Completed
Push — release-2.1 ( f1e1b9...24a10c )
by Mathias
13s
created
other/upgrade-helper.php 1 patch
Braces   +96 added lines, -68 removed lines patch added patch discarded remove patch
@@ -13,8 +13,9 @@  discard block
 block discarded – undo
13 13
  * This file contains helper functions for upgrade.php
14 14
  */
15 15
 
16
-if (!defined('SMF_VERSION'))
16
+if (!defined('SMF_VERSION')) {
17 17
 	die('No direct access!');
18
+}
18 19
 
19 20
 /**
20 21
  * Clean the cache using the SMF 2.1 CacheAPI.
@@ -45,8 +46,9 @@  discard block
 block discarded – undo
45 46
 	global $smcFunc;
46 47
 	static $member_groups = array();
47 48
 
48
-	if (!empty($member_groups))
49
-		return $member_groups;
49
+	if (!empty($member_groups)) {
50
+			return $member_groups;
51
+	}
50 52
 
51 53
 	$request = $smcFunc['db_query']('', '
52 54
 		SELECT group_name, id_group
@@ -71,8 +73,9 @@  discard block
 block discarded – undo
71 73
 			)
72 74
 		);
73 75
 	}
74
-	while ($row = $smcFunc['db_fetch_row']($request))
75
-		$member_groups[trim($row[0])] = $row[1];
76
+	while ($row = $smcFunc['db_fetch_row']($request)) {
77
+			$member_groups[trim($row[0])] = $row[1];
78
+	}
76 79
 	$smcFunc['db_free_result']($request);
77 80
 
78 81
 	return $member_groups;
@@ -88,8 +91,9 @@  discard block
 block discarded – undo
88 91
 {
89 92
 	global $upcontext, $boarddir, $sourcedir;
90 93
 
91
-	if (empty($files))
92
-		return true;
94
+	if (empty($files)) {
95
+			return true;
96
+	}
93 97
 
94 98
 	$failure = false;
95 99
 	// On linux, it's easy - just use is_writable!
@@ -100,22 +104,25 @@  discard block
 block discarded – undo
100 104
 		foreach ($files as $k => $file)
101 105
 		{
102 106
 			// Some files won't exist, try to address up front
103
-			if (!file_exists($file))
104
-				@touch($file);
107
+			if (!file_exists($file)) {
108
+							@touch($file);
109
+			}
105 110
 			// NOW do the writable check...
106 111
 			if (!is_writable($file))
107 112
 			{
108 113
 				@chmod($file, 0755);
109 114
 
110 115
 				// Well, 755 hopefully worked... if not, try 777.
111
-				if (!is_writable($file) && !@chmod($file, 0777))
112
-					$failure = true;
116
+				if (!is_writable($file) && !@chmod($file, 0777)) {
117
+									$failure = true;
118
+				}
113 119
 				// Otherwise remove it as it's good!
114
-				else
115
-					unset($files[$k]);
120
+				else {
121
+									unset($files[$k]);
122
+				}
123
+			} else {
124
+							unset($files[$k]);
116 125
 			}
117
-			else
118
-				unset($files[$k]);
119 126
 		}
120 127
 	}
121 128
 	// Windows is trickier.  Let's try opening for r+...
@@ -126,30 +133,35 @@  discard block
 block discarded – undo
126 133
 		foreach ($files as $k => $file)
127 134
 		{
128 135
 			// Folders can't be opened for write... but the index.php in them can ;).
129
-			if (is_dir($file))
130
-				$file .= '/index.php';
136
+			if (is_dir($file)) {
137
+							$file .= '/index.php';
138
+			}
131 139
 
132 140
 			// Funny enough, chmod actually does do something on windows - it removes the read only attribute.
133 141
 			@chmod($file, 0777);
134 142
 			$fp = @fopen($file, 'r+');
135 143
 
136 144
 			// Hmm, okay, try just for write in that case...
137
-			if (!$fp)
138
-				$fp = @fopen($file, 'w');
145
+			if (!$fp) {
146
+							$fp = @fopen($file, 'w');
147
+			}
139 148
 
140
-			if (!$fp)
141
-				$failure = true;
142
-			else
143
-				unset($files[$k]);
149
+			if (!$fp) {
150
+							$failure = true;
151
+			} else {
152
+							unset($files[$k]);
153
+			}
144 154
 			@fclose($fp);
145 155
 		}
146 156
 	}
147 157
 
148
-	if (empty($files))
149
-		return true;
158
+	if (empty($files)) {
159
+			return true;
160
+	}
150 161
 
151
-	if (!isset($_SERVER))
152
-		return !$failure;
162
+	if (!isset($_SERVER)) {
163
+			return !$failure;
164
+	}
153 165
 
154 166
 	// What still needs to be done?
155 167
 	$upcontext['chmod']['files'] = $files;
@@ -201,36 +213,40 @@  discard block
 block discarded – undo
201 213
 
202 214
 		if (!isset($ftp) || $ftp->error !== false)
203 215
 		{
204
-			if (!isset($ftp))
205
-				$ftp = new ftp_connection(null);
216
+			if (!isset($ftp)) {
217
+							$ftp = new ftp_connection(null);
218
+			}
206 219
 			// Save the error so we can mess with listing...
207
-			elseif ($ftp->error !== false && !isset($upcontext['chmod']['ftp_error']))
208
-				$upcontext['chmod']['ftp_error'] = $ftp->last_message === null ? '' : $ftp->last_message;
220
+			elseif ($ftp->error !== false && !isset($upcontext['chmod']['ftp_error'])) {
221
+							$upcontext['chmod']['ftp_error'] = $ftp->last_message === null ? '' : $ftp->last_message;
222
+			}
209 223
 
210 224
 			list ($username, $detect_path, $found_path) = $ftp->detect_path(dirname(__FILE__));
211 225
 
212
-			if ($found_path || !isset($upcontext['chmod']['path']))
213
-				$upcontext['chmod']['path'] = $detect_path;
226
+			if ($found_path || !isset($upcontext['chmod']['path'])) {
227
+							$upcontext['chmod']['path'] = $detect_path;
228
+			}
214 229
 
215
-			if (!isset($upcontext['chmod']['username']))
216
-				$upcontext['chmod']['username'] = $username;
230
+			if (!isset($upcontext['chmod']['username'])) {
231
+							$upcontext['chmod']['username'] = $username;
232
+			}
217 233
 
218 234
 			// Don't forget the login token.
219 235
 			$upcontext += createToken('login');
220 236
 
221 237
 			return false;
222
-		}
223
-		else
238
+		} else
224 239
 		{
225 240
 			// We want to do a relative path for FTP.
226 241
 			if (!in_array($upcontext['chmod']['path'], array('', '/')))
227 242
 			{
228 243
 				$ftp_root = strtr($boarddir, array($upcontext['chmod']['path'] => ''));
229
-				if (substr($ftp_root, -1) == '/' && ($upcontext['chmod']['path'] == '' || $upcontext['chmod']['path'][0] === '/'))
230
-					$ftp_root = substr($ftp_root, 0, -1);
244
+				if (substr($ftp_root, -1) == '/' && ($upcontext['chmod']['path'] == '' || $upcontext['chmod']['path'][0] === '/')) {
245
+									$ftp_root = substr($ftp_root, 0, -1);
246
+				}
247
+			} else {
248
+							$ftp_root = $boarddir;
231 249
 			}
232
-			else
233
-				$ftp_root = $boarddir;
234 250
 
235 251
 			// Save the info for next time!
236 252
 			$_SESSION['installer_temp_ftp'] = array(
@@ -244,10 +260,12 @@  discard block
 block discarded – undo
244 260
 
245 261
 			foreach ($files as $k => $file)
246 262
 			{
247
-				if (!is_writable($file))
248
-					$ftp->chmod($file, 0755);
249
-				if (!is_writable($file))
250
-					$ftp->chmod($file, 0777);
263
+				if (!is_writable($file)) {
264
+									$ftp->chmod($file, 0755);
265
+				}
266
+				if (!is_writable($file)) {
267
+									$ftp->chmod($file, 0777);
268
+				}
251 269
 
252 270
 				// Assuming that didn't work calculate the path without the boarddir.
253 271
 				if (!is_writable($file))
@@ -256,19 +274,23 @@  discard block
 block discarded – undo
256 274
 					{
257 275
 						$ftp_file = strtr($file, array($_SESSION['installer_temp_ftp']['root'] => ''));
258 276
 						$ftp->chmod($ftp_file, 0755);
259
-						if (!is_writable($file))
260
-							$ftp->chmod($ftp_file, 0777);
277
+						if (!is_writable($file)) {
278
+													$ftp->chmod($ftp_file, 0777);
279
+						}
261 280
 						// Sometimes an extra slash can help...
262 281
 						$ftp_file = '/' . $ftp_file;
263
-						if (!is_writable($file))
264
-							$ftp->chmod($ftp_file, 0755);
265
-						if (!is_writable($file))
266
-							$ftp->chmod($ftp_file, 0777);
282
+						if (!is_writable($file)) {
283
+													$ftp->chmod($ftp_file, 0755);
284
+						}
285
+						if (!is_writable($file)) {
286
+													$ftp->chmod($ftp_file, 0777);
287
+						}
267 288
 					}
268 289
 				}
269 290
 
270
-				if (is_writable($file))
271
-					unset($files[$k]);
291
+				if (is_writable($file)) {
292
+									unset($files[$k]);
293
+				}
272 294
 			}
273 295
 
274 296
 			$ftp->close();
@@ -278,8 +300,9 @@  discard block
 block discarded – undo
278 300
 	// What remains?
279 301
 	$upcontext['chmod']['files'] = $files;
280 302
 
281
-	if (empty($files))
282
-		return true;
303
+	if (empty($files)) {
304
+			return true;
305
+	}
283 306
 
284 307
 	return false;
285 308
 }
@@ -293,12 +316,14 @@  discard block
 block discarded – undo
293 316
 function quickFileWritable($file)
294 317
 {
295 318
 	// Some files won't exist, try to address up front
296
-	if (!file_exists($file))
297
-		@touch($file);
319
+	if (!file_exists($file)) {
320
+			@touch($file);
321
+	}
298 322
 
299 323
 	// NOW do the writable check...
300
-	if (is_writable($file))
301
-		return true;
324
+	if (is_writable($file)) {
325
+			return true;
326
+	}
302 327
 
303 328
 	@chmod($file, 0755);
304 329
 
@@ -308,10 +333,11 @@  discard block
 block discarded – undo
308 333
 	foreach ($chmod_values as $val)
309 334
 	{
310 335
 		// If it's writable, break out of the loop
311
-		if (is_writable($file))
312
-			break;
313
-		else
314
-			@chmod($file, $val);
336
+		if (is_writable($file)) {
337
+					break;
338
+		} else {
339
+					@chmod($file, $val);
340
+		}
315 341
 	}
316 342
 
317 343
 	return is_writable($file);
@@ -338,14 +364,16 @@  discard block
 block discarded – undo
338 364
 {
339 365
 	static $fp = null;
340 366
 
341
-	if ($fp === null)
342
-		$fp = fopen('php://stderr', 'wb');
367
+	if ($fp === null) {
368
+			$fp = fopen('php://stderr', 'wb');
369
+	}
343 370
 
344 371
 	fwrite($fp, $message . "\n");
345 372
 
346
-	if ($fatal)
347
-		exit;
348
-}
373
+	if ($fatal) {
374
+			exit;
375
+	}
376
+	}
349 377
 
350 378
 /**
351 379
  * Throws a graphical error message.
Please login to merge, or discard this patch.
Sources/MessageIndex.php 1 patch
Braces   +266 added lines, -199 removed lines patch added patch discarded remove patch
@@ -14,8 +14,9 @@  discard block
 block discarded – undo
14 14
  * @version 2.1 Beta 4
15 15
  */
16 16
 
17
-if (!defined('SMF'))
17
+if (!defined('SMF')) {
18 18
 	die('No direct access...');
19
+}
19 20
 
