SimpleMachines / SMF2.1

Sources/Class-Graphics.php

Braces +90 added lines, -62 removed lines

@@ -19,8 +19,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Class gif_lzw_compression
@@ -52,13 +53,15 @@ 
 
 		$this->LZWCommand($data, true);
 
-		while (($iIndex = $this->LZWCommand($data, false)) >= 0)
-			$ret .= chr($iIndex);
+		while (($iIndex = $this->LZWCommand($data, false)) >= 0) {
+					$ret .= chr($iIndex);
+		}
 
 		$datLen = $stLen - strlen($data);
 
-		if ($iIndex != -2)
-			return false;
+		if ($iIndex != -2) {
+					return false;
+		}
 
 		return $ret;
 	}
@@ -140,8 +143,9 @@ 
 				return $this->FirstCode;
 			}
 
-			if ($Code == $this->EndCode)
-				return -2;
+			if ($Code == $this->EndCode) {
+							return -2;
+			}
 
 			$InCode = $Code;
 			if ($Code >= $this->MaxCode)
@@ -156,8 +160,10 @@ 
 				$this->Stack[$this->sp] = $this->Vals[$Code];
 				$this->sp++;
 
-				if ($Code == $this->Next[$Code]) // Circular table entry, big GIF Error!
+				if ($Code == $this->Next[$Code]) {
+					// Circular table entry, big GIF Error!
 					return -1;
+				}
 
 				$Code = $this->Next[$Code];
 			}
@@ -207,8 +213,9 @@ 
 			if ($this->Done)
 			{
 				// Ran off the end of my bits...
-				if ($this->CurBit >= $this->LastBit)
-					return 0;
+				if ($this->CurBit >= $this->LastBit) {
+									return 0;
+				}
 
 				return -1;
 			}
@@ -221,13 +228,14 @@ 
 
 			if ($count)
 			{
-				for ($i = 0; $i < $count; $i++)
-					$this->Buf[2 + $i] = ord($data{$i});
+				for ($i = 0; $i < $count; $i++) {
+									$this->Buf[2 + $i] = ord($data{$i});
+				}
 
 				$data = substr($data, $count);
+			} else {
+							$this->Done = 1;
 			}
-			else
-				$this->Done = 1;
 
 			$this->LastByte = 2 + $count;
 			$this->CurBit = ($this->CurBit - $this->LastBit) + 16;
@@ -235,8 +243,9 @@ 
 		}
 
 		$iRet = 0;
-		for ($i = $this->CurBit, $j = 0; $j < $this->CodeSize; $i++, $j++)
-			$iRet |= (($this->Buf[intval($i / 8)] & (1 << ($i % 8))) != 0) << $j;
+		for ($i = $this->CurBit, $j = 0; $j < $this->CodeSize; $i++, $j++) {
+					$iRet |= (($this->Buf[intval($i / 8)] & (1 << ($i % 8))) != 0) << $j;
+		}
 
 		$this->CurBit += $this->CodeSize;
 		return $iRet;
@@ -261,8 +270,9 @@ 
 		for ($i = 0; $i < $num; $i++)
 		{
 			$rgb = substr($lpData, $i * 3, 3);
-			if (strlen($rgb) < 3)
-				return false;
+			if (strlen($rgb) < 3) {
+							return false;
+			}
 
 			$this->m_arColors[] = (ord($rgb[2]) << 16) + (ord($rgb[1]) << 8) + ord($rgb[0]);
 			$this->m_nColors++;
@@ -329,13 +339,15 @@ 
 		$hdrLen = 0;
 
 		$this->m_lpVer = substr($lpData, 0, 6);
-		if (($this->m_lpVer != 'GIF87a') && ($this->m_lpVer != 'GIF89a'))
-			return false;
+		if (($this->m_lpVer != 'GIF87a') && ($this->m_lpVer != 'GIF89a')) {
+					return false;
+		}
 
 		list ($this->m_nWidth, $this->m_nHeight) = array_values(unpack('v2', substr($lpData, 6, 4)));
 
-		if (!$this->m_nWidth || !$this->m_nHeight)
-			return false;
+		if (!$this->m_nWidth || !$this->m_nHeight) {
+					return false;
+		}
 
 		$b = ord(substr($lpData, 10, 1));
 		$this->m_bGlobalClr  = ($b & 0x80) ? true : false;
@@ -349,8 +361,9 @@ 
 		if ($this->m_bGlobalClr)
 		{
 			$this->m_colorTable = new gif_color_table();
-			if (!$this->m_colorTable->load(substr($lpData, $hdrLen), $this->m_nTableSize))
-				return false;
+			if (!$this->m_colorTable->load(substr($lpData, $hdrLen), $this->m_nTableSize)) {
+							return false;
+			}
 
 			$hdrLen += 3 * $this->m_nTableSize;
 		}
@@ -377,8 +390,9 @@ 
 		// Get the width/height/etc. from the header.
 		list ($this->m_nLeft, $this->m_nTop, $this->m_nWidth, $this->m_nHeight) = array_values(unpack('v4', substr($lpData, 0, 8)));
 
-		if (!$this->m_nWidth || !$this->m_nHeight)
-			return false;
+		if (!$this->m_nWidth || !$this->m_nHeight) {
+					return false;
+		}
 
 		$b = ord($lpData[8]);
 		$this->m_bLocalClr  = ($b & 0x80) ? true : false;
@@ -390,8 +404,9 @@ 
 		if ($this->m_bLocalClr)
 		{
 			$this->m_colorTable = new gif_color_table();
-			if (!$this->m_colorTable->load(substr($lpData, $hdrLen), $this->m_nTableSize))
-				return false;
+			if (!$this->m_colorTable->load(substr($lpData, $hdrLen), $this->m_nTableSize)) {
+							return false;
+			}
 
 			$hdrLen += 3 * $this->m_nTableSize;
 		}
@@ -427,8 +442,9 @@ 
 			// Extension...
 				case 0x21:
 					$len = 0;
-					if (!$this->skipExt($data, $len))
-						return false;
+					if (!$this->skipExt($data, $len)) {
+											return false;
+					}
 
 					$datLen += $len;
 					break;
@@ -437,21 +453,24 @@ 
 				case 0x2C:
 					// Load the header and color table.
 					$len = 0;
-					if (!$this->m_gih->load($data, $len))
-						return false;
+					if (!$this->m_gih->load($data, $len)) {
+											return false;
+					}
 
 					$data = substr($data, $len);
 					$datLen += $len;
 
 					// Decompress the data, and ride on home ;).
 					$len = 0;
-					if (!($this->m_data = $this->m_lzw->decompress($data, $len)))
-						return false;
+					if (!($this->m_data = $this->m_lzw->decompress($data, $len))) {
+											return false;
+					}
 					
 					$datLen += $len;
 
-					if ($this->m_gih->m_bInterlace)
-						$this->deInterlace();
+					if ($this->m_gih->m_bInterlace) {
+											$this->deInterlace();
+					}
 
 					return true;
 
@@ -571,17 +590,20 @@ 
 
 	public function loadFile($filename, $iIndex)
 	{
-		if ($iIndex < 0)
-			return false;
+		if ($iIndex < 0) {
+					return false;
+		}
 
 		$this->data = @file_get_contents($filename);
-		if ($this->data === false)
-			return false;
+		if ($this->data === false) {
+					return false;
+		}
 
 		// Tell the header to load up....
 		$len = 0;
-		if (!$this->header->load($this->data, $len))
-			return false;
+		if (!$this->header->load($this->data, $len)) {
+					return false;
+		}
 
 		$this->data = substr($this->data, $len);
 
@@ -589,8 +611,9 @@ 
 		for ($j = 0; $j <= $iIndex; $j++)
 		{
 			$imgLen = 0;
-			if (!$this->image->load($this->data, $imgLen))
-				return false;
+			if (!$this->image->load($this->data, $imgLen)) {
+							return false;
+			}
 
 			$this->data = substr($this->data, $imgLen);
 		}
@@ -601,8 +624,9 @@ 
 
 	public function get_png_data($background_color)
 	{
-		if (!$this->loaded)
-			return false;
+		if (!$this->loaded) {
+					return false;
+		}
 
 		// Prepare the color table.
 		if ($this->image->m_gih->m_bLocalClr)
@@ -610,25 +634,26 @@ 
 			$colors = $this->image->m_gih->m_nTableSize;
 			$pal = $this->image->m_gih->m_colorTable->toString();
 
-			if ($background_color != -1)
-				$background_color = $this->image->m_gih->m_colorTable->colorIndex($background_color);
-		}
-		elseif ($this->header->m_bGlobalClr)
+			if ($background_color != -1) {
+							$background_color = $this->image->m_gih->m_colorTable->colorIndex($background_color);
+			}
+		} elseif ($this->header->m_bGlobalClr)
 		{
 			$colors = $this->header->m_nTableSize;
 			$pal = $this->header->m_colorTable->toString();
 
-			if ($background_color != -1)
-				$background_color = $this->header->m_colorTable->colorIndex($background_color);
-		}
-		else
+			if ($background_color != -1) {
+							$background_color = $this->header->m_colorTable->colorIndex($background_color);
+			}
+		} else
 		{
 			$colors = 0;
 			$background_color = -1;
 		}
 
-		if ($background_color == -1)
-			$background_color = $this->header->m_nBgColor;
+		if ($background_color == -1) {
+					$background_color = $this->header->m_nBgColor;
+		}
 
 		$data = &$this->image->m_data;
 		$header = &$this->image->m_gih;
@@ -644,11 +669,13 @@ 
 			for ($x = 0; $x < $this->header->m_nWidth; $x++, $i++)
 			{
 				// Is this in the proper range?  If so, get the specific pixel data...
-				if ($x >= $header->m_nLeft && $y >= $header->m_nTop && $x < ($header->m_nLeft + $header->m_nWidth) && $y < ($header->m_nTop + $header->m_nHeight))
-					$bmp .= $data{$i};
+				if ($x >= $header->m_nLeft && $y >= $header->m_nTop && $x < ($header->m_nLeft + $header->m_nWidth) && $y < ($header->m_nTop + $header->m_nHeight)) {
+									$bmp .= $data{$i};
+				}
 				// Otherwise, this is background...
-				else
-					$bmp .= chr($background_color);
+				else {
+									$bmp .= chr($background_color);
+				}
 			}
 		}
 
@@ -677,8 +704,9 @@ 
 			$tmp = 'tRNS';
 
 			// Stick each color on - full transparency or none.
-			for ($i = 0; $i < $colors; $i++)
-				$tmp .= $i == $this->image->m_nTrans ? "\x00" : "\xFF";
+			for ($i = 0; $i < $colors; $i++) {
+							$tmp .= $i == $this->image->m_nTrans ? "\x00" : "\xFF";
+			}
 
 			$out .= $tmp . pack('N', smf_crc32($tmp));
 		}

Sources/tasks/index.php

Braces +3 added lines, -2 removed lines

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

avatars/Oxygen/index.php

Braces +3 added lines, -2 removed lines

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

avatars/index.php

Braces +2 added lines, -1 removed lines

@@ -12,7 +12,8 @@
 	header('Location: ' . $boardurl);
 }
 // Can't find it... just forget it.
-else
+else {
 	exit;
+}
 
 ?>
\ No newline at end of file

Sources/Subs-Sound.php

Braces +32 added lines, -20 removed lines

@@ -15,8 +15,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Creates a wave file that spells the letters of $word.
@@ -32,8 +33,9 @@ 
 	global $settings, $user_info;
 
 	// Allow max 2 requests per 20 seconds.
-	if (($ip = cache_get_data('wave_file/' . $user_info['ip'], 20)) > 2 || ($ip2 = cache_get_data('wave_file/' . $user_info['ip2'], 20)) > 2)
-		die(header('HTTP/1.1 400 Bad Request'));
+	if (($ip = cache_get_data('wave_file/' . $user_info['ip'], 20)) > 2 || ($ip2 = cache_get_data('wave_file/' . $user_info['ip2'], 20)) > 2) {
+			die(header('HTTP/1.1 400 Bad Request'));
+	}
 	cache_put_data('wave_file/' . $user_info['ip'], $ip ? $ip + 1 : 1, 20);
 	cache_put_data('wave_file/' . $user_info['ip2'], $ip2 ? $ip2 + 1 : 1, 20);
 
@@ -42,16 +44,19 @@ 
 	mt_srand(end($tmp));
 
 	// Try to see if there's a sound font in the user's language.
-	if (file_exists($settings['default_theme_dir'] . '/fonts/sound/a.' . $user_info['language'] . '.wav'))
-		$sound_language = $user_info['language'];
+	if (file_exists($settings['default_theme_dir'] . '/fonts/sound/a.' . $user_info['language'] . '.wav')) {
+			$sound_language = $user_info['language'];
+	}
 
 	// English should be there.
-	elseif (file_exists($settings['default_theme_dir'] . '/fonts/sound/a.english.wav'))
-		$sound_language = 'english';
+	elseif (file_exists($settings['default_theme_dir'] . '/fonts/sound/a.english.wav')) {
+			$sound_language = 'english';
+	}
 
 	// Guess not...
-	else
-		return false;
+	else {
+			return false;
+	}
 
 	// File names are in lower case so lets make sure that we are only using a lower case string
 	$word = strtolower($word);
@@ -61,20 +66,25 @@ 
 	for ($i = 0; $i < strlen($word); $i++)
 	{
 		$sound_letter = implode('', file($settings['default_theme_dir'] . '/fonts/sound/' . $word{$i} . '.' . $sound_language . '.wav'));
-		if (strpos($sound_letter, 'data') === false)
-			return false;
+		if (strpos($sound_letter, 'data') === false) {
+					return false;
+		}
 
 		$sound_letter = substr($sound_letter, strpos($sound_letter, 'data') + 8);
 		switch ($word{$i} === 's' ? 0 : mt_rand(0, 2))
 		{
-			case 0 : for ($j = 0, $n = strlen($sound_letter); $j < $n; $j++)
-					for ($k = 0, $m = round(mt_rand(15, 25) / 10); $k < $m; $k++)
-						$sound_word .= $word{$i} === 's' ? $sound_letter{$j} : chr(mt_rand(max(ord($sound_letter{$j}) - 1, 0x00), min(ord($sound_letter{$j}) + 1, 0xFF)));
+			case 0 : for ($j = 0, $n = strlen($sound_letter); $j < $n; $j++) {
+								for ($k = 0, $m = round(mt_rand(15, 25) / 10);
+			}
+			$k < $m; $k++) {
+											$sound_word .= $word{$i} === 's' ? $sound_letter{$j} : chr(mt_rand(max(ord($sound_letter{$j}) - 1, 0x00), min(ord($sound_letter{$j}) + 1, 0xFF)));
+					}
 			break;
 
 			case 1:
-				for ($j = 0, $n = strlen($sound_letter) - 1; $j < $n; $j += 2)
-					$sound_word .= (mt_rand(0, 3) == 0 ? '' : $sound_letter{$j}) . (mt_rand(0, 3) === 0 ? $sound_letter{$j + 1} : $sound_letter{$j}) . (mt_rand(0, 3) === 0 ? $sound_letter{$j} : $sound_letter{$j + 1}) . $sound_letter{$j + 1} . (mt_rand(0, 3) == 0 ? $sound_letter{$j + 1} : '');
+				for ($j = 0, $n = strlen($sound_letter) - 1; $j < $n; $j += 2) {
+									$sound_word .= (mt_rand(0, 3) == 0 ? '' : $sound_letter{$j}) . (mt_rand(0, 3) === 0 ? $sound_letter{$j + 1} : $sound_letter{$j}) . (mt_rand(0, 3) === 0 ? $sound_letter{$j} : $sound_letter{$j + 1}) . $sound_letter{$j + 1} . (mt_rand(0, 3) == 0 ? $sound_letter{$j + 1} : '');
+				}
 				$sound_word .= str_repeat($sound_letter{$n}, 2);
 			break;
 
@@ -82,10 +92,12 @@ 
 				$shift = 0;
 				for ($j = 0, $n = strlen($sound_letter); $j < $n; $j++)
 				{
-					if (mt_rand(0, 10) === 0)
-						$shift += mt_rand(-3, 3);
-					for ($k = 0, $m = round(mt_rand(15, 25) / 10); $k < $m; $k++)
-						$sound_word .= chr(min(max(ord($sound_letter{$j}) + $shift, 0x00), 0xFF));
+					if (mt_rand(0, 10) === 0) {
+											$shift += mt_rand(-3, 3);
+					}
+					for ($k = 0, $m = round(mt_rand(15, 25) / 10); $k < $m; $k++) {
+											$sound_word .= chr(min(max(ord($sound_letter{$j}) + $shift, 0x00), 0xFF));
+					}
 				}
 			break;
 

Sources/Profile-Modify.php

Braces +694 added lines, -518 removed lines

@@ -15,8 +15,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * This defines every profile field known to man.
@@ -29,8 +30,9 @@ 
 	global $sourcedir, $profile_vars;
 
 	// Don't load this twice!
-	if (!empty($profile_fields) && !$force_reload)
-		return;
+	if (!empty($profile_fields) && !$force_reload) {
+			return;
+	}
 
 	/* This horrific array defines all the profile fields in the whole world!
 		In general each "field" has one array - the key of which is the database column name associated with said field. Each item
@@ -103,13 +105,14 @@ 
 				if (isset($_POST['bday2'], $_POST['bday3']) && $value > 0 && $_POST['bday2'] > 0)
 				{
 					// Set to blank?
-					if ((int) $_POST['bday3'] == 1 && (int) $_POST['bday2'] == 1 && (int) $value == 1)
-						$value = '0001-01-01';
-					else
-						$value = checkdate($value, $_POST['bday2'], $_POST['bday3'] < 4 ? 4 : $_POST['bday3']) ? sprintf('%04d-%02d-%02d', $_POST['bday3'] < 4 ? 4 : $_POST['bday3'], $_POST['bday1'], $_POST['bday2']) : '0001-01-01';
+					if ((int) $_POST['bday3'] == 1 && (int) $_POST['bday2'] == 1 && (int) $value == 1) {
+											$value = '0001-01-01';
+					} else {
+											$value = checkdate($value, $_POST['bday2'], $_POST['bday3'] < 4 ? 4 : $_POST['bday3']) ? sprintf('%04d-%02d-%02d', $_POST['bday3'] < 4 ? 4 : $_POST['bday3'], $_POST['bday1'], $_POST['bday2']) : '0001-01-01';
+					}
+				} else {
+									$value = '0001-01-01';
 				}
-				else
-					$value = '0001-01-01';
 
 				$profile_vars['birthdate'] = $value;
 				$cur_profile['birthdate'] = $value;
@@ -127,8 +130,7 @@ 
 				{
 					$value = checkdate($dates[2], $dates[3], $dates[1] < 4 ? 4 : $dates[1]) ? sprintf('%04d-%02d-%02d', $dates[1] < 4 ? 4 : $dates[1], $dates[2], $dates[3]) : '0001-01-01';
 					return true;
-				}
-				else
+				} else
 				{
 					$value = empty($cur_profile['birthdate']) ? '0001-01-01' : $cur_profile['birthdate'];
 					return false;
@@ -150,10 +152,11 @@ 
 					return $txt['invalid_registration'] . ' ' . strftime('%d %b %Y ' . (strpos($user_info['time_format'], '%H') !== false ? '%I:%M:%S %p' : '%H:%M:%S'), forum_time(false));
 				}
 				// As long as it doesn't equal "N/A"...
-				elseif ($value != $txt['not_applicable'] && $value != strtotime(strftime('%Y-%m-%d', $cur_profile['date_registered'] + ($user_info['time_offset'] + $modSettings['time_offset']) * 3600)))
-					$value = $value - ($user_info['time_offset'] + $modSettings['time_offset']) * 3600;
-				else
-					$value = $cur_profile['date_registered'];
+				elseif ($value != $txt['not_applicable'] && $value != strtotime(strftime('%Y-%m-%d', $cur_profile['date_registered'] + ($user_info['time_offset'] + $modSettings['time_offset']) * 3600))) {
+									$value = $value - ($user_info['time_offset'] + $modSettings['time_offset']) * 3600;
+				} else {
+									$value = $cur_profile['date_registered'];
+				}
 
 				return true;
 			},
@@ -177,8 +180,9 @@ 
 			{
 				global $context, $old_profile, $profile_vars, $sourcedir, $modSettings;
 
-				if (strtolower($value) == strtolower($old_profile['email_address']))
-					return false;
+				if (strtolower($value) == strtolower($old_profile['email_address'])) {
+									return false;
+				}
 
 				$isValid = profileValidateEmail($value, $context['id_member']);
 
@@ -254,11 +258,11 @@ 
 
 				if (isset($context['profile_languages'][$value]))
 				{
-					if ($context['user']['is_owner'] && empty($context['password_auth_failed']))
-						$_SESSION['language'] = $value;
+					if ($context['user']['is_owner'] && empty($context['password_auth_failed'])) {
+											$_SESSION['language'] = $value;
+					}
 					return true;
-				}
-				else
+				} else
 				{
 					$value = $cur_profile['lngfile'];
 					return false;
@@ -282,13 +286,14 @@ 
 
 					// Maybe they are trying to change their password as well?
 					$resetPassword = true;
-					if (isset($_POST['passwrd1']) && $_POST['passwrd1'] != '' && isset($_POST['passwrd2']) && $_POST['passwrd1'] == $_POST['passwrd2'] && validatePassword($_POST['passwrd1'], $value, array($cur_profile['real_name'], $user_info['username'], $user_info['name'], $user_info['email'])) == null)
-						$resetPassword = false;
+					if (isset($_POST['passwrd1']) && $_POST['passwrd1'] != '' && isset($_POST['passwrd2']) && $_POST['passwrd1'] == $_POST['passwrd2'] && validatePassword($_POST['passwrd1'], $value, array($cur_profile['real_name'], $user_info['username'], $user_info['name'], $user_info['email'])) == null) {
+											$resetPassword = false;
+					}
 
 					// Do the reset... this will send them an email too.
-					if ($resetPassword)
-						resetPassword($context['id_member'], $value);
-					elseif ($value !== null)
+					if ($resetPassword) {
+											resetPassword($context['id_member'], $value);
+					} elseif ($value !== null)
 					{
 						validateUsername($context['id_member'], trim(preg_replace('~[\t\n\r \x0B\0' . ($context['utf8'] ? '\x{A0}\x{AD}\x{2000}-\x{200F}\x{201F}\x{202F}\x{3000}\x{FEFF}' : '\x00-\x08\x0B\x0C\x0E-\x19\xA0') . ']+~' . ($context['utf8'] ? 'u' : ''), ' ', $value)));
 						updateMemberData($context['id_member'], array('member_name' => $value));
@@ -312,20 +317,23 @@ 
 			'input_validate' => function(&$value) use ($sourcedir, $user_info, $smcFunc, $cur_profile)
 			{
 				// If we didn't try it then ignore it!
-				if ($value == '')
-					return false;
+				if ($value == '') {
+									return false;
+				}
 
 				// Do the two entries for the password even match?
-				if (!isset($_POST['passwrd2']) || $value != $_POST['passwrd2'])
-					return 'bad_new_password';
+				if (!isset($_POST['passwrd2']) || $value != $_POST['passwrd2']) {
+									return 'bad_new_password';
+				}
 
 				// Let's get the validation function into play...
 				require_once($sourcedir . '/Subs-Auth.php');
 				$passwordErrors = validatePassword($value, $cur_profile['member_name'], array($cur_profile['real_name'], $user_info['username'], $user_info['name'], $user_info['email']));
 
 				// Were there errors?
-				if ($passwordErrors != null)
-					return 'password_' . $passwordErrors;
+				if ($passwordErrors != null) {
+									return 'password_' . $passwordErrors;
+				}
 
 				// Set up the new password variable... ready for storage.
 				$value = hash_password($cur_profile['member_name'], un_htmlspecialchars($value));
@@ -350,8 +358,9 @@ 
 			'permission' => 'profile_blurb',
 			'input_validate' => function(&$value) use ($smcFunc)
 			{
-				if ($smcFunc['strlen']($value) > 50)
-					return 'personal_text_too_long';
+				if ($smcFunc['strlen']($value) > 50) {
+									return 'personal_text_too_long';
+				}
 
 				return true;
 			},
@@ -386,10 +395,11 @@ 
 			'permission' => 'moderate_forum',
 			'input_validate' => function(&$value)
 			{
-				if (!is_numeric($value))
-					return 'digits_only';
-				else
-					$value = $value != '' ? strtr($value, array(',' => '', '.' => '', ' ' => '')) : 0;
+				if (!is_numeric($value)) {
+									return 'digits_only';
+				} else {
+									$value = $value != '' ? strtr($value, array(',' => '', '.' => '', ' ' => '')) : 0;
+				}
 				return true;
 			},
 		),
@@ -405,15 +415,16 @@ 
 			{
 				$value = trim(preg_replace('~[\t\n\r \x0B\0' . ($context['utf8'] ? '\x{A0}\x{AD}\x{2000}-\x{200F}\x{201F}\x{202F}\x{3000}\x{FEFF}' : '\x00-\x08\x0B\x0C\x0E-\x19\xA0') . ']+~' . ($context['utf8'] ? 'u' : ''), ' ', $value));
 
-				if (trim($value) == '')
-					return 'no_name';
-				elseif ($smcFunc['strlen']($value) > 60)
-					return 'name_too_long';
-				elseif ($cur_profile['real_name'] != $value)
+				if (trim($value) == '') {
+									return 'no_name';
+				} elseif ($smcFunc['strlen']($value) > 60) {
+									return 'name_too_long';
+				} elseif ($cur_profile['real_name'] != $value)
 				{
 					require_once($sourcedir . '/Subs-Members.php');
-					if (isReservedName($value, $context['id_member']))
-						return 'name_taken';
+					if (isReservedName($value, $context['id_member'])) {
+											return 'name_taken';
+					}
 				}
 				return true;
 			},
@@ -471,8 +482,9 @@ 
 						'selected' => $set == $context['member']['smiley_set']['id']
 					);
 
-					if ($context['smiley_sets'][$i]['selected'])
-						$context['member']['smiley_set']['name'] = $set_names[$i];
+					if ($context['smiley_sets'][$i]['selected']) {
+											$context['member']['smiley_set']['name'] = $set_names[$i];
+					}
 				}
 				return true;
 			},
@@ -481,8 +493,9 @@ 
 				global $modSettings;
 
 				$smiley_sets = explode(',', $modSettings['smiley_sets_known']);
-				if (!in_array($value, $smiley_sets) && $value != 'none')
-					$value = '';
+				if (!in_array($value, $smiley_sets) && $value != 'none') {
+									$value = '';
+				}
 				return true;
 			},
 		),
@@ -497,8 +510,9 @@ 
 				loadLanguage('Settings');
 
 				$context['allow_no_censored'] = false;
-				if ($user_info['is_admin'] || $context['user']['is_owner'])
-					$context['allow_no_censored'] = !empty($modSettings['allow_no_censored']);
+				if ($user_info['is_admin'] || $context['user']['is_owner']) {
+									$context['allow_no_censored'] = !empty($modSettings['allow_no_censored']);
+				}
 
 				return true;
 			},
@@ -545,8 +559,9 @@ 
 			'input_validate' => function($value)
 			{
 				$tz = smf_list_timezones();
-				if (!isset($tz[$value]))
-					return 'bad_timezone';
+				if (!isset($tz[$value])) {
+									return 'bad_timezone';
+				}
 
 				return true;
 			},
@@ -561,8 +576,9 @@ 
 			'enabled' => !empty($modSettings['titlesEnable']),
 			'input_validate' => function(&$value) use ($smcFunc)
 			{
-				if ($smcFunc['strlen']($value) > 50)
-					return 'user_title_too_long';
+				if ($smcFunc['strlen']($value) > 50) {
+									return 'user_title_too_long';
+				}
 
 				return true;
 			},
@@ -584,10 +600,12 @@ 
 			// Fix the URL...
 			'input_validate' => function(&$value)
 			{
-				if (strlen(trim($value)) > 0 && strpos($value, '://') === false)
-					$value = 'http://' . $value;
-				if (strlen($value) < 8 || (substr($value, 0, 7) !== 'http://' && substr($value, 0, 8) !== 'https://'))
-					$value = '';
+				if (strlen(trim($value)) > 0 && strpos($value, '://') === false) {
+									$value = 'http://' . $value;
+				}
+				if (strlen($value) < 8 || (substr($value, 0, 7) !== 'http://' && substr($value, 0, 8) !== 'https://')) {
+									$value = '';
+				}
 				return true;
 			},
 			'link_with' => 'website',
@@ -601,16 +619,19 @@ 
 	foreach ($profile_fields as $key => $field)
 	{
 		// Do we have permission to do this?
-		if (isset($field['permission']) && !allowedTo(($context['user']['is_owner'] ? array($field['permission'] . '_own', $field['permission'] . '_any') : $field['permission'] . '_any')) && !allowedTo($field['permission']))
-			unset($profile_fields[$key]);
+		if (isset($field['permission']) && !allowedTo(($context['user']['is_owner'] ? array($field['permission'] . '_own', $field['permission'] . '_any') : $field['permission'] . '_any')) && !allowedTo($field['permission'])) {
+					unset($profile_fields[$key]);
+		}
 
 		// Is it enabled?
-		if (isset($field['enabled']) && !$field['enabled'])
-			unset($profile_fields[$key]);
+		if (isset($field['enabled']) && !$field['enabled']) {
+					unset($profile_fields[$key]);
+		}
 
 		// Is it specifically disabled?
-		if (in_array($key, $disabled_fields) || (isset($field['link_with']) && in_array($field['link_with'], $disabled_fields)))
-			unset($profile_fields[$key]);
+		if (in_array($key, $disabled_fields) || (isset($field['link_with']) && in_array($field['link_with'], $disabled_fields))) {
+					unset($profile_fields[$key]);
+		}
 	}
 }
 
@@ -635,9 +656,10 @@ 
 	loadProfileFields(true);
 
 	// First check for any linked sets.
-	foreach ($profile_fields as $key => $field)
-		if (isset($field['link_with']) && in_array($field['link_with'], $fields))
+	foreach ($profile_fields as $key => $field) {
+			if (isset($field['link_with']) && in_array($field['link_with'], $fields))
 			$fields[] = $key;
+	}
 
 	$i = 0;
 	$last_type = '';
@@ -649,38 +671,46 @@ 
 			$cur_field = &$profile_fields[$field];
 
 			// Does it have a preload and does that preload succeed?
-			if (isset($cur_field['preload']) && !$cur_field['preload']())
-				continue;
+			if (isset($cur_field['preload']) && !$cur_field['preload']()) {
+							continue;
+			}
 
 			// If this is anything but complex we need to do more cleaning!
 			if ($cur_field['type'] != 'callback' && $cur_field['type'] != 'hidden')
 			{
-				if (!isset($cur_field['label']))
-					$cur_field['label'] = isset($txt[$field]) ? $txt[$field] : $field;
+				if (!isset($cur_field['label'])) {
+									$cur_field['label'] = isset($txt[$field]) ? $txt[$field] : $field;
+				}
 
 				// Everything has a value!
-				if (!isset($cur_field['value']))
-					$cur_field['value'] = isset($cur_profile[$field]) ? $cur_profile[$field] : '';
+				if (!isset($cur_field['value'])) {
+									$cur_field['value'] = isset($cur_profile[$field]) ? $cur_profile[$field] : '';
+				}
 
 				// Any input attributes?
 				$cur_field['input_attr'] = !empty($cur_field['input_attr']) ? implode(',', $cur_field['input_attr']) : '';
 			}
 
 			// Was there an error with this field on posting?
-			if (isset($context['profile_errors'][$field]))
-				$cur_field['is_error'] = true;
+			if (isset($context['profile_errors'][$field])) {
+							$cur_field['is_error'] = true;
+			}
 
 			// Any javascript stuff?
-			if (!empty($cur_field['js_submit']))
-				$context['profile_onsubmit_javascript'] .= $cur_field['js_submit'];
-			if (!empty($cur_field['js']))
-				$context['profile_javascript'] .= $cur_field['js'];
+			if (!empty($cur_field['js_submit'])) {
+							$context['profile_onsubmit_javascript'] .= $cur_field['js_submit'];
+			}
+			if (!empty($cur_field['js'])) {
+							$context['profile_javascript'] .= $cur_field['js'];
+			}
 
 			// Any template stuff?
-			if (!empty($cur_field['prehtml']))
-				$context['profile_prehtml'] .= $cur_field['prehtml'];
-			if (!empty($cur_field['posthtml']))
-				$context['profile_posthtml'] .= $cur_field['posthtml'];
+			if (!empty($cur_field['prehtml'])) {
+							$context['profile_prehtml'] .= $cur_field['prehtml'];
+			}
+			if (!empty($cur_field['posthtml'])) {
+							$context['profile_posthtml'] .= $cur_field['posthtml'];
+			}
 
 			// Finally put it into context?
 			if ($cur_field['type'] != 'hidden')
@@ -713,12 +743,14 @@ 
 	}, false);' : ''), true);
 
 	// Any onsubmit javascript?
-	if (!empty($context['profile_onsubmit_javascript']))
-		addInlineJavaScript($context['profile_onsubmit_javascript'], true);
+	if (!empty($context['profile_onsubmit_javascript'])) {
+			addInlineJavaScript($context['profile_onsubmit_javascript'], true);
+	}
 
 	// Any totally custom stuff?
-	if (!empty($context['profile_javascript']))
-		addInlineJavaScript($context['profile_javascript'], true);
+	if (!empty($context['profile_javascript'])) {
+			addInlineJavaScript($context['profile_javascript'], true);
+	}
 
 	// Free up some memory.
 	unset($profile_fields);
@@ -739,8 +771,9 @@ 
 
 	// This allows variables to call activities when they save - by default just to reload their settings
 	$context['profile_execute_on_save'] = array();
-	if ($context['user']['is_owner'])
-		$context['profile_execute_on_save']['reload_user'] = 'profileReloadUser';
+	if ($context['user']['is_owner']) {
+			$context['profile_execute_on_save']['reload_user'] = 'profileReloadUser';
+	}
 
 	// Assume we log nothing.
 	$context['log_changes'] = array();
@@ -748,8 +781,9 @@ 
 	// Cycle through the profile fields working out what to do!
 	foreach ($profile_fields as $key => $field)
 	{
-		if (!isset($_POST[$key]) || !empty($field['is_dummy']) || (isset($_POST['preview_signature']) && $key == 'signature'))
-			continue;
+		if (!isset($_POST[$key]) || !empty($field['is_dummy']) || (isset($_POST['preview_signature']) && $key == 'signature')) {
+					continue;
+		}
 
 		// What gets updated?
 		$db_key = isset($field['save_key']) ? $field['save_key'] : $key;
@@ -777,12 +811,13 @@ 
 		$field['cast_type'] = empty($field['cast_type']) ? $field['type'] : $field['cast_type'];
 
 		// Finally, clean up certain types.
-		if ($field['cast_type'] == 'int')
-			$_POST[$key] = (int) $_POST[$key];
-		elseif ($field['cast_type'] == 'float')
-			$_POST[$key] = (float) $_POST[$key];
-		elseif ($field['cast_type'] == 'check')
-			$_POST[$key] = !empty($_POST[$key]) ? 1 : 0;
+		if ($field['cast_type'] == 'int') {
+					$_POST[$key] = (int) $_POST[$key];
+		} elseif ($field['cast_type'] == 'float') {
+					$_POST[$key] = (float) $_POST[$key];
+		} elseif ($field['cast_type'] == 'check') {
+					$_POST[$key] = !empty($_POST[$key]) ? 1 : 0;
+		}
 
 		// If we got here we're doing OK.
 		if ($field['type'] != 'hidden' && (!isset($old_profile[$key]) || $_POST[$key] != $old_profile[$key]))
@@ -793,11 +828,12 @@ 
 			$cur_profile[$key] = $_POST[$key];
 
 			// Are we logging it?
-			if (!empty($field['log_change']) && isset($old_profile[$key]))
-				$context['log_changes'][$key] = array(
+			if (!empty($field['log_change']) && isset($old_profile[$key])) {
+							$context['log_changes'][$key] = array(
 					'previous' => $old_profile[$key],
 					'new' => $_POST[$key],
 				);
+			}
 		}
 
 		// Logging group changes are a bit different...
@@ -830,10 +866,11 @@ 
 				{
 					foreach ($groups as $id => $group)
 					{
-						if (isset($context['member_groups'][$group]))
-							$additional_groups[$type][$id] = $context['member_groups'][$group]['name'];
-						else
-							unset($additional_groups[$type][$id]);
+						if (isset($context['member_groups'][$group])) {
+													$additional_groups[$type][$id] = $context['member_groups'][$group]['name'];
+						} else {
+													unset($additional_groups[$type][$id]);
+						}
 					}
 					$additional_groups[$type] = implode(', ', $additional_groups[$type]);
 				}
@@ -844,10 +881,11 @@ 
 	}
 
 	// @todo Temporary
-	if ($context['user']['is_owner'])
-		$changeOther = allowedTo(array('profile_extra_any', 'profile_extra_own'));
-	else
-		$changeOther = allowedTo('profile_extra_any');
+	if ($context['user']['is_owner']) {
+			$changeOther = allowedTo(array('profile_extra_any', 'profile_extra_own'));
+	} else {
+			$changeOther = allowedTo('profile_extra_any');
+	}
 	if ($changeOther && empty($post_errors))
 	{
 		makeThemeChanges($context['id_member'], isset($_POST['id_theme']) ? (int) $_POST['id_theme'] : $old_profile['id_theme']);
@@ -855,8 +893,9 @@ 
 		{
 			$custom_fields_errors = makeCustomFieldChanges($context['id_member'], $_REQUEST['sa'], false, true);
 
-			if (!empty($custom_fields_errors))
-				$post_errors = array_merge($post_errors, $custom_fields_errors);
+			if (!empty($custom_fields_errors)) {
+							$post_errors = array_merge($post_errors, $custom_fields_errors);
+			}
 		}
 	}
 
@@ -882,9 +921,9 @@ 
 	if ($context['user']['is_owner'])
 	{
 		$changeOther = allowedTo(array('profile_extra_any', 'profile_extra_own', 'profile_website_any', 'profile_website_own', 'profile_signature_any', 'profile_signature_own'));
+	} else {
+			$changeOther = allowedTo(array('profile_extra_any', 'profile_website_any', 'profile_signature_any'));
 	}
-	else
-		$changeOther = allowedTo(array('profile_extra_any', 'profile_website_any', 'profile_signature_any'));
 
 	// Arrays of all the changes - makes things easier.
 	$profile_bools = array();
@@ -895,22 +934,25 @@ 
 		'ignore_boards',
 	);
 
-	if (isset($_POST['sa']) && $_POST['sa'] == 'ignoreboards' && empty($_POST['ignore_brd']))
-		$_POST['ignore_brd'] = array();
+	if (isset($_POST['sa']) && $_POST['sa'] == 'ignoreboards' && empty($_POST['ignore_brd'])) {
+			$_POST['ignore_brd'] = array();
+	}
 
 	unset($_POST['ignore_boards']); // Whatever it is set to is a dirty filthy thing.  Kinda like our minds.
 	if (isset($_POST['ignore_brd']))
 	{
-		if (!is_array($_POST['ignore_brd']))
-			$_POST['ignore_brd'] = array($_POST['ignore_brd']);
+		if (!is_array($_POST['ignore_brd'])) {
+					$_POST['ignore_brd'] = array($_POST['ignore_brd']);
+		}
 
 		foreach ($_POST['ignore_brd'] as $k => $d)
 		{
 			$d = (int) $d;
-			if ($d != 0)
-				$_POST['ignore_brd'][$k] = $d;
-			else
-				unset($_POST['ignore_brd'][$k]);
+			if ($d != 0) {
+							$_POST['ignore_brd'][$k] = $d;
+			} else {
+							unset($_POST['ignore_brd'][$k]);
+			}
 		}
 		$_POST['ignore_boards'] = implode(',', $_POST['ignore_brd']);
 		unset($_POST['ignore_brd']);
@@ -923,21 +965,26 @@ 
 		makeThemeChanges($memID, isset($_POST['id_theme']) ? (int) $_POST['id_theme'] : $old_profile['id_theme']);
 		//makeAvatarChanges($memID, $post_errors);
 
-		if (!empty($_REQUEST['sa']))
-			makeCustomFieldChanges($memID, $_REQUEST['sa'], false);
+		if (!empty($_REQUEST['sa'])) {
+					makeCustomFieldChanges($memID, $_REQUEST['sa'], false);
+		}
 
-		foreach ($profile_bools as $var)
-			if (isset($_POST[$var]))
+		foreach ($profile_bools as $var) {
+					if (isset($_POST[$var]))
 				$profile_vars[$var] = empty($_POST[$var]) ? '0' : '1';
-		foreach ($profile_ints as $var)
-			if (isset($_POST[$var]))
+		}
+		foreach ($profile_ints as $var) {
+					if (isset($_POST[$var]))
 				$profile_vars[$var] = $_POST[$var] != '' ? (int) $_POST[$var] : '';
-		foreach ($profile_floats as $var)
-			if (isset($_POST[$var]))
+		}
+		foreach ($profile_floats as $var) {
+					if (isset($_POST[$var]))
 				$profile_vars[$var] = (float) $_POST[$var];
-		foreach ($profile_strings as $var)
-			if (isset($_POST[$var]))
+		}
+		foreach ($profile_strings as $var) {
+					if (isset($_POST[$var]))
 				$profile_vars[$var] = $_POST[$var];
+		}
 	}
 }
 
@@ -971,8 +1018,9 @@ 
 	);
 
 	// Can't change reserved vars.
-	if ((isset($_POST['options']) && count(array_intersect(array_keys($_POST['options']), $reservedVars)) != 0) || (isset($_POST['default_options']) && count(array_intersect(array_keys($_POST['default_options']), $reservedVars)) != 0))
-		fatal_lang_error('no_access', false);
+	if ((isset($_POST['options']) && count(array_intersect(array_keys($_POST['options']), $reservedVars)) != 0) || (isset($_POST['default_options']) && count(array_intersect(array_keys($_POST['default_options']), $reservedVars)) != 0)) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Don't allow any overriding of custom fields with default or non-default options.
 	$request = $smcFunc['db_query']('', '
@@ -984,8 +1032,9 @@ 
 		)
 	);
 	$custom_fields = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$custom_fields[] = $row['col_name'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$custom_fields[] = $row['col_name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	// These are the theme changes...
@@ -994,33 +1043,39 @@ 
 	{
 		foreach ($_POST['options'] as $opt => $val)
 		{
-			if (in_array($opt, $custom_fields))
-				continue;
+			if (in_array($opt, $custom_fields)) {
+							continue;
+			}
 
 			// These need to be controlled.
-			if ($opt == 'topics_per_page' || $opt == 'messages_per_page')
-				$val = max(0, min($val, 50));
+			if ($opt == 'topics_per_page' || $opt == 'messages_per_page') {
+							$val = max(0, min($val, 50));
+			}
 			// We don't set this per theme anymore.
-			elseif ($opt == 'allow_no_censored')
-				continue;
+			elseif ($opt == 'allow_no_censored') {
+							continue;
+			}
 
 			$themeSetArray[] = array($memID, $id_theme, $opt, is_array($val) ? implode(',', $val) : $val);
 		}
 	}
 
 	$erase_options = array();
-	if (isset($_POST['default_options']) && is_array($_POST['default_options']))
-		foreach ($_POST['default_options'] as $opt => $val)
+	if (isset($_POST['default_options']) && is_array($_POST['default_options'])) {
+			foreach ($_POST['default_options'] as $opt => $val)
 		{
 			if (in_array($opt, $custom_fields))
 				continue;
+	}
 
 			// These need to be controlled.
-			if ($opt == 'topics_per_page' || $opt == 'messages_per_page')
-				$val = max(0, min($val, 50));
+			if ($opt == 'topics_per_page' || $opt == 'messages_per_page') {
+							$val = max(0, min($val, 50));
+			}
 			// Only let admins and owners change the censor.
-			elseif ($opt == 'allow_no_censored' && !$user_info['is_admin'] && !$context['user']['is_owner'])
-					continue;
+			elseif ($opt == 'allow_no_censored' && !$user_info['is_admin'] && !$context['user']['is_owner']) {
+								continue;
+			}
 
 			$themeSetArray[] = array($memID, 1, $opt, is_array($val) ? implode(',', $val) : $val);
 			$erase_options[] = $opt;
@@ -1056,8 +1111,9 @@ 
 
 		// Admins can choose any theme, even if it's not enabled...
 		$themes = allowedTo('admin_forum') ? explode(',', $modSettings['knownThemes']) : explode(',', $modSettings['enableThemes']);
-		foreach ($themes as $t)
-			cache_put_data('theme_settings-' . $t . ':' . $memID, null, 60);
+		foreach ($themes as $t) {
+					cache_put_data('theme_settings-' . $t . ':' . $memID, null, 60);
+		}
 	}
 }
 
@@ -1076,8 +1132,9 @@ 
 	if (isset($_POST['edit_notify_boards']) && !empty($_POST['notify_boards']))
 	{
 		// Make sure only integers are deleted.
-		foreach ($_POST['notify_boards'] as $index => $id)
-			$_POST['notify_boards'][$index] = (int) $id;
+		foreach ($_POST['notify_boards'] as $index => $id) {
+					$_POST['notify_boards'][$index] = (int) $id;
+		}
 
 		// id_board = 0 is reserved for topic notifications.
 		$_POST['notify_boards'] = array_diff($_POST['notify_boards'], array(0));
@@ -1096,8 +1153,9 @@ 
 	// We are editing topic notifications......
 	elseif (isset($_POST['edit_notify_topics']) && !empty($_POST['notify_topics']))
 	{
-		foreach ($_POST['notify_topics'] as $index => $id)
-			$_POST['notify_topics'][$index] = (int) $id;
+		foreach ($_POST['notify_topics'] as $index => $id) {
+					$_POST['notify_topics'][$index] = (int) $id;
+		}
 
 		// Make sure there are no zeros left.
 		$_POST['notify_topics'] = array_diff($_POST['notify_topics'], array(0));
@@ -1111,16 +1169,18 @@ 
 				'selected_member' => $memID,
 			)
 		);
-		foreach ($_POST['notify_topics'] as $topic)
-			setNotifyPrefs($memID, array('topic_notify_' . $topic => 0));
+		foreach ($_POST['notify_topics'] as $topic) {
+					setNotifyPrefs($memID, array('topic_notify_' . $topic => 0));
+		}
 	}
 
 	// We are removing topic preferences
 	elseif (isset($_POST['remove_notify_topics']) && !empty($_POST['notify_topics']))
 	{
 		$prefs = array();
-		foreach ($_POST['notify_topics'] as $topic)
-			$prefs[] = 'topic_notify_' . $topic;
+		foreach ($_POST['notify_topics'] as $topic) {
+					$prefs[] = 'topic_notify_' . $topic;
+		}
 		deleteNotifyPrefs($memID, $prefs);
 	}
 
@@ -1128,8 +1188,9 @@ 
 	elseif (isset($_POST['remove_notify_board']) && !empty($_POST['notify_boards']))
 	{
 		$prefs = array();
-		foreach ($_POST['notify_boards'] as $board)
-			$prefs[] = 'board_notify_' . $board;
+		foreach ($_POST['notify_boards'] as $board) {
+					$prefs[] = 'board_notify_' . $board;
+		}
 		deleteNotifyPrefs($memID, $prefs);
 	}
 }
@@ -1150,8 +1211,9 @@ 
 
 	$errors = array();
 
-	if ($sanitize && isset($_POST['customfield']))
-		$_POST['customfield'] = htmlspecialchars__recursive($_POST['customfield']);
+	if ($sanitize && isset($_POST['customfield'])) {
+			$_POST['customfield'] = htmlspecialchars__recursive($_POST['customfield']);
+	}
 
 	$where = $area == 'register' ? 'show_reg != 0' : 'show_profile = {string:area}';
 
@@ -1176,48 +1238,49 @@ 
 			- The data is not invisible to users but editable by the owner (or if it is the user is not the owner)
 			- The area isn't registration, and if it is that the field is not supposed to be shown there.
 		*/
-		if ($row['private'] != 0 && !allowedTo('admin_forum') && ($memID != $user_info['id'] || $row['private'] != 2) && ($area != 'register' || $row['show_reg'] == 0))
-			continue;
+		if ($row['private'] != 0 && !allowedTo('admin_forum') && ($memID != $user_info['id'] || $row['private'] != 2) && ($area != 'register' || $row['show_reg'] == 0)) {
+					continue;
+		}
 
 		// Validate the user data.
-		if ($row['field_type'] == 'check')
-			$value = isset($_POST['customfield'][$row['col_name']]) ? 1 : 0;
-		elseif ($row['field_type'] == 'select' || $row['field_type'] == 'radio')
+		if ($row['field_type'] == 'check') {
+					$value = isset($_POST['customfield'][$row['col_name']]) ? 1 : 0;
+		} elseif ($row['field_type'] == 'select' || $row['field_type'] == 'radio')
 		{
 			$value = $row['default_value'];
-			foreach (explode(',', $row['field_options']) as $k => $v)
-				if (isset($_POST['customfield'][$row['col_name']]) && $_POST['customfield'][$row['col_name']] == $k)
+			foreach (explode(',', $row['field_options']) as $k => $v) {
+							if (isset($_POST['customfield'][$row['col_name']]) && $_POST['customfield'][$row['col_name']] == $k)
 					$value = $v;
+			}
 		}
 		// Otherwise some form of text!
 		else
 		{
 			$value = isset($_POST['customfield'][$row['col_name']]) ? $_POST['customfield'][$row['col_name']] : '';
-			if ($row['field_length'])
-				$value = $smcFunc['substr']($value, 0, $row['field_length']);
+			if ($row['field_length']) {
+							$value = $smcFunc['substr']($value, 0, $row['field_length']);
+			}
 
 			// Any masks?
 			if ($row['field_type'] == 'text' && !empty($row['mask']) && $row['mask'] != 'none')
 			{
 				if ($row['mask'] == 'email' && (!filter_var($value, FILTER_VALIDATE_EMAIL) || strlen($value) > 255))
 				{
-					if ($returnErrors)
-						$errors[] = 'custom_field_mail_fail';
-
-					else
-						$value = '';
-				}
-				elseif ($row['mask'] == 'number')
+					if ($returnErrors) {
+											$errors[] = 'custom_field_mail_fail';
+					} else {
+											$value = '';
+					}
+				} elseif ($row['mask'] == 'number')
 				{
 					$value = (int) $value;
-				}
-				elseif (substr($row['mask'], 0, 5) == 'regex' && trim($value) != '' && preg_match(substr($row['mask'], 5), $value) === 0)
+				} elseif (substr($row['mask'], 0, 5) == 'regex' && trim($value) != '' && preg_match(substr($row['mask'], 5), $value) === 0)
 				{
-					if ($returnErrors)
-						$errors[] = 'custom_field_regex_fail';
-
-					else
-						$value = '';
+					if ($returnErrors) {
+											$errors[] = 'custom_field_regex_fail';
+					} else {
+											$value = '';
+					}
 				}
 			}
 		}
