elkarte / Elkarte

sources/admin/AdminDebug.controller.php

Braces +9 added lines, -4 removed lines

@@ -56,7 +56,9 @@ 
 
 		// We should have debug mode enabled, as well as something to display!
 		if ($db_show_debug !== true || !isset($this->_req->session->debug))
-			throw new Elk_Exception('no_access', false);
+		{
+					throw new Elk_Exception('no_access', false);
+		}
 
 		// Don't allow except for administrators.
 		isAllowedTo('admin_forum');
@@ -69,9 +71,12 @@ 
 			$debug->toggleViewQueries();
 
 			if (strpos($this->_req->session->old_url, 'action=viewquery') !== false)
-				redirectexit();
-			else
-				redirectexit($this->_req->session->old_url);
+			{
+							redirectexit();
+			}
+			else {
+							redirectexit($this->_req->session->old_url);
+			}
 		}
 
 		// Looking at a specific query?

sources/admin/ManageAvatars.controller.php

Braces +3 added lines, -1 removed lines

@@ -85,7 +85,9 @@
 
 			// Disable if invalid values would result
 			if (isset($this->_req->post->custom_avatar_enabled) && $this->_req->post->custom_avatar_enabled == 1 && (empty($this->_req->post->custom_avatar_dir) || empty($this->_req->post->custom_avatar_url)))
-				$this->_req->post->custom_avatar_enabled = 0;
+			{
+							$this->_req->post->custom_avatar_enabled = 0;
+			}
 
 			$settingsForm->setConfigValues((array) $this->_req->post);
 			$settingsForm->save();

sources/admin/ManageSmileys.controller.php

Braces +282 added lines, -97 removed lines

@@ -97,7 +97,9 @@ 
 
 		// Some settings may not be enabled, disallow these from the tabs as appropriate.
 		if (empty($modSettings['messageIcons_enable']))
