Completed
Push — release-2.1 ( e9ccf0...3d75db )
by Michael
08:23
created
SSI.php 1 patch
Braces   +428 added lines, -304 removed lines patch added patch discarded remove patch
@@ -12,8 +12,9 @@  discard block
 block discarded – undo
12 12
  */
13 13
 
14 14
 // Don't do anything if SMF is already loaded.
15
-if (defined('SMF'))
15
+if (defined('SMF')) {
16 16
 	return true;
17
+}
17 18
 
18 19
 define('SMF', 'SSI');
19 20
 
@@ -26,21 +27,24 @@  discard block
 block discarded – undo
26 27
 
27 28
 // Remember the current configuration so it can be set back.
28 29
 $ssi_magic_quotes_runtime = function_exists('get_magic_quotes_gpc') && get_magic_quotes_runtime();
29
-if (function_exists('set_magic_quotes_runtime'))
30
+if (function_exists('set_magic_quotes_runtime')) {
30 31
 	@set_magic_quotes_runtime(0);
32
+}
31 33
 $time_start = microtime();
32 34
 
33 35
 // Just being safe...
34
-foreach (array('db_character_set', 'cachedir') as $variable)
36
+foreach (array('db_character_set', 'cachedir') as $variable) {
35 37
 	if (isset($GLOBALS[$variable]))
36 38
 		unset($GLOBALS[$variable]);
39
+}
37 40
 
38 41
 // Get the forum's settings for database and file paths.
39 42
 require_once(dirname(__FILE__) . '/Settings.php');
40 43
 
41 44
 // Make absolutely sure the cache directory is defined.
42
-if ((empty($cachedir) || !file_exists($cachedir)) && file_exists($boarddir . '/cache'))
45
+if ((empty($cachedir) || !file_exists($cachedir)) && file_exists($boarddir . '/cache')) {
43 46
 	$cachedir = $boarddir . '/cache';
47
+}
44 48
 
45 49
 $ssi_error_reporting = error_reporting(defined('E_STRICT') ? E_ALL | E_STRICT : E_ALL);
46 50
 /* Set this to one of three values depending on what you want to happen in the case of a fatal error.
@@ -51,12 +55,14 @@  discard block
 block discarded – undo
51 55
 $ssi_on_error_method = false;
52 56
 
53 57
 // Don't do john didley if the forum's been shut down completely.
54
-if ($maintenance == 2 && (!isset($ssi_maintenance_off) || $ssi_maintenance_off !== true))
58
+if ($maintenance == 2 && (!isset($ssi_maintenance_off) || $ssi_maintenance_off !== true)) {
55 59
 	die($mmessage);
60
+}
56 61
 
57 62
 // Fix for using the current directory as a path.
58
-if (substr($sourcedir, 0, 1) == '.' && substr($sourcedir, 1, 1) != '.')
63
+if (substr($sourcedir, 0, 1) == '.' && substr($sourcedir, 1, 1) != '.') {
59 64
 	$sourcedir = dirname(__FILE__) . substr($sourcedir, 1);
65
+}
60 66
 
61 67
 // Load the important includes.
62 68
 require_once($sourcedir . '/QueryString.php');
@@ -81,34 +87,38 @@  discard block
 block discarded – undo
81 87
 cleanRequest();
82 88
 
83 89
 // Seed the random generator?
84
-if (empty($modSettings['rand_seed']) || mt_rand(1, 250) == 69)
90
+if (empty($modSettings['rand_seed']) || mt_rand(1, 250) == 69) {
85 91
 	smf_seed_generator();
92
+}
86 93
 
87 94
 // Check on any hacking attempts.
88
-if (isset($_REQUEST['GLOBALS']) || isset($_COOKIE['GLOBALS']))
95
+if (isset($_REQUEST['GLOBALS']) || isset($_COOKIE['GLOBALS'])) {
89 96
 	die('No direct access...');
90
-elseif (isset($_REQUEST['ssi_theme']) && (int) $_REQUEST['ssi_theme'] == (int) $ssi_theme)
97
+} elseif (isset($_REQUEST['ssi_theme']) && (int) $_REQUEST['ssi_theme'] == (int) $ssi_theme) {
91 98
 	die('No direct access...');
92
-elseif (isset($_COOKIE['ssi_theme']) && (int) $_COOKIE['ssi_theme'] == (int) $ssi_theme)
99
+} elseif (isset($_COOKIE['ssi_theme']) && (int) $_COOKIE['ssi_theme'] == (int) $ssi_theme) {
93 100
 	die('No direct access...');
94
-elseif (isset($_REQUEST['ssi_layers'], $ssi_layers) && (@get_magic_quotes_gpc() ? stripslashes($_REQUEST['ssi_layers']) : $_REQUEST['ssi_layers']) == $ssi_layers)
101
+} elseif (isset($_REQUEST['ssi_layers'], $ssi_layers) && (@get_magic_quotes_gpc() ? stripslashes($_REQUEST['ssi_layers']) : $_REQUEST['ssi_layers']) == $ssi_layers) {
95 102
 	die('No direct access...');
96
-if (isset($_REQUEST['context']))
103
+}
104
+if (isset($_REQUEST['context'])) {
97 105
 	die('No direct access...');
106
+}
98 107
 
99 108
 // Gzip output? (because it must be boolean and true, this can't be hacked.)
100
-if (isset($ssi_gzip) && $ssi_gzip === true && ini_get('zlib.output_compression') != '1' && ini_get('output_handler') != 'ob_gzhandler' && version_compare(PHP_VERSION, '4.2.0', '>='))
109
+if (isset($ssi_gzip) && $ssi_gzip === true && ini_get('zlib.output_compression') != '1' && ini_get('output_handler') != 'ob_gzhandler' && version_compare(PHP_VERSION, '4.2.0', '>=')) {
101 110
 	ob_start('ob_gzhandler');
102
-else
111
+} else {
103 112
 	$modSettings['enableCompressedOutput'] = '0';
113
+}
104 114
 
105 115
 // Primarily, this is to fix the URLs...
106 116
 ob_start('ob_sessrewrite');
107 117
 
108 118
 // Start the session... known to scramble SSI includes in cases...
109
-if (!headers_sent())
119
+if (!headers_sent()) {
110 120
 	loadSession();
111
-else
121
+} else
112 122
 {
113 123
 	if (isset($_COOKIE[session_name()]) || isset($_REQUEST[session_name()]))
114 124
 	{
@@ -142,12 +152,14 @@  discard block
 block discarded – undo
142 152
 loadTheme(isset($ssi_theme) ? (int) $ssi_theme : 0);
143 153
 
144 154
 // @todo: probably not the best place, but somewhere it should be set...
145
-if (!headers_sent())
155
+if (!headers_sent()) {
146 156
 	header('Content-Type: text/html; charset=' . (empty($modSettings['global_character_set']) ? (empty($txt['lang_character_set']) ? 'ISO-8859-1' : $txt['lang_character_set']) : $modSettings['global_character_set']));
157
+}
147 158
 
148 159
 // Take care of any banning that needs to be done.
149
-if (isset($_REQUEST['ssi_ban']) || (isset($ssi_ban) && $ssi_ban === true))
160
+if (isset($_REQUEST['ssi_ban']) || (isset($ssi_ban) && $ssi_ban === true)) {
150 161
 	is_not_banned();
162
+}
151 163
 
152 164
 // Do we allow guests in here?
153 165
 if (empty($ssi_guest_access) && empty($modSettings['allow_guestAccess']) && $user_info['is_guest'] && basename($_SERVER['PHP_SELF']) != 'SSI.php')
@@ -162,17 +174,19 @@  discard block
 block discarded – undo
162 174
 {
163 175
 	$context['template_layers'] = $ssi_layers;
164 176
 	template_header();
165
-}
166
-else
177
+} else {
167 178
 	setupThemeContext();
179
+}
168 180
 
169 181
 // Make sure they didn't muss around with the settings... but only if it's not cli.
170
-if (isset($_SERVER['REMOTE_ADDR']) && !isset($_SERVER['is_cli']) && session_id() == '')
182
+if (isset($_SERVER['REMOTE_ADDR']) && !isset($_SERVER['is_cli']) && session_id() == '') {
171 183
 	trigger_error($txt['ssi_session_broken'], E_USER_NOTICE);
184
+}
172 185
 
173 186
 // Without visiting the forum this session variable might not be set on submit.
174
-if (!isset($_SESSION['USER_AGENT']) && (!isset($_GET['ssi_function']) || $_GET['ssi_function'] !== 'pollVote'))
187
+if (!isset($_SESSION['USER_AGENT']) && (!isset($_GET['ssi_function']) || $_GET['ssi_function'] !== 'pollVote')) {
175 188
 	$_SESSION['USER_AGENT'] = $_SERVER['HTTP_USER_AGENT'];
189
+}
176 190
 
177 191
 // Have the ability to easily add functions to SSI.
178 192
 call_integration_hook('integrate_SSI');
@@ -183,15 +197,18 @@  discard block
 block discarded – undo
183 197
 	call_user_func('ssi_' . $_GET['ssi_function']);
184 198
 	exit;
185 199
 }
186
-if (isset($_GET['ssi_function']))
200
+if (isset($_GET['ssi_function'])) {
187 201
 	exit;
202
+}
188 203
 // You shouldn't just access SSI.php directly by URL!!
189
-elseif (basename($_SERVER['PHP_SELF']) == 'SSI.php')
204
+elseif (basename($_SERVER['PHP_SELF']) == 'SSI.php') {
190 205
 	die(sprintf($txt['ssi_not_direct'], $user_info['is_admin'] ? '\'' . addslashes(__FILE__) . '\'' : '\'SSI.php\''));
206
+}
191 207
 
192 208
 error_reporting($ssi_error_reporting);
193
-if (function_exists('set_magic_quotes_runtime'))
209
+if (function_exists('set_magic_quotes_runtime')) {
194 210
 	@set_magic_quotes_runtime($ssi_magic_quotes_runtime);
211
+}
195 212
 
196 213
 return true;
197 214
 
@@ -201,9 +218,10 @@  discard block
 block discarded – undo
201 218
  */
