elkarte / Elkarte

sources/subs/CacheMethod/Apc.php

Braces +27 added lines, -12 removed lines

@@ -58,16 +58,22 @@ 
 		if ($this->apcu)
 		{
 			if ($value === null)
-				apcu_delete($prefixedKey);
-			else
-				apcu_store($prefixedKey, $value, $ttl);
+			{
+							apcu_delete($prefixedKey);
+			}
+			else {
+							apcu_store($prefixedKey, $value, $ttl);
+			}
 		}
 		else
 		{
 			if ($value === null)
-				apc_delete($prefixedKey);
-			else
-				apc_store($prefixedKey, $value, $ttl);
+			{
+							apc_delete($prefixedKey);
+			}
+			else {
+							apc_store($prefixedKey, $value, $ttl);
+			}
 		}
 	}
 
@@ -79,9 +85,12 @@ 
 		$prefixedKey = $this->getprefixedKey($key);
 		$success = false;
 		if ($this->apcu)
-			$result = apcu_fetch($prefixedKey, $success);
-		else
-			$result = apc_fetch($prefixedKey, $success);
+		{
+					$result = apcu_fetch($prefixedKey, $success);
+		}
+		else {
+					$result = apc_fetch($prefixedKey, $success);
+		}
 		$this->is_miss = !$success;
 
 		/*
@@ -90,7 +99,9 @@ 
 		 * the specified cache entry.
 		 */
 		if ($this->is_miss)
-			return;
+		{
+					return;
+		}
 
 		return $result;
 	}