-			$context[$context['admin_menu_name']]['tab_data']['tabs']['editicons']['disabled'] = true;
+		{
+					$context[$context['admin_menu_name']]['tab_data']['tabs']['editicons']['disabled'] = true;
+		}
 
 		if (empty($modSettings['smiley_enable']))
 		{
@@ -141,7 +143,9 @@ 
 
 			// Make sure that the smileys are in the right order after enabling them.
 			if (isset($this->_req->post->smiley_enable))
-				sortSmileyTable();
+			{
+							sortSmileyTable();
+			}
 
 			call_integration_hook('integrate_save_smiley_settings');
 
@@ -220,12 +224,14 @@ 
 		$context['smiley_sets'] = explode(',', $modSettings['smiley_sets_known']);
 		$set_names = explode("\n", $modSettings['smiley_sets_names']);
 		foreach ($context['smiley_sets'] as $i => $set)
-			$context['smiley_sets'][$i] = array(
+		{
+					$context['smiley_sets'][$i] = array(
 				'id' => $i,
 				'path' => htmlspecialchars($set, ENT_COMPAT, 'UTF-8'),
 				'name' => htmlspecialchars(stripslashes($set_names[$i]), ENT_COMPAT, 'UTF-8'),
 				'selected' => $set == $modSettings['smiley_sets_default']
 			);
+		}
 
 		// Importing any smileys from an existing set?
 		$this->_subActionImport();
@@ -362,7 +368,9 @@ 
 				foreach ($this->_req->post->smiley_set as $id => $val)
 				{
 					if (isset($set_paths[$id], $set_names[$id]) && !empty($id))
-						unset($set_paths[$id], $set_names[$id]);
+					{
+											unset($set_paths[$id], $set_names[$id]);
+					}
 				}
 
 				// Update the modsettings with the new values
@@ -374,7 +382,9 @@ 
 			}
 			// Add a new smiley set.
 			elseif (!empty($this->_req->post->add))
-				$context['sub_action'] = 'modifyset';
+			{
+							$context['sub_action'] = 'modifyset';
+			}
 			// Create or modify a smiley set.
 			elseif (isset($this->_req->post->set))
 			{
@@ -387,7 +397,9 @@ 
 				if ($set == -1 && isset($this->_req->post->smiley_sets_path))
 				{
 					if (in_array($this->_req->post->smiley_sets_path, $set_paths))
-						throw new Elk_Exception('smiley_set_already_exists');
+					{
+											throw new Elk_Exception('smiley_set_already_exists');
+					}
 
 					updateSettings(array(
 						'smiley_sets_known' => $modSettings['smiley_sets_known'] . ',' . $this->_req->post->smiley_sets_path,
@@ -400,11 +412,15 @@ 
 				{
 					// Make sure the smiley set exists.
 					if (!isset($set_paths[$set]) || !isset($set_names[$set]))
-						throw new Elk_Exception('smiley_set_not_found');
+					{
+											throw new Elk_Exception('smiley_set_not_found');
+					}
 
 					// Make sure the path is not yet used by another smileyset.
 					if (in_array($this->_req->post->smiley_sets_path, $set_paths) && $this->_req->post->smiley_sets_path != $set_paths[$set])
-						throw new Elk_Exception('smiley_set_path_already_used');
+					{
+											throw new Elk_Exception('smiley_set_path_already_used');
+					}
 
 					$set_paths[$set] = $this->_req->post->smiley_sets_path;
 					$set_names[$set] = $this->_req->post->smiley_sets_name;
@@ -417,7 +433,9 @@ 
 
 				// The user might have checked to also import smileys.
 				if (!empty($this->_req->post->smiley_sets_import))
-					$this->importSmileys($this->_req->post->smiley_sets_path);
+				{
+									$this->importSmileys($this->_req->post->smiley_sets_path);
+				}
 			}
 
 			// No matter what, reset the cache
@@ -437,13 +455,15 @@ 
 		{
 			$set = $this->_req->getQuery('set', 'intval', -1);
 			if ($set == -1 || !isset($context['smiley_sets'][$set]))
-				$context['current_set'] = array(
+			{
+							$context['current_set'] = array(
 					'id' => '-1',
 					'path' => '',
 					'name' => '',
 					'selected' => false,
 					'is_new' => true,
 				);
+			}
 			else
 			{
 				$context['current_set'] = &$context['smiley_sets'][$set];
@@ -457,19 +477,25 @@ 
 					while ($entry = $dir->read())
 					{
 						if (in_array(strrchr($entry, '.'), array('.jpg', '.gif', '.jpeg', '.png', '.webp')))
-							$smileys[strtolower($entry)] = $entry;
+						{
+													$smileys[strtolower($entry)] = $entry;
+						}
 					}
 					$dir->close();
 
 					if (empty($smileys))
-						throw new Elk_Exception('smiley_set_dir_not_found', false, array($context['current_set']['name']));
+					{
+											throw new Elk_Exception('smiley_set_dir_not_found', false, array($context['current_set']['name']));
+					}
 
 					// Exclude the smileys that are already in the database.
 					$found = smileyExists($smileys);
 					foreach ($found as $smiley)
 					{
 						if (isset($smileys[$smiley]))
-							unset($smileys[$smiley]);
+						{
+													unset($smileys[$smiley]);
+						}
 					}
 
 					$context['current_set']['can_import'] = count($smileys);
@@ -487,12 +513,14 @@ 
 				while ($entry = $dir->read())
 				{
 					if (!in_array($entry, array('.', '..')) && is_dir($modSettings['smileys_dir'] . '/' . $entry))
-						$context['smiley_set_dirs'][] = array(
+					{
+											$context['smiley_set_dirs'][] = array(
 							'id' => $entry,
 							'path' => $modSettings['smileys_dir'] . '/' . $entry,
 							'selectable' => $entry == $context['current_set']['path'] || !in_array($entry, explode(',', $modSettings['smiley_sets_known'])),
 							'current' => $entry == $context['current_set']['path'],
 						);
+					}
 				}
 				$dir->close();
 			}
@@ -516,7 +544,9 @@ 
 
 			// Sanity check - then import.
 			if (isset($context['smiley_sets'][$set]))
-				$this->importSmileys(un_htmlspecialchars($context['smiley_sets'][$set]['path']));
+			{
+							$this->importSmileys(un_htmlspecialchars($context['smiley_sets'][$set]['path']));
+			}
 
 			// Force the process to continue.
 			$context['sub_action'] = 'modifyset';
@@ -541,12 +571,14 @@ 
 
 		$set_names = explode("\n", $modSettings['smiley_sets_names']);
 		foreach ($context['smiley_sets'] as $i => $set)
-			$context['smiley_sets'][$i] = array(
+		{
+					$context['smiley_sets'][$i] = array(
 				'id' => $i,
 				'path' => htmlspecialchars($set, ENT_COMPAT, 'UTF-8'),
 				'name' => htmlspecialchars(stripslashes($set_names[$i]), ENT_COMPAT, 'UTF-8'),
 				'selected' => $set == $modSettings['smiley_sets_default']
 			);
+		}
 
 		// Submitting a form?
 		if (isset($this->_req->post->{$context['session_var']}, $this->_req->post->smiley_code))
@@ -563,11 +595,15 @@ 
 
 			// Make sure some code was entered.
 			if (empty($this->_req->post->smiley_code))
-				throw new Elk_Exception('smiley_has_no_code');
+			{
+							throw new Elk_Exception('smiley_has_no_code');
+			}
 
 			// Check whether the new code has duplicates. It should be unique.
 			if (validateDuplicateSmiley($this->_req->post->smiley_code))
-				throw new Elk_Exception('smiley_not_unique');
+			{
+							throw new Elk_Exception('smiley_not_unique');
+			}
 
 			// If we are uploading - check all the smiley sets are writable!
 			if ($this->_req->post->method !== 'existing')
@@ -576,39 +612,51 @@ 
 				foreach ($context['smiley_sets'] as $set)
 				{
 					if (!is_writable($context['smileys_dir'] . '/' . un_htmlspecialchars($set['path'])))
-						$writeErrors[] = $set['path'];
+					{
+											$writeErrors[] = $set['path'];
+					}
 				}
 
 				if (!empty($writeErrors))
-					throw new Elk_Exception('smileys_upload_error_notwritable', true, array(implode(', ', $writeErrors)));
+				{
+									throw new Elk_Exception('smileys_upload_error_notwritable', true, array(implode(', ', $writeErrors)));
+				}
 			}
 
 			// Uploading just one smiley for all of them?
 			if (isset($this->_req->post->sameall) && isset($_FILES['uploadSmiley']['name']) && $_FILES['uploadSmiley']['name'] != '')
 			{
 				if (!is_uploaded_file($_FILES['uploadSmiley']['tmp_name']) || (ini_get('open_basedir') == '' && !file_exists($_FILES['uploadSmiley']['tmp_name'])))
-					throw new Elk_Exception('smileys_upload_error');
+				{
+									throw new Elk_Exception('smileys_upload_error');
+				}
 
 				// Sorry, no spaces, dots, or anything else but letters allowed.
 				$_FILES['uploadSmiley']['name'] = preg_replace(array('/\s/', '/\.[\.]+/', '/[^\w_\.\-]/'), array('_', '.', ''), $_FILES['uploadSmiley']['name']);
 
 				// We only allow image files - it's THAT simple - no messing around here...
 				if (!in_array(strtolower(substr(strrchr($_FILES['uploadSmiley']['name'], '.'), 1)), $allowedTypes))
-					throw new Elk_Exception('smileys_upload_error_types', false, array(implode(', ', $allowedTypes)));
+				{
+									throw new Elk_Exception('smileys_upload_error_types', false, array(implode(', ', $allowedTypes)));
+				}
 
 				// We only need the filename...
 				$destName = basename($_FILES['uploadSmiley']['name']);
 
 				// Make sure they aren't trying to upload a nasty file - for their own good here!
 				if (in_array(strtolower($destName), $disabledFiles))
-					throw new Elk_Exception('smileys_upload_error_illegal');
+				{
+									throw new Elk_Exception('smileys_upload_error_illegal');
+				}
 
 				// Check if the file already exists... and if not move it to EVERY smiley set directory.
 				$i = 0;
 
 				// Keep going until we find a set the file doesn't exist in. (or maybe it exists in all of them?)
 				while (isset($context['smiley_sets'][$i]) && file_exists($context['smileys_dir'] . '/' . un_htmlspecialchars($context['smiley_sets'][$i]['path']) . '/' . $destName))
-					$i++;
+				{
+									$i++;
+				}
 
 				// Okay, we're going to put the smiley right here, since it's not there yet!
 				if (isset($context['smiley_sets'][$i]['path']))
@@ -624,7 +672,9 @@ 
 
 						// The file is already there!  Don't overwrite it!
 						if (file_exists($currentPath))
-							continue;
+						{
+													continue;
+						}
 
 						// Okay, so copy the first one we made to here.
 						copy($smileyLocation, $currentPath);
@@ -642,12 +692,18 @@ 
 				foreach ($_FILES as $name => $dummy)
 				{
 					if ($_FILES[$name]['name'] == '')
-						throw new Elk_Exception('smileys_upload_error_blank');
+					{
+											throw new Elk_Exception('smileys_upload_error_blank');
+					}
 
 					if (empty($newName))
-						$newName = basename($_FILES[$name]['name']);
+					{
+											$newName = basename($_FILES[$name]['name']);
+					}
 					elseif (basename($_FILES[$name]['name']) != $newName)
-						throw new Elk_Exception('smileys_upload_error_name');
+					{
+											throw new Elk_Exception('smileys_upload_error_name');
+					}
 				}
 
 				foreach ($context['smiley_sets'] as $i => $set)
@@ -656,30 +712,40 @@ 
 					$set['path'] = un_htmlspecialchars($set['path']);
 
 					if (!isset($_FILES['individual_' . $set['name']]['name']) || $_FILES['individual_' . $set['name']]['name'] == '')
-						continue;
+					{
+											continue;
+					}
 
 					// Got one...
 					if (!is_uploaded_file($_FILES['individual_' . $set['name']]['tmp_name']) || (ini_get('open_basedir') == '' && !file_exists($_FILES['individual_' . $set['name']]['tmp_name'])))
-						throw new Elk_Exception('smileys_upload_error');
+					{
+											throw new Elk_Exception('smileys_upload_error');
+					}
 
 					// Sorry, no spaces, dots, or anything else but letters allowed.
 					$_FILES['individual_' . $set['name']]['name'] = preg_replace(array('/\s/', '/\.[\.]+/', '/[^\w_\.\-]/'), array('_', '.', ''), $_FILES['individual_' . $set['name']]['name']);
 
 					// We only allow image files - it's THAT simple - no messing around here...
 					if (!in_array(strtolower(substr(strrchr($_FILES['individual_' . $set['name']]['name'], '.'), 1)), $allowedTypes))
-						throw new Elk_Exception('smileys_upload_error_types', false, array(implode(', ', $allowedTypes)));
+					{
+											throw new Elk_Exception('smileys_upload_error_types', false, array(implode(', ', $allowedTypes)));
+					}
 
 					// We only need the filename...
 					$destName = basename($_FILES['individual_' . $set['name']]['name']);
 
 					// Make sure they aren't trying to upload a nasty file - for their own good here!
 					if (in_array(strtolower($destName), $disabledFiles))
-						throw new Elk_Exception('smileys_upload_error_illegal');
+					{
+											throw new Elk_Exception('smileys_upload_error_illegal');
+					}
 
 					// If the file exists - ignore it.
 					$smileyLocation = $context['smileys_dir'] . '/' . $set['path'] . '/' . $destName;
 					if (file_exists($smileyLocation))
-						continue;
+					{
+											continue;
+					}
 
 					// Finally - move the image!
 					move_uploaded_file($_FILES['individual_' . $set['name']]['tmp_name'], $smileyLocation);
@@ -692,7 +758,9 @@ 
 
 			// Also make sure a filename was given.
 			if (empty($this->_req->post->smiley_filename))
-				throw new Elk_Exception('smiley_has_no_filename');
+			{
+							throw new Elk_Exception('smiley_has_no_filename');
+			}
 
 			// Find the position on the right.
 			$smiley_order = '0';
@@ -702,7 +770,9 @@ 
 				$smiley_order = nextSmileyLocation($this->_req->post->smiley_location);
 
 				if (empty($smiley_order))
-					$smiley_order = '0';
+				{
+									$smiley_order = '0';
+				}
 			}
 			$param = array(
 				$this->_req->post->smiley_code,
@@ -728,16 +798,20 @@ 
 			foreach ($context['smiley_sets'] as $smiley_set)
 			{
 				if (!file_exists($context['smileys_dir'] . '/' . un_htmlspecialchars($smiley_set['path'])))
-					continue;
+				{
+									continue;
+				}
 
 				$dir = dir($context['smileys_dir'] . '/' . un_htmlspecialchars($smiley_set['path']));
 				while ($entry = $dir->read())
 				{
 					if (!in_array($entry, $context['filenames']) && in_array(strrchr($entry, '.'), array('.jpg', '.gif', '.jpeg', '.png', '.webp')))
-						$context['filenames'][strtolower($entry)] = array(
+					{
+											$context['filenames'][strtolower($entry)] = array(
 							'id' => htmlspecialchars($entry, ENT_COMPAT, 'UTF-8'),
 							'selected' => false,
 						);
+					}
 				}
 				$dir->close();
 			}
@@ -780,10 +854,14 @@ 
 			if (isset($this->_req->post->smiley_action) && !empty($this->_req->post->checked_smileys))
 			{
 				foreach ($this->_req->post->checked_smileys as $id => $smiley_id)
-					$this->_req->post->checked_smileys[$id] = (int) $smiley_id;
+				{
+									$this->_req->post->checked_smileys[$id] = (int) $smiley_id;
+				}
 
 				if ($this->_req->post->smiley_action == 'delete')
-					deleteSmileys($this->_req->post->checked_smileys);
+				{
+									deleteSmileys($this->_req->post->checked_smileys);
+				}
 				// Changing the status of the smiley?
 				else
 				{
@@ -794,7 +872,9 @@ 
 						'popup' => 2
 					);
 					if (isset($displayTypes[$this->_req->post->smiley_action]))
-						updateSmileyDisplayType($this->_req->post->checked_smileys, $displayTypes[$this->_req->post->smiley_action]);
+					{
+											updateSmileyDisplayType($this->_req->post->checked_smileys, $displayTypes[$this->_req->post->smiley_action]);
+					}
 				}
 			}
 			// Create/modify a smiley.
@@ -804,7 +884,9 @@ 
 
 				// Is it a delete?
 				if (!empty($this->_req->post->deletesmiley))
-					deleteSmileys(array($this->_req->post->smiley));
+				{
+									deleteSmileys(array($this->_req->post->smiley));
+				}
 				// Otherwise an edit.
 				else
 				{
@@ -814,15 +896,21 @@ 
 
 					// Make sure some code was entered.
 					if (empty($this->_req->post->smiley_code))
-						throw new Elk_Exception('smiley_has_no_code');
+					{
+											throw new Elk_Exception('smiley_has_no_code');
+					}
 
 					// Also make sure a filename was given.
 					if (empty($this->_req->post->smiley_filename))
-						throw new Elk_Exception('smiley_has_no_filename');
+					{
+											throw new Elk_Exception('smiley_has_no_filename');
+					}
 
 					// Check whether the new code has duplicates. It should be unique.
 					if (validateDuplicateSmiley($this->_req->post->smiley_code, $this->_req->post->smiley))
-						throw new Elk_Exception('smiley_not_unique');
+					{
+											throw new Elk_Exception('smiley_not_unique');
+					}
 
 					$param = array(
 						'smiley_location' => $this->_req->post->smiley_location,
@@ -845,12 +933,14 @@ 
 		$context['smiley_sets'] = explode(',', $modSettings['smiley_sets_known']);
 		$set_names = explode("\n", $modSettings['smiley_sets_names']);
 		foreach ($context['smiley_sets'] as $i => $set)
-			$context['smiley_sets'][$i] = array(
+		{
+					$context['smiley_sets'][$i] = array(
 				'id' => $i,
 				'path' => htmlspecialchars($set, ENT_COMPAT, 'UTF-8'),
 				'name' => htmlspecialchars(stripslashes($set_names[$i]), ENT_COMPAT, 'UTF-8'),
 				'selected' => $set == $modSettings['smiley_sets_default']
 			);
+		}
 
 		// Prepare overview of all (custom) smileys.
 		if ($context['sub_action'] == 'editsmileys')
@@ -867,8 +957,10 @@ 
 			$smileyset_option_list = '
 				<select name="set" onchange="changeSet(this.options[this.selectedIndex].value);">';
 			foreach ($context['smiley_sets'] as $smiley_set)
-				$smileyset_option_list .= '
+			{
+							$smileyset_option_list .= '
 					<option value="' . $smiley_set['path'] . '"' . ($modSettings['smiley_sets_default'] == $smiley_set['path'] ? ' selected="selected"' : '') . '>' . $smiley_set['name'] . '</option>';
+			}
 			$smileyset_option_list .= '
 				</select>';
 
@@ -932,11 +1024,16 @@ 
 								global $txt;
 
 								if (empty($rowData['hidden']))
-									return $txt['smileys_location_form'];
+								{
+																	return $txt['smileys_location_form'];
+								}
 								elseif ($rowData['hidden'] == 1)
-									return $txt['smileys_location_hidden'];
-								else
-									return $txt['smileys_location_popup'];
+								{
+																	return $txt['smileys_location_hidden'];
+								}
+								else {
+																	return $txt['smileys_location_popup'];
+								}
 							},
 						),
 						'sort' => array(
@@ -953,18 +1050,24 @@ 
 								global $context, $txt, $modSettings;
 
 								if (empty($modSettings['smileys_dir']) || !is_dir($modSettings['smileys_dir']))
-									return htmlspecialchars($rowData['description'], ENT_COMPAT, 'UTF-8');
+								{
+																	return htmlspecialchars($rowData['description'], ENT_COMPAT, 'UTF-8');
+								}
 
 								// Check if there are smileys missing in some sets.
 								$missing_sets = array();
 								foreach ($context['smiley_sets'] as $smiley_set)
-									if (!file_exists(sprintf('%1$s/%2$s/%3$s', $modSettings['smileys_dir'], $smiley_set['path'], $rowData['filename'])))
+								{
+																	if (!file_exists(sprintf('%1$s/%2$s/%3$s', $modSettings['smileys_dir'], $smiley_set['path'], $rowData['filename'])))
 										$missing_sets[] = $smiley_set['path'];
+								}
 
 								$description = htmlspecialchars($rowData['description'], ENT_COMPAT, 'UTF-8');
 
 								if (!empty($missing_sets))
-									$description .= sprintf('<br /><span class="smalltext"><strong>%1$s:</strong> %2$s</span>', $txt['smileys_not_found_in_set'], implode(', ', $missing_sets));
+								{
+																	$description .= sprintf('<br /><span class="smalltext"><strong>%1$s:</strong> %2$s</span>', $txt['smileys_not_found_in_set'], implode(', ', $missing_sets));
+								}
 
 								return $description;
 							},
@@ -1080,12 +1183,14 @@ 
 			$context['smiley_sets'] = explode(',', $modSettings['smiley_sets_known']);
 			$set_names = explode("\n", $modSettings['smiley_sets_names']);
 			foreach ($context['smiley_sets'] as $i => $set)
-				$context['smiley_sets'][$i] = array(
+			{
+							$context['smiley_sets'][$i] = array(
 					'id' => $i,
 					'path' => htmlspecialchars($set, ENT_COMPAT, 'UTF-8'),
 					'name' => htmlspecialchars(stripslashes($set_names[$i]), ENT_COMPAT, 'UTF-8'),
 					'selected' => $set == $modSettings['smiley_sets_default']
 				);
+			}
 
 			$context['selected_set'] = $modSettings['smiley_sets_default'];
 
@@ -1096,16 +1201,20 @@ 
 				foreach ($context['smiley_sets'] as $smiley_set)
 				{
 					if (!file_exists($context['smileys_dir'] . '/' . un_htmlspecialchars($smiley_set['path'])))
-						continue;
+					{
+											continue;
+					}
 
 					$dir = dir($context['smileys_dir'] . '/' . un_htmlspecialchars($smiley_set['path']));
 					while ($entry = $dir->read())
 					{
 						if (!in_array($entry, $context['filenames']) && in_array(strrchr($entry, '.'), array('.jpg', '.gif', '.jpeg', '.png', '.webp')))
-							$context['filenames'][strtolower($entry)] = array(
+						{
+													$context['filenames'][strtolower($entry)] = array(
 								'id' => htmlspecialchars($entry, ENT_COMPAT, 'UTF-8'),
 								'selected' => false,
 							);
+						}
 					}
 					$dir->close();
 				}
@@ -1119,7 +1228,9 @@ 
 			$context['current_smiley']['description'] = htmlspecialchars($context['current_smiley']['description'], ENT_COMPAT, 'UTF-8');
 
 			if (isset($context['filenames'][strtolower($context['current_smiley']['filename'])]))
-				$context['filenames'][strtolower($context['current_smiley']['filename'])]['selected'] = true;
+			{
+							$context['filenames'][strtolower($context['current_smiley']['filename'])]['selected'] = true;
+			}
 		}
 	}
 
@@ -1147,7 +1258,9 @@ 
 			{
 				$deleteIcons = array();
 				foreach ($this->_req->post->checked_icons as $icon)
-					$deleteIcons[] = (int) $icon;
+				{
+									$deleteIcons[] = (int) $icon;
+				}
 
 				// Do the actual delete!
 				deleteMessageIcons($deleteIcons);
@@ -1159,36 +1272,50 @@ 
 
 				// Do some preparation with the data... like check the icon exists *somewhere*
 				if (strpos($this->_req->post->icon_filename, '.png') !== false)
-					$this->_req->post->icon_filename = substr($this->_req->post->icon_filename, 0, -4);
+				{
+									$this->_req->post->icon_filename = substr($this->_req->post->icon_filename, 0, -4);
+				}
 
 				if (!file_exists($settings['default_theme_dir'] . '/images/post/' . $this->_req->post->icon_filename . '.png'))
-					throw new Elk_Exception('icon_not_found');
+				{
+									throw new Elk_Exception('icon_not_found');
+				}
 				// There is a 16 character limit on message icons...
 				elseif (strlen($this->_req->post->icon_filename) > 16)
-					throw new Elk_Exception('icon_name_too_long');
+				{
+									throw new Elk_Exception('icon_name_too_long');
+				}
 				elseif ($this->_req->post->icon_location == $this->_req->query->icon && !empty($this->_req->query->icon))
-					throw new Elk_Exception('icon_after_itself');
+				{
+									throw new Elk_Exception('icon_after_itself');
+				}
 
 				// First do the sorting... if this is an edit reduce the order of everything after it by one ;)
 				if ($this->_req->query->icon != 0)
 				{
 					$oldOrder = $context['icons'][$this->_req->query->icon]['true_order'];
 					foreach ($context['icons'] as $id => $data)
-						if ($data['true_order'] > $oldOrder)
+					{
+											if ($data['true_order'] > $oldOrder)
 							$context['icons'][$id]['true_order']--;
+					}
 				}
 
 				// If there are no existing icons and this is a new one, set the id to 1 (mainly for non-mysql)
 				if (empty($this->_req->query->icon) && empty($context['icons']))
-					$this->_req->query->icon = 1;
+				{
+									$this->_req->query->icon = 1;
+				}
 
 				// Get the new order.
 				$newOrder = $this->_req->post->icon_location == 0 ? 0 : $context['icons'][$this->_req->post->icon_location]['true_order'] + 1;
 
 				// Do the same, but with the one that used to be after this icon, done to avoid conflict.
 				foreach ($context['icons'] as $id => $data)
-					if ($data['true_order'] >= $newOrder)
+				{
+									if ($data['true_order'] >= $newOrder)
 						$context['icons'][$id]['true_order']++;
+				}
 
 				// Finally set the current icon's position!
 				$context['icons'][$this->_req->query->icon]['true_order'] = $newOrder;
@@ -1204,15 +1331,20 @@ 
 				foreach ($context['icons'] as $id => $icon)
 				{
 					if ($id != 0)
-						$iconInsert[] = array($id, $icon['board_id'], $icon['title'], $icon['filename'], $icon['true_order']);
-					else
-						$iconInsert_new[] = array($icon['board_id'], $icon['title'], $icon['filename'], $icon['true_order']);
+					{
+											$iconInsert[] = array($id, $icon['board_id'], $icon['title'], $icon['filename'], $icon['true_order']);
+					}
+					else {
+											$iconInsert_new[] = array($icon['board_id'], $icon['title'], $icon['filename'], $icon['true_order']);
+					}
 				}
 
 				updateMessageIcon($iconInsert);
 
 				if (!empty($iconInsert_new))
-					addMessageIcon($iconInsert_new);
+				{
+									addMessageIcon($iconInsert_new);
+				}
 
 				// Flush the cache so the changes are reflected
 				Cache::instance()->remove('posting_icons-' . (int) $this->_req->post->icon_board);
@@ -1223,7 +1355,9 @@ 
 
 			// Unless we're adding a new thing, we'll escape
 			if (!isset($this->_req->post->add))
-				redirectexit('action=admin;area=smileys;sa=editicons');
+			{
+							redirectexit('action=admin;area=smileys;sa=editicons');
+			}
 		}
 
 		$context[$context['admin_menu_name']]['current_subsection'] = 'editicons';
@@ -1350,7 +1484,9 @@ 
 
 			// Get the properties of the current icon from the icon list.
 			if (!$context['new_icon'])
-				$context['icon'] = $context['icons'][$this->_req->query->icon];
+			{
+							$context['icon'] = $context['icons'][$this->_req->query->icon];
+			}
 
 			// Get a list of boards needed for assigning this icon to a specific board.
 			$boardListOptions = array(
@@ -1380,7 +1516,9 @@ 
 			$this->_req->query->source = empty($this->_req->query->source) ? 0 : (int) $this->_req->query->source;
 
 			if (empty($this->_req->query->source))
-				throw new Elk_Exception('smiley_not_found');
+			{
+							throw new Elk_Exception('smiley_not_found');
+			}
 
 			$smiley = array();
 
@@ -1390,7 +1528,9 @@ 
 
 				$smiley = getSmileyPosition($this->_req->query->location, $this->_req->query->after);
 				if (empty($smiley))
-					throw new Elk_Exception('smiley_not_found');
+				{
+									throw new Elk_Exception('smiley_not_found');
+				}
 			}
 			else
 			{
@@ -1407,13 +1547,15 @@ 
 
 		// Make sure all rows are sequential.
 		foreach (array_keys($context['smileys']) as $location)
-			$context['smileys'][$location] = array(
+		{
+					$context['smileys'][$location] = array(
 				'id' => $location,
 				'title' => $location === 'postform' ? $txt['smileys_location_form'] : $txt['smileys_location_popup'],
 				'description' => $location === 'postform' ? $txt['smileys_location_form_description'] : $txt['smileys_location_popup_description'],
 				'last_row' => count($context['smileys'][$location]['rows']),
 				'rows' => array_values($context['smileys'][$location]['rows']),
 			);
+		}
 
 		// Check & fix smileys that are not ordered properly in the database.
 		foreach (array_keys($context['smileys']) as $location)
@@ -1430,8 +1572,10 @@ 
 
 				// Make sure the smiley order is always sequential.
 				foreach ($smiley_row as $order_id => $smiley)
-					if ($order_id != $smiley['order'])
+				{
+									if ($order_id != $smiley['order'])
 						updateSmileyOrder($smiley['id'], $order_id);
+				}
 			}
 		}
 
@@ -1471,12 +1615,16 @@ 
 
 			// Check that the smiley is from simplemachines.org, for now... maybe add mirroring later.
 			if (!isAuthorizedServer($this->_req->query->set_gz) == 0)
-				throw new Elk_Exception('not_valid_server');
+			{
+							throw new Elk_Exception('not_valid_server');
+			}
 
 			$destination = BOARDDIR . '/packages/' . $base_name;
 
 			if (file_exists($destination))
-				throw new Elk_Exception('package_upload_error_exists');
+			{
+							throw new Elk_Exception('package_upload_error_exists');
+			}
 
 			// Let's copy it to the packages directory
 			file_put_contents($destination, fetch_web_data($this->_req->query->set_gz));
@@ -1492,11 +1640,15 @@ 
 		}
 
 		if (!file_exists($destination))
-			throw new Elk_Exception('package_no_file', false);
+		{
+					throw new Elk_Exception('package_no_file', false);
+		}
 
 		// Make sure temp directory exists and is empty.
 		if (file_exists(BOARDDIR . '/packages/temp'))
-			deltree(BOARDDIR . '/packages/temp', false);
+		{
+					deltree(BOARDDIR . '/packages/temp', false);
+		}
 
 		if (!mktree(BOARDDIR . '/packages/temp', 0755))
 		{
@@ -1509,7 +1661,9 @@ 
 
 				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);
+				}
 			}
 		}
 
@@ -1517,7 +1671,9 @@ 
 
 		// @todo needs to change the URL in the next line ;)
 		if (!$extracted)
-			throw new Elk_Exception('packageget_unable', false, array('http://custom.elkarte.net/index.php?action=search;type=12;basic_search=' . $name));
+		{
+					throw new Elk_Exception('packageget_unable', false, array('http://custom.elkarte.net/index.php?action=search;type=12;basic_search=' . $name));
+		}
 
 		if ($extracted && !file_exists(BOARDDIR . '/packages/temp/package-info.xml'))
 		{
@@ -1532,18 +1688,26 @@ 
 		}
 
 		if (!isset($base_path))
-			$base_path = '';
+		{
+					$base_path = '';
+		}
 
 		if (!file_exists(BOARDDIR . '/packages/temp/' . $base_path . 'package-info.xml'))
-			throw new Elk_Exception('package_get_error_missing_xml', false);
+		{
+					throw new Elk_Exception('package_get_error_missing_xml', false);
+		}
 
 		$smileyInfo = getPackageInfo($context['filename']);
 		if (!is_array($smileyInfo))
-			throw new Elk_Exception($smileyInfo);
+		{
+					throw new Elk_Exception($smileyInfo);
+		}
 
 		// See if it is installed?
 		if (isSmileySetInstalled($smileyInfo['id']))
-			\Errors::instance()->fatal_lang_error('package_installed_warning1');
+		{
+					\Errors::instance()->fatal_lang_error('package_installed_warning1');
+		}
 
 		// Everything is fine, now it's time to do something, first we test
 		$actions = parsePackageInfo($smileyInfo['xml'], true, 'install');
@@ -1561,9 +1725,13 @@ 
 			{
 				$type = 'package_' . $action['type'];
 				if (file_exists(BOARDDIR . '/packages/temp/' . $base_path . $action['filename']))
-					$context[$type] = htmlspecialchars(trim(file_get_contents(BOARDDIR . '/packages/temp/' . $base_path . $action['filename']), "\n\r"), ENT_COMPAT, 'UTF-8');
+				{
+									$context[$type] = htmlspecialchars(trim(file_get_contents(BOARDDIR . '/packages/temp/' . $base_path . $action['filename']), "\n\r"), ENT_COMPAT, 'UTF-8');
+				}
 				elseif (file_exists($action['filename']))
-					$context[$type] = htmlspecialchars(trim(file_get_contents($action['filename']), "\n\r"), ENT_COMPAT, 'UTF-8');
+				{
+									$context[$type] = htmlspecialchars(trim(file_get_contents($action['filename']), "\n\r"), ENT_COMPAT, 'UTF-8');
+				}
 
 				if (!empty($action['parse_bbc']))
 				{
@@ -1571,8 +1739,9 @@ 
 					preparsecode($context[$type]);
 					$context[$type] = $bbc_parser->parsePackage($context[$type]);
 				}
-				else
-					$context[$type] = nl2br($context[$type]);
+				else {
+									$context[$type] = nl2br($context[$type]);
+				}
 
 				continue;
 			}
@@ -1597,7 +1766,9 @@ 
 
 				// Show a description for the action if one is provided
 				if (empty($thisAction['description']))
-					$thisAction['description'] = isset($action['description']) ? $action['description'] : '';
+				{
+									$thisAction['description'] = isset($action['description']) ? $action['description'] : '';
+				}
 
 				$context['actions'][] = $thisAction;
 			}
@@ -1656,10 +1827,14 @@ 
 		}
 
 		if (file_exists(BOARDDIR . '/packages/temp'))
-			deltree(BOARDDIR . '/packages/temp');
+		{
+					deltree(BOARDDIR . '/packages/temp');
+		}
 
 		if (!$testing)
-			redirectexit('action=admin;area=smileys');
+		{
+					redirectexit('action=admin;area=smileys');
+		}
 	}
 
 	/**
@@ -1675,7 +1850,9 @@ 
 		$smiley_context = array();
 
 		foreach ($smiley_sets as $i => $set)
-			$smiley_context[$set] = stripslashes($set_names[$i]);
+		{
+					$smiley_context[$set] = stripslashes($set_names[$i]);
+		}
 
 		$this->_smiley_context = $smiley_context;
 	}
@@ -1694,14 +1871,18 @@ 
 		require_once(SUBSDIR . '/Smileys.subs.php');
 
 		if (empty($modSettings['smileys_dir']) || !is_dir($modSettings['smileys_dir'] . '/' . $smileyPath))
-			throw new Elk_Exception('smiley_set_unable_to_import');
+		{
+					throw new Elk_Exception('smiley_set_unable_to_import');
+		}
 
 		$smileys = array();
 		$dir = dir($modSettings['smileys_dir'] . '/' . $smileyPath);
 		while ($entry = $dir->read())
 		{
 			if (in_array(strrchr($entry, '.'), array('.jpg', '.gif', '.jpeg', '.png', '.webp')))
-				$smileys[strtolower($entry)] = $entry;
+			{
+							$smileys[strtolower($entry)] = $entry;
+			}
 		}
 		$dir->close();
 
@@ -1711,15 +1892,19 @@ 
 		foreach ($duplicates as $duplicate)
 		{
 			if (isset($smileys[strtolower($duplicate)]))
-				unset($smileys[strtolower($duplicate)]);
+			{
+							unset($smileys[strtolower($duplicate)]);
+			}
 		}
 
 		$smiley_order = getMaxSmileyOrder();
 
 		$new_smileys = array();
 		foreach ($smileys as $smiley)
-			if (strlen($smiley) <= 48)
+		{
+					if (strlen($smiley) <= 48)
 				$new_smileys[] = array(':' . strtok($smiley, '.') . ':', $smiley, strtok($smiley, '.'), 0, ++$smiley_order);
+		}
 
 		if (!empty($new_smileys))
 		{

Spacing +4 added lines, -4 removed lines

@@ -255,7 +255,7 @@ 
 						'class' => 'centertext',
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							return $rowData['selected'] ? '<i class="icon i-check"></i>' : '';
 						},
 						'class' => 'centertext',
@@ -312,7 +312,7 @@ 
 						'class' => 'centertext',
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							return $rowData['id'] == 0 ? '' : sprintf('<input type="checkbox" name="smiley_set[%1$d]" class="input_check" />', $rowData['id']);
 						},
 						'class' => 'centertext',
@@ -928,7 +928,7 @@ 
 							'value' => $txt['smileys_location'],
 						),
 						'data' => array(
-							'function' => function ($rowData) {
+							'function' => function($rowData) {
 								global $txt;
 
 								if (empty($rowData['hidden']))
@@ -949,7 +949,7 @@ 
 							'value' => $txt['smileys_description'],
 						),
 						'data' => array(
-							'function' => function ($rowData) {
+							'function' => function($rowData) {
 								global $context, $txt, $modSettings;
 
 								if (empty($modSettings['smileys_dir']) || !is_dir($modSettings['smileys_dir']))

sources/admin/AdminLog.controller.php

Braces +15 added lines, -7 removed lines

@@ -100,7 +100,9 @@ 
 
 		// If it's not got a sa set it must have come here for first time, pretend error log should be reversed.
 		if (!isset($this->_req->query->sa))
-			$this->_req->query->desc = true;
+		{
+					$this->_req->query->desc = true;
+		}
 
 		// Set up the action control
 		$action = new Action('manage_logs');
@@ -152,14 +154,17 @@ 
 				foreach ($config_vars as $index => $dummy)
 				{
 					if (!is_array($dummy) || $index == 'pruningOptions')
-						continue;
+					{
+											continue;
+					}
 
 					$vals[] = empty($this->_req->post->{$dummy[1]}) || $this->_req->post->{$dummy[1]} < 0 ? 0 : $this->_req->getPost($dummy[1], 'intval');
 				}
 				$_POST['pruningOptions'] = implode(',', $vals);
 			}
-			else
-				$_POST['pruningOptions'] = '';
+			else {
+							$_POST['pruningOptions'] = '';
+			}
 
 			$settingsForm->setConfigVars($savevar);
 			$settingsForm->setConfigValues((array) $_POST);
@@ -173,9 +178,12 @@ 
 
 		// Get the actual values
 		if (!empty($modSettings['pruningOptions']))
-			list ($modSettings['pruneErrorLog'], $modSettings['pruneModLog'], $modSettings['pruneBanLog'], $modSettings['pruneReportLog'], $modSettings['pruneScheduledTaskLog'], $modSettings['pruneBadbehaviorLog'], $modSettings['pruneSpiderHitLog']) = array_pad(explode(',', $modSettings['pruningOptions']), 7, 0);
-		else
-			$modSettings['pruneErrorLog'] = $modSettings['pruneModLog'] = $modSettings['pruneBanLog'] = $modSettings['pruneReportLog'] = $modSettings['pruneScheduledTaskLog'] = $modSettings['pruneBadbehaviorLog'] = $modSettings['pruneSpiderHitLog'] = 0;
+		{
+					list ($modSettings['pruneErrorLog'], $modSettings['pruneModLog'], $modSettings['pruneBanLog'], $modSettings['pruneReportLog'], $modSettings['pruneScheduledTaskLog'], $modSettings['pruneBadbehaviorLog'], $modSettings['pruneSpiderHitLog']) = array_pad(explode(',', $modSettings['pruningOptions']), 7, 0);
+		}
+		else {
+					$modSettings['pruneErrorLog'] = $modSettings['pruneModLog'] = $modSettings['pruneBanLog'] = $modSettings['pruneReportLog'] = $modSettings['pruneScheduledTaskLog'] = $modSettings['pruneBadbehaviorLog'] = $modSettings['pruneSpiderHitLog'] = 0;
+		}
 
 		$settingsForm->prepare();
 	}

sources/admin/ManageMaillist.controller.php

Braces +117 added lines, -52 removed lines

@@ -104,7 +104,9 @@ 
 		// Set an id if none was supplied
 		$id = $this->_req->getQuery('e_id', 'intval', 0);
 		if (empty($id) || $id <= 0)
-			$id = 0;
+		{
+					$id = 0;
+		}
 
 		createToken('admin-ml', 'get');
 
@@ -147,9 +149,12 @@ 
 						'function' => function ($rowData) {
 							$error = $rowData['error_code'];
 							if ($error === 'error_pm_not_found')
-								return '<span class="error">' . $rowData['error'] . '<span>';
-							else
-								return $rowData['error'];
+							{
+															return '<span class="error">' . $rowData['error'] . '<span>';
+							}
+							else {
+															return $rowData['error'];
+							}
 						},
 					),
 					'sort' => array(
@@ -222,16 +227,23 @@ 
 
 							// Do we have a type?
 							if (empty($rowData['type']))
-								return $txt['not_applicable'];
+							{
+															return $txt['not_applicable'];
+							}
 							// Personal?
 							elseif ($rowData['type'] === 'p')
-								return $txt['personal_message'];
+							{
+															return $txt['personal_message'];
+							}
 							// New Topic?
 							elseif ($rowData['type'] === 'x')
-								return $txt['new_topic'];
+							{
+															return $txt['new_topic'];
+							}
 							// Ah a Reply then
-							else
-								return $txt['topic'] . ' ' . $txt['reply'];
+							else {
+															return $txt['topic'] . ' ' . $txt['reply'];
+							}
 						},
 					),
 					'sort' => array(
@@ -252,9 +264,12 @@ 
 							$security = $context['session_var'] . '=' . $context['session_id'] . ';' . $context['admin-ml_token_var'] . '=' . $context['admin-ml_token'];
 
 							if ($rowData['error_code'] === 'error_pm_not_found')
-								$commands[] = '<a href="?action=admin;area=maillist;sa=approve;item=' . $id . $security . '" onclick="return confirm(' . JavaScriptEscape($txt['pm_approve_warning']) . ') && submitThisOnce(this);"><i class="icon i-check" title="' . $txt['approve'] . '"></i></a>&nbsp;';
-							else
-								$commands[] = '<a href="?action=admin;area=maillist;sa=approve;item=' . $id . $security . '"><i class="icon i-check" title="' . $txt['approve'] . '"></i></a>&nbsp;';
+							{
+															$commands[] = '<a href="?action=admin;area=maillist;sa=approve;item=' . $id . $security . '" onclick="return confirm(' . JavaScriptEscape($txt['pm_approve_warning']) . ') && submitThisOnce(this);"><i class="icon i-check" title="' . $txt['approve'] . '"></i></a>&nbsp;';
+							}
+							else {
+															$commands[] = '<a href="?action=admin;area=maillist;sa=approve;item=' . $id . $security . '"><i class="icon i-check" title="' . $txt['approve'] . '"></i></a>&nbsp;';
+							}
 
 							$commands[] = '<a href="?action=admin;area=maillist;sa=delete;item=' . $id . $security . '" onclick="return confirm(' . JavaScriptEscape($txt['delete_warning']) . ') && submitThisOnce(this);" accesskey="d"><i class="icon i-delete" title="' . $txt['delete'] . '"></i></a><br />';
 							$commands[] = '<a href="?action=admin;area=maillist;sa=bounce;item=' . $id . $security . '"><i class="icon i-sign-out" title="' . $txt['bounce'] . '"></i></a>&nbsp;';
@@ -335,11 +350,13 @@ 
 					$email_to = $txt['private'];
 				}
 			}
-			else
-				$text = $txt['badid'];
+			else {
+							$text = $txt['badid'];
+			}
+		}
+		else {
+					$text = $txt['badid'];
 		}
-		else
-			$text = $txt['badid'];
 
 		$parser = \BBC\ParserWrapper::instance();
 
@@ -372,7 +389,9 @@ 
 
 		// Remove this entry
 		if (!empty($id))
-			maillist_delete_error_entry($id);
+		{
+					maillist_delete_error_entry($id);
+		}
 
 		// Flush the cache
 		Cache::instance()->remove('num_menu_errors');
@@ -424,7 +443,9 @@ 
 						$check_emails = array_pad(explode('=>', $temp_email[0]['from']), 2, '');
 
 						if (!empty($check_emails[1]))
-							$data = preg_replace('~(From: )(.*<)?(' . preg_quote(trim($check_emails[0])) . ')(>)?(\n)~i', '$1$2' . trim($check_emails[1]) . '$4$5', $data);
+						{
+													$data = preg_replace('~(From: )(.*<)?(' . preg_quote(trim($check_emails[0])) . ')(>)?(\n)~i', '$1$2' . trim($check_emails[1]) . '$4$5', $data);
+						}
 					}
 
 					// Lets TRY AGAIN to make a post!
@@ -443,17 +464,21 @@ 
 						$_SESSION['email_error'] = $txt['approved'];
 						$_SESSION['email_error_type'] = 1;
 					}
-					else
-						$_SESSION['email_error'] = $txt['error_approved'];
+					else {
+											$_SESSION['email_error'] = $txt['error_approved'];
+					}
+				}
+				else {
+									$_SESSION['email_error'] = $txt['cant_approve'];
 				}
-				else
-					$_SESSION['email_error'] = $txt['cant_approve'];
 			}
-			else
-				$_SESSION['email_error'] = $txt['badid'];
+			else {
+							$_SESSION['email_error'] = $txt['badid'];
+			}
+		}
+		else {
+					$_SESSION['email_error'] = $txt['badid'];
 		}
-		else
-			$_SESSION['email_error'] = $txt['badid'];
 
 		// back to the list we go
 		redirectexit('action=admin;area=maillist;sa=emaillist');
@@ -525,11 +550,13 @@ 
 					));
 				}
 			}
-			else
-				$context['settings_message'] = $txt['badid'];
+			else {
+							$context['settings_message'] = $txt['badid'];
+			}
+		}
+		else {
+					$context['settings_message'] = $txt['badid'];
 		}
-		else
-			$context['settings_message'] = $txt['badid'];
 
 		// Check if they are sending the notice
 		if (isset($this->_req->post->bounce) && isset($temp_email))
@@ -547,7 +574,9 @@ 
 				$body = trim($this->_req->post->warn_body);
 
 				if (empty($body) || empty($subject))
-					$context['settings_message'] = $txt['bad_bounce'];
+				{
+									$context['settings_message'] = $txt['bad_bounce'];
+				}
 				else
 				{
 					// Time for someone to get a we're so sorry message!
@@ -876,7 +905,9 @@ 
 			// Needs to be an int!
 			$id = (int) $this->_req->query->f_id;
 			if (empty($id) || $id <= 0)
-				throw new Elk_Exception('error_no_id_filter');
+			{
+							throw new Elk_Exception('error_no_id_filter');
+			}
 
 			// Load it up and set it as the current values
 			$row = maillist_load_filter_parser($id, 'filter');
@@ -1273,7 +1304,9 @@ 
 			// Needs to be an int!
 			$id = (int) $this->_req->query->f_id;
 			if (empty($id) || $id < 0)
-				throw new Elk_Exception('error_no_id_filter');
+			{
+							throw new Elk_Exception('error_no_id_filter');
+			}
 
 			// Load this filter so we can edit it
 			$row = maillist_load_filter_parser($id, 'parser');
@@ -1425,7 +1458,9 @@ 
 
 		// Be nice, show them we did something
 		if (isset($this->_req->query->saved))
-			$context['settings_message'] = $txt['saved'];
+		{
+					$context['settings_message'] = $txt['saved'];
+		}
 
 		// Templates and language
 		loadLanguage('Admin');
@@ -1463,11 +1498,17 @@ 
 
 			// Basic checking of the email addresses
 			if (!Data_Validator::is_valid($this->_req->post, array('maillist_sitename_address' => 'valid_email'), array('maillist_sitename_address' => 'trim')))
-				$email_error = $this->_req->post->maillist_sitename_address;
+			{
+							$email_error = $this->_req->post->maillist_sitename_address;
+			}
 			if (!Data_Validator::is_valid($this->_req->post, array('maillist_sitename_help' => 'valid_email'), array('maillist_sitename_help' => 'trim')))
-				$email_error = $this->_req->post->maillist_sitename_help;
+			{
+							$email_error = $this->_req->post->maillist_sitename_help;
+			}
 			if (!Data_Validator::is_valid($this->_req->post, array('maillist_mail_from' => 'valid_email'), array('maillist_mail_from' => 'trim')))
-				$email_error = $this->_req->post->maillist_mail_from;
+			{
+							$email_error = $this->_req->post->maillist_mail_from;
+			}
 
 			// Inbound email set up then we need to check for both valid email and valid board
 			if (!$email_error && !empty($this->_req->post->emailfrom))
@@ -1507,9 +1548,13 @@ 
 
 			// Check and set any errors or give the go ahead to save
 			if ($email_error)
-				$context['settings_message'] = sprintf($txt['email_not_valid'], $email_error);
+			{
+							$context['settings_message'] = sprintf($txt['email_not_valid'], $email_error);
+			}
 			elseif ($board_error)
-				$context['settings_message'] = sprintf($txt['board_not_valid'], $board_error);
+			{
+							$context['settings_message'] = sprintf($txt['board_not_valid'], $board_error);
+			}
 			else
 			{
 				// Clear the moderation count cache
@@ -1517,7 +1562,9 @@ 
 
 				// Should be off if mail posting is on, we ignore it anyway but this at least updates the ACP
 				if (!empty($this->_req->post->maillist_enabled))
-					updateSettings(array('disallow_sendBody' => ''));
+				{
+									updateSettings(array('disallow_sendBody' => ''));
+				}
 
 				updateSettings(array('maillist_receiving_address' => serialize($maillist_receiving_address)));
 				$settingsForm->setConfigValues((array) $this->_req->post);
@@ -1534,7 +1581,9 @@ 
 
 		// Create the board selection list
 		foreach ($board_list as $board_id => $board_name)
-			$script .= $i++ . ': {id:' . $board_id . ', name:' . JavaScriptEscape($board_name) . '},';
+		{
+					$script .= $i++ . ': {id:' . $board_id . ', name:' . JavaScriptEscape($board_name) . '},';
+		}
 
 		addInlineJavascript('
 		var sEmailParent = \'add_more_email_placeholder\',
@@ -1596,13 +1645,15 @@ 
 
 		// Imap?
 		if (!function_exists('imap_open'))
-			$config_vars = array_merge($config_vars,
+		{
+					$config_vars = array_merge($config_vars,
 				array(
 					array('title', 'maillist_imap_missing'),
 				)
 			);
-		else
-			$config_vars = array_merge($config_vars,
+		}
+		else {
+					$config_vars = array_merge($config_vars,
 				array(
 					array('title', 'maillist_imap'),
 					array('desc', 'maillist_imap_reason'),
@@ -1624,6 +1675,7 @@ 
 						array('check', 'maillist_imap_cron', 20, 'subtext' => $txt['maillist_imap_cron_desc'], 'disabled' => !function_exists('imap_open')),
 				)
 			);
+		}
 
 		call_integration_hook('integrate_modify_maillist_settings', array(&$config_vars));
 
@@ -1658,7 +1710,9 @@ 
 
 		// Submitting a new one or editing an existing one then pass this request off
 		if (isset($this->_req->post->add) || isset($this->_req->post->save) || isset($this->_req->query->tid))
-			return $this->action_modify_bounce_templates();
+		{
+					return $this->action_modify_bounce_templates();
+		}
 		// Deleting and existing one
 		elseif (isset($this->_req->post->delete) && !empty($this->_req->post->deltpl))
 		{
@@ -1796,7 +1850,9 @@ 
 
 		// If it's an edit load it.
 		if ($context['is_edit'])
-			modLoadTemplate($context['id_template'], 'bnctpl');
+		{
+					modLoadTemplate($context['id_template'], 'bnctpl');
+		}
 
 		// Wait, we are saving?
 		if (isset($this->_req->post->save))
@@ -1834,13 +1890,18 @@ 
 
 					// If it wasn't visible and now is they've effectively added it.
 					if ($context['template_data']['personal'] && !$recipient_id)
-						logAction('add_bounce_template', array('template' => $template_title));
+					{
+											logAction('add_bounce_template', array('template' => $template_title));
+					}
 					// Conversely if they made it personal it's a delete.
 					elseif (!$context['template_data']['personal'] && $recipient_id)
-						logAction('delete_bounce_template', array('template' => $template_title));
+					{
+											logAction('delete_bounce_template', array('template' => $template_title));
+					}
 					// Otherwise just an edit.
-					else
-						logAction('modify_bounce_template', array('template' => $template_title));
+					else {
+											logAction('modify_bounce_template', array('template' => $template_title));
+					}
 				}
 				else
 				{
@@ -1859,10 +1920,14 @@ 
 				$context['template_data']['personal'] = !empty($this->_req->post->make_personal);
 
 				if (empty($template_title))
-					$context['warning_errors'][] = $txt['ml_bounce_template_error_no_title'];
+				{
+									$context['warning_errors'][] = $txt['ml_bounce_template_error_no_title'];
+				}
 
 				if (empty($template_body))
-					$context['warning_errors'][] = $txt['ml_bounce_template_error_no_body'];
+				{
+									$context['warning_errors'][] = $txt['ml_bounce_template_error_no_body'];
+				}
 			}
 		}
 

Spacing +4 added lines, -4 removed lines

@@ -144,7 +144,7 @@ 
 						'value' => $txt['error'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							$error = $rowData['error_code'];
 							if ($error === 'error_pm_not_found')
 								return '<span class="error">' . $rowData['error'] . '<span>';
@@ -217,7 +217,7 @@ 
 						'value' => $txt['message_type'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $txt;
 
 							// Do we have a type?
@@ -244,7 +244,7 @@ 
 						'value' => $txt['message_action'],
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							global $context, $txt;
 
 							$id = $rowData['id_email'] . ';';
@@ -1733,7 +1733,7 @@ 
 						'class' => 'centertext',
 					),
 					'data' => array(
-						'function' => function ($rowData) {
+						'function' => function($rowData) {
 							return '<input type="checkbox" name="deltpl[]" value="' . $rowData['id_comment'] . '" class="input_check" />';
 						},
 						'class' => 'centertext',

sources/admin/ManageErrors.controller.php

Braces +33 added lines, -13 removed lines

@@ -42,11 +42,14 @@ 
 
 		// Some code redundancy... and we only take this!
 		if (isset($activity) && $activity == 'file')
-			// View the file with the error
+		{
+					// View the file with the error
 			$this->action_viewfile();
-		else
-			// View error log
+		}
+		else {
+					// View error log
 			$this->action_log();
+		}
 	}
 
 	/**
@@ -84,7 +87,9 @@ 
 
 			// Go back to where we were.
 			if ($type == 'delete')
-				redirectexit('action=admin;area=logs;sa=errorlog' . (isset($this->_req->query->desc) ? ';desc' : '') . ';start=' . $this->_req->query->start . (!empty($filter) ? ';filter=' . $this->_req->query->filter . ';value=' . $this->_req->query->value : ''));
+			{
+							redirectexit('action=admin;area=logs;sa=errorlog' . (isset($this->_req->query->desc) ? ';desc' : '') . ';start=' . $this->_req->query->start . (!empty($filter) ? ';filter=' . $this->_req->query->filter . ';value=' . $this->_req->query->value : ''));
+			}
 
 			redirectexit('action=admin;area=logs;sa=errorlog' . (isset($this->_req->query->desc) ? ';desc' : ''));
 		}
@@ -94,11 +99,15 @@ 
 
 		// If this filter is empty...
 		if ($num_errors == 0 && !empty($filter))
-			redirectexit('action=admin;area=logs;sa=errorlog' . (isset($this->_req->query->desc) ? ';desc' : ''));
+		{
+					redirectexit('action=admin;area=logs;sa=errorlog' . (isset($this->_req->query->desc) ? ';desc' : ''));
+		}
 
 		// Clean up start.
 		if (!isset($this->_req->query->start) || $this->_req->query->start < 0)
-			$this->_req->query->start = 0;
+		{
+					$this->_req->query->start = 0;
+		}
 
 		// Do we want to reverse error listing?
 		$context['sort_direction'] = isset($this->_req->query->desc) ? 'down' : 'up';
@@ -139,9 +148,12 @@ 
 
 		// Finally, work out what is the last tab!
 		if (isset($context['error_types'][$sum]))
-			$context['error_types'][$sum]['is_last'] = true;
-		else
-			$context['error_types']['all']['is_last'] = true;
+		{
+					$context['error_types'][$sum]['is_last'] = true;
+		}
+		else {
+					$context['error_types']['all']['is_last'] = true;
+		}
 
 		// And this is pretty basic ;).
 		$context['page_title'] = $txt['errlog'];
@@ -255,7 +267,9 @@ 
 			);
 		}
 		elseif (isset($this->_req->query->filter) || isset($this->_req->query->value))
-			unset($this->_req->query->filter, $this->_req->query->value);
+		{
+					unset($this->_req->query->filter, $this->_req->query->value);
+		}
 
 		return $filter;
 	}
@@ -276,7 +290,9 @@ 
 
 		// We can't help you if you don't spell it out loud :P
 		if (!isset($this->_req->query->file))
-			redirectexit();
+		{
+					redirectexit();
+		}
 
 		// Decode the file and get the line
 		$filename = base64_decode($this->_req->query->file);
@@ -295,14 +311,18 @@ 
 
 		// Not like we can look at just any old file
 		if ($ext !== '.php' || (strpos($file, $real_board) === false && strpos($file, $real_source) === false) || strpos($file, $real_cache) !== false || in_array($basename, $excluded) || !is_readable($file))
-			throw new Elk_Exception('error_bad_file', true, array(htmlspecialchars($filename, ENT_COMPAT, 'UTF-8')));
+		{
+					throw new Elk_Exception('error_bad_file', true, array(htmlspecialchars($filename, ENT_COMPAT, 'UTF-8')));
+		}
 
 		// Get the min and max lines
 		$min = $line - 16 <= 0 ? 1 : $line - 16;
 		$max = $line + 21; // One additional line to make everything work out correctly
 
 		if ($max <= 0 || $min >= $max)
-			throw new Elk_Exception('error_bad_line');
+		{
+					throw new Elk_Exception('error_bad_line');
+		}
 
 		$file_data = explode('<br />', highlight_php_code(htmlspecialchars(implode('', file($file)), ENT_COMPAT, 'UTF-8')));
 

sources/admin/RepairBoards.controller.php

Braces +9 added lines, -3 removed lines

@@ -71,7 +71,9 @@ 
 
 		// Start displaying errors without fixing them.
 		if (isset($this->_req->query->fixErrors))
-			checkSession('get');
+		{
+					checkSession('get');
+		}
 
 		// Will want this.
 		loadForumTests();
@@ -98,7 +100,9 @@ 
 				$_SESSION['repairboards_to_fix2'] = null;
 
 				if (empty($context['repair_errors']))
-					$context['repair_errors'][] = '???';
+				{
+									$context['repair_errors'][] = '???';
+				}
 			}
 		}
 		else
@@ -134,7 +138,9 @@ 
 			));
 
 			if (!empty($salvageBoardID))
-				$context['redirect_to_recount'] = true;
+			{
+							$context['redirect_to_recount'] = true;
+			}
 
 			$_SESSION['repairboards_to_fix'] = null;
 			$_SESSION['repairboards_to_fix2'] = null;

sources/BrowserDetector.class.php

Braces +86 added lines, -30 removed lines

@@ -88,16 +88,24 @@ 
 
 		// One at a time, one at a time, and in this order too
 		if ($this->isOpera())
-			$this->_setupOpera();
+		{
+					$this->_setupOpera();
+		}
 		// Them webkits need to be set up too
 		elseif ($this->isWebkit())
-			$this->_setupWebkit();
+		{
+					$this->_setupWebkit();
+		}
 		// We may have work to do on Firefox...
 		elseif ($this->isFirefox())
-			$this->_setupFirefox();
+		{
+					$this->_setupFirefox();
+		}
 		// Old friend, old frenemy
 		elseif ($this->isIe())
-			$this->_setupIe();
+		{
+					$this->_setupIe();
+		}
 
 		// Just a few mobile checks
 		$this->isOperaMini();
@@ -120,7 +128,9 @@ 
 	public function isOpera()
 	{
 		if (!isset($this->_browsers['is_opera']))
-			$this->_browsers['is_opera'] = strpos($this->_ua, 'Opera') !== false;
+		{
+					$this->_browsers['is_opera'] = strpos($this->_ua, 'Opera') !== false;
+		}
 
 		return $this->_browsers['is_opera'];
 	}
@@ -134,7 +144,9 @@ 
 	{
 		// I'm IE, Yes I'm the real IE; All you other IEs are just imitating.
 		if (!isset($this->_browsers['is_ie']))
-			$this->_browsers['is_ie'] = !$this->isOpera() && !$this->isGecko() && !$this->isWebTv() && (preg_match('~Trident/\d+~', $this->_ua) === 1 || preg_match('~MSIE \d+~', $this->_ua) === 1);
+		{
+					$this->_browsers['is_ie'] = !$this->isOpera() && !$this->isGecko() && !$this->isWebTv() && (preg_match('~Trident/\d+~', $this->_ua) === 1 || preg_match('~MSIE \d+~', $this->_ua) === 1);
+		}
 
 		return $this->_browsers['is_ie'];
 	}
@@ -147,7 +159,9 @@ 
 	public function isWebkit()
 	{
 		if (!isset($this->_browsers['is_webkit']))
-			$this->_browsers['is_webkit'] = strpos($this->_ua, 'AppleWebKit') !== false;
+		{
+					$this->_browsers['is_webkit'] = strpos($this->_ua, 'AppleWebKit') !== false;
+		}
 
 		return $this->_browsers['is_webkit'];
 	}
@@ -160,7 +174,9 @@ 
 	public function isFirefox()
 	{
 		if (!isset($this->_browsers['is_firefox']))
-			$this->_browsers['is_firefox'] = preg_match('~(?:Firefox|Ice[wW]easel|IceCat|Shiretoko|Minefield)/~', $this->_ua) === 1 && $this->isGecko();
+		{
+					$this->_browsers['is_firefox'] = preg_match('~(?:Firefox|Ice[wW]easel|IceCat|Shiretoko|Minefield)/~', $this->_ua) === 1 && $this->isGecko();
+		}
 
 		return $this->_browsers['is_firefox'];
 	}
@@ -173,7 +189,9 @@ 
 	public function isWebTv()
 	{
 		if (!isset($this->_browsers['is_web_tv']))
-			$this->_browsers['is_web_tv'] = strpos($this->_ua, 'WebTV') !== false;
+		{
+					$this->_browsers['is_web_tv'] = strpos($this->_ua, 'WebTV') !== false;
+		}
 
 		return $this->_browsers['is_web_tv'];
 	}
@@ -186,7 +204,9 @@ 
 	public function isKonqueror()
 	{
 		if (!isset($this->_browsers['is_konqueror']))
-			$this->_browsers['is_konqueror'] = strpos($this->_ua, 'Konqueror') !== false;
+		{
+					$this->_browsers['is_konqueror'] = strpos($this->_ua, 'Konqueror') !== false;
+		}
 
 		return $this->_browsers['is_konqueror'];
 	}
@@ -199,7 +219,9 @@ 
 	public function isGecko()
 	{
 		if (!isset($this->_browsers['is_gecko']))
-			$this->_browsers['is_gecko'] = strpos($this->_ua, 'Gecko') !== false && strpos($this->_ua, 'like Gecko') === false && !$this->isWebkit() && !$this->isKonqueror();
+		{
+					$this->_browsers['is_gecko'] = strpos($this->_ua, 'Gecko') !== false && strpos($this->_ua, 'like Gecko') === false && !$this->isWebkit() && !$this->isKonqueror();
+		}
 
 		return $this->_browsers['is_gecko'];
 	}
@@ -212,9 +234,13 @@ 
 	public function isOperaMini()
 	{
 		if (!isset($this->_browsers['is_opera_mini']))
-			$this->_browsers['is_opera_mini'] = (isset($_SERVER['HTTP_X_OPERAMINI_PHONE_UA']) || stripos($this->_ua, 'opera mini') !== false);
+		{
+					$this->_browsers['is_opera_mini'] = (isset($_SERVER['HTTP_X_OPERAMINI_PHONE_UA']) || stripos($this->_ua, 'opera mini') !== false);
+		}
 		if ($this->_browsers['is_opera_mini'])
-			$this->_is_mobile = true;
+		{
+					$this->_is_mobile = true;
+		}
 
 		return $this->_browsers['is_opera_mini'];
 	}
@@ -227,9 +253,13 @@ 
 	public function isOperaMobi()
 	{
 		if (!isset($this->_browsers['is_opera_mobi']))
-			$this->_browsers['is_opera_mobi'] = stripos($this->_ua, 'opera mobi') !== false;
+		{
+					$this->_browsers['is_opera_mobi'] = stripos($this->_ua, 'opera mobi') !== false;
+		}
 		if ($this->_browsers['is_opera_mobi'])
-			$this->_is_mobile = true;
+		{
+					$this->_is_mobile = true;
+		}
 
 		return $this->_browsers['is_opera_mini'];
 	}
@@ -246,16 +276,20 @@ 
 		// Be you robot or human?
 		if (!isset($this->_browsers['possibly_robot']))
 		{
-			if (isset($user_info['possibly_robot'])) {
+			if (isset($user_info['possibly_robot']))
+			{
 				// This isn't meant to be reliable, it's just meant to catch most bots to prevent PHPSESSID from showing up.
 				$this->_browsers['possibly_robot'] = !empty($user_info['possibly_robot']);
 
 				// Robots shouldn't be logging in or registering.  So, they aren't a bot.  Better to be wrong than sorry (or people won't be able to log in!), anyway.
 				if ((isset($_REQUEST['action']) && in_array($_REQUEST['action'], array('login', 'login2', 'register'))) || !$user_info['is_guest'])
-					$this->_browsers['possibly_robot'] = false;
+				{
+									$this->_browsers['possibly_robot'] = false;
+				}
+			}
+			else {
+							$this->_browsers['possibly_robot'] = false;
 			}
-			else
-				$this->_browsers['possibly_robot'] = false;
 		}
 
 		return $this->_browsers['possibly_robot'];
@@ -281,12 +315,16 @@ 
 
 		// blackberry, playbook, iphone, nokia, android and ipods set a mobile flag
 		if ($this->_browsers['is_iphone'] || $this->_browsers['is_blackberry'] || $this->_browsers['is_android'] || $this->_browsers['is_nokia'])
-			$this->_is_mobile = true;
+		{
+					$this->_is_mobile = true;
+		}
 
 		// iPad and droid tablets get a tablet flag
 		$this->_browsers['is_android_tablet'] = $this->_browsers['is_android'] && strpos($this->_ua, 'Mobile') === false;
 		if ($this->_browsers['is_ipad'] || $this->_browsers['is_android_tablet'])
-			$this->_is_tablet = true;
+		{
+					$this->_is_tablet = true;
+		}
 
 		// Prevent some repetition here
 		$_chrome = strpos($this->_ua, 'Chrome');
@@ -312,27 +350,37 @@ 
 		if ($this->_browsers['is_chrome'])
 		{
 			if (preg_match('~chrome[/]([0-9][0-9]?[.])~i', $this->_ua, $match) === 1)
-				$this->_browsers['is_chrome' . (int) $match[1]] = true;
+			{
+							$this->_browsers['is_chrome' . (int) $match[1]] = true;
+			}
 		}
 		elseif ($this->_browsers['is_edge'])
 		{
 			$this->_browsers['is_webkit'] = false;
 			if (preg_match('~edge[/]([0-9][0-9]?[.])~i', $this->_ua, $match) === 1)
-				$this->_browsers['is_edge' . (int) $match[1]] = true;
+			{
+							$this->_browsers['is_edge' . (int) $match[1]] = true;
+			}
 		}
 		elseif ($this->_browsers['is_safari'])
 		{
 			if (preg_match('~version/?(.*)safari.*~i', $this->_ua, $match) === 1)
-				$this->_browsers['is_safari' . (int) trim($match[1])] = true;
+			{
+							$this->_browsers['is_safari' . (int) trim($match[1])] = true;
+			}
 		}
 		elseif ($this->_browsers['is_opera'])
 		{
 			if (preg_match('~OPR[/]([0-9][0-9]?[.])~i', $this->_ua, $match) === 1)
-				$this->_browsers['is_opera' . (int) trim($match[1])] = true;
+			{
+							$this->_browsers['is_opera' . (int) trim($match[1])] = true;
+			}
 
 			// Since opera >= 15 wants to look like chrome, set the body to do just that
 			if (trim($match[1]) >= 15)
-				$this->_browsers['is_chrome'] = true;
+			{
+							$this->_browsers['is_chrome'] = true;
+			}
 		}
 	}
 
@@ -365,7 +413,9 @@ 
 
 			// If trident is set, see the (if any) msie tag in the user agent matches ... if not its in some compatibility view
 			if (isset($msie_match[1]) && ($msie_match[1] < $trident_match[1] + 4))
-				$this->_browsers['is_ie_compat_view'] = true;
+			{
+							$this->_browsers['is_ie_compat_view'] = true;
+			}
 		}
 
 		// IE mobile, ... shucks why not
@@ -394,7 +444,9 @@ 
 	private function _setupFirefox()
 	{
 		if (preg_match('~(?:Firefox|Ice[wW]easel|IceCat|Shiretoko|Minefield)[\/ \(]([^ ;\)]+)~', $this->_ua, $match) === 1)
-			$this->_browsers['is_firefox' . (int) $match[1]] = true;
+		{
+					$this->_browsers['is_firefox' . (int) $match[1]] = true;
+		}
 
 		// Firefox mobile
 		if (strpos($this->_ua, 'Android; Mobile;') !== false)
@@ -423,10 +475,14 @@ 
 	{
 		// Opera 10+ uses the version tag at the end of the string
 		if (preg_match('~\sVersion/([0-9]+)\.[0-9]+(?:\s*|$)~', $this->_ua, $match))
-			$this->_browsers['is_opera' . (int) $match[1]] = true;
+		{
+					$this->_browsers['is_opera' . (int) $match[1]] = true;
+		}
 		// Opera pre 10 is supposed to uses the Opera tag alone, as do some spoofers
 		elseif (preg_match('~Opera[ /]([0-9]+)(?!\\.[89])~', $this->_ua, $match))
-			$this->_browsers['is_opera' . (int) $match[1]] = true;
+		{
+					$this->_browsers['is_opera' . (int) $match[1]] = true;
+		}
 	}
 
 	/**

sources/Hooks.class.php

Braces +96 added lines, -36 removed lines

@@ -67,7 +67,9 @@ 
 		$this->_debug = $debug;
 
 		if ($paths !== null)
-			$this->newPath($paths);
+		{
+					$this->newPath($paths);
+		}
 	}
 
 	/**
@@ -98,16 +100,22 @@ 
 		global $modSettings;
 
 		if ($this->_debug !== null)
-			$this->_debug->add('hooks', $hook);
+		{
+					$this->_debug->add('hooks', $hook);
+		}
 
 		$results = array();
 		if (empty($modSettings[$hook]))
-			return $results;
+		{
+					return $results;
+		}
 
 		// Loop through each function.
 		$functions = $this->_prepare_hooks($modSettings[$hook]);
 		foreach ($functions as $function => $call)
-			$results[$function] = call_user_func_array($call, $parameters);
+		{
+					$results[$function] = call_user_func_array($call, $parameters);
+		}
 
 		return $results;
 	}
@@ -128,25 +136,34 @@ 
 			$function = trim($function);
 
 			if (strpos($function, '|') !== false)
-				list ($call, $file) = explode('|', $function);
-			else
-				$call = $function;
+			{
+							list ($call, $file) = explode('|', $function);
+			}
+			else {
+							$call = $function;
+			}
 
 			// OOP static method
 			if (strpos($call, '::') !== false)
-				$call = explode('::', $call);
+			{
+							$call = explode('::', $call);
+			}
 
 			if (!empty($file))
 			{
 				$absPath = strtr(trim($file), $this->_path_replacements);
 
 				if (file_exists($absPath))
-					require_once($absPath);
+				{
+									require_once($absPath);
+				}
 			}
 
 			// Is it valid?
 			if (is_callable($call))
-				$returns[$function] = $call;
+			{
+							$returns[$function] = $call;
+			}
 		}
 
 		return $returns;
@@ -162,7 +179,9 @@ 
 		global $modSettings;
 
 		if ($this->_debug !== null)
-			$this->_debug->add('hooks', $hook);
+		{
+					$this->_debug->add('hooks', $hook);
+		}
 
 		// Any file to include?
 		if (!empty($modSettings[$hook]))
@@ -173,7 +192,9 @@ 
 				$include = strtr(trim($include), $this->_path_replacements);
 
 				if (file_exists($include))
-					require_once($include);
+				{
+									require_once($include);
+				}
 			}
 		}
 	}
@@ -186,15 +207,21 @@ 
 		global $modSettings;
 
 		if ($this->_debug !== null)
-			$this->_debug->add('hooks', 'integrate_buffer');
+		{
+					$this->_debug->add('hooks', 'integrate_buffer');
+		}
 
 		if (empty($modSettings['integrate_buffer']))
-			return;
+		{
+					return;
+		}
 
 		$buffers = $this->_prepare_hooks($modSettings['integrate_buffer']);
 
 		foreach ($buffers as $call)
-			ob_start($call);
+		{
+					ob_start($call);
+		}
 	}
 
 	/**
@@ -215,14 +242,18 @@ 
 
 		// Is it going to be permanent?
 		if ($permanent)
-			$this->_store($hook, $integration_call);
+		{
+					$this->_store($hook, $integration_call);
+		}
 
 		// Make current function list usable.
 		$functions = empty($modSettings[$hook]) ? array() : explode(',', $modSettings[$hook]);
 
 		// Do nothing, if it's already there.
 		if (in_array($integration_call, $functions))
-			return;
+		{
+					return;
+		}
 
 		$functions[] = $integration_call;
 		$modSettings[$hook] = implode(',', $functions);
@@ -242,10 +273,14 @@ 
 				$hooks = $class::register();
 
 				if (empty($hooks))
-					continue;
+				{
+									continue;
+				}
 
 				foreach ($hooks as $hook)
-					$this->add($hook[0], $hook[1], isset($hook[2]) ? $hook[2] : '', false);
+				{
+									$this->add($hook[0], $hook[1], isset($hook[2]) ? $hook[2] : '', false);
+				}
 			}
 		}
 	}
@@ -264,10 +299,14 @@ 
 				$hooks = $class::settingsRegister();
 
 				if (empty($hooks))
-					continue;
+				{
+									continue;
+				}
 
 				foreach ($hooks as $hook)
-					$this->add($hook[0], $hook[1], isset($hook[2]) ? $hook[2] : '', false);
+				{
+									$this->add($hook[0], $hook[1], isset($hook[2]) ? $hook[2] : '', false);
+				}
 			}
 		}
 	}
@@ -299,9 +338,11 @@ 
 
 			// Already have the integration compose file, then use it, otherwise create one
 			if (file_exists($composer_file))
-				$composer_data = json_decode(file_get_contents($composer_file));
-			else
-				$composer_data = json_decode('{
+			{
+							$composer_data = json_decode(file_get_contents($composer_file));
+			}
+			else {
+							$composer_data = json_decode('{
     "name": "' . $name . '",
     "description": "' . $name . '",
     "version": "1.0.0",
@@ -338,6 +379,7 @@ 
         "setting_url": ""
     }
 }');
+			}
 
 			$names[] = array(
 				'id' => $name,
@@ -390,9 +432,12 @@ 
 		global $modSettings;
 
 		if (!empty($modSettings['autoload_integrate']))
-			$existing = explode(',', $modSettings['autoload_integrate']);
-		else
-			$existing = array();
+		{
+					$existing = explode(',', $modSettings['autoload_integrate']);
+		}
+		else {
+					$existing = array();
+		}
 
 		return $existing;
 	}
@@ -434,12 +479,15 @@ 
 		{
 			$current_functions = explode(',', $current_functions);
 			if (in_array($integration_call, $current_functions))
-				return;
+			{
+							return;
+			}
 
 			$permanent_functions = array_merge($current_functions, array($integration_call));
 		}
-		else
-			$permanent_functions = array($integration_call);
+		else {
+					$permanent_functions = array($integration_call);
+		}
 
 		updateSettings(array($hook => implode(',', $permanent_functions)));
 	}
@@ -484,7 +532,9 @@ 
 			{
 				updateSettings(array($hook => implode(',', array_diff($current_functions, array($integration_call)))));
 				if (empty($modSettings[$hook]))
-					removeSettings($hook);
+				{
+									removeSettings($hook);
+				}
 			}
 		}
 
@@ -493,7 +543,9 @@ 
 
 		// You can only remove it if it's available.
 		if (!in_array($integration_call, $functions))
-			return;
+		{
+					return;
+		}
 
 		$functions = array_diff($functions, array($integration_call));
 		$modSettings[$hook] = implode(',', $functions);
@@ -509,10 +561,14 @@ 
 	public static function init($db = null, $debug = null, $paths = null)
 	{
 		if ($db === null)
-			$db = database();
+		{
+					$db = database();
+		}
 
 		if ($debug === null)
-			$debug = Debug::instance();
+		{
+					$debug = Debug::instance();
+		}
 
 		self::$_instance = new Hooks($db, $debug, $paths);
 	}
@@ -529,9 +585,13 @@ 
 	public static function instance($db = null, $debug = null, $paths = null)
 	{
 		if (self::$_instance === null)
-			self::init($db, $debug, $paths);
+		{
+					self::init($db, $debug, $paths);
+		}
 		elseif ($paths !== null)
-			self::$_instance->newPath($paths);
+		{
+					self::$_instance->newPath($paths);
+		}
 
 		return self::$_instance;
 	}