albertlast / SMF2.1

Sources/ManageLanguages.php

Braces +190 added lines, -142 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * This is the main function for the languages area.
@@ -153,11 +154,11 @@ 
 	$language_list = new xmlArray(fetch_web_data($url), true);
 
 	// Check that the site responded and that the language exists.
-	if (!$language_list->exists('languages'))
-		$context['smf_error'] = 'no_response';
-	elseif (!$language_list->exists('languages/language'))
-		$context['smf_error'] = 'no_files';
-	else
+	if (!$language_list->exists('languages')) {
+			$context['smf_error'] = 'no_response';
+	} elseif (!$language_list->exists('languages/language')) {
+			$context['smf_error'] = 'no_files';
+	} else
 	{
 		$language_list = $language_list->path('languages[0]');
 		$lang_files = $language_list->set('language');
@@ -165,8 +166,9 @@ 
 		foreach ($lang_files as $file)
 		{
 			// Were we searching?
-			if (!empty($context['smf_search_term']) && strpos($file->fetch('name'), $smcFunc['strtolower']($context['smf_search_term'])) === false)
-				continue;
+			if (!empty($context['smf_search_term']) && strpos($file->fetch('name'), $smcFunc['strtolower']($context['smf_search_term'])) === false) {
+							continue;
+			}
 
 			$smf_languages[] = array(
 				'id' => $file->fetch('id'),
@@ -177,10 +179,11 @@ 
 				'install_link' => '<a href="' . $scripturl . '?action=admin;area=languages;sa=downloadlang;did=' . $file->fetch('id') . ';' . $context['session_var'] . '=' . $context['session_id'] . '">' . $txt['add_language_smf_install'] . '</a>',
 			);
 		}
-		if (empty($smf_languages))
-			$context['smf_error'] = 'no_files';
-		else
-			return $smf_languages;
+		if (empty($smf_languages)) {
+					$context['smf_error'] = 'no_files';
+		} else {
+					return $smf_languages;
+		}
 	}
 }
 
@@ -202,8 +205,9 @@ 
 	require_once($sourcedir . '/Subs-Package.php');
 
 	// Clearly we need to know what to request.
-	if (!isset($_GET['did']))
-		fatal_lang_error('no_access', false);
+	if (!isset($_GET['did'])) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Some lovely context.
 	$context['download_id'] = $_GET['did'];
@@ -223,8 +227,9 @@ 
 		foreach ($_POST['copy_file'] as $file)
 		{
 			// Check it's not very bad.
-			if (strpos($file, '..') !== false || (strpos($file, 'Themes') !== 0 && !preg_match('~agreement\.[A-Za-z-_0-9]+\.txt$~', $file)))
-				fatal_error($txt['languages_download_illegal_paths']);
+			if (strpos($file, '..') !== false || (strpos($file, 'Themes') !== 0 && !preg_match('~agreement\.[A-Za-z-_0-9]+\.txt$~', $file))) {
+							fatal_error($txt['languages_download_illegal_paths']);
+			}
 
 			$chmod_files[] = $boarddir . '/' . $file;
 			$install_files[] = $file;
@@ -235,8 +240,9 @@ 
 		$files_left = $file_status['files']['notwritable'];
 
 		// Something not writable?
-		if (!empty($files_left))
-			$context['error_message'] = $txt['languages_download_not_chmod'];
+		if (!empty($files_left)) {
+					$context['error_message'] = $txt['languages_download_not_chmod'];
+		}
 		// Otherwise, go go go!
 		elseif (!empty($install_files))
 		{
@@ -251,11 +257,13 @@ 
 	}
 
 	// Open up the old china.
-	if (!isset($archive_content))
-		$archive_content = read_tgz_file('https://download.simplemachines.org/fetch_language.php?version=' . urlencode(strtr($forum_version, array('SMF ' => ''))) . ';fetch=' . urlencode($_GET['did']), null);
+	if (!isset($archive_content)) {
+			$archive_content = read_tgz_file('https://download.simplemachines.org/fetch_language.php?version=' . urlencode(strtr($forum_version, array('SMF ' => ''))) . ';fetch=' . urlencode($_GET['did']), null);
+	}
 
-	if (empty($archive_content))
-		fatal_error($txt['add_language_error_no_response']);
+	if (empty($archive_content)) {
+			fatal_error($txt['add_language_error_no_response']);
+	}
 
 	// Now for each of the files, let's do some *stuff*
 	$context['files'] = array(
@@ -270,8 +278,9 @@ 
 		$extension = substr($filename, strrpos($filename, '.') + 1);
 
 		// Don't do anything with files we don't understand.
-		if (!in_array($extension, array('php', 'jpg', 'gif', 'jpeg', 'png', 'txt')))
-			continue;
+		if (!in_array($extension, array('php', 'jpg', 'gif', 'jpeg', 'png', 'txt'))) {
+					continue;
+		}
 
 		// Basic data.
 		$context_data = array(
@@ -290,8 +299,9 @@ 
 		// Does the file exist, is it different and can we overwrite?
 		if (file_exists($boarddir . '/' . $file['filename']))
 		{
-			if (is_writable($boarddir . '/' . $file['filename']))
-				$context_data['writable'] = true;
+			if (is_writable($boarddir . '/' . $file['filename'])) {
+							$context_data['writable'] = true;
+			}
 
 			// Finally, do we actually think the content has changed?
 			if ($file['size'] == filesize($boarddir . '/' . $file['filename']) && $file['md5'] == md5_file($boarddir . '/' . $file['filename']))
@@ -304,16 +314,17 @@ 
 			{
 				$context_data['exists'] = 'same';
 				$context_data['default_copy'] = false;
+			} else {
+							$context_data['exists'] = 'different';
 			}
-			else
-				$context_data['exists'] = 'different';
 		}
 		// No overwrite?
 		else
 		{
 			// Can we at least stick it in the directory...
-			if (is_writable($boarddir . '/' . $dirname))
-				$context_data['writable'] = true;
+			if (is_writable($boarddir . '/' . $dirname)) {
+							$context_data['writable'] = true;
+			}
 		}
 
 		// I love PHP files, that's why I'm a developer and not an artistic type spending my time drinking absinth and living a life of sin...
@@ -328,8 +339,9 @@ 
 			list ($name, $language) = explode('.', $filename);
 
 			// Let's get the new version, I like versions, they tell me that I'm up to date.
-			if (preg_match('~\s*Version:\s+(.+?);\s*' . preg_quote($name, '~') . '~i', $file['preview'], $match) == 1)
-				$context_data['version'] = $match[1];
+			if (preg_match('~\s*Version:\s+(.+?);\s*' . preg_quote($name, '~') . '~i', $file['preview'], $match) == 1) {
+							$context_data['version'] = $match[1];
+			}
 
 			// Now does the old file exist - if so what is it's version?
 			if (file_exists($boarddir . '/' . $file['filename']))
@@ -345,34 +357,35 @@ 
 					$context_data['cur_version'] = $match[1];
 
 					// How does this compare?
-					if ($context_data['cur_version'] == $context_data['version'])
-						$context_data['version_compare'] = 'same';
-					elseif ($context_data['cur_version'] > $context_data['version'])
-						$context_data['version_compare'] = 'older';
+					if ($context_data['cur_version'] == $context_data['version']) {
+											$context_data['version_compare'] = 'same';
+					} elseif ($context_data['cur_version'] > $context_data['version']) {
+											$context_data['version_compare'] = 'older';
+					}
 
 					// Don't recommend copying if the version is the same.
-					if ($context_data['version_compare'] != 'newer')
-						$context_data['default_copy'] = false;
+					if ($context_data['version_compare'] != 'newer') {
+											$context_data['default_copy'] = false;
+					}
 				}
 			}
 
 			// Add the context data to the main set.
 			$context['files']['lang'][] = $context_data;
-		}
-		elseif ($extension == '.txt' && stripos($filename, 'agreement') !== false)
+		} elseif ($extension == '.txt' && stripos($filename, 'agreement') !== false)
 		{
 			// Registration agreement is a primary file
 			$context['files']['lang'][] = $context_data;
-		}
-		else
+		} else
 		{
 			// There shouldn't be anything else, but load this into "other" in case we decide to handle it in the future
 			$context['files']['other'][] = $context_data;
 		}
 
 		// Collect together all non-writable areas.
-		if (!$context_data['writable'])
-			$context['make_writable'][] = $context_data['destination'];
+		if (!$context_data['writable']) {
+					$context['make_writable'][] = $context_data['destination'];
+		}
 	}
 
 	// Before we go to far can we make anything writable, eh, eh?
@@ -387,22 +400,24 @@ 
 		{
 			if ($type == 'lang')
 			{
-				foreach ($data as $k => $file)
-					if (!$file['writable'] && !in_array($file['destination'], $context['still_not_writable']))
+				foreach ($data as $k => $file) {
+									if (!$file['writable'] && !in_array($file['destination'], $context['still_not_writable']))
 						$context['files'][$type][$k]['writable'] = true;
-			}
-			else
+				}
+			} else
 			{
-				foreach ($data as $theme => $files)
-					foreach ($files as $k => $file)
+				foreach ($data as $theme => $files) {
+									foreach ($files as $k => $file)
 						if (!$file['writable'] && !in_array($file['destination'], $context['still_not_writable']))
 							$context['files'][$type][$theme][$k]['writable'] = true;
+				}
 			}
 		}
 
 		// Are we going to need more language stuff?
-		if (!empty($context['still_not_writable']))
-			loadLanguage('Packages');
+		if (!empty($context['still_not_writable'])) {
+					loadLanguage('Packages');
+		}
 	}
 
 	// This is the list for the main files.
@@ -615,12 +630,13 @@ 
 	highlightSelected("list_language_list_' . ($language == '' ? 'english' : $language) . '");', true);
 
 	// Display a warning if we cannot edit the default setting.
