albertlast / SMF2.1

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%">';
 					},
@@ -2355,7 +2355,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">';
 						},
@@ -2726,7 +2726,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/Themes.php

Spacing +10 added lines, -10 removed lines

@@ -837,7 +837,7 @@ 
 		remove_dir($theme_info['theme_dir']);
 
 	// Go back to the list page.
-	redirectexit('action=admin;area=theme;sa=list;' . $context['session_var'] . '=' . $context['session_id'] .';done=removing');
+	redirectexit('action=admin;area=theme;sa=list;' . $context['session_var'] . '=' . $context['session_id'] . ';done=removing');
 }
 
 /**
@@ -871,7 +871,7 @@ 
 	updateSettings(array('enableThemes' => $enableThemes));
 
 	// Done!
-	redirectexit('action=admin;area=theme;sa=list;' . $context['session_var'] . '=' . $context['session_id'] .';done='. (isset($_GET['disabled']) ? 'disabling' : 'enabling'));
+	redirectexit('action=admin;area=theme;sa=list;' . $context['session_var'] . '=' . $context['session_id'] . ';done=' . (isset($_GET['disabled']) ? 'disabling' : 'enabling'));
 }
 
 /**
@@ -1106,7 +1106,7 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Figure out which theme it is they are REALLY using.
-		if (!empty($modSettings['knownThemes']) && !in_array($row['id_theme'], explode(',',$modSettings['knownThemes'])))
+		if (!empty($modSettings['knownThemes']) && !in_array($row['id_theme'], explode(',', $modSettings['knownThemes'])))
 			$row['id_theme'] = $guest_theme;
 		elseif (empty($modSettings['theme_allow']))
 			$row['id_theme'] = $guest_theme;
@@ -1254,10 +1254,10 @@ 
 		$action = $smcFunc['htmlspecialchars'](trim($_GET['do']));
 
 		// Got any info from the specific form?
-		if (!isset($_POST['save_'. $action]))
+		if (!isset($_POST['save_' . $action]))
 			fatal_lang_error('theme_install_no_action', false);
 
-		validateToken('admin-t-'. $action);
+		validateToken('admin-t-' . $action);
 
 		// Hopefully the themes directory is writable, or we might have a problem.
 		if (!is_writable($themedir))
@@ -1291,7 +1291,7 @@ 
 	global $themedir, $themeurl, $context;
 
 	// Set a temp dir for dumping all required files on it.
-	$dirtemp = $themedir .'/temp';
+	$dirtemp = $themedir . '/temp';
 
 	// Make sure the temp dir doesn't already exist
 	if (file_exists($dirtemp))
@@ -1317,7 +1317,7 @@ 
 
 	// Another error check layer, something went wrong with the upload.
 	if (isset($_FILES['theme_gz']['error']) && $_FILES['theme_gz']['error'] != 0)
-		fatal_lang_error('theme_install_error_file_'. $_FILES['theme_gz']['error'], false);
+		fatal_lang_error('theme_install_error_file_' . $_FILES['theme_gz']['error'], false);
 
 	// Get the theme's name.
 	$name = pathinfo($_FILES['theme_gz']['name'], PATHINFO_FILENAME);
@@ -1373,7 +1373,7 @@ 
 	$name = preg_replace('~[^A-Za-z0-9_\- ]~', '', $_REQUEST['copy']);
 
 	// Is there a theme already named like this?
-	if (file_exists($themedir .'/'. $name))
+	if (file_exists($themedir . '/' . $name))
 		fatal_lang_error('theme_install_already_dir', false);
 
 	// This is a brand new theme so set all possible values.
@@ -1383,7 +1383,7 @@ 
 		'name' => $name,
 		'images_url' => $themeurl . '/' . $name . '/images',
 		'version' => '1.0',
-		'install_for' => '2.1 - 2.1.99, '. strtr($forum_version, array('SMF ' => '')),
+		'install_for' => '2.1 - 2.1.99, ' . strtr($forum_version, array('SMF ' => '')),
 		'based_on' => '',
 		'based_on_dir' => $themedir . '/default',
 	);
@@ -1454,7 +1454,7 @@ 
 <!-- The theme\'s version, please try to use semantic versioning. -->
 <version>1.0</version>
 <!-- Install for, the SMF versions this theme was designed for. Uses the same wildcards used in the packager manager. This field is mandatory. -->
-<install for="'. $context['to_install']['install_for'] .'" />
+<install for="'. $context['to_install']['install_for'] . '" />
 <!-- Theme name, used purely for aesthetics. -->
 <name>' . $context['to_install']['name'] . '</name>
 <!-- Author: your email address or contact information. The name attribute is optional. -->

Sources/Who.php

Spacing +3 added lines, -3 removed lines

@@ -589,7 +589,7 @@ 
 						'Shitiz "Dragooon" Garg',
 						'Karl "RegularExpression" Benson',
 						'Matthew "Labradoodle-360" Kerle',
-						$user_info['is_admin'] ? 'Matt "Grudge" Wolf': 'Grudge',
+						$user_info['is_admin'] ? 'Matt "Grudge" Wolf' : 'Grudge',
 						'Michael "Thantos" Miller',
 						'Norv',
 						'Peter "Arantor" Spicer',
@@ -813,13 +813,13 @@ 
 			$credit_info = smf_json_decode($row['credits'], true);
 
 			$copyright = empty($credit_info['copyright']) ? '' : $txt['credits_copyright'] . ' © ' . $smcFunc['htmlspecialchars']($credit_info['copyright']);
-			$license = empty($credit_info['license']) ? '' : $txt['credits_license'] . ': ' . (!empty($credit_info['licenseurl']) ? '<a href="'. $smcFunc['htmlspecialchars']($credit_info['licenseurl']) .'">'. $smcFunc['htmlspecialchars']($credit_info['license']) .'</a>' : $smcFunc['htmlspecialchars']($credit_info['license']));
+			$license = empty($credit_info['license']) ? '' : $txt['credits_license'] . ': ' . (!empty($credit_info['licenseurl']) ? '<a href="' . $smcFunc['htmlspecialchars']($credit_info['licenseurl']) . '">' . $smcFunc['htmlspecialchars']($credit_info['license']) . '</a>' : $smcFunc['htmlspecialchars']($credit_info['license']));
 			$version = $txt['credits_version'] . ' ' . $row['version'];
 			$title = (empty($credit_info['title']) ? $row['name'] : $smcFunc['htmlspecialchars']($credit_info['title'])) . ': ' . $version;
 
 			// build this one out and stash it away
 			$mod_name = empty($credit_info['url']) ? $title : '<a href="' . $credit_info['url'] . '">' . $title . '</a>';
-			$mods[] = $mod_name . (!empty($license) ? ' | ' . $license  : '') . (!empty($copyright) ? ' | ' . $copyright  : '');
+			$mods[] = $mod_name . (!empty($license) ? ' | ' . $license : '') . (!empty($copyright) ? ' | ' . $copyright : '');
 		}
 		cache_put_data('mods_credits', $mods, 86400);
 	}

Sources/DbExtra-mysql.php

Spacing +1 added lines, -1 removed lines

@@ -443,7 +443,7 @@
 {
 	static $ver;
 
-	if(!empty($ver))
+	if (!empty($ver))
 		return $ver;
 
 	global $smcFunc;

Sources/Profile-Modify.php

Spacing +36 added lines, -36 removed lines

@@ -86,7 +86,7 @@ 
 			'type' => 'callback',
 			'callback_func' => 'birthdate',
 			'permission' => 'profile_extra',
-			'preload' => function () use ($cur_profile, &$context)
+			'preload' => function() use ($cur_profile, &$context)
 			{
 				// Split up the birthdate....
 				list ($uyear, $umonth, $uday) = explode('-', empty($cur_profile['birthdate']) || $cur_profile['birthdate'] == '0001-01-01' ? '0000-00-00' : $cur_profile['birthdate']);
@@ -98,7 +98,7 @@ 
 
 				return true;
 			},
-			'input_validate' => function (&$value) use (&$cur_profile, &$profile_vars)
+			'input_validate' => function(&$value) use (&$cur_profile, &$profile_vars)
 			{
 				if (isset($_POST['bday2'], $_POST['bday3']) && $value > 0 && $_POST['bday2'] > 0)
 				{
@@ -120,7 +120,7 @@ 
 		'birthdate' => array(
 			'type' => 'hidden',
 			'permission' => 'profile_extra',
-			'input_validate' => function (&$value) use ($cur_profile)
+			'input_validate' => function(&$value) use ($cur_profile)
 			{
 				// @todo Should we check for this year and tell them they made a mistake :P? (based on coppa at least?)
 				if (preg_match('/(\d{4})[\-\., ](\d{2})[\-\., ](\d{2})/', $value, $dates) === 1)
@@ -141,7 +141,7 @@ 
 			'label' => $txt['date_registered'],
 			'log_change' => true,
 			'permission' => 'moderate_forum',
-			'input_validate' => function (&$value) use ($txt, $user_info, $modSettings, $cur_profile, $context)
+			'input_validate' => function(&$value) use ($txt, $user_info, $modSettings, $cur_profile, $context)
 			{
 				// Bad date!  Go try again - please?
 				if (($value = strtotime($value)) === -1)
@@ -167,13 +167,13 @@ 
 			'js_submit' => !empty($modSettings['send_validation_onChange']) ? '
 	form_handle.addEventListener(\'submit\', function(event)
 	{
-		if (this.email_address.value != "'. $cur_profile['email_address'] .'")
+		if (this.email_address.value != "'. $cur_profile['email_address'] . '")
 		{
-			alert('. JavaScriptEscape($txt['email_change_logout']) .');
+			alert('. JavaScriptEscape($txt['email_change_logout']) . ');
 			return true;
 		}
 	}, false);' : '',
-			'input_validate' => function (&$value)
+			'input_validate' => function(&$value)
 			{
 				global $context, $old_profile, $profile_vars, $sourcedir, $modSettings;
 
@@ -209,7 +209,7 @@ 
 			'callback_func' => 'theme_pick',
 			'permission' => 'profile_extra',
 			'enabled' => $modSettings['theme_allow'] || allowedTo('admin_forum'),
-			'preload' => function () use ($smcFunc, &$context, $cur_profile, $txt)
+			'preload' => function() use ($smcFunc, &$context, $cur_profile, $txt)
 			{
 				$request = $smcFunc['db_query']('', '
 					SELECT value
@@ -230,7 +230,7 @@ 
 				);
 				return true;
 			},
-			'input_validate' => function (&$value)
+			'input_validate' => function(&$value)
 			{
 				$value = (int) $value;
 				return true;
@@ -238,7 +238,7 @@ 
 		),
 		'lngfile' => array(
 			'type' => 'select',
-			'options' => function () use (&$context)
+			'options' => function() use (&$context)
 			{
 				return $context['profile_languages'];
 			},
@@ -247,7 +247,7 @@ 
 			'preload' => 'profileLoadLanguages',
 			'enabled' => !empty($modSettings['userLanguage']),
 			'value' => empty($cur_profile['lngfile']) ? $language : $cur_profile['lngfile'],
-			'input_validate' => function (&$value) use (&$context, $cur_profile)
+			'input_validate' => function(&$value) use (&$context, $cur_profile)
 			{
 				// Load the languages.
 				profileLoadLanguages();
@@ -273,7 +273,7 @@ 
 			'log_change' => true,
 			'permission' => 'profile_identity',
 			'prehtml' => allowedTo('admin_forum') && isset($_GET['changeusername']) ? '<div class="alert">' . $txt['username_warning'] . '</div>' : '',
-			'input_validate' => function (&$value) use ($sourcedir, $context, $user_info, $cur_profile)
+			'input_validate' => function(&$value) use ($sourcedir, $context, $user_info, $cur_profile)
 			{
 				if (allowedTo('admin_forum'))
 				{
@@ -309,7 +309,7 @@ 
 			'permission' => 'profile_password',
 			'save_key' => 'passwd',
 			// Note this will only work if passwrd2 also exists!
-			'input_validate' => function (&$value) use ($sourcedir, $user_info, $smcFunc, $cur_profile)
+			'input_validate' => function(&$value) use ($sourcedir, $user_info, $smcFunc, $cur_profile)
 			{
 				// If we didn't try it then ignore it!
 				if ($value == '')
@@ -348,7 +348,7 @@ 
 			'input_attr' => array('maxlength="50"'),
 			'size' => 50,
 			'permission' => 'profile_blurb',
-			'input_validate' => function (&$value) use ($smcFunc)
+			'input_validate' => function(&$value) use ($smcFunc)
 			{
 				if ($smcFunc['strlen']($value) > 50)
 					return 'personal_text_too_long';
@@ -361,14 +361,14 @@ 
 			'type' => 'callback',
 			'callback_func' => 'pm_settings',
 			'permission' => 'pm_read',
-			'preload' => function () use (&$context, $cur_profile)
+			'preload' => function() use (&$context, $cur_profile)
 			{
 				$context['display_mode'] = $cur_profile['pm_prefs'] & 3;
 				$context['receive_from'] = !empty($cur_profile['pm_receive_from']) ? $cur_profile['pm_receive_from'] : 0;
 
 				return true;
 			},
-			'input_validate' => function (&$value) use (&$cur_profile, &$profile_vars)
+			'input_validate' => function(&$value) use (&$cur_profile, &$profile_vars)
 			{
 				// Simple validate and apply the two "sub settings"
 				$value = max(min($value, 2), 0);
@@ -384,7 +384,7 @@ 
 			'log_change' => true,
 			'size' => 7,
 			'permission' => 'moderate_forum',
-			'input_validate' => function (&$value)
+			'input_validate' => function(&$value)
 			{
 				if (!is_numeric($value))
 					return 'digits_only';
@@ -401,7 +401,7 @@ 
 			'input_attr' => array('maxlength="60"'),
 			'permission' => 'profile_displayed_name',
 			'enabled' => allowedTo('profile_displayed_name_own') || allowedTo('profile_displayed_name_any') || allowedTo('moderate_forum'),
-			'input_validate' => function (&$value) use ($context, $smcFunc, $sourcedir, $cur_profile)
+			'input_validate' => function(&$value) use ($context, $smcFunc, $sourcedir, $cur_profile)
 			{
 				$value = trim(preg_replace('~[\t\n\r \x0B\0' . ($context['utf8'] ? '\x{A0}\x{AD}\x{2000}-\x{200F}\x{201F}\x{202F}\x{3000}\x{FEFF}' : '\x00-\x08\x0B\x0C\x0E-\x19\xA0') . ']+~' . ($context['utf8'] ? 'u' : ''), ' ', $value));
 
@@ -433,7 +433,7 @@ 
 			'postinput' => '<span class="smalltext"><a href="' . $scripturl . '?action=helpadmin;help=secret_why_blank" onclick="return reqOverlayDiv(this.href);"><span class="generic_icons help"></span> ' . $txt['secret_why_blank'] . '</a></span>',
 			'value' => '',
 			'permission' => 'profile_password',
-			'input_validate' => function (&$value)
+			'input_validate' => function(&$value)
 			{
 				$value = $value != '' ? md5($value) : '';
 				return true;
@@ -458,7 +458,7 @@ 
 			'callback_func' => 'smiley_pick',
 			'enabled' => !empty($modSettings['smiley_sets_enable']),
 			'permission' => 'profile_extra',
-			'preload' => function () use ($modSettings, &$context, $txt, $cur_profile, $smcFunc)
+			'preload' => function() use ($modSettings, &$context, $txt, $cur_profile, $smcFunc)
 			{
 				$context['member']['smiley_set']['id'] = empty($cur_profile['smiley_set']) ? '' : $cur_profile['smiley_set'];
 				$context['smiley_sets'] = explode(',', 'none,,' . $modSettings['smiley_sets_known']);
@@ -476,7 +476,7 @@ 
 				}
 				return true;
 			},
-			'input_validate' => function (&$value)
+			'input_validate' => function(&$value)
 			{
 				global $modSettings;
 
@@ -492,7 +492,7 @@ 
 			'callback_func' => 'theme_settings',
 			'permission' => 'profile_extra',
 			'is_dummy' => true,
-			'preload' => function () use (&$context, $user_info, $modSettings)
+			'preload' => function() use (&$context, $user_info, $modSettings)
 			{
 				loadLanguage('Settings');
 
@@ -519,7 +519,7 @@ 
 			'type' => 'callback',
 			'callback_func' => 'timeformat_modify',
 			'permission' => 'profile_extra',
-			'preload' => function () use (&$context, $user_info, $txt, $cur_profile, $modSettings)
+			'preload' => function() use (&$context, $user_info, $txt, $cur_profile, $modSettings)
 			{
 				$context['easy_timeformats'] = array(
 					array('format' => '', 'title' => $txt['timeformat_default']),
@@ -542,7 +542,7 @@ 
 			'options' => smf_list_timezones(),
 			'permission' => 'profile_extra',
 			'label' => $txt['timezone'],
-			'input_validate' => function ($value)
+			'input_validate' => function($value)
 			{
 				$tz = smf_list_timezones();
 				if (!isset($tz[$value]))
@@ -559,7 +559,7 @@ 
 			'size' => 50,
 			'permission' => 'profile_title',
 			'enabled' => !empty($modSettings['titlesEnable']),
-			'input_validate' => function (&$value) use ($smcFunc)
+			'input_validate' => function(&$value) use ($smcFunc)
 			{
 				if ($smcFunc['strlen']($value) > 50)
 					return 'user_title_too_long';
@@ -582,7 +582,7 @@ 
 			'size' => 50,
 			'permission' => 'profile_website',
 			// Fix the URL...
-			'input_validate' => function (&$value)
+			'input_validate' => function(&$value)
 			{
 				if (strlen(trim($value)) > 0 && strpos($value, '://') === false)
 					$value = 'http://' . $value;
@@ -707,7 +707,7 @@ 
 		if (this.oldpasswrd.value == "")
 		{
 			event.preventDefault();
-			alert('. (JavaScriptEscape($txt['required_security_reasons'])) .');
+			alert('. (JavaScriptEscape($txt['required_security_reasons'])) . ');
 			return false;
 		}
 	}, false);' : ''), true);
@@ -906,7 +906,7 @@ 
 	if (isset($_POST['ignore_brd']))
 	{
 		if (!is_array($_POST['ignore_brd']))
-			$_POST['ignore_brd'] = array ($_POST['ignore_brd']);
+			$_POST['ignore_brd'] = array($_POST['ignore_brd']);
 
 		foreach ($_POST['ignore_brd'] as $k => $d)
 		{
@@ -1872,7 +1872,7 @@ 
 
 	// Now load all the values for this user.
 	require_once($sourcedir . '/Subs-Notify.php');
-	$prefs = getNotifyPrefs($memID,  '', $memID != 0);
+	$prefs = getNotifyPrefs($memID, '', $memID != 0);
 
 	$context['alert_prefs'] = !empty($prefs[$memID]) ? $prefs[$memID] : array();
 
@@ -2171,7 +2171,7 @@ 
 	);
 
 	// Gotta know how many unread alerts are left.
-	$count =  alert_count($memID, true);
+	$count = alert_count($memID, true);
 
 	updateMemberData($memID, array('alerts' => $count));
 
@@ -2206,7 +2206,7 @@ 
 	// Gotta know how many unread alerts are left.
 	if ($memID)
 	{
-		$count =  alert_count($memID, true);
+		$count = alert_count($memID, true);
 
 		updateMemberData($memID, array('alerts' => $count));
 
@@ -2242,7 +2242,7 @@ 
 		)
 	);
 
-	$count =  $smcFunc['db_num_rows']($request);
+	$count = $smcFunc['db_num_rows']($request);
 	$smcFunc['db_free_result']($request);
 
 	return $count;
@@ -2302,7 +2302,7 @@ 
 					'class' => 'lefttext',
 				),
 				'data' => array(
-					'function' => function ($topic) use ($txt)
+					'function' => function($topic) use ($txt)
 					{
 						$link = $topic['link'];
 
@@ -2357,7 +2357,7 @@ 
 					'class' => 'lefttext',
 				),
 				'data' => array(
-					'function' => function ($topic) use ($txt)
+					'function' => function($topic) use ($txt)
 					{
 						$pref = $topic['notify_pref'];
 						$mode = !empty($topic['unwatched']) ? 0 : ($pref & 0x02 ? 3 : ($pref & 0x01 ? 2 : 1));
@@ -2454,7 +2454,7 @@ 
 					'class' => 'lefttext',
 				),
 				'data' => array(
-					'function' => function ($board) use ($txt)
+					'function' => function($board) use ($txt)
 					{
 						$link = $board['link'];
 
@@ -2475,7 +2475,7 @@ 
 					'class' => 'lefttext',
 				),
 				'data' => array(
-					'function' => function ($board) use ($txt)
+					'function' => function($board) use ($txt)
 					{
 						$pref = $board['notify_pref'];
 						$mode = $pref & 0x02 ? 3 : ($pref & 0x01 ? 2 : 1);

Sources/Subs-ReportedContent.php

Spacing +2 added lines, -2 removed lines

@@ -49,7 +49,7 @@ 
 	$smcFunc['db_query']('', '
 		UPDATE {db_prefix}log_reported
 		SET  {raw:action} = {string:value}
-		'. (is_array($report_id) ? 'WHERE id_report IN ({array_int:id_report})' : 'WHERE id_report = {int:id_report}') .'
+		'. (is_array($report_id) ? 'WHERE id_report IN ({array_int:id_report})' : 'WHERE id_report = {int:id_report}') . '
 			' . $board_query,
 		array(
 			'action' => $action,
@@ -97,7 +97,7 @@ 
 			)
 		);
 
-		while($row = $smcFunc['db_fetch_assoc']($request))
+		while ($row = $smcFunc['db_fetch_assoc']($request))
 			$extra[$row['id_report']] = array(
 				'report' => $row['id_report'],
 				'member' => $row['id_member'],

Sources/ManageServer.php

Spacing +2 added lines, -2 removed lines

@@ -247,7 +247,7 @@ 
 
 		saveSettings($config_vars);
 		$_SESSION['adm-save'] = true;
-		redirectexit('action=admin;area=serversettings;sa=database;' . $context['session_var'] . '=' . $context['session_id'] );
+		redirectexit('action=admin;area=serversettings;sa=database;' . $context['session_var'] . '=' . $context['session_id']);
 	}
 
 	// Fill the config array.
@@ -272,7 +272,7 @@ 
 		array('localCookies', $txt['localCookies'], 'db', 'check', false, 'localCookies'),
 		array('globalCookies', $txt['globalCookies'], 'db', 'check', false, 'globalCookies'),
 		array('globalCookiesDomain', $txt['globalCookiesDomain'], 'db', 'text', false, 'globalCookiesDomain'),
-		array('secureCookies', $txt['secureCookies'], 'db', 'check', false, 'secureCookies',  'disabled' => !isset($_SERVER['HTTPS']) || !(strtolower($_SERVER['HTTPS']) == 'on' || strtolower($_SERVER['HTTPS']) == '1')),
+		array('secureCookies', $txt['secureCookies'], 'db', 'check', false, 'secureCookies', 'disabled' => !isset($_SERVER['HTTPS']) || !(strtolower($_SERVER['HTTPS']) == 'on' || strtolower($_SERVER['HTTPS']) == '1')),
 		array('httponlyCookies', $txt['httponlyCookies'], 'db', 'check', false, 'httponlyCookies'),
 		'',
 		// Sessions

Sources/ShowAttachments.php

Spacing +10 added lines, -10 removed lines

@@ -71,11 +71,11 @@ 
 	}
 
 	// Use cache when possible.
-	if (($cache = cache_get_data('attachment_lookup_id-'. $attachId)) != null)
+	if (($cache = cache_get_data('attachment_lookup_id-' . $attachId)) != null)
 		list($file, $thumbFile) = $cache;
 
 	// Get the info from the DB.
-	if(empty($file) || empty($thumbFile) && !empty($file['id_thumb']))
+	if (empty($file) || empty($thumbFile) && !empty($file['id_thumb']))
 	{
 		// Do we have a hook wanting to use our attachment system? We use $attachRequest to prevent accidental usage of $request.
 		$attachRequest = null;
@@ -144,8 +144,8 @@ 
 		$file['filePath'] = getAttachmentFilename($file['filename'], $attachId, $file['id_folder'], false, $file['file_hash']);
 		// ensure variant attachment compatibility
 		$filePath = pathinfo($file['filePath']);
-		$file['filePath'] = !file_exists($file['filePath']) ? substr($file['filePath'], 0, -(strlen($filePath['extension'])+1)) : $file['filePath'];
-		$file['etag'] = '"'. md5_file($file['filePath']) .'"';
+		$file['filePath'] = !file_exists($file['filePath']) ? substr($file['filePath'], 0, -(strlen($filePath['extension']) + 1)) : $file['filePath'];
+		$file['etag'] = '"' . md5_file($file['filePath']) . '"';
 
 		// now get the thumbfile!
 		$thumbFile = array();
@@ -171,13 +171,13 @@ 
 
 				// set filePath and ETag time
 				$thumbFile['filePath'] = getAttachmentFilename($thumbFile['filename'], $attachId, $thumbFile['id_folder'], false, $thumbFile['file_hash']);
-				$thumbFile['etag'] = '"'. md5_file($thumbFile['filePath']) .'"';
+				$thumbFile['etag'] = '"' . md5_file($thumbFile['filePath']) . '"';
 			}
 		}
 
 		// Cache it.
-		if(!empty($file) || !empty($thumbFile))
-			cache_put_data('attachment_lookup_id-'. $file['id_attach'], array($file, $thumbFile), mt_rand(850, 900));
+		if (!empty($file) || !empty($thumbFile))
+			cache_put_data('attachment_lookup_id-' . $file['id_attach'], array($file, $thumbFile), mt_rand(850, 900));
 	}
 
 	// Update the download counter (unless it's a thumbnail).
@@ -289,17 +289,17 @@ 
 	if (!empty($modSettings['attachmentRecodeLineEndings']) && !isset($_REQUEST['image']) && in_array($file['fileext'], array('txt', 'css', 'htm', 'html', 'php', 'xml')))
 	{
 		if (strpos($_SERVER['HTTP_USER_AGENT'], 'Windows') !== false)
-			$callback = function ($buffer)
+			$callback = function($buffer)
 			{
 				return preg_replace('~[\r]?\n~', "\r\n", $buffer);
 			};
 		elseif (strpos($_SERVER['HTTP_USER_AGENT'], 'Mac') !== false)
-			$callback = function ($buffer)
+			$callback = function($buffer)
 			{
 				return preg_replace('~[\r]?\n~', "\r", $buffer);
 			};
 		else
-			$callback = function ($buffer)
+			$callback = function($buffer)
 			{
 				return preg_replace('~[\r]?\n~', "\n", $buffer);
 			};

Sources/Subs-Attachments.php

Spacing +9 added lines, -9 removed lines

@@ -150,7 +150,7 @@ 
 	{
 		if (!@is_dir($directory))
 		{
-			if (!@mkdir($directory,0755))
+			if (!@mkdir($directory, 0755))
 			{
 				$context['dir_creation_error'] = 'attachments_no_create';
 				return false;
@@ -248,7 +248,7 @@ 
  *
  * @return array|bool An array of all the directories and subdirectories or false on failure
  */
