SimpleMachines / SMF2.1

Sources/MessageIndex.php

Spacing +3 added lines, -3 removed lines

@@ -324,7 +324,7 @@ 
 				' . (empty($sort_methods_table[$context['sort_by']]) ? '' : $sort_methods_table[$context['sort_by']]) . '
 				WHERE t.id_board = {int:current_board} '
 				. (!$modSettings['postmod_active'] || $context['can_approve_posts'] ? '' : '
-					AND (t.approved = {int:is_approved}' . ($user_info['is_guest'] ? '' : ' OR t.id_member_started = {int:current_member}') . ')') .'
+					AND (t.approved = {int:is_approved}' . ($user_info['is_guest'] ? '' : ' OR t.id_member_started = {int:current_member}') . ')') . '
 				ORDER BY is_sticky' . ($fake_ascending ? '' : ' DESC') . ', ' . $_REQUEST['sort'] . ($ascending ? '' : ' DESC') . '
 				LIMIT {int:maxindex}
 					OFFSET {int:start} ';
@@ -333,7 +333,7 @@ 
 		SELECT
 			t.id_topic, t.num_replies, t.locked, t.num_views, t.is_sticky, t.id_poll, t.id_previous_board,
 			' . ($user_info['is_guest'] ? '0' : 'COALESCE(lt.id_msg, COALESCE(lmr.id_msg, -1)) + 1') . ' AS new_from,
-			' . ( $enableParticipation ? ' COALESCE(( SELECT 1 FROM {db_prefix}messages AS parti WHERE t.id_topic = parti.id_topic and parti.id_member = {int:current_member} LIMIT 1) , 0) as is_posted_in,
+			' . ($enableParticipation ? ' COALESCE(( SELECT 1 FROM {db_prefix}messages AS parti WHERE t.id_topic = parti.id_topic and parti.id_member = {int:current_member} LIMIT 1) , 0) as is_posted_in,
 			'	: '') . '
 			t.id_last_msg, t.approved, t.unapproved_posts, ml.poster_time AS last_poster_time, t.id_redirect_topic,
 			ml.id_msg_modified, ml.subject AS last_subject, ml.icon AS last_icon,
@@ -357,7 +357,7 @@ 
 			LEFT JOIN {db_prefix}log_mark_read AS lmr ON (lmr.id_board = {int:current_board} AND lmr.id_member = {int:current_member})') . '
 			' . (!empty($message_index_tables) ? implode("\n\t\t\t\t", $message_index_tables) : '') . '
 			' . (!empty($message_index_wheres) ? ' WHERE ' . implode("\n\t\t\t\tAND ", $message_index_wheres) : '') . '
-		ORDER BY is_sticky' . ($fake_ascending ? '' : ' DESC') . ', ' . $_REQUEST['sort'] . ($ascending ? '' : ' DESC') ,
+		ORDER BY is_sticky' . ($fake_ascending ? '' : ' DESC') . ', ' . $_REQUEST['sort'] . ($ascending ? '' : ' DESC'),
 		$message_index_parameters
 	);
 

Themes/default/PersonalMessage.template.php

Spacing +20 added lines, -20 removed lines

@@ -230,7 +230,7 @@ 
 
 				foreach ($message['custom_fields']['above_member'] as $custom)
 					echo '
-							<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
+							<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
 
 				echo '
 						</ul>
@@ -279,7 +279,7 @@ 
 			if (!empty($message['custom_fields']['below_avatar']))
 				foreach ($message['custom_fields']['below_avatar'] as $custom)
 					echo '
-						<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
+						<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
 
 			if (!$message['member']['is_guest'])
 				echo '
@@ -321,7 +321,7 @@ 
 
 					foreach ($message['custom_fields']['icons'] as $custom)
 						echo '
-								<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
+								<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
 
 					echo '
 							</ol>
@@ -385,7 +385,7 @@ 
 				if (!empty($message['custom_fields']['standard']))
 					foreach ($message['custom_fields']['standard'] as $custom)
 						echo '
-						<li class="custom ', $custom['col_name'] ,'">', $custom['title'], ': ', $custom['value'], '</li>';
+						<li class="custom ', $custom['col_name'], '">', $custom['title'], ': ', $custom['value'], '</li>';
 
 				// Are we showing the warning status?
 				if ($message['member']['can_see_warning'])
@@ -396,7 +396,7 @@ 
 				if (!empty($message['custom_fields']['bottom_poster']))
 					foreach ($message['custom_fields']['bottom_poster'] as $custom)
 						echo '
-						<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
+						<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
 			}
 
 			// Done with the information about the poster... on to the post itself.
@@ -497,7 +497,7 @@ 
 
 				foreach ($message['custom_fields']['above_signature'] as $custom)
 					echo '
