elkarte / Elkarte

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/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/subs/Emailpost.subs.php

Braces +157 added lines, -66 removed lines

@@ -105,7 +105,9 @@ 
 	// below and/or inside the original message. People like this should not be allowed
 	// to use the net, or be forced to read their own messed up emails
 	if (empty($result) || (trim(strip_tags(pbe_filter_email_message($text))) === ''))
-		$text = $text_save;
+	{
+			$text = $text_save;
+	}
 
 	return $text;
 }
@@ -224,7 +226,9 @@ 
 
 		// No quote or in the same quote just continue
 		if ($level == $current_quote)
-			continue;
+		{
+					continue;
+		}
 
 		// Deeper than we were so add a quote
 		if ($level > $current_quote)
@@ -309,12 +313,15 @@ 
 			$string = substr($string, 1);
 		}
 		// All done getting the depth
-		else
-			$check = false;
+		else {
+					$check = false;
+		}
 	}
 
 	if (!$update)
-		$string = $string_save;
+	{
+			$string = $string_save;
+	}
 
 	return $level;
 }
@@ -356,10 +363,13 @@ 
 			// @todo these are tested at insertion now, so this test is really not necessary
 			$temp = preg_replace($row['filter_from'], '', '$5#6#8%9456@^)098');
 			if ($temp !== null)
-				$expressions[] = array('type' => 'regex', 'parser' => $row['filter_from']);
+			{
+							$expressions[] = array('type' => 'regex', 'parser' => $row['filter_from']);
+			}
+		}
+		else {
+					$expressions[] = array('type' => 'string', 'parser' => $row['filter_from']);
 		}
-		else
-			$expressions[] = array('type' => 'string', 'parser' => $row['filter_from']);
 	}
 	$db->free_result($request);
 
@@ -368,9 +378,12 @@ 
 	foreach ($expressions as $expression)
 	{
 		if ($expression['type'] === 'regex')
-			$split = preg_split($expression['parser'], $body);
-		else
-			$split = explode($expression['parser'], $body, 2);
+		{
+					$split = preg_split($expression['parser'], $body);
+		}
+		else {
+					$split = explode($expression['parser'], $body, 2);
+		}
 
 		// If an expression was matched our fine work is done
 		if (!empty($split[1]))
@@ -418,15 +431,20 @@ 
 		{
 			// Newline madness
 			if (!empty($row['filter_to']))
-				$row['filter_to'] = str_replace('\n', "\n", $row['filter_to']);
+			{
+							$row['filter_to'] = str_replace('\n', "\n", $row['filter_to']);
+			}
 
 			// Test the regex and if good use, else skip, don't want a bad regex to empty the message!
 			$temp = preg_replace($row['filter_from'], $row['filter_to'], $text);
 			if ($temp !== null)
-				$text = $temp;
+			{
+							$text = $temp;
+			}
+		}
+		else {
+					$text = str_replace($row['filter_from'], $row['filter_to'], $text);
 		}
-		else
-			$text = str_replace($row['filter_from'], $row['filter_to'], $text);
 	}
 	$db->free_result($request);
 
@@ -451,34 +469,49 @@ 
 	// Find Re: Subject: FW: FWD or [$sitename] in the subject and strip it
 	$re = strpos(strtoupper($text), $txt['RE:']);
 	if ($re !== false)
-		$text = substr($text, 0, $re) . substr($text, $re + strlen($txt['RE:']), strlen($text));
+	{
+			$text = substr($text, 0, $re) . substr($text, $re + strlen($txt['RE:']), strlen($text));
+	}
 
 	$su = strpos(strtoupper($text), $txt['SUBJECT:']);
 	if ($su !== false)
-		$text = substr($text, 0, $su) . substr($text, $su + strlen($txt['SUBJECT:']), strlen($text));
+	{
+			$text = substr($text, 0, $su) . substr($text, $su + strlen($txt['SUBJECT:']), strlen($text));
+	}
 
 	$fw = strpos(strtoupper($text), $txt['FW:']);
 	if ($fw !== false)
-		$text = substr($text, 0, $fw) . substr($text, $fw + strlen($txt['FW:']), strlen($text));
+	{
+			$text = substr($text, 0, $fw) . substr($text, $fw + strlen($txt['FW:']), strlen($text));
+	}
 
 	$gr = strpos($text, '[' . $sitename . ']');
 	if ($gr !== false)
-		$text = substr($text, 0, $gr) . substr($text, $gr + strlen($sitename) + 2, strlen($text));
+	{
+			$text = substr($text, 0, $gr) . substr($text, $gr + strlen($sitename) + 2, strlen($text));
+	}
 
 	$fwd = strpos(strtoupper($text), $txt['FWD:']);
 	if ($fwd !== false)
-		$text = substr($text, 0, $fwd) . substr($text, $fwd + strlen($txt['FWD:']), strlen($text));
+	{
+			$text = substr($text, 0, $fwd) . substr($text, $fwd + strlen($txt['FWD:']), strlen($text));
+	}
 
 	// if not done then call ourselves again, we like the sound of our name
 	if (strpos(strtoupper($text), $txt['RE:']) || strpos(strtoupper($text), $txt['FW:']) || strpos(strtoupper($text), $txt['FWD:']) || strpos($text, '[' . $sitename . ']'))
-		$text = pbe_clean_email_subject($text);
+	{
+			$text = pbe_clean_email_subject($text);
+	}
 
 	// clean or not?
 	if ($check)
