albertlast / SMF2.1

Themes/default/Reports.template.php

Braces +32 added lines, -24 removed lines

@@ -29,9 +29,10 @@ 
 	// Go through each type of report they can run.
 	foreach ($context['report_types'] as $type)
 	{
-		if (isset($type['description']))
-			echo '
+		if (isset($type['description'])) {
+					echo '
 					<dt>', $type['description'], '</dt>';
+		}
 
 		echo '
 					<dd>
@@ -62,8 +63,9 @@ 
 		</div>
 		<div id="report_buttons">';
 
-	if (!empty($context['report_buttons']))
-		template_button_strip($context['report_buttons'], 'right');
+	if (!empty($context['report_buttons'])) {
+			template_button_strip($context['report_buttons'], 'right');
+	}
 
 	echo '
 		</div>';
@@ -74,25 +76,27 @@ 
 		echo '
 		<table class="table_grid report_results">';
 
-		if (!empty($table['title']))
-			echo '
+		if (!empty($table['title'])) {
+					echo '
 			<thead>
 				<tr class="title_bar">
 					<th scope="col" colspan="', $table['column_count'], '">', $table['title'], '</th>
 				</tr>
 			</thead>
 			<tbody>';
+		}
 
 		// Now do each row!
 		$row_number = 0;
 		foreach ($table['data'] as $row)
 		{
-			if ($row_number == 0 && !empty($table['shading']['top']))
-				echo '
+			if ($row_number == 0 && !empty($table['shading']['top'])) {
+							echo '
 				<tr class="windowbg table_caption">';
-			else
-				echo '
+			} else {
+							echo '
 				<tr class="', !empty($row[0]['separator']) ? 'title_bar' : 'windowbg', '">';
+			}
 
 			// Now do each column.
 			$column_number = 0;
@@ -110,16 +114,17 @@ 
 				}
 
 				// Shaded?
-				if ($column_number == 0 && !empty($table['shading']['left']))
-					echo '
+				if ($column_number == 0 && !empty($table['shading']['left'])) {
+									echo '
 					<td class="table_caption ', $table['align']['shaded'], 'text"', $table['width']['shaded'] != 'auto' ? ' width="' . $table['width']['shaded'] . '"' : '', '>
 						', $data['v'] == $table['default_value'] ? '' : ($data['v'] . (empty($data['v']) ? '' : ':')), '
 					</td>';
-				else
-					echo '
+				} else {
+									echo '
 					<td class="smalltext centertext" ', $table['width']['normal'] != 'auto' ? ' width="' . $table['width']['normal'] . '"' : '', !empty($data['style']) ? ' style="' . $data['style'] . '"' : '', '>
 						', $data['v'], '
 					</td>';
+				}
 
 				$column_number++;
 			}
@@ -168,24 +173,26 @@ 
 		<div style="overflow: visible;', $table['max_width'] != 'auto' ? ' width: ' . $table['max_width'] . 'px;' : '', '">
 			<table class="bordercolor">';
 
-		if (!empty($table['title']))
-			echo '
+		if (!empty($table['title'])) {
+					echo '
 				<tr class="title_bar">
 					<td colspan="', $table['column_count'], '">
 						', $table['title'], '
 					</td>
 				</tr>';
+		}
 
 		// Now do each row!
 		$row_number = 0;
 		foreach ($table['data'] as $row)
 		{
-			if ($row_number == 0 && !empty($table['shading']['top']))
-				echo '
+			if ($row_number == 0 && !empty($table['shading']['top'])) {
+							echo '
 				<tr class="titlebg">';
-			else
-				echo '
+			} else {
+							echo '
 				<tr class="windowbg">';
+			}
 
 			// Now do each column!!
 			$column_number = 0;
@@ -202,16 +209,17 @@ 
 				}
 
 				// Shaded?
-				if ($column_number == 0 && !empty($table['shading']['left']))
-					echo '
+				if ($column_number == 0 && !empty($table['shading']['left'])) {
+									echo '
 					<td class="titlebg ', $table['align']['shaded'], 'text"', $table['width']['shaded'] != 'auto' ? ' width="' . $table['width']['shaded'] . '"' : '', '>
 						', $data['v'] == $table['default_value'] ? '' : ($data['v'] . (empty($data['v']) ? '' : ':')), '
 					</td>';
-				else
-					echo '
+				} else {
+									echo '
 					<td class="centertext" ', $table['width']['normal'] != 'auto' ? ' width="' . $table['width']['normal'] . '"' : '', !empty($data['style']) ? ' style="' . $data['style'] . '"' : '', '>
 						', $data['v'], '
 					</td>';
+				}
 
 				$column_number++;
 			}

Themes/default/ModerationCenter.template.php

Braces +59 added lines, -41 removed lines

@@ -55,18 +55,20 @@ 
 			<div class="modbox">
 				<ul>';
 
-	foreach ($context['group_requests'] as $request)
-		echo '
+	foreach ($context['group_requests'] as $request) {
+			echo '
 					<li class="smalltext">
 						<a href="', $request['request_href'], '">', $request['group']['name'], '</a> ', $txt['mc_groupr_by'], ' ', $request['member']['link'], '
 					</li>';
+	}
 
 	// Don't have any watched users right now?
-	if (empty($context['group_requests']))
-		echo '
+	if (empty($context['group_requests'])) {
+			echo '
 					<li>
 						<strong class="smalltext">', $txt['mc_group_requests_none'], '</strong>
 					</li>';
+	}
 
 	echo '
 				</ul>
@@ -124,18 +126,20 @@ 
 			<div class="modbox">
 				<ul>';
 
-	foreach ($context['watched_users'] as $user)
-		echo '
+	foreach ($context['watched_users'] as $user) {
+			echo '
 					<li>
 						<span class="smalltext">', sprintf(!empty($user['last_login']) ? $txt['mc_seen'] : $txt['mc_seen_never'], $user['link'], $user['last_login']), '</span>
 					</li>';
+	}
 
 	// Don't have any watched users right now?
-	if (empty($context['watched_users']))
-		echo '
+	if (empty($context['watched_users'])) {
+			echo '
 					<li>
 						<strong class="smalltext">', $txt['mc_watched_users_none'], '</strong>
 					</li>';
+	}
 
 	echo '
 				</ul>
@@ -193,18 +197,20 @@ 
 			<div class="modbox">
 				<ul>';
 
-	foreach ($context['reported_posts'] as $post)
-		echo '
+	foreach ($context['reported_posts'] as $post) {
+			echo '
 					<li>
 						<span class="smalltext">', sprintf($txt['mc_post_report'], $post['report_link'], $post['author']['link']), '</span>
 					</li>';
+	}
 
 	// Don't have any watched users right now?