@@ -101,7 +112,9 @@ 
 	public function clean($type = '')
 	{
 		if ($this->apcu)
-			apcu_clear_cache();
+		{
+					apcu_clear_cache();
+		}
 		// If passed a type, clear that type out
 		elseif ($type === '' || $type === 'data')
 		{
@@ -109,7 +122,9 @@ 
 			apc_clear_cache('system');
 		}
 		elseif ($type === 'user')
-			apc_clear_cache('user');
+		{
+					apc_clear_cache('user');
+		}
 	}
 
 	/**

sources/subs/UnZip.class.php

Braces +93 added lines, -35 removed lines

@@ -140,7 +140,9 @@ 
 
 		// This function sorta needs gzinflate!
 		if (!function_exists('gzinflate'))
-			throw new Elk_Exception('package_no_zlib', 'critical');
+		{
+					throw new Elk_Exception('package_no_zlib', 'critical');
+		}
 
 		// Make sure we have this loaded.
 		loadLanguage('Packages');
@@ -151,7 +153,9 @@ 
 		// The destination needs exist and be writable or we are doomed
 		umask(0);
 		if ($this->destination !== null && !file_exists($this->destination) && !$this->single_file)
-			mktree($this->destination, 0777);
+		{
+					mktree($this->destination, 0777);
+		}
 	}
 
 	/**
@@ -163,7 +167,9 @@ 
 	{
 		// Make sure we have a zip file
 		if ($this->check_valid_zip() === false)
-			return false;
+		{
+					return false;
+		}
 
 		// The overall zip information for this archive
 		$this->_read_endof_cdr();
@@ -173,23 +179,32 @@ 
 
 		// Load the file list from the central directory record
 		if ($this->_load_file_headers() === false)
-			return false;
+		{
+					return false;
+		}
 
 		// The file records in the CDR point to the files location in the archive
 		$this->_process_files();
 
 		// Looking for a single file and this is it
 		if ($this->_found && $this->single_file)
-			return $this->_crc_check ? $this->_found : false;
+		{
+					return $this->_crc_check ? $this->_found : false;
+		}
 
 		// Wanted many files then we need to clean up
 		if ($this->destination !== null && !$this->single_file)
-			package_flush_cache();
+		{
+					package_flush_cache();
+		}
 
 		if ($this->single_file)
-			return false;
-		else
-			return $this->return;
+		{
+					return false;
+		}
+		else {
+					return $this->return;
+		}
 	}
 
 	/**
@@ -201,7 +216,9 @@ 
 	{
 		// No signature?
 		if (strlen($this->data) < 10)
-			return false;
+		{
+					return false;
+		}
 
 		// Look for an end of central directory signature 0x06054b50
 		$check = explode("\x50\x4b\x05\x06", $this->data);
@@ -280,7 +297,9 @@ 
 			// Extract all file standard length information for this record, its the 42 bytes following the signature
 			$temp = unpack('vversion/vversion_needed/vgeneral_purpose/vcompress_method/vfile_time/vfile_date/Vcrc/Vcompressed_size/Vsize/vfilename_length/vextra_field_length/vcomment_length/vdisk_number_start/vinternal_attributes/vexternal_attributes1/vexternal_attributes2/Vrelative_offset', substr($this->_data_cdr, $pointer + 4, 42));
 			if ($temp === false)
-				return false;
+			{
+							return false;
+			}
 
 			// Extract the variable length data, filename, etc
 			$pointer = $pointer + 46;
@@ -298,7 +317,9 @@ 
 
 		// Sections and count from the signature must match or the zip file is bad
 		if ($i !== $this->_zip_info['files'])
-			return false;
+		{
+					return false;
+		}
 	}
 
 	/**
@@ -323,10 +344,13 @@ 
 
 			// Validate we are at a local file header '\x50\x4b\x03\x04'
 			if (substr($this->_file_info['data'], 0, 4) === "\x50\x4b\x03\x04")
-				$this->_read_local_header();
+			{
+							$this->_read_local_header();
+			}
 			// Something is probably wrong with the archive, like the 70's
-			else
-				continue;
+			else {
+							continue;
+			}
 
 			// Check if the gp flag requires us to make any adjustments
 			$this->_check_general_purpose_flag();
@@ -335,12 +359,17 @@ 
 			if (!empty($this->_file_info['compress_method']) || ($this->_file_info['compressed_size'] != $this->_file_info['size']))
 			{
 				if ($this->_file_info['compress_method'] == 8)
-					$this->_file_info['data'] = @gzinflate($this->_file_info['compress_data'], $this->_file_info['size']);
+				{
+									$this->_file_info['data'] = @gzinflate($this->_file_info['compress_data'], $this->_file_info['size']);
+				}
 				elseif ($this->_file_info['compress_method'] == 12 && function_exists('bzdecompress'))
-					$this->_file_info['data'] = bzdecompress($this->_file_info['compress_data']);
+				{
+									$this->_file_info['data'] = bzdecompress($this->_file_info['compress_data']);
+				}
+			}
+			else {
+							$this->_file_info['data'] = $this->_file_info['compress_data'];
 			}
-			else
-				$this->_file_info['data'] = $this->_file_info['compress_data'];
 
 			// Okay!  We can write this file, looks good from here...
 			if ($this->_write_this && $this->destination !== null)
@@ -348,10 +377,14 @@ 
 				$this->_write_this_file();
 
 				if ($this->_skip)
-					continue;
+				{
+									continue;
+				}
 
 				if ($this->_found)
-					return;
+				{
+									return;
+				}
 			}
 
 			// Not a directory, add it to our results
@@ -411,10 +444,14 @@ 
 	{
 		// If this is a file, and it doesn't exist.... happy days!
 		if (substr($this->_filename, -1) !== '/' && !file_exists($this->destination . '/' . $this->_filename))
-			$this->_write_this = true;
+		{
+					$this->_write_this = true;
+		}
 		// If the file exists, we may not want to overwrite it.
 		elseif (substr($this->_filename, -1) !== '/')
-			$this->_write_this = $this->overwrite;
+		{
+					$this->_write_this = $this->overwrite;
+		}
 		// This is a directory, so we're gonna want to create it. (probably...)
 		elseif ($this->destination !== null && !$this->single_file)
 		{
@@ -422,11 +459,14 @@ 
 			$this->_filename = strtr($this->_filename, array('../' => '', '/..' => ''));
 
 			if (!file_exists($this->destination . '/' . $this->_filename))
-				mktree($this->destination . '/' . $this->_filename, 0777);
+			{
+							mktree($this->destination . '/' . $this->_filename, 0777);
+			}
 			$this->_write_this = false;
 		}
-		else
-			$this->_write_this = false;
+		else {
+					$this->_write_this = false;
+		}
 	}
 
 	/**
@@ -442,26 +482,40 @@ 
 
 		// A directory may need to be created
 		if ((strpos($this->_filename, '/') !== false && !$this->single_file) || (!$this->single_file && !is_dir($this->_file_info['dir'])))
-			mktree($this->_file_info['dir'], 0777);
+		{
+					mktree($this->_file_info['dir'], 0777);
+		}
 
 		// If we're looking for a **specific file**, and this is it... ka-bam, baby.
 		if ($this->single_file && ($this->destination === $this->_filename || $this->destination === '*/' . basename($this->_filename)))
-			$this->_found = $this->_file_info['data'];
+		{
+					$this->_found = $this->_file_info['data'];
+		}
 		// Oh?  Another file.  Fine.  You don't like this file, do you?  I know how it is.
 		// Yeah... just go away.  No, don't apologize.  I know this file's just not *good enough* for you.
 		elseif ($this->single_file)
-			$this->_skip = true;
+		{
+					$this->_skip = true;
+		}
 		// Don't really want this file?
 		elseif ($this->files_to_extract !== null && !in_array($this->_filename, $this->files_to_extract))
-			$this->_skip = true;
+		{
+					$this->_skip = true;
+		}
 
 		// Write it out then
 		if ($this->_skip === true)