-		return ($re === false && $su === false && $gr === false && $fw === false && $fwd === false);
-	else
-		return trim($text);
-}
+	{
+			return ($re === false && $su === false && $gr === false && $fw === false && $fwd === false);
+	}
+	else {
+			return trim($text);
+	}
+	}
 
 /**
  * Used if the original email could not be removed from the message (top of post)
@@ -556,7 +589,9 @@ 
 	// Looks for the first occurrence of $needle in $haystack and replaces it with $replace
 	$pos = strpos($haystack, $needle);
 	if ($pos === false)
-		return $haystack;
+	{
+			return $haystack;
+	}
 
 	return substr_replace($haystack, $replace, $pos, strlen($needle));
 }
@@ -574,7 +609,9 @@ 
 	global $modSettings;
 
 	if (empty($modSettings['postmod_active']))
-		return;
+	{
+			return;
+	}
 
 	// Have they been muted for being naughty?
 	if (!empty($modSettings['warning_mute']) && $modSettings['warning_mute'] <= $pbe['user_info']['warning'])
@@ -602,9 +639,12 @@ 
 		foreach ($permission_change as $old => $new)
 		{
 			if (!in_array($old, $pbe['user_info']['permissions']))
-				unset($permission_change[$old]);
-			else
-				$pbe['user_info']['permissions'][] = $new;
+			{
+							unset($permission_change[$old]);
+			}
+			else {
+							$pbe['user_info']['permissions'][] = $new;
+			}
 		}
 
 		$pbe['user_info']['permissions'] = array_diff($pbe['user_info']['permissions'], array_keys($permission_change));
@@ -684,7 +724,9 @@ 
 		// We don't have the message type (since we don't have a key)
 		// Attempt to see if it might be a PM so we handle it correctly
 		if (empty($message_type) && (strpos($email_message->subject, $pm_subject_leader) !== false))
-			$message_type = 'p';
+		{
+					$message_type = 'p';
+		}
 
 		// Find all keys sent to this user, sorted by date
 		$user_keys = query_user_keys($email_message->email['from']);
@@ -714,7 +756,9 @@ 
 
 	// Maybe we have enough to find the board id where this was going
 	if (!empty($message_id) && $message_type !== 'p')
-		$board_id = query_load_board($message_id);
+	{
+			$board_id = query_load_board($message_id);
+	}
 
 	// Log the error so the moderators can take a look, helps keep them sharp
 	$id = isset($_REQUEST['item']) ? (int) $_REQUEST['item'] : 0;
@@ -774,13 +818,16 @@ 
 	if (!empty($modSettings['currentAttachmentUploadDir']))
 	{
 		if (!is_array($modSettings['attachmentUploadDir']))
-			$modSettings['attachmentUploadDir'] = Util::unserialize($modSettings['attachmentUploadDir']);
+		{
+					$modSettings['attachmentUploadDir'] = Util::unserialize($modSettings['attachmentUploadDir']);
+		}
 
 		// The current directory, of course!
 		$current_attach_dir = $modSettings['attachmentUploadDir'][$modSettings['currentAttachmentUploadDir']];
 	}
-	else
-		$current_attach_dir = $modSettings['attachmentUploadDir'];
+	else {
+			$current_attach_dir = $modSettings['attachmentUploadDir'];
+	}
 
 	// For attachmentChecks function
 	require_once(SUBSDIR . '/Attachments.subs.php');
@@ -844,11 +891,15 @@ 
 		{
 			$attachIDs[] = $attachmentOptions['id'];
 			if (!empty($attachmentOptions['thumb']))
-				$attachIDs[] = $attachmentOptions['thumb'];
+			{
+							$attachIDs[] = $attachmentOptions['thumb'];
+			}
 		}
 		// We had a problem so simply remove it
 		elseif (file_exists($attachment['tmp_name']))
-			@unlink($attachment['tmp_name']);
+		{
+					@unlink($attachment['tmp_name']);
+		}
 	}
 
 	return $attachIDs;
@@ -873,7 +924,9 @@ 
 	// Load our valid email ids and the corresponding board ids
 	$data = (!empty($modSettings['maillist_receiving_address'])) ? Util::unserialize($modSettings['maillist_receiving_address']) : array();
 	foreach ($data as $key => $addr)
-		$valid_address[$addr[0]] = $addr[1];
+	{
+			$valid_address[$addr[0]] = $addr[1];
+	}
 
 	// Who was this message sent to, may have been sent to multiple addresses
 	// so we must check each one to see if we have a valid entry
@@ -911,7 +964,9 @@ 
 
 	// Check on some things needed by parse_bbc as an autotask does not load them
 	if (!isset($context['browser']))
-		detectBrowser();
+	{
+			detectBrowser();
+	}
 
 	// Server?
 	detectServer();
@@ -955,7 +1010,9 @@ 
 
 			// Build the th line for this table
 			for ($i = 1; $i <= $cols; $i++)
-				$table_header .= '<th>- ' . $i . ' -</th>';
+			{
+							$table_header .= '<th>- ' . $i . ' -</th>';
+			}
 
 			// Insert it in to the table tag
 			$table_header = '<tr>' . $table_header . '</tr>';
@@ -1122,7 +1179,9 @@ 
 	$db = database();
 
 	if (empty($email))
-		return false;
+	{
+			return false;
+	}
 
 	// Find the user who owns this email address
 	$request = $db->query('', '
@@ -1142,7 +1201,9 @@ 
 
 	// No user found ... back we go
 	if (empty($id_member))
-		return false;
+	{
+			return false;
+	}
 
 	// Load the users profile information
 	$pbe = array();
@@ -1152,17 +1213,22 @@ 
 
 		// Load in *some* user_info data just like loadUserSettings would do
 		if (empty($pbe['profile']['additional_groups']))
-			$pbe['user_info']['groups'] = array(
+		{
+					$pbe['user_info']['groups'] = array(
 				$pbe['profile']['id_group'], $pbe['profile']['id_post_group']);
-		else
-			$pbe['user_info']['groups'] = array_merge(
+		}
+		else {
+					$pbe['user_info']['groups'] = array_merge(
 				array($pbe['profile']['id_group'], $pbe['profile']['id_post_group']),
 				explode(',', $pbe['profile']['additional_groups'])
 			);
+		}
 
 		// Clean up the groups
 		foreach ($pbe['user_info']['groups'] as $k => $v)
-			$pbe['user_info']['groups'][$k] = (int) $v;
+		{
+					$pbe['user_info']['groups'][$k] = (int) $v;
+		}
 		$pbe['user_info']['groups'] = array_unique($pbe['user_info']['groups']);
 
 		// Load the user's general permissions....
@@ -1173,9 +1239,12 @@ 
 
 		// Work out our query_see_board string for security
 		if (in_array(1, $pbe['user_info']['groups']))
-			$pbe['user_info']['query_see_board'] = '1=1';
-		else
-			$pbe['user_info']['query_see_board'] = '((FIND_IN_SET(' . implode(', b.member_groups) != 0 OR FIND_IN_SET(', $pbe['user_info']['groups']) . ', b.member_groups) != 0)' . (!empty($modSettings['deny_boards_access']) ? ' AND (FIND_IN_SET(' . implode(', b.deny_member_groups) = 0 AND FIND_IN_SET(', $pbe['user_info']['groups']) . ', b.deny_member_groups) = 0)' : '') . ')';
+		{
+					$pbe['user_info']['query_see_board'] = '1=1';
+		}
+		else {
+					$pbe['user_info']['query_see_board'] = '((FIND_IN_SET(' . implode(', b.member_groups) != 0 OR FIND_IN_SET(', $pbe['user_info']['groups']) . ', b.member_groups) != 0)' . (!empty($modSettings['deny_boards_access']) ? ' AND (FIND_IN_SET(' . implode(', b.deny_member_groups) = 0 AND FIND_IN_SET(', $pbe['user_info']['groups']) . ', b.deny_member_groups) = 0)' : '') . ')';
+		}
 
 		// Set some convenience items
 		$pbe['user_info']['is_admin'] = in_array(1, $pbe['user_info']['groups']) ? 1 : 0;
@@ -1224,16 +1293,21 @@ 
 	while ($row = $db->fetch_assoc($request))
 	{
 		if (empty($row['add_deny']))
-			$removals[] = $row['permission'];
-		else
-			$pbe['user_info']['permissions'][] = $row['permission'];
+		{
+					$removals[] = $row['permission'];
+		}
+		else {
+					$pbe['user_info']['permissions'][] = $row['permission'];
+		}
 	}
 	$db->free_result($request);
 
 	// Remove all the permissions they shouldn't have ;)
 	if (!empty($modSettings['permission_enable_deny']))
-		$pbe['user_info']['permissions'] = array_diff($pbe['user_info']['permissions'], $removals);
-}
+	{
+			$pbe['user_info']['permissions'] = array_diff($pbe['user_info']['permissions'], $removals);
+	}
+	}
 
 /**
  * Fetches the senders email wrapper details
@@ -1589,18 +1663,24 @@ 
 	// Verify the id_theme...
 	// Allow the board specific theme, if they are overriding.
 	if (!empty($board_info['id_theme']) && $board_info['override_theme'])
-		$id_theme = (int) $board_info['id_theme'];
+	{
+			$id_theme = (int) $board_info['id_theme'];
+	}
 	elseif (!empty($modSettings['knownThemes']))
 	{
 		$themes = explode(',', $modSettings['knownThemes']);
 
 		if (!in_array($id_theme, $themes))
-			$id_theme = $modSettings['theme_guests'];
-		else
+		{
+					$id_theme = $modSettings['theme_guests'];
+		}
+		else {
+					$id_theme = (int) $id_theme;
+		}
+	}
+	else {
 			$id_theme = (int) $id_theme;
 	}
-	else
-		$id_theme = (int) $id_theme;
 
 	// With the theme and member, load the auto_notify variables
 	$result = $db->query('', '
@@ -1618,7 +1698,9 @@ 
 	// Put everything about this member/theme into a theme setting array
 	$theme_settings = array();
 	while ($row = $db->fetch_assoc($result))
-		$theme_settings[$row['variable']] = $row['value'];
+	{
+			$theme_settings[$row['variable']] = $row['value'];
+	}
 
 	$db->free_result($result);
 
@@ -1654,7 +1736,9 @@ 
 		)
 	);
 	if ($db->fetch_row($request))
-		$board_notify = true;
+	{
+			$board_notify = true;
+	}
 	$db->free_result($request);
 
 	// If they have topic notification on and not board notification then
@@ -1728,7 +1812,9 @@ 
 		);
 		$total_unread = 0;
 		while ($row = $db->fetch_assoc($result))
-			$total_unread += $row['num'];
+		{
+					$total_unread += $row['num'];
+		}
 		$db->free_result($result);
 
 		// Update things for when they do come to the site
@@ -1830,23 +1916,28 @@ 
 
 	// Show they are active in the who's online list and what they have done
 	if ($email_message->message_type === 'm' || $email_message->message_type === 't')
-		$get_temp = array(
+	{
+			$get_temp = array(
 			'action' => 'postbyemail',
 			'topic' => $topic_info['id_topic'],
 			'last_msg' => $topic_info['id_last_msg'],
 			'board' => $topic_info['id_board']
 		);
+	}
 	elseif ($email_message->message_type === 'x')
-		$get_temp = array(
+	{
+			$get_temp = array(
 			'action' => 'topicbyemail',
 			'topic' => $topic_info['id'],
 			'board' => $topic_info['board'],
 		);
-	else
-		$get_temp = array(
+	}
+	else {
+			$get_temp = array(
 			'action' => 'pm',
 			'sa' => 'byemail'
 		);
+	}
 
 	// Place the entry in to the online log so the who's online can use it
 	$serialized = serialize($get_temp);

sources/subs/Html2Md.class.php

Braces +9 added lines, -4 removed lines

@@ -444,9 +444,12 @@ 
 			case 'ol':
 			case 'ul':
 				if ($this->_has_parent_list($node, $this->_parser))
-					$markdown = trim($this->_get_value($node));
-				else
-					$markdown = $this->line_end . $this->_get_value($node) . $this->line_end;
+				{
+									$markdown = trim($this->_get_value($node));
+				}
+				else {
+									$markdown = $this->line_end . $this->_get_value($node) . $this->line_end;
+				}
 				break;
 			case 'li':
 				$markdown = $this->_convert_list($node);
@@ -541,7 +544,9 @@ 
 		global $txt;
 
 		if ($node->getAttribute('data-lightboximage') || $node->getAttribute('data-lightboxmessage'))
-			return '~`skip`~';
+		{
+					return '~`skip`~';
+		}
 
 		$href = str_replace('\_', '_', htmlspecialchars_decode($node->getAttribute('href')));
 		$title = $node->getAttribute('title');

Spacing +3 added lines, -3 removed lines

@@ -271,7 +271,7 @@ 
 
 		// Strip the chaff and any excess blank lines we may have produced
 		$this->markdown = trim($this->markdown);
-		$this->markdown = preg_replace("~(?:\s?\n\s?){3,6}~", "\n\n", $this->markdown);	}
+		$this->markdown = preg_replace("~(?:\s?\n\s?){3,6}~", "\n\n", $this->markdown); }
 
 	/**
 	 * Looks for the text inside <body> and then <html>, returning just the inner
@@ -577,7 +577,7 @@ 
 		}
 		else
 		{
-			$markdown = '[' . ($value === $txt['link'] ? 'X' : $value) . ']('  . $href . ' "' . $txt['link'] . '")';
+			$markdown = '[' . ($value === $txt['link'] ? 'X' : $value) . '](' . $href . ' "' . $txt['link'] . '")';
 		}
 
 		$this->_check_line_length($markdown, $this->get_buffer($node));
@@ -1231,7 +1231,7 @@ 
 		$re = '/((?<!\\\\\( |]\()https?:\/\/|(?<!\\\\\( |]\(|:\/\/)www)[-\p{L}0-9+&@#\/%?=~_|!:,.;]*[\p{L}0-9+&@#\/%=~_|]/ui';
 		$count = 0;
 		$text = preg_replace_callback($re,
-			function ($matches) {
+			function($matches) {
 				return $this->_plaintxt_callback($matches);
 			}, $text, -1, $count);
 

sources/subs/Bans.subs.php

Braces +218 added lines, -86 removed lines

@@ -59,15 +59,20 @@ 
 	$ban_errors = ElkArte\Errors\ErrorContext::context('ban', 1);
 
 	if (!is_array($suggestions))
-		return false;
+	{
+			return false;
+	}
 
 	// What triggers are we adding (like ip, host, email, etc)
 	foreach ($suggestions['ban_suggestions'] as $key => $value)
 	{
 		if (is_array($value))
-			$triggers[$key] = $value;
-		else
-			$triggers[$value] = !empty($suggestions[$value]) ? $suggestions[$value] : '';
+		{
+					$triggers[$key] = $value;
+		}
+		else {
+					$triggers[$value] = !empty($suggestions[$value]) ? $suggestions[$value] : '';
+		}
 	}
 
 	// Make sure the triggers for this ban are valid
@@ -77,17 +82,23 @@ 
 	if (!empty($ban_triggers['ban_triggers']) && !$ban_errors->hasErrors())
 	{
 		if (empty($trigger_id))
-			addTriggers($ban_group, $ban_triggers['ban_triggers'], $ban_triggers['log_info']);
-		else
-			updateTriggers($trigger_id, $ban_group, array_shift($ban_triggers['ban_triggers']), $ban_triggers['log_info']);
+		{
+					addTriggers($ban_group, $ban_triggers['ban_triggers'], $ban_triggers['log_info']);
+		}
+		else {
+					updateTriggers($trigger_id, $ban_group, array_shift($ban_triggers['ban_triggers']), $ban_triggers['log_info']);
+		}
 	}
 
 	// No errors, then return the ban triggers
 	if ($ban_errors->hasErrors())
-		return $triggers;
-	else
-		return false;
-}
+	{
+			return $triggers;
+	}
+	else {
+			return false;
+	}
+	}
 
 /**
  * This function removes a batch of triggers based on ids
@@ -107,13 +118,19 @@ 
 	$db = database();
 
 	if ($group_id !== false)
-		$group_id = (int) $group_id;
+	{
+			$group_id = (int) $group_id;
+	}
 
 	if (empty($group_id) && empty($items_ids))
-		return false;
+	{
+			return false;
+	}
 
 	if (!is_array($items_ids))
-		$items_ids = array($items_ids);
+	{
+			$items_ids = array($items_ids);
+	}
 
 	// Log the ban removals so others know
 	$log_info = banLogItems(banDetails($items_ids, $group_id));
@@ -163,12 +180,16 @@ 
 	$db = database();
 
 	if (!is_array($group_ids))
-		$group_ids = array($group_ids);
+	{
+			$group_ids = array($group_ids);
+	}
 
 	$group_ids = array_unique($group_ids);
 
 	if (empty($group_ids))
-		return false;
+	{
+			return false;
+	}
 
 	$db->query('', '
 		DELETE FROM {db_prefix}ban_groups
@@ -199,21 +220,27 @@ 
 
 	// No specific id's passed, we truncate the entire table
 	if (empty($ids))
-		$db->query('truncate_table', '
+	{
+			$db->query('truncate_table', '
 			TRUNCATE {db_prefix}log_banned',
 			array(
 			)
 		);
+	}
 	else
 	{
 		if (!is_array($ids))
-			$ids = array($ids);
+		{
+					$ids = array($ids);
+		}
 
 		// Can only remove it once
 		$ids = array_unique($ids);
 
 		if (empty($ids))
-			return false;
+		{
+					return false;
+		}
 
 		// Remove this grouping
 		$db->query('', '
@@ -240,7 +267,9 @@ 
 
 	$ban_errors = ElkArte\Errors\ErrorContext::context('ban', 1);
 	if (empty($triggers))
-		$ban_errors->addError('ban_empty_triggers');
+	{
+			$ban_errors->addError('ban_empty_triggers');
+	}
 
 	$ban_triggers = array();
 	$log_info = array();
@@ -251,7 +280,9 @@ 
 		if (!empty($value))
 		{
 			if ($key == 'member')
-				continue;
+			{
+							continue;
+			}
 
 			if ($key == 'main_ip')
 			{
@@ -262,13 +293,16 @@ 
 				{
 					$ban_triggers['main_ip'] = $ban_trigger;
 				}
-				else
-					$ban_errors->addError($ban_trigger['error']);
+				else {
+									$ban_errors->addError($ban_trigger['error']);
+				}
 			}
 			elseif ($key == 'hostname')
 			{
 				if (preg_match('/[^\w.\-*]/', $value) == 1)
-					$ban_errors->addError('invalid_hostname');
+				{
+									$ban_errors->addError('invalid_hostname');
+				}
 				else
 				{
 					// Replace the * wildcard by a MySQL wildcard %.
@@ -280,7 +314,9 @@ 
 			elseif ($key == 'email')
 			{
 				if (preg_match('/[^\w.\-\+*@]/', $value) == 1)
-					$ban_errors->addError('invalid_email');
+				{
+									$ban_errors->addError('invalid_email');
+				}
 
 				// Check the user is not banning an admin.
 				$request = $db->query('', '
@@ -295,7 +331,9 @@ 
 					)
 				);
 				if ($db->num_rows($request) != 0)
-					$ban_errors->addError('no_ban_admin');
+				{
+									$ban_errors->addError('no_ban_admin');
+				}
 				$db->free_result($request);
 
 				$value = substr(strtolower(str_replace('*', '%', $value)), 0, 255);
@@ -317,7 +355,9 @@ 
 					)
 				);
 				if ($db->num_rows($request) == 0)
-					$ban_errors->addError('invalid_username');
+				{
+									$ban_errors->addError('invalid_username');
+				}
 				list ($value, $isAdmin) = $db->fetch_row($request);
 				$db->free_result($request);
 
@@ -326,8 +366,9 @@ 
 					unset($value);
 					$ban_errors->addError('no_ban_admin');
 				}
-				else
-					$ban_triggers['user']['id_member'] = $value;
+				else {
+									$ban_triggers['user']['id_member'] = $value;
+				}
 			}
 			elseif (in_array($key, array('ips_in_messages', 'ips_in_errors')))
 			{
@@ -336,7 +377,9 @@ 
 
 				// Don't add the main IP again.
 				if (isset($triggers['main_ip']))
-					$values = array_diff($values, array($triggers['main_ip']));
+				{
+									$values = array_diff($values, array($triggers['main_ip']));
+				}
 
 				unset($value);
 				foreach ($values as $val)
@@ -354,18 +397,22 @@ 
 							'bantype' => 'ip_range',
 						);
 					}
-					else
-						$ban_errors->addError($ban_trigger['error']);
+					else {
+											$ban_errors->addError($ban_trigger['error']);
+					}
 				}
 			}
-			else
-				$ban_errors->addError('no_bantype_selected');
+			else {
+							$ban_errors->addError('no_bantype_selected');
+			}
 
 			if (isset($value) && !is_array($value))
-				$log_info[] = array(
+			{
+							$log_info[] = array(
 					'value' => $value,
 					'bantype' => $key,
 				);
+			}
 		}
 	}
 
@@ -388,7 +435,9 @@ 
 	$ban_errors = ElkArte\Errors\ErrorContext::context('ban', 1);
 
 	if (empty($group_id))
-		$ban_errors->addError('ban_not_found');
+	{
+			$ban_errors->addError('ban_not_found');
+	}
 
 	// Preset all values that are required.
 	$values = array(
@@ -442,17 +491,24 @@ 
 	{
 		// Exceptions, exceptions, exceptions...always exceptions... :P
 		if (in_array($key, array('ips_in_messages', 'ips_in_errors')))
-			foreach ($trigger as $real_trigger)
+		{
+					foreach ($trigger as $real_trigger)
 				$insertTriggers[] = array_merge($values, $real_trigger);
-		else
-			$insertTriggers[] = array_merge($values, $trigger);
+		}
+		else {
+					$insertTriggers[] = array_merge($values, $trigger);
+		}
 	}
 
 	if (empty($insertTriggers))
-		$ban_errors->addError('ban_no_triggers');
+	{
+			$ban_errors->addError('ban_no_triggers');
+	}
 
 	if ($ban_errors->hasErrors())
-		return false;
+	{
+			return false;
+	}
 
 	$db->insert('ignore',
 		'{db_prefix}ban_items',
@@ -482,15 +538,23 @@ 
 	$ban_errors = ElkArte\Errors\ErrorContext::context('ban', 1);
 
 	if (empty($ban_item))
-		$ban_errors->addError('ban_ban_item_empty');
+	{
+			$ban_errors->addError('ban_ban_item_empty');
+	}
 	if (empty($group_id))
-		$ban_errors->addError('ban_not_found');
+	{
+			$ban_errors->addError('ban_not_found');
+	}
 	if (empty($trigger))
-		$ban_errors->addError('ban_no_triggers');
+	{
+			$ban_errors->addError('ban_no_triggers');
+	}
 
 	// Any errors then we are not updating it
 	if ($ban_errors->hasErrors())
-		return;
+	{
+			return;
+	}
 
 	// Preset all values that are required.
 	$values = array(
@@ -554,7 +618,9 @@ 
 function logTriggersUpdates($logs, $new = true)
 {
 	if (empty($logs))
-		return;
+	{
+			return;
+	}
 
 	$log_name_map = array(
 		'main_ip' => 'ip_range',
@@ -566,12 +632,14 @@ 
 
 	// Log the addition of the ban entries into the moderation log.
 	foreach ($logs as $log)
-		logAction('ban', array(
+	{
+			logAction('ban', array(
 			$log_name_map[$log['bantype']] => $log['value'],
 			'new' => empty($new) ? 0 : ($new === true ? 1 : -1),
 			'type' => $log['bantype'],
 		));
-}
+	}
+	}
 
 /**
  * Updates an existing ban group
@@ -590,13 +658,19 @@ 
 	$ban_errors = ElkArte\Errors\ErrorContext::context('ban', 1);
 
 	if (empty($ban_info['name']))
-		$ban_errors->addError('ban_name_empty');
+	{
+			$ban_errors->addError('ban_name_empty');
+	}
 
 	if (empty($ban_info['id']))
-		$ban_errors->addError('ban_id_empty');
+	{
+			$ban_errors->addError('ban_id_empty');
+	}
 
 	if ($ban_errors->hasErrors())
-		return false;
+	{
+			return false;
+	}
 
 	// No problems found, so lets add this to the ban list
 	$request = $db->query('', '
@@ -611,7 +685,9 @@ 
 		)
 	);
 	if ($db->num_rows($request) == 0)
-		return insertBanGroup($ban_info);
+	{
+			return insertBanGroup($ban_info);
+	}
 	$db->free_result($request);
 
 	$db->query('', '
@@ -661,13 +737,19 @@ 
 	$ban_errors = ElkArte\Errors\ErrorContext::context('ban', 1);
 
 	if (empty($ban_info['name']))
-		$ban_errors->addError('ban_name_empty');
+	{
+			$ban_errors->addError('ban_name_empty');
+	}
 
 	if (empty($ban_info['cannot']['access']) && empty($ban_info['cannot']['register']) && empty($ban_info['cannot']['post']) && empty($ban_info['cannot']['login']))
-		$ban_errors->addError('ban_unknown_restriction_type');
+	{
+			$ban_errors->addError('ban_unknown_restriction_type');
+	}
 
 	if ($ban_errors->hasErrors())
-		return false;
+	{
+			return false;
+	}
 
 	// Check whether a ban with this name already exists.
 	$request = $db->query('', '
@@ -705,7 +787,9 @@ 
 	$ban_info['id'] = $db->insert_id('{db_prefix}ban_groups', 'id_ban_group');
 
 	if (empty($ban_info['id']))
-		$ban_errors->addError('impossible_insert_new_bangroup');
+	{
+			$ban_errors->addError('impossible_insert_new_bangroup');
+	}
 
 	return $ban_info['id'];
 }
@@ -730,16 +814,23 @@ 
 	if (!empty($high[4]) || !empty($high[5]) || !empty($high[6]) || !empty($high[7]))
 	{
 		if (count($low) != 8 || count($high) != 8)
-			return '';
+		{
+					return '';
+		}
 
 		for ($i = 0; $i < 8; $i++)
 		{
 			if ($low[$i] == $high[$i])
-				$ip[$i] = dechex($low[$i]);
+			{
+							$ip[$i] = dechex($low[$i]);
+			}
 			elseif ($low[$i] == '0' && $high[$i] == '255')
-				$ip[$i] = '*';
-			else
-				$ip[$i] = dechex($low[$i]) . '-' . dechex($high[$i]);
+			{
+							$ip[$i] = '*';
+			}
+			else {
+							$ip[$i] = dechex($low[$i]) . '-' . dechex($high[$i]);
+			}
 		}
 
 		return implode(':', $ip);
@@ -748,21 +839,30 @@ 
 	// Legacy IPv4 stuff.
 	// (count($low) != 4 || count($high) != 4) would not work because $low and $high always contain 8 elements!
 	if ((count($low) != 4 || count($high) != 4) && (count($low) != 8 || count($high) != 8))
-			return '';
+	{
+				return '';
+	}
 
 	for ($i = 0; $i < 4; $i++)
 	{
 		if ($low[$i] == $high[$i])
-			$ip[$i] = $low[$i];
+		{
+					$ip[$i] = $low[$i];
+		}
 		elseif ($low[$i] == '0' && $high[$i] == '255')
-			$ip[$i] = '*';
-		else
-			$ip[$i] = $low[$i] . '-' . $high[$i];
+		{
+					$ip[$i] = '*';
+		}
+		else {
+					$ip[$i] = $low[$i] . '-' . $high[$i];
+		}
 	}
 
 	// Pretending is fun... the IP can't be this, so use it for 'unknown'.
 	if ($ip == array(255, 255, 255, 255))
-		return 'unknown';
+	{
+			return 'unknown';
+	}
 
 	return implode('.', $ip);
 }
@@ -788,7 +888,8 @@ 
 	$db = database();
 
 	if (count($ip_array) == 4 || count($ip_array) == 8)
-		$values = array(
+	{
+			$values = array(
 			'ip_low1' => $ip_array[0]['low'],
 			'ip_high1' => $ip_array[0]['high'],
 			'ip_low2' => $ip_array[1]['low'],
@@ -806,8 +907,10 @@ 
 			'ip_low8' => $ip_array[7]['low'],
 			'ip_high8' => $ip_array[7]['high'],
 		);
-	else
-		$values = array('error' => 'invalid_ip');
+	}
+	else {
+			$values = array('error' => 'invalid_ip');
+	}
 
 	$request = $db->query('', '
 		SELECT bg.id_ban_group, bg.name
@@ -861,10 +964,14 @@ 
 	$return = validateIPBan($ip_array, $fullip);
 
 	if (empty($return['error']))
-		return $return;
+	{
+			return $return;
+	}
 
 	if ($return['error'] === 'ban_trigger_already_exists')
-		throw new Elk_Exception($return['error'][0], false, $return['error'][1]);
+	{
+			throw new Elk_Exception($return['error'][0], false, $return['error'][1]);
+	}
 
 	return false;
 }
@@ -904,14 +1011,19 @@ 
 		function ($row) use (&$memberIDs, &$memberEmails, &$memberEmailWild)
 		{
 			if ($row['id_member'])
-				$memberIDs[$row['id_member']] = $row['id_member'];
+			{
+							$memberIDs[$row['id_member']] = $row['id_member'];
+			}
 			if ($row['email_address'])
 			{
 				// Does it have a wildcard - if so we can't do a IN on it.
 				if (strpos($row['email_address'], '%') !== false)
-					$memberEmailWild[$row['email_address']] = $row['email_address'];
-				else
-					$memberEmails[$row['email_address']] = $row['email_address'];
+				{
+									$memberEmailWild[$row['email_address']] = $row['email_address'];
+				}
+				else {
+									$memberEmails[$row['email_address']] = $row['email_address'];
+				}
 			}
 		}
 	);
@@ -997,7 +1109,9 @@ 
 	{
 		require_once(SUBSDIR . '/Members.subs.php');
 		foreach ($updates as $newStatus => $members)
-			updateMemberData($members, array('is_activated' => $newStatus));
+		{
+					updateMemberData($members, array('is_activated' => $newStatus));
+		}
 	}
 
 	// Update the latest member and our total members as banning may change them.
@@ -1020,7 +1134,8 @@ 
 
 	$result = getBasicMemberData($id, array('moderation' => true));
 	if (!empty($result))
-		$suggestions = array(
+	{
+			$suggestions = array(
 			'member' => array(
 				'id' => $result['id_member'],
 				'name' => $result['real_name'],
@@ -1028,6 +1143,7 @@ 
 			'main_ip' => $result['member_ip'],
 			'email' => $result['email_address'],
 		);
+	}
 
 	return $suggestions;
 }
@@ -1128,12 +1244,16 @@ 
 			// Work out what restrictions we actually have.
 			$ban_restrictions = array();
 			foreach (array('access', 'register', 'login', 'post') as $type)
-				if ($row['cannot_' . $type])
+			{
+							if ($row['cannot_' . $type])
 					$ban_restrictions[] = $txt['ban_type_' . $type];
+			}
 
 			// No actual ban in place?
 			if (empty($ban_restrictions))
-				continue;
+			{
+							continue;
+			}
 
 			// Prepare the link for context.
 			$ban_explanation = sprintf($txt['user_cannot_due_to'], implode(', ', $ban_restrictions), '<a href="' . $scripturl . '?action=admin;area=ban;sa=edit;bg=' . $row['id_ban_group'] . '">' . $row['name'] . '</a>');
@@ -1296,7 +1416,9 @@ 
 		)
 	);
 	if ($db->num_rows($request) == 0)
-		throw new Elk_Exception('ban_not_found', false);
+	{
+			throw new Elk_Exception('ban_not_found', false);
+	}
 	while ($row = $db->fetch_assoc($request))
 	{
 		if (!isset($context['ban']))
@@ -1446,7 +1568,9 @@ 
 		)
 	);
 	while ($row = $db->fetch_assoc($request))
-		$message_ips[] = $row['poster_ip'];
+	{
+			$message_ips[] = $row['poster_ip'];
+	}
 	$db->free_result($request);
 
 	return $message_ips;
@@ -1475,7 +1599,9 @@ 
 		)
 	);
 	while ($row = $db->fetch_assoc($request))
-		$error_ips[] = $row['ip'];
+	{
+			$error_ips[] = $row['ip'];
+	}
 	$db->free_result($request);
 
 	return $error_ips;
@@ -1499,8 +1625,10 @@ 
 
 	$return = array();
 	foreach ($search_list as $key => $callable)
-		if (is_callable($callable))
+	{
+			if (is_callable($callable))
 			$return[$key] = call_user_func($callable, $member_id);
+	}
 
 	return $return;
 }
@@ -1517,7 +1645,9 @@ 
 	$db = database();
 
 	if (!is_array($ban_ids))
-		$ban_ids = array($ban_ids);
+	{
+			$ban_ids = array($ban_ids);
+	}
 
 	$request = $db->query('', '
 		SELECT
@@ -1536,7 +1666,9 @@ 
 	);
 	$details = array();
 	while ($row = $db->fetch_assoc($request))
-		$details[$row['id_ban']] = $row;
+	{
+			$details[$row['id_ban']] = $row;
+	}
 	$db->free_result($request);
 
 	return $details;

Spacing +3 added lines, -3 removed lines

@@ -901,7 +901,7 @@ 
 			'current_time' => time(),
 			'blank_string' => '',
 		),
-		function ($row) use (&$memberIDs, &$memberEmails, &$memberEmailWild)
+		function($row) use (&$memberIDs, &$memberEmails, &$memberEmailWild)
 		{
 			if ($row['id_member'])
 				$memberIDs[$row['id_member']] = $row['id_member'];
@@ -946,7 +946,7 @@ 
 			FROM {db_prefix}members AS mem
 			WHERE ' . implode(' OR ', $queryPart),
 			$queryValues,
-			function ($row) use (&$allMembers, &$updates, &$newMembers)
+			function($row) use (&$allMembers, &$updates, &$newMembers)
 			{
 				if (!in_array($row['id_member'], $allMembers))
 				{
@@ -982,7 +982,7 @@ 
 			'current_time' => time(),
 			'ban_flag' => 10,
 		),
-		function ($row) use (&$allMembers, &$updates)
+		function($row) use (&$allMembers, &$updates)
 		{
 			// Don't do this twice!
 			if (!in_array($row['id_member'], $allMembers))

sources/subs/Memberlist.subs.php

Braces +24 added lines, -9 removed lines

@@ -65,15 +65,18 @@ 
 		{
 			// Build the sort queries.
 			if ($row['field_type'] != 'check')
-				$context['custom_profile_fields']['columns'][$curField]['sort'] = array(
+			{
+							$context['custom_profile_fields']['columns'][$curField]['sort'] = array(
 					'down' => 'LENGTH(cfd' . $curField . '.value) > 0 ASC, COALESCE(cfd' . $curField . '.value, 1=1) DESC, cfd' . $curField . '.value DESC',
 					'up' => 'LENGTH(cfd' . $curField . '.value) > 0 DESC, COALESCE(cfd' . $curField . '.value, 1=1) ASC, cfd' . $curField . '.value ASC'
 				);
-			else
-				$context['custom_profile_fields']['columns'][$curField]['sort'] = array(
+			}
+			else {
+							$context['custom_profile_fields']['columns'][$curField]['sort'] = array(
 					'down' => 'cfd' . $curField . '.value DESC',
 					'up' => 'cfd' . $curField . '.value ASC'
 				);
+			}
 
 			// Build the join and parameters for the sort query
 			$context['custom_profile_fields']['join'] = 'LEFT JOIN {db_prefix}custom_fields_data AS cfd' . $curField . ' ON (cfd' . $curField . '.variable = {string:cfd' . $curField . '} AND cfd' . $curField . '.id_member = mem.id_member)';
@@ -291,11 +294,13 @@ 
 	);
 	$context['custom_search_fields'] = array();
 	while ($row = $db->fetch_assoc($request))
-		$context['custom_search_fields'][$row['col_name']] = array(
+	{
+			$context['custom_search_fields'][$row['col_name']] = array(
 			'colname' => $row['col_name'],
 			'name' => $row['field_name'],
 			'desc' => $row['field_desc'],
 		);
+	}
 	$db->free_result($request);
 }
 
@@ -323,11 +328,15 @@ 
 
 	// Avoid division by zero...
 	if ($most_posts == 0)
-		$most_posts = 1;
+	{
+			$most_posts = 1;
+	}
 
 	$members = array();
 	while ($row = $db->fetch_assoc($request))
-		$members[] = $row['id_member'];
+	{
+			$members[] = $row['id_member'];
+	}
 
 	// Load all the members for display.
 	loadMemberData($members);
@@ -338,7 +347,9 @@ 
 	foreach ($members as $member)
 	{
 		if (!loadMemberContext($member, true))
-			continue;
+		{
+					continue;
+		}
 
 		$context['members'][$member] = $memberContext[$member];
 		$context['members'][$member]['post_percent'] = round(($context['members'][$member]['real_posts'] * 100) / $most_posts);
@@ -388,9 +399,13 @@ 
 
 				// Anything else to make it look "nice"
 				if ($column['bbc'])
-					$context['members'][$member]['options'][$curField] = strip_tags($bbc_parser->parseCustomFields($context['members'][$member]['options'][$curField]));
+				{
+									$context['members'][$member]['options'][$curField] = strip_tags($bbc_parser->parseCustomFields($context['members'][$member]['options'][$curField]));
+				}
 				elseif ($column['type'] === 'check')
-					$context['members'][$member]['options'][$curField] = $context['members'][$member]['options'][$curField] == 0 ? $txt['no'] : $txt['yes'];
+				{
+									$context['members'][$member]['options'][$curField] = $context['members'][$member]['options'][$curField] == 0 ? $txt['no'] : $txt['yes'];
+				}
 			}
 		}
 	}

sources/subs/Mentions.subs.php

Braces +33 added lines, -14 removed lines

@@ -29,7 +29,9 @@ 
 	$id_member = $id_member === null ? $user_info['id'] : (int) $id_member;
 
 	if (isset($counts[$id_member]))
-		return $counts[$id_member];
+	{
+			return $counts[$id_member];
+	}
 
 	$request = $db->query('', '
 		SELECT COUNT(*)
@@ -172,7 +174,9 @@ 
 	}
 
 	if (empty($inserts))
-		return;
+	{
+			return;
+	}
 
 	// Insert the new mentions
 	$db->insert('',
@@ -192,8 +196,10 @@ 
 
 	// Update the member mention count
 	foreach ($inserts as $insert)
-		updateMentionMenuCount($insert[2], $insert[0]);
-}
+	{
+			updateMentionMenuCount($insert[2], $insert[0]);
+	}
+	}
 
 /**
  * Softly and gently removes a 'likemsg' mention when the post is unliked
@@ -231,8 +237,10 @@ 
 
 	// Update the member mention count
 	foreach ($members_to as $member)
-		updateMentionMenuCount($newstatus, $member);
-}
+	{
+			updateMentionMenuCount($newstatus, $member);
+	}
+	}
 
 /**
  * Changes a specific mention status for a member
@@ -266,7 +274,9 @@ 
 
 	// Update the top level mentions count
 	if ($success)
-		updateMentionMenuCount($status, $user_info['id']);
+	{
+			updateMentionMenuCount($status, $user_info['id']);
+	}
 
 	return $success;
 }
@@ -296,7 +306,9 @@ 
 
 	// Update the top level mentions count
 	if ($success)
-		updateMentionMenuCount(null, $user_info['id']);
+	{
+			updateMentionMenuCount(null, $user_info['id']);
+	}
 
 	return $success;
 }
@@ -419,7 +431,9 @@ 
 	global $user_info;
 
 	if (!isset($input[$field]))
-		return;
+	{
+			return;
+	}
 
 	if (!findMemberMention($input[$field], $user_info['id']))
 	{
@@ -474,14 +488,19 @@ 
 
 	// If its new add to our menu count
 	if ($status === 0)
-		updateMemberData($member_id, array('mentions' => '+'));
+	{
+			updateMemberData($member_id, array('mentions' => '+'));
+	}
 	// Mark as read we decrease the count
 	elseif ($status === 1)
-		updateMemberData($member_id, array('mentions' => '-'));
+	{
+			updateMemberData($member_id, array('mentions' => '-'));
+	}
 	// Deleting or un-approving may have been read or not, so a count is required
-	else
-		countUserMentions(false, '', $member_id);
-}
+	else {
+			countUserMentions(false, '', $member_id);
+	}
+	}
 
 /**
  * Retrieves the time the last notification of a certain member was added.

Spacing +3 added lines, -3 removed lines

@@ -103,7 +103,7 @@ 
 			'limit' => $limit,
 			'sort' => $sort,
 		),
-		function ($row)
+		function($row)
 		{
 			$row['avatar'] = determineAvatar($row);
 			return $row;
@@ -148,7 +148,7 @@ 
 			'target' => $target,
 			'log_time' => $time === null ? time() : $time,
 		),
-		function ($row)
+		function($row)
 		{
 			return $row['id_member'];
 		}
@@ -333,7 +333,7 @@ 
 		array(
 			'messages' => $msgs,
 		),
-		function ($row) use ($status)
+		function($row) use ($status)
 		{
 			updateMentionMenuCount($status, $row['id_member']);
 		}

sources/subs/MembersOnline.subs.php

Braces +28 added lines, -11 removed lines

@@ -51,13 +51,17 @@ 
 
 	// Not allowed sort method? Bang! Error!
 	elseif (!in_array($membersOnlineOptions['sort'], $allowed_sort_options))
-		trigger_error('Sort method for getMembersOnlineStats() function is not allowed', E_USER_NOTICE);
+	{
+			trigger_error('Sort method for getMembersOnlineStats() function is not allowed', E_USER_NOTICE);
+	}
 
 	// Get it from the cache and send it back.
 	$temp = array();
 	$cache = Cache::instance();
 	if ($cache->levelHigherThan(1) && $cache->getVar($temp, 'membersOnlineStats-' . $membersOnlineOptions['sort'], 240))
-		return filter_members_online($temp, empty($membersOnlineOptions['reverse_sort']) ? 'ksort' : 'krsort');
+	{
+			return filter_members_online($temp, empty($membersOnlineOptions['reverse_sort']) ? 'ksort' : 'krsort');
+	}
 
 	// Initialize the array that'll be returned later on.
 	$membersOnlineStats = array(
@@ -75,7 +79,9 @@ 
 	$spiders = array();
 	$spider_finds = array();
 	if (!empty($modSettings['show_spider_online']) && ($modSettings['show_spider_online'] < 3 || allowedTo('admin_forum')) && !empty($modSettings['spider_name_cache']))
-		$spiders = Util::unserialize($modSettings['spider_name_cache']);
+	{
+			$spiders = Util::unserialize($modSettings['spider_name_cache']);
+	}
 
 	// Load the users online right now.
 	$request = $db->query('', '
@@ -113,9 +119,12 @@ 
 
 		// Some basic color coding...
 		if (!empty($row['online_color']))
-			$link = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '" style="color: ' . $row['online_color'] . ';">' . $row['real_name'] . '</a>';
-		else
-			$link = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
+		{
+					$link = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '" style="color: ' . $row['online_color'] . ';">' . $row['real_name'] . '</a>';
+		}
+		else {
+					$link = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
+		}
 
 		// Buddies get counted and highlighted.
 		$is_buddy = in_array($row['id_member'], $user_info['buddies']);
@@ -140,11 +149,13 @@ 
 
 		// Store all distinct (primary) membergroups that are shown.
 		if (!isset($membersOnlineStats['online_groups'][$row['id_group']]))
-			$membersOnlineStats['online_groups'][$row['id_group']] = array(
+		{
+					$membersOnlineStats['online_groups'][$row['id_group']] = array(
 				'id' => $row['id_group'],
 				'name' => $row['group_name'],
 				'color' => $row['online_color']
 			);
+		}
 	}
 	$db->free_result($request);
 
@@ -234,10 +245,12 @@ 
 
 	// More members on now than ever were?  Update it!
 	if (!isset($modSettings['mostOnline']) || $total_users_online >= $modSettings['mostOnline'])
-		$settingsToUpdate = array(
+	{
+			$settingsToUpdate = array(
 			'mostOnline' => $total_users_online,
 			'mostDate' => time()
 		);
+	}
 
 	$date = Util::strftime('%Y-%m-%d', forum_time(false));
 
@@ -270,7 +283,9 @@ 
 			list ($modSettings['mostOnlineToday']) = $db->fetch_row($request);
 
 			if ($total_users_online > $modSettings['mostOnlineToday'])
-				trackStats(array('most_on' => $total_users_online));
+			{
+							trackStats(array('most_on' => $total_users_online));
+			}
 
 			$total_users_online = max($total_users_online, $modSettings['mostOnlineToday']);
 		}
@@ -288,5 +303,7 @@ 
 	}
 
 	if (!empty($settingsToUpdate))
-		updateSettings($settingsToUpdate);
-}
+	{
+			updateSettings($settingsToUpdate);
+	}
+	}

sources/subs/BBC/BBCParser.php

Braces +12 added lines, -5 removed lines

@@ -750,7 +750,9 @@ 
 	protected function handleItemCode()
 	{
 		if (!isset($this->item_codes[$this->message[$this->pos + 1]]))
-			return;
+		{
+					return;
+		}
 
 		$tag = $this->item_codes[$this->message[$this->pos + 1]];
 
@@ -1351,7 +1353,9 @@ 
 			$control_order[$index] = $index;
 
 			if ($this->tag_possible['optionals'][$index])
-				$control_order[$index] = $index + $this->tag_possible['regex_size'];
+			{
+							$control_order[$index] = $index + $this->tag_possible['regex_size'];
+			}
 		}
 
 		array_multisort($control_order, SORT_ASC, $this->tag_possible['regex_cache']);
@@ -1382,9 +1386,12 @@ 
 			if ($optional)
 			{
 				if ($param_exists)
-					$this->tag_possible['optionals'][$index] = false;
-				else
-					$this->tag_possible['regex_cache'][$index] .= '?';
+				{
+									$this->tag_possible['optionals'][$index] = false;
+				}
+				else {
+									$this->tag_possible['regex_cache'][$index] .= '?';
+				}
 			}
 		}
 	}