-	if (empty($context['reported_posts']))
-		echo '
+	if (empty($context['reported_posts'])) {
+			echo '
 					<li>
 						<strong class="smalltext">', $txt['mc_recent_reports_none'], '</strong>
 					</li>';
+	}
 
 	echo '
 				</ul>
@@ -262,18 +268,20 @@ 
 			<div class="modbox">
 				<ul>';
 
-	foreach ($context['reported_users'] as $user)
-		echo '
+	foreach ($context['reported_users'] as $user) {
+			echo '
 					<li>
 						<span class="smalltext">', $user['user']['link'], '</span>
 					</li>';
+	}
 
 	// Don't have any watched users right now?
-	if (empty($context['reported_users']))
-		echo '
+	if (empty($context['reported_users'])) {
+			echo '
 					<li>
 						<strong class="smalltext">', $txt['mc_reported_users_none'], '</strong>
 					</li>';
+	}
 
 	echo '
 				</ul>
@@ -321,11 +329,12 @@ 
 	global $context, $txt, $scripturl;
 
 	// Let them know the action was a success.
-	if (!empty($context['report_post_action']))
-		echo '
+	if (!empty($context['report_post_action'])) {
+			echo '
 		<div class="infobox">
 			', $txt['report_action_' . $context['report_post_action']], '
 		</div>';
+	}
 
 	echo '
 		<div class="modnotes">
@@ -342,11 +351,12 @@ 
 						<ul class="moderation_notes">';
 
 		// Cycle through the notes.
-		foreach ($context['notes'] as $note)
-			echo '
+		foreach ($context['notes'] as $note) {
+					echo '
 							<li class="smalltext">
 								', ($note['can_delete'] ? '<a href="' . $note['delete_href'] . ';' . $context['mod-modnote-del_token_var'] . '=' . $context['mod-modnote-del_token'] . '" data-confirm="' . $txt['mc_reportedp_delete_confirm'] . '" class="you_sure"><span class="generic_icons delete"></span></a>' : ''), $note['time'], ' <strong>', $note['author']['link'], ':</strong> ', $note['text'], '
 							</li>';
+		}
 
 		echo '
 						</ul>
@@ -388,18 +398,19 @@ 
 	$remove_button = create_button('delete', 'remove_message', 'remove');
 
 	// No posts?
-	if (empty($context['unapproved_items']))
-		echo '
+	if (empty($context['unapproved_items'])) {
+			echo '
 			<div class="windowbg2">
 				<p class="centertext">
 					', $txt['mc_unapproved_' . $context['current_view'] . '_none_found'], '
 				</p>
 			</div>';
-	else
-		echo '
+	} else {
+			echo '
 			<div class="pagesection floatleft">
 				', $context['page_index'], '
 			</div>';
+	}
 
 	foreach ($context['unapproved_items'] as $item)
 	{
@@ -418,14 +429,16 @@ 
 				<span class="floatright">
 					<a href="', $scripturl, '?action=moderate;area=postmod;sa=', $context['current_view'], ';start=', $context['start'], ';', $context['session_var'], '=', $context['session_id'], ';approve=', $item['id'], '">', $approve_button, '</a>';
 
-		if ($item['can_delete'])
-			echo '
+		if ($item['can_delete']) {
+					echo '
 					', $context['menu_separator'], '
 					<a href="', $scripturl, '?action=moderate;area=postmod;sa=', $context['current_view'], ';start=', $context['start'], ';', $context['session_var'], '=', $context['session_id'], ';delete=', $item['id'], '">', $remove_button, '</a>';
+		}
 
-		if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1)
-			echo '
+		if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1) {
+					echo '
 					<input type="checkbox" name="item[]" value="', $item['id'], '" checked> ';
+		}
 
 		echo '
 				</span>
@@ -435,8 +448,8 @@ 
 	echo '
 			<div class="pagesection">';
 
-	if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1)
-		echo '
+	if (!empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1) {
+			echo '
 				<div class="floatright">
 					<select name="do" onchange="if (this.value != 0 &amp;&amp; confirm(\'', $txt['mc_unapproved_sure'], '\')) submit();">
 						<option value="0">', $txt['with_selected'], ':</option>
@@ -448,12 +461,14 @@ 
 						<input type="submit" name="mc_go" value="', $txt['go'], '" class="button">
 					</noscript>
 				</div>';
+	}
 
-	if (!empty($context['unapproved_items']))
-		echo '
+	if (!empty($context['unapproved_items'])) {
+			echo '
 				<div class="floatleft">
 					<div class="pagelinks">', $context['page_index'], '</div>
 				</div>';
+	}
 
 	echo '
 			</div><!-- .pagesection -->
@@ -473,8 +488,9 @@ 
 	global $scripturl, $context, $txt, $delete_button;
 
 	// We'll have a delete please bob.
-	if (empty($delete_button))
-		$delete_button = create_button('delete', 'remove_message', 'remove', 'class="centericon"');
+	if (empty($delete_button)) {
+			$delete_button = create_button('delete', 'remove_message', 'remove', 'class="centericon"');
+	}
 
 	$output_html = '
 					<div>
@@ -483,10 +499,11 @@ 
 						</div>
 						<div class="floatright">';
 
-	if ($post['can_delete'])
-		$output_html .= '
+	if ($post['can_delete']) {
+			$output_html .= '
 							<a href="' . $scripturl . '?action=moderate;area=userwatch;sa=post;delete=' . $post['id'] . ';start=' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id'] . '" data-confirm="' . $txt['mc_watched_users_delete_post'] . '" class="you_sure">' . $delete_button . '</a>
 							<input type="checkbox" name="delete[]" value="' . $post['id'] . '">';
+	}
 
 	$output_html .= '
 						</div>
@@ -529,12 +546,12 @@ 
 				<input type="submit" name="save" value="', $txt['save'], '" class="button">
 			</div>
 		</form>';
-	}
-	else
-		echo '
+	} else {
+			echo '
 		<div class="windowbg">
 			<div class="centertext">', $txt['mc_no_settings'], '</div>
 		</div>';
+	}
 
 	echo '
 	</div><!-- #modcenter -->';
@@ -630,13 +647,14 @@ 
 					</dd>
 				</dl>';
 
-	if ($context['template_data']['can_edit_personal'])
-		echo '
+	if ($context['template_data']['can_edit_personal']) {
+			echo '
 				<input type="checkbox" name="make_personal" id="make_personal"', $context['template_data']['personal'] ? ' checked' : '', '>
 					<label for="make_personal">
 						<strong>', $txt['mc_warning_template_personal'], '</strong>
 					</label><br>
 					<span class="smalltext">', $txt['mc_warning_template_personal_desc'], '</span><br>';
+	}
 
 	echo '
 				<hr>