20 21
 /**
21 22
  * Show the list of topics in this board, along with any child boards.
@@ -56,8 +57,9 @@  discard block
 block discarded – undo
56 57
 
57 58
 	$context['name'] = $board_info['name'];
58 59
 	$context['description'] = $board_info['description'];
59
-	if (!empty($board_info['description']))
60
-		$context['meta_description'] = strip_tags($board_info['description']);
60
+	if (!empty($board_info['description'])) {
61
+			$context['meta_description'] = strip_tags($board_info['description']);
62
+	}
61 63
 
62 64
 	// How many topics do we have in total?
63 65
 	$board_info['total_topics'] = allowedTo('approve_posts') ? $board_info['num_topics'] + $board_info['unapproved_topics'] : $board_info['num_topics'] + $board_info['unapproved_user_topics'];
@@ -73,12 +75,14 @@  discard block
 block discarded – undo
73 75
 		$session_name = session_name();
74 76
 		foreach ($_GET as $k => $v)
75 77
 		{
76
-			if (!in_array($k, array('board', 'start', $session_name)))
77
-				$context['robot_no_index'] = true;
78
+			if (!in_array($k, array('board', 'start', $session_name))) {
79
+							$context['robot_no_index'] = true;
80
+			}
78 81
 		}
79 82
 	}
80
-	if (!empty($_REQUEST['start']) && (!is_numeric($_REQUEST['start']) || $_REQUEST['start'] % $context['messages_per_page'] != 0))
81
-		$context['robot_no_index'] = true;
83
+	if (!empty($_REQUEST['start']) && (!is_numeric($_REQUEST['start']) || $_REQUEST['start'] % $context['messages_per_page'] != 0)) {
84
+			$context['robot_no_index'] = true;
85
+	}
82 86
 
83 87
 	// If we can view unapproved messages and there are some build up a list.
84 88
 	if (allowedTo('approve_posts') && ($board_info['unapproved_topics'] || $board_info['unapproved_posts']))
@@ -89,14 +93,16 @@  discard block
 block discarded – undo
89 93
 	}
90 94
 
91 95
 	// We only know these.
92
-	if (isset($_REQUEST['sort']) && !in_array($_REQUEST['sort'], array('subject', 'starter', 'last_poster', 'replies', 'views', 'first_post', 'last_post')))
93
-		$_REQUEST['sort'] = 'last_post';
96
+	if (isset($_REQUEST['sort']) && !in_array($_REQUEST['sort'], array('subject', 'starter', 'last_poster', 'replies', 'views', 'first_post', 'last_post'))) {
97
+			$_REQUEST['sort'] = 'last_post';
98
+	}
94 99
 
95 100
 	// Make sure the starting place makes sense and construct the page index.
96
-	if (isset($_REQUEST['sort']))
97
-		$context['page_index'] = constructPageIndex($scripturl . '?board=' . $board . '.%1$d;sort=' . $_REQUEST['sort'] . (isset($_REQUEST['desc']) ? ';desc' : ''), $_REQUEST['start'], $board_info['total_topics'], $context['maxindex'], true);
98
-	else
99
-		$context['page_index'] = constructPageIndex($scripturl . '?board=' . $board . '.%1$d', $_REQUEST['start'], $board_info['total_topics'], $context['maxindex'], true);
101
+	if (isset($_REQUEST['sort'])) {
102
+			$context['page_index'] = constructPageIndex($scripturl . '?board=' . $board . '.%1$d;sort=' . $_REQUEST['sort'] . (isset($_REQUEST['desc']) ? ';desc' : ''), $_REQUEST['start'], $board_info['total_topics'], $context['maxindex'], true);
103
+	} else {
104
+			$context['page_index'] = constructPageIndex($scripturl . '?board=' . $board . '.%1$d', $_REQUEST['start'], $board_info['total_topics'], $context['maxindex'], true);
105
+	}
100 106
 	$context['start'] = &$_REQUEST['start'];
101 107
 
102 108
 	// Set a canonical URL for this page.
@@ -132,14 +138,16 @@  discard block
 block discarded – undo
132 138
 	$context['link_moderators'] = array();
133 139
 	if (!empty($board_info['moderators']))
134 140
 	{
135
-		foreach ($board_info['moderators'] as $mod)
136
-			$context['link_moderators'][] = '<a href="' . $scripturl . '?action=profile;u=' . $mod['id'] . '" title="' . $txt['board_moderator'] . '">' . $mod['name'] . '</a>';
141
+		foreach ($board_info['moderators'] as $mod) {
142
+					$context['link_moderators'][] = '<a href="' . $scripturl . '?action=profile;u=' . $mod['id'] . '" title="' . $txt['board_moderator'] . '">' . $mod['name'] . '</a>';
143
+		}
137 144
 	}
138 145
 	if (!empty($board_info['moderator_groups']))
139 146
 	{
140 147
 		// By default just tack the moderator groups onto the end of the members
141
-		foreach ($board_info['moderator_groups'] as $mod_group)
142
-			$context['link_moderators'][] = '<a href="' . $scripturl . '?action=groups;sa=members;group=' . $mod_group['id'] . '" title="' . $txt['board_moderator'] . '">' . $mod_group['name'] . '</a>';
148
+		foreach ($board_info['moderator_groups'] as $mod_group) {
149
+					$context['link_moderators'][] = '<a href="' . $scripturl . '?action=groups;sa=members;group=' . $mod_group['id'] . '" title="' . $txt['board_moderator'] . '">' . $mod_group['name'] . '</a>';
150
+		}
143 151
 	}
144 152
 
145 153
 	// Now we tack the info onto the end of the linktree
@@ -191,20 +199,24 @@  discard block
 block discarded – undo
191 199
 		);
192 200
 		while ($row = $smcFunc['db_fetch_assoc']($request))
193 201
 		{
194
-			if (empty($row['id_member']))
195
-				continue;
202
+			if (empty($row['id_member'])) {
203
+							continue;
204
+			}
196 205
 
197
-			if (!empty($row['online_color']))
198
-				$link = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '" style="color: ' . $row['online_color'] . ';">' . $row['real_name'] . '</a>';
199
-			else
200
-				$link = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
206
+			if (!empty($row['online_color'])) {
207
+							$link = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '" style="color: ' . $row['online_color'] . ';">' . $row['real_name'] . '</a>';
208
+			} else {
209
+							$link = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
210
+			}
201 211
 
202 212
 			$is_buddy = in_array($row['id_member'], $user_info['buddies']);
203
-			if ($is_buddy)
204
-				$link = '<strong>' . $link . '</strong>';
213
+			if ($is_buddy) {
214
+							$link = '<strong>' . $link . '</strong>';
215
+			}
205 216
 
206
-			if (!empty($row['show_online']) || allowedTo('moderate_forum'))
207
-				$context['view_members_list'][$row['log_time'] . $row['member_name']] = empty($row['show_online']) ? '<em>' . $link . '</em>' : $link;
217
+			if (!empty($row['show_online']) || allowedTo('moderate_forum')) {
218
+							$context['view_members_list'][$row['log_time'] . $row['member_name']] = empty($row['show_online']) ? '<em>' . $link . '</em>' : $link;
219
+			}
208 220
 			// @todo why are we filling this array of data that are just counted (twice) and discarded? ???
209 221
 			$context['view_members'][$row['log_time'] . $row['member_name']] = array(
210 222
 				'id' => $row['id_member'],
@@ -217,8 +229,9 @@  discard block
 block discarded – undo
217 229
 				'hidden' => empty($row['show_online']),
218 230
 			);
219 231
 
220
-			if (empty($row['show_online']))
221
-				$context['view_num_hidden']++;
232
+			if (empty($row['show_online'])) {
233
+							$context['view_num_hidden']++;
234
+			}
222 235
 		}
223 236
 		$context['view_num_guests'] = $smcFunc['db_num_rows']($request) - count($context['view_members']);
224 237
 		$smcFunc['db_free_result']($request);
@@ -260,8 +273,9 @@  discard block
 block discarded – undo
260 273
 	// Bring in any changes we want to make before the query.
261 274
 	call_integration_hook('integrate_pre_messageindex', array(&$sort_methods));
262 275
 
263
-	foreach ($sort_methods as $key => $val)
264
-		$context['topics_headers'][$key] = '<a href="' . $scripturl . '?board=' . $context['current_board'] . '.' . $context['start'] . ';sort=' . $key . ($context['sort_by'] == $key && $context['sort_direction'] == 'up' ? ';desc' : '') . '">' . $txt[$key] . ($context['sort_by'] == $key ? '<span class="sort sort_' . $context['sort_direction'] . '"></span>' : '') . '</a>';
276
+	foreach ($sort_methods as $key => $val) {
277
+			$context['topics_headers'][$key] = '<a href="' . $scripturl . '?board=' . $context['current_board'] . '.' . $context['start'] . ';sort=' . $key . ($context['sort_by'] == $key && $context['sort_direction'] == 'up' ? ';desc' : '') . '">' . $txt[$key] . ($context['sort_by'] == $key ? '<span class="sort sort_' . $context['sort_direction'] . '"></span>' : '') . '</a>';
278
+	}
265 279
 
266 280
 	// Calculate the fastest way to get the topics.
267 281
 	$start = (int) $_REQUEST['start'];
@@ -271,14 +285,15 @@  discard block
 block discarded – undo
271 285
 		$fake_ascending = true;
272 286
 		$context['maxindex'] = $board_info['total_topics'] < $start + $context['maxindex'] + 1 ? $board_info['total_topics'] - $start : $context['maxindex'];
273 287
 		$start = $board_info['total_topics'] < $start + $context['maxindex'] + 1 ? 0 : $board_info['total_topics'] - $start - $context['maxindex'];
288
+	} else {
289
+			$fake_ascending = false;
274 290
 	}
275
-	else
276
-		$fake_ascending = false;
277 291
 
278 292
 	// Setup the default topic icons...
279 293
 	$context['icon_sources'] = array();
280
-	foreach ($context['stable_icons'] as $icon)
281
-		$context['icon_sources'][$icon] = 'images_url';
294
+	foreach ($context['stable_icons'] as $icon) {
295
+			$context['icon_sources'][$icon] = 'images_url';
296
+	}
282 297
 
283 298
 	$topic_ids = array();
284 299
 	$context['topics'] = array();
@@ -316,8 +331,9 @@  discard block
 block discarded – undo
316 331
 			$message_pre_index_parameters
317 332
 		);
318 333
 		$topic_ids = array();
319
-		while ($row = $smcFunc['db_fetch_assoc']($request))
320
-			$topic_ids[] = $row['id_topic'];
334
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
335
+					$topic_ids[] = $row['id_topic'];
336
+		}
321 337
 	}
322 338
 
323 339
 	// Grab the appropriate topic information...
@@ -340,10 +356,11 @@  discard block
 block discarded – undo
340 356
 		$message_index_wheres = array();
341 357
 		call_integration_hook('integrate_message_index', array(&$message_index_selects, &$message_index_tables, &$message_index_parameters, &$message_index_wheres, &$topic_ids));
342 358
 
343
-		if (!empty($modSettings['enableParticipation']) && !$user_info['is_guest'])
344
-			$enableParticipation = true;
345
-		else
346
-			$enableParticipation = false;
359
+		if (!empty($modSettings['enableParticipation']) && !$user_info['is_guest']) {
360
+					$enableParticipation = true;
361
+		} else {
362
+					$enableParticipation = false;
363
+		}
347 364
 
348 365
 		$result = $smcFunc['db_query']('substring', '
349 366
 			SELECT
@@ -382,11 +399,13 @@  discard block
 block discarded – undo
382 399
 		// Begin 'printing' the message index for current board.
383 400
 		while ($row = $smcFunc['db_fetch_assoc']($result))
384 401
 		{
385
-			if ($row['id_poll'] > 0 && $modSettings['pollMode'] == '0')
386
-				continue;
402
+			if ($row['id_poll'] > 0 && $modSettings['pollMode'] == '0') {
403
+							continue;
404
+			}
387 405
 
388
-			if (!$pre_query)
389
-				$topic_ids[] = $row['id_topic'];
406
+			if (!$pre_query) {
407
+							$topic_ids[] = $row['id_topic'];
408
+			}
390 409
 
391 410
 			// Reference the main color class.
392 411
 			$colorClass = 'windowbg';
@@ -396,8 +415,9 @@  discard block
 block discarded – undo
396 415
 			{
397 416
 				// Limit them to $modSettings['preview_characters'] characters
398 417
 				$row['first_body'] = strip_tags(strtr(parse_bbc($row['first_body'], $row['first_smileys'], $row['id_first_msg']), array('<br>' => '&#10;')));
399
-				if ($smcFunc['strlen']($row['first_body']) > $modSettings['preview_characters'])
400
-					$row['first_body'] = $smcFunc['substr']($row['first_body'], 0, $modSettings['preview_characters']) . '...';
418
+				if ($smcFunc['strlen']($row['first_body']) > $modSettings['preview_characters']) {
419
+									$row['first_body'] = $smcFunc['substr']($row['first_body'], 0, $modSettings['preview_characters']) . '...';
420
+				}
401 421
 
402 422
 				// Censor the subject and message preview.
403 423
 				censorText($row['first_subject']);
@@ -408,27 +428,27 @@  discard block
 block discarded – undo
408 428
 				{
409 429
 					$row['last_subject'] = $row['first_subject'];
410 430
 					$row['last_body'] = $row['first_body'];
411
-				}
412
-				else
431
+				} else
413 432
 				{
414 433
 					$row['last_body'] = strip_tags(strtr(parse_bbc($row['last_body'], $row['last_smileys'], $row['id_last_msg']), array('<br>' => '&#10;')));
415
-					if ($smcFunc['strlen']($row['last_body']) > $modSettings['preview_characters'])
416
-						$row['last_body'] = $smcFunc['substr']($row['last_body'], 0, $modSettings['preview_characters']) . '...';
434
+					if ($smcFunc['strlen']($row['last_body']) > $modSettings['preview_characters']) {
435
+											$row['last_body'] = $smcFunc['substr']($row['last_body'], 0, $modSettings['preview_characters']) . '...';
436
+					}
417 437
 
418 438
 					censorText($row['last_subject']);
419 439
 					censorText($row['last_body']);
420 440
 				}
421
-			}
422
-			else
441
+			} else
423 442
 			{
424 443
 				$row['first_body'] = '';
425 444
 				$row['last_body'] = '';
426 445
 				censorText($row['first_subject']);
427 446
 
428
-				if ($row['id_first_msg'] == $row['id_last_msg'])
429
-					$row['last_subject'] = $row['first_subject'];
430
-				else
431
-					censorText($row['last_subject']);
447
+				if ($row['id_first_msg'] == $row['id_last_msg']) {
448
+									$row['last_subject'] = $row['first_subject'];
449
+				} else {
450
+									censorText($row['last_subject']);
451
+				}
432 452
 			}
433 453
 
434 454
 			// Decide how many pages the topic should have.
@@ -439,42 +459,50 @@  discard block
 block discarded – undo
439 459
 				$pages = constructPageIndex($scripturl . '?topic=' . $row['id_topic'] . '.%1$d', $start, $row['num_replies'] + 1, $context['messages_per_page'], true, false);
440 460
 
441 461
 				// If we can use all, show all.
442
-				if (!empty($modSettings['enableAllMessages']) && $row['num_replies'] + 1 < $modSettings['enableAllMessages'])
443
-					$pages .= ' &nbsp;<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.0;all">' . $txt['all'] . '</a>';
462
+				if (!empty($modSettings['enableAllMessages']) && $row['num_replies'] + 1 < $modSettings['enableAllMessages']) {
463
+									$pages .= ' &nbsp;<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.0;all">' . $txt['all'] . '</a>';
464
+				}
465
+			} else {
466
+							$pages = '';
444 467
 			}
445
-			else
446
-				$pages = '';
447 468
 
448 469
 			// We need to check the topic icons exist...
449 470
 			if (!empty($modSettings['messageIconChecks_enable']))
450 471
 			{
451
-				if (!isset($context['icon_sources'][$row['first_icon']]))
452
-					$context['icon_sources'][$row['first_icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['first_icon'] . '.png') ? 'images_url' : 'default_images_url';
453
-				if (!isset($context['icon_sources'][$row['last_icon']]))
454
-					$context['icon_sources'][$row['last_icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['last_icon'] . '.png') ? 'images_url' : 'default_images_url';
455
-			}
456
-			else
472
+				if (!isset($context['icon_sources'][$row['first_icon']])) {
473
+									$context['icon_sources'][$row['first_icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['first_icon'] . '.png') ? 'images_url' : 'default_images_url';
474
+				}
475
+				if (!isset($context['icon_sources'][$row['last_icon']])) {
476
+									$context['icon_sources'][$row['last_icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['last_icon'] . '.png') ? 'images_url' : 'default_images_url';
477
+				}
478
+			} else
457 479
 			{
458
-				if (!isset($context['icon_sources'][$row['first_icon']]))
459
-					$context['icon_sources'][$row['first_icon']] = 'images_url';
460
-				if (!isset($context['icon_sources'][$row['last_icon']]))
461
-					$context['icon_sources'][$row['last_icon']] = 'images_url';
480
+				if (!isset($context['icon_sources'][$row['first_icon']])) {
481
+									$context['icon_sources'][$row['first_icon']] = 'images_url';
482
+				}
483
+				if (!isset($context['icon_sources'][$row['last_icon']])) {
484
+									$context['icon_sources'][$row['last_icon']] = 'images_url';
485
+				}
462 486
 			}
463 487
 
464
-			if (!empty($board_info['recycle']))
465
-				$row['first_icon'] = 'recycled';
488
+			if (!empty($board_info['recycle'])) {
489
+							$row['first_icon'] = 'recycled';
490
+			}
466 491
 
467 492
 			// Is this topic pending approval, or does it have any posts pending approval?
468
-			if ($context['can_approve_posts'] && $row['unapproved_posts'])
469
-				$colorClass .= (!$row['approved'] ? ' approvetopic' : ' approvepost');
493
+			if ($context['can_approve_posts'] && $row['unapproved_posts']) {
494
+							$colorClass .= (!$row['approved'] ? ' approvetopic' : ' approvepost');
495
+			}
470 496
 
471 497
 			// Sticky topics should get a different color, too.
472
-			if ($row['is_sticky'])
473
-				$colorClass .= ' sticky';
498
+			if ($row['is_sticky']) {
499
+							$colorClass .= ' sticky';
500
+			}
474 501
 
475 502
 			// Locked topics get special treatment as well.
476
-			if ($row['locked'])
477
-				$colorClass .= ' locked';
503
+			if ($row['locked']) {
504
+							$colorClass .= ' locked';
505
+			}
478 506
 
479 507
 			// 'Print' the topic info.
480 508
 			$context['topics'][$row['id_topic']] = array_merge($row, array(
@@ -555,8 +583,9 @@  discard block
 block discarded – undo
555 583
 		$smcFunc['db_free_result']($result);
556 584
 
557 585
 		// Fix the sequence of topics if they were retrieved in the wrong order. (for speed reasons...)
558
-		if ($fake_ascending)
559
-			$context['topics'] = array_reverse($context['topics'], true);
586
+		if ($fake_ascending) {
587
+					$context['topics'] = array_reverse($context['topics'], true);
588
+		}
560 589
 	}
561 590
 
562 591
 	$context['jump_to'] = array(
@@ -579,9 +608,9 @@  discard block
 block discarded – undo
579 608
 		// Can we restore topics?
580 609
 		$context['can_restore'] = allowedTo('move_any') && !empty($board_info['recycle']);
581 610
 
582
-		if ($user_info['is_admin'] || $modSettings['topic_move_any'])
583
-			$context['can_move_any'] = true;
584
-		else
611
+		if ($user_info['is_admin'] || $modSettings['topic_move_any']) {
612
+					$context['can_move_any'] = true;
613
+		} else
585 614
 		{
586 615
 			// We'll use this in a minute
587 616
 			$boards_allowed = boardsAllowedTo('post_new');
@@ -608,11 +637,13 @@  discard block
 block discarded – undo
608 637
 		}
609 638
 
610 639
 		// Can we use quick moderation checkboxes?
611
-		if ($options['display_quick_mod'] == 1)
612
-			$context['can_quick_mod'] = $context['user']['is_logged'] || $context['can_approve'] || $context['can_remove'] || $context['can_lock'] || $context['can_sticky'] || $context['can_move'] || $context['can_merge'] || $context['can_restore'];
640
+		if ($options['display_quick_mod'] == 1) {
641
+					$context['can_quick_mod'] = $context['user']['is_logged'] || $context['can_approve'] || $context['can_remove'] || $context['can_lock'] || $context['can_sticky'] || $context['can_move'] || $context['can_merge'] || $context['can_restore'];
642
+		}
613 643
 		// Or the icons?
614
-		else
615
-			$context['can_quick_mod'] = $context['can_remove'] || $context['can_lock'] || $context['can_sticky'] || $context['can_move'];
644
+		else {
645
+					$context['can_quick_mod'] = $context['can_remove'] || $context['can_lock'] || $context['can_sticky'] || $context['can_move'];
646
+		}
616 647
 	}
617 648
 
618 649
 	if (!empty($context['can_quick_mod']) && $options['display_quick_mod'] == 1)
@@ -646,13 +677,15 @@  discard block
 block discarded – undo
646 677
 			);
647 678
 
648 679
 			// We've seen all these boards now!
649
-			foreach ($board_info['parent_boards'] as $k => $dummy)
650
-				if (isset($_SESSION['topicseen_cache'][$k]))
680
+			foreach ($board_info['parent_boards'] as $k => $dummy) {
681
+							if (isset($_SESSION['topicseen_cache'][$k]))
651 682
 					unset($_SESSION['topicseen_cache'][$k]);
683
+			}
652 684
 		}
653 685
 
654
-		if (isset($_SESSION['topicseen_cache'][$board]))
655
-			unset($_SESSION['topicseen_cache'][$board]);
686
+		if (isset($_SESSION['topicseen_cache'][$board])) {
687
+					unset($_SESSION['topicseen_cache'][$board]);
688
+		}
656 689
 
657 690
 		$request = $smcFunc['db_query']('', '
658 691
 			SELECT id_topic, id_board, sent
@@ -673,8 +706,9 @@  discard block
 block discarded – undo
673 706
 				$context['is_marked_notify'] = true;
674 707
 				$board_sent = $row['sent'];
675 708
 			}
676
-			if (!empty($row['id_topic']))
677
-				$context['topics'][$row['id_topic']]['is_watched'] = true;
709
+			if (!empty($row['id_topic'])) {
710
+							$context['topics'][$row['id_topic']]['is_watched'] = true;
711
+			}
678 712
 		}
679 713
 		$smcFunc['db_free_result']($request);
680 714
 
@@ -698,8 +732,7 @@  discard block
 block discarded – undo
698 732
 		$pref = !empty($pref[$user_info['id']]) ? $pref[$user_info['id']] : array();
699 733
 		$pref = isset($pref['board_notify_' . $board]) ? $pref['board_notify_' . $board] : (!empty($pref['board_notify']) ? $pref['board_notify'] : 0);
700 734
 		$context['board_notification_mode'] = !$context['is_marked_notify'] ? 1 : ($pref & 0x02 ? 3 : ($pref & 0x01 ? 2 : 1));
701
-	}
702
-	else
735
+	} else
703 736
 	{
704 737
 		$context['is_marked_notify'] = false;
705 738
 		$context['board_notification_mode'] = 1;
@@ -712,23 +745,27 @@  discard block
 block discarded – undo
712 745
 	$context['becomesUnapproved'] = !empty($_SESSION['becomesUnapproved']) ? true : false;
713 746
 
714 747
 	// Don't want to show this forever...
715
-	if ($context['becomesUnapproved'])
716
-		unset($_SESSION['becomesUnapproved']);
748
+	if ($context['becomesUnapproved']) {
749
+			unset($_SESSION['becomesUnapproved']);
750
+	}
717 751
 
718 752
 	// Build the message index button array.
719 753
 	$context['normal_buttons'] = array();
720 754
 
721
-	if ($context['can_post_new'])
722
-		$context['normal_buttons']['new_topic'] = array('text' => 'new_topic', 'image' => 'new_topic.png', 'lang' => true, 'url' => $scripturl . '?action=post;board=' . $context['current_board'] . '.0', 'active' => true);
755
+	if ($context['can_post_new']) {
756
+			$context['normal_buttons']['new_topic'] = array('text' => 'new_topic', 'image' => 'new_topic.png', 'lang' => true, 'url' => $scripturl . '?action=post;board=' . $context['current_board'] . '.0', 'active' => true);
757
+	}
723 758
 
724
-	if ($context['can_post_poll'])
725
-		$context['normal_buttons']['post_poll'] = array('text' => 'new_poll', 'image' => 'new_poll.png', 'lang' => true, 'url' => $scripturl . '?action=post;board=' . $context['current_board'] . '.0;poll');
759
+	if ($context['can_post_poll']) {
760
+			$context['normal_buttons']['post_poll'] = array('text' => 'new_poll', 'image' => 'new_poll.png', 'lang' => true, 'url' => $scripturl . '?action=post;board=' . $context['current_board'] . '.0;poll');
761
+	}
726 762
 
727
-	if (!$context['user']['is_logged'])
728
-		$context['normal_buttons']['markread'] = array('text' => 'mark_read_short', 'image' => 'markread.png', 'lang' => true, 'custom' => 'data-confirm="' . $txt['are_sure_mark_read'] . '"', 'class' => 'you_sure', 'url' => $scripturl . '?action=markasread;sa=board;board=' . $context['current_board'] . '.0;' . $context['session_var'] . '=' . $context['session_id']);
763
+	if (!$context['user']['is_logged']) {
764
+			$context['normal_buttons']['markread'] = array('text' => 'mark_read_short', 'image' => 'markread.png', 'lang' => true, 'custom' => 'data-confirm="' . $txt['are_sure_mark_read'] . '"', 'class' => 'you_sure', 'url' => $scripturl . '?action=markasread;sa=board;board=' . $context['current_board'] . '.0;' . $context['session_var'] . '=' . $context['session_id']);
765
+	}
729 766
 
730
-	if ($context['can_mark_notify'])
731
-		$context['normal_buttons']['notify'] = array(
767
+	if ($context['can_mark_notify']) {
768
+			$context['normal_buttons']['notify'] = array(
732 769
 			'lang' => true,
733 770
 			'text' => 'notify_board_' . $context['board_notification_mode'],
734 771
 			'sub_buttons' => array(
@@ -746,6 +783,7 @@  discard block
 block discarded – undo
746 783
 				),
747 784
 			),
748 785
 		);
786
+	}
749 787
 
750 788
 	// Javascript for inline editing.
751 789
 	loadJavaScriptFile('topic.js', array('defer' => false, 'minimize' => true), 'smf_topic');
@@ -767,18 +805,21 @@  discard block
 block discarded – undo
767 805
 	checkSession('request');
768 806
 
769 807
 	// Lets go straight to the restore area.
770
-	if (isset($_REQUEST['qaction']) && $_REQUEST['qaction'] == 'restore' && !empty($_REQUEST['topics']))
771
-		redirectexit('action=restoretopic;topics=' . implode(',', $_REQUEST['topics']) . ';' . $context['session_var'] . '=' . $context['session_id']);
808
+	if (isset($_REQUEST['qaction']) && $_REQUEST['qaction'] == 'restore' && !empty($_REQUEST['topics'])) {
809
+			redirectexit('action=restoretopic;topics=' . implode(',', $_REQUEST['topics']) . ';' . $context['session_var'] . '=' . $context['session_id']);
810
+	}
772 811
 
773
-	if (isset($_SESSION['topicseen_cache']))
774
-		$_SESSION['topicseen_cache'] = array();
812
+	if (isset($_SESSION['topicseen_cache'])) {
813
+			$_SESSION['topicseen_cache'] = array();
814
+	}
775 815
 
776 816
 	// This is going to be needed to send off the notifications and for updateLastMessages().
777 817
 	require_once($sourcedir . '/Subs-Post.php');
778 818
 
779 819
 	// Remember the last board they moved things to.
780
-	if (isset($_REQUEST['move_to']))
781
-		$_SESSION['move_to_topic'] = $_REQUEST['move_to'];
820
+	if (isset($_REQUEST['move_to'])) {
821
+			$_SESSION['move_to_topic'] = $_REQUEST['move_to'];
822
+	}
782 823
 
783 824
 	// Only a few possible actions.
784 825
 	$possibleActions = array();
@@ -798,8 +839,7 @@  discard block
 block discarded – undo
798 839
 		);
799 840
 
800 841
 		$redirect_url = 'board=' . $board . '.' . $_REQUEST['start'];
801
-	}
802
-	else
842
+	} else
803 843
 	{
804 844
 		/**
805 845
 		 * @todo Ugly. There's no getting around this, is there?
@@ -817,8 +857,7 @@  discard block
 block discarded – undo
817 857
 		if (!empty($board))
818 858
 		{
819 859
 			$boards_can['post_new'] = array_diff(boardsAllowedTo('post_new'), array($board));
820
-		}
821
-		else
860
+		} else
822 861
 		{
823 862
 			$boards_can['post_new'] = boardsAllowedTo('post_new');
824 863
 		}
@@ -829,55 +868,67 @@  discard block
 block discarded – undo
829 868
 		}
830 869
 	}
831 870
 
832
-	if (!$user_info['is_guest'])
833
-		$possibleActions[] = 'markread';
834
-	if (!empty($boards_can['make_sticky']))
835
-		$possibleActions[] = 'sticky';
836
-	if (!empty($boards_can['move_any']) || !empty($boards_can['move_own']))
837
-		$possibleActions[] = 'move';
838
-	if (!empty($boards_can['remove_any']) || !empty($boards_can['remove_own']))
839
-		$possibleActions[] = 'remove';
840
-	if (!empty($boards_can['lock_any']) || !empty($boards_can['lock_own']))
841
-		$possibleActions[] = 'lock';
842
-	if (!empty($boards_can['merge_any']))
843
-		$possibleActions[] = 'merge';
844
-	if (!empty($boards_can['approve_posts']))
845
-		$possibleActions[] = 'approve';
871
+	if (!$user_info['is_guest']) {
872
+			$possibleActions[] = 'markread';
873
+	}
874
+	if (!empty($boards_can['make_sticky'])) {
875
+			$possibleActions[] = 'sticky';
876
+	}
877
+	if (!empty($boards_can['move_any']) || !empty($boards_can['move_own'])) {
878
+			$possibleActions[] = 'move';
879
+	}
880
+	if (!empty($boards_can['remove_any']) || !empty($boards_can['remove_own'])) {
881
+			$possibleActions[] = 'remove';
882
+	}
883
+	if (!empty($boards_can['lock_any']) || !empty($boards_can['lock_own'])) {
884
+			$possibleActions[] = 'lock';
885
+	}
886
+	if (!empty($boards_can['merge_any'])) {
887
+			$possibleActions[] = 'merge';
888
+	}
889
+	if (!empty($boards_can['approve_posts'])) {
890
+			$possibleActions[] = 'approve';
891
+	}
846 892
 
847 893
 	// Two methods: $_REQUEST['actions'] (id_topic => action), and $_REQUEST['topics'] and $_REQUEST['qaction'].
848 894
 	// (if action is 'move', $_REQUEST['move_to'] or $_REQUEST['move_tos'][$topic] is used.)
849 895
 	if (!empty($_REQUEST['topics']))
850 896
 	{
851 897
 		// If the action isn't valid, just quit now.
852
-		if (empty($_REQUEST['qaction']) || !in_array($_REQUEST['qaction'], $possibleActions))
853
-			redirectexit($redirect_url);
898
+		if (empty($_REQUEST['qaction']) || !in_array($_REQUEST['qaction'], $possibleActions)) {
899
+					redirectexit($redirect_url);
900
+		}
854 901
 
855 902
 		// Merge requires all topics as one parameter and can be done at once.
856 903
 		if ($_REQUEST['qaction'] == 'merge')
857 904
 		{
858 905
 			// Merge requires at least two topics.
859
-			if (empty($_REQUEST['topics']) || count($_REQUEST['topics']) < 2)
860
-				redirectexit($redirect_url);
906
+			if (empty($_REQUEST['topics']) || count($_REQUEST['topics']) < 2) {
907
+							redirectexit($redirect_url);
908
+			}
861 909
 
862 910
 			require_once($sourcedir . '/SplitTopics.php');
863 911
 			return MergeExecute($_REQUEST['topics']);
864 912
 		}
865 913
 
866 914
 		// Just convert to the other method, to make it easier.
867
-		foreach ($_REQUEST['topics'] as $topic)
868
-			$_REQUEST['actions'][(int) $topic] = $_REQUEST['qaction'];
915
+		foreach ($_REQUEST['topics'] as $topic) {
916
+					$_REQUEST['actions'][(int) $topic] = $_REQUEST['qaction'];
917
+		}
869 918
 	}
870 919
 
871 920
 	// Weird... how'd you get here?
872
-	if (empty($_REQUEST['actions']))
873
-		redirectexit($redirect_url);
921
+	if (empty($_REQUEST['actions'])) {
922
+			redirectexit($redirect_url);
923
+	}
874 924
 
875 925
 	// Validate each action.
876 926
 	$temp = array();
877 927
 	foreach ($_REQUEST['actions'] as $topic => $action)
878 928
 	{
879
-		if (in_array($action, $possibleActions))
880
-			$temp[(int) $topic] = $action;
929
+		if (in_array($action, $possibleActions)) {
930
+					$temp[(int) $topic] = $action;
931
+		}
881 932
 	}
882 933
 	$_REQUEST['actions'] = $temp;
883 934
 
@@ -898,27 +949,31 @@  discard block
 block discarded – undo
898 949
 		{
899 950
 			if (!empty($board))
900 951
 			{
901
-				if ($row['id_board'] != $board || ($modSettings['postmod_active'] && !$row['approved'] && !allowedTo('approve_posts')))
902
-					unset($_REQUEST['actions'][$row['id_topic']]);
903
-			}
904
-			else
952
+				if ($row['id_board'] != $board || ($modSettings['postmod_active'] && !$row['approved'] && !allowedTo('approve_posts'))) {
953
+									unset($_REQUEST['actions'][$row['id_topic']]);
954
+				}
955
+			} else
905 956
 			{
906 957
 				// Don't allow them to act on unapproved posts they can't see...
907
-				if ($modSettings['postmod_active'] && !$row['approved'] && !in_array(0, $boards_can['approve_posts']) && !in_array($row['id_board'], $boards_can['approve_posts']))
908
-					unset($_REQUEST['actions'][$row['id_topic']]);
958
+				if ($modSettings['postmod_active'] && !$row['approved'] && !in_array(0, $boards_can['approve_posts']) && !in_array($row['id_board'], $boards_can['approve_posts'])) {
959
+									unset($_REQUEST['actions'][$row['id_topic']]);
960
+				}
909 961
 				// Goodness, this is fun.  We need to validate the action.
910
-				elseif ($_REQUEST['actions'][$row['id_topic']] == 'sticky' && !in_array(0, $boards_can['make_sticky']) && !in_array($row['id_board'], $boards_can['make_sticky']))
911
-					unset($_REQUEST['actions'][$row['id_topic']]);
912
-				elseif ($_REQUEST['actions'][$row['id_topic']] == 'move' && !in_array(0, $boards_can['move_any']) && !in_array($row['id_board'], $boards_can['move_any']) && ($row['id_member_started'] != $user_info['id'] || (!in_array(0, $boards_can['move_own']) && !in_array($row['id_board'], $boards_can['move_own']))))
913
-					unset($_REQUEST['actions'][$row['id_topic']]);
914
-				elseif ($_REQUEST['actions'][$row['id_topic']] == 'remove' && !in_array(0, $boards_can['remove_any']) && !in_array($row['id_board'], $boards_can['remove_any']) && ($row['id_member_started'] != $user_info['id'] || (!in_array(0, $boards_can['remove_own']) && !in_array($row['id_board'], $boards_can['remove_own']))))
915
-					unset($_REQUEST['actions'][$row['id_topic']]);
962
+				elseif ($_REQUEST['actions'][$row['id_topic']] == 'sticky' && !in_array(0, $boards_can['make_sticky']) && !in_array($row['id_board'], $boards_can['make_sticky'])) {
963
+									unset($_REQUEST['actions'][$row['id_topic']]);
964
+				} elseif ($_REQUEST['actions'][$row['id_topic']] == 'move' && !in_array(0, $boards_can['move_any']) && !in_array($row['id_board'], $boards_can['move_any']) && ($row['id_member_started'] != $user_info['id'] || (!in_array(0, $boards_can['move_own']) && !in_array($row['id_board'], $boards_can['move_own'])))) {
965
+									unset($_REQUEST['actions'][$row['id_topic']]);
966
+				} elseif ($_REQUEST['actions'][$row['id_topic']] == 'remove' && !in_array(0, $boards_can['remove_any']) && !in_array($row['id_board'], $boards_can['remove_any']) && ($row['id_member_started'] != $user_info['id'] || (!in_array(0, $boards_can['remove_own']) && !in_array($row['id_board'], $boards_can['remove_own'])))) {
967
+									unset($_REQUEST['actions'][$row['id_topic']]);
968
+				}
916 969
 				// @todo $locked is not set, what are you trying to do? (taking the change it is supposed to be $row['locked'])
917
-				elseif ($_REQUEST['actions'][$row['id_topic']] == 'lock' && !in_array(0, $boards_can['lock_any']) && !in_array($row['id_board'], $boards_can['lock_any']) && ($row['id_member_started'] != $user_info['id'] || $row['locked'] == 1 || (!in_array(0, $boards_can['lock_own']) && !in_array($row['id_board'], $boards_can['lock_own']))))
918
-					unset($_REQUEST['actions'][$row['id_topic']]);
970
+				elseif ($_REQUEST['actions'][$row['id_topic']] == 'lock' && !in_array(0, $boards_can['lock_any']) && !in_array($row['id_board'], $boards_can['lock_any']) && ($row['id_member_started'] != $user_info['id'] || $row['locked'] == 1 || (!in_array(0, $boards_can['lock_own']) && !in_array($row['id_board'], $boards_can['lock_own'])))) {
971
+									unset($_REQUEST['actions'][$row['id_topic']]);
972
+				}
919 973
 				// If the topic is approved then you need permission to approve the posts within.
920
-				elseif ($_REQUEST['actions'][$row['id_topic']] == 'approve' && (!$row['unapproved_posts'] || (!in_array(0, $boards_can['approve_posts']) && !in_array($row['id_board'], $boards_can['approve_posts']))))
921
-					unset($_REQUEST['actions'][$row['id_topic']]);
974
+				elseif ($_REQUEST['actions'][$row['id_topic']] == 'approve' && (!$row['unapproved_posts'] || (!in_array(0, $boards_can['approve_posts']) && !in_array($row['id_board'], $boards_can['approve_posts'])))) {
975
+									unset($_REQUEST['actions'][$row['id_topic']]);
976
+				}
922 977
 			}
923 978
 		}
924 979
 		$smcFunc['db_free_result']($request);
@@ -936,11 +991,11 @@  discard block
 block discarded – undo
936 991
 	{
937 992
 		$topic = (int) $topic;
938 993
 
939
-		if ($action == 'markread')
940
-			$markCache[] = $topic;
941
-		elseif ($action == 'sticky')
942
-			$stickyCache[] = $topic;
943
-		elseif ($action == 'move')
994
+		if ($action == 'markread') {
995
+					$markCache[] = $topic;
996
+		} elseif ($action == 'sticky') {
997
+					$stickyCache[] = $topic;
998
+		} elseif ($action == 'move')
944 999
 		{
945 1000
 			require_once($sourcedir . '/MoveTopic.php');
946 1001
 			moveTopicConcurrence();
@@ -948,23 +1003,25 @@  discard block
 block discarded – undo
948 1003
 			// $moveCache[0] is the topic, $moveCache[1] is the board to move to.
949 1004
 			$moveCache[1][$topic] = (int) (isset($_REQUEST['move_tos'][$topic]) ? $_REQUEST['move_tos'][$topic] : $_REQUEST['move_to']);
950 1005
 
951
-			if (empty($moveCache[1][$topic]))
952
-				continue;
1006
+			if (empty($moveCache[1][$topic])) {
1007
+							continue;
1008
+			}
953 1009
 
954 1010
 			$moveCache[0][] = $topic;
1011
+		} elseif ($action == 'remove') {
1012
+					$removeCache[] = $topic;
1013
+		} elseif ($action == 'lock') {
1014
+					$lockCache[] = $topic;
1015
+		} elseif ($action == 'approve') {
1016
+					$approveCache[] = $topic;
955 1017
 		}
956
-		elseif ($action == 'remove')
957
-			$removeCache[] = $topic;
958
-		elseif ($action == 'lock')
959
-			$lockCache[] = $topic;
960
-		elseif ($action == 'approve')
961
-			$approveCache[] = $topic;
962 1018
 	}
963 1019
 
964
-	if (empty($board))
965
-		$affectedBoards = array();
966
-	else
967
-		$affectedBoards = array($board => array(0, 0));
1020
+	if (empty($board)) {
1021
+			$affectedBoards = array();
1022
+	} else {
1023
+			$affectedBoards = array($board => array(0, 0));
1024
+	}
968 1025
 
969 1026
 	// Do all the stickies...
970 1027
 	if (!empty($stickyCache))
@@ -1024,14 +1081,16 @@  discard block
 block discarded – undo
1024 1081
 		{
1025 1082
 			$to = $moveCache[1][$row['id_topic']];
1026 1083
 
1027
-			if (empty($to))
1028
-				continue;
1084
+			if (empty($to)) {
1085
+							continue;
1086
+			}
1029 1087
 
1030 1088
 			// Does this topic's board count the posts or not?
1031 1089
 			$countPosts[$row['id_topic']] = empty($row['count_posts']);
1032 1090
 
1033
-			if (!isset($moveTos[$to]))
1034
-				$moveTos[$to] = array();
1091
+			if (!isset($moveTos[$to])) {
1092
+							$moveTos[$to] = array();
1093
+			}
1035 1094
 
1036 1095
 			$moveTos[$to][] = $row['id_topic'];
1037 1096
 
@@ -1045,8 +1104,9 @@  discard block
 block discarded – undo
1045 1104
 		require_once($sourcedir . '/MoveTopic.php');
1046 1105
 
1047 1106
 		// Do the actual moves...
1048
-		foreach ($moveTos as $to => $topics)
1049
-			moveTopics($topics, $to);
1107
+		foreach ($moveTos as $to => $topics) {
1108
+					moveTopics($topics, $to);
1109
+		}
1050 1110
 
1051 1111
 		// Does the post counts need to be updated?
1052 1112
 		if (!empty($moveTos))
@@ -1095,20 +1155,23 @@  discard block
 block discarded – undo
1095 1155
 
1096 1156
 				while ($row = $smcFunc['db_fetch_assoc']($request))
1097 1157
 				{
1098
-					if (!isset($members[$row['id_member']]))
1099
-						$members[$row['id_member']] = 0;
1158
+					if (!isset($members[$row['id_member']])) {
1159
+											$members[$row['id_member']] = 0;
1160
+					}
1100 1161
 
1101
-					if ($topicRecounts[$row['id_topic']] === '+')
1102
-						$members[$row['id_member']] += 1;
1103
-					else
1104
-						$members[$row['id_member']] -= 1;
1162
+					if ($topicRecounts[$row['id_topic']] === '+') {
1163
+											$members[$row['id_member']] += 1;
1164
+					} else {
1165
+											$members[$row['id_member']] -= 1;
1166
+					}
1105 1167
 				}
1106 1168
 
1107 1169
 				$smcFunc['db_free_result']($request);
1108 1170
 
1109 1171
 				// And now update them member's post counts
1110
-				foreach ($members as $id_member => $post_adj)
1111
-					updateMemberData($id_member, array('posts' => 'posts + ' . $post_adj));
1172
+				foreach ($members as $id_member => $post_adj) {
1173
+									updateMemberData($id_member, array('posts' => 'posts + ' . $post_adj));
1174
+				}
1112 1175
 			}
1113 1176
 		}
1114 1177
 	}
@@ -1187,8 +1250,9 @@  discard block
 block discarded – undo
1187 1250
 			approveTopics($approveCache);
1188 1251
 
1189 1252
 			// Time for some logging!
1190
-			foreach ($approveCache as $topic)
1191
-				logAction('approve_topic', array('topic' => $topic, 'member' => $approveCacheMembers[$topic]));
1253
+			foreach ($approveCache as $topic) {
1254
+							logAction('approve_topic', array('topic' => $topic, 'member' => $approveCacheMembers[$topic]));
1255
+			}
1192 1256
 		}
1193 1257
 	}
1194 1258
 
@@ -1223,8 +1287,7 @@  discard block
 block discarded – undo
1223 1287
 				$lockStatus[$row['id_topic']] = empty($row['locked']);
1224 1288
 			}
1225 1289
 			$smcFunc['db_free_result']($result);
1226
-		}
1227
-		else
1290
+		} else
1228 1291
 		{
1229 1292
 			$result = $smcFunc['db_query']('', '
1230 1293
 				SELECT id_topic, locked, id_board
@@ -1274,13 +1337,15 @@  discard block
 block discarded – undo
1274 1337
 			)
1275 1338
 		);
1276 1339
 		$logged_topics = array();
1277
-		while ($row = $smcFunc['db_fetch_assoc']($request))
1278
-			$logged_topics[$row['id_topic']] = $row['unwatched'];
1340
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
1341
+					$logged_topics[$row['id_topic']] = $row['unwatched'];
1342
+		}
1279 1343
 		$smcFunc['db_free_result']($request);
1280 1344
 
1281 1345
 		$markArray = array();
1282
-		foreach ($markCache as $topic)
1283
-			$markArray[] = array($modSettings['maxMsgID'], $user_info['id'], $topic, (isset($logged_topics[$topic]) ? $logged_topics[$topic] : 0));
1346
+		foreach ($markCache as $topic) {
1347
+					$markArray[] = array($modSettings['maxMsgID'], $user_info['id'], $topic, (isset($logged_topics[$topic]) ? $logged_topics[$topic] : 0));
1348
+		}
1284 1349
 
1285 1350
 		$smcFunc['db_insert']('replace',
1286 1351
 			'{db_prefix}log_topics',
@@ -1293,8 +1358,9 @@  discard block
 block discarded – undo
1293 1358
 	foreach ($moveCache as $topic)
1294 1359
 	{
1295 1360
 		// Didn't actually move anything!
1296
-		if (!isset($topic[0]))
1297
-			break;
1361
+		if (!isset($topic[0])) {
1362
+					break;
1363
+		}
1298 1364
 
1299 1365
 		logAction('move', array('topic' => $topic[0], 'board_from' => $topic[1], 'board_to' => $topic[2]));
1300 1366
 		sendNotifications($topic[0], 'move');
@@ -1316,8 +1382,9 @@  discard block
 block discarded – undo
1316 1382
 		'calendar_updated' => time(),
1317 1383
 	));
1318 1384
 
1319
-	if (!empty($affectedBoards))
1320
-		updateLastMessages(array_keys($affectedBoards));
1385
+	if (!empty($affectedBoards)) {
1386
+			updateLastMessages(array_keys($affectedBoards));
1387
+	}
1321 1388
 
1322 1389
 	redirectexit($redirect_url);
1323 1390
 }
Please login to merge, or discard this patch.
Sources/PackageGet.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -181,14 +181,14 @@  discard block
 block discarded – undo
181 181
 		{
182 182
 			collapsedDiv.show(\'slow\');
183 183
 			icon.removeClass(\'toggle_down\').addClass(\'toggle_up\');
184
-			icon.prop(\'title\', '. JavaScriptEscape($txt['hide']) .');
184
+			icon.prop(\'title\', '. JavaScriptEscape($txt['hide']) . ');
185 185
 		}
186 186
 
187 187
 		else
188 188
 		{
189 189
 			collapsedDiv.hide(\'slow\');
190 190
 			icon.removeClass(\'toggle_up\').addClass(\'toggle_down\');
191
-			icon.prop(\'title\', '. JavaScriptEscape($txt['show']) .');
191
+			icon.prop(\'title\', '. JavaScriptEscape($txt['show']) . ');
192 192
 		}
193 193
 	});', true);
194 194
 }
@@ -641,7 +641,7 @@  discard block
 block discarded – undo
641 641
 
642 642
 	// Setup the correct template, even though I'll admit we ain't downloading ;)
643 643
 	$context['sub_template'] = 'downloaded';
644
-	$allowext = array('.zip','.tgz','.gz');
644
+	$allowext = array('.zip', '.tgz', '.gz');
645 645
 	// @todo Use FTP if the Packages directory is not writable.
646 646
 
647 647
 	// Check the file was even sent!
@@ -653,13 +653,13 @@  discard block
 block discarded – undo
653 653
 	// Make sure it has a sane filename.
654 654
 	$_FILES['package']['name'] = preg_replace(array('/\s/', '/\.[\.]+/', '/[^\w_\.\-]/'), array('_', '.', ''), $_FILES['package']['name']);
655 655
 	$extension = substr(strrchr(strtolower($_FILES['package']['name']), '.'), 0);
656
-	if(!in_array($extension, $allowext))
656
+	if (!in_array($extension, $allowext))
657 657
 	{
658 658
 		fatal_lang_error('package_upload_error_supports', false, array('zip, tgz, tar.gz'));
659 659
 	}
660 660
 
661 661
 	// We only need the filename...
662
-	$extension = ($extension == '.gz') ? '.tar.gz' : $extension ;
662
+	$extension = ($extension == '.gz') ? '.tar.gz' : $extension;
663 663
 	$packageName = time() . $extension;
664 664
 
665 665
 	// Setup the destination and throw an error if the file is already there!
Please login to merge, or discard this patch.
Sources/Class-Punycode.php 1 patch
Indentation   +327 added lines, -327 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
  */