202 219
 function ssi_shutdown()
203 220
 {
204
-	if (!isset($_GET['ssi_function']) || $_GET['ssi_function'] != 'shutdown')
205
-		template_footer();
206
-}
221
+	if (!isset($_GET['ssi_function']) || $_GET['ssi_function'] != 'shutdown') {
222
+			template_footer();
223
+	}
224
+	}
207 225
 
208 226
 /**
209 227
  * Display a welcome message, like: Hey, User, you have 0 messages, 0 are new.
@@ -216,15 +234,17 @@  discard block
 block discarded – undo
216 234
 
217 235
 	if ($output_method == 'echo')
218 236
 	{
219
-		if ($context['user']['is_guest'])
220
-			echo sprintf($txt[$context['can_register'] ? 'welcome_guest_register' : 'welcome_guest'], $txt['guest_title'], $context['forum_name_html_safe'], $scripturl . '?action=login', 'return reqOverlayDiv(this.href, ' . JavaScriptEscape($txt['login']) . ');', $scripturl . '?action=signup');
221
-		else
222
-			echo $txt['hello_member'], ' <strong>', $context['user']['name'], '</strong>', allowedTo('pm_read') ? ', ' . (empty($context['user']['messages']) ? $txt['msg_alert_no_messages'] : (($context['user']['messages'] == 1 ? sprintf($txt['msg_alert_one_message'], $scripturl . '?action=pm') : sprintf($txt['msg_alert_many_message'], $scripturl . '?action=pm', $context['user']['messages'])) . ', ' . ($context['user']['unread_messages'] == 1 ? $txt['msg_alert_one_new'] : sprintf($txt['msg_alert_many_new'], $context['user']['unread_messages'])))) : '';
237
+		if ($context['user']['is_guest']) {
238
+					echo sprintf($txt[$context['can_register'] ? 'welcome_guest_register' : 'welcome_guest'], $txt['guest_title'], $context['forum_name_html_safe'], $scripturl . '?action=login', 'return reqOverlayDiv(this.href, ' . JavaScriptEscape($txt['login']) . ');', $scripturl . '?action=signup');
239
+		} else {
240
+					echo $txt['hello_member'], ' <strong>', $context['user']['name'], '</strong>', allowedTo('pm_read') ? ', ' . (empty($context['user']['messages']) ? $txt['msg_alert_no_messages'] : (($context['user']['messages'] == 1 ? sprintf($txt['msg_alert_one_message'], $scripturl . '?action=pm') : sprintf($txt['msg_alert_many_message'], $scripturl . '?action=pm', $context['user']['messages'])) . ', ' . ($context['user']['unread_messages'] == 1 ? $txt['msg_alert_one_new'] : sprintf($txt['msg_alert_many_new'], $context['user']['unread_messages'])))) : '';
241
+		}
223 242
 	}
224 243
 	// Don't echo... then do what?!
225
-	else
226
-		return $context['user'];
227
-}
244
+	else {
245
+			return $context['user'];
246
+	}
247
+	}
228 248
 
229 249
 /**
230 250
  * Display a menu bar, like is displayed at the top of the forum.
@@ -235,12 +255,14 @@  discard block
 block discarded – undo
235 255
 {
236 256
 	global $context;
237 257
 
238
-	if ($output_method == 'echo')
239
-		template_menu();
258
+	if ($output_method == 'echo') {
259
+			template_menu();
260
+	}
240 261
 	// What else could this do?
241
-	else
242
-		return $context['menu_buttons'];
243
-}
262
+	else {
263
+			return $context['menu_buttons'];
264
+	}
265
+	}
244 266
 
245 267
 /**
246 268
  * Show a logout link.
@@ -252,20 +274,23 @@  discard block
 block discarded – undo
252 274
 {
253 275
 	global $context, $txt, $scripturl;
254 276
 
255
-	if ($redirect_to != '')
256
-		$_SESSION['logout_url'] = $redirect_to;
277
+	if ($redirect_to != '') {
278
+			$_SESSION['logout_url'] = $redirect_to;
279
+	}
257 280
 
258 281
 	// Guests can't log out.
259
-	if ($context['user']['is_guest'])
260
-		return false;
282
+	if ($context['user']['is_guest']) {
283
+			return false;
284
+	}
261 285
 
262 286
 	$link = '<a href="' . $scripturl . '?action=logout;' . $context['session_var'] . '=' . $context['session_id'] . '">' . $txt['logout'] . '</a>';
263 287
 
264
-	if ($output_method == 'echo')
265
-		echo $link;
266
-	else
267
-		return $link;
268
-}
288
+	if ($output_method == 'echo') {
289
+			echo $link;
290
+	} else {
291
+			return $link;
292
+	}
293
+	}
269 294
 
270 295
 /**
271 296
  * Recent post list:   [board] Subject by Poster    Date
@@ -281,17 +306,17 @@  discard block
 block discarded – undo
281 306
 	global $modSettings, $context;
282 307
 
283 308
 	// Excluding certain boards...
284
-	if ($exclude_boards === null && !empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] > 0)
285
-		$exclude_boards = array($modSettings['recycle_board']);
286
-	else
287
-		$exclude_boards = empty($exclude_boards) ? array() : (is_array($exclude_boards) ? $exclude_boards : array($exclude_boards));
309
+	if ($exclude_boards === null && !empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] > 0) {
310
+			$exclude_boards = array($modSettings['recycle_board']);
311
+	} else {
312
+			$exclude_boards = empty($exclude_boards) ? array() : (is_array($exclude_boards) ? $exclude_boards : array($exclude_boards));
313
+	}
288 314
 
289 315
 	// What about including certain boards - note we do some protection here as pre-2.0 didn't have this parameter.
290 316
 	if (is_array($include_boards) || (int) $include_boards === $include_boards)
291 317
 	{
292 318
 		$include_boards = is_array($include_boards) ? $include_boards : array($include_boards);
293
-	}
294
-	elseif ($include_boards != null)
319
+	} elseif ($include_boards != null)
295 320
 	{
296 321
 		$include_boards = array();
297 322
 	}
@@ -328,8 +353,9 @@  discard block
 block discarded – undo
328 353
 {
329 354
 	global $modSettings;
330 355
 
331
-	if (empty($post_ids))
332
-		return;
356
+	if (empty($post_ids)) {
357
+			return;
358
+	}
333 359
 
334 360
 	// Allow the user to request more than one - why not?
335 361
 	$post_ids = is_array($post_ids) ? $post_ids : array($post_ids);
@@ -364,8 +390,9 @@  discard block
 block discarded – undo
364 390
 	global $scripturl, $txt, $user_info;
365 391
 	global $modSettings, $smcFunc, $context;
366 392
 
367
-	if (!empty($modSettings['enable_likes']))
368
-		$context['can_like'] = allowedTo('likes_like');
393
+	if (!empty($modSettings['enable_likes'])) {
394
+			$context['can_like'] = allowedTo('likes_like');
395
+	}
369 396
 
370 397
 	// Find all the posts. Newer ones will have higher IDs.
371 398
 	$request = $smcFunc['db_query']('substring', '
@@ -431,12 +458,13 @@  discard block
 block discarded – undo
431 458
 		);
432 459
 
433 460
 		// Get the likes for each message.
434
-		if (!empty($modSettings['enable_likes']))
435
-			$posts[$row['id_msg']]['likes'] = array(
461
+		if (!empty($modSettings['enable_likes'])) {
462
+					$posts[$row['id_msg']]['likes'] = array(
436 463
 				'count' => $row['likes'],
437 464
 				'you' => in_array($row['id_msg'], prepareLikesContext($row['id_topic'])),
438 465
 				'can_like' => !$context['user']['is_guest'] && $row['id_member'] != $context['user']['id'] && !empty($context['can_like']),
439 466
 			);
467
+		}
440 468
 	}
441 469
 	$smcFunc['db_free_result']($request);
442 470
 
@@ -444,13 +472,14 @@  discard block
 block discarded – undo
444 472
 	call_integration_hook('integrate_ssi_queryPosts', array(&$posts));
445 473
 
446 474
 	// Just return it.
447
-	if ($output_method != 'echo' || empty($posts))
448
-		return $posts;
475
+	if ($output_method != 'echo' || empty($posts)) {
476
+			return $posts;
477
+	}
449 478
 
450 479
 	echo '
451 480
 		<table style="border: none" class="ssi_table">';
452
-	foreach ($posts as $post)
453
-		echo '
481
+	foreach ($posts as $post) {
482
+			echo '
454 483
 			<tr>
455 484
 				<td style="text-align: right; vertical-align: top; white-space: nowrap">
456 485
 					[', $post['board']['link'], ']
@@ -464,6 +493,7 @@  discard block
 block discarded – undo
464 493
 					', $post['time'], '
465 494
 				</td>
466 495
 			</tr>';
496
+	}
467 497
 	echo '
468 498
 		</table>';
469 499
 }
@@ -481,25 +511,26 @@  discard block
 block discarded – undo
481 511
 	global $settings, $scripturl, $txt, $user_info;
482 512
 	global $modSettings, $smcFunc, $context;
483 513
 
484
-	if ($exclude_boards === null && !empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] > 0)
485
-		$exclude_boards = array($modSettings['recycle_board']);
486
-	else
487
-		$exclude_boards = empty($exclude_boards) ? array() : (is_array($exclude_boards) ? $exclude_boards : array($exclude_boards));
514
+	if ($exclude_boards === null && !empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] > 0) {
515
+			$exclude_boards = array($modSettings['recycle_board']);
516
+	} else {
517
+			$exclude_boards = empty($exclude_boards) ? array() : (is_array($exclude_boards) ? $exclude_boards : array($exclude_boards));
518
+	}
488 519
 
489 520
 	// Only some boards?.
490 521
 	if (is_array($include_boards) || (int) $include_boards === $include_boards)
491 522
 	{
492 523
 		$include_boards = is_array($include_boards) ? $include_boards : array($include_boards);
493
-	}
494
-	elseif ($include_boards != null)
524
+	} elseif ($include_boards != null)
495 525
 	{
496 526
 		$output_method = $include_boards;
497 527
 		$include_boards = array();
498 528
 	}
499 529
 
500 530
 	$icon_sources = array();
501
-	foreach ($context['stable_icons'] as $icon)
502
-		$icon_sources[$icon] = 'images_url';
531
+	foreach ($context['stable_icons'] as $icon) {
532
+			$icon_sources[$icon] = 'images_url';
533
+	}
503 534
 
504 535
 	// Find all the posts in distinct topics.  Newer ones will have higher IDs.
505 536
 	$request = $smcFunc['db_query']('substring', '
@@ -524,13 +555,15 @@  discard block
 block discarded – undo
524 555
 		)
525 556
 	);
526 557
 	$topics = array();
527
-	while ($row = $smcFunc['db_fetch_assoc']($request))
528
-		$topics[$row['id_topic']] = $row;
558
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
559
+			$topics[$row['id_topic']] = $row;
560
+	}
529 561
 	$smcFunc['db_free_result']($request);
530 562
 
531 563
 	// Did we find anything? If not, bail.
532
-	if (empty($topics))
533
-		return array();
564
+	if (empty($topics)) {
565
+			return array();
566
+	}
534 567
 
535 568
 	$recycle_board = !empty($modSettings['recycle_enable']) && !empty($modSettings['recycle_board']) ? (int) $modSettings['recycle_board'] : 0;
536 569
 
@@ -558,19 +591,22 @@  discard block
 block discarded – undo
558 591
 	while ($row = $smcFunc['db_fetch_assoc']($request))
559 592
 	{
560 593
 		$row['body'] = strip_tags(strtr(parse_bbc($row['body'], $row['smileys_enabled'], $row['id_msg']), array('<br>' => '&#10;')));
561
-		if ($smcFunc['strlen']($row['body']) > 128)
562
-			$row['body'] = $smcFunc['substr']($row['body'], 0, 128) . '...';
594
+		if ($smcFunc['strlen']($row['body']) > 128) {
595
+					$row['body'] = $smcFunc['substr']($row['body'], 0, 128) . '...';
596
+		}
563 597
 
564 598
 		// Censor the subject.
565 599
 		censorText($row['subject']);
566 600
 		censorText($row['body']);
567 601
 
568 602
 		// Recycled icon
569
-		if (!empty($recycle_board) && $topics[$row['id_topic']]['id_board'])
570
-			$row['icon'] = 'recycled';
603
+		if (!empty($recycle_board) && $topics[$row['id_topic']]['id_board']) {
604
+					$row['icon'] = 'recycled';
605
+		}
571 606
 
572
-		if (!empty($modSettings['messageIconChecks_enable']) && !isset($icon_sources[$row['icon']]))
573
-			$icon_sources[$row['icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['icon'] . '.png') ? 'images_url' : 'default_images_url';
607
+		if (!empty($modSettings['messageIconChecks_enable']) && !isset($icon_sources[$row['icon']])) {
608
+					$icon_sources[$row['icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['icon'] . '.png') ? 'images_url' : 'default_images_url';
609
+		}
574 610
 
575 611
 		// Build the array.
576 612
 		$posts[] = array(
@@ -609,13 +645,14 @@  discard block
 block discarded – undo
609 645
 	call_integration_hook('integrate_ssi_recentTopics', array(&$posts));
610 646
 
611 647
 	// Just return it.
612
-	if ($output_method != 'echo' || empty($posts))
613
-		return $posts;
648
+	if ($output_method != 'echo' || empty($posts)) {
649
+			return $posts;
650
+	}
614 651
 
615 652
 	echo '
616 653
 		<table style="border: none" class="ssi_table">';
617
-	foreach ($posts as $post)
618
-		echo '
654
+	foreach ($posts as $post) {
655
+			echo '
619 656
 			<tr>
620 657
 				<td style="text-align: right; vertical-align: top; white-space: nowrap">
621 658
 					[', $post['board']['link'], ']
@@ -629,6 +666,7 @@  discard block
 block discarded – undo
629 666
 					', $post['time'], '
630 667
 				</td>
631 668
 			</tr>';
669
+	}
632 670
 	echo '
633 671
 		</table>';
634 672
 }
@@ -653,27 +691,30 @@  discard block
 block discarded – undo
653 691
 		)
654 692
 	);
655 693
 	$return = array();
656
-	while ($row = $smcFunc['db_fetch_assoc']($request))
657
-		$return[] = array(
694
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
695
+			$return[] = array(
658 696
 			'id' => $row['id_member'],
659 697
 			'name' => $row['real_name'],
660 698
 			'href' => $scripturl . '?action=profile;u=' . $row['id_member'],
661 699
 			'link' => '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>',
662 700
 			'posts' => $row['posts']
663 701
 		);
702
+	}
664 703
 	$smcFunc['db_free_result']($request);
665 704
 
666 705
 	// If mods want to do somthing with this list of members, let them do that now.
667 706
 	call_integration_hook('integrate_ssi_topPoster', array(&$return));
668 707
 
669 708
 	// Just return all the top posters.
670
-	if ($output_method != 'echo')
671
-		return $return;
709
+	if ($output_method != 'echo') {
710
+			return $return;
711
+	}
672 712
 
673 713
 	// Make a quick array to list the links in.
674 714
 	$temp_array = array();
675
-	foreach ($return as $member)
676
-		$temp_array[] = $member['link'];
715
+	foreach ($return as $member) {
716
+			$temp_array[] = $member['link'];
717
+	}
677 718
 
678 719
 	echo implode(', ', $temp_array);
679 720
 }
@@ -705,8 +746,8 @@  discard block
 block discarded – undo
705 746
 		)
706 747
 	);
707 748
 	$boards = array();
708
-	while ($row = $smcFunc['db_fetch_assoc']($request))
709
-		$boards[] = array(
749
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
750
+			$boards[] = array(
710 751
 			'id' => $row['id_board'],
711 752
 			'num_posts' => $row['num_posts'],
712 753
 			'num_topics' => $row['num_topics'],
@@ -715,14 +756,16 @@  discard block
 block discarded – undo
715 756
 			'href' => $scripturl . '?board=' . $row['id_board'] . '.0',
716 757
 			'link' => '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>'
717 758
 		);
759
+	}
718 760
 	$smcFunc['db_free_result']($request);
719 761
 
720 762
 	// If mods want to do somthing with this list of boards, let them do that now.
721 763
 	call_integration_hook('integrate_ssi_topBoards', array(&$boards));
722 764
 
723 765
 	// If we shouldn't output or have nothing to output, just jump out.
724
-	if ($output_method != 'echo' || empty($boards))
725
-		return $boards;
766
+	if ($output_method != 'echo' || empty($boards)) {
767
+			return $boards;
768
+	}
726 769
 
727 770
 	echo '
728 771
 		<table class="ssi_table">
@@ -731,13 +774,14 @@  discard block
 block discarded – undo
731 774
 				<th style="text-align: left">', $txt['board_topics'], '</th>
732 775
 				<th style="text-align: left">', $txt['posts'], '</th>
733 776
 			</tr>';
734
-	foreach ($boards as $sBoard)
735
-		echo '
777
+	foreach ($boards as $sBoard) {
778
+			echo '
736 779
 			<tr>
737 780
 				<td>', $sBoard['link'], $sBoard['new'] ? ' <a href="' . $sBoard['href'] . '"><span class="new_posts">' . $txt['new'] . '</span></a>' : '', '</td>
738 781
 				<td style="text-align: right">', comma_format($sBoard['num_topics']), '</td>
739 782
 				<td style="text-align: right">', comma_format($sBoard['num_posts']), '</td>
740 783
 			</tr>';
784
+	}
741 785
 	echo '
742 786
 		</table>';
743 787
 }
@@ -770,12 +814,13 @@  discard block
 block discarded – undo
770 814
 			)
771 815
 		);
772 816
 		$topic_ids = array();
773
-		while ($row = $smcFunc['db_fetch_assoc']($request))
774
-			$topic_ids[] = $row['id_topic'];
817
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
818
+					$topic_ids[] = $row['id_topic'];
819
+		}
775 820
 		$smcFunc['db_free_result']($request);
821
+	} else {
822
+			$topic_ids = array();
776 823
 	}
777
-	else
778
-		$topic_ids = array();
779 824
 
780 825
 	$request = $smcFunc['db_query']('', '
781 826
 		SELECT m.subject, m.id_topic, t.num_views, t.num_replies
@@ -814,8 +859,9 @@  discard block
 block discarded – undo
814 859
 	// If mods want to do somthing with this list of topics, let them do that now.
815 860
 	call_integration_hook('integrate_ssi_topTopics', array(&$topics, $type));
816 861
 
817
-	if ($output_method != 'echo' || empty($topics))
818
-		return $topics;
862
+	if ($output_method != 'echo' || empty($topics)) {
863
+			return $topics;
864
+	}
819 865
 
820 866
 	echo '
821 867
 		<table class="ssi_table">
@@ -824,8 +870,8 @@  discard block
 block discarded – undo
824 870
 				<th style="text-align: left">', $txt['views'], '</th>
825 871
 				<th style="text-align: left">', $txt['replies'], '</th>
826 872
 			</tr>';
827
-	foreach ($topics as $sTopic)
828
-		echo '
873
+	foreach ($topics as $sTopic) {
874
+			echo '
829 875
 			<tr>
830 876
 				<td style="text-align: left">
831 877
 					', $sTopic['link'], '
@@ -833,6 +879,7 @@  discard block
 block discarded – undo
833 879
 				<td style="text-align: right">', comma_format($sTopic['num_views']), '</td>
834 880
 				<td style="text-align: right">', comma_format($sTopic['num_replies']), '</td>
835 881
 			</tr>';
882
+	}
836 883
 	echo '
837 884
 		</table>';
838 885
 }
@@ -868,12 +915,13 @@  discard block
 block discarded – undo
868 915
 {
869 916
 	global $txt, $context;
870 917
 
871
-	if ($output_method == 'echo')
872
-		echo '
918
+	if ($output_method == 'echo') {
919
+			echo '
873 920
 	', sprintf($txt['welcome_newest_member'], $context['common_stats']['latest_member']['link']), '<br>';
874
-	else
875
-		return $context['common_stats']['latest_member'];
876
-}
921
+	} else {
922
+			return $context['common_stats']['latest_member'];
923
+	}
924
+	}
877 925
 
878 926
 /**
879 927
  * Fetches a random member.
@@ -922,8 +970,9 @@  discard block
 block discarded – undo
922 970
 	}
923 971
 
924 972
 	// Just to be sure put the random generator back to something... random.
925
-	if ($random_type != '')
926
-		mt_srand(time());
973
+	if ($random_type != '') {
974
+			mt_srand(time());
975
+	}
927 976
 
928 977
 	return $result;
929 978
 }
@@ -936,8 +985,9 @@  discard block
 block discarded – undo
936 985
  */