Themes/default/Post.template.php

Spacing +13 added lines, -13 removed lines

@@ -417,8 +417,8 @@ 
 									</div><!-- .attached_BBC -->
 									<div class="progressBar" role="progressBar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"><span></span></div>
 									<div class="attach-ui">
-										<a data-dz-remove class="button cancel">', $txt['modify_cancel'] ,'</a>
-										<a class="button upload">', $txt['upload'] ,'</a>
+										<a data-dz-remove class="button cancel">', $txt['modify_cancel'], '</a>
+										<a class="button upload">', $txt['upload'], '</a>
 									</div>
 								</div><!-- .attach-info -->
 							</div><!-- #au-template -->
@@ -433,10 +433,10 @@ 
 							</dt>
 							<dd class="smalltext fallback">
 								<div id="attachUpload" class="descbox">
-									<h5>', $txt['attach_drop_zone'] ,'</h5>
-									<a class="button" id="attach-cancelAll">', $txt['attached_cancelAll'] ,'</a>
-									<a class="button" id="attach-uploadAll">', $txt['attached_uploadAll'] ,'</a>
-									<a class="button fileinput-button">', $txt['attach_add'] ,'</a>
+									<h5>', $txt['attach_drop_zone'], '</h5>
+									<a class="button" id="attach-cancelAll">', $txt['attached_cancelAll'], '</a>
+									<a class="button" id="attach-uploadAll">', $txt['attached_uploadAll'], '</a>
+									<a class="button fileinput-button">', $txt['attach_add'], '</a>
 									<div id="total-progress" class="progressBar" role="progressBar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"><span></span></div>
 									<div class="fallback">
 										<input type="file" multiple="multiple" name="attachment[]" id="attachment1" class="fallback"> (<a href="javascript:void(0);" onclick="cleanFileInput(\'attachment1\');">', $txt['clean_attach'], '</a>)
@@ -541,7 +541,7 @@ 
 	// Option to delete an event if user is editing one.
 	if ($context['make_event'] && !$context['event']['new'])
 		echo '
-						<input type="submit" name="deleteevent" value="', $txt['event_delete'], '" data-confirm="', $txt['event_delete_confirm'] ,'" class="button you_sure">';
+						<input type="submit" name="deleteevent" value="', $txt['event_delete'], '" data-confirm="', $txt['event_delete_confirm'], '" class="button you_sure">';
 
 	echo '
 					</span>
@@ -795,7 +795,7 @@ 
 			});';
 
 	echo '
-			var oEditorID = "', $context['post_box_name'] ,'";
+			var oEditorID = "', $context['post_box_name'], '";
 			var oEditorObject = oEditorHandle_', $context['post_box_name'], ';
 		</script>';
 
@@ -827,7 +827,7 @@ 
 			if ($context['can_quote'])
 				echo '
 					<ul class="quickbuttons" id="msg_', $post['id'], '_quote">
-						<li style="display:none;" id="quoteSelected_', $post['id'], '" data-msgid="', $post['id'], '"><a href="javascript:void(0)"><span class="generic_icons quote_selected"></span>', $txt['quote_selected_action'] ,'</a></li>
+						<li style="display:none;" id="quoteSelected_', $post['id'], '" data-msgid="', $post['id'], '"><a href="javascript:void(0)"><span class="generic_icons quote_selected"></span>', $txt['quote_selected_action'], '</a></li>
 						<li id="post_modify"><a href="#postmodify" onclick="return insertQuoteFast(', $post['id'], ');"><span class="generic_icons quote"></span>', $txt['quote'], '</a></li>
 					</ul>';
 
@@ -911,7 +911,7 @@ 
 	<head>
 		<meta charset="', $context['character_set'], '">
 		<title>', $txt['spell_check'], '</title>