-function get_directory_tree_elements ($directory)
+function get_directory_tree_elements($directory)
 {
 	/*
 		In Windows server both \ and / can be used as directory separators in paths
@@ -264,7 +264,7 @@ 
 		if (substr($directory, 0, 1) != DIRECTORY_SEPARATOR)
 			return false;
 
-		$tree = explode(DIRECTORY_SEPARATOR, trim($directory,DIRECTORY_SEPARATOR));
+		$tree = explode(DIRECTORY_SEPARATOR, trim($directory, DIRECTORY_SEPARATOR));
 	}
 	return $tree;
 }
@@ -277,7 +277,7 @@ 
  *
  * @return string|bool The first part of the path or false on error
  */
-function attachments_init_dir (&$tree, &$count)
+function attachments_init_dir(&$tree, &$count)
 {
 	$directory = '';
 	// If on Windows servers the first part of the path is the drive (e.g. "C:")
@@ -286,7 +286,7 @@ 
 		 //Better be sure that the first part of the path is actually a drive letter...
 		 //...even if, I should check this in the admin page...isn't it?
 		 //...NHAAA Let's leave space for users' complains! :P
-		if (preg_match('/^[a-z]:$/i',$tree[0]))
+		if (preg_match('/^[a-z]:$/i', $tree[0]))
 			$directory = array_shift($tree);
 		else
 			return false;
@@ -484,7 +484,7 @@ 
 	global $modSettings, $context, $sourcedir, $smcFunc;
 
 	// No data or missing data .... Not necessarily needed, but in case a mod author missed something.
-	if ( empty($_SESSION['temp_attachments'][$attachID]))
+	if (empty($_SESSION['temp_attachments'][$attachID]))
 		$error = '$_SESSION[\'temp_attachments\'][$attachID]';
 
 	elseif (empty($attachID))
@@ -911,9 +911,9 @@ 
 		$attachContext = $attachLoaded[$attachID];
 
 		// Fix the url to point out to showAvatar().
-		$attachContext['href'] = $scripturl . '?action=dlattach;attach=' . $attachID .';type=preview';
+		$attachContext['href'] = $scripturl . '?action=dlattach;attach=' . $attachID . ';type=preview';
 
-		$attachContext['link'] = '<a href="' . $scripturl . '?action=dlattach;attach=' . $attachID .';type=preview'. (empty($attachContext['is_image']) ? ';file' : '') .'">' . $smcFunc['htmlspecialchars']($attachContext['name']) . '</a>';
+		$attachContext['link'] = '<a href="' . $scripturl . '?action=dlattach;attach=' . $attachID . ';type=preview' . (empty($attachContext['is_image']) ? ';file' : '') . '">' . $smcFunc['htmlspecialchars']($attachContext['name']) . '</a>';
 
 		// Fix the thumbnail too, if the image has one.
 		if (!empty($attachContext['thumbnail']) && !empty($attachContext['thumbnail']['has_thumb']))
@@ -1078,7 +1078,7 @@ 
 				LEFT JOIN {db_prefix}attachments AS thumb ON (thumb.id_attach = a.id_thumb)') . '
 				LEFT JOIN {db_prefix}messages AS m ON (m.id_msg = a.id_msg)
 			WHERE a.attachment_type = {int:attachment_type}
-				'. (!empty($msgID) ? 'AND a.id_msg = {int:message_id}' : '') .'',
+				'. (!empty($msgID) ? 'AND a.id_msg = {int:message_id}' : '') . '',
 			array(
 				'message_id' => $msgID,
 				'attachment_type' => 0,