20 20
 
21 21
 if (!defined('SMF'))
22
-    die('No direct access...');
22
+	die('No direct access...');
23 23
 
24 24
 /**
25 25
  * Punycode implementation as described in RFC 3492
@@ -28,332 +28,332 @@  discard block
 block discarded – undo
28 28
  */
29 29
 class Punycode
30 30
 {
31
-    /**
32
-     * Bootstring parameter values
33
-     *
34
-     */
35
-    const BASE         = 36;
36
-    const TMIN         = 1;
37
-    const TMAX         = 26;
38
-    const SKEW         = 38;
39
-    const DAMP         = 700;
40
-    const INITIAL_BIAS = 72;
41
-    const INITIAL_N    = 128;
42
-    const PREFIX       = 'xn--';
43
-    const DELIMITER    = '-';
44
-
45
-    /**
46
-     * Encode table
47
-     *
48
-     * @param array
49
-     */
50
-    protected static $encodeTable = array(
51
-        'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l',
52
-        'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x',
53
-        'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
54
-    );
55
-
56
-    /**
57
-     * Decode table
58
-     *
59
-     * @param array
60
-     */
61
-    protected static $decodeTable = array(
62
-        'a' =>  0, 'b' =>  1, 'c' =>  2, 'd' =>  3, 'e' =>  4, 'f' =>  5,
63
-        'g' =>  6, 'h' =>  7, 'i' =>  8, 'j' =>  9, 'k' => 10, 'l' => 11,
64
-        'm' => 12, 'n' => 13, 'o' => 14, 'p' => 15, 'q' => 16, 'r' => 17,
65
-        's' => 18, 't' => 19, 'u' => 20, 'v' => 21, 'w' => 22, 'x' => 23,
66
-        'y' => 24, 'z' => 25, '0' => 26, '1' => 27, '2' => 28, '3' => 29,
67
-        '4' => 30, '5' => 31, '6' => 32, '7' => 33, '8' => 34, '9' => 35
68
-    );
69
-
70
-    /**
71
-     * Character encoding
72
-     *
73
-     * @param string
74
-     */
75
-    protected $encoding;
76
-
77
-    /**
78
-     * Constructor
79
-     *
80
-     * @param string $encoding Character encoding
81
-     */
82
-    public function __construct($encoding = 'UTF-8')
83
-    {
84
-        $this->encoding = $encoding;
85
-    }
86
-
87
-    /**
88
-     * Encode a domain to its Punycode version
89
-     *
90
-     * @param string $input Domain name in Unicode to be encoded
91
-     * @return string Punycode representation in ASCII
92
-     */
93
-    public function encode($input)
94
-    {
95
-        $input = mb_strtolower($input, $this->encoding);
96
-        $parts = explode('.', $input);
97
-        foreach ($parts as &$part) {
98
-            $part = $this->encodePart($part);
99
-        }
100
-        $output = implode('.', $parts);
101
-        $length = strlen($output);
102
-
103
-        return $output;
104
-    }
105
-
106
-    /**
107
-     * Encode a part of a domain name, such as tld, to its Punycode version
108
-     *
109
-     * @param string $input Part of a domain name
110
-     * @return string Punycode representation of a domain part
111
-     */
112
-    protected function encodePart($input)
113
-    {
114
-        $codePoints = $this->listCodePoints($input);
115
-
116
-        $n = static::INITIAL_N;
117
-        $bias = static::INITIAL_BIAS;
118
-        $delta = 0;
119
-        $h = $b = count($codePoints['basic']);
120
-
121
-        $output = '';
122
-        foreach ($codePoints['basic'] as $code) {
123
-            $output .= $this->codePointToChar($code);
124
-        }
125
-        if ($input === $output) {
126
-            return $output;
127
-        }
128
-        if ($b > 0) {
129
-            $output .= static::DELIMITER;
130
-        }
131
-
132
-        $codePoints['nonBasic'] = array_unique($codePoints['nonBasic']);
133
-        sort($codePoints['nonBasic']);
134
-
135
-        $i = 0;
136
-        $length = mb_strlen($input, $this->encoding);
137
-        while ($h < $length) {
138
-            $m = $codePoints['nonBasic'][$i++];
139
-            $delta = $delta + ($m - $n) * ($h + 1);
140
-            $n = $m;
141
-
142
-            foreach ($codePoints['all'] as $c) {
143
-                if ($c < $n || $c < static::INITIAL_N) {
144
-                    $delta++;
145
-                }
146
-                if ($c === $n) {
147
-                    $q = $delta;
148
-                    for ($k = static::BASE;; $k += static::BASE) {
149
-                        $t = $this->calculateThreshold($k, $bias);
150
-                        if ($q < $t) {
151
-                            break;
152
-                        }
153
-
154
-                        $code = $t + (($q - $t) % (static::BASE - $t));
155
-                        $output .= static::$encodeTable[$code];
156
-
157
-                        $q = ($q - $t) / (static::BASE - $t);
158
-                    }
159
-
160
-                    $output .= static::$encodeTable[$q];
161
-                    $bias = $this->adapt($delta, $h + 1, ($h === $b));
162
-                    $delta = 0;
163
-                    $h++;
164
-                }
165
-            }
166
-
167
-            $delta++;
168
-            $n++;
169
-        }
170
-        $out = static::PREFIX . $output;
171
-
172
-        return $out;
173
-    }
174
-
175
-    /**
176
-     * Decode a Punycode domain name to its Unicode counterpart
177
-     *
178
-     * @param string $input Domain name in Punycode
179
-     * @return string Unicode domain name
180
-     */
181
-    public function decode($input)
182
-    {
183
-        $input = strtolower($input);
184
-        $parts = explode('.', $input);
185
-        foreach ($parts as &$part) {
186
-            if (strpos($part, static::PREFIX) !== 0) {
187
-                continue;
188
-            }
189
-
190
-            $part = substr($part, strlen(static::PREFIX));
191
-            $part = $this->decodePart($part);
192
-        }
193
-        $output = implode('.', $parts);
194
-
195
-        return $output;
196
-    }
197
-
198
-    /**
199
-     * Decode a part of domain name, such as tld
200
-     *
201
-     * @param string $input Part of a domain name
202
-     * @return string Unicode domain part
203
-     */
204
-    protected function decodePart($input)
205
-    {
206
-        $n = static::INITIAL_N;
207
-        $i = 0;
208
-        $bias = static::INITIAL_BIAS;
209
-        $output = '';
210
-
211
-        $pos = strrpos($input, static::DELIMITER);
212
-        if ($pos !== false) {
213
-            $output = substr($input, 0, $pos++);
214
-        } else {
215
-            $pos = 0;
216
-        }
217
-
218
-        $outputLength = strlen($output);
219
-        $inputLength = strlen($input);
220
-        while ($pos < $inputLength) {
221
-            $oldi = $i;
222
-            $w = 1;
223
-
224
-            for ($k = static::BASE;; $k += static::BASE) {
225
-                $digit = static::$decodeTable[$input[$pos++]];
226
-                $i = $i + ($digit * $w);
227
-                $t = $this->calculateThreshold($k, $bias);
228
-
229
-                if ($digit < $t) {
230
-                    break;
231
-                }
232
-
233
-                $w = $w * (static::BASE - $t);
234
-            }
235
-
236
-            $bias = $this->adapt($i - $oldi, ++$outputLength, ($oldi === 0));
237
-            $n = $n + (int) ($i / $outputLength);
238
-            $i = $i % ($outputLength);
239
-            $output = mb_substr($output, 0, $i, $this->encoding) . $this->codePointToChar($n) . mb_substr($output, $i, $outputLength - 1, $this->encoding);
240
-
241
-            $i++;
242
-        }
243
-
244
-        return $output;
245
-    }
246
-
247
-    /**
248
-     * Calculate the bias threshold to fall between TMIN and TMAX
249
-     *
250
-     * @param integer $k
251
-     * @param integer $bias
252
-     * @return integer
253
-     */
254
-    protected function calculateThreshold($k, $bias)
255
-    {
256
-        if ($k <= $bias + static::TMIN) {
257
-            return static::TMIN;
258
-        } elseif ($k >= $bias + static::TMAX) {
259
-            return static::TMAX;
260
-        }
261
-        return $k - $bias;
262
-    }
263
-
264
-    /**
265
-     * Bias adaptation
266
-     *
267
-     * @param integer $delta
268
-     * @param integer $numPoints
269
-     * @param boolean $firstTime
270
-     * @return integer
271
-     */
272
-    protected function adapt($delta, $numPoints, $firstTime)
273
-    {
274
-        $delta = (int) (
275
-            ($firstTime)
276
-                ? $delta / static::DAMP
277
-                : $delta / 2
278
-            );
279
-        $delta += (int) ($delta / $numPoints);
280
-
281
-        $k = 0;
282
-        while ($delta > ((static::BASE - static::TMIN) * static::TMAX) / 2) {
283
-            $delta = (int) ($delta / (static::BASE - static::TMIN));
284
-            $k = $k + static::BASE;
285
-        }
286
-        $k = $k + (int) (((static::BASE - static::TMIN + 1) * $delta) / ($delta + static::SKEW));
287
-
288
-        return $k;
289
-    }
290
-
291
-    /**
292
-     * List code points for a given input
293
-     *
294
-     * @param string $input
295
-     * @return array Multi-dimension array with basic, non-basic and aggregated code points
296
-     */
297
-    protected function listCodePoints($input)
298
-    {
299
-        $codePoints = array(
300
-            'all'      => array(),
301
-            'basic'    => array(),
302
-            'nonBasic' => array(),
303
-        );
304
-
305
-        $length = mb_strlen($input, $this->encoding);
306
-        for ($i = 0; $i < $length; $i++) {
307
-            $char = mb_substr($input, $i, 1, $this->encoding);
308
-            $code = $this->charToCodePoint($char);
309
-            if ($code < 128) {
310
-                $codePoints['all'][] = $codePoints['basic'][] = $code;
311
-            } else {
312
-                $codePoints['all'][] = $codePoints['nonBasic'][] = $code;
313
-            }
314
-        }
315
-
316
-        return $codePoints;
317
-    }
318
-
319
-    /**
320
-     * Convert a single or multi-byte character to its code point
321
-     *
322
-     * @param string $char
323
-     * @return integer
324
-     */
325
-    protected function charToCodePoint($char)
326
-    {
327
-        $code = ord($char[0]);
328
-        if ($code < 128) {
329
-            return $code;
330
-        } elseif ($code < 224) {
331
-            return (($code - 192) * 64) + (ord($char[1]) - 128);
332
-        } elseif ($code < 240) {
333
-            return (($code - 224) * 4096) + ((ord($char[1]) - 128) * 64) + (ord($char[2]) - 128);
334
-        } else {
335
-            return (($code - 240) * 262144) + ((ord($char[1]) - 128) * 4096) + ((ord($char[2]) - 128) * 64) + (ord($char[3]) - 128);
336
-        }
337
-    }
338
-
339
-    /**
340
-     * Convert a code point to its single or multi-byte character
341
-     *
342
-     * @param integer $code
343
-     * @return string
344
-     */
345
-    protected function codePointToChar($code)
346
-    {
347
-        if ($code <= 0x7F) {
348
-            return chr($code);
349
-        } elseif ($code <= 0x7FF) {
350
-            return chr(($code >> 6) + 192) . chr(($code & 63) + 128);
351
-        } elseif ($code <= 0xFFFF) {
352
-            return chr(($code >> 12) + 224) . chr((($code >> 6) & 63) + 128) . chr(($code & 63) + 128);
353
-        } else {
354
-            return chr(($code >> 18) + 240) . chr((($code >> 12) & 63) + 128) . chr((($code >> 6) & 63) + 128) . chr(($code & 63) + 128);
355
-        }
356
-    }
31
+	/**
32
+	 * Bootstring parameter values
33
+	 *
34
+	 */
35
+	const BASE         = 36;
36
+	const TMIN         = 1;
37
+	const TMAX         = 26;
38
+	const SKEW         = 38;
39
+	const DAMP         = 700;
40
+	const INITIAL_BIAS = 72;
41
+	const INITIAL_N    = 128;
42
+	const PREFIX       = 'xn--';
43
+	const DELIMITER    = '-';
44
+
45
+	/**
46
+	 * Encode table
47
+	 *
48
+	 * @param array
49
+	 */
50
+	protected static $encodeTable = array(
51
+		'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l',
52
+		'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x',
53
+		'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
54
+	);
55
+
56
+	/**
57
+	 * Decode table
58
+	 *
59
+	 * @param array
60
+	 */
61
+	protected static $decodeTable = array(
62
+		'a' =>  0, 'b' =>  1, 'c' =>  2, 'd' =>  3, 'e' =>  4, 'f' =>  5,
63
+		'g' =>  6, 'h' =>  7, 'i' =>  8, 'j' =>  9, 'k' => 10, 'l' => 11,
64
+		'm' => 12, 'n' => 13, 'o' => 14, 'p' => 15, 'q' => 16, 'r' => 17,
65
+		's' => 18, 't' => 19, 'u' => 20, 'v' => 21, 'w' => 22, 'x' => 23,
66
+		'y' => 24, 'z' => 25, '0' => 26, '1' => 27, '2' => 28, '3' => 29,
67
+		'4' => 30, '5' => 31, '6' => 32, '7' => 33, '8' => 34, '9' => 35
68
+	);
69
+
70
+	/**
71
+	 * Character encoding
72
+	 *
73
+	 * @param string
74
+	 */
75
+	protected $encoding;
76
+
77
+	/**
78
+	 * Constructor
79
+	 *
80
+	 * @param string $encoding Character encoding
81
+	 */
82
+	public function __construct($encoding = 'UTF-8')
83
+	{
84
+		$this->encoding = $encoding;
85
+	}
86
+
87
+	/**
88
+	 * Encode a domain to its Punycode version
89
+	 *
90
+	 * @param string $input Domain name in Unicode to be encoded
91
+	 * @return string Punycode representation in ASCII
92
+	 */
93
+	public function encode($input)
94
+	{
95
+		$input = mb_strtolower($input, $this->encoding);
96
+		$parts = explode('.', $input);
97
+		foreach ($parts as &$part) {
98
+			$part = $this->encodePart($part);
99
+		}
100
+		$output = implode('.', $parts);
101
+		$length = strlen($output);
102
+
103
+		return $output;
104
+	}
105
+
106
+	/**
107
+	 * Encode a part of a domain name, such as tld, to its Punycode version
108
+	 *
109
+	 * @param string $input Part of a domain name
110
+	 * @return string Punycode representation of a domain part
111
+	 */
112
+	protected function encodePart($input)
113
+	{
114
+		$codePoints = $this->listCodePoints($input);
115
+
116
+		$n = static::INITIAL_N;
117
+		$bias = static::INITIAL_BIAS;
118
+		$delta = 0;
119
+		$h = $b = count($codePoints['basic']);
120
+
121
+		$output = '';
122
+		foreach ($codePoints['basic'] as $code) {
123
+			$output .= $this->codePointToChar($code);
124
+		}
125
+		if ($input === $output) {
126
+			return $output;
127
+		}
128
+		if ($b > 0) {
129
+			$output .= static::DELIMITER;
130
+		}
131
+
132
+		$codePoints['nonBasic'] = array_unique($codePoints['nonBasic']);
133
+		sort($codePoints['nonBasic']);
134
+
135
+		$i = 0;
136
+		$length = mb_strlen($input, $this->encoding);
137
+		while ($h < $length) {
138
+			$m = $codePoints['nonBasic'][$i++];
139
+			$delta = $delta + ($m - $n) * ($h + 1);
140
+			$n = $m;
141
+
142
+			foreach ($codePoints['all'] as $c) {
143
+				if ($c < $n || $c < static::INITIAL_N) {
144
+					$delta++;
145
+				}
146
+				if ($c === $n) {
147
+					$q = $delta;
148
+					for ($k = static::BASE;; $k += static::BASE) {
149
+						$t = $this->calculateThreshold($k, $bias);
150
+						if ($q < $t) {
151
+							break;
152
+						}
153
+
154
+						$code = $t + (($q - $t) % (static::BASE - $t));
155
+						$output .= static::$encodeTable[$code];
156
+
157
+						$q = ($q - $t) / (static::BASE - $t);
158
+					}
159
+
160
+					$output .= static::$encodeTable[$q];
161
+					$bias = $this->adapt($delta, $h + 1, ($h === $b));
162
+					$delta = 0;
163
+					$h++;
164
+				}
165
+			}
166
+
167
+			$delta++;
168
+			$n++;
169
+		}
170
+		$out = static::PREFIX . $output;
171
+
172
+		return $out;
173
+	}
174
+
175
+	/**
176
+	 * Decode a Punycode domain name to its Unicode counterpart
177
+	 *
178
+	 * @param string $input Domain name in Punycode
179
+	 * @return string Unicode domain name
180
+	 */
181
+	public function decode($input)
182
+	{
183
+		$input = strtolower($input);
184
+		$parts = explode('.', $input);
185
+		foreach ($parts as &$part) {
186
+			if (strpos($part, static::PREFIX) !== 0) {
187
+				continue;
188
+			}
189
+
190
+			$part = substr($part, strlen(static::PREFIX));
191
+			$part = $this->decodePart($part);
192
+		}
193
+		$output = implode('.', $parts);
194
+
195
+		return $output;
196
+	}
197
+
198
+	/**
199
+	 * Decode a part of domain name, such as tld
200
+	 *
201
+	 * @param string $input Part of a domain name
202
+	 * @return string Unicode domain part
203
+	 */
204
+	protected function decodePart($input)
205
+	{
206
+		$n = static::INITIAL_N;
207
+		$i = 0;
208
+		$bias = static::INITIAL_BIAS;
209
+		$output = '';
210
+
211
+		$pos = strrpos($input, static::DELIMITER);
212
+		if ($pos !== false) {
213
+			$output = substr($input, 0, $pos++);
214
+		} else {
215
+			$pos = 0;
216
+		}
217
+
218
+		$outputLength = strlen($output);
219
+		$inputLength = strlen($input);
220
+		while ($pos < $inputLength) {
221
+			$oldi = $i;
222
+			$w = 1;
223
+
224
+			for ($k = static::BASE;; $k += static::BASE) {
225
+				$digit = static::$decodeTable[$input[$pos++]];
226
+				$i = $i + ($digit * $w);
227
+				$t = $this->calculateThreshold($k, $bias);
228
+
229
+				if ($digit < $t) {
230
+					break;
231
+				}
232
+
233
+				$w = $w * (static::BASE - $t);
234
+			}
235
+
236
+			$bias = $this->adapt($i - $oldi, ++$outputLength, ($oldi === 0));
237
+			$n = $n + (int) ($i / $outputLength);
238
+			$i = $i % ($outputLength);
239
+			$output = mb_substr($output, 0, $i, $this->encoding) . $this->codePointToChar($n) . mb_substr($output, $i, $outputLength - 1, $this->encoding);
240
+
241
+			$i++;
242
+		}
243
+
244
+		return $output;
245
+	}
246
+
247
+	/**
248
+	 * Calculate the bias threshold to fall between TMIN and TMAX
249
+	 *
250
+	 * @param integer $k
251
+	 * @param integer $bias
252
+	 * @return integer
253
+	 */
254
+	protected function calculateThreshold($k, $bias)
255
+	{
256
+		if ($k <= $bias + static::TMIN) {
257
+			return static::TMIN;
258
+		} elseif ($k >= $bias + static::TMAX) {
259
+			return static::TMAX;
260
+		}
261
+		return $k - $bias;
262
+	}
263
+
264
+	/**
265
+	 * Bias adaptation
266
+	 *
267
+	 * @param integer $delta
268
+	 * @param integer $numPoints
269
+	 * @param boolean $firstTime
270
+	 * @return integer
271
+	 */
272
+	protected function adapt($delta, $numPoints, $firstTime)
273
+	{
274
+		$delta = (int) (
275
+			($firstTime)
276
+				? $delta / static::DAMP
277
+				: $delta / 2
278
+			);
279
+		$delta += (int) ($delta / $numPoints);
280
+
281
+		$k = 0;
282
+		while ($delta > ((static::BASE - static::TMIN) * static::TMAX) / 2) {
283
+			$delta = (int) ($delta / (static::BASE - static::TMIN));
284
+			$k = $k + static::BASE;
285
+		}
286
+		$k = $k + (int) (((static::BASE - static::TMIN + 1) * $delta) / ($delta + static::SKEW));
287
+
288
+		return $k;
289
+	}
290
+
291
+	/**
292
+	 * List code points for a given input
293
+	 *
294
+	 * @param string $input
295
+	 * @return array Multi-dimension array with basic, non-basic and aggregated code points
296
+	 */
297
+	protected function listCodePoints($input)
298
+	{
299
+		$codePoints = array(
300
+			'all'      => array(),
301
+			'basic'    => array(),
302
+			'nonBasic' => array(),
303
+		);
304
+
305
+		$length = mb_strlen($input, $this->encoding);
306
+		for ($i = 0; $i < $length; $i++) {
307
+			$char = mb_substr($input, $i, 1, $this->encoding);
308
+			$code = $this->charToCodePoint($char);
309
+			if ($code < 128) {
310
+				$codePoints['all'][] = $codePoints['basic'][] = $code;
311
+			} else {
312
+				$codePoints['all'][] = $codePoints['nonBasic'][] = $code;
313
+			}
314
+		}
315
+
316
+		return $codePoints;
317
+	}
318
+
319
+	/**
320
+	 * Convert a single or multi-byte character to its code point
321
+	 *
322
+	 * @param string $char
323
+	 * @return integer
324
+	 */
325
+	protected function charToCodePoint($char)
326
+	{
327
+		$code = ord($char[0]);
328
+		if ($code < 128) {
329
+			return $code;
330
+		} elseif ($code < 224) {
331
+			return (($code - 192) * 64) + (ord($char[1]) - 128);
332
+		} elseif ($code < 240) {
333
+			return (($code - 224) * 4096) + ((ord($char[1]) - 128) * 64) + (ord($char[2]) - 128);
334
+		} else {
335
+			return (($code - 240) * 262144) + ((ord($char[1]) - 128) * 4096) + ((ord($char[2]) - 128) * 64) + (ord($char[3]) - 128);
336
+		}
337
+	}
338
+
339
+	/**
340
+	 * Convert a code point to its single or multi-byte character
341
+	 *
342
+	 * @param integer $code
343
+	 * @return string
344
+	 */
345
+	protected function codePointToChar($code)
346
+	{
347
+		if ($code <= 0x7F) {
348
+			return chr($code);
349
+		} elseif ($code <= 0x7FF) {
350
+			return chr(($code >> 6) + 192) . chr(($code & 63) + 128);
351
+		} elseif ($code <= 0xFFFF) {
352
+			return chr(($code >> 12) + 224) . chr((($code >> 6) & 63) + 128) . chr(($code & 63) + 128);
353
+		} else {
354
+			return chr(($code >> 18) + 240) . chr((($code >> 12) & 63) + 128) . chr((($code >> 6) & 63) + 128) . chr(($code & 63) + 128);
355
+		}
356
+	}
357 357
 }
358 358
 
359 359
 ?>
360 360
\ No newline at end of file
Please login to merge, or discard this patch.
Sources/Packages.php 1 patch
Braces   +593 added lines, -480 removed lines patch added patch discarded remove patch
@@ -13,8 +13,9 @@  discard block
 block discarded – undo
13 13
  * @version 2.1 Beta 4
14 14
  */
15 15
 
16
-if (!defined('SMF'))
16
+if (!defined('SMF')) {
17 17
 	die('No direct access...');
18
+}
18 19
 
