Yoshi2889 / SMF2.1

Sources/Subs-Db-mysql.php

Spacing +2 added lines, -2 removed lines

@@ -252,7 +252,7 @@ 
 						$replacement[$key] = 'null';
 					if (!isValidIP($value))
 						smf_db_error_backtrace('Wrong value type sent to the database. IPv4 or IPv6 expected.(' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
-					$replacement[$key] =  sprintf('unhex(\'%1$s\')', bin2hex(inet_pton($value)));
+					$replacement[$key] = sprintf('unhex(\'%1$s\')', bin2hex(inet_pton($value)));
 				}
 
 				return implode(', ', $replacement);
@@ -811,7 +811,7 @@ 
  * @param bool $translate_human_wildcards If true, turns human readable wildcards into SQL wildcards.
  * @return string The escaped string
  */
-function smf_db_escape_wildcard_string($string, $translate_human_wildcards=false)
+function smf_db_escape_wildcard_string($string, $translate_human_wildcards = false)
 {
 	$replacements = array(
 		'%' => '\%',

Sources/Subs-Post.php

Spacing +18 added lines, -18 removed lines

@@ -34,7 +34,7 @@ 
 	$message = preg_replace('~&#(\d{4,5}|[2-9]\d{2,4}|1[2-9]\d);~', '&#$1;', $message);
 
 	// Clean up after nobbc ;).
-	$message = preg_replace_callback('~\[nobbc\](.+?)\[/nobbc\]~is', function ($a)
+	$message = preg_replace_callback('~\[nobbc\](.+?)\[/nobbc\]~is', function($a)
 	{
 		return '[nobbc]' . strtr($a[1], array('[' => '[', ']' => ']', ':' => ':', '@' => '@')) . '[/nobbc]';
 	}, $message);
@@ -122,7 +122,7 @@ 
 	if (!$previewing && strpos($message, '[html]') !== false)
 	{
 		if (allowedTo('admin_forum'))
-			$message = preg_replace_callback('~\[html\](.+?)\[/html\]~is', function ($m) {
+			$message = preg_replace_callback('~\[html\](.+?)\[/html\]~is', function($m) {
 				return '[html]' . strtr(un_htmlspecialchars($m), array("\n" => '
', '  ' => '  ', '[' => '[', ']' => ']')) . '[/html]';
 			}, $message);
 
@@ -135,17 +135,17 @@ 
 	}
 
 	// Let's look at the time tags...
-	$message = preg_replace_callback('~\[time(?:=(absolute))*\](.+?)\[/time\]~i', function ($m) use ($modSettings, $user_info)
+	$message = preg_replace_callback('~\[time(?:=(absolute))*\](.+?)\[/time\]~i', function($m) use ($modSettings, $user_info)
 	{
 		return "[time]" . (is_numeric("$m[2]") || @strtotime("$m[2]") == 0 ? "$m[2]" : strtotime("$m[2]") - ("$m[1]" == "absolute" ? 0 : (($modSettings["time_offset"] + $user_info["time_offset"]) * 3600))) . "[/time]";
 	}, $message);
 
 	// Change the color specific tags to [color=the color].
-	$message = preg_replace('~\[(black|blue|green|red|white)\]~', '[color=$1]', $message);  // First do the opening tags.
-	$message = preg_replace('~\[/(black|blue|green|red|white)\]~', '[/color]', $message);   // And now do the closing tags
+	$message = preg_replace('~\[(black|blue|green|red|white)\]~', '[color=$1]', $message); // First do the opening tags.
+	$message = preg_replace('~\[/(black|blue|green|red|white)\]~', '[/color]', $message); // And now do the closing tags
 
 	// Make sure all tags are lowercase.
-	$message = preg_replace_callback('~\[([/]?)(list|li|table|tr|td)((\s[^\]]+)*)\]~i', function ($m)
+	$message = preg_replace_callback('~\[([/]?)(list|li|table|tr|td)((\s[^\]]+)*)\]~i', function($m)
 	{
 		return "[$m[1]" . strtolower("$m[2]") . "$m[3]]";
 	}, $message);
@@ -252,13 +252,13 @@ 
 
 	$message = implode('', $parts);
 
-	$message = preg_replace_callback('~\[html\](.+?)\[/html\]~i', function ($m) use ($smcFunc)
+	$message = preg_replace_callback('~\[html\](.+?)\[/html\]~i', function($m) use ($smcFunc)
 	{
 		return "[html]" . strtr($smcFunc['htmlspecialchars']("$m[1]", ENT_QUOTES), array("\\&quot;" => "&quot;", "&amp;#13;" => "<br>", "&amp;#32;" => " ", "&amp;#91;" => "[", "&amp;#93;" => "]")) . "[/html]";
 	}, $message);
 
 	// Attempt to un-parse the time to something less awful.
-	$message = preg_replace_callback('~\[time\](\d{0,10})\[/time\]~i', function ($m)
+	$message = preg_replace_callback('~\[time\](\d{0,10})\[/time\]~i', function($m)
 	{
 		return "[time]" . timeformat("$m[1]", false) . "[/time]";
 	}, $message);
@@ -349,7 +349,7 @@ 
 		fixTag($message, $param['tag'], $param['protocols'], $param['embeddedUrl'], $param['hasEqualSign'], !empty($param['hasExtra']));
 
 	// Now fix possible security problems with images loading links automatically...
-	$message = preg_replace_callback('~(\[img.*?\])(.+?)\[/img\]~is', function ($m)
+	$message = preg_replace_callback('~(\[img.*?\])(.+?)\[/img\]~is', function($m)
 	{
 		return "$m[1]" . preg_replace("~action(=|%3d)(?!dlattach)~i", "action-", "$m[2]") . "[/img]";
 	}, $message);
@@ -535,7 +535,7 @@ 
 	$to_array = is_array($to) ? $to : array($to);
 
 	// Make sure we actually have email addresses to send this to
-	foreach($to_array as $k => $v)
+	foreach ($to_array as $k => $v)
 	{
 		// This should never happen, but better safe than sorry
 		if (trim($v) == '')
@@ -1211,7 +1211,7 @@ 
 		unset($matches);
 
 		if ($simple)
-			$string = preg_replace_callback('~&#(\d{3,8});~', function ($m)
+			$string = preg_replace_callback('~&#(\d{3,8});~', function($m)
 			{
 				return chr("$m[1]");
 			}, $string);
@@ -1242,7 +1242,7 @@ 
 				$string = $newstring;
 		}
 
-		$entityConvert = function ($m)
+		$entityConvert = function($m)
 		{
 			$c = $m[1];
 			if (strlen($c) === 1 && ord($c[0]) <= 0x7F)
@@ -1348,14 +1348,14 @@ 
 		$helo = gethostname();
 	elseif (function_exists('php_uname'))
 		$helo = php_uname('n');
-	elseif (array_key_exists('SERVER_NAME',$_SERVER) && !empty($_SERVER['SERVER_NAME']))
+	elseif (array_key_exists('SERVER_NAME', $_SERVER) && !empty($_SERVER['SERVER_NAME']))
 		$helo = $_SERVER['SERVER_NAME'];
 
 	if (empty($helo))
 		$helo = $modSettings['smtp_host'];
 
 	// SMTP = 1, SMTP - STARTTLS = 2
-	if (in_array($modSettings['mail_type'], array(1,2)) && $modSettings['smtp_username'] != '' && $modSettings['smtp_password'] != '')
+	if (in_array($modSettings['mail_type'], array(1, 2)) && $modSettings['smtp_username'] != '' && $modSettings['smtp_password'] != '')
 	{
 		// EHLO could be understood to mean encrypted hello...
 		if (server_parse('EHLO ' . $helo, $socket, null, $response) == '250')
@@ -2119,7 +2119,7 @@ 
 			preg_match_all('/\[member\=([0-9]+)\]([^\[]*)\[\/member\]/U', $msgOptions['old_body'], $match);
 
 			if (isset($match[1]) && isset($match[2]) && is_array($match[1]) && is_array($match[2]))
-				foreach($match[1] as $i => $oldID)
+				foreach ($match[1] as $i => $oldID)
 					$oldmentions[$oldID] = array('id' => $oldID, 'real_name' => $match[2][$i]);
 
 			if (empty($modSettings['search_custom_index_config']))
@@ -2130,10 +2130,10 @@ 
 		$messages_columns['body'] = $msgOptions['body'] = Mentions::getBody($msgOptions['body'], $mentions);
 
 		// Remove the poster.
-		if(isset($mentions[$user_info['id']]))
+		if (isset($mentions[$user_info['id']]))
 			unset($mentions[$user_info['id']]);
 
-		if(isset($oldmentions[$user_info['id']]))
+		if (isset($oldmentions[$user_info['id']]))
 			unset($oldmentions[$user_info['id']]);
 
 		if (is_array($mentions) && is_array($oldmentions) && count(array_diff_key($mentions, $oldmentions)) > 0 && count($mentions) > count($oldmentions))
@@ -2948,7 +2948,7 @@ 
 			$suggestions = enchant_dict_suggest($dict, $word);
 
 			// Go through the suggestions and convert them back to the proper character set
-			foreach($suggestions as $index => $suggestion)
+			foreach ($suggestions as $index => $suggestion)
 			{
 				// //TRANSLIT makes it use similar-looking characters for incompatible ones...
 				$suggestions[$index] = iconv('UTF-8', $txt['lang_character_set'] . '//TRANSLIT', $suggestion);

Sources/DbExtra-postgresql.php

Spacing +2 added lines, -2 removed lines

@@ -92,7 +92,7 @@ 
 
 	$table = str_replace('{db_prefix}', $db_prefix, $table);
 
-	$pg_tables = array('pg_catalog','information_schema');
+	$pg_tables = array('pg_catalog', 'information_schema');
 
 	$request = $smcFunc['db_query']('', '
 		SELECT pg_relation_size(C.oid) AS "size"
@@ -369,7 +369,7 @@ 
 {
 	static $ver;
 
-	if(!empty($ver))
+	if (!empty($ver))
 		return $ver;
 
 	global $smcFunc;

Sources/MessageIndex.php

Spacing +3 added lines, -3 removed lines

@@ -133,7 +133,7 @@ 
 	if (!empty($board_info['moderators']))
 	{
 		foreach ($board_info['moderators'] as $mod)
-			$context['link_moderators'][] ='<a href="' . $scripturl . '?action=profile;u=' . $mod['id'] . '" title="' . $txt['board_moderator'] . '">' . $mod['name'] . '</a>';
+			$context['link_moderators'][] = '<a href="' . $scripturl . '?action=profile;u=' . $mod['id'] . '" title="' . $txt['board_moderator'] . '">' . $mod['name'] . '</a>';
 	}
 	if (!empty($board_info['moderator_groups']))
 	{
@@ -342,7 +342,7 @@ 
 				COALESCE(memf.real_name, mf.poster_name) AS first_display_name, ' . (!empty($modSettings['preview_characters']) ? '
 				SUBSTRING(ml.body, 1, ' . ($modSettings['preview_characters'] + 256) . ') AS last_body,
 				SUBSTRING(mf.body, 1, ' . ($modSettings['preview_characters'] + 256) . ') AS first_body,' : '') . 'ml.smileys_enabled AS last_smileys, mf.smileys_enabled AS first_smileys
-				' . (!empty($message_index_selects) ? (', '. implode(', ', $message_index_selects)) : '') . '
+				' . (!empty($message_index_selects) ? (', ' . implode(', ', $message_index_selects)) : '') . '
 			FROM {db_prefix}topics AS t
 				INNER JOIN {db_prefix}messages AS ml ON (ml.id_msg = t.id_last_msg)
 				INNER JOIN {db_prefix}messages AS mf ON (mf.id_msg = t.id_first_msg)
@@ -727,7 +727,7 @@ 
 		$context['normal_buttons']['post_poll'] = array('text' => 'new_poll', 'image' => 'new_poll.png', 'lang' => true, 'url' => $scripturl . '?action=post;board=' . $context['current_board'] . '.0;poll');
 	
 	if (!$context['user']['is_logged'])
-		$context['normal_buttons']['markread'] = array('text' => 'mark_read_short', 'image' => 'markread.png', 'lang' => true, 'custom' => 'data-confirm="'. $txt['are_sure_mark_read'] .'"', 'class' => 'you_sure', 'url' => $scripturl . '?action=markasread;sa=board;board=' . $context['current_board'] . '.0;' . $context['session_var'] . '=' . $context['session_id']);
+		$context['normal_buttons']['markread'] = array('text' => 'mark_read_short', 'image' => 'markread.png', 'lang' => true, 'custom' => 'data-confirm="' . $txt['are_sure_mark_read'] . '"', 'class' => 'you_sure', 'url' => $scripturl . '?action=markasread;sa=board;board=' . $context['current_board'] . '.0;' . $context['session_var'] . '=' . $context['session_id']);
 
 	if ($context['can_mark_notify'])
 		$context['normal_buttons']['notify'] = array(

Sources/ManageAttachments.php

Spacing +20 added lines, -20 removed lines

@@ -104,14 +104,14 @@ 
 	$context['valid_upload_dir'] = is_dir($context['attachmentUploadDir']) && is_writable($context['attachmentUploadDir']);
 
 	if (!empty($modSettings['automanage_attachments']))
-		$context['valid_basedirectory'] =  !empty($modSettings['basedirectory_for_attachments']) && is_writable($modSettings['basedirectory_for_attachments']);
+		$context['valid_basedirectory'] = !empty($modSettings['basedirectory_for_attachments']) && is_writable($modSettings['basedirectory_for_attachments']);
 
 	else
 		$context['valid_basedirectory'] = true;
 
 	// A bit of razzle dazzle with the $txt strings. :)
 	$txt['attachment_path'] = $context['attachmentUploadDir'];
-	$txt['basedirectory_for_attachments_path']= isset($modSettings['basedirectory_for_attachments']) ? $modSettings['basedirectory_for_attachments'] : '';
+	$txt['basedirectory_for_attachments_path'] = isset($modSettings['basedirectory_for_attachments']) ? $modSettings['basedirectory_for_attachments'] : '';
 	$txt['use_subdirectories_for_attachments_note'] = empty($modSettings['attachment_basedirectories']) || empty($modSettings['use_subdirectories_for_attachments']) ? $txt['use_subdirectories_for_attachments_note'] : '';
 	$txt['attachmentUploadDir_multiple_configure'] = '<a href="' . $scripturl . '?action=admin;area=manageattachments;sa=attachpaths">[' . $txt['attachmentUploadDir_multiple_configure'] . ']</a>';
 	$txt['attach_current_dir'] = empty($modSettings['automanage_attachments']) ? $txt['attach_current_dir'] : $txt['attach_last_dir'];
@@ -136,7 +136,7 @@ 
 			array('select', 'automanage_attachments', array(0 => $txt['attachments_normal'], 1 => $txt['attachments_auto_space'], 2 => $txt['attachments_auto_years'], 3 => $txt['attachments_auto_months'], 4 => $txt['attachments_auto_16'])),
 			array('check', 'use_subdirectories_for_attachments', 'subtext' => $txt['use_subdirectories_for_attachments_note']),
 			(empty($modSettings['attachment_basedirectories']) ? array('text', 'basedirectory_for_attachments', 40,) : array('var_message', 'basedirectory_for_attachments', 'message' => 'basedirectory_for_attachments_path', 'invalid' => empty($context['valid_basedirectory']), 'text_label' => (!empty($context['valid_basedirectory']) ? $txt['basedirectory_for_attachments_current'] : $txt['basedirectory_for_attachments_warning']))),
-			empty($modSettings['attachment_basedirectories']) && $modSettings['currentAttachmentUploadDir'] == 1 && count($modSettings['attachmentUploadDir']) == 1	? array('json', 'attachmentUploadDir', 'subtext' => $txt['attachmentUploadDir_multiple_configure'], 40, 'invalid' => !$context['valid_upload_dir'], 'disabled' => true) : array('var_message', 'attach_current_directory', 'subtext' => $txt['attachmentUploadDir_multiple_configure'], 'message' => 'attachment_path', 'invalid' => empty($context['valid_upload_dir']), 'text_label' => (!empty($context['valid_upload_dir']) ? $txt['attach_current_dir'] : $txt['attach_current_dir_warning'])),
+			empty($modSettings['attachment_basedirectories']) && $modSettings['currentAttachmentUploadDir'] == 1 && count($modSettings['attachmentUploadDir']) == 1 ? array('json', 'attachmentUploadDir', 'subtext' => $txt['attachmentUploadDir_multiple_configure'], 40, 'invalid' => !$context['valid_upload_dir'], 'disabled' => true) : array('var_message', 'attach_current_directory', 'subtext' => $txt['attachmentUploadDir_multiple_configure'], 'message' => 'attachment_path', 'invalid' => empty($context['valid_upload_dir']), 'text_label' => (!empty($context['valid_upload_dir']) ? $txt['attach_current_dir'] : $txt['attach_current_dir_warning'])),
 			array('int', 'attachmentDirFileLimit', 'subtext' => $txt['zero_for_no_limit'], 6),
 			array('int', 'attachmentDirSizeLimit', 'subtext' => $txt['zero_for_no_limit'], 6, 'postinput' => $txt['kilobyte']),
 			array('check', 'dont_show_attach_under_post', 'subtext' => $txt['dont_show_attach_under_post_sub']),
@@ -349,16 +349,16 @@ 
 
 		// These settings cannot be left empty!
 		if (empty($_POST['custom_avatar_dir']))
-			$_POST['custom_avatar_dir'] = $boarddir .'/custom_avatar';
+			$_POST['custom_avatar_dir'] = $boarddir . '/custom_avatar';
 
 		if (empty($_POST['custom_avatar_url']))
-			$_POST['custom_avatar_url'] = $boardurl .'/custom_avatar';
+			$_POST['custom_avatar_url'] = $boardurl . '/custom_avatar';
 
 		if (empty($_POST['avatar_directory']))
-			$_POST['avatar_directory'] = $boarddir .'/avatars';
+			$_POST['avatar_directory'] = $boarddir . '/avatars';
 
 		if (empty($_POST['avatar_url']))
-			$_POST['avatar_url'] = $boardurl .'/avatars';
+			$_POST['avatar_url'] = $boardurl . '/avatars';
 
 		call_integration_hook('integrate_save_avatar_settings');
 
@@ -422,7 +422,7 @@ 
 		'items_per_page' => $modSettings['defaultMaxListItems'],
 		'base_href' => $scripturl . '?action=admin;area=manageattachments;sa=browse' . ($context['browse_type'] === 'avatars' ? ';avatars' : ($context['browse_type'] === 'thumbs' ? ';thumbs' : '')),
 		'default_sort_col' => 'name',
-		'no_items_label' => $txt['attachment_manager_' . ($context['browse_type'] === 'avatars' ? 'avatars' : ( $context['browse_type'] === 'thumbs' ? 'thumbs' : 'attachments')) . '_no_entries'],
+		'no_items_label' => $txt['attachment_manager_' . ($context['browse_type'] === 'avatars' ? 'avatars' : ($context['browse_type'] === 'thumbs' ? 'thumbs' : 'attachments')) . '_no_entries'],
 		'get_items' => array(
 			'function' => 'list_getFiles',
 			'params' => array(
@@ -441,7 +441,7 @@ 
 					'value' => $txt['attachment_name'],
 				),
 				'data' => array(
-					'function' => function ($rowData) use ($modSettings, $context, $scripturl, $smcFunc)
+					'function' => function($rowData) use ($modSettings, $context, $scripturl, $smcFunc)
 					{
 						$link = '<a href="';
 
@@ -482,7 +482,7 @@ 
 					'value' => $txt['attachment_file_size'],
 				),
 				'data' => array(
-					'function' => function ($rowData) use ($txt)
+					'function' => function($rowData) use ($txt)
 					{
 						return sprintf('%1$s%2$s', round($rowData['size'] / 1024, 2), $txt['kilobyte']);
 					},
@@ -497,7 +497,7 @@ 
 					'value' => $context['browse_type'] == 'avatars' ? $txt['attachment_manager_member'] : $txt['posted_by'],
 				),
 				'data' => array(
-					'function' => function ($rowData) use ($scripturl, $smcFunc)
+					'function' => function($rowData) use ($scripturl, $smcFunc)
 					{
 						// In case of an attachment, return the poster of the attachment.
 						if (empty($rowData['id_member']))
@@ -518,7 +518,7 @@ 
 					'value' => $context['browse_type'] == 'avatars' ? $txt['attachment_manager_last_active'] : $txt['date'],
 				),
 				'data' => array(
-					'function' => function ($rowData) use ($txt, $context, $scripturl)
+					'function' => function($rowData) use ($txt, $context, $scripturl)
 					{
 						// The date the message containing the attachment was posted or the owner of the avatar was active.
 						$date = empty($rowData['poster_time']) ? $txt['never'] : timeformat($rowData['poster_time']);
@@ -1336,7 +1336,7 @@ 
 					if (!empty($modSettings['currentAttachmentUploadDir']))
 					{
 						// Get the attachment name with out the folder.
-						$attachment_name = $row['id_attach'] . '_' . $row['file_hash'] .'.dat';
+						$attachment_name = $row['id_attach'] . '_' . $row['file_hash'] . '.dat';
 
 						// Loop through the other folders.
 						foreach ($modSettings['attachmentUploadDir'] as $id => $dir)
@@ -1952,7 +1952,7 @@ 
 				if (automanage_attachments_create_directory($path))
 					$_POST['current_dir'] = $modSettings['currentAttachmentUploadDir'];
 				else
-					$errors[] =  $path . ': ' . $txt[$context['dir_creation_error']];
+					$errors[] = $path . ': ' . $txt[$context['dir_creation_error']];
 			}
 
 			// Changing a directory name?
@@ -2074,7 +2074,7 @@ 
 		}
 
 		// If the user wishes to go back, update the last_dir array
-		if ($_POST['current_dir'] !=  $modSettings['currentAttachmentUploadDir']&& !empty($modSettings['last_attachments_directory']) && (isset($modSettings['last_attachments_directory'][$_POST['current_dir']]) || isset($modSettings['last_attachments_directory'][0])))
+		if ($_POST['current_dir'] != $modSettings['currentAttachmentUploadDir'] && !empty($modSettings['last_attachments_directory']) && (isset($modSettings['last_attachments_directory'][$_POST['current_dir']]) || isset($modSettings['last_attachments_directory'][0])))
 		{
 			if (!is_array($modSettings['last_attachments_directory']))
 				$modSettings['last_attachments_directory'] = smf_json_decode($modSettings['last_attachments_directory'], true);
@@ -2087,7 +2087,7 @@ 
 				$use_subdirectories_for_attachments = 0;
 				if (!empty($modSettings['attachment_basedirectories']))
 					foreach ($modSettings['attachment_basedirectories'] as $bid => $base)
-						if (strpos($modSettings['attachmentUploadDir'][$_POST['current_dir']], $base . DIRECTORY_SEPARATOR) !==false)
+						if (strpos($modSettings['attachmentUploadDir'][$_POST['current_dir']], $base . DIRECTORY_SEPARATOR) !== false)
 						{
 							$use_subdirectories_for_attachments = 1;
 							break;
@@ -2263,7 +2263,7 @@ 
 					'class' => 'centercol',
 				),
 				'data' => array(
-					'function' => function ($rowData)
+					'function' => function($rowData)
 					{
 						return '<input type="radio" name="current_dir" value="' . $rowData['id'] . '"' . ($rowData['current'] ? ' checked' : '') . (!empty($rowData['disable_current']) ? ' disabled' : '') . ' class="input_radio">';
 					},
@@ -2276,7 +2276,7 @@ 
 					'value' => $txt['attach_path'],
 				),
 				'data' => array(
-					'function' => function ($rowData)
+					'function' => function($rowData)
 					{
 						return '<input type="hidden" name="dirs[' . $rowData['id'] . ']" value="' . $rowData['path'] . '"><input type="text" size="40" name="dirs[' . $rowData['id'] . ']" value="' . $rowData['path'] . '"' . (!empty($rowData['disable_base_dir']) ? ' disabled' : '') . ' class="input_text" style="width: 100%">';
 					},
@@ -2356,7 +2356,7 @@ 
 						'class' => 'centercol',
 					),
 					'data' => array(
-						'function' => function ($rowData)
+						'function' => function($rowData)
 						{
 							return '<input type="radio" name="current_base_dir" value="' . $rowData['id'] . '"' . ($rowData['current'] ? ' checked' : '') . ' class="input_radio">';
 						},
@@ -2727,7 +2727,7 @@ 
 					$dir_size += !empty($row['size']) ? $row['size'] : filesize($source);
 
 					// If we've reached a limit. Do something.
-					if (!empty($modSettings['attachmentDirSizeLimit']) && $dir_size > $modSettings['attachmentDirSizeLimit'] * 1024 || (!empty($modSettings['attachmentDirFileLimit']) && $dir_files >  $modSettings['attachmentDirFileLimit']))
+					if (!empty($modSettings['attachmentDirSizeLimit']) && $dir_size > $modSettings['attachmentDirSizeLimit'] * 1024 || (!empty($modSettings['attachmentDirFileLimit']) && $dir_files > $modSettings['attachmentDirFileLimit']))
 					{
 						if (!empty($_POST['auto']))
 						{

Sources/Subs-Members.php

Spacing +5 added lines, -5 removed lines

@@ -586,7 +586,7 @@ 
 		'member_name' => $regOptions['username'],
 		'email_address' => $regOptions['email'],
 		'passwd' => hash_password($regOptions['username'], $regOptions['password']),
-		'password_salt' => substr(md5(mt_rand()), 0, 4) ,
+		'password_salt' => substr(md5(mt_rand()), 0, 4),
 		'posts' => 0,
 		'date_registered' => time(),
 		'member_ip' => $regOptions['interface'] == 'admin' ? '127.0.0.1' : $user_info['ip'],
@@ -676,7 +676,7 @@ 
 		'time_offset',
 	);
 	$knownInets = array(
-		'member_ip','member_ip2',
+		'member_ip', 'member_ip2',
 	);
 
 	// Call an optional function to validate the users' input.
@@ -904,7 +904,7 @@ 
 	$checkName = strtr($name, array('_' => '\\_', '%' => '\\%'));
 
 	//when we got no wildcard we can use equal -> fast
-	$operator = (strpos($checkName, '%') || strpos($checkName, '_') ? 'LIKE' : '=' );
+	$operator = (strpos($checkName, '%') || strpos($checkName, '_') ? 'LIKE' : '=');
 
 	// Make sure they don't want someone else's name.
 	$request = $smcFunc['db_query']('', '
@@ -1273,7 +1273,7 @@ 
 		$user_info['buddies'][] = $userReceiver;
 
 		// And add a nice alert. Don't abuse though!
-		if ((cache_get_data('Buddy-sent-'. $user_info['id'] .'-'. $userReceiver, 86400)) == null)
+		if ((cache_get_data('Buddy-sent-' . $user_info['id'] . '-' . $userReceiver, 86400)) == null)
 		{
 			$smcFunc['db_insert']('insert',
 				'{db_prefix}background_tasks',
@@ -1288,7 +1288,7 @@ 
 			);
 
 			// Store this in a cache entry to avoid creating multiple alerts. Give it a long life cycle.
-			cache_put_data('Buddy-sent-'. $user_info['id'] .'-'. $userReceiver, '1', 86400);
+			cache_put_data('Buddy-sent-' . $user_info['id'] . '-' . $userReceiver, '1', 86400);
 		}
 	}
 

Sources/LogInOut.php

Spacing +4 added lines, -4 removed lines

@@ -99,19 +99,19 @@
 	{
 		if (isset($_COOKIE[$cookiename]) && preg_match('~^a:[34]:\{i:0;i:\d{1,7};i:1;s:(0|128):"([a-fA-F0-9]{128})?";i:2;[id]:\d{1,14};(i:3;i:\d;)?\}$~', $_COOKIE[$cookiename]) === 1)
 		{
-			list (, , $timeout) = smf_json_decode($_COOKIE[$cookiename], true);
+			list (,, $timeout) = smf_json_decode($_COOKIE[$cookiename], true);
 
 			// That didn't work... Maybe it's using serialize?
 			if (is_null($timeout))
-				list (, , $timeout) = safe_unserialize($_COOKIE[$cookiename]);
+				list (,, $timeout) = safe_unserialize($_COOKIE[$cookiename]);
 		}
 		elseif (isset($_SESSION['login_' . $cookiename]))
 		{
-			list (, , $timeout) = smf_json_decode($_SESSION['login_' . $cookiename]);
+			list (,, $timeout) = smf_json_decode($_SESSION['login_' . $cookiename]);
 
 			// Try for old format
 			if (is_null($timeout))
-				list (, , $timeout) = safe_unserialize($_SESSION['login_' . $cookiename]);
+				list (,, $timeout) = safe_unserialize($_SESSION['login_' . $cookiename]);
 		}
 		else
 			trigger_error('Login2(): Cannot be logged in without a session or cookie', E_USER_ERROR);

Sources/ManageSearch.php

Spacing +6 added lines, -6 removed lines

@@ -231,7 +231,7 @@ 
 				)
 			);
 
-			$request = $smcFunc['db_query']('','
+			$request = $smcFunc['db_query']('', '
 				SHOW default_text_search_config',
 				array()
 			);
@@ -426,8 +426,8 @@ 
 			WHERE t.schemaname= {string:schema} and (
 				indexname = {string:messages_ftx} OR indexname = {string:log_search_words} )',
 			array(
-				'messages_ftx' => $db_prefix. 'messages_ftx',
-				'log_search_words' => $db_prefix. 'log_search_words',
+				'messages_ftx' => $db_prefix . 'messages_ftx',
+				'log_search_words' => $db_prefix . 'log_search_words',
 				'schema' => 'public',
 			)
 		);
@@ -442,7 +442,7 @@ 
 					$context['table_info']['index_length'] = (int) $row['index_size'];
 					$context['table_info']['fulltext_length'] = (int) $row['index_size'];
 				}
-				elseif ($row['indexname'] == $db_prefix. 'log_search_words')
+				elseif ($row['indexname'] == $db_prefix . 'log_search_words')
 				{
 					$context['table_info']['index_length'] = (int) $row['index_size'];
 					$context['table_info']['custom_index_length'] = (int) $row['index_size'];
@@ -799,7 +799,7 @@ 
 	// We need this for db_get_version
 	db_extend();
 
-	if ($smcFunc['db_title'] == 'PostgreSQL'){
+	if ($smcFunc['db_title'] == 'PostgreSQL') {
 		$request = $smcFunc['db_query']('', '
 			SELECT
 				indexname
@@ -814,7 +814,7 @@ 
 			WHERE t.schemaname= {string:schema} and indexname = {string:messages_ftx}',
 			array(
 				'schema' => 'public',
-				'messages_ftx' => $db_prefix.'messages_ftx',
+				'messages_ftx' => $db_prefix . 'messages_ftx',
 			)
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))

Sources/Subs-Db-postgresql.php

Spacing +15 added lines, -15 removed lines

@@ -63,7 +63,7 @@ 
 	if (!empty($db_options['persist']))
 		$connection = @pg_pconnect('host=' . $db_server . ' dbname=' . $db_name . ' user=\'' . $db_user . '\' password=\'' . $db_passwd . '\'' . (empty($db_options['port']) ? '' : ' port=\'' . $db_options['port'] . '\''));
 	else
-		$connection = @pg_connect( 'host=' . $db_server . ' dbname=' . $db_name . ' user=\'' . $db_user . '\' password=\'' . $db_passwd . '\'' . (empty($db_options['port']) ? '' : ' port=\'' . $db_options['port'] . '\''));
+		$connection = @pg_connect('host=' . $db_server . ' dbname=' . $db_name . ' user=\'' . $db_user . '\' password=\'' . $db_passwd . '\'' . (empty($db_options['port']) ? '' : ' port=\'' . $db_options['port'] . '\''));
 
 	// Something's wrong, show an error if its fatal (which we assume it is)
 	if (!$connection)
@@ -87,7 +87,7 @@ 
  *
  * @param string $type Indicates which additional file to load. ('extra', 'packages')
  */
-function db_extend ($type = 'extra')
+function db_extend($type = 'extra')
 {
 	global $sourcedir, $db_type;
 
@@ -103,7 +103,7 @@ 
  * @param string $db_prefix The database prefix
  * @param string $db_name The database name
  */
-function db_fix_prefix (&$db_prefix, $db_name)
+function db_fix_prefix(&$db_prefix, $db_name)
 {
 	return;
 }
@@ -236,7 +236,7 @@ 
 						$replacement[$key] = 'null';
 					if (!isValidIP($value))
 						smf_db_error_backtrace('Wrong value type sent to the database. IPv4 or IPv6 expected.(' . $matches[2] . ')', '', E_USER_ERROR, __FILE__, __LINE__);
-					$replacement[$key] =  sprintf('\'%1$s\'::inet', pg_escape_string($value));
+					$replacement[$key] = sprintf('\'%1$s\'::inet', pg_escape_string($value));
 				}
 
 				return implode(', ', $replacement);
@@ -552,7 +552,7 @@ 
 
 	// Log the error.
 	if (function_exists('log_error'))
-		log_error($txt['database_error'] . ': ' . $query_error . (!empty($modSettings['enableErrorQueryLogging']) ? "\n\n" .$db_string : ''), 'database', $file, $line);
+		log_error($txt['database_error'] . ': ' . $query_error . (!empty($modSettings['enableErrorQueryLogging']) ? "\n\n" . $db_string : ''), 'database', $file, $line);
 
 	// Nothing's defined yet... just die with it.
 	if (empty($context) || empty($txt))
@@ -688,31 +688,31 @@ 
 		static $pg_version;
 		static $replace_support;
 
-		if(empty($pg_version))
+		if (empty($pg_version))
 		{
 			db_extend();
 			//pg 9.5 got replace support
 			$pg_version = $smcFunc['db_get_version']();
 			// if we got a Beta Version
 			if (stripos($pg_version, 'beta') !== false)
-				$pg_version = substr($pg_version, 0, stripos($pg_version, 'beta')).'.0';
+				$pg_version = substr($pg_version, 0, stripos($pg_version, 'beta')) . '.0';
 			// or RC
 			if (stripos($pg_version, 'rc') !== false)
-				$pg_version = substr($pg_version, 0, stripos($pg_version, 'rc')).'.0';
+				$pg_version = substr($pg_version, 0, stripos($pg_version, 'rc')) . '.0';
 
-			$replace_support = (version_compare($pg_version,'9.5.0','>=') ? true : false);
+			$replace_support = (version_compare($pg_version, '9.5.0', '>=') ? true : false);
 		}
 
 		$count = 0;
 		$where = '';
 		$count_pk = 0;
 
-		If($replace_support)
+		If ($replace_support)
 		{
 			foreach ($columns as $columnName => $type)
 			{
 				//check pk fiel
-				IF(in_array($columnName, $keys))
+				IF (in_array($columnName, $keys))
 				{
 					$key_str .= ($count_pk > 0 ? ',' : '');
 					$key_str .= $columnName;
@@ -721,11 +721,11 @@ 
 				else //normal field
 				{
 					$col_str .= ($count > 0 ? ',' : '');
-					$col_str .= $columnName.' = EXCLUDED.'.$columnName;
+					$col_str .= $columnName . ' = EXCLUDED.' . $columnName;
 					$count++;
 				}
 			}
-			$replace = ' ON CONFLICT ('.$key_str.') DO UPDATE SET '.$col_str;
+			$replace = ' ON CONFLICT (' . $key_str . ') DO UPDATE SET ' . $col_str;
 		}
 		else
 		{
@@ -785,7 +785,7 @@ 
 			$smcFunc['db_query']('', '
 				INSERT INTO ' . $table . '("' . implode('", "', $indexed_columns) . '")
 				VALUES
-					' . $entry.$replace,
+					' . $entry . $replace,
 				array(
 					'security_override' => true,
 					'db_error_skip' => $method == 'ignore' || $table === $db_prefix . 'log_errors',
@@ -880,7 +880,7 @@ 
  * @param bool $translate_human_wildcards If true, turns human readable wildcards into SQL wildcards.
  * @return string The escaped string
  */
-function smf_db_escape_wildcard_string($string, $translate_human_wildcards=false)
+function smf_db_escape_wildcard_string($string, $translate_human_wildcards = false)
 {
 	$replacements = array(
 		'%' => '\%',