937 986
 function ssi_fetchMember($member_ids = array(), $output_method = 'echo')
938 987
 {
939
-	if (empty($member_ids))
940
-		return;
988
+	if (empty($member_ids)) {
989
+			return;
990
+	}
941 991
 
942 992
 	// Can have more than one member if you really want...
943 993
 	$member_ids = is_array($member_ids) ? $member_ids : array($member_ids);
@@ -962,8 +1012,9 @@  discard block
 block discarded – undo
962 1012
  */
963 1013
 function ssi_fetchGroupMembers($group_id = null, $output_method = 'echo')
964 1014
 {
965
-	if ($group_id === null)
966
-		return;
1015
+	if ($group_id === null) {
1016
+			return;
1017
+	}
967 1018
 
968 1019
 	$query_where = '
969 1020
 		id_group = {int:id_group}
@@ -990,8 +1041,9 @@  discard block
 block discarded – undo
990 1041
 {
991 1042
 	global $smcFunc, $memberContext;
992 1043
 
993
-	if ($query_where === null)
994
-		return;
1044
+	if ($query_where === null) {
1045
+			return;
1046
+	}
995 1047
 
996 1048
 	// Fetch the members in question.
997 1049
 	$request = $smcFunc['db_query']('', '
@@ -1004,12 +1056,14 @@  discard block
 block discarded – undo
1004 1056
 		))
1005 1057
 	);
1006 1058
 	$members = array();
1007
-	while ($row = $smcFunc['db_fetch_assoc']($request))
1008
-		$members[] = $row['id_member'];
1059
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
1060
+			$members[] = $row['id_member'];
1061
+	}
1009 1062
 	$smcFunc['db_free_result']($request);