19 20
 /**
20 21
  * This is the notoriously defunct package manager..... :/.
@@ -57,10 +58,11 @@  discard block
 block discarded – undo
57 58
 	);
58 59
 
59 60
 	// Work out exactly who it is we are calling.
60
-	if (isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']]))
61
-		$context['sub_action'] = $_REQUEST['sa'];
62
-	else
63
-		$context['sub_action'] = 'browse';
61
+	if (isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']])) {
62
+			$context['sub_action'] = $_REQUEST['sa'];
63
+	} else {
64
+			$context['sub_action'] = 'browse';
65
+	}
64 66
 
65 67
 	// Set up some tabs...
66 68
 	$context[$context['admin_menu_name']]['tab_data'] = array(
@@ -82,8 +84,9 @@  discard block
 block discarded – undo
82 84
 		),
83 85
 	);
84 86
 
85
-	if ($context['sub_action'] == 'browse')
86
-		loadJavaScriptFile('suggest.js', array('defer' => false, 'minimize' => true), 'smf_suggest');
87
+	if ($context['sub_action'] == 'browse') {
88
+			loadJavaScriptFile('suggest.js', array('defer' => false, 'minimize' => true), 'smf_suggest');
89
+	}
87 90
 
88 91
 	call_integration_hook('integrate_manage_packages', array(&$subActions));
89 92
 
@@ -99,8 +102,9 @@  discard block
 block discarded – undo
99 102
 	global $boarddir, $txt, $context, $scripturl, $sourcedir, $packagesdir, $modSettings, $smcFunc, $settings;
100 103
 
101 104
 	// You have to specify a file!!
102
-	if (!isset($_REQUEST['package']) || $_REQUEST['package'] == '')
103
-		redirectexit('action=admin;area=packages');
105
+	if (!isset($_REQUEST['package']) || $_REQUEST['package'] == '') {
106
+			redirectexit('action=admin;area=packages');
107
+	}
104 108
 	$context['filename'] = preg_replace('~[\.]+~', '.', $_REQUEST['package']);
105 109
 
106 110
 	// Do we have an existing id, for uninstalls and the like.
@@ -112,8 +116,9 @@  discard block
 block discarded – undo
112 116
 	create_chmod_control();
113 117
 
114 118
 	// Make sure temp directory exists and is empty.
115
-	if (file_exists($packagesdir . '/temp'))
116
-		deltree($packagesdir . '/temp', false);
119
+	if (file_exists($packagesdir . '/temp')) {
120
+			deltree($packagesdir . '/temp', false);
121
+	}
117 122
 
118 123
 	if (!mktree($packagesdir . '/temp', 0755))
119 124
 	{
@@ -124,8 +129,9 @@  discard block
 block discarded – undo
124 129
 			create_chmod_control(array($packagesdir . '/temp/delme.tmp'), array('destination_url' => $scripturl . '?action=admin;area=packages;sa=' . $_REQUEST['sa'] . ';package=' . $_REQUEST['package'], 'crash_on_error' => true));
125 130
 
126 131
 			deltree($packagesdir . '/temp', false);
127
-			if (!mktree($packagesdir . '/temp', 0777))
128
-				fatal_lang_error('package_cant_download', false);
132
+			if (!mktree($packagesdir . '/temp', 0777)) {
133
+							fatal_lang_error('package_cant_download', false);
134
+			}
129 135
 		}
130 136
 	}
131 137
 
@@ -151,25 +157,26 @@  discard block
 block discarded – undo
151 157
 	{
152 158
 		$context['extracted_files'] = read_tgz_file($packagesdir . '/' . $context['filename'], $packagesdir . '/temp');
153 159
 
154
-		if ($context['extracted_files'] && !file_exists($packagesdir . '/temp/package-info.xml'))
155
-			foreach ($context['extracted_files'] as $file)
160
+		if ($context['extracted_files'] && !file_exists($packagesdir . '/temp/package-info.xml')) {
161
+					foreach ($context['extracted_files'] as $file)
156 162
 				if (basename($file['filename']) == 'package-info.xml')
157 163
 				{
158 164
 					$context['base_path'] = dirname($file['filename']) . '/';
165
+		}
159 166
 					break;
160 167
 				}
161 168
 
162
-		if (!isset($context['base_path']))
163
-			$context['base_path'] = '';
164
-	}
165
-	elseif (is_dir($packagesdir . '/' . $context['filename']))
169
+		if (!isset($context['base_path'])) {
170
+					$context['base_path'] = '';
171
+		}
172
+	} elseif (is_dir($packagesdir . '/' . $context['filename']))
166 173
 	{
167 174
 		copytree($packagesdir . '/' . $context['filename'], $packagesdir . '/temp');
168 175
 		$context['extracted_files'] = listtree($packagesdir . '/temp');
169 176
 		$context['base_path'] = '';
177
+	} else {
178
+			fatal_lang_error('no_access', false);
170 179
 	}
171
-	else
172
-		fatal_lang_error('no_access', false);
173 180
 
174 181
 	// Load up any custom themes we may want to install into...
175 182
 	$request = $smcFunc['db_query']('', '
@@ -185,15 +192,17 @@  discard block
 block discarded – undo
185 192
 		)
186 193
 	);
187 194
 	$theme_paths = array();
188
-	while ($row = $smcFunc['db_fetch_assoc']($request))
189
-		$theme_paths[$row['id_theme']][$row['variable']] = $row['value'];
195
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
196
+			$theme_paths[$row['id_theme']][$row['variable']] = $row['value'];
197
+	}
190 198
 	$smcFunc['db_free_result']($request);
191 199
 
192 200
 	// Get the package info...
193 201
 	$packageInfo = getPackageInfo($context['filename']);
194 202
 
195
-	if (!is_array($packageInfo))
196
-		fatal_lang_error($packageInfo);
203
+	if (!is_array($packageInfo)) {
204
+			fatal_lang_error($packageInfo);
205
+	}
197 206
 
198 207
 	$packageInfo['filename'] = $context['filename'];
199 208
 	$context['package_name'] = isset($packageInfo['name']) ? $packageInfo['name'] : $context['filename'];
@@ -227,18 +236,19 @@  discard block
 block discarded – undo
227 236
 	$smcFunc['db_free_result']($request);
228 237
 
229 238
 	$context['database_changes'] = array();
230
-	if (isset($packageInfo['uninstall']['database']))
231
-		$context['database_changes'][] = $txt['execute_database_changes'] . ' - ' . $packageInfo['uninstall']['database'];
232
-	elseif (!empty($db_changes))
239
+	if (isset($packageInfo['uninstall']['database'])) {
240
+			$context['database_changes'][] = $txt['execute_database_changes'] . ' - ' . $packageInfo['uninstall']['database'];
241
+	} elseif (!empty($db_changes))
233 242
 	{
234 243
 		foreach ($db_changes as $change)
235 244
 		{
236
-			if (isset($change[2]) && isset($txt['package_db_' . $change[0]]))
237
-				$context['database_changes'][] = sprintf($txt['package_db_' . $change[0]], $change[1], $change[2]);
238
-			elseif (isset($txt['package_db_' . $change[0]]))
239
-				$context['database_changes'][] = sprintf($txt['package_db_' . $change[0]], $change[1]);
240
-			else
241
-				$context['database_changes'][] = $change[0] . '-' . $change[1] . (isset($change[2]) ? '-' . $change[2] : '');
245
+			if (isset($change[2]) && isset($txt['package_db_' . $change[0]])) {
246
+							$context['database_changes'][] = sprintf($txt['package_db_' . $change[0]], $change[1], $change[2]);
247
+			} elseif (isset($txt['package_db_' . $change[0]])) {
248
+							$context['database_changes'][] = sprintf($txt['package_db_' . $change[0]], $change[1]);
249
+			} else {
250
+							$context['database_changes'][] = $change[0] . '-' . $change[1] . (isset($change[2]) ? '-' . $change[2] : '');
251
+			}
242 252
 		}
243 253
 	}
244 254
 
@@ -265,31 +275,33 @@  discard block
 block discarded – undo
265 275
 		$context['themes_locked'] = true;
266 276
 
267 277
 		// Only let them uninstall themes it was installed into.
268
-		foreach ($theme_paths as $id => $data)
269
-			if ($id != 1 && !in_array($id, $old_themes))
278
+		foreach ($theme_paths as $id => $data) {
279
+					if ($id != 1 && !in_array($id, $old_themes))
270 280
 				unset($theme_paths[$id]);
271
-	}
272
-	elseif (isset($old_version) && $old_version != $packageInfo['version'])
281
+		}
282
+	} elseif (isset($old_version) && $old_version != $packageInfo['version'])
273 283
 	{
274 284
 		// Look for an upgrade...
275 285
 		$actions = parsePackageInfo($packageInfo['xml'], true, 'upgrade', $old_version);
276 286
 
277 287
 		// There was no upgrade....
278
-		if (empty($actions))
279
-			$context['is_installed'] = true;
280
-		else
288
+		if (empty($actions)) {
289
+					$context['is_installed'] = true;
290
+		} else
281 291
 		{
282 292
 			// Otherwise they can only upgrade themes from the first time around.
283
-			foreach ($theme_paths as $id => $data)
284
-				if ($id != 1 && !in_array($id, $old_themes))
293
+			foreach ($theme_paths as $id => $data) {
294
+							if ($id != 1 && !in_array($id, $old_themes))
285 295
 					unset($theme_paths[$id]);
296
+			}
286 297
 		}
298
+	} elseif (isset($old_version) && $old_version == $packageInfo['version']) {
299
+			$context['is_installed'] = true;
287 300
 	}
288
-	elseif (isset($old_version) && $old_version == $packageInfo['version'])
289
-		$context['is_installed'] = true;
290 301
 
291
-	if (!isset($old_version) || $context['is_installed'])
292
-		$actions = parsePackageInfo($packageInfo['xml'], true, 'install');
302
+	if (!isset($old_version) || $context['is_installed']) {
303
+			$actions = parsePackageInfo($packageInfo['xml'], true, 'install');
304
+	}
293 305
 
294 306
 	$context['actions'] = array();
295 307
 	$context['ftp_needed'] = false;
@@ -297,8 +309,9 @@  discard block
 block discarded – undo
297 309
 	$chmod_files = array();
298 310
 
299 311
 	// no actions found, return so we can display an error
300
-	if (empty($actions))
301
-		return;
312
+	if (empty($actions)) {
313
+			return;
314
+	}
302 315
 
303 316
 	// This will hold data about anything that can be installed in other themes.
304 317
 	$themeFinds = array(
@@ -317,14 +330,14 @@  discard block
 block discarded – undo
317 330
 		{
318 331
 			$chmod_files[] = $action['filename'];
319 332
 			continue;
320
-		}
321
-		elseif ($action['type'] == 'readme' || $action['type'] == 'license')
333
+		} elseif ($action['type'] == 'readme' || $action['type'] == 'license')
322 334
 		{
323 335
 			$type = 'package_' . $action['type'];
324
-			if (file_exists($packagesdir . '/temp/' . $context['base_path'] . $action['filename']))
325
-				$context[$type] = $smcFunc['htmlspecialchars'](trim(file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $action['filename']), "\n\r"));
326
-			elseif (file_exists($action['filename']))
327
-				$context[$type] = $smcFunc['htmlspecialchars'](trim(file_get_contents($action['filename']), "\n\r"));
336
+			if (file_exists($packagesdir . '/temp/' . $context['base_path'] . $action['filename'])) {
337
+							$context[$type] = $smcFunc['htmlspecialchars'](trim(file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $action['filename']), "\n\r"));
338
+			} elseif (file_exists($action['filename'])) {
339
+							$context[$type] = $smcFunc['htmlspecialchars'](trim(file_get_contents($action['filename']), "\n\r"));
340
+			}
328 341
 
329 342
 			if (!empty($action['parse_bbc']))
330 343
 			{
@@ -332,24 +345,24 @@  discard block
 block discarded – undo
332 345
 				$context[$type] = preg_replace('~\[[/]?html\]~i', '', $context[$type]);
333 346
 				preparsecode($context[$type]);
334 347
 				$context[$type] = parse_bbc($context[$type]);
348
+			} else {
349
+							$context[$type] = nl2br($context[$type]);
335 350
 			}
336
-			else
337
-				$context[$type] = nl2br($context[$type]);
338 351
 
339 352
 			continue;
340 353
 		}
341 354
 		// Don't show redirects.
342
-		elseif ($action['type'] == 'redirect')
343
-			continue;
344
-		elseif ($action['type'] == 'error')
355
+		elseif ($action['type'] == 'redirect') {
356
+					continue;
357
+		} elseif ($action['type'] == 'error')
345 358
 		{
346 359
 			$context['has_failure'] = true;
347
-			if (isset($action['error_msg']) && isset($action['error_var']))
348
-				$context['failure_details'] = sprintf($txt['package_will_fail_' . $action['error_msg']], $action['error_var']);
349
-			elseif (isset($action['error_msg']))
350
-				$context['failure_details'] = isset($txt['package_will_fail_' . $action['error_msg']]) ? $txt['package_will_fail_' . $action['error_msg']] : $action['error_msg'];
351
-		}
352
-		elseif ($action['type'] == 'modification')
360
+			if (isset($action['error_msg']) && isset($action['error_var'])) {
361
+							$context['failure_details'] = sprintf($txt['package_will_fail_' . $action['error_msg']], $action['error_var']);
362
+			} elseif (isset($action['error_msg'])) {
363
+							$context['failure_details'] = isset($txt['package_will_fail_' . $action['error_msg']]) ? $txt['package_will_fail_' . $action['error_msg']] : $action['error_msg'];
364
+			}
365
+		} elseif ($action['type'] == 'modification')
353 366
 		{
354 367
 			if (!file_exists($packagesdir . '/temp/' . $context['base_path'] . $action['filename']))
355 368
 			{
@@ -361,51 +374,53 @@  discard block
 block discarded – undo
361 374
 					'description' => $txt['package_action_missing'],
362 375
 					'failed' => true,
363 376
 				);
364
-			}
365
-			else
377
+			} else
366 378
 			{
367
-				if ($action['boardmod'])
368
-					$mod_actions = parseBoardMod(@file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $action['filename']), true, $action['reverse'], $theme_paths);
369
-				else
370
-					$mod_actions = parseModification(@file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $action['filename']), true, $action['reverse'], $theme_paths);
379
+				if ($action['boardmod']) {
380
+									$mod_actions = parseBoardMod(@file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $action['filename']), true, $action['reverse'], $theme_paths);
381
+				} else {
382
+									$mod_actions = parseModification(@file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $action['filename']), true, $action['reverse'], $theme_paths);
383
+				}
371 384
 
372
-				if (count($mod_actions) == 1 && isset($mod_actions[0]) && $mod_actions[0]['type'] == 'error' && $mod_actions[0]['filename'] == '-')
373
-					$mod_actions[0]['filename'] = $action['filename'];
385
+				if (count($mod_actions) == 1 && isset($mod_actions[0]) && $mod_actions[0]['type'] == 'error' && $mod_actions[0]['filename'] == '-') {
386
+									$mod_actions[0]['filename'] = $action['filename'];
387
+				}
374 388
 
375 389
 				foreach ($mod_actions as $key => $mod_action)
376 390
 				{
377 391
 					// Lets get the last section of the file name.
378
-					if (isset($mod_action['filename']) && substr($mod_action['filename'], -13) != '.template.php')
379
-						$actual_filename = strtolower(substr(strrchr($mod_action['filename'], '/'), 1) . '||' . $action['filename']);
380
-					elseif (isset($mod_action['filename']) && preg_match('~([\w]*)/([\w]*)\.template\.php$~', $mod_action['filename'], $matches))
381
-						$actual_filename = strtolower($matches[1] . '/' . $matches[2] . '.template.php' . '||' . $action['filename']);
382
-					else
383
-						$actual_filename = $key;
384
-
385
-					if ($mod_action['type'] == 'opened')
386
-						$failed = false;
387
-					elseif ($mod_action['type'] == 'failure')
392
+					if (isset($mod_action['filename']) && substr($mod_action['filename'], -13) != '.template.php') {
393
+											$actual_filename = strtolower(substr(strrchr($mod_action['filename'], '/'), 1) . '||' . $action['filename']);
394
+					} elseif (isset($mod_action['filename']) && preg_match('~([\w]*)/([\w]*)\.template\.php$~', $mod_action['filename'], $matches)) {
395
+											$actual_filename = strtolower($matches[1] . '/' . $matches[2] . '.template.php' . '||' . $action['filename']);
396
+					} else {
397
+											$actual_filename = $key;
398
+					}
399
+
400
+					if ($mod_action['type'] == 'opened') {
401
+											$failed = false;
402
+					} elseif ($mod_action['type'] == 'failure')
388 403
 					{
389
-						if (empty($mod_action['is_custom']))
390
-							$context['has_failure'] = true;
404
+						if (empty($mod_action['is_custom'])) {
405
+													$context['has_failure'] = true;
406
+						}
391 407
 						$failed = true;
392
-					}
393
-					elseif ($mod_action['type'] == 'chmod')
408
+					} elseif ($mod_action['type'] == 'chmod')
394 409
 					{
395 410
 						$chmod_files[] = $mod_action['filename'];
396
-					}
397
-					elseif ($mod_action['type'] == 'saved')
411
+					} elseif ($mod_action['type'] == 'saved')
398 412
 					{
399 413
 						if (!empty($mod_action['is_custom']))
400 414
 						{
401
-							if (!isset($context['theme_actions'][$mod_action['is_custom']]))
402
-								$context['theme_actions'][$mod_action['is_custom']] = array(
415
+							if (!isset($context['theme_actions'][$mod_action['is_custom']])) {
416
+															$context['theme_actions'][$mod_action['is_custom']] = array(
403 417
 									'name' => $theme_paths[$mod_action['is_custom']]['name'],
404 418
 									'actions' => array(),
405 419
 									'has_failure' => $failed,
406 420
 								);
407
-							else
408
-								$context['theme_actions'][$mod_action['is_custom']]['has_failure'] |= $failed;
421
+							} else {
422
+															$context['theme_actions'][$mod_action['is_custom']]['has_failure'] |= $failed;
423
+							}
409 424
 
410 425
 							$context['theme_actions'][$mod_action['is_custom']]['actions'][$actual_filename] = array(
411 426
 								'type' => $txt['execute_modification'],
@@ -413,8 +428,7 @@  discard block
 block discarded – undo
413 428
 								'description' => $failed ? $txt['package_action_failure'] : $txt['package_action_success'],
414 429
 								'failed' => $failed,
415 430
 							);
416
-						}
417
-						elseif (!isset($context['actions'][$actual_filename]))
431
+						} elseif (!isset($context['actions'][$actual_filename]))
418 432
 						{
419 433
 							$context['actions'][$actual_filename] = array(
420 434
 								'type' => $txt['execute_modification'],
@@ -422,22 +436,19 @@  discard block
 block discarded – undo
422 436
 								'description' => $failed ? $txt['package_action_failure'] : $txt['package_action_success'],
423 437
 								'failed' => $failed,
424 438
 							);
425
-						}
426
-						else
439
+						} else
427 440
 						{
428 441
 								$context['actions'][$actual_filename]['failed'] |= $failed;
429 442
 								$context['actions'][$actual_filename]['description'] = $context['actions'][$actual_filename]['failed'] ? $txt['package_action_failure'] : $txt['package_action_success'];
430 443
 						}
431
-					}
432
-					elseif ($mod_action['type'] == 'skipping')
444
+					} elseif ($mod_action['type'] == 'skipping')
433 445
 					{
434 446
 						$context['actions'][$actual_filename] = array(
435 447
 							'type' => $txt['execute_modification'],
436 448
 							'action' => $smcFunc['htmlspecialchars'](strtr($mod_action['filename'], array($boarddir => '.'))),
437 449
 							'description' => $txt['package_action_skipping']
438 450
 						);
439
-					}
440
-					elseif ($mod_action['type'] == 'missing' && empty($mod_action['is_custom']))
451
+					} elseif ($mod_action['type'] == 'missing' && empty($mod_action['is_custom']))
441 452
 					{
442 453
 						$context['has_failure'] = true;
443 454
 						$context['actions'][$actual_filename] = array(
@@ -446,32 +457,33 @@  discard block
 block discarded – undo
446 457
 							'description' => $txt['package_action_missing'],
447 458
 							'failed' => true,
448 459
 						);
449
-					}
450
-					elseif ($mod_action['type'] == 'error')
451
-						$context['actions'][$actual_filename] = array(
460
+					} elseif ($mod_action['type'] == 'error') {
461
+											$context['actions'][$actual_filename] = array(
452 462
 							'type' => $txt['execute_modification'],
453 463
 							'action' => $smcFunc['htmlspecialchars'](strtr($mod_action['filename'], array($boarddir => '.'))),
454 464
 							'description' => $txt['package_action_error'],
455 465
 							'failed' => true,
456 466
 						);
467
+					}
457 468
 				}
458 469
 
459 470
 				// We need to loop again just to get the operations down correctly.
460 471
 				foreach ($mod_actions as $operation_key => $mod_action)
461 472
 				{
462 473
 					// Lets get the last section of the file name.
463
-					if (isset($mod_action['filename']) && substr($mod_action['filename'], -13) != '.template.php')
464
-						$actual_filename = strtolower(substr(strrchr($mod_action['filename'], '/'), 1) . '||' . $action['filename']);
465
-					elseif (isset($mod_action['filename']) && preg_match('~([\w]*)/([\w]*)\.template\.php$~', $mod_action['filename'], $matches))
466
-						$actual_filename = strtolower($matches[1] . '/' . $matches[2] . '.template.php' . '||' . $action['filename']);
467
-					else
468
-						$actual_filename = $key;
474
+					if (isset($mod_action['filename']) && substr($mod_action['filename'], -13) != '.template.php') {
475
+											$actual_filename = strtolower(substr(strrchr($mod_action['filename'], '/'), 1) . '||' . $action['filename']);
476
+					} elseif (isset($mod_action['filename']) && preg_match('~([\w]*)/([\w]*)\.template\.php$~', $mod_action['filename'], $matches)) {
477
+											$actual_filename = strtolower($matches[1] . '/' . $matches[2] . '.template.php' . '||' . $action['filename']);
478
+					} else {
479
+											$actual_filename = $key;
480
+					}
469 481
 
470 482
 					// We just need it for actual parse changes.
471 483
 					if (!in_array($mod_action['type'], array('error', 'result', 'opened', 'saved', 'end', 'missing', 'skipping', 'chmod')))
472 484
 					{
473
-						if (empty($mod_action['is_custom']))
474
-							$context['actions'][$actual_filename]['operations'][] = array(
485
+						if (empty($mod_action['is_custom'])) {
486
+													$context['actions'][$actual_filename]['operations'][] = array(
475 487
 								'type' => $txt['execute_modification'],
476 488
 								'action' => $smcFunc['htmlspecialchars'](strtr($mod_action['filename'], array($boarddir => '.'))),
477 489
 								'description' => $mod_action['failed'] ? $txt['package_action_failure'] : $txt['package_action_success'],
@@ -482,10 +494,11 @@  discard block
 block discarded – undo
482 494
 								'failed' => $mod_action['failed'],
483 495
 								'ignore_failure' => !empty($mod_action['ignore_failure']),
484 496
 							);
497
+						}
485 498
 
486 499
 						// Themes are under the saved type.
487
-						if (isset($mod_action['is_custom']) && isset($context['theme_actions'][$mod_action['is_custom']]))
488
-							$context['theme_actions'][$mod_action['is_custom']]['actions'][$actual_filename]['operations'][] = array(
500
+						if (isset($mod_action['is_custom']) && isset($context['theme_actions'][$mod_action['is_custom']])) {
501
+													$context['theme_actions'][$mod_action['is_custom']]['actions'][$actual_filename]['operations'][] = array(
489 502
 								'type' => $txt['execute_modification'],
490 503
 								'action' => $smcFunc['htmlspecialchars'](strtr($mod_action['filename'], array($boarddir => '.'))),
491 504
 								'description' => $mod_action['failed'] ? $txt['package_action_failure'] : $txt['package_action_success'],
@@ -496,59 +509,55 @@  discard block
 block discarded – undo
496 509
 								'failed' => $mod_action['failed'],
497 510
 								'ignore_failure' => !empty($mod_action['ignore_failure']),
498 511
 							);
512
+						}
499 513
 					}
500 514
 				}
501 515
 			}
502
-		}
503
-		elseif ($action['type'] == 'code')
516
+		} elseif ($action['type'] == 'code')
504 517
 		{
505 518
 			$thisAction = array(
506 519
 				'type' => $txt['execute_code'],
507 520
 				'action' => $smcFunc['htmlspecialchars']($action['filename']),
508 521
 			);
509
-		}
510
-		elseif ($action['type'] == 'database')
522
+		} elseif ($action['type'] == 'database')
511 523
 		{
512 524
 			$thisAction = array(
513 525
 				'type' => $txt['execute_database_changes'],
514 526
 				'action' => $smcFunc['htmlspecialchars']($action['filename']),
515 527
 			);
516
-		}
517
-		elseif (in_array($action['type'], array('create-dir', 'create-file')))
528
+		} elseif (in_array($action['type'], array('create-dir', 'create-file')))
518 529
 		{
519 530
 			$thisAction = array(
520 531
 				'type' => $txt['package_create'] . ' ' . ($action['type'] == 'create-dir' ? $txt['package_tree'] : $txt['package_file']),
521 532
 				'action' => $smcFunc['htmlspecialchars'](strtr($action['destination'], array($boarddir => '.')))
522 533
 			);
523
-		}
524
-		elseif ($action['type'] == 'hook')
534
+		} elseif ($action['type'] == 'hook')
525 535
 		{
526 536
 			$action['description'] = !isset($action['hook'], $action['function']) ? $txt['package_action_failure'] : $txt['package_action_success'];
527 537
 
528
-			if (!isset($action['hook'], $action['function']))
529
-				$context['has_failure'] = true;
538
+			if (!isset($action['hook'], $action['function'])) {
539
+							$context['has_failure'] = true;
540
+			}
530 541
 
531 542
 			$thisAction = array(
532 543
 				'type' => $action['reverse'] ? $txt['execute_hook_remove'] : $txt['execute_hook_add'],
533 544
 				'action' => sprintf($txt['execute_hook_action' . ($action['reverse'] ? '_inverse' : '')], $smcFunc['htmlspecialchars']($action['hook'])),
534 545
 			);
535
-		}
536
-		elseif ($action['type'] == 'credits')
546
+		} elseif ($action['type'] == 'credits')
537 547
 		{
538 548
 			$thisAction = array(
539 549
 				'type' => $txt['execute_credits_add'],
540 550
 				'action' => sprintf($txt['execute_credits_action'], $smcFunc['htmlspecialchars']($action['title'])),
541 551
 			);
542
-		}
543
-		elseif ($action['type'] == 'requires')
552
+		} elseif ($action['type'] == 'requires')
544 553
 		{
545 554
 			$installed = false;
546 555
 			$version = true;
547 556
 
548 557
 			// package missing required values?
549
-			if (!isset($action['id']))
550
-				$context['has_failure'] = true;
551
-			else
558
+			if (!isset($action['id'])) {
559
+							$context['has_failure'] = true;
560
+			} else
552 561
 			{
553 562
 				// See if this dependancy is installed
554 563
 				$request = $smcFunc['db_query']('', '
@@ -564,8 +573,9 @@  discard block
 block discarded – undo
564 573
 					)
565 574
 				);
566 575
 				$installed = ($smcFunc['db_num_rows']($request) !== 0);
567
-				if ($installed)
568
-					list ($version) = $smcFunc['db_fetch_row']($request);
576
+				if ($installed) {
577
+									list ($version) = $smcFunc['db_fetch_row']($request);
578
+				}
569 579
 				$smcFunc['db_free_result']($request);
570 580
 
571 581
 				// do a version level check (if requested) in the most basic way
@@ -580,8 +590,7 @@  discard block
 block discarded – undo
580 590
 				'type' => $txt['package_requires'],
581 591
 				'action' => $txt['package_check_for'] . ' ' . $action['id'] . (isset($action['version']) ? (' / ' . ($version ? $action['version'] : '<span class="error">' . $action['version'] . '</span>')) : ''),
582 592
 			);
583
-		}
584
-		elseif (in_array($action['type'], array('require-dir', 'require-file')))
593
+		} elseif (in_array($action['type'], array('require-dir', 'require-file')))
585 594
 		{
586 595
 			// Do this one...
587 596
 			$thisAction = array(
@@ -595,26 +604,29 @@  discard block
 block discarded – undo
595 604
 				// Is the action already stated?
596 605
 				$theme_action = !empty($action['theme_action']) && in_array($action['theme_action'], array('no', 'yes', 'auto')) ? $action['theme_action'] : 'auto';
597 606
 				// If it's not auto do we think we have something we can act upon?
598
-				if ($theme_action != 'auto' && !in_array($matches[1], array('languagedir', 'languages_dir', 'imagesdir', 'themedir')))
599
-					$theme_action = '';
607
+				if ($theme_action != 'auto' && !in_array($matches[1], array('languagedir', 'languages_dir', 'imagesdir', 'themedir'))) {
608
+									$theme_action = '';
609
+				}
600 610
 				// ... or if it's auto do we even want to do anything?
601
-				elseif ($theme_action == 'auto' && $matches[1] != 'imagesdir')
602
-					$theme_action = '';
611
+				elseif ($theme_action == 'auto' && $matches[1] != 'imagesdir') {
612
+									$theme_action = '';
613
+				}
603 614
 
604 615
 				// So, we still want to do something?
605
-				if ($theme_action != '')
606
-					$themeFinds['candidates'][] = $action;
616
+				if ($theme_action != '') {
617
+									$themeFinds['candidates'][] = $action;
618
+				}
607 619
 				// Otherwise is this is going into another theme record it.
608
-				elseif ($matches[1] == 'themes_dir')
609
-					$themeFinds['other_themes'][] = strtolower(strtr(parse_path($action['unparsed_destination']), array('\\' => '/')) . '/' . basename($action['filename']));
620
+				elseif ($matches[1] == 'themes_dir') {
621
+									$themeFinds['other_themes'][] = strtolower(strtr(parse_path($action['unparsed_destination']), array('\\' => '/')) . '/' . basename($action['filename']));
622
+				}
610 623
 			}
611
-		}
612
-		elseif (in_array($action['type'], array('move-dir', 'move-file')))
613
-			$thisAction = array(
624
+		} elseif (in_array($action['type'], array('move-dir', 'move-file'))) {
625
+					$thisAction = array(
614 626
 				'type' => $txt['package_move'] . ' ' . ($action['type'] == 'move-dir' ? $txt['package_tree'] : $txt['package_file']),
615 627
 				'action' => $smcFunc['htmlspecialchars'](strtr($action['source'], array($boarddir => '.'))) . ' => ' . $smcFunc['htmlspecialchars'](strtr($action['destination'], array($boarddir => '.')))
616 628
 			);
617
-		elseif (in_array($action['type'], array('remove-dir', 'remove-file')))
629
+		} elseif (in_array($action['type'], array('remove-dir', 'remove-file')))
618 630
 		{
619 631
 			$thisAction = array(
620 632
 				'type' => $txt['package_delete'] . ' ' . ($action['type'] == 'remove-dir' ? $txt['package_tree'] : $txt['package_file']),
@@ -629,30 +641,36 @@  discard block
 block discarded – undo
629 641
 				$action['unparsed_destination'] = $action['unparsed_filename'];
630 642
 
631 643
 				// If it's not auto do we think we have something we can act upon?
632
-				if ($theme_action != 'auto' && !in_array($matches[1], array('languagedir', 'languages_dir', 'imagesdir', 'themedir')))
633
-					$theme_action = '';
644
+				if ($theme_action != 'auto' && !in_array($matches[1], array('languagedir', 'languages_dir', 'imagesdir', 'themedir'))) {
645
+									$theme_action = '';
646
+				}
634 647
 				// ... or if it's auto do we even want to do anything?
635
-				elseif ($theme_action == 'auto' && $matches[1] != 'imagesdir')
636
-					$theme_action = '';
648
+				elseif ($theme_action == 'auto' && $matches[1] != 'imagesdir') {
649
+									$theme_action = '';
650
+				}
637 651
 
638 652
 				// So, we still want to do something?
639
-				if ($theme_action != '')
640
-					$themeFinds['candidates'][] = $action;
653
+				if ($theme_action != '') {
654
+									$themeFinds['candidates'][] = $action;
655
+				}
641 656
 				// Otherwise is this is going into another theme record it.
642
-				elseif ($matches[1] == 'themes_dir')
643
-					$themeFinds['other_themes'][] = strtolower(strtr(parse_path($action['unparsed_filename']), array('\\' => '/')) . '/' . basename($action['filename']));
657
+				elseif ($matches[1] == 'themes_dir') {
658
+									$themeFinds['other_themes'][] = strtolower(strtr(parse_path($action['unparsed_filename']), array('\\' => '/')) . '/' . basename($action['filename']));
659
+				}
644 660
 			}
645 661
 		}
646 662
 
647
-		if (empty($thisAction))
648
-			continue;
663
+		if (empty($thisAction)) {
664
+					continue;
665
+		}
649 666
 
650 667
 		if (!in_array($action['type'], array('hook', 'credits')))
651 668
 		{
652
-			if ($context['uninstalling'])
653
-				$file = in_array($action['type'], array('remove-dir', 'remove-file')) ? $action['filename'] : $packagesdir . '/temp/' . $context['base_path'] . $action['filename'];
654
-			else
655
-				$file = $packagesdir . '/temp/' . $context['base_path'] . $action['filename'];
669
+			if ($context['uninstalling']) {
670
+							$file = in_array($action['type'], array('remove-dir', 'remove-file')) ? $action['filename'] : $packagesdir . '/temp/' . $context['base_path'] . $action['filename'];
671
+			} else {
672
+							$file = $packagesdir . '/temp/' . $context['base_path'] . $action['filename'];
673
+			}
656 674
 		}
657 675
 
658 676
 		// Don't fail if a file/directory we're trying to create doesn't exist...
@@ -667,8 +685,9 @@  discard block
 block discarded – undo
667 685
 		}
668 686
 
669 687
 		// @todo None given?
670
-		if (empty($thisAction['description']))
671
-			$thisAction['description'] = isset($action['description']) ? $action['description'] : '';
688
+		if (empty($thisAction['description'])) {
689
+					$thisAction['description'] = isset($action['description']) ? $action['description'] : '';
690
+		}
672 691
 
673 692
 		$context['actions'][] = $thisAction;
674 693
 	}
@@ -681,18 +700,21 @@  discard block
 block discarded – undo
681 700
 			// Get the part of the file we'll be dealing with.
682 701
 			preg_match('~^\$(languagedir|languages_dir|imagesdir|themedir)(\\|/)*(.+)*~i', $action_data['unparsed_destination'], $matches);
683 702
 
684
-			if ($matches[1] == 'imagesdir')
685
-				$path = '/' . basename($settings['default_images_url']);
686
-			elseif ($matches[1] == 'languagedir' || $matches[1] == 'languages_dir')
687
-				$path = '/languages';
688
-			else
689
-				$path = '';
703
+			if ($matches[1] == 'imagesdir') {
704
+							$path = '/' . basename($settings['default_images_url']);
705
+			} elseif ($matches[1] == 'languagedir' || $matches[1] == 'languages_dir') {
706
+							$path = '/languages';
707
+			} else {
708
+							$path = '';
709
+			}
690 710
 
691
-			if (!empty($matches[3]))
692
-				$path .= $matches[3];
711
+			if (!empty($matches[3])) {
712
+							$path .= $matches[3];
713
+			}
693 714
 
694
-			if (!$context['uninstalling'])
695
-				$path .= '/' . basename($action_data['filename']);
715
+			if (!$context['uninstalling']) {
716
+							$path .= '/' . basename($action_data['filename']);
717
+			}
696 718
 
697 719
 			// Loop through each custom theme to note it's candidacy!
698 720
 			foreach ($theme_paths as $id => $theme_data)
@@ -708,36 +730,40 @@  discard block
 block discarded – undo
708 730
 						if (!mktree(dirname($real_path), false))
709 731
 						{
710 732
 							$temp = dirname($real_path);
711
-							while (!file_exists($temp) && strlen($temp) > 1)
712
-								$temp = dirname($temp);
733
+							while (!file_exists($temp) && strlen($temp) > 1) {
734
+															$temp = dirname($temp);
735
+							}
713 736
 							$chmod_files[] = $temp;
714 737
 						}
715 738
 
716
-						if ($action_data['type'] == 'require-dir' && !is_writable($real_path) && (file_exists($real_path) || !is_writable(dirname($real_path))))
717
-							$chmod_files[] = $real_path;
739
+						if ($action_data['type'] == 'require-dir' && !is_writable($real_path) && (file_exists($real_path) || !is_writable(dirname($real_path)))) {
740
+													$chmod_files[] = $real_path;
741
+						}
718 742
 
719
-						if (!isset($context['theme_actions'][$id]))
720
-							$context['theme_actions'][$id] = array(
743
+						if (!isset($context['theme_actions'][$id])) {
744
+													$context['theme_actions'][$id] = array(
721 745
 								'name' => $theme_data['name'],
722 746
 								'actions' => array(),
723 747
 							);
748
+						}
724 749
 
725
-						if ($context['uninstalling'])
726
-							$context['theme_actions'][$id]['actions'][] = array(
750
+						if ($context['uninstalling']) {
751
+													$context['theme_actions'][$id]['actions'][] = array(
727 752
 								'type' => $txt['package_delete'] . ' ' . ($action_data['type'] == 'require-dir' ? $txt['package_tree'] : $txt['package_file']),
728 753
 								'action' => strtr($real_path, array('\\' => '/', $boarddir => '.')),
729 754
 								'description' => '',
730 755
 								'value' => base64_encode($smcFunc['json_encode'](array('type' => $action_data['type'], 'orig' => $action_data['filename'], 'future' => $real_path, 'id' => $id))),
731 756
 								'not_mod' => true,
732 757
 							);
733
-						else
734
-							$context['theme_actions'][$id]['actions'][] = array(
758
+						} else {
759
+													$context['theme_actions'][$id]['actions'][] = array(
735 760
 								'type' => $txt['package_extract'] . ' ' . ($action_data['type'] == 'require-dir' ? $txt['package_tree'] : $txt['package_file']),
736 761
 								'action' => strtr($real_path, array('\\' => '/', $boarddir => '.')),
737 762
 								'description' => '',
738 763
 								'value' => base64_encode($smcFunc['json_encode'](array('type' => $action_data['type'], 'orig' => $action_data['destination'], 'future' => $real_path, 'id' => $id))),
739 764
 								'not_mod' => true,
740 765
 							);
766
+						}
741 767
 					}
742 768
 				}
743 769
 			}
@@ -747,8 +773,9 @@  discard block
 block discarded – undo
747 773
 	// Trash the cache... which will also check permissions for us!
748 774
 	package_flush_cache(true);
749 775
 
750
-	if (file_exists($packagesdir . '/temp'))
751
-		deltree($packagesdir . '/temp');
776
+	if (file_exists($packagesdir . '/temp')) {
777
+			deltree($packagesdir . '/temp');
778
+	}
752 779
 
753 780
 	if (!empty($chmod_files))
754 781
 	{
@@ -773,8 +800,9 @@  discard block
 block discarded – undo
773 800
 	checkSession();
774 801
 
775 802
 	// If there's no file, what are we installing?
776
-	if (!isset($_REQUEST['package']) || $_REQUEST['package'] == '')
777
-		redirectexit('action=admin;area=packages');
803
+	if (!isset($_REQUEST['package']) || $_REQUEST['package'] == '') {
804
+			redirectexit('action=admin;area=packages');
805
+	}
778 806
 	$context['filename'] = $_REQUEST['package'];
779 807
 
780 808
 	// If this is an uninstall, we'll have an id.
@@ -795,51 +823,55 @@  discard block
 block discarded – undo
795 823
 
796 824
 	$context['sub_template'] = 'extract_package';
797 825
 
798
-	if (!file_exists($packagesdir . '/' . $context['filename']))
799
-		fatal_lang_error('package_no_file', false);
826
+	if (!file_exists($packagesdir . '/' . $context['filename'])) {
827
+			fatal_lang_error('package_no_file', false);
828
+	}
800 829
 
801 830
 	// Load up the package FTP information?
802 831
 	create_chmod_control(array(), array('destination_url' => $scripturl . '?action=admin;area=packages;sa=' . $_REQUEST['sa'] . ';package=' . $_REQUEST['package']));
803 832
 
804 833
 	// Make sure temp directory exists and is empty!
805
-	if (file_exists($packagesdir . '/temp'))
806
-		deltree($packagesdir . '/temp', false);
807
-	else
808
-		mktree($packagesdir . '/temp', 0777);
834
+	if (file_exists($packagesdir . '/temp')) {
835
+			deltree($packagesdir . '/temp', false);
836
+	} else {
837
+			mktree($packagesdir . '/temp', 0777);
838
+	}
809 839
 
810 840
 	// Let the unpacker do the work.
811 841
 	if (is_file($packagesdir . '/' . $context['filename']))
812 842
 	{
813 843
 		$context['extracted_files'] = read_tgz_file($packagesdir . '/' . $context['filename'], $packagesdir . '/temp');
814 844
 
815
-		if (!file_exists($packagesdir . '/temp/package-info.xml'))
816
-			foreach ($context['extracted_files'] as $file)
845
+		if (!file_exists($packagesdir . '/temp/package-info.xml')) {
846
+					foreach ($context['extracted_files'] as $file)
817 847
 				if (basename($file['filename']) == 'package-info.xml')
818 848
 				{
819 849
 					$context['base_path'] = dirname($file['filename']) . '/';
850
+		}
820 851
 					break;
821 852
 				}
822 853
 
823
-		if (!isset($context['base_path']))
824
-			$context['base_path'] = '';
825
-	}
826
-	elseif (is_dir($packagesdir . '/' . $context['filename']))
854
+		if (!isset($context['base_path'])) {
855
+					$context['base_path'] = '';
856
+		}
857
+	} elseif (is_dir($packagesdir . '/' . $context['filename']))
827 858
 	{
828 859
 		copytree($packagesdir . '/' . $context['filename'], $packagesdir . '/temp');
829 860
 		$context['extracted_files'] = listtree($packagesdir . '/temp');
830 861
 		$context['base_path'] = '';
862
+	} else {
863
+			fatal_lang_error('no_access', false);
831 864
 	}
832
-	else
833
-		fatal_lang_error('no_access', false);
834 865
 
835 866
 	// Are we installing this into any custom themes?
836 867
 	$custom_themes = array(1);
837 868
 	$known_themes = explode(',', $modSettings['knownThemes']);
838 869
 	if (!empty($_POST['custom_theme']))
839 870
 	{
840
-		foreach ($_POST['custom_theme'] as $tid)
841
-			if (in_array($tid, $known_themes))
871
+		foreach ($_POST['custom_theme'] as $tid) {
872
+					if (in_array($tid, $known_themes))
842 873
 				$custom_themes[] = (int) $tid;
874
+		}
843 875
 	}
844 876
 
845 877
 	// Now load up the paths of the themes that we need to know about.
@@ -856,8 +888,9 @@  discard block
 block discarded – undo
856 888
 	);
857 889
 	$theme_paths = array();
858 890
 	$themes_installed = array(1);
859
-	while ($row = $smcFunc['db_fetch_assoc']($request))
860
-		$theme_paths[$row['id_theme']][$row['variable']] = $row['value'];
891
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
892
+			$theme_paths[$row['id_theme']][$row['variable']] = $row['value'];
893
+	}
861 894
 	$smcFunc['db_free_result']($request);
862 895
 
863 896
 	// Are there any theme copying that we want to take place?
@@ -869,11 +902,13 @@  discard block
 block discarded – undo
869 902
 	{
870 903
 		foreach ($_POST['theme_changes'] as $change)
871 904
 		{
872
-			if (empty($change))
873
-				continue;
905
+			if (empty($change)) {
906
+							continue;
907
+			}
874 908
 			$theme_data = $smcFunc['json_decode'](base64_decode($change), true);
875
-			if (empty($theme_data['type']))
876
-				continue;
909
+			if (empty($theme_data['type'])) {
910
+							continue;
911
+			}
877 912
 
878 913
 			$themes_installed[] = $theme_data['id'];
879 914
 			$context['theme_copies'][$theme_data['type']][$theme_data['orig']][] = $theme_data['future'];
@@ -882,8 +917,9 @@  discard block
 block discarded – undo
882 917
 
883 918
 	// Get the package info...
884 919
 	$packageInfo = getPackageInfo($context['filename']);
885
-	if (!is_array($packageInfo))
886
-		fatal_lang_error($packageInfo);
920
+	if (!is_array($packageInfo)) {
921
+			fatal_lang_error($packageInfo);
922
+	}
887 923
 
888 924
 	$packageInfo['filename'] = $context['filename'];
889 925
 
@@ -895,8 +931,9 @@  discard block
 block discarded – undo
895 931
 	{
896 932
 		$_SESSION['last_backup_for'] = $context['filename'] . ($context['uninstalling'] ? '$$' : '$');
897 933
 		$result = package_create_backup(($context['uninstalling'] ? 'backup_' : 'before_') . strtok($context['filename'], '.'));
898
-		if (!$result)
899
-			fatal_lang_error('could_not_package_backup', false);
934
+		if (!$result) {
935
+					fatal_lang_error('could_not_package_backup', false);
936
+		}
900 937
 	}
901 938
 
902 939
 	// The mod isn't installed.... unless proven otherwise.
@@ -936,35 +973,38 @@  discard block
 block discarded – undo
936 973
 		$install_log = parsePackageInfo($packageInfo['xml'], false, 'uninstall');
937 974
 
938 975
 		// Gadzooks!  There's no uninstaller at all!?
939
-		if (empty($install_log))
940
-			fatal_lang_error('package_uninstall_cannot', false);
976
+		if (empty($install_log)) {
977
+					fatal_lang_error('package_uninstall_cannot', false);
978
+		}
941 979
 
942 980
 		// They can only uninstall from what it was originally installed into.
943
-		foreach ($theme_paths as $id => $data)
944
-			if ($id != 1 && !in_array($id, $old_themes))
981
+		foreach ($theme_paths as $id => $data) {
982
+					if ($id != 1 && !in_array($id, $old_themes))
945 983
 				unset($theme_paths[$id]);
946
-	}
947
-	elseif (isset($old_version) && $old_version != $packageInfo['version'])
984
+		}
985
+	} elseif (isset($old_version) && $old_version != $packageInfo['version'])
948 986
 	{
949 987
 		// Look for an upgrade...
950 988
 		$install_log = parsePackageInfo($packageInfo['xml'], false, 'upgrade', $old_version);
951 989
 
952 990
 		// There was no upgrade....
953
-		if (empty($install_log))
954
-			$context['is_installed'] = true;
955
-		else
991
+		if (empty($install_log)) {
992
+					$context['is_installed'] = true;
993
+		} else
956 994
 		{
957 995
 			// Upgrade previous themes only!
958
-			foreach ($theme_paths as $id => $data)
959
-				if ($id != 1 && !in_array($id, $old_themes))
996
+			foreach ($theme_paths as $id => $data) {
997
+							if ($id != 1 && !in_array($id, $old_themes))
960 998
 					unset($theme_paths[$id]);
999
+			}
961 1000
 		}
1001
+	} elseif (isset($old_version) && $old_version == $packageInfo['version']) {
1002
+			$context['is_installed'] = true;
962 1003
 	}
963
-	elseif (isset($old_version) && $old_version == $packageInfo['version'])
964
-		$context['is_installed'] = true;
965 1004
 
966
-	if (!isset($old_version) || $context['is_installed'])
967
-		$install_log = parsePackageInfo($packageInfo['xml'], false, 'install');
1005
+	if (!isset($old_version) || $context['is_installed']) {
1006
+			$install_log = parsePackageInfo($packageInfo['xml'], false, 'install');
1007
+	}
968 1008
 
969 1009
 	$context['install_finished'] = false;
970 1010
 
@@ -981,37 +1021,39 @@  discard block
 block discarded – undo
981 1021
 
982 1022
 			if ($action['type'] == 'modification' && !empty($action['filename']))
983 1023
 			{
984
-				if ($action['boardmod'])
985
-					$mod_actions = parseBoardMod(file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $action['filename']), false, $action['reverse'], $theme_paths);
986
-				else
987
-					$mod_actions = parseModification(file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $action['filename']), false, $action['reverse'], $theme_paths);
1024
+				if ($action['boardmod']) {
1025
+									$mod_actions = parseBoardMod(file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $action['filename']), false, $action['reverse'], $theme_paths);
1026
+				} else {
1027
+									$mod_actions = parseModification(file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $action['filename']), false, $action['reverse'], $theme_paths);
1028
+				}
988 1029
 
989 1030
 				// Any errors worth noting?
990 1031
 				foreach ($mod_actions as $key => $modAction)
991 1032
 				{
992
-					if ($modAction['type'] == 'failure')
993
-						$failed_steps[] = array(
1033
+					if ($modAction['type'] == 'failure') {
1034
+											$failed_steps[] = array(
994 1035
 							'file' => $modAction['filename'],
995 1036
 							'large_step' => $failed_count,
996 1037
 							'sub_step' => $key,
997 1038
 							'theme' => 1,
998 1039
 						);
1040
+					}
999 1041
 
1000 1042
 					// Gather the themes we installed into.
1001
-					if (!empty($modAction['is_custom']))
1002
-						$themes_installed[] = $modAction['is_custom'];
1043
+					if (!empty($modAction['is_custom'])) {
1044
+											$themes_installed[] = $modAction['is_custom'];
1045
+					}
1003 1046
 				}
1004
-			}
1005
-			elseif ($action['type'] == 'code' && !empty($action['filename']))
1047
+			} elseif ($action['type'] == 'code' && !empty($action['filename']))
1006 1048
 			{
1007 1049
 				// This is just here as reference for what is available.
1008 1050
 				global $txt, $boarddir, $sourcedir, $modSettings, $context, $settings, $forum_version, $smcFunc;
1009 1051
 
1010 1052
 				// Now include the file and be done with it ;).
1011
-				if (file_exists($packagesdir . '/temp/' . $context['base_path'] . $action['filename']))
1012
-					require($packagesdir . '/temp/' . $context['base_path'] . $action['filename']);
1013
-			}
1014
-			elseif ($action['type'] == 'credits')
1053
+				if (file_exists($packagesdir . '/temp/' . $context['base_path'] . $action['filename'])) {
1054
+									require($packagesdir . '/temp/' . $context['base_path'] . $action['filename']);
1055
+				}
1056
+			} elseif ($action['type'] == 'credits')
1015 1057
 			{
1016 1058
 				// Time to build the billboard
1017 1059
 				$credits_tag = array(
@@ -1021,13 +1063,13 @@  discard block
 block discarded – undo
1021 1063
 					'copyright' => $action['copyright'],
1022 1064
 					'title' => $action['title'],
1023 1065
 				);
1024
-			}
1025
-			elseif ($action['type'] == 'hook' && isset($action['hook'], $action['function']))
1066
+			} elseif ($action['type'] == 'hook' && isset($action['hook'], $action['function']))
1026 1067
 			{
1027
-				if ($action['reverse'])
1028
-					remove_integration_function($action['hook'], $action['function'], true, $action['include_file'], $action['object']);
1029
-				else
1030
-					add_integration_function($action['hook'], $action['function'], true, $action['include_file'], $action['object']);
1068
+				if ($action['reverse']) {
1069
+									remove_integration_function($action['hook'], $action['function'], true, $action['include_file'], $action['object']);
1070
+				} else {
1071
+									add_integration_function($action['hook'], $action['function'], true, $action['include_file'], $action['object']);
1072
+				}
1031 1073
 			}
1032 1074
 			// Only do the database changes on uninstall if requested.
1033 1075
 			elseif ($action['type'] == 'database' && !empty($action['filename']) && (!$context['uninstalling'] || !empty($_POST['do_db_changes'])))
@@ -1040,8 +1082,9 @@  discard block
 block discarded – undo
1040 1082
 				db_extend('packages');
1041 1083
 
1042 1084
 				// Let the file work its magic ;)
1043
-				if (file_exists($packagesdir . '/temp/' . $context['base_path'] . $action['filename']))
1044
-					require($packagesdir . '/temp/' . $context['base_path'] . $action['filename']);
1085
+				if (file_exists($packagesdir . '/temp/' . $context['base_path'] . $action['filename'])) {
1086
+									require($packagesdir . '/temp/' . $context['base_path'] . $action['filename']);
1087
+				}
1045 1088
 			}
1046 1089
 			// Handle a redirect...
1047 1090
 			elseif ($action['type'] == 'redirect' && !empty($action['redirect_url']))
@@ -1123,8 +1166,9 @@  discard block
 block discarded – undo
1123 1166
 			reloadSettings();
1124 1167
 
1125 1168
 			// Any db changes from older version?
1126
-			if (!empty($old_db_changes))
1127
-				$db_package_log = empty($db_package_log) ? $old_db_changes : array_merge($old_db_changes, $db_package_log);
1169
+			if (!empty($old_db_changes)) {
1170
+							$db_package_log = empty($db_package_log) ? $old_db_changes : array_merge($old_db_changes, $db_package_log);
1171
+			}
1128 1172
 
1129 1173
 			// If there are some database changes we might want to remove then filter them out.
1130 1174
 			if (!empty($db_package_log))
@@ -1140,22 +1184,24 @@  discard block
 block discarded – undo
1140 1184
 				 */