-		<link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'] ,'">
+		<link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'], '">
 		<style>
 			body, td {
 				font-size: small;
@@ -941,8 +941,8 @@ 
 			var spell_formname = window.opener.spell_formname;
 			var spell_fieldname = window.opener.spell_fieldname;
 		</script>
-		<script src="', $settings['default_theme_url'], '/scripts/spellcheck.js', $modSettings['browser_cache'] ,'"></script>
-		<script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'] ,'"></script>
+		<script src="', $settings['default_theme_url'], '/scripts/spellcheck.js', $modSettings['browser_cache'], '"></script>
+		<script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'], '"></script>
 		<script>
 			', $context['spell_js'], '
 		</script>
@@ -986,7 +986,7 @@ 
 	<head>
 		<meta charset="', $context['character_set'], '">
 		<title>', $txt['retrieving_quote'], '</title>
-		<script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'] ,'"></script>
+		<script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'], '"></script>
 	</head>
 	<body>
 		', $txt['retrieving_quote'], '

Braces +105 added lines, -71 removed lines

@@ -22,24 +22,26 @@ 
 		<script>';
 
 	// When using Go Back due to fatal_error, allow the form to be re-submitted with changes.
-	if (isBrowser('is_firefox'))
-		echo '
+	if (isBrowser('is_firefox')) {
+			echo '
 			window.addEventListener("pageshow", reActivate, false);';
+	}
 
 	// Start with message icons - and any missing from this theme.
 	echo '
 			var icon_urls = {';
 
-	foreach ($context['icons'] as $icon)
-		echo '
+	foreach ($context['icons'] as $icon) {
+			echo '
 				\'', $icon['value'], '\': \'', $icon['url'], '\'', $icon['is_last'] ? '' : ',';
+	}
 
 	echo '
 			};';
 
 	// If this is a poll - use some javascript to ensure the user doesn't create a poll with illegal option combinations.
-	if ($context['make_poll'])
-		echo '
+	if ($context['make_poll']) {
+			echo '
 			var pollOptionNum = 0, pollTabIndex;
 			var pollOptionId = ', $context['last_choice_id'], ';
 			function addPollOption()
@@ -58,11 +60,13 @@ 
 
 				setOuterHTML(document.getElementById(\'pollMoreOptions\'), ', JavaScriptEscape('<dt><label for="options-'), ' + pollOptionId + ', JavaScriptEscape('">' . $txt['option'] . ' '), ' + pollOptionNum + ', JavaScriptEscape('</label>:</dt><dd><input type="text" name="options['), ' + pollOptionId + ', JavaScriptEscape(']" id="options-'), ' + pollOptionId + ', JavaScriptEscape('" value="" size="80" maxlength="255" tabindex="'), ' + pollTabIndex + ', JavaScriptEscape('"></dd><p id="pollMoreOptions"></p>'), ');
 			}';
+	}
 
 	// If we are making a calendar event we want to ensure we show the current days in a month etc... this is done here.
-	if ($context['make_event'])
-		echo '
+	if ($context['make_event']) {
+			echo '
 			var monthLength = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];';
+	}
 
 	// End of the javascript, start the form and display the link tree.
 	echo '
@@ -83,9 +87,10 @@ 
 			</div>
 			<br>';
 
-	if ($context['make_event'] && (!$context['event']['new'] || !empty($context['current_board'])))
-		echo '
+	if ($context['make_event'] && (!$context['event']['new'] || !empty($context['current_board']))) {
+			echo '
 			<input type="hidden" name="eventid" value="', $context['event']['id'], '">';
+	}
 
 	// Start the main table.
 	echo '
@@ -110,26 +115,29 @@ 
 					</div>';
 
 	// If this won't be approved let them know!
-	if (!$context['becomes_approved'])
-		echo '
+	if (!$context['becomes_approved']) {
+			echo '
 					<div class="noticebox">
 						<em>', $txt['wait_for_approval'], '</em>
 						<input type="hidden" name="not_approved" value="1">
 					</div>';
+	}
 
 	// If it's locked, show a message to warn the replier.
-	if (!empty($context['locked']))
-	echo '
+	if (!empty($context['locked'])) {
+		echo '
 					<div class="errorbox">
 						', $txt['topic_locked_no_reply'], '
 					</div>';
+	}
 
-	if (!empty($modSettings['drafts_post_enabled']))
-		echo '
+	if (!empty($modSettings['drafts_post_enabled'])) {
+			echo '
 					<div id="draft_section" class="infobox"', isset($context['draft_saved']) ? '' : ' style="display: none;"', '>',
 						sprintf($txt['draft_saved'], $scripturl . '?action=profile;u=' . $context['user']['id'] . ';area=showdrafts'), '
 						', (!empty($modSettings['drafts_keep_days']) ? ' <strong>' . sprintf($txt['draft_save_warning'], $modSettings['drafts_keep_days']) . '</strong>' : ''), '
 					</div>';
+	}
 
 	// The post header... important stuff
 	echo '
@@ -139,14 +147,15 @@ 
 	// Mod & theme authors can use the 'integrate_post_end' hook to modify or add to these (see Post.php)
 	if (!empty($context['posting_fields']) && is_array($context['posting_fields']))
 	{
-		foreach ($context['posting_fields'] as $pfid => $pf)
-			echo '
+		foreach ($context['posting_fields'] as $pfid => $pf) {
+					echo '
 						<dt class="clear', !is_numeric($pfid) ? ' pf_' . $pfid : '', '">
 							', $pf['dt'], '
 						</dt>
 						<dd', !is_numeric($pfid) ? ' class="pf_' . $pfid . '"' : '', '>
 							', preg_replace('~<(input|select|textarea|button|area|a|object)\b~', '<$1 tabindex="' . $context['tabindex']++ . '"', $pf['dd']), '
 						</dd>';
+		}
 	}
 
 	echo '
@@ -180,9 +189,10 @@ 
 				echo '
 										<optgroup label="', $category['name'], '">';
 
-				foreach ($category['boards'] as $board)
-					echo '
+				foreach ($category['boards'] as $board) {
+									echo '
 											<option value="', $board['id'], '"', $board['selected'] ? ' selected' : '', '>', $board['child_level'] > 0 ? str_repeat('==', $board['child_level'] - 1) . '=&gt;' : '', ' ', $board['name'], '</option>';
+				}
 				echo '
 										</optgroup>';
 			}
@@ -218,9 +228,10 @@ 
 									<span class="label">', $txt['calendar_timezone'], '</span>
 									<select name="tz" id="tz"', !empty($context['event']['allday']) ? ' disabled' : '', '>';
 
-		foreach ($context['all_timezones'] as $tz => $tzname)
-			echo '
+		foreach ($context['all_timezones'] as $tz => $tzname) {
+					echo '
 										<option value="', $tz, '"', $tz == $context['event']['tz'] ? ' selected' : '', '>', $tzname, '</option>';
+		}
 
 		echo '
 									</select>
@@ -249,14 +260,15 @@ 
 								</dd>';
 
 		// Loop through all the choices and print them out.
-		foreach ($context['choices'] as $choice)
-			echo '
+		foreach ($context['choices'] as $choice) {
+					echo '
 								<dt>
 									<label for="options-', $choice['id'], '">', $txt['option'], ' ', $choice['number'], '</label>:
 								</dt>
 								<dd>
 									<input type="text" name="options[', $choice['id'], ']" id="options-', $choice['id'], '" value="', $choice['label'], '" tabindex="', $context['tabindex']++, '" size="80" maxlength="255">
 								</dd>';
+		}
 
 		echo '
 								<p id="pollMoreOptions"></p>
@@ -286,14 +298,15 @@ 
 									<input type="checkbox" id="poll_change_vote" name="poll_change_vote"', !empty($context['poll']['change_vote']) ? ' checked' : '', '>
 								</dd>';
 
-		if ($context['poll_options']['guest_vote_enabled'])
-			echo '
+		if ($context['poll_options']['guest_vote_enabled']) {
+					echo '
 								<dt>
 									<label for="poll_guest_vote">', $txt['poll_guest_vote'], ':</label>
 								</dt>
 								<dd>
 									<input type="checkbox" id="poll_guest_vote" name="poll_guest_vote"', !empty($context['poll_options']['guest_vote']) ? ' checked' : '', '>
 								</dd>';
+		}
 
 		echo '
 								<dt>
@@ -314,8 +327,8 @@ 
 					', template_control_richedit($context['post_box_name'], 'smileyBox_message', 'bbcBox_message');
 
 	// If we're editing and displaying edit details, show a box where they can say why
-	if (isset($context['editing']) && $modSettings['show_modify'])
-		echo '
+	if (isset($context['editing']) && $modSettings['show_modify']) {
+			echo '
 					<dl>
 						<dt class="clear">
 							<span id="caption_edit_reason">', $txt['reason_for_edit'], ':</span>
@@ -324,20 +337,23 @@ 
 							<input type="text" name="modify_reason"', isset($context['last_modified_reason']) ? ' value="' . $context['last_modified_reason'] . '"' : '', ' tabindex="', $context['tabindex']++, '" size="80" maxlength="80">
 						</dd>
 					</dl>';
+	}
 
 	// If this message has been edited in the past - display when it was.
-	if (isset($context['last_modified']))
-		echo '
+	if (isset($context['last_modified'])) {
+			echo '
 					<div class="padding smalltext">
 						', $context['last_modified_text'], '
 					</div>';
+	}
 
 	// If the admin has enabled the hiding of the additional options - show a link and image for it.