1010 1063
 
1011
-	if (empty($members))
1012
-		return array();
1064
+	if (empty($members)) {
1065
+			return array();
1066
+	}
1013 1067
 
1014 1068
 	// If mods want to do somthing with this list of members, let them do that now.
1015 1069
 	call_integration_hook('integrate_ssi_queryMembers', array(&$members));
@@ -1018,23 +1072,25 @@  discard block
 block discarded – undo
1018 1072
 	loadMemberData($members);
1019 1073
 
1020 1074
 	// Draw the table!
1021
-	if ($output_method == 'echo')
1022
-		echo '
1075
+	if ($output_method == 'echo') {
1076
+			echo '
1023 1077
 		<table style="border: none" class="ssi_table">';
1078
+	}
1024 1079
 
1025 1080
 	$query_members = array();
1026 1081
 	foreach ($members as $member)
1027 1082
 	{
1028 1083
 		// Load their context data.
1029
-		if (!loadMemberContext($member))
1030
-			continue;
1084
+		if (!loadMemberContext($member)) {
1085
+					continue;
1086
+		}
1031 1087
 
1032 1088
 		// Store this member's information.
1033 1089
 		$query_members[$member] = $memberContext[$member];
1034 1090
 
1035 1091
 		// Only do something if we're echo'ing.
1036
-		if ($output_method == 'echo')
1037
-			echo '
1092
+		if ($output_method == 'echo') {
1093
+					echo '
1038 1094
 			<tr>
1039 1095
 				<td style="text-align: right; vertical-align: top; white-space: nowrap">
1040 1096
 					', $query_members[$member]['link'], '
@@ -1042,12 +1098,14 @@  discard block
 block discarded – undo
1042 1098
 					<br>', $query_members[$member]['avatar']['image'], '
1043 1099
 				</td>
1044 1100
 			</tr>';
1101
+		}
1045 1102
 	}
1046 1103
 
1047 1104
 	// End the table if appropriate.
1048
-	if ($output_method == 'echo')
1049
-		echo '
1105
+	if ($output_method == 'echo') {
1106
+			echo '
1050 1107
 		</table>';
1108
+	}
1051 1109
 
1052 1110
 	// Send back the data.
1053 1111
 	return $query_members;
@@ -1062,8 +1120,9 @@  discard block
 block discarded – undo