-								<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
+								<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
 
 				echo '
 							</ul>
@@ -520,7 +520,7 @@ 
 
 				foreach ($message['custom_fields']['below_signature'] as $custom)
 					echo '
-								<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
+								<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
 
 				echo '
 							</ul>
@@ -656,7 +656,7 @@ 
 	while ($message = $context['get_pmessage']('subject'))
 	{
 		echo '
-			<tr class="windowbg', $message['is_unread'] ? ' unread_pm' : '','">
+			<tr class="windowbg', $message['is_unread'] ? ' unread_pm' : '', '">
 				<td class="table_icon pm_icon">
 					<script>
 						currentLabels[', $message['id'], '] = {';
@@ -680,7 +680,7 @@ 
 				<td class="pm_time">', $message['time'], '</td>
 				<td class="pm_subject">
 					', ($context['display_mode'] != 0 && $context['current_pm'] == $message['id'] ? '<img src="' . $settings['images_url'] . '/selected.png" alt="*">' : ''), '<a href="', ($context['display_mode'] == 0 || $context['current_pm'] == $message['id'] ? '' : ($scripturl . '?action=pm;pmid=' . $message['id'] . ';kstart;f=' . $context['folder'] . ';start=' . $context['start'] . ';sort=' . $context['sort_by'] . ($context['sort_direction'] == 'up' ? ';' : ';desc') . ($context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : ''))), '#msg', $message['id'], '">', $message['subject'], $message['is_unread'] ? '&nbsp;<span class="new_posts">' . $txt['new'] . '</span>' : '', '</a>
-					<span class="pm_inline_time"><span class="generic_icons ', ($context['from_or_to']=='to' && count($message['recipients']['to'])>1) ? 'people' : 'members', '"></span> ', ($context['from_or_to'] == 'from' ? $message['member']['link'] : (empty($message['recipients']['to']) ? '' : implode(', ', $message['recipients']['to']))), '  <span class="generic_icons time_online"></span> ', $message['time'], '</span>
+					<span class="pm_inline_time"><span class="generic_icons ', ($context['from_or_to'] == 'to' && count($message['recipients']['to']) > 1) ? 'people' : 'members', '"></span> ', ($context['from_or_to'] == 'from' ? $message['member']['link'] : (empty($message['recipients']['to']) ? '' : implode(', ', $message['recipients']['to']))), '  <span class="generic_icons time_online"></span> ', $message['time'], '</span>
 				</td>
 				<td class="pm_from_to">
 					', ($context['from_or_to'] == 'from' ? $message['member']['link'] : (empty($message['recipients']['to']) ? '' : implode(', ', $message['recipients']['to']))), '
@@ -957,13 +957,13 @@ 
 				// You can only reply if they are not a guest...
 				if (!$message['member']['is_guest'])
 					echo '
-					<a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote;u=', $context['folder'] == 'sent' ? '' : $message['member']['id'], '">', $quote_button , '</a>', $context['menu_separator'], '
-					<a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';u=', $message['member']['id'], '">', $reply_button , '</a> ', $context['menu_separator'];
+					<a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote;u=', $context['folder'] == 'sent' ? '' : $message['member']['id'], '">', $quote_button, '</a>', $context['menu_separator'], '
+					<a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';u=', $message['member']['id'], '">', $reply_button, '</a> ', $context['menu_separator'];
 
 				// This is for "forwarding" - even if the member is gone.
 				else
 					echo '
-					<a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote">', $quote_button , '</a>', $context['menu_separator'];
+					<a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote">', $quote_button, '</a>', $context['menu_separator'];
 			}
 
 			echo '
@@ -1063,7 +1063,7 @@ 
 				<div class="', empty($context['error_type']) || $context['error_type'] != 'serious' ? 'noticebox' : 'errorbox', '', empty($context['post_error']['messages']) ? ' hidden' : '', '" id="errors">
 					<dl>
 						<dt>
-							<strong id="error_serious">', $txt['error_while_submitting'] , '</strong>
+							<strong id="error_serious">', $txt['error_while_submitting'], '</strong>
 						</dt>
 						<dd class="error" id="error_list">
 							', empty($context['post_error']['messages']) ? '' : implode('<br>', $context['post_error']['messages']), '
@@ -1119,7 +1119,7 @@ 
 						<span', (isset($context['post_error']['no_subject']) ? ' class="error"' : ''), ' id="caption_subject">', $txt['subject'], ':</span>
 					</dt>
 					<dd id="pm_subject">
-						<input type="text" name="subject" value="', $context['subject'], '" tabindex="', $context['tabindex']++, '" size="80" maxlength="80"',isset($context['post_error']['no_subject']) ? ' class="error"' : '', '>
+						<input type="text" name="subject" value="', $context['subject'], '" tabindex="', $context['tabindex']++, '" size="80" maxlength="80"', isset($context['post_error']['no_subject']) ? ' class="error"' : '', '>
 					</dd>
 				</dl>';
 
@@ -1472,7 +1472,7 @@ 
 		echo '
 		<div class="block righttext">
 			<input type="submit" name="save" value="', $txt['save'], '" class="button">
-			<input type="submit" name="delete" value="', $txt['quickmod_delete_selected'], '" data-confirm="', $txt['pm_labels_delete'] ,'" class="button you_sure">
+			<input type="submit" name="delete" value="', $txt['quickmod_delete_selected'], '" data-confirm="', $txt['pm_labels_delete'], '" class="button you_sure">
 		</div>';
 
 	echo '
@@ -1636,7 +1636,7 @@ 
 	if (!empty($context['rules']))
 		echo '
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
-			<input type="submit" name="delselected" value="', $txt['pm_delete_selected_rule'], '" data-confirm="', $txt['pm_js_delete_rule_confirm'] ,'" class="button smalltext you_sure">';
+			<input type="submit" name="delselected" value="', $txt['pm_delete_selected_rule'], '" data-confirm="', $txt['pm_js_delete_rule_confirm'], '" class="button smalltext you_sure">';
 
 	echo '
 		</div>
@@ -1879,9 +1879,9 @@ 
 
 		echo '
 				<select name="acttype[', $k, ']" id="acttype', $k, '" onchange="updateActionDef(', $k, '); rebuildRuleDesc();">
-					<option value="">', $txt['pm_rule_sel_action'] , ':</option>
-					<option value="lab"', $action['t'] == 'lab' ? ' selected' : '', '>', $txt['pm_rule_label'] , '</option>
-					<option value="del"', $action['t'] == 'del' ? ' selected' : '', '>', $txt['pm_rule_delete'] , '</option>
+					<option value="">', $txt['pm_rule_sel_action'], ':</option>
+					<option value="lab"', $action['t'] == 'lab' ? ' selected' : '', '>', $txt['pm_rule_label'], '</option>
+					<option value="del"', $action['t'] == 'del' ? ' selected' : '', '>', $txt['pm_rule_delete'], '</option>
 				</select>
 				<span id="labdiv', $k, '">
 					<select name="labdef[', $k, ']" id="labdef', $k, '" onchange="rebuildRuleDesc();">
@@ -1993,7 +1993,7 @@ 
 			</div>
 			<ul class="quickbuttons">
 				<li><a href="', $scripturl, '?action=pm;sa=showpmdrafts;id_draft=', $draft['id_draft'], ';', $context['session_var'], '=', $context['session_id'], '"><span class="generic_icons modifybutton"></span>', $txt['draft_edit'], '</a></li>
-				<li><a href="', $scripturl, '?action=pm;sa=showpmdrafts;delete=', $draft['id_draft'], ';', $context['session_var'], '=', $context['session_id'], '" data-confirm="', $txt['draft_remove'] ,'?" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['draft_delete'], '</a></li>
+				<li><a href="', $scripturl, '?action=pm;sa=showpmdrafts;delete=', $draft['id_draft'], ';', $context['session_var'], '=', $context['session_id'], '" data-confirm="', $txt['draft_remove'], '?" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['draft_delete'], '</a></li>
 			</ul>
 		</div><!-- .windowbg -->';
 		}