-	if (!empty($modSettings['additional_options_collapsable']))
-		echo '
+	if (!empty($modSettings['additional_options_collapsable'])) {
+			echo '
 					<div id="postAdditionalOptionsHeader">
 						<strong><a href="#" id="postMoreExpandLink"> ', $context['can_post_attachment'] ? $txt['post_additionalopt_attach'] : $txt['post_additionalopt'], '</a></strong>
 					</div>';
+	}
 
 	echo '
 					<div id="postAdditionalOptions">';
@@ -370,19 +386,21 @@ 
 								', $txt['uncheck_unwatchd_attach'], ':
 							</dd>';
 
-		foreach ($context['current_attachments'] as $attachment)
-			echo '
+		foreach ($context['current_attachments'] as $attachment) {
+					echo '
 							<dd class="smalltext">
 								<label for="attachment_', $attachment['attachID'], '"><input type="checkbox" id="attachment_', $attachment['attachID'], '" name="attach_del[]" value="', $attachment['attachID'], '"', empty($attachment['unchecked']) ? ' checked' : '', '> ', $attachment['name'], (empty($attachment['approved']) ? ' (' . $txt['awaiting_approval'] . ')' : ''),
 								!empty($modSettings['attachmentPostLimit']) || !empty($modSettings['attachmentSizeLimit']) ? sprintf($txt['attach_kb'], comma_format(round(max($attachment['size'], 1024) / 1024), 0)) : '', '</label>
 							</dd>';
+		}
 
 		echo '
 						</dl>';
 
-		if (!empty($context['files_in_session_warning']))
-			echo '
+		if (!empty($context['files_in_session_warning'])) {
+					echo '
 						<div class="smalltext">', $context['files_in_session_warning'], '</div>';
+		}
 	}
 
 	// Is the user allowed to post any additional ones? If so give them the boxes to do it!
@@ -443,8 +461,8 @@ 
 								', empty($modSettings['attachmentSizeLimit']) ? '' : ('<input type="hidden" name="MAX_FILE_SIZE" value="' . $modSettings['attachmentSizeLimit'] * 1024 . '">');
 
 		// Show more boxes if they aren't approaching that limit.
-		if ($context['num_allowed_attachments'] > 1)
-			echo '
+		if ($context['num_allowed_attachments'] > 1) {
+					echo '
 										<script>
 											var allowed_attachments = ', $context['num_allowed_attachments'], ';
 											var current_attachment = 1;
@@ -464,6 +482,7 @@ 
 										<a href="#" onclick="addAttachment(); return false;">(', $txt['more_attachments'], ')</a>
 									</div><!-- .fallback -->
 								</div><!-- #attachUpload -->';
+		}
 
 		echo '
 							</dd>';
@@ -475,21 +494,25 @@ 
 							<dd class="smalltext">';
 
 		// Show some useful information such as allowed extensions, maximum size and amount of attachments allowed.
-		if (!empty($modSettings['attachmentCheckExtensions']))
-			echo '
+		if (!empty($modSettings['attachmentCheckExtensions'])) {
+					echo '
 								', $txt['allowed_types'], ': ', $context['allowed_extensions'], '<br>';
+		}
 
-		if (!empty($context['attachment_restrictions']))
-			echo '
+		if (!empty($context['attachment_restrictions'])) {
+					echo '
 								', $txt['attach_restrictions'], ' ', implode(', ', $context['attachment_restrictions']), '<br>';
+		}
 
-		if ($context['num_allowed_attachments'] == 0)
-			echo '
+		if ($context['num_allowed_attachments'] == 0) {
+					echo '
 								', $txt['attach_limit_nag'], '<br>';
+		}
 
-		if (!$context['can_post_attachment_unapproved'])
-			echo '
+		if (!$context['can_post_attachment_unapproved']) {
+					echo '
 								<span class="alert">', $txt['attachment_requires_approval'], '</span>', '<br>';
+		}
 
 		echo '
 							</dd>
@@ -513,24 +536,26 @@ 
 							<dt><strong>', $txt['subject'], '</strong></dt>
 							<dd><strong>', $txt['draft_saved_on'], '</strong></dd>';
 
-		foreach ($context['drafts'] as $draft)
-			echo '
+		foreach ($context['drafts'] as $draft) {
+					echo '
 							<dt>', $draft['link'], '</dt>
 							<dd>', $draft['poster_time'], '</dd>';
+		}
 		echo '
 						</dl>
 					</div>';
 	}
 
 	// Is visual verification enabled?
-	if ($context['require_verification'])
-		echo '
+	if ($context['require_verification']) {
+			echo '
 					<div class="post_verification">
 						<span', !empty($context['post_error']['need_qr_verification']) ? ' class="error"' : '', '>
 							<strong>', $txt['verification'], ':</strong>
 						</span>
 						', template_control_verification($context['visual_verification_id'], 'all'), '
 					</div>';
+	}
 
 	// Finally, the submit buttons.
 	echo '
@@ -539,9 +564,10 @@ 
 						', template_control_richedit_buttons($context['post_box_name']);
 
 	// Option to delete an event if user is editing one.
-	if ($context['make_event'] && !$context['event']['new'])
-		echo '
+	if ($context['make_event'] && !$context['event']['new']) {
+			echo '
 						<input type="submit" name="deleteevent" value="', $txt['event_delete'], '" data-confirm="', $txt['event_delete_confirm'] ,'" class="button you_sure">';
+	}
 
 	echo '
 					</span>
@@ -550,9 +576,10 @@ 
 			<br class="clear">';
 
 	// Assuming this isn't a new topic pass across the last message id.
-	if (isset($context['topic_last_message']))
-		echo '
+	if (isset($context['topic_last_message'])) {
+			echo '
 			<input type="hidden" name="last_msg" value="', $context['topic_last_message'], '">';
+	}
 
 	echo '
 			<input type="hidden" name="additional_options" id="additional_options" value="', $context['show_additional_options'] ? '1' : '0', '">
@@ -694,9 +721,10 @@ 
 
 						newPostsHTML += \'<div class="windowbg\' + (++reply_counter % 2 == 0 ? \'2\' : \'\') + \'"><div id="msg\' + newPosts[i].getAttribute("id") + \'"><div class="floatleft"><h5>', $txt['posted_by'], ': \' + newPosts[i].getElementsByTagName("poster")[0].firstChild.nodeValue + \'</h5><span class="smalltext">&#171;&nbsp;<strong>', $txt['on'], ':</strong> \' + newPosts[i].getElementsByTagName("time")[0].firstChild.nodeValue + \'&nbsp;&#187;</span> <span class="new_posts" id="image_new_\' + newPosts[i].getAttribute("id") + \'">', $txt['new'], '</span></div>\';';
 