-	if (!is_writable($boarddir . '/Settings.php'))
-		$listOptions['additional_rows'][] = array(
+	if (!is_writable($boarddir . '/Settings.php')) {
+			$listOptions['additional_rows'][] = array(
 				'position' => 'after_title',
 				'value' => $txt['language_settings_writable'],
 				'class' => 'smalltext alert',
 			);
+	}
 
 	require_once($sourcedir . '/Subs-List.php');
 	createList($listOptions);
@@ -662,10 +678,11 @@ 
 
 	// Put them back.
 	$settings['actual_theme_dir'] = $backup_actual_theme_dir;
-	if (!empty($backup_base_theme_dir))
-		$settings['base_theme_dir'] = $backup_base_theme_dir;
-	else
-		unset($settings['base_theme_dir']);
+	if (!empty($backup_base_theme_dir)) {
+			$settings['base_theme_dir'] = $backup_base_theme_dir;
+	} else {
+			unset($settings['base_theme_dir']);
+	}
 
 	// Get the language files and data...
 	foreach ($context['languages'] as $lang)
@@ -694,13 +711,15 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Default?
-		if (empty($row['lngfile']) || !isset($languages[$row['lngfile']]))
-			$row['lngfile'] = $language;
+		if (empty($row['lngfile']) || !isset($languages[$row['lngfile']])) {
+					$row['lngfile'] = $language;
+		}
 
-		if (!isset($languages[$row['lngfile']]) && isset($languages['english']))
-			$languages['english']['count'] += $row['num_users'];
-		elseif (isset($languages[$row['lngfile']]))
-			$languages[$row['lngfile']]['count'] += $row['num_users'];
+		if (!isset($languages[$row['lngfile']]) && isset($languages['english'])) {
+					$languages['english']['count'] += $row['num_users'];
+		} elseif (isset($languages[$row['lngfile']])) {
+					$languages[$row['lngfile']]['count'] += $row['num_users'];
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -740,13 +759,15 @@ 
 
 	call_integration_hook('integrate_language_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Get our languages. No cache
 	getLanguages(false);
-	foreach ($context['languages'] as $lang)
-		$config_vars['language'][4][$lang['filename']] = array($lang['filename'], $lang['name']);
+	foreach ($context['languages'] as $lang) {
+			$config_vars['language'][4][$lang['filename']] = array($lang['filename'], $lang['name']);
+	}
 
 	// Saving settings?
 	if (isset($_REQUEST['save']))
@@ -756,8 +777,9 @@ 
 		call_integration_hook('integrate_save_language_settings', array(&$config_vars));
 
 		saveSettings($config_vars);
-		if (!$settings_not_writable && !$settings_backup_fail)
-			$_SESSION['adm-save'] = true;
+		if (!$settings_not_writable && !$settings_backup_fail) {
+					$_SESSION['adm-save'] = true;
+		}
 		redirectexit('action=admin;area=languages;sa=settings');
 	}
 
@@ -766,10 +788,11 @@ 
 	$context['settings_title'] = $txt['language_settings'];
 	$context['save_disabled'] = $settings_not_writable;
 
-	if ($settings_not_writable)
-		$context['settings_message'] = '<div class="centertext"><strong>' . $txt['settings_not_writable'] . '</strong></div><br>';
-	elseif ($settings_backup_fail)
-		$context['settings_message'] = '<div class="centertext"><strong>' . $txt['admin_backup_fail'] . '</strong></div><br>';
+	if ($settings_not_writable) {
+			$context['settings_message'] = '<div class="centertext"><strong>' . $txt['settings_not_writable'] . '</strong></div><br>';
+	} elseif ($settings_backup_fail) {
+			$context['settings_message'] = '<div class="centertext"><strong>' . $txt['admin_backup_fail'] . '</strong></div><br>';
+	}
 
 	// Fill the config array.
 	prepareServerSettingsContext($config_vars);
@@ -816,8 +839,9 @@ 
 			'theme_dir' => $settings['default_theme_dir'],
 		),
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$themes[$row['id_theme']][$row['variable']] = $row['value'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$themes[$row['id_theme']][$row['variable']] = $row['value'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	// This will be where we look
@@ -829,14 +853,16 @@ 
 	// Check we have themes with a path and a name - just in case - and add the path.
 	foreach ($themes as $id => $data)
 	{
-		if (count($data) != 2)
-			unset($themes[$id]);
-		elseif (is_dir($data['theme_dir'] . '/languages'))
-			$lang_dirs[$id] = $data['theme_dir'] . '/languages';
+		if (count($data) != 2) {
+					unset($themes[$id]);
+		} elseif (is_dir($data['theme_dir'] . '/languages')) {
+					$lang_dirs[$id] = $data['theme_dir'] . '/languages';
+		}
 
 		// How about image directories?
-		if (is_dir($data['theme_dir'] . '/images/' . $context['lang_id']))
-			$images_dirs[$id] = $data['theme_dir'] . '/images/' . $context['lang_id'];
+		if (is_dir($data['theme_dir'] . '/images/' . $context['lang_id'])) {
+					$images_dirs[$id] = $data['theme_dir'] . '/images/' . $context['lang_id'];
+		}
 	}
 
 	$current_file = $file_id ? $lang_dirs[$theme_id] . '/' . $file_id . '.' . $context['lang_id'] . '.php' : '';
@@ -850,15 +876,17 @@ 
 		while ($entry = $dir->read())
 		{
 			// We're only after the files for this language.
-			if (preg_match('~^([A-Za-z]+)\.' . $context['lang_id'] . '\.php$~', $entry, $matches) == 0)
-				continue;
+			if (preg_match('~^([A-Za-z]+)\.' . $context['lang_id'] . '\.php$~', $entry, $matches) == 0) {
+							continue;
+			}
 
-			if (!isset($context['possible_files'][$theme]))
-				$context['possible_files'][$theme] = array(
+			if (!isset($context['possible_files'][$theme])) {
+							$context['possible_files'][$theme] = array(
 					'id' => $theme,
 					'name' => $themes[$theme]['name'],
 					'files' => array(),
 				);
+			}
 
 			$context['possible_files'][$theme]['files'][] = array(
 				'id' => $matches[1],
@@ -887,31 +915,36 @@ 
 		{
 			$_SESSION['last_backup_for'] = $context['lang_id'] . '$$$';
 			$result = package_create_backup('backup_lang_' . $context['lang_id']);
-			if (!$result)
-				fatal_lang_error('could_not_language_backup', false);
+			if (!$result) {
+							fatal_lang_error('could_not_language_backup', false);
+			}
 		}
 
 		// Second, loop through the array to remove the files.
 		foreach ($lang_dirs as $curPath)
 		{
-			foreach ($context['possible_files'][1]['files'] as $lang)
-				if (file_exists($curPath . '/' . $lang['id'] . '.' . $context['lang_id'] . '.php'))
+			foreach ($context['possible_files'][1]['files'] as $lang) {
+							if (file_exists($curPath . '/' . $lang['id'] . '.' . $context['lang_id'] . '.php'))
 					unlink($curPath . '/' . $lang['id'] . '.' . $context['lang_id'] . '.php');
+			}
 
 			// Check for the email template.
-			if (file_exists($curPath . '/EmailTemplates.' . $context['lang_id'] . '.php'))
-				unlink($curPath . '/EmailTemplates.' . $context['lang_id'] . '.php');
+			if (file_exists($curPath . '/EmailTemplates.' . $context['lang_id'] . '.php')) {
+							unlink($curPath . '/EmailTemplates.' . $context['lang_id'] . '.php');
+			}
 		}
 
 		// Third, the agreement file.
-		if (file_exists($boarddir . '/agreement.' . $context['lang_id'] . '.txt'))
-			unlink($boarddir . '/agreement.' . $context['lang_id'] . '.txt');
+		if (file_exists($boarddir . '/agreement.' . $context['lang_id'] . '.txt')) {
+					unlink($boarddir . '/agreement.' . $context['lang_id'] . '.txt');
+		}
 
 		// Fourth, a related images folder, if it exists...
-		if (!empty($images_dirs))
-			foreach ($images_dirs as $curPath)
+		if (!empty($images_dirs)) {
+					foreach ($images_dirs as $curPath)
 				if (is_dir($curPath))
 					deltree($curPath);
+		}
 
 		// Members can no longer use this language.
 		$smcFunc['db_query']('', '
@@ -995,8 +1028,9 @@ 
 		foreach ($_POST['entry'] as $k => $v)
 		{
 			// Only try to save if it's changed!
-			if ($_POST['entry'][$k] != $_POST['comp'][$k])
-				$save_strings[$k] = cleanLangString($v, false);
+			if ($_POST['entry'][$k] != $_POST['comp'][$k]) {
+							$save_strings[$k] = cleanLangString($v, false);
+			}
 		}
 	}
 
@@ -1030,12 +1064,13 @@ 
 		if ($multiline_cache)
 		{
 			preg_match('~\$(helptxt|txt|editortxt)\[\'(.+)\'\]\s?=\s?(.+);~ms', strtr($multiline_cache, array("\r" => '')), $matches);
-			if (!empty($matches[3]))
-				$entries[$matches[2]] = array(
+			if (!empty($matches[3])) {
+							$entries[$matches[2]] = array(
 					'type' => $matches[1],
 					'full' => $matches[0],
 					'entry' => $matches[3],
 				);
+			}
 		}
 
 		// These are the entries we can definitely save.
@@ -1046,8 +1081,9 @@ 
 		{
 			// Ignore some things we set separately.
 			$ignore_files = array('lang_character_set', 'lang_locale', 'lang_dictionary', 'lang_spelling', 'lang_rtl');
-			if (in_array($entryKey, $ignore_files))
-				continue;
+			if (in_array($entryKey, $ignore_files)) {
+							continue;
+			}
 
 			// These are arrays that need breaking out.
 			$arrays = array('days', 'days_short', 'months', 'months_titles', 'months_short', 'happy_birthday_author', 'karlbenson1_author', 'nite0859_author', 'zwaldowski_author', 'geezmo_author', 'karlbenson2_author');
@@ -1080,9 +1116,9 @@ 
 					{
 						$save_cache['entries'][$cur_index] = strtr($save_strings[$entryKey . '-+- ' . $cur_index], array('\'' => ''));
 						$save_cache['enabled'] = true;
+					} else {
+											$save_cache['entries'][$cur_index] = $subValue;
 					}
-					else
-						$save_cache['entries'][$cur_index] = $subValue;
 
 					$context['file_entries'][] = array(
 						'key' => $entryKey . '-+- ' . $cur_index,
@@ -1105,9 +1141,9 @@ 
 						{
 							$items[] = $k2 . ' => \'' . $v2 . '\'';
 							$cur_index = $k2;
+						} else {
+													$items[] = '\'' . $v2 . '\'';
 						}
-						else
-							$items[] = '\'' . $v2 . '\'';
 
 						$cur_index++;
 					}
@@ -1117,15 +1153,15 @@ 
 						'replace' => '$' . $entryValue['type'] . '[\'' . $entryKey . '\'] = array(' . implode(', ', $items) . ');',
 					);
 				}
-			}
-			else
+			} else
 			{
 				// Saving?
 				if (isset($save_strings[$entryKey]) && $save_strings[$entryKey] != $entryValue['entry'])
 				{
 					// @todo Fix this properly.
-					if ($save_strings[$entryKey] == '')
-						$save_strings[$entryKey] = '\'\'';
+					if ($save_strings[$entryKey] == '') {
+											$save_strings[$entryKey] = '\'\'';
+					}
 
 					// Set the new value.
 					$entryValue['entry'] = $save_strings[$entryKey];
@@ -1151,8 +1187,9 @@ 
 			checkSession();
 
 			$file_contents = implode('', file($current_file));
-			foreach ($final_saves as $save)
-				$file_contents = strtr($file_contents, array($save['find'] => $save['replace']));
+			foreach ($final_saves as $save) {
+							$file_contents = strtr($file_contents, array($save['find'] => $save['replace']));
+			}
 
 			// Save the actual changes.
 			$fp = fopen($current_file, 'w+');
@@ -1167,8 +1204,9 @@ 
 	}
 
 	// If we saved, redirect.
-	if ($madeSave)
-		redirectexit('action=admin;area=languages;sa=editlang;lid=' . $context['lang_id']);
+	if ($madeSave) {
+			redirectexit('action=admin;area=languages;sa=editlang;lid=' . $context['lang_id']);
+	}
 
 	createToken('admin-mlang');
 }
@@ -1200,8 +1238,9 @@ 
 				// Toggle the escape.
 				$is_escape = !$is_escape;
 				// If we're now escaped don't add this string.
-				if ($is_escape)
-					continue;
+				if ($is_escape) {
+									continue;
+				}
 			}
 			// Special case - parsed string with line break etc?
 			elseif (($string{$i} == 'n' || $string{$i} == 't') && $in_string == 2 && $is_escape)
@@ -1218,11 +1257,13 @@ 
 				if ($in_string != 2 && ($in_string != 1 || !$is_escape))
 				{
 					// Is it the end of a single quote string?
-					if ($in_string == 1)
-						$in_string = 0;
+					if ($in_string == 1) {
+											$in_string = 0;
+					}
 					// Otherwise it's the start!
-					else
-						$in_string = 1;
+					else {
+											$in_string = 1;
+					}
 
 					// Don't actually include this character!
 					continue;
@@ -1235,19 +1276,22 @@ 
 				if ($in_string != 1 && ($in_string != 2 || !$is_escape))
 				{
 					// Is it the end of a double quote string?
-					if ($in_string == 2)
-						$in_string = 0;
+					if ($in_string == 2) {
+											$in_string = 0;
+					}
 					// Otherwise it's the start!
-					else
-						$in_string = 2;
+					else {
+											$in_string = 2;
+					}
 
 					// Don't actually include this character!
 					continue;
 				}
 			}
 			// A join/space outside of a string is simply removed.
-			elseif ($in_string == 0 && (empty($string{$i}) || $string{$i} == '.'))
-				continue;
+			elseif ($in_string == 0 && (empty($string{$i}) || $string{$i} == '.')) {
+							continue;
+			}
 			// Start of a variable?
 			elseif ($in_string == 0 && $string{$i} == '$')
 			{
@@ -1281,8 +1325,7 @@ 
 
 		// Unhtml then rehtml the whole thing!
 		$new_string = $smcFunc['htmlspecialchars'](un_htmlspecialchars($new_string));
-	}
-	else
+	} else
 	{
 		// Keep track of what we're doing...
 		$in_string = 0;
@@ -1311,10 +1354,11 @@ 
 				preg_match('~\{%([\$A-Za-z0-9\'\[\]_-]+)%\}~', substr($string, $i), $matches);
 				if (!empty($matches[1]))
 				{
-					if ($in_string == 1)
-						$new_string .= '\' . ';
-					elseif ($new_string)
-						$new_string .= ' . ';
+					if ($in_string == 1) {
+											$new_string .= '\' . ';
+					} elseif ($new_string) {
+											$new_string .= ' . ';
+					}
 
 					$new_string .= $matches[1];
 					$i += strlen($matches[1]) + 3;
@@ -1327,8 +1371,9 @@ 
 			elseif ($string{$i} == '<')
 			{
 				// Probably HTML?
-				if ($string{$i + 1} != ' ')
-					$in_html = true;
+				if ($string{$i + 1} != ' ') {
+									$in_html = true;
+				}
 				// Assume we need an entity...
 				else
 				{
@@ -1340,8 +1385,9 @@ 
 			elseif ($string{$i} == '>')
 			{
 				// Will it be HTML?
-				if ($in_html)
-					$in_html = false;
+				if ($in_html) {
+									$in_html = false;
+				}
 				// Otherwise we need an entity...
 				else
 				{
@@ -1350,8 +1396,9 @@ 
 				}
 			}
 			// Is it a slash? If so escape it...
-			if ($string{$i} == '\\')
-				$new_string .= '\\';
+			if ($string{$i} == '\\') {
+							$new_string .= '\\';
+			}
 			// The infamous double quote?
 			elseif ($string{$i} == '"')
 			{
@@ -1374,10 +1421,11 @@ 
 		}
 
 		// If we ended as a string then close it off.
-		if ($in_string == 1)
-			$new_string .= '\'';
-		elseif ($in_string == 2)
-			$new_string .= '"';
+		if ($in_string == 1) {
+					$new_string .= '\'';
+		} elseif ($in_string == 2) {
+					$new_string .= '"';
+		}
 	}
 
 	return $new_string;

Sources/Subs-Db-mysql.php

Braces +257 added lines, -189 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  *  Maps the implementations in this file (smf_db_function_name)
@@ -33,8 +34,8 @@ 
 	global $smcFunc, $mysql_set_mode;
 
 	// Map some database specific functions, only do this once.
-	if (!isset($smcFunc['db_fetch_assoc']))
-		$smcFunc += array(
+	if (!isset($smcFunc['db_fetch_assoc'])) {
+			$smcFunc += array(
 			'db_query'                  => 'smf_db_query',
 			'db_quote'                  => 'smf_db_quote',
 			'db_fetch_assoc'            => 'mysqli_fetch_assoc',
@@ -60,9 +61,11 @@ 
 			'db_mb4'                    => false,
 			'db_ping'                   => 'mysqli_ping',
 		);
+	}
 
-	if (!empty($db_options['persist']))
-		$db_server = 'p:' . $db_server;
+	if (!empty($db_options['persist'])) {
+			$db_server = 'p:' . $db_server;
+	}
 
 	$connection = mysqli_init();
 	
@@ -71,31 +74,35 @@ 
 	$success = false;
 	
 	if ($connection) {
-		if (!empty($db_options['port']))
-			$success = mysqli_real_connect($connection, $db_server, $db_user, $db_passwd, '', $db_options['port'], null, $flags);
-		else
-			$success = mysqli_real_connect($connection, $db_server, $db_user, $db_passwd, '', 0, null, $flags);
+		if (!empty($db_options['port'])) {
+					$success = mysqli_real_connect($connection, $db_server, $db_user, $db_passwd, '', $db_options['port'], null, $flags);
+		} else {
+					$success = mysqli_real_connect($connection, $db_server, $db_user, $db_passwd, '', 0, null, $flags);
+		}
 	}
 
 	// Something's wrong, show an error if its fatal (which we assume it is)
 	if ($success === false)
 	{
-		if (!empty($db_options['non_fatal']))
-			return null;
-		else
-			display_db_error();
+		if (!empty($db_options['non_fatal'])) {
+					return null;
+		} else {
+					display_db_error();
+		}
 	}
 
 	// Select the database, unless told not to
-	if (empty($db_options['dont_select_db']) && !@mysqli_select_db($connection, $db_name) && empty($db_options['non_fatal']))
-		display_db_error();
+	if (empty($db_options['dont_select_db']) && !@mysqli_select_db($connection, $db_name) && empty($db_options['non_fatal'])) {
+			display_db_error();
+	}
 
 	// This makes it possible to have SMF automatically change the sql_mode and autocommit if needed.
-	if (isset($mysql_set_mode) && $mysql_set_mode === true)
-		$smcFunc['db_query']('', 'SET sql_mode = \'\', AUTOCOMMIT = 1',
+	if (isset($mysql_set_mode) && $mysql_set_mode === true) {
+			$smcFunc['db_query']('', 'SET sql_mode = \'\', AUTOCOMMIT = 1',
 		array(),
 		false
 	);
+	}
 
 	return $connection;
 }
@@ -166,37 +173,46 @@ 
 	global $db_callback, $user_info, $db_prefix, $smcFunc;
 
 	list ($values, $connection) = $db_callback;
-	if (!is_object($connection))
-		display_db_error();
+	if (!is_object($connection)) {
+			display_db_error();
+	}
 
-	if ($matches[1] === 'db_prefix')
-		return $db_prefix;
+	if ($matches[1] === 'db_prefix') {
+			return $db_prefix;
+	}
 
-	if ($matches[1] === 'query_see_board')
-		return $user_info['query_see_board'];
+	if ($matches[1] === 'query_see_board') {
+			return $user_info['query_see_board'];
+	}
 
-	if ($matches[1] === 'query_wanna_see_board')
-		return $user_info['query_wanna_see_board'];
+	if ($matches[1] === 'query_wanna_see_board') {
+			return $user_info['query_wanna_see_board'];
+	}
 
-	if ($matches[1] === 'empty')
-		return '\'\'';
+	if ($matches[1] === 'empty') {
+			return '\'\'';
+	}
 
-	if (!isset($matches[2]))
-		smf_db_error_backtrace('Invalid value inserted or no type specified.', '', E_USER_ERROR, __FILE__, __LINE__);
+	if (!isset($matches[2])) {
+			smf_db_error_backtrace('Invalid value inserted or no type specified.', '', E_USER_ERROR, __FILE__, __LINE__);
+	}
 
-	if ($matches[1] === 'literal')
-		return '\'' . mysqli_real_escape_string($connection, $matches[2]) . '\'';
+	if ($matches[1] === 'literal') {
+			return '\'' . mysqli_real_escape_string($connection, $matches[2]) . '\'';
+	}
 
-	if (!isset($values[$matches[2]]))
-		smf_db_error_backtrace('The database value you\'re trying to insert does not exist: ' . (isset($smcFunc['htmlspecialchars']) ? $smcFunc['htmlspecialchars']($matches[2]) : htmlspecialchars($matches[2])), '', E_USER_ERROR, __FILE__, __LINE__);
+	if (!isset($values[$matches[2]])) {
+			smf_db_error_backtrace('The database value you\'re trying to insert does not exist: ' . (isset($smcFunc['htmlspecialchars']) ? $smcFunc['htmlspecialchars']($matches[2]) : htmlspecialchars($matches[2])), '', E_USER_ERROR, __FILE__, __LINE__);
+	}
 
 	$replacement = $values[$matches[2]];
 
 	switch ($matches[1])
 	{
 		case 'int':
-			if (!is_numeric($replacement) || (string) $replacement !== (string) (int) $replacement)
-				smf_db_error_backtrace('Wrong value type sent to the database. Integer expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			if (!is_numeric($replacement) || (string) $replacement !== (string) (int) $replacement) {
+							smf_db_error_backtrace('Wrong value type sent to the database. Integer expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			}
 			return (string) (int) $replacement;
 		break;
 
@@ -208,65 +224,73 @@ 
 		case 'array_int':
 			if (is_array($replacement))
 			{
-				if (empty($replacement))
-					smf_db_error_backtrace('Database error, given array of integer values is empty. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+				if (empty($replacement)) {
+									smf_db_error_backtrace('Database error, given array of integer values is empty. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+				}
 
 				foreach ($replacement as $key => $value)
 				{
-					if (!is_numeric($value) || (string) $value !== (string) (int) $value)
-						smf_db_error_backtrace('Wrong value type sent to the database. Array of integers expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+					if (!is_numeric($value) || (string) $value !== (string) (int) $value) {
+											smf_db_error_backtrace('Wrong value type sent to the database. Array of integers expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+					}
 
 					$replacement[$key] = (string) (int) $value;
 				}
 
 				return implode(', ', $replacement);
+			} else {
+							smf_db_error_backtrace('Wrong value type sent to the database. Array of integers expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
 			}
-			else
-				smf_db_error_backtrace('Wrong value type sent to the database. Array of integers expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
 
 		break;
 
 		case 'array_string':
 			if (is_array($replacement))
 			{
-				if (empty($replacement))
-					smf_db_error_backtrace('Database error, given array of string values is empty. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+				if (empty($replacement)) {
+									smf_db_error_backtrace('Database error, given array of string values is empty. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+				}
 
-				foreach ($replacement as $key => $value)
-					$replacement[$key] = sprintf('\'%1$s\'', mysqli_real_escape_string($connection, $value));
+				foreach ($replacement as $key => $value) {
+									$replacement[$key] = sprintf('\'%1$s\'', mysqli_real_escape_string($connection, $value));
+				}
 
 				return implode(', ', $replacement);
+			} else {
+							smf_db_error_backtrace('Wrong value type sent to the database. Array of strings expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
 			}
-			else
-				smf_db_error_backtrace('Wrong value type sent to the database. Array of strings expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
 		break;
 
 		case 'date':
-			if (preg_match('~^(\d{4})-([0-1]?\d)-([0-3]?\d)$~', $replacement, $date_matches) === 1)
-				return sprintf('\'%04d-%02d-%02d\'', $date_matches[1], $date_matches[2], $date_matches[3]);
-			else
-				smf_db_error_backtrace('Wrong value type sent to the database. Date expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			if (preg_match('~^(\d{4})-([0-1]?\d)-([0-3]?\d)$~', $replacement, $date_matches) === 1) {
+							return sprintf('\'%04d-%02d-%02d\'', $date_matches[1], $date_matches[2], $date_matches[3]);
+			} else {
+							smf_db_error_backtrace('Wrong value type sent to the database. Date expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			}
 		break;
 
 		case 'time':
-			if (preg_match('~^([0-1]?\d|2[0-3]):([0-5]\d):([0-5]\d)$~', $replacement, $time_matches) === 1)
-				return sprintf('\'%02d:%02d:%02d\'', $time_matches[1], $time_matches[2], $time_matches[3]);
-			else
-				smf_db_error_backtrace('Wrong value type sent to the database. Time expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			if (preg_match('~^([0-1]?\d|2[0-3]):([0-5]\d):([0-5]\d)$~', $replacement, $time_matches) === 1) {
+							return sprintf('\'%02d:%02d:%02d\'', $time_matches[1], $time_matches[2], $time_matches[3]);
+			} else {
+							smf_db_error_backtrace('Wrong value type sent to the database. Time expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			}
 		break;
 		
 		case 'datetime':
-			if (preg_match('~^(\d{4})-([0-1]?\d)-([0-3]?\d) ([0-1]?\d|2[0-3]):([0-5]\d):([0-5]\d)$~', $replacement, $datetime_matches) === 1)
-				return 'str_to_date('.
+			if (preg_match('~^(\d{4})-([0-1]?\d)-([0-3]?\d) ([0-1]?\d|2[0-3]):([0-5]\d):([0-5]\d)$~', $replacement, $datetime_matches) === 1) {
+							return 'str_to_date('.
 					sprintf('\'%04d-%02d-%02d %02d:%02d:%02d\'', $datetime_matches[1], $datetime_matches[2], $datetime_matches[3], $datetime_matches[4], $datetime_matches[5] ,$datetime_matches[6]).
 					',\'%Y-%m-%d %h:%i:%s\')';
-			else
-				smf_db_error_backtrace('Wrong value type sent to the database. Datetime expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			} else {
+							smf_db_error_backtrace('Wrong value type sent to the database. Datetime expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			}
 		break;
 
 		case 'float':
-			if (!is_numeric($replacement))
-				smf_db_error_backtrace('Wrong value type sent to the database. Floating point number expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			if (!is_numeric($replacement)) {
+							smf_db_error_backtrace('Wrong value type sent to the database. Floating point number expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			}
 			return (string) (float) $replacement;
 		break;
 
@@ -280,32 +304,37 @@ 
 		break;
 
 		case 'inet':
-			if ($replacement == 'null' || $replacement == '')
-				return 'null';
-			if (!isValidIP($replacement))
-				smf_db_error_backtrace('Wrong value type sent to the database. IPv4 or IPv6 expected.(' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			if ($replacement == 'null' || $replacement == '') {
+							return 'null';
+			}
+			if (!isValidIP($replacement)) {
+							smf_db_error_backtrace('Wrong value type sent to the database. IPv4 or IPv6 expected.(' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+			}
 			//we don't use the native support of mysql > 5.6.2
 			return sprintf('unhex(\'%1$s\')', bin2hex(inet_pton($replacement)));
 
 		case 'array_inet':
 			if (is_array($replacement))
 			{
-				if (empty($replacement))
-					smf_db_error_backtrace('Database error, given array of IPv4 or IPv6 values is empty. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+				if (empty($replacement)) {
+									smf_db_error_backtrace('Database error, given array of IPv4 or IPv6 values is empty. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+				}
 
 				foreach ($replacement as $key => $value)
 				{
-					if ($replacement == 'null' || $replacement == '')
-						$replacement[$key] = 'null';
-					if (!isValidIP($value))
-						smf_db_error_backtrace('Wrong value type sent to the database. IPv4 or IPv6 expected.(' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+					if ($replacement == 'null' || $replacement == '') {
+											$replacement[$key] = 'null';
+					}
+					if (!isValidIP($value)) {
+											smf_db_error_backtrace('Wrong value type sent to the database. IPv4 or IPv6 expected.(' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
+					}
 					$replacement[$key] = sprintf('unhex(\'%1$s\')', bin2hex(inet_pton($value)));
 				}
 
 				return implode(', ', $replacement);
+			} else {
+							smf_db_error_backtrace('Wrong value type sent to the database. Array of IPv4 or IPv6 expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
 			}
-			else
-				smf_db_error_backtrace('Wrong value type sent to the database. Array of IPv4 or IPv6 expected. (' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
 		break;
 
 		default:
@@ -381,22 +410,25 @@ 
 		// Are we in SSI mode?  If so try that username and password first
 		if (SMF == 'SSI' && !empty($ssi_db_user) && !empty($ssi_db_passwd))
 		{
-			if (empty($db_persist))
-				$db_connection = @mysqli_connect($db_server, $ssi_db_user, $ssi_db_passwd);
-			else
-				$db_connection = @mysqli_connect('p:' . $db_server, $ssi_db_user, $ssi_db_passwd);
+			if (empty($db_persist)) {
+							$db_connection = @mysqli_connect($db_server, $ssi_db_user, $ssi_db_passwd);
+			} else {
+							$db_connection = @mysqli_connect('p:' . $db_server, $ssi_db_user, $ssi_db_passwd);
+			}
 		}
 		// Fall back to the regular username and password if need be
 		if (!$db_connection)
 		{
-			if (empty($db_persist))
-				$db_connection = @mysqli_connect($db_server, $db_user, $db_passwd);
-			else
-				$db_connection = @mysqli_connect('p:' . $db_server, $db_user, $db_passwd);
+			if (empty($db_persist)) {
+							$db_connection = @mysqli_connect($db_server, $db_user, $db_passwd);
+			} else {
+							$db_connection = @mysqli_connect('p:' . $db_server, $db_user, $db_passwd);
+			}
 		}
 
-		if (!$db_connection || !@mysqli_select_db($db_connection, $db_name))
-			$db_connection = false;
+		if (!$db_connection || !@mysqli_select_db($db_connection, $db_name)) {
+					$db_connection = false;
+		}
 
 		$connection = $db_connection;
 	}
@@ -404,18 +436,20 @@ 
 	// One more query....
 	$db_count = !isset($db_count) ? 1 : $db_count + 1;
 
-	if (empty($modSettings['disableQueryCheck']) && strpos($db_string, '\'') !== false && empty($db_values['security_override']))
-		smf_db_error_backtrace('Hacking attempt...', 'Illegal character (\') used in query...', true, __FILE__, __LINE__);
+	if (empty($modSettings['disableQueryCheck']) && strpos($db_string, '\'') !== false && empty($db_values['security_override'])) {
+			smf_db_error_backtrace('Hacking attempt...', 'Illegal character (\') used in query...', true, __FILE__, __LINE__);
+	}
 
 	// Use "ORDER BY null" to prevent Mysql doing filesorts for Group By clauses without an Order By
 	if (strpos($db_string, 'GROUP BY') !== false && strpos($db_string, 'ORDER BY') === false && preg_match('~^\s+SELECT~i', $db_string))
 	{
 		// Add before LIMIT
-		if ($pos = strpos($db_string, 'LIMIT '))
-			$db_string = substr($db_string, 0, $pos) . "\t\t\tORDER BY null\n" . substr($db_string, $pos, strlen($db_string));
-		else
-			// Append it.
+		if ($pos = strpos($db_string, 'LIMIT ')) {
+					$db_string = substr($db_string, 0, $pos) . "\t\t\tORDER BY null\n" . substr($db_string, $pos, strlen($db_string));
+		} else {
+					// Append it.
 			$db_string .= "\n\t\t\tORDER BY null";
+		}
 	}
 
 	if (empty($db_values['security_override']) && (!empty($db_values) || strpos($db_string, '{db_prefix}') !== false))
@@ -437,8 +471,9 @@ 
 		list ($file, $line) = smf_db_error_backtrace('', '', 'return', __FILE__, __LINE__);
 
 		// Initialize $db_cache if not already initialized.
-		if (!isset($db_cache))
-			$db_cache = array();
+		if (!isset($db_cache)) {
+					$db_cache = array();
+		}
 
 		if (!empty($_SESSION['debug_redirect']))
 		{
@@ -464,17 +499,18 @@ 
 		while (true)
 		{
 			$pos = strpos($db_string, '\'', $pos + 1);
-			if ($pos === false)
-				break;
+			if ($pos === false) {
+							break;
+			}
 			$clean .= substr($db_string, $old_pos, $pos - $old_pos);
 
 			while (true)
 			{
 				$pos1 = strpos($db_string, '\'', $pos + 1);
 				$pos2 = strpos($db_string, '\\', $pos + 1);
-				if ($pos1 === false)
-					break;
-				elseif ($pos2 === false || $pos2 > $pos1)
+				if ($pos1 === false) {
+									break;
+				} elseif ($pos2 === false || $pos2 > $pos1)
 				{
 					$pos = $pos1;
 					break;
@@ -490,29 +526,35 @@ 
 		$clean = trim(strtolower(preg_replace($allowed_comments_from, $allowed_comments_to, $clean)));
 
 		// Comments?  We don't use comments in our queries, we leave 'em outside!
-		if (strpos($clean, '/*') > 2 || strpos($clean, '--') !== false || strpos($clean, ';') !== false)
-			$fail = true;
+		if (strpos($clean, '/*') > 2 || strpos($clean, '--') !== false || strpos($clean, ';') !== false) {
+					$fail = true;
+		}
 		// Trying to change passwords, slow us down, or something?
-		elseif (strpos($clean, 'sleep') !== false && preg_match('~(^|[^a-z])sleep($|[^[_a-z])~s', $clean) != 0)
-			$fail = true;
-		elseif (strpos($clean, 'benchmark') !== false && preg_match('~(^|[^a-z])benchmark($|[^[a-z])~s', $clean) != 0)
-			$fail = true;
+		elseif (strpos($clean, 'sleep') !== false && preg_match('~(^|[^a-z])sleep($|[^[_a-z])~s', $clean) != 0) {
+					$fail = true;
+		} elseif (strpos($clean, 'benchmark') !== false && preg_match('~(^|[^a-z])benchmark($|[^[a-z])~s', $clean) != 0) {
+					$fail = true;
+		}
 
-		if (!empty($fail) && function_exists('log_error'))
-			smf_db_error_backtrace('Hacking attempt...', 'Hacking attempt...' . "\n" . $db_string, E_USER_ERROR, __FILE__, __LINE__);
+		if (!empty($fail) && function_exists('log_error')) {
+					smf_db_error_backtrace('Hacking attempt...', 'Hacking attempt...' . "\n" . $db_string, E_USER_ERROR, __FILE__, __LINE__);
+		}
 	}
 
-	if (empty($db_unbuffered))
-		$ret = @mysqli_query($connection, $db_string);
-	else
-		$ret = @mysqli_query($connection, $db_string, MYSQLI_USE_RESULT);
+	if (empty($db_unbuffered)) {
+			$ret = @mysqli_query($connection, $db_string);
+	} else {
+			$ret = @mysqli_query($connection, $db_string, MYSQLI_USE_RESULT);
+	}
 
-	if ($ret === false && empty($db_values['db_error_skip']))
-		$ret = smf_db_error($db_string, $connection);
+	if ($ret === false && empty($db_values['db_error_skip'])) {
+			$ret = smf_db_error($db_string, $connection);
+	}
 
 	// Debugging.
-	if (isset($db_show_debug) && $db_show_debug === true)
-		$db_cache[$db_count]['t'] = array_sum(explode(' ', microtime())) - array_sum(explode(' ', $st));
+	if (isset($db_show_debug) && $db_show_debug === true) {
+			$db_cache[$db_count]['t'] = array_sum(explode(' ', microtime())) - array_sum(explode(' ', $st));
+	}
 
 	return $ret;
 }
@@ -559,12 +601,13 @@ 
 	// Decide which connection to use
 	$connection = $connection === null ? $db_connection : $connection;
 
-	if ($type == 'begin')
-		return @mysqli_query($connection, 'BEGIN');
-	elseif ($type == 'rollback')
-		return @mysqli_query($connection, 'ROLLBACK');
-	elseif ($type == 'commit')
-		return @mysqli_query($connection, 'COMMIT');
+	if ($type == 'begin') {
+			return @mysqli_query($connection, 'BEGIN');
+	} elseif ($type == 'rollback') {
+			return @mysqli_query($connection, 'ROLLBACK');
+	} elseif ($type == 'commit') {
+			return @mysqli_query($connection, 'COMMIT');
+	}
 
 	return false;
 }
@@ -604,8 +647,9 @@ 
 	//    2013: Lost connection to server during query.
 
 	// Log the error.
-	if ($query_errno != 1213 && $query_errno != 1205 && function_exists('log_error'))
-		log_error($txt['database_error'] . ': ' . $query_error . (!empty($modSettings['enableErrorQueryLogging']) ? "\n\n$db_string" : ''), 'database', $file, $line);
+	if ($query_errno != 1213 && $query_errno != 1205 && function_exists('log_error')) {
+			log_error($txt['database_error'] . ': ' . $query_error . (!empty($modSettings['enableErrorQueryLogging']) ? "\n\n$db_string" : ''), 'database', $file, $line);
+	}
 
 	// Database error auto fixing ;).
 	if (function_exists('cache_get_data') && (!isset($modSettings['autoFixDatabase']) || $modSettings['autoFixDatabase'] == '1'))
@@ -614,8 +658,9 @@ 
 		$old_cache = @$modSettings['cache_enable'];
 		$modSettings['cache_enable'] = '1';
 
-		if (($temp = cache_get_data('db_last_error', 600)) !== null)
-			$db_last_error = max(@$db_last_error, $temp);
+		if (($temp = cache_get_data('db_last_error', 600)) !== null) {
+					$db_last_error = max(@$db_last_error, $temp);
+		}
 
 		if (@$db_last_error < time() - 3600 * 24 * 3)
 		{
@@ -631,8 +676,9 @@ 
 					foreach ($tables as $table)
 					{
 						// Now, it's still theoretically possible this could be an injection.  So backtick it!
-						if (trim($table) != '')
-							$fix_tables[] = '`' . strtr(trim($table), array('`' => '')) . '`';
+						if (trim($table) != '') {
+													$fix_tables[] = '`' . strtr(trim($table), array('`' => '')) . '`';
+						}
 					}
 				}
 
@@ -641,8 +687,9 @@ 
 			// Table crashed.  Let's try to fix it.
 			elseif ($query_errno == 1016)
 			{
-				if (preg_match('~\'([^\.\']+)~', $query_error, $match) != 0)
-					$fix_tables = array('`' . $match[1] . '`');
+				if (preg_match('~\'([^\.\']+)~', $query_error, $match) != 0) {
+									$fix_tables = array('`' . $match[1] . '`');
+				}
 			}
 			// Indexes crashed.  Should be easy to fix!
 			elseif ($query_errno == 1034 || $query_errno == 1035)
@@ -661,13 +708,15 @@ 
 
 			// Make a note of the REPAIR...
 			cache_put_data('db_last_error', time(), 600);
-			if (($temp = cache_get_data('db_last_error', 600)) === null)
-				updateSettingsFile(array('db_last_error' => time()));
+			if (($temp = cache_get_data('db_last_error', 600)) === null) {
+							updateSettingsFile(array('db_last_error' => time()));
+			}
 
 			// Attempt to find and repair the broken table.
-			foreach ($fix_tables as $table)
-				$smcFunc['db_query']('', "
+			foreach ($fix_tables as $table) {
+							$smcFunc['db_query']('', "
 					REPAIR TABLE $table", false, false);
+			}
 
 			// And send off an email!
 			sendmail($webmaster_email, $txt['database_error'], $txt['tried_to_repair'], null, 'dberror');
@@ -676,11 +725,12 @@ 
 
 			// Try the query again...?
 			$ret = $smcFunc['db_query']('', $db_string, false, false);
-			if ($ret !== false)
-				return $ret;
+			if ($ret !== false) {
+							return $ret;
+			}
+		} else {
+					$modSettings['cache_enable'] = $old_cache;
 		}
-		else
-			$modSettings['cache_enable'] = $old_cache;
 
 		// Check for the "lost connection" or "deadlock found" errors - and try it just one more time.
 		if (in_array($query_errno, array(1205, 1213, 2006, 2013)))
@@ -690,22 +740,25 @@ 
 				// Are we in SSI mode?  If so try that username and password first
 				if (SMF == 'SSI' && !empty($ssi_db_user) && !empty($ssi_db_passwd))
 				{
-					if (empty($db_persist))
-						$db_connection = @mysqli_connect($db_server, $ssi_db_user, $ssi_db_passwd);
-					else
-						$db_connection = @mysqli_connect('p:' . $db_server, $ssi_db_user, $ssi_db_passwd);
+					if (empty($db_persist)) {
+											$db_connection = @mysqli_connect($db_server, $ssi_db_user, $ssi_db_passwd);
+					} else {
+											$db_connection = @mysqli_connect('p:' . $db_server, $ssi_db_user, $ssi_db_passwd);
+					}
 				}
 				// Fall back to the regular username and password if need be
 				if (!$db_connection)
 				{
-					if (empty($db_persist))
-						$db_connection = @mysqli_connect($db_server, $db_user, $db_passwd);
-					else
-						$db_connection = @mysqli_connect('p:' . $db_server, $db_user, $db_passwd);
+					if (empty($db_persist)) {
+											$db_connection = @mysqli_connect($db_server, $db_user, $db_passwd);
+					} else {
+											$db_connection = @mysqli_connect('p:' . $db_server, $db_user, $db_passwd);
+					}
 				}
 
-				if (!$db_connection || !@mysqli_select_db($db_connection, $db_name))
-					$db_connection = false;
+				if (!$db_connection || !@mysqli_select_db($db_connection, $db_name)) {
+									$db_connection = false;
+				}
 			}
 
 			if ($db_connection)
@@ -716,24 +769,27 @@ 
 					$ret = $smcFunc['db_query']('', $db_string, false, false);
 
 					$new_errno = mysqli_errno($db_connection);
-					if ($ret !== false || in_array($new_errno, array(1205, 1213)))
-						break;
+					if ($ret !== false || in_array($new_errno, array(1205, 1213))) {
+											break;
+					}
 				}
 
 				// If it failed again, shucks to be you... we're not trying it over and over.
-				if ($ret !== false)
-					return $ret;
+				if ($ret !== false) {
+									return $ret;
+				}
 			}
 		}
 		// Are they out of space, perhaps?
 		elseif ($query_errno == 1030 && (strpos($query_error, ' -1 ') !== false || strpos($query_error, ' 28 ') !== false || strpos($query_error, ' 12 ') !== false))
 		{
-			if (!isset($txt))
-				$query_error .= ' - check database storage space.';
-			else
+			if (!isset($txt)) {
+							$query_error .= ' - check database storage space.';
+			} else
 			{
-				if (!isset($txt['mysql_error_space']))
-					loadLanguage('Errors');
+				if (!isset($txt['mysql_error_space'])) {
+									loadLanguage('Errors');
+				}
 
 				$query_error .= !isset($txt['mysql_error_space']) ? ' - check database storage space.' : $txt['mysql_error_space'];
 			}
@@ -741,15 +797,17 @@ 
 	}
 
 	// Nothing's defined yet... just die with it.
-	if (empty($context) || empty($txt))
-		die($query_error);
+	if (empty($context) || empty($txt)) {
+			die($query_error);
+	}
 
 	// Show an error message, if possible.
 	$context['error_title'] = $txt['database_error'];
-	if (allowedTo('admin_forum'))
-		$context['error_message'] = nl2br($query_error) . '<br>' . $txt['file'] . ': ' . $file . '<br>' . $txt['line'] . ': ' . $line;
-	else
-		$context['error_message'] = $txt['try_again'];
+	if (allowedTo('admin_forum')) {
+			$context['error_message'] = nl2br($query_error) . '<br>' . $txt['file'] . ': ' . $file . '<br>' . $txt['line'] . ': ' . $line;
+	} else {
+			$context['error_message'] = $txt['try_again'];
+	}
 
 	if (allowedTo('admin_forum') && isset($db_show_debug) && $db_show_debug === true)
 	{
@@ -779,25 +837,28 @@ 
 	$connection = $connection === null ? $db_connection : $connection;
 
 	// With nothing to insert, simply return.
-	if (empty($data))
-		return;
+	if (empty($data)) {
+			return;
+	}
 
 	// Replace the prefix holder with the actual prefix.
 	$table = str_replace('{db_prefix}', $db_prefix, $table);
 
 	// Inserting data as a single row can be done as a single array.
-	if (!is_array($data[array_rand($data)]))
-		$data = array($data);
+	if (!is_array($data[array_rand($data)])) {
+			$data = array($data);
+	}
 
 	// Create the mold for a single row insert.
 	$insertData = '(';
 	foreach ($columns as $columnName => $type)
 	{
 		// Are we restricting the length?
-		if (strpos($type, 'string-') !== false)
-			$insertData .= sprintf('SUBSTRING({string:%1$s}, 1, ' . substr($type, 7) . '), ', $columnName);
-		else
-			$insertData .= sprintf('{%1$s:%2$s}, ', $type, $columnName);
+		if (strpos($type, 'string-') !== false) {
+					$insertData .= sprintf('SUBSTRING({string:%1$s}, 1, ' . substr($type, 7) . '), ', $columnName);
+		} else {
+					$insertData .= sprintf('{%1$s:%2$s}, ', $type, $columnName);
+		}
 	}
 	$insertData = substr($insertData, 0, -2) . ')';
 
@@ -806,8 +867,9 @@ 
 
 	// Here's where the variables are injected to the query.
 	$insertRows = array();
-	foreach ($data as $dataRow)
-		$insertRows[] = smf_db_quote($insertData, array_combine($indexed_columns, $dataRow), $connection);
+	foreach ($data as $dataRow) {
+			$insertRows[] = smf_db_quote($insertData, array_combine($indexed_columns, $dataRow), $connection);
+	}
 
 	// Determine the method of insertion.
 	$queryTitle = $method == 'replace' ? 'REPLACE' : ($method == 'ignore' ? 'INSERT IGNORE' : 'INSERT');
@@ -827,15 +889,16 @@ 
 	
 	if(!empty($keys) && (count($keys) > 0) && $method == '' && $returnmode > 0)
 	{
-		if ($returnmode == 1)
-			$return_var = smf_db_insert_id($table, $keys[0]) + count($insertRows) - 1;
-		else if ($returnmode == 2)
+		if ($returnmode == 1) {
+					$return_var = smf_db_insert_id($table, $keys[0]) + count($insertRows) - 1;
+		} else if ($returnmode == 2)
 		{
 			$return_var = array();
 			$count = count($insertRows);
 			$start = smf_db_insert_id($table, $keys[0]);
-			for ($i = 0; $i < $count; $i++ )
-				$return_var[] = $start + $i;
+			for ($i = 0; $i < $count; $i++ ) {
+							$return_var[] = $start + $i;
+			}
 		}
 		return $return_var;
 	}
@@ -853,8 +916,9 @@ 
  */
 function smf_db_error_backtrace($error_message, $log_message = '', $error_type = false, $file = null, $line = null)
 {
-	if (empty($log_message))
-		$log_message = $error_message;
+	if (empty($log_message)) {
+			$log_message = $error_message;
+	}
 
 	foreach (debug_backtrace() as $step)
 	{
@@ -873,12 +937,14 @@ 
 	}
 
 	// A special case - we want the file and line numbers for debugging.
-	if ($error_type == 'return')
-		return array($file, $line);
+	if ($error_type == 'return') {
+			return array($file, $line);
+	}
 
 	// Is always a critical error.
-	if (function_exists('log_error'))
-		log_error($log_message, 'critical', $file, $line);
+	if (function_exists('log_error')) {
+			log_error($log_message, 'critical', $file, $line);
+	}
 
 	if (function_exists('fatal_error'))
 	{
@@ -886,12 +952,12 @@ 
 
 		// Cannot continue...
 		exit;
+	} elseif ($error_type) {
+			trigger_error($error_message . ($line !== null ? '<em>(' . basename($file) . '-' . $line . ')</em>' : ''), $error_type);
+	} else {
+			trigger_error($error_message . ($line !== null ? '<em>(' . basename($file) . '-' . $line . ')</em>' : ''));
+	}
 	}
-	elseif ($error_type)
-		trigger_error($error_message . ($line !== null ? '<em>(' . basename($file) . '-' . $line . ')</em>' : ''), $error_type);
-	else
-		trigger_error($error_message . ($line !== null ? '<em>(' . basename($file) . '-' . $line . ')</em>' : ''));
-}
 
 /**
  * Escape the LIKE wildcards so that they match the character and not the wildcard.
@@ -908,10 +974,11 @@ 
 		'\\' => '\\\\',
 	);
 
-	if ($translate_human_wildcards)
-		$replacements += array(
+	if ($translate_human_wildcards) {
+			$replacements += array(
 			'*' => '%',
 		);
+	}
 
 	return strtr($string, $replacements);
 }
@@ -925,8 +992,9 @@ 
  */
 function smf_is_resource($result)
 {
-	if ($result instanceof mysqli_result)
-		return true;
+	if ($result instanceof mysqli_result) {
+			return true;
+	}
 
 	return false;
 }

Sources/Admin.php

Braces +75 added lines, -52 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * The main admin handling function.<br>
@@ -444,8 +445,9 @@ 
 		foreach ($admin_includes as $include)
 		{
 			$include = strtr(trim($include), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir, '$themedir' => $settings['theme_dir']));
-			if (file_exists($include))
-				require_once($include);
+			if (file_exists($include)) {
+							require_once($include);
+			}
 		}
 	}
 
@@ -457,24 +459,27 @@ 
 	unset($admin_areas);
 
 	// Nothing valid?
-	if ($admin_include_data == false)
-		fatal_lang_error('no_access', false);
+	if ($admin_include_data == false) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Build the link tree.
 	$context['linktree'][] = array(
 		'url' => $scripturl . '?action=admin',
 		'name' => $txt['admin_center'],
 	);
-	if (isset($admin_include_data['current_area']) && $admin_include_data['current_area'] != 'index')
-		$context['linktree'][] = array(
+	if (isset($admin_include_data['current_area']) && $admin_include_data['current_area'] != 'index') {
+			$context['linktree'][] = array(
 			'url' => $scripturl . '?action=admin;area=' . $admin_include_data['current_area'] . ';' . $context['session_var'] . '=' . $context['session_id'],
 			'name' => $admin_include_data['label'],
 		);
-	if (!empty($admin_include_data['current_subsection']) && $admin_include_data['subsections'][$admin_include_data['current_subsection']][0] != $admin_include_data['label'])
-		$context['linktree'][] = array(
+	}
+	if (!empty($admin_include_data['current_subsection']) && $admin_include_data['subsections'][$admin_include_data['current_subsection']][0] != $admin_include_data['label']) {
+			$context['linktree'][] = array(
 			'url' => $scripturl . '?action=admin;area=' . $admin_include_data['current_area'] . ';sa=' . $admin_include_data['current_subsection'] . ';' . $context['session_var'] . '=' . $context['session_id'],
 			'name' => $admin_include_data['subsections'][$admin_include_data['current_subsection']][0],
 		);
+	}
 
 	// Make a note of the Unique ID for this menu.
 	$context['admin_menu_id'] = $context['max_menu_id'];
@@ -484,16 +489,18 @@ 
 	$context['admin_area'] = $admin_include_data['current_area'];
 
 	// Now - finally - call the right place!
-	if (isset($admin_include_data['file']))
-		require_once($sourcedir . '/' . $admin_include_data['file']);
+	if (isset($admin_include_data['file'])) {
+			require_once($sourcedir . '/' . $admin_include_data['file']);
+	}
 
 	// Get the right callable.
 	$call = call_helper($admin_include_data['function'], true);
 
 	// Is it valid?
-	if (!empty($call))
-		call_user_func($call);
-}
+	if (!empty($call)) {
+			call_user_func($call);
+	}
+	}
 
 /**
  * The main administration section.
@@ -547,13 +554,14 @@ 
 
 	$context['sub_template'] = $context['admin_area'] == 'credits' ? 'credits' : 'admin';
 	$context['page_title'] = $context['admin_area'] == 'credits' ? $txt['support_credits_title'] : $txt['admin_center'];
-	if ($context['admin_area'] != 'credits')
-		$context[$context['admin_menu_name']]['tab_data'] = array(
+	if ($context['admin_area'] != 'credits') {
+			$context[$context['admin_menu_name']]['tab_data'] = array(
 			'title' => $txt['admin_center'],
 			'help' => '',
 			'description' => '<strong>' . $txt['hello_guest'] . ' ' . $context['user']['name'] . '!</strong>
 						' . sprintf($txt['admin_main_welcome'], $txt['admin_center'], $txt['help'], $txt['help']),
 		);
+	}
 
 	// Lastly, fill in the blanks in the support resources paragraphs.
 	$txt['support_resources_p1'] = sprintf($txt['support_resources_p1'],
@@ -571,9 +579,10 @@ 
 		'https://www.simplemachines.org/redirect/customize_support'
 	);
 
-	if ($context['admin_area'] == 'admin')
-		loadJavaScriptFile('admin.js', array('defer' => false), 'smf_admin');
-}
+	if ($context['admin_area'] == 'admin') {
+			loadJavaScriptFile('admin.js', array('defer' => false), 'smf_admin');
+	}
+	}
 
 /**
  * Get one of the admin information files from Simple Machines.
@@ -584,8 +593,9 @@ 
 
 	setMemoryLimit('32M');
 
-	if (empty($_REQUEST['filename']) || !is_string($_REQUEST['filename']))
-		fatal_lang_error('no_access', false);
+	if (empty($_REQUEST['filename']) || !is_string($_REQUEST['filename'])) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Strip off the forum cache part or we won't find it...
 	$_REQUEST['filename'] = str_replace($modSettings['browser_cache'], '', $_REQUEST['filename']);
@@ -600,27 +610,30 @@ 
 		)
 	);
 
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('admin_file_not_found', true, array($_REQUEST['filename']), 404);
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('admin_file_not_found', true, array($_REQUEST['filename']), 404);
+	}
 
 	list ($file_data, $filetype) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
 
 	// @todo Temp
 	// Figure out if sesc is still being used.
-	if (strpos($file_data, ';sesc=') !== false && $filetype == 'text/javascript')
-		$file_data = '
+	if (strpos($file_data, ';sesc=') !== false && $filetype == 'text/javascript') {
+			$file_data = '
 if (!(\'smfForum_sessionvar\' in window))
 	window.smfForum_sessionvar = \'sesc\';
 ' . strtr($file_data, array(';sesc=' => ';\' + window.smfForum_sessionvar + \'='));
+	}
 
 	$context['template_layers'] = array();
 	// Lets make sure we aren't going to output anything nasty.
 	@ob_end_clean();
-	if (!empty($modSettings['enableCompressedOutput']))
-		@ob_start('ob_gzhandler');
-	else
-		@ob_start();
+	if (!empty($modSettings['enableCompressedOutput'])) {
+			@ob_start('ob_gzhandler');
+	} else {
+			@ob_start();
+	}
 
 	// Make sure they know what type of file we are.
 	header('Content-Type: ' . $filetype);
@@ -660,11 +673,12 @@ 
 		updateAdminPreferences();
 	}
 
-	if (trim($context['search_term']) == '')
-		$context['search_results'] = array();
-	else
-		call_helper($subActions[$context['search_type']]);
-}
+	if (trim($context['search_term']) == '') {
+			$context['search_results'] = array();
+	} else {
+			call_helper($subActions[$context['search_type']]);
+	}
+	}
 
 /**
  * A complicated but relatively quick internal search.
@@ -728,8 +742,9 @@ 
 
 	loadLanguage(implode('+', $language_files));
 
-	foreach ($include_files as $file)
-		require_once($sourcedir . '/' . $file . '.php');
+	foreach ($include_files as $file) {
+			require_once($sourcedir . '/' . $file . '.php');
+	}
 
 	/* This is the huge array that defines everything... it's a huge array of items formatted as follows:
 		0 = Language index (Can be array of indexes) to search through for this setting.
@@ -753,11 +768,12 @@ 
 		foreach ($section['areas'] as $menu_key => $menu_item)
 		{
 			$search_data['sections'][] = array($menu_item['label'], 'area=' . $menu_key);
-			if (!empty($menu_item['subsections']))
-				foreach ($menu_item['subsections'] as $key => $sublabel)
+			if (!empty($menu_item['subsections'])) {
+							foreach ($menu_item['subsections'] as $key => $sublabel)
 				{
 					if (isset($sublabel['label']))
 						$search_data['sections'][] = array($sublabel['label'], 'area=' . $menu_key . ';sa=' . $key);
+			}
 				}
 		}
 	}
@@ -767,9 +783,10 @@ 
 		// Get a list of their variables.
 		$config_vars = $setting_area[0](true);
 
-		foreach ($config_vars as $var)
-			if (!empty($var[1]) && !in_array($var[0], array('permissions', 'switch', 'desc')))
+		foreach ($config_vars as $var) {
+					if (!empty($var[1]) && !in_array($var[0], array('permissions', 'switch', 'desc')))
 				$search_data['settings'][] = array($var[(isset($var[2]) && in_array($var[2], array('file', 'db'))) ? 0 : 1], $setting_area[1]);
+		}
 	}
 
 	$context['page_title'] = $txt['admin_search_results'];
@@ -782,8 +799,9 @@ 
 		foreach ($data as $item)
 		{
 			$found = false;
-			if (!is_array($item[0]))
-				$item[0] = array($item[0]);
+			if (!is_array($item[0])) {
+							$item[0] = array($item[0]);
+			}
 			foreach ($item[0] as $term)
 			{
 				if (stripos($term, $search_term) !== false || (isset($txt[$term]) && stripos($txt[$term], $search_term) !== false) || (isset($txt['setting_' . $term]) && stripos($txt['setting_' . $term], $search_term) !== false))
@@ -841,8 +859,9 @@ 
 	$postVars = explode(' ', $context['search_term']);
 
 	// Encode the search data.
-	foreach ($postVars as $k => $v)
-		$postVars[$k] = urlencode($v);
+	foreach ($postVars as $k => $v) {
+			$postVars[$k] = urlencode($v);
+	}
 
 	// This is what we will send.
 	$postVars = implode('+', $postVars);
@@ -854,8 +873,9 @@ 
 	$search_results = fetch_web_data($context['doc_apiurl'] . '?action=query&list=search&srprop=timestamp|snippet&format=xml&srwhat=text&srsearch=' . $postVars);
 
 	// If we didn't get any xml back we are in trouble - perhaps the doc site is overloaded?
-	if (!$search_results || preg_match('~<' . '\?xml\sversion="\d+\.\d+"\?' . '>\s*(<api>.+?</api>)~is', $search_results, $matches) != true)
-		fatal_lang_error('cannot_connect_doc_site');
+	if (!$search_results || preg_match('~<' . '\?xml\sversion="\d+\.\d+"\?' . '>\s*(<api>.+?</api>)~is', $search_results, $matches) != true) {
+			fatal_lang_error('cannot_connect_doc_site');
+	}
 
 	$search_results = $matches[1];
 
@@ -867,8 +887,9 @@ 
 	$results = new xmlArray($search_results, false);
 
 	// Move through the api layer.
-	if (!$results->exists('api'))
-		fatal_lang_error('cannot_connect_doc_site');
+	if (!$results->exists('api')) {
+			fatal_lang_error('cannot_connect_doc_site');
+	}
 
 	// Are there actually some results?
 	if ($results->exists('api/query/search/p'))
@@ -904,8 +925,9 @@ 
 	);
 
 	// If it's not got a sa set it must have come here for first time, pretend error log should be reversed.
-	if (!isset($_REQUEST['sa']))
-		$_REQUEST['desc'] = true;
+	if (!isset($_REQUEST['sa'])) {
+			$_REQUEST['desc'] = true;
+	}
 
 	// Setup some tab stuff.
 	$context[$context['admin_menu_name']]['tab_data'] = array(
@@ -955,9 +977,10 @@ 
 	unset($_SESSION['admin_time']);
 
 	// Clean any admin tokens as well.
-	foreach ($_SESSION['token'] as $key => $token)
-		if (strpos($key, '-admin') !== false)
+	foreach ($_SESSION['token'] as $key => $token) {
+			if (strpos($key, '-admin') !== false)
 			unset($_SESSION['token'][$key]);
+	}
 
 	redirectexit();
 }

Sources/ShowAttachments.php

Braces +59 added lines, -52 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Shows an avatar based on $_GET['attach']
@@ -35,11 +36,11 @@ 
 
 	if (!empty($modSettings['enableCompressedOutput']) && !headers_sent() && ob_get_length() == 0)
 	{
-		if (@ini_get('zlib.output_compression') == '1' || @ini_get('output_handler') == 'ob_gzhandler')
-			$modSettings['enableCompressedOutput'] = 0;
-
-		else
-			ob_start('ob_gzhandler');
+		if (@ini_get('zlib.output_compression') == '1' || @ini_get('output_handler') == 'ob_gzhandler') {
+					$modSettings['enableCompressedOutput'] = 0;
+		} else {
+					ob_start('ob_gzhandler');
+		}
 	}
 
 	if (empty($modSettings['enableCompressedOutput']))
@@ -71,8 +72,9 @@ 
 	}
 
 	// Use cache when possible.
-	if (($cache = cache_get_data('attachment_lookup_id-' . $attachId)) != null)
-		list($file, $thumbFile) = $cache;
+	if (($cache = cache_get_data('attachment_lookup_id-' . $attachId)) != null) {
+			list($file, $thumbFile) = $cache;
+	}
 
 	// Get the info from the DB.
 	if (empty($file) || empty($thumbFile) && !empty($file['id_thumb']))
@@ -80,10 +82,9 @@ 
 		// Do we have a hook wanting to use our attachment system? We use $attachRequest to prevent accidental usage of $request.
 		$attachRequest = null;
 		call_integration_hook('integrate_download_request', array(&$attachRequest));
-		if (!is_null($attachRequest) && $smcFunc['db_is_resource']($attachRequest))
-			$request = $attachRequest;
-
-		else
+		if (!is_null($attachRequest) && $smcFunc['db_is_resource']($attachRequest)) {
+					$request = $attachRequest;
+		} else
 		{
 			// Make sure this attachment is on this board and load its info while we are at it.
 			$request = $smcFunc['db_query']('', '
@@ -176,13 +177,15 @@ 
 		}
 
 		// Cache it.
-		if (!empty($file) || !empty($thumbFile))
-			cache_put_data('attachment_lookup_id-' . $file['id_attach'], array($file, $thumbFile), mt_rand(850, 900));
+		if (!empty($file) || !empty($thumbFile)) {
+					cache_put_data('attachment_lookup_id-' . $file['id_attach'], array($file, $thumbFile), mt_rand(850, 900));
+		}
 	}
 
 	// Replace the normal file with its thumbnail if it has one!
-	if (!empty($showThumb) && !empty($thumbFile))
-		$file = $thumbFile;
+	if (!empty($showThumb) && !empty($thumbFile)) {
+			$file = $thumbFile;
+	}
 
 	// No point in a nicer message, because this is supposed to be an attachment anyway...
 	if (!file_exists($file['filePath']))
@@ -232,8 +235,8 @@ 
 	}
 
 	// Update the download counter (unless it's a thumbnail or resuming an incomplete download).
-	if ($file['attachment_type'] != 3 && empty($showThumb) && $range === 0)
-		$smcFunc['db_query']('attach_download_increase', '
+	if ($file['attachment_type'] != 3 && empty($showThumb) && $range === 0) {
+			$smcFunc['db_query']('attach_download_increase', '
 			UPDATE LOW_PRIORITY {db_prefix}attachments
 			SET downloads = downloads + 1
 			WHERE id_attach = {int:id_attach}',
@@ -241,12 +244,14 @@ 
 				'id_attach' => $attachId,
 			)
 		);
+	}
 
 	// Send the attachment headers.
 	header('Pragma: ');
 
-	if (!isBrowser('gecko'))
-		header('Content-Transfer-Encoding: binary');
+	if (!isBrowser('gecko')) {
+			header('Content-Transfer-Encoding: binary');
+	}
 
 	header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 525600 * 60) . ' GMT');
 	header('Last-Modified: ' . gmdate('D, d M Y H:i:s', filemtime($file['filePath'])) . ' GMT');
@@ -255,18 +260,19 @@ 
 	header('ETag: ' . $eTag);
 
 	// Make sure the mime type warrants an inline display.
-	if (isset($_REQUEST['image']) && !empty($file['mime_type']) && strpos($file['mime_type'], 'image/') !== 0)
-		unset($_REQUEST['image']);
+	if (isset($_REQUEST['image']) && !empty($file['mime_type']) && strpos($file['mime_type'], 'image/') !== 0) {
+			unset($_REQUEST['image']);
+	}
 
 	// Does this have a mime type?
-	elseif (!empty($file['mime_type']) && (isset($_REQUEST['image']) || !in_array($file['fileext'], array('jpg', 'gif', 'jpeg', 'x-ms-bmp', 'png', 'psd', 'tiff', 'iff'))))
-		header('Content-Type: ' . strtr($file['mime_type'], array('image/bmp' => 'image/x-ms-bmp')));
-
-	else
+	elseif (!empty($file['mime_type']) && (isset($_REQUEST['image']) || !in_array($file['fileext'], array('jpg', 'gif', 'jpeg', 'x-ms-bmp', 'png', 'psd', 'tiff', 'iff')))) {
+			header('Content-Type: ' . strtr($file['mime_type'], array('image/bmp' => 'image/x-ms-bmp')));
+	} else
 	{
 		header('Content-Type: ' . (isBrowser('ie') || isBrowser('opera') ? 'application/octetstream' : 'application/octet-stream'));
-		if (isset($_REQUEST['image']))
-			unset($_REQUEST['image']);
+		if (isset($_REQUEST['image'])) {
+					unset($_REQUEST['image']);
+		}
 	}
 
 	// Convert the file to UTF-8, cuz most browsers dig that.
@@ -274,24 +280,22 @@ 
 	$disposition = !isset($_REQUEST['image']) ? 'attachment' : 'inline';
 
 	// Different browsers like different standards...
-	if (isBrowser('firefox'))
-		header('Content-Disposition: ' . $disposition . '; filename*=UTF-8\'\'' . rawurlencode(preg_replace_callback('~&#(\d{3,8});~', 'fixchar__callback', $utf8name)));
-
-	elseif (isBrowser('opera'))
-		header('Content-Disposition: ' . $disposition . '; filename="' . preg_replace_callback('~&#(\d{3,8});~', 'fixchar__callback', $utf8name) . '"');
-
-	elseif (isBrowser('ie'))
-		header('Content-Disposition: ' . $disposition . '; filename="' . urlencode(preg_replace_callback('~&#(\d{3,8});~', 'fixchar__callback', $utf8name)) . '"');
-
-	else
-		header('Content-Disposition: ' . $disposition . '; filename="' . $utf8name . '"');
+	if (isBrowser('firefox')) {
+			header('Content-Disposition: ' . $disposition . '; filename*=UTF-8\'\'' . rawurlencode(preg_replace_callback('~&#(\d{3,8});~', 'fixchar__callback', $utf8name)));
+	} elseif (isBrowser('opera')) {
+			header('Content-Disposition: ' . $disposition . '; filename="' . preg_replace_callback('~&#(\d{3,8});~', 'fixchar__callback', $utf8name) . '"');
+	} elseif (isBrowser('ie')) {
+			header('Content-Disposition: ' . $disposition . '; filename="' . urlencode(preg_replace_callback('~&#(\d{3,8});~', 'fixchar__callback', $utf8name)) . '"');
+	} else {
+			header('Content-Disposition: ' . $disposition . '; filename="' . $utf8name . '"');
+	}
 
 	// If this has an "image extension" - but isn't actually an image - then ensure it isn't cached cause of silly IE.
-	if (!isset($_REQUEST['image']) && in_array($file['fileext'], array('gif', 'jpg', 'bmp', 'png', 'jpeg', 'tiff')))
-		header('Cache-Control: no-cache');
-
-	else
-		header('Cache-Control: max-age=' . (525600 * 60) . ', private');
+	if (!isset($_REQUEST['image']) && in_array($file['fileext'], array('gif', 'jpg', 'bmp', 'png', 'jpeg', 'tiff'))) {
+			header('Cache-Control: no-cache');
+	} else {
+			header('Cache-Control: max-age=' . (525600 * 60) . ', private');
+	}
 
 	// Multipart and resuming support
 	if (isset($_SERVER['HTTP_RANGE']))
@@ -299,9 +303,9 @@ 
 		header("HTTP/1.1 206 Partial Content");
 		header("Content-Length: $new_length");
 		header("Content-Range: bytes $range-$range_end/$size");
+	} else {
+			header("Content-Length: " . $size);
 	}
-	else
-		header("Content-Length: " . $size);
 
 
 	// Try to buy some time...
@@ -310,8 +314,9 @@ 
 	// For multipart/resumable downloads, send the requested chunk(s) of the file
 	if (isset($_SERVER['HTTP_RANGE']))
 	{
-		while (@ob_get_level() > 0)
-			@ob_end_clean();
+		while (@ob_get_level() > 0) {
+					@ob_end_clean();
+		}
 
 		// 40 kilobytes is a good-ish amount
 		$chunksize = 40 * 1024;
@@ -335,8 +340,9 @@ 
 	elseif ($size > 4194304)
 	{
 		// Forcibly end any output buffering going on.
-		while (@ob_get_level() > 0)
-			@ob_end_clean();
+		while (@ob_get_level() > 0) {
+					@ob_end_clean();
+		}
 
 		$fp = fopen($file['filePath'], 'rb');
 		while (!feof($fp))
@@ -348,8 +354,9 @@ 
 	}
 
 	// On some of the less-bright hosts, readfile() is disabled.  It's just a faster, more byte safe, version of what's in the if.
-	elseif (@readfile($file['filePath']) === null)
-		echo file_get_contents($file['filePath']);
+	elseif (@readfile($file['filePath']) === null) {
+			echo file_get_contents($file['filePath']);
+	}
 
 	die();
 }

Sources/News.php

Braces +226 added lines, -185 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Outputs xml data representing recent information or a profile.
@@ -37,8 +38,9 @@ 
 	global $query_this_board, $smcFunc, $forum_version, $settings;
 
 	// If it's not enabled, die.
-	if (empty($modSettings['xmlnews_enable']))
-		obExit(false);
+	if (empty($modSettings['xmlnews_enable'])) {
+			obExit(false);
+	}
 
 	loadLanguage('Stats');
 
@@ -64,8 +66,9 @@ 
 	if (!empty($_REQUEST['c']) && empty($board))
 	{
 		$_REQUEST['c'] = explode(',', $_REQUEST['c']);
-		foreach ($_REQUEST['c'] as $i => $c)
-			$_REQUEST['c'][$i] = (int) $c;
+		foreach ($_REQUEST['c'] as $i => $c) {
+					$_REQUEST['c'][$i] = (int) $c;
+		}
 
 		if (count($_REQUEST['c']) == 1)
 		{
@@ -101,18 +104,20 @@ 
 		}
 		$smcFunc['db_free_result']($request);
 
-		if (!empty($boards))
-			$query_this_board = 'b.id_board IN (' . implode(', ', $boards) . ')';
+		if (!empty($boards)) {
+					$query_this_board = 'b.id_board IN (' . implode(', ', $boards) . ')';
+		}
 
 		// Try to limit the number of messages we look through.
-		if ($total_cat_posts > 100 && $total_cat_posts > $modSettings['totalMessages'] / 15)
-			$context['optimize_msg']['lowest'] = 'm.id_msg >= ' . max(0, $modSettings['maxMsgID'] - 400 - $_GET['limit'] * 5);
-	}
-	elseif (!empty($_REQUEST['boards']))
+		if ($total_cat_posts > 100 && $total_cat_posts > $modSettings['totalMessages'] / 15) {
+					$context['optimize_msg']['lowest'] = 'm.id_msg >= ' . max(0, $modSettings['maxMsgID'] - 400 - $_GET['limit'] * 5);
+		}
+	} elseif (!empty($_REQUEST['boards']))
 	{
 		$_REQUEST['boards'] = explode(',', $_REQUEST['boards']);
-		foreach ($_REQUEST['boards'] as $i => $b)
-			$_REQUEST['boards'][$i] = (int) $b;
+		foreach ($_REQUEST['boards'] as $i => $b) {
+					$_REQUEST['boards'][$i] = (int) $b;
+		}
 
 		$request = $smcFunc['db_query']('', '
 			SELECT b.id_board, b.num_posts, b.name
@@ -128,29 +133,32 @@ 
 
 		// Either the board specified doesn't exist or you have no access.
 		$num_boards = $smcFunc['db_num_rows']($request);
-		if ($num_boards == 0)
-			fatal_lang_error('no_board');
+		if ($num_boards == 0) {
+					fatal_lang_error('no_board');
+		}
 
 		$total_posts = 0;
 		$boards = array();
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if ($num_boards == 1)
-				$feed_meta['title'] = ' - ' . strip_tags($row['name']);
+			if ($num_boards == 1) {
+							$feed_meta['title'] = ' - ' . strip_tags($row['name']);
+			}
 
 			$boards[] = $row['id_board'];
 			$total_posts += $row['num_posts'];
 		}
 		$smcFunc['db_free_result']($request);
 
-		if (!empty($boards))
-			$query_this_board = 'b.id_board IN (' . implode(', ', $boards) . ')';
+		if (!empty($boards)) {
+					$query_this_board = 'b.id_board IN (' . implode(', ', $boards) . ')';
+		}
 
 		// The more boards, the more we're going to look through...
-		if ($total_posts > 100 && $total_posts > $modSettings['totalMessages'] / 12)
-			$context['optimize_msg']['lowest'] = 'm.id_msg >= ' . max(0, $modSettings['maxMsgID'] - 500 - $_GET['limit'] * 5);
-	}
-	elseif (!empty($board))
+		if ($total_posts > 100 && $total_posts > $modSettings['totalMessages'] / 12) {
+					$context['optimize_msg']['lowest'] = 'm.id_msg >= ' . max(0, $modSettings['maxMsgID'] - 500 - $_GET['limit'] * 5);
+		}
+	} elseif (!empty($board))
 	{
 		$request = $smcFunc['db_query']('', '
 			SELECT num_posts
@@ -170,10 +178,10 @@ 
 		$query_this_board = 'b.id_board = ' . $board;
 
 		// Try to look through just a few messages, if at all possible.
-		if ($total_posts > 80 && $total_posts > $modSettings['totalMessages'] / 10)
-			$context['optimize_msg']['lowest'] = 'm.id_msg >= ' . max(0, $modSettings['maxMsgID'] - 600 - $_GET['limit'] * 5);
-	}
-	else
+		if ($total_posts > 80 && $total_posts > $modSettings['totalMessages'] / 10) {
+					$context['optimize_msg']['lowest'] = 'm.id_msg >= ' . max(0, $modSettings['maxMsgID'] - 600 - $_GET['limit'] * 5);
+		}
+	} else
 	{
 		$query_this_board = '{query_see_board}' . (!empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] > 0 ? '
 			AND b.id_board != ' . $modSettings['recycle_board'] : '');
@@ -196,30 +204,35 @@ 
 	// Easy adding of sub actions
  	call_integration_hook('integrate_xmlfeeds', array(&$subActions));
 
-	if (empty($_GET['sa']) || !isset($subActions[$_GET['sa']]))
-		$_GET['sa'] = 'recent';
+	if (empty($_GET['sa']) || !isset($subActions[$_GET['sa']])) {
+			$_GET['sa'] = 'recent';
+	}
 
 	// We only want some information, not all of it.
 	$cachekey = array($xml_format, $_GET['action'], $_GET['limit'], $_GET['sa']);
-	foreach (array('board', 'boards', 'c') as $var)
-		if (isset($_REQUEST[$var]))
+	foreach (array('board', 'boards', 'c') as $var) {
+			if (isset($_REQUEST[$var]))
 			$cachekey[] = $_REQUEST[$var];
+	}
 	$cachekey = md5(json_encode($cachekey) . (!empty($query_this_board) ? $query_this_board : ''));
 	$cache_t = microtime();
 
 	// Get the associative array representing the xml.
-	if (!empty($modSettings['cache_enable']) && (!$user_info['is_guest'] || $modSettings['cache_enable'] >= 3))
-		$xml_data = cache_get_data('xmlfeed-' . $xml_format . ':' . ($user_info['is_guest'] ? '' : $user_info['id'] . '-') . $cachekey, 240);
+	if (!empty($modSettings['cache_enable']) && (!$user_info['is_guest'] || $modSettings['cache_enable'] >= 3)) {
+			$xml_data = cache_get_data('xmlfeed-' . $xml_format . ':' . ($user_info['is_guest'] ? '' : $user_info['id'] . '-') . $cachekey, 240);
+	}
 	if (empty($xml_data))
 	{
 		$call = call_helper($subActions[$_GET['sa']][0], true);
 
-		if (!empty($call))
-			$xml_data = call_user_func($call, $xml_format);
+		if (!empty($call)) {
+					$xml_data = call_user_func($call, $xml_format);
+		}
 
 		if (!empty($modSettings['cache_enable']) && (($user_info['is_guest'] && $modSettings['cache_enable'] >= 3)
-		|| (!$user_info['is_guest'] && (array_sum(explode(' ', microtime())) - array_sum(explode(' ', $cache_t)) > 0.2))))
-			cache_put_data('xmlfeed-' . $xml_format . ':' . ($user_info['is_guest'] ? '' : $user_info['id'] . '-') . $cachekey, $xml_data, 240);
+		|| (!$user_info['is_guest'] && (array_sum(explode(' ', microtime())) - array_sum(explode(' ', $cache_t)) > 0.2)))) {
+					cache_put_data('xmlfeed-' . $xml_format . ':' . ($user_info['is_guest'] ? '' : $user_info['id'] . '-') . $cachekey, $xml_data, 240);
+		}
 	}
 
 	$feed_meta['title'] = $smcFunc['htmlspecialchars'](strip_tags($context['forum_name'])) . (isset($feed_meta['title']) ? $feed_meta['title'] : '');
@@ -259,43 +272,49 @@ 
 	call_integration_hook('integrate_xml_data', array(&$xml_data, &$feed_meta, &$namespaces, &$extraFeedTags, &$forceCdataKeys, &$nsKeys, $xml_format, $_GET['sa']));
 
 	// These can't be empty
-	foreach (array('title', 'desc', 'source') as $mkey)
-		$feed_meta[$mkey] = !empty($feed_meta[$mkey]) ? $feed_meta[$mkey] : $orig_feed_meta[$mkey];
+	foreach (array('title', 'desc', 'source') as $mkey) {
+			$feed_meta[$mkey] = !empty($feed_meta[$mkey]) ? $feed_meta[$mkey] : $orig_feed_meta[$mkey];
+	}
 
 	// Sanitize basic feed metadata values
-	foreach ($feed_meta as $mkey => $mvalue)
-		$feed_meta[$mkey] = cdata_parse(strip_tags(fix_possible_url($feed_meta[$mkey])));
+	foreach ($feed_meta as $mkey => $mvalue) {
+			$feed_meta[$mkey] = cdata_parse(strip_tags(fix_possible_url($feed_meta[$mkey])));
+	}
 
 	$ns_string = '';
 	if (!empty($namespaces[$xml_format]))
 	{
-		foreach ($namespaces[$xml_format] as $nsprefix => $nsurl)
-			$ns_string .= ' xmlns' . ($nsprefix !== '' ? ':' : '') . $nsprefix . '="' . $nsurl . '"';
+		foreach ($namespaces[$xml_format] as $nsprefix => $nsurl) {
+					$ns_string .= ' xmlns' . ($nsprefix !== '' ? ':' : '') . $nsprefix . '="' . $nsurl . '"';
+		}
 	}
 
 	$extraFeedTags_string = '';
 	if (!empty($extraFeedTags[$xml_format]))
 	{
 		$indent = "\t" . ($xml_format !== 'atom' ? "\t" : '');
-		foreach ($extraFeedTags[$xml_format] as $extraTag)
-			$extraFeedTags_string .= "\n" . $indent . $extraTag;
+		foreach ($extraFeedTags[$xml_format] as $extraTag) {
+					$extraFeedTags_string .= "\n" . $indent . $extraTag;
+		}
 	}
 
 	// This is an xml file....
 	ob_end_clean();
-	if (!empty($modSettings['enableCompressedOutput']))
-		@ob_start('ob_gzhandler');
-	else
-		ob_start();
+	if (!empty($modSettings['enableCompressedOutput'])) {
+			@ob_start('ob_gzhandler');
+	} else {
+			ob_start();
+	}
 
-	if ($xml_format == 'smf' || isset($_REQUEST['debug']))
-		header('Content-Type: text/xml; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
-	elseif ($xml_format == 'rss' || $xml_format == 'rss2')
-		header('Content-Type: application/rss+xml; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
-	elseif ($xml_format == 'atom')
-		header('Content-Type: application/atom+xml; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
-	elseif ($xml_format == 'rdf')
-		header('Content-Type: ' . (isBrowser('ie') ? 'text/xml' : 'application/rdf+xml') . '; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
+	if ($xml_format == 'smf' || isset($_REQUEST['debug'])) {
+			header('Content-Type: text/xml; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
+	} elseif ($xml_format == 'rss' || $xml_format == 'rss2') {
+			header('Content-Type: application/rss+xml; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
+	} elseif ($xml_format == 'atom') {
+			header('Content-Type: application/atom+xml; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
+	} elseif ($xml_format == 'rdf') {
+			header('Content-Type: ' . (isBrowser('ie') ? 'text/xml' : 'application/rdf+xml') . '; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
+	}
 
 	// First, output the xml header.
 	echo '<?xml version="1.0" encoding="', $context['character_set'], '"?' . '>';
@@ -303,10 +322,11 @@ 
 	// Are we outputting an rss feed or one with more information?
 	if ($xml_format == 'rss' || $xml_format == 'rss2')
 	{
-		if ($xml_format == 'rss2')
-			foreach ($_REQUEST as $var => $val)
+		if ($xml_format == 'rss2') {
+					foreach ($_REQUEST as $var => $val)
 				if (in_array($var, array('action', 'sa', 'type', 'board', 'boards', 'c', 'u', 'limit')))
 					$url_parts[] = $var . '=' . (is_array($val) ? implode(',', $val) : $val);
+		}
 
 		// Start with an RSS 2.0 header.
 		echo '
@@ -327,9 +347,10 @@ 
 		<language>' . $feed_meta['language'] . '</language>' : '';
 
 		// RSS2 calls for this.
-		if ($xml_format == 'rss2')
-			echo '
+		if ($xml_format == 'rss2') {
+					echo '
 		<atom:link rel="self" type="application/rss+xml" href="', $scripturl, !empty($url_parts) ? '?' . implode(';', $url_parts) : '', '" />';
+		}
 
 		echo $extraFeedTags_string;
 
@@ -340,12 +361,12 @@ 
 		echo '
 	</channel>
 </rss>';
-	}
-	elseif ($xml_format == 'atom')
+	} elseif ($xml_format == 'atom')
 	{
-		foreach ($_REQUEST as $var => $val)
-			if (in_array($var, array('action', 'sa', 'type', 'board', 'boards', 'c', 'u', 'limit')))
+		foreach ($_REQUEST as $var => $val) {
+					if (in_array($var, array('action', 'sa', 'type', 'board', 'boards', 'c', 'u', 'limit')))
 				$url_parts[] = $var . '=' . (is_array($val) ? implode(',', $val) : $val);
+		}
 
 		echo '
 <feed', $ns_string, !empty($feed_meta['language']) ? ' xml:lang="' . $feed_meta['language'] . '"' : '', '>
@@ -371,8 +392,7 @@ 
 
 		echo '
 </feed>';
-	}
-	elseif ($xml_format == 'rdf')
+	} elseif ($xml_format == 'rdf')
 	{
 		echo '
 <rdf:RDF', $ns_string, '>
@@ -437,13 +457,15 @@ 
 {
 	global $modSettings, $context, $scripturl;
 
-	if (substr($val, 0, strlen($scripturl)) != $scripturl)
-		return $val;
+	if (substr($val, 0, strlen($scripturl)) != $scripturl) {
+			return $val;
+	}
 
 	call_integration_hook('integrate_fix_url', array(&$val));
 
-	if (empty($modSettings['queryless_urls']) || ($context['server']['is_cgi'] && ini_get('cgi.fix_pathinfo') == 0 && @get_cfg_var('cgi.fix_pathinfo') == 0) || (!$context['server']['is_apache'] && !$context['server']['is_lighttpd']))
-		return $val;
+	if (empty($modSettings['queryless_urls']) || ($context['server']['is_cgi'] && ini_get('cgi.fix_pathinfo') == 0 && @get_cfg_var('cgi.fix_pathinfo') == 0) || (!$context['server']['is_apache'] && !$context['server']['is_lighttpd'])) {
+			return $val;
+	}
 
 	$val = preg_replace_callback('~\b' . preg_quote($scripturl, '~') . '\?((?:board|topic)=[^#"]+)(#[^"]*)?$~', function($m) use ($scripturl)
 		{
@@ -466,8 +488,9 @@ 
 	global $smcFunc;
 
 	// Do we even need to do this?
-	if (strpbrk($data, '<>&') == false && $force !== true)
-		return $data;
+	if (strpbrk($data, '<>&') == false && $force !== true) {
+			return $data;
+	}
 
 	$cdata = '<![CDATA[';
 
@@ -477,49 +500,55 @@ 
 			$smcFunc['strpos']($data, '&', $pos),
 			$smcFunc['strpos']($data, ']', $pos),
 		);
-		if ($ns != '')
-			$positions[] = $smcFunc['strpos']($data, '<', $pos);
+		if ($ns != '') {
+					$positions[] = $smcFunc['strpos']($data, '<', $pos);
+		}
 		foreach ($positions as $k => $dummy)
 		{
-			if ($dummy === false)
-				unset($positions[$k]);
+			if ($dummy === false) {
+							unset($positions[$k]);
+			}
 		}
 
 		$old = $pos;
 		$pos = empty($positions) ? $n : min($positions);
 
-		if ($pos - $old > 0)
-			$cdata .= $smcFunc['substr']($data, $old, $pos - $old);
-		if ($pos >= $n)
-			break;
+		if ($pos - $old > 0) {
+					$cdata .= $smcFunc['substr']($data, $old, $pos - $old);
+		}
+		if ($pos >= $n) {
+					break;
+		}
 
 		if ($smcFunc['substr']($data, $pos, 1) == '<')
 		{
 			$pos2 = $smcFunc['strpos']($data, '>', $pos);
-			if ($pos2 === false)
-				$pos2 = $n;
-			if ($smcFunc['substr']($data, $pos + 1, 1) == '/')
-				$cdata .= ']]></' . $ns . ':' . $smcFunc['substr']($data, $pos + 2, $pos2 - $pos - 1) . '<![CDATA[';
-			else
-				$cdata .= ']]><' . $ns . ':' . $smcFunc['substr']($data, $pos + 1, $pos2 - $pos) . '<![CDATA[';
+			if ($pos2 === false) {
+							$pos2 = $n;
+			}
+			if ($smcFunc['substr']($data, $pos + 1, 1) == '/') {
+							$cdata .= ']]></' . $ns . ':' . $smcFunc['substr']($data, $pos + 2, $pos2 - $pos - 1) . '<![CDATA[';
+			} else {
+							$cdata .= ']]><' . $ns . ':' . $smcFunc['substr']($data, $pos + 1, $pos2 - $pos) . '<![CDATA[';
+			}
 			$pos = $pos2 + 1;
-		}
-		elseif ($smcFunc['substr']($data, $pos, 1) == ']')
+		} elseif ($smcFunc['substr']($data, $pos, 1) == ']')
 		{
 			$cdata .= ']]>&#093;<![CDATA[';
 			$pos++;
-		}
-		elseif ($smcFunc['substr']($data, $pos, 1) == '&')
+		} elseif ($smcFunc['substr']($data, $pos, 1) == '&')
 		{
 			$pos2 = $smcFunc['strpos']($data, ';', $pos);
-			if ($pos2 === false)
-				$pos2 = $n;
+			if ($pos2 === false) {
+							$pos2 = $n;
+			}
 			$ent = $smcFunc['substr']($data, $pos + 1, $pos2 - $pos - 1);
 
-			if ($smcFunc['substr']($data, $pos + 1, 1) == '#')
-				$cdata .= ']]>' . $smcFunc['substr']($data, $pos, $pos2 - $pos + 1) . '<![CDATA[';
-			elseif (in_array($ent, array('amp', 'lt', 'gt', 'quot')))
-				$cdata .= ']]>' . $smcFunc['substr']($data, $pos, $pos2 - $pos + 1) . '<![CDATA[';
+			if ($smcFunc['substr']($data, $pos + 1, 1) == '#') {
+							$cdata .= ']]>' . $smcFunc['substr']($data, $pos, $pos2 - $pos + 1) . '<![CDATA[';
+			} elseif (in_array($ent, array('amp', 'lt', 'gt', 'quot'))) {
+							$cdata .= ']]>' . $smcFunc['substr']($data, $pos, $pos2 - $pos + 1) . '<![CDATA[';
+			}
 
 			$pos = $pos2 + 1;
 		}
@@ -558,8 +587,9 @@ 
 		'gender',
 		'blurb',
 	);
-	if ($xml_format != 'atom')
-		$keysToCdata[] = 'category';
+	if ($xml_format != 'atom') {
+			$keysToCdata[] = 'category';
+	}
 
 	if (!empty($forceCdataKeys))
 	{
@@ -576,8 +606,9 @@ 
 		$attrs = isset($element['attributes']) ? $element['attributes'] : null;
 
 		// Skip it, it's been set to null.
-		if ($key === null || ($val === null && $attrs === null))
-			continue;
+		if ($key === null || ($val === null && $attrs === null)) {
+					continue;
+		}
 
 		$forceCdata = in_array($key, $forceCdataKeys);
 		$ns = !empty($nsKeys[$key]) ? $nsKeys[$key] : '';
@@ -590,16 +621,16 @@ 
 
 		if (!empty($attrs))
 		{
-			foreach ($attrs as $attr_key => $attr_value)
-				echo ' ', $attr_key, '="', fix_possible_url($attr_value), '"';
+			foreach ($attrs as $attr_key => $attr_value) {
+							echo ' ', $attr_key, '="', fix_possible_url($attr_value), '"';
+			}
 		}
 
 		// If it's empty, simply output an empty element.
 		if (empty($val))
 		{
 			echo ' />';
-		}
-		else
+		} else
 		{
 			echo '>';
 
@@ -611,11 +642,13 @@ 
 				echo "\n", str_repeat("\t", $i);
 			}
 			// A string with returns in it.... show this as a multiline element.
-			elseif (strpos($val, "\n") !== false)
-				echo "\n", in_array($key, $keysToCdata) ? cdata_parse(fix_possible_url($val), $ns, $forceCdata) : fix_possible_url($val), "\n", str_repeat("\t", $i);
+			elseif (strpos($val, "\n") !== false) {
+							echo "\n", in_array($key, $keysToCdata) ? cdata_parse(fix_possible_url($val), $ns, $forceCdata) : fix_possible_url($val), "\n", str_repeat("\t", $i);
+			}
 			// A simple string.
-			else
-				echo in_array($key, $keysToCdata) ? cdata_parse(fix_possible_url($val), $ns, $forceCdata) : fix_possible_url($val);
+			else {
+							echo in_array($key, $keysToCdata) ? cdata_parse(fix_possible_url($val), $ns, $forceCdata) : fix_possible_url($val);
+			}
 
 			// Ending tag.
 			echo '</', $key, '>';
@@ -635,8 +668,9 @@ 
 {
 	global $scripturl, $smcFunc;
 
-	if (!allowedTo('view_mlist'))
-		return array();
+	if (!allowedTo('view_mlist')) {
+			return array();
+	}
 
 	// Find the most recent members.
 	$request = $smcFunc['db_query']('', '
@@ -655,8 +689,8 @@ 
 		$guid = 'tag:' . parse_url($scripturl, PHP_URL_HOST) . ',' . gmdate('Y-m-d', $row['date_registered']) . ':member=' . $row['id_member'];
 
 		// Make the data look rss-ish.
-		if ($xml_format == 'rss' || $xml_format == 'rss2')
-			$data[] = array(
+		if ($xml_format == 'rss' || $xml_format == 'rss2') {
+					$data[] = array(
 				'tag' => 'item',
 				'content' => array(
 					array(
@@ -684,8 +718,8 @@ 
 					),
 				),
 			);
-		elseif ($xml_format == 'rdf')
-			$data[] = array(
+		} elseif ($xml_format == 'rdf') {
+					$data[] = array(
 				'tag' => 'item',
 				'attributes' => array('rdf:about' => $scripturl . '?action=profile;u=' . $row['id_member']),
 				'content' => array(
@@ -703,8 +737,8 @@ 
 					),
 				),
 			);
-		elseif ($xml_format == 'atom')
-			$data[] = array(
+		} elseif ($xml_format == 'atom') {
+					$data[] = array(
 				'tag' => 'entry',
 				'content' => array(
 					array(
@@ -733,9 +767,10 @@ 
 					),
 				),
 			);
+		}
 		// More logical format for the data, but harder to apply.
-		else
-			$data[] = array(
+		else {
+					$data[] = array(
 				'tag' => 'member',
 				'content' => array(
 					array(
@@ -756,6 +791,7 @@ 
 					),
 				),
 			);
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -816,22 +852,24 @@ 
 		if ($loops < 2 && $smcFunc['db_num_rows']($request) < $_GET['limit'])
 		{
 			$smcFunc['db_free_result']($request);
-			if (empty($_REQUEST['boards']) && empty($board))
-				unset($context['optimize_msg']['lowest']);
-			else
-				$context['optimize_msg']['lowest'] = 'm.id_msg >= t.id_first_msg';
+			if (empty($_REQUEST['boards']) && empty($board)) {
+							unset($context['optimize_msg']['lowest']);
+			} else {
+							$context['optimize_msg']['lowest'] = 'm.id_msg >= t.id_first_msg';
+			}
 			$context['optimize_msg']['highest'] = 'm.id_msg <= t.id_last_msg';
 			$loops++;
+		} else {
+					$done = true;
 		}
-		else
-			$done = true;
 	}
 	$data = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Limit the length of the message, if the option is set.
-		if (!empty($modSettings['xmlnews_maxlen']) && $smcFunc['strlen'](str_replace('<br>', "\n", $row['body'])) > $modSettings['xmlnews_maxlen'])
-			$row['body'] = strtr($smcFunc['substr'](str_replace('<br>', "\n", $row['body']), 0, $modSettings['xmlnews_maxlen'] - 3), array("\n" => '<br>')) . '...';
+		if (!empty($modSettings['xmlnews_maxlen']) && $smcFunc['strlen'](str_replace('<br>', "\n", $row['body'])) > $modSettings['xmlnews_maxlen']) {
+					$row['body'] = strtr($smcFunc['substr'](str_replace('<br>', "\n", $row['body']), 0, $modSettings['xmlnews_maxlen'] - 3), array("\n" => '<br>')) . '...';
+		}
 
 		$row['body'] = parse_bbc($row['body'], $row['smileys_enabled'], $row['id_msg']);
 
@@ -858,8 +896,9 @@ 
 			while ($attach = $smcFunc['db_fetch_assoc']($attach_request))
 			{
 				// Include approved attachments only
-				if ($attach['approved'])
-					$loaded_attachments['attachment_' . $attach['id_attach']] = $attach;
+				if ($attach['approved']) {
+									$loaded_attachments['attachment_' . $attach['id_attach']] = $attach;
+				}
 			}
 			$smcFunc['db_free_result']($attach_request);
 
@@ -867,16 +906,17 @@ 
 			if (!empty($loaded_attachments))
 			{
 				uasort($loaded_attachments, function($a, $b) {
-					if ($a['filesize'] == $b['filesize'])
-					        return 0;
+					if ($a['filesize'] == $b['filesize']) {
+										        return 0;
+					}
 					return ($a['filesize'] < $b['filesize']) ? -1 : 1;
 				});
+			} else {
+							$loaded_attachments = null;
 			}
-			else
-				$loaded_attachments = null;
+		} else {
+					$loaded_attachments = null;
 		}
-		else
-			$loaded_attachments = null;
 
 		// Create a GUID for this topic using the tag URI scheme
 		$guid = 'tag:' . parse_url($scripturl, PHP_URL_HOST) . ',' . gmdate('Y-m-d', $row['poster_time']) . ':topic=' . $row['id_topic'];
@@ -893,9 +933,9 @@ 
 					'length' => $attachment['filesize'],
 					'type' => $attachment['mime_type'],
 				);
+			} else {
+							$enclosure = null;
 			}
-			else
-				$enclosure = null;
 
 			$data[] = array(
 				'tag' => 'item',
@@ -941,8 +981,7 @@ 
 					),
 				),
 			);
-		}
-		elseif ($xml_format == 'rdf')
+		} elseif ($xml_format == 'rdf')
 		{
 			$data[] = array(
 				'tag' => 'item',
@@ -966,8 +1005,7 @@ 
 					),
 				),
 			);
-		}
-		elseif ($xml_format == 'atom')
+		} elseif ($xml_format == 'atom')
 		{
 			// Only one attachment allowed
 			if (!empty($loaded_attachments))
@@ -979,9 +1017,9 @@ 
 					'length' => $attachment['filesize'],
 					'type' => $attachment['mime_type'],
 				);
+			} else {
+							$enclosure = null;
 			}
-			else
-				$enclosure = null;
 
 			$data[] = array(
 				'tag' => 'entry',
@@ -1081,9 +1119,9 @@ 
 						)
 					);
 				}
+			} else {
+							$attachments = null;
 			}
-			else
-				$attachments = null;
 
 			$data[] = array(
 				'tag' => 'article',
@@ -1201,22 +1239,25 @@ 
 		if ($loops < 2 && $smcFunc['db_num_rows']($request) < $_GET['limit'])
 		{
 			$smcFunc['db_free_result']($request);
-			if (empty($_REQUEST['boards']) && empty($board))
-				unset($context['optimize_msg']['lowest']);
-			else
-				$context['optimize_msg']['lowest'] = $loops ? 'm.id_msg >= t.id_first_msg' : 'm.id_msg >= (t.id_last_msg - t.id_first_msg) / 2';
+			if (empty($_REQUEST['boards']) && empty($board)) {
+							unset($context['optimize_msg']['lowest']);
+			} else {
+							$context['optimize_msg']['lowest'] = $loops ? 'm.id_msg >= t.id_first_msg' : 'm.id_msg >= (t.id_last_msg - t.id_first_msg) / 2';
+			}
 			$loops++;
+		} else {
+					$done = true;
 		}
-		else
-			$done = true;
 	}
 	$messages = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$messages[] = $row['id_msg'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$messages[] = $row['id_msg'];
+	}
 	$smcFunc['db_free_result']($request);
 
-	if (empty($messages))
-		return array();
+	if (empty($messages)) {
+			return array();
+	}
 
 	// Find the most recent posts this user can see.
 	$request = $smcFunc['db_query']('', '
@@ -1246,8 +1287,9 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Limit the length of the message, if the option is set.
-		if (!empty($modSettings['xmlnews_maxlen']) && $smcFunc['strlen'](str_replace('<br>', "\n", $row['body'])) > $modSettings['xmlnews_maxlen'])
-			$row['body'] = strtr($smcFunc['substr'](str_replace('<br>', "\n", $row['body']), 0, $modSettings['xmlnews_maxlen'] - 3), array("\n" => '<br>')) . '...';
+		if (!empty($modSettings['xmlnews_maxlen']) && $smcFunc['strlen'](str_replace('<br>', "\n", $row['body'])) > $modSettings['xmlnews_maxlen']) {
+					$row['body'] = strtr($smcFunc['substr'](str_replace('<br>', "\n", $row['body']), 0, $modSettings['xmlnews_maxlen'] - 3), array("\n" => '<br>')) . '...';
+		}
 
 		$row['body'] = parse_bbc($row['body'], $row['smileys_enabled'], $row['id_msg']);
 
@@ -1274,8 +1316,9 @@ 
 			while ($attach = $smcFunc['db_fetch_assoc']($attach_request))
 			{
 				// Include approved attachments only
-				if ($attach['approved'])
-					$loaded_attachments['attachment_' . $attach['id_attach']] = $attach;
+				if ($attach['approved']) {
+									$loaded_attachments['attachment_' . $attach['id_attach']] = $attach;
+				}
 			}
 			$smcFunc['db_free_result']($attach_request);
 
@@ -1283,16 +1326,17 @@ 
 			if (!empty($loaded_attachments))
 			{
 				uasort($loaded_attachments, function($a, $b) {
-					if ($a['filesize'] == $b['filesize'])
-					        return 0;
+					if ($a['filesize'] == $b['filesize']) {
+										        return 0;
+					}
 					return ($a['filesize'] < $b['filesize']) ? -1 : 1;
 				});
+			} else {
+							$loaded_attachments = null;
 			}
-			else
-				$loaded_attachments = null;
+		} else {
+					$loaded_attachments = null;
 		}
-		else
-			$loaded_attachments = null;
 
 		// Create a GUID for this post using the tag URI scheme
 		$guid = 'tag:' . parse_url($scripturl, PHP_URL_HOST) . ',' . gmdate('Y-m-d', $row['poster_time']) . ':msg=' . $row['id_msg'];
@@ -1309,9 +1353,9 @@ 
 					'length' => $attachment['filesize'],
 					'type' => $attachment['mime_type'],
 				);
+			} else {
+							$enclosure = null;
 			}
-			else
-				$enclosure = null;
 
 			$data[] = array(
 				'tag' => 'item',
@@ -1357,8 +1401,7 @@ 
 					),
 				),
 			);
-		}
-		elseif ($xml_format == 'rdf')
+		} elseif ($xml_format == 'rdf')
 		{
 			$data[] = array(
 				'tag' => 'item',
@@ -1382,8 +1425,7 @@ 
 					),
 				),
 			);
-		}
-		elseif ($xml_format == 'atom')
+		} elseif ($xml_format == 'atom')
 		{
 			// Only one attachment allowed
 			if (!empty($loaded_attachments))
@@ -1395,9 +1437,9 @@ 
 					'length' => $attachment['filesize'],
 					'type' => $attachment['mime_type'],
 				);
+			} else {
+							$enclosure = null;
 			}
-			else
-				$enclosure = null;
 
 			$data[] = array(
 				'tag' => 'entry',
@@ -1497,9 +1539,9 @@ 
 						)
 					);
 				}
+			} else {
+							$attachments = null;
 			}
-			else
-				$attachments = null;
 
 			$data[] = array(
 				'tag' => 'recent-post',
@@ -1618,14 +1660,16 @@ 
 	global $scripturl, $memberContext, $user_profile, $user_info;
 
 	// You must input a valid user....
-	if (empty($_GET['u']) || !loadMemberData((int) $_GET['u']))
-		return array();
+	if (empty($_GET['u']) || !loadMemberData((int) $_GET['u'])) {
+			return array();
+	}
 
 	// Make sure the id is a number and not "I like trying to hack the database".
 	$_GET['u'] = (int) $_GET['u'];
 	// Load the member's contextual information!
-	if (!loadMemberContext($_GET['u']) || !allowedTo('profile_view'))
-		return array();
+	if (!loadMemberContext($_GET['u']) || !allowedTo('profile_view')) {
+			return array();
+	}
 
 	// Okay, I admit it, I'm lazy.  Stupid $_GET['u'] is long and hard to type.
 	$profile = &$memberContext[$_GET['u']];
@@ -1667,8 +1711,7 @@ 
 				),
 			)
 		);
-	}
-	elseif ($xml_format == 'rdf')
+	} elseif ($xml_format == 'rdf')
 	{
 		$data[] = array(
 			'tag' => 'item',
@@ -1692,8 +1735,7 @@ 
 				),
 			)
 		);
-	}
-	elseif ($xml_format == 'atom')
+	} elseif ($xml_format == 'atom')
 	{
 		$data[] = array(
 			'tag' => 'entry',
@@ -1746,8 +1788,7 @@ 
 				),
 			)
 		);
-	}
-	else
+	} else
 	{
 		$data = array(
 			array(

Sources/PackageGet.php

Braces +197 added lines, -154 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Browse the list of package servers, add servers...
@@ -43,13 +44,15 @@ 
 	);
 
 	// Now let's decide where we are taking this...
-	if (isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']]))
-		$context['sub_action'] = $_REQUEST['sa'];
+	if (isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']])) {
+			$context['sub_action'] = $_REQUEST['sa'];
+	}
 	// We need to support possible old javascript links...
-	elseif (isset($_GET['pgdownload']))
-		$context['sub_action'] = 'download';
-	else
-		$context['sub_action'] = 'servers';
+	elseif (isset($_GET['pgdownload'])) {
+			$context['sub_action'] = 'download';
+	} else {
+			$context['sub_action'] = 'servers';
+	}
 
 	// We need to force the "Download" tab as selected.
 	$context['menu_data_' . $context['admin_menu_id']]['current_subsection'] = 'packageget';
@@ -141,17 +144,19 @@ 
 			{
 				require_once($sourcedir . '/Class-Package.php');
 				$ftp = new ftp_connection(null);
+			} elseif ($ftp->error !== false && !isset($ftp_error)) {
+							$ftp_error = $ftp->last_message === null ? '' : $ftp->last_message;
 			}
-			elseif ($ftp->error !== false && !isset($ftp_error))
-				$ftp_error = $ftp->last_message === null ? '' : $ftp->last_message;
 
 			list ($username, $detect_path, $found_path) = $ftp->detect_path($packagesdir);
 
-			if ($found_path || !isset($_POST['ftp_path']))
-				$_POST['ftp_path'] = $detect_path;
+			if ($found_path || !isset($_POST['ftp_path'])) {
+							$_POST['ftp_path'] = $detect_path;
+			}
 
-			if (!isset($_POST['ftp_username']))
-				$_POST['ftp_username'] = $username;
+			if (!isset($_POST['ftp_username'])) {
+							$_POST['ftp_username'] = $username;
+			}
 
 			$context['package_ftp'] = array(
 				'server' => isset($_POST['ftp_server']) ? $_POST['ftp_server'] : (isset($modSettings['package_server']) ? $modSettings['package_server'] : 'localhost'),
@@ -160,8 +165,7 @@ 
 				'path' => $_POST['ftp_path'],
 				'error' => empty($ftp_error) ? null : $ftp_error,
 			);
-		}
-		else
+		} else
 		{
 			$context['package_download_broken'] = false;
 
@@ -203,8 +207,9 @@ 
 
 	if (isset($_GET['server']))
 	{
-		if ($_GET['server'] == '')
-			redirectexit('action=admin;area=packages;get');
+		if ($_GET['server'] == '') {
+					redirectexit('action=admin;area=packages;get');
+		}
 
 		$server = (int) $_GET['server'];
 
@@ -222,17 +227,18 @@ 
 		$smcFunc['db_free_result']($request);
 
 		// If the server does not exist, dump out.
-		if (empty($url))
-			fatal_lang_error('couldnt_connect', false);
+		if (empty($url)) {
+					fatal_lang_error('couldnt_connect', false);
+		}
 
 		// If there is a relative link, append to the stored server url.
-		if (isset($_GET['relative']))
-			$url = $url . (substr($url, -1) == '/' ? '' : '/') . $_GET['relative'];
+		if (isset($_GET['relative'])) {
+					$url = $url . (substr($url, -1) == '/' ? '' : '/') . $_GET['relative'];
+		}
 
 		// Clear any "absolute" URL.  Since "server" is present, "absolute" is garbage.
 		unset($_GET['absolute']);
-	}
-	elseif (isset($_GET['absolute']) && $_GET['absolute'] != '')
+	} elseif (isset($_GET['absolute']) && $_GET['absolute'] != '')
 	{
 		// Initialize the requried variables.
 		$server = '';
@@ -256,16 +262,19 @@ 
 		}
 	}
 	// Minimum required parameter did not exist so dump out.
-	else
-		fatal_lang_error('couldnt_connect', false);
+	else {
+			fatal_lang_error('couldnt_connect', false);
+	}
 
 	// Attempt to connect.  If unsuccessful... try the URL.
-	if (!isset($_GET['package']) || file_exists($_GET['package']))
-		$_GET['package'] = $url . '/packages.xml?language=' . $context['user']['language'];
+	if (!isset($_GET['package']) || file_exists($_GET['package'])) {
+			$_GET['package'] = $url . '/packages.xml?language=' . $context['user']['language'];
+	}
 
 	// Check to be sure the packages.xml file actually exists where it is should be... or dump out.
-	if ((isset($_GET['absolute']) || isset($_GET['relative'])) && !url_exists($_GET['package']))
-		fatal_lang_error('packageget_unable', false, array($url . '/index.php'));
+	if ((isset($_GET['absolute']) || isset($_GET['relative'])) && !url_exists($_GET['package'])) {
+			fatal_lang_error('packageget_unable', false, array($url . '/index.php'));
+	}
 
 	// Might take some time.
 	@set_time_limit(600);
@@ -275,8 +284,9 @@ 
 	$listing = new xmlArray(fetch_web_data($_GET['package']), true);
 
 	// Errm.... empty file?  Try the URL....
-	if (!$listing->exists('package-list'))
-		fatal_lang_error('packageget_unable', false, array($url . '/index.php'));
+	if (!$listing->exists('package-list')) {
+			fatal_lang_error('packageget_unable', false, array($url . '/index.php'));
+	}
 
 	// List out the packages...
 	$context['package_list'] = array();
@@ -284,8 +294,9 @@ 
 	$listing = $listing->path('package-list[0]');
 
 	// Use the package list's name if it exists.
-	if ($listing->exists('list-title'))
-		$name = $smcFunc['htmlspecialchars']($listing->fetch('list-title'));
+	if ($listing->exists('list-title')) {
+			$name = $smcFunc['htmlspecialchars']($listing->fetch('list-title'));
+	}
 
 	// Pick the correct template.
 	$context['sub_template'] = 'package_list';
@@ -300,28 +311,32 @@ 
 
 	$installed_mods = array();
 	// Look through the list of installed mods...
-	foreach ($instmods as $installed_mod)
-		$installed_mods[$installed_mod['package_id']] = $installed_mod['version'];
+	foreach ($instmods as $installed_mod) {
+			$installed_mods[$installed_mod['package_id']] = $installed_mod['version'];
+	}
 
 	// Get default author and email if they exist.
 	if ($listing->exists('default-author'))
 	{
 		$default_author = $smcFunc['htmlspecialchars']($listing->fetch('default-author'));
-		if ($listing->exists('default-author/@email') && filter_var($listing->fetch('default-author/@email'), FILTER_VALIDATE_EMAIL))
-			$default_email = $smcFunc['htmlspecialchars']($listing->fetch('default-author/@email'));
+		if ($listing->exists('default-author/@email') && filter_var($listing->fetch('default-author/@email'), FILTER_VALIDATE_EMAIL)) {
+					$default_email = $smcFunc['htmlspecialchars']($listing->fetch('default-author/@email'));
+		}
 	}
 
 	// Get default web site if it exists.
 	if ($listing->exists('default-website'))
 	{
 		$default_website = $smcFunc['htmlspecialchars']($listing->fetch('default-website'));
-		if ($listing->exists('default-website/@title'))
-			$default_title = $smcFunc['htmlspecialchars']($listing->fetch('default-website/@title'));
+		if ($listing->exists('default-website/@title')) {
+					$default_title = $smcFunc['htmlspecialchars']($listing->fetch('default-website/@title'));
+		}
 	}
 
 	$the_version = strtr($forum_version, array('SMF ' => ''));
-	if (!empty($_SESSION['version_emulate']))
-		$the_version = $_SESSION['version_emulate'];
+	if (!empty($_SESSION['version_emulate'])) {
+			$the_version = $_SESSION['version_emulate'];
+	}
 
 	$packageNum = 0;
 	$packageSection = 0;
@@ -342,11 +357,13 @@ 
 				'type' => $thisPackage->name(),
 			);
 
-			if (in_array($package['type'], array('title', 'text')))
-				$context['package_list'][$packageSection][$package['type']] = $smcFunc['htmlspecialchars']($thisPackage->fetch('.'));
+			if (in_array($package['type'], array('title', 'text'))) {
+							$context['package_list'][$packageSection][$package['type']] = $smcFunc['htmlspecialchars']($thisPackage->fetch('.'));
+			}
 			// It's a Title, Heading, Rule or Text.
-			elseif (in_array($package['type'], array('heading', 'rule')))
-				$package['name'] = $smcFunc['htmlspecialchars']($thisPackage->fetch('.'));
+			elseif (in_array($package['type'], array('heading', 'rule'))) {
+							$package['name'] = $smcFunc['htmlspecialchars']($thisPackage->fetch('.'));
+			}
 			// It's a Remote link.
 			elseif ($package['type'] == 'remote')
 			{
@@ -354,20 +371,21 @@ 
 
 				if ($remote_type == 'relative' && substr($thisPackage->fetch('@href'), 0, 7) != 'http://' && substr($thisPackage->fetch('@href'), 0, 8) != 'https://')
 				{
-					if (isset($_GET['absolute']))
-						$current_url = $_GET['absolute'] . '/';
-					elseif (isset($_GET['relative']))
-						$current_url = $_GET['relative'] . '/';
-					else
-						$current_url = '';
+					if (isset($_GET['absolute'])) {
+											$current_url = $_GET['absolute'] . '/';
+					} elseif (isset($_GET['relative'])) {
+											$current_url = $_GET['relative'] . '/';
+					} else {
+											$current_url = '';
+					}
 
 					$current_url .= $thisPackage->fetch('@href');
-					if (isset($_GET['absolute']))
-						$package['href'] = $scripturl . '?action=admin;area=packages;get;sa=browse;absolute=' . $current_url;
-					else
-						$package['href'] = $scripturl . '?action=admin;area=packages;get;sa=browse;server=' . $context['package_server'] . ';relative=' . $current_url;
-				}
-				else
+					if (isset($_GET['absolute'])) {
+											$package['href'] = $scripturl . '?action=admin;area=packages;get;sa=browse;absolute=' . $current_url;
+					} else {
+											$package['href'] = $scripturl . '?action=admin;area=packages;get;sa=browse;server=' . $context['package_server'] . ';relative=' . $current_url;
+					}
+				} else
 				{
 					$current_url = $thisPackage->fetch('@href');
 					$package['href'] = $scripturl . '?action=admin;area=packages;get;sa=browse;absolute=' . $current_url;
@@ -379,25 +397,28 @@ 
 			// It's a package...
 			else
 			{
-				if (isset($_GET['absolute']))
-					$current_url = $_GET['absolute'] . '/';
-				elseif (isset($_GET['relative']))
-					$current_url = $_GET['relative'] . '/';
-				else
-					$current_url = '';
+				if (isset($_GET['absolute'])) {
+									$current_url = $_GET['absolute'] . '/';
+				} elseif (isset($_GET['relative'])) {
+									$current_url = $_GET['relative'] . '/';
+				} else {
+									$current_url = '';
+				}
 
 				$server_att = $server != '' ? ';server=' . $server : '';
 
 				$package += $thisPackage->to_array();
 
-				if (isset($package['website']))
-					unset($package['website']);
+				if (isset($package['website'])) {
+									unset($package['website']);
+				}
 				$package['author'] = array();
 
-				if ($package['description'] == '')
-					$package['description'] = $txt['package_no_description'];
-				else
-					$package['description'] = parse_bbc(preg_replace('~\[[/]?html\]~i', '', $smcFunc['htmlspecialchars']($package['description'])));
+				if ($package['description'] == '') {
+									$package['description'] = $txt['package_no_description'];
+				} else {
+									$package['description'] = parse_bbc(preg_replace('~\[[/]?html\]~i', '', $smcFunc['htmlspecialchars']($package['description'])));
+				}
 
 				$package['is_installed'] = isset($installed_mods[$package['id']]);
 				$package['is_current'] = $package['is_installed'] && ($installed_mods[$package['id']] == $package['version']);
@@ -406,12 +427,14 @@ 
 				// This package is either not installed, or installed but old.  Is it supported on this version of SMF?
 				if (!$package['is_installed'] || (!$package['is_current'] && !$package['is_newer']))
 				{
-					if ($thisPackage->exists('version/@for'))
-						$package['can_install'] = matchPackageVersion($the_version, $thisPackage->fetch('version/@for'));
+					if ($thisPackage->exists('version/@for')) {
+											$package['can_install'] = matchPackageVersion($the_version, $thisPackage->fetch('version/@for'));
+					}
 				}
 				// Okay, it's already installed AND up to date.
-				else
-					$package['can_install'] = false;
+				else {
+									$package['can_install'] = false;
+				}
 
 				$already_exists = getPackageInfo(basename($package['filename']));
 				$package['download_conflict'] = is_array($already_exists) && $already_exists['id'] == $package['id'] && $already_exists['version'] != $package['version'];
@@ -423,40 +446,44 @@ 
 
 				if ($thisPackage->exists('author') || isset($default_author))
 				{
-					if ($thisPackage->exists('author/@email') && filter_var($thisPackage->fetch('author/@email'), FILTER_VALIDATE_EMAIL))
-						$package['author']['email'] = $thisPackage->fetch('author/@email');
-					elseif (isset($default_email))
-						$package['author']['email'] = $default_email;
-
-					if ($thisPackage->exists('author') && $thisPackage->fetch('author') != '')
-						$package['author']['name'] = $smcFunc['htmlspecialchars']($thisPackage->fetch('author'));
-					else
-						$package['author']['name'] = $default_author;
-
-					if (!empty($package['author']['email']))
-						$package['author']['link'] = '<a href="mailto:' . $package['author']['email'] . '">' . $package['author']['name'] . '</a>';
+					if ($thisPackage->exists('author/@email') && filter_var($thisPackage->fetch('author/@email'), FILTER_VALIDATE_EMAIL)) {
+											$package['author']['email'] = $thisPackage->fetch('author/@email');
+					} elseif (isset($default_email)) {
+											$package['author']['email'] = $default_email;
+					}
+
+					if ($thisPackage->exists('author') && $thisPackage->fetch('author') != '') {
+											$package['author']['name'] = $smcFunc['htmlspecialchars']($thisPackage->fetch('author'));
+					} else {
+											$package['author']['name'] = $default_author;
+					}
+
+					if (!empty($package['author']['email'])) {
+											$package['author']['link'] = '<a href="mailto:' . $package['author']['email'] . '">' . $package['author']['name'] . '</a>';
+					}
 				}
 
 				if ($thisPackage->exists('website') || isset($default_website))
 				{
-					if ($thisPackage->exists('website') && $thisPackage->exists('website/@title'))
-						$package['author']['website']['name'] = $smcFunc['htmlspecialchars']($thisPackage->fetch('website/@title'));
-					elseif (isset($default_title))
-						$package['author']['website']['name'] = $default_title;
-					elseif ($thisPackage->exists('website'))
-						$package['author']['website']['name'] = $smcFunc['htmlspecialchars']($thisPackage->fetch('website'));
-					else
-						$package['author']['website']['name'] = $default_website;
-
-					if ($thisPackage->exists('website') && $thisPackage->fetch('website') != '')
-						$authorhompage = $smcFunc['htmlspecialchars']($thisPackage->fetch('website'));
-					else
-						$authorhompage = $default_website;
+					if ($thisPackage->exists('website') && $thisPackage->exists('website/@title')) {
+											$package['author']['website']['name'] = $smcFunc['htmlspecialchars']($thisPackage->fetch('website/@title'));
+					} elseif (isset($default_title)) {
+											$package['author']['website']['name'] = $default_title;
+					} elseif ($thisPackage->exists('website')) {
+											$package['author']['website']['name'] = $smcFunc['htmlspecialchars']($thisPackage->fetch('website'));
+					} else {
+											$package['author']['website']['name'] = $default_website;
+					}
+
+					if ($thisPackage->exists('website') && $thisPackage->fetch('website') != '') {
+											$authorhompage = $smcFunc['htmlspecialchars']($thisPackage->fetch('website'));
+					} else {
+											$authorhompage = $default_website;
+					}
 
 					$package['author']['website']['href'] = $authorhompage;
 					$package['author']['website']['link'] = '<a href="' . $authorhompage . '">' . $package['author']['website']['name'] . '</a>';
-				}
-				else
+				} else
 				{
 					$package['author']['website']['href'] = '';
 					$package['author']['website']['link'] = '';
@@ -472,11 +499,13 @@ 
 			$packageNum = in_array($package['type'], array('title', 'heading', 'text', 'remote', 'rule')) ? 0 : $packageNum + 1;
 			$package['count'] = $packageNum;
 
-			if (!in_array($package['type'], array('title', 'text')))
-				$context['package_list'][$packageSection]['items'][] = $package;
+			if (!in_array($package['type'], array('title', 'text'))) {
+							$context['package_list'][$packageSection]['items'][] = $package;
+			}
 
-			if ($package['count'] > 1)
-				$context['list_type'] = 'ol';
+			if ($package['count'] > 1) {
+							$context['list_type'] = 'ol';
+			}
 		}
 
 		$packageSection++;
@@ -489,8 +518,9 @@ 
 	{
 		foreach ($packageSection['items'] as $i => $package)
 		{
-			if ($package['count'] == 0 || isset($package['can_install']))
-				continue;
+			if ($package['count'] == 0 || isset($package['can_install'])) {
+							continue;
+			}
 
 			$context['package_list'][$ps_id]['items'][$i]['can_install'] = false;
 
@@ -539,8 +569,9 @@ 
 	checkSession('get');
 
 	// To download something, we need a valid server or url.
-	if (empty($_GET['server']) && (!empty($_GET['get']) && !empty($_REQUEST['package'])))
-		fatal_lang_error('package_get_error_is_zero', false);
+	if (empty($_GET['server']) && (!empty($_GET['get']) && !empty($_REQUEST['package']))) {
+			fatal_lang_error('package_get_error_is_zero', false);
+	}
 
 	if (isset($_GET['server']))
 	{
@@ -560,22 +591,23 @@ 
 		$smcFunc['db_free_result']($request);
 
 		// If server does not exist then dump out.
-		if (empty($url))
-			fatal_lang_error('couldnt_connect', false);
+		if (empty($url)) {
+					fatal_lang_error('couldnt_connect', false);
+		}
 
 		$url = $url . '/';
-	}
-	else
+	} else
 	{
 		// Initialize the requried variables.
 		$server = '';
 		$url = '';
 	}
 
-	if (isset($_REQUEST['byurl']) && !empty($_POST['filename']))
-		$package_name = basename($_REQUEST['filename']);
-	else
-		$package_name = basename($_REQUEST['package']);
+	if (isset($_REQUEST['byurl']) && !empty($_POST['filename'])) {
+			$package_name = basename($_REQUEST['filename']);
+	} else {
+			$package_name = basename($_REQUEST['package']);
+	}
 
 	if (isset($_REQUEST['conflict']) || (isset($_REQUEST['auto']) && file_exists($packagesdir . '/' . $package_name)))
 	{
@@ -584,14 +616,15 @@ 
 		{
 			$ext = substr($package_name, strrpos(substr($package_name, 0, -3), '.'));
 			$package_name = substr($package_name, 0, strrpos(substr($package_name, 0, -3), '.')) . '_';
+		} else {
+					$ext = '';
 		}
-		else
-			$ext = '';
 
 		// Find the first available.
 		$i = 1;
-		while (file_exists($packagesdir . '/' . $package_name . $i . $ext))
-			$i++;
+		while (file_exists($packagesdir . '/' . $package_name . $i . $ext)) {
+					$i++;
+		}
 
 		$package_name = $package_name . $i . $ext;
 	}
@@ -602,25 +635,28 @@ 
 
 	// Done!  Did we get this package automatically?
 	// @ TODO: These are usually update packages.  Allowing both for now until more testing has been done.
-	if (preg_match('~^https?://[\w_\-]+\.simplemachines\.org/~', $_REQUEST['package']) == 1 && strpos($_REQUEST['package'], 'dlattach') === false && isset($_REQUEST['auto']))
-		redirectexit('action=admin;area=packages;sa=install;package=' . $package_name);
+	if (preg_match('~^https?://[\w_\-]+\.simplemachines\.org/~', $_REQUEST['package']) == 1 && strpos($_REQUEST['package'], 'dlattach') === false && isset($_REQUEST['auto'])) {
+			redirectexit('action=admin;area=packages;sa=install;package=' . $package_name);
+	}
 
 	// You just downloaded a mod from SERVER_NAME_GOES_HERE.
 	$context['package_server'] = $server;
 
 	$context['package'] = getPackageInfo($package_name);
 
-	if (!is_array($context['package']))
-		fatal_lang_error('package_cant_download', false);
+	if (!is_array($context['package'])) {
+			fatal_lang_error('package_cant_download', false);
+	}
 
-	if ($context['package']['type'] == 'modification')
-		$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['install_mod'] . ' ]</a>';
-	elseif ($context['package']['type'] == 'avatar')
-		$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['use_avatars'] . ' ]</a>';
-	elseif ($context['package']['type'] == 'language')
-		$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['add_languages'] . ' ]</a>';
-	else
-		$context['package']['install']['link'] = '';
+	if ($context['package']['type'] == 'modification') {
+			$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['install_mod'] . ' ]</a>';
+	} elseif ($context['package']['type'] == 'avatar') {
+			$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['use_avatars'] . ' ]</a>';
+	} elseif ($context['package']['type'] == 'language') {
+			$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['add_languages'] . ' ]</a>';
+	} else {
+			$context['package']['install']['link'] = '';
+	}
 
 	// Does a 3rd party hook want to do some additional changes?
 	call_integration_hook('integrate_package_download');
@@ -646,10 +682,11 @@ 
 	// @todo Use FTP if the Packages directory is not writable.
 
 	// Check the file was even sent!
-	if (!isset($_FILES['package']['name']) || $_FILES['package']['name'] == '')
-		fatal_lang_error('package_upload_error_nofile');
-	elseif (!is_uploaded_file($_FILES['package']['tmp_name']) || (ini_get('open_basedir') == '' && !file_exists($_FILES['package']['tmp_name'])))
-		fatal_lang_error('package_upload_error_failed');
+	if (!isset($_FILES['package']['name']) || $_FILES['package']['name'] == '') {
+			fatal_lang_error('package_upload_error_nofile');
+	} elseif (!is_uploaded_file($_FILES['package']['tmp_name']) || (ini_get('open_basedir') == '' && !file_exists($_FILES['package']['tmp_name']))) {
+			fatal_lang_error('package_upload_error_failed');
+	}
 
 	// Make sure it has a sane filename.
 	$_FILES['package']['name'] = preg_replace(array('/\s/', '/\.[\.]+/', '/[^\w_\.\-]/'), array('_', '.', ''), $_FILES['package']['name']);
@@ -666,8 +703,9 @@ 
 	// Setup the destination and throw an error if the file is already there!
 	$destination = $packagesdir . '/' . $packageName;
 	// @todo Maybe just roll it like we do for downloads?
-	if (file_exists($destination))
-		fatal_lang_error('package_upload_error_exists');
+	if (file_exists($destination)) {
+			fatal_lang_error('package_upload_error_exists');
+	}
 
 	// Now move the file.
 	move_uploaded_file($_FILES['package']['tmp_name'], $destination);
@@ -690,12 +728,14 @@ 
 	{
 		while ($package = readdir($dir))
 		{
-			if ($package == '.' || $package == '..' || $package == 'temp' || $package == $packageName || (!(is_dir($packagesdir . '/' . $package) && file_exists($packagesdir . '/' . $package . '/package-info.xml')) && substr(strtolower($package), -7) != '.tar.gz' && substr(strtolower($package), -4) != '.tgz' && substr(strtolower($package), -4) != '.zip'))
-				continue;
+			if ($package == '.' || $package == '..' || $package == 'temp' || $package == $packageName || (!(is_dir($packagesdir . '/' . $package) && file_exists($packagesdir . '/' . $package . '/package-info.xml')) && substr(strtolower($package), -7) != '.tar.gz' && substr(strtolower($package), -4) != '.tgz' && substr(strtolower($package), -4) != '.zip')) {
+							continue;
+			}
 
 			$packageInfo = getPackageInfo($package);
-			if (!is_array($packageInfo))
-				continue;
+			if (!is_array($packageInfo)) {
+							continue;
+			}
 
 			if ($packageInfo['id'] == $context['package']['id'] && $packageInfo['version'] == $context['package']['version'])
 			{
@@ -707,14 +747,15 @@ 
 		closedir($dir);
 	}
 
-	if ($context['package']['type'] == 'modification')
-		$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['install_mod'] . ' ]</a>';
-	elseif ($context['package']['type'] == 'avatar')
-		$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['use_avatars'] . ' ]</a>';
-	elseif ($context['package']['type'] == 'language')
-		$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['add_languages'] . ' ]</a>';
-	else
-		$context['package']['install']['link'] = '';
+	if ($context['package']['type'] == 'modification') {
+			$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['install_mod'] . ' ]</a>';
+	} elseif ($context['package']['type'] == 'avatar') {
+			$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['use_avatars'] . ' ]</a>';
+	} elseif ($context['package']['type'] == 'language') {
+			$context['package']['install']['link'] = '<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">[ ' . $txt['add_languages'] . ' ]</a>';
+	} else {
+			$context['package']['install']['link'] = '';
+	}
 
 	// Does a 3rd party hook want to do some additional changes?
 	call_integration_hook('integrate_package_upload');
@@ -737,16 +778,18 @@ 
 	checkSession();
 
 	// If they put a slash on the end, get rid of it.
-	if (substr($_POST['serverurl'], -1) == '/')
-		$_POST['serverurl'] = substr($_POST['serverurl'], 0, -1);
+	if (substr($_POST['serverurl'], -1) == '/') {
+			$_POST['serverurl'] = substr($_POST['serverurl'], 0, -1);
+	}
 
 	// Are they both nice and clean?
 	$servername = trim($smcFunc['htmlspecialchars']($_POST['servername']));
 	$serverurl = trim($smcFunc['htmlspecialchars']($_POST['serverurl']));
 
 	// Make sure the URL has the correct prefix.
-	if (strpos($serverurl, 'http://') !== 0 && strpos($serverurl, 'https://') !== 0)
-		$serverurl = 'http://' . $serverurl;
+	if (strpos($serverurl, 'http://') !== 0 && strpos($serverurl, 'https://') !== 0) {
+			$serverurl = 'http://' . $serverurl;
+	}
 
 	$smcFunc['db_insert']('',
 		'{db_prefix}package_servers',

Sources/Subscriptions-PayPal.php

Braces +83 added lines, -61 removed lines

@@ -14,8 +14,9 @@ 
 // This won't be dedicated without this - this must exist in each gateway!
 // SMF Payment Gateway: paypal
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Class for returning available form data for this gateway
@@ -118,8 +119,7 @@ 
 		{
 			$return_data['hidden']['p3'] = 1;
 			$return_data['hidden']['t3'] = strtoupper(substr($period, 0, 1));
-		}
-		else
+		} else
 		{
 			preg_match('~(\d*)(\w)~', $sub_data['real_length'], $match);
 			$unit = $match[1];
@@ -130,14 +130,15 @@ 
 		}
 
 		// If it's repeatable do some javascript to respect this idea.
-		if (!empty($sub_data['repeatable']))
-			$return_data['javascript'] = '
+		if (!empty($sub_data['repeatable'])) {
+					$return_data['javascript'] = '
 				document.write(\'<label for="do_paypal_recur"><input type="checkbox" name="do_paypal_recur" id="do_paypal_recur" checked onclick="switchPaypalRecur();" class="input_check">' . $txt['paid_make_recurring'] . '</label><br>\');
 
 				function switchPaypalRecur()
 				{
 					document.getElementById("paypal_cmd").value = document.getElementById("do_paypal_recur").checked ? "_xclick-subscriptions" : "_xclick";
 				}';
+		}
 
 		return $return_data;
 	}
@@ -160,20 +161,24 @@ 
 		global $modSettings;
 
 		// Has the user set up an email address?
-		if ((empty($modSettings['paidsubs_test']) && empty($modSettings['paypal_email'])) || (!empty($modSettings['paidsubs_test']) && empty($modSettings['paypal_sandbox_email'])))
-			return false;
+		if ((empty($modSettings['paidsubs_test']) && empty($modSettings['paypal_email'])) || (!empty($modSettings['paidsubs_test']) && empty($modSettings['paypal_sandbox_email']))) {
+					return false;
+		}
 		// Check the correct transaction types are even here.
-		if ((!isset($_POST['txn_type']) && !isset($_POST['payment_status'])) || (!isset($_POST['business']) && !isset($_POST['receiver_email'])))
-			return false;
+		if ((!isset($_POST['txn_type']) && !isset($_POST['payment_status'])) || (!isset($_POST['business']) && !isset($_POST['receiver_email']))) {
+					return false;
+		}
 		// Correct email address?
-		if (!isset($_POST['business']))
-			$_POST['business'] = $_POST['receiver_email'];
+		if (!isset($_POST['business'])) {
+					$_POST['business'] = $_POST['receiver_email'];
+		}
 
 		// Are we testing?
-		if (empty($modSettings['paidsubs_test']) && strtolower($modSettings['paypal_sandbox_email']) != strtolower($_POST['business']) && (empty($modSettings['paypal_additional_emails']) || !in_array(strtolower($_POST['business']), explode(',', strtolower($modSettings['paypal_additional_emails'])))))
-			return false;
-		elseif (strtolower($modSettings['paypal_email']) != strtolower($_POST['business']) && (empty($modSettings['paypal_additional_emails']) || !in_array(strtolower($_POST['business']), explode(',', $modSettings['paypal_additional_emails']))))
-			return false;
+		if (empty($modSettings['paidsubs_test']) && strtolower($modSettings['paypal_sandbox_email']) != strtolower($_POST['business']) && (empty($modSettings['paypal_additional_emails']) || !in_array(strtolower($_POST['business']), explode(',', strtolower($modSettings['paypal_additional_emails']))))) {
+					return false;
+		} elseif (strtolower($modSettings['paypal_email']) != strtolower($_POST['business']) && (empty($modSettings['paypal_additional_emails']) || !in_array(strtolower($_POST['business']), explode(',', $modSettings['paypal_additional_emails'])))) {
+					return false;
+		}
 		return true;
 	}
 
@@ -192,15 +197,17 @@ 
 		global $modSettings, $txt;
 
 		// Put this to some default value.
-		if (!isset($_POST['txn_type']))
-			$_POST['txn_type'] = '';
+		if (!isset($_POST['txn_type'])) {
+					$_POST['txn_type'] = '';
+		}
 
 		// Build the request string - starting with the minimum requirement.
 		$requestString = 'cmd=_notify-validate';
 
 		// Now my dear, add all the posted bits in the order we got them
-		foreach ($_POST as $k => $v)
-			$requestString .= '&' . $k . '=' . urlencode($v);
+		foreach ($_POST as $k => $v) {
+					$requestString .= '&' . $k . '=' . urlencode($v);
+		}
 
 		// Can we use curl?
 		if (function_exists('curl_init') && $curl = curl_init((!empty($modSettings['paidsubs_test']) ? 'https://www.sandbox.' : 'https://www.') . 'paypal.com/cgi-bin/webscr'))
@@ -240,14 +247,16 @@ 
 			$header .= 'Connection: close' . "\r\n\r\n";
 
 			// Open the connection.
-			if (!empty($modSettings['paidsubs_test']))
-				$fp = fsockopen('ssl://www.sandbox.paypal.com', 443, $errno, $errstr, 30);
-			else
-				$fp = fsockopen('www.paypal.com', 80, $errno, $errstr, 30);
+			if (!empty($modSettings['paidsubs_test'])) {
+							$fp = fsockopen('ssl://www.sandbox.paypal.com', 443, $errno, $errstr, 30);
+			} else {
+							$fp = fsockopen('www.paypal.com', 80, $errno, $errstr, 30);
+			}
 
 			// Did it work?
-			if (!$fp)
-				generateSubscriptionError($txt['paypal_could_not_connect']);
+			if (!$fp) {
+							generateSubscriptionError($txt['paypal_could_not_connect']);
+			}
 
 			// Put the data to the port.
 			fputs($fp, $header . $requestString);
@@ -256,8 +265,9 @@ 
 			while (!feof($fp))
 			{
 				$this->return_data = fgets($fp, 1024);
-				if (strcmp(trim($this->return_data), 'VERIFIED') === 0)
-					break;
+				if (strcmp(trim($this->return_data), 'VERIFIED') === 0) {
+									break;
+				}
 			}
 
 			// Clean up.
@@ -265,28 +275,34 @@ 
 		}
 
 		// If this isn't verified then give up...
-		if (strcmp(trim($this->return_data), 'VERIFIED') !== 0)
-			exit;
+		if (strcmp(trim($this->return_data), 'VERIFIED') !== 0) {
+					exit;
+		}
 
 		// Check that this is intended for us.
-		if (strtolower($modSettings['paypal_email']) != strtolower($_POST['business']) && (empty($modSettings['paypal_additional_emails']) || !in_array(strtolower($_POST['business']), explode(',', strtolower($modSettings['paypal_additional_emails'])))))
-			exit;
+		if (strtolower($modSettings['paypal_email']) != strtolower($_POST['business']) && (empty($modSettings['paypal_additional_emails']) || !in_array(strtolower($_POST['business']), explode(',', strtolower($modSettings['paypal_additional_emails']))))) {
+					exit;
+		}
 
 		// Is this a subscription - and if so is it a secondary payment that we need to process?
 		// If so, make sure we get it in the expected format. Seems PayPal sometimes sends it without urlencoding.
-		if (!empty($_POST['item_number']) && strpos($_POST['item_number'], ' ') !== false)
-			$_POST['item_number'] = str_replace(' ', '+', $_POST['item_number']);
-		if ($this->isSubscription() && (empty($_POST['item_number']) || strpos($_POST['item_number'], '+') === false))
-			// Calculate the subscription it relates to!
+		if (!empty($_POST['item_number']) && strpos($_POST['item_number'], ' ') !== false) {
+					$_POST['item_number'] = str_replace(' ', '+', $_POST['item_number']);
+		}
+		if ($this->isSubscription() && (empty($_POST['item_number']) || strpos($_POST['item_number'], '+') === false)) {
+					// Calculate the subscription it relates to!
 			$this->_findSubscription();
+		}
 
 		// Verify the currency!
-		if (strtolower($_POST['mc_currency']) !== strtolower($modSettings['paid_currency_code']))
-			exit;
+		if (strtolower($_POST['mc_currency']) !== strtolower($modSettings['paid_currency_code'])) {
+					exit;
+		}
 
 		// Can't exist if it doesn't contain anything.
-		if (empty($_POST['item_number']))
-			exit;
+		if (empty($_POST['item_number'])) {
+					exit;
+		}
 
 		// Return the id_sub and id_member
 		return explode('+', $_POST['item_number']);
@@ -299,10 +315,11 @@ 
 	 */
 	public function isRefund()
 	{
-		if ($_POST['payment_status'] === 'Refunded' || $_POST['payment_status'] === 'Reversed' || $_POST['txn_type'] === 'Refunded' || ($_POST['txn_type'] === 'reversal' && $_POST['payment_status'] === 'Completed'))
-			return true;
-		else
-			return false;
+		if ($_POST['payment_status'] === 'Refunded' || $_POST['payment_status'] === 'Reversed' || $_POST['txn_type'] === 'Refunded' || ($_POST['txn_type'] === 'reversal' && $_POST['payment_status'] === 'Completed')) {
+					return true;
+		} else {
+					return false;
+		}
 	}
 
 	/**
@@ -312,10 +329,11 @@ 
 	 */
 	public function isSubscription()
 	{
-		if (substr($_POST['txn_type'], 0, 14) === 'subscr_payment' && $_POST['payment_status'] === 'Completed')
-			return true;
-		else
-			return false;
+		if (substr($_POST['txn_type'], 0, 14) === 'subscr_payment' && $_POST['payment_status'] === 'Completed') {
+					return true;
+		} else {
+					return false;
+		}
 	}
 
 	/**
@@ -325,10 +343,11 @@ 
 	 */
 	public function isPayment()
 	{
-		if ($_POST['payment_status'] === 'Completed' && $_POST['txn_type'] === 'web_accept')
-			return true;
-		else
-			return false;
+		if ($_POST['payment_status'] === 'Completed' && $_POST['txn_type'] === 'web_accept') {
+					return true;
+		} else {
+					return false;
+		}
 	}
 
 	/**
@@ -341,10 +360,11 @@ 
 		// subscr_cancel is sent when the user cancels, subscr_eot is sent when the subscription reaches final payment
 		// Neither require us to *do* anything as per performCancel().
 		// subscr_eot, if sent, indicates an end of payments term.
-		if (substr($_POST['txn_type'], 0, 13) === 'subscr_cancel' || substr($_POST['txn_type'], 0, 10) === 'subscr_eot')
-			return true;
-		else
-			return false;
+		if (substr($_POST['txn_type'], 0, 13) === 'subscr_cancel' || substr($_POST['txn_type'], 0, 10) === 'subscr_eot') {
+					return true;
+		} else {
+					return false;
+		}
 	}
 
 	/**
@@ -409,8 +429,9 @@ 
 		global $smcFunc;
 
 		// Assume we have this?
-		if (empty($_POST['subscr_id']))
-			return false;
+		if (empty($_POST['subscr_id'])) {
+					return false;
+		}
 
 		// Do we have this in the database?
 		$request = $smcFunc['db_query']('', '
@@ -439,11 +460,12 @@ 
 						'payer_email' => $_POST['payer_email'],
 					)
 				);
-				if ($smcFunc['db_num_rows']($request) === 0)
-					return false;
+				if ($smcFunc['db_num_rows']($request) === 0) {
+									return false;
+				}
+			} else {
+							return false;
 			}
-			else
-				return false;
 		}
 		list ($member_id, $subscription_id) = $smcFunc['db_fetch_row']($request);
 		$_POST['item_number'] = $member_id . '+' . $subscription_id;

Sources/SearchAPI-Fulltext.php

Braces +44 added lines, -34 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Class fulltext_search
@@ -98,8 +99,9 @@ 
 			$smcFunc['db_free_result']($request);
 		}
 		// 4 is the MySQL default...
-		else
-			$min_word_length = 4;
+		else {
+					$min_word_length = 4;
+		}
 
 		return $min_word_length;
 	}
@@ -138,8 +140,7 @@ 
 					$wordsSearch['words'][] = trim($word, "/*- ");
 					$wordsSearch['complex_words'][] = count($subwords) === 1 ? $word : '"' . $word . '"';
 				}
-			}
-			elseif ($smcFunc['strlen'](trim($word, "/*- ")) < $this->min_word_length)
+			} elseif ($smcFunc['strlen'](trim($word, "/*- ")) < $this->min_word_length)
 			{
 				// short words have feelings too
 				$wordsSearch['words'][] = trim($word, "/*- ");
@@ -149,8 +150,9 @@ 
 
 		$fulltextWord = count($subwords) === 1 ? $word : '"' . $word . '"';
 		$wordsSearch['indexed_words'][] = $fulltextWord;
-		if ($isExcluded)
-			$wordsExclude[] = $fulltextWord;
+		if ($isExcluded) {
+					$wordsExclude[] = $fulltextWord;
+		}
 	}
 
 	/**
@@ -166,41 +168,50 @@ 
 		$query_where = array();
 		$query_params = $search_data['params'];
 
-		if ($query_params['id_search'])
-			$query_select['id_search'] = '{int:id_search}';
+		if ($query_params['id_search']) {
+					$query_select['id_search'] = '{int:id_search}';
+		}
 
 		$count = 0;
-		if (empty($modSettings['search_simple_fulltext']))
-			foreach ($words['words'] as $regularWord)
+		if (empty($modSettings['search_simple_fulltext'])) {
+					foreach ($words['words'] as $regularWord)
 			{
 				$query_where[] = 'm.body' . (in_array($regularWord, $query_params['excluded_words']) ? ' NOT' : '') . (empty($modSettings['search_match_words']) || $search_data['no_regexp'] ? ' LIKE ' : 'RLIKE') . '{string:complex_body_' . $count . '}';
+		}
 				$query_params['complex_body_' . $count++] = empty($modSettings['search_match_words']) || $search_data['no_regexp'] ? '%' . strtr($regularWord, array('_' => '\\_', '%' => '\\%')) . '%' : '[[:<:]]' . addcslashes(preg_replace(array('/([\[\]$.+*?|{}()])/'), array('[$1]'), $regularWord), '\\\'') . '[[:>:]]';
 			}
 
-		if ($query_params['user_query'])
-			$query_where[] = '{raw:user_query}';
-		if ($query_params['board_query'])
-			$query_where[] = 'm.id_board {raw:board_query}';
+		if ($query_params['user_query']) {
+					$query_where[] = '{raw:user_query}';
+		}
+		if ($query_params['board_query']) {
+					$query_where[] = 'm.id_board {raw:board_query}';
+		}
 
-		if ($query_params['topic'])
-			$query_where[] = 'm.id_topic = {int:topic}';
-		if ($query_params['min_msg_id'])
-			$query_where[] = 'm.id_msg >= {int:min_msg_id}';
-		if ($query_params['max_msg_id'])
-			$query_where[] = 'm.id_msg <= {int:max_msg_id}';
+		if ($query_params['topic']) {
+					$query_where[] = 'm.id_topic = {int:topic}';
+		}
+		if ($query_params['min_msg_id']) {
+					$query_where[] = 'm.id_msg >= {int:min_msg_id}';
+		}
+		if ($query_params['max_msg_id']) {
+					$query_where[] = 'm.id_msg <= {int:max_msg_id}';
+		}
 
 		$count = 0;
-		if (!empty($query_params['excluded_phrases']) && empty($modSettings['search_force_index']))
-			foreach ($query_params['excluded_phrases'] as $phrase)
+		if (!empty($query_params['excluded_phrases']) && empty($modSettings['search_force_index'])) {
+					foreach ($query_params['excluded_phrases'] as $phrase)
 			{
 				$query_where[] = 'subject NOT ' . (empty($modSettings['search_match_words']) || $search_data['no_regexp'] ? ' LIKE ' : 'RLIKE') . '{string:exclude_subject_phrase_' . $count . '}';
+		}
 				$query_params['exclude_subject_phrase_' . $count++] = empty($modSettings['search_match_words']) || $search_data['no_regexp'] ? '%' . strtr($phrase, array('_' => '\\_', '%' => '\\%')) . '%' : '[[:<:]]' . addcslashes(preg_replace(array('/([\[\]$.+*?|{}()])/'), array('[$1]'), $phrase), '\\\'') . '[[:>:]]';
 			}
 		$count = 0;
-		if (!empty($query_params['excluded_subject_words']) && empty($modSettings['search_force_index']))
-			foreach ($query_params['excluded_subject_words'] as $excludedWord)
+		if (!empty($query_params['excluded_subject_words']) && empty($modSettings['search_force_index'])) {
+					foreach ($query_params['excluded_subject_words'] as $excludedWord)
 			{
 				$query_where[] = 'subject NOT ' . (empty($modSettings['search_match_words']) || $search_data['no_regexp'] ? ' LIKE ' : 'RLIKE') . '{string:exclude_subject_words_' . $count . '}';
+		}
 				$query_params['exclude_subject_words_' . $count++] = empty($modSettings['search_match_words']) || $search_data['no_regexp'] ? '%' . strtr($excludedWord, array('_' => '\\_', '%' => '\\%')) . '%' : '[[:<:]]' . addcslashes(preg_replace(array('/([\[\]$.+*?|{}()])/'), array('[$1]'), $excludedWord), '\\\'') . '[[:>:]]';
 			}
 
@@ -212,12 +223,11 @@ 
 				
 				$query_where[] = 'to_tsvector({string:language_ftx},body) @@ to_tsquery({string:language_ftx},{string:body_match})';
 				$query_params['language_ftx'] = $language_ftx;
+			} else {
+							$query_where[] = 'MATCH (body) AGAINST ({string:body_match})';
 			}
-			else
-				$query_where[] = 'MATCH (body) AGAINST ({string:body_match})';
 			$query_params['body_match'] = implode(' ', array_diff($words['indexed_words'], $query_params['excluded_index_words']));
-		}
-		else
+		} else
 		{
 			$query_params['boolean_match'] = '';
 
@@ -231,10 +241,10 @@ 
 					$query_params['boolean_match'] .= (in_array($fulltextWord, $query_params['excluded_index_words']) ? '!' : '') . $fulltextWord . ' ';
 					$row++;
 				}
-			}
-			else
-				foreach ($words['indexed_words'] as $fulltextWord)
+			} else {
+							foreach ($words['indexed_words'] as $fulltextWord)
 					$query_params['boolean_match'] .= (in_array($fulltextWord, $query_params['excluded_index_words']) ? '-' : '+') . $fulltextWord . ' ';
+			}
 
 			$query_params['boolean_match'] = substr($query_params['boolean_match'], 0, -1);
 
@@ -246,9 +256,9 @@ 
 					
 					$query_where[] = 'to_tsvector({string:language_ftx},body) @@ to_tsquery({string:language_ftx},{string:boolean_match})';
 					$query_params['language_ftx'] = $language_ftx;
+				} else {
+									$query_where[] = 'MATCH (body) AGAINST ({string:boolean_match} IN BOOLEAN MODE)';
 				}
-				else
-					$query_where[] = 'MATCH (body) AGAINST ({string:boolean_match} IN BOOLEAN MODE)';
 			}
 
 		}

Sources/Subs-Calendar.php

Braces +215 added lines, -157 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Get all birthdays within the given time range.
@@ -60,8 +61,7 @@ 
 				'max_year' => $year_high,
 			)
 		);
-	}
-	else
+	} else
 	{
 		$result = $smcFunc['db_query']('birthday_array', '
 			SELECT id_member, real_name, YEAR(birthdate) AS birth_year, birthdate
@@ -91,10 +91,11 @@ 
 	$bday = array();
 	while ($row = $smcFunc['db_fetch_assoc']($result))
 	{
-		if ($year_low != $year_high)
-			$age_year = substr($row['birthdate'], 5) < substr($high_date, 5) ? $year_high : $year_low;
-		else
-			$age_year = $year_low;
+		if ($year_low != $year_high) {
+					$age_year = substr($row['birthdate'], 5) < substr($high_date, 5) ? $year_high : $year_low;
+		} else {
+					$age_year = $year_low;
+		}
 
 		$bday[$age_year . substr($row['birthdate'], 4)][] = array(
 			'id' => $row['id_member'],
@@ -108,8 +109,9 @@ 
 	ksort($bday);
 
 	// Set is_last, so the themes know when to stop placing separators.
-	foreach ($bday as $mday => $array)
-		$bday[$mday][count($array) - 1]['is_last'] = true;
+	foreach ($bday as $mday => $array) {
+			$bday[$mday][count($array) - 1]['is_last'] = true;
+	}
 
 	return $bday;
 }
@@ -157,8 +159,9 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($result))
 	{
 		// If the attached topic is not approved then for the moment pretend it doesn't exist
-		if (!empty($row['id_first_msg']) && $modSettings['postmod_active'] && !$row['approved'])
-			continue;
+		if (!empty($row['id_first_msg']) && $modSettings['postmod_active'] && !$row['approved']) {
+					continue;
+		}
 
 		// Force a censor of the title - as often these are used by others.
 		censorText($row['title'], $use_permissions ? false : true);
@@ -167,8 +170,9 @@ 
 		list($start, $end, $allday, $span, $tz, $tz_abbrev) = buildEventDatetimes($row);
 
 		// Sanity check
-		if (!empty($start['error_count']) || !empty($start['warning_count']) || !empty($end['error_count']) || !empty($end['warning_count']))
-			continue;
+		if (!empty($start['error_count']) || !empty($start['warning_count']) || !empty($end['error_count']) || !empty($end['warning_count'])) {
+					continue;
+		}
 
 		// Get set up for the loop
 		$start_object = date_create($row['start_date'] . (!$allday ? ' ' . $row['start_time'] : ''), timezone_open($tz));
@@ -232,8 +236,8 @@ 
 			);
 
 			// If we're using permissions (calendar pages?) then just ouput normal contextual style information.
-			if ($use_permissions)
-				$events[date_format($cal_date, 'Y-m-d')][] = array_merge($eventProperties, array(
+			if ($use_permissions) {
+							$events[date_format($cal_date, 'Y-m-d')][] = array_merge($eventProperties, array(
 					'href' => $row['id_board'] == 0 ? '' : $scripturl . '?topic=' . $row['id_topic'] . '.0',
 					'link' => $row['id_board'] == 0 ? $row['title'] : '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.0">' . $row['title'] . '</a>',
 					'can_edit' => allowedTo('calendar_edit_any') || ($row['id_member'] == $user_info['id'] && allowedTo('calendar_edit_own')),
@@ -241,9 +245,10 @@ 
 					'can_export' => !empty($modSettings['cal_export']) ? true : false,
 					'export_href' => $scripturl . '?action=calendar;sa=ical;eventid=' . $row['id_event'] . ';' . $context['session_var'] . '=' . $context['session_id'],
 				));
+			}
 			// Otherwise, this is going to be cached and the VIEWER'S permissions should apply... just put together some info.
-			else
-				$events[date_format($cal_date, 'Y-m-d')][] = array_merge($eventProperties, array(
+			else {
+							$events[date_format($cal_date, 'Y-m-d')][] = array_merge($eventProperties, array(
 					'href' => $row['id_topic'] == 0 ? '' : $scripturl . '?topic=' . $row['id_topic'] . '.0',
 					'link' => $row['id_topic'] == 0 ? $row['title'] : '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.0">' . $row['title'] . '</a>',
 					'can_edit' => false,
@@ -253,6 +258,7 @@ 
 					'poster' => $row['id_member'],
 					'allowed_groups' => explode(',', $row['member_groups']),
 				));
+			}
 
 			date_add($cal_date, date_interval_create_from_date_string('1 day'));
 		}
@@ -262,8 +268,9 @@ 
 	// If we're doing normal contextual data, go through and make things clear to the templates ;).
 	if ($use_permissions)
 	{
-		foreach ($events as $mday => $array)
-			$events[$mday][count($array) - 1]['is_last'] = true;
+		foreach ($events as $mday => $array) {
+					$events[$mday][count($array) - 1]['is_last'] = true;
+		}
 	}
 
 	ksort($events);
@@ -283,11 +290,12 @@ 
 	global $smcFunc;
 
 	// Get the lowest and highest dates for "all years".
-	if (substr($low_date, 0, 4) != substr($high_date, 0, 4))
-		$allyear_part = 'event_date BETWEEN {date:all_year_low} AND {date:all_year_dec}
+	if (substr($low_date, 0, 4) != substr($high_date, 0, 4)) {
+			$allyear_part = 'event_date BETWEEN {date:all_year_low} AND {date:all_year_dec}
 			OR event_date BETWEEN {date:all_year_jan} AND {date:all_year_high}';
-	else
-		$allyear_part = 'event_date BETWEEN {date:all_year_low} AND {date:all_year_high}';
+	} else {
+			$allyear_part = 'event_date BETWEEN {date:all_year_low} AND {date:all_year_high}';
+	}
 
 	// Find some holidays... ;).
 	$result = $smcFunc['db_query']('', '
@@ -307,10 +315,11 @@ 
 	$holidays = array();
 	while ($row = $smcFunc['db_fetch_assoc']($result))
 	{
-		if (substr($low_date, 0, 4) != substr($high_date, 0, 4))
-			$event_year = substr($row['event_date'], 5) < substr($high_date, 5) ? substr($high_date, 0, 4) : substr($low_date, 0, 4);
-		else
-			$event_year = substr($low_date, 0, 4);
+		if (substr($low_date, 0, 4) != substr($high_date, 0, 4)) {
+					$event_year = substr($row['event_date'], 5) < substr($high_date, 5) ? substr($high_date, 0, 4) : substr($low_date, 0, 4);
+		} else {
+					$event_year = substr($low_date, 0, 4);
+		}
 
 		$holidays[$event_year . substr($row['event_date'], 4)][] = $row['title'];
 	}
@@ -336,10 +345,12 @@ 
 	isAllowedTo('calendar_post');
 
 	// No board?  No topic?!?
-	if (empty($board))
-		fatal_lang_error('missing_board_id', false);
-	if (empty($topic))
-		fatal_lang_error('missing_topic_id', false);
+	if (empty($board)) {
+			fatal_lang_error('missing_board_id', false);
+	}
+	if (empty($topic)) {
+			fatal_lang_error('missing_topic_id', false);
+	}
 
 	// Administrator, Moderator, or owner.  Period.
 	if (!allowedTo('admin_forum') && !allowedTo('moderate_board'))
@@ -357,12 +368,14 @@ 
 		if ($row = $smcFunc['db_fetch_assoc']($result))
 		{
 			// Not the owner of the topic.
-			if ($row['id_member_started'] != $user_info['id'])
-				fatal_lang_error('not_your_topic', 'user');
+			if ($row['id_member_started'] != $user_info['id']) {
+							fatal_lang_error('not_your_topic', 'user');
+			}
 		}
 		// Topic/Board doesn't exist.....
-		else
-			fatal_lang_error('calendar_no_topic', 'general');
+		else {
+					fatal_lang_error('calendar_no_topic', 'general');
+		}
 		$smcFunc['db_free_result']($result);
 	}
 }
@@ -450,14 +463,16 @@ 
 	if (!empty($calendarOptions['start_day']))
 	{
 		$nShift -= $calendarOptions['start_day'];
-		if ($nShift < 0)
-			$nShift = 7 + $nShift;
+		if ($nShift < 0) {
+					$nShift = 7 + $nShift;
+		}
 	}
 
 	// Number of rows required to fit the month.
 	$nRows = floor(($month_info['last_day']['day_of_month'] + $nShift) / 7);
-	if (($month_info['last_day']['day_of_month'] + $nShift) % 7)
-		$nRows++;
+	if (($month_info['last_day']['day_of_month'] + $nShift) % 7) {
+			$nRows++;
+	}
 
 	// Fetch the arrays for birthdays, posted events, and holidays.
 	$bday = $calendarOptions['show_birthdays'] ? getBirthdayRange($month_info['first_day']['date'], $month_info['last_day']['date']) : array();
@@ -470,8 +485,9 @@ 
 	{
 		$calendarGrid['week_days'][] = $count;
 		$count++;
-		if ($count == 7)
-			$count = 0;
+		if ($count == 7) {
+					$count = 0;
+		}
 	}
 
 	// Iterate through each week.
@@ -488,8 +504,9 @@ 
 		{
 			$nDay = ($nRow * 7) + $nCol - $nShift + 1;
 
-			if ($nDay < 1 || $nDay > $month_info['last_day']['day_of_month'])
-				$nDay = 0;
+			if ($nDay < 1 || $nDay > $month_info['last_day']['day_of_month']) {
+							$nDay = 0;
+			}
 
 			$date = sprintf('%04d-%02d-%02d', $year, $month, $nDay);
 
@@ -507,8 +524,9 @@ 
 	}
 
 	// What is the last day of the month?
-	if ($is_previous === true)
-		$calendarGrid['last_of_month'] = $month_info['last_day']['day_of_month'];
+	if ($is_previous === true) {
+			$calendarGrid['last_of_month'] = $month_info['last_day']['day_of_month'];
+	}
 
 	// We'll use the shift in the template.
 	$calendarGrid['shift'] = $nShift;
@@ -542,8 +560,9 @@ 
 	{
 		// Here we offset accordingly to get things to the real start of a week.
 		$date_diff = $day_of_week - $calendarOptions['start_day'];
-		if ($date_diff < 0)
-			$date_diff += 7;
+		if ($date_diff < 0) {
+					$date_diff += 7;
+		}
 		$new_timestamp = mktime(0, 0, 0, $month, $day, $year) - $date_diff * 86400;
 		$day = (int) strftime('%d', $new_timestamp);
 		$month = (int) strftime('%m', $new_timestamp);
@@ -673,18 +692,20 @@ 
 	{
 		foreach ($date_events as $event_key => $event_val)
 		{
-			if (in_array($event_val['id'], $temp))
-				unset($calendarGrid['events'][$date][$event_key]);
-			else
-				$temp[] = $event_val['id'];
+			if (in_array($event_val['id'], $temp)) {
+							unset($calendarGrid['events'][$date][$event_key]);
+			} else {
+							$temp[] = $event_val['id'];
+			}
 		}
 	}
 
 	// Give birthdays and holidays a friendly format, without the year
-	if (preg_match('~%[AaBbCcDdeGghjmuYy](?:[^%]*%[AaBbCcDdeGghjmuYy])*~', $user_info['time_format'], $matches) == 0 || empty($matches[0]))
-		$date_format = '%b %d';
-	else
-		$date_format = str_replace(array('%Y', '%y', '%G', '%g', '%C', '%c', '%D'), array('', '', '', '', '', '%b %d', '%m/%d'), $matches[0]);
+	if (preg_match('~%[AaBbCcDdeGghjmuYy](?:[^%]*%[AaBbCcDdeGghjmuYy])*~', $user_info['time_format'], $matches) == 0 || empty($matches[0])) {
+			$date_format = '%b %d';
+	} else {
+			$date_format = str_replace(array('%Y', '%y', '%G', '%g', '%C', '%c', '%D'), array('', '', '', '', '', '%b %d', '%m/%d'), $matches[0]);
+	}
 
 	foreach (array('birthdays', 'holidays') as $type)
 	{
@@ -779,8 +800,9 @@ 
 	// Holidays between now and now + days.
 	for ($i = $now; $i < $now + $days_for_index; $i += 86400)
 	{
-		if (isset($cached_data['holidays'][strftime('%Y-%m-%d', $i)]))
-			$return_data['calendar_holidays'] = array_merge($return_data['calendar_holidays'], $cached_data['holidays'][strftime('%Y-%m-%d', $i)]);
+		if (isset($cached_data['holidays'][strftime('%Y-%m-%d', $i)])) {
+					$return_data['calendar_holidays'] = array_merge($return_data['calendar_holidays'], $cached_data['holidays'][strftime('%Y-%m-%d', $i)]);
+		}
 	}
 
 	// Happy Birthday, guys and gals!
@@ -789,8 +811,9 @@ 
 		$loop_date = strftime('%Y-%m-%d', $i);
 		if (isset($cached_data['birthdays'][$loop_date]))
 		{
-			foreach ($cached_data['birthdays'][$loop_date] as $index => $dummy)
-				$cached_data['birthdays'][strftime('%Y-%m-%d', $i)][$index]['is_today'] = $loop_date === $today['date'];
+			foreach ($cached_data['birthdays'][$loop_date] as $index => $dummy) {
+							$cached_data['birthdays'][strftime('%Y-%m-%d', $i)][$index]['is_today'] = $loop_date === $today['date'];
+			}
 			$return_data['calendar_birthdays'] = array_merge($return_data['calendar_birthdays'], $cached_data['birthdays'][$loop_date]);
 		}
 	}
@@ -802,8 +825,9 @@ 
 		$loop_date = strftime('%Y-%m-%d', $i);
 
 		// No events today? Check the next day.
-		if (empty($cached_data['events'][$loop_date]))
-			continue;
+		if (empty($cached_data['events'][$loop_date])) {
+					continue;
+		}
 
 		// Loop through all events to add a few last-minute values.
 		foreach ($cached_data['events'][$loop_date] as $ev => $event)
@@ -816,9 +840,9 @@ 
 			{
 				unset($cached_data['events'][$loop_date][$ev]);
 				continue;
+			} else {
+							$duplicates[$this_event['topic'] . $this_event['title']] = true;
 			}
-			else
-				$duplicates[$this_event['topic'] . $this_event['title']] = true;
 
 			// Might be set to true afterwards, depending on the permissions.
 			$this_event['can_edit'] = false;
@@ -826,15 +850,18 @@ 
 			$this_event['date'] = $loop_date;
 		}
 
-		if (!empty($cached_data['events'][$loop_date]))
-			$return_data['calendar_events'] = array_merge($return_data['calendar_events'], $cached_data['events'][$loop_date]);
+		if (!empty($cached_data['events'][$loop_date])) {
+					$return_data['calendar_events'] = array_merge($return_data['calendar_events'], $cached_data['events'][$loop_date]);
+		}
 	}
 
 	// Mark the last item so that a list separator can be used in the template.
-	for ($i = 0, $n = count($return_data['calendar_birthdays']); $i < $n; $i++)
-		$return_data['calendar_birthdays'][$i]['is_last'] = !isset($return_data['calendar_birthdays'][$i + 1]);
-	for ($i = 0, $n = count($return_data['calendar_events']); $i < $n; $i++)
-		$return_data['calendar_events'][$i]['is_last'] = !isset($return_data['calendar_events'][$i + 1]);
+	for ($i = 0, $n = count($return_data['calendar_birthdays']); $i < $n; $i++) {
+			$return_data['calendar_birthdays'][$i]['is_last'] = !isset($return_data['calendar_birthdays'][$i + 1]);
+	}
+	for ($i = 0, $n = count($return_data['calendar_events']); $i < $n; $i++) {
+			$return_data['calendar_events'][$i]['is_last'] = !isset($return_data['calendar_events'][$i + 1]);
+	}
 
 	return array(
 		'data' => $return_data,
@@ -882,37 +909,46 @@ 
 		if (isset($_POST['start_date']))
 		{
 			$d = date_parse($_POST['start_date']);
-			if (!empty($d['error_count']) || !empty($d['warning_count']))
-				fatal_lang_error('invalid_date', false);
-			if (empty($d['year']))
-				fatal_lang_error('event_year_missing', false);
-			if (empty($d['month']))
-				fatal_lang_error('event_month_missing', false);
-		}
-		elseif (isset($_POST['start_datetime']))
+			if (!empty($d['error_count']) || !empty($d['warning_count'])) {
+							fatal_lang_error('invalid_date', false);
+			}
+			if (empty($d['year'])) {
+							fatal_lang_error('event_year_missing', false);
+			}
+			if (empty($d['month'])) {
+							fatal_lang_error('event_month_missing', false);
+			}
+		} elseif (isset($_POST['start_datetime']))
 		{
 			$d = date_parse($_POST['start_datetime']);
-			if (!empty($d['error_count']) || !empty($d['warning_count']))
-				fatal_lang_error('invalid_date', false);
-			if (empty($d['year']))
-				fatal_lang_error('event_year_missing', false);
-			if (empty($d['month']))
-				fatal_lang_error('event_month_missing', false);
+			if (!empty($d['error_count']) || !empty($d['warning_count'])) {
+							fatal_lang_error('invalid_date', false);
+			}
+			if (empty($d['year'])) {
+							fatal_lang_error('event_year_missing', false);
+			}
+			if (empty($d['month'])) {
+							fatal_lang_error('event_month_missing', false);
+			}
 		}
 		// The 2.0 way
 		else
 		{
 			// No month?  No year?
-			if (!isset($_POST['month']))
-				fatal_lang_error('event_month_missing', false);
-			if (!isset($_POST['year']))
-				fatal_lang_error('event_year_missing', false);
+			if (!isset($_POST['month'])) {
+							fatal_lang_error('event_month_missing', false);
+			}
+			if (!isset($_POST['year'])) {
+							fatal_lang_error('event_year_missing', false);
+			}
 
 			// Check the month and year...
-			if ($_POST['month'] < 1 || $_POST['month'] > 12)
-				fatal_lang_error('invalid_month', false);
-			if ($_POST['year'] < $modSettings['cal_minyear'] || $_POST['year'] > $modSettings['cal_maxyear'])
-				fatal_lang_error('invalid_year', false);
+			if ($_POST['month'] < 1 || $_POST['month'] > 12) {
+							fatal_lang_error('invalid_month', false);
+			}
+			if ($_POST['year'] < $modSettings['cal_minyear'] || $_POST['year'] > $modSettings['cal_maxyear']) {
+							fatal_lang_error('invalid_year', false);
+			}
 		}
 	}
 
@@ -922,8 +958,9 @@ 
 	// If they want to us to calculate an end date, make sure it will fit in an acceptable range.
 	if (isset($_POST['span']))
 	{
-		if (($_POST['span'] < 1) || (!empty($modSettings['cal_maxspan']) && $_POST['span'] > $modSettings['cal_maxspan']))
-			fatal_lang_error('invalid_days_numb', false);
+		if (($_POST['span'] < 1) || (!empty($modSettings['cal_maxspan']) && $_POST['span'] > $modSettings['cal_maxspan'])) {
+					fatal_lang_error('invalid_days_numb', false);
+		}
 	}
 
 	// There is no need to validate the following values if we are just deleting the event.
@@ -933,24 +970,29 @@ 
 		if (empty($_POST['start_date']) && empty($_POST['start_datetime']))
 		{
 			// No day?
-			if (!isset($_POST['day']))
-				fatal_lang_error('event_day_missing', false);
+			if (!isset($_POST['day'])) {
+							fatal_lang_error('event_day_missing', false);
+			}
 
 			// Bad day?
-			if (!checkdate($_POST['month'], $_POST['day'], $_POST['year']))
-				fatal_lang_error('invalid_date', false);
+			if (!checkdate($_POST['month'], $_POST['day'], $_POST['year'])) {
+							fatal_lang_error('invalid_date', false);
+			}
 		}
 
-		if (!isset($_POST['evtitle']) && !isset($_POST['subject']))
-			fatal_lang_error('event_title_missing', false);
-		elseif (!isset($_POST['evtitle']))
-			$_POST['evtitle'] = $_POST['subject'];
+		if (!isset($_POST['evtitle']) && !isset($_POST['subject'])) {
+					fatal_lang_error('event_title_missing', false);
+		} elseif (!isset($_POST['evtitle'])) {
+					$_POST['evtitle'] = $_POST['subject'];
+		}
 
 		// No title?
-		if ($smcFunc['htmltrim']($_POST['evtitle']) === '')
-			fatal_lang_error('no_event_title', false);
-		if ($smcFunc['strlen']($_POST['evtitle']) > 100)
-			$_POST['evtitle'] = $smcFunc['substr']($_POST['evtitle'], 0, 100);
+		if ($smcFunc['htmltrim']($_POST['evtitle']) === '') {
+					fatal_lang_error('no_event_title', false);
+		}
+		if ($smcFunc['strlen']($_POST['evtitle']) > 100) {
+					$_POST['evtitle'] = $smcFunc['substr']($_POST['evtitle'], 0, 100);
+		}
 		$_POST['evtitle'] = str_replace(';', '', $_POST['evtitle']);
 	}
 }
@@ -977,8 +1019,9 @@ 
 	);
 
 	// No results, return false.
-	if ($smcFunc['db_num_rows'] === 0)
-		return false;
+	if ($smcFunc['db_num_rows'] === 0) {
+			return false;
+	}
 
 	// Grab the results and return.
 	list ($poster) = $smcFunc['db_fetch_row']($request);
@@ -1112,8 +1155,9 @@ 
 	call_integration_hook('integrate_modify_event', array($event_id, &$eventOptions, &$event_columns, &$event_parameters));
 
 	$column_clauses = array();
-	foreach ($event_columns as $col => $crit)
-		$column_clauses[] = $col . ' = ' . $crit;
+	foreach ($event_columns as $col => $crit) {
+			$column_clauses[] = $col . ' = ' . $crit;
+	}
 
 	$smcFunc['db_query']('', '
 		UPDATE {db_prefix}calendar
@@ -1198,8 +1242,9 @@ 
 	);
 
 	// If nothing returned, we are in poo, poo.
-	if ($smcFunc['db_num_rows']($request) === 0)
-		return false;
+	if ($smcFunc['db_num_rows']($request) === 0) {
+			return false;
+	}
 
 	$row = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
@@ -1207,8 +1252,9 @@ 
 	list($start, $end, $allday, $span, $tz, $tz_abbrev) = buildEventDatetimes($row);
 
 	// Sanity check
-	if (!empty($start['error_count']) || !empty($start['warning_count']) || !empty($end['error_count']) || !empty($end['warning_count']))
-		return false;
+	if (!empty($start['error_count']) || !empty($start['warning_count']) || !empty($end['error_count']) || !empty($end['warning_count'])) {
+			return false;
+	}
 
 	$return_value = array(
 		'boards' => array(),
@@ -1345,24 +1391,27 @@ 
 
 	// Set $span, in case we need it
 	$span = isset($eventOptions['span']) ? $eventOptions['span'] : (isset($_POST['span']) ? $_POST['span'] : 0);
-	if ($span > 0)
-		$span = !empty($modSettings['cal_maxspan']) ? min($modSettings['cal_maxspan'], $span - 1) : $span - 1;
+	if ($span > 0) {
+			$span = !empty($modSettings['cal_maxspan']) ? min($modSettings['cal_maxspan'], $span - 1) : $span - 1;
+	}
 
 	// Define the timezone for this event, falling back to the default if not provided
-	if (!empty($eventOptions['tz']) && in_array($eventOptions['tz'], timezone_identifiers_list(DateTimeZone::ALL_WITH_BC)))
-		$tz = $eventOptions['tz'];
-	elseif (!empty($_POST['tz']) && in_array($_POST['tz'], timezone_identifiers_list(DateTimeZone::ALL_WITH_BC)))
-		$tz = $_POST['tz'];
-	else
-		$tz = getUserTimezone();
+	if (!empty($eventOptions['tz']) && in_array($eventOptions['tz'], timezone_identifiers_list(DateTimeZone::ALL_WITH_BC))) {
+			$tz = $eventOptions['tz'];
+	} elseif (!empty($_POST['tz']) && in_array($_POST['tz'], timezone_identifiers_list(DateTimeZone::ALL_WITH_BC))) {
+			$tz = $_POST['tz'];
+	} else {
+			$tz = getUserTimezone();
+	}
 
 	// Is this supposed to be an all day event, or should it have specific start and end times?
-	if (isset($eventOptions['allday']))
-		$allday = $eventOptions['allday'];
-	elseif (empty($_POST['allday']))
-		$allday = false;
-	else
-		$allday = true;
+	if (isset($eventOptions['allday'])) {
+			$allday = $eventOptions['allday'];
+	} elseif (empty($_POST['allday'])) {
+			$allday = false;
+	} else {
+			$allday = true;
+	}
 
 	// Input might come as individual parameters...
 	$start_year = isset($eventOptions['year']) ? $eventOptions['year'] : (isset($_POST['year']) ? $_POST['year'] : null);
@@ -1389,10 +1438,12 @@ 
 	$end_time_string = isset($eventOptions['end_time']) ? $eventOptions['end_time'] : (isset($_POST['end_time']) ? $_POST['end_time'] : null);
 
 	// If the date and time were given in separate strings, combine them
-	if (empty($start_string) && isset($start_date_string))
-		$start_string = $start_date_string . (isset($start_time_string) ? ' ' . $start_time_string : '');
-	if (empty($end_string) && isset($end_date_string))
-		$end_string = $end_date_string . (isset($end_time_string) ? ' ' . $end_time_string : '');
+	if (empty($start_string) && isset($start_date_string)) {
+			$start_string = $start_date_string . (isset($start_time_string) ? ' ' . $start_time_string : '');
+	}
+	if (empty($end_string) && isset($end_date_string)) {
+			$end_string = $end_date_string . (isset($end_time_string) ? ' ' . $end_time_string : '');
+	}
 
 	// If some form of string input was given, override individually defined options with it
 	if (isset($start_string))
@@ -1483,10 +1534,11 @@ 
 	if ($start_object >= $end_object)
 	{
 		$end_object = date_create(sprintf('%04d-%02d-%02d %02d:%02d:%02d', $start_year, $start_month, $start_day, $start_hour, $start_minute, $start_second) . ' ' . $tz);
-		if ($span > 0)
-			date_add($end_object, date_interval_create_from_date_string($span . ' days'));
-		else
-			date_add($end_object, date_interval_create_from_date_string('1 hour'));
+		if ($span > 0) {
+					date_add($end_object, date_interval_create_from_date_string($span . ' days'));
+		} else {
+					date_add($end_object, date_interval_create_from_date_string('1 hour'));
+		}
 	}
 
 	// Is $end_object too late?
@@ -1499,9 +1551,9 @@ 
 			{
 				$end_object = date_create(sprintf('%04d-%02d-%02d %02d:%02d:%02d', $start_year, $start_month, $start_day, $start_hour, $start_minute, $start_second) . ' ' . $tz);
 				date_add($end_object, date_interval_create_from_date_string($modSettings['cal_maxspan'] . ' days'));
+			} else {
+							$end_object = date_create(sprintf('%04d-%02d-%02d %02d:%02d:%02d', $start_year, $start_month, $start_day, '11', '59', '59') . ' ' . $tz);
 			}
-			else
-				$end_object = date_create(sprintf('%04d-%02d-%02d %02d:%02d:%02d', $start_year, $start_month, $start_day, '11', '59', '59') . ' ' . $tz);
 		}
 	}
 
@@ -1514,8 +1566,7 @@ 
 		$start_time = null;
 		$end_time = null;
 		$tz = null;
-	}
-	else
+	} else
 	{
 		$start_time = date_format($start_object, 'H:i:s');
 		$end_time = date_format($end_object, 'H:i:s');
@@ -1536,16 +1587,18 @@ 
 	require_once($sourcedir . '/Subs.php');
 
 	// First, try to create a better date format, ignoring the "time" elements.
-	if (preg_match('~%[AaBbCcDdeGghjmuYy](?:[^%]*%[AaBbCcDdeGghjmuYy])*~', $user_info['time_format'], $matches) == 0 || empty($matches[0]))
-		$date_format = '%F';
-	else
-		$date_format = $matches[0];
+	if (preg_match('~%[AaBbCcDdeGghjmuYy](?:[^%]*%[AaBbCcDdeGghjmuYy])*~', $user_info['time_format'], $matches) == 0 || empty($matches[0])) {
+			$date_format = '%F';
+	} else {
+			$date_format = $matches[0];
+	}
 
 	// We want a fairly compact version of the time, but as close as possible to the user's settings.
-	if (preg_match('~%[HkIlMpPrRSTX](?:[^%]*%[HkIlMpPrRSTX])*~', $user_info['time_format'], $matches) == 0 || empty($matches[0]))
-		$time_format = '%k:%M';
-	else
-		$time_format = str_replace(array('%I', '%H', '%S', '%r', '%R', '%T'), array('%l', '%k', '', '%l:%M %p', '%k:%M', '%l:%M'), $matches[0]);
+	if (preg_match('~%[HkIlMpPrRSTX](?:[^%]*%[HkIlMpPrRSTX])*~', $user_info['time_format'], $matches) == 0 || empty($matches[0])) {
+			$time_format = '%k:%M';
+	} else {
+			$time_format = str_replace(array('%I', '%H', '%S', '%r', '%R', '%T'), array('%l', '%k', '', '%l:%M %p', '%k:%M', '%l:%M'), $matches[0]);
+	}
 
 	// Should this be an all day event?
 	$allday = (empty($row['start_time']) || empty($row['end_time']) || empty($row['timezone']) || !in_array($row['timezone'], timezone_identifiers_list(DateTimeZone::ALL_WITH_BC))) ? true : false;
@@ -1554,8 +1607,9 @@ 
 	$span = 1 + date_interval_format(date_diff(date_create($row['start_date']), date_create($row['end_date'])), '%d');
 
 	// We need to have a defined timezone in the steps below
-	if (empty($row['timezone']))
-		$row['timezone'] = getUserTimezone();
+	if (empty($row['timezone'])) {
+			$row['timezone'] = getUserTimezone();
+	}
 
 	// Get most of the standard date information for the start and end datetimes
 	$start = date_parse($row['start_date'] . (!$allday ? ' ' . $row['start_time'] : ''));
@@ -1607,8 +1661,9 @@ 
 	global $smcFunc, $context, $sourcedir, $user_info, $modSettings;
 	static $member_cache = array();
 
-	if (is_null($id_member) && $user_info['is_guest'] == false)
-		$id_member = $context['user']['id'];
+	if (is_null($id_member) && $user_info['is_guest'] == false) {
+			$id_member = $context['user']['id'];
+	}
 
 	//check if the cache got the data
 	if (isset($id_member) && isset($member_cache[$id_member]))
@@ -1630,11 +1685,13 @@ 
 		$smcFunc['db_free_result']($request);
 	}
 
-	if (empty($timezone) || !in_array($timezone, timezone_identifiers_list(DateTimeZone::ALL_WITH_BC)))
-		$timezone = isset($modSettings['default_timezone']) ? $modSettings['default_timezone'] : date_default_timezone_get();
+	if (empty($timezone) || !in_array($timezone, timezone_identifiers_list(DateTimeZone::ALL_WITH_BC))) {
+			$timezone = isset($modSettings['default_timezone']) ? $modSettings['default_timezone'] : date_default_timezone_get();
+	}
 
-	if (isset($id_member))
-		$member_cache[$id_member] = $timezone;
+	if (isset($id_member)) {
+			$member_cache[$id_member] = $timezone;
+	}
 
 	return $timezone;
 }
@@ -1663,8 +1720,9 @@ 
 		)
 	);
 	$holidays = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$holidays[] = $row;
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$holidays[] = $row;
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $holidays;