Sources/ManageLanguages.php

Spacing +10 added lines, -10 removed lines

@@ -592,7 +592,7 @@ 
 			'editlang' => array(
 				'header' => array(
 					'value' => '',
-				),'data' => array(
+				), 'data' => array(
 					'function' => function($rowData) use ($scripturl, $txt)
 					{
 						return sprintf('<a href="%1$s?action=admin;area=languages;sa=editlang;lid=%2$s" class="button">%3$s</a>', $scripturl, $rowData['id'], $txt['edit']);
@@ -1269,7 +1269,7 @@ 
 					// Now create the string!
 					$final_saves[$entryKey] = array(
 						'find' => $entryValue['full'],
-						'replace' => '// ' . implode("\n// ", explode("\n", rtrim($entryValue['full'], "\n")))  . "\n" . '$' . $entryValue['type'] . '[\'' . $entryKey . '\'] = array(' . implode(', ', $items) . ');' . $entryValue['cruft'],
+						'replace' => '// ' . implode("\n// ", explode("\n", rtrim($entryValue['full'], "\n"))) . "\n" . '$' . $entryValue['type'] . '[\'' . $entryKey . '\'] = array(' . implode(', ', $items) . ');' . $entryValue['cruft'],
 					);
 				}
 			}
@@ -1291,7 +1291,7 @@ 
 					// And save it
 					$final_saves[$entryKey] = array(
 						'find' => $entryValue['full'],
-						'replace' => '// ' . implode("\n// ", explode("\n", rtrim($entryValue['full'], "\n")))  . "\n" . '$' . $entryValue['type'] . '[\'' . $entryValue['key'] . '\'][' . $subKey . '] = ' . $save_strings[$entryValue['key']][$entryValue['subkey']] . ';' . $entryValue['cruft'],
+						'replace' => '// ' . implode("\n// ", explode("\n", rtrim($entryValue['full'], "\n"))) . "\n" . '$' . $entryValue['type'] . '[\'' . $entryValue['key'] . '\'][' . $subKey . '] = ' . $save_strings[$entryValue['key']][$entryValue['subkey']] . ';' . $entryValue['cruft'],
 					);
 				}
 