1062 1120
 {
1063 1121
 	global $txt, $scripturl, $modSettings, $smcFunc;
1064 1122
 
1065
-	if (!allowedTo('view_stats'))
1066
-		return;
1123
+	if (!allowedTo('view_stats')) {
1124
+			return;
1125
+	}
1067 1126
 
1068 1127
 	$totals = array(
1069 1128
 		'members' => $modSettings['totalMembers'],
@@ -1092,8 +1151,9 @@  discard block
 block discarded – undo
1092 1151
 	// If mods want to do somthing with the board stats, let them do that now.
1093 1152
 	call_integration_hook('integrate_ssi_boardStats', array(&$totals));
1094 1153
 
1095
-	if ($output_method != 'echo')
1096
-		return $totals;
1154
+	if ($output_method != 'echo') {
1155
+			return $totals;
1156
+	}
1097 1157
 
1098 1158
 	echo '
1099 1159
 		', $txt['total_members'], ': <a href="', $scripturl . '?action=mlist">', comma_format($totals['members']), '</a><br>
@@ -1122,8 +1182,8 @@  discard block
 block discarded – undo
1122 1182
 	call_integration_hook('integrate_ssi_whosOnline', array(&$return));
1123 1183
 
1124 1184
 	// Add some redundancy for backwards compatibility reasons.
1125
-	if ($output_method != 'echo')
1126
-		return $return + array(
1185
+	if ($output_method != 'echo') {
1186
+			return $return + array(
1127 1187
 			'users' => $return['users_online'],
1128 1188
 			'guests' => $return['num_guests'],
1129 1189
 			'hidden' => $return['num_users_hidden'],
@@ -1131,29 +1191,35 @@  discard block
 block discarded – undo
1131 1191
 			'num_users' => $return['num_users_online'],
1132 1192
 			'total_users' => $return['num_users_online'] + $return['num_guests'],
1133 1193
 		);
1194
+	}
1134 1195
 
1135 1196
 	echo '
1136 1197
 		', comma_format($return['num_guests']), ' ', $return['num_guests'] == 1 ? $txt['guest'] : $txt['guests'], ', ', comma_format($return['num_users_online']), ' ', $return['num_users_online'] == 1 ? $txt['user'] : $txt['users'];
1137 1198
 
1138 1199
 	$bracketList = array();
1139
-	if (!empty($user_info['buddies']))
1140
-		$bracketList[] = comma_format($return['num_buddies']) . ' ' . ($return['num_buddies'] == 1 ? $txt['buddy'] : $txt['buddies']);
1141
-	if (!empty($return['num_spiders']))
1142
-		$bracketList[] = comma_format($return['num_spiders']) . ' ' . ($return['num_spiders'] == 1 ? $txt['spider'] : $txt['spiders']);
1143
-	if (!empty($return['num_users_hidden']))
1144
-		$bracketList[] = comma_format($return['num_users_hidden']) . ' ' . $txt['hidden'];
1200
+	if (!empty($user_info['buddies'])) {
1201
+			$bracketList[] = comma_format($return['num_buddies']) . ' ' . ($return['num_buddies'] == 1 ? $txt['buddy'] : $txt['buddies']);
1202
+	}
1203
+	if (!empty($return['num_spiders'])) {
1204
+			$bracketList[] = comma_format($return['num_spiders']) . ' ' . ($return['num_spiders'] == 1 ? $txt['spider'] : $txt['spiders']);
1205
+	}
1206
+	if (!empty($return['num_users_hidden'])) {
1207
+			$bracketList[] = comma_format($return['num_users_hidden']) . ' ' . $txt['hidden'];
1208
+	}
1145 1209
 
1146
-	if (!empty($bracketList))
1147
-		echo ' (' . implode(', ', $bracketList) . ')';
1210
+	if (!empty($bracketList)) {
1211
+			echo ' (' . implode(', ', $bracketList) . ')';
1212
+	}
1148 1213
 
1149 1214
 	echo '<br>
1150 1215
 			', implode(', ', $return['list_users_online']);
1151 1216
 
1152 1217
 	// Showing membergroups?
1153
-	if (!empty($settings['show_group_key']) && !empty($return['membergroups']))
1154
-		echo '<br>
1218
+	if (!empty($settings['show_group_key']) && !empty($return['membergroups'])) {
1219
+			echo '<br>
1155 1220
 			[' . implode(']&nbsp;&nbsp;[', $return['membergroups']) . ']';
1156
-}
1221
+	}
1222
+	}
1157 1223
 
1158 1224
 /**
1159 1225
  * Just like whosOnline except it also logs the online presence.
@@ -1164,11 +1230,12 @@  discard block
 block discarded – undo
1164 1230
 {
1165 1231
 	writeLog();
1166 1232
 
1167
-	if ($output_method != 'echo')
1168
-		return ssi_whosOnline($output_method);
1169
-	else
1170
-		ssi_whosOnline($output_method);
1171
-}
1233
+	if ($output_method != 'echo') {
1234
+			return ssi_whosOnline($output_method);
1235
+	} else {
1236
+			ssi_whosOnline($output_method);
1237
+	}
1238
+	}
1172 1239
 
1173 1240
 // Shows a login box.
1174 1241
 /**
@@ -1181,11 +1248,13 @@  discard block
 block discarded – undo
1181 1248
 {
1182 1249
 	global $scripturl, $txt, $user_info, $context;
1183 1250
 
1184
-	if ($redirect_to != '')
1185
-		$_SESSION['login_url'] = $redirect_to;
1251
+	if ($redirect_to != '') {
1252
+			$_SESSION['login_url'] = $redirect_to;
1253
+	}
1186 1254
 
1187
-	if ($output_method != 'echo' || !$user_info['is_guest'])
1188
-		return $user_info['is_guest'];
1255
+	if ($output_method != 'echo' || !$user_info['is_guest']) {
1256
+			return $user_info['is_guest'];
1257
+	}
1189 1258
 
1190 1259
 	// Create a login token
1191 1260
 	createToken('login');
@@ -1237,8 +1306,9 @@  discard block
 block discarded – undo
1237 1306
 
1238 1307
 	$boardsAllowed = array_intersect(boardsAllowedTo('poll_view'), boardsAllowedTo('poll_vote'));
1239 1308
 
1240
-	if (empty($boardsAllowed))
1241
-		return array();
1309
+	if (empty($boardsAllowed)) {
1310
+			return array();
1311
+	}
1242 1312
 
1243 1313
 	$request = $smcFunc['db_query']('', '
1244 1314
 		SELECT p.id_poll, p.question, t.id_topic, p.max_votes, p.guest_vote, p.hide_results, p.expire_time
@@ -1271,12 +1341,14 @@  discard block
 block discarded – undo
1271 1341
 	$smcFunc['db_free_result']($request);
1272 1342
 
1273 1343
 	// This user has voted on all the polls.
1274
-	if (empty($row) || !is_array($row))
1275
-		return array();
1344
+	if (empty($row) || !is_array($row)) {
1345
+			return array();
1346
+	}
1276 1347
 
1277 1348
 	// If this is a guest who's voted we'll through ourselves to show poll to show the results.
1278
-	if ($user_info['is_guest'] && (!$row['guest_vote'] || (isset($_COOKIE['guest_poll_vote']) && in_array($row['id_poll'], explode(',', $_COOKIE['guest_poll_vote'])))))
1279
-		return ssi_showPoll($row['id_topic'], $output_method);
1349
+	if ($user_info['is_guest'] && (!$row['guest_vote'] || (isset($_COOKIE['guest_poll_vote']) && in_array($row['id_poll'], explode(',', $_COOKIE['guest_poll_vote']))))) {
1350
+			return ssi_showPoll($row['id_topic'], $output_method);
1351
+	}
1280 1352
 
1281 1353
 	$request = $smcFunc['db_query']('', '
1282 1354
 		SELECT COUNT(DISTINCT id_member)
@@ -1340,8 +1412,9 @@  discard block
 block discarded – undo
1340 1412
 	// If mods want to do somthing with this list of polls, let them do that now.
1341 1413
 	call_integration_hook('integrate_ssi_recentPoll', array(&$return, $topPollInstead));
1342 1414
 
1343
-	if ($output_method != 'echo')
1344
-		return $return;
1415
+	if ($output_method != 'echo') {
1416
+			return $return;
1417
+	}
1345 1418
 
1346 1419
 	if ($allow_view_results)
1347 1420
 	{
@@ -1350,19 +1423,20 @@  discard block
 block discarded – undo
1350 1423
 			<strong>', $return['question'], '</strong><br>
1351 1424
 			', !empty($return['allowed_warning']) ? $return['allowed_warning'] . '<br>' : '';
1352 1425
 
1353
-		foreach ($return['options'] as $option)
1354
-			echo '
1426
+		foreach ($return['options'] as $option) {
1427
+					echo '
1355 1428
 			<label for="', $option['id'], '">', $option['vote_button'], ' ', $option['option'], '</label><br>';
1429
+		}
1356 1430
 
1357 1431
 		echo '
1358 1432
 			<input type="submit" value="', $txt['poll_vote'], '" class="button_submit">
1359 1433
 			<input type="hidden" name="poll" value="', $return['id'], '">
1360 1434
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
1361 1435
 		</form>';
1436
+	} else {
1437
+			echo $txt['poll_cannot_see'];
1438
+	}
1362 1439
 	}
1363
-	else
1364
-		echo $txt['poll_cannot_see'];
1365
-}
1366 1440
 
1367 1441
 /**
1368 1442
  * Shows the poll from the specified topic
@@ -1376,13 +1450,15 @@  discard block
 block discarded – undo
1376 1450
 
1377 1451
 	$boardsAllowed = boardsAllowedTo('poll_view');
1378 1452
 
1379
-	if (empty($boardsAllowed))
1380
-		return array();
1453
+	if (empty($boardsAllowed)) {
1454
+			return array();
1455
+	}
1381 1456
 
1382
-	if ($topic === null && isset($_REQUEST['ssi_topic']))
1383
-		$topic = (int) $_REQUEST['ssi_topic'];
1384
-	else
1385
-		$topic = (int) $topic;
1457
+	if ($topic === null && isset($_REQUEST['ssi_topic'])) {
1458
+			$topic = (int) $_REQUEST['ssi_topic'];
1459
+	} else {
1460
+			$topic = (int) $topic;
1461
+	}
1386 1462
 
1387 1463
 	$request = $smcFunc['db_query']('', '
1388 1464
 		SELECT
@@ -1403,17 +1479,18 @@  discard block
 block discarded – undo
1403 1479
 	);
1404 1480
 
1405 1481
 	// Either this topic has no poll, or the user cannot view it.
1406
-	if ($smcFunc['db_num_rows']($request) == 0)
1407
-		return array();
1482
+	if ($smcFunc['db_num_rows']($request) == 0) {
1483
+			return array();
1484
+	}
1408 1485
 
1409 1486
 	$row = $smcFunc['db_fetch_assoc']($request);
1410 1487
 	$smcFunc['db_free_result']($request);
1411 1488
 
1412 1489
 	// Check if they can vote.
1413 1490
 	$already_voted = false;
1414
-	if (!empty($row['expire_time']) && $row['expire_time'] < time())
1415
-		$allow_vote = false;
1416
-	elseif ($user_info['is_guest'])
1491
+	if (!empty($row['expire_time']) && $row['expire_time'] < time()) {
1492
+			$allow_vote = false;
1493
+	} elseif ($user_info['is_guest'])
1417 1494
 	{
1418 1495
 		// There's a difference between "allowed to vote" and "already voted"...
1419 1496
 		$allow_vote = $row['guest_vote'];
@@ -1423,10 +1500,9 @@  discard block
 block discarded – undo
1423 1500
 		{
1424 1501
 			$already_voted = true;
1425 1502
 		}
1426
-	}
1427
-	elseif (!empty($row['voting_locked']) || !allowedTo('poll_vote', $row['id_board']))
1428
-		$allow_vote = false;
1429
-	else
1503
+	} elseif (!empty($row['voting_locked']) || !allowedTo('poll_vote', $row['id_board'])) {
1504
+			$allow_vote = false;
1505
+	} else
1430 1506
 	{
1431 1507
 		$request = $smcFunc['db_query']('', '
1432 1508
 			SELECT id_member
@@ -1508,8 +1584,9 @@  discard block
 block discarded – undo
1508 1584
 	// If mods want to do somthing with this poll, let them do that now.
1509 1585
 	call_integration_hook('integrate_ssi_showPoll', array(&$return));
1510 1586
 
1511
-	if ($output_method != 'echo')
1512
-		return $return;
1587
+	if ($output_method != 'echo') {
1588
+			return $return;
1589
+	}
1513 1590
 
1514 1591
 	if ($return['allow_vote'])
1515 1592
 	{
@@ -1518,17 +1595,17 @@  discard block
 block discarded – undo
1518 1595
 				<strong>', $return['question'], '</strong><br>
1519 1596
 				', !empty($return['allowed_warning']) ? $return['allowed_warning'] . '<br>' : '';
1520 1597
 
1521
-		foreach ($return['options'] as $option)
1522
-			echo '
1598
+		foreach ($return['options'] as $option) {
1599
+					echo '
1523 1600
 				<label for="', $option['id'], '">', $option['vote_button'], ' ', $option['option'], '</label><br>';
1601
+		}
1524 1602
 
1525 1603
 		echo '
1526 1604
 				<input type="submit" value="', $txt['poll_vote'], '" class="button_submit">
1527 1605
 				<input type="hidden" name="poll" value="', $return['id'], '">
1528 1606
 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
1529 1607
 			</form>';
1530
-	}
1531
-	else
1608
+	} else
1532 1609
 	{
1533 1610
 		echo '
1534 1611
 			<div class="ssi_poll">
@@ -1608,27 +1685,32 @@  discard block
 block discarded – undo
1608 1685
 			'is_approved' => 1,
1609 1686
 		)
1610 1687
 	);
1611
-	if ($smcFunc['db_num_rows']($request) == 0)
1612
-		die;
1688
+	if ($smcFunc['db_num_rows']($request) == 0) {
1689
+			die;
1690
+	}
1613 1691
 	$row = $smcFunc['db_fetch_assoc']($request);
1614 1692
 	$smcFunc['db_free_result']($request);
1615 1693
 
1616
-	if (!empty($row['voting_locked']) || ($row['selected'] != -1 && !$user_info['is_guest']) || (!empty($row['expire_time']) && time() > $row['expire_time']))
1617
-		redirectexit('topic=' . $row['id_topic'] . '.0');
1694
+	if (!empty($row['voting_locked']) || ($row['selected'] != -1 && !$user_info['is_guest']) || (!empty($row['expire_time']) && time() > $row['expire_time'])) {
1695
+			redirectexit('topic=' . $row['id_topic'] . '.0');
1696
+	}
1618 1697
 
1619 1698
 	// Too many options checked?
1620
-	if (count($_REQUEST['options']) > $row['max_votes'])
1621
-		redirectexit('topic=' . $row['id_topic'] . '.0');
1699
+	if (count($_REQUEST['options']) > $row['max_votes']) {
1700
+			redirectexit('topic=' . $row['id_topic'] . '.0');
1701
+	}
1622 1702
 
1623 1703
 	// It's a guest who has already voted?
1624 1704
 	if ($user_info['is_guest'])
1625 1705
 	{
1626 1706
 		// Guest voting disabled?
1627
-		if (!$row['guest_vote'])
1628
-			redirectexit('topic=' . $row['id_topic'] . '.0');
1707
+		if (!$row['guest_vote']) {
1708
+					redirectexit('topic=' . $row['id_topic'] . '.0');
1709
+		}
1629 1710
 		// Already voted?
1630
-		elseif (isset($_COOKIE['guest_poll_vote']) && in_array($row['id_poll'], explode(',', $_COOKIE['guest_poll_vote'])))
1631
-			redirectexit('topic=' . $row['id_topic'] . '.0');
1711
+		elseif (isset($_COOKIE['guest_poll_vote']) && in_array($row['id_poll'], explode(',', $_COOKIE['guest_poll_vote']))) {
1712
+					redirectexit('topic=' . $row['id_topic'] . '.0');
1713
+		}
1632 1714
 	}
1633 1715
 
1634 1716
 	$sOptions = array();
@@ -1682,11 +1764,13 @@  discard block
 block discarded – undo
1682 1764
 {
1683 1765
 	global $scripturl, $txt, $context;
1684 1766
 
1685
-	if (!allowedTo('search_posts'))
1686
-		return;
1767
+	if (!allowedTo('search_posts')) {
1768
+			return;
1769
+	}
1687 1770
 
1688
-	if ($output_method != 'echo')
1689
-		return $scripturl . '?action=search';
1771
+	if ($output_method != 'echo') {
1772
+			return $scripturl . '?action=search';
1773
+	}
1690 1774
 
1691 1775
 	echo '
1692 1776
 		<form action="', $scripturl, '?action=search2" method="post" accept-charset="', $context['character_set'], '">
@@ -1708,8 +1792,9 @@  discard block
 block discarded – undo
1708 1792
 	// If mods want to do somthing with the news, let them do that now. Don't need to pass the news line itself, since it is already in $context.
1709 1793
 	call_integration_hook('integrate_ssi_news');
1710 1794
 
1711
-	if ($output_method != 'echo')
1712
-		return $context['random_news_line'];
1795
+	if ($output_method != 'echo') {
1796
+			return $context['random_news_line'];
1797
+	}
1713 1798
 
1714 1799
 	echo $context['random_news_line'];
1715 1800
 }
@@ -1723,8 +1808,9 @@  discard block
 block discarded – undo
1723 1808
 {
1724 1809
 	global $scripturl, $modSettings, $user_info;
1725 1810
 
1726
-	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view') || !allowedTo('profile_view'))
1727
-		return;
1811
+	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view') || !allowedTo('profile_view')) {
1812
+			return;
1813
+	}
1728 1814
 
1729 1815
 	$eventOptions = array(
1730 1816
 		'include_birthdays' => true,
@@ -1735,13 +1821,15 @@  discard block
 block discarded – undo
1735 1821
 	// The ssi_todaysCalendar variants all use the same hook and just pass on $eventOptions so the hooked code can distinguish different cases if necessary
1736 1822
 	call_integration_hook('integrate_ssi_calendar', array(&$return, $eventOptions));
1737 1823
 
1738
-	if ($output_method != 'echo')
1739
-		return $return['calendar_birthdays'];
1824
+	if ($output_method != 'echo') {
1825
+			return $return['calendar_birthdays'];
1826
+	}
1740 1827
 
1741
-	foreach ($return['calendar_birthdays'] as $member)
1742
-		echo '
1828
+	foreach ($return['calendar_birthdays'] as $member) {
1829
+			echo '
1743 1830
 			<a href="', $scripturl, '?action=profile;u=', $member['id'], '"><span class="fix_rtl_names">' . $member['name'] . '</span>' . (isset($member['age']) ? ' (' . $member['age'] . ')' : '') . '</a>' . (!$member['is_last'] ? ', ' : '');
1744
-}
1831
+	}
1832
+	}
1745 1833
 
1746 1834
 /**
1747 1835
  * Shows today's holidays.
@@ -1752,8 +1840,9 @@  discard block
 block discarded – undo
1752 1840
 {
1753 1841
 	global $modSettings, $user_info;
1754 1842
 
1755
-	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view'))
1756
-		return;
1843
+	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view')) {
1844
+			return;
1845
+	}
1757 1846
 
1758 1847
 	$eventOptions = array(
1759 1848
 		'include_holidays' => true,
@@ -1764,8 +1853,9 @@  discard block
 block discarded – undo
1764 1853
 	// The ssi_todaysCalendar variants all use the same hook and just pass on $eventOptions so the hooked code can distinguish different cases if necessary
1765 1854
 	call_integration_hook('integrate_ssi_calendar', array(&$return, $eventOptions));
1766 1855
 
1767
-	if ($output_method != 'echo')
1768
-		return $return['calendar_holidays'];
1856
+	if ($output_method != 'echo') {
1857
+			return $return['calendar_holidays'];
1858
+	}
1769 1859
 
1770 1860
 	echo '
1771 1861
 		', implode(', ', $return['calendar_holidays']);
@@ -1779,8 +1869,9 @@  discard block
 block discarded – undo
1779 1869
 {
1780 1870
 	global $modSettings, $user_info;
1781 1871
 
1782
-	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view'))
1783
-		return;
1872
+	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view')) {
1873
+			return;
1874
+	}
1784 1875
 
1785 1876
 	$eventOptions = array(
1786 1877
 		'include_events' => true,
@@ -1791,14 +1882,16 @@  discard block
 block discarded – undo
1791 1882
 	// The ssi_todaysCalendar variants all use the same hook and just pass on $eventOptions so the hooked code can distinguish different cases if necessary
1792 1883
 	call_integration_hook('integrate_ssi_calendar', array(&$return, $eventOptions));
1793 1884
 
1794
-	if ($output_method != 'echo')
1795
-		return $return['calendar_events'];
1885
+	if ($output_method != 'echo') {
1886
+			return $return['calendar_events'];
1887
+	}
1796 1888
 
1797 1889
 	foreach ($return['calendar_events'] as $event)
1798 1890
 	{
1799
-		if ($event['can_edit'])
1800
-			echo '
1891
+		if ($event['can_edit']) {
1892
+					echo '
1801 1893
 	<a href="' . $event['modify_href'] . '" style="color: #ff0000;">*</a> ';
1894
+		}
1802 1895
 		echo '
1803 1896
 	' . $event['link'] . (!$event['is_last'] ? ', ' : '');
1804 1897
 	}
@@ -1813,8 +1906,9 @@  discard block
 block discarded – undo
1813 1906
 {
1814 1907
 	global $modSettings, $txt, $scripturl, $user_info;
1815 1908
 
1816
-	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view'))
1817
-		return;
1909
+	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view')) {
1910
+			return;
1911
+	}
1818 1912
 
1819 1913
 	$eventOptions = array(
1820 1914
 		'include_birthdays' => allowedTo('profile_view'),
@@ -1827,19 +1921,22 @@  discard block
 block discarded – undo
1827 1921
 	// The ssi_todaysCalendar variants all use the same hook and just pass on $eventOptions so the hooked code can distinguish different cases if necessary
1828 1922
 	call_integration_hook('integrate_ssi_calendar', array(&$return, $eventOptions));
1829 1923
 
1830
-	if ($output_method != 'echo')
1831
-		return $return;
1924
+	if ($output_method != 'echo') {
1925
+			return $return;
1926
+	}
1832 1927
 
1833
-	if (!empty($return['calendar_holidays']))
1834
-		echo '
1928
+	if (!empty($return['calendar_holidays'])) {
1929
+			echo '
1835 1930
 			<span class="holiday">' . $txt['calendar_prompt'] . ' ' . implode(', ', $return['calendar_holidays']) . '<br></span>';
1931
+	}
1836 1932
 	if (!empty($return['calendar_birthdays']))
1837 1933
 	{
1838 1934
 		echo '
1839 1935
 			<span class="birthday">' . $txt['birthdays_upcoming'] . '</span> ';
1840
-		foreach ($return['calendar_birthdays'] as $member)
1841
-			echo '
1936
+		foreach ($return['calendar_birthdays'] as $member) {
1937
+					echo '
1842 1938
 			<a href="', $scripturl, '?action=profile;u=', $member['id'], '"><span class="fix_rtl_names">', $member['name'], '</span>', isset($member['age']) ? ' (' . $member['age'] . ')' : '', '</a>', !$member['is_last'] ? ', ' : '';
1939
+		}
1843 1940
 		echo '
1844 1941
 			<br>';
1845 1942
 	}
@@ -1849,9 +1946,10 @@  discard block
 block discarded – undo
1849 1946
 			<span class="event">' . $txt['events_upcoming'] . '</span> ';
1850 1947
 		foreach ($return['calendar_events'] as $event)
1851 1948
 		{
1852
-			if ($event['can_edit'])
1853
-				echo '
1949
+			if ($event['can_edit']) {
1950
+							echo '
1854 1951
 			<a href="' . $event['modify_href'] . '" style="color: #ff0000;">*</a> ';
1952
+			}
1855 1953
 			echo '
1856 1954
 			' . $event['link'] . (!$event['is_last'] ? ', ' : '');
1857 1955
 		}
@@ -1875,25 +1973,29 @@  discard block
 block discarded – undo
1875 1973
 	loadLanguage('Stats');
1876 1974
 
1877 1975
 	// Must be integers....
1878
-	if ($limit === null)
1879
-		$limit = isset($_GET['limit']) ? (int) $_GET['limit'] : 5;
1880
-	else
1881
-		$limit = (int) $limit;
1882
-
1883
-	if ($start === null)
1884
-		$start = isset($_GET['start']) ? (int) $_GET['start'] : 0;
1885
-	else
1886
-		$start = (int) $start;
1887
-
1888
-	if ($board !== null)
1889
-		$board = (int) $board;
1890
-	elseif (isset($_GET['board']))
1891
-		$board = (int) $_GET['board'];
1892
-
1893
-	if ($length === null)
1894
-		$length = isset($_GET['length']) ? (int) $_GET['length'] : 0;
1895
-	else
1896
-		$length = (int) $length;
1976
+	if ($limit === null) {
1977
+			$limit = isset($_GET['limit']) ? (int) $_GET['limit'] : 5;
1978
+	} else {
1979
+			$limit = (int) $limit;
1980
+	}
1981
+
1982
+	if ($start === null) {
1983
+			$start = isset($_GET['start']) ? (int) $_GET['start'] : 0;
1984
+	} else {
1985
+			$start = (int) $start;
1986
+	}
1987
+
1988
+	if ($board !== null) {
1989
+			$board = (int) $board;
1990
+	} elseif (isset($_GET['board'])) {
1991
+			$board = (int) $_GET['board'];
1992
+	}
1993
+
1994
+	if ($length === null) {
1995
+			$length = isset($_GET['length']) ? (int) $_GET['length'] : 0;
1996
+	} else {
1997
+			$length = (int) $length;
1998
+	}
1897 1999
 
1898 2000
 	$limit = max(0, $limit);
1899 2001
 	$start = max(0, $start);
@@ -1911,17 +2013,19 @@  discard block
 block discarded – undo
1911 2013
 	);
1912 2014
 	if ($smcFunc['db_num_rows']($request) == 0)
1913 2015
 	{
1914
-		if ($output_method == 'echo')
1915
-			die($txt['ssi_no_guests']);
1916
-		else
1917
-			return array();
2016
+		if ($output_method == 'echo') {
2017
+					die($txt['ssi_no_guests']);
2018
+		} else {
2019
+					return array();
2020
+		}
1918 2021
 	}
1919 2022
 	list ($board) = $smcFunc['db_fetch_row']($request);
1920 2023
 	$smcFunc['db_free_result']($request);
1921 2024
 
1922 2025
 	$icon_sources = array();
1923
-	foreach ($context['stable_icons'] as $icon)
1924
-		$icon_sources[$icon] = 'images_url';
2026
+	foreach ($context['stable_icons'] as $icon) {
2027
+			$icon_sources[$icon] = 'images_url';
2028
+	}
1925 2029
 
1926 2030
 	if (!empty($modSettings['enable_likes']))
1927 2031
 	{
@@ -1945,12 +2049,14 @@  discard block
 block discarded – undo
1945 2049
 		)
1946 2050
 	);
1947 2051
 	$posts = array();
1948
-	while ($row = $smcFunc['db_fetch_assoc']($request))
1949
-		$posts[] = $row['id_first_msg'];
2052
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
2053
+			$posts[] = $row['id_first_msg'];
2054
+	}
1950 2055
 	$smcFunc['db_free_result']($request);
1951 2056
 
1952
-	if (empty($posts))
1953
-		return array();
2057
+	if (empty($posts)) {
2058
+			return array();
2059
+	}
1954 2060
 
1955 2061
 	// Find the posts.
1956 2062
 	$request = $smcFunc['db_query']('', '
@@ -1980,24 +2086,28 @@  discard block
 block discarded – undo
1980 2086
 			$last_space = strrpos($row['body'], ' ');
1981 2087
 			$last_open = strrpos($row['body'], '<');
1982 2088
 			$last_close = strrpos($row['body'], '>');
1983
-			if (empty($last_space) || ($last_space == $last_open + 3 && (empty($last_close) || (!empty($last_close) && $last_close < $last_open))) || $last_space < $last_open || $last_open == $length - 6)
1984
-				$cutoff = $last_open;
1985
-			elseif (empty($last_close) || $last_close < $last_open)
1986
-				$cutoff = $last_space;
2089
+			if (empty($last_space) || ($last_space == $last_open + 3 && (empty($last_close) || (!empty($last_close) && $last_close < $last_open))) || $last_space < $last_open || $last_open == $length - 6) {
2090
+							$cutoff = $last_open;
2091
+			} elseif (empty($last_close) || $last_close < $last_open) {
2092
+							$cutoff = $last_space;
2093
+			}
1987 2094
 
1988
-			if ($cutoff !== false)
1989
-				$row['body'] = $smcFunc['substr']($row['body'], 0, $cutoff);
2095
+			if ($cutoff !== false) {
2096
+							$row['body'] = $smcFunc['substr']($row['body'], 0, $cutoff);
2097
+			}
1990 2098
 			$row['body'] .= '...';
1991 2099
 		}
1992 2100
 
1993 2101
 		$row['body'] = parse_bbc($row['body'], $row['smileys_enabled'], $row['id_msg']);
1994 2102
 
1995
-		if (!empty($recycle_board) && $row['id_board'] == $recycle_board)
1996
-			$row['icon'] = 'recycled';
2103
+		if (!empty($recycle_board) && $row['id_board'] == $recycle_board) {
2104
+					$row['icon'] = 'recycled';
2105
+		}
1997 2106
 
1998 2107
 		// Check that this message icon is there...
1999
-		if (!empty($modSettings['messageIconChecks_enable']) && !isset($icon_sources[$row['icon']]))
2000
-			$icon_sources[$row['icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['icon'] . '.png') ? 'images_url' : 'default_images_url';
2108
+		if (!empty($modSettings['messageIconChecks_enable']) && !isset($icon_sources[$row['icon']])) {
2109
+					$icon_sources[$row['icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['icon'] . '.png') ? 'images_url' : 'default_images_url';
2110
+		}
2001 2111
 
2002 2112
 		censorText($row['subject']);
2003 2113
 		censorText($row['body']);
@@ -2034,16 +2144,18 @@  discard block
 block discarded – undo
2034 2144
 	}
2035 2145
 	$smcFunc['db_free_result']($request);
2036 2146
 
2037
-	if (empty($return))
2038
-		return $return;
2147
+	if (empty($return)) {
2148
+			return $return;
2149
+	}
2039 2150
 
2040 2151
 	$return[count($return) - 1]['is_last'] = true;
2041 2152
 
2042 2153
 	// If mods want to do somthing with this list of posts, let them do that now.
2043 2154
 	call_integration_hook('integrate_ssi_boardNews', array(&$return));
2044 2155
 
2045
-	if ($output_method != 'echo')
2046
-		return $return;
2156
+	if ($output_method != 'echo') {
2157
+			return $return;
2158
+	}
2047 2159
 
2048 2160
 	foreach ($return as $news)
2049 2161
 	{
@@ -2095,9 +2207,10 @@  discard block
 block discarded – undo
2095 2207
 		echo '
2096 2208
 			</div>';
2097 2209
 
2098
-		if (!$news['is_last'])
2099
-			echo '
2210
+		if (!$news['is_last']) {
2211
+					echo '
2100 2212
 			<hr>';
2213
+		}
2101 2214
 	}
2102 2215
 }
2103 2216
 
@@ -2111,8 +2224,9 @@  discard block
 block discarded – undo
2111 2224
 {
2112 2225
 	global $user_info, $scripturl, $modSettings, $txt, $context, $smcFunc;
2113 2226
 
2114
-	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view'))
2115
-		return;
2227
+	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view')) {
2228
+			return;
2229
+	}
2116 2230
 
2117 2231
 	// Find all events which are happening in the near future that the member can see.
2118 2232
 	$request = $smcFunc['db_query']('', '
@@ -2138,20 +2252,23 @@  discard block
 block discarded – undo
2138 2252
 	while ($row = $smcFunc['db_fetch_assoc']($request))
2139 2253
 	{
2140 2254
 		// Check if we've already come by an event linked to this same topic with the same title... and don't display it if we have.
2141
-		if (!empty($duplicates[$row['title'] . $row['id_topic']]))
2142
-			continue;
2255
+		if (!empty($duplicates[$row['title'] . $row['id_topic']])) {
2256
+					continue;
2257
+		}
2143 2258
 
2144 2259
 		// Censor the title.
2145 2260
 		censorText($row['title']);
2146 2261
 
2147
-		if ($row['start_date'] < strftime('%Y-%m-%d', forum_time(false)))
2148
-			$date = strftime('%Y-%m-%d', forum_time(false));
2149
-		else
2150
-			$date = $row['start_date'];
2262
+		if ($row['start_date'] < strftime('%Y-%m-%d', forum_time(false))) {
2263
+					$date = strftime('%Y-%m-%d', forum_time(false));
2264
+		} else {
2265
+					$date = $row['start_date'];
2266
+		}
2151 2267
 
2152 2268
 		// If the topic it is attached to is not approved then don't link it.
2153
-		if (!empty($row['id_first_msg']) && !$row['approved'])
2154
-			$row['id_board'] = $row['id_topic'] = $row['id_first_msg'] = 0;
2269
+		if (!empty($row['id_first_msg']) && !$row['approved']) {
2270
+					$row['id_board'] = $row['id_topic'] = $row['id_first_msg'] = 0;
2271
+		}
2155 2272
 
2156 2273
 		$allday = (empty($row['start_time']) || empty($row['end_time']) || empty($row['timezone']) || !in_array($row['timezone'], timezone_identifiers_list(DateTimeZone::ALL_WITH_BC))) ? true : false;
2157 2274
 
@@ -2177,24 +2294,27 @@  discard block
 block discarded – undo
2177 2294
 	}
2178 2295
 	$smcFunc['db_free_result']($request);
2179 2296
 
2180
-	foreach ($return as $mday => $array)
2181
-		$return[$mday][count($array) - 1]['is_last'] = true;
2297
+	foreach ($return as $mday => $array) {
2298
+			$return[$mday][count($array) - 1]['is_last'] = true;
2299
+	}
2182 2300
 
2183 2301
 	// If mods want to do somthing with this list of events, let them do that now.
2184 2302
 	call_integration_hook('integrate_ssi_recentEvents', array(&$return));
2185 2303
 
2186
-	if ($output_method != 'echo' || empty($return))
2187
-		return $return;
2304
+	if ($output_method != 'echo' || empty($return)) {
2305
+			return $return;
2306
+	}
2188 2307
 
2189 2308
 	// Well the output method is echo.
2190 2309
 	echo '
2191 2310
 			<span class="event">' . $txt['events'] . '</span> ';
2192
-	foreach ($return as $mday => $array)
2193
-		foreach ($array as $event)
2311
+	foreach ($return as $mday => $array) {
2312
+			foreach ($array as $event)
2194 2313
 		{
2195 2314
 			if ($event['can_edit'])
2196 2315
 				echo '
2197 2316
 				<a href="' . $event['modify_href'] . '" style="color: #ff0000;">*</a> ';
2317
+	}
2198 2318
 
2199 2319
 			echo '
2200 2320
 				' . $event['link'] . (!$event['is_last'] ? ', ' : '');
@@ -2213,8 +2333,9 @@  discard block
 block discarded – undo
2213 2333
 	global $smcFunc;
2214 2334
 
2215 2335
 	// If $id is null, this was most likely called from a query string and should do nothing.
2216
-	if ($id === null)
2217
-		return;
2336
+	if ($id === null) {
2337
+			return;
2338
+	}
2218 2339
 
2219 2340
 	$request = $smcFunc['db_query']('', '
2220 2341
 		SELECT passwd, member_name, is_activated
@@ -2246,8 +2367,9 @@  discard block
 block discarded – undo
2246 2367
 	$attachments_boards = boardsAllowedTo('view_attachments');
2247 2368
 
2248 2369
 	// No boards?  Adios amigo.
2249
-	if (empty($attachments_boards))
2250
-		return array();
2370
+	if (empty($attachments_boards)) {
2371
+			return array();
2372
+	}
2251 2373
 
2252 2374
 	// Is it an array?
2253 2375
 	$attachment_ext = (array) $attachment_ext;
@@ -2331,8 +2453,9 @@  discard block
 block discarded – undo
2331 2453
 	call_integration_hook('integrate_ssi_recentAttachments', array(&$attachments));
2332 2454
 
2333 2455
 	// So you just want an array?  Here you can have it.
2334
-	if ($output_method == 'array' || empty($attachments))
2335
-		return $attachments;
2456
+	if ($output_method == 'array' || empty($attachments)) {
2457
+			return $attachments;
2458
+	}
2336 2459
 
2337 2460
 	// Give them the default.
2338 2461
 	echo '
@@ -2343,14 +2466,15 @@  discard block
 block discarded – undo
2343 2466
 				<th style="text-align: left; padding: 2">', $txt['downloads'], '</th>
2344 2467
 				<th style="text-align: left; padding: 2">', $txt['filesize'], '</th>
2345 2468
 			</tr>';
2346
-	foreach ($attachments as $attach)
2347
-		echo '
2469
+	foreach ($attachments as $attach) {
2470
+			echo '
2348 2471
 			<tr>
2349 2472
 				<td>', $attach['file']['link'], '</td>
2350 2473
 				<td>', $attach['member']['link'], '</td>
2351 2474
 				<td style="text-align: center">', $attach['file']['downloads'], '</td>
2352 2475
 				<td>', $attach['file']['filesize'], '</td>
2353 2476
 			</tr>';
2477
+	}
2354 2478
 	echo '
2355 2479
 		</table>';
2356 2480
 }
Please login to merge, or discard this patch.
custom_avatar/index.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,8 @@
 block discarded – undo
12 12
 	header('Location: ' . $boardurl);
13 13
 }
14 14
 // Can't find it... just forget it.
15
-else
15
+else {
16 16
 	exit;
17
+}
17 18
 
18 19
 ?>
19 20
\ No newline at end of file
Please login to merge, or discard this patch.
attachments/index.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,8 @@
 block discarded – undo
12 12
 	header('Location: ' . $boardurl);
13 13
 }
14 14
 // Can't find it... just forget it.
15
-else
15
+else {
16 16
 	exit;
17
+}
17 18
 
18 19
 ?>
19 20
\ No newline at end of file
Please login to merge, or discard this patch.
Smileys/fugue/index.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,9 +1,10 @@
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 // Try to handle it with the upper level index.php. (it should know what to do.)
4
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
4
+if (file_exists(dirname(dirname(__FILE__)) . '/index.php')) {
5 5
 	include (dirname(dirname(__FILE__)) . '/index.php');
6
-else
6
+} else {
7 7
 	exit;
8
+}
8 9
 
9 10
 ?>
10 11
\ No newline at end of file
Please login to merge, or discard this patch.
Smileys/aaron/index.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,9 +1,10 @@
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 // Try to handle it with the upper level index.php. (it should know what to do.)
4
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
4
+if (file_exists(dirname(dirname(__FILE__)) . '/index.php')) {
5 5
 	include (dirname(dirname(__FILE__)) . '/index.php');
6
-else
6
+} else {
7 7
 	exit;
8
+}
8 9
 
9 10
 ?>
10 11
\ No newline at end of file
Please login to merge, or discard this patch.
Smileys/akyhne/index.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,9 +1,10 @@
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 // Try to handle it with the upper level index.php. (it should know what to do.)
4
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
4
+if (file_exists(dirname(dirname(__FILE__)) . '/index.php')) {
5 5
 	include (dirname(dirname(__FILE__)) . '/index.php');
6
-else
6
+} else {
7 7
 	exit;
8
+}
8 9
 
9 10
 ?>
10 11
\ No newline at end of file
Please login to merge, or discard this patch.
Smileys/index.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,8 @@
 block discarded – undo
12 12
 	header('Location: ' . $boardurl);
13 13
 }
14 14
 // Can't find it... just forget it.
15
-else
15
+else {
16 16
 	exit;
17
+}
17 18
 
18 19
 ?>
19 20
\ No newline at end of file
Please login to merge, or discard this patch.
Smileys/default/index.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,9 +1,10 @@
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 // Try to handle it with the upper level index.php. (it should know what to do.)
4
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
4
+if (file_exists(dirname(dirname(__FILE__)) . '/index.php')) {
5 5
 	include (dirname(dirname(__FILE__)) . '/index.php');
6
-else
6
+} else {
7 7
 	exit;
8
+}
8 9
 
9 10
 ?>
10 11
\ No newline at end of file
Please login to merge, or discard this patch.
Themes/index.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,8 @@
 block discarded – undo
12 12
 	header('Location: ' . $boardurl);
13 13
 }
14 14
 // Can't find it... just forget it.
15
-else
15
+else {
16 16
 	exit;
17
+}
17 18
 
18 19
 ?>
19 20
\ No newline at end of file
Please login to merge, or discard this patch.