1141 1185
 				function sort_table_first($a, $b)
1142 1186
 				{
1143
-					if ($a[0] == $b[0])
1144
-						return 0;
1187
+					if ($a[0] == $b[0]) {
1188
+											return 0;
1189
+					}
1145 1190
 					return $a[0] == 'remove_table' ? -1 : 1;
1146 1191
 				}
1147 1192
 				usort($db_package_log, 'sort_table_first');
1148 1193
 				foreach ($db_package_log as $k => $log)
1149 1194
 				{
1150
-					if ($log[0] == 'remove_table')
1151
-						$tables[] = $log[1];
1152
-					elseif (in_array($log[1], $tables))
1153
-						unset($db_package_log[$k]);
1195
+					if ($log[0] == 'remove_table') {
1196
+											$tables[] = $log[1];
1197
+					} elseif (in_array($log[1], $tables)) {
1198
+											unset($db_package_log[$k]);
1199
+					}
1154 1200
 				}
1155 1201
 				$db_changes = $smcFunc['json_encode']($db_package_log);
1202
+			} else {
1203
+							$db_changes = '';
1156 1204
 			}
1157
-			else
1158
-				$db_changes = '';
1159 1205
 
1160 1206
 			// What themes did we actually install?
1161 1207
 			$themes_installed = array_unique($themes_installed);
@@ -1204,18 +1250,20 @@  discard block
 block discarded – undo
1204 1250
 
1205 1251
 		foreach ($db_changes as $change)
1206 1252
 		{
1207
-			if ($change[0] == 'remove_table' && isset($change[1]))
1208
-				$smcFunc['db_drop_table']($change[1]);
1209
-			elseif ($change[0] == 'remove_column' && isset($change[2]))
1210
-				$smcFunc['db_remove_column']($change[1], $change[2]);
1211
-			elseif ($change[0] == 'remove_index' && isset($change[2]))
1212
-				$smcFunc['db_remove_index']($change[1], $change[2]);
1253
+			if ($change[0] == 'remove_table' && isset($change[1])) {
1254
+							$smcFunc['db_drop_table']($change[1]);
1255
+			} elseif ($change[0] == 'remove_column' && isset($change[2])) {
1256
+							$smcFunc['db_remove_column']($change[1], $change[2]);
1257
+			} elseif ($change[0] == 'remove_index' && isset($change[2])) {
1258
+							$smcFunc['db_remove_index']($change[1], $change[2]);
1259
+			}
1213 1260
 		}
1214 1261
 	}
1215 1262
 
1216 1263
 	// Clean house... get rid of the evidence ;).
1217
-	if (file_exists($packagesdir . '/temp'))
1218
-		deltree($packagesdir . '/temp');
1264
+	if (file_exists($packagesdir . '/temp')) {
1265
+			deltree($packagesdir . '/temp');
1266
+	}
1219 1267
 
1220 1268
 	// Log what we just did.
1221 1269
 	logAction($context['uninstalling'] ? 'uninstall_package' : (!empty($is_upgrade) ? 'upgrade_package' : 'install_package'), array('package' => $smcFunc['htmlspecialchars']($packageInfo['name']), 'version' => $smcFunc['htmlspecialchars']($packageInfo['version'])), 'admin');
@@ -1238,8 +1286,9 @@  discard block
 block discarded – undo
1238 1286
 	require_once($sourcedir . '/Subs-Package.php');
1239 1287
 
1240 1288
 	// No package?  Show him or her the door.
1241
-	if (!isset($_REQUEST['package']) || $_REQUEST['package'] == '')
1242
-		redirectexit('action=admin;area=packages');
1289
+	if (!isset($_REQUEST['package']) || $_REQUEST['package'] == '') {
1290
+			redirectexit('action=admin;area=packages');
1291
+	}
1243 1292
 
1244 1293
 	$context['linktree'][] = array(
1245 1294
 		'url' => $scripturl . '?action=admin;area=packages;sa=list;package=' . $_REQUEST['package'],
@@ -1252,11 +1301,12 @@  discard block
 block discarded – undo
1252 1301
 	$context['filename'] = $_REQUEST['package'];
1253 1302
 
1254 1303
 	// Let the unpacker do the work.
1255
-	if (is_file($packagesdir . '/' . $context['filename']))
1256
-		$context['files'] = read_tgz_file($packagesdir . '/' . $context['filename'], null);
1257
-	elseif (is_dir($packagesdir . '/' . $context['filename']))
1258
-		$context['files'] = listtree($packagesdir . '/' . $context['filename']);
1259
-}
1304
+	if (is_file($packagesdir . '/' . $context['filename'])) {
1305
+			$context['files'] = read_tgz_file($packagesdir . '/' . $context['filename'], null);
1306
+	} elseif (is_dir($packagesdir . '/' . $context['filename'])) {
1307
+			$context['files'] = listtree($packagesdir . '/' . $context['filename']);
1308
+	}
1309
+	}
1260 1310
 