@@ -1301,7 +1301,7 @@ 
 					$entryValue['entry'] = '\'\'';
 					$final_saves[$entryKey] = array(
 						'find' => $entryValue['full'],
-						'replace' => '// ' . implode("\n// ", explode("\n", rtrim($entryValue['full'], "\n")))  . "\n",
+						'replace' => '// ' . implode("\n// ", explode("\n", rtrim($entryValue['full'], "\n"))) . "\n",
 					);
 				}
 
@@ -1329,7 +1329,7 @@ 
 					// And we know what to save now!
 					$final_saves[$entryKey] = array(
 						'find' => $entryValue['full'],
-						'replace' => '// ' . implode("\n// ", explode("\n", rtrim($entryValue['full'], "\n")))  . "\n" . '$' . $entryValue['type'] . '[\'' . $entryValue['key'] . '\'] = ' . $save_strings[$entryValue['key']] . ';' . $entryValue['cruft'],
+						'replace' => '// ' . implode("\n// ", explode("\n", rtrim($entryValue['full'], "\n"))) . "\n" . '$' . $entryValue['type'] . '[\'' . $entryValue['key'] . '\'] = ' . $save_strings[$entryValue['key']] . ';' . $entryValue['cruft'],
 					);
 				}
 				// Remove this entry only if it is allowed
@@ -1338,7 +1338,7 @@ 
 					$entryValue['entry'] = '\'\'';
 					$final_saves[$entryKey] = array(
 						'find' => $entryValue['full'],
-						'replace' => '// ' . implode("\n// ", explode("\n", rtrim($entryValue['full'], "\n")))  . "\n",
+						'replace' => '// ' . implode("\n// ", explode("\n", rtrim($entryValue['full'], "\n"))) . "\n",
 					);
 				}
 
@@ -1369,8 +1369,8 @@ 
 						continue;
 
 					$final_saves[$string_key] = array(
-						'find' => "\s*\?".'>$',
-						'replace' => "\n\$" . $type . '[\'' . $string_key . '\'] = ' . $string_val['string'] . ';' . "\n\n?".'>',
+						'find' => "\s*\?" . '>$',
+						'replace' => "\n\$" . $type . '[\'' . $string_key . '\'] = ' . $string_val['string'] . ';' . "\n\n?" . '>',
 						'is_regex' => true,
 					);
 				}
@@ -1387,8 +1387,8 @@ 
 						$subKey = ctype_digit(trim($substring_key, '\'')) ? trim($substring_key, '\'') : '\'' . $substring_key . '\'';
 
 						$final_saves[$string_key . '[' . $substring_key . ']'] = array(
-							'find' => "\s*\?".'>$',
-							'replace' => "\n\$" . $type . '[\'' . $string_key . '\'][' . $subKey . '] = ' . $substring_val['string'] . ';' . "\n\n?".'>',
+							'find' => "\s*\?" . '>$',
+							'replace' => "\n\$" . $type . '[\'' . $string_key . '\'][' . $subKey . '] = ' . $substring_val['string'] . ';' . "\n\n?" . '>',
 							'is_regex' => true,
 						);
 					}

Sources/Subs-Editor.php

Spacing +2 added lines, -2 removed lines

@@ -1112,7 +1112,7 @@ 
 		$lastlen = strlen($text = preg_replace($backToBackPattern, '', $text));
 
 	// Need to sort the tags by name length.
