elkarte / Elkarte

sources/admin/Maintenance.controller.php

Braces +117 added lines, -46 removed lines

@@ -146,7 +146,9 @@ 
 
 		// Doing something special, does it exist?
 		if (isset($this->_req->query->activity, $subActions[$subAction]['activities'][$this->_req->query->activity]))
-			$activity = $this->_req->query->activity;
+		{
+					$activity = $this->_req->query->activity;
+		}
 
 		// Set a few things.
 		$context[$context['admin_menu_name']]['current_subsection'] = $subAction;
@@ -160,9 +162,13 @@ 
 		if (isset($activity))
 		{
 			if (is_string($subActions[$subAction]['activities'][$activity]) && method_exists($this, $subActions[$subAction]['activities'][$activity]))
-				$this->{$subActions[$subAction]['activities'][$activity]}();
+			{
+							$this->{$subActions[$subAction]['activities'][$activity]}();
+			}
 			elseif (is_string($subActions[$subAction]['activities'][$activity]))
-				$subActions[$subAction]['activities'][$activity]();
+			{
+							$subActions[$subAction]['activities'][$activity]();
+			}
 			else
 			{
 				if (is_array($subActions[$subAction]['activities'][$activity]))
@@ -243,9 +249,13 @@ 
 		//  * cannot change the execution time OR
 		//  * cannot reset timeout
 		if ($context['safe_mode_enable'] || empty($new_time_limit) || ($current_time_limit == $new_time_limit && !function_exists('apache_reset_timeout')))
-			$context['suggested_method'] = 'use_external_tool';
+		{
+					$context['suggested_method'] = 'use_external_tool';
+		}
 		elseif ($zip_limit < $plain_limit && $messages < $zip_limit)
-			$context['suggested_method'] = 'zipped_file';
+		{
+					$context['suggested_method'] = 'zipped_file';
+		}
 		elseif ($zip_limit > $plain_limit || ($zip_limit < $plain_limit && $plain_limit < $messages))
 		{
 			$context['suggested_method'] = 'use_external_tool';
@@ -287,7 +297,9 @@ 
 		global $context, $txt, $scripturl;
 
 		if ($this->_req->getQuery('done', 'trim|strval') === 'recount')
-			$context['maintenance_finished'] = $txt['maintain_recount'];
+		{
+					$context['maintenance_finished'] = $txt['maintain_recount'];
+		}
 
 		// set up the sub-template
 		$context['sub_template'] = 'maintain_routine';
@@ -360,9 +372,11 @@ 
 
 		// Show that we completed this action
 		if ($this->_req->getQuery('done', 'strval') === 'recountposts')
-			$context['maintenance_finished'] = array(
+		{
+					$context['maintenance_finished'] = array(
 				'errors' => array(sprintf($txt['maintain_done'], $txt['maintain_recountposts'])),
 			);
+		}
 
 		loadJavascriptFile('suggest.js');
 
@@ -424,13 +438,17 @@ 
 		call_integration_hook('integrate_topics_maintenance', array(&$context['topics_actions']));
 
 		if ($this->_req->getQuery('done', 'strval') === 'purgeold')
-			$context['maintenance_finished'] = array(
+		{
+					$context['maintenance_finished'] = array(
 				'errors' => array(sprintf($txt['maintain_done'], $txt['maintain_old'])),
 			);
+		}
 		elseif ($this->_req->getQuery('done', 'strval') === 'massmove')
-			$context['maintenance_finished'] = array(
+		{
+					$context['maintenance_finished'] = array(
 				'errors' => array(sprintf($txt['maintain_done'], $txt['move_topics_maintenance'])),
 			);
+		}
 
 		// Set up the sub-template
 		$context['sub_template'] = 'maintain_topics';
@@ -519,7 +537,9 @@ 
 		isAllowedTo('admin_forum');
 
 		if (DB_TYPE !== 'MySQL')
-			return;
+		{
+					return;
+		}
 
 		$body_type = '';
 
@@ -543,15 +563,20 @@ 
 
 			// Make it longer so we can do their limit.
 			if ($body_type === 'text')
-				resizeMessageTableBody('mediumtext');
+			{
+							resizeMessageTableBody('mediumtext');
+			}
 			// Shorten the column so we can have a bit (literally per record) less space occupied
-			else
-				resizeMessageTableBody('text');
+			else {
+							resizeMessageTableBody('text');
+			}
 
 			$colData = getMessageTableColumns();
 			foreach ($colData as $column)
-				if ($column['name'] === 'body')
+			{
+							if ($column['name'] === 'body')
 					$body_type = $column['type'];
+			}
 
 			$context['maintenance_finished'] = $txt[$context['convert_to'] . '_title'];
 			$context['convert_to'] = $body_type === 'text' ? 'mediumtext' : 'text';
@@ -564,9 +589,12 @@ 
 			checkSession();
 
 			if (empty($this->_req->query->start))
-				validateToken('admin-maint');
-			else
-				validateToken('admin-convertMsg');
+			{
+							validateToken('admin-maint');
+			}
+			else {
+							validateToken('admin-convertMsg');
+			}
 
 			$context['page_title'] = $txt['not_done_title'];
 			$context['continue_post_data'] = '';
@@ -613,8 +641,9 @@ 
 					$query_msg = array_slice($id_msg_exceeding, 0, 100);
 					$context['exceeding_messages_morethan'] = sprintf($txt['exceeding_messages_morethan'], count($id_msg_exceeding));
 				}
-				else
-					$query_msg = $id_msg_exceeding;
+				else {
+									$query_msg = $id_msg_exceeding;
+				}
 
 				$context['exceeding_messages'] = getExceedingMessages($query_msg);
 			}
@@ -653,7 +682,9 @@ 
 		// If there aren't any tables then I believe that would mean the world has exploded...
 		$context['num_tables'] = count($tables);
 		if ($context['num_tables'] == 0)
-			throw new Elk_Exception('You appear to be running ElkArte in a flat file mode... fantastic!', false);
+		{
+					throw new Elk_Exception('You appear to be running ElkArte in a flat file mode... fantastic!', false);
+		}
 
 		// For each table....
 		$context['optimized_tables'] = array();
@@ -663,10 +694,12 @@ 
 			$data_freed = optimizeTable($table['table_name']);
 
 			if ($data_freed > 0)
-				$context['optimized_tables'][] = array(
+			{
+							$context['optimized_tables'][] = array(
 					'name' => $table['table_name'],
 					'data_freed' => $data_freed,
 				);
+			}
 		}
 
 		// Number of tables, etc....
@@ -709,9 +742,12 @@ 
 
 		// Validate the request or the loop
 		if (!isset($this->_req->query->step))
-			validateToken('admin-maint');
-		else
-			validateToken('admin-boardrecount');
+		{
+					validateToken('admin-maint');
+		}
+		else {
+					validateToken('admin-boardrecount');
+		}
 
 		// For the loop template
 		$context['page_title'] = $txt['not_done_title'];
@@ -757,7 +793,9 @@ 
 		if ($this->step <= 1)
 		{
 			if (empty($this->start))
-				resetBoardsCounter('num_posts');
+			{
+							resetBoardsCounter('num_posts');
+			}
 
 			while ($this->start < $this->max_topics)
 			{
@@ -781,7 +819,9 @@ 
 		if ($this->step <= 2)
 		{
 			if (empty($this->start))
-				resetBoardsCounter('num_topics');
+			{
+							resetBoardsCounter('num_topics');
+			}
 
 			while ($this->start < $this->max_topics)
 			{
@@ -804,7 +844,9 @@ 
 		if ($this->step <= 3)
 		{
 			if (empty($this->start))
-				resetBoardsCounter('unapproved_posts');
+			{
+							resetBoardsCounter('unapproved_posts');
+			}
 
 			while ($this->start < $this->max_topics)
 			{
@@ -827,7 +869,9 @@ 
 		if ($this->step <= 4)
 		{
 			if (empty($this->start))
-				resetBoardsCounter('unapproved_topics');
+			{
+							resetBoardsCounter('unapproved_topics');
+			}
 
 			while ($this->start < $this->max_topics)
 			{
@@ -997,7 +1041,9 @@ 
 
 			// No members, no further
 			if (empty($members))
-				throw new Elk_Exception('reattribute_cannot_find_member');
+			{
+							throw new Elk_Exception('reattribute_cannot_find_member');
+			}
 
 			$memID = array_shift($members);
 			$memID = $memID['id'];
@@ -1017,9 +1063,12 @@ 
 		{
 			// Show them the correct error
 			if ($our_post['type'] === 'name' && empty($our_post['from_name']))
-				$error = $validator->validation_errors(array('from_name', 'to'));
-			else
-				$error = $validator->validation_errors(array('from_email', 'to'));
+			{
+							$error = $validator->validation_errors(array('from_name', 'to'));
+			}
+			else {
+							$error = $validator->validation_errors(array('from_email', 'to'));
+			}
 
 			$context['maintenance_finished'] = array(
 				'errors' => $error,
@@ -1042,13 +1091,17 @@ 
 
 		// Administrators only!
 		if (!allowedTo('admin_forum'))
-			throw new Elk_Exception('no_dump_database', 'critical');
+		{
+					throw new Elk_Exception('no_dump_database', 'critical');
+		}
 
 		checkSession('post');
 
 		// Validate access
 		if (empty($iknowitmaybeunsafe) && !$this->_validate_access())
-			return $this->action_database();
+		{
+					return $this->action_database();
+		}
 		else
 		{
 			require_once(SUBSDIR . '/Admin.subs.php');
@@ -1084,7 +1137,9 @@ 
 		{
 			// I know, I know... but a lot of people want to type /home/xyz/... which is wrong, but logical.
 			if (!$ftp->chdir($this->_req->post->ftp_path))
-				$ftp->chdir(preg_replace('~^/home[2]?/[^/]+?~', '', $this->_req->post->ftp_path));
+			{
+							$ftp->chdir(preg_replace('~^/home[2]?/[^/]+?~', '', $this->_req->post->ftp_path));
+			}
 		}
 
 		// If we had an error...
@@ -1135,7 +1190,9 @@ 
 
 			$groups = array();
 			foreach ($our_post['groups'] as $id => $dummy)
-				$groups[] = (int) $id;
+			{
+							$groups[] = (int) $id;
+			}
 
 			$time_limit = (time() - ($our_post['maxdays'] * 24 * 3600));
 			$members = purgeMembers($our_post['del_type'], $groups, $time_limit);
@@ -1167,14 +1224,19 @@ 
 
 		// No boards at all?  Forget it then :/.
 		if (empty($this->_req->post->boards))
-			redirectexit('action=admin;area=maintain;sa=topics');
+		{
+					redirectexit('action=admin;area=maintain;sa=topics');
+		}
 
 		$boards = array_keys($this->_req->post->boards);
 
 		if (!isset($this->_req->post->delete_type) || !in_array($this->_req->post->delete_type, array('moved', 'nothing', 'locked')))
-			$delete_type = 'nothing';
-		else
-			$delete_type = $this->_req->post->delete_type;
+		{
+					$delete_type = 'nothing';
+		}
+		else {
+					$delete_type = $this->_req->post->delete_type;
+		}
 
 		$exclude_stickies = isset($this->_req->post->delete_old_not_sticky);
 
@@ -1219,7 +1281,9 @@ 
 
 		// No boards then this is your stop.
 		if (empty($id_board_from) || empty($id_board_to))
-			return;
+		{
+					return;
+		}
 
 		// These will be needed
 		require_once(SUBSDIR . '/Maintenance.subs.php');
@@ -1243,7 +1307,9 @@ 
 
 				// Just return if we don't have any topics left to move.
 				if (empty($topics))
-					break;
+				{
+									break;
+				}
 
 				// Lets move them.
 				moveTopics($topics, $id_board_to);
@@ -1333,9 +1399,12 @@ 
 							global $txt;
 
 							if (!empty($data['included_file']))
-								return $txt['hooks_field_function'] . ': ' . $data['real_function'] . '<br />' . $txt['hooks_field_included_file'] . ': ' . $data['included_file'];
-							else
-								return $data['real_function'];
+							{
+															return $txt['hooks_field_function'] . ': ' . $data['real_function'] . '<br />' . $txt['hooks_field_included_file'] . ': ' . $data['included_file'];
+							}
+							else {
+															return $data['real_function'];
+							}
 						},
 					),
 					'sort' => array(
@@ -1492,7 +1561,9 @@ 
 
 		$context['filter'] = false;
 		if (isset($this->_req->query->filter))
-			$context['filter'] = $this->_req->query->filter;
+		{
+					$context['filter'] = $this->_req->query->filter;
+		}
 
 		return integration_hooks_count($context['filter']);
 	}

Spacing +2 added lines, -2 removed lines

@@ -1329,7 +1329,7 @@ 
 						'value' => $txt['hooks_field_function_name'],
 					),
 					'data' => array(
-						'function' => function ($data) {
+						'function' => function($data) {
 							global $txt;
 
 							if (!empty($data['included_file']))
@@ -1361,7 +1361,7 @@ 
 						'class' => 'nowrap',
 					),
 					'data' => array(
-						'function' => function ($data) {
+						'function' => function($data) {
 							return '<i class="icon i-post_moderation_' . $data['status'] . '" title="' . $data['img_text'] . '"></i>';
 						},
 						'class' => 'centertext',

sources/admin/ManageThemes.controller.php

Braces +372 added lines, -138 removed lines

@@ -231,7 +231,9 @@ 
 
 		// Follow the sa or just go to administration.
 		if (isset($this->_req->query->sa) && !empty($subActions[$this->_req->query->sa]))
-			$this->{$subActions[$this->_req->query->sa]}();
+		{
+					$this->{$subActions[$this->_req->query->sa]}();
+		}
 		else
 		{
 			loadLanguage('Errors');
@@ -272,13 +274,18 @@ 
 			if (isset($this->_req->post->options['known_themes']))
 			{
 				foreach ($this->_req->post->options['known_themes'] as $key => $id)
-					$this->_req->post->options['known_themes'][$key] = (int) $id;
+				{
+									$this->_req->post->options['known_themes'][$key] = (int) $id;
+				}
+			}
+			else {
+							throw new Elk_Exception('themes_none_selectable', false);
 			}
-			else
-				throw new Elk_Exception('themes_none_selectable', false);
 
 			if (!in_array($this->_req->post->options['theme_guests'], $this->_req->post->options['known_themes']))
-				throw new Elk_Exception('themes_default_selectable', false);
+			{
+							throw new Elk_Exception('themes_default_selectable', false);
+			}
 
 			// Commit the new settings.
 			updateSettings(array(
@@ -316,7 +323,9 @@ 
 			$theme_dir = BOARDDIR . '/themes/theme';
 			$i = 1;
 			while (file_exists($theme_dir . $i))
-				$i++;
+			{
+							$i++;
+			}
 			$context['new_theme_name'] = 'theme' . $i;
 
 			createToken('admin-tm');
@@ -338,7 +347,9 @@ 
 		loadLanguage('Admin');
 
 		if (isset($this->_req->query->th))
-			return $this->action_setthemesettings();
+		{
+					return $this->action_setthemesettings();
+		}
 
 		// Saving?
 		if (isset($this->_req->post->save))
@@ -369,7 +380,9 @@ 
 			}
 
 			if (!empty($setValues))
-				updateThemeOptions($setValues);
+			{
+							updateThemeOptions($setValues);
+			}
 
 			redirectexit('action=admin;area=theme;sa=list;' . $context['session_var'] . '=' . $context['session_id']);
 		}
@@ -392,7 +405,9 @@ 
 
 				// Can we find a version comment, at all?
 				if (preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $header, $match) == 1)
-					$context['themes'][$i]['version'] = $match[1];
+				{
+									$context['themes'][$i]['version'] = $match[1];
+				}
 			}
 
 			$context['themes'][$i]['valid_path'] = file_exists($context['themes'][$i]['theme_dir']) && is_dir($context['themes'][$i]['theme_dir']);
@@ -430,17 +445,23 @@ 
 			// How many options do we have setup for guests?
 			$guestOptions = countConfiguredGuestOptions();
 			foreach ($guestOptions as $guest_option)
-				$context['themes'][$guest_option['id_theme']]['num_default_options'] = $guest_option['value'];
+			{
+							$context['themes'][$guest_option['id_theme']]['num_default_options'] = $guest_option['value'];
+			}
 
 			// How many options do we have setup for members?
 			$memberOptions = countConfiguredMemberOptions();
 			foreach ($memberOptions as $member_option)
-				$context['themes'][$member_option['id_theme']]['num_members'] = $member_option['value'];
+			{
+							$context['themes'][$member_option['id_theme']]['num_members'] = $member_option['value'];
+			}
 
 			// There has to be a Settings template!
 			foreach ($context['themes'] as $k => $v)
-				if (empty($v['theme_dir']) || (!file_exists($v['theme_dir'] . '/Settings.template.php') && empty($v['num_members'])))
+			{
+							if (empty($v['theme_dir']) || (!file_exists($v['theme_dir'] . '/Settings.template.php') && empty($v['num_members'])))
 					unset($context['themes'][$k]);
+			}
 
 			loadTemplate('ManageThemes');
 			$context['sub_template'] = 'reset_list';
@@ -461,7 +482,9 @@ 
 			// Set up the query values.
 			$setValues = array();
 			foreach ($this->_options as $opt => $val)
-				$setValues[] = array($theme, -1, $opt, is_array($val) ? implode(',', $val) : $val);
+			{
+							$setValues[] = array($theme, -1, $opt, is_array($val) ? implode(',', $val) : $val);
+			}
 
 			$old_settings = array();
 			foreach ($this->_default_options as $opt => $val)
@@ -475,7 +498,9 @@ 
 			{
 				// Are there options in non-default themes set that should be cleared?
 				if (!empty($old_settings))
-					removeThemeOptions('custom', 'guests', $old_settings);
+				{
+									removeThemeOptions('custom', 'guests', $old_settings);
+				}
 
 				updateThemeOptions($setValues);
 			}
@@ -502,7 +527,9 @@ 
 			foreach ($this->_default_options as $opt => $val)
 			{
 				if ($this->_default_options_master[$opt] == 0)
-					continue;
+				{
+									continue;
+				}
 				elseif ($this->_default_options_master[$opt] == 1)
 				{
 					// Delete then insert for ease of database compatibility!
@@ -512,17 +539,23 @@ 
 					$old_settings[] = $opt;
 				}
 				elseif ($this->_default_options_master[$opt] == 2)
-					removeThemeOptions('all', 'members', $opt);
+				{
+									removeThemeOptions('all', 'members', $opt);
+				}
 			}
 
 			// Delete options from other themes.
 			if (!empty($old_settings))
-				removeThemeOptions('custom', 'members', $old_settings);
+			{
+							removeThemeOptions('custom', 'members', $old_settings);
+			}
 
 			foreach ($this->_options as $opt => $val)
 			{
 				if ($this->_options_master[$opt] == 0)
-					continue;
+				{
+									continue;
+				}
 				elseif ($this->_options_master[$opt] == 1)
 				{
 					// Delete then insert for ease of database compatibility - again!
@@ -530,7 +563,9 @@ 
 					addThemeOptions($theme, $opt, $val);
 				}
 				elseif ($this->_options_master[$opt] == 2)
-					removeThemeOptions($theme, 'all', $opt);
+				{
+									removeThemeOptions($theme, 'all', $opt);
+				}
 			}
 
 			redirectexit('action=admin;area=theme;' . $context['session_var'] . '=' . $context['session_id'] . ';sa=reset');
@@ -594,14 +629,22 @@ 
 
 			// Type of field so we display the right input field
 			if (!isset($setting['type']) || $setting['type'] === 'bool')
-				$context['options'][$i]['type'] = 'checkbox';
+			{
+							$context['options'][$i]['type'] = 'checkbox';
+			}
 			elseif ($setting['type'] === 'int' || $setting['type'] === 'integer')
-				$context['options'][$i]['type'] = 'number';
+			{
+							$context['options'][$i]['type'] = 'number';
+			}
 			elseif ($setting['type'] === 'string')
-				$context['options'][$i]['type'] = 'text';
+			{
+							$context['options'][$i]['type'] = 'text';
+			}
 
 			if (isset($setting['options']))
-				$context['options'][$i]['type'] = 'list';
+			{
+							$context['options'][$i]['type'] = 'list';
+			}
 
 			$context['options'][$i]['value'] = !isset($context['theme_options'][$setting['id']]) ? '' : $context['theme_options'][$setting['id']];
 		}
@@ -635,14 +678,18 @@ 
 
 		// Nothing chosen, back to the start you go
 		if (empty($this->_req->query->th) && empty($this->_req->query->id))
-			return $this->action_admin();
+		{
+					return $this->action_admin();
+		}
 
 		// The theme's ID is needed
 		$theme = $this->_req->getQuery('th', 'intval', $this->_req->getQuery('id', 'intval', 0));
 
 		// Validate inputs/user.
 		if (empty($theme))
-			throw new Elk_Exception('no_theme', false);
+		{
+					throw new Elk_Exception('no_theme', false);
+		}
 
 		// Select the best fitting tab.
 		$context[$context['admin_menu_name']]['current_subsection'] = 'list';
@@ -655,7 +702,9 @@ 
 			'' => $txt['smileys_no_default']
 		);
 		foreach ($sets as $i => $set)
-			$context['smiley_sets'][$set] = htmlspecialchars($set_names[$i], ENT_COMPAT, 'UTF-8');
+		{
+					$context['smiley_sets'][$set] = htmlspecialchars($set_names[$i], ENT_COMPAT, 'UTF-8');
+		}
 
 		$old_id = $settings['theme_id'];
 		$old_settings = $settings;
@@ -678,7 +727,9 @@ 
 		{
 			$file_contents = implode("\n", file($settings['theme_dir'] . '/index.template.php'));
 			if (preg_match('~\'theme_variants\'\s*=>(.+?\)),$~sm', $file_contents, $matches))
-				eval('global $settings; $settings[\'theme_variants\'] = ' . $matches[1] . ';');
+			{
+							eval('global $settings; $settings[\'theme_variants\'] = ' . $matches[1] . ';');
+			}
 
 				call_integration_hook('integrate_init_theme', array($theme, &$settings));
 		}
@@ -699,33 +750,47 @@ 
 			{
 				// Unwatch this item if this is just a separator.
 				if (!is_array($item))
-					continue;
+				{
+									continue;
+				}
 
 				// Clean them up for the database
 				foreach (array('options', 'default_options') as $option)
 				{
 					if (!isset($options[$option][$item['id']]))
-						continue;
+					{
+											continue;
+					}
 					// Checkbox.
 					elseif (empty($item['type']))
-						$options[$option][$item['id']] = $options[$option][$item['id']] ? 1 : 0;
+					{
+											$options[$option][$item['id']] = $options[$option][$item['id']] ? 1 : 0;
+					}
 					// Number
 					elseif ($item['type'] === 'number')
-						$options[$option][$item['id']] = (int) $options[$option][$item['id']];
+					{
+											$options[$option][$item['id']] = (int) $options[$option][$item['id']];
+					}
 				}
 			}
 
 			// Set up the sql query.
 			$inserts = array();
 			foreach ($options['options'] as $opt => $val)
-				$inserts[] = array($theme, 0, $opt, is_array($val) ? implode(',', $val) : $val);
+			{
+							$inserts[] = array($theme, 0, $opt, is_array($val) ? implode(',', $val) : $val);
+			}
 
 			foreach ($options['default_options'] as $opt => $val)
-				$inserts[] = array(1, 0, $opt, is_array($val) ? implode(',', $val) : $val);
+			{
+							$inserts[] = array(1, 0, $opt, is_array($val) ? implode(',', $val) : $val);
+			}
 
 			// If we're actually inserting something..
 			if (!empty($inserts))
-				updateThemeOptions($inserts);
+			{
+							updateThemeOptions($inserts);
+			}
 
 			// Clear and Invalidate the cache.
 			Cache::instance()->remove('theme_settings-' . $theme);
@@ -741,7 +806,9 @@ 
 		foreach ($settings as $setting => $dummy)
 		{
 			if (!in_array($setting, array('theme_url', 'theme_dir', 'images_url', 'template_dirs')))
-				$settings[$setting] = htmlspecialchars__recursive($settings[$setting]);
+			{
+							$settings[$setting] = htmlspecialchars__recursive($settings[$setting]);
+			}
 		}
 
 		$context['settings'] = $context['theme_settings'];
@@ -751,18 +818,28 @@ 
 		{
 			// Separators are dummies, so leave them alone.
 			if (!is_array($setting))
-				continue;
+			{
+							continue;
+			}
 
 			// Create the right input fields for the data
 			if (!isset($setting['type']) || $setting['type'] === 'bool')
-				$context['settings'][$i]['type'] = 'checkbox';
+			{
+							$context['settings'][$i]['type'] = 'checkbox';
+			}
 			elseif ($setting['type'] === 'int' || $setting['type'] === 'integer')
-				$context['settings'][$i]['type'] = 'number';
+			{
+							$context['settings'][$i]['type'] = 'number';
+			}
 			elseif ($setting['type'] === 'string')
-				$context['settings'][$i]['type'] = 'text';
+			{
+							$context['settings'][$i]['type'] = 'text';
+			}
 
 			if (isset($setting['options']))
-				$context['settings'][$i]['type'] = 'list';
+			{
+							$context['settings'][$i]['type'] = 'list';
+			}
 
 			$context['settings'][$i]['value'] = !isset($settings[$setting['id']]) ? '' : $settings[$setting['id']];
 		}
@@ -789,7 +866,9 @@ 
 
 		// Reinit just incase.
 		if (function_exists('template_init'))
-			$settings += template_init();
+		{
+					$settings += template_init();
+		}
 
 		loadTemplate('ManageThemes');
 
@@ -820,14 +899,18 @@ 
 
 		// You can't delete the default theme!
 		if ($theme == 1)
-			throw new Elk_Exception('no_access', false);
+		{
+					throw new Elk_Exception('no_access', false);
+		}
 
 		// Its no longer known
 		$known = explode(',', $modSettings['knownThemes']);
 		for ($i = 0, $n = count($known); $i < $n; $i++)
 		{
 			if ($known[$i] == $theme)
-				unset($known[$i]);
+			{
+							unset($known[$i]);
+			}
 		}
 		$known = strtr(implode(',', $known), array(',,' => ','));
 
@@ -836,9 +919,12 @@ 
 
 		// Fix it if the theme was the overall default theme.
 		if ($modSettings['theme_guests'] == $theme)
-			updateSettings(array('theme_guests' => '1', 'knownThemes' => $known));
-		else
-			updateSettings(array('knownThemes' => $known));
+		{
+					updateSettings(array('theme_guests' => '1', 'knownThemes' => $known));
+		}
+		else {
+					updateSettings(array('knownThemes' => $known));
+		}
 
 		redirectexit('action=admin;area=theme;sa=list;' . $context['session_var'] . '=' . $context['session_id']);
 	}
@@ -912,7 +998,9 @@ 
 		for ($i = 0, $n = count($known); $i < $n; $i++)
 		{
 			if ($known[$i] == $theme)
-				unset($known[$i]);
+			{
+							unset($known[$i]);
+			}
 		}
 
 		// Finally, remove it
@@ -922,9 +1010,12 @@ 
 
 		// Fix it if the theme was the overall default theme.
 		if ($modSettings['theme_guests'] == $theme)
-			updateSettings(array('theme_guests' => '1', 'knownThemes' => $known));
-		else
-			updateSettings(array('knownThemes' => $known));
+		{
+					updateSettings(array('theme_guests' => '1', 'knownThemes' => $known));
+		}
+		else {
+					updateSettings(array('knownThemes' => $known));
+		}
 
 		// Let them know it worked, all without a page refresh
 		createToken('admin-tr', 'request');
@@ -957,7 +1048,9 @@ 
 		require_once(SUBSDIR . '/Themes.subs.php');
 
 		if (!$modSettings['theme_allow'] && $settings['disable_user_variant'] && !allowedTo('admin_forum'))
-			throw new Elk_Exception('no_access', false);
+		{
+					throw new Elk_Exception('no_access', false);
+		}
 
 		loadLanguage('Profile');
 		loadTemplate('ManageThemes');
@@ -972,17 +1065,23 @@ 
 		$_SESSION['id_theme'] = 0;
 
 		if (isset($this->_req->query->id))
-			$this->_req->query->th = $this->_req->query->id;
+		{
+					$this->_req->query->th = $this->_req->query->id;
+		}
 
 		// Saving a variant cause JS doesn't work - pretend it did ;)
 		if (isset($this->_req->post->save))
 		{
 			// Which theme?
 			foreach ($this->_req->post->save as $k => $v)
-				$this->_req->query->th = (int) $k;
+			{
+							$this->_req->query->th = (int) $k;
+			}
 
 			if (isset($this->_req->post->vrt[$k]))
-				$this->_req->query->vrt = $this->_req->post->vrt[$k];
+			{
+							$this->_req->query->vrt = $this->_req->post->vrt[$k];
+			}
 		}
 
 		// Have we made a decision, or are we just browsing?
@@ -1030,7 +1129,9 @@ 
 
 				// Remove any custom variants.
 				if (!empty($vrt))
-					deleteVariants($th);
+				{
+									deleteVariants($th);
+				}
 
 				redirectexit('action=admin;area=theme;sa=admin;' . $context['session_var'] . '=' . $context['session_id']);
 			}
@@ -1046,7 +1147,9 @@ 
 			{
 				// The forum's default theme is always 0 and we
 				if (isset($th) && $th == 0)
-					$th = $modSettings['theme_guests'];
+				{
+									$th = $modSettings['theme_guests'];
+				}
 
 				require_once(SUBSDIR . '/Members.subs.php');
 				updateMemberData($u, array('id_theme' => $th));
@@ -1057,7 +1160,9 @@ 
 					Cache::instance()->remove('theme_settings-' . $th . ':' . $u);
 
 					if ($user_info['id'] == $u)
-						$_SESSION['id_variant'] = 0;
+					{
+											$_SESSION['id_variant'] = 0;
+					}
 				}
 
 				redirectexit('action=profile;u=' . $u . ';area=theme');
@@ -1102,7 +1207,9 @@ 
 		if (!isset($u) || $u >= 0)
 		{
 			if ($guest_theme != 0)
-				$context['available_themes'][0] = $context['available_themes'][$guest_theme];
+			{
+							$context['available_themes'][0] = $context['available_themes'][$guest_theme];
+			}
 
 			$context['available_themes'][0]['id'] = 0;
 			$context['available_themes'][0]['name'] = $txt['theme_forum_default'];
@@ -1156,23 +1263,35 @@ 
 
 		// How are we going to install this theme, from a dir, zip, copy of default?
 		if ((!empty($_FILES['theme_gz']) && (!isset($_FILES['theme_gz']['error']) || $_FILES['theme_gz']['error'] != 4)) || !empty($this->_req->query->theme_gz))
-			$method = 'upload';
+		{
+					$method = 'upload';
+		}
 		elseif (isset($this->_req->post->theme_dir) && rtrim(realpath($this->_req->post->theme_dir), '/\\') != realpath(BOARDDIR . '/themes') && file_exists($this->_req->post->theme_dir))
-			$method = 'path';
-		else
-			$method = 'copy';
+		{
+					$method = 'path';
+		}
+		else {
+					$method = 'copy';
+		}
 
 		// Copy the default theme?
 		if (!empty($this->_req->post->copy) && $method === 'copy')
-			$this->copyDefault();
+		{
+					$this->copyDefault();
+		}
 		// Install from another directory
 		elseif (isset($this->_req->post->theme_dir) && $method === 'path')
-			$this->installFromDir();
+		{
+					$this->installFromDir();
+		}
 		// Uploaded a zip file to install from
 		elseif ($method === 'upload')
-			$this->installFromZip();
-		else
-			throw new Elk_Exception('theme_install_general', false);
+		{
+					$this->installFromZip();
+		}
+		else {
+					throw new Elk_Exception('theme_install_general', false);
+		}
 
 		// Something go wrong?
 		if ($this->theme_dir != '' && basename($this->theme_dir) !== 'themes')
@@ -1195,7 +1314,9 @@ 
 
 				// @todo Error message of some sort?
 				if (!$theme_info_xml->exists('theme-info[0]'))
-					return 'package_get_error_packageinfo_corrupt';
+				{
+									return 'package_get_error_packageinfo_corrupt';
+				}
 
 				$theme_info_xml = $theme_info_xml->path('theme-info[0]');
 				$theme_info_xml = $theme_info_xml->to_array();
@@ -1209,7 +1330,9 @@ 
 				foreach ($xml_elements as $var => $name)
 				{
 					if (!empty($theme_info_xml[$name]))
-						$install_info[$var] = $theme_info_xml[$name];
+					{
+											$install_info[$var] = $theme_info_xml[$name];
+					}
 				}
 
 				if (!empty($theme_info_xml['images']))
@@ -1219,7 +1342,9 @@ 
 				}
 
 				if (!empty($theme_info_xml['extra']))
-					$install_info += Util::unserialize($theme_info_xml['extra']);
+				{
+									$install_info += Util::unserialize($theme_info_xml['extra']);
+				}
 			}
 
 			if (isset($install_info['based_on']))
@@ -1241,7 +1366,9 @@ 
 						$install_info = $temp + $install_info;
 
 						if (empty($explicit_images) && !empty($install_info['base_theme_url']))
-							$install_info['theme_url'] = $install_info['base_theme_url'];
+						{
+													$install_info['theme_url'] = $install_info['base_theme_url'];
+						}
 					}
 				}
 
@@ -1253,10 +1380,14 @@ 
 
 			$inserts = array();
 			foreach ($install_info as $var => $val)
-				$inserts[] = array($id_theme, $var, $val);
+			{
+							$inserts[] = array($id_theme, $var, $val);
+			}
 
 			if (!empty($inserts))
-				addTheme($inserts);
+			{
+							addTheme($inserts);
+			}
 
 			updateSettings(array('knownThemes' => strtr($modSettings['knownThemes'] . ',' . $id_theme, array(',,' => ','))));
 
@@ -1273,11 +1404,15 @@ 
 	{
 		// Hopefully the themes directory is writable, or we might have a problem.
 		if (!is_writable(BOARDDIR . '/themes'))
-			throw new Elk_Exception('theme_install_write_error', 'critical');
+		{
+					throw new Elk_Exception('theme_install_write_error', 'critical');
+		}
 
 		// This happens when the admin session is gone and the user has to login again
 		if (empty($_FILES['theme_gz']) && empty($this->_req->post->theme_gz))
-			return;
+		{
+					return;
+		}
 
 		// Set the default settings...
 		$this->theme_name = strtok(basename(isset($_FILES['theme_gz']) ? $_FILES['theme_gz']['name'] : $this->_req->post->theme_gz), '.');
@@ -1285,11 +1420,15 @@ 
 		$this->theme_dir = BOARDDIR . '/themes/' . $this->theme_name;
 
 		if (isset($_FILES['theme_gz']) && is_uploaded_file($_FILES['theme_gz']['tmp_name']) && (ini_get('open_basedir') != '' || file_exists($_FILES['theme_gz']['tmp_name'])))
-			read_tgz_file($_FILES['theme_gz']['tmp_name'], BOARDDIR . '/themes/' . $this->theme_name, false, true);
+		{
+					read_tgz_file($_FILES['theme_gz']['tmp_name'], BOARDDIR . '/themes/' . $this->theme_name, false, true);
+		}
 		elseif (isset($this->_req->post->theme_gz))
 		{
 			if (!isAuthorizedServer($this->_req->post->theme_gz))
-				throw new Elk_Exception('not_valid_server');
+			{
+							throw new Elk_Exception('not_valid_server');
+			}
 
 			read_tgz_file($this->_req->post->theme_gz, BOARDDIR . '/themes/' . $this->theme_name, false, true);
 		}
@@ -1303,7 +1442,9 @@ 
 	public function installFromDir()
 	{
 		if (!is_dir($this->_req->post->theme_dir) || !file_exists($this->_req->post->theme_dir . '/theme_info.xml'))
-			throw new Elk_Exception('theme_install_error', false);
+		{
+					throw new Elk_Exception('theme_install_error', false);
+		}
 
 		$this->theme_name = basename($this->_req->post->theme_dir);
 		$this->theme_dir = $this->_req->post->theme_dir;
@@ -1318,7 +1459,9 @@ 
 
 		// Hopefully the themes directory is writable, or we might have a problem.
 		if (!is_writable(BOARDDIR . '/themes'))
-			throw new Elk_Exception('theme_install_write_error', 'critical');
+		{
+					throw new Elk_Exception('theme_install_write_error', 'critical');
+		}
 
 		// Make the new directory, standard characters only
 		$this->theme_dir = BOARDDIR . '/themes/' . preg_replace('~[^A-Za-z0-9_\- ]~', '', $this->_req->post->copy);
@@ -1380,11 +1523,15 @@ 
 
 		// This good-for-nothing pixel is being used to keep the session alive.
 		if (empty($this->_req->query->var) || !isset($this->_req->query->val))
-			redirectexit($settings['images_url'] . '/blank.png');
+		{
+					redirectexit($settings['images_url'] . '/blank.png');
+		}
 
 		// Sorry, guests can't go any further than this..
 		if ($user_info['is_guest'] || $user_info['id'] == 0)
-			obExit(false);
+		{
+					obExit(false);
+		}
 
 		$reservedVars = array(
 			'actual_theme_url',
@@ -1408,7 +1555,9 @@ 
 
 		// Can't change reserved vars.
 		if (in_array(strtolower($this->_req->query->var), $reservedVars))
-			redirectexit($settings['images_url'] . '/blank.png');
+		{
+					redirectexit($settings['images_url'] . '/blank.png');
+		}
 
 		// Use a specific theme?
 		if (isset($this->_req->query->th) || isset($this->_req->query->id))
@@ -1439,7 +1588,9 @@ 
 
 			// New thingy...
 			if (isset($this->_req->query->admin_key) && strlen($this->_req->query->admin_key) < 5)
-				$options['admin_preferences'][$this->_req->query->admin_key] = $this->_req->query->val;
+			{
+							$options['admin_preferences'][$this->_req->query->admin_key] = $this->_req->query->val;
+			}
 
 			// Change the value to be something nice,
 			$this->_req->query->val = json_encode($options['admin_preferences']);
@@ -1464,7 +1615,9 @@ 
 
 			// New value for them
 			if (isset($this->_req->query->minmax_key) && strlen($this->_req->query->minmax_key) < 10)
-				$minmax_preferences[$this->_req->query->minmax_key] = $this->_req->query->val;
+			{
+							$minmax_preferences[$this->_req->query->minmax_key] = $this->_req->query->val;
+			}
 
 			// Change the value to be something nice,
 			$this->_req->query->val = json_encode($minmax_preferences);
@@ -1506,10 +1659,14 @@ 
 
 		// Unfortunately we cannot edit an unknown theme.. redirect.
 		if (empty($selectedTheme))
-			redirectexit('action=admin;area=theme;sa=themelist');
+		{
+					redirectexit('action=admin;area=theme;sa=themelist');
+		}
 		// You're browsing around, aren't you
 		elseif (!isset($this->_req->query->filename) && !isset($this->_req->post->save))
-			redirectexit('action=admin;area=theme;sa=browse;th=' . $selectedTheme);
+		{
+					redirectexit('action=admin;area=theme;sa=browse;th=' . $selectedTheme);
+		}
 
 		// We don't have errors. Yet.
 		$context['session_error'] = false;
@@ -1534,11 +1691,16 @@ 
 		// Note: we're here sending $theme_dir as parameter to action_()
 		// controller functions, which isn't cool. To be refactored.
 		if (substr($this->_req->query->filename, -4) === '.css')
-			$this->_action_edit_style();
+		{
+					$this->_action_edit_style();
+		}
 		elseif (substr($this->_req->query->filename, -13) === '.template.php')
-			$this->_action_edit_template();
-		else
-			$this->_action_edit_file();
+		{
+					$this->_action_edit_template();
+		}
+		else {
+					$this->_action_edit_file();
+		}
 
 		// Create a special token to allow editing of multiple files.
 		createToken('admin-te-' . md5($selectedTheme . '-' . $this->_req->query->filename));
@@ -1595,7 +1757,9 @@ 
 				$context['file_parts'][$j]['data'] = trim($context['file_parts'][$j]['data']);
 
 				if (empty($context['file_parts'][$j]['lines']))
-					unset($context['file_parts'][$j]);
+				{
+									unset($context['file_parts'][$j]);
+				}
 
 				// Start a new function block
 				$context['file_parts'][++$j] = array('lines' => 0, 'line' => $i, 'data' => '');
@@ -1663,9 +1827,12 @@ 
 		{
 			// Consolidate the format in which we received the file contents
 			if (is_array($file))
-				$entire_file = implode("\n", $file);
-			else
-				$entire_file = $file;
+			{
+							$entire_file = implode("\n", $file);
+			}
+			else {
+							$entire_file = $file;
+			}
 
 			// Convert our tabs back to tabs!
 			$entire_file = rtrim(strtr($entire_file, array("\r" => '', '   ' => "\t")));
@@ -1717,7 +1884,9 @@ 
 				fclose($fp);
 
 				if ($this->_checkOpcache())
-					opcache_invalidate($theme_dir . '/' . $_REQUEST['filename']);
+				{
+									opcache_invalidate($theme_dir . '/' . $_REQUEST['filename']);
+				}
 
 				// We're done here.
 				redirectexit('action=admin;area=theme;th=' . $selectedTheme . ';' . $context['session_var'] . '=' . $context['session_id'] . ';sa=browse;directory=' . dirname($this->_req->post->filename));
@@ -1727,17 +1896,24 @@ 
 			{
 				// Pick the right sub-template for the next try
 				if ($is_template)
-					$context['sub_template'] = 'edit_template';
-				else
-					$context['sub_template'] = 'edit_file';
+				{
+									$context['sub_template'] = 'edit_template';
+				}
+				else {
+									$context['sub_template'] = 'edit_file';
+				}
 
 				// Fill contextual data for the template, the errors to show
 				foreach ($errors as $error)
-					$context['parse_error'][] = $error;
+				{
+									$context['parse_error'][] = $error;
+				}
 
 				// The format of the data depends on template/non-template file.
 				if (!is_array($file))
-					$file = array($file);
+				{
+									$file = array($file);
+				}
 
 				// Send back the file contents
 				$context['entire_file'] = htmlspecialchars(strtr(implode('', $file), array("\t" => '   ')), ENT_COMPAT, 'UTF-8');
@@ -1764,15 +1940,20 @@ 
 
 			// Recycle the submitted data.
 			if (is_array($file))
-				$context['entire_file'] = htmlspecialchars(implode("\n", $file), ENT_COMPAT, 'UTF-8');
-			else
-				$context['entire_file'] = htmlspecialchars($file, ENT_COMPAT, 'UTF-8');
+			{
+							$context['entire_file'] = htmlspecialchars(implode("\n", $file), ENT_COMPAT, 'UTF-8');
+			}
+			else {
+							$context['entire_file'] = htmlspecialchars($file, ENT_COMPAT, 'UTF-8');
+			}
 
 			$context['edit_filename'] = htmlspecialchars($this->_req->post->filename, ENT_COMPAT, 'UTF-8');
 
 			// Choose sub-template
 			if ($is_template)
-				$context['sub_template'] = 'edit_template';
+			{
+							$context['sub_template'] = 'edit_template';
+			}
 			elseif ($is_css)
 			{
 				addJavascriptVar(array(
@@ -1784,8 +1965,9 @@ 
 				));
 				$context['sub_template'] = 'edit_style';
 			}
-			else
-				$context['sub_template'] = 'edit_file';
+			else {
+							$context['sub_template'] = 'edit_file';
+			}
 
 			// Re-create the token so that it can be used
 			createToken('admin-te-' . md5($selectedTheme . '-' . $this->_req->post->filename));
@@ -1824,7 +2006,9 @@ 
 
 		$selectedTheme = $this->_req->getQuery('th', 'intval', $this->_req->getQuery('id', 'intval', 0));
 		if (empty($selectedTheme))
-			redirectexit('action=admin;area=theme;sa=themelist');
+		{
+					redirectexit('action=admin;area=theme;sa=themelist');
+		}
 
 		// Get first the directory of the theme we are editing.
 		$context['theme_id'] = isset($this->_req->query->th) ? (int) $this->_req->query->th : (isset($this->_req->query->id) ? (int) $this->_req->query->id : 0);
@@ -1832,20 +2016,26 @@ 
 
 		// Eh? not trying to sneak a peek outside the theme directory are we
 		if (!file_exists($theme_dir . '/index.template.php') && !file_exists($theme_dir . '/css/index.css'))
-			throw new Elk_Exception('theme_edit_missing', false);
+		{
+					throw new Elk_Exception('theme_edit_missing', false);
+		}
 
 		// Now, where exactly are you?
 		if (isset($this->_req->query->directory))
 		{
 			if (substr($this->_req->query->directory, 0, 1) === '.')
-				$this->_req->query->directory = '';
+			{
+							$this->_req->query->directory = '';
+			}
 			else
 			{
 				$this->_req->query->directory = preg_replace(array('~^[\./\\:\0\n\r]+~', '~[\\\\]~', '~/[\./]+~'), array('', '/', '/'), $this->_req->query->directory);
 
 				$temp = realpath($theme_dir . '/' . $this->_req->query->directory);
 				if (empty($temp) || substr($temp, 0, strlen(realpath($theme_dir))) != realpath($theme_dir))
-					$this->_req->query->directory = '';
+				{
+									$this->_req->query->directory = '';
+				}
 			}
 		}
 
@@ -1865,8 +2055,9 @@ 
 				'size' => '',
 			));
 		}
-		else
-			$context['theme_files'] = get_file_listing($theme_dir, '');
+		else {
+					$context['theme_files'] = get_file_listing($theme_dir, '');
+		}
 
 		// finally, load the sub-template
 		$context['sub_template'] = 'browse';
@@ -1891,19 +2082,26 @@ 
 		{
 			// There has to be a Settings template!
 			if (!file_exists($theme['theme_dir'] . '/index.template.php') && !file_exists($theme['theme_dir'] . '/css/index.css'))
-				unset($context['themes'][$key]);
+			{
+							unset($context['themes'][$key]);
+			}
 			else
 			{
 				if (!isset($theme['theme_templates']))
-					$templates = array('index');
-				else
-					$templates = explode(',', $theme['theme_templates']);
+				{
+									$templates = array('index');
+				}
+				else {
+									$templates = explode(',', $theme['theme_templates']);
+				}
 
 				foreach ($templates as $template)
-					if (file_exists($theme['theme_dir'] . '/' . $template . '.template.php'))
+				{
+									if (file_exists($theme['theme_dir'] . '/' . $template . '.template.php'))
 					{
 						// Fetch the header... a good 256 bytes should be more than enough.
 						$fp = fopen($theme['theme_dir'] . '/' . $template . '.template.php', 'rb');
+				}
 						$header = fread($fp, 256);
 						fclose($fp);
 
@@ -1912,7 +2110,9 @@ 
 						{
 							$ver = $match[1];
 							if (!isset($context['themes'][$key]['version']) || $context['themes'][$key]['version'] > $ver)
-								$context['themes'][$key]['version'] = $ver;
+							{
+															$context['themes'][$key]['version'] = $ver;
+							}
 						}
 					}
 
@@ -1945,36 +2145,50 @@ 
 		if (isset($this->_req->query->template) && preg_match('~[\./\\\\:\0]~', $this->_req->query->template) == 0)
 		{
 			if (!empty($theme_dirs['base_theme_dir']) && file_exists($theme_dirs['base_theme_dir'] . '/' . $this->_req->query->template . '.template.php'))
-				$filename = $theme_dirs['base_theme_dir'] . '/' . $this->_req->query->template . '.template.php';
+			{
+							$filename = $theme_dirs['base_theme_dir'] . '/' . $this->_req->query->template . '.template.php';
+			}
 			elseif (file_exists($settings['default_theme_dir'] . '/' . $this->_req->query->template . '.template.php'))
-				$filename = $settings['default_theme_dir'] . '/' . $this->_req->query->template . '.template.php';
-			else
-				throw new Elk_Exception('no_access', false);
+			{
+							$filename = $settings['default_theme_dir'] . '/' . $this->_req->query->template . '.template.php';
+			}
+			else {
+							throw new Elk_Exception('no_access', false);
+			}
 
 			$fp = fopen($theme_dirs['theme_dir'] . '/' . $this->_req->query->template . '.template.php', 'w');
 			fwrite($fp, file_get_contents($filename));
 			fclose($fp);
 
 			if ($this->_checkOpcache())
-				opcache_invalidate($filename);
+			{
+							opcache_invalidate($filename);
+			}
 
 			redirectexit('action=admin;area=theme;th=' . $context['theme_id'] . ';' . $context['session_var'] . '=' . $context['session_id'] . ';sa=copy');
 		}
 		elseif (isset($this->_req->query->lang_file) && preg_match('~^[^\./\\\\:\0]\.[^\./\\\\:\0]$~', $this->_req->query->lang_file) != 0)
 		{
 			if (!empty($theme_dirs['base_theme_dir']) && file_exists($theme_dirs['base_theme_dir'] . '/languages/' . $this->_req->query->lang_file . '.php'))
-				$filename = $theme_dirs['base_theme_dir'] . '/languages/' . $this->_req->query->template . '.php';
+			{
+							$filename = $theme_dirs['base_theme_dir'] . '/languages/' . $this->_req->query->template . '.php';
+			}
 			elseif (file_exists($settings['default_theme_dir'] . '/languages/' . $this->_req->query->template . '.php'))
-				$filename = $settings['default_theme_dir'] . '/languages/' . $this->_req->query->template . '.php';
-			else
-				throw new Elk_Exception('no_access', false);
+			{
+							$filename = $settings['default_theme_dir'] . '/languages/' . $this->_req->query->template . '.php';
+			}
+			else {
+							throw new Elk_Exception('no_access', false);
+			}
 
 			$fp = fopen($theme_dirs['theme_dir'] . '/languages/' . $this->_req->query->lang_file . '.php', 'w');
 			fwrite($fp, file_get_contents($filename));
 			fclose($fp);
 
 			if ($this->_checkOpcache())
-				opcache_invalidate($filename);
+			{
+							opcache_invalidate($filename);
+			}
 
 			redirectexit('action=admin;area=theme;th=' . $context['theme_id'] . ';' . $context['session_var'] . '=' . $context['session_id'] . ';sa=copy');
 		}
@@ -1986,7 +2200,9 @@ 
 		while ($entry = $dir->read())
 		{
 			if (substr($entry, -13) === '.template.php')
-				$templates[] = substr($entry, 0, -13);
+			{
+							$templates[] = substr($entry, 0, -13);
+			}
 		}
 		$dir->close();
 
@@ -1994,7 +2210,9 @@ 
 		while ($entry = $dir->read())
 		{
 			if (preg_match('~^([^\.]+\.[^\.]+)\.php$~', $entry, $matches))
-				$lang_files[] = $matches[1];
+			{
+							$lang_files[] = $matches[1];
+			}
 		}
 		$dir->close();
 
@@ -2004,7 +2222,9 @@ 
 			while ($entry = $dir->read())
 			{
 				if (substr($entry, -13) === '.template.php' && !in_array(substr($entry, 0, -13), $templates))
-					$templates[] = substr($entry, 0, -13);
+				{
+									$templates[] = substr($entry, 0, -13);
+				}
 			}
 			$dir->close();
 
@@ -2014,7 +2234,9 @@ 
 				while ($entry = $dir->read())
 				{
 					if (preg_match('~^([^\.]+\.[^\.]+)\.php$~', $entry, $matches) && !in_array($matches[1], $lang_files))
-						$lang_files[] = $matches[1];
+					{
+											$lang_files[] = $matches[1];
+					}
 				}
 				$dir->close();
 			}
@@ -2025,20 +2247,24 @@ 
 
 		$context['available_templates'] = array();
 		foreach ($templates as $template)
-			$context['available_templates'][$template] = array(
+		{
+					$context['available_templates'][$template] = array(
 				'filename' => $template . '.template.php',
 				'value' => $template,
 				'already_exists' => false,
 				'can_copy' => is_writable($theme_dirs['theme_dir']),
 			);
+		}
 		$context['available_language_files'] = array();
 		foreach ($lang_files as $file)
-			$context['available_language_files'][$file] = array(
+		{
+					$context['available_language_files'][$file] = array(
 				'filename' => $file . '.php',
 				'value' => $file,
 				'already_exists' => false,
 				'can_copy' => file_exists($theme_dirs['theme_dir'] . '/languages') ? is_writable($theme_dirs['theme_dir'] . '/languages') : is_writable($theme_dirs['theme_dir']),
 			);
+		}
 
 		$dir = dir($theme_dirs['theme_dir']);
 		while ($entry = $dir->read())
@@ -2078,26 +2304,34 @@ 
 
 		// Eh? not trying to sneak a peek outside the theme directory are we
 		if (!file_exists($this->theme_dir . '/index.template.php') && !file_exists($this->theme_dir . '/css/index.css'))
-			throw new Elk_Exception('theme_edit_missing', false);
+		{
+					throw new Elk_Exception('theme_edit_missing', false);
+		}
 
 		// Get the filename from the appropriate spot
 		$filename = isset($this->_req->post->save) ? $this->_req->getPost('filename', 'strval', '') : $this->_req->getQuery('filename', 'strval', '');
 
 		// You're editing a file: we have extra-checks coming up first.
 		if (substr($filename, 0, 1) === '.')
-			$filename = '';
+		{
+					$filename = '';
+		}
 		else
 		{
 			$filename = preg_replace(array('~^[\./\\:\0\n\r]+~', '~[\\\\]~', '~/[\./]+~'), array('', '/', '/'), $filename);
 
 			$temp = realpath($this->theme_dir . '/' . $filename);
 			if (empty($temp) || substr($temp, 0, strlen(realpath($this->theme_dir))) !== realpath($this->theme_dir))
-				$filename = '';
+			{
+							$filename = '';
+			}
 		}
 
 		// We shouldn't end up with no file
 		if (empty($filename))
-			throw new Elk_Exception('theme_edit_missing', false);
+		{
+					throw new Elk_Exception('theme_edit_missing', false);
+		}
 
 		// Initialize context
 		$context['allow_save'] = is_writable($this->theme_dir . '/' . $filename);

Spacing +2 added lines, -2 removed lines

@@ -1424,7 +1424,7 @@ 
 		{
 			if (!empty($options['admin_preferences']))
 			{
-				$options['admin_preferences'] = serializeToJson($options['admin_preferences'], function ($array_form) {
+				$options['admin_preferences'] = serializeToJson($options['admin_preferences'], function($array_form) {
 					global $context;
 
 					$context['admin_preferences'] = $array_form;
@@ -1449,7 +1449,7 @@ 
 		{
 			if (!empty($options['minmax_preferences']))
 			{
-				$minmax_preferences = serializeToJson($options['minmax_preferences'], function ($array_form) {
+				$minmax_preferences = serializeToJson($options['minmax_preferences'], function($array_form) {
 					global $settings, $user_info;
 
 					// Update the option.

sources/admin/ManageLanguages.controller.php

Braces +129 added lines, -48 removed lines

@@ -190,9 +190,12 @@ 
 			'data_check' => array(
 				'class' => function ($rowData) {
 					if ($rowData['default'])
-						return 'highlight2';
-					else
-						return '';
+					{
+											return 'highlight2';
+					}
+					else {
+											return '';
+					}
 				},
 			),
 			'get_items' => array(
@@ -266,11 +269,13 @@ 
 
 		// Display a warning if we cannot edit the default setting.
 		if (!is_writable(BOARDDIR . '/Settings.php'))
-			$listOptions['additional_rows'][] = array(
+		{
+					$listOptions['additional_rows'][] = array(
 				'position' => 'after_title',
 				'value' => $txt['language_settings_writable'],
 				'class' => 'smalltext alert',
 			);
+		}
 
 		createList($listOptions);
 
@@ -301,7 +306,9 @@ 
 
 		// Clearly we need to know what to request.
 		if (!isset($this->_req->query->did))
-			throw new Elk_Exception('no_access', false);
+		{
+					throw new Elk_Exception('no_access', false);
+		}
 
 		// Some lovely context.
 		$context['download_id'] = $this->_req->query->did;
@@ -322,7 +329,9 @@ 
 			{
 				// Check it's not very bad.
 				if (strpos($file, '..') !== false || (strpos($file, 'themes') !== 0 && !preg_match('~agreement\.[A-Za-z-_0-9]+\.txt$~', $file)))
-					throw new Elk_Exception($txt['languages_download_illegal_paths']);
+				{
+									throw new Elk_Exception($txt['languages_download_illegal_paths']);
+				}
 
 				$chmod_files[] = BOARDDIR . '/' . $file;
 				$install_files[] = $file;
@@ -334,7 +343,9 @@ 
 
 			// Something not writable?
 			if (!empty($files_left))
-				$context['error_message'] = $txt['languages_download_not_chmod'];
+			{
+							$context['error_message'] = $txt['languages_download_not_chmod'];
+			}
 			// Otherwise, go go go!
 			elseif (!empty($install_files))
 			{
@@ -353,7 +364,9 @@ 
 		$archive_content = read_tgz_file('http://download.elkarte.net/fetch_language.php?version=' . urlencode(strtr(FORUM_VERSION, array('ElkArte ' => ''))) . ';fetch=' . urlencode($this->_req->query->did), null);
 
 		if (empty($archive_content))
-			throw new Elk_Exception($txt['add_language_error_no_response']);
+		{
+					throw new Elk_Exception($txt['add_language_error_no_response']);
+		}
 
 		// Now for each of the files, let's do some *stuff*
 		$context['files'] = array(
@@ -369,7 +382,9 @@ 
 
 			// Don't do anything with files we don't understand.
 			if (!in_array($extension, array('php', 'jpg', 'gif', 'jpeg', 'png', 'txt')))
-				continue;
+			{
+							continue;
+			}
 
 			// Basic data.
 			$context_data = array(
@@ -389,7 +404,9 @@ 
 			if (file_exists(BOARDDIR . '/' . $file['filename']))
 			{
 				if (is_writable(BOARDDIR . '/' . $file['filename']))
-					$context_data['writable'] = true;
+				{
+									$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']))
@@ -403,15 +420,18 @@ 
 					$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;
+				{
+									$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...
@@ -427,7 +447,9 @@ 
 
 				// 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];
+				{
+									$context_data['version'] = $match[1];
+				}
 
 				// Now does the old file exist - if so what is it's version?
 				if (file_exists(BOARDDIR . '/' . $file['filename']))
@@ -444,13 +466,19 @@ 
 
 						// How does this compare?
 						if ($context_data['cur_version'] == $context_data['version'])
-							$context_data['version_compare'] = 'same';
+						{
+													$context_data['version_compare'] = 'same';
+						}
 						elseif ($context_data['cur_version'] > $context_data['version'])
-							$context_data['version_compare'] = 'older';
+						{
+													$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;
+						{
+													$context_data['default_copy'] = false;
+						}
 					}
 				}
 
@@ -461,9 +489,12 @@ 
 			{
 				// If we think it's a theme thing, work out what the theme is.
 				if (strpos($dirname, 'themes') === 0 && preg_match('~themes[\\/]([^\\/]+)[\\/]~', $dirname, $match))
-					$theme_name = $match[1];
-				else
-					$theme_name = 'misc';
+				{
+									$theme_name = $match[1];
+				}
+				else {
+									$theme_name = 'misc';
+				}
 
 				// Assume it's an image, could be an acceptance note etc but rare.
 				$context['files']['images'][$theme_name][] = $context_data;
@@ -471,13 +502,17 @@ 
 
 			// Collect together all non-writable areas.
 			if (!$context_data['writable'])
-				$context['make_writable'][] = $context_data['destination'];
+			{
+							$context['make_writable'][] = $context_data['destination'];
+			}
 		}
 
 		// So, I'm a perfectionist - let's get the theme names.
 		$indexes = array();
 		foreach ($context['files']['images'] as $k => $dummy)
-			$indexes[] = $k;
+		{
+					$indexes[] = $k;
+		}
 
 		$context['theme_names'] = array();
 		if (!empty($indexes))
@@ -498,7 +533,9 @@ 
 
 			// Now we have the id_theme we can get the pretty description.
 			if (!empty($themes))
-				$context['theme_names'] = getBasicThemeInfos($themes);
+			{
+							$context['theme_names'] = getBasicThemeInfos($themes);
+			}
 		}
 
 		// Before we go to far can we make anything writable, eh, eh?
@@ -514,21 +551,27 @@ 
 				if ($type == 'lang')
 				{
 					foreach ($data as $k => $file)
-						if (!$file['writable'] && !in_array($file['destination'], $context['still_not_writable']))
+					{
+											if (!$file['writable'] && !in_array($file['destination'], $context['still_not_writable']))
 							$context['files'][$type][$k]['writable'] = true;
+					}
 				}
 				else
 				{
 					foreach ($data as $theme => $files)
-						foreach ($files as $k => $file)
+					{
+											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');
+			{
+							loadLanguage('Packages');
+			}
 		}
 
 		// This is the list for the main files.
@@ -647,13 +690,19 @@ 
 		foreach ($themes as $id => $data)
 		{
 			if (count($data) != 2)
-				unset($themes[$id]);
+			{
+							unset($themes[$id]);
+			}
 			elseif (is_dir($data['theme_dir'] . '/languages/' . $context['lang_id']))
-				$lang_dirs[$id] = $data['theme_dir'] . '/languages/' . $context['lang_id'];
+			{
+							$lang_dirs[$id] = $data['theme_dir'] . '/languages/' . $context['lang_id'];
+			}
 
 			// How about image directories?
 			if (is_dir($data['theme_dir'] . '/images/' . $context['lang_id']))
-				$images_dirs[$id] = $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' : '';
@@ -668,14 +717,18 @@ 
 			{
 				// We're only after the files for this language.
 				if (preg_match('~^([A-Za-z]+)\.' . $context['lang_id'] . '\.php$~', $entry, $matches) == 0)
-					continue;
+				{
+									continue;
+				}
 
 				if (!isset($context['possible_files'][$theme]))
-					$context['possible_files'][$theme] = array(
+				{
+									$context['possible_files'][$theme] = array(
 						'id' => $theme,
 						'name' => $themes[$theme]['name'],
 						'files' => array(),
 					);
+				}
 
 				$context['possible_files'][$theme]['files'][] = array(
 					'id' => $matches[1],
@@ -721,17 +774,23 @@ 
 			foreach ($lang_dirs as $curPath)
 			{
 				foreach ($context['possible_files'][1]['files'] as $lang)
-					if (file_exists($curPath . '/' . $lang['id'] . '.' . $context['lang_id'] . '.php'))
+				{
+									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');
+				{
+									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');
+			{
+							unlink(BOARDDIR . '/agreement.' . $context['lang_id'] . '.txt');
+			}
 
 			// Fourth, a related images folder?
 			if (!empty($images_dirs))
@@ -739,7 +798,9 @@ 
 				foreach ($images_dirs as $curPath)
 				{
 					if (is_dir($curPath))
-						deltree($curPath);
+					{
+											deltree($curPath);
+					}
 				}
 			}
 
@@ -784,7 +845,9 @@ 
 			fclose($fp);
 
 			if ($this->_checkOpcache())
-				opcache_invalidate($settings['default_theme_dir'] . '/languages/' . $context['lang_id'] . '/index.' . $context['lang_id'] . '.php');
+			{
+							opcache_invalidate($settings['default_theme_dir'] . '/languages/' . $context['lang_id'] . '/index.' . $context['lang_id'] . '.php');
+			}
 
 			$madeSave = true;
 		}
@@ -818,7 +881,9 @@ 
 			{
 				// Only try to save if it's changed!
 				if ($this->_req->post->entry[$k] != $this->_req->post->comp[$k])
-					$save_strings[$k] = cleanLangString($v, false);
+				{
+									$save_strings[$k] = cleanLangString($v, false);
+				}
 			}
 		}
 
@@ -855,11 +920,13 @@ 
 			{
 				preg_match('~\$(helptxt|txt|editortxt)\[\'(.+)\'\]\s?=\s?(.+);~ms', strtr($multiline_cache, array("\r" => '')), $matches);
 				if (!empty($matches[3]))
-					$entries[$matches[2]] = array(
+				{
+									$entries[$matches[2]] = array(
 						'type' => $matches[1],
 						'full' => $matches[0],
 						'entry' => $matches[3],
 					);
+				}
 			}
 
 			// These are the entries we can definitely save.
@@ -874,7 +941,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;
+				{
+									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');
@@ -908,8 +977,9 @@ 
 							$save_cache['entries'][$cur_index] = strtr($save_strings[$md5EntryKey . '-+- ' . $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,
@@ -934,8 +1004,9 @@ 
 								$items[] = $k2 . ' => \'' . $v2 . '\'';
 								$cur_index = $k2;
 							}
-							else
-								$items[] = '\'' . $v2 . '\'';
+							else {
+															$items[] = '\'' . $v2 . '\'';
+							}
 
 							$cur_index++;
 						}
@@ -954,7 +1025,9 @@ 
 					{
 						// @todo Fix this properly.
 						if ($save_strings[$md5EntryKey] == '')
-							$save_strings[$md5EntryKey] = '\'\'';
+						{
+													$save_strings[$md5EntryKey] = '\'\'';
+						}
 
 						// Set the new value.
 						$entryValue['entry'] = $save_strings[$md5EntryKey];
@@ -983,7 +1056,9 @@ 
 
 				$file_contents = implode('', file($current_file));
 				foreach ($final_saves as $save)
-					$file_contents = strtr($file_contents, array($save['find'] => $save['replace']));
+				{
+									$file_contents = strtr($file_contents, array($save['find'] => $save['replace']));
+				}
 
 				// Save the actual changes.
 				$fp = fopen($current_file, 'w+');
@@ -991,7 +1066,9 @@ 
 				fclose($fp);
 
 				if ($this->_checkOpcache())
-					opcache_invalidate($current_file);
+				{
+									opcache_invalidate($current_file);
+				}
 
 				$madeSave = true;
 			}
@@ -1002,7 +1079,9 @@ 
 
 		// If we saved, redirect.
 		if ($madeSave)
-			redirectexit('action=admin;area=languages;sa=editlang;lid=' . $context['lang_id']);
+		{
+					redirectexit('action=admin;area=languages;sa=editlang;lid=' . $context['lang_id']);
+		}
 
 		createToken('admin-mlang');
 	}
@@ -1095,7 +1174,9 @@ 
 		// Get our languages. No cache.
 		$languages = getLanguages(false);
 		foreach ($languages as $lang)
-			$config_vars['language'][4][] = array($lang['filename'], strtr($lang['name'], array('-utf8' => ' (UTF-8)')));
+		{
+					$config_vars['language'][4][] = array($lang['filename'], strtr($lang['name'], array('-utf8' => ' (UTF-8)')));
+		}
 
 		return $config_vars;
 	}

Spacing +10 added lines, -10 removed lines

@@ -188,7 +188,7 @@ 
 			'base_href' => $scripturl . '?action=admin;area=languages',
 			'title' => $txt['edit_languages'],
 			'data_check' => array(
-				'class' => function ($rowData) {
+				'class' => function($rowData) {
 					if ($rowData['default'])
 						return 'highlight2';
 					else
@@ -208,7 +208,7 @@ 
 						'class' => 'centertext',
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							return '<input type="radio" name="def_language" value="' . $rowData['id'] . '" ' . ($rowData['default'] ? 'checked="checked"' : '') . ' class="input_radio" />';
 						},
 						'style' => 'width: 8%;',
@@ -220,7 +220,7 @@ 
 						'value' => $txt['languages_lang_name'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $scripturl;
 
 							return sprintf('<a href="%1$s?action=admin;area=languages;sa=editlang;lid=%2$s">%3$s<i class="icon icon-small i-modify"></i></a>', $scripturl, $rowData['id'], $rowData['name']);
@@ -536,7 +536,7 @@ 
 			'id' => 'lang_main_files_list',
 			'title' => $txt['languages_download_main_files'],
 			'get_items' => array(
-				'function' => function () {
+				'function' => function() {
 					global $context;
 					return $context['files']['lang'];
 				},
@@ -547,7 +547,7 @@ 
 						'value' => $txt['languages_download_filename'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $txt;
 
 							return '<strong>' . $rowData['name'] . '</strong><br /><span class="smalltext">' . $txt['languages_download_dest'] . ': ' . $rowData['destination'] . '</span>' . ($rowData['version_compare'] == 'older' ? '<br />' . $txt['languages_download_older'] : '');
@@ -559,7 +559,7 @@ 
 						'value' => $txt['languages_download_writable'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $txt;
 
 							return '<span class="' . ($rowData['writable'] ? 'success' : 'error') . ';">' . ($rowData['writable'] ? $txt['yes'] : $txt['no']) . '</span>';
@@ -571,7 +571,7 @@ 
 						'value' => $txt['languages_download_version'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							return '<span class="' . ($rowData['version_compare'] == 'older' ? 'error' : ($rowData['version_compare'] == 'same' ? 'softalert' : 'success')) . ';">' . $rowData['version'] . '</span>';
 						},
 					),
@@ -581,7 +581,7 @@ 
 						'value' => $txt['languages_download_exists'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $txt;
 
 							return $rowData['exists'] ? ($rowData['exists'] == 'same' ? $txt['languages_download_exists_same'] : $txt['languages_download_exists_different']) : $txt['no'];
@@ -594,7 +594,7 @@ 
 						'class' => 'centertext',
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							return '<input type="checkbox" name="copy_file[]" value="' . $rowData['generaldest'] . '" ' . ($rowData['default_copy'] ? 'checked="checked"' : '') . ' class="input_check" />';
 						},
 						'style' => 'width: 4%;',
@@ -684,7 +684,7 @@ 
 				);
 			}
 			$dir->close();
-			usort($context['possible_files'][$theme]['files'], function ($val1, $val2) {
+			usort($context['possible_files'][$theme]['files'], function($val1, $val2) {
 				return strcmp($val1['name'], $val2['name']);
 			});
 		}

sources/admin/PackageServers.controller.php

Braces +111 added lines, -44 removed lines

@@ -113,7 +113,9 @@ 
 		$context['package_download_broken'] = !is_writable(BOARDDIR . '/packages') || !is_writable(BOARDDIR . '/packages/installed.list');
 
 		if ($context['package_download_broken'])
-			$this->ftp_connect();
+		{
+					$this->ftp_connect();
+		}
 	}
 
 	/**
@@ -130,11 +132,14 @@ 
 
 		// Browsing the packages from a server
 		if (isset($this->_req->query->server))
-			list($name, $url, $server) = $this->_package_server();
+		{
+					list($name, $url, $server) = $this->_package_server();
+		}
 
 		// Minimum required parameter did not exist so dump out.
-		else
-			throw new Elk_Exception('couldnt_connect', false);
+		else {
+					throw new Elk_Exception('couldnt_connect', false);
+		}
 
 		// Might take some time.
 		detectServer()->setTimeLimit(60);
@@ -159,11 +164,15 @@ 
 			// Look through the list of installed mods and get version information for the compare
 			$installed_adds = array();
 			foreach ($instadds as $installed_add)
-				$installed_adds[$installed_add['package_id']] = $installed_add['version'];
+			{
+							$installed_adds[$installed_add['package_id']] = $installed_add['version'];
+			}
 
 			$the_version = strtr(FORUM_VERSION, array('ElkArte ' => ''));
 			if (!empty($_SESSION['version_emulate']))
-				$the_version = $_SESSION['version_emulate'];
+			{
+							$the_version = $_SESSION['version_emulate'];
+			}
 
 			// Parse the json file, each section contains a category of addons
 			$packageNum = 0;
@@ -352,12 +361,15 @@ 
 			// not always accurate, especially when dealing with repos.  So for now just put in in no conflict mode
 			// and do the save.
 			if ($this->_req->getQuery('area') === 'packageservers' && $this->_req->getQuery('sa') === 'download')
-				$this->_req->query->auto = true;
+			{
+							$this->_req->query->auto = true;
+			}
 
 			return str_replace($invalid, '_', $newname) . $matches[6];
 		}
-		else
-			return basename($name);
+		else {
+					return basename($name);
+		}
 	}
 
 	/**
@@ -384,13 +396,18 @@ 
 
 		// Security is good...
 		if (isset($this->_req->query->server))
-			checkSession('get');
-		else
-			checkSession();
+		{
+					checkSession('get');
+		}
+		else {
+					checkSession();
+		}
 
 		// To download something, we need either a valid server or url.
 		if (empty($this->_req->query->server) && (!empty($this->_req->query->get) && !empty($this->_req->post->package)))
-			throw new Elk_Exception('package_get_error_is_zero', false);
+		{
+					throw new Elk_Exception('package_get_error_is_zero', false);
+		}
 
 		// Start off with nothing
 		$server = '';
@@ -418,8 +435,9 @@ 
 				$url = isset($path_url['dirname']) ? $path_url['dirname'] . '/' : '';
 			}
 			// Not found or some monkey business
-			else
-				throw new Elk_Exception('package_cant_download', false);
+			else {
+							throw new Elk_Exception('package_cant_download', false);
+			}
 		}
 		// Entered a url and optional filename
 		elseif (isset($this->_req->post->byurl) && !empty($this->_req->post->filename))
@@ -443,13 +461,16 @@ 
 				$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 free name
 			$i = 1;
 			while (file_exists(BOARDDIR . '/packages/' . $package_name . $i . $ext))
-				$i++;
+			{
+							$i++;
+			}
 
 			$package_name = $package_name . $i . $ext;
 		}
@@ -458,7 +479,9 @@ 
 		$packageInfo = getPackageInfo($url . $package_id);
 
 		if (!is_array($packageInfo))
-			throw new Elk_Exception($packageInfo);
+		{
+					throw new Elk_Exception($packageInfo);
+		}
 
 		// Save the package to disk, use FTP if necessary
 		create_chmod_control(
@@ -473,7 +496,9 @@ 
 
 		// Done!  Did we get this package automatically?
 		if (preg_match('~^http://[\w_\-]+\.elkarte\.net/~', $package_id) == 1 && strpos($package_id, 'dlattach') === false && isset($this->_req->query->auto))
-			redirectexit('action=admin;area=packages;sa=install;package=' . $package_name);
+		{
+					redirectexit('action=admin;area=packages;sa=install;package=' . $package_name);
+		}
 
 		// You just downloaded a addon from SERVER_NAME_GOES_HERE.
 		$context['package_server'] = $server;
@@ -482,16 +507,25 @@ 
 		$context['package'] = getPackageInfo($package_name);
 
 		if (!is_array($context['package']))
-			throw new Elk_Exception('package_cant_download', false);
+		{
+					throw new Elk_Exception('package_cant_download', false);
+		}
 
 		if ($context['package']['type'] === 'modification' || $context['package']['type'] === 'addon')
-			$context['package']['install']['link'] = '<a class="linkbutton" href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">' . $txt['install_mod'] . '</a>';
+		{
+					$context['package']['install']['link'] = '<a class="linkbutton" 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 class="linkbutton" href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">' . $txt['use_avatars'] . '</a>';
+		{
+					$context['package']['install']['link'] = '<a class="linkbutton" 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 class="linkbutton" href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">' . $txt['add_languages'] . '</a>';
-		else
-			$context['package']['install']['link'] = '';
+		{
+					$context['package']['install']['link'] = '<a class="linkbutton" href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">' . $txt['add_languages'] . '</a>';
+		}
+		else {
+					$context['package']['install']['link'] = '';
+		}
 
 		$context['package']['list_files']['link'] = '<a class="linkbutton" href="' . $scripturl . '?action=admin;area=packages;sa=list;package=' . $context['package']['filename'] . '">' . $txt['list_files'] . '</a>';
 
@@ -519,7 +553,9 @@ 
 		if (isset($this->_req->query->server))
 		{
 			if ($this->_req->query->server == '')
-				redirectexit('action=admin;area=packageservers');
+			{
+							redirectexit('action=admin;area=packageservers');
+			}
 
 			$server = $this->_req->getQuery('server', 'intval');
 
@@ -530,7 +566,9 @@ 
 
 			// If server does not exist then dump out.
 			if (empty($url))
-				throw new Elk_Exception('couldnt_connect', false);
+			{
+							throw new Elk_Exception('couldnt_connect', false);
+			}
 		}
 
 		return array($name, $url, $server);
@@ -551,15 +589,21 @@ 
 		// @todo Use FTP if the packages directory is not writable.
 		// Check the file was even sent!
 		if (!isset($_FILES['package']['name']) || $_FILES['package']['name'] == '')
-			throw new Elk_Exception('package_upload_error_nofile');
+		{
+					throw new Elk_Exception('package_upload_error_nofile');
+		}
 		elseif (!is_uploaded_file($_FILES['package']['tmp_name']) || (ini_get('open_basedir') == '' && !file_exists($_FILES['package']['tmp_name'])))
-			throw new Elk_Exception('package_upload_error_failed');
+		{
+					throw new Elk_Exception('package_upload_error_failed');
+		}
 
 		// Make sure it has a sane filename.
 		$_FILES['package']['name'] = preg_replace(array('/\s/', '/\.[\.]+/', '/[^\w_\.\-]/'), array('_', '.', ''), $_FILES['package']['name']);
 
 		if (strtolower(substr($_FILES['package']['name'], -4)) !== '.zip' && strtolower(substr($_FILES['package']['name'], -4)) !== '.tgz' && strtolower(substr($_FILES['package']['name'], -7)) !== '.tar.gz')
-			throw new Elk_Exception('package_upload_error_supports', false, array('zip, tgz, tar.gz'));
+		{
+					throw new Elk_Exception('package_upload_error_supports', false, array('zip, tgz, tar.gz'));
+		}
 
 		// We only need the filename...
 		$packageName = basename($_FILES['package']['name']);
@@ -569,7 +613,9 @@ 
 
 		// @todo Maybe just roll it like we do for downloads?
 		if (file_exists($destination))
-			throw new Elk_Exception('package_upload_error_exists');
+		{
+					throw new Elk_Exception('package_upload_error_exists');
+		}
 
 		// Now move the file.
 		move_uploaded_file($_FILES['package']['tmp_name'], $destination);
@@ -601,12 +647,16 @@ 
 				{
 					// No need to check these
 					if ($package->getFilename() == $packageName)
-						continue;
+					{
+											continue;
+					}
 
 					// Read package info for the archive we found
 					$packageInfo = getPackageInfo($package->getFilename());
 					if (!is_array($packageInfo))
-						continue;
+					{
+											continue;
+					}
 
 					// If it was already uploaded under another name don't upload it again.
 					if ($packageInfo['id'] == $context['package']['id'] && compareVersions($packageInfo['version'], $context['package']['version']) == 0)
@@ -624,13 +674,20 @@ 
 		}
 
 		if ($context['package']['type'] === 'modification' || $context['package']['type'] === 'addon')
-			$context['package']['install']['link'] = '<a class="linkbutton" href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">' . $txt['install_mod'] . '</a>';
+		{
+					$context['package']['install']['link'] = '<a class="linkbutton" 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 class="linkbutton" href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">' . $txt['use_avatars'] . '</a>';
+		{
+					$context['package']['install']['link'] = '<a class="linkbutton" 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 class="linkbutton" href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">' . $txt['add_languages'] . '</a>';
-		else
-			$context['package']['install']['link'] = '';
+		{
+					$context['package']['install']['link'] = '<a class="linkbutton" href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $context['package']['filename'] . '">' . $txt['add_languages'] . '</a>';
+		}
+		else {
+					$context['package']['install']['link'] = '';
+		}
 
 		$context['package']['list_files']['link'] = '<a class="linkbutton" href="' . $scripturl . '?action=admin;area=packages;sa=list;package=' . $context['package']['filename'] . '">' . $txt['list_files'] . '</a>';
 
@@ -654,7 +711,9 @@ 
 
 		// If they put a slash on the end, get rid of it.
 		if (substr($this->_req->post->serverurl, -1) === '/')
-			$this->_req->post->serverurl = substr($this->_req->post->serverurl, 0, -1);
+		{
+					$this->_req->post->serverurl = substr($this->_req->post->serverurl, 0, -1);
+		}
 
 		// Are they both nice and clean?
 		$servername = trim(Util::htmlspecialchars($this->_req->post->servername));
@@ -712,7 +771,9 @@ 
 
 		// Give FTP a chance...
 		if ($context['package_download_broken'])
-			$this->ftp_connect();
+		{
+					$this->ftp_connect();
+		}
 	}
 
 	/**
@@ -769,15 +830,21 @@ 
 				}
 				// ...or we failed
 				elseif ($ftp->error !== false && !isset($ftp_error))
-					$ftp_error = $ftp->last_message === null ? '' : $ftp->last_message;
+				{
+									$ftp_error = $ftp->last_message === null ? '' : $ftp->last_message;
+				}
 
 				list ($username, $detect_path, $found_path) = $ftp->detect_path(BOARDDIR);
 
 				if ($found_path || !isset($this->_req->post->ftp_path))
-					$this->_req->post->ftp_path = $detect_path;
+				{
+									$this->_req->post->ftp_path = $detect_path;
+				}
 
 				if (!isset($this->_req->post->ftp_username))
-					$this->_req->post->ftp_username = $username;
+				{
+									$this->_req->post->ftp_username = $username;
+				}
 
 				// Fill the boxes for a FTP connection with data from the previous attempt too, if any
 				$context['package_ftp'] = array(

sources/admin/Packages.controller.php

Braces +411 added lines, -155 removed lines

@@ -176,7 +176,9 @@ 
 		// You have to specify a file!!
 		$file = $this->_req->getQuery('package', 'trim');
 		if (empty($file))
-			redirectexit('action=admin;area=packages');
+		{
+					redirectexit('action=admin;area=packages');
+		}
 
 		// What are we trying to do
 		$this->_filename = (string) preg_replace('~[\.]+~', '.', $file);
@@ -184,7 +186,9 @@ 
 
 		// If we can't find the file, our install ends here
 		if (!file_exists(BOARDDIR . '/packages/' . $this->_filename))
-			throw new Elk_Exception('package_no_file', false);
+		{
+					throw new Elk_Exception('package_no_file', false);
+		}
 
 		// Do we have an existing id, for uninstalls and the like.
 		$this->install_id = $this->_req->getQuery('pid', 'intval', 0);
@@ -197,9 +201,12 @@ 
 
 		// Make sure our temp directory exists and is empty.
 		if (file_exists(BOARDDIR . '/packages/temp'))
-			deltree(BOARDDIR . '/packages/temp', false);
-		else
-			$this->_create_temp_dir();
+		{
+					deltree(BOARDDIR . '/packages/temp', false);
+		}
+		else {
+					$this->_create_temp_dir();
+		}
 
 		// Extract the files in to the temp so we can get things like the readme, etc.
 		$this->_extract_files_temp();
@@ -210,7 +217,9 @@ 
 		// Get the package info...
 		$packageInfo = getPackageInfo($this->_filename);
 		if (!is_array($packageInfo))
-			throw new Elk_Exception($packageInfo);
+		{
+					throw new Elk_Exception($packageInfo);
+		}
 
 		$packageInfo['filename'] = $this->_filename;
 
@@ -222,17 +231,24 @@ 
 
 		$context['database_changes'] = array();
 		if (isset($packageInfo['uninstall']['database']))
-			$context['database_changes'][] = $txt['execute_database_changes'] . ' - ' . $packageInfo['uninstall']['database'];
+		{
+					$context['database_changes'][] = $txt['execute_database_changes'] . ' - ' . $packageInfo['uninstall']['database'];
+		}
 		elseif (!empty($package_installed['db_changes']))
 		{
 			foreach ($package_installed['db_changes'] as $change)
 			{
 				if (isset($change[2]) && isset($txt['package_db_' . $change[0]]))
-					$context['database_changes'][] = sprintf($txt['package_db_' . $change[0]], $change[1], $change[2]);
+				{
+									$context['database_changes'][] = sprintf($txt['package_db_' . $change[0]], $change[1], $change[2]);
+				}
 				elseif (isset($txt['package_db_' . $change[0]]))
-					$context['database_changes'][] = sprintf($txt['package_db_' . $change[0]], $change[1]);
-				else
-					$context['database_changes'][] = $change[0] . '-' . $change[1] . (isset($change[2]) ? '-' . $change[2] : '');
+				{
+									$context['database_changes'][] = sprintf($txt['package_db_' . $change[0]], $change[1]);
+				}
+				else {
+									$context['database_changes'][] = $change[0] . '-' . $change[1] . (isset($change[2]) ? '-' . $change[2] : '');
+				}
 			}
 		}
 
@@ -243,7 +259,9 @@ 
 
 		// No actions found, return so we can display an error
 		if (empty($actions))
-			redirectexit('action=admin;area=packages');
+		{
+					redirectexit('action=admin;area=packages');
+		}
 
 		// Now prepare things for the template using the package actions class
 		$pka = new Package_Actions();
@@ -276,7 +294,9 @@ 
 
 		// Clear the temp directory
 		if (file_exists(BOARDDIR . '/packages/temp'))
-			deltree(BOARDDIR . '/packages/temp');
+		{
+					deltree(BOARDDIR . '/packages/temp');
+		}
 
 		// Will we need chmod permissions to pull this off
 		$this->chmod_files = !empty($pka->chmod_files) ? $pka->chmod_files : array();
@@ -306,17 +326,26 @@ 
 				preg_match('~^\$(languagedir|languages_dir|imagesdir|themedir)(\\|/)*(.+)*~i', $action_data['unparsed_destination'], $matches);
 
 				if ($matches[1] === 'imagesdir')
-					$path = '/' . basename($settings['default_images_url']);
+				{
+									$path = '/' . basename($settings['default_images_url']);
+				}
 				elseif ($matches[1] === 'languagedir' || $matches[1] === 'languages_dir')
-					$path = '/languages';
-				else
-					$path = '';
+				{
+									$path = '/languages';
+				}
+				else {
+									$path = '';
+				}
 
 				if (!empty($matches[3]))
-					$path .= $matches[3];
+				{
+									$path .= $matches[3];
+				}
 
 				if (!$this->_uninstalling)
-					$path .= '/' . basename($action_data['filename']);
+				{
+									$path .= '/' . basename($action_data['filename']);
+				}
 
 				// Loop through each custom theme to note it's candidacy!
 				foreach ($this->theme_paths as $id => $theme_data)
@@ -333,36 +362,45 @@ 
 							{
 								$temp = dirname($real_path);
 								while (!file_exists($temp) && strlen($temp) > 1)
-									$temp = dirname($temp);
+								{
+																	$temp = dirname($temp);
+								}
 
 								$this->chmod_files[] = $temp;
 							}
 
 							if ($action_data['type'] === 'require-dir' && !is_writable($real_path) && (file_exists($real_path) || !is_writable(dirname($real_path))))
-								$this->chmod_files[] = $real_path;
+							{
+															$this->chmod_files[] = $real_path;
+							}
 
 							if (!isset($context['theme_actions'][$id]))
-								$context['theme_actions'][$id] = array(
+							{
+															$context['theme_actions'][$id] = array(
 									'name' => $theme_data['name'],
 									'actions' => array(),
 								);
+							}
 
 							if ($this->_uninstalling)
-								$context['theme_actions'][$id]['actions'][] = array(
+							{
+															$context['theme_actions'][$id]['actions'][] = array(
 									'type' => $txt['package_delete'] . ' ' . ($action_data['type'] === 'require-dir' ? $txt['package_tree'] : $txt['package_file']),
 									'action' => strtr($real_path, array('\\' => '/', BOARDDIR => '.')),
 									'description' => '',
 									'value' => base64_encode(json_encode(array('type' => $action_data['type'], 'orig' => $action_data['filename'], 'future' => $real_path, 'id' => $id))),
 									'not_mod' => true,
 								);
-							else
-								$context['theme_actions'][$id]['actions'][] = array(
+							}
+							else {
+															$context['theme_actions'][$id]['actions'][] = array(
 									'type' => $txt['package_extract'] . ' ' . ($action_data['type'] === 'require-dir' ? $txt['package_tree'] : $txt['package_file']),
 									'action' => strtr($real_path, array('\\' => '/', BOARDDIR => '.')),
 									'description' => '',
 									'value' => base64_encode(json_encode(array('type' => $action_data['type'], 'orig' => $action_data['destination'], 'future' => $real_path, 'id' => $id))),
 									'not_mod' => true,
 								);
+							}
 						}
 					}
 				}
@@ -398,7 +436,9 @@ 
 			}
 
 			if (!isset($this->_base_path))
-				$this->_base_path = '';
+			{
+							$this->_base_path = '';
+			}
 		}
 		// Perhaps its a directory then, assumed to be extracted
 		elseif (!empty($this->_filename) && is_dir(BOARDDIR . '/packages/' . $this->_filename))
@@ -411,8 +451,9 @@ 
 			$this->_base_path = '';
 		}
 		// Well we don't know what it is then, so we stop
-		else
-			throw new Elk_Exception('no_access', false);
+		else {
+					throw new Elk_Exception('no_access', false);
+		}
 	}
 
 	/**
@@ -459,7 +500,9 @@ 
 			foreach ($this->theme_paths as $id => $data)
 			{
 				if ($id != 1 && !in_array($id, $package_installed['old_themes']))
-					unset($this->theme_paths[$id]);
+				{
+									unset($this->theme_paths[$id]);
+				}
 			}
 		}
 		// Or is it already installed and you want to upgrade
@@ -470,23 +513,31 @@ 
 
 			// There was no upgrade....
 			if (empty($actions))
-				$this->_is_installed = true;
+			{
+							$this->_is_installed = true;
+			}
 			else
 			{
 				// Otherwise they can only upgrade themes from the first time around.
 				foreach ($this->theme_paths as $id => $data)
 				{
 					if ($id != 1 && !in_array($id, $package_installed['old_themes']))
-						unset($this->theme_paths[$id]);
+					{
+											unset($this->theme_paths[$id]);
+					}
 				}
 			}
 		}
 		// Simply already installed
 		elseif (isset($package_installed['old_version']) && $package_installed['old_version'] == $packageInfo['version'])
-			$this->_is_installed = true;
+		{
+					$this->_is_installed = true;
+		}
 
 		if (!isset($package_installed['old_version']) || $this->_is_installed)
-			$actions = parsePackageInfo($packageInfo['xml'], $testing, 'install');
+		{
+					$actions = parsePackageInfo($packageInfo['xml'], $testing, 'install');
+		}
 
 		return $actions;
 	}
@@ -516,7 +567,9 @@ 
 				// No temp directory was able to be made, that's fatal
 				deltree(BOARDDIR . '/packages/temp', false);
 				if (!mktree(BOARDDIR . '/packages/temp', 0777))
-					throw new Elk_Exception('package_cant_download', false);
+				{
+									throw new Elk_Exception('package_cant_download', false);
+				}
 			}
 		}
 	}
@@ -535,11 +588,15 @@ 
 		// If there's no package file, what are we installing?
 		$this->_filename = $this->_req->getQuery('package', 'trim');
 		if (empty($this->_filename))
-			redirectexit('action=admin;area=packages');
+		{
+					redirectexit('action=admin;area=packages');
+		}
 
 		// And if the file does not exist there is a problem
 		if (!file_exists(BOARDDIR . '/packages/' . $this->_filename))
-			throw new Elk_Exception('package_no_file', false);
+		{
+					throw new Elk_Exception('package_no_file', false);
+		}
 
 		// If this is an uninstall, we'll have an id.
 		$this->install_id = $this->_req->getQuery('pid', 'intval', 0);
@@ -555,9 +612,12 @@ 
 
 		// Make sure temp directory exists and is empty!
 		if (file_exists(BOARDDIR . '/packages/temp'))
-			deltree(BOARDDIR . '/packages/temp', false);
-		else
-			$this->_create_temp_dir();
+		{
+					deltree(BOARDDIR . '/packages/temp', false);
+		}
+		else {
+					$this->_create_temp_dir();
+		}
 
 		// Let the unpacker do the work.
 		$this->_extract_files_temp();
@@ -568,8 +628,10 @@ 
 		if (!empty($this->_req->post->custom_theme))
 		{
 			foreach ($this->_req->post->custom_theme as $tid)
-				if (in_array($tid, $known_themes))
+			{
+							if (in_array($tid, $known_themes))
 					$custom_themes[] = (int) $tid;
+			}
 		}
 
 		// Now load up the paths of the themes that we need to know about.
@@ -587,11 +649,15 @@ 
 			foreach ($this->_req->post->theme_changes as $change)
 			{
 				if (empty($change))
-					continue;
+				{
+									continue;
+				}
 
 				$theme_data = json_decode(base64_decode($change), true);
 				if (empty($theme_data['type']))
-					continue;
+				{
+									continue;
+				}
 
 				$themes_installed[] = $theme_data['id'];
 				$context['theme_copies'][$theme_data['type']][$theme_data['orig']][] = $theme_data['future'];
@@ -601,7 +667,9 @@ 
 		// Get the package info...
 		$packageInfo = getPackageInfo($this->_filename);
 		if (!is_array($packageInfo))
-			throw new Elk_Exception($packageInfo);
+		{
+					throw new Elk_Exception($packageInfo);
+		}
 
 		$packageInfo['filename'] = $this->_filename;
 
@@ -664,7 +732,9 @@ 
 			if (!empty($package_check['install_state']))
 			{
 				if ($this->_uninstalling)
-					setPackageState($package_check['package_id'], $this->install_id);
+				{
+									setPackageState($package_check['package_id'], $this->install_id);
+				}
 				else
 				{
 					// not uninstalling so must be an upgrade
@@ -680,9 +750,12 @@ 
 				$table_log = $table_installer->package_log();
 
 				if (!empty($old_db_changes))
-					$db_package_log = empty($table_log) ? $old_db_changes : array_merge($old_db_changes, $table_log);
-				else
-					$db_package_log = $table_log;
+				{
+									$db_package_log = empty($table_log) ? $old_db_changes : array_merge($old_db_changes, $table_log);
+				}
+				else {
+									$db_package_log = $table_log;
+				}
 
 				// If there are some database changes we might want to remove then filter them out.
 				if (!empty($db_package_log))
@@ -693,15 +766,20 @@ 
 					foreach ($db_package_log as $k => $log)
 					{
 						if ($log[0] === 'remove_table')
-							$tables[] = $log[1];
+						{
+													$tables[] = $log[1];
+						}
 						elseif (in_array($log[1], $tables))
-							unset($db_package_log[$k]);
+						{
+													unset($db_package_log[$k]);
+						}
 					}
 
 					$package_installed['db_changes'] = serialize($db_package_log);
 				}
-				else
-					$package_installed['db_changes'] = '';
+				else {
+									$package_installed['db_changes'] = '';
+				}
 
 				// What themes did we actually install?
 				$themes_installed = array_unique($themes_installed);
@@ -726,17 +804,25 @@ 
 			foreach ($package_installed['db_changes'] as $change)
 			{
 				if ($change[0] === 'remove_table' && isset($change[1]))
-					$table_installer->db_drop_table($change[1]);
+				{
+									$table_installer->db_drop_table($change[1]);
+				}
 				elseif ($change[0] === 'remove_column' && isset($change[2]))
-					$table_installer->db_remove_column($change[1], $change[2]);
+				{
+									$table_installer->db_remove_column($change[1], $change[2]);
+				}
 				elseif ($change[0] === 'remove_index' && isset($change[2]))
-					$table_installer->db_remove_index($change[1], $change[2]);
+				{
+									$table_installer->db_remove_index($change[1], $change[2]);
+				}
 			}
 		}
 
 		// Clean house... get rid of the evidence ;).
 		if (file_exists(BOARDDIR . '/packages/temp'))
-			deltree(BOARDDIR . '/packages/temp');
+		{
+					deltree(BOARDDIR . '/packages/temp');
+		}
 
 		// Log what we just did.
 		logAction($this->_uninstalling ? 'uninstall_package' : (!empty($is_upgrade) ? 'upgrade_package' : 'install_package'), array('package' => Util::htmlspecialchars($packageInfo['name']), 'version' => Util::htmlspecialchars($packageInfo['version'])), 'admin');
@@ -757,7 +843,9 @@ 
 	private function _sort_table_first($a, $b)
 	{
 		if ($a[0] == $b[0])
-			return 0;
+		{
+					return 0;
+		}
 
 		return $a[0] === 'remove_table' ? -1 : 1;
 	}
@@ -771,7 +859,9 @@ 
 
 		// No package?  Show him or her the door.
 		if (!isset($this->_req->query->package) || $this->_req->query->package == '')
-			redirectexit('action=admin;area=packages');
+		{
+					redirectexit('action=admin;area=packages');
+		}
 
 		$context['linktree'][] = array(
 			'url' => $scripturl . '?action=admin;area=packages;sa=list;package=' . $this->_req->query->package,
@@ -785,9 +875,13 @@ 
 
 		// Let the unpacker do the work.
 		if (is_file(BOARDDIR . '/packages/' . $context['filename']))
-			$context['files'] = read_tgz_file(BOARDDIR . '/packages/' . $context['filename'], null);
+		{
+					$context['files'] = read_tgz_file(BOARDDIR . '/packages/' . $context['filename'], null);
+		}
 		elseif (is_dir(BOARDDIR . '/packages/' . $context['filename']))
-			$context['files'] = listtree(BOARDDIR . '/packages/' . $context['filename']);
+		{
+					$context['files'] = listtree(BOARDDIR . '/packages/' . $context['filename']);
+		}
 	}
 
 	/**
@@ -799,11 +893,15 @@ 
 
 		// No package?  Show him or her the door.
 		if (!isset($this->_req->query->package) || $this->_req->query->package == '')
-			redirectexit('action=admin;area=packages');
+		{
+					redirectexit('action=admin;area=packages');
+		}
 
 		// No file?  Show him or her the door.
 		if (!isset($this->_req->query->file) || $this->_req->query->file == '')
-			redirectexit('action=admin;area=packages');
+		{
+					redirectexit('action=admin;area=packages');
+		}
 
 		$this->_req->query->package = preg_replace('~[\.]+~', '.', strtr($this->_req->query->package, array('/' => '_', '\\' => '_')));
 		$this->_req->query->file = preg_replace('~[\.]+~', '.', $this->_req->query->file);
@@ -811,9 +909,13 @@ 
 		if (isset($this->_req->query->raw))
 		{
 			if (is_file(BOARDDIR . '/packages/' . $this->_req->query->package))
-				echo read_tgz_file(BOARDDIR . '/packages/' . $this->_req->query->package, $this->_req->query->file, true);
+			{
+							echo read_tgz_file(BOARDDIR . '/packages/' . $this->_req->query->package, $this->_req->query->file, true);
+			}
 			elseif (is_dir(BOARDDIR . '/packages/' . $this->_req->query->package))
-				echo file_get_contents(BOARDDIR . '/packages/' . $this->_req->query->package . '/' . $this->_req->query->file);
+			{
+							echo file_get_contents(BOARDDIR . '/packages/' . $this->_req->query->package . '/' . $this->_req->query->file);
+			}
 
 			obExit(false);
 		}
@@ -831,16 +933,24 @@ 
 
 		// Let the unpacker do the work.... but make sure we handle images properly.
 		if (in_array(strtolower(strrchr($this->_req->query->file, '.')), array('.bmp', '.gif', '.jpeg', '.jpg', '.png')))
-			$context['filedata'] = '<img src="' . $scripturl . '?action=admin;area=packages;sa=examine;package=' . $this->_req->query->package . ';file=' . $this->_req->query->file . ';raw" alt="' . $this->_req->query->file . '" />';
+		{
+					$context['filedata'] = '<img src="' . $scripturl . '?action=admin;area=packages;sa=examine;package=' . $this->_req->query->package . ';file=' . $this->_req->query->file . ';raw" alt="' . $this->_req->query->file . '" />';
+		}
 		else
 		{
 			if (is_file(BOARDDIR . '/packages/' . $this->_req->query->package))
-				$context['filedata'] = htmlspecialchars(read_tgz_file(BOARDDIR . '/packages/' . $this->_req->query->package, $this->_req->query->file, true));
+			{
+							$context['filedata'] = htmlspecialchars(read_tgz_file(BOARDDIR . '/packages/' . $this->_req->query->package, $this->_req->query->file, true));
+			}
 			elseif (is_dir(BOARDDIR . '/packages/' . $this->_req->query->package))
-				$context['filedata'] = htmlspecialchars(file_get_contents(BOARDDIR . '/packages/' . $this->_req->query->package . '/' . $this->_req->query->file));
+			{
+							$context['filedata'] = htmlspecialchars(file_get_contents(BOARDDIR . '/packages/' . $this->_req->query->package . '/' . $this->_req->query->file));
+			}
 
 			if (strtolower(strrchr($this->_req->query->file, '.')) === '.php')
-				$context['filedata'] = highlight_php_code($context['filedata']);
+			{
+							$context['filedata'] = highlight_php_code($context['filedata']);
+			}
 		}
 	}
 
@@ -875,7 +985,9 @@ 
 
 		// Ack, don't allow deletion of arbitrary files here, could become a security hole somehow!
 		if (!isset($this->_req->query->package) || $this->_req->query->package === 'index.php' || $this->_req->query->package === 'installed.list' || $this->_req->query->package === 'backups')
-			redirectexit('action=admin;area=packages;sa=browse');
+		{
+					redirectexit('action=admin;area=packages;sa=browse');
+		}
 		$this->_req->query->package = preg_replace('~[\.]+~', '.', strtr($this->_req->query->package, array('/' => '_', '\\' => '_')));
 
 		// Can't delete what's not there.
@@ -886,7 +998,9 @@ 
 			create_chmod_control(array(BOARDDIR . '/packages/' . $this->_req->query->package), array('destination_url' => $scripturl . '?action=admin;area=packages;sa=remove;package=' . $this->_req->query->package, 'crash_on_error' => true));
 
 			if (is_dir(BOARDDIR . '/packages/' . $this->_req->query->package))
-				deltree(BOARDDIR . '/packages/' . $this->_req->query->package);
+			{
+							deltree(BOARDDIR . '/packages/' . $this->_req->query->package);
+			}
 			else
 			{
 				@chmod(BOARDDIR . '/packages/' . $this->_req->query->package, 0777);
@@ -939,7 +1053,9 @@ 
 								global $context;
 
 								if (isset($context['available_' . $type . ''][$package_md5]))
-									return $context['available_' . $type . ''][$package_md5]['name'];
+								{
+																	return $context['available_' . $type . ''][$package_md5]['name'];
+								}
 
 								return '';
 							},
@@ -959,7 +1075,9 @@ 
 								global $context;
 
 								if (isset($context['available_' . $type . ''][$package_md5]))
-									return $context['available_' . $type . ''][$package_md5]['version'];
+								{
+																	return $context['available_' . $type . ''][$package_md5]['version'];
+								}
 
 								return '';
 							},
@@ -978,27 +1096,39 @@ 
 								global $context, $scripturl, $txt;
 
 								if (!isset($context['available_' . $type . ''][$package_md5]))
-									return '';
+								{
+																	return '';
+								}
 
 								// Rewrite shortcut
 								$package = $context['available_' . $type . ''][$package_md5];
 								$return = '';
 
 								if ($package['can_uninstall'])
-									$return = '
+								{
+																	$return = '
 										<a class="linkbutton" href="' . $scripturl . '?action=admin;area=packages;sa=uninstall;package=' . $package['filename'] . ';pid=' . $package['installed_id'] . '">' . $txt['uninstall'] . '</a>';
+								}
 								elseif ($package['can_emulate_uninstall'])
-									$return = '
+								{
+																	$return = '
 										<a class="linkbutton" href="' . $scripturl . '?action=admin;area=packages;sa=uninstall;ve=' . $package['can_emulate_uninstall'] . ';package=' . $package['filename'] . ';pid=' . $package['installed_id'] . '">' . $txt['package_emulate_uninstall'] . ' ' . $package['can_emulate_uninstall'] . '</a>';
+								}
 								elseif ($package['can_upgrade'])
-									$return = '
+								{
+																	$return = '
 										<a class="linkbutton" href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $package['filename'] . '">' . $txt['package_upgrade'] . '</a>';
+								}
 								elseif ($package['can_install'])
-									$return = '
+								{
+																	$return = '
 										<a class="linkbutton" href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $package['filename'] . '">' . $txt['install_mod'] . '</a>';
+								}
 								elseif ($package['can_emulate_install'])
-									$return = '
+								{
+																	$return = '
 										<a class="linkbutton" href="' . $scripturl . '?action=admin;area=packages;sa=install;ve=' . $package['can_emulate_install'] . ';package=' . $package['filename'] . '">' . $txt['package_emulate_install'] . ' ' . $package['can_emulate_install'] . '</a>';
+								}
 
 								return $return . '
 										<a class="linkbutton" href="' . $scripturl . '?action=admin;area=packages;sa=list;package=' . $package['filename'] . '">' . $txt['list_files'] . '</a>
@@ -1086,9 +1216,12 @@ 
 		}
 
 		if (preg_match('~^/home\d*/([^/]+?)/public_html~', $this->_req->server->DOCUMENT_ROOT, $match))
-			$default_username = $match[1];
-		else
-			$default_username = '';
+		{
+					$default_username = $match[1];
+		}
+		else {
+					$default_username = '';
+		}
 
 		$context['page_title'] = $txt['package_settings'];
 		$context['sub_template'] = 'install_options';
@@ -1111,7 +1244,9 @@ 
 
 		// We need to know the operation key for the search and replace?
 		if (!isset($this->_req->query->operation_key, $this->_req->query->filename) && !is_numeric($this->_req->query->operation_key))
-			throw new Elk_Exception('operation_invalid', 'general');
+		{
+					throw new Elk_Exception('operation_invalid', 'general');
+		}
 
 		// Load the required file.
 		require_once(SUBSDIR . '/Themes.subs.php');
@@ -1139,7 +1274,9 @@ 
 			}
 
 			if (!isset($context['base_path']))
-				$context['base_path'] = '';
+			{
+							$context['base_path'] = '';
+			}
 		}
 		elseif (is_dir(BOARDDIR . '/packages/' . $context['filename']))
 		{
@@ -1161,7 +1298,9 @@ 
 				foreach ($theme_paths as $id => $data)
 				{
 					if ($id != 1 && !in_array($id, $old_themes))
-						unset($theme_paths[$id]);
+					{
+											unset($theme_paths[$id]);
+					}
 				}
 			}
 		}
@@ -1223,8 +1362,9 @@ 
 				'form_elements_only' => true,
 			);
 		}
-		else
-			$context['ftp_connected'] = true;
+		else {
+					$context['ftp_connected'] = true;
+		}
 
 		// Define the template.
 		$context['page_title'] = $txt['package_file_perms'];
@@ -1336,14 +1476,18 @@ 
 			unset($context['file_tree'][strtr(BOARDDIR, array('\\' => '/'))]['contents']['attachments']);
 
 			if (!is_array($modSettings['attachmentUploadDir']))
-				$modSettings['attachmentUploadDir'] = Util::unserialize($modSettings['attachmentUploadDir']);
+			{
+							$modSettings['attachmentUploadDir'] = Util::unserialize($modSettings['attachmentUploadDir']);
+			}
 
 			// @todo Should we suggest non-current directories be read only?
 			foreach ($modSettings['attachmentUploadDir'] as $dir)
-				$context['file_tree'][strtr($dir, array('\\' => '/'))] = array(
+			{
+							$context['file_tree'][strtr($dir, array('\\' => '/'))] = array(
 					'type' => 'dir',
 					'writable_on' => 'restrictive',
 				);
+			}
 		}
 		elseif (substr($modSettings['attachmentUploadDir'], 0, strlen(BOARDDIR)) != BOARDDIR)
 		{
@@ -1388,7 +1532,9 @@ 
 		{
 			// Skip the default
 			if ($id == 1)
-				continue;
+			{
+							continue;
+			}
 
 			if (substr(strtolower(strtr($theme['theme_dir'], array('\\' => '/'))), 0, strlen(BOARDDIR) + 7) === strtolower(strtr(BOARDDIR, array('\\' => '/')) . '/themes'))
 			{
@@ -1420,30 +1566,40 @@ 
 
 		// If we're submitting then let's move on to another function to keep things cleaner..
 		if (isset($this->_req->post->action_changes))
-			return $this->action_perms_save();
+		{
+					return $this->action_perms_save();
+		}
 
 		$context['look_for'] = array();
 
 		// Are we looking for a particular tree - normally an expansion?
 		if (!empty($this->_req->query->find))
-			$context['look_for'][] = base64_decode($this->_req->query->find);
+		{
+					$context['look_for'][] = base64_decode($this->_req->query->find);
+		}
 
 		// Only that tree?
 		$context['only_find'] = isset($this->_req->query->xml) && !empty($this->_req->query->onlyfind) ? $this->_req->query->onlyfind : '';
 		if ($context['only_find'])
-			$context['look_for'][] = $context['only_find'];
+		{
+					$context['look_for'][] = $context['only_find'];
+		}
 
 		// Have we got a load of back-catalogue trees to expand from a submit etc?
 		if (!empty($this->_req->query->back_look))
 		{
 			$potententialTrees = json_decode(base64_decode($this->_req->query->back_look), true);
 			foreach ($potententialTrees as $tree)
-				$context['look_for'][] = $tree;
+			{
+							$context['look_for'][] = $tree;
+			}
 		}
 
 		// ... maybe posted?
 		if (!empty($this->_req->post->back_look))
-			$context['only_find'] = array_merge($context['only_find'], $this->_req->post->back_look);
+		{
+					$context['only_find'] = array_merge($context['only_find'], $this->_req->post->back_look);
+		}
 
 		$context['back_look_data'] = base64_encode(json_encode(array_slice($context['look_for'], 0, 15)));
 
@@ -1484,8 +1640,9 @@ 
 					'perms' => @fileperms($path),
 				);
 			}
-			else
-				unset($context['file_tree'][$path]);
+			else {
+							unset($context['file_tree'][$path]);
+			}
 		}
 
 		// Is this actually xml?
@@ -1512,7 +1669,9 @@ 
 
 		// Skipping use of FTP?
 		if (empty($package_ftp))
-			$context['skip_ftp'] = true;
+		{
+					$context['skip_ftp'] = true;
+		}
 
 		// We'll start off in a good place, security. Make sure that if we're dealing with individual files that they seem in the right place.
 		if ($context['method'] === 'individual')
@@ -1523,7 +1682,9 @@ 
 
 			// Continuing?
 			if (isset($this->_req->post->toProcess))
-				$this->_req->post->permStatus = json_decode(base64_decode($this->_req->post->toProcess), true);
+			{
+							$this->_req->post->permStatus = json_decode(base64_decode($this->_req->post->toProcess), true);
+			}
 
 			if (isset($this->_req->post->permStatus))
 			{
@@ -1533,22 +1694,32 @@ 
 				{
 					// Nothing to see here?
 					if ($status === 'no_change')
-						continue;
+					{
+											continue;
+					}
 
 					$legal = false;
 					foreach ($legal_roots as $root)
-						if (substr($path, 0, strlen($root)) == $root)
+					{
+											if (substr($path, 0, strlen($root)) == $root)
 							$legal = true;
+					}
 
 					if (!$legal)
-						continue;
+					{
+											continue;
+					}
 
 					// Check it exists.
 					if (!file_exists($path))
-						continue;
+					{
+											continue;
+					}
 
 					if ($status === 'custom')
-						$validate_custom = true;
+					{
+											$validate_custom = true;
+					}
 
 					// Now add it.
 					$context['to_process'][$path] = $status;
@@ -1559,16 +1730,21 @@ 
 				if ($validate_custom)
 				{
 					if (!preg_match('~^[4567][4567][4567]$~', $context['custom_value']))
-						throw new Elk_Exception($txt['chmod_value_invalid']);
+					{
+											throw new Elk_Exception($txt['chmod_value_invalid']);
+					}
 				}
 
 				// Nothing to do?
 				if (empty($context['to_process']))
-					redirectexit('action=admin;area=packages;sa=perms' . (!empty($context['back_look_data']) ? ';back_look=' . base64_encode(json_encode($context['back_look_data'])) : '') . ';' . $context['session_var'] . '=' . $context['session_id']);
+				{
+									redirectexit('action=admin;area=packages;sa=perms' . (!empty($context['back_look_data']) ? ';back_look=' . base64_encode(json_encode($context['back_look_data'])) : '') . ';' . $context['session_var'] . '=' . $context['session_id']);
+				}
 			}
 			// Should never get here,
-			else
-				throw new Elk_Exception('no_access', false);
+			else {
+							throw new Elk_Exception('no_access', false);
+			}
 
 			// Setup the custom value.
 			$custom_value = octdec('0' . $context['custom_value']);
@@ -1577,7 +1753,9 @@ 
 			foreach ($context['to_process'] as $path => $status)
 			{
 				if (in_array($status, array('execute', 'writable', 'read')))
-					package_chmod($path, $status);
+				{
+									package_chmod($path, $status);
+				}
 				elseif ($status === 'custom' && !empty($custom_value))
 				{
 					// Use FTP if we have it.
@@ -1586,8 +1764,9 @@ 
 						$ftp_file = strtr($path, array($_SESSION['pack_ftp']['root'] => ''));
 						$package_ftp->chmod($ftp_file, $custom_value);
 					}
-					else
-						@chmod($path, $custom_value);
+					else {
+											@chmod($path, $custom_value);
+					}
 				}
 
 				// This fish is fried...
@@ -1595,7 +1774,9 @@ 
 
 				// See if we're out of time?
 				if (time() - array_sum(explode(' ', $time_start)) > $timeout_limit)
-					pausePermsSave();
+				{
+									pausePermsSave();
+				}
 			}
 		}
 		// If predefined this is a little different.
@@ -1626,13 +1807,18 @@ 
 				$context['special_files'] = array();
 
 				foreach ($context['file_tree'] as $path => $data)
-					$this->build_special_files__recursive($path, $data);
+				{
+									$this->build_special_files__recursive($path, $data);
+				}
 			}
 			// Free doesn't need special files.
 			elseif ($context['predefined_type'] === 'free')
-				$context['special_files'] = array();
-			else
-				$context['special_files'] = json_decode(base64_decode($this->_req->post->specialFiles), true);
+			{
+							$context['special_files'] = array();
+			}
+			else {
+							$context['special_files'] = json_decode(base64_decode($this->_req->post->specialFiles), true);
+			}
 
 			// Now we definitely know where we are, we need to go through again doing the chmod!
 			foreach ($context['directory_list'] as $path => $dummy)
@@ -1688,7 +1874,9 @@ 
 
 				// See if we're out of time?
 				if (time() - array_sum(explode(' ', $time_start)) > $timeout_limit)
-					pausePermsSave();
+				{
+									pausePermsSave();
+				}
 			}
 		}
 
@@ -1707,12 +1895,16 @@ 
 		global $context;
 
 		if (!empty($data['writable_on']))
-			if ($context['predefined_type'] === 'standard' || $data['writable_on'] === 'restrictive')
+		{
+					if ($context['predefined_type'] === 'standard' || $data['writable_on'] === 'restrictive')
 				$context['special_files'][$path] = 1;
+		}
 
 		if (!empty($data['contents']))
-			foreach ($data['contents'] as $name => $contents)
+		{
+					foreach ($data['contents'] as $name => $contents)
 				$this->build_special_files__recursive($path . '/' . $name, $contents);
+		}
 	}
 
 	/**
@@ -1771,23 +1963,33 @@ 
 
 		// Start things up
 		if (!isset($packages[$params]))
-			$packages[$params] = array();
+		{
+					$packages[$params] = array();
+		}
 
 		// We need the packages directory to be writable for this.
 		if (!@is_writable(BOARDDIR . '/packages'))
-			create_chmod_control(array(BOARDDIR . '/packages'), array('destination_url' => $scripturl . '?action=admin;area=packages', 'crash_on_error' => true));
+		{
+					create_chmod_control(array(BOARDDIR . '/packages'), array('destination_url' => $scripturl . '?action=admin;area=packages', 'crash_on_error' => true));
+		}
 
 		list ($the_brand, $the_version) = explode(' ', FORUM_VERSION, 2);
 
 		// Here we have a little code to help those who class themselves as something of gods, version emulation ;)
 		if (isset($this->_req->query->version_emulate) && strtr($this->_req->query->version_emulate, array($the_brand => '')) == $the_version)
-			unset($_SESSION['version_emulate']);
+		{
+					unset($_SESSION['version_emulate']);
+		}
 		elseif (isset($this->_req->query->version_emulate))
 		{
 			if (($this->_req->query->version_emulate === 0 || $this->_req->query->version_emulate === FORUM_VERSION) && isset($this->_req->session->version_emulate))
-				unset($_SESSION['version_emulate']);
+			{
+							unset($_SESSION['version_emulate']);
+			}
 			elseif ($this->_req->query->version_emulate !== 0)
-				$_SESSION['version_emulate'] = strtr($this->_req->query->version_emulate, array('-' => ' ', '+' => ' ', $the_brand . ' ' => ''));
+			{
+							$_SESSION['version_emulate'] = strtr($this->_req->query->version_emulate, array('-' => ' ', '+' => ' ', $the_brand . ' ' => ''));
+			}
 		}
 
 		if (!empty($_SESSION['version_emulate']))
@@ -1797,7 +1999,9 @@ 
 		}
 
 		if (isset($_SESSION['single_version_emulate']))
-			unset($_SESSION['single_version_emulate']);
+		{
+					unset($_SESSION['single_version_emulate']);
+		}
 
 		if (empty($instadds))
 		{
@@ -1806,10 +2010,12 @@ 
 
 			// Look through the list of installed mods...
 			foreach ($instadds as $installed_add)
-				$installed_adds[$installed_add['package_id']] = array(
+			{
+							$installed_adds[$installed_add['package_id']] = array(
 					'id' => $installed_add['id'],
 					'version' => $installed_add['version'],
 				);
+			}
 
 			// Get a list of all the ids installed, so the latest packages won't include already installed ones.
 			$context['installed_adds'] = array_keys($installed_adds);
@@ -1834,8 +2040,10 @@ 
 		}
 
 		if (empty($packages))
-			foreach ($context['package_types'] as $type)
+		{
+					foreach ($context['package_types'] as $type)
 				$packages[$type] = array();
+		}
 
 		try
 		{
@@ -1853,32 +2061,42 @@ 
 			foreach ($filtered_dir as $package)
 			{
 				foreach ($context['package_types'] as $type)
-					if (isset($context['available_' . $type][md5($package->getFilename())]))
+				{
+									if (isset($context['available_' . $type][md5($package->getFilename())]))
 						continue 2;
+				}
 
 				// Skip directories or files that are named the same.
 				if ($package->isDir())
 				{
 					if (in_array($package, $dirs))
-						continue;
+					{
+											continue;
+					}
 					$dirs[] = $package;
 				}
 				elseif (substr(strtolower($package->getFilename()), -7) === '.tar.gz')
 				{
 					if (in_array(substr($package, 0, -7), $dirs))
-						continue;
+					{
+											continue;
+					}
 					$dirs[] = substr($package, 0, -7);
 				}
 				elseif (strtolower($package->getExtension()) === 'zip' || strtolower($package->getExtension()) === 'tgz')
 				{
 					if (in_array(substr($package->getBasename(), 0, -4), $dirs))
-						continue;
+					{
+											continue;
+					}
 					$dirs[] = substr($package->getBasename(), 0, -4);
 				}
 
 				$packageInfo = getPackageInfo($package->getFilename());
 				if (!is_array($packageInfo))
-					continue;
+				{
+									continue;
+				}
 
 				if (!empty($packageInfo))
 				{
@@ -1931,9 +2149,11 @@ 
 						{
 							// Even if it is for this ElkArte, is it for the installed version of the mod?
 							if (!$upgrade->exists('@for') || matchPackageVersion($the_version, $upgrade->fetch('@for')))
-								if (!$upgrade->exists('@from') || matchPackageVersion($installed_adds[$packageInfo['id']]['version'], $upgrade->fetch('@from')))
+							{
+															if (!$upgrade->exists('@from') || matchPackageVersion($installed_adds[$packageInfo['id']]['version'], $upgrade->fetch('@from')))
 								{
 									$packageInfo['can_upgrade'] = true;
+							}
 									break;
 								}
 						}
@@ -2022,9 +2242,12 @@ 
 		}
 
 		if (isset($this->_req->query->desc))
-			krsort($packages[$params]);
-		else
-			ksort($packages[$params]);
+		{
+					krsort($packages[$params]);
+		}
+		else {
+					ksort($packages[$params]);
+		}
 
 		return $packages[$params];
 	}
@@ -2049,21 +2272,29 @@ 
 	foreach ($context['look_for'] as $possiblePath)
 	{
 		if (substr($possiblePath, 0, strlen($path)) == $path)
-			$isLikelyPath = true;
+		{
+					$isLikelyPath = true;
+		}
 	}
 
 	// Is this where we stop?
 	if (isset($_GET['xml']) && !empty($context['look_for']) && !$isLikelyPath)
-		return;
+	{
+			return;
+	}
 	elseif ($level > $context['default_level'] && !$isLikelyPath)
-		return;
+	{
+			return;
+	}
 
 	// Are we actually interested in saving this data?
 	$save_data = empty($context['only_find']) || $context['only_find'] == $path;
 
 	// @todo Shouldn't happen - but better error message?
 	if (!is_dir($path))
-		throw new Elk_Exception('no_access', false);
+	{
+			throw new Elk_Exception('no_access', false);
+	}
 
 	// This is where we put stuff we've found for sorting.
 	$foundData = array(
@@ -2081,10 +2312,14 @@ 
 			{
 				// Are we listing PHP files in this directory?
 				if ($save_data && !empty($data['list_contents']) && $entry->getExtension() === 'php')
-					$foundData['files'][$entry->getFilename()] = true;
+				{
+									$foundData['files'][$entry->getFilename()] = true;
+				}
 				// A file we were looking for.
 				elseif ($save_data && isset($data['contents'][$entry->getFilename()]))
-					$foundData['files'][$entry->getFilename()] = true;
+				{
+									$foundData['files'][$entry->getFilename()] = true;
+				}
 			}
 			// It's a directory - we're interested one way or another, probably...
 			elseif ($entry->isDir())
@@ -2097,23 +2332,30 @@ 
 								&& $data['contents'][$entry->getFilename()]['type'] === 'dir_recursive'))))
 				{
 					if (!isset($data['contents'][$entry->getFilename()]))
-						$foundData['folders'][$entry->getFilename()] = 'dir_recursive';
-					else
-						$foundData['folders'][$entry->getFilename()] = true;
+					{
+											$foundData['folders'][$entry->getFilename()] = 'dir_recursive';
+					}
+					else {
+											$foundData['folders'][$entry->getFilename()] = true;
+					}
 
 					// If this wasn't expected inherit the recusiveness...
 					if (!isset($data['contents'][$entry->getFilename()]))
-						// We need to do this as we will be going all recursive.
+					{
+											// We need to do this as we will be going all recursive.
 						$data['contents'][$entry->getFilename()] = array(
 							'type' => 'dir_recursive',
 						);
+					}
 
 					// Actually do the recursive stuff...
 					fetchPerms__recursive($entry->getPathname(), $data['contents'][$entry->getFilename()], $level + 1);
 				}
 				// Maybe it is a folder we are not descending into.
 				elseif (isset($data['contents'][$entry->getFilename()]))
-					$foundData['folders'][$entry->getFilename()] = true;
+				{
+									$foundData['folders'][$entry->getFilename()] = true;
+				}
 				// Otherwise we stop here.
 			}
 		}
@@ -2125,7 +2367,9 @@ 
 
 	// Nothing to see here?
 	if (!$save_data)
-		return;
+	{
+			return;
+	}
 
 	// Now actually add the data, starting with the folders.
 	uksort($foundData['folders'], 'strcasecmp');
@@ -2138,7 +2382,9 @@ 
 			),
 		);
 		if ($type !== true)
-			$additional_data['type'] = $type;
+		{
+					$additional_data['type'] = $type;
+		}
 
 		// If there's an offset ignore any folders in XML mode.
 		if (isset($_GET['xml']) && $context['file_offset'] == 0)
@@ -2161,9 +2407,12 @@ 
 		elseif (!isset($_GET['xml']))
 		{
 			if (isset($data['contents'][$folder]))
-				$data['contents'][$folder] = array_merge($data['contents'][$folder], $additional_data);
-			else
-				$data['contents'][$folder] = $additional_data;
+			{
+							$data['contents'][$folder] = array_merge($data['contents'][$folder], $additional_data);
+			}
+			else {
+							$data['contents'][$folder] = $additional_data;
+			}
 		}
 	}
 
@@ -2176,11 +2425,15 @@ 
 
 		// Have we reached our offset?
 		if ($context['file_offset'] > $counter)
-			continue;
+		{
+					continue;
+		}
 
 		// Gone too far?
 		if ($counter > ($context['file_offset'] + $context['file_limit']))
-			continue;
+		{
+					continue;
+		}
 
 		$additional_data = array(
 			'perms' => array(
@@ -2210,9 +2463,12 @@ 
 		elseif ($counter != ($context['file_offset'] + $context['file_limit']))
 		{
 			if (isset($data['contents'][$file]))
-				$data['contents'][$file] = array_merge($data['contents'][$file], $additional_data);
-			else
-				$data['contents'][$file] = $additional_data;
+			{
+							$data['contents'][$file] = array_merge($data['contents'][$file], $additional_data);
+			}
+			else {
+							$data['contents'][$file] = $additional_data;
+			}
 		}
 	}
 }

Spacing +3 added lines, -3 removed lines

@@ -935,7 +935,7 @@ 
 							'style' => 'width: 25%;',
 						),
 						'data' => array(
-							'function' => function ($package_md5) use ($type)  {
+							'function' => function($package_md5) use ($type)  {
 								global $context;
 
 								if (isset($context['available_' . $type . ''][$package_md5]))
@@ -955,7 +955,7 @@ 
 							'style' => 'width: 25%;',
 						),
 						'data' => array(
-							'function' => function ($package_md5) use ($type)  {
+							'function' => function($package_md5) use ($type)  {
 								global $context;
 
 								if (isset($context['available_' . $type . ''][$package_md5]))
@@ -974,7 +974,7 @@ 
 							'value' => '',
 						),
 						'data' => array(
-							'function' => function ($package_md5) use ($type) {
+							'function' => function($package_md5) use ($type) {
 								global $context, $scripturl, $txt;
 
 								if (!isset($context['available_' . $type . ''][$package_md5]))

sources/admin/PackageActions.class.php

Braces +102 added lines, -39 removed lines

@@ -255,11 +255,17 @@ 
 		$type = 'package_' . $this->_action['type'];
 
 		if (file_exists(BOARDDIR . '/packages/temp/' . $this->_base_path . $this->_action['filename']))
-			$context[$type] = htmlspecialchars(trim(file_get_contents(BOARDDIR . '/packages/temp/' . $this->_base_path . $this->_action['filename']), "\n\r"), ENT_COMPAT, 'UTF-8');
+		{
+					$context[$type] = htmlspecialchars(trim(file_get_contents(BOARDDIR . '/packages/temp/' . $this->_base_path . $this->_action['filename']), "\n\r"), ENT_COMPAT, 'UTF-8');
+		}
 		elseif (file_exists($this->_action['filename']))
-			$context[$type] = htmlspecialchars(trim(file_get_contents($this->_action['filename']), "\n\r"), ENT_COMPAT, 'UTF-8');
+		{
+					$context[$type] = htmlspecialchars(trim(file_get_contents($this->_action['filename']), "\n\r"), ENT_COMPAT, 'UTF-8');
+		}
 		elseif (file_exists(BOARDDIR . '/packages/temp/' . $this->_action['filename']))
-			$context[$type] = htmlspecialchars(trim(file_get_contents(BOARDDIR . '/packages/temp/' . $this->_action['filename']), "\n\r"), ENT_COMPAT, 'UTF-8');
+		{
+					$context[$type] = htmlspecialchars(trim(file_get_contents(BOARDDIR . '/packages/temp/' . $this->_action['filename']), "\n\r"), ENT_COMPAT, 'UTF-8');
+		}
 
 		// Fancy or plain
 		if (!empty($this->_action['parse_bbc']))
@@ -271,8 +277,9 @@ 
 
 			$context[$type] = $bbc_parser->parsePackage($context[$type]);
 		}
-		else
-			$context[$type] = nl2br($context[$type]);
+		else {
+					$context[$type] = nl2br($context[$type]);
+		}
 	}
 
 	/**
@@ -301,9 +308,13 @@ 
 		$this->has_failure = true;
 
 		if (isset($this->_action['error_msg']) && isset($this->_action['error_var']))
-			$this->failure_details = sprintf($txt['package_will_fail_' . $this->_action['error_msg']], $this->_action['error_var']);
+		{
+					$this->failure_details = sprintf($txt['package_will_fail_' . $this->_action['error_msg']], $this->_action['error_var']);
+		}
 		elseif (isset($this->_action['error_msg']))
-			$this->failure_details = isset($txt['package_will_fail_' . $this->_action['error_msg']]) ? $txt['package_will_fail_' . $this->_action['error_msg']] : $this->_action['error_msg'];
+		{
+					$this->failure_details = isset($txt['package_will_fail_' . $this->_action['error_msg']]) ? $txt['package_will_fail_' . $this->_action['error_msg']] : $this->_action['error_msg'];
+		}
 	}
 
 	/**
@@ -332,7 +343,9 @@ 
 			$mod_actions = parseModification(@file_get_contents(BOARDDIR . '/packages/temp/' . $this->_base_path . $this->_action['filename']), true, $this->_action['reverse'], $this->_theme_paths);
 
 			if (count($mod_actions) === 1 && isset($mod_actions[0]) && $mod_actions[0]['type'] === 'error' && $mod_actions[0]['filename'] === '-')
-				$mod_actions[0]['filename'] = $this->_action['filename'];
+			{
+							$mod_actions[0]['filename'] = $this->_action['filename'];
+			}
 
 			foreach ($mod_actions as $key => $mod_action)
 			{
@@ -360,11 +373,15 @@ 
 					);
 
 					if (empty($mod_action['is_custom']))
-						$this->ourActions[$this->_actual_filename]['operations'][] = $summary;
+					{
+											$this->ourActions[$this->_actual_filename]['operations'][] = $summary;
+					}
 
 					// Themes are under the saved type.
 					if (isset($mod_action['is_custom']) && isset($context['theme_actions'][$mod_action['is_custom']]))
-						$context['theme_actions'][$mod_action['is_custom']]['actions'][$this->_actual_filename]['operations'][] = $summary;
+					{
+											$context['theme_actions'][$mod_action['is_custom']]['actions'][$this->_actual_filename]['operations'][] = $summary;
+					}
 				}
 			}
 		}
@@ -380,11 +397,16 @@ 
 	{
 		// Lets get the last section of the file name.
 		if (isset($mod_action['filename']) && substr($mod_action['filename'], -13) !== '.template.php')
-			$this->_actual_filename = strtolower(substr(strrchr($mod_action['filename'], '/'), 1) . '||' . $this->_action['filename']);
+		{
+					$this->_actual_filename = strtolower(substr(strrchr($mod_action['filename'], '/'), 1) . '||' . $this->_action['filename']);
+		}
 		elseif (isset($mod_action['filename']) && preg_match('~([\w]*)/([\w]*)\.template\.php$~', $mod_action['filename'], $matches))
-			$this->_actual_filename = strtolower($matches[1] . '/' . $matches[2] . '.template.php||' . $this->_action['filename']);
-		else
-			$this->_actual_filename = $key;
+		{
+					$this->_actual_filename = strtolower($matches[1] . '/' . $matches[2] . '.template.php||' . $this->_action['filename']);
+		}
+		else {
+					$this->_actual_filename = $key;
+		}
 	}
 
 	/**
@@ -403,7 +425,9 @@ 
 				break;
 			case 'failure':
 				if (empty($mod_action['is_custom']))
-					$this->has_failure = true;
+				{
+									$this->has_failure = true;
+				}
 
 				$this->_failure = true;
 				break;
@@ -414,13 +438,16 @@ 
 				if (!empty($mod_action['is_custom']))
 				{
 					if (!isset($context['theme_actions'][$mod_action['is_custom']]))
-						$context['theme_actions'][$mod_action['is_custom']] = array(
+					{
+											$context['theme_actions'][$mod_action['is_custom']] = array(
 							'name' => $this->_theme_paths[$mod_action['is_custom']]['name'],
 							'actions' => array(),
 							'has_failure' => $this->_failure,
 						);
-					else
-						$context['theme_actions'][$mod_action['is_custom']]['has_failure'] |= $this->_failure;
+					}
+					else {
+											$context['theme_actions'][$mod_action['is_custom']]['has_failure'] |= $this->_failure;
+					}
 
 					$context['theme_actions'][$mod_action['is_custom']]['actions'][$this->_actual_filename] = array(
 						'type' => $txt['execute_modification'],
@@ -530,7 +557,9 @@ 
 		$this->_action['description'] = !isset($this->_action['hook'], $this->_action['function']) ? $txt['package_action_failure'] : $txt['package_action_success'];
 
 		if (!isset($this->_action['hook'], $this->_action['function']))
-			$this->has_failure = true;
+		{
+					$this->has_failure = true;
+		}
 
 		$this->thisAction = array(
 			'type' => $this->_action['reverse'] ? $txt['execute_hook_remove'] : $txt['execute_hook_add'],
@@ -563,7 +592,9 @@ 
 
 		// Package missing required values?
 		if (!isset($this->_action['id']))
-			$this->has_failure = true;
+		{
+					$this->has_failure = true;
+		}
 		else
 		{
 			// See if this dependency is installed
@@ -599,7 +630,9 @@ 
 
 		// Could this be theme related?
 		if (!empty($this->_action['unparsed_destination']))
-			$this->_check_theme_actions($this->_action['unparsed_destination']);
+		{
+					$this->_check_theme_actions($this->_action['unparsed_destination']);
+		}
 	}
 
 	/**
@@ -633,7 +666,9 @@ 
 
 		// Could this be theme related?
 		if (!empty($this->_action['unparsed_filename']))
-			$this->_check_theme_actions($this->_action['unparsed_filename'], true);
+		{
+					$this->_check_theme_actions($this->_action['unparsed_filename'], true);
+		}
 	}
 
 	/**
@@ -651,21 +686,31 @@ 
 
 			// Need to set it?
 			if ($set_destination)
-				$this->_action['unparsed_destination'] = $this->_action['unparsed_filename'];
+			{
+							$this->_action['unparsed_destination'] = $this->_action['unparsed_filename'];
+			}
 
 			// If it's not auto do we think we have something we can act upon?
 			if ($theme_action !== 'auto' && !in_array($matches[1], array('languagedir', 'languages_dir', 'imagesdir', 'themedir')))
-				$theme_action = '';
+			{
+							$theme_action = '';
+			}
 			// ... or if it's auto do we even want to do anything?
 			elseif ($theme_action === 'auto' && $matches[1] !== 'imagesdir')
-				$theme_action = '';
+			{
+							$theme_action = '';
+			}
 
 			// So, we still want to do something?
 			if ($theme_action != '')
-				$this->themeFinds['candidates'][] = $this->_action;
+			{
+							$this->themeFinds['candidates'][] = $this->_action;
+			}
 			// Otherwise is this is going into another theme record it.
 			elseif ($matches[1] === 'themes_dir')
-				$this->themeFinds['other_themes'][] = strtolower(strtr(parse_path($destination), array('\\' => '/')) . '/' . basename($this->_action['filename']));
+			{
+							$this->themeFinds['other_themes'][] = strtolower(strtr(parse_path($destination), array('\\' => '/')) . '/' . basename($this->_action['filename']));
+			}
 		}
 	}
 
@@ -678,14 +723,19 @@ 
 
 		// Now prepare things for the template.
 		if (empty($this->thisAction))
-			return;
+		{
+					return;
+		}
 
 		if (isset($this->_action['filename']))
 		{
 			if ($this->_uninstalling)
-				$file = in_array($this->_action['type'], array('remove-dir', 'remove-file')) ? $this->_action['filename'] : BOARDDIR . '/packages/temp/' . $this->_base_path . $this->_action['filename'];
-			else
-				$file = BOARDDIR . '/packages/temp/' . $this->_base_path . $this->_action['filename'];
+			{
+							$file = in_array($this->_action['type'], array('remove-dir', 'remove-file')) ? $this->_action['filename'] : BOARDDIR . '/packages/temp/' . $this->_base_path . $this->_action['filename'];
+			}
+			else {
+							$file = BOARDDIR . '/packages/temp/' . $this->_base_path . $this->_action['filename'];
+			}
 
 			if (!file_exists($file))
 			{
@@ -700,7 +750,9 @@ 
 
 		// @todo None given?
 		if (empty($this->thisAction['description']))
-			$this->thisAction['description'] = isset($this->_action['description']) ? $this->_action['description'] : '';
+		{
+					$this->thisAction['description'] = isset($this->_action['description']) ? $this->_action['description'] : '';
+		}
 
 		$this->ourActions[] = $this->thisAction;
 	}
@@ -763,16 +815,20 @@ 
 			foreach ($mod_actions as $key => $action)
 			{
 				if ($this->_action['type'] === 'failure')
-					$this->failed_steps[] = array(
+				{
+									$this->failed_steps[] = array(
 						'file' => $action['filename'],
 						'large_step' => $this->_failed_count,
 						'sub_step' => $key,
 						'theme' => 1,
 					);
+				}
 
 				// Gather the themes we installed into.
 				if (!empty($this->_action['is_custom']))
-					$this->themes_installed[] = $this->_action['is_custom'];
+				{
+									$this->themes_installed[] = $this->_action['is_custom'];
+				}
 			}
 		}
 	}
@@ -789,7 +845,9 @@ 
 
 			// Now include the file and be done with it ;).
 			if (file_exists(BOARDDIR . '/packages/temp/' . $this->_base_path . $this->_action['filename']))
-				require(BOARDDIR . '/packages/temp/' . $this->_base_path . $this->_action['filename']);
+			{
+							require(BOARDDIR . '/packages/temp/' . $this->_base_path . $this->_action['filename']);
+			}
 		}
 	}
 
@@ -818,9 +876,12 @@ 
 		if (isset($this->_action['hook'], $this->_action['function']))
 		{
 			if ($this->_action['reverse'])
-				remove_integration_function($this->_action['hook'], $this->_action['function'], $this->_action['include_file']);
-			else
-				add_integration_function($this->_action['hook'], $this->_action['function'], $this->_action['include_file']);
+			{
+							remove_integration_function($this->_action['hook'], $this->_action['function'], $this->_action['include_file']);
+			}
+			else {
+							add_integration_function($this->_action['hook'], $this->_action['function'], $this->_action['include_file']);
+			}
 		}
 	}
 
@@ -837,7 +898,9 @@ 
 
 			// Let the file work its magic ;)
 			if (file_exists(BOARDDIR . '/packages/temp/' . $this->_base_path . $this->_action['filename']))
-				require(BOARDDIR . '/packages/temp/' . $this->_base_path . $this->_action['filename']);
+			{
+							require(BOARDDIR . '/packages/temp/' . $this->_base_path . $this->_action['filename']);
+			}
 		}
 	}
 

sources/admin/ManageAttachments.controller.php

Braces +258 added lines, -100 removed lines

@@ -188,13 +188,17 @@ 
 
 			// Default/Manual implies no subdirectories
 			if (empty($this->_req->post->automanage_attachments))
-				$this->_req->post->use_subdirectories_for_attachments = 0;
+			{
+							$this->_req->post->use_subdirectories_for_attachments = 0;
+			}
 
 			// Changing the attachment upload directory
 			if (isset($this->_req->post->attachmentUploadDir))
 			{
 				if (!empty($this->_req->post->attachmentUploadDir) && file_exists($modSettings['attachmentUploadDir']) && $modSettings['attachmentUploadDir'] != $this->_req->post->attachmentUploadDir)
-					rename($modSettings['attachmentUploadDir'], $this->_req->post->attachmentUploadDir);
+				{
+									rename($modSettings['attachmentUploadDir'], $this->_req->post->attachmentUploadDir);
+				}
 
 				$modSettings['attachmentUploadDir'] = array(1 => $this->_req->post->attachmentUploadDir);
 				$this->_req->post->attachmentUploadDir = serialize($modSettings['attachmentUploadDir']);
@@ -205,16 +209,21 @@ 
 			{
 				// Make sure we have a base directory defined
 				if (empty($this->_req->post->basedirectory_for_attachments))
-					$this->_req->post->basedirectory_for_attachments = !empty($modSettings['basedirectory_for_attachments']) ? ($modSettings['basedirectory_for_attachments']) : BOARDDIR;
+				{
+									$this->_req->post->basedirectory_for_attachments = !empty($modSettings['basedirectory_for_attachments']) ? ($modSettings['basedirectory_for_attachments']) : BOARDDIR;
+				}
 
 				// The current base directories that we know
 				if (!empty($modSettings['attachment_basedirectories']))
 				{
 					if (!is_array($modSettings['attachment_basedirectories']))
-						$modSettings['attachment_basedirectories'] = Util::unserialize($modSettings['attachment_basedirectories']);
+					{
+											$modSettings['attachment_basedirectories'] = Util::unserialize($modSettings['attachment_basedirectories']);
+					}
+				}
+				else {
+									$modSettings['attachment_basedirectories'] = array();
 				}
-				else
-					$modSettings['attachment_basedirectories'] = array();
 
 				// Trying to use a non existent base directory
 				if (!empty($this->_req->post->basedirectory_for_attachments) && !in_array($this->_req->post->basedirectory_for_attachments, $modSettings['attachment_basedirectories']))
@@ -225,7 +234,9 @@ 
 					if (!in_array($this->_req->post->basedirectory_for_attachments, $modSettings['attachmentUploadDir']))
 					{
 						if (!automanage_attachments_create_directory($this->_req->post->basedirectory_for_attachments))
-							$this->_req->post->basedirectory_for_attachments = $modSettings['basedirectory_for_attachments'];
+						{
+													$this->_req->post->basedirectory_for_attachments = $modSettings['basedirectory_for_attachments'];
+						}
 					}
 
 					// The base directory should be in our list of available bases
@@ -279,18 +290,25 @@ 
 
 		// First time here?
 		if (empty($modSettings['attachment_basedirectories']) && $modSettings['currentAttachmentUploadDir'] == 1 && (is_array($modSettings['attachmentUploadDir']) && count($modSettings['attachmentUploadDir']) == 1))
-			$modSettings['attachmentUploadDir'] = $modSettings['attachmentUploadDir'][1];
+		{
+					$modSettings['attachmentUploadDir'] = $modSettings['attachmentUploadDir'][1];
+		}
 
 		// If not set, show a default path for the base directory
 		if (!isset($this->_req->query->save) && empty($modSettings['basedirectory_for_attachments']))
-			$modSettings['basedirectory_for_attachments'] = $context['attachmentUploadDir'];
+		{
+					$modSettings['basedirectory_for_attachments'] = $context['attachmentUploadDir'];
+		}
 
 		$context['valid_upload_dir'] = is_dir($context['attachmentUploadDir']) && is_writable($context['attachmentUploadDir']);
 
 		if (!empty($modSettings['automanage_attachments']))
-			$context['valid_basedirectory'] = !empty($modSettings['basedirectory_for_attachments']) && is_writable($modSettings['basedirectory_for_attachments']);
-		else
-			$context['valid_basedirectory'] = true;
+		{
+					$context['valid_basedirectory'] = !empty($modSettings['basedirectory_for_attachments']) && is_writable($modSettings['basedirectory_for_attachments']);
+		}
+		else {
+					$context['valid_basedirectory'] = true;
+		}
 
 		// A bit of razzle dazzle with the $txt strings. :)
 		$txt['basedirectory_for_attachments_warning'] = str_replace('{attach_repair_url}', $scripturl . '?action=admin;area=manageattachments;sa=attachpaths', $txt['basedirectory_for_attachments_warning']);
@@ -437,27 +455,36 @@ 
 
 							// In case of a custom avatar URL attachments have a fixed directory.
 							if ($rowData['attachment_type'] == 1)
-								$link .= sprintf('%1$s/%2$s', $modSettings['custom_avatar_url'], $rowData['filename']);
+							{
+															$link .= sprintf('%1$s/%2$s', $modSettings['custom_avatar_url'], $rowData['filename']);
+							}
 
 							// By default avatars are downloaded almost as attachments.
 							elseif ($context['browse_type'] == 'avatars')
-								$link .= sprintf('%1$s?action=dlattach;type=avatar;attach=%2$d', $scripturl, $rowData['id_attach']);
+							{
+															$link .= sprintf('%1$s?action=dlattach;type=avatar;attach=%2$d', $scripturl, $rowData['id_attach']);
+							}
 
 							// Normal attachments are always linked to a topic ID.
-							else
-								$link .= sprintf('%1$s?action=dlattach;topic=%2$d.0;attach=%3$d', $scripturl, $rowData['id_topic'], $rowData['id_attach']);
+							else {
+															$link .= sprintf('%1$s?action=dlattach;topic=%2$d.0;attach=%3$d', $scripturl, $rowData['id_topic'], $rowData['id_attach']);
+							}
 
 							$link .= '"';
 
 							// Show a popup on click if it's a picture and we know its dimensions.
 							if (!empty($rowData['width']) && !empty($rowData['height']))
-								$link .= sprintf(' onclick="return reqWin(this.href' . ($rowData['attachment_type'] == 1 ? '' : ' + \';image\'') . ', %1$d, %2$d, true);"', $rowData['width'] + 20, $rowData['height'] + 20);
+							{
+															$link .= sprintf(' onclick="return reqWin(this.href' . ($rowData['attachment_type'] == 1 ? '' : ' + \';image\'') . ', %1$d, %2$d, true);"', $rowData['width'] + 20, $rowData['height'] + 20);
+							}
 
 							$link .= sprintf('>%1$s</a>', preg_replace('~&amp;#(\\\\d{1,7}|x[0-9a-fA-F]{1,6});~', '&#\\\\1;', htmlspecialchars($rowData['filename'], ENT_COMPAT, 'UTF-8')));
 
 							// Show the dimensions.
 							if (!empty($rowData['width']) && !empty($rowData['height']))
-								$link .= sprintf(' <span class="smalltext">%1$dx%2$d</span>', $rowData['width'], $rowData['height']);
+							{
+															$link .= sprintf(' <span class="smalltext">%1$dx%2$d</span>', $rowData['width'], $rowData['height']);
+							}
 
 							return $link;
 						},
@@ -493,11 +520,14 @@ 
 
 							// In case of an attachment, return the poster of the attachment.
 							if (empty($rowData['id_member']))
-								return htmlspecialchars($rowData['poster_name'], ENT_COMPAT, 'UTF-8');
+							{
+															return htmlspecialchars($rowData['poster_name'], ENT_COMPAT, 'UTF-8');
+							}
 
 							// Otherwise it must be an avatar, return the link to the owner of it.
-							else
-								return sprintf('<a href="%1$s?action=profile;u=%2$d">%3$s</a>', $scripturl, $rowData['id_member'], $rowData['poster_name']);
+							else {
+															return sprintf('<a href="%1$s?action=profile;u=%2$d">%3$s</a>', $scripturl, $rowData['id_member'], $rowData['poster_name']);
+							}
 						},
 					),
 					'sort' => array(
@@ -519,7 +549,9 @@ 
 
 							// Add a link to the topic in case of an attachment.
 							if ($context['browse_type'] !== 'avatars')
-								$date .= sprintf('<br />%1$s <a href="%2$s?topic=%3$d.msg%4$d#msg%4$d">%5$s</a>', $txt['in'], $scripturl, $rowData['id_topic'], $rowData['id_msg'], $rowData['subject']);
+							{
+															$date .= sprintf('<br />%1$s <a href="%2$s?topic=%3$d.msg%4$d#msg%4$d">%5$s</a>', $txt['in'], $scripturl, $rowData['id_topic'], $rowData['id_msg'], $rowData['subject']);
+							}
 
 							return $date;
 							},
@@ -634,11 +666,15 @@ 
 
 		// If they specified a limit only....
 		if (!empty($modSettings['attachmentDirSizeLimit']))
-			$context['attachment_space'] = comma_format(max($modSettings['attachmentDirSizeLimit'] - $current_dir['size'], 0), 2);
+		{
+					$context['attachment_space'] = comma_format(max($modSettings['attachmentDirSizeLimit'] - $current_dir['size'], 0), 2);
+		}
 		$context['attachment_current_size'] = byte_format($current_dir['size']);
 
 		if (!empty($modSettings['attachmentDirFileLimit']))
-			$context['attachment_files'] = comma_format(max($modSettings['attachmentDirFileLimit'] - $current_dir['files'], 0), 0);
+		{
+					$context['attachment_files'] = comma_format(max($modSettings['attachmentDirFileLimit'] - $current_dir['files'], 0), 0);
+		}
 		$context['attachment_current_files'] = comma_format($current_dir['files'], 0);
 
 		$context['attach_multiple_dirs'] = count($attach_dirs) > 1 ? true : false;
@@ -669,7 +705,9 @@ 
 
 			// Guess that didn't work?
 			if (!is_writable($modSettings['custom_avatar_dir']))
-				throw new Elk_Exception('attachments_no_write', 'critical');
+			{
+							throw new Elk_Exception('attachments_no_write', 'critical');
+			}
 		}
 
 		// Finally move the attachments..
@@ -699,7 +737,9 @@ 
 
 			// Update the messages to reflect the change.
 			if (!empty($messages) && !empty($this->_req->post->notice))
-				setRemovalNotice($messages, $this->_req->post->notice);
+			{
+							setRemovalNotice($messages, $this->_req->post->notice);
+			}
 		}
 		else
 		{
@@ -725,7 +765,9 @@ 
 
 		// And make a note on the post.
 		if (!empty($messages) && !empty($this->_req->post->notice))
-			setRemovalNotice($messages, $this->_req->post->notice);
+		{
+					setRemovalNotice($messages, $this->_req->post->notice);
+		}
 
 		redirectexit('action=admin;area=manageattachments;sa=maintenance');
 	}
@@ -746,10 +788,14 @@ 
 			// There must be a quicker way to pass this safety test??
 			$attachments = array();
 			foreach ($this->_req->post->remove as $removeID => $dummy)
-				$attachments[] = (int) $removeID;
+			{
+							$attachments[] = (int) $removeID;
+			}
 
 			if ($this->_req->query->type == 'avatars' && !empty($attachments))
-				removeAttachments(array('id_attach' => $attachments));
+			{
+							removeAttachments(array('id_attach' => $attachments));
+			}
 			elseif (!empty($attachments))
 			{
 				$messages = removeAttachments(array('id_attach' => $attachments), 'messages', true);
@@ -785,7 +831,9 @@ 
 
 		// Add the notice on the end of the changed messages.
 		if (!empty($messages))
-			setRemovalNotice($messages, $notice);
+		{
+					setRemovalNotice($messages, $notice);
+		}
 
 		redirectexit('action=admin;area=manageattachments;sa=maintenance');
 	}
@@ -815,7 +863,9 @@ 
 
 		// If we choose cancel, redirect right back.
 		if (isset($this->_req->post->cancel))
-			redirectexit('action=admin;area=manageattachments;sa=maintenance');
+		{
+					redirectexit('action=admin;area=manageattachments;sa=maintenance');
+		}
 
 		// Try give us a while to sort this out...
 		detectServer()->setTimeLimit(600);
@@ -834,10 +884,14 @@ 
 			{
 				// Nothing?
 				if (empty($this->_req->post->to_fix))
-					redirectexit('action=admin;area=manageattachments;sa=maintenance');
+				{
+									redirectexit('action=admin;area=manageattachments;sa=maintenance');
+				}
 
 				foreach ($this->_req->post->to_fix as $key => $value)
-					$_SESSION['attachments_to_fix'][] = $value;
+				{
+									$_SESSION['attachments_to_fix'][] = $value;
+				}
 			}
 		}
 
@@ -907,7 +961,9 @@ 
 				$repair_errors = repairAttachmentData($this->substep, $fix_errors, $to_fix);
 
 				foreach ($repair_errors as $key => $value)
-					$context['repair_errors'][$key] += $value;
+				{
+									$context['repair_errors'][$key] += $value;
+				}
 
 				$this->_pauseAttachmentMaintenance($to_fix, $thumbnails);
 			}
@@ -959,7 +1015,9 @@ 
 		{
 			// Just use the current path for temp files.
 			if (!is_array($modSettings['attachmentUploadDir']))
-				$modSettings['attachmentUploadDir'] = Util::unserialize($modSettings['attachmentUploadDir']);
+			{
+							$modSettings['attachmentUploadDir'] = Util::unserialize($modSettings['attachmentUploadDir']);
+			}
 
 			$attach_dirs = $modSettings['attachmentUploadDir'];
 			$current_check = 0;
@@ -974,7 +1032,9 @@ 
 					foreach ($files as $file)
 					{
 						if ($file->getFilename() === '.htaccess')
-							continue;
+						{
+													continue;
+						}
 
 						if ($files_checked <= $current_check)
 						{
@@ -983,7 +1043,9 @@ 
 							{
 								// Temp file is more than 5 hours old!
 								if ($file->getMTime() < time() - 18000)
-									@unlink($file->getPathname());
+								{
+																	@unlink($file->getPathname());
+								}
 							}
 							// That should be an attachment, let's check if we have it in the database
 							elseif (strpos($file->getFilename(), '_') !== false)
@@ -994,25 +1056,33 @@ 
 									if (!validateAttachID($attachID))
 									{
 										if ($fix_errors && in_array('files_without_attachment', $to_fix))
-											@unlink($file->getPathname());
-										else
-											$context['repair_errors']['files_without_attachment']++;
+										{
+																					@unlink($file->getPathname());
+										}
+										else {
+																					$context['repair_errors']['files_without_attachment']++;
+										}
 									}
 								}
 							}
 							elseif ($file->getFilename() !== 'index.php' && !$file->isDir())
 							{
 								if ($fix_errors && in_array('files_without_attachment', $to_fix))
-									@unlink($file->getPathname());
-								else
-									$context['repair_errors']['files_without_attachment']++;
+								{
+																	@unlink($file->getPathname());
+								}
+								else {
+																	$context['repair_errors']['files_without_attachment']++;
+								}
 							}
 						}
 						$current_check++;
 						$this->substep = (int) $current_check;
 
 						if ($current_check - $files_checked >= $max_checks)
-							$this->_pauseAttachmentMaintenance($to_fix);
+						{
+													$this->_pauseAttachmentMaintenance($to_fix);
+						}
 					}
 				}
 				catch (UnexpectedValueException $e)
@@ -1053,12 +1123,18 @@ 
 
 		// Since this needs to be done eventually.
 		if (!is_array($modSettings['attachmentUploadDir']))
-			$modSettings['attachmentUploadDir'] = Util::unserialize($modSettings['attachmentUploadDir']);
+		{
+					$modSettings['attachmentUploadDir'] = Util::unserialize($modSettings['attachmentUploadDir']);
+		}
 
 		if (!isset($modSettings['attachment_basedirectories']))
-			$modSettings['attachment_basedirectories'] = array();
+		{
+					$modSettings['attachment_basedirectories'] = array();
+		}
 		elseif (!is_array($modSettings['attachment_basedirectories']))
-			$modSettings['attachment_basedirectories'] = Util::unserialize($modSettings['attachment_basedirectories']);
+		{
+					$modSettings['attachment_basedirectories'] = Util::unserialize($modSettings['attachment_basedirectories']);
+		}
 
 		$errors = array();
 
@@ -1074,20 +1150,26 @@ 
 			$themes = installedThemes();
 			$reserved_dirs = array(BOARDDIR, SOURCEDIR, SUBSDIR, CONTROLLERDIR, CACHEDIR, EXTDIR, LANGUAGEDIR, ADMINDIR);
 			foreach ($themes as $theme)
-				$reserved_dirs[] = $theme['theme_dir'];
+			{
+							$reserved_dirs[] = $theme['theme_dir'];
+			}
 
 			foreach ($this->_req->post->dirs as $id => $path)
 			{
 				$error = '';
 				$id = (int) $id;
 				if ($id < 1)
-					continue;
+				{
+									continue;
+				}
 
 				$real_path = rtrim(trim($path), DIRECTORY_SEPARATOR);
 
 				// If it doesn't look like a directory, probably is not a directory
 				if (preg_match('~[/\\\\]~', $real_path) !== 1)
-					$real_path = realpath(BOARDDIR . DIRECTORY_SEPARATOR . ltrim($real_path, DIRECTORY_SEPARATOR));
+				{
+									$real_path = realpath(BOARDDIR . DIRECTORY_SEPARATOR . ltrim($real_path, DIRECTORY_SEPARATOR));
+				}
 
 				// Hmm, a new path maybe?
 				if (!array_key_exists($id, $modSettings['attachmentUploadDir']))
@@ -1108,9 +1190,12 @@ 
 
 					// OK, so let's try to create it then.
 					if (automanage_attachments_create_directory($path))
-						$this->current_dir = $modSettings['currentAttachmentUploadDir'];
-					else
-						$errors[] = $path . ': ' . $txt[$context['dir_creation_error']];
+					{
+											$this->current_dir = $modSettings['currentAttachmentUploadDir'];
+					}
+					else {
+											$errors[] = $path . ': ' . $txt[$context['dir_creation_error']];
+					}
 				}
 
 				// Changing a directory name?
@@ -1150,10 +1235,14 @@ 
 
 					// It's not a good idea to delete the current directory.
 					if ($id == (!empty($this->current_dir) ? $this->current_dir : $modSettings['currentAttachmentUploadDir']))
-						$errors[] = $real_path . ': ' . $txt['attach_dir_is_current'];
+					{
+											$errors[] = $real_path . ': ' . $txt['attach_dir_is_current'];
+					}
 					// Or the current base directory
 					elseif (!empty($modSettings['basedirectory_for_attachments']) && $modSettings['basedirectory_for_attachments'] == $modSettings['attachmentUploadDir'][$id])
-						$errors[] = $real_path . ': ' . $txt['attach_dir_is_current_bd'];
+					{
+											$errors[] = $real_path . ': ' . $txt['attach_dir_is_current_bd'];
+					}
 					else
 					{
 						// Let's not try to delete a path with files in it.
@@ -1164,15 +1253,19 @@ 
 						{
 							// Count any sub-folders.
 							foreach ($modSettings['attachmentUploadDir'] as $sub)
-								if (strpos($sub, $real_path . DIRECTORY_SEPARATOR) !== false)
+							{
+															if (strpos($sub, $real_path . DIRECTORY_SEPARATOR) !== false)
 									$num_attach++;
+							}
 						}
 
 						// It's safe to delete. So try to delete the folder also
 						if ($num_attach == 0)
 						{
 							if (is_dir($real_path))
-								$doit = true;
+							{
+															$doit = true;
+							}
 							elseif (is_dir(BOARDDIR . DIRECTORY_SEPARATOR . $real_path))
 							{
 								$doit = true;
@@ -1184,7 +1277,9 @@ 
 								unlink($real_path . '/.htaccess');
 								unlink($real_path . '/index.php');
 								if (!@rmdir($real_path))
-									$error = $real_path . ': ' . $txt['attach_dir_no_delete'];
+								{
+																	$error = $real_path . ': ' . $txt['attach_dir_no_delete'];
+								}
 							}
 
 							// Remove it from the base directory list.
@@ -1195,13 +1290,17 @@ 
 								$modSettings['attachment_basedirectories'] = Util::unserialize($modSettings['attachment_basedirectories']);
 							}
 						}
-						else
-							$error = $real_path . ': ' . $txt['attach_dir_no_remove'];
+						else {
+													$error = $real_path . ': ' . $txt['attach_dir_no_remove'];
+						}
 
 						if (empty($error))
-							continue;
-						else
-							$errors[] = $error;
+						{
+													continue;
+						}
+						else {
+													$errors[] = $error;
+						}
 					}
 				}
 
@@ -1210,22 +1309,29 @@ 
 
 			// We need to make sure the current directory is right.
 			if (empty($this->current_dir) && !empty($modSettings['currentAttachmentUploadDir']))
-				$this->current_dir = $modSettings['currentAttachmentUploadDir'];
+			{
+							$this->current_dir = $modSettings['currentAttachmentUploadDir'];
+			}
 
 			// Find the current directory if there's no value carried,
 			if (empty($this->current_dir) || empty($new_dirs[$this->current_dir]))
 			{
 				if (array_key_exists($modSettings['currentAttachmentUploadDir'], $modSettings['attachmentUploadDir']))
-					$this->current_dir = $modSettings['currentAttachmentUploadDir'];
-				else
-					$this->current_dir = max(array_keys($modSettings['attachmentUploadDir']));
+				{
+									$this->current_dir = $modSettings['currentAttachmentUploadDir'];
+				}
+				else {
+									$this->current_dir = max(array_keys($modSettings['attachmentUploadDir']));
+				}
 			}
 
 			// If the user wishes to go back, update the last_dir array
 			if ($this->current_dir != $modSettings['currentAttachmentUploadDir'] && !empty($modSettings['last_attachments_directory']) && (isset($modSettings['last_attachments_directory'][$this->current_dir]) || isset($modSettings['last_attachments_directory'][0])))
 			{
 				if (!is_array($modSettings['last_attachments_directory']))
-					$modSettings['last_attachments_directory'] = Util::unserialize($modSettings['last_attachments_directory']);
+				{
+									$modSettings['last_attachments_directory'] = Util::unserialize($modSettings['last_attachments_directory']);
+				}
 
 				$num = substr(strrchr($modSettings['attachmentUploadDir'][$this->current_dir], '_'), 1);
 				if (is_numeric($num))
@@ -1234,17 +1340,21 @@ 
 					$bid = -1;
 					$use_subdirectories_for_attachments = 0;
 					if (!empty($modSettings['attachment_basedirectories']))
-						foreach ($modSettings['attachment_basedirectories'] as $bid => $base)
+					{
+											foreach ($modSettings['attachment_basedirectories'] as $bid => $base)
 						{
 							if (strpos($modSettings['attachmentUploadDir'][$this->current_dir], $base . DIRECTORY_SEPARATOR) !== false)
 							{
 								$use_subdirectories_for_attachments = 1;
+					}
 								break;
 							}
 						}
 
 					if ($use_subdirectories_for_attachments == 0 && strpos($modSettings['attachmentUploadDir'][$this->current_dir], BOARDDIR . DIRECTORY_SEPARATOR) !== false)
-						$bid = 0;
+					{
+											$bid = 0;
+					}
 
 					$modSettings['last_attachments_directory'][$bid] = (int) $num;
 					$modSettings['basedirectory_for_attachments'] = !empty($modSettings['basedirectory_for_attachments']) ? $modSettings['basedirectory_for_attachments'] : '';
@@ -1264,7 +1374,9 @@ 
 				foreach ($new_dirs as $id => $dir)
 				{
 					if ($id != 1)
-						updateAttachmentIdFolder($id, 1);
+					{
+											updateAttachmentIdFolder($id, 1);
+					}
 
 					$update = array(
 						'currentAttachmentUploadDir' => 1,
@@ -1282,10 +1394,14 @@ 
 			}
 
 			if (!empty($update))
-				updateSettings($update);
+			{
+							updateSettings($update);
+			}
 
 			if (!empty($errors))
-				$_SESSION['errors']['dir'] = $errors;
+			{
+							$_SESSION['errors']['dir'] = $errors;
+			}
 
 			redirectexit('action=admin;area=manageattachments;sa=attachpaths;' . $context['session_var'] . '=' . $context['session_id']);
 		}
@@ -1300,9 +1416,11 @@ 
 			if (empty($this->_req->post->new_base_dir) && !empty($this->current_base_dir))
 			{
 				if ($modSettings['basedirectory_for_attachments'] != $modSettings['attachmentUploadDir'][$this->current_base_dir])
-					$update = (array(
+				{
+									$update = (array(
 						'basedirectory_for_attachments' => $modSettings['attachmentUploadDir'][$this->current_base_dir],
 					));
+				}
 			}
 
 			if (isset($this->_req->post->base_dir))
@@ -1350,12 +1468,16 @@ 
 				if (!in_array($this->_req->post->new_base_dir, $modSettings['attachmentUploadDir']))
 				{
 					if (!automanage_attachments_create_directory($this->_req->post->new_base_dir))
-						$errors[] = $this->_req->post->new_base_dir . ': ' . $txt['attach_dir_base_no_create'];
+					{
+											$errors[] = $this->_req->post->new_base_dir . ': ' . $txt['attach_dir_base_no_create'];
+					}
 				}
 
 				$modSettings['currentAttachmentUploadDir'] = array_search($this->_req->post->new_base_dir, $modSettings['attachmentUploadDir']);
 				if (!in_array($this->_req->post->new_base_dir, $modSettings['attachment_basedirectories']))
-					$modSettings['attachment_basedirectories'][$modSettings['currentAttachmentUploadDir']] = $this->_req->post->new_base_dir;
+				{
+									$modSettings['attachment_basedirectories'][$modSettings['currentAttachmentUploadDir']] = $this->_req->post->new_base_dir;
+				}
 				ksort($modSettings['attachment_basedirectories']);
 
 				$update = (array(
@@ -1366,10 +1488,14 @@ 
 			}
 
 			if (!empty($errors))
-				$_SESSION['errors']['base'] = $errors;
+			{
+							$_SESSION['errors']['base'] = $errors;
+			}
 
 			if (!empty($update))
-				updateSettings($update);
+			{
+							updateSettings($update);
+			}
 
 			redirectexit('action=admin;area=manageattachments;sa=attachpaths;' . $context['session_var'] . '=' . $context['session_id']);
 		}
@@ -1380,12 +1506,16 @@ 
 			{
 				$errors = array();
 				if (!empty($this->_req->session->errors['dir']))
-					foreach ($this->_req->session->errors['dir'] as $error)
+				{
+									foreach ($this->_req->session->errors['dir'] as $error)
 						$errors['dir'][] = Util::htmlspecialchars($error, ENT_QUOTES);
+				}
 
 				if (!empty($this->_req->session->errors['base']))
-					foreach ($this->_req->session->errors['base'] as $error)
+				{
+									foreach ($this->_req->session->errors['base'] as $error)
 						$errors['base'][] = Util::htmlspecialchars($error, ENT_QUOTES);
+				}
 			}
 			unset($_SESSION['errors'], $this->_req->session->errors);
 		}
@@ -1572,9 +1702,12 @@ 
 		// The list(s) of directory's that are available.
 		$modSettings['attachmentUploadDir'] = Util::unserialize($modSettings['attachmentUploadDir']);
 		if (!empty($modSettings['attachment_basedirectories']))
-			$modSettings['attachment_basedirectories'] = Util::unserialize($modSettings['attachment_basedirectories']);
-		else
-			$modSettings['basedirectory_for_attachments'] = array();
+		{
+					$modSettings['attachment_basedirectories'] = Util::unserialize($modSettings['attachment_basedirectories']);
+		}
+		else {
+					$modSettings['basedirectory_for_attachments'] = array();
+		}
 
 		// Clean the inputs
 		$this->from = $this->_req->getPost('from', 'intval');
@@ -1594,11 +1727,15 @@ 
 
 		// Need to know where we are moving things from
 		if (empty($this->from) || (empty($this->auto) && empty($this->to)))
-			$results[] = $txt['attachment_transfer_no_dir'];
+		{
+					$results[] = $txt['attachment_transfer_no_dir'];
+		}
 
 		// Same location, that's easy
 		if ($this->from == $this->to)
-			$results[] = $txt['attachment_transfer_same_dir'];
+		{
+					$results[] = $txt['attachment_transfer_same_dir'];
+		}
 
 		// No errors so determine how many we may have to move
 		if (empty($results))
@@ -1608,7 +1745,9 @@ 
 			$total_progress -= $start;
 
 			if ($total_progress < 1)
-				$results[] = $txt['attachment_transfer_no_find'];
+			{
+							$results[] = $txt['attachment_transfer_no_find'];
+			}
 		}
 
 		// Nothing to move (no files in source or below the max limit)
@@ -1628,8 +1767,9 @@ 
 				$new_dir = $modSettings['currentAttachmentUploadDir'];
 			}
 			// Or to a specified directory
-			else
-				$new_dir = $this->to;
+			else {
+							$new_dir = $this->to;
+			}
 
 			$modSettings['currentAttachmentUploadDir'] = $new_dir;
 			$break = false;
@@ -1652,13 +1792,17 @@ 
 				if ($tomove_count === 0)
 				{
 					if (empty($current_progress))
-						$results[] = $txt['attachment_transfer_no_find'];
+					{
+											$results[] = $txt['attachment_transfer_no_find'];
+					}
 					break;
 				}
 
 				// No more to move after this batch then set the finished flag.
 				if ($tomove_count < $limit)
-					$break = true;
+				{
+									$break = true;
+				}
 
 				// Move them
 				$moved = array();
@@ -1684,7 +1828,9 @@ 
 
 								$results[] = sprintf($txt['attachments_transfered'], $total_moved, $modSettings['attachmentUploadDir'][$new_dir]);
 								if (!empty($total_not_moved))
-									$results[] = sprintf($txt['attachments_not_transfered'], $total_not_moved);
+								{
+																	$results[] = sprintf($txt['attachments_not_transfered'], $total_not_moved);
+								}
 
 								$dir_files = 0;
 								$total_moved = 0;
@@ -1710,13 +1856,16 @@ 
 						$current_progress++;
 						$moved[] = $row['id_attach'];
 					}
-					else
-						$total_not_moved++;
+					else {
+											$total_not_moved++;
+					}
 				}
 
 				// Update the database to reflect the new file location
 				if (!empty($moved))
-					moveAttachments($moved, $new_dir);
+				{
+									moveAttachments($moved, $new_dir);
+				}
 
 				$new_dir = $modSettings['currentAttachmentUploadDir'];
 
@@ -1741,13 +1890,17 @@ 
 
 			$results[] = sprintf($txt['attachments_transfered'], $total_moved, $modSettings['attachmentUploadDir'][$new_dir]);
 			if (!empty($total_not_moved))
-				$results[] = sprintf($txt['attachments_not_transfered'], $total_not_moved);
+			{
+							$results[] = sprintf($txt['attachments_not_transfered'], $total_not_moved);
+			}
 		}
 
 		// All done, time to clean up
 		$_SESSION['results'] = $results;
 		if (file_exists(BOARDDIR . '/progress.php'))
-			unlink(BOARDDIR . '/progress.php');
+		{
+					unlink(BOARDDIR . '/progress.php');
+		}
 
 		redirectexit('action=admin;area=manageattachments;sa=maintenance#transfer');
 	}
@@ -1775,7 +1928,9 @@ 
 
 		// Have we already used our maximum time?
 		if (microtime(true) - $time_start < 3 || $this->starting_substep == $this->substep)
-			return;
+		{
+					return;
+		}
 
 		$context['continue_get_data'] = '?action=admin;area=manageattachments;sa=repair' . (isset($this->_req->query->fixErrors) ? ';fixErrors' : '') . ';step=' . $this->step . ';substep=' . $this->substep . ';' . $context['session_var'] . '=' . $context['session_id'];
 		$context['page_title'] = $txt['not_done_title'];
@@ -1788,9 +1943,12 @@ 
 
 		// Change these two if more steps are added!
 		if (empty($max_substep))
-			$context['continue_percent'] = round(($this->step * 100) / 25);
-		else
-			$context['continue_percent'] = round(($this->step * 100 + ($this->substep * 100) / $max_substep) / 25);
+		{
+					$context['continue_percent'] = round(($this->step * 100) / 25);
+		}
+		else {
+					$context['continue_percent'] = round(($this->step * 100 + ($this->substep * 100) / $max_substep) / 25);
+		}
 
 		// Never more than 100%!
 		$context['continue_percent'] = min($context['continue_percent'], 100);

Spacing +7 added lines, -7 removed lines

@@ -430,7 +430,7 @@ 
 						'class' => 'grid50',
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $modSettings, $context, $scripturl;
 
 							$link = '<a href="';
@@ -473,7 +473,7 @@ 
 						'class' => 'nowrap',
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							return byte_format($rowData['size']);
 						},
 					),
@@ -488,7 +488,7 @@ 
 						'class' => 'nowrap',
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $scripturl;
 
 							// In case of an attachment, return the poster of the attachment.
@@ -511,7 +511,7 @@ 
 						'class' => 'nowrap',
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $txt, $context, $scripturl;
 
 							// The date the message containing the attachment was posted or the owner of the avatar was active.
@@ -1404,7 +1404,7 @@ 
 						'class' => 'centertext',
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							return '<input type="radio" name="current_dir" value="' . $rowData['id'] . '" ' . ($rowData['current'] ? ' checked="checked"' : '') . (!empty($rowData['disable_current']) ? ' disabled="disabled"' : '') . ' class="input_radio" />';
 						},
 						'style' => 'width: 10%;',
@@ -1416,7 +1416,7 @@ 
 						'value' => $txt['attach_path'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							return '<input type="hidden" name="dirs[' . $rowData['id'] . ']" value="' . $rowData['path'] . '" /><input type="text" size="40" name="dirs[' . $rowData['id'] . ']" value="' . $rowData['path'] . '"' . (!empty($rowData['disable_base_dir']) ? ' disabled="disabled"' : '') . ' class="input_text"/>';
 						},
 						'style' => 'width: 40%;',
@@ -1493,7 +1493,7 @@ 
 							'class' => 'centertext',
 						),
 						'data' => array(
-							'function' => function ($rowData) {
+							'function' => function($rowData) {
 								return '<input type="radio" name="current_base_dir" value="' . $rowData['id'] . '" ' . ($rowData['current'] ? ' checked="checked"' : '') . ' class="input_radio" />';
 							},
 							'style' => 'width: 10%;',

sources/admin/ManageDraftsModule.controller.php

Braces +3 added lines, -1 removed lines

@@ -157,7 +157,9 @@
 
 		// If we have old drafts, remove them
 		if (count($drafts) > 0)
-			deleteDrafts($drafts, -1, false);
+		{
+					deleteDrafts($drafts, -1, false);
+		}
 
 		// Errors?  no errors, only success !
 		$context['maintenance_finished'] = array(

Spacing +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
 				'drafts_autosave_enabled' => 2,
 				'drafts_show_saved_enabled' => 2,
 			),
-			'setting_callback' => function ($value) {
+			'setting_callback' => function($value) {
 				require_once(SUBSDIR . '/ScheduledTasks.subs.php');
 				toggleTaskStatusByName('remove_old_drafts', $value);
 
@@ -136,7 +136,7 @@ 
 	 */
 	public static function integrate_sa_manage_maintenance(&$subActions)
 	{
-		$subActions['topics']['activities']['olddrafts'] = function () {
+		$subActions['topics']['activities']['olddrafts'] = function() {
 			$controller = new ManageDraftsModule_Controller(new Event_manager());
 			$controller->pre_dispatch();
 			$controller->action_olddrafts_display();

sources/admin/Admin.controller.php

Braces +21 added lines, -8 removed lines

@@ -82,7 +82,9 @@ 
 
 		// Now - finally - call the right place!
 		if (isset($admin_include_data['file']))
-			require_once($admin_include_data['file']);
+		{
+					require_once($admin_include_data['file']);
+		}
 
 		callMenu($admin_include_data);
 	}
@@ -612,16 +614,20 @@ 
 		);
 
 		if (isset($admin_include_data['current_area']) && $admin_include_data['current_area'] != 'index')
-			$context['linktree'][] = array(
+		{
+					$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(
+		{
+					$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],
 			);
+		}
 	}
 
 	/**
@@ -779,9 +785,12 @@ 
 
 		// You did remember to enter something to search for, otherwise its easy
 		if ($context['search_term'] === '')
-			$context['search_results'] = array();
-		else
-			$action->dispatch($subAction);
+		{
+					$context['search_results'] = array();
+		}
+		else {
+					$action->dispatch($subAction);
+		}
 	}
 
 	/**
@@ -925,7 +934,9 @@ 
 
 		// Encode the search data.
 		foreach ($postVars as $k => $v)
-			$postVars[$k] = urlencode($v);
+		{
+					$postVars[$k] = urlencode($v);
+		}
 
 		// This is what we will send.
 		$postVars = implode('+', $postVars);
@@ -938,7 +949,9 @@ 
 
 		// 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) !== 1)
-			throw new Elk_Exception('cannot_connect_doc_site');
+		{
+					throw new Elk_Exception('cannot_connect_doc_site');
+		}
 
 		$search_results = !empty($matches[1]) ? $matches[1] : '';