-			return;
+		{
+					return;
+		}
 		elseif (!empty($this->_found))
-			$this->_check_crc();
+		{
+					$this->_check_crc();
+		}
 		elseif ($this->_skip === false && $this->_found === false && $this->_check_crc())
-			package_put_contents($this->destination . '/' . $this->_filename, $this->_file_info['data']);
+		{
+					package_put_contents($this->destination . '/' . $this->_filename, $this->_file_info['data']);
+		}
 	}
 
 	/**
@@ -487,7 +541,9 @@ 
 	{
 		// If bit 1 is set the file is encrypted so empty it instead of writing out gibberish
 		if ($this->_file_info['general_purpose'] & 0x0001)
-			$this->_file_info['data'] = '';
+		{
+					$this->_file_info['data'] = '';
+		}
 
 		// See if bit 3 is set
 		if ($this->_file_info['general_purpose'] & 0x0008)
@@ -497,7 +553,9 @@ 
 
 			// The spec allows for an optional header in the general purpose record
 			if (substr($general_purpose, 0, 4) === "\x50\x4b\x07\x08")
-				$general_purpose = substr($general_purpose, 4);
+			{
+							$general_purpose = substr($general_purpose, 4);
+			}
 
 			// These values should be what's in the CDR record per spec
 			$general_purpose_data = unpack('Vcrc/Vcompressed_size/Vsize', $general_purpose);

sources/subs/UserNotification.integrate.php

Braces +3 added lines, -1 removed lines

@@ -21,7 +21,9 @@
 		global $modSettings;
 
 		if (empty($modSettings['usernotif_favicon_enable']) && empty($modSettings['usernotif_desktop_enable']))
-			return array();
+		{
+					return array();
+		}
 
 		// $hook, $function, $file
 		return array(

sources/subs/Poll.subs.php

Braces +43 added lines, -17 removed lines

@@ -144,7 +144,9 @@ 
 		$boardsAllowed = boardsAllowedTo('poll_view');
 
 		if (empty($boardsAllowed))
-			return false;
+		{
+					return false;
+		}
 	}
 
 	// Read info from the db
@@ -171,7 +173,9 @@ 
 	$db->free_result($request);
 
 	if (empty($poll_info))
-		return false;
+	{
+			return false;
+	}
 
 	$request = $db->query('', '
 		SELECT COUNT(DISTINCT id_member) AS total
@@ -219,7 +223,9 @@ 
 
 	// The topic must exist
 	if ($db->num_rows($request) == 0)
-		return false;
+	{
+			return false;
+	}
 
 	// Get the poll information.
 	$pollinfo = $db->fetch_assoc($request);
@@ -254,10 +260,13 @@ 
 
 	// The topic must exist
 	if ($db->num_rows($request) == 0)
-		$topicID = false;
+	{
+			$topicID = false;
+	}
 	// Get the poll information.
-	else
-		list ($topicID, $boardID) = $db->fetch_row($request);
+	else {
+			list ($topicID, $boardID) = $db->fetch_row($request);
+	}
 
 	$db->free_result($request);
 
@@ -368,7 +377,9 @@ 
 	$id_poll = $db->insert_id('{db_prefix}polls', 'id_poll');
 
 	if (!empty($options))
-		addPollOptions($id_poll, $options);
+	{
+			addPollOptions($id_poll, $options);
+	}
 
 	call_integration_hook('integrate_poll_add_edit', array($id_poll, false));
 
@@ -424,7 +435,9 @@ 
 
 	$pollOptions = array();
 	foreach ($options as $i => $option)
-		$pollOptions[] = array($id_poll, $i, $option);
+	{
+			$pollOptions[] = array($id_poll, $i, $option);
+	}
 
 	$db->insert('insert',
 		'{db_prefix}poll_choices',
@@ -463,7 +476,8 @@ 
 	$db = database();
 
 	foreach ($options as $option)
-		$db->query('', '
+	{
+			$db->query('', '
 			UPDATE {db_prefix}poll_choices
 			SET label = {string:option_name}
 			WHERE id_poll = {int:id_poll}
@@ -474,7 +488,8 @@ 
 				'option_name' => $option[2],
 			)
 		);
-}
+	}
+	}
 
 /**
  * Delete a bunch of options from a poll
@@ -531,7 +546,9 @@ 
 	$pollStarters = array();
 
 	if ($db->num_rows($request) != 0)
-		$pollStarters = $db->fetch_row($request);
+	{
+			$pollStarters = $db->fetch_row($request);
+	}
 
 	$db->free_result($request);
 
@@ -697,7 +714,9 @@ 
 		)
 	);
 	while ($choice = $db->fetch_row($request))
-		$pollOptions[] = $choice[0];
+	{
+			$pollOptions[] = $choice[0];
+	}
 	$db->free_result($request);
 
 	return $pollOptions;
@@ -811,7 +830,9 @@ 
 		)
 	);
 	if ($db->num_rows($request) == 0)
-		throw new Elk_Exception('no_board');
+	{
+			throw new Elk_Exception('no_board');
+	}
 	$bcinfo = $db->fetch_assoc($request);
 	$db->free_result($request);
 
@@ -855,7 +876,9 @@ 
 			{
 				$guestvoted = explode(',', $guestvoted);
 				if ($guestvoted[0] == $poll_id)
-					break;
+				{
+									break;
+				}
 			}
 
 			// Has the poll been reset since guest voted?
@@ -864,9 +887,12 @@ 
 				// Remove the poll info from the cookie to allow guest to vote again
 				unset($guestinfo[$i]);
 				if (!empty($guestinfo))
-					$_COOKIE['guest_poll_vote'] = ';' . implode(';', $guestinfo);
-				else
-					unset($_COOKIE['guest_poll_vote']);
+				{
+									$_COOKIE['guest_poll_vote'] = ';' . implode(';', $guestinfo);
+				}
+				else {
+									unset($_COOKIE['guest_poll_vote']);
+				}
 			}
 			else
 			{

sources/subs/Modlog.subs.php

Braces +90 added lines, -34 removed lines

@@ -75,7 +75,9 @@ 
 
 	// Do a little bit of self protection.
 	if (!isset($context['hoursdisable']))
-		$context['hoursdisable'] = 24;
+	{
+			$context['hoursdisable'] = 24;
+	}
 
 	// Can they see the IP address?
 	$seeIP = allowedTo('moderate_forum');
@@ -120,28 +122,41 @@ 
 		if (!empty($row['id_board']))
 		{
 			if ($row['action'] == 'move')
-				$row['extra']['board_to'] = $row['id_board'];
-			else
-				$row['extra']['board'] = $row['id_board'];
+			{
+							$row['extra']['board_to'] = $row['id_board'];
+			}
+			else {
+							$row['extra']['board'] = $row['id_board'];
+			}
 		}
 
 		if (!empty($row['id_topic']))
-			$row['extra']['topic'] = $row['id_topic'];
+		{
+					$row['extra']['topic'] = $row['id_topic'];
+		}
 		if (!empty($row['id_msg']))
-			$row['extra']['message'] = $row['id_msg'];
+		{
+					$row['extra']['message'] = $row['id_msg'];
+		}
 
 		// Is this associated with a topic?
 		if (isset($row['extra']['topic']))
-			$topics[(int) $row['extra']['topic']][] = $row['id_action'];
+		{
+					$topics[(int) $row['extra']['topic']][] = $row['id_action'];
+		}
 		if (isset($row['extra']['new_topic']))
-			$topics[(int) $row['extra']['new_topic']][] = $row['id_action'];
+		{
+					$topics[(int) $row['extra']['new_topic']][] = $row['id_action'];
+		}
 
 		// How about a member?
 		if (isset($row['extra']['member']))
 		{
 			// Guests don't have names!
 			if (empty($row['extra']['member']))
-				$row['extra']['member'] = $txt['modlog_parameter_guest'];
+			{
+							$row['extra']['member'] = $txt['modlog_parameter_guest'];
+			}
 			else
 			{
 				// Try to find it...
@@ -151,40 +166,60 @@ 
 
 		// Associated with a board?
 		if (isset($row['extra']['board_to']))
-			$boards[(int) $row['extra']['board_to']][] = $row['id_action'];
+		{
+					$boards[(int) $row['extra']['board_to']][] = $row['id_action'];
+		}
 		if (isset($row['extra']['board_from']))
-			$boards[(int) $row['extra']['board_from']][] = $row['id_action'];
+		{
+					$boards[(int) $row['extra']['board_from']][] = $row['id_action'];
+		}
 		if (isset($row['extra']['board']))
-			$boards[(int) $row['extra']['board']][] = $row['id_action'];
+		{
+					$boards[(int) $row['extra']['board']][] = $row['id_action'];
+		}
 
 		// A message?
 		if (isset($row['extra']['message']))
-			$messages[(int) $row['extra']['message']][] = $row['id_action'];
+		{
+					$messages[(int) $row['extra']['message']][] = $row['id_action'];
+		}
 
 		// IP Info?
 		if (isset($row['extra']['ip_range']))
-			if ($seeIP)
+		{
+					if ($seeIP)
 				$row['extra']['ip_range'] = '<a href="' . $scripturl . '?action=trackip;searchip=' . $row['extra']['ip_range'] . '">' . $row['extra']['ip_range'] . '</a>';
-			else
-				$row['extra']['ip_range'] = $txt['logged'];
+		}
+			else {
+							$row['extra']['ip_range'] = $txt['logged'];
+			}
 
 		// Email?
 		if (isset($row['extra']['email']))
-			$row['extra']['email'] = '<a href="mailto:' . $row['extra']['email'] . '">' . $row['extra']['email'] . '</a>';
+		{
+					$row['extra']['email'] = '<a href="mailto:' . $row['extra']['email'] . '">' . $row['extra']['email'] . '</a>';
+		}
 
 		// Bans are complex.
 		if ($row['action'] == 'ban')
 		{
 			if (!isset($row['extra']['new']) || $row['extra']['new'] == 1)
-				$row['action_text'] = $txt['modlog_ac_ban'];
+			{
+							$row['action_text'] = $txt['modlog_ac_ban'];
+			}
 			elseif ($row['extra']['new'] == 0)
-				$row['action_text'] = $txt['modlog_ac_ban_update'];
-			else
-				$row['action_text'] = $txt['modlog_ac_ban_remove'];
+			{
+							$row['action_text'] = $txt['modlog_ac_ban_update'];
+			}
+			else {
+							$row['action_text'] = $txt['modlog_ac_ban_remove'];
+			}
 
 			foreach (array('member', 'email', 'ip_range', 'hostname') as $type)
-				if (isset($row['extra'][$type]))
+			{
+							if (isset($row['extra'][$type]))
 					$row['action_text'] .= $txt['modlog_ac_ban_trigger_' . $type];
+			}
 		}
 
 		// The array to go to the template. Note here that action is set to a "default" value of the action doesn't match anything in the descriptions. Allows easy adding of logging events with basic details.
@@ -215,11 +250,17 @@ 
 			{
 				// Make the board number into a link - dealing with moving too.
 				if (isset($entries[$action]['extra']['board_to']) && $entries[$action]['extra']['board_to'] == $row['id_board'])
-					$entries[$action]['extra']['board_to'] = '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>';
+				{
+									$entries[$action]['extra']['board_to'] = '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>';
+				}
 				elseif (isset($entries[$action]['extra']['board_from']) && $entries[$action]['extra']['board_from'] == $row['id_board'])
-					$entries[$action]['extra']['board_from'] = '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>';
+				{
+									$entries[$action]['extra']['board_from'] = '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>';
+				}
 				elseif (isset($entries[$action]['extra']['board']) && $entries[$action]['extra']['board'] == $row['id_board'])
-					$entries[$action]['extra']['board'] = '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>';
+				{
+									$entries[$action]['extra']['board'] = '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>';
+				}
 			}
 		}
 	}
@@ -252,9 +293,13 @@ 
 
 				// Make the topic number into a link - dealing with splitting too.
 				if (isset($this_action['extra']['topic']) && $this_action['extra']['topic'] == $row['id_topic'])
-					$this_action['extra']['topic'] = '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.' . (isset($this_action['extra']['message']) ? 'msg' . $this_action['extra']['message'] . '#msg' . $this_action['extra']['message'] : '0') . '">' . $row['subject'] . '</a>';
+				{
+									$this_action['extra']['topic'] = '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.' . (isset($this_action['extra']['message']) ? 'msg' . $this_action['extra']['message'] . '#msg' . $this_action['extra']['message'] : '0') . '">' . $row['subject'] . '</a>';
+				}
 				elseif (isset($this_action['extra']['new_topic']) && $this_action['extra']['new_topic'] == $row['id_topic'])
-					$this_action['extra']['new_topic'] = '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.' . (isset($this_action['extra']['message']) ? 'msg' . $this_action['extra']['message'] . '#msg' . $this_action['extra']['message'] : '0') . '">' . $row['subject'] . '</a>';
+				{
+									$this_action['extra']['new_topic'] = '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.' . (isset($this_action['extra']['message']) ? 'msg' . $this_action['extra']['message'] . '#msg' . $this_action['extra']['message'] : '0') . '">' . $row['subject'] . '</a>';
+				}
 			}
 		}
 		$db->free_result($request);
@@ -287,7 +332,9 @@ 
 
 				// Make the message number into a link.
 				if (isset($this_action['extra']['message']) && $this_action['extra']['message'] == $row['id_msg'])
-					$this_action['extra']['message'] = '<a href="' . $scripturl . '?msg=' . $row['id_msg'] . '">' . $row['subject'] . '</a>';
+				{
+									$this_action['extra']['message'] = '<a href="' . $scripturl . '?msg=' . $row['id_msg'] . '">' . $row['subject'] . '</a>';
+				}
 			}
 		}
 		$db->free_result($request);
@@ -324,15 +371,21 @@ 
 	{
 		// Make any message info links so its easier to go find that message.
 		if (isset($entry['extra']['message']) && (empty($entry['message']) || empty($entry['message']['id'])))
-			$entries[$k]['extra']['message'] = '<a href="' . $scripturl . '?msg=' . $entry['extra']['message'] . '">' . $entry['extra']['message'] . '</a>';
+		{
+					$entries[$k]['extra']['message'] = '<a href="' . $scripturl . '?msg=' . $entry['extra']['message'] . '">' . $entry['extra']['message'] . '</a>';
+		}
 
 		// Mark up any deleted members, topics and boards.
 		foreach (array('board', 'board_from', 'board_to', 'member', 'topic', 'new_topic') as $type)
-			if (!empty($entry['extra'][$type]) && is_numeric($entry['extra'][$type]))
+		{
+					if (!empty($entry['extra'][$type]) && is_numeric($entry['extra'][$type]))
 				$entries[$k]['extra'][$type] = sprintf($txt['modlog_id'], $entry['extra'][$type]);
+		}
 
 		if (empty($entries[$k]['action_text']))
-			$entries[$k]['action_text'] = isset($txt['modlog_ac_' . $entry['action']]) ? $txt['modlog_ac_' . $entry['action']] : $entry['action'];
+		{
+					$entries[$k]['action_text'] = isset($txt['modlog_ac_' . $entry['action']]) ? $txt['modlog_ac_' . $entry['action']] : $entry['action'];
+		}
 
 		$callback->key = $k;
 		$entries[$k]['action_text'] = preg_replace_callback('~\{([A-Za-z\d_]+)\}~i', array($callback, 'callback'), $entries[$k]['action_text']);
@@ -361,9 +414,12 @@ 
 	public function callback($matches)
 	{
 		if (isset($this->entries[$this->key]['extra'][$matches[1]]))
-			return $this->entries[$this->key]['extra'][$matches[1]];
-		else
-			return '';
+		{
+					return $this->entries[$this->key]['extra'][$matches[1]];
+		}
+		else {
+					return '';
+		}
 	}
 }
 

sources/subs/Errors/Log.php

Braces +12 added lines, -4 removed lines

@@ -32,29 +32,35 @@ 
 	{
 		// Delete all or just some?
 		if ($type == 'delall' && empty($filter))
-			$this->_db->query('truncate_table', '
+		{
+					$this->_db->query('truncate_table', '
 				TRUNCATE {db_prefix}log_errors',
 				array(
 				)
 			);
+		}
 		// Deleting all with a filter?
 		elseif ($type == 'delall' && !empty($filter))
-			$this->_db->query('', '
+		{
+					$this->_db->query('', '
 				DELETE FROM {db_prefix}log_errors
 				WHERE ' . $filter['variable'] . ' LIKE {string:filter}',
 				array(
 					'filter' => !empty($filter) ? $filter['value']['sql'] : '',
 				)
 			);
+		}
 		// Just specific errors?
 		elseif ($type == 'delete')
-			$this->_db->query('', '
+		{
+					$this->_db->query('', '
 				DELETE FROM {db_prefix}log_errors
 				WHERE id_error IN ({array_int:error_list})',
 				array(
 					'error_list' => is_array($error_list) ? array_unique($error_list) : '',
 				)
 			);
+		}
 	}
 
 	/**
@@ -110,7 +116,9 @@ 
 		{
 			$search_message = preg_replace('~<span class="remove">(.+?)</span>~', '%', $this->_db->escape_wildcard_string($row['message']));
 			if (!empty($filter) && $search_message == $filter['value']['sql'])
-				$search_message = $this->_db->escape_wildcard_string($row['message']);
+			{
+							$search_message = $this->_db->escape_wildcard_string($row['message']);
+			}
 			$show_message = strtr(strtr(preg_replace('~&lt;span class=&quot;remove&quot;&gt;(.+?)&lt;/span&gt;~', '$1', $row['message']), array("\r" => '', '<br />' => "\n", '<' => '&lt;', '>' => '&gt;', '"' => '&quot;')), array("\n" => '<br />'));
 
 			$log['errors'][$row['id_error']] = array(

sources/subs/Errors/ErrorContext.php

Braces +63 added lines, -25 removed lines

@@ -73,16 +73,21 @@ 
 	private function __construct($id = 'default', $default_severity = null)
 	{
 		if (!empty($id))
-			$this->_name = $id;
+		{
+					$this->_name = $id;
+		}
 
 		// Initialize severity levels... waiting for details!
 		$this->_severity_levels = array(self::MINOR, self::SERIOUS);
 
 		// Initialize default severity (not sure this is needed)
 		if ($default_severity === null || !in_array($default_severity, $this->_severity_levels))
-			$this->_default_severity = self::MINOR;
-		else
-			$this->_default_severity = $default_severity;
+		{
+					$this->_default_severity = self::MINOR;
+		}
+		else {
+					$this->_default_severity = $default_severity;
+		}
 
 		$this->_errors = array();
 	}
@@ -105,7 +110,9 @@ 
 		}
 
 		if (!empty($lang_file) && !isset($this->_language_files[$lang_file]))
-			$this->_language_files[$lang_file] = false;
+		{
+					$this->_language_files[$lang_file] = false;
+		}
 	}
 
 	/**
@@ -122,9 +129,13 @@ 
 			foreach ($this->_errors as $severity => $errors)
 			{
 				if (array_key_exists($name, $errors))
-					unset($this->_errors[$severity][$name]);
+				{
+									unset($this->_errors[$severity][$name]);
+				}
 				if (empty($this->_errors[$severity]))
-					unset($this->_errors[$severity]);
+				{
+									unset($this->_errors[$severity]);
+				}
 			}
 		}
 	}
@@ -194,11 +205,16 @@ 
 	public function getErrors($severity = null)
 	{
 		if ($severity !== null && in_array($severity, $this->_severity_levels) && !empty($this->_errors[$severity]))
-			return $this->_errors[$severity];
+		{
+					return $this->_errors[$severity];
+		}
 		elseif ($severity === null && !empty($this->_errors))
-			return $this->_errors;
-		else
-			return false;
+		{
+					return $this->_errors;
+		}
+		else {
+					return false;
+		}
 	}
 
 	/**
@@ -211,9 +227,12 @@ 
 	{
 		$name = $this->getErrorName($error);
 		if (isset($this->_errors[$name]))
-			return $this->_errors[$name];
-		else
-			return null;
+		{
+					return $this->_errors[$name];
+		}
+		else {
+					return null;
+		}
 	}
 
 	/**
@@ -225,11 +244,16 @@ 
 	public function hasErrors($severity = null)
 	{
 		if ($severity !== null && in_array($severity, $this->_severity_levels))
-			return !empty($this->_errors[$severity]);
+		{
+					return !empty($this->_errors[$severity]);
+		}
 		elseif ($severity === null)
-			return !empty($this->_errors);
-		else
-			return false;
+		{
+					return !empty($this->_errors);
+		}
+		else {
+					return false;
+		}
 	}
 
 	/**
@@ -269,7 +293,9 @@ 
 		foreach ($levels as $level)
 		{
 			if (!empty($this->_errors[$level]))
-				return $level;
+			{
+							return $level;
+			}
 		}
 
 		return $level;
@@ -287,7 +313,9 @@ 
 		global $txt;
 
 		if (empty($this->_errors))
-			return array();
+		{
+					return array();
+		}
 
 		$this->_loadLang();
 
@@ -298,10 +326,14 @@ 
 		if ($severity === null)
 		{
 			foreach ($this->_errors as $err)
-				$errors = array_merge($errors, $err);
+			{
+							$errors = array_merge($errors, $err);
+			}
 		}
 		elseif (in_array($severity, $this->_severity_levels) && !empty($this->_errors[$severity]))
-			$errors = $this->_errors[$severity];
+		{
+					$errors = $this->_errors[$severity];
+		}
 
 		foreach ($errors as $error_val)
 		{
@@ -338,10 +370,12 @@ 
 
 		// Any custom one?
 		if (!empty($this->_language_files))
-			foreach ($this->_language_files as $language => $loaded)
+		{
+					foreach ($this->_language_files as $language => $loaded)
 				if (!$loaded)
 				{
 					loadLanguage($language);
+		}
 
 					// Remember this file has been loaded already
 					$this->_language_files[$language] = true;
@@ -359,10 +393,14 @@ 
 	public static function context($id = 'default', $default_severity = null)
 	{
 		if (self::$_contexts === null)
-			self::$_contexts = array();
+		{
+					self::$_contexts = array();
+		}
 
 		if (!array_key_exists($id, self::$_contexts))
-			self::$_contexts[$id] = new self($id, $default_severity);
+		{
+					self::$_contexts[$id] = new self($id, $default_severity);
+		}
 
 		return self::$_contexts[$id];
 	}

sources/subs/Errors/ErrorHandler.php

Braces +18 added lines, -7 removed lines

@@ -153,18 +153,24 @@ 
 
 		// Elk_Exception handles its own logging.
 		if (!$e instanceof Elk_Exception)
-			$this->log_error($this->error_name . ': ' . $this->error_string, $error_type, $err_file, $err_line);
+		{
+					$this->log_error($this->error_name . ': ' . $this->error_string, $error_type, $err_file, $err_line);
+		}
 
 		// Let's give integrations a chance to output a bit differently
 		call_integration_hook('integrate_output_error', array($message, $error_type, $this->error_level, $err_file, $err_line));
 
 		// Dying on these errors only causes MORE problems (blank pages!)
 		if ($err_file === 'Unknown')
-			return;
+		{
+					return;
+		}
 
 		// If this is an E_ERROR, E_USER_ERROR, E_WARNING, or E_USER_WARNING.... die.  Violently so.
 		if ($this->error_level & $this->fatalErrors || $this->error_level % 255 === E_WARNING || $isException)
-			$this->_setup_fatal_ErrorContext($message, $this->error_level);
+		{
+					$this->_setup_fatal_ErrorContext($message, $this->error_level);
+		}
 		else
 		{
 			// Display debug information?
@@ -175,7 +181,9 @@ 
 
 		// We should NEVER get to this point.  Any fatal error MUST quit, or very bad things can happen.
 		if ($this->error_level & $this->fatalErrors)
-			$this->terminate('Hacking attempt...');
+		{
+					$this->terminate('Hacking attempt...');
+		}
 	}
 
 	/**
@@ -195,7 +203,9 @@ 
 			{
 				$temporary = ob_get_contents();
 				if (substr($temporary, -2) === '="')
-					echo '"';
+				{
+									echo '"';
+				}
 			}
 
 			// Debugging!  This should look like a PHP error message.
@@ -234,8 +244,9 @@ 
 				$exception->getLine()
 			);
 		}
-		else
-			return $this->error_string;
+		else {
+					return $this->error_string;
+		}
 	}
 
 	/**

sources/subs/Errors/AttachmentErrorContext.php

Braces +36 added lines, -13 removed lines

@@ -61,10 +61,12 @@ 
 		}
 
 		if (!isset($this->_attachs[$id]))
-			$this->_attachs[$id] = array(
+		{
+					$this->_attachs[$id] = array(
 				'name' => $name,
 				'error' => ErrorContext::context($id, 1),
 			);
+		}
 
 		$this->activate($id);
 
@@ -79,9 +81,12 @@ 
 	public function activate($id = null)
 	{
 		if (empty($id) || !isset($this->_attachs[$id]))
-			$this->_active_attach = 'generic';
-		else
-			$this->_active_attach = $id;
+		{
+					$this->_active_attach = 'generic';
+		}
+		else {
+					$this->_active_attach = $id;
+		}
 
 		return $this;
 	}
@@ -95,12 +100,16 @@ 
 	public function addError($error, $lang_file = null)
 	{
 		if (empty($error))
-			return;
+		{
+					return;
+		}
 
 		if ($this->_active_attach == 'generic')
 		{
 			if (!isset($this->_attachs[$this->_active_attach]))
-				$this->_generic_error = ErrorContext::context('attach_generic_error', 1);
+			{
+							$this->_generic_error = ErrorContext::context('attach_generic_error', 1);
+			}
 
 			$this->_generic_error->addError($error, $lang_file);
 			return;
@@ -117,7 +126,9 @@ 
 	public function removeError($error)
 	{
 		if (empty($error))
-			return;
+		{
+					return;
+		}
 
 		$this->_attachs[$this->_active_attach]['error']->removeError($error);
 	}
@@ -131,21 +142,27 @@ 
 	public function hasErrors($attachID = null, $severity = null)
 	{
 		if ($this->_generic_error !== null)
-			if ($this->_generic_error->hasErrors($severity))
+		{
+					if ($this->_generic_error->hasErrors($severity))
 				return true;
+		}
 
 		if (!empty($this->_attachs))
 		{
 			if ($attachID !== null)
 			{
 				if (isset($this->_attachs[$attachID]))
-					return $this->_attachs[$attachID]['error']->hasErrors($severity);
+				{
+									return $this->_attachs[$attachID]['error']->hasErrors($severity);
+				}
 			}
 			else
 			{
 				foreach ($this->_attachs as $attach)
-					if ($attach['error']->hasErrors($severity))
+				{
+									if ($attach['error']->hasErrors($severity))
 						return true;
+				}
 			}
 		}
 		return false;
@@ -178,7 +195,9 @@ 
 				foreach ($this->_attachs as $attach)
 				{
 					if ($attach['error']->hasError($error_code))
-						return true;
+					{
+											return true;
+					}
 				}
 			}
 		}
@@ -200,11 +219,13 @@ 
 		$returns = array();
 
 		if ($this->_generic_error !== null)
-			$returns['attach_generic'] = array(
+		{
+					$returns['attach_generic'] = array(
 				'errors' => $this->_generic_error->prepareErrors($severity),
 				'type' => $this->getErrorType(),
 				'title' => $txt['attach_error_title'],
 			);
+		}
 
 		if (!empty($this->_attachs))
 		{
@@ -241,7 +262,9 @@ 
 	public static function context()
 	{
 		if (self::$_context === null)
-			self::$_context = new self();
+		{
+					self::$_context = new self();
+		}
 
 		return self::$_context;
 	}