-	if ($context['can_quote'])
-		echo '
+	if ($context['can_quote']) {
+			echo '
 						newPostsHTML += \'<ul class="quickbuttons" id="msg_\' + newPosts[i].getAttribute("id") + \'_quote"><li><a href="#postmodify" onclick="return insertQuoteFast(\\\'\' + newPosts[i].getAttribute("id") + \'\\\');" class="quote_button"><span>', $txt['quote'], '</span><\' + \'/a></li></ul>\';';
+	}
 
 	echo '
 						newPostsHTML += \'<br class="clear">\';
@@ -739,8 +767,8 @@ 
 			}';
 
 	// Code for showing and hiding additional options.
-	if (!empty($modSettings['additional_options_collapsable']))
-		echo '
+	if (!empty($modSettings['additional_options_collapsable'])) {
+			echo '
 			var oSwapAdditionalOptions = new smc_Toggle({
 				bToggleEnabled: true,
 				bCurrentlyCollapsed: ', $context['show_additional_options'] ? 'false' : 'true', ',
@@ -768,10 +796,11 @@ 
 					}
 				]
 			});';
+	}
 
 	// Code for showing and hiding drafts
-	if (!empty($context['drafts']))
-		echo '
+	if (!empty($context['drafts'])) {
+			echo '
 			var oSwapDraftOptions = new smc_Toggle({
 				bToggleEnabled: true,
 				bCurrentlyCollapsed: true,
@@ -793,6 +822,7 @@ 
 					}
 				]
 			});';
+	}
 
 	echo '
 			var oEditorID = "', $context['post_box_name'] ,'";