-	uksort($valid_tags, function ($a, $b) {
+	uksort($valid_tags, function($a, $b) {
 		return strlen($a) < strlen($b) ? 1 : -1;
 	});
 
@@ -1980,7 +1980,7 @@ 
 		}
 
 		// Set proper extensions; do this post caching so cache doesn't become extension-specific
-		array_walk_recursive($context['smileys'], function (&$filename, $key)
+		array_walk_recursive($context['smileys'], function(&$filename, $key)
 			{
 				global $context, $user_info, $modSettings;
 				if ($key == 'filename')

Braces +3 added lines, -5 removed lines

@@ -332,7 +332,6 @@ 
 					$replacement .= $precedingStyle . $extra_attr . $afterStyle;
 			}
 		}
-
 		elseif (preg_match('~</([A-Za-z]+)>~', $part, $matches) === 1)
 		{
 			// Is this the element that we've been waiting for to be closed?
@@ -592,7 +591,6 @@ 
 							$parts[$i + 2] = str_repeat("\t", $listDepth) . '[/list]';
 							$parts[$i + 3] = '';
 						}
-
 						else
 						{
 							// We're in a list item.
@@ -631,7 +629,6 @@ 
 							$parts[$i + 2] = '';
 							$parts[$i + 3] = '';
 						}
-
 						else
 						{
 							// Remove the trailing breaks from the list item.
@@ -1112,7 +1109,8 @@ 
 		$lastlen = strlen($text = preg_replace($backToBackPattern, '', $text));
 
 	// Need to sort the tags by name length.
-	uksort($valid_tags, function ($a, $b) {
+	uksort($valid_tags, function ($a, $b)
+	{
 		return strlen($a) < strlen($b) ? 1 : -1;
 	});
 
@@ -1980,7 +1978,7 @@ 
 
 		// Set proper extensions; do this post caching so cache doesn't become extension-specific
 		array_walk_recursive($context['smileys'], function (&$filename, $key)
-			{
+		{
 				global $context, $user_info, $modSettings;
 				if ($key == 'filename')
 					// Need to use the default if user selection is disabled

Sources/ManageMembers.php

Spacing +4 added lines, -4 removed lines

@@ -355,7 +355,7 @@ 
 			// INET.
 			elseif ($param_info['type'] == 'inet')
 			{
-				if(count($search_params[$param_name]) === 1)
+				if (count($search_params[$param_name]) === 1)
 				{
 					$query_parts[] = '(' . $param_info['db_fields'][0] . ' = {inet:' . $param_name . '})';
 					$where_params[$param_name] = $search_params[$param_name][0];
@@ -363,8 +363,8 @@ 
 				elseif (count($search_params[$param_name]) === 2)
 				{
 					$query_parts[] = '(' . $param_info['db_fields'][0] . ' <= {inet:' . $param_name . '_high} and ' . $param_info['db_fields'][0] . ' >= {inet:' . $param_name . '_low})';
-					$where_params[$param_name.'_low'] = $search_params[$param_name]['low'];
-					$where_params[$param_name.'_high'] = $search_params[$param_name]['high'];
+					$where_params[$param_name . '_low'] = $search_params[$param_name]['low'];
+					$where_params[$param_name . '_high'] = $search_params[$param_name]['high'];
 				}
 				
 			}
@@ -1012,7 +1012,7 @@ 
 	if (!empty($context['show_filter']) && !empty($context['available_filters']))
 		$listOptions['additional_rows'][] = array(
 			'position' => 'above_column_headers',
-			'value' => '<strong>' . $txt['admin_browse_filter_show'] . ':</strong> ' . ((isset($context['current_filter']) && isset($txt['admin_browse_filter_type_'.$context['current_filter']])) ? $txt['admin_browse_filter_type_'.$context['current_filter']] : $context['available_filters'][0]['desc']),
+			'value' => '<strong>' . $txt['admin_browse_filter_show'] . ':</strong> ' . ((isset($context['current_filter']) && isset($txt['admin_browse_filter_type_' . $context['current_filter']])) ? $txt['admin_browse_filter_type_' . $context['current_filter']] : $context['available_filters'][0]['desc']),
 			'class' => 'filter_row generic_list_wrapper smalltext',
 		);
 

Sources/Subs-BoardIndex.php

Spacing +6 added lines, -6 removed lines

@@ -135,7 +135,7 @@ 
 	$smcFunc['db_free_result']($result_boards);
 
 	// Run through the categories and boards (or only boards)....
-	for (reset($row_boards); key($row_boards)!==null; next($row_boards))
+	for (reset($row_boards); key($row_boards) !== null; next($row_boards))
 	{
 		$row_board = current($row_boards);
 
@@ -303,7 +303,7 @@ 
 					$row_boards[$row_board['id_parent']]['id_msg'] = $row_board['id_msg'];
 					$row_boards[$row_board['id_parent']]['subject'] = $row_board['subject'];
 					$row_boards[$row_board['id_parent']]['poster_time'] = $row_board['poster_time'];
-					$row_boards[$row_board['id_parent']]['short_subject'] = (!empty($row_board['short_subject']) ? $row_board['short_subject'] : '') ;
+					$row_boards[$row_board['id_parent']]['short_subject'] = (!empty($row_board['short_subject']) ? $row_board['short_subject'] : '');
 					$row_boards[$row_board['id_parent']]['poster_name'] = $row_board['poster_name'];
 					$row_boards[$row_board['id_parent']]['real_name'] = $row_board['real_name'];
 					$row_boards[$row_board['id_parent']]['id_member'] = $row_board['id_member'];
@@ -368,7 +368,7 @@ 
 
 		// Set the last post in the root board 
 		if (!$isChild && !empty($row_board['poster_time'])
-			&& ( empty($this_category[$row_board['id_board']]['last_post']['timestamp'])
+			&& (empty($this_category[$row_board['id_board']]['last_post']['timestamp'])
 				|| $this_category[$row_board['id_board']]['last_post']['timestamp'] < forum_time(true, $row_board['poster_time'])
 				)
 			)
@@ -398,7 +398,7 @@ 
 	if ($boardIndexOptions['include_categories'])
 		foreach ($categories as &$category)
 		{
-			foreach ($category['boards'] as &$board )
+			foreach ($category['boards'] as &$board)
 			{
 				if (!empty($moderators[$board['id']]))
 				{
@@ -420,7 +420,7 @@ 
 			}
 		}
 	else
-		foreach ($this_category as &$board )
+		foreach ($this_category as &$board)
 		{
 			if (!empty($moderators[$board['id']]))
 			{
@@ -441,7 +441,7 @@ 
 				$board['last_post']['last_post_message'] = sprintf($txt['last_post_message'], $board['last_post']['member']['link'], $board['last_post']['link'], $board['last_post']['time'] > 0 ? timeformat($board['last_post']['time']) : $txt['not_applicable']);
 		}
 
-	unset($category,$board);
+	unset($category, $board);
 
 	if ($boardIndexOptions['include_categories'])
 		sortCategories($categories);

Braces +1 added lines, -1 removed lines

@@ -419,7 +419,7 @@
 					$board['last_post']['last_post_message'] = sprintf($txt['last_post_message'], $board['last_post']['member']['link'], $board['last_post']['link'], $board['last_post']['time'] > 0 ? timeformat($board['last_post']['time']) : $txt['not_applicable']);
 			}
 		}
-	else
+		else
 		foreach ($this_category as &$board )
 		{
 			if (!empty($moderators[$board['id']]))

ssi_examples.php

Braces +3 added lines, -1 removed lines

@@ -89,7 +89,9 @@
 						<li><a href="#" onclick="showSSIBlock('ssi_quickSearch'); return false;">Quick Search Box</a></li>
 						<li><a href="#" onclick="showSSIBlock('ssi_recentAttachments'); return false;">Recent Attachments</a></li>
 					</ul>
-					<?php if ($user_info['is_admin']) { ?>
+					<?php if ($user_info['is_admin'])
+{
+?>
 					<h3>Advanced Functions <img class="help" title="Functions that require additional tweaking, not just copy and paste." src="<?php echo $settings['images_url']; ?>/helptopics.png" alt=""></h3>
 					<ul>
 						<li><a href="#" onclick="showSSIBlock('ssi_showPoll'); return false;">Show Single Poll</a></li>

Sources/Subs-Admin.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 	{
 		if (class_exists('Imagick'))
 		{
-			$temp = New Imagick;
+			$temp = new Imagick;
 			$temp2 = $temp->getVersion();
 			$im_version = $temp2['versionString'];
 			$extension_version = 'Imagick ' . phpversion('Imagick');

Sources/Subs-Password.php

Braces +93 added lines, -45 removed lines

@@ -18,7 +18,8 @@ 
 
 namespace {
 
-	if (!defined('PASSWORD_DEFAULT')) {
+	if (!defined('PASSWORD_DEFAULT'))
+	{
 
 		define('PASSWORD_BCRYPT', 1);
 		define('PASSWORD_DEFAULT', PASSWORD_BCRYPT);
@@ -34,29 +35,37 @@ 
 		 *
 		 * @return string|false The hashed password, or false on error.
 		 */
-		function password_hash($password, $algo, array $options = array()) {
-			if (!function_exists('crypt')) {
+		function password_hash($password, $algo, array $options = array())
+		{
+			if (!function_exists('crypt'))
+			{
 				trigger_error("Crypt must be loaded for password_hash to function", E_USER_WARNING);
 				return null;
 			}
-			if (!is_string($password)) {
+			if (!is_string($password))
+			{
 				trigger_error("password_hash(): Password must be a string", E_USER_WARNING);
 				return null;
 			}
-			if (!is_int($algo)) {
+			if (!is_int($algo))
+			{
 				trigger_error("password_hash() expects parameter 2 to be long, " . gettype($algo) . " given", E_USER_WARNING);
 				return null;
 			}
-			if (PasswordCompat\binary\_strlen($password) > 72) {
+			if (PasswordCompat\binary\_strlen($password) > 72)
+			{
 				$password = PasswordCompat\binary\_substr($password, 0, 72);
 			}
-			switch ($algo) {
+			switch ($algo)
+			{
 				case PASSWORD_BCRYPT:
 					// Note that this is a C constant, but not exposed to PHP, so we don't define it here.
 					$cost = 10;
-					if (isset($options['cost'])) {
+					if (isset($options['cost']))
+					{
 						$cost = $options['cost'];
-						if ($cost < 4 || $cost > 31) {
+						if ($cost < 4 || $cost > 31)
+						{
 							trigger_error(sprintf("password_hash(): Invalid bcrypt cost parameter specified: %d", $cost), E_USER_WARNING);
 							return null;
 						}
@@ -74,8 +83,10 @@ 
 					return null;
 			}
 			$salt_requires_encoding = false;
-			if (isset($options['salt'])) {
-				switch (gettype($options['salt'])) {
+			if (isset($options['salt']))
+			{
+				switch (gettype($options['salt']))
+				{
 					case 'NULL':
 					case 'boolean':
 					case 'integer':
@@ -84,7 +95,8 @@ 
 						$salt = (string) $options['salt'];
 						break;
 					case 'object':
-						if (method_exists($options['salt'], '__tostring')) {
+						if (method_exists($options['salt'], '__tostring'))
+						{
 							$salt = (string) $options['salt'];
 							break;
 						}
@@ -94,51 +106,70 @@ 
 						trigger_error('password_hash(): Non-string salt parameter supplied', E_USER_WARNING);
 						return null;
 				}
-				if (PasswordCompat\binary\_strlen($salt) < $required_salt_len) {
+				if (PasswordCompat\binary\_strlen($salt) < $required_salt_len)
+				{
 					trigger_error(sprintf("password_hash(): Provided salt is too short: %d expecting %d", PasswordCompat\binary\_strlen($salt), $required_salt_len), E_USER_WARNING);
 					return null;
-				} elseif (0 == preg_match('#^[a-zA-Z0-9./]+$#D', $salt)) {
+				}
+				elseif (0 == preg_match('#^[a-zA-Z0-9./]+$#D', $salt))
+				{
 					$salt_requires_encoding = true;
 				}
-			} else {
+			}
+			else
+			{
 				$buffer = '';
 				$buffer_valid = false;
-				if (function_exists('random_bytes')) {
+				if (function_exists('random_bytes'))
+				{
 					$buffer = random_bytes($raw_salt_len);
-					if ($buffer) {
+					if ($buffer)
+					{
 						$buffer_valid = true;
 					}
 				}
-				if (!$buffer_valid && function_exists('mcrypt_create_iv') && !defined('PHALANGER')) {
+				if (!$buffer_valid && function_exists('mcrypt_create_iv') && !defined('PHALANGER'))
+				{
 					$buffer = mcrypt_create_iv($raw_salt_len, MCRYPT_DEV_URANDOM);
-					if ($buffer) {
+					if ($buffer)
+					{
 						$buffer_valid = true;
 					}
 				}
-				if (!$buffer_valid && function_exists('openssl_random_pseudo_bytes')) {
+				if (!$buffer_valid && function_exists('openssl_random_pseudo_bytes'))
+				{
 					$buffer = openssl_random_pseudo_bytes($raw_salt_len);
-					if ($buffer) {
+					if ($buffer)
+					{
 						$buffer_valid = true;
 					}
 				}
-				if (!$buffer_valid && @is_readable('/dev/urandom')) {
+				if (!$buffer_valid && @is_readable('/dev/urandom'))
+				{
 					$f = fopen('/dev/urandom', 'r');
 					$read = PasswordCompat\binary\_strlen($buffer);
-					while ($read < $raw_salt_len) {
+					while ($read < $raw_salt_len)
+					{
 						$buffer .= fread($f, $raw_salt_len - $read);
 						$read = PasswordCompat\binary\_strlen($buffer);
 					}
 					fclose($f);
-					if ($read >= $raw_salt_len) {
+					if ($read >= $raw_salt_len)
+					{
 						$buffer_valid = true;
 					}
 				}
-				if (!$buffer_valid || PasswordCompat\binary\_strlen($buffer) < $raw_salt_len) {
+				if (!$buffer_valid || PasswordCompat\binary\_strlen($buffer) < $raw_salt_len)
+				{
 					$bl = PasswordCompat\binary\_strlen($buffer);
-					for ($i = 0; $i < $raw_salt_len; $i++) {
-						if ($i < $bl) {
+					for ($i = 0; $i < $raw_salt_len; $i++)
+					{
+						if ($i < $bl)
+						{
 							$buffer[$i] = $buffer[$i] ^ chr(mt_rand(0, 255));
-						} else {
+						}
+						else
+						{
 							$buffer .= chr(mt_rand(0, 255));
 						}
 					}
@@ -146,7 +177,8 @@ 
 				$salt = $buffer;
 				$salt_requires_encoding = true;
 			}
-			if ($salt_requires_encoding) {
+			if ($salt_requires_encoding)
+			{
 				// encode string with the Base64 variant used by crypt
 				$base64_digits =
 					'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
@@ -162,7 +194,8 @@ 
 
 			$ret = crypt($password, $hash);
 
-			if (!is_string($ret) || PasswordCompat\binary\_strlen($ret) != $resultLength) {
+			if (!is_string($ret) || PasswordCompat\binary\_strlen($ret) != $resultLength)
+			{
 				return false;
 			}
 
@@ -185,13 +218,15 @@ 
 		 *
 		 * @return array The array of information about the hash.
 		 */
-		function password_get_info($hash) {
+		function password_get_info($hash)
+		{
 			$return = array(
 				'algo' => 0,
 				'algoName' => 'unknown',
 				'options' => array(),
 			);
-			if (PasswordCompat\binary\_substr($hash, 0, 4) == '$2y$' && PasswordCompat\binary\_strlen($hash) == 60) {
+			if (PasswordCompat\binary\_substr($hash, 0, 4) == '$2y$' && PasswordCompat\binary\_strlen($hash) == 60)
+			{
 				$return['algo'] = PASSWORD_BCRYPT;
 				$return['algoName'] = 'bcrypt';
 				list($cost) = sscanf($hash, "$2y$%d$");
@@ -211,15 +246,19 @@ 
 		 *
 		 * @return boolean True if the password needs to be rehashed.
 		 */
-		function password_needs_rehash($hash, $algo, array $options = array()) {
+		function password_needs_rehash($hash, $algo, array $options = array())
+		{
 			$info = password_get_info($hash);
-			if ($info['algo'] != $algo) {
+			if ($info['algo'] != $algo)
+			{
 				return true;
 			}
-			switch ($algo) {
+			switch ($algo)
+			{
 				case PASSWORD_BCRYPT:
 					$cost = isset($options['cost']) ? $options['cost'] : 10;
-					if ($cost != $info['options']['cost']) {
+					if ($cost != $info['options']['cost'])
+					{
 						return true;
 					}
 					break;
@@ -235,21 +274,26 @@ 
 		 *
 		 * @return boolean If the password matches the hash
 		 */
-		function password_verify($password, $hash) {
-			if (!function_exists('crypt')) {
+		function password_verify($password, $hash)
+		{
+			if (!function_exists('crypt'))
+			{
 				trigger_error("Crypt must be loaded for password_verify to function", E_USER_WARNING);
 				return false;
 			}
-			if (PasswordCompat\binary\_strlen($password) > 72) {
+			if (PasswordCompat\binary\_strlen($password) > 72)
+			{
 				$password = PasswordCompat\binary\_substr($password, 0, 72);
 			}
 			$ret = crypt($password, $hash);
-			if (!is_string($ret) || PasswordCompat\binary\_strlen($ret) != PasswordCompat\binary\_strlen($hash) || PasswordCompat\binary\_strlen($ret) <= 13) {
+			if (!is_string($ret) || PasswordCompat\binary\_strlen($ret) != PasswordCompat\binary\_strlen($hash) || PasswordCompat\binary\_strlen($ret) <= 13)
+			{
 				return false;
 			}
 
 			$status = 0;
-			for ($i = 0; $i < PasswordCompat\binary\_strlen($ret); $i++) {
+			for ($i = 0; $i < PasswordCompat\binary\_strlen($ret); $i++)
+			{
 				$status |= (ord($ret[$i]) ^ ord($hash[$i]));
 			}
 
@@ -271,8 +315,10 @@ 
 	 * @internal
 	 * @return int The number of bytes
 	 */
-	function _strlen($binary_string) {
-		if (function_exists('mb_strlen')) {
+	function _strlen($binary_string)
+	{
+		if (function_exists('mb_strlen'))
+		{
 			return mb_strlen($binary_string, '8bit');
 		}
 		return strlen($binary_string);
@@ -290,8 +336,10 @@ 
 	 * @internal
 	 * @return string The substring
 	 */
-	function _substr($binary_string, $start, $length) {
-		if (function_exists('mb_substr')) {
+	function _substr($binary_string, $start, $length)
+	{
+		if (function_exists('mb_substr'))
+		{
 			return mb_substr($binary_string, $start, $length, '8bit');
 		}
 		return substr($binary_string, $start, $length);