@@ -1243,8 +1306,9 @@ 
 
 	$hook_errors = call_integration_hook('integrate_save_custom_profile_fields', array(&$changes, &$log_changes, &$errors, $returnErrors, $memID, $area, $sanitize));
 
-	if (!empty($hook_errors) && is_array($hook_errors))
-		$errors = array_merge($errors, $hook_errors);
+	if (!empty($hook_errors) && is_array($hook_errors)) {
+			$errors = array_merge($errors, $hook_errors);
+	}
 
 	// Make those changes!
 	if (!empty($changes) && empty($context['password_auth_failed']) && empty($errors))
@@ -1262,9 +1326,10 @@ 
 		}
 	}
 
-	if ($returnErrors)
-		return $errors;
-}
+	if ($returnErrors) {
+			return $errors;
+	}
+	}
 
 /**
  * Show all the users buddies, as well as a add/delete interface.
@@ -1276,8 +1341,9 @@ 
 	global $context, $txt, $modSettings;
 
 	// Do a quick check to ensure people aren't getting here illegally!
-	if (!$context['user']['is_owner'] || empty($modSettings['enable_buddylist']))
-		fatal_lang_error('no_access', false);
+	if (!$context['user']['is_owner'] || empty($modSettings['enable_buddylist'])) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Can we email the user direct?
 	$context['can_moderate_forum'] = allowedTo('moderate_forum');
@@ -1307,9 +1373,10 @@ 
 	$context['sub_template'] = $subActions[$context['list_area']][0];
 	$call = call_helper($subActions[$context['list_area']][0], true);
 
-	if (!empty($call))
-		call_user_func($call, $memID);
-}
+	if (!empty($call)) {
+			call_user_func($call, $memID);
+	}
+	}
 
 /**
  * Show all the users buddies, as well as a add/delete interface.
@@ -1323,9 +1390,10 @@ 
 
 	// For making changes!
 	$buddiesArray = explode(',', $user_profile[$memID]['buddy_list']);
-	foreach ($buddiesArray as $k => $dummy)
-		if ($dummy == '')
+	foreach ($buddiesArray as $k => $dummy) {
+			if ($dummy == '')
 			unset($buddiesArray[$k]);
+	}
 
 	// Removing a buddy?
 	if (isset($_GET['remove']))
@@ -1337,10 +1405,11 @@ 
 		$_SESSION['prf-save'] = $txt['could_not_remove_person'];
 
 		// Heh, I'm lazy, do it the easy way...
-		foreach ($buddiesArray as $key => $buddy)
-			if ($buddy == (int) $_GET['remove'])
+		foreach ($buddiesArray as $key => $buddy) {
+					if ($buddy == (int) $_GET['remove'])
 			{
 				unset($buddiesArray[$key]);
+		}
 				$_SESSION['prf-save'] = true;
 			}
 
@@ -1350,8 +1419,7 @@ 
 
 		// Redirect off the page because we don't like all this ugly query stuff to stick in the history.
 		redirectexit('action=profile;area=lists;sa=buddies;u=' . $memID);
-	}
-	elseif (isset($_POST['new_buddy']))
+	} elseif (isset($_POST['new_buddy']))
 	{
 		checkSession();
 
@@ -1364,8 +1432,9 @@ 
 		{
 			$new_buddies[$k] = strtr(trim($new_buddies[$k]), array('\'' => '&#039;'));
 
-			if (strlen($new_buddies[$k]) == 0 || in_array($new_buddies[$k], array($user_profile[$memID]['member_name'], $user_profile[$memID]['real_name'])))
-				unset($new_buddies[$k]);
+			if (strlen($new_buddies[$k]) == 0 || in_array($new_buddies[$k], array($user_profile[$memID]['member_name'], $user_profile[$memID]['real_name']))) {
+							unset($new_buddies[$k]);
+			}
 		}
 
 		call_integration_hook('integrate_add_buddies', array($memID, &$new_buddies));
@@ -1385,16 +1454,18 @@ 
 				)
 			);
 
-			if ($smcFunc['db_num_rows']($request) != 0)
-				$_SESSION['prf-save'] = true;
+			if ($smcFunc['db_num_rows']($request) != 0) {
+							$_SESSION['prf-save'] = true;
+			}
 
 			// Add the new member to the buddies array.
 			while ($row = $smcFunc['db_fetch_assoc']($request))
 			{
-				if (in_array($row['id_member'], $buddiesArray))
-					continue;
-				else
-					$buddiesArray[] = (int) $row['id_member'];
+				if (in_array($row['id_member'], $buddiesArray)) {
+									continue;
+				} else {
+									$buddiesArray[] = (int) $row['id_member'];
+				}
 			}
 			$smcFunc['db_free_result']($request);
 
@@ -1424,18 +1495,20 @@ 
 
 	$context['custom_pf'] = array();
 	$disabled_fields = isset($modSettings['disabled_profile_fields']) ? array_flip(explode(',', $modSettings['disabled_profile_fields'])) : array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		if (!isset($disabled_fields[$row['col_name']]))
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			if (!isset($disabled_fields[$row['col_name']]))
 			$context['custom_pf'][$row['col_name']] = array(
 				'label' => $row['field_name'],
 				'type' => $row['field_type'],
 				'bbc' => !empty($row['bbc']),
 				'enclose' => $row['enclose'],
 			);
+	}
 
 	// Gotta disable the gender option.
-	if (isset($context['custom_pf']['cust_gender']) && $context['custom_pf']['cust_gender'] == 'Disabled')
-		unset($context['custom_pf']['cust_gender']);
+	if (isset($context['custom_pf']['cust_gender']) && $context['custom_pf']['cust_gender'] == 'Disabled') {
+			unset($context['custom_pf']['cust_gender']);
+	}
 
 	$smcFunc['db_free_result']($request);
 
@@ -1452,8 +1525,9 @@ 
 				'buddy_list_count' => substr_count($user_profile[$memID]['buddy_list'], ',') + 1,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($result))
-			$buddies[] = $row['id_member'];
+		while ($row = $smcFunc['db_fetch_assoc']($result)) {
+					$buddies[] = $row['id_member'];
+		}
 		$smcFunc['db_free_result']($result);
 	}
 
@@ -1481,30 +1555,32 @@ 
 					continue;
 				}
 
-				if ($column['bbc'] && !empty($context['buddies'][$buddy]['options'][$key]))
-					$context['buddies'][$buddy]['options'][$key] = strip_tags(parse_bbc($context['buddies'][$buddy]['options'][$key]));
-
-				elseif ($column['type'] == 'check')
-					$context['buddies'][$buddy]['options'][$key] = $context['buddies'][$buddy]['options'][$key] == 0 ? $txt['no'] : $txt['yes'];
+				if ($column['bbc'] && !empty($context['buddies'][$buddy]['options'][$key])) {
+									$context['buddies'][$buddy]['options'][$key] = strip_tags(parse_bbc($context['buddies'][$buddy]['options'][$key]));
+				} elseif ($column['type'] == 'check') {
+									$context['buddies'][$buddy]['options'][$key] = $context['buddies'][$buddy]['options'][$key] == 0 ? $txt['no'] : $txt['yes'];
+				}
 
 				// Enclosing the user input within some other text?
-				if (!empty($column['enclose']) && !empty($context['buddies'][$buddy]['options'][$key]))
-					$context['buddies'][$buddy]['options'][$key] = strtr($column['enclose'], array(
+				if (!empty($column['enclose']) && !empty($context['buddies'][$buddy]['options'][$key])) {
+									$context['buddies'][$buddy]['options'][$key] = strtr($column['enclose'], array(
 						'{SCRIPTURL}' => $scripturl,
 						'{IMAGES_URL}' => $settings['images_url'],
 						'{DEFAULT_IMAGES_URL}' => $settings['default_images_url'],
 						'{INPUT}' => $context['buddies'][$buddy]['options'][$key],
 					));
+				}
 			}
 		}
 	}
 
 	if (isset($_SESSION['prf-save']))
 	{
-		if ($_SESSION['prf-save'] === true)
-			$context['saved_successful'] = true;
-		else
-			$context['saved_failed'] = $_SESSION['prf-save'];
+		if ($_SESSION['prf-save'] === true) {
+					$context['saved_successful'] = true;
+		} else {
+					$context['saved_failed'] = $_SESSION['prf-save'];
+		}
 
 		unset($_SESSION['prf-save']);
 	}
@@ -1524,9 +1600,10 @@ 
 
 	// For making changes!
 	$ignoreArray = explode(',', $user_profile[$memID]['pm_ignore_list']);
-	foreach ($ignoreArray as $k => $dummy)
-		if ($dummy == '')
+	foreach ($ignoreArray as $k => $dummy) {
+			if ($dummy == '')
 			unset($ignoreArray[$k]);
+	}
 
 	// Removing a member from the ignore list?
 	if (isset($_GET['remove']))
@@ -1536,10 +1613,11 @@ 
 		$_SESSION['prf-save'] = $txt['could_not_remove_person'];
 
 		// Heh, I'm lazy, do it the easy way...
-		foreach ($ignoreArray as $key => $id_remove)
-			if ($id_remove == (int) $_GET['remove'])
+		foreach ($ignoreArray as $key => $id_remove) {
+					if ($id_remove == (int) $_GET['remove'])
 			{
 				unset($ignoreArray[$key]);
+		}
 				$_SESSION['prf-save'] = true;
 			}
 
@@ -1549,8 +1627,7 @@ 
 
 		// Redirect off the page because we don't like all this ugly query stuff to stick in the history.
 		redirectexit('action=profile;area=lists;sa=ignore;u=' . $memID);
-	}
-	elseif (isset($_POST['new_ignore']))
+	} elseif (isset($_POST['new_ignore']))
 	{
 		checkSession();
 		// Prepare the string for extraction...
@@ -1562,8 +1639,9 @@ 
 		{
 			$new_entries[$k] = strtr(trim($new_entries[$k]), array('\'' => '&#039;'));
 
-			if (strlen($new_entries[$k]) == 0 || in_array($new_entries[$k], array($user_profile[$memID]['member_name'], $user_profile[$memID]['real_name'])))
-				unset($new_entries[$k]);
+			if (strlen($new_entries[$k]) == 0 || in_array($new_entries[$k], array($user_profile[$memID]['member_name'], $user_profile[$memID]['real_name']))) {
+							unset($new_entries[$k]);
+			}
 		}
 
 		$_SESSION['prf-save'] = $txt['could_not_add_person'];
@@ -1581,16 +1659,18 @@ 
 				)
 			);
 
-			if ($smcFunc['db_num_rows']($request) != 0)
-				$_SESSION['prf-save'] = true;
+			if ($smcFunc['db_num_rows']($request) != 0) {
+							$_SESSION['prf-save'] = true;
+			}
 
 			// Add the new member to the buddies array.
 			while ($row = $smcFunc['db_fetch_assoc']($request))
 			{
-				if (in_array($row['id_member'], $ignoreArray))
-					continue;
-				else
-					$ignoreArray[] = (int) $row['id_member'];
+				if (in_array($row['id_member'], $ignoreArray)) {
+									continue;
+				} else {
+									$ignoreArray[] = (int) $row['id_member'];
+				}
 			}
 			$smcFunc['db_free_result']($request);
 
@@ -1619,8 +1699,9 @@ 
 				'ignore_list_count' => substr_count($user_profile[$memID]['pm_ignore_list'], ',') + 1,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($result))
-			$ignored[] = $row['id_member'];
+		while ($row = $smcFunc['db_fetch_assoc']($result)) {
+					$ignored[] = $row['id_member'];
+		}
 		$smcFunc['db_free_result']($result);
 	}
 
@@ -1639,10 +1720,11 @@ 
 
 	if (isset($_SESSION['prf-save']))
 	{
-		if ($_SESSION['prf-save'] === true)
-			$context['saved_successful'] = true;
-		else
-			$context['saved_failed'] = $_SESSION['prf-save'];
+		if ($_SESSION['prf-save'] === true) {
+					$context['saved_successful'] = true;
+		} else {
+					$context['saved_failed'] = $_SESSION['prf-save'];
+		}
 
 		unset($_SESSION['prf-save']);
 	}
@@ -1658,8 +1740,9 @@ 
 	global $context, $txt;
 
 	loadThemeOptions($memID);
-	if (allowedTo(array('profile_identity_own', 'profile_identity_any', 'profile_password_own', 'profile_password_any')))
-		loadCustomFields($memID, 'account');
+	if (allowedTo(array('profile_identity_own', 'profile_identity_any', 'profile_password_own', 'profile_password_any'))) {
+			loadCustomFields($memID, 'account');
+	}
 
 	$context['sub_template'] = 'edit_options';
 	$context['page_desc'] = $txt['account_info'];
@@ -1686,8 +1769,9 @@ 
 	global $context, $txt;
 
 	loadThemeOptions($memID);
-	if (allowedTo(array('profile_forum_own', 'profile_forum_any')))
-		loadCustomFields($memID, 'forumprofile');
+	if (allowedTo(array('profile_forum_own', 'profile_forum_any'))) {
+			loadCustomFields($memID, 'forumprofile');
+	}
 
 	$context['sub_template'] = 'edit_options';
 	$context['page_desc'] = $txt['forumProfile_info'];
@@ -1720,18 +1804,21 @@ 
 	$dirs = array();
 	$files = array();
 
-	if (!$dir)
-		return array();
+	if (!$dir) {
+			return array();
+	}
 
 	while ($line = $dir->read())
 	{
-		if (in_array($line, array('.', '..', 'blank.png', 'index.php')))
-			continue;
+		if (in_array($line, array('.', '..', 'blank.png', 'index.php'))) {
+					continue;
+		}
 
-		if (is_dir($modSettings['avatar_directory'] . '/' . $directory . (!empty($directory) ? '/' : '') . $line))
-			$dirs[] = $line;
-		else
-			$files[] = $line;
+		if (is_dir($modSettings['avatar_directory'] . '/' . $directory . (!empty($directory) ? '/' : '') . $line)) {
+					$dirs[] = $line;
+		} else {
+					$files[] = $line;
+		}
 	}
 	$dir->close();
 
@@ -1752,14 +1839,15 @@ 
 	foreach ($dirs as $line)
 	{
 		$tmp = getAvatars($directory . (!empty($directory) ? '/' : '') . $line, $level + 1);
-		if (!empty($tmp))
-			$result[] = array(
+		if (!empty($tmp)) {
+					$result[] = array(
 				'filename' => $smcFunc['htmlspecialchars']($line),
 				'checked' => strpos($context['member']['avatar']['server_pic'], $line . '/') !== false,
 				'name' => '[' . $smcFunc['htmlspecialchars'](str_replace('_', ' ', $line)) . ']',
 				'is_dir' => true,
 				'files' => $tmp
 		);
+		}
 		unset($tmp);
 	}
 
@@ -1769,8 +1857,9 @@ 
 		$extension = substr(strrchr($line, '.'), 1);
 
 		// Make sure it is an image.
-		if (strcasecmp($extension, 'gif') != 0 && strcasecmp($extension, 'jpg') != 0 && strcasecmp($extension, 'jpeg') != 0 && strcasecmp($extension, 'png') != 0 && strcasecmp($extension, 'bmp') != 0)
-			continue;
+		if (strcasecmp($extension, 'gif') != 0 && strcasecmp($extension, 'jpg') != 0 && strcasecmp($extension, 'jpeg') != 0 && strcasecmp($extension, 'png') != 0 && strcasecmp($extension, 'bmp') != 0) {
+					continue;
+		}
 
 		$result[] = array(
 			'filename' => $smcFunc['htmlspecialchars']($line),
@@ -1778,8 +1867,9 @@ 
 			'name' => $smcFunc['htmlspecialchars'](str_replace('_', ' ', $filename)),
 			'is_dir' => false
 		);
-		if ($level == 1)
-			$context['avatar_list'][] = $directory . '/' . $line;
+		if ($level == 1) {
+					$context['avatar_list'][] = $directory . '/' . $line;
+		}
 	}
 
 	return $result;
@@ -1798,8 +1888,9 @@ 
 	loadSubTemplate('options');
 
 	loadThemeOptions($memID);
-	if (allowedTo(array('profile_extra_own', 'profile_extra_any')))
-		loadCustomFields($memID, 'theme');
+	if (allowedTo(array('profile_extra_own', 'profile_extra_any'))) {
+			loadCustomFields($memID, 'theme');
+	}
 
 	$context['sub_template'] = 'edit_options';
 	$context['page_desc'] = $txt['theme_info'];
@@ -1853,16 +1944,19 @@ 
 {
 	global $txt, $user_profile, $context, $modSettings, $smcFunc, $sourcedir;
 
-	if (!isset($context['token_check']))
-		$context['token_check'] = 'profile-nt' . $memID;
+	if (!isset($context['token_check'])) {
+			$context['token_check'] = 'profile-nt' . $memID;
+	}
 
 	is_not_guest();
-	if (!$context['user']['is_owner'])
-		isAllowedTo('profile_extra_any');
+	if (!$context['user']['is_owner']) {
+			isAllowedTo('profile_extra_any');
+	}
 
 	// Set the post action if we're coming from the profile...
-	if (!isset($context['action']))
-		$context['action'] = 'action=profile;area=notification;sa=alerts;u=' . $memID;
+	if (!isset($context['action'])) {
+			$context['action'] = 'action=profile;area=notification;sa=alerts;u=' . $memID;
+	}
 
 	// What options are set
 	loadThemeOptions($memID);
@@ -1949,28 +2043,34 @@ 
 	);
 
 	// There are certain things that are disabled at the group level.
-	if (empty($modSettings['cal_enabled']))
-		unset($alert_types['calendar']);
+	if (empty($modSettings['cal_enabled'])) {
+			unset($alert_types['calendar']);
+	}
 
 	// Disable paid subscriptions at group level if they're disabled
-	if (empty($modSettings['paid_enabled']))
-		unset($alert_types['paidsubs']);
+	if (empty($modSettings['paid_enabled'])) {
+			unset($alert_types['paidsubs']);
+	}
 
 	// Disable membergroup requests at group level if they're disabled
-	if (empty($modSettings['show_group_membership']))
-		unset($alert_types['groupr'], $alert_types['members']['request_group']);
+	if (empty($modSettings['show_group_membership'])) {
+			unset($alert_types['groupr'], $alert_types['members']['request_group']);
+	}
 
 	// Disable mentions if they're disabled
-	if (empty($modSettings['enable_mentions']))
-		unset($alert_types['msg']['msg_mention']);
+	if (empty($modSettings['enable_mentions'])) {
+			unset($alert_types['msg']['msg_mention']);
+	}
 
 	// Disable likes if they're disabled
-	if (empty($modSettings['enable_likes']))
-		unset($alert_types['msg']['msg_like']);
+	if (empty($modSettings['enable_likes'])) {
+			unset($alert_types['msg']['msg_like']);
+	}
 
 	// Disable buddy requests if they're disabled
-	if (empty($modSettings['enable_buddylist']))
-		unset($alert_types['members']['buddy_request']);
+	if (empty($modSettings['enable_buddylist'])) {
+			unset($alert_types['members']['buddy_request']);
+	}
 
 	// Now, now, we could pass this through global but we should really get into the habit of
 	// passing content to hooks, not expecting hooks to splatter everything everywhere.
@@ -1998,15 +2098,17 @@ 
 			$perms_cache['manage_membergroups'] = in_array($memID, $members);
 		}
 
-		if (!($perms_cache['manage_membergroups'] || $can_mod != 0))
-			unset($alert_types['members']['request_group']);
+		if (!($perms_cache['manage_membergroups'] || $can_mod != 0)) {
+					unset($alert_types['members']['request_group']);
+		}
 
 		foreach ($alert_types as $group => $items)
 		{
 			foreach ($items as $alert_key => $alert_value)
 			{
-				if (!isset($alert_value['permission']))
-					continue;
+				if (!isset($alert_value['permission'])) {
+									continue;
+				}
 				if (!isset($perms_cache[$alert_value['permission']['name']]))
 				{
 					$in_board = !empty($alert_value['permission']['is_board']) ? 0 : null;
@@ -2014,12 +2116,14 @@ 
 					$perms_cache[$alert_value['permission']['name']] = in_array($memID, $members);
 				}
 
-				if (!$perms_cache[$alert_value['permission']['name']])
-					unset ($alert_types[$group][$alert_key]);
+				if (!$perms_cache[$alert_value['permission']['name']]) {
+									unset ($alert_types[$group][$alert_key]);
+				}
 			}
 
-			if (empty($alert_types[$group]))
-				unset ($alert_types[$group]);
+			if (empty($alert_types[$group])) {
+							unset ($alert_types[$group]);
+			}
 		}
 	}
 
@@ -2051,9 +2155,9 @@ 
 						$update_prefs[$this_option[1]] = !empty($_POST['opt_' . $this_option[1]]) ? 1 : 0;
 						break;
 					case 'select':
-						if (isset($_POST['opt_' . $this_option[1]], $this_option['opts'][$_POST['opt_' . $this_option[1]]]))
-							$update_prefs[$this_option[1]] = $_POST['opt_' . $this_option[1]];
-						else
+						if (isset($_POST['opt_' . $this_option[1]], $this_option['opts'][$_POST['opt_' . $this_option[1]]])) {
+													$update_prefs[$this_option[1]] = $_POST['opt_' . $this_option[1]];
+						} else
 						{
 							// We didn't have a sane value. Let's grab the first item from the possibles.
 							$keys = array_keys($this_option['opts']);
@@ -2073,23 +2177,28 @@ 
 				$this_value = 0;
 				foreach ($context['alert_bits'] as $type => $bitvalue)
 				{
-					if ($this_options[$type] == 'yes' && !empty($_POST[$type . '_' . $item_key]) || $this_options[$type] == 'always')
-						$this_value |= $bitvalue;
+					if ($this_options[$type] == 'yes' && !empty($_POST[$type . '_' . $item_key]) || $this_options[$type] == 'always') {
+											$this_value |= $bitvalue;
+					}
+				}
+				if (!isset($context['alert_prefs'][$item_key]) || $context['alert_prefs'][$item_key] != $this_value) {
+									$update_prefs[$item_key] = $this_value;
 				}
-				if (!isset($context['alert_prefs'][$item_key]) || $context['alert_prefs'][$item_key] != $this_value)
-					$update_prefs[$item_key] = $this_value;
 			}
 		}
 
-		if (!empty($_POST['opt_alert_timeout']))
-			$update_prefs['alert_timeout'] = $context['member']['alert_timeout'] = (int) $_POST['opt_alert_timeout'];
+		if (!empty($_POST['opt_alert_timeout'])) {
+					$update_prefs['alert_timeout'] = $context['member']['alert_timeout'] = (int) $_POST['opt_alert_timeout'];
+		}
 
-		if (!empty($_POST['notify_announcements']))
-			$update_prefs['announcements'] = $context['member']['notify_announcements'] = (int) $_POST['notify_announcements'];
+		if (!empty($_POST['notify_announcements'])) {
+					$update_prefs['announcements'] = $context['member']['notify_announcements'] = (int) $_POST['notify_announcements'];
+		}
 
 		setNotifyPrefs((int) $memID, $update_prefs);
-		foreach ($update_prefs as $pref => $value)
-			$context['alert_prefs'][$pref] = $value;
+		foreach ($update_prefs as $pref => $value) {
+					$context['alert_prefs'][$pref] = $value;
+		}
 
 		makeNotificationChanges($memID);
 
@@ -2119,8 +2228,9 @@ 
 
 	// Now we're all set up.
 	is_not_guest();
-	if (!$context['user']['is_owner'])
-		fatal_error('no_access');
+	if (!$context['user']['is_owner']) {
+			fatal_error('no_access');
+	}
 
 	checkSession('get');
 
@@ -2152,8 +2262,9 @@ 
 {
 	global $smcFunc;
 
-	if (empty($toMark) || empty($memID))
-		return false;
+	if (empty($toMark) || empty($memID)) {
+			return false;
+	}
 
 	$toMark = (array) $toMark;
 
@@ -2187,8 +2298,9 @@ 
 {
 	global $smcFunc;
 
-	if (empty($toDelete))
-		return false;
+	if (empty($toDelete)) {
+			return false;
+	}
 
 	$toDelete = (array) $toDelete;
 
@@ -2223,8 +2335,9 @@ 
 {
 	global $smcFunc;
 
-	if (empty($memID))
-		return false;
+	if (empty($memID)) {
+			return false;
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT id_alert
@@ -2301,8 +2414,9 @@ 
 					{
 						$link = $topic['link'];
 
-						if ($topic['new'])
-							$link .= ' <a href="' . $topic['new_href'] . '"><span class="new_posts">' . $txt['new'] . '</span></a>';
+						if ($topic['new']) {
+													$link .= ' <a href="' . $topic['new_href'] . '"><span class="new_posts">' . $txt['new'] . '</span></a>';
+						}
 
 						$link .= '<br><span class="smalltext"><em>' . $txt['in'] . ' ' . $topic['board_link'] . '</em></span>';
 
@@ -2453,8 +2567,9 @@ 
 					{
 						$link = $board['link'];
 
-						if ($board['new'])
-							$link .= ' <a href="' . $board['href'] . '"><span class="new_posts">' . $txt['new'] . '</span></a>';
+						if ($board['new']) {
+													$link .= ' <a href="' . $board['href'] . '"><span class="new_posts">' . $txt['new'] . '</span></a>';
+						}
 
 						return $link;
 					},
@@ -2654,8 +2769,8 @@ 
 		)
 	);
 	$notification_boards = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$notification_boards[] = array(
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$notification_boards[] = array(
 			'id' => $row['id_board'],
 			'name' => $row['name'],
 			'href' => $scripturl . '?board=' . $row['id_board'] . '.0',
@@ -2663,6 +2778,7 @@ 
 			'new' => $row['board_read'] < $row['id_msg_updated'],
 			'notify_pref' => isset($prefs['board_notify_' . $row['id_board']]) ? $prefs['board_notify_' . $row['id_board']] : (!empty($prefs['board_notify']) ? $prefs['board_notify'] : 0),
 		);
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $notification_boards;
@@ -2677,17 +2793,18 @@ 
 {
 	global $context, $options, $cur_profile, $smcFunc;
 
-	if (isset($_POST['default_options']))
-		$_POST['options'] = isset($_POST['options']) ? $_POST['options'] + $_POST['default_options'] : $_POST['default_options'];
+	if (isset($_POST['default_options'])) {
+			$_POST['options'] = isset($_POST['options']) ? $_POST['options'] + $_POST['default_options'] : $_POST['default_options'];
+	}
 
 	if ($context['user']['is_owner'])
 	{
 		$context['member']['options'] = $options;
-		if (isset($_POST['options']) && is_array($_POST['options']))
-			foreach ($_POST['options'] as $k => $v)
+		if (isset($_POST['options']) && is_array($_POST['options'])) {
+					foreach ($_POST['options'] as $k => $v)
 				$context['member']['options'][$k] = $v;
-	}
-	else
+		}
+	} else
 	{
 		$request = $smcFunc['db_query']('', '
 			SELECT id_member, variable, value
@@ -2708,8 +2825,9 @@ 
 				continue;
 			}
 
-			if (isset($_POST['options'][$row['variable']]))
-				$row['value'] = $_POST['options'][$row['variable']];
+			if (isset($_POST['options'][$row['variable']])) {
+							$row['value'] = $_POST['options'][$row['variable']];
+			}
 			$context['member']['options'][$row['variable']] = $row['value'];
 		}
 		$smcFunc['db_free_result']($request);
@@ -2717,8 +2835,9 @@ 
 		// Load up the default theme options for any missing.
 		foreach ($temp as $k => $v)
 		{
-			if (!isset($context['member']['options'][$k]))
-				$context['member']['options'][$k] = $v;
+			if (!isset($context['member']['options'][$k])) {
+							$context['member']['options'][$k] = $v;
+			}
 		}
 	}
 }
@@ -2733,8 +2852,9 @@ 
 	global $context, $modSettings, $smcFunc, $cur_profile, $sourcedir;
 
 	// Have the admins enabled this option?
-	if (empty($modSettings['allow_ignore_boards']))
-		fatal_lang_error('ignoreboards_disallowed', 'user');
+	if (empty($modSettings['allow_ignore_boards'])) {
+			fatal_lang_error('ignoreboards_disallowed', 'user');
+	}
 
 	// Find all the boards this user is allowed to see.
 	$request = $smcFunc['db_query']('order_by_board_order', '
@@ -2754,12 +2874,13 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// This category hasn't been set up yet..
-		if (!isset($context['categories'][$row['id_cat']]))
-			$context['categories'][$row['id_cat']] = array(
+		if (!isset($context['categories'][$row['id_cat']])) {
+					$context['categories'][$row['id_cat']] = array(
 				'id' => $row['id_cat'],
 				'name' => $row['cat_name'],
 				'boards' => array()
 			);
+		}
 
 		// Set this board up, and let the template know when it's a child.  (indent them..)
 		$context['categories'][$row['id_cat']]['boards'][$row['id_board']] = array(
@@ -2789,18 +2910,20 @@ 
 	}
 
 	$max_boards = ceil(count($temp_boards) / 2);
-	if ($max_boards == 1)
-		$max_boards = 2;
+	if ($max_boards == 1) {
+			$max_boards = 2;
+	}
 
 	// Now, alternate them so they can be shown left and right ;).
 	$context['board_columns'] = array();
 	for ($i = 0; $i < $max_boards; $i++)
 	{
 		$context['board_columns'][] = $temp_boards[$i];
-		if (isset($temp_boards[$i + $max_boards]))
-			$context['board_columns'][] = $temp_boards[$i + $max_boards];
-		else
-			$context['board_columns'][] = array();
+		if (isset($temp_boards[$i + $max_boards])) {
+					$context['board_columns'][] = $temp_boards[$i + $max_boards];
+		} else {
+					$context['board_columns'][] = array();
+		}
 	}
 
 	loadThemeOptions($memID);
@@ -2869,8 +2992,9 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// We should skip the administrator group if they don't have the admin_forum permission!
-		if ($row['id_group'] == 1 && !allowedTo('admin_forum'))
-			continue;
+		if ($row['id_group'] == 1 && !allowedTo('admin_forum')) {
+					continue;
+		}
 
 		$context['member_groups'][$row['id_group']] = array(
 			'id' => $row['id_group'],
@@ -2916,16 +3040,17 @@ 
 	$context['max_signature_length'] = $context['signature_limits']['max_length'];
 	// Warning message for signature image limits?
 	$context['signature_warning'] = '';
-	if ($context['signature_limits']['max_image_width'] && $context['signature_limits']['max_image_height'])
-		$context['signature_warning'] = sprintf($txt['profile_error_signature_max_image_size'], $context['signature_limits']['max_image_width'], $context['signature_limits']['max_image_height']);
-	elseif ($context['signature_limits']['max_image_width'] || $context['signature_limits']['max_image_height'])
-		$context['signature_warning'] = sprintf($txt['profile_error_signature_max_image_' . ($context['signature_limits']['max_image_width'] ? 'width' : 'height')], $context['signature_limits'][$context['signature_limits']['max_image_width'] ? 'max_image_width' : 'max_image_height']);
+	if ($context['signature_limits']['max_image_width'] && $context['signature_limits']['max_image_height']) {
+			$context['signature_warning'] = sprintf($txt['profile_error_signature_max_image_size'], $context['signature_limits']['max_image_width'], $context['signature_limits']['max_image_height']);
+	} elseif ($context['signature_limits']['max_image_width'] || $context['signature_limits']['max_image_height']) {
+			$context['signature_warning'] = sprintf($txt['profile_error_signature_max_image_' . ($context['signature_limits']['max_image_width'] ? 'width' : 'height')], $context['signature_limits'][$context['signature_limits']['max_image_width'] ? 'max_image_width' : 'max_image_height']);
+	}
 
 	$context['show_spellchecking'] = !empty($modSettings['enableSpellChecking']) && (function_exists('pspell_new') || (function_exists('enchant_broker_init') && ($txt['lang_charset'] == 'UTF-8' || function_exists('iconv'))));
 
-	if (empty($context['do_preview']))
-		$context['member']['signature'] = empty($cur_profile['signature']) ? '' : str_replace(array('<br>', '<', '>', '"', '\''), array("\n", '&lt;', '&gt;', '&quot;', '&#039;'), $cur_profile['signature']);
-	else
+	if (empty($context['do_preview'])) {
+			$context['member']['signature'] = empty($cur_profile['signature']) ? '' : str_replace(array('<br>', '<', '>', '"', '\''), array("\n", '&lt;', '&gt;', '&quot;', '&#039;'), $cur_profile['signature']);
+	} else
 	{
 		$signature = !empty($_POST['signature']) ? $_POST['signature'] : '';
 		$validation = profileValidateSignature($signature);
@@ -2935,8 +3060,9 @@ 
 			$context['post_errors'] = array();
 		}
 		$context['post_errors'][] = 'signature_not_yet_saved';
-		if ($validation !== true && $validation !== false)
-			$context['post_errors'][] = $validation;
+		if ($validation !== true && $validation !== false) {
+					$context['post_errors'][] = $validation;
+		}
 
 		censorText($context['member']['signature']);
 		$context['member']['current_signature'] = $context['member']['signature'];
@@ -2946,8 +3072,9 @@ 
 	}
 
 	// Load the spell checker?
-	if ($context['show_spellchecking'])
-		loadJavaScriptFile('spellcheck.js', array('defer' => false), 'smf_spellcheck');
+	if ($context['show_spellchecking']) {
+			loadJavaScriptFile('spellcheck.js', array('defer' => false), 'smf_spellcheck');
+	}
 
 	return true;
 }
@@ -2981,8 +3108,7 @@ 
 			'external' => $cur_profile['avatar'] == 'gravatar://' || empty($modSettings['gravatarAllowExtraEmail']) || !empty($modSettings['gravatarOverride']) ? $cur_profile['email_address'] : substr($cur_profile['avatar'], 11)
 		);
 		$context['member']['avatar']['href'] = get_gravatar_url($context['member']['avatar']['external']);
-	}
-	elseif ($cur_profile['avatar'] == '' && $cur_profile['id_attach'] > 0 && $context['member']['avatar']['allow_upload'])
+	} elseif ($cur_profile['avatar'] == '' && $cur_profile['id_attach'] > 0 && $context['member']['avatar']['allow_upload'])
 	{
 		$context['member']['avatar'] += array(
 			'choice' => 'upload',
@@ -2992,33 +3118,34 @@ 
 		$context['member']['avatar']['href'] = empty($cur_profile['attachment_type']) ? $scripturl . '?action=dlattach;attach=' . $cur_profile['id_attach'] . ';type=avatar' : $modSettings['custom_avatar_url'] . '/' . $cur_profile['filename'];
 	}
 	// Use "avatar_original" here so we show what the user entered even if the image proxy is enabled
-	elseif ((stristr($cur_profile['avatar'], 'http://') || stristr($cur_profile['avatar'], 'https://')) && $context['member']['avatar']['allow_external'])
-		$context['member']['avatar'] += array(
+	elseif ((stristr($cur_profile['avatar'], 'http://') || stristr($cur_profile['avatar'], 'https://')) && $context['member']['avatar']['allow_external']) {
+			$context['member']['avatar'] += array(
 			'choice' => 'external',
 			'server_pic' => 'blank.png',
 			'external' => $cur_profile['avatar_original']
 		);
-	elseif ($cur_profile['avatar'] != '' && file_exists($modSettings['avatar_directory'] . '/' . $cur_profile['avatar']) && $context['member']['avatar']['allow_server_stored'])
-		$context['member']['avatar'] += array(
+	} elseif ($cur_profile['avatar'] != '' && file_exists($modSettings['avatar_directory'] . '/' . $cur_profile['avatar']) && $context['member']['avatar']['allow_server_stored']) {
+			$context['member']['avatar'] += array(
 			'choice' => 'server_stored',
 			'server_pic' => $cur_profile['avatar'] == '' ? 'blank.png' : $cur_profile['avatar'],
 			'external' => 'http://'
 		);
-	else
-		$context['member']['avatar'] += array(
+	} else {
+			$context['member']['avatar'] += array(
 			'choice' => 'none',
 			'server_pic' => 'blank.png',
 			'external' => 'http://'
 		);
+	}
 
 	// Get a list of all the avatars.
 	if ($context['member']['avatar']['allow_server_stored'])
 	{
 		$context['avatar_list'] = array();
 		$context['avatars'] = is_dir($modSettings['avatar_directory']) ? getAvatars('', 0) : array();
+	} else {
+			$context['avatars'] = array();
 	}
-	else
-		$context['avatars'] = array();
 
 	// Second level selected avatar...
 	$context['avatar_selected'] = substr(strrchr($context['member']['avatar']['server_pic'], '/'), 1);
@@ -3047,19 +3174,22 @@ 
 			)
 		);
 		$protected_groups = array(1);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$protected_groups[] = $row['id_group'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$protected_groups[] = $row['id_group'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		$protected_groups = array_unique($protected_groups);
 	}
 
 	// The account page allows the change of your id_group - but not to a protected group!
-	if (empty($protected_groups) || count(array_intersect(array((int) $value, $old_profile['id_group']), $protected_groups)) == 0)
-		$value = (int) $value;
+	if (empty($protected_groups) || count(array_intersect(array((int) $value, $old_profile['id_group']), $protected_groups)) == 0) {
+			$value = (int) $value;
+	}
 	// ... otherwise it's the old group sir.
-	else
-		$value = $old_profile['id_group'];
+	else {
+			$value = $old_profile['id_group'];
+	}
 
 	// Find the additional membergroups (if any)
 	if (isset($_POST['additional_groups']) && is_array($_POST['additional_groups']))
@@ -3068,16 +3198,18 @@ 
 		foreach ($_POST['additional_groups'] as $group_id)
 		{
 			$group_id = (int) $group_id;
-			if (!empty($group_id) && (empty($protected_groups) || !in_array($group_id, $protected_groups)))
-				$additional_groups[] = $group_id;
+			if (!empty($group_id) && (empty($protected_groups) || !in_array($group_id, $protected_groups))) {
+							$additional_groups[] = $group_id;
+			}
 		}
 
 		// Put the protected groups back in there if you don't have permission to take them away.
 		$old_additional_groups = explode(',', $old_profile['additional_groups']);
 		foreach ($old_additional_groups as $group_id)
 		{
-			if (!empty($protected_groups) && in_array($group_id, $protected_groups))
-				$additional_groups[] = $group_id;
+			if (!empty($protected_groups) && in_array($group_id, $protected_groups)) {
+							$additional_groups[] = $group_id;
+			}
 		}
 
 		if (implode(',', $additional_groups) !== $old_profile['additional_groups'])
@@ -3109,18 +3241,20 @@ 
 			list ($another) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
 
-			if (empty($another))
-				fatal_lang_error('at_least_one_admin', 'critical');
+			if (empty($another)) {
+							fatal_lang_error('at_least_one_admin', 'critical');
+			}
 		}
 	}
 
 	// If we are changing group status, update permission cache as necessary.
 	if ($value != $old_profile['id_group'] || isset($profile_vars['additional_groups']))
 	{
-		if ($context['user']['is_owner'])
-			$_SESSION['mc']['time'] = 0;
-		else
-			updateSettings(array('settings_updated' => time()));
+		if ($context['user']['is_owner']) {
+					$_SESSION['mc']['time'] = 0;
+		} else {
+					updateSettings(array('settings_updated' => time()));
+		}
 	}
 
 	// Announce to any hooks that we have changed groups, but don't allow them to change it.
@@ -3141,8 +3275,9 @@ 
 	global $modSettings, $sourcedir, $smcFunc, $profile_vars, $cur_profile, $context;
 
 	$memID = $context['id_member'];
-	if (empty($memID) && !empty($context['password_auth_failed']))
-		return false;
+	if (empty($memID) && !empty($context['password_auth_failed'])) {
+			return false;
+	}
 
 	require_once($sourcedir . '/ManageAttachments.php');
 
@@ -3153,8 +3288,9 @@ 
 	$downloadedExternalAvatar = false;
 	if ($value == 'external' && allowedTo('profile_remote_avatar') && (stripos($_POST['userpicpersonal'], 'http://') === 0 || stripos($_POST['userpicpersonal'], 'https://') === 0) && strlen($_POST['userpicpersonal']) > 7 && !empty($modSettings['avatar_download_external']))
 	{
-		if (!is_writable($uploadDir))
-			fatal_lang_error('attachments_no_write', 'critical');
+		if (!is_writable($uploadDir)) {
+					fatal_lang_error('attachments_no_write', 'critical');
+		}
 
 		require_once($sourcedir . '/Subs-Package.php');
 
@@ -3198,19 +3334,18 @@ 
 
 		// Get rid of their old avatar. (if uploaded.)
 		removeAttachments(array('id_member' => $memID));
-	}
-	elseif ($value == 'gravatar' && !empty($modSettings['gravatarEnabled']))
+	} elseif ($value == 'gravatar' && !empty($modSettings['gravatarEnabled']))
 	{
 		// One wasn't specified, or it's not allowed to use extra email addresses, or it's not a valid one, reset to default Gravatar.
-		if (empty($_POST['gravatarEmail']) || empty($modSettings['gravatarAllowExtraEmail']) || !filter_var($_POST['gravatarEmail'], FILTER_VALIDATE_EMAIL))
-			$profile_vars['avatar'] = 'gravatar://';
-		else
-			$profile_vars['avatar'] = 'gravatar://' . ($_POST['gravatarEmail'] != $cur_profile['email_address'] ? $_POST['gravatarEmail'] : '');
+		if (empty($_POST['gravatarEmail']) || empty($modSettings['gravatarAllowExtraEmail']) || !filter_var($_POST['gravatarEmail'], FILTER_VALIDATE_EMAIL)) {
+					$profile_vars['avatar'] = 'gravatar://';
+		} else {
+					$profile_vars['avatar'] = 'gravatar://' . ($_POST['gravatarEmail'] != $cur_profile['email_address'] ? $_POST['gravatarEmail'] : '');
+		}
 
 		// Get rid of their old avatar. (if uploaded.)
 		removeAttachments(array('id_member' => $memID));
-	}
-	elseif ($value == 'external' && allowedTo('profile_remote_avatar') && (stripos($_POST['userpicpersonal'], 'http://') === 0 || stripos($_POST['userpicpersonal'], 'https://') === 0) && empty($modSettings['avatar_download_external']))
+	} elseif ($value == 'external' && allowedTo('profile_remote_avatar') && (stripos($_POST['userpicpersonal'], 'http://') === 0 || stripos($_POST['userpicpersonal'], 'https://') === 0) && empty($modSettings['avatar_download_external']))
 	{
 		// We need these clean...
 		$cur_profile['id_attach'] = 0;
@@ -3222,11 +3357,13 @@ 
 
 		$profile_vars['avatar'] = str_replace(' ', '%20', preg_replace('~action(?:=|%3d)(?!dlattach)~i', 'action-', $_POST['userpicpersonal']));
 
-		if ($profile_vars['avatar'] == 'http://' || $profile_vars['avatar'] == 'http:///')
-			$profile_vars['avatar'] = '';
+		if ($profile_vars['avatar'] == 'http://' || $profile_vars['avatar'] == 'http:///') {
+					$profile_vars['avatar'] = '';
+		}
 		// Trying to make us do something we'll regret?
-		elseif (substr($profile_vars['avatar'], 0, 7) != 'http://' && substr($profile_vars['avatar'], 0, 8) != 'https://')
-			return 'bad_avatar_invalid_url';
+		elseif (substr($profile_vars['avatar'], 0, 7) != 'http://' && substr($profile_vars['avatar'], 0, 8) != 'https://') {
+					return 'bad_avatar_invalid_url';
+		}
 		// Should we check dimensions?
 		elseif (!empty($modSettings['avatar_max_height_external']) || !empty($modSettings['avatar_max_width_external']))
 		{
@@ -3236,9 +3373,9 @@ 
 			if (is_array($sizes) && (($sizes[0] > $modSettings['avatar_max_width_external'] && !empty($modSettings['avatar_max_width_external'])) || ($sizes[1] > $modSettings['avatar_max_height_external'] && !empty($modSettings['avatar_max_height_external']))))
 			{
 				// Houston, we have a problem. The avatar is too large!!
-				if ($modSettings['avatar_action_too_large'] == 'option_refuse')
-					return 'bad_avatar_too_large';
-				elseif ($modSettings['avatar_action_too_large'] == 'option_download_and_resize')
+				if ($modSettings['avatar_action_too_large'] == 'option_refuse') {
+									return 'bad_avatar_too_large';
+				} elseif ($modSettings['avatar_action_too_large'] == 'option_download_and_resize')
 				{
 					// @todo remove this if appropriate
 					require_once($sourcedir . '/Subs-Graphics.php');
@@ -3248,26 +3385,27 @@ 
 						$cur_profile['id_attach'] = $modSettings['new_avatar_data']['id'];
 						$cur_profile['filename'] = $modSettings['new_avatar_data']['filename'];
 						$cur_profile['attachment_type'] = $modSettings['new_avatar_data']['type'];
+					} else {
+											return 'bad_avatar';
 					}
-					else
-						return 'bad_avatar';
 				}
 			}
 		}
-	}
-	elseif (($value == 'upload' && allowedTo('profile_upload_avatar')) || $downloadedExternalAvatar)
+	} elseif (($value == 'upload' && allowedTo('profile_upload_avatar')) || $downloadedExternalAvatar)
 	{
 		if ((isset($_FILES['attachment']['name']) && $_FILES['attachment']['name'] != '') || $downloadedExternalAvatar)
 		{
 			// Get the dimensions of the image.
 			if (!$downloadedExternalAvatar)
 			{
-				if (!is_writable($uploadDir))
-					fatal_lang_error('attachments_no_write', 'critical');
+				if (!is_writable($uploadDir)) {
+									fatal_lang_error('attachments_no_write', 'critical');
+				}
 
 				$new_filename = $uploadDir . '/' . getAttachmentFilename('avatar_tmp_' . $memID, false, null, true);
-				if (!move_uploaded_file($_FILES['attachment']['tmp_name'], $new_filename))
-					fatal_lang_error('attach_timeout', 'critical');
+				if (!move_uploaded_file($_FILES['attachment']['tmp_name'], $new_filename)) {
+									fatal_lang_error('attach_timeout', 'critical');
+				}
 
 				$_FILES['attachment']['tmp_name'] = $new_filename;
 			}
@@ -3380,17 +3518,19 @@ 
 			$profile_vars['avatar'] = '';
 
 			// Delete any temporary file.
-			if (file_exists($_FILES['attachment']['tmp_name']))
-				@unlink($_FILES['attachment']['tmp_name']);
+			if (file_exists($_FILES['attachment']['tmp_name'])) {
+							@unlink($_FILES['attachment']['tmp_name']);
+			}
 		}
 		// Selected the upload avatar option and had one already uploaded before or didn't upload one.
-		else
+		else {
+					$profile_vars['avatar'] = '';
+		}
+	} elseif ($value == 'gravatar' && allowedTo('profile_gravatar_avatar')) {
+			$profile_vars['avatar'] = 'gravatar://www.gravatar.com/avatar/' . md5(strtolower(trim($cur_profile['email_address'])));
+	} else {
 			$profile_vars['avatar'] = '';
 	}
-	elseif ($value == 'gravatar' && allowedTo('profile_gravatar_avatar'))
-		$profile_vars['avatar'] = 'gravatar://www.gravatar.com/avatar/' . md5(strtolower(trim($cur_profile['email_address'])));
-	else
-		$profile_vars['avatar'] = '';
 
 	// Setup the profile variables so it shows things right on display!
 	$cur_profile['avatar'] = $profile_vars['avatar'];
@@ -3438,9 +3578,9 @@ 
 		$smiley_parsed = $unparsed_signature;
 		parsesmileys($smiley_parsed);
 		$smiley_count = substr_count(strtolower($smiley_parsed), '<img') - substr_count(strtolower($unparsed_signature), '<img');
-		if (!empty($sig_limits[4]) && $sig_limits[4] == -1 && $smiley_count > 0)
-			return 'signature_allow_smileys';
-		elseif (!empty($sig_limits[4]) && $sig_limits[4] > 0 && $smiley_count > $sig_limits[4])
+		if (!empty($sig_limits[4]) && $sig_limits[4] == -1 && $smiley_count > 0) {
+					return 'signature_allow_smileys';
+		} elseif (!empty($sig_limits[4]) && $sig_limits[4] > 0 && $smiley_count > $sig_limits[4])
 		{
 			$txt['profile_error_signature_max_smileys'] = sprintf($txt['profile_error_signature_max_smileys'], $sig_limits[4]);
 			return 'signature_max_smileys';
@@ -3453,14 +3593,15 @@ 
 			{
 				$limit_broke = 0;
 				// Attempt to allow all sizes of abuse, so to speak.
-				if ($matches[2][$ind] == 'px' && $size > $sig_limits[7])
-					$limit_broke = $sig_limits[7] . 'px';
-				elseif ($matches[2][$ind] == 'pt' && $size > ($sig_limits[7] * 0.75))
-					$limit_broke = ((int) $sig_limits[7] * 0.75) . 'pt';
-				elseif ($matches[2][$ind] == 'em' && $size > ((float) $sig_limits[7] / 16))
-					$limit_broke = ((float) $sig_limits[7] / 16) . 'em';
-				elseif ($matches[2][$ind] != 'px' && $matches[2][$ind] != 'pt' && $matches[2][$ind] != 'em' && $sig_limits[7] < 18)
-					$limit_broke = 'large';
+				if ($matches[2][$ind] == 'px' && $size > $sig_limits[7]) {
+									$limit_broke = $sig_limits[7] . 'px';
+				} elseif ($matches[2][$ind] == 'pt' && $size > ($sig_limits[7] * 0.75)) {
+									$limit_broke = ((int) $sig_limits[7] * 0.75) . 'pt';
+				} elseif ($matches[2][$ind] == 'em' && $size > ((float) $sig_limits[7] / 16)) {
+									$limit_broke = ((float) $sig_limits[7] / 16) . 'em';
+				} elseif ($matches[2][$ind] != 'px' && $matches[2][$ind] != 'pt' && $matches[2][$ind] != 'em' && $sig_limits[7] < 18) {
+									$limit_broke = 'large';
+				}
 
 				if ($limit_broke)
 				{
@@ -3502,24 +3643,26 @@ 
 					$width = -1; $height = -1;
 
 					// Does it have predefined restraints? Width first.
-					if ($matches[6][$key])
-						$matches[2][$key] = $matches[6][$key];
+					if ($matches[6][$key]) {
+											$matches[2][$key] = $matches[6][$key];
+					}
 					if ($matches[2][$key] && $sig_limits[5] && $matches[2][$key] > $sig_limits[5])
 					{
 						$width = $sig_limits[5];
 						$matches[4][$key] = $matches[4][$key] * ($width / $matches[2][$key]);
+					} elseif ($matches[2][$key]) {
+											$width = $matches[2][$key];
 					}
-					elseif ($matches[2][$key])
-						$width = $matches[2][$key];
 					// ... and height.
 					if ($matches[4][$key] && $sig_limits[6] && $matches[4][$key] > $sig_limits[6])
 					{
 						$height = $sig_limits[6];
-						if ($width != -1)
-							$width = $width * ($height / $matches[4][$key]);
+						if ($width != -1) {
+													$width = $width * ($height / $matches[4][$key]);
+						}
+					} elseif ($matches[4][$key]) {
+											$height = $matches[4][$key];
 					}
-					elseif ($matches[4][$key])
-						$height = $matches[4][$key];
 
 					// If the dimensions are still not fixed - we need to check the actual image.
 					if (($width == -1 && $sig_limits[5]) || ($height == -1 && $sig_limits[6]))
@@ -3537,21 +3680,24 @@ 
 							if ($sizes[1] > $sig_limits[6] && $sig_limits[6])
 							{
 								$height = $sig_limits[6];
-								if ($width == -1)
-									$width = $sizes[0];
+								if ($width == -1) {
+																	$width = $sizes[0];
+								}
 								$width = $width * ($height / $sizes[1]);
+							} elseif ($width != -1) {
+															$height = $sizes[1];
 							}
-							elseif ($width != -1)
-								$height = $sizes[1];
 						}
 					}
 
 					// Did we come up with some changes? If so remake the string.
-					if ($width != -1 || $height != -1)
-						$replaces[$image] = '[img' . ($width != -1 ? ' width=' . round($width) : '') . ($height != -1 ? ' height=' . round($height) : '') . ']' . $matches[7][$key] . '[/img]';
+					if ($width != -1 || $height != -1) {
+											$replaces[$image] = '[img' . ($width != -1 ? ' width=' . round($width) : '') . ($height != -1 ? ' height=' . round($height) : '') . ']' . $matches[7][$key] . '[/img]';
+					}
+				}
+				if (!empty($replaces)) {
+									$value = str_replace(array_keys($replaces), array_values($replaces), $value);
 				}
-				if (!empty($replaces))
-					$value = str_replace(array_keys($replaces), array_values($replaces), $value);
 			}
 		}
 
@@ -3595,10 +3741,12 @@ 
 	$email = strtr($email, array('&#039;' => '\''));
 
 	// Check the name and email for validity.
-	if (trim($email) == '')
-		return 'no_email';
-	if (!filter_var($email, FILTER_VALIDATE_EMAIL))
-		return 'bad_email';
+	if (trim($email) == '') {
+			return 'no_email';
+	}
+	if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
+			return 'bad_email';
+	}
 
 	// Email addresses should be and stay unique.
 	$request = $smcFunc['db_query']('', '
@@ -3613,8 +3761,9 @@ 
 		)
 	);
 
-	if ($smcFunc['db_num_rows']($request) > 0)
-		return 'email_taken';
+	if ($smcFunc['db_num_rows']($request) > 0) {
+			return 'email_taken';
+	}
 	$smcFunc['db_free_result']($request);
 
 	return true;
@@ -3627,8 +3776,9 @@ 
 {
 	global $modSettings, $context, $cur_profile;
 
-	if (isset($_POST['passwrd2']) && $_POST['passwrd2'] != '')
-		setLoginCookie(60 * $modSettings['cookieTime'], $context['id_member'], hash_salt($_POST['passwrd1'], $cur_profile['password_salt']));
+	if (isset($_POST['passwrd2']) && $_POST['passwrd2'] != '') {
+			setLoginCookie(60 * $modSettings['cookieTime'], $context['id_member'], hash_salt($_POST['passwrd1'], $cur_profile['password_salt']));
+	}
 
 	loadUserSettings();
 	writeLog();
@@ -3644,8 +3794,9 @@ 
 	require_once($sourcedir . '/Subs-Post.php');
 
 	// Shouldn't happen but just in case.
-	if (empty($profile_vars['email_address']))
-		return;
+	if (empty($profile_vars['email_address'])) {
+			return;
+	}
 
 	$replacements = array(
 		'ACTIVATIONLINK' => $scripturl . '?action=activate;u=' . $context['id_member'] . ';code=' . $profile_vars['validation_code'],
@@ -3668,8 +3819,9 @@ 
 	$_SESSION['log_time'] = 0;
 	$_SESSION['login_' . $cookiename] = json_encode(array(0, '', 0));
 
-	if (isset($_COOKIE[$cookiename]))
-		$_COOKIE[$cookiename] = '';
+	if (isset($_COOKIE[$cookiename])) {
+			$_COOKIE[$cookiename] = '';
+	}
 
 	loadUserSettings();
 
@@ -3702,11 +3854,13 @@ 
 	$groups[] = $curMember['id_group'];
 
 	// Ensure the query doesn't croak!
-	if (empty($groups))
-		$groups = array(0);
+	if (empty($groups)) {
+			$groups = array(0);
+	}
 	// Just to be sure...
-	foreach ($groups as $k => $v)
-		$groups[$k] = (int) $v;
+	foreach ($groups as $k => $v) {
+			$groups[$k] = (int) $v;
+	}
 
 	// Get all the membergroups they can join.
 	$request = $smcFunc['db_query']('', '
@@ -3736,12 +3890,14 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Can they edit their primary group?
-		if (($row['id_group'] == $context['primary_group'] && $row['group_type'] > 1) || ($row['hidden'] != 2 && $context['primary_group'] == 0 && in_array($row['id_group'], $groups)))
-			$context['can_edit_primary'] = true;
+		if (($row['id_group'] == $context['primary_group'] && $row['group_type'] > 1) || ($row['hidden'] != 2 && $context['primary_group'] == 0 && in_array($row['id_group'], $groups))) {
+					$context['can_edit_primary'] = true;
+		}
 
 		// If they can't manage (protected) groups, and it's not publically joinable or already assigned, they can't see it.
-		if (((!$context['can_manage_protected'] && $row['group_type'] == 1) || (!$context['can_manage_membergroups'] && $row['group_type'] == 0)) && $row['id_group'] != $context['primary_group'])
-			continue;
+		if (((!$context['can_manage_protected'] && $row['group_type'] == 1) || (!$context['can_manage_membergroups'] && $row['group_type'] == 0)) && $row['id_group'] != $context['primary_group']) {
+					continue;
+		}
 
 		$context['groups'][in_array($row['id_group'], $groups) ? 'member' : 'available'][$row['id_group']] = array(
 			'id' => $row['id_group'],
@@ -3770,13 +3926,15 @@ 
 	);
 
 	// No changing primary one unless you have enough groups!
-	if (count($context['groups']['member']) < 2)
-		$context['can_edit_primary'] = false;
+	if (count($context['groups']['member']) < 2) {
+			$context['can_edit_primary'] = false;
+	}
 
 	// In the special case that someone is requesting membership of a group, setup some special context vars.
-	if (isset($_REQUEST['request']) && isset($context['groups']['available'][(int) $_REQUEST['request']]) && $context['groups']['available'][(int) $_REQUEST['request']]['type'] == 2)
-		$context['group_request'] = $context['groups']['available'][(int) $_REQUEST['request']];
-}
+	if (isset($_REQUEST['request']) && isset($context['groups']['available'][(int) $_REQUEST['request']]) && $context['groups']['available'][(int) $_REQUEST['request']]['type'] == 2) {
+			$context['group_request'] = $context['groups']['available'][(int) $_REQUEST['request']];
+	}
+	}
 
 /**
  * This function actually makes all the group changes
@@ -3791,10 +3949,12 @@ 
 	global $user_info, $context, $user_profile, $modSettings, $smcFunc;
 
 	// Let's be extra cautious...
-	if (!$context['user']['is_owner'] || empty($modSettings['show_group_membership']))
-		isAllowedTo('manage_membergroups');
-	if (!isset($_REQUEST['gid']) && !isset($_POST['primary']))
-		fatal_lang_error('no_access', false);
+	if (!$context['user']['is_owner'] || empty($modSettings['show_group_membership'])) {
+			isAllowedTo('manage_membergroups');
+	}
+	if (!isset($_REQUEST['gid']) && !isset($_POST['primary'])) {
+			fatal_lang_error('no_access', false);
+	}
 
 	checkSession(isset($_GET['gid']) ? 'get' : 'post');
 
@@ -3813,8 +3973,9 @@ 
 	$foundTarget = $changeType == 'primary' && $group_id == 0 ? true : false;
 
 	// Sanity check!!
-	if ($group_id == 1)
-		isAllowedTo('admin_forum');
+	if ($group_id == 1) {
+			isAllowedTo('admin_forum');
+	}
 	// Protected groups too!
 	else
 	{
@@ -3831,8 +3992,9 @@ 
 		list ($is_protected) = $smcFunc['db_fetch_row']($request);
 		$smcFunc['db_free_result']($request);
 
-		if ($is_protected == 1)
-			isAllowedTo('admin_forum');
+		if ($is_protected == 1) {
+					isAllowedTo('admin_forum');
+		}
 	}
 
 	// What ever we are doing, we need to determine if changing primary is possible!
@@ -3854,36 +4016,43 @@ 
 			$group_name = $row['group_name'];
 
 			// Does the group type match what we're doing - are we trying to request a non-requestable group?
-			if ($changeType == 'request' && $row['group_type'] != 2)
-				fatal_lang_error('no_access', false);
+			if ($changeType == 'request' && $row['group_type'] != 2) {
+							fatal_lang_error('no_access', false);
+			}
 			// What about leaving a requestable group we are not a member of?
-			elseif ($changeType == 'free' && $row['group_type'] == 2 && $old_profile['id_group'] != $row['id_group'] && !isset($addGroups[$row['id_group']]))
-				fatal_lang_error('no_access', false);
-			elseif ($changeType == 'free' && $row['group_type'] != 3 && $row['group_type'] != 2)
-				fatal_lang_error('no_access', false);
+			elseif ($changeType == 'free' && $row['group_type'] == 2 && $old_profile['id_group'] != $row['id_group'] && !isset($addGroups[$row['id_group']])) {
+							fatal_lang_error('no_access', false);
+			} elseif ($changeType == 'free' && $row['group_type'] != 3 && $row['group_type'] != 2) {
+							fatal_lang_error('no_access', false);
+			}
 
 			// We can't change the primary group if this is hidden!
-			if ($row['hidden'] == 2)
-				$canChangePrimary = false;
+			if ($row['hidden'] == 2) {
+							$canChangePrimary = false;
+			}
 		}
 
 		// If this is their old primary, can we change it?
-		if ($row['id_group'] == $old_profile['id_group'] && ($row['group_type'] > 1 || $context['can_manage_membergroups']) && $canChangePrimary !== false)
-			$canChangePrimary = 1;
+		if ($row['id_group'] == $old_profile['id_group'] && ($row['group_type'] > 1 || $context['can_manage_membergroups']) && $canChangePrimary !== false) {
+					$canChangePrimary = 1;
+		}
 
 		// If we are not doing a force primary move, don't do it automatically if current primary is not 0.
-		if ($changeType != 'primary' && $old_profile['id_group'] != 0)
-			$canChangePrimary = false;
+		if ($changeType != 'primary' && $old_profile['id_group'] != 0) {
+					$canChangePrimary = false;
+		}
 
 		// If this is the one we are acting on, can we even act?
-		if ((!$context['can_manage_protected'] && $row['group_type'] == 1) || (!$context['can_manage_membergroups'] && $row['group_type'] == 0))
-			$canChangePrimary = false;
+		if ((!$context['can_manage_protected'] && $row['group_type'] == 1) || (!$context['can_manage_membergroups'] && $row['group_type'] == 0)) {
+					$canChangePrimary = false;
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
 	// Didn't find the target?
-	if (!$foundTarget)
-		fatal_lang_error('no_access', false);
+	if (!$foundTarget) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Final security check, don't allow users to promote themselves to admin.
 	if ($context['can_manage_membergroups'] && !allowedTo('admin_forum'))
@@ -3903,8 +4072,9 @@ 
 		list ($disallow) = $smcFunc['db_fetch_row']($request);
 		$smcFunc['db_free_result']($request);
 
-		if ($disallow)
-			isAllowedTo('admin_forum');
+		if ($disallow) {
+					isAllowedTo('admin_forum');
+		}
 	}
 
 	// If we're requesting, add the note then return.
@@ -3922,8 +4092,9 @@ 
 				'status_open' => 0,
 			)
 		);
-		if ($smcFunc['db_num_rows']($request) != 0)
-			fatal_lang_error('profile_error_already_requested_group');
+		if ($smcFunc['db_num_rows']($request) != 0) {
+					fatal_lang_error('profile_error_already_requested_group');
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Log the request.
@@ -3957,10 +4128,11 @@ 
 		// Are we leaving?
 		if ($old_profile['id_group'] == $group_id || isset($addGroups[$group_id]))
 		{
-			if ($old_profile['id_group'] == $group_id)
-				$newPrimary = 0;
-			else
-				unset($addGroups[$group_id]);
+			if ($old_profile['id_group'] == $group_id) {
+							$newPrimary = 0;
+			} else {
+							unset($addGroups[$group_id]);
+			}
 		}
 		// ... if not, must be joining.
 		else
@@ -3968,36 +4140,42 @@ 
 			// Can we change the primary, and do we want to?
 			if ($canChangePrimary)
 			{
-				if ($old_profile['id_group'] != 0)
-					$addGroups[$old_profile['id_group']] = -1;
+				if ($old_profile['id_group'] != 0) {
+									$addGroups[$old_profile['id_group']] = -1;
+				}
 				$newPrimary = $group_id;
 			}
 			// Otherwise it's an additional group...
-			else
-				$addGroups[$group_id] = -1;
+			else {
+							$addGroups[$group_id] = -1;
+			}
 		}
 	}
 	// Finally, we must be setting the primary.
 	elseif ($canChangePrimary)
 	{
-		if ($old_profile['id_group'] != 0)
-			$addGroups[$old_profile['id_group']] = -1;
-		if (isset($addGroups[$group_id]))
-			unset($addGroups[$group_id]);
+		if ($old_profile['id_group'] != 0) {
+					$addGroups[$old_profile['id_group']] = -1;
+		}
+		if (isset($addGroups[$group_id])) {
+					unset($addGroups[$group_id]);
+		}
 		$newPrimary = $group_id;
 	}
 
 	// Finally, we can make the changes!
-	foreach ($addGroups as $id => $dummy)
-		if (empty($id))
+	foreach ($addGroups as $id => $dummy) {
+			if (empty($id))
 			unset($addGroups[$id]);
+	}
 	$addGroups = implode(',', array_flip($addGroups));
 
 	// Ensure that we don't cache permissions if the group is changing.
-	if ($context['user']['is_owner'])
-		$_SESSION['mc']['time'] = 0;
-	else
-		updateSettings(array('settings_updated' => time()));
+	if ($context['user']['is_owner']) {
+			$_SESSION['mc']['time'] = 0;
+	} else {
+			updateSettings(array('settings_updated' => time()));
+	}
 
 	updateMemberData($memID, array('id_group' => $newPrimary, 'additional_groups' => $addGroups));
 
@@ -4020,8 +4198,9 @@ 
 	if (empty($user_settings['tfa_secret']) && $context['user']['is_owner'])
 	{
 		// Check to ensure we're forcing SSL for authentication
-		if (!empty($modSettings['force_ssl']) && empty($maintenance) && (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != 'on'))
-			fatal_lang_error('login_ssl_required');
+		if (!empty($modSettings['force_ssl']) && empty($maintenance) && (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != 'on')) {
+					fatal_lang_error('login_ssl_required');
+		}
 
 		// In some cases (forced 2FA or backup code) they would be forced to be redirected here,
 		// we do not want too much AJAX to confuse them.
@@ -4058,8 +4237,7 @@ 
 				$context['sub_template'] = 'tfasetup_backup';
 
 				return;
-			}
-			else
+			} else
 			{
 				$context['tfa_secret'] = $_SESSION['tfa_secret'];
 				$context['tfa_error'] = !$valid_code;
@@ -4067,8 +4245,7 @@ 
 				$context['tfa_pass_value'] = $_POST['passwd'];
 				$context['tfa_value'] = $_POST['tfa_code'];
 			}
-		}
-		else
+		} else
 		{
 			$totp = new \TOTP\Auth();
 			$secret = $totp->generateCode();
@@ -4078,17 +4255,16 @@ 
 		}
 
 		$context['tfa_qr_url'] = $totp->getQrCodeUrl($context['forum_name'] . ':' . $user_info['name'], $context['tfa_secret']);
-	}
-	elseif (isset($_REQUEST['disable']))
+	} elseif (isset($_REQUEST['disable']))
 	{
 		updateMemberData($memID, array(
 			'tfa_secret' => '',
 			'tfa_backup' => '',
 		));
 		redirectexit('action=profile;area=account;u=' . $memID);
+	} else {
+			redirectexit('action=profile;area=account;u=' . $memID);
+	}
 	}
-	else
-		redirectexit('action=profile;area=account;u=' . $memID);
-}
 
 ?>
\ No newline at end of file

Sources/Themes.php

Braces +348 added lines, -271 removed lines

@@ -30,8 +30,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Subaction handler - manages the action and delegates control to the proper
@@ -103,12 +104,12 @@ 
 	cache_put_data('minimized_css', null);
 
 	// Follow the sa or just go to administration.
-	if (isset($_GET['sa']) && !empty($subActions[$_GET['sa']]))
-		call_helper($subActions[$_GET['sa']]);
-
-	else
-		call_helper($subActions['admin']);
-}
+	if (isset($_GET['sa']) && !empty($subActions[$_GET['sa']])) {
+			call_helper($subActions[$_GET['sa']]);
+	} else {
+			call_helper($subActions['admin']);
+	}
+	}
 
 /**
  * This function allows administration of themes and their settings,
@@ -130,15 +131,16 @@ 
 		checkSession();
 		validateToken('admin-tm');
 
-		if (isset($_POST['options']['known_themes']))
-			foreach ($_POST['options']['known_themes'] as $key => $id)
+		if (isset($_POST['options']['known_themes'])) {
+					foreach ($_POST['options']['known_themes'] as $key => $id)
 				$_POST['options']['known_themes'][$key] = (int) $id;
+		} else {
+					fatal_lang_error('themes_none_selectable', false);
+		}
 
-		else
-			fatal_lang_error('themes_none_selectable', false);
-
-		if (!in_array($_POST['options']['theme_guests'], $_POST['options']['known_themes']))
-			fatal_lang_error('themes_default_selectable', false);
+		if (!in_array($_POST['options']['theme_guests'], $_POST['options']['known_themes'])) {
+					fatal_lang_error('themes_default_selectable', false);
+		}
 
 		// Commit the new settings.
 		updateSettings(array(
@@ -146,8 +148,9 @@ 
 			'theme_guests' => $_POST['options']['theme_guests'],
 			'knownThemes' => implode(',', $_POST['options']['known_themes']),
 		));
-		if ((int) $_POST['theme_reset'] == 0 || in_array($_POST['theme_reset'], $_POST['options']['known_themes']))
-			updateMemberData(null, array('id_theme' => (int) $_POST['theme_reset']));
+		if ((int) $_POST['theme_reset'] == 0 || in_array($_POST['theme_reset'], $_POST['options']['known_themes'])) {
+					updateMemberData(null, array('id_theme' => (int) $_POST['theme_reset']));
+		}
 
 		redirectexit('action=admin;area=theme;' . $context['session_var'] . '=' . $context['session_id'] . ';sa=admin');
 	}
@@ -166,8 +169,9 @@ 
 	// Look for a non existent theme directory. (ie theme87.)
 	$theme_dir = $boarddir . '/Themes/theme';
 	$i = 1;
-	while (file_exists($theme_dir . $i))
-		$i++;
+	while (file_exists($theme_dir . $i)) {
+			$i++;
+	}
 
 	$context['new_theme_name'] = 'theme' . $i;
 
@@ -189,8 +193,9 @@ 
 	loadLanguage('Admin');
 	isAllowedTo('admin_forum');
 
-	if (isset($_REQUEST['th']))
-		return SetThemeSettings();
+	if (isset($_REQUEST['th'])) {
+			return SetThemeSettings();
+	}
 
 	if (isset($_POST['save']))
 	{
@@ -274,12 +279,13 @@ 
 		$context['themes'] = array();
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (!isset($context['themes'][$row['id_theme']]))
-				$context['themes'][$row['id_theme']] = array(
+			if (!isset($context['themes'][$row['id_theme']])) {
+							$context['themes'][$row['id_theme']] = array(
 					'id' => $row['id_theme'],
 					'num_default_options' => 0,
 					'num_members' => 0,
 				);
+			}
 			$context['themes'][$row['id_theme']][$row['variable']] = $row['value'];
 		}
 		$smcFunc['db_free_result']($request);
@@ -293,8 +299,9 @@ 
 				'guest_member' => -1,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$context['themes'][$row['id_theme']]['num_default_options'] = $row['value'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$context['themes'][$row['id_theme']]['num_default_options'] = $row['value'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Need to make sure we don't do custom fields.
@@ -305,8 +312,9 @@ 
 			)
 		);
 		$customFields = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$customFields[] = $row['col_name'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$customFields[] = $row['col_name'];
+		}
 		$smcFunc['db_free_result']($request);
 		$customFieldsQuery = empty($customFields) ? '' : ('AND variable NOT IN ({array_string:custom_fields})');
 
@@ -321,14 +329,16 @@ 
 				'custom_fields' => empty($customFields) ? array() : $customFields,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$context['themes'][$row['id_theme']]['num_members'] = $row['value'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$context['themes'][$row['id_theme']]['num_members'] = $row['value'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// There has to be a Settings template!
-		foreach ($context['themes'] as $k => $v)
-			if (empty($v['theme_dir']) || (!file_exists($v['theme_dir'] . '/Settings.template.php') && empty($v['num_members'])))
+		foreach ($context['themes'] as $k => $v) {
+					if (empty($v['theme_dir']) || (!file_exists($v['theme_dir'] . '/Settings.template.php') && empty($v['num_members'])))
 				unset($context['themes'][$k]);
+		}
 
 		loadTemplate('Themes');
 		$context['sub_template'] = 'reset_list';
@@ -343,16 +353,19 @@ 
 		checkSession();
 		validateToken('admin-sto');
 
-		if (empty($_POST['options']))
-			$_POST['options'] = array();
-		if (empty($_POST['default_options']))
-			$_POST['default_options'] = array();
+		if (empty($_POST['options'])) {
+					$_POST['options'] = array();
+		}
+		if (empty($_POST['default_options'])) {
+					$_POST['default_options'] = array();
+		}
 
 		// Set up the sql query.
 		$setValues = array();
 
-		foreach ($_POST['options'] as $opt => $val)
-			$setValues[] = array(-1, $_GET['th'], $opt, is_array($val) ? implode(',', $val) : $val);
+		foreach ($_POST['options'] as $opt => $val) {
+					$setValues[] = array(-1, $_GET['th'], $opt, is_array($val) ? implode(',', $val) : $val);
+		}
 
 		$old_settings = array();
 		foreach ($_POST['default_options'] as $opt => $val)
@@ -366,8 +379,8 @@ 
 		if (!empty($setValues))
 		{
 			// Are there options in non-default themes set that should be cleared?
-			if (!empty($old_settings))
-				$smcFunc['db_query']('', '
+			if (!empty($old_settings)) {
+							$smcFunc['db_query']('', '
 					DELETE FROM {db_prefix}themes
 					WHERE id_theme != {int:default_theme}
 						AND id_member = {int:guest_member}
@@ -378,6 +391,7 @@ 
 						'old_settings' => $old_settings,
 					)
 				);
+			}
 
 			$smcFunc['db_insert']('replace',
 				'{db_prefix}themes',
@@ -391,8 +405,7 @@ 
 		cache_put_data('theme_settings-1', null, 90);
 
 		redirectexit('action=admin;area=theme;' . $context['session_var'] . '=' . $context['session_id'] . ';sa=reset');
-	}
-	elseif (isset($_POST['submit']) && $_POST['who'] == 1)
+	} elseif (isset($_POST['submit']) && $_POST['who'] == 1)
 	{
 		checkSession();
 		validateToken('admin-sto');
@@ -405,9 +418,9 @@ 
 		$old_settings = array();
 		foreach ($_POST['default_options'] as $opt => $val)
 		{
-			if ($_POST['default_options_master'][$opt] == 0)
-				continue;
-			elseif ($_POST['default_options_master'][$opt] == 1)
+			if ($_POST['default_options_master'][$opt] == 0) {
+							continue;
+			} elseif ($_POST['default_options_master'][$opt] == 1)
 			{
 				// Delete then insert for ease of database compatibility!
 				$smcFunc['db_query']('substring', '
@@ -433,8 +446,7 @@ 
 				);
 
 				$old_settings[] = $opt;
-			}
-			elseif ($_POST['default_options_master'][$opt] == 2)
+			} elseif ($_POST['default_options_master'][$opt] == 2)
 			{
 				$smcFunc['db_query']('', '
 					DELETE FROM {db_prefix}themes
@@ -449,8 +461,8 @@ 
 		}
 
 		// Delete options from other themes.
-		if (!empty($old_settings))
-			$smcFunc['db_query']('', '
+		if (!empty($old_settings)) {
+					$smcFunc['db_query']('', '
 				DELETE FROM {db_prefix}themes
 				WHERE id_theme != {int:default_theme}
 					AND id_member > {int:no_member}
@@ -461,12 +473,13 @@ 
 					'old_settings' => $old_settings,
 				)
 			);
+		}
 
 		foreach ($_POST['options'] as $opt => $val)
 		{
-			if ($_POST['options_master'][$opt] == 0)
-				continue;
-			elseif ($_POST['options_master'][$opt] == 1)
+			if ($_POST['options_master'][$opt] == 0) {
+							continue;
+			} elseif ($_POST['options_master'][$opt] == 1)
 			{
 				// Delete then insert for ease of database compatibility - again!
 				$smcFunc['db_query']('substring', '
@@ -491,8 +504,7 @@ 
 						'value' => (is_array($val) ? implode(',', $val) : $val),
 					)
 				);
-			}
-			elseif ($_POST['options_master'][$opt] == 2)
+			} elseif ($_POST['options_master'][$opt] == 2)
 			{
 				$smcFunc['db_query']('', '
 					DELETE FROM {db_prefix}themes
@@ -509,8 +521,7 @@ 
 		}
 
 		redirectexit('action=admin;area=theme;' . $context['session_var'] . '=' . $context['session_id'] . ';sa=reset');
-	}
-	elseif (!empty($_GET['who']) && $_GET['who'] == 2)
+	} elseif (!empty($_GET['who']) && $_GET['who'] == 2)
 	{
 		checkSession('get');
 		validateToken('admin-stor', 'request');
@@ -525,8 +536,9 @@ 
 				)
 			);
 			$customFields = array();
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$customFields[] = $row['col_name'];
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$customFields[] = $row['col_name'];
+			}
 			$smcFunc['db_free_result']($request);
 		}
 		$customFieldsQuery = empty($customFields) ? '' : ('AND variable NOT IN ({array_string:custom_fields})');
@@ -578,13 +590,13 @@ 
 			)
 		);
 		$context['theme_options'] = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$context['theme_options'][$row['variable']] = $row['value'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$context['theme_options'][$row['variable']] = $row['value'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		$context['theme_options_reset'] = false;
-	}
-	else
+	} else
 	{
 		$context['theme_options'] = array();
 		$context['theme_options_reset'] = true;
@@ -593,30 +605,32 @@ 
 	foreach ($context['options'] as $i => $setting)
 	{
 		// Just skip separators
-		if (!is_array($setting))
-			continue;
+		if (!is_array($setting)) {
+					continue;
+		}
 
 		// Is this disabled?
 		if ($setting['id'] == 'calendar_start_day' && empty($modSettings['cal_enabled']))
 		{
 			unset($context['options'][$i]);
 			continue;
-		}
-		elseif (($setting['id'] == 'topics_per_page' || $setting['id'] == 'messages_per_page') && !empty($modSettings['disableCustomPerPage']))
+		} elseif (($setting['id'] == 'topics_per_page' || $setting['id'] == 'messages_per_page') && !empty($modSettings['disableCustomPerPage']))
 		{
 			unset($context['options'][$i]);
 			continue;
 		}
 
-		if (!isset($setting['type']) || $setting['type'] == 'bool')
-			$context['options'][$i]['type'] = 'checkbox';
-		elseif ($setting['type'] == 'int' || $setting['type'] == 'integer')
-			$context['options'][$i]['type'] = 'number';
-		elseif ($setting['type'] == 'string')
-			$context['options'][$i]['type'] = 'text';
+		if (!isset($setting['type']) || $setting['type'] == 'bool') {
+					$context['options'][$i]['type'] = 'checkbox';
+		} elseif ($setting['type'] == 'int' || $setting['type'] == 'integer') {
+					$context['options'][$i]['type'] = 'number';
+		} elseif ($setting['type'] == 'string') {
+					$context['options'][$i]['type'] = 'text';
+		}
 
-		if (isset($setting['options']))
-			$context['options'][$i]['type'] = 'list';
+		if (isset($setting['options'])) {
+					$context['options'][$i]['type'] = 'list';
+		}
 
 		$context['options'][$i]['value'] = !isset($context['theme_options'][$setting['id']]) ? '' : $context['theme_options'][$setting['id']];
 	}
@@ -641,8 +655,9 @@ 
 {
 	global $txt, $context, $settings, $modSettings, $smcFunc;
 
-	if (empty($_GET['th']) && empty($_GET['id']))
-		return ThemeAdmin();
+	if (empty($_GET['th']) && empty($_GET['id'])) {
+			return ThemeAdmin();
+	}
 
 	$_GET['th'] = isset($_GET['th']) ? (int) $_GET['th'] : (int) $_GET['id'];
 
@@ -653,8 +668,9 @@ 
 	isAllowedTo('admin_forum');
 
 	// Validate inputs/user.
-	if (empty($_GET['th']))
-		fatal_lang_error('no_theme', false);
+	if (empty($_GET['th'])) {
+			fatal_lang_error('no_theme', false);
+	}
 
 	// Fetch the smiley sets...
 	$sets = explode(',', 'none,' . $modSettings['smiley_sets_known']);
@@ -662,8 +678,9 @@ 
 	$context['smiley_sets'] = array(
 		'' => $txt['smileys_no_default']
 	);
-	foreach ($sets as $i => $set)
-		$context['smiley_sets'][$set] = $smcFunc['htmlspecialchars']($set_names[$i]);
+	foreach ($sets as $i => $set) {
+			$context['smiley_sets'][$set] = $smcFunc['htmlspecialchars']($set_names[$i]);
+	}
 
 	$old_id = $settings['theme_id'];
 	$old_settings = $settings;
@@ -688,8 +705,9 @@ 
 	if (file_exists($settings['theme_dir'] . '/index.template.php'))
 	{
 		$file_contents = implode('', file($settings['theme_dir'] . '/index.template.php'));
-		if (preg_match('~\$settings\[\'theme_variants\'\]\s*=(.+?);~', $file_contents, $matches))
-				eval('global $settings;' . $matches[0]);
+		if (preg_match('~\$settings\[\'theme_variants\'\]\s*=(.+?);~', $file_contents, $matches)) {
+						eval('global $settings;' . $matches[0]);
+		}
 	}
 
 	// Submitting!
@@ -698,37 +716,45 @@ 
 		checkSession();
 		validateToken('admin-sts');
 
-		if (empty($_POST['options']))
-			$_POST['options'] = array();
-		if (empty($_POST['default_options']))
-			$_POST['default_options'] = array();
+		if (empty($_POST['options'])) {
+					$_POST['options'] = array();
+		}
+		if (empty($_POST['default_options'])) {
+					$_POST['default_options'] = array();
+		}
 
 		// Make sure items are cast correctly.
 		foreach ($context['theme_settings'] as $item)
 		{
 			// Disregard this item if this is just a separator.
-			if (!is_array($item))
-				continue;
+			if (!is_array($item)) {
+							continue;
+			}
 
 			foreach (array('options', 'default_options') as $option)
 			{
-				if (!isset($_POST[$option][$item['id']]))
-					continue;
+				if (!isset($_POST[$option][$item['id']])) {
+									continue;
+				}
 				// Checkbox.
-				elseif (empty($item['type']))
-					$_POST[$option][$item['id']] = $_POST[$option][$item['id']] ? 1 : 0;
+				elseif (empty($item['type'])) {
+									$_POST[$option][$item['id']] = $_POST[$option][$item['id']] ? 1 : 0;
+				}
 				// Number
-				elseif ($item['type'] == 'number')
-					$_POST[$option][$item['id']] = (int) $_POST[$option][$item['id']];
+				elseif ($item['type'] == 'number') {
+									$_POST[$option][$item['id']] = (int) $_POST[$option][$item['id']];
+				}
 			}
 		}
 
 		// Set up the sql query.
 		$inserts = array();
-		foreach ($_POST['options'] as $opt => $val)
-			$inserts[] = array(0, $_GET['th'], $opt, is_array($val) ? implode(',', $val) : $val);
-		foreach ($_POST['default_options'] as $opt => $val)
-			$inserts[] = array(0, 1, $opt, is_array($val) ? implode(',', $val) : $val);
+		foreach ($_POST['options'] as $opt => $val) {
+					$inserts[] = array(0, $_GET['th'], $opt, is_array($val) ? implode(',', $val) : $val);
+		}
+		foreach ($_POST['default_options'] as $opt => $val) {
+					$inserts[] = array(0, 1, $opt, is_array($val) ? implode(',', $val) : $val);
+		}
 		// If we're actually inserting something..
 		if (!empty($inserts))
 		{
@@ -754,8 +780,9 @@ 
 
 	foreach ($settings as $setting => $dummy)
 	{
-		if (!in_array($setting, array('theme_url', 'theme_dir', 'images_url', 'template_dirs')))
-			$settings[$setting] = htmlspecialchars__recursive($settings[$setting]);
+		if (!in_array($setting, array('theme_url', 'theme_dir', 'images_url', 'template_dirs'))) {
+					$settings[$setting] = htmlspecialchars__recursive($settings[$setting]);
+		}
 	}
 
 	$context['settings'] = $context['theme_settings'];
@@ -764,18 +791,21 @@ 
 	foreach ($context['settings'] as $i => $setting)
 	{
 		// Separators are dummies, so leave them alone.
-		if (!is_array($setting))
-			continue;
+		if (!is_array($setting)) {
+					continue;
+		}
 
-		if (!isset($setting['type']) || $setting['type'] == 'bool')
-			$context['settings'][$i]['type'] = 'checkbox';
-		elseif ($setting['type'] == 'int' || $setting['type'] == 'integer')
-			$context['settings'][$i]['type'] = 'number';
-		elseif ($setting['type'] == 'string')
-			$context['settings'][$i]['type'] = 'text';
+		if (!isset($setting['type']) || $setting['type'] == 'bool') {
+					$context['settings'][$i]['type'] = 'checkbox';
+		} elseif ($setting['type'] == 'int' || $setting['type'] == 'integer') {
+					$context['settings'][$i]['type'] = 'number';
+		} elseif ($setting['type'] == 'string') {
+					$context['settings'][$i]['type'] = 'text';
+		}
 
-		if (isset($setting['options']))
-			$context['settings'][$i]['type'] = 'list';
+		if (isset($setting['options'])) {
+					$context['settings'][$i]['type'] = 'list';
+		}
 
 		$context['settings'][$i]['value'] = !isset($settings[$setting['id']]) ? '' : $settings[$setting['id']];
 	}
@@ -828,8 +858,9 @@ 
 	$themeID = isset($_GET['th']) ? (int) $_GET['th'] : (int) $_GET['id'];
 
 	// You can't delete the default theme!
-	if ($themeID == 1)
-		fatal_lang_error('no_access', false);
+	if ($themeID == 1) {
+			fatal_lang_error('no_access', false);
+	}
 
 	$theme_info = get_single_theme($themeID);
 
@@ -837,8 +868,9 @@ 
 	remove_theme($themeID);
 
 	// And remove all its files and folders too.
-	if (!empty($theme_info) && !empty($theme_info['theme_dir']))
-		remove_dir($theme_info['theme_dir']);
+	if (!empty($theme_info) && !empty($theme_info['theme_dir'])) {
+			remove_dir($theme_info['theme_dir']);
+	}
 
 	// Go back to the list page.
 	redirectexit('action=admin;area=theme;sa=list;' . $context['session_var'] . '=' . $context['session_id'] . ';done=removing');
@@ -863,12 +895,14 @@ 
 	$enableThemes = explode(',', $modSettings['enableThemes']);
 
 	// Are we disabling it?
-	if (isset($_GET['disabled']))
-		$enableThemes = array_diff($enableThemes, array($themeID));
+	if (isset($_GET['disabled'])) {
+			$enableThemes = array_diff($enableThemes, array($themeID));
+	}
 
 	// Nope? then enable it!
-	else
-		$enableThemes[] = (string) $themeID;
+	else {
+			$enableThemes[] = (string) $themeID;
+	}
 
 	// Update the setting.
 	$enableThemes = strtr(implode(',', $enableThemes), array(',,' => ','));
@@ -903,18 +937,21 @@ 
 
 	$_SESSION['id_theme'] = 0;
 
-	if (isset($_GET['id']))
-		$_GET['th'] = $_GET['id'];
+	if (isset($_GET['id'])) {
+			$_GET['th'] = $_GET['id'];
+	}
 
 	// Saving a variant cause JS doesn't work - pretend it did ;)
 	if (isset($_POST['save']))
 	{
 		// Which theme?
-		foreach ($_POST['save'] as $k => $v)
-			$_GET['th'] = (int) $k;
+		foreach ($_POST['save'] as $k => $v) {
+					$_GET['th'] = (int) $k;
+		}
 
-		if (isset($_POST['vrt'][$k]))
-			$_GET['vrt'] = $_POST['vrt'][$k];
+		if (isset($_POST['vrt'][$k])) {
+					$_GET['vrt'] = $_POST['vrt'][$k];
+		}
 	}
 
 	// Have we made a decision, or are we just browsing?
@@ -992,8 +1029,9 @@ 
 		else
 		{
 			// The forum's default theme is always 0 and we
-			if (isset($_GET['th']) && $_GET['th'] == 0)
-					$_GET['th'] = $modSettings['theme_guests'];
+			if (isset($_GET['th']) && $_GET['th'] == 0) {
+								$_GET['th'] = $modSettings['theme_guests'];
+			}
 
 			updateMemberData((int) $_REQUEST['u'], array('id_theme' => (int) $_GET['th']));
 
@@ -1007,8 +1045,9 @@ 
 				);
 				cache_put_data('theme_settings-' . $_GET['th'] . ':' . (int) $_REQUEST['u'], null, 90);
 
-				if ($user_info['id'] == $_REQUEST['u'])
-					$_SESSION['id_variant'] = 0;
+				if ($user_info['id'] == $_REQUEST['u']) {
+									$_SESSION['id_variant'] = 0;
+				}
 			}
 
 			redirectexit('action=profile;u=' . (int) $_REQUEST['u'] . ';area=theme');
@@ -1077,12 +1116,13 @@ 
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (!isset($context['available_themes'][$row['id_theme']]))
-				$context['available_themes'][$row['id_theme']] = array(
+			if (!isset($context['available_themes'][$row['id_theme']])) {
+							$context['available_themes'][$row['id_theme']] = array(
 					'id' => $row['id_theme'],
 					'selected' => $context['current_theme'] == $row['id_theme'],
 					'num_users' => 0
 				);
+			}
 			$context['available_themes'][$row['id_theme']][$row['variable']] = $row['value'];
 		}
 		$smcFunc['db_free_result']($request);
@@ -1095,9 +1135,9 @@ 
 			'num_users' => 0
 		);
 		$guest_theme = 0;
+	} else {
+			$guest_theme = $modSettings['theme_guests'];
 	}
-	else
-		$guest_theme = $modSettings['theme_guests'];
 
 	$request = $smcFunc['db_query']('', '
 		SELECT id_theme, COUNT(*) AS the_count
@@ -1110,15 +1150,17 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Figure out which theme it is they are REALLY using.
-		if (!empty($modSettings['knownThemes']) && !in_array($row['id_theme'], explode(',', $modSettings['knownThemes'])))
-			$row['id_theme'] = $guest_theme;
-		elseif (empty($modSettings['theme_allow']))
-			$row['id_theme'] = $guest_theme;
+		if (!empty($modSettings['knownThemes']) && !in_array($row['id_theme'], explode(',', $modSettings['knownThemes']))) {
+					$row['id_theme'] = $guest_theme;
+		} elseif (empty($modSettings['theme_allow'])) {
+					$row['id_theme'] = $guest_theme;
+		}
 
-		if (isset($context['available_themes'][$row['id_theme']]))
-			$context['available_themes'][$row['id_theme']]['num_users'] += $row['the_count'];
-		else
-			$context['available_themes'][$guest_theme]['num_users'] += $row['the_count'];
+		if (isset($context['available_themes'][$row['id_theme']])) {
+					$context['available_themes'][$row['id_theme']]['num_users'] += $row['the_count'];
+		} else {
+					$context['available_themes'][$guest_theme]['num_users'] += $row['the_count'];
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -1137,8 +1179,9 @@ 
 				'id_member' => isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'pick' ? array(-1, $context['current_member']) : array(-1),
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$variant_preferences[$row['id_theme']] = $row['value'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$variant_preferences[$row['id_theme']] = $row['value'];
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
@@ -1149,17 +1192,18 @@ 
 	foreach ($context['available_themes'] as $id_theme => $theme_data)
 	{
 		// Don't try to load the forum or board default theme's data... it doesn't have any!
-		if ($id_theme == 0)
-			continue;
+		if ($id_theme == 0) {
+					continue;
+		}
 
 		// The thumbnail needs the correct path.
 		$settings['images_url'] = &$theme_data['images_url'];
 
-		if (file_exists($theme_data['theme_dir'] . '/languages/Settings.' . $user_info['language'] . '.php'))
-			include($theme_data['theme_dir'] . '/languages/Settings.' . $user_info['language'] . '.php');
-		elseif (file_exists($theme_data['theme_dir'] . '/languages/Settings.' . $language . '.php'))
-			include($theme_data['theme_dir'] . '/languages/Settings.' . $language . '.php');
-		else
+		if (file_exists($theme_data['theme_dir'] . '/languages/Settings.' . $user_info['language'] . '.php')) {
+					include($theme_data['theme_dir'] . '/languages/Settings.' . $user_info['language'] . '.php');
+		} elseif (file_exists($theme_data['theme_dir'] . '/languages/Settings.' . $language . '.php')) {
+					include($theme_data['theme_dir'] . '/languages/Settings.' . $language . '.php');
+		} else
 		{
 			$txt['theme_thumbnail_href'] = $theme_data['images_url'] . '/thumbnail.png';
 			$txt['theme_description'] = '';
@@ -1184,15 +1228,17 @@ 
 					loadLanguage('Settings');
 
 					$context['available_themes'][$id_theme]['variants'] = array();
-					foreach ($settings['theme_variants'] as $variant)
-						$context['available_themes'][$id_theme]['variants'][$variant] = array(
+					foreach ($settings['theme_variants'] as $variant) {
+											$context['available_themes'][$id_theme]['variants'][$variant] = array(
 							'label' => isset($txt['variant_' . $variant]) ? $txt['variant_' . $variant] : $variant,
 							'thumbnail' => !file_exists($theme_data['theme_dir'] . '/images/thumbnail.png') || file_exists($theme_data['theme_dir'] . '/images/thumbnail_' . $variant . '.png') ? $theme_data['images_url'] . '/thumbnail_' . $variant . '.png' : ($theme_data['images_url'] . '/thumbnail.png'),
 						);
+					}
 
 					$context['available_themes'][$id_theme]['selected_variant'] = isset($_GET['vrt']) ? $_GET['vrt'] : (!empty($variant_preferences[$id_theme]) ? $variant_preferences[$id_theme] : (!empty($settings['default_variant']) ? $settings['default_variant'] : $settings['theme_variants'][0]));
-					if (!isset($context['available_themes'][$id_theme]['variants'][$context['available_themes'][$id_theme]['selected_variant']]['thumbnail']))
-						$context['available_themes'][$id_theme]['selected_variant'] = $settings['theme_variants'][0];
+					if (!isset($context['available_themes'][$id_theme]['variants'][$context['available_themes'][$id_theme]['selected_variant']]['thumbnail'])) {
+											$context['available_themes'][$id_theme]['selected_variant'] = $settings['theme_variants'][0];
+					}
 
 					$context['available_themes'][$id_theme]['thumbnail_href'] = $context['available_themes'][$id_theme]['variants'][$context['available_themes'][$id_theme]['selected_variant']]['thumbnail'];
 					// Allow themes to override the text.
@@ -1208,8 +1254,9 @@ 
 	// As long as we're not doing the default theme...
 	if (!isset($_REQUEST['u']) || $_REQUEST['u'] >= 0)
 	{
-		if ($guest_theme != 0)
-			$context['available_themes'][0] = $context['available_themes'][$guest_theme];
+		if ($guest_theme != 0) {
+					$context['available_themes'][0] = $context['available_themes'][$guest_theme];
+		}
 
 		$context['available_themes'][0]['id'] = 0;
 		$context['available_themes'][0]['name'] = $txt['theme_forum_default'];
@@ -1258,14 +1305,16 @@ 
 		$action = $smcFunc['htmlspecialchars'](trim($_GET['do']));
 
 		// Got any info from the specific form?
-		if (!isset($_POST['save_' . $action]))
-			fatal_lang_error('theme_install_no_action', false);
+		if (!isset($_POST['save_' . $action])) {
+					fatal_lang_error('theme_install_no_action', false);
+		}
 
 		validateToken('admin-t-' . $action);
 
 		// Hopefully the themes directory is writable, or we might have a problem.
-		if (!is_writable($themedir))
-			fatal_lang_error('theme_install_write_error', 'critical');
+		if (!is_writable($themedir)) {
+					fatal_lang_error('theme_install_write_error', 'critical');
+		}
 
 		// Call the function and handle the result.
 		$result = $subActions[$action]();
@@ -1280,9 +1329,10 @@ 
 	}
 
 	// Nope, show a nice error.
-	else
-		fatal_lang_error('theme_install_no_action', false);
-}
+	else {
+			fatal_lang_error('theme_install_no_action', false);
+	}
+	}
 
 /**
  * Installs a theme from a theme package.
@@ -1298,8 +1348,9 @@ 
 	$dirtemp = $themedir . '/temp';
 
 	// Make sure the temp dir doesn't already exist
-	if (file_exists($dirtemp))
-		remove_dir($dirtemp);
+	if (file_exists($dirtemp)) {
+			remove_dir($dirtemp);
+	}
 
 	// Create the temp dir.
 	mkdir($dirtemp, 0777);
@@ -1311,17 +1362,20 @@ 
 		smf_chmod($dirtemp, '0755');
 
 		// How about now?
-		if (!is_writable($dirtemp))
-			fatal_lang_error('theme_install_write_error', 'critical');
+		if (!is_writable($dirtemp)) {
+					fatal_lang_error('theme_install_write_error', 'critical');
+		}
 	}
 
 	// This happens when the admin session is gone and the user has to login again.
-	if (!isset($_FILES) || !isset($_FILES['theme_gz']) || empty($_FILES['theme_gz']))
-		redirectexit('action=admin;area=theme;sa=admin;' . $context['session_var'] . '=' . $context['session_id']);
+	if (!isset($_FILES) || !isset($_FILES['theme_gz']) || empty($_FILES['theme_gz'])) {
+			redirectexit('action=admin;area=theme;sa=admin;' . $context['session_var'] . '=' . $context['session_id']);
+	}
 
 	// Another error check layer, something went wrong with the upload.
-	if (isset($_FILES['theme_gz']['error']) && $_FILES['theme_gz']['error'] != 0)
-		fatal_lang_error('theme_install_error_file_' . $_FILES['theme_gz']['error'], false);
+	if (isset($_FILES['theme_gz']['error']) && $_FILES['theme_gz']['error'] != 0) {
+			fatal_lang_error('theme_install_error_file_' . $_FILES['theme_gz']['error'], false);
+	}
 
 	// Get the theme's name.
 	$name = pathinfo($_FILES['theme_gz']['name'], PATHINFO_FILENAME);
@@ -1352,11 +1406,10 @@ 
 
 		// return all the info.
 		return $context['to_install'];
+	} else {
+			fatal_lang_error('theme_install_error_title', false);
+	}
 	}
-
-	else
-		fatal_lang_error('theme_install_error_title', false);
-}
 
 /**
  * Makes a copy from the default theme, assigns a name for it and installs it.
@@ -1370,15 +1423,17 @@ 
 	global $forum_version;
 
 	// There's gotta be something to work with.
-	if (!isset($_REQUEST['copy']) || empty($_REQUEST['copy']))
-		fatal_lang_error('theme_install_error_title', false);
+	if (!isset($_REQUEST['copy']) || empty($_REQUEST['copy'])) {
+			fatal_lang_error('theme_install_error_title', false);
+	}
 
 	// Get a cleaner version.
 	$name = preg_replace('~[^A-Za-z0-9_\- ]~', '', $_REQUEST['copy']);
 
 	// Is there a theme already named like this?
-	if (file_exists($themedir . '/' . $name))
-		fatal_lang_error('theme_install_already_dir', false);
+	if (file_exists($themedir . '/' . $name)) {
+			fatal_lang_error('theme_install_already_dir', false);
+	}
 
 	// This is a brand new theme so set all possible values.
 	$context['to_install'] = array(
@@ -1398,8 +1453,9 @@ 
 
 	// Buy some time.
 	@set_time_limit(600);
-	if (function_exists('apache_reset_timeout'))
-		@apache_reset_timeout();
+	if (function_exists('apache_reset_timeout')) {
+			@apache_reset_timeout();
+	}
 
 	// Create subdirectories for css and javascript files.
 	mkdir($context['to_install']['theme_dir'] . '/css', 0777);
@@ -1435,12 +1491,13 @@ 
 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if ($row['variable'] == 'theme_templates')
-			$theme_templates = $row['value'];
-		elseif ($row['variable'] == 'theme_layers')
-			$theme_layers = $row['value'];
-		else
-			continue;
+		if ($row['variable'] == 'theme_templates') {
+					$theme_templates = $row['value'];
+		} elseif ($row['variable'] == 'theme_layers') {
+					$theme_layers = $row['value'];
+		} else {
+					continue;
+		}
 	}
 
 	$smcFunc['db_free_result']($request);
@@ -1499,12 +1556,14 @@ 
 	global $themedir, $themeurl, $context;
 
 	// Cannot use the theme dir as a theme dir.
-	if (!isset($_REQUEST['theme_dir']) || empty($_REQUEST['theme_dir']) || rtrim(realpath($_REQUEST['theme_dir']), '/\\') == realpath($themedir))
-		fatal_lang_error('theme_install_invalid_dir', false);
+	if (!isset($_REQUEST['theme_dir']) || empty($_REQUEST['theme_dir']) || rtrim(realpath($_REQUEST['theme_dir']), '/\\') == realpath($themedir)) {
+			fatal_lang_error('theme_install_invalid_dir', false);
+	}
 
 	// Check is there is "something" on the dir.
-	elseif (!is_dir($_REQUEST['theme_dir']) || !file_exists($_REQUEST['theme_dir'] . '/theme_info.xml'))
-		fatal_lang_error('theme_install_error', false);
+	elseif (!is_dir($_REQUEST['theme_dir']) || !file_exists($_REQUEST['theme_dir'] . '/theme_info.xml')) {
+			fatal_lang_error('theme_install_error', false);
+	}
 
 	$name = basename($_REQUEST['theme_dir']);
 	$name = preg_replace(array('/\s/', '/\.[\.]+/', '/[^\w_\.\-]/'), array('_', '.', ''), $name);
@@ -1548,24 +1607,27 @@ 
 	}
 
 	// Any special layers?
-	if (isset($settings['catch_action']['layers']))
-		$context['template_layers'] = $settings['catch_action']['layers'];
+	if (isset($settings['catch_action']['layers'])) {
+			$context['template_layers'] = $settings['catch_action']['layers'];
+	}
 
 	// Any function to call?
 	if (isset($settings['catch_action']['function']))
 	{
 		$hook = $settings['catch_action']['function'];
 
-		if (!isset($settings['catch_action']['filename']))
-			$settings['catch_action']['filename'] = '';
+		if (!isset($settings['catch_action']['filename'])) {
+					$settings['catch_action']['filename'] = '';
+		}
 
 		add_integration_function('integrate_wrap_action', $hook, false, $settings['catch_action']['filename'], false);
 		call_integration_hook('integrate_wrap_action');
 	}
 	// And finally, the main sub template ;).
-	if (isset($settings['catch_action']['sub_template']))
-		$context['sub_template'] = $settings['catch_action']['sub_template'];
-}
+	if (isset($settings['catch_action']['sub_template'])) {
+			$context['sub_template'] = $settings['catch_action']['sub_template'];
+	}
+	}
 
 /**
  * Set an option via javascript.
@@ -1584,12 +1646,14 @@ 
 	checkSession('get');
 
 	// This good-for-nothing pixel is being used to keep the session alive.
-	if (empty($_GET['var']) || !isset($_GET['val']))
-		redirectexit($settings['images_url'] . '/blank.png');
+	if (empty($_GET['var']) || !isset($_GET['val'])) {
+			redirectexit($settings['images_url'] . '/blank.png');
+	}
 
 	// Sorry, guests can't go any further than this.
-	if ($user_info['is_guest'] || $user_info['id'] == 0)
-		obExit(false);
+	if ($user_info['is_guest'] || $user_info['id'] == 0) {
+			obExit(false);
+	}
 
 	$reservedVars = array(
 		'actual_theme_url',
@@ -1612,8 +1676,9 @@ 
 	);
 
 	// Can't change reserved vars.
-	if (in_array(strtolower($_GET['var']), $reservedVars))
-		redirectexit($settings['images_url'] . '/blank.png');
+	if (in_array(strtolower($_GET['var']), $reservedVars)) {
+			redirectexit($settings['images_url'] . '/blank.png');
+	}
 
 	// Use a specific theme?
 	if (isset($_GET['th']) || isset($_GET['id']))
@@ -1629,8 +1694,9 @@ 
 	{
 		$options['admin_preferences'] = !empty($options['admin_preferences']) ? smf_json_decode($options['admin_preferences'], true) : array();
 		// New thingy...
-		if (isset($_GET['admin_key']) && strlen($_GET['admin_key']) < 5)
-			$options['admin_preferences'][$_GET['admin_key']] = $_GET['val'];
+		if (isset($_GET['admin_key']) && strlen($_GET['admin_key']) < 5) {
+					$options['admin_preferences'][$_GET['admin_key']] = $_GET['val'];
+		}
 
 		// Change the value to be something nice,
 		$_GET['val'] = json_encode($options['admin_preferences']);
@@ -1660,8 +1726,9 @@ 
 	global $context, $scripturl, $boarddir, $smcFunc, $txt;
 
 	// @todo Should this be removed?
-	if (isset($_REQUEST['preview']))
-		die('die() with fire');
+	if (isset($_REQUEST['preview'])) {
+			die('die() with fire');
+	}
 
 	isAllowedTo('admin_forum');
 	loadTemplate('Themes');
@@ -1675,11 +1742,11 @@ 
 		foreach ($context['themes'] as $key => $theme)
 		{
 			// There has to be a Settings template!
-			if (!file_exists($theme['theme_dir'] . '/index.template.php') && !file_exists($theme['theme_dir'] . '/css/index.css'))
-				unset($context['themes'][$key]);
-
-			else
-				$context['themes'][$key]['can_edit_style'] = file_exists($theme['theme_dir'] . '/css/index.css');
+			if (!file_exists($theme['theme_dir'] . '/index.template.php') && !file_exists($theme['theme_dir'] . '/css/index.css')) {
+							unset($context['themes'][$key]);
+			} else {
+							$context['themes'][$key]['can_edit_style'] = file_exists($theme['theme_dir'] . '/css/index.css');
+			}
 		}
 
 		$context['sub_template'] = 'edit_list';
@@ -1694,22 +1761,24 @@ 
 	$context['theme_id'] = $currentTheme['id'];
 	$context['browse_title'] = sprintf($txt['themeadmin_browsing_theme'], $currentTheme['name']);
 
-	if (!file_exists($currentTheme['theme_dir'] . '/index.template.php') && !file_exists($currentTheme['theme_dir'] . '/css/index.css'))
-		fatal_lang_error('theme_edit_missing', false);
+	if (!file_exists($currentTheme['theme_dir'] . '/index.template.php') && !file_exists($currentTheme['theme_dir'] . '/css/index.css')) {
+			fatal_lang_error('theme_edit_missing', false);
+	}
 
 	if (!isset($_REQUEST['filename']))
 	{
 		if (isset($_GET['directory']))
 		{
-			if (substr($_GET['directory'], 0, 1) == '.')
-				$_GET['directory'] = '';
-			else
+			if (substr($_GET['directory'], 0, 1) == '.') {
+							$_GET['directory'] = '';
+			} else
 			{
 				$_GET['directory'] = preg_replace(array('~^[\./\\:\0\n\r]+~', '~[\\\\]~', '~/[\./]+~'), array('', '/', '/'), $_GET['directory']);
 
 				$temp = realpath($currentTheme['theme_dir'] . '/' . $_GET['directory']);
-				if (empty($temp) || substr($temp, 0, strlen(realpath($currentTheme['theme_dir']))) != realpath($currentTheme['theme_dir']))
-					$_GET['directory'] = '';
+				if (empty($temp) || substr($temp, 0, strlen(realpath($currentTheme['theme_dir']))) != realpath($currentTheme['theme_dir'])) {
+									$_GET['directory'] = '';
+				}
 			}
 		}
 
@@ -1728,37 +1797,39 @@ 
 				'href' => $scripturl . '?action=admin;area=theme;th=' . $_GET['th'] . ';' . $context['session_var'] . '=' . $context['session_id'] . ';sa=edit;directory=' . $temp,
 				'size' => '',
 			));
+		} else {
+					$context['theme_files'] = get_file_listing($currentTheme['theme_dir'], '');
 		}
-		else
-			$context['theme_files'] = get_file_listing($currentTheme['theme_dir'], '');
 
 		$context['sub_template'] = 'edit_browse';
 
 		return;
-	}
-	else
+	} else
 	{
-		if (substr($_REQUEST['filename'], 0, 1) == '.')
-			$_REQUEST['filename'] = '';
-		else
+		if (substr($_REQUEST['filename'], 0, 1) == '.') {
+					$_REQUEST['filename'] = '';
+		} else
 		{
 			$_REQUEST['filename'] = preg_replace(array('~^[\./\\:\0\n\r]+~', '~[\\\\]~', '~/[\./]+~'), array('', '/', '/'), $_REQUEST['filename']);
 
 			$temp = realpath($currentTheme['theme_dir'] . '/' . $_REQUEST['filename']);
-			if (empty($temp) || substr($temp, 0, strlen(realpath($currentTheme['theme_dir']))) != realpath($currentTheme['theme_dir']))
-				$_REQUEST['filename'] = '';
+			if (empty($temp) || substr($temp, 0, strlen(realpath($currentTheme['theme_dir']))) != realpath($currentTheme['theme_dir'])) {
+							$_REQUEST['filename'] = '';
+			}
 		}
 
-		if (empty($_REQUEST['filename']))
-			fatal_lang_error('theme_edit_missing', false);
+		if (empty($_REQUEST['filename'])) {
+					fatal_lang_error('theme_edit_missing', false);
+		}
 	}
 
 	if (isset($_POST['save']))
 	{
 		if (checkSession('post', '', false) == '' && validateToken('admin-te-' . md5($_GET['th'] . '-' . $_REQUEST['filename']), 'post', false) == true)
 		{
-			if (is_array($_POST['entire_file']))
-				$_POST['entire_file'] = implode("\n", $_POST['entire_file']);
+			if (is_array($_POST['entire_file'])) {
+							$_POST['entire_file'] = implode("\n", $_POST['entire_file']);
+			}
 
 			$_POST['entire_file'] = rtrim(strtr($_POST['entire_file'], array("\r" => '', '   ' => "\t")));
 
@@ -1770,10 +1841,11 @@ 
 				fclose($fp);
 
 				$error = @file_get_contents($currentTheme['theme_url'] . '/tmp_' . session_id() . '.php');
-				if (preg_match('~ <b>(\d+)</b><br( /)?' . '>$~i', $error) != 0)
-					$error_file = $currentTheme['theme_dir'] . '/tmp_' . session_id() . '.php';
-				else
-					unlink($currentTheme['theme_dir'] . '/tmp_' . session_id() . '.php');
+				if (preg_match('~ <b>(\d+)</b><br( /)?' . '>$~i', $error) != 0) {
+									$error_file = $currentTheme['theme_dir'] . '/tmp_' . session_id() . '.php';
+				} else {
+									unlink($currentTheme['theme_dir'] . '/tmp_' . session_id() . '.php');
+				}
 			}
 
 			if (!isset($error_file))
@@ -1794,10 +1866,11 @@ 
 			$context['sub_template'] = 'edit_file';
 
 			// Recycle the submitted data.
-			if (is_array($_POST['entire_file']))
-				$context['entire_file'] = $smcFunc['htmlspecialchars'](implode("\n", $_POST['entire_file']));
-			else
-				$context['entire_file'] = $smcFunc['htmlspecialchars']($_POST['entire_file']);
+			if (is_array($_POST['entire_file'])) {
+							$context['entire_file'] = $smcFunc['htmlspecialchars'](implode("\n", $_POST['entire_file']));
+			} else {
+							$context['entire_file'] = $smcFunc['htmlspecialchars']($_POST['entire_file']);
+			}
 
 			$context['edit_filename'] = $smcFunc['htmlspecialchars']($_POST['filename']);
 
@@ -1820,17 +1893,17 @@ 
 		$context['sub_template'] = 'edit_style';
 
 		$context['entire_file'] = $smcFunc['htmlspecialchars'](strtr(file_get_contents($currentTheme['theme_dir'] . '/' . $_REQUEST['filename']), array("\t" => '   ')));
-	}
-	elseif (substr($_REQUEST['filename'], -13) == '.template.php')
+	} elseif (substr($_REQUEST['filename'], -13) == '.template.php')
 	{
 		$context['sub_template'] = 'edit_template';
 
-		if (!isset($error_file))
-			$file_data = file($currentTheme['theme_dir'] . '/' . $_REQUEST['filename']);
-		else
+		if (!isset($error_file)) {
+					$file_data = file($currentTheme['theme_dir'] . '/' . $_REQUEST['filename']);
+		} else
 		{
-			if (preg_match('~(<b>.+?</b>:.+?<b>).+?(</b>.+?<b>\d+</b>)<br( /)?' . '>$~i', $error, $match) != 0)
-				$context['parse_error'] = $match[1] . $_REQUEST['filename'] . $match[2];
+			if (preg_match('~(<b>.+?</b>:.+?<b>).+?(</b>.+?<b>\d+</b>)<br( /)?' . '>$~i', $error, $match) != 0) {
+							$context['parse_error'] = $match[1] . $_REQUEST['filename'] . $match[2];
+			}
 			$file_data = file($error_file);
 			unlink($error_file);
 		}
@@ -1844,8 +1917,9 @@ 
 				// Try to format the functions a little nicer...
 				$context['file_parts'][$j]['data'] = trim($context['file_parts'][$j]['data']) . "\n";
 
-				if (empty($context['file_parts'][$j]['lines']))
-					unset($context['file_parts'][$j]);
+				if (empty($context['file_parts'][$j]['lines'])) {
+									unset($context['file_parts'][$j]);
+				}
 				$context['file_parts'][++$j] = array('lines' => 0, 'line' => $i + 1, 'data' => '');
 			}
 
@@ -1854,8 +1928,7 @@ 
 		}
 
 		$context['entire_file'] = $smcFunc['htmlspecialchars'](strtr(implode('', $file_data), array("\t" => '   ')));
-	}
-	else
+	} else
 	{
 		$context['sub_template'] = 'edit_file';
 
@@ -1881,8 +1954,9 @@ 
 
 	$_GET['th'] = isset($_GET['th']) ? (int) $_GET['th'] : (int) $_GET['id'];
 
-	if (empty($_GET['th']))
-		fatal_lang_error('theme_install_invalid_id');
+	if (empty($_GET['th'])) {
+			fatal_lang_error('theme_install_invalid_id');
+	}
 
 	// Get the theme info.
 	$theme = get_single_theme($_GET['th']);
@@ -1890,25 +1964,24 @@ 
 
 	if (isset($_REQUEST['template']) && preg_match('~[\./\\\\:\0]~', $_REQUEST['template']) == 0)
 	{
-		if (file_exists($settings['default_theme_dir'] . '/' . $_REQUEST['template'] . '.template.php'))
-			$filename = $settings['default_theme_dir'] . '/' . $_REQUEST['template'] . '.template.php';
-
-		else
-			fatal_lang_error('no_access', false);
+		if (file_exists($settings['default_theme_dir'] . '/' . $_REQUEST['template'] . '.template.php')) {
+					$filename = $settings['default_theme_dir'] . '/' . $_REQUEST['template'] . '.template.php';
+		} else {
+					fatal_lang_error('no_access', false);
+		}
 
 		$fp = fopen($theme['theme_dir'] . '/' . $_REQUEST['template'] . '.template.php', 'w');
 		fwrite($fp, file_get_contents($filename));
 		fclose($fp);
 
 		redirectexit('action=admin;area=theme;th=' . $context['theme_id'] . ';' . $context['session_var'] . '=' . $context['session_id'] . ';sa=copy');
-	}
-	elseif (isset($_REQUEST['lang_file']) && preg_match('~^[^\./\\\\:\0]\.[^\./\\\\:\0]$~', $_REQUEST['lang_file']) != 0)
+	} elseif (isset($_REQUEST['lang_file']) && preg_match('~^[^\./\\\\:\0]\.[^\./\\\\:\0]$~', $_REQUEST['lang_file']) != 0)
 	{
-		if (file_exists($settings['default_theme_dir'] . '/languages/' . $_REQUEST['template'] . '.php'))
-			$filename = $settings['default_theme_dir'] . '/languages/' . $_REQUEST['template'] . '.php';
-
-		else
-			fatal_lang_error('no_access', false);
+		if (file_exists($settings['default_theme_dir'] . '/languages/' . $_REQUEST['template'] . '.php')) {
+					$filename = $settings['default_theme_dir'] . '/languages/' . $_REQUEST['template'] . '.php';
+		} else {
+					fatal_lang_error('no_access', false);
+		}
 
 		$fp = fopen($theme['theme_dir'] . '/languages/' . $_REQUEST['lang_file'] . '.php', 'w');
 		fwrite($fp, file_get_contents($filename));
@@ -1923,16 +1996,18 @@ 
 	$dir = dir($settings['default_theme_dir']);
 	while ($entry = $dir->read())
 	{
-		if (substr($entry, -13) == '.template.php')
-			$templates[] = substr($entry, 0, -13);
+		if (substr($entry, -13) == '.template.php') {
+					$templates[] = substr($entry, 0, -13);
+		}
 	}
 	$dir->close();
 
 	$dir = dir($settings['default_theme_dir'] . '/languages');
 	while ($entry = $dir->read())
 	{
-		if (preg_match('~^([^\.]+\.[^\.]+)\.php$~', $entry, $matches))
-			$lang_files[] = $matches[1];
+		if (preg_match('~^([^\.]+\.[^\.]+)\.php$~', $entry, $matches)) {
+					$lang_files[] = $matches[1];
+		}
 	}
 	$dir->close();
 
@@ -1940,21 +2015,23 @@ 
 	natcasesort($lang_files);
 
 	$context['available_templates'] = array();
-	foreach ($templates as $template)
-		$context['available_templates'][$template] = array(
+	foreach ($templates as $template) {
+			$context['available_templates'][$template] = array(
 			'filename' => $template . '.template.php',
 			'value' => $template,
 			'already_exists' => false,
 			'can_copy' => is_writable($theme['theme_dir']),
 		);
+	}
 	$context['available_language_files'] = array();
-	foreach ($lang_files as $file)
-		$context['available_language_files'][$file] = array(
+	foreach ($lang_files as $file) {
+			$context['available_language_files'][$file] = array(
 			'filename' => $file . '.php',
 			'value' => $file,
 			'already_exists' => false,
 			'can_copy' => file_exists($theme['theme_dir'] . '/languages') ? is_writable($theme['theme_dir'] . '/languages') : is_writable($theme['theme_dir']),
 		);
+	}
 
 	$dir = dir($theme['theme_dir']);
 	while ($entry = $dir->read())

Themes/default/Profile.template.php

Braces +461 added lines, -344 removed lines

@@ -18,23 +18,25 @@ 
 	global $context;
 
 	// Prevent Chrome from auto completing fields when viewing/editing other members profiles
-	if (isBrowser('is_chrome') && !$context['user']['is_owner'])
-		echo '
+	if (isBrowser('is_chrome') && !$context['user']['is_owner']) {
+			echo '
 	<script>
 		disableAutoComplete();
 	</script>';
+	}
 
 	// If an error occurred while trying to save previously, give the user a clue!
 	echo '
 					', template_error_message();
 
 	// If the profile was update successfully, let the user know this.
-	if (!empty($context['profile_updated']))
-		echo '
+	if (!empty($context['profile_updated'])) {
+			echo '
 					<div class="infobox">
 						', $context['profile_updated'], '
 					</div>';
-}
+	}
+	}
 
 /**
  * Template for any HTML needed below the profile (closing off divs/tables, etc.)
@@ -102,8 +104,7 @@ 
 	if (empty($context['unread_alerts']))
 	{
 		template_alerts_all_read();
-	}
-	else
+	} else
 	{
 		foreach ($context['unread_alerts'] as $id_alert => $details)
 		{
@@ -164,10 +165,11 @@ 
 			<div class="custom_fields_above_name">
 				<ul >';
 
-		foreach ($context['print_custom_fields']['above_member'] as $field)
-			if (!empty($field['output_html']))
+		foreach ($context['print_custom_fields']['above_member'] as $field) {
+					if (!empty($field['output_html']))
 				echo '
 					<li>', $field['output_html'], '</li>';
+		}
 
 		echo '
 				</ul>
@@ -188,10 +190,11 @@ 
 			<div class="custom_fields_below_avatar">
 				<ul >';
 
-		foreach ($context['print_custom_fields']['below_avatar'] as $field)
-			if (!empty($field['output_html']))
+		foreach ($context['print_custom_fields']['below_avatar'] as $field) {
+					if (!empty($field['output_html']))
 				echo '
 					<li>', $field['output_html'], '</li>';
+		}
 
 		echo '
 				</ul>
@@ -202,22 +205,25 @@ 
 		echo '
 			<ul class="clear">';
 	// Email is only visible if it's your profile or you have the moderate_forum permission
-	if ($context['member']['show_email'])
-		echo '
+	if ($context['member']['show_email']) {
+			echo '
 				<li><a href="mailto:', $context['member']['email'], '" title="', $context['member']['email'], '" rel="nofollow"><span class="generic_icons mail" title="' . $txt['email'] . '"></span></a></li>';
+	}
 
 	// Don't show an icon if they haven't specified a website.
-	if ($context['member']['website']['url'] !== '' && !isset($context['disabled_fields']['website']))
-		echo '
+	if ($context['member']['website']['url'] !== '' && !isset($context['disabled_fields']['website'])) {
+			echo '
 				<li><a href="', $context['member']['website']['url'], '" title="' . $context['member']['website']['title'] . '" target="_blank" class="new_win">', ($settings['use_image_buttons'] ? '<span class="generic_icons www" title="' . $context['member']['website']['title'] . '"></span>' : $txt['www']), '</a></li>';
+	}
 
 	// Are there any custom profile fields as icons?
 	if (!empty($context['print_custom_fields']['icons']))
 	{
-		foreach ($context['print_custom_fields']['icons'] as $field)
-			if (!empty($field['output_html']))
+		foreach ($context['print_custom_fields']['icons'] as $field) {
+					if (!empty($field['output_html']))
 				echo '
 					<li class="custom_field">', $field['output_html'], '</li>';
+		}
 	}
 
 	echo '
@@ -225,23 +231,26 @@ 
 			<span id="userstatus">', $context['can_send_pm'] ? '<a href="' . $context['member']['online']['href'] . '" title="' . $context['member']['online']['text'] . '" rel="nofollow">' : '', $settings['use_image_buttons'] ? '<span class="' . ($context['member']['online']['is_online'] == 1 ? 'on' : 'off') . '" title="' . $context['member']['online']['text'] . '"></span>' : $context['member']['online']['label'], $context['can_send_pm'] ? '</a>' : '', $settings['use_image_buttons'] ? '<span class="smalltext"> ' . $context['member']['online']['label'] . '</span>' : '';
 
 	// Can they add this member as a buddy?
-	if (!empty($context['can_have_buddy']) && !$context['user']['is_owner'])
-		echo '
+	if (!empty($context['can_have_buddy']) && !$context['user']['is_owner']) {
+			echo '
 				<br><a href="', $scripturl, '?action=buddy;u=', $context['id_member'], ';', $context['session_var'], '=', $context['session_id'], '">[', $txt['buddy_' . ($context['member']['is_buddy'] ? 'remove' : 'add')], ']</a>';
+	}
 
 	echo '
 			</span>';
 
-	if (!$context['user']['is_owner'] && $context['can_send_pm'])
-		echo '
+	if (!$context['user']['is_owner'] && $context['can_send_pm']) {
+			echo '
 			<a href="', $scripturl, '?action=pm;sa=send;u=', $context['id_member'], '" class="infolinks">', $txt['profile_sendpm_short'], '</a>';
+	}
 
 	echo '
 			<a href="', $scripturl, '?action=profile;area=showposts;u=', $context['id_member'], '" class="infolinks">', $txt['showPosts'], '</a>';
 
-	if ($context['user']['is_owner'] && !empty($modSettings['drafts_post_enabled']))
-		echo '
+	if ($context['user']['is_owner'] && !empty($modSettings['drafts_post_enabled'])) {
+			echo '
 			<a href="', $scripturl, '?action=profile;area=showdrafts;u=', $context['id_member'], '" class="infolinks">', $txt['drafts_show'], '</a>';
+	}
 
 	echo '
 			<a href="', $scripturl, '?action=profile;area=statistics;u=', $context['id_member'], '" class="infolinks">', $txt['statPanel'], '</a>';
@@ -253,10 +262,11 @@ 
 			<div class="custom_fields_bottom">
 				<ul class="nolist">';
 
-		foreach ($context['print_custom_fields']['bottom_poster'] as $field)
-			if (!empty($field['output_html']))
+		foreach ($context['print_custom_fields']['bottom_poster'] as $field) {
+					if (!empty($field['output_html']))
 				echo '
 					<li>', $field['output_html'], '</li>';
+		}
 
 		echo '
 				</ul>
@@ -270,15 +280,17 @@ 
 		<div id="detailedinfo">
 			<dl class="settings">';
 
-	if ($context['user']['is_owner'] || $context['user']['is_admin'])
-		echo '
+	if ($context['user']['is_owner'] || $context['user']['is_admin']) {
+			echo '
 				<dt>', $txt['username'], ': </dt>
 				<dd>', $context['member']['username'], '</dd>';
+	}
 
-	if (!isset($context['disabled_fields']['posts']))
-		echo '
+	if (!isset($context['disabled_fields']['posts'])) {
+			echo '
 				<dt>', $txt['profile_posts'], ': </dt>
 				<dd>', $context['member']['posts'], ' (', $context['member']['posts_per_day'], ' ', $txt['posts_per_day'], ')</dd>';
+	}
 
 	if ($context['member']['show_email'])
 	{
@@ -287,15 +299,17 @@ 
 				<dd><a href="mailto:', $context['member']['email'], '">', $context['member']['email'], '</a></dd>';
 	}
 
-	if (!empty($modSettings['titlesEnable']) && !empty($context['member']['title']))
-		echo '
+	if (!empty($modSettings['titlesEnable']) && !empty($context['member']['title'])) {
+			echo '
 				<dt>', $txt['custom_title'], ': </dt>
 				<dd>', $context['member']['title'], '</dd>';
+	}
 
-	if (!empty($context['member']['blurb']))
-		echo '
+	if (!empty($context['member']['blurb'])) {
+			echo '
 				<dt>', $txt['personal_text'], ': </dt>
 				<dd>', $context['member']['blurb'], '</dd>';
+	}
 
 	echo '
 				<dt>', $txt['age'], ':</dt>
@@ -310,11 +324,12 @@ 
 		echo '
 				<dl class="settings">';
 
-		foreach ($context['print_custom_fields']['standard'] as $field)
-			if (!empty($field['output_html']))
+		foreach ($context['print_custom_fields']['standard'] as $field) {
+					if (!empty($field['output_html']))
 				echo '
 					<dt>', $field['name'], ':</dt>
 					<dd>', $field['output_html'], '</dd>';
+		}
 
 		echo '
 				</dl>';
@@ -332,9 +347,10 @@ 
 						<a href="', $scripturl, '?action=profile;u=', $context['id_member'], ';area=', ($context['can_issue_warning'] && !$context['user']['is_owner'] ? 'issuewarning' : 'viewwarning'), '">', $context['member']['warning'], '%</a>';
 
 		// Can we provide information on what this means?
-		if (!empty($context['warning_status']))
-			echo '
+		if (!empty($context['warning_status'])) {
+					echo '
 						<span class="smalltext">(', $context['warning_status'], ')</span>';
+		}
 
 		echo '
 					</dd>';
@@ -345,9 +361,10 @@ 
 	{
 
 		// If the person looking at the summary has permission, and the account isn't activated, give the viewer the ability to do it themselves.
-		if (!empty($context['activate_message']))
-			echo '
+		if (!empty($context['activate_message'])) {
+					echo '
 					<dt class="clear"><span class="alert">', $context['activate_message'], '</span>&nbsp;(<a href="', $context['activate_link'], '"', ($context['activate_type'] == 4 ? ' class="you_sure" data-confirm="' . $txt['profileConfirm'] . '"' : ''), '>', $context['activate_link_text'], '</a>)</dt>';
+		}
 
 		// If the current member is banned, show a message and possibly a link to the ban.
 		if (!empty($context['member']['bans']))
@@ -357,9 +374,10 @@ 
 					<dt class="clear" id="ban_info" style="display: none;">
 						<strong>', $txt['user_banned_by_following'], ':</strong>';
 
-			foreach ($context['member']['bans'] as $ban)
-				echo '
+			foreach ($context['member']['bans'] as $ban) {
+							echo '
 						<br><span class="smalltext">', $ban['explanation'], '</span>';
+			}
 
 			echo '
 					</dt>';
@@ -373,30 +391,34 @@ 
 	// If the person looking is allowed, they can check the members IP address and hostname.
 	if ($context['can_see_ip'])
 	{
-		if (!empty($context['member']['ip']))
-		echo '
+		if (!empty($context['member']['ip'])) {
+				echo '
 					<dt>', $txt['ip'], ': </dt>
 					<dd><a href="', $scripturl, '?action=profile;area=tracking;sa=ip;searchip=', $context['member']['ip'], ';u=', $context['member']['id'], '">', $context['member']['ip'], '</a></dd>';
+		}
 
-		if (empty($modSettings['disableHostnameLookup']) && !empty($context['member']['ip']))
-			echo '
+		if (empty($modSettings['disableHostnameLookup']) && !empty($context['member']['ip'])) {
+					echo '
 					<dt>', $txt['hostname'], ': </dt>
 					<dd>', $context['member']['hostname'], '</dd>';
+		}
 	}
 
 	echo '
 					<dt>', $txt['local_time'], ':</dt>
 					<dd>', $context['member']['local_time'], '</dd>';
 
-	if (!empty($modSettings['userLanguage']) && !empty($context['member']['language']))
-		echo '
+	if (!empty($modSettings['userLanguage']) && !empty($context['member']['language'])) {
+			echo '
 					<dt>', $txt['language'], ':</dt>
 					<dd>', $context['member']['language'], '</dd>';
+	}
 
-	if ($context['member']['show_last_login'])
-		echo '
+	if ($context['member']['show_last_login']) {
+			echo '
 					<dt>', $txt['lastLoggedIn'], ': </dt>
 					<dd>', $context['member']['last_login'], (!empty($context['member']['is_hidden']) ? ' (' . $txt['hidden'] . ')' : ''), '</dd>';
+	}
 
 	echo '
 				</dl>';
@@ -408,10 +430,11 @@ 
 				<div class="custom_fields_above_signature">
 					<ul class="nolist">';
 
-		foreach ($context['print_custom_fields']['above_signature'] as $field)
-			if (!empty($field['output_html']))
+		foreach ($context['print_custom_fields']['above_signature'] as $field) {
+					if (!empty($field['output_html']))
 				echo '
 						<li>', $field['output_html'], '</li>';
+		}
 
 		echo '
 					</ul>
@@ -419,12 +442,13 @@ 
 	}
 
 	// Show the users signature.
-	if ($context['signature_enabled'] && !empty($context['member']['signature']))
-		echo '
+	if ($context['signature_enabled'] && !empty($context['member']['signature'])) {
+			echo '
 				<div class="signature">
 					<h5>', $txt['signature'], ':</h5>
 					', $context['member']['signature'], '
 				</div>';
+	}
 
 	// Are there any custom profile fields for below the signature?
 	if (!empty($context['print_custom_fields']['below_signature']))
@@ -433,10 +457,11 @@ 
 				<div class="custom_fields_below_signature">
 					<ul class="nolist">';
 
-		foreach ($context['print_custom_fields']['below_signature'] as $field)
-			if (!empty($field['output_html']))
+		foreach ($context['print_custom_fields']['below_signature'] as $field) {
+					if (!empty($field['output_html']))
 				echo '
 						<li>', $field['output_html'], '</li>';
+		}
 
 		echo '
 					</ul>
@@ -481,62 +506,70 @@ 
 				</div>
 				<div class="list_posts">';
 
-			if (!$post['approved'])
-				echo '
+			if (!$post['approved']) {
+							echo '
 					<div class="approve_post">
 						<em>', $txt['post_awaiting_approval'], '</em>
 					</div>';
+			}
 
 			echo '
 					', $post['body'], '
 				</div>';
 
-			if ($post['can_reply'] || $post['can_quote'] || $post['can_delete'])
-				echo '
+			if ($post['can_reply'] || $post['can_quote'] || $post['can_delete']) {
+							echo '
 				<div class="floatright">
 					<ul class="quickbuttons">';
+			}
 
 			// If they *can* reply?
-			if ($post['can_reply'])
-				echo '
+			if ($post['can_reply']) {
+							echo '
 						<li><a href="', $scripturl, '?action=post;topic=', $post['topic'], '.', $post['start'], '"><span class="generic_icons reply_button"></span>', $txt['reply'], '</a></li>';
+			}
 
 			// If they *can* quote?
-			if ($post['can_quote'])
-				echo '
+			if ($post['can_quote']) {
+							echo '
 						<li><a href="', $scripturl . '?action=post;topic=', $post['topic'], '.', $post['start'], ';quote=', $post['id'], '"><span class="generic_icons quote"></span>', $txt['quote_action'], '</a></li>';
+			}
 
 			// How about... even... remove it entirely?!
-			if ($post['can_delete'])
-				echo '
+			if ($post['can_delete']) {
+							echo '
 						<li><a href="', $scripturl, '?action=deletemsg;msg=', $post['id'], ';topic=', $post['topic'], ';profile;u=', $context['member']['id'], ';start=', $context['start'], ';', $context['session_var'], '=', $context['session_id'], '" data-confirm="', $txt['remove_message'], '" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['remove'], '</a></li>';
+			}
 
-			if ($post['can_reply'] || $post['can_quote'] || $post['can_delete'])
-				echo '
+			if ($post['can_reply'] || $post['can_quote'] || $post['can_delete']) {
+							echo '
 					</ul>
 				</div>';
+			}
 
 			echo '
 			</div>';
 		}
+	} else {
+			template_show_list('attachments');
 	}
-	else
-		template_show_list('attachments');
 
 	// No posts? Just end with a informative message.
-	if ((isset($context['attachments']) && empty($context['attachments'])) || (!isset($context['attachments']) && empty($context['posts'])))
-		echo '
+	if ((isset($context['attachments']) && empty($context['attachments'])) || (!isset($context['attachments']) && empty($context['posts']))) {
+			echo '
 			<div class="windowbg2">
 				', isset($context['attachments']) ? $txt['show_attachments_none'] : ($context['is_topics'] ? $txt['show_topics_none'] : $txt['show_posts_none']), '
 			</div>';
+	}
 
 	// Show more page numbers.
-	if (!empty($context['page_index']))
-		echo '
+	if (!empty($context['page_index'])) {
+			echo '
 		<div class="pagesection">
 			<div class="pagelinks">', $context['page_index'], '</div>
 		</div>';
-}
+	}
+	}
 
 /**
  * Template for showing alerts within the alerts popup
@@ -546,11 +579,12 @@ 
 	global $context, $txt, $scripturl;
 
 	// Do we have an update message?
-	if (!empty($context['update_message']))
-		echo '
+	if (!empty($context['update_message'])) {
+			echo '
 		<div class="infobox">
 			', $context['update_message'], '.
 		</div>';
+	}
 
 	echo '
 		<div class="cat_bar">
@@ -559,13 +593,12 @@ 
 			</h3>
 		</div>';
 
-	if (empty($context['alerts']))
-		echo '
+	if (empty($context['alerts'])) {
+			echo '
 		<div class="information">
 			', $txt['alerts_none'], '
 		</div>';
-
-	else
+	} else
 	{
 		// Start the form.
 		echo '
@@ -627,12 +660,12 @@ 
 		</div>' : '';
 
 	// No drafts? Just show an informative message.
-	if (empty($context['drafts']))
-		echo '
+	if (empty($context['drafts'])) {
+			echo '
 		<div class="windowbg2 centertext">
 			', $txt['draft_none'], '
 		</div>';
-	else
+	} else
 	{
 		// For every draft to be displayed, give it its own div, and show the important details of the draft.
 		foreach ($context['drafts'] as $draft)
@@ -643,11 +676,13 @@ 
 					<div class="topic_details">
 						<h5><strong><a href="', $scripturl, '?board=', $draft['board']['id'], '.0">', $draft['board']['name'], '</a> / ', $draft['topic']['link'], '</strong> &nbsp; &nbsp;';
 
-			if (!empty($draft['sticky']))
-				echo '<span class="generic_icons sticky" title="', $txt['sticky_topic'], '"></span>';
+			if (!empty($draft['sticky'])) {
+							echo '<span class="generic_icons sticky" title="', $txt['sticky_topic'], '"></span>';
+			}
 
-			if (!empty($draft['locked']))
-				echo '<span class="generic_icons lock" title="', $txt['locked_topic'], '"></span>';
+			if (!empty($draft['locked'])) {
+							echo '<span class="generic_icons lock" title="', $txt['locked_topic'], '"></span>';
+			}
 
 			echo '
 						</h5>
@@ -680,12 +715,13 @@ 
 {
 	global $context, $scripturl, $txt;
 
-	if (!empty($context['saved_successful']))
-		echo '
+	if (!empty($context['saved_successful'])) {
+			echo '
 					<div class="infobox">', $context['user']['is_owner'] ? $txt['profile_updated_own'] : sprintf($txt['profile_updated_else'], $context['member']['name']), '</div>';
-	elseif (!empty($context['saved_failed']))
-		echo '
+	} elseif (!empty($context['saved_failed'])) {
+			echo '
 					<div class="errorbox">', $context['saved_failed'], '</div>';
+	}
 
 	echo '
 	<div id="edit_buddies">
@@ -699,24 +735,27 @@ 
 				<th scope="col" class="quarter_table">', $txt['name'], '</th>
 				<th scope="col">', $txt['status'], '</th>';
 
-	if (allowedTo('moderate_forum'))
-		echo '
+	if (allowedTo('moderate_forum')) {
+			echo '
 				<th scope="col">', $txt['email'], '</th>';
+	}
 
-	if (!empty($context['custom_pf']))
-		foreach ($context['custom_pf'] as $column)
+	if (!empty($context['custom_pf'])) {
+			foreach ($context['custom_pf'] as $column)
 				echo '<th scope="col">', $column['label'], '</th>';
+	}
 
 	echo '
 				<th scope="col">', $txt['remove'], '</th>
 			</tr>';
 
 	// If they don't have any buddies don't list them!
-	if (empty($context['buddies']))
-		echo '
+	if (empty($context['buddies'])) {
+			echo '
 			<tr class="windowbg">
 				<td colspan="', allowedTo('moderate_forum') ? '10' : '9', '"><strong>', $txt['no_buddies'], '</strong></td>
 			</tr>';
+	}
 
 		// Now loop through each buddy showing info on each.
 	else
@@ -728,15 +767,17 @@ 
 					<td>', $buddy['link'], '</td>
 					<td><a href="', $buddy['online']['href'], '"><span class="' . ($buddy['online']['is_online'] == 1 ? 'on' : 'off') . '" title="' . $buddy['online']['text'] . '"></span></a></td>';
 
-			if ($buddy['show_email'])
-				echo '
+			if ($buddy['show_email']) {
+							echo '
 					<td><a href="mailto:' . $buddy['email'] . '" rel="nofollow"><span class="generic_icons mail icon" title="' . $txt['email'] . ' ' . $buddy['name'] . '"></span></a></td>';
+			}
 
 			// Show the custom profile fields for this user.
-			if (!empty($context['custom_pf']))
-				foreach ($context['custom_pf'] as $key => $column)
+			if (!empty($context['custom_pf'])) {
+							foreach ($context['custom_pf'] as $key => $column)
 					echo '
 						<td class="lefttext">', $buddy['options'][$key], '</td>';
+			}
 
 			echo '
 					<td><a href="', $scripturl, '?action=profile;area=lists;sa=buddies;u=', $context['id_member'], ';remove=', $buddy['id'], ';', $context['session_var'], '=', $context['session_id'], '"><span class="generic_icons delete" title="', $txt['buddy_remove'], '"></span></a></td>
@@ -766,9 +807,10 @@ 
 			</dl>
 		</div>';
 
-	if (!empty($context['token_check']))
-		echo '
+	if (!empty($context['token_check'])) {
+			echo '
 			<input type="hidden" name="', $context[$context['token_check'] . '_token_var'], '" value="', $context[$context['token_check'] . '_token'], '">';
+	}
 
 	echo '
 		<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -794,12 +836,13 @@ 
 {
 	global $context, $scripturl, $txt;
 
-	if (!empty($context['saved_successful']))
-		echo '
+	if (!empty($context['saved_successful'])) {
+			echo '
 					<div class="infobox">', $context['user']['is_owner'] ? $txt['profile_updated_own'] : sprintf($txt['profile_updated_else'], $context['member']['name']), '</div>';
-	elseif (!empty($context['saved_failed']))
-		echo '
+	} elseif (!empty($context['saved_failed'])) {
+			echo '
 					<div class="errorbox">', $context['saved_failed'], '</div>';
+	}
 
 	echo '
 	<div id="edit_buddies">
@@ -813,20 +856,22 @@ 
 				<th scope="col" class="quarter_table">', $txt['name'], '</th>
 				<th scope="col">', $txt['status'], '</th>';
 
-	if (allowedTo('moderate_forum'))
-		echo '
+	if (allowedTo('moderate_forum')) {
+			echo '
 				<th scope="col">', $txt['email'], '</th>';
+	}
 
 	echo '
 				<th scope="col">', $txt['ignore_remove'], '</th>
 			</tr>';
 
 	// If they don't have anyone on their ignore list, don't list it!
-	if (empty($context['ignore_list']))
-		echo '
+	if (empty($context['ignore_list'])) {
+			echo '
 			<tr class="windowbg">
 				<td colspan="', allowedTo('moderate_forum') ? '4' : '3', '"><strong>', $txt['no_ignore'], '</strong></td>
 			</tr>';
+	}
 
 	// Now loop through each buddy showing info on each.
 	foreach ($context['ignore_list'] as $member)
@@ -836,9 +881,10 @@ 
 				<td>', $member['link'], '</td>
 				<td><a href="', $member['online']['href'], '"><span class="' . ($member['online']['is_online'] == 1 ? 'on' : 'off') . '" title="' . $member['online']['text'] . '"></span></a></td>';
 
-		if ($member['show_email'])
-			echo '
+		if ($member['show_email']) {
+					echo '
 				<td><a href="mailto:' . $member['email'] . '" rel="nofollow"><span class="generic_icons mail icon" title="' . $txt['email'] . ' ' . $member['name'] . '"></span></a></td>';
+		}
 		echo '
 				<td><a href="', $scripturl, '?action=profile;u=', $context['id_member'], ';area=lists;sa=ignore;remove=', $member['id'], ';', $context['session_var'], '=', $context['session_id'], '"><span class="generic_icons delete" title="', $txt['ignore_remove'], '"></span></a></td>
 			</tr>';
@@ -865,9 +911,10 @@ 
 			</dl>
 		</div>';
 
-	if (!empty($context['token_check']))
-		echo '
+	if (!empty($context['token_check'])) {
+			echo '
 		<input type="hidden" name="', $context[$context['token_check'] . '_token_var'], '" value="', $context[$context['token_check'] . '_token'], '">';
+	}
 
 	echo '
 		<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -912,9 +959,10 @@ 
 					<a href="', $scripturl, '?action=profile;area=tracking;sa=ip;searchip=', $context['last_ip'], ';u=', $context['member']['id'], '">', $context['last_ip'], '</a>';
 
 	// Second address detected?
-	if (!empty($context['last_ip2']))
-		echo '
+	if (!empty($context['last_ip2'])) {
+			echo '
 					, <a href="', $scripturl, '?action=profile;area=tracking;sa=ip;searchip=', $context['last_ip2'], ';u=', $context['member']['id'], '">', $context['last_ip2'], '</a>';
+	}
 
 	echo '
 				</dd>';
@@ -979,9 +1027,10 @@ 
 				<h3 class="catbg">', $txt['whois_title'], ' ', $context['ip'], '</h3>
 			</div>
 			<div class="windowbg2 noup">';
-			foreach ($context['whois_servers'] as $server)
-			echo '
+			foreach ($context['whois_servers'] as $server) {
+						echo '
 				<a href="', $server['url'], '" target="_blank" class="new_win"', isset($context['auto_whois_server']) && $context['auto_whois_server']['name'] == $server['name'] ? ' style="font-weight: bold;"' : '', '>', $server['name'], '</a><br>';
+			}
 			echo '
 			</div>
 			<br>';
@@ -992,10 +1041,10 @@ 
 		<div class="cat_bar">
 			<h3 class="catbg">', $txt['members_from_ip'], ' ', $context['ip'], '</h3>
 		</div>';
-	if (empty($context['ips']))
-		echo '
+	if (empty($context['ips'])) {
+			echo '
 		<p class="windowbg2 description"><em>', $txt['no_members_from_ip'], '</em></p>';
-	else
+	} else
 	{
 		echo '
 		<table class="table_grid">
@@ -1008,12 +1057,13 @@ 
 			<tbody>';
 
 		// Loop through each of the members and display them.
-		foreach ($context['ips'] as $ip => $memberlist)
-			echo '
+		foreach ($context['ips'] as $ip => $memberlist) {
+					echo '
 				<tr class="windowbg">
 					<td><a href="', $context['base_url'], ';searchip=', $ip, '">', $ip, '</a></td>
 					<td>', implode(', ', $memberlist), '</td>
 				</tr>';
+		}
 
 		echo '
 			</tbody>
@@ -1059,8 +1109,7 @@ 
 	{
 		echo '
 		<div class="information">', $txt['showPermissions_all'], '</div>';
-	}
-	else
+	} else
 	{
 		echo '
 		<div class="information">',$txt['showPermissions_help'], '</div>
@@ -1074,9 +1123,10 @@ 
 				</div>
 				<div class="windowbg smalltext">
 					', $txt['showPermissions_restricted_boards_desc'], ':<br>';
-				foreach ($context['no_access_boards'] as $no_access_board)
-					echo '
+				foreach ($context['no_access_boards'] as $no_access_board) {
+									echo '
 						<a href="', $scripturl, '?board=', $no_access_board['id'], '.0">', $no_access_board['name'], '</a>', $no_access_board['is_last'] ? '' : ', ';
+				}
 				echo '
 				</div>';
 		}
@@ -1108,12 +1158,13 @@ 
 								</td>
 								<td class="smalltext">';
 
-				if ($permission['is_denied'])
-					echo '
+				if ($permission['is_denied']) {
+									echo '
 									<span class="alert">', $txt['showPermissions_denied'], ':&nbsp;', implode(', ', $permission['groups']['denied']), '</span>';
-				else
-					echo '
+				} else {
+									echo '
 									', $txt['showPermissions_given'], ':&nbsp;', implode(', ', $permission['groups']['allowed']);
+				}
 
 					echo '
 								</td>
@@ -1123,10 +1174,10 @@ 
 						</tbody>
 					</table>
 				</div><br>';
-		}
-		else
-			echo '
+		} else {
+					echo '
 			<p class="windowbg2">', $txt['showPermissions_none_general'], '</p>';
+		}
 
 		// Board permission section.
 		echo '
@@ -1136,14 +1187,16 @@ 
 						<a id="board_permissions"></a>', $txt['showPermissions_select'], ':
 						<select name="board" onchange="if (this.options[this.selectedIndex].value) this.form.submit();">
 							<option value="0"', $context['board'] == 0 ? ' selected' : '', '>', $txt['showPermissions_global'], '&nbsp;</option>';
-				if (!empty($context['boards']))
-					echo '
+				if (!empty($context['boards'])) {
+									echo '
 							<option value="" disabled>---------------------------</option>';
+				}
 
 				// Fill the box with any local permission boards.
-				foreach ($context['boards'] as $board)
-					echo '
+				foreach ($context['boards'] as $board) {
+									echo '
 							<option value="', $board['id'], '"', $board['selected'] ? ' selected' : '', '>', $board['name'], ' (', $board['profile_name'], ')</option>';
+				}
 
 				echo '
 						</select>
@@ -1174,8 +1227,7 @@ 
 				{
 					echo '
 							<span class="alert">', $txt['showPermissions_denied'], ':&nbsp;', implode(', ', $permission['groups']['denied']), '</span>';
-				}
-				else
+				} else
 				{
 					echo '
 							', $txt['showPermissions_given'], ': &nbsp;', implode(', ', $permission['groups']['allowed']);
@@ -1187,10 +1239,10 @@ 
 			echo '
 				</tbody>
 			</table>';
-		}
-		else
-			echo '
+		} else {
+					echo '
 			<p class="windowbg2">', $txt['showPermissions_none_board'], '</p>';
+		}
 	echo '
 			</div>
 		</div>';
@@ -1232,9 +1284,10 @@ 
 			</div>';
 
 	// If they haven't post at all, don't draw the graph.
-	if (empty($context['posts_by_time']))
-		echo '
+	if (empty($context['posts_by_time'])) {
+			echo '
 			<p class="centertext padding">', $txt['statPanel_noPosts'], '</p>';
+	}
 	// Otherwise do!
 	else
 	{
@@ -1273,11 +1326,10 @@ 
 					</h3>
 				</div>';
 
-	if (empty($context['popular_boards']))
-		echo '
+	if (empty($context['popular_boards'])) {
+			echo '
 				<p class="centertext padding">', $txt['statPanel_noPosts'], '</p>';
-
-	else
+	} else
 	{
 		echo '
 				<dl class="stats">';
@@ -1308,10 +1360,10 @@ 
 					</h3>
 				</div>';
 
-	if (empty($context['board_activity']))
-		echo '
+	if (empty($context['board_activity'])) {
+			echo '
 				<p class="centertext padding">', $txt['statPanel_noPosts'], '</p>';
-	else
+	} else
 	{
 		echo '
 				<dl class="stats">';
@@ -1359,41 +1411,46 @@ 
 				<h3 class="catbg profile_hd">';
 
 		// Don't say "Profile" if this isn't the profile...
-		if (!empty($context['profile_header_text']))
-			echo '
+		if (!empty($context['profile_header_text'])) {
+					echo '
 					', $context['profile_header_text'];
-		else
-			echo '
+		} else {
+					echo '
 					', $txt['profile'];
+		}
 
 		echo '
 				</h3>
 			</div>';
 
 	// Have we some description?
-	if ($context['page_desc'])
-		echo '
+	if ($context['page_desc']) {
+			echo '
 			<p class="information">', $context['page_desc'], '</p>';
+	}
 
 	echo '
 			<div class="roundframe">';
 
 	// Any bits at the start?
-	if (!empty($context['profile_prehtml']))
-		echo '
+	if (!empty($context['profile_prehtml'])) {
+			echo '
 				<div>', $context['profile_prehtml'], '</div>';
+	}
 
-	if (!empty($context['profile_fields']))
-		echo '
+	if (!empty($context['profile_fields'])) {
+			echo '
 				<dl class="settings">';
+	}
 
 	// Start the big old loop 'of love.
 	$lastItem = 'hr';
 	foreach ($context['profile_fields'] as $key => $field)
 	{
 		// We add a little hack to be sure we never get more than one hr in a row!
-		if ($lastItem == 'hr' && $field['type'] == 'hr')
-			continue;
+		if ($lastItem == 'hr' && $field['type'] == 'hr') {
+					continue;
+		}
 
 		$lastItem = $field['type'];
 		if ($field['type'] == 'hr')
@@ -1402,48 +1459,50 @@ 
 				</dl>
 				<hr>
 				<dl class="settings">';
-		}
-		elseif ($field['type'] == 'callback')
+		} elseif ($field['type'] == 'callback')
 		{
 			if (isset($field['callback_func']) && function_exists('template_profile_' . $field['callback_func']))
 			{
 				$callback_func = 'template_profile_' . $field['callback_func'];
 				$callback_func();
 			}
-		}
-		else
+		} else
 		{
 			echo '
 					<dt>
 						<strong', !empty($field['is_error']) ? ' class="error"' : '', '>', $field['type'] !== 'label' ? '<label for="' . $key . '">' : '', $field['label'], $field['type'] !== 'label' ? '</label>' : '', '</strong>';
 
 			// Does it have any subtext to show?
-			if (!empty($field['subtext']))
-				echo '
+			if (!empty($field['subtext'])) {
+							echo '
 						<br>
 						<span class="smalltext">', $field['subtext'], '</span>';
+			}
 
 			echo '
 					</dt>
 					<dd>';
 
 			// Want to put something infront of the box?
-			if (!empty($field['preinput']))
-				echo '
+			if (!empty($field['preinput'])) {
+							echo '
 						', $field['preinput'];
+			}
 
 			// What type of data are we showing?
-			if ($field['type'] == 'label')
-				echo '
+			if ($field['type'] == 'label') {
+							echo '
 						', $field['value'];
+			}
 
 			// Maybe it's a text box - very likely!
 			elseif (in_array($field['type'], array('int', 'float', 'text', 'password', 'color', 'date', 'datetime', 'datetime-local', 'email', 'month', 'number', 'time', 'url')))
 			{
-				if ($field['type'] == 'int' || $field['type'] == 'float')
-					$type = 'number';
-				else
-					$type = $field['type'];
+				if ($field['type'] == 'int' || $field['type'] == 'float') {
+									$type = 'number';
+				} else {
+									$type = $field['type'];
+				}
 				$step = $field['type'] == 'float' ? ' step="0.1"' : '';
 
 
@@ -1451,9 +1510,10 @@ 
 						<input type="', $type, '" name="', $key, '" id="', $key, '" size="', empty($field['size']) ? 30 : $field['size'], '" value="', $field['value'], '" ', $field['input_attr'], ' class="input_', $field['type'] == 'password' ? 'password' : 'text', '"', $step, '>';
 			}
 			// You "checking" me out? ;)
-			elseif ($field['type'] == 'check')
-				echo '
+			elseif ($field['type'] == 'check') {
+							echo '
 						<input type="hidden" name="', $key, '" value="0"><input type="checkbox" name="', $key, '" id="', $key, '"', !empty($field['value']) ? ' checked' : '', ' value="1" class="input_check" ', $field['input_attr'], '>';
+			}
 
 			// Always fun - select boxes!
 			elseif ($field['type'] == 'select')
@@ -1464,13 +1524,15 @@ 
 				if (isset($field['options']))
 				{
 					// Is this some code to generate the options?
-					if (!is_array($field['options']))
-						$field['options'] = $field['options']();
+					if (!is_array($field['options'])) {
+											$field['options'] = $field['options']();
+					}
 					// Assuming we now have some!
-					if (is_array($field['options']))
-						foreach ($field['options'] as $value => $name)
+					if (is_array($field['options'])) {
+											foreach ($field['options'] as $value => $name)
 							echo '
 								<option value="', $value, '"', $value == $field['value'] ? ' selected' : '', '>', $name, '</option>';
+					}
 				}
 
 				echo '
@@ -1478,25 +1540,28 @@ 
 			}
 
 			// Something to end with?
-			if (!empty($field['postinput']))
-				echo '
+			if (!empty($field['postinput'])) {
+							echo '
 							', $field['postinput'];
+			}
 
 			echo '
 					</dd>';
 		}
 	}
 
-	if (!empty($context['profile_fields']))
-		echo '
+	if (!empty($context['profile_fields'])) {
+			echo '
 				</dl>';
+	}
 
 	// Are there any custom profile fields - if so print them!
 	if (!empty($context['custom_fields']))
 	{
-		if ($lastItem != 'hr')
-			echo '
+		if ($lastItem != 'hr') {
+					echo '
 				<hr>';
+		}
 
 		echo '
 				<dl class="settings">';
@@ -1519,13 +1584,14 @@ 
 	}
 
 	// Any closing HTML?
-	if (!empty($context['profile_posthtml']))
-		echo '
+	if (!empty($context['profile_posthtml'])) {
+			echo '
 				<div>', $context['profile_posthtml'], '</div>';
+	}
 
 	// Only show the password box if it's actually needed.
-	if ($context['require_password'])
-		echo '
+	if ($context['require_password']) {
+			echo '
 				<dl class="settings">
 					<dt>
 						<strong', isset($context['modify_error']['bad_password']) || isset($context['modify_error']['no_password']) ? ' class="error"' : '', '><label for="oldpasswrd">', $txt['current_password'], ': </label></strong><br>
@@ -1535,18 +1601,21 @@ 
 						<input type="password" name="oldpasswrd" id="oldpasswrd" size="20" style="margin-right: 4ex;" class="input_password">
 					</dd>
 				</dl>';
+	}
 
 	// The button shouldn't say "Change profile" unless we're changing the profile...
-	if (!empty($context['submit_button_text']))
-		echo '
+	if (!empty($context['submit_button_text'])) {
+			echo '
 				<input type="submit" name="save" value="', $context['submit_button_text'], '" class="button_submit">';
-	else
-		echo '
+	} else {
+			echo '
 				<input type="submit" name="save" value="', $txt['change_profile'], '" class="button_submit">';
+	}
 
-	if (!empty($context['token_check']))
-		echo '
+	if (!empty($context['token_check'])) {
+			echo '
 				<input type="hidden" name="', $context[$context['token_check'] . '_token_var'], '" value="', $context[$context['token_check'] . '_token'], '">';
+	}
 
 	echo '
 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -1556,10 +1625,11 @@ 
 		</form>';
 
 	// Any final spellchecking stuff?
-	if (!empty($context['show_spellchecking']))
-		echo '
+	if (!empty($context['show_spellchecking'])) {
+			echo '
 		<form name="spell_form" id="spell_form" method="post" accept-charset="', $context['character_set'], '" target="spellWindow" action="', $scripturl, '?action=spellcheck"><input type="hidden" name="spellstring" value=""></form>';
-}
+	}
+	}
 
 /**
  * Personal Message settings.
@@ -1596,10 +1666,11 @@ 
 										<select name="pm_receive_from" id="pm_receive_from">
 												<option value="0"', empty($context['receive_from']) || (empty($modSettings['enable_buddylist']) && $context['receive_from'] < 3) ? ' selected' : '', '>', $txt['pm_receive_from_everyone'], '</option>';
 
-	if (!empty($modSettings['enable_buddylist']))
-		echo '
+	if (!empty($modSettings['enable_buddylist'])) {
+			echo '
 												<option value="1"', !empty($context['receive_from']) && $context['receive_from'] == 1 ? ' selected' : '', '>', $txt['pm_receive_from_ignore'], '</option>
 												<option value="2"', !empty($context['receive_from']) && $context['receive_from'] == 2 ? ' selected' : '', '>', $txt['pm_receive_from_buddies'], '</option>';
+	}
 
 	echo '
 												<option value="3"', !empty($context['receive_from']) && $context['receive_from'] > 2 ? ' selected' : '', '>', $txt['pm_receive_from_admins'], '</option>
@@ -1641,11 +1712,12 @@ 
 		if (empty($setting) || !is_array($setting))
 		{
 			// Insert a separator (unless this is the first item in the list)
-			if ($i !== $first_option_key)
-				echo '
+			if ($i !== $first_option_key) {
+							echo '
 				</dl>
 				<hr>
 				<dl class="settings">';
+			}
 
 			// Should we give a name to this section?
 			if (is_string($setting) && !empty($setting))
@@ -1653,48 +1725,52 @@ 
 				$titled_section = true;
 				echo '
 					<dt><b>' . $setting . '</b></dt><dd></dd>';
+			} else {
+							$titled_section = false;
 			}
-			else
-				$titled_section = false;
 
 			continue;
 		}
 
 		// Is this disabled?
-		if ($setting['id'] == 'calendar_start_day' && empty($modSettings['cal_enabled']))
-			continue;
-		elseif (($setting['id'] == 'topics_per_page' || $setting['id'] == 'messages_per_page') && !empty($modSettings['disableCustomPerPage']))
-			continue;
-		elseif ($setting['id'] == 'show_no_censored' && empty($modSettings['allow_no_censored']))
-			continue;
-		elseif ($setting['id'] == 'posts_apply_ignore_list' && empty($modSettings['enable_buddylist']))
-			continue;
-		elseif ($setting['id'] == 'wysiwyg_default' && !empty($modSettings['disable_wysiwyg']))
-			continue;
-		elseif ($setting['id'] == 'topics_per_page' && !empty($modSettings['disableCustomPerPage']))
-			continue;
-		elseif ($setting['id'] == 'drafts_autosave_enabled' && (empty($modSettings['drafts_autosave_enabled']) || (empty($modSettings['drafts_post_enabled']) && empty($modSettings['drafts_pm_enabled']))))
-			continue;
-		elseif ($setting['id'] == 'drafts_show_saved_enabled' && (empty($modSettings['drafts_show_saved_enabled']) || (empty($modSettings['drafts_post_enabled']) && empty($modSettings['drafts_pm_enabled']))))
-			continue;
+		if ($setting['id'] == 'calendar_start_day' && empty($modSettings['cal_enabled'])) {
+					continue;
+		} elseif (($setting['id'] == 'topics_per_page' || $setting['id'] == 'messages_per_page') && !empty($modSettings['disableCustomPerPage'])) {
+					continue;
+		} elseif ($setting['id'] == 'show_no_censored' && empty($modSettings['allow_no_censored'])) {
+					continue;
+		} elseif ($setting['id'] == 'posts_apply_ignore_list' && empty($modSettings['enable_buddylist'])) {
+					continue;
+		} elseif ($setting['id'] == 'wysiwyg_default' && !empty($modSettings['disable_wysiwyg'])) {
+					continue;
+		} elseif ($setting['id'] == 'topics_per_page' && !empty($modSettings['disableCustomPerPage'])) {
+					continue;
+		} elseif ($setting['id'] == 'drafts_autosave_enabled' && (empty($modSettings['drafts_autosave_enabled']) || (empty($modSettings['drafts_post_enabled']) && empty($modSettings['drafts_pm_enabled'])))) {
+					continue;
+		} elseif ($setting['id'] == 'drafts_show_saved_enabled' && (empty($modSettings['drafts_show_saved_enabled']) || (empty($modSettings['drafts_post_enabled']) && empty($modSettings['drafts_pm_enabled'])))) {
+					continue;
+		}
 
-		if (!isset($setting['type']) || $setting['type'] == 'bool')
-			$setting['type'] = 'checkbox';
-		elseif ($setting['type'] == 'int' || $setting['type'] == 'integer')
-			$setting['type'] = 'number';
-		elseif ($setting['type'] == 'string')
-			$setting['type'] = 'text';
+		if (!isset($setting['type']) || $setting['type'] == 'bool') {
+					$setting['type'] = 'checkbox';
+		} elseif ($setting['type'] == 'int' || $setting['type'] == 'integer') {
+					$setting['type'] = 'number';
+		} elseif ($setting['type'] == 'string') {
+					$setting['type'] = 'text';
+		}
 
-		if (isset($setting['options']))
-			$setting['type'] = 'list';
+		if (isset($setting['options'])) {
+					$setting['type'] = 'list';
+		}
 
 		echo '
 					<dt>
 						<label for="', $setting['id'], '">', !$titled_section ? '<b>' : '', $setting['label'], !$titled_section ? '</b>' : '', '</label>';
 
-		if (isset($setting['description']))
-			echo '
+		if (isset($setting['description'])) {
+					echo '
 						<br><span class="smalltext">', $setting['description'], '</span>';
+		}
 		echo '
 					</dt>
 					<dd>';
@@ -1732,13 +1808,11 @@ 
 
 				echo '
 						<input type="number"', $min . $max . $step;
-			}
-			else if (isset($setting['type']) && $setting['type'] == 'url')
+			} else if (isset($setting['type']) && $setting['type'] == 'url')
 			{
 				echo'
 						<input type="url"';
-			}
-			else
+			} else
 			{
 				echo '
 						<input type="text"';
@@ -1777,8 +1851,8 @@ 
 				<dl class="settings">';
 
 	// Allow notification on announcements to be disabled?
-	if (!empty($modSettings['allow_disableAnnounce']))
-		echo '
+	if (!empty($modSettings['allow_disableAnnounce'])) {
+			echo '
 					<dt>
 						<label for="notify_announcements">', $txt['notify_important_email'], '</label>
 					</dt>
@@ -1786,9 +1860,10 @@ 
 						<input type="hidden" name="notify_announcements" value="0">
 						<input type="checkbox" id="notify_announcements" name="notify_announcements" value="1"', !empty($context['member']['notify_announcements']) ? ' checked' : '', ' class="input_check">
 					</dd>';
+	}
 
-	if (!empty($modSettings['enable_ajax_alerts']))
-		echo '
+	if (!empty($modSettings['enable_ajax_alerts'])) {
+			echo '
 					<dt>
 						<label for="notify_send_body">', $txt['notify_alert_timeout'], '</label>
 					</dt>
@@ -1796,6 +1871,7 @@ 
 						<input type="number" size="4" id="notify_alert_timeout" name="opt_alert_timeout" min="0" value="', $context['member']['alert_timeout'], '" class="input_text">
 					</dd>
 		';
+	}
 
 	echo '
 				</dl>
@@ -1825,9 +1901,10 @@ 
 					<td colspan="3">';
 				$label = $txt['alert_opt_' . $opts[1]];
 				$label_pos = isset($opts['label']) ? $opts['label'] : '';
-				if ($label_pos == 'before')
-					echo '
+				if ($label_pos == 'before') {
+									echo '
 					<label for="opt_', $opts[1], '">', $label, '</label>';
+				}
 
 				$this_value = isset($context['alert_prefs'][$opts[1]]) ? $context['alert_prefs'][$opts[1]] : 0;
 				switch ($opts[0])
@@ -1839,17 +1916,19 @@ 
 					case 'select':
 						echo '
 						<select name="opt_', $opts[1], '" id="opt_', $opts[1], '">';
-						foreach ($opts['opts'] as $k => $v)
-							echo '
+						foreach ($opts['opts'] as $k => $v) {
+													echo '
 							<option value="', $k, '"', $this_value == $k ? ' selected' : '', '>', $v, '</option>';
+						}
 						echo '
 						</select>';
 						break;
 				}
 
-				if ($label_pos == 'after')
-					echo '
+				if ($label_pos == 'after') {
+									echo '
 					<label for="opt_', $opts[1], '">', $label, '</label>';
+				}
 
 				echo '
 					</td>
@@ -1963,11 +2042,12 @@ 
 			<p class="information">', $txt['groupMembership_info'], '</p>';
 
 	// Do we have an update message?
-	if (!empty($context['update_message']))
-		echo '
+	if (!empty($context['update_message'])) {
+			echo '
 			<div class="infobox">
 				', $context['update_message'], '.
 			</div>';
+	}
 
 	echo '
 		<div id="groups">';
@@ -1989,8 +2069,7 @@ 
 					</div>
 				</div>
 			</div>';
-	}
-	else
+	} else
 	{
 		echo '
 			<div class="title_bar">
@@ -2002,27 +2081,30 @@ 
 			echo '
 					<div class="windowbg" id="primdiv_', $group['id'], '">';
 
-				if ($context['can_edit_primary'])
-					echo '
+				if ($context['can_edit_primary']) {
+									echo '
 						<input type="radio" name="primary" id="primary_', $group['id'], '" value="', $group['id'], '"', $group['is_primary'] ? ' checked' : '', ' onclick="highlightSelected(\'primdiv_' . $group['id'] . '\');"', $group['can_be_primary'] ? '' : ' disabled', ' class="input_radio">';
+				}
 
 				echo '
 						<label for="primary_', $group['id'], '"><strong>', (empty($group['color']) ? $group['name'] : '<span style="color: ' . $group['color'] . '">' . $group['name'] . '</span>'), '</strong>', (!empty($group['desc']) ? '<br><span class="smalltext">' . $group['desc'] . '</span>' : ''), '</label>';
 
 				// Can they leave their group?
-				if ($group['can_leave'])
-					echo '
+				if ($group['can_leave']) {
+									echo '
 						<a href="' . $scripturl . '?action=profile;save;u=' . $context['id_member'] . ';area=groupmembership;' . $context['session_var'] . '=' . $context['session_id'] . ';gid=' . $group['id'] . ';', $context[$context['token_check'] . '_token_var'], '=', $context[$context['token_check'] . '_token'], '">' . $txt['leave_group'] . '</a>';
+				}
 
 				echo '
 					</div>';
 		}
 
-		if ($context['can_edit_primary'])
-			echo '
+		if ($context['can_edit_primary']) {
+					echo '
 			<div class="padding righttext">
 				<input type="submit" value="', $txt['make_primary'], '" class="button_submit">
 			</div>';
+		}
 
 		// Any groups they can join?
 		if (!empty($context['groups']['available']))
@@ -2038,15 +2120,16 @@ 
 					<div class="windowbg">
 						<strong>', (empty($group['color']) ? $group['name'] : '<span style="color: ' . $group['color'] . '">' . $group['name'] . '</span>'), '</strong>', (!empty($group['desc']) ? '<br><span class="smalltext">' . $group['desc'] . '</span>' : ''), '';
 
-				if ($group['type'] == 3)
-					echo '
+				if ($group['type'] == 3) {
+									echo '
 						<a href="', $scripturl, '?action=profile;save;u=', $context['id_member'], ';area=groupmembership;', $context['session_var'], '=', $context['session_id'], ';gid=', $group['id'], ';', $context[$context['token_check'] . '_token_var'], '=', $context[$context['token_check'] . '_token'], '" class="button floatright">', $txt['join_group'], '</a>';
-				elseif ($group['type'] == 2 && $group['pending'])
-					echo '
+				} elseif ($group['type'] == 2 && $group['pending']) {
+									echo '
 						<span class="floatright">', $txt['approval_pending'], '</span>';
-				elseif ($group['type'] == 2)
-					echo '
+				} elseif ($group['type'] == 2) {
+									echo '
 						<a href="', $scripturl, '?action=profile;u=', $context['id_member'], ';area=groupmembership;request=', $group['id'], '" class="button floatright">', $txt['request_group'], '</a>';
+				}
 
 				echo '
 					</div>';
@@ -2069,9 +2152,10 @@ 
 
 			prevDiv.className = "windowbg";
 		}';
-		if (isset($context['groups']['member'][$context['primary_group']]))
-			echo '
+		if (isset($context['groups']['member'][$context['primary_group']])) {
+					echo '
 		highlightSelected("primdiv_' . $context['primary_group'] . '");';
+		}
 		echo '
 	</script>';
 	}
@@ -2079,9 +2163,10 @@ 
 	echo '
 		</div>';
 
-	if (!empty($context['token_check']))
-		echo '
+	if (!empty($context['token_check'])) {
+			echo '
 				<input type="hidden" name="', $context[$context['token_check'] . '_token_var'], '" value="', $context[$context['token_check'] . '_token'], '">';
+	}
 
 	echo '
 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -2128,14 +2213,15 @@ 
 
 		foreach ($category['boards'] as $board)
 		{
-			if ($i == $limit)
-				echo '
+			if ($i == $limit) {
+							echo '
 						</ul>
 					</li>
 				</ul>
 				<ul class="ignoreboards floatright">
 					<li class="category">
 						<ul>';
+			}
 
 			echo '
 							<li class="board" style="margin-', $context['right_to_left'] ? 'right' : 'left', ': ', $board['child_level'], 'em;">
@@ -2181,10 +2267,11 @@ 
 
 	// Work out the starting color.
 	$context['current_color'] = $context['colors'][0];
-	foreach ($context['colors'] as $limit => $color)
-		if ($context['member']['warning'] >= $limit)
+	foreach ($context['colors'] as $limit => $color) {
+			if ($context['member']['warning'] >= $limit)
 			$context['current_color'] = $color;
-}
+	}
+	}
 
 // Show all warnings of a user?
 function template_viewWarning()
@@ -2223,14 +2310,15 @@ 
 				</dd>';
 
 		// There's some impact of this?
-		if (!empty($context['level_effects'][$context['current_level']]))
-			echo '
+		if (!empty($context['level_effects'][$context['current_level']])) {
+					echo '
 				<dt>
 					<strong>', $txt['profile_viewwarning_impact'], ':</strong>
 				</dt>
 				<dd>
 					', $context['level_effects'][$context['current_level']], '
 				</dd>';
+		}
 
 		echo '
 			</dl>
@@ -2268,10 +2356,11 @@ 
 
 			// Otherwise see what we can do...';
 
-	foreach ($context['notification_templates'] as $k => $type)
-		echo '
+	foreach ($context['notification_templates'] as $k => $type) {
+			echo '
 			if (index == ', $k, ')
 				document.getElementById(\'warn_body\').value = "', strtr($type['body'], array('"' => "'", "\n" => '\\n', "\r" => '')), '";';
+	}
 
 	echo '
 		}
@@ -2281,10 +2370,11 @@ 
 			// Also set the right effect.
 			effectText = "";';
 
-	foreach ($context['level_effects'] as $limit => $text)
-		echo '
+	foreach ($context['level_effects'] as $limit => $text) {
+			echo '
 			if (slideAmount >= ', $limit, ')
 				effectText = "', $text, '";';
+	}
 
 	echo '
 			setInnerHTML(document.getElementById(\'cur_level_div\'), slideAmount + \'% (\' + effectText + \')\');
@@ -2299,31 +2389,34 @@ 
 			</h3>
 		</div>';
 
-	if (!$context['user']['is_owner'])
-		echo '
+	if (!$context['user']['is_owner']) {
+			echo '
 		<p class="information">', $txt['profile_warning_desc'], '</p>';
+	}
 
 	echo '
 		<div class="windowbg">
 			<dl class="settings">';
 
-	if (!$context['user']['is_owner'])
-		echo '
+	if (!$context['user']['is_owner']) {
+			echo '
 				<dt>
 					<strong>', $txt['profile_warning_name'], ':</strong>
 				</dt>
 				<dd>
 					<strong>', $context['member']['name'], '</strong>
 				</dd>';
+	}
 
 	echo '
 				<dt>
 					<strong>', $txt['profile_warning_level'], ':</strong>';
 
 	// Is there only so much they can apply?
-	if ($context['warning_limit'])
-		echo '
+	if ($context['warning_limit']) {
+			echo '
 					<br><span class="smalltext">', sprintf($txt['profile_warning_limit_attribute'], $context['warning_limit']), '</span>';
+	}
 
 	echo '
 				</dt>
@@ -2376,9 +2469,10 @@ 
 						<option value="-1">', $txt['profile_warning_notify_template'], '</option>
 						<option value="-1" disabled>------------------------------</option>';
 
-		foreach ($context['notification_templates'] as $id_template => $template)
-			echo '
+		foreach ($context['notification_templates'] as $id_template => $template) {
+					echo '
 						<option value="', $id_template, '">', $template['title'], '</option>';
+		}
 
 		echo '
 					</select>
@@ -2390,9 +2484,10 @@ 
 			</dl>
 			<div class="righttext">';
 
-	if (!empty($context['token_check']))
-		echo '
+	if (!empty($context['token_check'])) {
+			echo '
 				<input type="hidden" name="', $context[$context['token_check'] . '_token_var'], '" value="', $context[$context['token_check'] . '_token'], '">';
+	}
 
 	echo '
 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -2408,8 +2503,8 @@ 
 	echo '
 	<script>';
 
-	if (!$context['user']['is_owner'])
-		echo '
+	if (!$context['user']['is_owner']) {
+			echo '
 		modifyWarnNotify();
 		$(document).ready(function() {
 			$("#preview_button").click(function() {
@@ -2448,6 +2543,7 @@ 
 			});
 			return false;
 		}';
+	}
 
 	echo '
 	</script>';
@@ -2470,16 +2566,18 @@ 
 			</div>';
 
 	// If deleting another account give them a lovely info box.
-	if (!$context['user']['is_owner'])
-		echo '
+	if (!$context['user']['is_owner']) {
+			echo '
 			<p class="information">', $txt['deleteAccount_desc'], '</p>';
+	}
 	echo '
 			<div class="windowbg2">';
 
 	// If they are deleting their account AND the admin needs to approve it - give them another piece of info ;)
-	if ($context['needs_approval'])
-		echo '
+	if ($context['needs_approval']) {
+			echo '
 				<div class="errorbox">', $txt['deleteAccount_approval'], '</div>';
+	}
 
 	// If the user is deleting their own account warn them first - and require a password!
 	if ($context['user']['is_owner'])
@@ -2491,9 +2589,10 @@ 
 					<input type="password" name="oldpasswrd" size="20" class="input_password">&nbsp;&nbsp;&nbsp;&nbsp;
 					<input type="submit" value="', $txt['yes'], '" class="button_submit">';
 
-		if (!empty($context['token_check']))
-			echo '
+		if (!empty($context['token_check'])) {
+					echo '
 				<input type="hidden" name="', $context[$context['token_check'] . '_token_var'], '" value="', $context[$context['token_check'] . '_token'], '">';
+		}
 
 		echo '
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -2519,9 +2618,10 @@ 
 						<option value="topics">', $txt['deleteAccount_topics'], '</option>
 					</select>';
 
-			if ($context['show_perma_delete'])
-				echo '
+			if ($context['show_perma_delete']) {
+							echo '
 					<br><label for="perma_delete"><input type="checkbox" name="perma_delete" id="perma_delete" value="1" class="input_check">', $txt['deleteAccount_permanent'], ':</label>';
+			}
 
 			echo '
 				</div>';
@@ -2534,9 +2634,10 @@ 
 				<div>
 					<input type="submit" value="', $txt['delete'], '" class="button_submit">';
 
-		if (!empty($context['token_check']))
-			echo '
+		if (!empty($context['token_check'])) {
+					echo '
 				<input type="hidden" name="', $context[$context['token_check'] . '_token_var'], '" value="', $context[$context['token_check'] . '_token'], '">';
+		}
 
 		echo '
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -2562,8 +2663,8 @@ 
 					<hr>';
 
 	// Only show the password box if it's actually needed.
-	if ($context['require_password'])
-		echo '
+	if ($context['require_password']) {
+			echo '
 					<dl class="settings">
 						<dt>
 							<strong', isset($context['modify_error']['bad_password']) || isset($context['modify_error']['no_password']) ? ' class="error"' : '', '>', $txt['current_password'], ': </strong><br>
@@ -2573,13 +2674,15 @@ 
 							<input type="password" name="oldpasswrd" size="20" style="margin-right: 4ex;" class="input_password">
 						</dd>
 					</dl>';
+	}
 
 	echo '
 					<div class="righttext">';
 
-		if (!empty($context['token_check']))
-			echo '
+		if (!empty($context['token_check'])) {
+					echo '
 				<input type="hidden" name="', $context[$context['token_check'] . '_token_var'], '" value="', $context[$context['token_check'] . '_token'], '">';
+		}
 
 	echo '
 						<input type="submit" value="', $txt['change_profile'], '" class="button_submit">
@@ -2606,9 +2709,10 @@ 
 			<ul id="list_errors">';
 
 		// Cycle through each error and display an error message.
-		foreach ($context['post_errors'] as $error)
-			echo '
+		foreach ($context['post_errors'] as $error) {
+					echo '
 				<li>', isset($txt['profile_error_' . $error]) ? $txt['profile_error_' . $error] : $error, '</li>';
+		}
 
 		echo '
 			</ul>';
@@ -2634,12 +2738,13 @@ 
 								<select name="id_group" ', ($context['user']['is_owner'] && $context['member']['group_id'] == 1 ? 'onchange="if (this.value != 1 &amp;&amp; !confirm(\'' . $txt['deadmin_confirm'] . '\')) this.value = 1;"' : ''), '>';
 
 		// Fill the select box with all primary member groups that can be assigned to a member.
-		foreach ($context['member_groups'] as $member_group)
-			if (!empty($member_group['can_be_primary']))
+		foreach ($context['member_groups'] as $member_group) {
+					if (!empty($member_group['can_be_primary']))
 				echo '
 									<option value="', $member_group['id'], '"', $member_group['is_primary'] ? ' selected' : '', '>
 										', $member_group['name'], '
 									</option>';
+		}
 		echo '
 								</select>
 							</dd>
@@ -2651,10 +2756,11 @@ 
 									<input type="hidden" name="additional_groups[]" value="0">';
 
 		// For each membergroup show a checkbox so members can be assigned to more than one group.
-		foreach ($context['member_groups'] as $member_group)
-			if ($member_group['can_be_additional'])
+		foreach ($context['member_groups'] as $member_group) {
+					if ($member_group['can_be_additional'])
 				echo '
 									<label for="additional_groups-', $member_group['id'], '"><input type="checkbox" name="additional_groups[]" value="', $member_group['id'], '" id="additional_groups-', $member_group['id'], '"', $member_group['is_additional'] ? ' checked' : '', ' class="input_check"> ', $member_group['name'], '</label><br>';
+		}
 		echo '
 								</span>
 								<a href="javascript:void(0);" onclick="document.getElementById(\'additional_groupsList\').style.display = \'block\'; document.getElementById(\'additional_groupsLink\').style.display = \'none\'; return false;" id="additional_groupsLink" style="display: none;" class="toggle_down">', $txt['additional_membergroups_show'], '</a>
@@ -2714,9 +2820,10 @@ 
 								<span class="smalltext">', $txt['sig_info'], '</span><br>
 								<br>';
 
-	if ($context['show_spellchecking'])
-		echo '
+	if ($context['show_spellchecking']) {
+			echo '
 								<input type="button" value="', $txt['spell_check'], '" onclick="spellCheck(\'creator\', \'signature\');" class="button_submit">';
+	}
 
 		echo '
 							</dt>
@@ -2724,17 +2831,20 @@ 
 								<textarea class="editor" onkeyup="calcCharLeft();" id="signature" name="signature" rows="5" cols="50" style="min-width: 50%; max-width: 99%;">', $context['member']['signature'], '</textarea><br>';
 
 	// If there is a limit at all!
-	if (!empty($context['signature_limits']['max_length']))
-		echo '
+	if (!empty($context['signature_limits']['max_length'])) {
+			echo '
 								<span class="smalltext">', sprintf($txt['max_sig_characters'], $context['signature_limits']['max_length']), ' <span id="signatureLeft">', $context['signature_limits']['max_length'], '</span></span><br>';
+	}
 
-	if (!empty($context['show_preview_button']))
-		echo '
+	if (!empty($context['show_preview_button'])) {
+			echo '
 								<input type="button" name="preview_signature" id="preview_button" value="', $txt['preview_signature'], '" class="button_submit">';
+	}
 
-	if ($context['signature_warning'])
-		echo '
+	if ($context['signature_warning']) {
+			echo '
 								<span class="smalltext">', $context['signature_warning'], '</span>';
+	}
 
 	// Some javascript used to count how many characters have been used so far in the signature.
 	echo '
@@ -2778,9 +2888,10 @@ 
 									<div>
 										<select name="cat" id="cat" size="10" onchange="changeSel(\'\');" onfocus="selectRadioByName(document.forms.creator.avatar_choice, \'server_stored\');">';
 		// This lists all the file categories.
-		foreach ($context['avatars'] as $avatar)
-			echo '
+		foreach ($context['avatars'] as $avatar) {
+					echo '
 											<option value="', $avatar['filename'] . ($avatar['is_dir'] ? '/' : ''), '"', ($avatar['checked'] ? ' selected' : ''), '>', $avatar['name'], '</option>';
+		}
 		echo '
 										</select>
 									</div>
@@ -2835,16 +2946,17 @@ 
 								<div id="avatar_gravatar">
 									<img src="' . $context['member']['avatar']['href'] . '" alt="" />';
 
-		if (empty($modSettings['gravatarAllowExtraEmail']))
-			echo '
+		if (empty($modSettings['gravatarAllowExtraEmail'])) {
+					echo '
 									<div class="smalltext">', $txt['gravatar_noAlternateEmail'], '</div>';
-		else
+		} else
 		{
 			// Depending on other stuff, the stored value here might have some odd things in it from other areas.
-			if ($context['member']['avatar']['external'] == $context['member']['email'])
-				$textbox_value = '';
-			else
-				$textbox_value = $context['member']['avatar']['external'];
+			if ($context['member']['avatar']['external'] == $context['member']['email']) {
+							$textbox_value = '';
+			} else {
+							$textbox_value = $context['member']['avatar']['external'];
+			}
 
 			echo '
 									<div class="smalltext">', $txt['gravatar_alternateEmail'], '</div>
@@ -2916,8 +3028,9 @@ 
 	$h = !empty($modSettings['avatar_max_height_' . $type]) ? comma_format($modSettings['avatar_max_height_' . $type]) : 0;
 
 	$suffix = (!empty($w) ? 'w' : '') . (!empty($h) ? 'h' : '');
-	if (empty($suffix))
-		return;
+	if (empty($suffix)) {
+			return;
+	}
 
 	echo '
 									<div class="smalltext">', sprintf($txt['avatar_max_size_' . $suffix], $w, $h), '</div>';
@@ -2939,9 +3052,10 @@ 
 							<dd>
 								<select name="easyformat" id="easyformat" onchange="document.forms.creator.time_format.value = this.options[this.selectedIndex].value;" style="margin-bottom: 4px;">';
 	// Help the user by showing a list of common time formats.
-	foreach ($context['easy_timeformats'] as $time_format)
-		echo '
+	foreach ($context['easy_timeformats'] as $time_format) {
+			echo '
 									<option value="', $time_format['format'], '"', $time_format['format'] == $context['member']['time_format'] ? ' selected' : '', '>', $time_format['title'], '</option>';
+	}
 	echo '
 								</select><br>
 								<input type="text" name="time_format" id="time_format" value="', $context['member']['time_format'], '" size="30" class="input_text">
@@ -2977,9 +3091,10 @@ 
 							</dt>
 							<dd>
 								<select name="smiley_set" id="smiley_set" onchange="document.getElementById(\'smileypr\').src = this.selectedIndex == 0 ? \'', $settings['images_url'], '/blank.png\' : \'', $modSettings['smileys_url'], '/\' + (this.selectedIndex != 1 ? this.options[this.selectedIndex].value : \'', !empty($settings['smiley_sets_default']) ? $settings['smiley_sets_default'] : $modSettings['smiley_sets_default'], '\') + \'/smiley.gif\';">';
-	foreach ($context['smiley_sets'] as $set)
-		echo '
+	foreach ($context['smiley_sets'] as $set) {
+			echo '
 									<option value="', $set['id'], '"', $set['selected'] ? ' selected' : '', '>', $set['name'], '</option>';
+	}
 	echo '
 								</select> <img id="smileypr" class="centericon" src="', $context['member']['smiley_set']['id'] != 'none' ? $modSettings['smileys_url'] . '/' . ($context['member']['smiley_set']['id'] != '' ? $context['member']['smiley_set']['id'] : (!empty($settings['smiley_sets_default']) ? $settings['smiley_sets_default'] : $modSettings['smiley_sets_default'])) . '/smiley.gif' : $settings['images_url'] . '/blank.png', '" alt=":)"  style="padding-left: 20px;">
 							</dd>';
@@ -3030,10 +3145,11 @@ 
 									</div>
 									<div class="clear"></div>';
 
-	if (!empty($context['from_ajax']))
-		echo '
+	if (!empty($context['from_ajax'])) {
+			echo '
 									<br>
 									<a href="javascript:self.close();"></a>';
+	}
 
 	echo '
 								</div>
@@ -3072,15 +3188,16 @@ 
 								<br /><div class="smalltext">', $txt['tfa_profile_desc'], '</div>
 							</dt>
 							<dd>';
-	if (!$context['tfa_enabled'] && $context['user']['is_owner'])
-		echo '
+	if (!$context['tfa_enabled'] && $context['user']['is_owner']) {
+			echo '
 								<a href="', !empty($modSettings['force_ssl']) && $modSettings['force_ssl'] < 2 ? strtr($scripturl, array('http://' => 'https://')) : $scripturl, '?action=profile;area=tfasetup" id="enable_tfa">', $txt['tfa_profile_enable'], '</a>';
-	elseif (!$context['tfa_enabled'])
-		echo '
+	} elseif (!$context['tfa_enabled']) {
+			echo '
 								', $txt['tfa_profile_disabled'];
-	else
-		echo '
+	} else {
+			echo '
 							', sprintf($txt['tfa_profile_enabled'], $scripturl . '?action=profile;u=' . $context['id_member'] . ';area=tfasetup;disable');
+	}
 	echo '
 							</dd>';
 }

Themes/default/Themes.template.php

Braces +103 added lines, -80 removed lines

@@ -54,9 +54,10 @@ 
 					<dd>
 						<div id="known_themes_list">';
 
-	foreach ($context['themes'] as $theme)
-		echo '
+	foreach ($context['themes'] as $theme) {
+			echo '
 							<label for="options-known_themes_', $theme['id'], '"><input type="checkbox" name="options[known_themes][]" id="options-known_themes_', $theme['id'], '" value="', $theme['id'], '"', $theme['known'] ? ' checked' : '', ' class="input_check"> ', $theme['name'], '</label><br>';
+	}
 
 		echo '
 						</div>
@@ -73,9 +74,10 @@ 
 						<select name="options[theme_guests]" id="theme_guests">';
 
 	// Put an option for each theme in the select box.
-	foreach ($context['themes'] as $theme)
-		echo '
+	foreach ($context['themes'] as $theme) {
+			echo '
 							<option value="', $theme['id'], '"', $modSettings['theme_guests'] == $theme['id'] ? ' selected' : '', '>', $theme['name'], '</option>';
+	}
 
 	echo '
 						</select>
@@ -90,9 +92,10 @@ 
 							<option value="0">', $txt['theme_forum_default'], '</option>';
 
 	// Same thing, this time for changing the theme of everyone.
-	foreach ($context['themes'] as $theme)
-		echo '
+	foreach ($context['themes'] as $theme) {
+			echo '
 							<option value="', $theme['id'], '">', $theme['name'], '</option>';
+	}
 
 	echo '
 						</select>
@@ -189,11 +192,12 @@ 
 	global $context, $scripturl, $txt;
 
 	// Show a nice confirmation message.
-	if (isset($_GET['done']))
-		echo '
+	if (isset($_GET['done'])) {
+			echo '
 	<div class="infobox">
 		', $txt['theme_confirmed_' . $_GET['done']], '
 	</div>';
+	}
 
 	echo '
 	<div id="admincenter">';
@@ -356,11 +360,12 @@ 
 		if (empty($setting) || !is_array($setting))
 		{
 			// Insert a separator (unless this is the first item in the list)
-			if ($i !== $first_option_key)
-				echo '
+			if ($i !== $first_option_key) {
+							echo '
 				</dl>
 				<hr>
 				<dl class="settings">';
+			}
 
 			// Should we give a name to this section?
 			if (is_string($setting) && !empty($setting))
@@ -368,9 +373,9 @@ 
 				$titled_section = true;
 				echo '
 					<dt><b>' . $setting . '</b></dt><dd></dd>';
+			} else {
+							$titled_section = false;
 			}
-			else
-				$titled_section = false;
 
 			continue;
 		}
@@ -379,19 +384,21 @@ 
 					<dt ', $context['theme_options_reset'] ? 'style="width:50%"' : '', '>';
 
 		// Show the change option box ?
-		if ($context['theme_options_reset'])
-			echo '
+		if ($context['theme_options_reset']) {
+					echo '
 						<span class="floatleft"><select name="', !empty($setting['default']) ? 'default_' : '', 'options_master[', $setting['id'], ']" onchange="this.form.options_', $setting['id'], '.disabled = this.selectedIndex != 1;">
 							<option value="0" selected>', $txt['themeadmin_reset_options_none'], '</option>
 							<option value="1">', $txt['themeadmin_reset_options_change'], '</option>
 							<option value="2">', $txt['themeadmin_reset_options_default'], '</option>
 						</select>&nbsp;</span>';
+		}
 
 		echo '
 						<label for="options_', $setting['id'], '">', !$titled_section ? '<b>' : '', $setting['label'], !$titled_section ? '</b>' : '', '</label>';
-		if (isset($setting['description']))
-			echo '
+		if (isset($setting['description'])) {
+					echo '
 						<br><span class="smalltext">', $setting['description'], '</span>';
+		}
 		echo '
 					</dt>';
 
@@ -433,13 +440,11 @@ 
 
 				echo '
 						<input type="number"', $min . $max . $step;
-			}
-			else if (isset($setting['type']) && $setting['type'] == 'url')
+			} else if (isset($setting['type']) && $setting['type'] == 'url')
 			{
 				echo'
 						<input type="url"';
-			}
-			else
+			} else
 			{
 				echo '
 						<input type="text"';
@@ -483,8 +488,8 @@ 
 			<br>';
 
 	// @todo Why can't I edit the default theme popup.
-	if ($context['theme_settings']['theme_id'] != 1)
-		echo '
+	if ($context['theme_settings']['theme_id'] != 1) {
+			echo '
 			<div class="cat_bar">
 				<h3 class="catbg config_hd">
 					', $txt['theme_edit'], '
@@ -500,6 +505,7 @@ 
 					</li>
 				</ul>
 			</div>';
+	}
 
 	echo '
 			<div class="cat_bar">
@@ -553,9 +559,10 @@ 
 					<dd>
 						<select id="variant" name="options[default_variant]" onchange="changeVariant(this.value)">';
 
-		foreach ($context['theme_variants'] as $key => $variant)
-			echo '
+		foreach ($context['theme_variants'] as $key => $variant) {
+					echo '
 							<option value="', $key, '"', $context['default_variant'] == $key ? ' selected' : '', '>', $variant['label'], '</option>';
+		}
 
 		echo '
 						</select>
@@ -590,11 +597,12 @@ 
 		if (empty($setting) || !is_array($setting))
 		{
 			// We don't need a separator before the first list element
-			if ($i !== $first_setting_key)
-				echo '
+			if ($i !== $first_setting_key) {
+							echo '
 				</dl>
 				<hr>
 				<dl class="settings">';
+			}
 
 			// Add a fake heading?
 			if (is_string($setting) && !empty($setting))
@@ -602,9 +610,9 @@ 
 				$titled_section = true;
 				echo '
 					<dt><b>' . $setting . '</b></dt><dd></dd>';
+			} else {
+							$titled_section = false;
 			}
-			else
-				$titled_section = false;
 
 			continue;
 		}
@@ -613,9 +621,10 @@ 
 					<dt>
 						<label for="', $setting['id'], '">', !$titled_section ? '<b>' : '', $setting['label'], !$titled_section ? '</b>' : '', '</label>:';
 
-		if (isset($setting['description']))
-			echo '<br>
+		if (isset($setting['description'])) {
+					echo '<br>
 						<span class="smalltext">', $setting['description'], '</span>';
+		}
 
 		echo '
 					</dt>';
@@ -636,9 +645,10 @@ 
 					<dd>
 						<select name="', !empty($setting['default']) ? 'default_' : '', 'options[', $setting['id'], ']" id="', $setting['id'], '">';
 
-			foreach ($setting['options'] as $value => $label)
-				echo '
+			foreach ($setting['options'] as $value => $label) {
+							echo '
 							<option value="', $value, '"', $value == $setting['value'] ? ' selected' : '', '>', $label, '</option>';
+			}
 
 			echo '
 						</select>
@@ -667,13 +677,11 @@ 
 
 				echo '
 						<input type="number"', $min . $max . $step;
-			}
-			else if (isset($setting['type']) && $setting['type'] == 'url')
+			} else if (isset($setting['type']) && $setting['type'] == 'url')
 			{
 				echo'
 						<input type="url"';
-			}
-			else
+			} else
 			{
 				echo '
 						<input type="text"';
@@ -826,21 +834,23 @@ 
 		<div class="windowbg">';
 
 	// Oops! there was an error :(
-	if (!empty($context['error_message']))
-		echo '
+	if (!empty($context['error_message'])) {
+			echo '
 			<p>
 				', $context['error_message'], '
 			</p>';
+	}
 
 	// Not much to show except a link back...
-	else
-		echo '
+	else {
+			echo '
 			<p>
 				<a href="', $scripturl, '?action=admin;area=theme;sa=list;th=', $context['installed_theme']['id'], ';', $context['session_var'], '=', $context['session_id'], '">', $context['installed_theme']['name'], '</a> ', $txt['theme_' . (isset($context['installed_theme']['updated']) ? 'updated' : 'installed') . '_message'], '
 			</p>
 			<p>
 				<a href="', $scripturl, '?action=admin;area=theme;sa=admin;', $context['session_var'], '=', $context['session_id'], '">', $txt['back'], '</a>
 			</p>';
+	}
 
 	echo '
 		</div>
@@ -907,10 +917,11 @@ 
 					<span class="floatleft">', $template['filename'], $template['already_exists'] ? ' <span class="error">(' . $txt['themeadmin_edit_exists'] . ')</span>' : '', '</span>
 					<span class="floatright">';
 
-		if ($template['can_copy'])
-			echo '<a href="', $scripturl, '?action=admin;area=theme;th=', $context['theme_id'], ';', $context['session_var'], '=', $context['session_id'], ';sa=copy;template=', $template['value'], '" data-confirm="', $template['already_exists'] ? $txt['themeadmin_edit_overwrite_confirm'] : $txt['themeadmin_edit_copy_confirm'], '" class="you_sure">', $txt['themeadmin_edit_do_copy'], '</a>';
-		else
-			echo $txt['themeadmin_edit_no_copy'];
+		if ($template['can_copy']) {
+					echo '<a href="', $scripturl, '?action=admin;area=theme;th=', $context['theme_id'], ';', $context['session_var'], '=', $context['session_id'], ';sa=copy;template=', $template['value'], '" data-confirm="', $template['already_exists'] ? $txt['themeadmin_edit_overwrite_confirm'] : $txt['themeadmin_edit_copy_confirm'], '" class="you_sure">', $txt['themeadmin_edit_do_copy'], '</a>';
+		} else {
+					echo $txt['themeadmin_edit_no_copy'];
+		}
 
 		echo '
 					</span>
@@ -933,11 +944,12 @@ 
 	echo '
 	<div id="admincenter">';
 
-	if (!empty($context['browse_title']))
-		echo '
+	if (!empty($context['browse_title'])) {
+			echo '
 		<div class="cat_bar">
 			<h3 class="catbg">', $context['browse_title'], '</h3>
 		</div>';
+	}
 
 	echo '
 		<table class="table_grid tborder">
@@ -957,14 +969,13 @@ 
 			<tr class="windowbg">
 				<td>';
 
-		if ($file['is_editable'])
-			echo '<a href="', $file['href'], '"', $file['is_template'] ? ' style="font-weight: bold;"' : '', '>', $file['filename'], '</a>';
-
-		elseif ($file['is_directory'])
-			echo '<a href="', $file['href'], '" class="is_directory"><span class="generic_icons folder"></span>', $file['filename'], '</a>';
-
-		else
-			echo $file['filename'];
+		if ($file['is_editable']) {
+					echo '<a href="', $file['href'], '"', $file['is_template'] ? ' style="font-weight: bold;"' : '', '>', $file['filename'], '</a>';
+		} elseif ($file['is_directory']) {
+					echo '<a href="', $file['href'], '" class="is_directory"><span class="generic_icons folder"></span>', $file['filename'], '</a>';
+		} else {
+					echo $file['filename'];
+		}
 
 		echo '
 				</td>
@@ -986,11 +997,12 @@ 
 {
 	global $context, $settings, $scripturl, $txt;
 
-	if ($context['session_error'])
-		echo '
+	if ($context['session_error']) {
+			echo '
 	<div class="errorbox">
 		', $txt['error_session_timeout'], '
 	</div>';
+	}
 
 	// From now on no one can complain that editing css is difficult. If you disagree, go to www.w3schools.com.
 	echo '
@@ -1053,17 +1065,18 @@ 
 					try
 					{
 					';
-	if (isBrowser('is_ie'))
-		echo '
+	if (isBrowser('is_ie')) {
+			echo '
 						var sheets = frames["css_preview_box"].document.styleSheets;
 						for (var j = 0; j < sheets.length; j++)
 						{
 							if (sheets[j].id == "css_preview_box")
 								sheets[j].cssText = document.forms.stylesheetForm.entire_file.value;
 						}';
-	else
-		echo '
+	} else {
+			echo '
 						setInnerHTML(frames["css_preview_box"].document.getElementById("css_preview_sheet"), document.forms.stylesheetForm.entire_file.value);';
+	}
 	echo '
 					}
 					catch (e)
@@ -1115,9 +1128,10 @@ 
 			</div>
 			<div class="windowbg">';
 
-	if (!$context['allow_save'])
-		echo '
+	if (!$context['allow_save']) {
+			echo '
 				', $txt['theme_edit_no_save'], ': ', $context['allow_save_filename'], '<br>';
+	}
 
 	echo '
 				<textarea name="entire_file" cols="80" rows="20" style="width: 96%; font-family: monospace; margin-top: 1ex; white-space: pre;" onkeyup="setPreviewTimeout();" onchange="refreshPreview(true);">', $context['entire_file'], '</textarea><br>
@@ -1130,9 +1144,10 @@ 
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">';
 
 	// Hopefully it exists.
-	if (isset($context['admin-te-' . md5($context['theme_id'] . '-' . $context['edit_filename']) . '_token']))
-		echo '
+	if (isset($context['admin-te-' . md5($context['theme_id'] . '-' . $context['edit_filename']) . '_token'])) {
+			echo '
 			<input type="hidden" name="', $context['admin-te-' . md5($context['theme_id'] . '-' . $context['edit_filename']) . '_token_var'], '" value="', $context['admin-te-' . md5($context['theme_id'] . '-' . $context['edit_filename']) . '_token'], '">';
+	}
 
 	echo '
 		</form>
@@ -1146,18 +1161,20 @@ 
 {
 	global $context, $scripturl, $txt;
 
-	if ($context['session_error'])
-		echo '
+	if ($context['session_error']) {
+			echo '
 	<div class="errorbox">
 		', $txt['error_session_timeout'], '
 	</div>';
+	}
 
-	if (isset($context['parse_error']))
-		echo '
+	if (isset($context['parse_error'])) {
+			echo '
 	<div class="errorbox">
 		', $txt['themeadmin_edit_error'], '
 			<div><pre>', $context['parse_error'], '</pre></div>
 	</div>';
+	}
 
 	// Just show a big box.... gray out the Save button if it's not saveable... (ie. not 777.)
 	echo '
@@ -1168,16 +1185,18 @@ 
 			</div>
 			<div class="windowbg">';
 
-	if (!$context['allow_save'])
-		echo '
+	if (!$context['allow_save']) {
+			echo '
 				', $txt['theme_edit_no_save'], ': ', $context['allow_save_filename'], '<br>';
+	}
 
-	foreach ($context['file_parts'] as $part)
-		echo '
+	foreach ($context['file_parts'] as $part) {
+			echo '
 				<label for="on_line', $part['line'], '">', $txt['themeadmin_edit_on_line'], ' ', $part['line'], '</label>:<br>
 				<div class="centertext">
 					<textarea id="on_line', $part['line'], '" name="entire_file[]" cols="80" rows="', $part['lines'] > 14 ? '14' : $part['lines'], '" class="edit_file">', $part['data'], '</textarea>
 				</div>';
+	}
 
 	echo '
 				<div class="padding righttext">
@@ -1186,9 +1205,10 @@ 
 					<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">';
 
 	// Hopefully it exists.
-	if (isset($context['admin-te-' . md5($context['theme_id'] . '-' . $context['edit_filename']) . '_token']))
-		echo '
+	if (isset($context['admin-te-' . md5($context['theme_id'] . '-' . $context['edit_filename']) . '_token'])) {
+			echo '
 					<input type="hidden" name="', $context['admin-te-' . md5($context['theme_id'] . '-' . $context['edit_filename']) . '_token_var'], '" value="', $context['admin-te-' . md5($context['theme_id'] . '-' . $context['edit_filename']) . '_token'], '">';
+	}
 
 	echo '
 				</div>
@@ -1204,18 +1224,20 @@ 
 {
 	global $context, $scripturl, $txt;
 
-	if ($context['session_error'])
-		echo '
+	if ($context['session_error']) {
+			echo '
 	<div class="errorbox">
 		', $txt['error_session_timeout'], '
 	</div>';
+	}
 
 	//Is this file writeable?
-	if (!$context['allow_save'])
-		echo '
+	if (!$context['allow_save']) {
+			echo '
 	<div class="errorbox">
 		', $txt['theme_edit_no_save'], ': ', $context['allow_save_filename'], '
 	</div>';
+	}
 
 	// Just show a big box.... gray out the Save button if it's not saveable... (ie. not 777.)
 	echo '
@@ -1231,9 +1253,10 @@ 
 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">';
 
 	// Hopefully it exists.
-	if (isset($context['admin-te-' . md5($context['theme_id'] . '-' . $context['edit_filename']) . '_token']))
-		echo '
+	if (isset($context['admin-te-' . md5($context['theme_id'] . '-' . $context['edit_filename']) . '_token'])) {
+			echo '
 				<input type="hidden" name="', $context['admin-te-' . md5($context['theme_id'] . '-' . $context['edit_filename']) . '_token_var'], '" value="', $context['admin-te-' . md5($context['theme_id'] . '-' . $context['edit_filename']) . '_token'], '">';
+	}
 
 	echo '
 			</div>