@@ -813,8 +843,9 @@ 
 		foreach ($context['previous_posts'] as $post)
 		{
 			$ignoring = false;
-			if (!empty($post['is_ignored']))
-				$ignored_posts[] = $ignoring = $post['id'];
+			if (!empty($post['is_ignored'])) {
+							$ignored_posts[] = $ignoring = $post['id'];
+			}
 
 			echo '
 			<div class="windowbg">
@@ -824,22 +855,24 @@ 
 					</h5>
 					&nbsp;-&nbsp;', $post['time'];
 
-			if ($context['can_quote'])
-				echo '
+			if ($context['can_quote']) {
+							echo '
 					<ul class="quickbuttons" id="msg_', $post['id'], '_quote">
 						<li style="display:none;" id="quoteSelected_', $post['id'], '" data-msgid="', $post['id'], '"><a href="javascript:void(0)"><span class="generic_icons quote_selected"></span>', $txt['quote_selected_action'] ,'</a></li>
 						<li id="post_modify"><a href="#postmodify" onclick="return insertQuoteFast(', $post['id'], ');"><span class="generic_icons quote"></span>', $txt['quote'], '</a></li>
 					</ul>';
+			}
 
 			echo '
 					<br class="clear">';
 
-			if ($ignoring)
-				echo '
+			if ($ignoring) {
+							echo '
 					<div id="msg_', $post['id'], '_ignored_prompt" class="smalltext">
 						', $txt['ignoring_user'], '
 						<a href="#" id="msg_', $post['id'], '_ignored_link" style="display: none;">', $txt['show_ignore_user_post'], '</a>
 					</div>';
+			}
 
 			echo '
 					<div class="list_posts smalltext" id="msg_', $post['id'], '_body" data-msgid="', $post['id'], '">', $post['message'], '</div>
@@ -993,10 +1026,10 @@ 
 		<div id="temporary_posting_area" style="display: none;"></div>
 		<script>';
 
-	if ($context['close_window'])
-		echo '
+	if ($context['close_window']) {
+			echo '
 			window.close();';
-	else
+	} else
 	{
 		// Lucky for us, Internet Explorer has an "innerText" feature which basically converts entities <--> text. Use it if possible ;)
 		echo '
@@ -1050,11 +1083,12 @@ 
 				</p>
 				<ul>';
 
-	foreach ($context['groups'] as $group)
-		echo '
+	foreach ($context['groups'] as $group) {
+			echo '
 					<li>
 						<label for="who_', $group['id'], '"><input type="checkbox" name="who[', $group['id'], ']" id="who_', $group['id'], '" value="', $group['id'], '" checked> ', $group['name'], '</label> <em>(', $group['member_count'], ')</em>
 					</li>';
+	}
 
 	echo '
 					<li>

Themes/default/ManageLanguages.template.php

Braces +24 added lines, -16 removed lines

@@ -36,11 +36,12 @@ 
 	}
 
 	// An error?
-	if (!empty($context['error_message']))
-		echo '
+	if (!empty($context['error_message'])) {
+			echo '
 	<div class="errorbox">
 		', $context['error_message'], '
 	</div>';
+	}
 
 	// Provide something of an introduction...
 	echo '
@@ -67,11 +68,12 @@ 
 	// If the files are not writable, we might!
 	if (!empty($context['still_not_writable']))
 	{
-		if (!empty($context['package_ftp']['error']))
-			echo '
+		if (!empty($context['package_ftp']['error'])) {
+					echo '
 			<div class="errorbox">
 				', $context['package_ftp']['error'], '
 			</div>';
+		}
 
 		echo '
 			<div class="cat_bar">
@@ -150,11 +152,12 @@ 
 			</div>';
 
 	// Not writable? Oops, show an error for ya.
-	if (!empty($context['lang_file_not_writable_message']))
-		echo '
+	if (!empty($context['lang_file_not_writable_message'])) {
+			echo '
 			<div class="errorbox">
 				', $context['lang_file_not_writable_message'], '
 			</div>';
+	}
 
 	// Show the language entries
 	echo '
@@ -199,9 +202,10 @@ 
 				<input type="submit" name="save_main" value="', $txt['save'], '"', $context['lang_file_not_writable_message'] || !empty($context['file_entries']) ? ' disabled' : '', ' class="button">';
 
 	// Allow deleting entries. English can't be deleted though.
-	if ($context['lang_id'] != 'english')
-		echo '
+	if ($context['lang_id'] != 'english') {
+			echo '
 				<input type="submit" name="delete_main" value="', $txt['delete'], '"', $context['lang_file_not_writable_message'] || !empty($context['file_entries']) ? ' disabled' : '', ' onclick="confirm(\'', $txt['languages_delete_confirm'], '\');" class="button">';
+	}
 
 	echo '
 			</div><!-- .windowbg -->
@@ -223,9 +227,10 @@ 
 		echo '
 					<optgroup label="', $theme['name'], '">';
 
-		foreach ($theme['files'] as $file)
-			echo '
+		foreach ($theme['files'] as $file) {
+					echo '
 						<option value="', $id_theme, '+', $file['id'], '"', $file['selected'] ? ' selected' : '', '> =&gt; ', $file['name'], '</option>';
+		}
 
 		echo '
 					</optgroup>';
@@ -240,11 +245,12 @@ 
 			<br class="clear">';
 
 	// Is it not writable? Show an error.
-	if (!empty($context['entries_not_writable_message']))
-		echo '
+	if (!empty($context['entries_not_writable_message'])) {
+			echo '
 			<div class="errorbox">
 				', $context['entries_not_writable_message'], '
 			</div>';
+	}
 
 	// Already have some file entries?
 	if (!empty($context['file_entries']))
@@ -283,8 +289,8 @@ 
 		}
 
 		// Odd number?
-		if (!empty($cached))
-			echo '
+		if (!empty($cached)) {
+					echo '
 
 					<dt>
 						<span class="smalltext">', $cached['key'], '</span>
@@ -297,6 +303,7 @@ 
 					</dt>
 					<dd>
 					</dd>';
+		}
 
 		echo '
 				</dl>
@@ -331,12 +338,13 @@ 
 					<input type="text" name="smf_add" size="40" value="', !empty($context['smf_search_term']) ? $context['smf_search_term'] : '', '">';
 
 	// Do we have some errors? Too bad. Display a little error box.
-	if (!empty($context['smf_error']))
-		echo '
+	if (!empty($context['smf_error'])) {
+			echo '
 					<div>
 						<br>
 						<p class="errorbox">', $txt['add_language_error_' . $context['smf_error']], '</p>
 					</div>';
+	}
 
 	echo '
 				</fieldset>

Themes/default/Errors.template.php

Braces +24 added lines, -17 removed lines

@@ -23,15 +23,15 @@ 
 {
 	global $context, $txt;
 
-	if (!empty($context['simple_action']))
-		echo '
+	if (!empty($context['simple_action'])) {
+			echo '
 	<strong>
 		', $context['error_title'], '
 	</strong><br>
 	<div ', $context['error_code'], 'class="padding">
 		', $context['error_message'], '
 	</div>';
-	else
+	} else
 	{
 		echo '
 	<div id="fatal_error">
@@ -85,21 +85,23 @@ 
 
 	$error_types = array();
 
-	foreach ($context['error_types'] as $type => $details)
-		$error_types[] = ($details['is_selected'] ? '<img src="' . $settings['images_url'] . '/selected.png" alt=""> ' : '') . '<a href="' . $details['url'] . '" ' . ($details['is_selected'] ? 'style="font-weight: bold;"' : '') . ' title="' . $details['description'] . '">' . $details['label'] . '</a>';
+	foreach ($context['error_types'] as $type => $details) {
+			$error_types[] = ($details['is_selected'] ? '<img src="' . $settings['images_url'] . '/selected.png" alt=""> ' : '') . '<a href="' . $details['url'] . '" ' . ($details['is_selected'] ? 'style="font-weight: bold;"' : '') . ' title="' . $details['description'] . '">' . $details['label'] . '</a>';
+	}
 
 	echo '
 						', implode(' | ', $error_types), '
 					</td>
 				</tr>';
 
-	if ($context['has_filter'])
-		echo '
+	if ($context['has_filter']) {
+			echo '
 				<tr>
 					<td colspan="3" class="windowbg">
 						<strong>', $txt['applying_filter'], ':</strong> ', $context['filter']['entity'], ' ', $context['filter']['value']['html'], ' [<a href="', $scripturl, '?action=admin;area=logs;sa=errorlog', $context['sort_direction'] == 'down' ? ';desc' : '', '">', $txt['clear_filter'], '</a>]
 					</td>
 				</tr>';
+	}
 
 	echo '
 				<tr>
@@ -110,11 +112,12 @@ 
 				</tr>';
 
 	// No errors, then show a message
-	if (count($context['errors']) == 0)
-		echo '
+	if (count($context['errors']) == 0) {
+			echo '
 				<tr class="windowbg">
 					<td class="centertext" colspan="2">', $txt['errlog_no_entries'], '</td>
 				</tr>';
+	}
 
 	// We have some errors, must be some mods installed :P
 	foreach ($context['errors'] as $error)
@@ -128,19 +131,21 @@ 
 							<a href="', $scripturl, '?action=admin;area=logs;sa=errorlog', $context['sort_direction'] == 'down' ? '' : ';desc', $context['has_filter'] ? $context['filter']['href'] : '', '" title="', $txt['reverse_direction'], '"><span class="generic_icons sort_' . $context['sort_direction'] . '"></span></a>
 							', $error['time'], '<br>';
 
-		if (!empty($error['member']['ip']))
-			echo '
+		if (!empty($error['member']['ip'])) {
+					echo '
 							<a href="', $scripturl, '?action=admin;area=logs;sa=errorlog', $context['sort_direction'] == 'down' ? ';desc' : '', ';filter=ip;value=', $error['member']['ip'], '" title="', $txt['apply_filter'], ': ', $txt['filter_only_ip'], '"><span class="generic_icons filter centericon"></span></a>
 							<strong><a href="', $scripturl, '?action=trackip;searchip=', $error['member']['ip'], '">', $error['member']['ip'], '</a></strong>';
+		}
 
 		echo '
 						</div>
 						<div class="error_info">';
 
-		if ($error['member']['session'] != '')
-			echo '
+		if ($error['member']['session'] != '') {
+					echo '
 							<a href="', $scripturl, '?action=admin;area=logs;sa=errorlog', $context['sort_direction'] == 'down' ? ';desc' : '', ';filter=session;value=', $error['member']['session'], '" title="', $txt['apply_filter'], ': ', $txt['filter_only_session'], '"><span class="generic_icons filter centericon"></span></a>
 							', $error['member']['session'], '<br>';
+		}
 
 		echo '
 							<a href="', $scripturl, '?action=admin;area=logs;sa=errorlog', $context['sort_direction'] == 'down' ? ';desc' : '', ';filter=error_type;value=', $error['error_type']['type'], '" title="', $txt['apply_filter'], ': ', $txt['filter_only_type'], '"><span class="generic_icons filter centericon"></span></a>
@@ -154,8 +159,8 @@ 
 							<a href="', $error['url']['html'], '">', $error['url']['html'], '</a>
 						</div>';
 
-		if (!empty($error['file']))
-			echo '
+		if (!empty($error['file'])) {
+					echo '
 						<div class="error_location">
 							<a href="', $scripturl, '?action=admin;area=logs;sa=errorlog', $context['sort_direction'] == 'down' ? ';desc' : '', ';filter=file;value=', $error['file']['search'], '" title="', $txt['apply_filter'], ': ', $txt['filter_only_file'], '"><span class="generic_icons filter"></span></a>
 							<div>
@@ -163,6 +168,7 @@ 
 								', $txt['line'], ': ', $error['file']['line'], '
 							</div>
 						</div>';
+		}
 
 		echo '
 					</td>
@@ -190,9 +196,10 @@ 
 				</div>
 			</div>';
 
-	if ($context['sort_direction'] == 'down')
-		echo '
+	if ($context['sort_direction'] == 'down') {
+			echo '
 			<input type="hidden" name="desc" value="1">';
+	}
 
 	echo '
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">

cron.php

Braces +36 added lines, -28 removed lines

@@ -41,37 +41,43 @@ 
 define('TIME_START', microtime(true));
 
 // Just being safe...
-foreach (array('db_character_set', 'cachedir') as $variable)
+foreach (array('db_character_set', 'cachedir') as $variable) {
 	if (isset($GLOBALS[$variable]))
 		unset($GLOBALS[$variable]);
+}
 
 // Get the forum's settings for database and file paths.
 require_once(dirname(__FILE__) . '/Settings.php');
 
 // Make absolutely sure the cache directory is defined.
-if ((empty($cachedir) || !file_exists($cachedir)) && file_exists($boarddir . '/cache'))
+if ((empty($cachedir) || !file_exists($cachedir)) && file_exists($boarddir . '/cache')) {
 	$cachedir = $boarddir . '/cache';
+}
 
 // Don't do john didley if the forum's been shut down competely.
-if ($maintenance == 2)
+if ($maintenance == 2) {
 	die($mmessage);
+}
 
 // Fix for using the current directory as a path.
-if (substr($sourcedir, 0, 1) == '.' && substr($sourcedir, 1, 1) != '.')
+if (substr($sourcedir, 0, 1) == '.' && substr($sourcedir, 1, 1) != '.') {
 	$sourcedir = dirname(__FILE__) . substr($sourcedir, 1);
+}
 
 // Have we already turned this off? If so, exist gracefully.
-if (file_exists($cachedir . '/cron.lock'))
+if (file_exists($cachedir . '/cron.lock')) {
 	obExit_cron();
+}
 
 // Before we go any further, if this is not a CLI request, we need to do some checking.
 if (!FROM_CLI)
 {
 	// We will clean up $_GET shortly. But we want to this ASAP.
 	$ts = isset($_GET['ts']) ? (int) $_GET['ts'] : 0;
-	if ($ts <= 0 || $ts % 15 != 0 || time() - $ts < 0 || time() - $ts > 20)
-		obExit_cron();
-}
+	if ($ts <= 0 || $ts % 15 != 0 || time() - $ts < 0 || time() - $ts > 20) {
+			obExit_cron();
+	}
+	}
 
 // Load the most important includes. In general, a background should be loading its own dependencies.
 require_once($sourcedir . '/Errors.php');
@@ -123,8 +129,9 @@ 
 	global $smcFunc;
 
 	// Check we haven't run over our time limit.
-	if (microtime(true) - TIME_START > MAX_CRON_TIME)
-		return false;
+	if (microtime(true) - TIME_START > MAX_CRON_TIME) {
+			return false;
+	}
 
 	// Try to find a task. Specifically, try to find one that hasn't been claimed previously, or failing that,
 	// a task that was claimed but failed for whatever reason and failed long enough ago. We should not care
@@ -159,14 +166,12 @@ 
 			// Update the time and go back.
 			$row['claimed_time'] = time();
 			return $row;
-		}
-		else
+		} else
 		{
 			// Uh oh, we just missed it. Try to claim another one, and let it fall through if there aren't any.
 			return fetch_task();
 		}