1261 1311
 /**
1262 1312
  * Display one of the files in a package.
@@ -1268,22 +1318,25 @@  discard block
 block discarded – undo
1268 1318
 	require_once($sourcedir . '/Subs-Package.php');
1269 1319
 
1270 1320
 	// No package?  Show him or her the door.
1271
-	if (!isset($_REQUEST['package']) || $_REQUEST['package'] == '')
1272
-		redirectexit('action=admin;area=packages');
1321
+	if (!isset($_REQUEST['package']) || $_REQUEST['package'] == '') {
1322
+			redirectexit('action=admin;area=packages');
1323
+	}
1273 1324
 
1274 1325
 	// No file?  Show him or her the door.
1275
-	if (!isset($_REQUEST['file']) || $_REQUEST['file'] == '')
1276
-		redirectexit('action=admin;area=packages');
1326
+	if (!isset($_REQUEST['file']) || $_REQUEST['file'] == '') {
1327
+			redirectexit('action=admin;area=packages');
1328
+	}
1277 1329
 
1278 1330
 	$_REQUEST['package'] = preg_replace('~[\.]+~', '.', strtr($_REQUEST['package'], array('/' => '_', '\\' => '_')));
1279 1331
 	$_REQUEST['file'] = preg_replace('~[\.]+~', '.', $_REQUEST['file']);
1280 1332
 
1281 1333
 	if (isset($_REQUEST['raw']))
1282 1334
 	{
1283
-		if (is_file($packagesdir . '/' . $_REQUEST['package']))
1284
-			echo read_tgz_file($packagesdir . '/' . $_REQUEST['package'], $_REQUEST['file'], true);
1285
-		elseif (is_dir($packagesdir . '/' . $_REQUEST['package']))
1286
-			echo file_get_contents($packagesdir . '/' . $_REQUEST['package'] . '/' . $_REQUEST['file']);
1335
+		if (is_file($packagesdir . '/' . $_REQUEST['package'])) {
1336
+					echo read_tgz_file($packagesdir . '/' . $_REQUEST['package'], $_REQUEST['file'], true);
1337
+		} elseif (is_dir($packagesdir . '/' . $_REQUEST['package'])) {
1338
+					echo file_get_contents($packagesdir . '/' . $_REQUEST['package'] . '/' . $_REQUEST['file']);
1339
+		}
1287 1340
 
1288 1341
 		obExit(false);
1289 1342
 	}
@@ -1300,17 +1353,19 @@  discard block
 block discarded – undo
1300 1353
 	$context['filename'] = $_REQUEST['file'];
1301 1354
 
1302 1355
 	// Let the unpacker do the work.... but make sure we handle images properly.
1303
-	if (in_array(strtolower(strrchr($_REQUEST['file'], '.')), array('.bmp', '.gif', '.jpeg', '.jpg', '.png')))
1304
-		$context['filedata'] = '<img src="' . $scripturl . '?action=admin;area=packages;sa=examine;package=' . $_REQUEST['package'] . ';file=' . $_REQUEST['file'] . ';raw" alt="' . $_REQUEST['file'] . '">';
1305
-	else
1356
+	if (in_array(strtolower(strrchr($_REQUEST['file'], '.')), array('.bmp', '.gif', '.jpeg', '.jpg', '.png'))) {
1357
+			$context['filedata'] = '<img src="' . $scripturl . '?action=admin;area=packages;sa=examine;package=' . $_REQUEST['package'] . ';file=' . $_REQUEST['file'] . ';raw" alt="' . $_REQUEST['file'] . '">';
1358
+	} else
1306 1359
 	{
1307
-		if (is_file($packagesdir . '/' . $_REQUEST['package']))
1308
-			$context['filedata'] = $smcFunc['htmlspecialchars'](read_tgz_file($packagesdir . '/' . $_REQUEST['package'], $_REQUEST['file'], true));
1309
-		elseif (is_dir($packagesdir . '/' . $_REQUEST['package']))
1310
-			$context['filedata'] = $smcFunc['htmlspecialchars'](file_get_contents($packagesdir . '/' . $_REQUEST['package'] . '/' . $_REQUEST['file']));
1360
+		if (is_file($packagesdir . '/' . $_REQUEST['package'])) {
1361
+					$context['filedata'] = $smcFunc['htmlspecialchars'](read_tgz_file($packagesdir . '/' . $_REQUEST['package'], $_REQUEST['file'], true));
1362
+		} elseif (is_dir($packagesdir . '/' . $_REQUEST['package'])) {
1363
+					$context['filedata'] = $smcFunc['htmlspecialchars'](file_get_contents($packagesdir . '/' . $_REQUEST['package'] . '/' . $_REQUEST['file']));
1364
+		}
1311 1365
 
1312
-		if (strtolower(strrchr($_REQUEST['file'], '.')) == '.php')
1313
-			$context['filedata'] = highlight_php_code($context['filedata']);
1366
+		if (strtolower(strrchr($_REQUEST['file'], '.')) == '.php') {
1367
+					$context['filedata'] = highlight_php_code($context['filedata']);
1368
+		}
1314 1369
 	}
1315 1370
 }
1316 1371
 
@@ -1325,8 +1380,9 @@  discard block
 block discarded – undo
1325 1380
 	checkSession('get');
1326 1381
 
1327 1382
 	// Ack, don't allow deletion of arbitrary files here, could become a security hole somehow!
1328
-	if (!isset($_GET['package']) || $_GET['package'] == 'index.php' || $_GET['package'] == 'backups')
1329
-		redirectexit('action=admin;area=packages;sa=browse');
1383
+	if (!isset($_GET['package']) || $_GET['package'] == 'index.php' || $_GET['package'] == 'backups') {
1384
+			redirectexit('action=admin;area=packages;sa=browse');
1385
+	}
1330 1386
 	$_GET['package'] = preg_replace('~[\.]+~', '.', strtr($_GET['package'], array('/' => '_', '\\' => '_')));
1331 1387
 
1332 1388
 	// Can't delete what's not there.
@@ -1334,9 +1390,9 @@  discard block
 block discarded – undo
1334 1390
 	{
1335 1391
 		create_chmod_control(array($packagesdir . '/' . $_GET['package']), array('destination_url' => $scripturl . '?action=admin;area=packages;sa=remove;package=' . $_GET['package'], 'crash_on_error' => true));
1336 1392
 
1337
-		if (is_dir($packagesdir . '/' . $_GET['package']))
1338
-			deltree($packagesdir . '/' . $_GET['package']);
1339
-		else
1393
+		if (is_dir($packagesdir . '/' . $_GET['package'])) {
1394
+					deltree($packagesdir . '/' . $_GET['package']);
1395
+		} else
1340 1396
 		{
1341 1397
 			smf_chmod($packagesdir . '/' . $_GET['package'], 0777);
1342 1398
 			unlink($packagesdir . '/' . $_GET['package']);
@@ -1384,8 +1440,9 @@  discard block
 block discarded – undo
1384 1440
 					'data' => array(
1385 1441
 						'function' => function($package_md5) use ($type, &$context)
1386 1442
 						{
1387
-							if (isset($context['available_' . $type . ''][$package_md5]))
1388
-								return $context['available_' . $type . ''][$package_md5]['sort_id'];
1443
+							if (isset($context['available_' . $type . ''][$package_md5])) {
1444
+															return $context['available_' . $type . ''][$package_md5]['sort_id'];
1445
+							}
1389 1446
 						},
1390 1447
 					),
1391 1448
 					'sort' => array(
@@ -1401,8 +1458,9 @@  discard block
 block discarded – undo
1401 1458
 					'data' => array(
1402 1459
 						'function' => function($package_md5) use ($type, &$context)
1403 1460
 						{
1404
-							if (isset($context['available_' . $type . ''][$package_md5]))
1405
-								return $context['available_' . $type . ''][$package_md5]['name'];
1461
+							if (isset($context['available_' . $type . ''][$package_md5])) {
1462
+															return $context['available_' . $type . ''][$package_md5]['name'];
1463
+							}
1406 1464
 						},
1407 1465
 					),
1408 1466
 					'sort' => array(
@@ -1417,8 +1475,9 @@  discard block
 block discarded – undo
1417 1475
 					'data' => array(
1418 1476
 						'function' => function($package_md5) use ($type, &$context)
1419 1477
 						{
1420
-							if (isset($context['available_' . $type . ''][$package_md5]))
1421
-								return $context['available_' . $type . ''][$package_md5]['version'];
1478
+							if (isset($context['available_' . $type . ''][$package_md5])) {
1479
+															return $context['available_' . $type . ''][$package_md5]['version'];
1480
+							}
1422 1481
 						},
1423 1482
 					),
1424 1483
 					'sort' => array(
@@ -1433,8 +1492,9 @@  discard block
 block discarded – undo
1433 1492
 					'data' => array(
1434 1493
 						'function' => function($package_md5) use ($type, $txt, &$context)
1435 1494
 						{
1436
-							if (isset($context['available_' . $type . ''][$package_md5]))
1437
-								return !empty($context['available_' . $type . ''][$package_md5]['time_installed']) ? timeformat($context['available_' . $type . ''][$package_md5]['time_installed']) : $txt['not_applicable'];
1495
+							if (isset($context['available_' . $type . ''][$package_md5])) {
1496
+															return !empty($context['available_' . $type . ''][$package_md5]['time_installed']) ? timeformat($context['available_' . $type . ''][$package_md5]['time_installed']) : $txt['not_applicable'];
1497
+							}
1438 1498
 						},
1439 1499
 						'class' => 'smalltext',
1440 1500
 					),
@@ -1450,28 +1510,30 @@  discard block
 block discarded – undo
1450 1510
 					'data' => array(
1451 1511
 						'function' => function($package_md5) use ($type, &$context, $scripturl, $txt)
1452 1512
 						{
1453
-							if (!isset($context['available_' . $type . ''][$package_md5]))
1454
-								return '';
1513
+							if (!isset($context['available_' . $type . ''][$package_md5])) {
1514
+															return '';
1515
+							}
1455 1516
 
1456 1517
 							// Rewrite shortcut
1457 1518
 							$package = $context['available_' . $type . ''][$package_md5];
1458 1519
 							$return = '';
1459 1520
 
1460
-							if ($package['can_uninstall'])
1461
-								$return = '
1521
+							if ($package['can_uninstall']) {
1522
+															$return = '
1462 1523
 									<a href="' . $scripturl . '?action=admin;area=packages;sa=uninstall;package=' . $package['filename'] . ';pid=' . $package['installed_id'] . '" class="button">' . $txt['uninstall'] . '</a>';
1463
-							elseif ($package['can_emulate_uninstall'])
1464
-								$return = '
1524
+							} elseif ($package['can_emulate_uninstall']) {
1525
+															$return = '
1465 1526
 									<a href="' . $scripturl . '?action=admin;area=packages;sa=uninstall;ve=' . $package['can_emulate_uninstall'] . ';package=' . $package['filename'] . ';pid=' . $package['installed_id'] . '" class="button">' . $txt['package_emulate_uninstall'] . ' ' . $package['can_emulate_uninstall'] . '</a>';
1466
-							elseif ($package['can_upgrade'])
1467
-								$return = '
1527
+							} elseif ($package['can_upgrade']) {
1528
+															$return = '
1468 1529
 									<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $package['filename'] . '" class="button">' . $txt['package_upgrade'] . '</a>';
1469
-							elseif ($package['can_install'])
1470
-								$return = '
1530
+							} elseif ($package['can_install']) {
1531
+															$return = '
1471 1532
 									<a href="' . $scripturl . '?action=admin;area=packages;sa=install;package=' . $package['filename'] . '" class="button">' . $txt['install_mod'] . '</a>';
1472
-							elseif ($package['can_emulate_install'])
1473
-								$return = '
1533
+							} elseif ($package['can_emulate_install']) {
1534
+															$return = '
1474 1535
 									<a href="' . $scripturl . '?action=admin;area=packages;sa=install;ve=' . $package['can_emulate_install'] . ';package=' . $package['filename'] . '" class="button">' . $txt['package_emulate_install'] . ' ' . $package['can_emulate_install'] . '</a>';
1536
+							}
1475 1537
 
1476 1538
 							return $return . '
1477 1539
 									<a href="' . $scripturl . '?action=admin;area=packages;sa=list;package=' . $package['filename'] . '" class="button">' . $txt['list_files'] . '</a>
@@ -1536,12 +1598,14 @@  discard block
 block discarded – undo
1536 1598
 	static $packages, $installed_mods;
1537 1599
 
1538 1600
 	// Start things up
1539
-	if (!isset($packages[$params]))
1540
-		$packages[$params] = array();
1601
+	if (!isset($packages[$params])) {
1602
+			$packages[$params] = array();
1603
+	}
1541 1604
 
1542 1605
 	// We need the packages directory to be writable for this.
1543
-	if (!@is_writable($packagesdir))
1544
-		create_chmod_control(array($packagesdir), array('destination_url' => $scripturl . '?action=admin;area=packages', 'crash_on_error' => true));
1606
+	if (!@is_writable($packagesdir)) {
1607
+			create_chmod_control(array($packagesdir), array('destination_url' => $scripturl . '?action=admin;area=packages', 'crash_on_error' => true));
1608
+	}
1545 1609
 
1546 1610
 	$the_version = strtr($forum_version, array('SMF ' => ''));
1547 1611
 
@@ -1549,41 +1613,44 @@  discard block
 block discarded – undo
1549 1613
 	if (isset($_GET['version_emulate']) && strtr($_GET['version_emulate'], array('SMF ' => '')) == $the_version)
1550 1614
 	{
1551 1615
 		unset($_SESSION['version_emulate']);
1552
-	}
1553
-	elseif (isset($_GET['version_emulate']))
1616
+	} elseif (isset($_GET['version_emulate']))
1554 1617
 	{
1555
-		if (($_GET['version_emulate'] === 0 || $_GET['version_emulate'] === $forum_version) && isset($_SESSION['version_emulate']))
1556
-			unset($_SESSION['version_emulate']);
1557
-		elseif ($_GET['version_emulate'] !== 0)
1558
-			$_SESSION['version_emulate'] = strtr($_GET['version_emulate'], array('-' => ' ', '+' => ' ', 'SMF ' => ''));
1618
+		if (($_GET['version_emulate'] === 0 || $_GET['version_emulate'] === $forum_version) && isset($_SESSION['version_emulate'])) {
1619
+					unset($_SESSION['version_emulate']);
1620
+		} elseif ($_GET['version_emulate'] !== 0) {
1621
+					$_SESSION['version_emulate'] = strtr($_GET['version_emulate'], array('-' => ' ', '+' => ' ', 'SMF ' => ''));
1622
+		}
1559 1623
 	}
1560 1624
 	if (!empty($_SESSION['version_emulate']))
1561 1625
 	{
1562 1626
 		$context['forum_version'] = 'SMF ' . $_SESSION['version_emulate'];
1563 1627
 		$the_version = $_SESSION['version_emulate'];
1564 1628
 	}
1565
-	if (isset($_SESSION['single_version_emulate']))
1566
-		unset($_SESSION['single_version_emulate']);
1629
+	if (isset($_SESSION['single_version_emulate'])) {
1630
+			unset($_SESSION['single_version_emulate']);
1631
+	}
1567 1632
 
1568 1633
 	if (empty($installed_mods))
1569 1634
 	{
1570 1635
 		$instmods = loadInstalledPackages();
1571 1636
 		$installed_mods = array();
1572 1637
 		// Look through the list of installed mods...
1573
-		foreach ($instmods as $installed_mod)
1574
-			$installed_mods[$installed_mod['package_id']] = array(
1638
+		foreach ($instmods as $installed_mod) {
1639
+					$installed_mods[$installed_mod['package_id']] = array(
1575 1640
 				'id' => $installed_mod['id'],
1576 1641
 				'version' => $installed_mod['version'],
1577 1642
 				'time_installed' => $installed_mod['time_installed'],
1578 1643
 			);
1644
+		}
1579 1645
 
1580 1646
 		// Get a list of all the ids installed, so the latest packages won't include already installed ones.
1581 1647
 		$context['installed_mods'] = array_keys($installed_mods);
1582 1648
 	}
1583 1649
 
1584
-	if (empty($packages))
1585
-		foreach ($context['modification_types'] as $type)
1650
+	if (empty($packages)) {
1651
+			foreach ($context['modification_types'] as $type)
1586 1652
 			$packages[$type] = array();
1653
+	}
1587 1654
 
1588 1655
 	if ($dir = @opendir($packagesdir))
1589 1656
 	{
@@ -1599,50 +1666,56 @@  discard block
 block discarded – undo
1599 1666
 
1600 1667
 		while ($package = readdir($dir))
1601 1668
 		{
1602
-			if ($package == '.' || $package == '..' || $package == 'temp' || (!(is_dir($packagesdir . '/' . $package) && file_exists($packagesdir . '/' . $package . '/package-info.xml')) && substr(strtolower($package), -7) != '.tar.gz' && substr(strtolower($package), -4) != '.tgz' && substr(strtolower($package), -4) != '.zip'))
1603
-				continue;
1669
+			if ($package == '.' || $package == '..' || $package == 'temp' || (!(is_dir($packagesdir . '/' . $package) && file_exists($packagesdir . '/' . $package . '/package-info.xml')) && substr(strtolower($package), -7) != '.tar.gz' && substr(strtolower($package), -4) != '.tgz' && substr(strtolower($package), -4) != '.zip')) {
1670
+							continue;
1671
+			}
1604 1672
 
1605 1673
 			$skip = false;
1606
-			foreach ($context['modification_types'] as $type)
1607
-				if (isset($context['available_' . $type][md5($package)]))
1674
+			foreach ($context['modification_types'] as $type) {
1675
+							if (isset($context['available_' . $type][md5($package)]))
1608 1676
 					$skip = true;
1677
+			}
1609 1678
 
1610
-			if ($skip)
1611
-				continue;
1679
+			if ($skip) {
1680
+							continue;
1681
+			}
1612 1682
 
1613 1683
 			// Skip directories or files that are named the same.
1614 1684
 			if (is_dir($packagesdir . '/' . $package))
1615 1685
 			{
1616
-				if (in_array($package, $dirs))
1617
-					continue;
1686
+				if (in_array($package, $dirs)) {
1687
+									continue;
1688
+				}
1618 1689
 				$dirs[] = $package;
1619
-			}
1620
-			elseif (substr(strtolower($package), -7) == '.tar.gz')
1690
+			} elseif (substr(strtolower($package), -7) == '.tar.gz')
1621 1691
 			{
1622
-				if (in_array(substr($package, 0, -7), $dirs))
1623
-					continue;
1692
+				if (in_array(substr($package, 0, -7), $dirs)) {
1693
+									continue;
1694
+				}
1624 1695
 				$dirs[] = substr($package, 0, -7);
1625
-			}
1626
-			elseif (substr(strtolower($package), -4) == '.zip' || substr(strtolower($package), -4) == '.tgz')
1696
+			} elseif (substr(strtolower($package), -4) == '.zip' || substr(strtolower($package), -4) == '.tgz')
1627 1697
 			{
1628
-				if (in_array(substr($package, 0, -4), $dirs))
1629
-					continue;
1698
+				if (in_array(substr($package, 0, -4), $dirs)) {
1699
+									continue;
1700
+				}
1630 1701
 				$dirs[] = substr($package, 0, -4);
1631 1702
 			}
1632 1703
 
1633 1704
 			$packageInfo = getPackageInfo($package);
1634
-			if (!is_array($packageInfo))
1635
-				continue;
1705
+			if (!is_array($packageInfo)) {
1706
+							continue;
1707
+			}
1636 1708
 
1637 1709
 			if (!empty($packageInfo))
1638 1710
 			{
1639 1711
 				$packageInfo['installed_id'] = isset($installed_mods[$packageInfo['id']]) ? $installed_mods[$packageInfo['id']]['id'] : 0;
1640 1712
 				$packageInfo['time_installed'] = isset($installed_mods[$packageInfo['id']]) ? $installed_mods[$packageInfo['id']]['time_installed'] : 0;
1641 1713
 
1642
-				if (!isset($sort_id[$packageInfo['type']]))
1643
-					$packageInfo['sort_id'] = $sort_id['unknown'];
1644
-				else
1645
-					$packageInfo['sort_id'] = $sort_id[$packageInfo['type']];
1714
+				if (!isset($sort_id[$packageInfo['type']])) {
1715
+									$packageInfo['sort_id'] = $sort_id['unknown'];
1716
+				} else {
1717
+									$packageInfo['sort_id'] = $sort_id[$packageInfo['type']];
1718
+				}
1646 1719
 
1647 1720
 				$packageInfo['is_installed'] = isset($installed_mods[$packageInfo['id']]);
1648 1721
 				$packageInfo['is_current'] = $packageInfo['is_installed'] && ($installed_mods[$packageInfo['id']]['version'] == $packageInfo['version']);
@@ -1691,10 +1764,11 @@  discard block
 block discarded – undo
1691 1764
 					foreach ($upgrades as $upgrade)
1692 1765
 					{
1693 1766
 						// Even if it is for this SMF, is it for the installed version of the mod?
1694
-						if (!$upgrade->exists('@for') || matchPackageVersion($the_version, $upgrade->fetch('@for')))
1695
-							if (!$upgrade->exists('@from') || matchPackageVersion($installed_mods[$packageInfo['id']]['version'], $upgrade->fetch('@from')))
1767
+						if (!$upgrade->exists('@for') || matchPackageVersion($the_version, $upgrade->fetch('@for'))) {
1768
+													if (!$upgrade->exists('@from') || matchPackageVersion($installed_mods[$packageInfo['id']]['version'], $upgrade->fetch('@from')))
1696 1769
 							{
1697 1770
 								$packageInfo['can_upgrade'] = true;
1771
+						}
1698 1772
 								break;
1699 1773
 							}
1700 1774
 					}
@@ -1771,10 +1845,11 @@  discard block
 block discarded – undo
1771 1845
 
1772 1846
 	if (isset($_GET['type']) && $_GET['type'] == $params)
1773 1847
 	{
1774
-		if (isset($_GET['desc']))
1775
-			krsort($packages[$params]);
1776
-		else
1777
-			ksort($packages[$params]);
1848
+		if (isset($_GET['desc'])) {
1849
+					krsort($packages[$params]);
1850
+		} else {
1851
+					ksort($packages[$params]);
1852
+		}
1778 1853
 	}
1779 1854
 
1780 1855
 	return $packages[$params];
@@ -1803,10 +1878,11 @@  discard block
 block discarded – undo
1803 1878
 		redirectexit('action=admin;area=packages;sa=options');
1804 1879
 	}
1805 1880
 
1806
-	if (preg_match('~^/home\d*/([^/]+?)/public_html~', $_SERVER['DOCUMENT_ROOT'], $match))
1807
-		$default_username = $match[1];
1808
-	else
1809
-		$default_username = '';
1881
+	if (preg_match('~^/home\d*/([^/]+?)/public_html~', $_SERVER['DOCUMENT_ROOT'], $match)) {
1882
+			$default_username = $match[1];
1883
+	} else {
1884
+			$default_username = '';
1885
+	}
1810 1886
 
1811 1887
 	$context['page_title'] = $txt['package_settings'];
1812 1888
 	$context['sub_template'] = 'install_options';
@@ -1835,8 +1911,9 @@  discard block
 block discarded – undo
1835 1911
 	isAllowedTo('admin_forum');
1836 1912
 
1837 1913
 	// We need to know the operation key for the search and replace, mod file looking at, is it a board mod?
1838
-	if (!isset($_REQUEST['operation_key'], $_REQUEST['filename']) && !is_numeric($_REQUEST['operation_key']))
1839
-		fatal_lang_error('operation_invalid', 'general');
1914
+	if (!isset($_REQUEST['operation_key'], $_REQUEST['filename']) && !is_numeric($_REQUEST['operation_key'])) {
1915
+			fatal_lang_error('operation_invalid', 'general');
1916
+	}
1840 1917
 
1841 1918
 	// Load the required file.
1842 1919
 	require_once($sourcedir . '/Subs-Package.php');
@@ -1852,18 +1929,19 @@  discard block
 block discarded – undo
1852 1929
 	{
1853 1930
 		$context['extracted_files'] = read_tgz_file($packagesdir . '/' . $context['filename'], $packagesdir . '/temp');
1854 1931
 
1855
-		if ($context['extracted_files'] && !file_exists($packagesdir . '/temp/package-info.xml'))
1856
-			foreach ($context['extracted_files'] as $file)
1932
+		if ($context['extracted_files'] && !file_exists($packagesdir . '/temp/package-info.xml')) {
1933
+					foreach ($context['extracted_files'] as $file)
1857 1934
 				if (basename($file['filename']) == 'package-info.xml')
1858 1935
 				{
1859 1936
 					$context['base_path'] = dirname($file['filename']) . '/';
1937
+		}
1860 1938
 					break;
1861 1939
 				}
1862 1940
 
1863
-		if (!isset($context['base_path']))
1864
-			$context['base_path'] = '';
1865
-	}
1866
-	elseif (is_dir($packagesdir . '/' . $context['filename']))
1941
+		if (!isset($context['base_path'])) {
1942
+					$context['base_path'] = '';
1943
+		}
1944
+	} elseif (is_dir($packagesdir . '/' . $context['filename']))
1867 1945
 	{
1868 1946
 		copytree($packagesdir . '/' . $context['filename'], $packagesdir . '/temp');
1869 1947
 		$context['extracted_files'] = listtree($packagesdir . '/temp');
@@ -1884,8 +1962,9 @@  discard block
 block discarded – undo
1884 1962
 		)
1885 1963
 	);
1886 1964
 	$theme_paths = array();
1887
-	while ($row = $smcFunc['db_fetch_assoc']($request))
1888
-		$theme_paths[$row['id_theme']][$row['variable']] = $row['value'];
1965
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
1966
+			$theme_paths[$row['id_theme']][$row['variable']] = $row['value'];
1967
+	}
1889 1968
 	$smcFunc['db_free_result']($request);
1890 1969
 
1891 1970
 	// If we're viewing uninstall operations, only consider themes that
@@ -1910,19 +1989,21 @@  discard block
 block discarded – undo
1910 1989
 				list ($old_themes) = $smcFunc['db_fetch_row']($request);
1911 1990
 				$old_themes = explode(',', $old_themes);
1912 1991
 
1913
-				foreach ($theme_paths as $id => $data)
1914
-					if ($id != 1 && !in_array($id, $old_themes))
1992
+				foreach ($theme_paths as $id => $data) {
1993
+									if ($id != 1 && !in_array($id, $old_themes))
1915 1994
 						unset($theme_paths[$id]);
1995
+				}
1916 1996
 			}
1917 1997
 			$smcFunc['db_free_result']($request);
1918 1998
 		}
1919 1999
 	}
1920 2000
 
1921 2001
 	// Boardmod?
1922
-	if (isset($_REQUEST['boardmod']))
1923
-		$mod_actions = parseBoardMod(@file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $_REQUEST['filename']), true, $reverse, $theme_paths);
1924
-	else
1925
-		$mod_actions = parseModification(@file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $_REQUEST['filename']), true, $reverse, $theme_paths);
2002
+	if (isset($_REQUEST['boardmod'])) {
2003
+			$mod_actions = parseBoardMod(@file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $_REQUEST['filename']), true, $reverse, $theme_paths);
2004
+	} else {
2005
+			$mod_actions = parseModification(@file_get_contents($packagesdir . '/temp/' . $context['base_path'] . $_REQUEST['filename']), true, $reverse, $theme_paths);
2006
+	}
1926 2007
 
1927 2008
 	// Ok lets get the content of the file.
1928 2009
 	$context['operations'] = array(
@@ -1978,9 +2059,9 @@  discard block
 block discarded – undo
1978 2059
 			'path' => $detect_path,
1979 2060
 			'form_elements_only' => true,
1980 2061
 		);
2062
+	} else {
2063
+			$context['ftp_connected'] = true;
1981 2064
 	}
1982
-	else
1983
-		$context['ftp_connected'] = true;
1984 2065
 
1985 2066
 	// Define the template.
1986 2067
 	$context['page_title'] = $txt['package_file_perms'];
@@ -2093,17 +2174,18 @@  discard block
 block discarded – undo
2093 2174
 	{
2094 2175
 		unset($context['file_tree'][strtr($boarddir, array('\\' => '/'))]['contents']['attachments']);
2095 2176
 
2096
-		if (!is_array($modSettings['attachmentUploadDir']))
2097
-			$modSettings['attachmentUploadDir'] = $smcFunc['json_decode']($modSettings['attachmentUploadDir'], true);
2177
+		if (!is_array($modSettings['attachmentUploadDir'])) {
2178
+					$modSettings['attachmentUploadDir'] = $smcFunc['json_decode']($modSettings['attachmentUploadDir'], true);
2179
+		}
2098 2180
 
2099 2181
 		// @todo Should we suggest non-current directories be read only?
2100
-		foreach ($modSettings['attachmentUploadDir'] as $dir)
2101
-			$context['file_tree'][strtr($dir, array('\\' => '/'))] = array(
2182
+		foreach ($modSettings['attachmentUploadDir'] as $dir) {
2183
+					$context['file_tree'][strtr($dir, array('\\' => '/'))] = array(
2102 2184
 			'type' => 'dir',
2103 2185
 			'writable_on' => 'restrictive',
2104 2186
 		);
2105
-	}
2106
-	elseif (substr($modSettings['attachmentUploadDir'], 0, strlen($boarddir)) != $boarddir)
2187
+		}
2188
+	} elseif (substr($modSettings['attachmentUploadDir'], 0, strlen($boarddir)) != $boarddir)
2107 2189
 	{
2108 2190
 		unset($context['file_tree'][strtr($boarddir, array('\\' => '/'))]['contents']['attachments']);
2109 2191
 		$context['file_tree'][strtr($modSettings['attachmentUploadDir'], array('\\' => '/'))] = array(
@@ -2153,8 +2235,8 @@  discard block
 block discarded – undo
2153 2235
 	);
2154 2236
 	while ($row = $smcFunc['db_fetch_assoc']($request))
2155 2237
 	{
2156
-		if (substr(strtolower(strtr($row['value'], array('\\' => '/'))), 0, strlen($boarddir) + 7) == strtolower(strtr($boarddir, array('\\' => '/')) . '/Themes'))
2157
-			$context['file_tree'][strtr($boarddir, array('\\' => '/'))]['contents']['Themes']['contents'][substr($row['value'], strlen($boarddir) + 8)] = array(
2238
+		if (substr(strtolower(strtr($row['value'], array('\\' => '/'))), 0, strlen($boarddir) + 7) == strtolower(strtr($boarddir, array('\\' => '/')) . '/Themes')) {
2239
+					$context['file_tree'][strtr($boarddir, array('\\' => '/'))]['contents']['Themes']['contents'][substr($row['value'], strlen($boarddir) + 8)] = array(
2158 2240
 				'type' => 'dir_recursive',
2159 2241
 				'list_contents' => true,
2160 2242
 				'contents' => array(
@@ -2164,7 +2246,7 @@  discard block
 block discarded – undo
2164 2246
 					),
2165 2247
 				),
2166 2248
 			);
2167
-		else
2249
+		} else
2168 2250
 		{
2169 2251
 			$context['file_tree'][strtr($row['value'], array('\\' => '/'))] = array(
2170 2252
 				'type' => 'dir_recursive',
@@ -2181,28 +2263,33 @@  discard block
 block discarded – undo
2181 2263
 	$smcFunc['db_free_result']($request);
2182 2264
 
2183 2265
 	// If we're submitting then let's move on to another function to keep things cleaner..
2184
-	if (isset($_POST['action_changes']))
2185
-		return PackagePermissionsAction();
2266
+	if (isset($_POST['action_changes'])) {
2267
+			return PackagePermissionsAction();
2268
+	}
2186 2269
 
2187 2270
 	$context['look_for'] = array();
2188 2271
 	// Are we looking for a particular tree - normally an expansion?
2189
-	if (!empty($_REQUEST['find']))
2190
-		$context['look_for'][] = base64_decode($_REQUEST['find']);
2272
+	if (!empty($_REQUEST['find'])) {
2273
+			$context['look_for'][] = base64_decode($_REQUEST['find']);
2274
+	}
2191 2275
 	// Only that tree?
2192 2276
 	$context['only_find'] = isset($_GET['xml']) && !empty($_REQUEST['onlyfind']) ? $_REQUEST['onlyfind'] : '';
2193
-	if ($context['only_find'])
2194
-		$context['look_for'][] = $context['only_find'];
2277
+	if ($context['only_find']) {
2278
+			$context['look_for'][] = $context['only_find'];
2279
+	}
2195 2280
 
2196 2281
 	// Have we got a load of back-catalogue trees to expand from a submit etc?
2197 2282
 	if (!empty($_GET['back_look']))
2198 2283
 	{
2199 2284
 		$potententialTrees = $smcFunc['json_decode'](base64_decode($_GET['back_look']), true);
2200
-		foreach ($potententialTrees as $tree)
2201
-			$context['look_for'][] = $tree;
2285
+		foreach ($potententialTrees as $tree) {
2286
+					$context['look_for'][] = $tree;
2287
+		}
2202 2288
 	}
2203 2289
 	// ... maybe posted?
2204
-	if (!empty($_POST['back_look']))
2205
-		$context['only_find'] = array_merge($context['only_find'], $_POST['back_look']);
2290
+	if (!empty($_POST['back_look'])) {
2291
+			$context['only_find'] = array_merge($context['only_find'], $_POST['back_look']);
2292
+	}
2206 2293
 
2207 2294
 	$context['back_look_data'] = base64_encode($smcFunc['json_encode'](array_slice($context['look_for'], 0, 15)));
2208 2295
 
@@ -2241,9 +2328,9 @@  discard block
 block discarded – undo
2241 2328
 				'chmod' => @is_writable($path),
2242 2329
 				'perms' => @fileperms($path),
2243 2330
 			);
2331
+		} else {
2332
+					unset($context['file_tree'][$path]);
2244 2333
 		}
2245
-		else
2246
-			unset($context['file_tree'][$path]);
2247 2334
 	}
2248 2335
 
2249 2336
 	// Is this actually xml?
@@ -2267,22 +2354,25 @@  discard block
 block discarded – undo
2267 2354
 	global $context;
2268 2355
 
2269 2356
 	$isLikelyPath = false;
2270
-	foreach ($context['look_for'] as $possiblePath)
2271
-		if (substr($possiblePath, 0, strlen($path)) == $path)
2357
+	foreach ($context['look_for'] as $possiblePath) {
2358
+			if (substr($possiblePath, 0, strlen($path)) == $path)
2272 2359
 			$isLikelyPath = true;
2360
+	}
2273 2361
 
2274 2362
 	// Is this where we stop?
2275
-	if (isset($_GET['xml']) && !empty($context['look_for']) && !$isLikelyPath)
2276
-		return;
2277
-	elseif ($level > $context['default_level'] && !$isLikelyPath)
2278
-		return;
2363
+	if (isset($_GET['xml']) && !empty($context['look_for']) && !$isLikelyPath) {
2364
+			return;
2365
+	} elseif ($level > $context['default_level'] && !$isLikelyPath) {
2366
+			return;
2367
+	}
2279 2368
 
2280 2369
 	// Are we actually interested in saving this data?
2281 2370
 	$save_data = empty($context['only_find']) || $context['only_find'] == $path;
2282 2371
 
2283 2372
 	// @todo Shouldn't happen - but better error message?
2284
-	if (!is_dir($path))
2285
-		fatal_lang_error('no_access', false);
2373
+	if (!is_dir($path)) {
2374
+			fatal_lang_error('no_access', false);
2375
+	}
2286 2376
 
2287 2377
 	// This is where we put stuff we've found for sorting.
2288 2378
 	$foundData = array(
@@ -2297,11 +2387,13 @@  discard block
 block discarded – undo
2297 2387
 		if (is_file($path . '/' . $entry))
2298 2388
 		{
2299 2389
 			// Are we listing PHP files in this directory?
2300
-			if ($save_data && !empty($data['list_contents']) && substr($entry, -4) == '.php')
2301
-				$foundData['files'][$entry] = true;
2390
+			if ($save_data && !empty($data['list_contents']) && substr($entry, -4) == '.php') {
2391
+							$foundData['files'][$entry] = true;
2392
+			}
2302 2393
 			// A file we were looking for.
2303
-			elseif ($save_data && isset($data['contents'][$entry]))
2304
-				$foundData['files'][$entry] = true;
2394
+			elseif ($save_data && isset($data['contents'][$entry])) {
2395
+							$foundData['files'][$entry] = true;
2396
+			}
2305 2397
 		}
2306 2398
 		// It's a directory - we're interested one way or another, probably...
2307 2399
 		elseif ($entry != '.' && $entry != '..')
@@ -2309,32 +2401,36 @@  discard block
 block discarded – undo
2309 2401
 			// Going further?
2310 2402
 			if ((!empty($data['type']) && $data['type'] == 'dir_recursive') || (isset($data['contents'][$entry]) && (!empty($data['contents'][$entry]['list_contents']) || (!empty($data['contents'][$entry]['type']) && $data['contents'][$entry]['type'] == 'dir_recursive'))))
2311 2403
 			{
2312
-				if (!isset($data['contents'][$entry]))
2313
-					$foundData['folders'][$entry] = 'dir_recursive';
2314
-				else
2315
-					$foundData['folders'][$entry] = true;
2404
+				if (!isset($data['contents'][$entry])) {
2405
+									$foundData['folders'][$entry] = 'dir_recursive';
2406
+				} else {
2407
+									$foundData['folders'][$entry] = true;
2408
+				}
2316 2409
 
2317 2410
 				// If this wasn't expected inherit the recusiveness...
2318
-				if (!isset($data['contents'][$entry]))
2319
-					// We need to do this as we will be going all recursive.
2411
+				if (!isset($data['contents'][$entry])) {
2412
+									// We need to do this as we will be going all recursive.
2320 2413
 					$data['contents'][$entry] = array(
2321 2414
 						'type' => 'dir_recursive',
2322 2415
 					);
2416
+				}
2323 2417
 
2324 2418
 				// Actually do the recursive stuff...
2325 2419
 				fetchPerms__recursive($path . '/' . $entry, $data['contents'][$entry], $level + 1);
2326 2420
 			}
2327 2421
 			// Maybe it is a folder we are not descending into.
2328
-			elseif (isset($data['contents'][$entry]))
2329
-				$foundData['folders'][$entry] = true;
2422
+			elseif (isset($data['contents'][$entry])) {
2423
+							$foundData['folders'][$entry] = true;
2424
+			}
2330 2425
 			// Otherwise we stop here.
2331 2426
 		}
2332 2427
 	}
2333 2428
 	closedir($dh);
2334 2429
 
2335 2430
 	// Nothing to see here?
2336
-	if (!$save_data)
2337
-		return;
2431
+	if (!$save_data) {
2432
+			return;
2433
+	}
2338 2434
 
2339 2435
 	// Now actually add the data, starting with the folders.
2340 2436
 	ksort($foundData['folders']);
@@ -2346,8 +2442,9 @@  discard block
 block discarded – undo
2346 2442
 				'perms' => @fileperms($path . '/' . $folder),
2347 2443
 			),
2348 2444
 		);
2349
-		if ($type !== true)
2350
-			$additional_data['type'] = $type;
2445
+		if ($type !== true) {
2446
+					$additional_data['type'] = $type;
2447
+		}
2351 2448
 
2352 2449
 		// If there's an offset ignore any folders in XML mode.
2353 2450
 		if (isset($_GET['xml']) && $context['file_offset'] == 0)
@@ -2366,13 +2463,13 @@  discard block
 block discarded – undo
2366 2463
 				),
2367 2464
 				'value' => $folder,
2368 2465
 			);
