SimpleMachines / SMF2.1

Sources/Profile-Actions.php

Indentation +3 added lines, -3 removed lines

@@ -1050,15 +1050,15 @@
 }
 
 /**
-  * Formats a line (passed as a fields  array) as CSV and returns the CSV as a string.
-  * from https://stackoverflow.com/questions/3933668/convert-array-into-csv
+ * Formats a line (passed as a fields  array) as CSV and returns the CSV as a string.
+ * from https://stackoverflow.com/questions/3933668/convert-array-into-csv
  * 
  * @param array $fields a line of the array
  * @param string @delimiter the delimiter char
  * @param string @enclosure the enclosure char
  * @param boolean $encloseAll enclose all
  * @param boolean $nullToMysqlNull
-  */
+ */
 function arrayToCsv( array $fields, $delimiter = ';', $enclosure = '"', $encloseAll = false, $nullToMysqlNull = false ) {
 	$delimiter_esc = preg_quote($delimiter, '/');
 	$enclosure_esc = preg_quote($enclosure, '/');

Spacing +10 added lines, -10 removed lines

@@ -992,12 +992,12 @@ 
 	{
 		loadMemberData($memID, false, 'profile');
 		$profile = $user_profile[$memID];
-		$removeFields = array('secret_question','tfa_secret','password_salt');
+		$removeFields = array('secret_question', 'tfa_secret', 'password_salt');
 		foreach ($removeFields as $value)
 		{
 			unset($profile[$value]);
 		}
-		foreach($profile as $key => &$value)
+		foreach ($profile as $key => &$value)
 		{
 			if (is_array($value))
 				$value = $smcFunc['json_encode']($value);
@@ -1009,7 +1009,7 @@ 
 	elseif ($mode == 'messages') // messages
 	{
 		
-		$request = $smcFunc['db_query']('','
+		$request = $smcFunc['db_query']('', '
 			SELECT id_msg, id_topic, poster_time, subject, modified_time, modified_name, modified_reason, body, likes, poster_ip
 			FROM {db_prefix}messages 
 			WHERE id_member = {int:memID}',
@@ -1027,7 +1027,7 @@ 
 	}
 	elseif ($mode == 'pmessages')
 	{
-		$request = $smcFunc['db_query']('','
+		$request = $smcFunc['db_query']('', '
 			SELECT pm.msgtime, pm.subject, pm.body
 			FROM {db_prefix}personal_messages pm
 			LEFT JOIN {db_prefix}pm_recipients pmr on (pm.id_pm = pmr.id_pm and pmr.id_member = {int:memID})
@@ -1045,14 +1045,14 @@ 
 	}
 	$count = count($profileData);
 	$csv_data = '';
-	for($i = 0; $i < $count; $i++)
+	for ($i = 0; $i < $count; $i++)
 	{
 		$csv_data .= arrayToCsv($profileData[$i]) . "\r\n";
 	}
 
 
 	header("Pragma: no-cache");
-	header('Content-Disposition: attachment; filename="privacySMF'.$mode.'.csv";');
+	header('Content-Disposition: attachment; filename="privacySMF' . $mode . '.csv";');
 	header("Content-Length: " . strlen($csv_data));
 	header("Content-Transfer-Encoding: binary");
 	header("Content-Type: application/force-download");
@@ -1071,12 +1071,12 @@ 
  * @param boolean $encloseAll enclose all
  * @param boolean $nullToMysqlNull
   */
-function arrayToCsv( array $fields, $delimiter = ';', $enclosure = '"', $encloseAll = false, $nullToMysqlNull = false ) {
+function arrayToCsv(array $fields, $delimiter = ';', $enclosure = '"', $encloseAll = false, $nullToMysqlNull = false) {
 	$delimiter_esc = preg_quote($delimiter, '/');
 	$enclosure_esc = preg_quote($enclosure, '/');
 
 	$output = array();
-	foreach ( $fields as $field )
+	foreach ($fields as $field)
 	{
 		if ($field === null && $nullToMysqlNull)
 		{
@@ -1085,7 +1085,7 @@ 
 		}
 
 		// Enclose fields containing $delimiter, $enclosure or whitespace
-		if ( $encloseAll || preg_match( "/(?:${delimiter_esc}|${enclosure_esc}|\s)/", $field ) )
+		if ($encloseAll || preg_match("/(?:${delimiter_esc}|${enclosure_esc}|\s)/", $field))
 		{
 			$output[] = $enclosure . str_replace($enclosure, $enclosure . $enclosure, $field) . $enclosure;
 		}
@@ -1095,7 +1095,7 @@ 
 		}
 	}
 
-	return implode( $delimiter, $output );
+	return implode($delimiter, $output);
 }
 
 ?>
\ No newline at end of file

Braces +2 added lines, -1 removed lines

@@ -1134,7 +1134,8 @@
  * @param boolean $encloseAll enclose all
  * @param boolean $nullToMysqlNull
   */
-function arrayToCsv( array $fields, $delimiter = ';', $enclosure = '"', $encloseAll = false, $nullToMysqlNull = false ) {
+function arrayToCsv( array $fields, $delimiter = ';', $enclosure = '"', $encloseAll = false, $nullToMysqlNull = false )
+{
 	$delimiter_esc = preg_quote($delimiter, '/');
 	$enclosure_esc = preg_quote($enclosure, '/');
 

Themes/default/Profile.template.php

Spacing +4 added lines, -4 removed lines

@@ -459,7 +459,7 @@ 
 		$fields = '';
 		foreach ($context['print_custom_fields']['below_signature'] as $field)
 			if (!empty($field['output_html']))
-				$fields .=  '
+				$fields .= '
 					<li>' . $field['output_html'] . '</li>';
 
 		if (!empty($fields))
@@ -3272,7 +3272,7 @@ 
 				', $txt['profileDataCenter'], '
 			</h3>
 		</div>
-		',( !empty($context['pdc']['nofound']) ? '<p class="information">' . $txt['profileDataNotFound'] . '</p>' : ''),'<div class="windowbg">
+		',(!empty($context['pdc']['nofound']) ? '<p class="information">' . $txt['profileDataNotFound'] . '</p>' : ''), '<div class="windowbg">
 		<div>
 			<form action="', $scripturl, '?action=profile;area=getprofiledata;activity=profile" method="post" accept-charset="', $context['character_set'], '" name="creator" id="creator">
 				<p',  '', '>', (!empty($context['pdc']['own']) ? $txt['profileDownloadProfile_own'] : sprintf($txt['profileDownloadProfile_any'], $context['pdc']['name'])), ': </p>
@@ -3331,7 +3331,7 @@ 
 				<div class="title_bar">
 					<h3 class="titlebg">', $txt['policy_approved'], '</h3>
 				</div>
-				<p>' ,$context['poc']['approved_text'] , '</p>
+				<p>' ,$context['poc']['approved_text'], '</p>
 			</div>';
 	if (!empty($context['poc']['newVersionText']))
 		echo '
@@ -3339,7 +3339,7 @@ 
 				<div class="title_bar">
 					<h3 class="titlebg">', $txt['policy_new'], '</h3>
 				</div>
-				<p>' ,$context['poc']['newVersionText'] , '</p>
+				<p>' ,$context['poc']['newVersionText'], '</p>
 			</div>';
 	
 	if (!empty($context['poc']['showAccept']))

Sources/ManageSettings.php

Spacing +19 added lines, -19 removed lines

@@ -1342,7 +1342,7 @@ 
 					'class' => 'centercol',
 				),
 				'data' => array(
-					'function' => function ($rowData)
+					'function' => function($rowData)
 					{
 						$isChecked = $rowData['disabled'] ? '' : ' checked';
 						$onClickHandler = $rowData['can_show_register'] ? sprintf(' onclick="document.getElementById(\'reg_%1$s\').disabled = !this.checked;"', $rowData['id']) : '';
@@ -1358,7 +1358,7 @@ 
 					'class' => 'centercol',
 				),
 				'data' => array(
-					'function' => function ($rowData)
+					'function' => function($rowData)
 					{
 						$isChecked = $rowData['on_register'] && !$rowData['disabled'] ? ' checked' : '';
 						$isDisabled = $rowData['can_show_register'] ? '' : ' disabled';
@@ -1405,15 +1405,15 @@ 
 					'value' => $txt['custom_profile_fieldorder'],
 				),
 				'data' => array(
-					'function' => function ($rowData) use ($context, $txt, $scripturl)
+					'function' => function($rowData) use ($context, $txt, $scripturl)
 					{
-						$return = '<p class="centertext bold_text">'. $rowData['field_order'] .'<br>';
+						$return = '<p class="centertext bold_text">' . $rowData['field_order'] . '<br>';
 
 						if ($rowData['field_order'] > 1)
-							$return .= '<a href="' . $scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $rowData['id_field'] . ';move=up"><span class="toggle_up" title="'. $txt['custom_edit_order_move'] .' '. $txt['custom_edit_order_up'] .'"></span></a>';
+							$return .= '<a href="' . $scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $rowData['id_field'] . ';move=up"><span class="toggle_up" title="' . $txt['custom_edit_order_move'] . ' ' . $txt['custom_edit_order_up'] . '"></span></a>';
 
 						if ($rowData['field_order'] < $context['custFieldsMaxOrder'])
-							$return .= '<a href="' . $scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $rowData['id_field'] . ';move=down"><span class="toggle_down" title="'. $txt['custom_edit_order_move'] .' '. $txt['custom_edit_order_down'] .'"></span></a>';
+							$return .= '<a href="' . $scripturl . '?action=admin;area=featuresettings;sa=profileedit;fid=' . $rowData['id_field'] . ';move=down"><span class="toggle_down" title="' . $txt['custom_edit_order_move'] . ' ' . $txt['custom_edit_order_down'] . '"></span></a>';
 
 						$return .= '</p>';
 
@@ -1431,7 +1431,7 @@ 
 					'value' => $txt['custom_profile_fieldname'],
 				),
 				'data' => array(
-					'function' => function ($rowData) use ($scripturl)
+					'function' => function($rowData) use ($scripturl)
 					{
 						return sprintf('<a href="%1$s?action=admin;area=featuresettings;sa=profileedit;fid=%2$d">%3$s</a><div class="smalltext">%4$s</div>', $scripturl, $rowData['id_field'], $rowData['field_name'], $rowData['field_desc']);
 					},
@@ -1447,7 +1447,7 @@ 
 					'value' => $txt['custom_profile_fieldtype'],
 				),
 				'data' => array(
-					'function' => function ($rowData) use ($txt)
+					'function' => function($rowData) use ($txt)
 					{
 						$textKey = sprintf('custom_profile_type_%1$s', $rowData['field_type']);
 						return isset($txt[$textKey]) ? $txt[$textKey] : $textKey;
@@ -1465,7 +1465,7 @@ 
 					'value' => $txt['custom_profile_active'],
 				),
 				'data' => array(
-					'function' => function ($rowData) use ($txt)
+					'function' => function($rowData) use ($txt)
 					{
 						return $rowData['active'] ? $txt['yes'] : $txt['no'];
 					},
@@ -1482,7 +1482,7 @@ 
 					'value' => $txt['custom_profile_placement'],
 				),
 				'data' => array(
-					'function' => function ($rowData)
+					'function' => function($rowData)
 					{
 						global $txt, $context;
 
@@ -1717,7 +1717,7 @@ 
 			redirectexit('action=admin;area=featuresettings;sa=profile'); // @todo implement an error handler
 
 		// All good, proceed.
-		$smcFunc['db_query']('','
+		$smcFunc['db_query']('', '
 			UPDATE {db_prefix}custom_fields
 			SET field_order = {int:old_order}
 			WHERE field_order = {int:new_order}',
@@ -1726,7 +1726,7 @@ 
 				'old_order' => $context['field']['order'],
 			)
 		);
-		$smcFunc['db_query']('','
+		$smcFunc['db_query']('', '
 			UPDATE {db_prefix}custom_fields
 			SET field_order = {int:new_order}
 			WHERE id_field = {int:id_field}',
@@ -1828,7 +1828,7 @@ 
 			$smcFunc['db_free_result']($request);
 
 			$unique = false;
-			for ($i = 0; !$unique && $i < 9; $i ++)
+			for ($i = 0; !$unique && $i < 9; $i++)
 			{
 				if (!in_array($col_name, $current_fields))
 					$unique = true;
@@ -2001,7 +2001,7 @@ 
 		);
 
 		// Re-arrange the order.
-		$smcFunc['db_query']('','
+		$smcFunc['db_query']('', '
 			UPDATE {db_prefix}custom_fields
 			SET field_order = field_order - 1
 			WHERE field_order > {int:current_order}',
@@ -2266,7 +2266,7 @@ 
 	$context['token_check'] = 'noti-admin';
 
 	// Specify our action since we'll want to post back here instead of the profile
-	$context['action'] = 'action=admin;area=featuresettings;sa=alerts;'. $context['session_var'] .'='. $context['session_id'];
+	$context['action'] = 'action=admin;area=featuresettings;sa=alerts;' . $context['session_var'] . '=' . $context['session_id'];
 
 	loadTemplate('Profile');
 	loadLanguage('Profile');
@@ -2438,10 +2438,10 @@ 
 			if (!empty($_REQUEST['save_new_policy']))
 				$currentVersion++;
 			
-			$config_vars[] = array('text', 'policy_text'.$currentVersion);
-			$_POST['policy_text'.$currentVersion] = $_REQUEST['policy_text'];
+			$config_vars[] = array('text', 'policy_text' . $currentVersion);
+			$_POST['policy_text' . $currentVersion] = $_REQUEST['policy_text'];
 			$config_vars[] = array('text', 'policy_version');
-			$_POST['policy_version'] = 'policy_text'.$currentVersion;
+			$_POST['policy_version'] = 'policy_text' . $currentVersion;
 			unset($config_vars[1]);
 			saveDBSettings($config_vars);
 		}
@@ -2499,7 +2499,7 @@ 
 			)
 		);
 		
-		$smcFunc['db_query']('','
+		$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}settings
 			WHERE variable = {string:policy_text}',
 			array(

Themes/default/Admin.template.php

Spacing +4 added lines, -4 removed lines

@@ -955,7 +955,7 @@ 
 				}
 
 				echo isset($config_var['postinput']) ? '
-											' . $config_var['postinput'] : '','
+											' . $config_var['postinput'] : '', '
 									</dd>';
 			}
 		}
@@ -1672,7 +1672,7 @@ 
 								</dl>
 								<input type="submit" name="save_setting" value="', $txt['save'], '" class="button">
 								<div class="block">
-									',template_control_richedit($context['post_box_name'], 'smileyBox_message', 'bbcBox_message') ,'
+									',template_control_richedit($context['post_box_name'], 'smileyBox_message', 'bbcBox_message'), '
 								</div>
 								<input type="submit" name="save_new_policy" value="', $txt['policy_save'], '" class="button">
 								<input type="submit" name="update_policy" value="', $txt['policy_update'], '" class="button">								
@@ -1717,11 +1717,11 @@ 
 							</div>
 							<div class="windowbg">
 								<dl class="settings">';
-	$count = ( is_array($context['poc']['policy_management']) ? count($context['poc']['policy_management']) : 0);
+	$count = (is_array($context['poc']['policy_management']) ? count($context['poc']['policy_management']) : 0);
 	foreach ($context['poc']['policy_management'] as $row)
 	{
 		echo '
-									<dt>', ($row['new'] ? $txt['policy_current'] : '<input type="submit" name="delete_policy" value="' . $row['name'] . '" class="button">') , '</dt><dd>', $row['amount'], '</dd>';
+									<dt>', ($row['new'] ? $txt['policy_current'] : '<input type="submit" name="delete_policy" value="' . $row['name'] . '" class="button">'), '</dt><dd>', $row['amount'], '</dd>';
 	}
 	echo '
 								</dl>

index.php

Spacing +2 added lines, -2 removed lines

@@ -102,7 +102,7 @@ 
  *
  * @param string $class The fully-qualified class name.
  */
-spl_autoload_register(function ($class) use ($sourcedir)
+spl_autoload_register(function($class) use ($sourcedir)
 {
 	$classMap = array(
 		'ReCaptcha\\' => 'ReCaptcha/',
@@ -217,7 +217,7 @@ 
 	{
 		global $options;
 		if (empty($options['policy_isvalid']) && 
-				(empty($_REQUEST['area']) || (!empty($_REQUEST['area']) && $_REQUEST['area'] != 'getpolicydata')) )
+				(empty($_REQUEST['area']) || (!empty($_REQUEST['area']) && $_REQUEST['area'] != 'getpolicydata')))
 			$show_privacy = true;
 	}