-	}
-	else
+	} else
 	{
 		// No dice. Clean up and go home.
 		$smcFunc['db_free_result']($request);
@@ -187,8 +192,9 @@ 
 	if (!empty($task_details['task_file']))
 	{
 		$include = strtr(trim($task_details['task_file']), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir));
-		if (file_exists($include))
-			require_once($include);
+		if (file_exists($include)) {
+					require_once($include);
+		}
 	}
 
 	if (empty($task_details['task_class']))
@@ -204,8 +210,7 @@ 
 		$details = empty($task_details['task_data']) ? array() : $smcFunc['json_decode']($task_details['task_data'], true);
 		$bgtask = new $task_details['task_class']($details);
 		return $bgtask->execute();
-	}
-	else
+	} else
 	{
 		log_error('Invalid background task specified: (class: ' . $task_details['task_class'] . ', ' . (empty($task_details['task_file']) ? ' no file' : ' to load ' . $task_details['task_file']) . ')');
 		return true; // So we clear it from the queue.
@@ -224,8 +229,9 @@ 
 	$scripturl = $boardurl . '/index.php';
 
 	// These keys shouldn't be set...ever.
-	if (isset($_REQUEST['GLOBALS']) || isset($_COOKIE['GLOBALS']))
-		die('Invalid request variable.');
+	if (isset($_REQUEST['GLOBALS']) || isset($_COOKIE['GLOBALS'])) {
+			die('Invalid request variable.');
+	}
 
 	// Save some memory.. (since we don't use these anyway.)
 	unset($GLOBALS['HTTP_POST_VARS'], $GLOBALS['HTTP_POST_VARS']);
@@ -246,26 +252,28 @@ 
 	global $modSettings;
 
 	// Ignore errors if we're ignoring them or they are strict notices from PHP 5
-	if (error_reporting() == 0)
-		return;
+	if (error_reporting() == 0) {
+			return;
+	}
 
 	$error_type = 'cron';
 
 	log_error($error_level . ': ' . $error_string, $error_type, $file, $line);
 
 	// If this is an E_ERROR or E_USER_ERROR.... die.  Violently so.
-	if ($error_level % 255 == E_ERROR)
-		die('No direct access...');
-}
+	if ($error_level % 255 == E_ERROR) {
+			die('No direct access...');
+	}
+	}
 
 /**
  * The exit function
  */
 function obExit_cron()
 {
-	if (FROM_CLI)
-		die(0);
-	else
+	if (FROM_CLI) {
+			die(0);
+	} else
 	{
 		header('Content-Type: image/gif');
 		die("\x47\x49\x46\x38\x39\x61\x01\x00\x01\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x21\xF9\x04\x01\x00\x00\x00\x00\x2C\x00\x00\x00\x00\x01\x00\x01\x00\x00\x02\x02\x44\x01\x00\x3B");