2369
-		}
2370
-		elseif (!isset($_GET['xml']))
2466
+		} elseif (!isset($_GET['xml']))
2371 2467
 		{
2372
-			if (isset($data['contents'][$folder]))
2373
-				$data['contents'][$folder] = array_merge($data['contents'][$folder], $additional_data);
2374
-			else
2375
-				$data['contents'][$folder] = $additional_data;
2468
+			if (isset($data['contents'][$folder])) {
2469
+							$data['contents'][$folder] = array_merge($data['contents'][$folder], $additional_data);
2470
+			} else {
2471
+							$data['contents'][$folder] = $additional_data;
2472
+			}
2376 2473
 		}
2377 2474
 	}
2378 2475
 
@@ -2384,11 +2481,13 @@  discard block
 block discarded – undo
2384 2481
 		$counter++;
2385 2482
 
2386 2483
 		// Have we reached our offset?
2387
-		if ($context['file_offset'] > $counter)
2388
-			continue;
2484
+		if ($context['file_offset'] > $counter) {
2485
+					continue;
2486
+		}
2389 2487
 		// Gone too far?
2390
-		if ($counter > ($context['file_offset'] + $context['file_limit']))
2391
-			continue;
2488
+		if ($counter > ($context['file_offset'] + $context['file_limit'])) {
2489
+					continue;
2490
+		}
2392 2491
 
2393 2492
 		$additional_data = array(
2394 2493
 			'perms' => array(
@@ -2414,13 +2513,13 @@  discard block
 block discarded – undo
2414 2513
 				),
2415 2514
 				'value' => $file,
2416 2515
 			);
2417
-		}
2418
-		elseif ($counter != ($context['file_offset'] + $context['file_limit']))
2516
+		} elseif ($counter != ($context['file_offset'] + $context['file_limit']))
2419 2517
 		{
2420
-			if (isset($data['contents'][$file]))
2421
-				$data['contents'][$file] = array_merge($data['contents'][$file], $additional_data);
2422
-			else
2423
-				$data['contents'][$file] = $additional_data;
2518
+			if (isset($data['contents'][$file])) {
2519
+							$data['contents'][$file] = array_merge($data['contents'][$file], $additional_data);
2520
+			} else {
2521
+							$data['contents'][$file] = $additional_data;
2522
+			}
2424 2523
 		}
2425 2524
 	}
2426 2525
 }
@@ -2442,8 +2541,9 @@  discard block
 block discarded – undo
2442 2541
 	$context['back_look_data'] = isset($_POST['back_look']) ? $_POST['back_look'] : array();
2443 2542
 
2444 2543
 	// Skipping use of FTP?
2445
-	if (empty($package_ftp))
2446
-		$context['skip_ftp'] = true;
2544
+	if (empty($package_ftp)) {
2545
+			$context['skip_ftp'] = true;
2546
+	}
2447 2547
 
2448 2548
 	// We'll start off in a good place, security. Make sure that if we're dealing with individual files that they seem in the right place.
2449 2549
 	if ($context['method'] == 'individual')
@@ -2453,8 +2553,9 @@  discard block
 block discarded – undo
2453 2553
 		$context['custom_value'] = (int) $_POST['custom_value'];
2454 2554
 
2455 2555
 		// Continuing?
2456
-		if (isset($_POST['toProcess']))
2457
-			$_POST['permStatus'] = $smcFunc['json_decode'](base64_decode($_POST['toProcess']), true);
2556
+		if (isset($_POST['toProcess'])) {
2557
+					$_POST['permStatus'] = $smcFunc['json_decode'](base64_decode($_POST['toProcess']), true);
2558
+		}
2458 2559
 
2459 2560
 		if (isset($_POST['permStatus']))
2460 2561
 		{
@@ -2463,22 +2564,27 @@  discard block
 block discarded – undo
2463 2564
 			foreach ($_POST['permStatus'] as $path => $status)
2464 2565
 			{
2465 2566
 				// Nothing to see here?
2466
-				if ($status == 'no_change')
2467
-					continue;
2567
+				if ($status == 'no_change') {
2568
+									continue;
2569
+				}
2468 2570
 				$legal = false;
2469
-				foreach ($legal_roots as $root)
2470
-					if (substr($path, 0, strlen($root)) == $root)
2571
+				foreach ($legal_roots as $root) {
2572
+									if (substr($path, 0, strlen($root)) == $root)
2471 2573
 						$legal = true;
2574
+				}
2472 2575
 
2473
-				if (!$legal)
2474
-					continue;
2576
+				if (!$legal) {
2577
+									continue;
2578
+				}
2475 2579
 
2476 2580
 				// Check it exists.
2477
-				if (!file_exists($path))
2478
-					continue;
2581
+				if (!file_exists($path)) {
2582
+									continue;
2583
+				}
2479 2584
 
2480
-				if ($status == 'custom')
2481
-					$validate_custom = true;
2585
+				if ($status == 'custom') {
2586
+									$validate_custom = true;
2587
+				}
2482 2588
 
2483 2589
 				// Now add it.
2484 2590
 				$context['to_process'][$path] = $status;
@@ -2488,17 +2594,20 @@  discard block
 block discarded – undo
2488 2594
 			// Make sure the chmod status is valid?
2489 2595
 			if ($validate_custom)
2490 2596
 			{
2491
-				if (preg_match('~^[4567][4567][4567]$~', $context['custom_value']) == false)
2492
-					fatal_error($txt['chmod_value_invalid']);
2597
+				if (preg_match('~^[4567][4567][4567]$~', $context['custom_value']) == false) {
2598
+									fatal_error($txt['chmod_value_invalid']);
2599
+				}
2493 2600
 			}
2494 2601
 
2495 2602
 			// Nothing to do?
2496
-			if (empty($context['to_process']))
2497
-				redirectexit('action=admin;area=packages;sa=perms' . (!empty($context['back_look_data']) ? ';back_look=' . base64_encode($smcFunc['json_encode']($context['back_look_data'])) : '') . ';' . $context['session_var'] . '=' . $context['session_id']);
2603
+			if (empty($context['to_process'])) {
2604
+							redirectexit('action=admin;area=packages;sa=perms' . (!empty($context['back_look_data']) ? ';back_look=' . base64_encode($smcFunc['json_encode']($context['back_look_data'])) : '') . ';' . $context['session_var'] . '=' . $context['session_id']);
2605
+			}
2498 2606
 		}
2499 2607
 		// Should never get here,
2500
-		else
2501
-			fatal_lang_error('no_access', false);
2608
+		else {
2609
+					fatal_lang_error('no_access', false);
2610
+		}
2502 2611
 
2503 2612
 		// Setup the custom value.
2504 2613
 		$custom_value = octdec('0' . $context['custom_value']);
@@ -2506,18 +2615,18 @@  discard block
 block discarded – undo
2506 2615
 		// Start processing items.
2507 2616
 		foreach ($context['to_process'] as $path => $status)
2508 2617
 		{
2509
-			if (in_array($status, array('execute', 'writable', 'read')))
2510
-				package_chmod($path, $status);
2511
-			elseif ($status == 'custom' && !empty($custom_value))
2618
+			if (in_array($status, array('execute', 'writable', 'read'))) {
2619
+							package_chmod($path, $status);
2620
+			} elseif ($status == 'custom' && !empty($custom_value))
2512 2621
 			{
2513 2622
 				// Use FTP if we have it.
2514 2623
 				if (!empty($package_ftp) && !empty($_SESSION['pack_ftp']))
2515 2624
 				{
2516 2625
 					$ftp_file = strtr($path, array($_SESSION['pack_ftp']['root'] => ''));
2517 2626
 					$package_ftp->chmod($ftp_file, $custom_value);
2627
+				} else {
2628
+									smf_chmod($path, $custom_value);
2518 2629
 				}
2519
-				else
2520
-					smf_chmod($path, $custom_value);
2521 2630
 			}
2522 2631
 
2523 2632
 			// This fish is fried...
@@ -2601,23 +2710,27 @@  discard block
 block discarded – undo
2601 2710
 			{
2602 2711
 				global $context;
2603 2712
 
2604
-				if (!empty($data['writable_on']))
2605
-					if ($context['predefined_type'] == 'standard' || $data['writable_on'] == 'restrictive')
2713
+				if (!empty($data['writable_on'])) {
2714
+									if ($context['predefined_type'] == 'standard' || $data['writable_on'] == 'restrictive')
2606 2715
 						$context['special_files'][$path] = 1;
2716
+				}
2607 2717
 
2608
-				if (!empty($data['contents']))
2609
-					foreach ($data['contents'] as $name => $contents)
2718
+				if (!empty($data['contents'])) {
2719
+									foreach ($data['contents'] as $name => $contents)
2610 2720
 						build_special_files__recursive($path . '/' . $name, $contents);
2721
+				}
2611 2722
 			}
2612 2723
 
2613
-			foreach ($context['file_tree'] as $path => $data)
2614
-				build_special_files__recursive($path, $data);
2724
+			foreach ($context['file_tree'] as $path => $data) {
2725
+							build_special_files__recursive($path, $data);
2726
+			}
2615 2727
 		}
2616 2728
 		// Free doesn't need special files.
2617
-		elseif ($context['predefined_type'] == 'free')
2618
-			$context['special_files'] = array();
2619
-		else
2620
-			$context['special_files'] = $smcFunc['json_decode'](base64_decode($_POST['specialFiles']), true);
2729
+		elseif ($context['predefined_type'] == 'free') {
2730
+					$context['special_files'] = array();
2731
+		} else {
2732
+					$context['special_files'] = $smcFunc['json_decode'](base64_decode($_POST['specialFiles']), true);
2733
+		}
2621 2734
 
2622 2735
 		// Now we definitely know where we are, we need to go through again doing the chmod!
2623 2736
 		foreach ($context['directory_list'] as $path => $dummy)
Please login to merge, or discard this patch.
Sources/Class-CurlFetchWeb.php 1 patch
Braces   +30 added lines, -24 removed lines patch added patch discarded remove patch
@@ -10,8 +10,9 @@  discard block
 block discarded – undo
10 10
  * @version 2.1 Beta 4
11 11
  */
12 12
 
13
-if (!defined('SMF'))
13
+if (!defined('SMF')) {
14 14
 	die('No direct access...');
15
+}
15 16
 
16 17
 /**
17 18
  * Class curl_fetch_web_data
@@ -121,10 +122,11 @@  discard block
 block discarded – undo
121 122
 	public function get_url_data($url, $post_data = array())
122 123
 	{
123 124
 		// POSTing some data perhaps?
124
-		if (!empty($post_data) && is_array($post_data))
125
-			$this->post_data = $this->build_post_data($post_data);
126
-		elseif (!empty($post_data))
127
-			$this->post_data = trim($post_data);
125
+		if (!empty($post_data) && is_array($post_data)) {
126
+					$this->post_data = $this->build_post_data($post_data);
127
+		} elseif (!empty($post_data)) {
128
+					$this->post_data = trim($post_data);
129
+		}
128 130
 
129 131
 		// set the options and get it
130 132
 		$this->set_options();
@@ -145,10 +147,11 @@  discard block
 block discarded – undo
145 147
 	private function curl_request($url, $redirect = false)
146 148
 	{
147 149
 		// we do have a url I hope
148
-		if ($url == '')
149
-			return false;
150
-		else
151
-			$this->options[CURLOPT_URL] = $url;
150
+		if ($url == '') {
151
+					return false;
152
+		} else {
153
+					$this->options[CURLOPT_URL] = $url;
154
+		}
152 155
 
153 156
 		// if we have not already been redirected, set it up so we can if needed
154 157
 		if (!$redirect)
@@ -228,10 +231,11 @@  discard block
 block discarded – undo
228 231
 		$max_result = count($this->response) - 1;
229 232
 
230 233
 		// just return a specifed area or the entire result?
231
-		if ($area == '')
232
-			return $this->response[$max_result];
233
-		else
234
-			return isset($this->response[$max_result][$area]) ? $this->response[$max_result][$area] : $this->response[$max_result];
234
+		if ($area == '') {
235
+					return $this->response[$max_result];
236
+		} else {
237
+					return isset($this->response[$max_result][$area]) ? $this->response[$max_result][$area] : $this->response[$max_result];
238
+		}
235 239
 	}
236 240
 
237 241
 	/**
@@ -244,9 +248,9 @@  discard block
 block discarded – undo
244 248
 	*/
245 249
 	public function result_raw($response_number = '')
246 250
 	{
247
-		if (!is_numeric($response_number))
248
-			return $this->response;
249
-		else
251
+		if (!is_numeric($response_number)) {
252
+					return $this->response;
253
+		} else
250 254
 		{
251 255
 			$response_number = min($response_number, count($this->response) - 1);
252 256
 			return $this->response[$response_number];
@@ -268,13 +272,14 @@  discard block
 block discarded – undo
268 272
 			$postvars = array();
269 273
 
270 274
 			// build the post data, drop ones with leading @'s since those can be used to send files, we don't support that.
271
-			foreach ($post_data as $name => $value)
272
-				$postvars[] = $name . '=' . urlencode($value[0] == '@' ? '' : $value);
275
+			foreach ($post_data as $name => $value) {
276
+							$postvars[] = $name . '=' . urlencode($value[0] == '@' ? '' : $value);
277
+			}
273 278
 
274 279
 			return implode('&', $postvars);
280
+		} else {
281
+					return $post_data;
275 282
 		}
276
-		else
277
-			return $post_data;
278 283
 	}
279 284
 
280 285
 	/**
@@ -294,9 +299,9 @@  discard block
 block discarded – undo
294 299
 			$keys = array_merge(array_keys($this->default_options), array_keys($this->user_options));
295 300
 			$vals = array_merge($this->default_options, $this->user_options);
296 301
 			$this->options = array_combine($keys, $vals);
302
+		} else {
303
+					$this->options = $this->default_options;
297 304
 		}
298
-		else
299
-			$this->options = $this->default_options;
300 305
 
301 306
 		// POST data options, here we don't allow any overide
302 307
 		if (isset($this->post_data))
@@ -335,8 +340,9 @@  discard block
 block discarded – undo
335 340
 		$temp = explode(': ', $_header, 2);
336 341
 
337 342
 		// set proper headers only
338
-		if (isset($temp[0]) && isset($temp[1]))
339
-			$this->headers[strtolower($temp[0])] = strtolower(trim($temp[1]));
343
+		if (isset($temp[0]) && isset($temp[1])) {
344
+					$this->headers[strtolower($temp[0])] = strtolower(trim($temp[1]));
345
+		}
340 346
 
341 347
 		// return the length of what was passed unless you want a Failed writing header error ;)
342 348
 		return strlen($header);
Please login to merge, or discard this patch.
Sources/RepairBoards.php 2 patches
Braces   +119 added lines, -85 removed lines patch added patch discarded remove patch
@@ -13,8 +13,9 @@  discard block
 block discarded – undo
13 13
  * @version 2.1 Beta 4
14 14
  */
15 15
 
16
-if (!defined('SMF'))
16
+if (!defined('SMF')) {
17 17
 	die('No direct access...');
18
+}
18 19
 
19 20
 /**
20 21
  * Finds or repairs errors in the database to fix possible problems.
@@ -50,8 +51,9 @@  discard block
 block discarded – undo
50 51
 	);
51 52
 
52 53
 	// Start displaying errors without fixing them.
53
-	if (isset($_GET['fixErrors']))
54
-		checkSession('get');
54
+	if (isset($_GET['fixErrors'])) {
55
+			checkSession('get');
56
+	}
55 57
 
56 58
 	// Will want this.
57 59
 	loadForumTests();
@@ -69,11 +71,11 @@  discard block
 block discarded – undo
69 71
 			$_SESSION['repairboards_to_fix'] = $context['to_fix'];
70 72
 			$_SESSION['repairboards_to_fix2'] = null;
71 73
 
72
-			if (empty($context['repair_errors']))
73
-				$context['repair_errors'][] = '???';
74
+			if (empty($context['repair_errors'])) {
75
+							$context['repair_errors'][] = '???';
76
+			}
74 77
 		}
75
-	}
76
-	else
78
+	} else
77 79
 	{
78 80
 		$context['error_search'] = false;
79 81
 		$context['to_fix'] = isset($_SESSION['repairboards_to_fix']) ? $_SESSION['repairboards_to_fix'] : array();
@@ -120,16 +122,19 @@  discard block
 block discarded – undo
120 122
 
121 123
 	// More time, I need more time!
122 124
 	@set_time_limit(600);
123
-	if (function_exists('apache_reset_timeout'))
124
-		@apache_reset_timeout();
125
+	if (function_exists('apache_reset_timeout')) {
126
+			@apache_reset_timeout();
127
+	}
125 128
 
126 129
 	// Errr, wait.  How much time has this taken already?
127
-	if (!$force && (time() - $time_start) < 3)
128
-		return;
130
+	if (!$force && (time() - $time_start) < 3) {
131
+			return;
132
+	}
129 133
 
130 134
 	// Restore the query cache if interested.
131
-	if (!empty($db_temp_cache))
132
-		$db_cache = $db_temp_cache;
135
+	if (!empty($db_temp_cache)) {
136
+			$db_cache = $db_temp_cache;
137
+	}
133 138
 
134 139
 	$context['continue_get_data'] = '?action=admin;area=repairboards' . (isset($_GET['fixErrors']) ? ';fixErrors' : '') . ';step=' . $_GET['step'] . ';substep=' . $_GET['substep'] . ';' . $context['session_var'] . '=' . $context['session_id'];
135 140
 	$context['page_title'] = $txt['not_done_title'];
@@ -138,10 +143,11 @@  discard block
 block discarded – undo
138 143
 	$context['sub_template'] = 'not_done';
139 144
 
140 145
 	// Change these two if more steps are added!
141
-	if (empty($max_substep))
142
-		$context['continue_percent'] = round(($_GET['step'] * 100) / $context['total_steps']);
143
-	else
144
-		$context['continue_percent'] = round((($_GET['step'] + ($_GET['substep'] / $max_substep)) * 100) / $context['total_steps']);
146
+	if (empty($max_substep)) {
147
+			$context['continue_percent'] = round(($_GET['step'] * 100) / $context['total_steps']);
148
+	} else {
149
+			$context['continue_percent'] = round((($_GET['step'] + ($_GET['substep'] / $max_substep)) * 100) / $context['total_steps']);
150
+	}
145 151
 
146 152
 	// Never more than 100%!
147 153
 	$context['continue_percent'] = min($context['continue_percent'], 100);
@@ -609,8 +615,9 @@  discard block
 block discarded – undo
609 615
 				$row['myid_last_msg'] = (int) $row['myid_last_msg'];
610 616
 
611 617
 				// Not really a problem?
612
-				if ($row['id_first_msg'] == $row['myid_first_msg'] && $row['id_last_msg'] == $row['myid_last_msg'] && $row['approved'] == $row['firstmsg_approved'])
613
-					return false;
618
+				if ($row['id_first_msg'] == $row['myid_first_msg'] && $row['id_last_msg'] == $row['myid_last_msg'] && $row['approved'] == $row['firstmsg_approved']) {
619
+									return false;
620
+				}
614 621
 
615 622
 				$memberStartedID = (int) getMsgMemberID($row['myid_first_msg']);
616 623
 				$memberUpdatedID = (int) getMsgMemberID($row['myid_last_msg']);
@@ -634,15 +641,19 @@  discard block
 block discarded – undo
634 641
 			'message_function' => function ($row) use ($txt, &$context)
635 642
 			{
636 643
 				// A pretend error?
637
-				if ($row['id_first_msg'] == $row['myid_first_msg'] && $row['id_last_msg'] == $row['myid_last_msg'] && $row['approved'] == $row['firstmsg_approved'])
638
-					return false;
644
+				if ($row['id_first_msg'] == $row['myid_first_msg'] && $row['id_last_msg'] == $row['myid_last_msg'] && $row['approved'] == $row['firstmsg_approved']) {
645
+									return false;
646
+				}
639 647
 
640
-				if ($row['id_first_msg'] != $row['myid_first_msg'])
641
-					$context['repair_errors'][] = sprintf($txt['repair_stats_topics_1'], $row['id_topic'], $row['id_first_msg']);
642
-				if ($row['id_last_msg'] != $row['myid_last_msg'])
643
-					$context['repair_errors'][] = sprintf($txt['repair_stats_topics_2'], $row['id_topic'], $row['id_last_msg']);
644
-				if ($row['approved'] != $row['firstmsg_approved'])
645
-					$context['repair_errors'][] = sprintf($txt['repair_stats_topics_5'], $row['id_topic']);
648
+				if ($row['id_first_msg'] != $row['myid_first_msg']) {
649
+									$context['repair_errors'][] = sprintf($txt['repair_stats_topics_1'], $row['id_topic'], $row['id_first_msg']);
650
+				}
651
+				if ($row['id_last_msg'] != $row['myid_last_msg']) {
652
+									$context['repair_errors'][] = sprintf($txt['repair_stats_topics_2'], $row['id_topic'], $row['id_last_msg']);
653
+				}
654
+				if ($row['approved'] != $row['firstmsg_approved']) {
655
+									$context['repair_errors'][] = sprintf($txt['repair_stats_topics_5'], $row['id_topic']);
656
+				}
646 657
 
647 658
 				return true;
648 659
 			},
@@ -671,8 +682,9 @@  discard block
 block discarded – undo
671 682
 				$row['my_num_replies'] = (int) $row['my_num_replies'];
672 683
 
673 684
 				// Not really a problem?
674
-				if ($row['my_num_replies'] == $row['num_replies'])
675
-					return false;
685
+				if ($row['my_num_replies'] == $row['num_replies']) {
686
+									return false;
687
+				}
676 688
 
677 689
 				$smcFunc['db_query']('', '
678 690
 					UPDATE {db_prefix}topics
@@ -689,11 +701,13 @@  discard block
 block discarded – undo
689 701
 				global $txt, $context;
690 702
 
691 703
 				// Just joking?
692
-				if ($row['my_num_replies'] == $row['num_replies'])
693
-					return false;
704
+				if ($row['my_num_replies'] == $row['num_replies']) {
705
+									return false;
706
+				}
694 707
 
695
-				if ($row['num_replies'] != $row['my_num_replies'])
696
-					$context['repair_errors'][] = sprintf($txt['repair_stats_topics_3'], $row['id_topic'], $row['num_replies']);
708
+				if ($row['num_replies'] != $row['my_num_replies']) {
709
+									$context['repair_errors'][] = sprintf($txt['repair_stats_topics_3'], $row['id_topic'], $row['num_replies']);
710
+				}
697 711
 
698 712
 				return true;
699 713
 			},
@@ -1262,8 +1276,9 @@  discard block
 block discarded – undo
1262 1276
 				$inserts = array();
1263 1277
 				while ($row = $smcFunc['db_fetch_assoc']($result))
1264 1278
 				{
1265
-					foreach (text2words($row['subject']) as $word)
1266
-						$inserts[] = array($word, $row['id_topic']);
1279
+					foreach (text2words($row['subject']) as $word) {
1280
+											$inserts[] = array($word, $row['id_topic']);
1281
+					}
1267 1282
 					if (count($inserts) > 500)
1268 1283
 					{
1269 1284
 						$smcFunc['db_insert']('ignore',
@@ -1276,13 +1291,14 @@  discard block
 block discarded – undo
1276 1291
 					}
1277 1292
 				}
1278 1293
 
1279
-				if (!empty($inserts))
1280
-					$smcFunc['db_insert']('ignore',
1294
+				if (!empty($inserts)) {
1295
+									$smcFunc['db_insert']('ignore',
1281 1296
 						'{db_prefix}log_search_subjects',
1282 1297
 						array('word' => 'string', 'id_topic' => 'int'),
1283 1298
 						$inserts,
1284 1299
 						array('word', 'id_topic')
1285 1300
 					);
1301
+				}
1286 1302
 			},
1287 1303
 			'message_function' => function ($row)
1288 1304
 			{
@@ -1541,8 +1557,9 @@  discard block
 block discarded – undo
1541 1557
 		$current_step++;
1542 1558
 
1543 1559
 		// Already done this?
1544
-		if ($_GET['step'] > $current_step)
1545
-			continue;
1560
+		if ($_GET['step'] > $current_step) {
1561
+					continue;
1562
+		}
1546 1563
 
1547 1564
 		// If we're fixing it but it ain't broke why try?
1548 1565
 		if ($do_fix && !in_array($error_type, $to_fix))
@@ -1571,14 +1588,16 @@  discard block
 block discarded – undo
1571 1588
 		while (!$done)
1572 1589
 		{
1573 1590
 			// Make sure there's at least one ID to test.
1574
-			if (isset($test['substeps']) && empty($step_max))
1575
-				break;
1591
+			if (isset($test['substeps']) && empty($step_max)) {
1592
+							break;
1593
+			}
1576 1594
 
1577 1595
 			// What is the testing query (Changes if we are testing or fixing)
1578
-			if (!$do_fix)
1579
-				$test_query = 'check_query';
1580
-			else
1581
-				$test_query = isset($test['fix_query']) ? 'fix_query' : 'check_query';
1596
+			if (!$do_fix) {
1597
+							$test_query = 'check_query';
1598
+			} else {
1599
+							$test_query = isset($test['fix_query']) ? 'fix_query' : 'check_query';
1600
+			}
1582 1601
 
1583 1602
 			// Do the test...
1584 1603
 			$request = $smcFunc['db_query']('',
@@ -1588,10 +1607,11 @@  discard block
 block discarded – undo
1588 1607
 			);
1589 1608
 
1590 1609
 			// Does it need a fix?
1591
-			if (!empty($test['check_type']) && $test['check_type'] == 'count')
1592
-				list ($needs_fix) = $smcFunc['db_fetch_row']($request);
1593
-			else
1594
-				$needs_fix = $smcFunc['db_num_rows']($request);
1610
+			if (!empty($test['check_type']) && $test['check_type'] == 'count') {
1611
+							list ($needs_fix) = $smcFunc['db_fetch_row']($request);
1612
+			} else {
1613
+							$needs_fix = $smcFunc['db_num_rows']($request);
1614
+			}
1595 1615
 
1596 1616
 			$total_queries++;
1597 1617
 
@@ -1603,8 +1623,9 @@  discard block
 block discarded – undo
1603 1623
 					// Assume need to fix.
1604 1624
 					$found_errors = true;
1605 1625
 
1606
-					if (isset($test['message']))
1607
-						$context['repair_errors'][] = $txt[$test['message']];
1626
+					if (isset($test['message'])) {
1627
+											$context['repair_errors'][] = $txt[$test['message']];
1628
+					}
1608 1629
 
1609 1630
 					// One per row!
1610 1631
 					elseif (isset($test['messages']))
@@ -1614,10 +1635,11 @@  discard block
 block discarded – undo
1614 1635
 							$variables = $test['messages'];
1615 1636
 							foreach ($variables as $k => $v)
1616 1637
 							{
1617
-								if ($k == 0 && isset($txt[$v]))
1618
-									$variables[$k] = $txt[$v];
1619
-								elseif ($k > 0 && isset($row[$v]))
1620
-									$variables[$k] = $row[$v];
1638
+								if ($k == 0 && isset($txt[$v])) {
1639
+																	$variables[$k] = $txt[$v];
1640
+								} elseif ($k > 0 && isset($row[$v])) {
1641
+																	$variables[$k] = $row[$v];
1642
+								}
1621 1643
 							}
1622 1644
 							$context['repair_errors'][] = call_user_func_array('sprintf', $variables);
1623 1645
 						}
@@ -1628,13 +1650,15 @@  discard block
 block discarded – undo
1628 1650
 					{
1629 1651
 						// Find out if there are actually errors.
1630 1652
 						$found_errors = false;
1631
-						while ($row = $smcFunc['db_fetch_assoc']($request))
1632
-							$found_errors |= $test['message_function']($row);
1653
+						while ($row = $smcFunc['db_fetch_assoc']($request)) {
1654
+													$found_errors |= $test['message_function']($row);
1655
+						}
1633 1656
 					}
1634 1657
 
1635 1658
 					// Actually have something to fix?
1636
-					if ($found_errors)
1637
-						$to_fix[] = $error_type;
1659
+					if ($found_errors) {
1660
+											$to_fix[] = $error_type;
1661
+					}
1638 1662
 				}
1639 1663
 
1640 1664
 				// We want to fix, we need to fix - so work out what exactly to do!
@@ -1644,8 +1668,9 @@  discard block
 block discarded – undo
1644 1668
 					if (isset($test['fix_collect']))
1645 1669
 					{
1646 1670
 						$ids = array();
1647
-						while ($row = $smcFunc['db_fetch_assoc']($request))
1648
-							$ids[] = $row[$test['fix_collect']['index']];
1671
+						while ($row = $smcFunc['db_fetch_assoc']($request)) {
1672
+													$ids[] = $row[$test['fix_collect']['index']];
1673
+						}
1649 1674
 						if (!empty($ids))
1650 1675
 						{
1651 1676
 							// Fix it!
@@ -1654,30 +1679,34 @@  discard block
 block discarded – undo
1654 1679
 					}
1655 1680
 
1656 1681
 					// Simply executing a fix it query?
1657
-					elseif (isset($test['fix_it_query']))
1658
-						$smcFunc['db_query']('',
1682
+					elseif (isset($test['fix_it_query'])) {
1683
+											$smcFunc['db_query']('',
1659 1684
 							$test['fix_it_query'],
1660 1685
 							array(
1661 1686
 							)
1662 1687
 						);
1688
+					}
1663 1689
 
1664 1690
 					// Do we have some processing to do?
1665 1691
 					elseif (isset($test['fix_processing']))
1666 1692
 					{
1667
-						while ($row = $smcFunc['db_fetch_assoc']($request))
1668
-							$test['fix_processing']($row);
1693
+						while ($row = $smcFunc['db_fetch_assoc']($request)) {
1694
+													$test['fix_processing']($row);
1695
+						}
1669 1696
 					}
1670 1697
 
1671 1698
 					// What about the full set of processing?
1672
-					elseif (isset($test['fix_full_processing']))
1673
-						$test['fix_full_processing']($request);
1699
+					elseif (isset($test['fix_full_processing'])) {
1700
+											$test['fix_full_processing']($request);
1701
+					}
1674 1702
 
1675 1703
 					// Do we have other things we need to fix as a result?
1676 1704
 					if (!empty($test['force_fix']))
1677 1705
 					{
1678
-						foreach ($test['force_fix'] as $item)
1679
-							if (!in_array($item, $to_fix))
1706
+						foreach ($test['force_fix'] as $item) {
1707
+													if (!in_array($item, $to_fix))
1680 1708
 								$to_fix[] = $item;
1709
+						}
1681 1710
 					}
1682 1711
 				}
1683 1712
 			}
@@ -1695,16 +1724,17 @@  discard block
 block discarded – undo
1695 1724
 				if ($_GET['substep'] <= $step_max)
1696 1725
 				{
1697 1726
 					pauseRepairProcess($to_fix, $error_type, $step_max);
1727
+				} else {
1728
+									$done = true;
1698 1729
 				}
1699
-				else
1700
-					$done = true;
1730
+			} else {
1731
+							$done = true;
1701 1732
 			}
1702
-			else
1703
-				$done = true;
1704 1733
 
1705 1734
 			// Don't allow more than 1000 queries at a time.
1706
-			if ($total_queries >= 1000)
1707
-				pauseRepairProcess($to_fix, $error_type, $step_max, true);
1735
+			if ($total_queries >= 1000) {
1736
+							pauseRepairProcess($to_fix, $error_type, $step_max, true);
1737
+			}
1708 1738
 		}
1709 1739
 
1710 1740
 		// Keep going.
@@ -1717,8 +1747,9 @@  discard block
 block discarded – undo
1717 1747
 		if ($do_fix)
1718 1748
 		{
1719 1749
 			$key = array_search($error_type, $to_fix);
1720
-			if ($key !== false && isset($to_fix[$key]))
1721
-				unset($to_fix[$key]);
1750
+			if ($key !== false && isset($to_fix[$key])) {
1751
+							unset($to_fix[$key]);
1752
+			}
1722 1753
 		}
1723 1754
 
1724 1755
 		// Are we done?
@@ -1741,10 +1772,11 @@  discard block
 block discarded – undo
1741 1772
 	static $createOnce = false;
1742 1773
 
1743 1774
 	// Have we already created it?
1744
-	if ($createOnce)
1745
-		return;
1746
-	else
1747
-		$createOnce = true;
1775
+	if ($createOnce) {
1776
+			return;
1777
+	} else {
1778
+			$createOnce = true;
1779
+	}
1748 1780
 
1749 1781
 	// Back to the forum's default language.
1750 1782
 	loadLanguage('Admin', $language);
@@ -1759,8 +1791,9 @@  discard block
 block discarded – undo
1759 1791
 			'cat_name' => $txt['salvaged_category_name'],
1760 1792
 		)
1761 1793
 	);
1762
-	if ($smcFunc['db_num_rows']($result) != 0)
1763
-		list ($salvageCatID) = $smcFunc['db_fetch_row']($result);
1794
+	if ($smcFunc['db_num_rows']($result) != 0) {
1795
+			list ($salvageCatID) = $smcFunc['db_fetch_row']($result);
1796
+	}
1764 1797
 	$smcFunc['db_free_result']($result);
1765 1798
 
1766 1799
 	if (empty($salvageCatID))
@@ -1792,8 +1825,9 @@  discard block
 block discarded – undo
1792 1825
 			'board_name' => $txt['salvaged_board_name'],
1793 1826
 		)
1794 1827
 	);
1795
-	if ($smcFunc['db_num_rows']($result) != 0)
1796
-		list ($salvageBoardID) = $smcFunc['db_fetch_row']($result);
1828
+	if ($smcFunc['db_num_rows']($result) != 0) {
1829
+			list ($salvageBoardID) = $smcFunc['db_fetch_row']($result);
1830
+	}
1797 1831
 	$smcFunc['db_free_result']($result);
1798 1832
 
1799 1833
 	if (empty($salvageBoardID))
Please login to merge, or discard this patch.
Spacing   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -232,7 +232,7 @@  discard block
 block discarded – undo
232 232
 					LEFT JOIN {db_prefix}topics AS t ON (t.id_topic = m.id_topic)
233 233
 				WHERE t.id_topic IS NULL
234 234
 				GROUP BY m.id_topic, m.id_board',
235
-			'fix_processing' => function ($row) use ($smcFunc)
235
+			'fix_processing' => function($row) use ($smcFunc)
236 236
 			{
237 237
 				global $salvageBoardID;
238 238
 
@@ -318,7 +318,7 @@  discard block
 block discarded – undo
318 318
 			// Remove all topics that have zero messages in the messages table.
319 319
 			'fix_collect' => array(
320 320
 				'index' => 'id_topic',
321
-				'process' => function ($topics) use ($smcFunc)
321
+				'process' => function($topics) use ($smcFunc)
322 322
 				{
323 323
 					$smcFunc['db_query']('', '
324 324
 						DELETE FROM {db_prefix}topics
@@ -355,7 +355,7 @@  discard block
 block discarded – undo
355 355
 				  AND p.id_poll IS NULL
356 356
 				GROUP BY o.id_poll, t.id_topic, t.id_board, t.id_member_started, m.member_name
357 357
 				  ',
358
-			'fix_processing' => function ($row) use ($smcFunc, $txt)
358
+			'fix_processing' => function($row) use ($smcFunc, $txt)
359 359
 			{
360 360
 				global $salvageBoardID;
361 361
 
@@ -366,7 +366,7 @@  discard block
 block discarded – undo
366 366
 				{
367 367
 					// Only if we don't have a reasonable idea of where to put it.
368 368
 					createSalvageArea();
369
-					$row['id_board'] = (int)$salvageBoardID;
369
+					$row['id_board'] = (int) $salvageBoardID;
370 370
 				}
371 371
 
372 372
 				if (empty($row['id_topic']))
@@ -492,7 +492,7 @@  discard block
 block discarded – undo
492 492
 					LEFT JOIN {db_prefix}topics AS t ON (t.id_poll = p.id_poll)
493 493
 				WHERE p.id_poll BETWEEN {STEP_LOW} AND {STEP_HIGH}
494 494
 					AND t.id_poll IS NULL',
495
-			'fix_processing' => function ($row) use ($smcFunc, $txt)
495
+			'fix_processing' => function($row) use ($smcFunc, $txt)
496 496
 			{
497 497
 				global $salvageBoardID;
498 498
 
@@ -603,7 +603,7 @@  discard block
 block discarded – undo
603 603
 				WHERE t.id_topic BETWEEN {STEP_LOW} AND {STEP_HIGH}
604 604
 				GROUP BY t.id_topic, t.id_first_msg, t.id_last_msg, t.approved, mf.approved
605 605
 				ORDER BY t.id_topic',
606
-			'fix_processing' => function ($row) use ($smcFunc)
606
+			'fix_processing' => function($row) use ($smcFunc)
607 607
 			{
608 608
 				$row['firstmsg_approved'] = (int) $row['firstmsg_approved'];
609 609
 				$row['myid_first_msg'] = (int) $row['myid_first_msg'];
@@ -632,7 +632,7 @@  discard block
 block discarded – undo
632 632
 					)
633 633
 				);
634 634
 			},
635
-			'message_function' => function ($row) use ($txt, &$context)
635
+			'message_function' => function($row) use ($txt, &$context)
636 636
 			{
637 637
 				// A pretend error?
638 638
 				if ($row['id_first_msg'] == $row['myid_first_msg'] && $row['id_last_msg'] == $row['myid_last_msg'] && $row['approved'] == $row['firstmsg_approved'])
@@ -666,7 +666,7 @@  discard block
 block discarded – undo
666 666
 				WHERE t.id_topic BETWEEN {STEP_LOW} AND {STEP_HIGH}
667 667
 				GROUP BY t.id_topic, t.num_replies, mf.approved
668 668
 				ORDER BY t.id_topic',
669
-			'fix_processing' => function ($row)
669
+			'fix_processing' => function($row)
670 670
 			{
671 671
 				global $smcFunc;
672 672
 				$row['my_num_replies'] = (int) $row['my_num_replies'];
@@ -685,7 +685,7 @@  discard block
 block discarded – undo
685 685
 					)
686 686
 				);
687 687
 			},
688
-			'message_function' => function ($row)
688
+			'message_function' => function($row)
689 689
 			{
690 690
 				global $txt, $context;
691 691
 
@@ -716,7 +716,7 @@  discard block
 block discarded – undo
716 716
 				GROUP BY t.id_topic, t.unapproved_posts
717 717
 				HAVING unapproved_posts != COUNT(mu.id_msg)
718 718
 				ORDER BY t.id_topic',
719
-			'fix_processing' => function ($row)
719
+			'fix_processing' => function($row)
720 720
 			{
721 721
 				global $smcFunc;
722 722
 				$row['my_unapproved_posts'] = (int) $row['my_unapproved_posts'];
@@ -756,7 +756,7 @@  discard block
 block discarded – undo
756 756
 				WHERE b.id_board IS NULL
757 757
 					AND t.id_topic BETWEEN {STEP_LOW} AND {STEP_HIGH}
758 758
 				GROUP BY t.id_board',
759
-			'fix_processing' => function ($row)
759
+			'fix_processing' => function($row)
760 760
 			{
761 761
 				global $smcFunc, $salvageCatID, $txt;
762 762
 				createSalvageArea();
@@ -803,7 +803,7 @@  discard block
 block discarded – undo
803 803
 				ORDER BY b.id_cat, b.id_board',
804 804
 			'fix_collect' => array(
805 805
 				'index' => 'id_cat',
806
-				'process' => function ($cats)
806
+				'process' => function($cats)
807 807
 				{
808 808
 					global $smcFunc, $salvageCatID;
809 809
 					createSalvageArea();
@@ -839,7 +839,7 @@  discard block
 block discarded – undo
839 839
 			// Last step-make sure all non-guest posters still exist.
840 840
 			'fix_collect' => array(
841 841
 				'index' => 'id_msg',
842
-				'process' => function ($msgs)
842
+				'process' => function($msgs)
843 843
 				{
844 844
 					global $smcFunc;
845 845
 					$smcFunc['db_query']('', '
@@ -866,7 +866,7 @@  discard block
 block discarded – undo
866 866
 				ORDER BY b.id_parent, b.id_board',
867 867
 			'fix_collect' => array(
868 868
 				'index' => 'id_parent',
869
-				'process' => function ($parents)
869
+				'process' => function($parents)
870 870
 				{
871 871
 					global $smcFunc, $salvageBoardID, $salvageCatID;
872 872
 					createSalvageArea();
@@ -900,7 +900,7 @@  discard block
 block discarded – undo
900 900
 					AND p.id_poll IS NULL',
901 901
 			'fix_collect' => array(
902 902
 				'index' => 'id_poll',
903
-				'process' => function ($polls)
903
+				'process' => function($polls)
904 904
 				{
905 905
 					global $smcFunc;
906 906
 					$smcFunc['db_query']('', '
@@ -932,7 +932,7 @@  discard block
 block discarded – undo
932 932
 				ORDER BY cal.id_topic',
933 933
 			'fix_collect' => array(
934 934
 				'index' => 'id_topic',
935
-				'process' => function ($events)
935
+				'process' => function($events)
936 936
 				{
937 937
 					global $smcFunc;
938 938
 					$smcFunc['db_query']('', '
@@ -962,7 +962,7 @@  discard block
 block discarded – undo
962 962
 					AND lt.id_member BETWEEN {STEP_LOW} AND {STEP_HIGH}',
963 963
 			'fix_collect' => array(
964 964
 				'index' => 'id_topic',
965
-				'process' => function ($topics)
965
+				'process' => function($topics)
966 966
 				{
967 967
 					global $smcFunc;
968 968
 					$smcFunc['db_query']('', '
@@ -992,7 +992,7 @@  discard block
 block discarded – undo
992 992
 				GROUP BY lt.id_member',
993 993
 			'fix_collect' => array(
994 994
 				'index' => 'id_member',
995
-				'process' => function ($members)
995
+				'process' => function($members)
996 996
 				{
997 997
 					global $smcFunc;
998 998
 					$smcFunc['db_query']('', '
@@ -1022,7 +1022,7 @@  discard block
 block discarded – undo
1022 1022
 				GROUP BY lb.id_board',
1023 1023
 			'fix_collect' => array(
1024 1024
 				'index' => 'id_board',
1025
-				'process' => function ($boards)
1025
+				'process' => function($boards)
1026 1026
 				{
1027 1027
 					global $smcFunc;
1028 1028
 					$smcFunc['db_query']('', '
@@ -1052,7 +1052,7 @@  discard block
 block discarded – undo
1052 1052
 				GROUP BY lb.id_member',
1053 1053
 			'fix_collect' => array(
1054 1054
 				'index' => 'id_member',
1055
-				'process' => function ($members) use ($smcFunc)
1055
+				'process' => function($members) use ($smcFunc)
1056 1056
 				{
1057 1057
 					$smcFunc['db_query']('', '
1058 1058
 						DELETE FROM {db_prefix}log_boards
@@ -1081,7 +1081,7 @@  discard block
 block discarded – undo
1081 1081
 				GROUP BY lmr.id_board',
1082 1082
 			'fix_collect' => array(
1083 1083
 				'index' => 'id_board',
1084
-				'process' => function ($boards) use ($smcFunc)
1084
+				'process' => function($boards) use ($smcFunc)
1085 1085
 				{
1086 1086
 					$smcFunc['db_query']('', '
1087 1087
 						DELETE FROM {db_prefix}log_mark_read
@@ -1110,7 +1110,7 @@  discard block
 block discarded – undo
1110 1110
 				GROUP BY lmr.id_member',
1111 1111
 			'fix_collect' => array(
1112 1112
 				'index' => 'id_member',
1113
-				'process' => function ($members) use ($smcFunc)
1113
+				'process' => function($members) use ($smcFunc)
1114 1114
 				{
1115 1115
 					$smcFunc['db_query']('', '
1116 1116
 						DELETE FROM {db_prefix}log_mark_read
@@ -1139,7 +1139,7 @@  discard block
 block discarded – undo
1139 1139
 				GROUP BY pmr.id_pm',
1140 1140
 			'fix_collect' => array(
1141 1141
 				'index' => 'id_pm',
1142
-				'process' => function ($pms) use ($smcFunc)
1142
+				'process' => function($pms) use ($smcFunc)
1143 1143
 				{
1144 1144
 					$smcFunc['db_query']('', '
1145 1145
 						DELETE FROM {db_prefix}pm_recipients
@@ -1169,7 +1169,7 @@  discard block
 block discarded – undo
1169 1169
 				GROUP BY pmr.id_member',
1170 1170
 			'fix_collect' => array(
1171 1171
 				'index' => 'id_member',
1172
-				'process' => function ($members)
1172
+				'process' => function($members)
1173 1173
 				{
1174 1174
 					global $smcFunc;
1175 1175
 					$smcFunc['db_query']('', '
@@ -1199,7 +1199,7 @@  discard block
 block discarded – undo
1199 1199
 					AND mem.id_member IS NULL',
1200 1200
 			'fix_collect' => array(
1201 1201
 				'index' => 'id_pm',
1202
-				'process' => function ($guestMessages)
1202
+				'process' => function($guestMessages)
1203 1203
 				{
1204 1204
 					global $smcFunc;
1205 1205
 					$smcFunc['db_query']('', '
@@ -1229,7 +1229,7 @@  discard block
 block discarded – undo
1229 1229
 				GROUP BY ln.id_member',
1230 1230
 			'fix_collect' => array(
1231 1231
 				'index' => 'id_member',
1232
-				'process' => function ($members) use ($smcFunc)
1232
+				'process' => function($members) use ($smcFunc)
1233 1233
 				{
1234 1234
 					$smcFunc['db_query']('', '
1235 1235
 						DELETE FROM {db_prefix}log_notify
@@ -1256,7 +1256,7 @@  discard block
 block discarded – undo
1256 1256
 					LEFT JOIN {db_prefix}log_search_subjects AS lss ON (lss.id_topic = t.id_topic)
1257 1257
 				WHERE t.id_topic BETWEEN {STEP_LOW} AND {STEP_HIGH}
1258 1258
 					AND lss.id_topic IS NULL',
1259
-			'fix_full_processing' => function ($result)
1259
+			'fix_full_processing' => function($result)
1260 1260
 			{
1261 1261
 				global $smcFunc;
1262 1262
 
@@ -1285,7 +1285,7 @@  discard block
 block discarded – undo
1285 1285
 						array('word', 'id_topic')
1286 1286
 					);
1287 1287
 			},
1288
-			'message_function' => function ($row)
1288
+			'message_function' => function($row)
1289 1289
 			{
1290 1290
 				global $txt, $context;
1291 1291
 
@@ -1313,7 +1313,7 @@  discard block
 block discarded – undo
1313 1313
 					AND t.id_topic IS NULL',
1314 1314
 			'fix_collect' => array(
1315 1315
 				'index' => 'id_topic',
1316
-				'process' => function ($deleteTopics)
1316
+				'process' => function($deleteTopics)
1317 1317
 				{
1318 1318
 					global $smcFunc;
1319 1319
 					$smcFunc['db_query']('', '
@@ -1343,7 +1343,7 @@  discard block
 block discarded – undo
1343 1343
 					AND mem.id_member IS NULL',
1344 1344
 			'fix_collect' => array(
1345 1345
 				'index' => 'id_member',
1346
-				'process' => function ($members)
1346
+				'process' => function($members)
1347 1347
 				{
1348 1348
 					global $smcFunc;
1349 1349
 					$smcFunc['db_query']('', '
@@ -1372,7 +1372,7 @@  discard block
 block discarded – undo
1372 1372
 					AND p.id_poll IS NULL',
1373 1373
 			'fix_collect' => array(
1374 1374
 				'index' => 'id_poll',
1375
-				'process' => function ($polls)
1375
+				'process' => function($polls)
1376 1376
 				{
1377 1377
 					global $smcFunc;
1378 1378
 					$smcFunc['db_query']('', '
@@ -1401,7 +1401,7 @@  discard block
 block discarded – undo
1401 1401
 					AND lrc.id_report IS NULL',
1402 1402
 			'fix_collect' => array(
1403 1403
 				'index' => 'id_report',
1404
-				'process' => function ($reports)
1404
+				'process' => function($reports)
1405 1405
 				{
1406 1406
 					global $smcFunc;
1407 1407
 					$smcFunc['db_query']('', '
@@ -1430,7 +1430,7 @@  discard block
 block discarded – undo
1430 1430
 					AND lr.id_report IS NULL',
1431 1431
 			'fix_collect' => array(
1432 1432
 				'index' => 'id_report',
1433
-				'process' => function ($reports)
1433
+				'process' => function($reports)
1434 1434
 				{
1435 1435
 					global $smcFunc;
1436 1436
 					$smcFunc['db_query']('', '
@@ -1460,7 +1460,7 @@  discard block
 block discarded – undo
1460 1460
 				GROUP BY lgr.id_member',
1461 1461
 			'fix_collect' => array(
1462 1462
 				'index' => 'id_member',
1463
-				'process' => function ($members)
1463
+				'process' => function($members)
1464 1464
 				{
1465 1465
 					global $smcFunc;
1466 1466
 					$smcFunc['db_query']('', '
@@ -1490,7 +1490,7 @@  discard block
 block discarded – undo
1490 1490
 				GROUP BY lgr.id_group',
1491 1491
 			'fix_collect' => array(
1492 1492
 				'index' => 'id_group',
1493
-				'process' => function ($groups)
1493
+				'process' => function($groups)
1494 1494
 				{
1495 1495
 					global $smcFunc;
1496 1496
 					$smcFunc['db_query']('', '
Please login to merge, or discard this patch.
Sources/Subs-Sound.php 1 patch
Braces   +32 added lines, -20 removed lines patch added patch discarded remove patch
@@ -15,8 +15,9 @@  discard block
 block discarded – undo
15 15
  * @version 2.1 Beta 4
16 16
  */
17 17
 
18
-if (!defined('SMF'))
18
+if (!defined('SMF')) {
19 19
 	die('No direct access...');
20
+}
20 21
 
21 22
 /**
22 23
  * Creates a wave file that spells the letters of $word.
@@ -32,8 +33,9 @@  discard block
 block discarded – undo
32 33
 	global $settings, $user_info;
33 34
 
34 35
 	// Allow max 2 requests per 20 seconds.
35
-	if (($ip = cache_get_data('wave_file/' . $user_info['ip'], 20)) > 2 || ($ip2 = cache_get_data('wave_file/' . $user_info['ip2'], 20)) > 2)
36
-		die(header('HTTP/1.1 400 Bad Request'));
36
+	if (($ip = cache_get_data('wave_file/' . $user_info['ip'], 20)) > 2 || ($ip2 = cache_get_data('wave_file/' . $user_info['ip2'], 20)) > 2) {
37
+			die(header('HTTP/1.1 400 Bad Request'));
38
+	}
37 39
 	cache_put_data('wave_file/' . $user_info['ip'], $ip ? $ip + 1 : 1, 20);
38 40
 	cache_put_data('wave_file/' . $user_info['ip2'], $ip2 ? $ip2 + 1 : 1, 20);
39 41
 
@@ -42,16 +44,19 @@  discard block
 block discarded – undo
42 44
 	mt_srand(end($tmp));
43 45
 
44 46
 	// Try to see if there's a sound font in the user's language.
45
-	if (file_exists($settings['default_theme_dir'] . '/fonts/sound/a.' . $user_info['language'] . '.wav'))
46
-		$sound_language = $user_info['language'];
47
+	if (file_exists($settings['default_theme_dir'] . '/fonts/sound/a.' . $user_info['language'] . '.wav')) {
48
+			$sound_language = $user_info['language'];
49
+	}
47 50
 
48 51
 	// English should be there.
49
-	elseif (file_exists($settings['default_theme_dir'] . '/fonts/sound/a.english.wav'))
50
-		$sound_language = 'english';
52
+	elseif (file_exists($settings['default_theme_dir'] . '/fonts/sound/a.english.wav')) {
53
+			$sound_language = 'english';
54
+	}
51 55
 
52 56
 	// Guess not...
53
-	else
54
-		return false;
57
+	else {
58
+			return false;
59
+	}
55 60
 
56 61
 	// File names are in lower case so lets make sure that we are only using a lower case string
57 62
 	$word = strtolower($word);
@@ -61,20 +66,25 @@  discard block
 block discarded – undo
61 66
 	for ($i = 0; $i < strlen($word); $i++)
62 67
 	{
63 68
 		$sound_letter = implode('', file($settings['default_theme_dir'] . '/fonts/sound/' . $word{$i} . '.' . $sound_language . '.wav'));
64
-		if (strpos($sound_letter, 'data') === false)
65
-			return false;
69
+		if (strpos($sound_letter, 'data') === false) {
70
+					return false;
71
+		}
66 72
 
67 73
 		$sound_letter = substr($sound_letter, strpos($sound_letter, 'data') + 8);
68 74
 		switch ($word{$i} === 's' ? 0 : mt_rand(0, 2))
69 75
 		{
70
-			case 0 : for ($j = 0, $n = strlen($sound_letter); $j < $n; $j++)
71
-					for ($k = 0, $m = round(mt_rand(15, 25) / 10); $k < $m; $k++)
72
-						$sound_word .= $word{$i} === 's' ? $sound_letter{$j} : chr(mt_rand(max(ord($sound_letter{$j}) - 1, 0x00), min(ord($sound_letter{$j}) + 1, 0xFF)));
76
+			case 0 : for ($j = 0, $n = strlen($sound_letter); $j < $n; $j++) {
77
+								for ($k = 0, $m = round(mt_rand(15, 25) / 10);
78
+			}
79
+			$k < $m; $k++) {
80
+											$sound_word .= $word{$i} === 's' ? $sound_letter{$j} : chr(mt_rand(max(ord($sound_letter{$j}) - 1, 0x00), min(ord($sound_letter{$j}) + 1, 0xFF)));
81
+					}
73 82
 			break;
74 83
 
75 84
 			case 1:
76
-				for ($j = 0, $n = strlen($sound_letter) - 1; $j < $n; $j += 2)
77
-					$sound_word .= (mt_rand(0, 3) == 0 ? '' : $sound_letter{$j}) . (mt_rand(0, 3) === 0 ? $sound_letter{$j + 1} : $sound_letter{$j}) . (mt_rand(0, 3) === 0 ? $sound_letter{$j} : $sound_letter{$j + 1}) . $sound_letter{$j + 1} . (mt_rand(0, 3) == 0 ? $sound_letter{$j + 1} : '');
85
+				for ($j = 0, $n = strlen($sound_letter) - 1; $j < $n; $j += 2) {
86
+									$sound_word .= (mt_rand(0, 3) == 0 ? '' : $sound_letter{$j}) . (mt_rand(0, 3) === 0 ? $sound_letter{$j + 1} : $sound_letter{$j}) . (mt_rand(0, 3) === 0 ? $sound_letter{$j} : $sound_letter{$j + 1}) . $sound_letter{$j + 1} . (mt_rand(0, 3) == 0 ? $sound_letter{$j + 1} : '');
87
+				}
78 88
 				$sound_word .= str_repeat($sound_letter{$n}, 2);
79 89
 			break;
80 90
 
@@ -82,10 +92,12 @@  discard block
 block discarded – undo
82 92
 				$shift = 0;
83 93
 				for ($j = 0, $n = strlen($sound_letter); $j < $n; $j++)
84 94
 				{
85
-					if (mt_rand(0, 10) === 0)
86
-						$shift += mt_rand(-3, 3);
87
-					for ($k = 0, $m = round(mt_rand(15, 25) / 10); $k < $m; $k++)
88
-						$sound_word .= chr(min(max(ord($sound_letter{$j}) + $shift, 0x00), 0xFF));
95
+					if (mt_rand(0, 10) === 0) {
96
+											$shift += mt_rand(-3, 3);
97
+					}
98
+					for ($k = 0, $m = round(mt_rand(15, 25) / 10); $k < $m; $k++) {
99
+											$sound_word .= chr(min(max(ord($sound_letter{$j}) + $shift, 0x00), 0xFF));
100
+					}
89 101
 				}
90 102
 			break;
91 103
 		}
Please login to merge, or discard this patch.
Sources/Notify.php 1 patch
Braces   +23 added lines, -20 removed lines patch added patch discarded remove patch
@@ -14,8 +14,9 @@  discard block
 block discarded – undo
14 14
  * @version 2.1 Beta 4
15 15
  */
16 16
 
17
-if (!defined('SMF'))
17
+if (!defined('SMF')) {
18 18
 	die('No direct access...');
19
+}
19 20
 
20 21
 /**
21 22
  * Turn off/on notification for a particular board.
@@ -34,8 +35,9 @@  discard block
 block discarded – undo
34 35
 	is_not_guest();
35 36
 
36 37
 	// You have to specify a board to turn notifications on!
37
-	if (empty($board))
38
-		fatal_lang_error('no_board', false);
38
+	if (empty($board)) {
39
+			fatal_lang_error('no_board', false);
40
+	}
39 41
 
40 42
 	// No subaction: find out what to do.
41 43
 	if (isset($_GET['mode']))
@@ -48,16 +50,16 @@  discard block
 block discarded – undo
48 50
 		require_once($sourcedir . '/Subs-Notify.php');
49 51
 		setNotifyPrefs($user_info['id'], array('board_notify_' . $board => $alertPref));
50 52
 
51
-		if ($mode > 1)
52
-			// Turn notification on.  (note this just blows smoke if it's already on.)
53
+		if ($mode > 1) {
54
+					// Turn notification on.  (note this just blows smoke if it's already on.)
53 55
 			$smcFunc['db_insert']('ignore',
54 56
 				'{db_prefix}log_notify',
55 57
 				array('id_member' => 'int', 'id_board' => 'int'),
56 58
 				array($user_info['id'], $board),
57 59
 				array('id_member', 'id_board')
58 60
 			);
59
-		else
60
-			$smcFunc['db_query']('', '
61
+		} else {
62
+					$smcFunc['db_query']('', '
61 63
 				DELETE FROM {db_prefix}log_notify
62 64
 				WHERE id_member = {int:current_member}
63 65
 				AND id_board = {int:current_board}',
@@ -66,6 +68,7 @@  discard block
 block discarded – undo
66 68
 					'current_member' => $user_info['id'],
67 69
 				)
68 70
 			);
71
+		}
69 72
 	}
70 73
 
71 74
 	// Back to the board!
@@ -80,10 +83,10 @@  discard block
 block discarded – undo
80 83
 			),
81 84
 		);
82 85
 		$context['sub_template'] = 'generic_xml';
86
+	} else {
87
+			redirectexit('board=' . $board . '.' . $_REQUEST['start']);
88
+	}
83 89
 	}
84
-	else
85
-		redirectexit('board=' . $board . '.' . $_REQUEST['start']);
86
-}
87 90
 
88 91
 /**
89 92
  * Turn off/on unread replies subscription for a topic as well as sets individual topic's alert preferences
@@ -107,8 +110,9 @@  discard block
 block discarded – undo
107 110
 			$mode = (int) $_GET['mode'];
108 111
 			$alertPref = $mode <= 1 ? 0 : ($mode == 2 ? 1 : 3);
109 112
 
110
-			if (empty($mode))
111
-				$mode = 1;
113
+			if (empty($mode)) {
114
+							$mode = 1;
115
+			}
112 116
 
113 117
 			$request = $smcFunc['db_query']('', '
114 118
 				SELECT id_member, id_topic, id_msg, unwatched
@@ -131,8 +135,7 @@  discard block
 block discarded – undo
131 135
 					'id_msg' => 0,
132 136
 					'unwatched' => empty($mode) ? 1 : 0,
133 137
 				);
134
-			}
135
-			else
138
+			} else
136 139
 			{
137 140
 				$insert = false;
138 141
 				$log['unwatched'] = empty($mode) ? 1 : 0;
@@ -159,9 +162,8 @@  discard block
 block discarded – undo
159 162
 					array($user_info['id'], $log['id_topic']),
160 163
 					array('id_member', 'id_board')
161 164
 				);
162
-			}
163
-			else
164
-				$smcFunc['db_query']('', '
165
+			} else {
166
+							$smcFunc['db_query']('', '
165 167
 					DELETE FROM {db_prefix}log_notify
166 168
 					WHERE id_topic = {int:topic}
167 169
 						AND id_member = {int:member}',
@@ -169,6 +171,7 @@  discard block
 block discarded – undo
169 171
 						'topic' => $log['id_topic'],
170 172
 						'member' => $user_info['id'],
171 173
 					));
174
+			}
172 175
 		}
173 176
 	}
174 177
 
@@ -184,9 +187,9 @@  discard block
 block discarded – undo
184 187
 			),
185 188
 		);
186 189
 		$context['sub_template'] = 'generic_xml';
190
+	} else {
191
+			redirectexit('topic=' . $topic . '.' . $_REQUEST['start']);
192
+	}
187 193
 	}
188
-	else
189
-		redirectexit('topic=' . $topic . '.' . $_REQUEST['start']);
190
-}
191 194
 
192 195
 ?>
193 196
\ No newline at end of file
Please login to merge, or discard this patch.