SimpleMachines /
SMF2.1
@@ -73,10 +73,10 @@ discard block |
||
| 73 | 73 | <subject is_first="', $context['message']['first_in_topic'] ? '1' : '0', '"><![CDATA[', cleanXml($context['message']['subject']), ']]></subject> |
| 74 | 74 | <body><![CDATA[', $context['message']['body'], ']]></body> |
| 75 | 75 | <success><![CDATA[', $txt['quick_modify_message'], ']]></success>'; |
| 76 | - } |
|
| 77 | - else |
|
| 78 | - echo ' |
|
| 76 | + } else { |
|
| 77 | + echo ' |
|
| 79 | 78 | <error in_subject="', $context['message']['error_in_subject'] ? '1' : '0', '" in_body="', cleanXml($context['message']['error_in_body']) ? '1' : '0', '"><![CDATA[', implode('<br />', $context['message']['errors']), ']]></error>'; |
| 79 | + } |
|
| 80 | 80 | echo ' |
| 81 | 81 | </message> |
| 82 | 82 | </smf>'; |
@@ -101,13 +101,14 @@ discard block |
||
| 101 | 101 | echo ' |
| 102 | 102 | <modified><![CDATA[', empty($modified) ? '' : cleanXml('« <em>' . $modified . '</em>»'), ']]></modified>'; |
| 103 | 103 | |
| 104 | - if (!empty($context['message']['subject'])) |
|
| 105 | - echo ' |
|
| 104 | + if (!empty($context['message']['subject'])) { |
|
| 105 | + echo ' |
|
| 106 | 106 | <subject><![CDATA[', cleanXml($context['message']['subject']), ']]></subject>'; |
| 107 | - } |
|
| 108 | - else |
|
| 109 | - echo ' |
|
| 107 | + } |
|
| 108 | + } else { |
|
| 109 | + echo ' |
|
| 110 | 110 | <error in_subject="', $context['message']['error_in_subject'] ? '1' : '0', '"><![CDATA[', cleanXml(implode('<br />', $context['message']['errors'])), ']]></error>'; |
| 111 | + } |
|
| 111 | 112 | echo ' |
| 112 | 113 | </message> |
| 113 | 114 | </smf>'; |
@@ -128,10 +129,11 @@ discard block |
||
| 128 | 129 | </preview> |
| 129 | 130 | <errors serious="', empty($context['error_type']) || $context['error_type'] != 'serious' ? '0' : '1', '" topic_locked="', $context['locked'] ? '1' : '0', '">'; |
| 130 | 131 | |
| 131 | - if (!empty($context['post_error'])) |
|
| 132 | - foreach ($context['post_error'] as $message) |
|
| 132 | + if (!empty($context['post_error'])) { |
|
| 133 | + foreach ($context['post_error'] as $message) |
|
| 133 | 134 | echo ' |
| 134 | 135 | <error><![CDATA[', cleanXml($message), ']]></error>'; |
| 136 | + } |
|
| 135 | 137 | |
| 136 | 138 | echo ' |
| 137 | 139 | <caption name="guestname" class="', isset($context['post_error']['long_name']) || isset($context['post_error']['no_name']) || isset($context['post_error']['bad_name']) ? 'error' : '', '" /> |
@@ -148,14 +150,15 @@ discard block |
||
| 148 | 150 | echo ' |
| 149 | 151 | <new_posts>'; |
| 150 | 152 | |
| 151 | - foreach ($context['previous_posts'] as $post) |
|
| 152 | - echo ' |
|
| 153 | + foreach ($context['previous_posts'] as $post) { |
|
| 154 | + echo ' |
|
| 153 | 155 | <post id="', $post['id'], '"> |
| 154 | 156 | <time><![CDATA[', $post['time'], ']]></time> |
| 155 | 157 | <poster><![CDATA[', cleanXml($post['poster']), ']]></poster> |
| 156 | 158 | <message><![CDATA[', cleanXml($post['message']), ']]></message> |
| 157 | 159 | <is_ignored>', $post['is_ignored'] ? '1' : '0', '</is_ignored> |
| 158 | 160 | </post>'; |
| 161 | + } |
|
| 159 | 162 | |
| 160 | 163 | echo ' |
| 161 | 164 | </new_posts>'; |
@@ -181,10 +184,11 @@ discard block |
||
| 181 | 184 | </preview> |
| 182 | 185 | <errors serious="', empty($context['error_type']) || $context['error_type'] != 'serious' ? '0' : '1', '">'; |
| 183 | 186 | |
| 184 | - if (!empty($context['post_error']['messages'])) |
|
| 185 | - foreach ($context['post_error']['messages'] as $message) |
|
| 187 | + if (!empty($context['post_error']['messages'])) { |
|
| 188 | + foreach ($context['post_error']['messages'] as $message) |
|
| 186 | 189 | echo ' |
| 187 | 190 | <error><![CDATA[', cleanXml($message), ']]></error>'; |
| 191 | + } |
|
| 188 | 192 | |
| 189 | 193 | echo ' |
| 190 | 194 | <caption name="to" class="', isset($context['post_error']['no_to']) ? 'error' : '', '" /> |
@@ -214,10 +218,11 @@ discard block |
||
| 214 | 218 | </preview> |
| 215 | 219 | <errors serious="', empty($context['error_type']) || $context['error_type'] != 'serious' ? '0' : '1', '">'; |
| 216 | 220 | |
| 217 | - if (!empty($context['post_error']['messages'])) |
|
| 218 | - foreach ($context['post_error']['messages'] as $message) |
|
| 221 | + if (!empty($context['post_error']['messages'])) { |
|
| 222 | + foreach ($context['post_error']['messages'] as $message) |
|
| 219 | 223 | echo ' |
| 220 | 224 | <error><![CDATA[', cleanXml($message), ']]></error>'; |
| 225 | + } |
|
| 221 | 226 | |
| 222 | 227 | echo ' |
| 223 | 228 | </errors>'; |
@@ -233,20 +238,23 @@ discard block |
||
| 233 | 238 | { |
| 234 | 239 | global $context, $modSettings; |
| 235 | 240 | |
| 236 | - if (empty($context['yearly'])) |
|
| 237 | - return; |
|
| 241 | + if (empty($context['yearly'])) { |
|
| 242 | + return; |
|
| 243 | + } |
|
| 238 | 244 | |
| 239 | 245 | echo '<', '?xml version="1.0" encoding="', $context['character_set'], '"?', '> |
| 240 | 246 | <smf>'; |
| 241 | - foreach ($context['yearly'] as $year) |
|
| 242 | - foreach ($year['months'] as $month) |
|
| 247 | + foreach ($context['yearly'] as $year) { |
|
| 248 | + foreach ($year['months'] as $month) |
|
| 243 | 249 | { |
| 244 | 250 | echo ' |
| 245 | 251 | <month id="', $month['date']['year'], $month['date']['month'], '">'; |
| 252 | + } |
|
| 246 | 253 | |
| 247 | - foreach ($month['days'] as $day) |
|
| 248 | - echo ' |
|
| 254 | + foreach ($month['days'] as $day) { |
|
| 255 | + echo ' |
|
| 249 | 256 | <day date="', $day['year'], '-', $day['month'], '-', $day['day'], '" new_topics="', $day['new_topics'], '" new_posts="', $day['new_posts'], '" new_members="', $day['new_members'], '" most_members_online="', $day['most_members_online'], '"', empty($modSettings['hitStats']) ? '' : ' hits="' . $day['hits'] . '"', ' />'; |
| 257 | + } |
|
| 250 | 258 | |
| 251 | 259 | echo ' |
| 252 | 260 | </month>'; |
@@ -269,17 +277,18 @@ discard block |
||
| 269 | 277 | <pageIndex section="selected" startFrom="', $context['selected']['start'], '"><![CDATA[', $context['selected']['page_index'], ']]></pageIndex>'; |
| 270 | 278 | foreach ($context['changes'] as $change) |
| 271 | 279 | { |
| 272 | - if ($change['type'] == 'remove') |
|
| 273 | - echo ' |
|
| 280 | + if ($change['type'] == 'remove') { |
|
| 281 | + echo ' |
|
| 274 | 282 | <change id="', $change['id'], '" curAction="remove" section="', $change['section'], '" />'; |
| 275 | - else |
|
| 276 | - echo ' |
|
| 283 | + } else { |
|
| 284 | + echo ' |
|
| 277 | 285 | <change id="', $change['id'], '" curAction="insert" section="', $change['section'], '"> |
| 278 | 286 | <subject><![CDATA[', cleanXml($change['insert_value']['subject']), ']]></subject> |
| 279 | 287 | <time><![CDATA[', cleanXml($change['insert_value']['time']), ']]></time> |
| 280 | 288 | <body><![CDATA[', cleanXml($change['insert_value']['body']), ']]></body> |
| 281 | 289 | <poster><![CDATA[', cleanXml($change['insert_value']['poster']), ']]></poster> |
| 282 | 290 | </change>'; |
| 291 | + } |
|
| 283 | 292 | } |
| 284 | 293 | echo ' |
| 285 | 294 | </smf>'; |
@@ -310,10 +319,10 @@ discard block |
||
| 310 | 319 | echo '<', '?xml version="1.0" encoding="', $context['character_set'], '"?', '> |
| 311 | 320 | <smf>'; |
| 312 | 321 | |
| 313 | - if (empty($context['topics'])) |
|
| 314 | - echo ' |
|
| 322 | + if (empty($context['topics'])) { |
|
| 323 | + echo ' |
|
| 315 | 324 | <noresults>', $txt['search_no_results'], '</noresults>'; |
| 316 | - else |
|
| 325 | + } else |
|
| 317 | 326 | { |
| 318 | 327 | echo ' |
| 319 | 328 | <results>'; |
@@ -382,9 +391,10 @@ discard block |
||
| 382 | 391 | echo ' |
| 383 | 392 | <item type="category" id="', $category['id'], '"><![CDATA[', cleanXml($category['name']), ']]></item>'; |
| 384 | 393 | |
| 385 | - foreach ($category['boards'] as $board) |
|
| 386 | - echo ' |
|
| 394 | + foreach ($category['boards'] as $board) { |
|
| 395 | + echo ' |
|
| 387 | 396 | <item type="board" id="', $board['id'], '" childlevel="', $board['child_level'], '"><![CDATA[', cleanXml($board['name']), ']]></item>'; |
| 397 | + } |
|
| 388 | 398 | } |
| 389 | 399 | echo ' |
| 390 | 400 | </smf>'; |
@@ -400,9 +410,10 @@ discard block |
||
| 400 | 410 | echo '<', '?xml version="1.0" encoding="', $context['character_set'], '"?', '> |
| 401 | 411 | <smf>'; |
| 402 | 412 | |
| 403 | - foreach ($context['icons'] as $icon) |
|
| 404 | - echo ' |
|
| 413 | + foreach ($context['icons'] as $icon) { |
|
| 414 | + echo ' |
|
| 405 | 415 | <icon value="', $icon['value'], '" url="', $icon['url'], '"><![CDATA[', cleanXml($icon['name']), ']]></icon>'; |
| 416 | + } |
|
| 406 | 417 | |
| 407 | 418 | echo ' |
| 408 | 419 | </smf>'; |
@@ -452,16 +463,18 @@ discard block |
||
| 452 | 463 | foreach ($xml_data as $key => $data) |
| 453 | 464 | { |
| 454 | 465 | // A group? |
| 455 | - if (is_array($data) && isset($data['identifier'])) |
|
| 456 | - template_generic_xml_recursive($data['children'], $key, $data['identifier'], $level); |
|
| 466 | + if (is_array($data) && isset($data['identifier'])) { |
|
| 467 | + template_generic_xml_recursive($data['children'], $key, $data['identifier'], $level); |
|
| 468 | + } |
|
| 457 | 469 | // An item... |
| 458 | 470 | elseif (is_array($data) && isset($data['value'])) |
| 459 | 471 | { |
| 460 | 472 | echo "\n", str_repeat("\t", $level), '<', $child_ident; |
| 461 | 473 | |
| 462 | - if (!empty($data['attributes'])) |
|
| 463 | - foreach ($data['attributes'] as $k => $v) |
|
| 474 | + if (!empty($data['attributes'])) { |
|
| 475 | + foreach ($data['attributes'] as $k => $v) |
|
| 464 | 476 | echo ' ' . $k . '="' . $v . '"'; |
| 477 | + } |
|
| 465 | 478 | echo '><![CDATA[', cleanXml($data['value']), ']]></', $child_ident, '>'; |
| 466 | 479 | } |
| 467 | 480 | } |
@@ -18,8 +18,9 @@ discard block |
||
| 18 | 18 | * @version 2.1 Beta 4 |
| 19 | 19 | */ |
| 20 | 20 | |
| 21 | -if (!defined('SMF')) |
|
| 21 | +if (!defined('SMF')) { |
|
| 22 | 22 | die('No direct access...'); |
| 23 | +} |
|
| 23 | 24 | |
| 24 | 25 | /** |
| 25 | 26 | * downloads a file from a url and stores it locally for avatar use by id_member. |
@@ -44,8 +45,9 @@ discard block |
||
| 44 | 45 | $destName = 'avatar_' . $memID . '_' . time() . '.' . $ext; |
| 45 | 46 | |
| 46 | 47 | // Just making sure there is a non-zero member. |
| 47 | - if (empty($memID)) |
|
| 48 | - return false; |
|
| 48 | + if (empty($memID)) { |
|
| 49 | + return false; |
|
| 50 | + } |
|
| 49 | 51 | |
| 50 | 52 | require_once($sourcedir . '/ManageAttachments.php'); |
| 51 | 53 | removeAttachments(array('id_member' => $memID)); |
@@ -76,10 +78,11 @@ discard block |
||
| 76 | 78 | $destName = $modSettings['custom_avatar_dir'] . '/' . $destName . '.tmp'; |
| 77 | 79 | |
| 78 | 80 | // Resize it. |
| 79 | - if (!empty($modSettings['avatar_download_png'])) |
|
| 80 | - $success = resizeImageFile($url, $destName, $max_width, $max_height, 3); |
|
| 81 | - else |
|
| 82 | - $success = resizeImageFile($url, $destName, $max_width, $max_height); |
|
| 81 | + if (!empty($modSettings['avatar_download_png'])) { |
|
| 82 | + $success = resizeImageFile($url, $destName, $max_width, $max_height, 3); |
|
| 83 | + } else { |
|
| 84 | + $success = resizeImageFile($url, $destName, $max_width, $max_height); |
|
| 85 | + } |
|
| 83 | 86 | |
| 84 | 87 | // Remove the .tmp extension. |
| 85 | 88 | $destName = substr($destName, 0, -4); |
@@ -108,11 +111,10 @@ discard block |
||
| 108 | 111 | ) |
| 109 | 112 | ); |
| 110 | 113 | return true; |
| 114 | + } else { |
|
| 115 | + return false; |
|
| 111 | 116 | } |
| 112 | - else |
|
| 113 | - return false; |
|
| 114 | - } |
|
| 115 | - else |
|
| 117 | + } else |
|
| 116 | 118 | { |
| 117 | 119 | $smcFunc['db_query']('', ' |
| 118 | 120 | DELETE FROM {db_prefix}attachments |
@@ -144,17 +146,18 @@ discard block |
||
| 144 | 146 | $destName = $source . '_thumb.tmp'; |
| 145 | 147 | |
| 146 | 148 | // Do the actual resize. |
| 147 | - if (!empty($modSettings['attachment_thumb_png'])) |
|
| 148 | - $success = resizeImageFile($source, $destName, $max_width, $max_height, 3); |
|
| 149 | - else |
|
| 150 | - $success = resizeImageFile($source, $destName, $max_width, $max_height); |
|
| 149 | + if (!empty($modSettings['attachment_thumb_png'])) { |
|
| 150 | + $success = resizeImageFile($source, $destName, $max_width, $max_height, 3); |
|
| 151 | + } else { |
|
| 152 | + $success = resizeImageFile($source, $destName, $max_width, $max_height); |
|
| 153 | + } |
|
| 151 | 154 | |
| 152 | 155 | // Okay, we're done with the temporary stuff. |
| 153 | 156 | $destName = substr($destName, 0, -4); |
| 154 | 157 | |
| 155 | - if ($success && @rename($destName . '.tmp', $destName)) |
|
| 156 | - return true; |
|
| 157 | - else |
|
| 158 | + if ($success && @rename($destName . '.tmp', $destName)) { |
|
| 159 | + return true; |
|
| 160 | + } else |
|
| 158 | 161 | { |
| 159 | 162 | @unlink($destName . '.tmp'); |
| 160 | 163 | @touch($destName); |
@@ -176,18 +179,21 @@ discard block |
||
| 176 | 179 | { |
| 177 | 180 | if (!resizeImageFile($fileName, $fileName . '.tmp', null, null, $preferred_format)) |
| 178 | 181 | { |
| 179 | - if (file_exists($fileName . '.tmp')) |
|
| 180 | - unlink($fileName . '.tmp'); |
|
| 182 | + if (file_exists($fileName . '.tmp')) { |
|
| 183 | + unlink($fileName . '.tmp'); |
|
| 184 | + } |
|
| 181 | 185 | |
| 182 | 186 | return false; |
| 183 | 187 | } |
| 184 | 188 | |
| 185 | - if (!unlink($fileName)) |
|
| 186 | - return false; |
|
| 189 | + if (!unlink($fileName)) { |
|
| 190 | + return false; |
|
| 191 | + } |
|
| 187 | 192 | |
| 188 | - if (!rename($fileName . '.tmp', $fileName)) |
|
| 189 | - return false; |
|
| 190 | -} |
|
| 193 | + if (!rename($fileName . '.tmp', $fileName)) { |
|
| 194 | + return false; |
|
| 195 | + } |
|
| 196 | + } |
|
| 191 | 197 | |
| 192 | 198 | /** |
| 193 | 199 | * Searches through the file to see if there's potentially harmful non-binary content. |
@@ -200,8 +206,9 @@ discard block |
||
| 200 | 206 | function checkImageContents($fileName, $extensiveCheck = false) |
| 201 | 207 | { |
| 202 | 208 | $fp = fopen($fileName, 'rb'); |
| 203 | - if (!$fp) |
|
| 204 | - fatal_lang_error('attach_timeout'); |
|
| 209 | + if (!$fp) { |
|
| 210 | + fatal_lang_error('attach_timeout'); |
|
| 211 | + } |
|
| 205 | 212 | |
| 206 | 213 | $prev_chunk = ''; |
| 207 | 214 | while (!feof($fp)) |
@@ -218,8 +225,7 @@ discard block |
||
| 218 | 225 | fclose($fp); |
| 219 | 226 | return false; |
| 220 | 227 | } |
| 221 | - } |
|
| 222 | - else |
|
| 228 | + } else |
|
| 223 | 229 | { |
| 224 | 230 | // Check for potential infection - focus on clues for inline php & flash. |
| 225 | 231 | // Will result in significantly fewer false positives than the paranoid check. |
@@ -247,8 +253,9 @@ discard block |
||
| 247 | 253 | global $gd2; |
| 248 | 254 | |
| 249 | 255 | // Check to see if GD is installed and what version. |
| 250 | - if (($extensionFunctions = get_extension_funcs('gd')) === false) |
|
| 251 | - return false; |
|
| 256 | + if (($extensionFunctions = get_extension_funcs('gd')) === false) { |
|
| 257 | + return false; |
|
| 258 | + } |
|
| 252 | 259 | |
| 253 | 260 | // Also determine if GD2 is installed and store it in a global. |
| 254 | 261 | $gd2 = in_array('imagecreatetruecolor', $extensionFunctions) && function_exists('imagecreatetruecolor'); |
@@ -320,8 +327,9 @@ discard block |
||
| 320 | 327 | global $sourcedir; |
| 321 | 328 | |
| 322 | 329 | // Nothing to do without GD or IM/MW |
| 323 | - if (!checkGD() && !checkImagick() && !checkMagickWand()) |
|
| 324 | - return false; |
|
| 330 | + if (!checkGD() && !checkImagick() && !checkMagickWand()) { |
|
| 331 | + return false; |
|
| 332 | + } |
|
| 325 | 333 | |
| 326 | 334 | static $default_formats = array( |
| 327 | 335 | '1' => 'gif', |
@@ -341,38 +349,39 @@ discard block |
||
| 341 | 349 | fclose($fp_destination); |
| 342 | 350 | |
| 343 | 351 | $sizes = @getimagesize($destination); |
| 344 | - } |
|
| 345 | - elseif ($fp_destination) |
|
| 352 | + } elseif ($fp_destination) |
|
| 346 | 353 | { |
| 347 | 354 | $sizes = @getimagesize($source); |
| 348 | 355 | |
| 349 | 356 | $fp_source = fopen($source, 'rb'); |
| 350 | 357 | if ($fp_source !== false) |
| 351 | 358 | { |
| 352 | - while (!feof($fp_source)) |
|
| 353 | - fwrite($fp_destination, fread($fp_source, 8192)); |
|
| 359 | + while (!feof($fp_source)) { |
|
| 360 | + fwrite($fp_destination, fread($fp_source, 8192)); |
|
| 361 | + } |
|
| 354 | 362 | fclose($fp_source); |
| 363 | + } else { |
|
| 364 | + $sizes = array(-1, -1, -1); |
|
| 355 | 365 | } |
| 356 | - else |
|
| 357 | - $sizes = array(-1, -1, -1); |
|
| 358 | 366 | fclose($fp_destination); |
| 359 | 367 | } |
| 360 | 368 | // We can't get to the file. |
| 361 | - else |
|
| 362 | - $sizes = array(-1, -1, -1); |
|
| 369 | + else { |
|
| 370 | + $sizes = array(-1, -1, -1); |
|
| 371 | + } |
|
| 363 | 372 | |
| 364 | 373 | // See if we have -or- can get the needed memory for this operation |
| 365 | 374 | // ImageMagick isn't subject to PHP's memory limits :) |
| 366 | - if (!(checkIMagick() || checkMagickWand()) && checkGD() && !imageMemoryCheck($sizes)) |
|
| 367 | - return false; |
|
| 375 | + if (!(checkIMagick() || checkMagickWand()) && checkGD() && !imageMemoryCheck($sizes)) { |
|
| 376 | + return false; |
|
| 377 | + } |
|
| 368 | 378 | |
| 369 | 379 | // A known and supported format? |
| 370 | 380 | // @todo test PSD and gif. |
| 371 | 381 | if ((checkImagick() || checkMagickWand()) && isset($default_formats[$sizes[2]])) |
| 372 | 382 | { |
| 373 | 383 | return resizeImage(null, $destination, null, null, $max_width, $max_height, true, $preferred_format); |
| 374 | - } |
|
| 375 | - elseif (checkGD() && isset($default_formats[$sizes[2]]) && function_exists('imagecreatefrom' . $default_formats[$sizes[2]])) |
|
| 384 | + } elseif (checkGD() && isset($default_formats[$sizes[2]]) && function_exists('imagecreatefrom' . $default_formats[$sizes[2]])) |
|
| 376 | 385 | { |
| 377 | 386 | $imagecreatefrom = 'imagecreatefrom' . $default_formats[$sizes[2]]; |
| 378 | 387 | if ($src_img = @$imagecreatefrom($destination)) |
@@ -425,14 +434,14 @@ discard block |
||
| 425 | 434 | $dest_width = empty($max_width) ? $src_width : $max_width; |
| 426 | 435 | $dest_height = empty($max_height) ? $src_height : $max_height; |
| 427 | 436 | |
| 428 | - if ($default_formats[$preferred_format] == 'jpeg') |
|
| 429 | - $imagick->setCompressionQuality(!empty($modSettings['avatar_jpeg_quality']) ? $modSettings['avatar_jpeg_quality'] : 82); |
|
| 437 | + if ($default_formats[$preferred_format] == 'jpeg') { |
|
| 438 | + $imagick->setCompressionQuality(!empty($modSettings['avatar_jpeg_quality']) ? $modSettings['avatar_jpeg_quality'] : 82); |
|
| 439 | + } |
|
| 430 | 440 | |
| 431 | 441 | $imagick->setImageFormat($default_formats[$preferred_format]); |
| 432 | 442 | $imagick->resizeImage($dest_width, $dest_height, Imagick::FILTER_LANCZOS, 1, true); |
| 433 | 443 | $success = $imagick->writeImage($destName); |
| 434 | - } |
|
| 435 | - else |
|
| 444 | + } else |
|
| 436 | 445 | { |
| 437 | 446 | $magick_wand = newMagickWand(); |
| 438 | 447 | MagickReadImage($magick_wand, $destName); |
@@ -441,8 +450,9 @@ discard block |
||
| 441 | 450 | $dest_width = empty($max_width) ? $src_width : $max_width; |
| 442 | 451 | $dest_height = empty($max_height) ? $src_height : $max_height; |
| 443 | 452 | |
| 444 | - if ($default_formats[$preferred_format] == 'jpeg') |
|
| 445 | - MagickSetCompressionQuality($magick_wand, !empty($modSettings['avatar_jpeg_quality']) ? $modSettings['avatar_jpeg_quality'] : 82); |
|
| 453 | + if ($default_formats[$preferred_format] == 'jpeg') { |
|
| 454 | + MagickSetCompressionQuality($magick_wand, !empty($modSettings['avatar_jpeg_quality']) ? $modSettings['avatar_jpeg_quality'] : 82); |
|
| 455 | + } |
|
| 446 | 456 | |
| 447 | 457 | MagickSetImageFormat($magick_wand, $default_formats[$preferred_format]); |
| 448 | 458 | MagickResizeImage($magick_wand, $dest_width, $dest_height, MW_LanczosFilter, 1, true); |
@@ -450,8 +460,7 @@ discard block |
||
| 450 | 460 | } |
| 451 | 461 | |
| 452 | 462 | return !empty($success); |
| 453 | - } |
|
| 454 | - elseif (checkGD()) |
|
| 463 | + } elseif (checkGD()) |
|
| 455 | 464 | { |
| 456 | 465 | $success = false; |
| 457 | 466 | |
@@ -462,8 +471,7 @@ discard block |
||
| 462 | 471 | { |
| 463 | 472 | $dst_width = $max_width; |
| 464 | 473 | $dst_height = round($src_height * $max_width / $src_width); |
| 465 | - } |
|
| 466 | - elseif (!empty($max_height)) |
|
| 474 | + } elseif (!empty($max_height)) |
|
| 467 | 475 | { |
| 468 | 476 | $dst_width = round($src_width * $max_height / $src_height); |
| 469 | 477 | $dst_height = $max_height; |
@@ -481,44 +489,48 @@ discard block |
||
| 481 | 489 | if ((!empty($preferred_format)) && ($preferred_format == 3)) |
| 482 | 490 | { |
| 483 | 491 | imagealphablending($dst_img, false); |
| 484 | - if (function_exists('imagesavealpha')) |
|
| 485 | - imagesavealpha($dst_img, true); |
|
| 492 | + if (function_exists('imagesavealpha')) { |
|
| 493 | + imagesavealpha($dst_img, true); |
|
| 494 | + } |
|
| 486 | 495 | } |
| 496 | + } else { |
|
| 497 | + $dst_img = imagecreate($dst_width, $dst_height); |
|
| 487 | 498 | } |
| 488 | - else |
|
| 489 | - $dst_img = imagecreate($dst_width, $dst_height); |
|
| 490 | 499 | |
| 491 | 500 | // Resize it! |
| 492 | - if ($gd2) |
|
| 493 | - imagecopyresampled($dst_img, $src_img, 0, 0, 0, 0, $dst_width, $dst_height, $src_width, $src_height); |
|
| 494 | - else |
|
| 495 | - imagecopyresamplebicubic($dst_img, $src_img, 0, 0, 0, 0, $dst_width, $dst_height, $src_width, $src_height); |
|
| 501 | + if ($gd2) { |
|
| 502 | + imagecopyresampled($dst_img, $src_img, 0, 0, 0, 0, $dst_width, $dst_height, $src_width, $src_height); |
|
| 503 | + } else { |
|
| 504 | + imagecopyresamplebicubic($dst_img, $src_img, 0, 0, 0, 0, $dst_width, $dst_height, $src_width, $src_height); |
|
| 505 | + } |
|
| 506 | + } else { |
|
| 507 | + $dst_img = $src_img; |
|
| 496 | 508 | } |
| 497 | - else |
|
| 498 | - $dst_img = $src_img; |
|
| 509 | + } else { |
|
| 510 | + $dst_img = $src_img; |
|
| 499 | 511 | } |
| 500 | - else |
|
| 501 | - $dst_img = $src_img; |
|
| 502 | 512 | |
| 503 | 513 | // Save the image as ... |
| 504 | - if (!empty($preferred_format) && ($preferred_format == 3) && function_exists('imagepng')) |
|
| 505 | - $success = imagepng($dst_img, $destName); |
|
| 506 | - elseif (!empty($preferred_format) && ($preferred_format == 1) && function_exists('imagegif')) |
|
| 507 | - $success = imagegif($dst_img, $destName); |
|
| 508 | - elseif (function_exists('imagejpeg')) |
|
| 509 | - $success = imagejpeg($dst_img, $destName, !empty($modSettings['avatar_jpeg_quality']) ? $modSettings['avatar_jpeg_quality'] : 82); |
|
| 514 | + if (!empty($preferred_format) && ($preferred_format == 3) && function_exists('imagepng')) { |
|
| 515 | + $success = imagepng($dst_img, $destName); |
|
| 516 | + } elseif (!empty($preferred_format) && ($preferred_format == 1) && function_exists('imagegif')) { |
|
| 517 | + $success = imagegif($dst_img, $destName); |
|
| 518 | + } elseif (function_exists('imagejpeg')) { |
|
| 519 | + $success = imagejpeg($dst_img, $destName, !empty($modSettings['avatar_jpeg_quality']) ? $modSettings['avatar_jpeg_quality'] : 82); |
|
| 520 | + } |
|
| 510 | 521 | |
| 511 | 522 | // Free the memory. |
| 512 | 523 | imagedestroy($src_img); |
| 513 | - if ($dst_img != $src_img) |
|
| 514 | - imagedestroy($dst_img); |
|
| 524 | + if ($dst_img != $src_img) { |
|
| 525 | + imagedestroy($dst_img); |
|
| 526 | + } |
|
| 515 | 527 | |
| 516 | 528 | return $success; |
| 517 | - } |
|
| 518 | - else |
|
| 519 | - // Without GD, no image resizing at all. |
|
| 529 | + } else { |
|
| 530 | + // Without GD, no image resizing at all. |
|
| 520 | 531 | return false; |
| 521 | -} |
|
| 532 | + } |
|
| 533 | + } |
|
| 522 | 534 | |
| 523 | 535 | /** |
| 524 | 536 | * Copy image. |
@@ -572,8 +584,9 @@ discard block |
||
| 572 | 584 | $color = imagecolorresolve($dst_img, $red, $green, $blue); |
| 573 | 585 | if ($color == -1) |
| 574 | 586 | { |
| 575 | - if ($palsize++ < 256) |
|
| 576 | - imagecolorallocate($dst_img, $red, $green, $blue); |
|
| 587 | + if ($palsize++ < 256) { |
|
| 588 | + imagecolorallocate($dst_img, $red, $green, $blue); |
|
| 589 | + } |
|
| 577 | 590 | $color = imagecolorclosest($dst_img, $red, $green, $blue); |
| 578 | 591 | } |
| 579 | 592 | |
@@ -603,13 +616,15 @@ discard block |
||
| 603 | 616 | $header = unpack('vtype/Vsize/Vreserved/Voffset', fread($fp, 14)); |
| 604 | 617 | $info = unpack('Vsize/Vwidth/Vheight/vplanes/vbits/Vcompression/Vimagesize/Vxres/Vyres/Vncolor/Vcolorimportant', fread($fp, 40)); |
| 605 | 618 | |
| 606 | - if ($header['type'] != 0x4D42) |
|
| 607 | - return false; |
|
| 619 | + if ($header['type'] != 0x4D42) { |
|
| 620 | + return false; |
|
| 621 | + } |
|
| 608 | 622 | |
| 609 | - if ($gd2) |
|
| 610 | - $dst_img = imagecreatetruecolor($info['width'], $info['height']); |
|
| 611 | - else |
|
| 612 | - $dst_img = imagecreate($info['width'], $info['height']); |
|
| 623 | + if ($gd2) { |
|
| 624 | + $dst_img = imagecreatetruecolor($info['width'], $info['height']); |
|
| 625 | + } else { |
|
| 626 | + $dst_img = imagecreate($info['width'], $info['height']); |
|
| 627 | + } |
|
| 613 | 628 | |
| 614 | 629 | $palette_size = $header['offset'] - 54; |
| 615 | 630 | $info['ncolor'] = $palette_size / 4; |
@@ -635,8 +650,9 @@ discard block |
||
| 635 | 650 | fseek($fp, $header['offset'] + ($scan_line_size + $scan_line_align) * $l); |
| 636 | 651 | $scan_line = fread($fp, $scan_line_size); |
| 637 | 652 | |
| 638 | - if (strlen($scan_line) < $scan_line_size) |
|
| 639 | - continue; |
|
| 653 | + if (strlen($scan_line) < $scan_line_size) { |
|
| 654 | + continue; |
|
| 655 | + } |
|
| 640 | 656 | |
| 641 | 657 | if ($info['bits'] == 32) |
| 642 | 658 | { |
@@ -654,14 +670,14 @@ discard block |
||
| 654 | 670 | $color = imagecolorallocate($dst_img, $r, $g, $b); |
| 655 | 671 | |
| 656 | 672 | // Gah! Out of colors? Stupid GD 1... try anyhow. |
| 657 | - if ($color == -1) |
|
| 658 | - $color = imagecolorclosest($dst_img, $r, $g, $b); |
|
| 673 | + if ($color == -1) { |
|
| 674 | + $color = imagecolorclosest($dst_img, $r, $g, $b); |
|
| 675 | + } |
|
| 659 | 676 | } |
| 660 | 677 | |
| 661 | 678 | imagesetpixel($dst_img, $x, $y, $color); |
| 662 | 679 | } |
| 663 | - } |
|
| 664 | - elseif ($info['bits'] == 24) |
|
| 680 | + } elseif ($info['bits'] == 24) |
|
| 665 | 681 | { |
| 666 | 682 | $x = 0; |
| 667 | 683 | for ($j = 0; $j < $scan_line_size; $x++) |
@@ -676,14 +692,14 @@ discard block |
||
| 676 | 692 | $color = imagecolorallocate($dst_img, $r, $g, $b); |
| 677 | 693 | |
| 678 | 694 | // Gah! Out of colors? Stupid GD 1... try anyhow. |
| 679 | - if ($color == -1) |
|
| 680 | - $color = imagecolorclosest($dst_img, $r, $g, $b); |
|
| 695 | + if ($color == -1) { |
|
| 696 | + $color = imagecolorclosest($dst_img, $r, $g, $b); |
|
| 697 | + } |
|
| 681 | 698 | } |
| 682 | 699 | |
| 683 | 700 | imagesetpixel($dst_img, $x, $y, $color); |
| 684 | 701 | } |
| 685 | - } |
|
| 686 | - elseif ($info['bits'] == 16) |
|
| 702 | + } elseif ($info['bits'] == 16) |
|
| 687 | 703 | { |
| 688 | 704 | $x = 0; |
| 689 | 705 | for ($j = 0; $j < $scan_line_size; $x++) |
@@ -704,20 +720,20 @@ discard block |
||
| 704 | 720 | $color = imagecolorallocate($dst_img, $r, $g, $b); |
| 705 | 721 | |
| 706 | 722 | // Gah! Out of colors? Stupid GD 1... try anyhow. |
| 707 | - if ($color == -1) |
|
| 708 | - $color = imagecolorclosest($dst_img, $r, $g, $b); |
|
| 723 | + if ($color == -1) { |
|
| 724 | + $color = imagecolorclosest($dst_img, $r, $g, $b); |
|
| 725 | + } |
|
| 709 | 726 | } |
| 710 | 727 | |
| 711 | 728 | imagesetpixel($dst_img, $x, $y, $color); |
| 712 | 729 | } |
| 713 | - } |
|
| 714 | - elseif ($info['bits'] == 8) |
|
| 730 | + } elseif ($info['bits'] == 8) |
|
| 715 | 731 | { |
| 716 | 732 | $x = 0; |
| 717 | - for ($j = 0; $j < $scan_line_size; $x++) |
|
| 718 | - imagesetpixel($dst_img, $x, $y, $palette[ord($scan_line{$j++})]); |
|
| 719 | - } |
|
| 720 | - elseif ($info['bits'] == 4) |
|
| 733 | + for ($j = 0; $j < $scan_line_size; $x++) { |
|
| 734 | + imagesetpixel($dst_img, $x, $y, $palette[ord($scan_line{$j++})]); |
|
| 735 | + } |
|
| 736 | + } elseif ($info['bits'] == 4) |
|
| 721 | 737 | { |
| 722 | 738 | $x = 0; |
| 723 | 739 | for ($j = 0; $j < $scan_line_size; $x++) |
@@ -726,11 +742,11 @@ discard block |
||
| 726 | 742 | |
| 727 | 743 | imagesetpixel($dst_img, $x, $y, $palette[(int) ($byte / 16)]); |
| 728 | 744 | |
| 729 | - if (++$x < $info['width']) |
|
| 730 | - imagesetpixel($dst_img, $x, $y, $palette[$byte & 15]); |
|
| 745 | + if (++$x < $info['width']) { |
|
| 746 | + imagesetpixel($dst_img, $x, $y, $palette[$byte & 15]); |
|
| 747 | + } |
|
| 731 | 748 | } |
| 732 | - } |
|
| 733 | - elseif ($info['bits'] == 1) |
|
| 749 | + } elseif ($info['bits'] == 1) |
|
| 734 | 750 | { |
| 735 | 751 | $x = 0; |
| 736 | 752 | for ($j = 0; $j < $scan_line_size; $x++) |
@@ -741,8 +757,9 @@ discard block |
||
| 741 | 757 | |
| 742 | 758 | for ($shift = 1; $shift < 8; $shift++) |
| 743 | 759 | { |
| 744 | - if (++$x < $info['width']) |
|
| 745 | - imagesetpixel($dst_img, $x, $y, $palette[(($byte << $shift) & 128) != 0]); |
|
| 760 | + if (++$x < $info['width']) { |
|
| 761 | + imagesetpixel($dst_img, $x, $y, $palette[(($byte << $shift) & 128) != 0]); |
|
| 762 | + } |
|
| 746 | 763 | } |
| 747 | 764 | } |
| 748 | 765 | } |
@@ -766,15 +783,18 @@ discard block |
||
| 766 | 783 | */ |
| 767 | 784 | function gif_outputAsPng($gif, $lpszFileName, $background_color = -1) |
| 768 | 785 | { |
| 769 | - if (!isset($gif) || @get_class($gif) != 'cgif' || !$gif->loaded || $lpszFileName == '') |
|
| 770 | - return false; |
|
| 786 | + if (!isset($gif) || @get_class($gif) != 'cgif' || !$gif->loaded || $lpszFileName == '') { |
|
| 787 | + return false; |
|
| 788 | + } |
|
| 771 | 789 | |
| 772 | 790 | $fd = $gif->get_png_data($background_color); |
| 773 | - if (strlen($fd) <= 0) |
|
| 774 | - return false; |
|
| 791 | + if (strlen($fd) <= 0) { |
|
| 792 | + return false; |
|
| 793 | + } |
|
| 775 | 794 | |
| 776 | - if (!($fh = @fopen($lpszFileName, 'wb'))) |
|
| 777 | - return false; |
|
| 795 | + if (!($fh = @fopen($lpszFileName, 'wb'))) { |
|
| 796 | + return false; |
|
| 797 | + } |
|
| 778 | 798 | |
| 779 | 799 | @fwrite($fh, $fd, strlen($fd)); |
| 780 | 800 | @fflush($fh); |
@@ -801,8 +821,9 @@ discard block |
||
| 801 | 821 | // What type are we going to be doing? |
| 802 | 822 | $imageType = $modSettings['visual_verification_type']; |
| 803 | 823 | // Special case to allow the admin center to show samples. |
| 804 | - if ($user_info['is_admin'] && isset($_GET['type'])) |
|
| 805 | - $imageType = (int) $_GET['type']; |
|
| 824 | + if ($user_info['is_admin'] && isset($_GET['type'])) { |
|
| 825 | + $imageType = (int) $_GET['type']; |
|
| 826 | + } |
|
| 806 | 827 | |
| 807 | 828 | // Some quick references for what we do. |
| 808 | 829 | // Do we show no, low or high noise? |
@@ -836,25 +857,28 @@ discard block |
||
| 836 | 857 | $character_spacing = 1; |
| 837 | 858 | |
| 838 | 859 | // What color is the background - generally white unless we're on "hard". |
| 839 | - if ($simpleBGColor) |
|
| 840 | - $background_color = array(255, 255, 255); |
|
| 841 | - else |
|
| 842 | - $background_color = isset($settings['verification_background']) ? $settings['verification_background'] : array(236, 237, 243); |
|
| 860 | + if ($simpleBGColor) { |
|
| 861 | + $background_color = array(255, 255, 255); |
|
| 862 | + } else { |
|
| 863 | + $background_color = isset($settings['verification_background']) ? $settings['verification_background'] : array(236, 237, 243); |
|
| 864 | + } |
|
| 843 | 865 | |
| 844 | 866 | // The color of the characters shown (red, green, blue). |
| 845 | - if ($simpleFGColor) |
|
| 846 | - $foreground_color = array(0, 0, 0); |
|
| 847 | - else |
|
| 867 | + if ($simpleFGColor) { |
|
| 868 | + $foreground_color = array(0, 0, 0); |
|
| 869 | + } else |
|
| 848 | 870 | { |
| 849 | 871 | $foreground_color = array(64, 101, 136); |
| 850 | 872 | |
| 851 | 873 | // Has the theme author requested a custom color? |
| 852 | - if (isset($settings['verification_foreground'])) |
|
| 853 | - $foreground_color = $settings['verification_foreground']; |
|
| 874 | + if (isset($settings['verification_foreground'])) { |
|
| 875 | + $foreground_color = $settings['verification_foreground']; |
|
| 876 | + } |
|
| 854 | 877 | } |
| 855 | 878 | |
| 856 | - if (!is_dir($settings['default_theme_dir'] . '/fonts')) |
|
| 857 | - return false; |
|
| 879 | + if (!is_dir($settings['default_theme_dir'] . '/fonts')) { |
|
| 880 | + return false; |
|
| 881 | + } |
|
| 858 | 882 | |
| 859 | 883 | // Get a list of the available fonts. |
| 860 | 884 | $font_dir = dir($settings['default_theme_dir'] . '/fonts'); |
@@ -865,25 +889,28 @@ discard block |
||
| 865 | 889 | { |
| 866 | 890 | if (preg_match('~^(.+)\.gdf$~', $entry, $matches) === 1) |
| 867 | 891 | { |
| 868 | - if ($endian ^ (strpos($entry, '_end.gdf') === false)) |
|
| 869 | - $font_list[] = $entry; |
|
| 892 | + if ($endian ^ (strpos($entry, '_end.gdf') === false)) { |
|
| 893 | + $font_list[] = $entry; |
|
| 894 | + } |
|
| 895 | + } elseif (preg_match('~^(.+)\.ttf$~', $entry, $matches) === 1) { |
|
| 896 | + $ttfont_list[] = $entry; |
|
| 870 | 897 | } |
| 871 | - elseif (preg_match('~^(.+)\.ttf$~', $entry, $matches) === 1) |
|
| 872 | - $ttfont_list[] = $entry; |
|
| 873 | 898 | } |
| 874 | 899 | |
| 875 | - if (empty($font_list)) |
|
| 876 | - return false; |
|
| 900 | + if (empty($font_list)) { |
|
| 901 | + return false; |
|
| 902 | + } |
|
| 877 | 903 | |
| 878 | 904 | // For non-hard things don't even change fonts. |
| 879 | 905 | if (!$varyFonts) |
| 880 | 906 | { |
| 881 | 907 | $font_list = array($font_list[0]); |
| 882 | 908 | // Try use Screenge if we can - it looks good! |
| 883 | - if (in_array('AnonymousPro.ttf', $ttfont_list)) |
|
| 884 | - $ttfont_list = array('AnonymousPro.ttf'); |
|
| 885 | - else |
|
| 886 | - $ttfont_list = empty($ttfont_list) ? array() : array($ttfont_list[0]); |
|
| 909 | + if (in_array('AnonymousPro.ttf', $ttfont_list)) { |
|
| 910 | + $ttfont_list = array('AnonymousPro.ttf'); |
|
| 911 | + } else { |
|
| 912 | + $ttfont_list = empty($ttfont_list) ? array() : array($ttfont_list[0]); |
|
| 913 | + } |
|
| 887 | 914 | } |
| 888 | 915 | |
| 889 | 916 | // Create a list of characters to be shown. |
@@ -900,14 +927,16 @@ discard block |
||
| 900 | 927 | } |
| 901 | 928 | |
| 902 | 929 | // Load all fonts and determine the maximum font height. |
| 903 | - foreach ($loaded_fonts as $font_index => $dummy) |
|
| 904 | - $loaded_fonts[$font_index] = imageloadfont($settings['default_theme_dir'] . '/fonts/' . $font_list[$font_index]); |
|
| 930 | + foreach ($loaded_fonts as $font_index => $dummy) { |
|
| 931 | + $loaded_fonts[$font_index] = imageloadfont($settings['default_theme_dir'] . '/fonts/' . $font_list[$font_index]); |
|
| 932 | + } |
|
| 905 | 933 | |
| 906 | 934 | // Determine the dimensions of each character. |
| 907 | - if ($imageType == 4 || $imageType == 5) |
|
| 908 | - $extra = 80; |
|
| 909 | - else |
|
| 910 | - $extra = 45; |
|
| 935 | + if ($imageType == 4 || $imageType == 5) { |
|
| 936 | + $extra = 80; |
|
| 937 | + } else { |
|
| 938 | + $extra = 45; |
|
| 939 | + } |
|
| 911 | 940 | |
| 912 | 941 | $total_width = $character_spacing * strlen($code) + $extra; |
| 913 | 942 | $max_height = 0; |
@@ -928,13 +957,15 @@ discard block |
||
| 928 | 957 | imagefilledrectangle($code_image, 0, 0, $total_width - 1, $max_height - 1, $bg_color); |
| 929 | 958 | |
| 930 | 959 | // Randomize the foreground color a little. |
| 931 | - for ($i = 0; $i < 3; $i++) |
|
| 932 | - $foreground_color[$i] = mt_rand(max($foreground_color[$i] - 3, 0), min($foreground_color[$i] + 3, 255)); |
|
| 960 | + for ($i = 0; $i < 3; $i++) { |
|
| 961 | + $foreground_color[$i] = mt_rand(max($foreground_color[$i] - 3, 0), min($foreground_color[$i] + 3, 255)); |
|
| 962 | + } |
|
| 933 | 963 | $fg_color = imagecolorallocate($code_image, $foreground_color[0], $foreground_color[1], $foreground_color[2]); |
| 934 | 964 | |
| 935 | 965 | // Color for the dots. |
| 936 | - for ($i = 0; $i < 3; $i++) |
|
| 937 | - $dotbgcolor[$i] = $background_color[$i] < $foreground_color[$i] ? mt_rand(0, max($foreground_color[$i] - 20, 0)) : mt_rand(min($foreground_color[$i] + 20, 255), 255); |
|
| 966 | + for ($i = 0; $i < 3; $i++) { |
|
| 967 | + $dotbgcolor[$i] = $background_color[$i] < $foreground_color[$i] ? mt_rand(0, max($foreground_color[$i] - 20, 0)) : mt_rand(min($foreground_color[$i] + 20, 255), 255); |
|
| 968 | + } |
|
| 938 | 969 | $randomness_color = imagecolorallocate($code_image, $dotbgcolor[0], $dotbgcolor[1], $dotbgcolor[2]); |
| 939 | 970 | |
| 940 | 971 | // Some squares/rectanges for new extreme level |
@@ -960,10 +991,11 @@ discard block |
||
| 960 | 991 | $can_do_ttf = function_exists('imagettftext'); |
| 961 | 992 | |
| 962 | 993 | // How much rotation will we give? |
| 963 | - if ($rotationType == 'none') |
|
| 964 | - $angle = 0; |
|
| 965 | - else |
|
| 966 | - $angle = mt_rand(-100, 100) / ($rotationType == 'high' ? 6 : 10); |
|
| 994 | + if ($rotationType == 'none') { |
|
| 995 | + $angle = 0; |
|
| 996 | + } else { |
|
| 997 | + $angle = mt_rand(-100, 100) / ($rotationType == 'high' ? 6 : 10); |
|
| 998 | + } |
|
| 967 | 999 | |
| 968 | 1000 | // What color shall we do it? |
| 969 | 1001 | if ($fontColorType == 'cyclic') |
@@ -977,51 +1009,56 @@ discard block |
||
| 977 | 1009 | array(0, 0, 0), |
| 978 | 1010 | array(143, 39, 31), |
| 979 | 1011 | ); |
| 980 | - if (!isset($last_index)) |
|
| 981 | - $last_index = -1; |
|
| 1012 | + if (!isset($last_index)) { |
|
| 1013 | + $last_index = -1; |
|
| 1014 | + } |
|
| 982 | 1015 | $new_index = $last_index; |
| 983 | - while ($last_index == $new_index) |
|
| 984 | - $new_index = mt_rand(0, count($colors) - 1); |
|
| 1016 | + while ($last_index == $new_index) { |
|
| 1017 | + $new_index = mt_rand(0, count($colors) - 1); |
|
| 1018 | + } |
|
| 985 | 1019 | $char_fg_color = $colors[$new_index]; |
| 986 | 1020 | $last_index = $new_index; |
| 1021 | + } elseif ($fontColorType == 'random') { |
|
| 1022 | + $char_fg_color = array(mt_rand(max($foreground_color[0] - 2, 0), $foreground_color[0]), mt_rand(max($foreground_color[1] - 2, 0), $foreground_color[1]), mt_rand(max($foreground_color[2] - 2, 0), $foreground_color[2])); |
|
| 1023 | + } else { |
|
| 1024 | + $char_fg_color = array($foreground_color[0], $foreground_color[1], $foreground_color[2]); |
|
| 987 | 1025 | } |
| 988 | - elseif ($fontColorType == 'random') |
|
| 989 | - $char_fg_color = array(mt_rand(max($foreground_color[0] - 2, 0), $foreground_color[0]), mt_rand(max($foreground_color[1] - 2, 0), $foreground_color[1]), mt_rand(max($foreground_color[2] - 2, 0), $foreground_color[2])); |
|
| 990 | - else |
|
| 991 | - $char_fg_color = array($foreground_color[0], $foreground_color[1], $foreground_color[2]); |
|
| 992 | 1026 | |
| 993 | 1027 | if (!empty($can_do_ttf)) |
| 994 | 1028 | { |
| 995 | 1029 | // GD2 handles font size differently. |
| 996 | - if ($fontSizeRandom) |
|
| 997 | - $font_size = $gd2 ? mt_rand(17, 19) : mt_rand(18, 25); |
|
| 998 | - else |
|
| 999 | - $font_size = $gd2 ? 18 : 24; |
|
| 1030 | + if ($fontSizeRandom) { |
|
| 1031 | + $font_size = $gd2 ? mt_rand(17, 19) : mt_rand(18, 25); |
|
| 1032 | + } else { |
|
| 1033 | + $font_size = $gd2 ? 18 : 24; |
|
| 1034 | + } |
|
| 1000 | 1035 | |
| 1001 | 1036 | // Work out the sizes - also fix the character width cause TTF not quite so wide! |
| 1002 | 1037 | $font_x = $fontHorSpace == 'minus' && $cur_x > 0 ? $cur_x - 3 : $cur_x + 5; |
| 1003 | 1038 | $font_y = $max_height - ($fontVerPos == 'vrandom' ? mt_rand(2, 8) : ($fontVerPos == 'random' ? mt_rand(3, 5) : 5)); |
| 1004 | 1039 | |
| 1005 | 1040 | // What font face? |
| 1006 | - if (!empty($ttfont_list)) |
|
| 1007 | - $fontface = $settings['default_theme_dir'] . '/fonts/' . $ttfont_list[mt_rand(0, count($ttfont_list) - 1)]; |
|
| 1041 | + if (!empty($ttfont_list)) { |
|
| 1042 | + $fontface = $settings['default_theme_dir'] . '/fonts/' . $ttfont_list[mt_rand(0, count($ttfont_list) - 1)]; |
|
| 1043 | + } |
|
| 1008 | 1044 | |
| 1009 | 1045 | // What color are we to do it in? |
| 1010 | 1046 | $is_reverse = $showReverseChars ? mt_rand(0, 1) : false; |
| 1011 | 1047 | $char_color = function_exists('imagecolorallocatealpha') && $fontTrans ? imagecolorallocatealpha($code_image, $char_fg_color[0], $char_fg_color[1], $char_fg_color[2], 50) : imagecolorallocate($code_image, $char_fg_color[0], $char_fg_color[1], $char_fg_color[2]); |
| 1012 | 1048 | |
| 1013 | 1049 | $fontcord = @imagettftext($code_image, $font_size, $angle, $font_x, $font_y, $char_color, $fontface, $character['id']); |
| 1014 | - if (empty($fontcord)) |
|
| 1015 | - $can_do_ttf = false; |
|
| 1016 | - elseif ($is_reverse) |
|
| 1050 | + if (empty($fontcord)) { |
|
| 1051 | + $can_do_ttf = false; |
|
| 1052 | + } elseif ($is_reverse) |
|
| 1017 | 1053 | { |
| 1018 | 1054 | imagefilledpolygon($code_image, $fontcord, 4, $fg_color); |
| 1019 | 1055 | // Put the character back! |
| 1020 | 1056 | imagettftext($code_image, $font_size, $angle, $font_x, $font_y, $randomness_color, $fontface, $character['id']); |
| 1021 | 1057 | } |
| 1022 | 1058 | |
| 1023 | - if ($can_do_ttf) |
|
| 1024 | - $cur_x = max($fontcord[2], $fontcord[4]) + ($angle == 0 ? 0 : 3); |
|
| 1059 | + if ($can_do_ttf) { |
|
| 1060 | + $cur_x = max($fontcord[2], $fontcord[4]) + ($angle == 0 ? 0 : 3); |
|
| 1061 | + } |
|
| 1025 | 1062 | } |
| 1026 | 1063 | |
| 1027 | 1064 | if (!$can_do_ttf) |
@@ -1040,8 +1077,9 @@ discard block |
||
| 1040 | 1077 | } |
| 1041 | 1078 | |
| 1042 | 1079 | // Sorry, no rotation available. |
| 1043 | - else |
|
| 1044 | - imagechar($code_image, $loaded_fonts[$character['font']], $cur_x, floor(($max_height - $character['height']) / 2), $character['id'], imagecolorallocate($code_image, $char_fg_color[0], $char_fg_color[1], $char_fg_color[2])); |
|
| 1080 | + else { |
|
| 1081 | + imagechar($code_image, $loaded_fonts[$character['font']], $cur_x, floor(($max_height - $character['height']) / 2), $character['id'], imagecolorallocate($code_image, $char_fg_color[0], $char_fg_color[1], $char_fg_color[2])); |
|
| 1082 | + } |
|
| 1045 | 1083 | $cur_x += $character['width'] + $character_spacing; |
| 1046 | 1084 | } |
| 1047 | 1085 | } |
@@ -1054,17 +1092,22 @@ discard block |
||
| 1054 | 1092 | } |
| 1055 | 1093 | |
| 1056 | 1094 | // Make the background color transparent on the hard image. |
| 1057 | - if (!$simpleBGColor) |
|
| 1058 | - imagecolortransparent($code_image, $bg_color); |
|
| 1059 | - if ($hasBorder) |
|
| 1060 | - imagerectangle($code_image, 0, 0, $total_width - 1, $max_height - 1, $fg_color); |
|
| 1095 | + if (!$simpleBGColor) { |
|
| 1096 | + imagecolortransparent($code_image, $bg_color); |
|
| 1097 | + } |
|
| 1098 | + if ($hasBorder) { |
|
| 1099 | + imagerectangle($code_image, 0, 0, $total_width - 1, $max_height - 1, $fg_color); |
|
| 1100 | + } |
|
| 1061 | 1101 | |
| 1062 | 1102 | // Add some noise to the background? |
| 1063 | 1103 | if ($noiseType != 'none') |
| 1064 | 1104 | { |
| 1065 | - for ($i = mt_rand(0, 2); $i < $max_height; $i += mt_rand(1, 2)) |
|
| 1066 | - for ($j = mt_rand(0, 10); $j < $total_width; $j += mt_rand(1, 10)) |
|
| 1067 | - imagesetpixel($code_image, $j, $i, mt_rand(0, 1) ? $fg_color : $randomness_color); |
|
| 1105 | + for ($i = mt_rand(0, 2); $i < $max_height; $i += mt_rand(1, 2)) { |
|
| 1106 | + for ($j = mt_rand(0, 10); |
|
| 1107 | + } |
|
| 1108 | + $j < $total_width; $j += mt_rand(1, 10)) { |
|
| 1109 | + imagesetpixel($code_image, $j, $i, mt_rand(0, 1) ? $fg_color : $randomness_color); |
|
| 1110 | + } |
|
| 1068 | 1111 | |
| 1069 | 1112 | // Put in some lines too? |
| 1070 | 1113 | if ($noiseType != 'extreme') |
@@ -1077,8 +1120,7 @@ discard block |
||
| 1077 | 1120 | $x1 = mt_rand(0, $total_width); |
| 1078 | 1121 | $x2 = mt_rand(0, $total_width); |
| 1079 | 1122 | $y1 = 0; $y2 = $max_height; |
| 1080 | - } |
|
| 1081 | - else |
|
| 1123 | + } else |
|
| 1082 | 1124 | { |
| 1083 | 1125 | $y1 = mt_rand(0, $max_height); |
| 1084 | 1126 | $y2 = mt_rand(0, $max_height); |
@@ -1087,8 +1129,7 @@ discard block |
||
| 1087 | 1129 | imagesetthickness($code_image, mt_rand(1, 2)); |
| 1088 | 1130 | imageline($code_image, $x1, $y1, $x2, $y2, mt_rand(0, 1) ? $fg_color : $randomness_color); |
| 1089 | 1131 | } |
| 1090 | - } |
|
| 1091 | - else |
|
| 1132 | + } else |
|
| 1092 | 1133 | { |
| 1093 | 1134 | // Put in some ellipse |
| 1094 | 1135 | $num_ellipse = $noiseType == 'extreme' ? mt_rand(6, 12) : mt_rand(2, 6); |
@@ -1108,8 +1149,7 @@ discard block |
||
| 1108 | 1149 | { |
| 1109 | 1150 | header('content-type: image/gif'); |
| 1110 | 1151 | imagegif($code_image); |
| 1111 | - } |
|
| 1112 | - else |
|
| 1152 | + } else |
|
| 1113 | 1153 | { |
| 1114 | 1154 | header('content-type: image/png'); |
| 1115 | 1155 | imagepng($code_image); |
@@ -1132,25 +1172,29 @@ discard block |
||
| 1132 | 1172 | { |
| 1133 | 1173 | global $settings; |
| 1134 | 1174 | |
| 1135 | - if (!is_dir($settings['default_theme_dir'] . '/fonts')) |
|
| 1136 | - return false; |
|
| 1175 | + if (!is_dir($settings['default_theme_dir'] . '/fonts')) { |
|
| 1176 | + return false; |
|
| 1177 | + } |
|
| 1137 | 1178 | |
| 1138 | 1179 | // Get a list of the available font directories. |
| 1139 | 1180 | $font_dir = dir($settings['default_theme_dir'] . '/fonts'); |
| 1140 | 1181 | $font_list = array(); |
| 1141 | - while ($entry = $font_dir->read()) |
|
| 1142 | - if ($entry[0] !== '.' && is_dir($settings['default_theme_dir'] . '/fonts/' . $entry) && file_exists($settings['default_theme_dir'] . '/fonts/' . $entry . '.gdf')) |
|
| 1182 | + while ($entry = $font_dir->read()) { |
|
| 1183 | + if ($entry[0] !== '.' && is_dir($settings['default_theme_dir'] . '/fonts/' . $entry) && file_exists($settings['default_theme_dir'] . '/fonts/' . $entry . '.gdf')) |
|
| 1143 | 1184 | $font_list[] = $entry; |
| 1185 | + } |
|
| 1144 | 1186 | |
| 1145 | - if (empty($font_list)) |
|
| 1146 | - return false; |
|
| 1187 | + if (empty($font_list)) { |
|
| 1188 | + return false; |
|
| 1189 | + } |
|
| 1147 | 1190 | |
| 1148 | 1191 | // Pick a random font. |
| 1149 | 1192 | $random_font = $font_list[array_rand($font_list)]; |
| 1150 | 1193 | |
| 1151 | 1194 | // Check if the given letter exists. |
| 1152 | - if (!file_exists($settings['default_theme_dir'] . '/fonts/' . $random_font . '/' . $letter . '.png')) |
|
| 1153 | - return false; |
|
| 1195 | + if (!file_exists($settings['default_theme_dir'] . '/fonts/' . $random_font . '/' . $letter . '.png')) { |
|
| 1196 | + return false; |
|
| 1197 | + } |
|
| 1154 | 1198 | |
| 1155 | 1199 | // Include it! |
| 1156 | 1200 | header('content-type: image/png'); |
@@ -51,34 +51,38 @@ discard block |
||
| 51 | 51 | $ignored_members = explode(',', $row['pm_ignore_list']); |
| 52 | 52 | |
| 53 | 53 | // If the user is in group 1 anywhere, they can see everything anyway. |
| 54 | - if (in_array(1, $groups) || count(array_intersect($allowed, $groups)) != 0) |
|
| 55 | - $author = $row['id_member']; |
|
| 54 | + if (in_array(1, $groups) || count(array_intersect($allowed, $groups)) != 0) { |
|
| 55 | + $author = $row['id_member']; |
|
| 56 | + } |
|
| 56 | 57 | } |
| 57 | 58 | $smcFunc['db_free_result']($request); |
| 58 | - } |
|
| 59 | - else |
|
| 59 | + } else |
|
| 60 | 60 | { |
| 61 | 61 | // This isn't something we know natively how to support. Call the hooks, if they're dealing with it, return false, otherwise return the user id. |
| 62 | 62 | $hook_results = call_integration_hook('integrate_find_like_author', array($this->_details['content_type'], $this->_details['content_id'])); |
| 63 | - foreach ($hook_results as $result) |
|
| 64 | - if (!empty($result)) |
|
| 63 | + foreach ($hook_results as $result) { |
|
| 64 | + if (!empty($result)) |
|
| 65 | 65 | { |
| 66 | 66 | $author = $result; |
| 67 | + } |
|
| 67 | 68 | break; |
| 68 | 69 | } |
| 69 | 70 | } |
| 70 | 71 | |
| 71 | 72 | // If we didn't have a member... leave. |
| 72 | - if (empty($author)) |
|
| 73 | - return true; |
|
| 73 | + if (empty($author)) { |
|
| 74 | + return true; |
|
| 75 | + } |
|
| 74 | 76 | |
| 75 | 77 | // If the person who sent the notification is the person whose content it is, do nothing. |
| 76 | - if ($author == $this->_details['sender_id']) |
|
| 77 | - return true; |
|
| 78 | + if ($author == $this->_details['sender_id']) { |
|
| 79 | + return true; |
|
| 80 | + } |
|
| 78 | 81 | |
| 79 | 82 | // If the person who sent the notification is on this person's ignore list, do nothing. |
| 80 | - if (!empty($ignored_members) && in_array($this->_details['sender_id'], $ignored_members)) |
|
| 81 | - return true; |
|
| 83 | + if (!empty($ignored_members) && in_array($this->_details['sender_id'], $ignored_members)) { |
|
| 84 | + return true; |
|
| 85 | + } |
|
| 82 | 86 | |
| 83 | 87 | require_once($sourcedir . '/Subs-Notify.php'); |
| 84 | 88 | $prefs = getNotifyPrefs($author, $this->_details['content_type'] . '_like', true); |
@@ -87,8 +91,9 @@ discard block |
||
| 87 | 91 | // As a result, the value should really just be non empty. |
| 88 | 92 | |
| 89 | 93 | // Check the value. If no value or it's empty, they didn't want alerts, oh well. |
| 90 | - if (empty($prefs[$author][$this->_details['content_type'] . '_like'])) |
|
| 91 | - return true; |
|
| 94 | + if (empty($prefs[$author][$this->_details['content_type'] . '_like'])) { |
|
| 95 | + return true; |
|
| 96 | + } |
|
| 92 | 97 | |
| 93 | 98 | // Don't spam the alerts: if there is an existing unread alert of the |
| 94 | 99 | // requested type for the target user from the sender, don't make a new one. |
@@ -108,8 +113,9 @@ discard block |
||
| 108 | 113 | ) |
| 109 | 114 | ); |
| 110 | 115 | |
| 111 | - if ($smcFunc['db_num_rows']($request) > 0) |
|
| 112 | - return true; |
|
| 116 | + if ($smcFunc['db_num_rows']($request) > 0) { |
|
| 117 | + return true; |
|
| 118 | + } |
|
| 113 | 119 | $smcFunc['db_free_result']($request); |
| 114 | 120 | |
| 115 | 121 | // Issue, update, move on. |
@@ -14,8 +14,9 @@ discard block |
||
| 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 | * Shows a listing of registered members. |
@@ -110,8 +111,9 @@ discard block |
||
| 110 | 111 | |
| 111 | 112 | $context['custom_profile_fields'] = getCustFieldsMList(); |
| 112 | 113 | |
| 113 | - if (!empty($context['custom_profile_fields']['columns'])) |
|
| 114 | - $context['columns'] += $context['custom_profile_fields']['columns']; |
|
| 114 | + if (!empty($context['custom_profile_fields']['columns'])) { |
|
| 115 | + $context['columns'] += $context['custom_profile_fields']['columns']; |
|
| 116 | + } |
|
| 115 | 117 | |
| 116 | 118 | $context['colspan'] = 0; |
| 117 | 119 | $context['disabled_fields'] = isset($modSettings['disabled_profile_fields']) ? array_flip(explode(',', $modSettings['disabled_profile_fields'])) : array(); |
@@ -147,12 +149,12 @@ discard block |
||
| 147 | 149 | call_integration_hook('integrate_memberlist_buttons'); |
| 148 | 150 | |
| 149 | 151 | // Jump to the sub action. |
| 150 | - if (isset($subActions[$context['listing_by']])) |
|
| 151 | - call_helper($subActions[$context['listing_by']][1]); |
|
| 152 | - |
|
| 153 | - else |
|
| 154 | - call_helper($subActions['all'][1]); |
|
| 155 | -} |
|
| 152 | + if (isset($subActions[$context['listing_by']])) { |
|
| 153 | + call_helper($subActions[$context['listing_by']][1]); |
|
| 154 | + } else { |
|
| 155 | + call_helper($subActions['all'][1]); |
|
| 156 | + } |
|
| 157 | + } |
|
| 156 | 158 | |
| 157 | 159 | /** |
| 158 | 160 | * List all members, page by page, with sorting. |
@@ -177,8 +179,9 @@ discard block |
||
| 177 | 179 | if ($use_cache) |
| 178 | 180 | { |
| 179 | 181 | // Maybe there's something cached already. |
| 180 | - if (!empty($modSettings['memberlist_cache'])) |
|
| 181 | - $memberlist_cache = $smcFunc['json_decode']($modSettings['memberlist_cache'], true); |
|
| 182 | + if (!empty($modSettings['memberlist_cache'])) { |
|
| 183 | + $memberlist_cache = $smcFunc['json_decode']($modSettings['memberlist_cache'], true); |
|
| 184 | + } |
|
| 182 | 185 | |
| 183 | 186 | // The chunk size for the cached index. |
| 184 | 187 | $cache_step_size = 500; |
@@ -234,13 +237,15 @@ discard block |
||
| 234 | 237 | } |
| 235 | 238 | |
| 236 | 239 | // Set defaults for sort (real_name) and start. (0) |
| 237 | - if (!isset($_REQUEST['sort']) || !isset($context['columns'][$_REQUEST['sort']])) |
|
| 238 | - $_REQUEST['sort'] = 'real_name'; |
|
| 240 | + if (!isset($_REQUEST['sort']) || !isset($context['columns'][$_REQUEST['sort']])) { |
|
| 241 | + $_REQUEST['sort'] = 'real_name'; |
|
| 242 | + } |
|
| 239 | 243 | |
| 240 | 244 | if (!is_numeric($_REQUEST['start'])) |
| 241 | 245 | { |
| 242 | - if (preg_match('~^[^\'\\\\/]~' . ($context['utf8'] ? 'u' : ''), $smcFunc['strtolower']($_REQUEST['start']), $match) === 0) |
|
| 243 | - fatal_error('Hacker?', false); |
|
| 246 | + if (preg_match('~^[^\'\\\\/]~' . ($context['utf8'] ? 'u' : ''), $smcFunc['strtolower']($_REQUEST['start']), $match) === 0) { |
|
| 247 | + fatal_error('Hacker?', false); |
|
| 248 | + } |
|
| 244 | 249 | |
| 245 | 250 | $_REQUEST['start'] = $match[0]; |
| 246 | 251 | |
@@ -259,16 +264,18 @@ discard block |
||
| 259 | 264 | } |
| 260 | 265 | |
| 261 | 266 | $context['letter_links'] = ''; |
| 262 | - for ($i = 97; $i < 123; $i++) |
|
| 263 | - $context['letter_links'] .= '<a href="' . $scripturl . '?action=mlist;sa=all;start=' . chr($i) . '#letter' . chr($i) . '">' . strtoupper(chr($i)) . '</a> '; |
|
| 267 | + for ($i = 97; $i < 123; $i++) { |
|
| 268 | + $context['letter_links'] .= '<a href="' . $scripturl . '?action=mlist;sa=all;start=' . chr($i) . '#letter' . chr($i) . '">' . strtoupper(chr($i)) . '</a> '; |
|
| 269 | + } |
|
| 264 | 270 | |
| 265 | 271 | // Sort out the column information. |
| 266 | 272 | foreach ($context['columns'] as $col => $column_details) |
| 267 | 273 | { |
| 268 | 274 | $context['columns'][$col]['href'] = $scripturl . '?action=mlist;sort=' . $col . ';start=0'; |
| 269 | 275 | |
| 270 | - if ((!isset($_REQUEST['desc']) && $col == $_REQUEST['sort']) || ($col != $_REQUEST['sort'] && !empty($column_details['default_sort_rev']))) |
|
| 271 | - $context['columns'][$col]['href'] .= ';desc'; |
|
| 276 | + if ((!isset($_REQUEST['desc']) && $col == $_REQUEST['sort']) || ($col != $_REQUEST['sort'] && !empty($column_details['default_sort_rev']))) { |
|
| 277 | + $context['columns'][$col]['href'] .= ';desc'; |
|
| 278 | + } |
|
| 272 | 279 | |
| 273 | 280 | $context['columns'][$col]['link'] = '<a href="' . $context['columns'][$col]['href'] . '" rel="nofollow">' . $context['columns'][$col]['label'] . '</a>'; |
| 274 | 281 | $context['columns'][$col]['selected'] = $_REQUEST['sort'] == $col; |
@@ -317,8 +324,9 @@ discard block |
||
| 317 | 324 | elseif ($use_cache && $_REQUEST['sort'] === 'real_name') |
| 318 | 325 | { |
| 319 | 326 | $first_offset = floor(($memberlist_cache['num_members'] - $modSettings['defaultMaxMembers'] - $_REQUEST['start']) / $cache_step_size) * $cache_step_size; |
| 320 | - if ($first_offset < 0) |
|
| 321 | - $first_offset = 0; |
|
| 327 | + if ($first_offset < 0) { |
|
| 328 | + $first_offset = 0; |
|
| 329 | + } |
|
| 322 | 330 | $second_offset = ceil(($memberlist_cache['num_members'] - $_REQUEST['start']) / $cache_step_size) * $cache_step_size; |
| 323 | 331 | |
| 324 | 332 | $where = 'mem.real_name BETWEEN {string:real_name_low} AND {string:real_name_high}'; |
@@ -328,8 +336,9 @@ discard block |
||
| 328 | 336 | } |
| 329 | 337 | |
| 330 | 338 | $custom_fields_qry = ''; |
| 331 | - if (!empty($context['custom_profile_fields']['join'][$_REQUEST['sort']])) |
|
| 332 | - $custom_fields_qry = $context['custom_profile_fields']['join'][$_REQUEST['sort']]; |
|
| 339 | + if (!empty($context['custom_profile_fields']['join'][$_REQUEST['sort']])) { |
|
| 340 | + $custom_fields_qry = $context['custom_profile_fields']['join'][$_REQUEST['sort']]; |
|
| 341 | + } |
|
| 333 | 342 | |
| 334 | 343 | // Select the members from the database. |
| 335 | 344 | $request = $smcFunc['db_query']('', ' |
@@ -399,12 +408,13 @@ discard block |
||
| 399 | 408 | ) |
| 400 | 409 | ); |
| 401 | 410 | $context['custom_search_fields'] = array(); |
| 402 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
| 403 | - $context['custom_search_fields'][$row['col_name']] = array( |
|
| 411 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
| 412 | + $context['custom_search_fields'][$row['col_name']] = array( |
|
| 404 | 413 | 'colname' => $row['col_name'], |
| 405 | 414 | 'name' => $row['field_name'], |
| 406 | 415 | 'desc' => $row['field_desc'], |
| 407 | 416 | ); |
| 417 | + } |
|
| 408 | 418 | $smcFunc['db_free_result']($request); |
| 409 | 419 | |
| 410 | 420 | // They're searching.. |
@@ -417,23 +427,27 @@ discard block |
||
| 417 | 427 | $context['old_search_value'] = urlencode($_REQUEST['search']); |
| 418 | 428 | |
| 419 | 429 | // No fields? Use default... |
| 420 | - if (empty($_POST['fields'])) |
|
| 421 | - $_POST['fields'] = array('name'); |
|
| 430 | + if (empty($_POST['fields'])) { |
|
| 431 | + $_POST['fields'] = array('name'); |
|
| 432 | + } |
|
| 422 | 433 | |
| 423 | 434 | // Set defaults for how the results are sorted |
| 424 | - if (!isset($_REQUEST['sort']) || !isset($context['columns'][$_REQUEST['sort']])) |
|
| 425 | - $_REQUEST['sort'] = 'real_name'; |
|
| 435 | + if (!isset($_REQUEST['sort']) || !isset($context['columns'][$_REQUEST['sort']])) { |
|
| 436 | + $_REQUEST['sort'] = 'real_name'; |
|
| 437 | + } |
|
| 426 | 438 | |
| 427 | 439 | // Build the column link / sort information. |
| 428 | 440 | foreach ($context['columns'] as $col => $column_details) |
| 429 | 441 | { |
| 430 | 442 | $context['columns'][$col]['href'] = $scripturl . '?action=mlist;sa=search;start=0;sort=' . $col; |
| 431 | 443 | |
| 432 | - if ((!isset($_REQUEST['desc']) && $col == $_REQUEST['sort']) || ($col != $_REQUEST['sort'] && !empty($column_details['default_sort_rev']))) |
|
| 433 | - $context['columns'][$col]['href'] .= ';desc'; |
|
| 444 | + if ((!isset($_REQUEST['desc']) && $col == $_REQUEST['sort']) || ($col != $_REQUEST['sort'] && !empty($column_details['default_sort_rev']))) { |
|
| 445 | + $context['columns'][$col]['href'] .= ';desc'; |
|
| 446 | + } |
|
| 434 | 447 | |
| 435 | - if (isset($_POST['search']) && isset($_POST['fields'])) |
|
| 436 | - $context['columns'][$col]['href'] .= ';search=' . $_POST['search'] . ';fields=' . implode(',', $_POST['fields']); |
|
| 448 | + if (isset($_POST['search']) && isset($_POST['fields'])) { |
|
| 449 | + $context['columns'][$col]['href'] .= ';search=' . $_POST['search'] . ';fields=' . implode(',', $_POST['fields']); |
|
| 450 | + } |
|
| 437 | 451 | |
| 438 | 452 | $context['columns'][$col]['link'] = '<a href="' . $context['columns'][$col]['href'] . '" rel="nofollow">' . $context['columns'][$col]['label'] . '</a>'; |
| 439 | 453 | $context['columns'][$col]['selected'] = $_REQUEST['sort'] == $col; |
@@ -456,8 +470,7 @@ discard block |
||
| 456 | 470 | { |
| 457 | 471 | $fields = allowedTo('moderate_forum') ? array('member_name', 'real_name') : array('real_name'); |
| 458 | 472 | $search_fields[] = 'name'; |
| 459 | - } |
|
| 460 | - else |
|
| 473 | + } else |
|
| 461 | 474 | { |
| 462 | 475 | $fields = array(); |
| 463 | 476 | $search_fields = array(); |
@@ -482,9 +495,10 @@ discard block |
||
| 482 | 495 | $search_fields[] = 'email'; |
| 483 | 496 | } |
| 484 | 497 | |
| 485 | - if ($smcFunc['db_case_sensitive']) |
|
| 486 | - foreach ($fields as $key => $field) |
|
| 498 | + if ($smcFunc['db_case_sensitive']) { |
|
| 499 | + foreach ($fields as $key => $field) |
|
| 487 | 500 | $fields[$key] = 'LOWER(' . $field . ')'; |
| 501 | + } |
|
| 488 | 502 | |
| 489 | 503 | $customJoin = array(); |
| 490 | 504 | $customCount = 10; |
@@ -503,8 +517,9 @@ discard block |
||
| 503 | 517 | } |
| 504 | 518 | |
| 505 | 519 | // No search fields? That means you're trying to hack things |
| 506 | - if (empty($search_fields)) |
|
| 507 | - fatal_lang_error('invalid_search_string', false); |
|
| 520 | + if (empty($search_fields)) { |
|
| 521 | + fatal_lang_error('invalid_search_string', false); |
|
| 522 | + } |
|
| 508 | 523 | |
| 509 | 524 | $query = $_POST['search'] == '' ? '= {string:blank_string}' : ($smcFunc['db_case_sensitive'] ? 'LIKE LOWER({string:search})' : 'LIKE {string:search}'); |
| 510 | 525 | |
@@ -542,8 +557,7 @@ discard block |
||
| 542 | 557 | ); |
| 543 | 558 | printMemberListRows($request); |
| 544 | 559 | $smcFunc['db_free_result']($request); |
| 545 | - } |
|
| 546 | - else |
|
| 560 | + } else |
|
| 547 | 561 | { |
| 548 | 562 | // These are all the possible fields. |
| 549 | 563 | $context['search_fields'] = array( |
@@ -558,14 +572,14 @@ discard block |
||
| 558 | 572 | { |
| 559 | 573 | unset($context['search_fields']['email']); |
| 560 | 574 | $context['search_defaults'] = array('name'); |
| 561 | - } |
|
| 562 | - else |
|
| 575 | + } else |
|
| 563 | 576 | { |
| 564 | 577 | $context['search_defaults'] = array('name', 'email'); |
| 565 | 578 | } |
| 566 | 579 | |
| 567 | - foreach ($context['custom_search_fields'] as $field) |
|
| 568 | - $context['search_fields']['cust_' . $field['colname']] = sprintf($txt['mlist_search_by'], $field['name']); |
|
| 580 | + foreach ($context['custom_search_fields'] as $field) { |
|
| 581 | + $context['search_fields']['cust_' . $field['colname']] = sprintf($txt['mlist_search_by'], $field['name']); |
|
| 582 | + } |
|
| 569 | 583 | |
| 570 | 584 | $context['sub_template'] = 'search'; |
| 571 | 585 | $context['old_search'] = isset($_GET['search']) ? $_GET['search'] : (isset($_POST['search']) ? $smcFunc['htmlspecialchars']($_POST['search']) : ''); |
@@ -607,12 +621,14 @@ discard block |
||
| 607 | 621 | $smcFunc['db_free_result']($result); |
| 608 | 622 | |
| 609 | 623 | // Avoid division by zero... |
| 610 | - if ($most_posts == 0) |
|
| 611 | - $most_posts = 1; |
|
| 624 | + if ($most_posts == 0) { |
|
| 625 | + $most_posts = 1; |
|
| 626 | + } |
|
| 612 | 627 | |
| 613 | 628 | $members = array(); |
| 614 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
| 615 | - $members[] = $row['id_member']; |
|
| 629 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
| 630 | + $members[] = $row['id_member']; |
|
| 631 | + } |
|
| 616 | 632 | |
| 617 | 633 | // Load all the members for display. |
| 618 | 634 | loadMemberData($members); |
@@ -620,8 +636,9 @@ discard block |
||
| 620 | 636 | $context['members'] = array(); |
| 621 | 637 | foreach ($members as $member) |
| 622 | 638 | { |
| 623 | - if (!loadMemberContext($member)) |
|
| 624 | - continue; |
|
| 639 | + if (!loadMemberContext($member)) { |
|
| 640 | + continue; |
|
| 641 | + } |
|
| 625 | 642 | |
| 626 | 643 | $context['members'][$member] = $memberContext[$member]; |
| 627 | 644 | $context['members'][$member]['post_percent'] = round(($context['members'][$member]['real_posts'] * 100) / $most_posts); |
@@ -644,26 +661,28 @@ discard block |
||
| 644 | 661 | $fieldOptions = explode(',', $column['options']); |
| 645 | 662 | foreach ($fieldOptions as $k => $v) |
| 646 | 663 | { |
| 647 | - if (empty($currentKey)) |
|
| 648 | - $currentKey = $v === $context['members'][$member]['options'][$key] ? $k : 0; |
|
| 664 | + if (empty($currentKey)) { |
|
| 665 | + $currentKey = $v === $context['members'][$member]['options'][$key] ? $k : 0; |
|
| 666 | + } |
|
| 649 | 667 | } |
| 650 | 668 | } |
| 651 | 669 | |
| 652 | - if ($column['bbc'] && !empty($context['members'][$member]['options'][$key])) |
|
| 653 | - $context['members'][$member]['options'][$key] = strip_tags(parse_bbc($context['members'][$member]['options'][$key])); |
|
| 654 | - |
|
| 655 | - elseif ($column['type'] == 'check') |
|
| 656 | - $context['members'][$member]['options'][$key] = $context['members'][$member]['options'][$key] == 0 ? $txt['no'] : $txt['yes']; |
|
| 670 | + if ($column['bbc'] && !empty($context['members'][$member]['options'][$key])) { |
|
| 671 | + $context['members'][$member]['options'][$key] = strip_tags(parse_bbc($context['members'][$member]['options'][$key])); |
|
| 672 | + } elseif ($column['type'] == 'check') { |
|
| 673 | + $context['members'][$member]['options'][$key] = $context['members'][$member]['options'][$key] == 0 ? $txt['no'] : $txt['yes']; |
|
| 674 | + } |
|
| 657 | 675 | |
| 658 | 676 | // Enclosing the user input within some other text? |
| 659 | - if (!empty($column['enclose'])) |
|
| 660 | - $context['members'][$member]['options'][$key] = strtr($column['enclose'], array( |
|
| 677 | + if (!empty($column['enclose'])) { |
|
| 678 | + $context['members'][$member]['options'][$key] = strtr($column['enclose'], array( |
|
| 661 | 679 | '{SCRIPTURL}' => $scripturl, |
| 662 | 680 | '{IMAGES_URL}' => $settings['images_url'], |
| 663 | 681 | '{DEFAULT_IMAGES_URL}' => $settings['default_images_url'], |
| 664 | 682 | '{INPUT}' => $context['members'][$member]['options'][$key], |
| 665 | 683 | '{KEY}' => $currentKey |
| 666 | 684 | )); |
| 685 | + } |
|
| 667 | 686 | } |
| 668 | 687 | } |
| 669 | 688 | } |
@@ -705,17 +724,17 @@ discard block |
||
| 705 | 724 | ); |
| 706 | 725 | |
| 707 | 726 | // Get the right sort method depending on the cust field type. |
| 708 | - if ($row['field_type'] != 'check') |
|
| 709 | - $cpf['columns'][$row['col_name']]['sort'] = array( |
|
| 727 | + if ($row['field_type'] != 'check') { |
|
| 728 | + $cpf['columns'][$row['col_name']]['sort'] = array( |
|
| 710 | 729 | 'down' => 'LENGTH(t' . $row['col_name'] . '.value) > 0 ASC, COALESCE(t' . $row['col_name'] . '.value, \'\') DESC', |
| 711 | 730 | 'up' => 'LENGTH(t' . $row['col_name'] . '.value) > 0 DESC, COALESCE(t' . $row['col_name'] . '.value, \'\') ASC' |
| 712 | 731 | ); |
| 713 | - |
|
| 714 | - else |
|
| 715 | - $cpf['columns'][$row['col_name']]['sort'] = array( |
|
| 732 | + } else { |
|
| 733 | + $cpf['columns'][$row['col_name']]['sort'] = array( |
|
| 716 | 734 | 'down' => 't' . $row['col_name'] . '.value DESC', |
| 717 | 735 | 'up' => 't' . $row['col_name'] . '.value ASC' |
| 718 | 736 | ); |
| 737 | + } |
|
| 719 | 738 | |
| 720 | 739 | $cpf['join'][$row['col_name']] = 'LEFT JOIN {db_prefix}themes AS t' . $row['col_name'] . ' ON (t' . $row['col_name'] . '.variable = {literal:' . $row['col_name'] . '} AND t' . $row['col_name'] . '.id_theme = 1 AND t' . $row['col_name'] . '.id_member = mem.id_member)'; |
| 721 | 740 | } |
@@ -14,8 +14,9 @@ discard block |
||
| 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 | * Clean the request variables - add html entities to GET and slashes if magic_quotes_gpc is Off. |
@@ -44,22 +45,26 @@ discard block |
||
| 44 | 45 | unset($GLOBALS['HTTP_POST_FILES'], $GLOBALS['HTTP_POST_FILES']); |
| 45 | 46 | |
| 46 | 47 | // These keys shouldn't be set...ever. |
| 47 | - if (isset($_REQUEST['GLOBALS']) || isset($_COOKIE['GLOBALS'])) |
|
| 48 | - die('Invalid request variable.'); |
|
| 48 | + if (isset($_REQUEST['GLOBALS']) || isset($_COOKIE['GLOBALS'])) { |
|
| 49 | + die('Invalid request variable.'); |
|
| 50 | + } |
|
| 49 | 51 | |
| 50 | 52 | // Same goes for numeric keys. |
| 51 | - foreach (array_merge(array_keys($_POST), array_keys($_GET), array_keys($_FILES)) as $key) |
|
| 52 | - if (is_numeric($key)) |
|
| 53 | + foreach (array_merge(array_keys($_POST), array_keys($_GET), array_keys($_FILES)) as $key) { |
|
| 54 | + if (is_numeric($key)) |
|
| 53 | 55 | die('Numeric request keys are invalid.'); |
| 56 | + } |
|
| 54 | 57 | |
| 55 | 58 | // Numeric keys in cookies are less of a problem. Just unset those. |
| 56 | - foreach ($_COOKIE as $key => $value) |
|
| 57 | - if (is_numeric($key)) |
|
| 59 | + foreach ($_COOKIE as $key => $value) { |
|
| 60 | + if (is_numeric($key)) |
|
| 58 | 61 | unset($_COOKIE[$key]); |
| 62 | + } |
|
| 59 | 63 | |
| 60 | 64 | // Get the correct query string. It may be in an environment variable... |
| 61 | - if (!isset($_SERVER['QUERY_STRING'])) |
|
| 62 | - $_SERVER['QUERY_STRING'] = getenv('QUERY_STRING'); |
|
| 65 | + if (!isset($_SERVER['QUERY_STRING'])) { |
|
| 66 | + $_SERVER['QUERY_STRING'] = getenv('QUERY_STRING'); |
|
| 67 | + } |
|
| 63 | 68 | |
| 64 | 69 | // It seems that sticking a URL after the query string is mighty common, well, it's evil - don't. |
| 65 | 70 | if (strpos($_SERVER['QUERY_STRING'], 'http') === 0) |
@@ -83,13 +88,14 @@ discard block |
||
| 83 | 88 | parse_str(preg_replace('/&(\w+)(?=&|$)/', '&$1=', strtr($_SERVER['QUERY_STRING'], array(';?' => '&', ';' => '&', '%00' => '', "\0" => ''))), $_GET); |
| 84 | 89 | |
| 85 | 90 | // Magic quotes still applies with parse_str - so clean it up. |
| 86 | - if (function_exists('get_magic_quotes_gpc') && @get_magic_quotes_gpc() != 0 && empty($modSettings['integrate_magic_quotes'])) |
|
| 87 | - $_GET = $removeMagicQuoteFunction($_GET); |
|
| 88 | - } |
|
| 89 | - elseif (strpos(ini_get('arg_separator.input'), ';') !== false) |
|
| 91 | + if (function_exists('get_magic_quotes_gpc') && @get_magic_quotes_gpc() != 0 && empty($modSettings['integrate_magic_quotes'])) { |
|
| 92 | + $_GET = $removeMagicQuoteFunction($_GET); |
|
| 93 | + } |
|
| 94 | + } elseif (strpos(ini_get('arg_separator.input'), ';') !== false) |
|
| 90 | 95 | { |
| 91 | - if (function_exists('get_magic_quotes_gpc') && @get_magic_quotes_gpc() != 0 && empty($modSettings['integrate_magic_quotes'])) |
|
| 92 | - $_GET = $removeMagicQuoteFunction($_GET); |
|
| 96 | + if (function_exists('get_magic_quotes_gpc') && @get_magic_quotes_gpc() != 0 && empty($modSettings['integrate_magic_quotes'])) { |
|
| 97 | + $_GET = $removeMagicQuoteFunction($_GET); |
|
| 98 | + } |
|
| 93 | 99 | |
| 94 | 100 | // Search engines will send action=profile%3Bu=1, which confuses PHP. |
| 95 | 101 | foreach ($_GET as $k => $v) |
@@ -102,8 +108,9 @@ discard block |
||
| 102 | 108 | for ($i = 1, $n = count($temp); $i < $n; $i++) |
| 103 | 109 | { |
| 104 | 110 | @list ($key, $val) = @explode('=', $temp[$i], 2); |
| 105 | - if (!isset($_GET[$key])) |
|
| 106 | - $_GET[$key] = $val; |
|
| 111 | + if (!isset($_GET[$key])) { |
|
| 112 | + $_GET[$key] = $val; |
|
| 113 | + } |
|
| 107 | 114 | } |
| 108 | 115 | } |
| 109 | 116 | |
@@ -120,18 +127,20 @@ discard block |
||
| 120 | 127 | if (!empty($_SERVER['REQUEST_URI'])) |
| 121 | 128 | { |
| 122 | 129 | // Remove the .html, assuming there is one. |
| 123 | - if (substr($_SERVER['REQUEST_URI'], strrpos($_SERVER['REQUEST_URI'], '.'), 4) == '.htm') |
|
| 124 | - $request = substr($_SERVER['REQUEST_URI'], 0, strrpos($_SERVER['REQUEST_URI'], '.')); |
|
| 125 | - else |
|
| 126 | - $request = $_SERVER['REQUEST_URI']; |
|
| 130 | + if (substr($_SERVER['REQUEST_URI'], strrpos($_SERVER['REQUEST_URI'], '.'), 4) == '.htm') { |
|
| 131 | + $request = substr($_SERVER['REQUEST_URI'], 0, strrpos($_SERVER['REQUEST_URI'], '.')); |
|
| 132 | + } else { |
|
| 133 | + $request = $_SERVER['REQUEST_URI']; |
|
| 134 | + } |
|
| 127 | 135 | |
| 128 | 136 | // @todo smflib. |
| 129 | 137 | // Replace 'index.php/a,b,c/d/e,f' with 'a=b,c&d=&e=f' and parse it into $_GET. |
| 130 | 138 | if (strpos($request, basename($scripturl) . '/') !== false) |
| 131 | 139 | { |
| 132 | 140 | parse_str(substr(preg_replace('/&(\w+)(?=&|$)/', '&$1=', strtr(preg_replace('~/([^,/]+),~', '/$1=', substr($request, strpos($request, basename($scripturl)) + strlen(basename($scripturl)))), '/', '&')), 1), $temp); |
| 133 | - if (function_exists('get_magic_quotes_gpc') && @get_magic_quotes_gpc() != 0 && empty($modSettings['integrate_magic_quotes'])) |
|
| 134 | - $temp = $removeMagicQuoteFunction($temp); |
|
| 141 | + if (function_exists('get_magic_quotes_gpc') && @get_magic_quotes_gpc() != 0 && empty($modSettings['integrate_magic_quotes'])) { |
|
| 142 | + $temp = $removeMagicQuoteFunction($temp); |
|
| 143 | + } |
|
| 135 | 144 | $_GET += $temp; |
| 136 | 145 | } |
| 137 | 146 | } |
@@ -142,9 +151,10 @@ discard block |
||
| 142 | 151 | $_ENV = $removeMagicQuoteFunction($_ENV); |
| 143 | 152 | $_POST = $removeMagicQuoteFunction($_POST); |
| 144 | 153 | $_COOKIE = $removeMagicQuoteFunction($_COOKIE); |
| 145 | - foreach ($_FILES as $k => $dummy) |
|
| 146 | - if (isset($_FILES[$k]['name'])) |
|
| 154 | + foreach ($_FILES as $k => $dummy) { |
|
| 155 | + if (isset($_FILES[$k]['name'])) |
|
| 147 | 156 | $_FILES[$k]['name'] = $removeMagicQuoteFunction($_FILES[$k]['name']); |
| 157 | + } |
|
| 148 | 158 | } |
| 149 | 159 | |
| 150 | 160 | // Add entities to GET. This is kinda like the slashes on everything else. |
@@ -160,11 +170,13 @@ discard block |
||
| 160 | 170 | $_REQUEST['board'] = (string) $_REQUEST['board']; |
| 161 | 171 | |
| 162 | 172 | // If there's a slash in it, we've got a start value! (old, compatible links.) |
| 163 | - if (strpos($_REQUEST['board'], '/') !== false) |
|
| 164 | - list ($_REQUEST['board'], $_REQUEST['start']) = explode('/', $_REQUEST['board']); |
|
| 173 | + if (strpos($_REQUEST['board'], '/') !== false) { |
|
| 174 | + list ($_REQUEST['board'], $_REQUEST['start']) = explode('/', $_REQUEST['board']); |
|
| 175 | + } |
|
| 165 | 176 | // Same idea, but dots. This is the currently used format - ?board=1.0... |
| 166 | - elseif (strpos($_REQUEST['board'], '.') !== false) |
|
| 167 | - list ($_REQUEST['board'], $_REQUEST['start']) = explode('.', $_REQUEST['board']); |
|
| 177 | + elseif (strpos($_REQUEST['board'], '.') !== false) { |
|
| 178 | + list ($_REQUEST['board'], $_REQUEST['start']) = explode('.', $_REQUEST['board']); |
|
| 179 | + } |
|
| 168 | 180 | // Now make absolutely sure it's a number. |
| 169 | 181 | $board = (int) $_REQUEST['board']; |
| 170 | 182 | $_REQUEST['start'] = isset($_REQUEST['start']) ? (int) $_REQUEST['start'] : 0; |
@@ -173,12 +185,14 @@ discard block |
||
| 173 | 185 | $_GET['board'] = $board; |
| 174 | 186 | } |
| 175 | 187 | // Well, $board is going to be a number no matter what. |
| 176 | - else |
|
| 177 | - $board = 0; |
|
| 188 | + else { |
|
| 189 | + $board = 0; |
|
| 190 | + } |
|
| 178 | 191 | |
| 179 | 192 | // If there's a threadid, it's probably an old YaBB SE link. Flow with it. |
| 180 | - if (isset($_REQUEST['threadid']) && !isset($_REQUEST['topic'])) |
|
| 181 | - $_REQUEST['topic'] = $_REQUEST['threadid']; |
|
| 193 | + if (isset($_REQUEST['threadid']) && !isset($_REQUEST['topic'])) { |
|
| 194 | + $_REQUEST['topic'] = $_REQUEST['threadid']; |
|
| 195 | + } |
|
| 182 | 196 | |
| 183 | 197 | // We've got topic! |
| 184 | 198 | if (isset($_REQUEST['topic'])) |
@@ -187,11 +201,13 @@ discard block |
||
| 187 | 201 | $_REQUEST['topic'] = (string) $_REQUEST['topic']; |
| 188 | 202 | |
| 189 | 203 | // Slash means old, beta style, formatting. That's okay though, the link should still work. |
| 190 | - if (strpos($_REQUEST['topic'], '/') !== false) |
|
| 191 | - list ($_REQUEST['topic'], $_REQUEST['start']) = explode('/', $_REQUEST['topic']); |
|
| 204 | + if (strpos($_REQUEST['topic'], '/') !== false) { |
|
| 205 | + list ($_REQUEST['topic'], $_REQUEST['start']) = explode('/', $_REQUEST['topic']); |
|
| 206 | + } |
|
| 192 | 207 | // Dots are useful and fun ;). This is ?topic=1.15. |
| 193 | - elseif (strpos($_REQUEST['topic'], '.') !== false) |
|
| 194 | - list ($_REQUEST['topic'], $_REQUEST['start']) = explode('.', $_REQUEST['topic']); |
|
| 208 | + elseif (strpos($_REQUEST['topic'], '.') !== false) { |
|
| 209 | + list ($_REQUEST['topic'], $_REQUEST['start']) = explode('.', $_REQUEST['topic']); |
|
| 210 | + } |
|
| 195 | 211 | |
| 196 | 212 | // Topic should always be an integer |
| 197 | 213 | $topic = $_GET['topic'] = $_REQUEST['topic'] = (int) $_REQUEST['topic']; |
@@ -225,21 +241,25 @@ discard block |
||
| 225 | 241 | $_REQUEST['start'] = $timestamp === 0 ? 0 : 'from' . $timestamp; |
| 226 | 242 | } |
| 227 | 243 | // ... or something invalid, in which case we reset it to 0. |
| 228 | - else |
|
| 229 | - $_REQUEST['start'] = 0; |
|
| 244 | + else { |
|
| 245 | + $_REQUEST['start'] = 0; |
|
| 246 | + } |
|
| 247 | + } else { |
|
| 248 | + $topic = 0; |
|
| 230 | 249 | } |
| 231 | - else |
|
| 232 | - $topic = 0; |
|
| 233 | 250 | |
| 234 | 251 | // There should be a $_REQUEST['start'], some at least. If you need to default to other than 0, use $_GET['start']. |
| 235 | - if (empty($_REQUEST['start']) || $_REQUEST['start'] < 0 || (int) $_REQUEST['start'] > 2147473647) |
|
| 236 | - $_REQUEST['start'] = 0; |
|
| 252 | + if (empty($_REQUEST['start']) || $_REQUEST['start'] < 0 || (int) $_REQUEST['start'] > 2147473647) { |
|
| 253 | + $_REQUEST['start'] = 0; |
|
| 254 | + } |
|
| 237 | 255 | |
| 238 | 256 | // The action needs to be a string and not an array or anything else |
| 239 | - if (isset($_REQUEST['action'])) |
|
| 240 | - $_REQUEST['action'] = (string) $_REQUEST['action']; |
|
| 241 | - if (isset($_GET['action'])) |
|
| 242 | - $_GET['action'] = (string) $_GET['action']; |
|
| 257 | + if (isset($_REQUEST['action'])) { |
|
| 258 | + $_REQUEST['action'] = (string) $_REQUEST['action']; |
|
| 259 | + } |
|
| 260 | + if (isset($_GET['action'])) { |
|
| 261 | + $_GET['action'] = (string) $_GET['action']; |
|
| 262 | + } |
|
| 243 | 263 | |
| 244 | 264 | // Some mail providers like to encode semicolons in activation URLs... |
| 245 | 265 | if (!empty($_REQUEST['action']) && substr($_SERVER['QUERY_STRING'], 0, 18) == 'action=activate%3b') |
@@ -265,29 +285,33 @@ discard block |
||
| 265 | 285 | $_SERVER['BAN_CHECK_IP'] = $_SERVER['REMOTE_ADDR']; |
| 266 | 286 | |
| 267 | 287 | // If we haven't specified how to handle Reverse Proxy IP headers, lets do what we always used to do. |
| 268 | - if (!isset($modSettings['proxy_ip_header'])) |
|
| 269 | - $modSettings['proxy_ip_header'] = 'autodetect'; |
|
| 288 | + if (!isset($modSettings['proxy_ip_header'])) { |
|
| 289 | + $modSettings['proxy_ip_header'] = 'autodetect'; |
|
| 290 | + } |
|
| 270 | 291 | |
| 271 | 292 | // Which headers are we going to check for Reverse Proxy IP headers? |
| 272 | - if ($modSettings['proxy_ip_header'] == 'disabled') |
|
| 273 | - $reverseIPheaders = array(); |
|
| 274 | - elseif ($modSettings['proxy_ip_header'] == 'autodetect') |
|
| 275 | - $reverseIPheaders = array('HTTP_X_FORWARDED_FOR', 'HTTP_CLIENT_IP'); |
|
| 276 | - else |
|
| 277 | - $reverseIPheaders = array($modSettings['proxy_ip_header']); |
|
| 293 | + if ($modSettings['proxy_ip_header'] == 'disabled') { |
|
| 294 | + $reverseIPheaders = array(); |
|
| 295 | + } elseif ($modSettings['proxy_ip_header'] == 'autodetect') { |
|
| 296 | + $reverseIPheaders = array('HTTP_X_FORWARDED_FOR', 'HTTP_CLIENT_IP'); |
|
| 297 | + } else { |
|
| 298 | + $reverseIPheaders = array($modSettings['proxy_ip_header']); |
|
| 299 | + } |
|
| 278 | 300 | |
| 279 | 301 | // Find the user's IP address. (but don't let it give you 'unknown'!) |
| 280 | 302 | foreach ($reverseIPheaders as $proxyIPheader) |
| 281 | 303 | { |
| 282 | 304 | // Ignore if this is not set. |
| 283 | - if (!isset($_SERVER[$proxyIPheader])) |
|
| 284 | - continue; |
|
| 305 | + if (!isset($_SERVER[$proxyIPheader])) { |
|
| 306 | + continue; |
|
| 307 | + } |
|
| 285 | 308 | |
| 286 | 309 | if (!empty($modSettings['proxy_ip_servers'])) |
| 287 | 310 | { |
| 288 | - foreach (explode(',', $modSettings['proxy_ip_servers']) as $proxy) |
|
| 289 | - if ($proxy == $_SERVER['REMOTE_ADDR'] || matchIPtoCIDR($_SERVER['REMOTE_ADDR'], $proxy)) |
|
| 311 | + foreach (explode(',', $modSettings['proxy_ip_servers']) as $proxy) { |
|
| 312 | + if ($proxy == $_SERVER['REMOTE_ADDR'] || matchIPtoCIDR($_SERVER['REMOTE_ADDR'], $proxy)) |
|
| 290 | 313 | continue; |
| 314 | + } |
|
| 291 | 315 | } |
| 292 | 316 | |
| 293 | 317 | // If there are commas, get the last one.. probably. |
@@ -307,8 +331,9 @@ discard block |
||
| 307 | 331 | |
| 308 | 332 | // Just incase we have a legacy IPv4 address. |
| 309 | 333 | // @ TODO: Convert to IPv6. |
| 310 | - if (preg_match('~^((([1]?\d)?\d|2[0-4]\d|25[0-5])\.){3}(([1]?\d)?\d|2[0-4]\d|25[0-5])$~', $_SERVER[$proxyIPheader]) === 0) |
|
| 311 | - continue; |
|
| 334 | + if (preg_match('~^((([1]?\d)?\d|2[0-4]\d|25[0-5])\.){3}(([1]?\d)?\d|2[0-4]\d|25[0-5])$~', $_SERVER[$proxyIPheader]) === 0) { |
|
| 335 | + continue; |
|
| 336 | + } |
|
| 312 | 337 | } |
| 313 | 338 | |
| 314 | 339 | continue; |
@@ -320,36 +345,40 @@ discard block |
||
| 320 | 345 | } |
| 321 | 346 | } |
| 322 | 347 | // Otherwise just use the only one. |
| 323 | - elseif (preg_match('~^((0|10|172\.(1[6-9]|2[0-9]|3[01])|192\.168|255|127)\.|unknown|::1|fe80::|fc00::)~', $_SERVER[$proxyIPheader]) == 0 || preg_match('~^((0|10|172\.(1[6-9]|2[0-9]|3[01])|192\.168|255|127)\.|unknown|::1|fe80::|fc00::)~', $_SERVER['REMOTE_ADDR']) != 0) |
|
| 324 | - $_SERVER['BAN_CHECK_IP'] = $_SERVER[$proxyIPheader]; |
|
| 325 | - elseif (!isValidIPv6($_SERVER[$proxyIPheader]) || preg_match('~::ffff:\d+\.\d+\.\d+\.\d+~', $_SERVER[$proxyIPheader]) !== 0) |
|
| 348 | + elseif (preg_match('~^((0|10|172\.(1[6-9]|2[0-9]|3[01])|192\.168|255|127)\.|unknown|::1|fe80::|fc00::)~', $_SERVER[$proxyIPheader]) == 0 || preg_match('~^((0|10|172\.(1[6-9]|2[0-9]|3[01])|192\.168|255|127)\.|unknown|::1|fe80::|fc00::)~', $_SERVER['REMOTE_ADDR']) != 0) { |
|
| 349 | + $_SERVER['BAN_CHECK_IP'] = $_SERVER[$proxyIPheader]; |
|
| 350 | + } elseif (!isValidIPv6($_SERVER[$proxyIPheader]) || preg_match('~::ffff:\d+\.\d+\.\d+\.\d+~', $_SERVER[$proxyIPheader]) !== 0) |
|
| 326 | 351 | { |
| 327 | 352 | $_SERVER[$proxyIPheader] = preg_replace('~^::ffff:(\d+\.\d+\.\d+\.\d+)~', '\1', $_SERVER[$proxyIPheader]); |
| 328 | 353 | |
| 329 | 354 | // Just incase we have a legacy IPv4 address. |
| 330 | 355 | // @ TODO: Convert to IPv6. |
| 331 | - if (preg_match('~^((([1]?\d)?\d|2[0-4]\d|25[0-5])\.){3}(([1]?\d)?\d|2[0-4]\d|25[0-5])$~', $_SERVER[$proxyIPheader]) === 0) |
|
| 332 | - continue; |
|
| 356 | + if (preg_match('~^((([1]?\d)?\d|2[0-4]\d|25[0-5])\.){3}(([1]?\d)?\d|2[0-4]\d|25[0-5])$~', $_SERVER[$proxyIPheader]) === 0) { |
|
| 357 | + continue; |
|
| 358 | + } |
|
| 333 | 359 | } |
| 334 | 360 | } |
| 335 | 361 | |
| 336 | 362 | // Make sure we know the URL of the current request. |
| 337 | - if (empty($_SERVER['REQUEST_URI'])) |
|
| 338 | - $_SERVER['REQUEST_URL'] = $scripturl . (!empty($_SERVER['QUERY_STRING']) ? '?' . $_SERVER['QUERY_STRING'] : ''); |
|
| 339 | - elseif (preg_match('~^([^/]+//[^/]+)~', $scripturl, $match) == 1) |
|
| 340 | - $_SERVER['REQUEST_URL'] = $match[1] . $_SERVER['REQUEST_URI']; |
|
| 341 | - else |
|
| 342 | - $_SERVER['REQUEST_URL'] = $_SERVER['REQUEST_URI']; |
|
| 363 | + if (empty($_SERVER['REQUEST_URI'])) { |
|
| 364 | + $_SERVER['REQUEST_URL'] = $scripturl . (!empty($_SERVER['QUERY_STRING']) ? '?' . $_SERVER['QUERY_STRING'] : ''); |
|
| 365 | + } elseif (preg_match('~^([^/]+//[^/]+)~', $scripturl, $match) == 1) { |
|
| 366 | + $_SERVER['REQUEST_URL'] = $match[1] . $_SERVER['REQUEST_URI']; |
|
| 367 | + } else { |
|
| 368 | + $_SERVER['REQUEST_URL'] = $_SERVER['REQUEST_URI']; |
|
| 369 | + } |
|
| 343 | 370 | |
| 344 | 371 | // And make sure HTTP_USER_AGENT is set. |
| 345 | 372 | $_SERVER['HTTP_USER_AGENT'] = isset($_SERVER['HTTP_USER_AGENT']) ? (isset($smcFunc['htmlspecialchars']) ? $smcFunc['htmlspecialchars']($smcFunc['db_unescape_string']($_SERVER['HTTP_USER_AGENT']), ENT_QUOTES) : htmlspecialchars($smcFunc['db_unescape_string']($_SERVER['HTTP_USER_AGENT']), ENT_QUOTES)) : ''; |
| 346 | 373 | |
| 347 | 374 | // Some final checking. |
| 348 | - if (!isValidIP($_SERVER['BAN_CHECK_IP'])) |
|
| 349 | - $_SERVER['BAN_CHECK_IP'] = ''; |
|
| 350 | - if ($_SERVER['REMOTE_ADDR'] == 'unknown') |
|
| 351 | - $_SERVER['REMOTE_ADDR'] = ''; |
|
| 352 | -} |
|
| 375 | + if (!isValidIP($_SERVER['BAN_CHECK_IP'])) { |
|
| 376 | + $_SERVER['BAN_CHECK_IP'] = ''; |
|
| 377 | + } |
|
| 378 | + if ($_SERVER['REMOTE_ADDR'] == 'unknown') { |
|
| 379 | + $_SERVER['REMOTE_ADDR'] = ''; |
|
| 380 | + } |
|
| 381 | + } |
|
| 353 | 382 | |
| 354 | 383 | /** |
| 355 | 384 | * Validates a IPv6 address. returns true if it is ipv6. |
@@ -360,8 +389,9 @@ discard block |
||
| 360 | 389 | function isValidIPv6($ip) |
| 361 | 390 | { |
| 362 | 391 | //looking for : |
| 363 | - if (strpos($ip, ':') === false) |
|
| 364 | - return false; |
|
| 392 | + if (strpos($ip, ':') === false) { |
|
| 393 | + return false; |
|
| 394 | + } |
|
| 365 | 395 | |
| 366 | 396 | //check valid address |
| 367 | 397 | return filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6); |
@@ -379,8 +409,9 @@ discard block |
||
| 379 | 409 | static $converted = array(); |
| 380 | 410 | |
| 381 | 411 | // Check if we have done this already. |
| 382 | - if (isset($converted[$addr])) |
|
| 383 | - return $converted[$addr]; |
|
| 412 | + if (isset($converted[$addr])) { |
|
| 413 | + return $converted[$addr]; |
|
| 414 | + } |
|
| 384 | 415 | |
| 385 | 416 | // Check if there are segments missing, insert if necessary. |
| 386 | 417 | if (strpos($addr, '::') !== false) |
@@ -390,18 +421,20 @@ discard block |
||
| 390 | 421 | $part[1] = explode(':', $part[1]); |
| 391 | 422 | $missing = array(); |
| 392 | 423 | |
| 393 | - for ($i = 0; $i < (8 - (count($part[0]) + count($part[1]))); $i++) |
|
| 394 | - array_push($missing, '0000'); |
|
| 424 | + for ($i = 0; $i < (8 - (count($part[0]) + count($part[1]))); $i++) { |
|
| 425 | + array_push($missing, '0000'); |
|
| 426 | + } |
|
| 395 | 427 | |
| 396 | 428 | $part = array_merge($part[0], $missing, $part[1]); |
| 429 | + } else { |
|
| 430 | + $part = explode(':', $addr); |
|
| 397 | 431 | } |
| 398 | - else |
|
| 399 | - $part = explode(':', $addr); |
|
| 400 | 432 | |
| 401 | 433 | // Pad each segment until it has 4 digits. |
| 402 | - foreach ($part as &$p) |
|
| 403 | - while (strlen($p) < 4) |
|
| 434 | + foreach ($part as &$p) { |
|
| 435 | + while (strlen($p) < 4) |
|
| 404 | 436 | $p = '0' . $p; |
| 437 | + } |
|
| 405 | 438 | |
| 406 | 439 | unset($p); |
| 407 | 440 | |
@@ -412,11 +445,12 @@ discard block |
||
| 412 | 445 | $converted[$addr] = $result; |
| 413 | 446 | |
| 414 | 447 | // Quick check to make sure the length is as expected. |
| 415 | - if (!$strict_check || strlen($result) == 39) |
|
| 416 | - return $result; |
|
| 417 | - else |
|
| 418 | - return false; |
|
| 419 | -} |
|
| 448 | + if (!$strict_check || strlen($result) == 39) { |
|
| 449 | + return $result; |
|
| 450 | + } else { |
|
| 451 | + return false; |
|
| 452 | + } |
|
| 453 | + } |
|
| 420 | 454 | |
| 421 | 455 | |
| 422 | 456 | /** |
@@ -434,8 +468,9 @@ discard block |
||
| 434 | 468 | //v6? |
| 435 | 469 | if ((strpos($cidr_network, ':') !== false)) |
| 436 | 470 | { |
| 437 | - if (!filter_var($ip_address, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) || !filter_var($cidr_network, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) |
|
| 438 | - return false; |
|
| 471 | + if (!filter_var($ip_address, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) || !filter_var($cidr_network, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) { |
|
| 472 | + return false; |
|
| 473 | + } |
|
| 439 | 474 | |
| 440 | 475 | $ip_address = inet_pton($ip_address); |
| 441 | 476 | $cidr_network = inet_pton($cidr_network); |
@@ -457,10 +492,10 @@ discard block |
||
| 457 | 492 | $binMask = pack("H*" , $binMask); |
| 458 | 493 | |
| 459 | 494 | return ($ip_address & $binMask) == $cidr_network; |
| 495 | + } else { |
|
| 496 | + return (ip2long($ip_address) & (~((1 << (32 - $cidr_subnetmask)) - 1))) == ip2long($cidr_network); |
|
| 497 | + } |
|
| 460 | 498 | } |
| 461 | - else |
|
| 462 | - return (ip2long($ip_address) & (~((1 << (32 - $cidr_subnetmask)) - 1))) == ip2long($cidr_network); |
|
| 463 | -} |
|
| 464 | 499 | |
| 465 | 500 | /** |
| 466 | 501 | * Adds slashes to the array/variable. |
@@ -476,15 +511,17 @@ discard block |
||
| 476 | 511 | { |
| 477 | 512 | global $smcFunc; |
| 478 | 513 | |
| 479 | - if (!is_array($var)) |
|
| 480 | - return $smcFunc['db_escape_string']($var); |
|
| 514 | + if (!is_array($var)) { |
|
| 515 | + return $smcFunc['db_escape_string']($var); |
|
| 516 | + } |
|
| 481 | 517 | |
| 482 | 518 | // Reindex the array with slashes. |
| 483 | 519 | $new_var = array(); |
| 484 | 520 | |
| 485 | 521 | // Add slashes to every element, even the indexes! |
| 486 | - foreach ($var as $k => $v) |
|
| 487 | - $new_var[$smcFunc['db_escape_string']($k)] = escapestring__recursive($v); |
|
| 522 | + foreach ($var as $k => $v) { |
|
| 523 | + $new_var[$smcFunc['db_escape_string']($k)] = escapestring__recursive($v); |
|
| 524 | + } |
|
| 488 | 525 | |
| 489 | 526 | return $new_var; |
| 490 | 527 | } |
@@ -504,12 +541,14 @@ discard block |
||
| 504 | 541 | { |
| 505 | 542 | global $smcFunc; |
| 506 | 543 | |
| 507 | - if (!is_array($var)) |
|
| 508 | - return isset($smcFunc['htmlspecialchars']) ? $smcFunc['htmlspecialchars']($var, ENT_QUOTES) : htmlspecialchars($var, ENT_QUOTES); |
|
| 544 | + if (!is_array($var)) { |
|
| 545 | + return isset($smcFunc['htmlspecialchars']) ? $smcFunc['htmlspecialchars']($var, ENT_QUOTES) : htmlspecialchars($var, ENT_QUOTES); |
|
| 546 | + } |
|
| 509 | 547 | |
| 510 | 548 | // Add the htmlspecialchars to every element. |
| 511 | - foreach ($var as $k => $v) |
|
| 512 | - $var[$k] = $level > 25 ? null : htmlspecialchars__recursive($v, $level + 1); |
|
| 549 | + foreach ($var as $k => $v) { |
|
| 550 | + $var[$k] = $level > 25 ? null : htmlspecialchars__recursive($v, $level + 1); |
|
| 551 | + } |
|
| 513 | 552 | |
| 514 | 553 | return $var; |
| 515 | 554 | } |
@@ -527,15 +566,17 @@ discard block |
||
| 527 | 566 | */ |
| 528 | 567 | function urldecode__recursive($var, $level = 0) |
| 529 | 568 | { |
| 530 | - if (!is_array($var)) |
|
| 531 | - return urldecode($var); |
|
| 569 | + if (!is_array($var)) { |
|
| 570 | + return urldecode($var); |
|
| 571 | + } |
|
| 532 | 572 | |
| 533 | 573 | // Reindex the array... |
| 534 | 574 | $new_var = array(); |
| 535 | 575 | |
| 536 | 576 | // Add the htmlspecialchars to every element. |
| 537 | - foreach ($var as $k => $v) |
|
| 538 | - $new_var[urldecode($k)] = $level > 25 ? null : urldecode__recursive($v, $level + 1); |
|
| 577 | + foreach ($var as $k => $v) { |
|
| 578 | + $new_var[urldecode($k)] = $level > 25 ? null : urldecode__recursive($v, $level + 1); |
|
| 579 | + } |
|
| 539 | 580 | |
| 540 | 581 | return $new_var; |
| 541 | 582 | } |
@@ -553,15 +594,17 @@ discard block |
||
| 553 | 594 | { |
| 554 | 595 | global $smcFunc; |
| 555 | 596 | |
| 556 | - if (!is_array($var)) |
|
| 557 | - return $smcFunc['db_unescape_string']($var); |
|
| 597 | + if (!is_array($var)) { |
|
| 598 | + return $smcFunc['db_unescape_string']($var); |
|
| 599 | + } |
|
| 558 | 600 | |
| 559 | 601 | // Reindex the array without slashes, this time. |
| 560 | 602 | $new_var = array(); |
| 561 | 603 | |
| 562 | 604 | // Strip the slashes from every element. |
| 563 | - foreach ($var as $k => $v) |
|
| 564 | - $new_var[$smcFunc['db_unescape_string']($k)] = unescapestring__recursive($v); |
|
| 605 | + foreach ($var as $k => $v) { |
|
| 606 | + $new_var[$smcFunc['db_unescape_string']($k)] = unescapestring__recursive($v); |
|
| 607 | + } |
|
| 565 | 608 | |
| 566 | 609 | return $new_var; |
| 567 | 610 | } |
@@ -579,15 +622,17 @@ discard block |
||
| 579 | 622 | */ |
| 580 | 623 | function stripslashes__recursive($var, $level = 0) |
| 581 | 624 | { |
| 582 | - if (!is_array($var)) |
|
| 583 | - return stripslashes($var); |
|
| 625 | + if (!is_array($var)) { |
|
| 626 | + return stripslashes($var); |
|
| 627 | + } |
|
| 584 | 628 | |
| 585 | 629 | // Reindex the array without slashes, this time. |
| 586 | 630 | $new_var = array(); |
| 587 | 631 | |
| 588 | 632 | // Strip the slashes from every element. |
| 589 | - foreach ($var as $k => $v) |
|
| 590 | - $new_var[stripslashes($k)] = $level > 25 ? null : stripslashes__recursive($v, $level + 1); |
|
| 633 | + foreach ($var as $k => $v) { |
|
| 634 | + $new_var[stripslashes($k)] = $level > 25 ? null : stripslashes__recursive($v, $level + 1); |
|
| 635 | + } |
|
| 591 | 636 | |
| 592 | 637 | return $new_var; |
| 593 | 638 | } |
@@ -608,12 +653,14 @@ discard block |
||
| 608 | 653 | global $smcFunc; |
| 609 | 654 | |
| 610 | 655 | // Remove spaces (32), tabs (9), returns (13, 10, and 11), nulls (0), and hard spaces. (160) |
| 611 | - if (!is_array($var)) |
|
| 612 | - return isset($smcFunc) ? $smcFunc['htmltrim']($var) : trim($var, ' ' . "\t\n\r\x0B" . '\0' . "\xA0"); |
|
| 656 | + if (!is_array($var)) { |
|
| 657 | + return isset($smcFunc) ? $smcFunc['htmltrim']($var) : trim($var, ' ' . "\t\n\r\x0B" . '\0' . "\xA0"); |
|
| 658 | + } |
|
| 613 | 659 | |
| 614 | 660 | // Go through all the elements and remove the whitespace. |
| 615 | - foreach ($var as $k => $v) |
|
| 616 | - $var[$k] = $level > 25 ? null : htmltrim__recursive($v, $level + 1); |
|
| 661 | + foreach ($var as $k => $v) { |
|
| 662 | + $var[$k] = $level > 25 ? null : htmltrim__recursive($v, $level + 1); |
|
| 663 | + } |
|
| 617 | 664 | |
| 618 | 665 | return $var; |
| 619 | 666 | } |
@@ -678,30 +725,37 @@ discard block |
||
| 678 | 725 | global $scripturl, $modSettings, $context; |
| 679 | 726 | |
| 680 | 727 | // If $scripturl is set to nothing, or the SID is not defined (SSI?) just quit. |
| 681 | - if ($scripturl == '' || !defined('SID')) |
|
| 682 | - return $buffer; |
|
| 728 | + if ($scripturl == '' || !defined('SID')) { |
|
| 729 | + return $buffer; |
|
| 730 | + } |
|
| 683 | 731 | |
| 684 | 732 | // Do nothing if the session is cookied, or they are a crawler - guests are caught by redirectexit(). This doesn't work below PHP 4.3.0, because it makes the output buffer bigger. |
| 685 | 733 | // @todo smflib |
| 686 | - if (empty($_COOKIE) && SID != '' && !isBrowser('possibly_robot')) |
|
| 687 | - $buffer = preg_replace('/(?<!<link rel="canonical" href=)"' . preg_quote($scripturl, '/') . '(?!\?' . preg_quote(SID, '/') . ')\\??/', '"' . $scripturl . '?' . SID . '&', $buffer); |
|
| 734 | + if (empty($_COOKIE) && SID != '' && !isBrowser('possibly_robot')) { |
|
| 735 | + $buffer = preg_replace('/(?<!<link rel="canonical" href=)"' . preg_quote($scripturl, '/') . '(?!\?' . preg_quote(SID, '/') . ')\\??/', '"' . $scripturl . '?' . SID . '&', $buffer); |
|
| 736 | + } |
|
| 688 | 737 | // Debugging templates, are we? |
| 689 | - elseif (isset($_GET['debug'])) |
|
| 690 | - $buffer = preg_replace('/(?<!<link rel="canonical" href=)"' . preg_quote($scripturl, '/') . '\\??/', '"' . $scripturl . '?debug;', $buffer); |
|
| 738 | + elseif (isset($_GET['debug'])) { |
|
| 739 | + $buffer = preg_replace('/(?<!<link rel="canonical" href=)"' . preg_quote($scripturl, '/') . '\\??/', '"' . $scripturl . '?debug;', $buffer); |
|
| 740 | + } |
|
| 691 | 741 | |
| 692 | 742 | // This should work even in 4.2.x, just not CGI without cgi.fix_pathinfo. |
| 693 | 743 | if (!empty($modSettings['queryless_urls']) && (!$context['server']['is_cgi'] || ini_get('cgi.fix_pathinfo') == 1 || @get_cfg_var('cgi.fix_pathinfo') == 1) && ($context['server']['is_apache'] || $context['server']['is_lighttpd'] || $context['server']['is_litespeed'])) |
| 694 | 744 | { |
| 695 | 745 | // Let's do something special for session ids! |
| 696 | - if (defined('SID') && SID != '') |
|
| 697 | - $buffer = preg_replace_callback('~"' . preg_quote($scripturl, '~') . '\?(?:' . SID . '(?:;|&|&))((?:board|topic)=[^#"]+?)(#[^"]*?)?"~', function($m) |
|
| 746 | + if (defined('SID') && SID != '') { |
|
| 747 | + $buffer = preg_replace_callback('~"' . preg_quote($scripturl, '~') . '\?(?:' . SID . '(?:;|&|&))((?:board|topic)=[^#"]+?)(#[^"]*?)?"~', function($m) |
|
| 698 | 748 | { |
| 699 | - global $scripturl; return '"' . $scripturl . "/" . strtr("$m[1]", '&;=', '//,') . ".html?" . SID . (isset($m[2]) ? $m[2] : "") . '"'; |
|
| 749 | + global $scripturl; |
|
| 750 | + } |
|
| 751 | + return '"' . $scripturl . "/" . strtr("$m[1]", '&;=', '//,') . ".html?" . SID . (isset($m[2]) ? $m[2] : "") . '"'; |
|
| 700 | 752 | }, $buffer); |
| 701 | - else |
|
| 702 | - $buffer = preg_replace_callback('~"' . preg_quote($scripturl, '~') . '\?((?:board|topic)=[^#"]+?)(#[^"]*?)?"~', function($m) |
|
| 753 | + else { |
|
| 754 | + $buffer = preg_replace_callback('~"' . preg_quote($scripturl, '~') . '\?((?:board|topic)=[^#"]+?)(#[^"]*?)?"~', function($m) |
|
| 703 | 755 | { |
| 704 | - global $scripturl; return '"' . $scripturl . '/' . strtr("$m[1]", '&;=', '//,') . '.html' . (isset($m[2]) ? $m[2] : "") . '"'; |
|
| 756 | + global $scripturl; |
|
| 757 | + } |
|
| 758 | + return '"' . $scripturl . '/' . strtr("$m[1]", '&;=', '//,') . '.html' . (isset($m[2]) ? $m[2] : "") . '"'; |
|
| 705 | 759 | }, $buffer); |
| 706 | 760 | } |
| 707 | 761 | |
@@ -13,8 +13,9 @@ discard block |
||
| 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 | * Scheduled tasks management dispatcher. This function checks permissions and delegates |
@@ -41,10 +42,11 @@ discard block |
||
| 41 | 42 | ); |
| 42 | 43 | |
| 43 | 44 | // We need to find what's the action. |
| 44 | - if (isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']])) |
|
| 45 | - $context['sub_action'] = $_REQUEST['sa']; |
|
| 46 | - else |
|
| 47 | - $context['sub_action'] = 'tasks'; |
|
| 45 | + if (isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']])) { |
|
| 46 | + $context['sub_action'] = $_REQUEST['sa']; |
|
| 47 | + } else { |
|
| 48 | + $context['sub_action'] = 'tasks'; |
|
| 49 | + } |
|
| 48 | 50 | |
| 49 | 51 | // Now for the lovely tabs. That we all love. |
| 50 | 52 | $context[$context['admin_menu_name']]['tab_data'] = array( |
@@ -94,9 +96,10 @@ discard block |
||
| 94 | 96 | |
| 95 | 97 | // Enable and disable as required. |
| 96 | 98 | $enablers = array(0); |
| 97 | - foreach ($_POST['enable_task'] as $id => $enabled) |
|
| 98 | - if ($enabled) |
|
| 99 | + foreach ($_POST['enable_task'] as $id => $enabled) { |
|
| 100 | + if ($enabled) |
|
| 99 | 101 | $enablers[] = (int) $id; |
| 102 | + } |
|
| 100 | 103 | |
| 101 | 104 | // Do the update! |
| 102 | 105 | $smcFunc['db_query']('', ' |
@@ -134,8 +137,9 @@ discard block |
||
| 134 | 137 | |
| 135 | 138 | // Lets figure out which ones they want to run. |
| 136 | 139 | $tasks = array(); |
| 137 | - foreach ($_POST['run_task'] as $task => $dummy) |
|
| 138 | - $tasks[] = (int) $task; |
|
| 140 | + foreach ($_POST['run_task'] as $task => $dummy) { |
|
| 141 | + $tasks[] = (int) $task; |
|
| 142 | + } |
|
| 139 | 143 | |
| 140 | 144 | // Load up the tasks. |
| 141 | 145 | $request = $smcFunc['db_query']('', ' |
@@ -155,36 +159,41 @@ discard block |
||
| 155 | 159 | while ($row = $smcFunc['db_fetch_assoc']($request)) |
| 156 | 160 | { |
| 157 | 161 | // What kind of task are we handling? |
| 158 | - if (!empty($row['callable'])) |
|
| 159 | - $task_string = $row['callable']; |
|
| 162 | + if (!empty($row['callable'])) { |
|
| 163 | + $task_string = $row['callable']; |
|
| 164 | + } |
|
| 160 | 165 | |
| 161 | 166 | // Default SMF task or old mods? |
| 162 | - elseif (function_exists('scheduled_' . $row['task'])) |
|
| 163 | - $task_string = 'scheduled_' . $row['task']; |
|
| 167 | + elseif (function_exists('scheduled_' . $row['task'])) { |
|
| 168 | + $task_string = 'scheduled_' . $row['task']; |
|
| 169 | + } |
|
| 164 | 170 | |
| 165 | 171 | // One last resource, the task name. |
| 166 | - elseif (!empty($row['task'])) |
|
| 167 | - $task_string = $row['task']; |
|
| 172 | + elseif (!empty($row['task'])) { |
|
| 173 | + $task_string = $row['task']; |
|
| 174 | + } |
|
| 168 | 175 | |
| 169 | 176 | $start_time = microtime(); |
| 170 | 177 | // The functions got to exist for us to use it. |
| 171 | - if (empty($task_string)) |
|
| 172 | - continue; |
|
| 178 | + if (empty($task_string)) { |
|
| 179 | + continue; |
|
| 180 | + } |
|
| 173 | 181 | |
| 174 | 182 | // Try to stop a timeout, this would be bad... |
| 175 | 183 | @set_time_limit(300); |
| 176 | - if (function_exists('apache_reset_timeout')) |
|
| 177 | - @apache_reset_timeout(); |
|
| 184 | + if (function_exists('apache_reset_timeout')) { |
|
| 185 | + @apache_reset_timeout(); |
|
| 186 | + } |
|
| 178 | 187 | |
| 179 | 188 | // Get the callable. |
| 180 | 189 | $callable_task = call_helper($task_string, true); |
| 181 | 190 | |
| 182 | 191 | // Perform the task. |
| 183 | - if (!empty($callable_task)) |
|
| 184 | - $completed = call_user_func($callable_task); |
|
| 185 | - |
|
| 186 | - else |
|
| 187 | - $completed = false; |
|
| 192 | + if (!empty($callable_task)) { |
|
| 193 | + $completed = call_user_func($callable_task); |
|
| 194 | + } else { |
|
| 195 | + $completed = false; |
|
| 196 | + } |
|
| 188 | 197 | |
| 189 | 198 | // Log that we did it ;) |
| 190 | 199 | if ($completed) |
@@ -201,8 +210,9 @@ discard block |
||
| 201 | 210 | $smcFunc['db_free_result']($request); |
| 202 | 211 | |
| 203 | 212 | // If we had any errors, push them to session so we can pick them up next time to tell the user. |
| 204 | - if (!empty($context['scheduled_errors'])) |
|
| 205 | - $_SESSION['st_error'] = $context['scheduled_errors']; |
|
| 213 | + if (!empty($context['scheduled_errors'])) { |
|
| 214 | + $_SESSION['st_error'] = $context['scheduled_errors']; |
|
| 215 | + } |
|
| 206 | 216 | |
| 207 | 217 | redirectexit('action=admin;area=scheduledtasks;done'); |
| 208 | 218 | } |
@@ -374,8 +384,9 @@ discard block |
||
| 374 | 384 | $context['server_time'] = timeformat(time(), false, 'server'); |
| 375 | 385 | |
| 376 | 386 | // Cleaning... |
| 377 | - if (!isset($_GET['tid'])) |
|
| 378 | - fatal_lang_error('no_access', false); |
|
| 387 | + if (!isset($_GET['tid'])) { |
|
| 388 | + fatal_lang_error('no_access', false); |
|
| 389 | + } |
|
| 379 | 390 | $_GET['tid'] = (int) $_GET['tid']; |
| 380 | 391 | |
| 381 | 392 | // Saving? |
@@ -391,10 +402,12 @@ discard block |
||
| 391 | 402 | preg_match('~(\d{1,2}):(\d{1,2})~', $_POST['offset'], $matches); |
| 392 | 403 | |
| 393 | 404 | // If a half is empty then assume zero offset! |
| 394 | - if (!isset($matches[2]) || $matches[2] > 59) |
|
| 395 | - $matches[2] = 0; |
|
| 396 | - if (!isset($matches[1]) || $matches[1] > 23) |
|
| 397 | - $matches[1] = 0; |
|
| 405 | + if (!isset($matches[2]) || $matches[2] > 59) { |
|
| 406 | + $matches[2] = 0; |
|
| 407 | + } |
|
| 408 | + if (!isset($matches[1]) || $matches[1] > 23) { |
|
| 409 | + $matches[1] = 0; |
|
| 410 | + } |
|
| 398 | 411 | |
| 399 | 412 | // Now the offset is easy; easy peasy - except we need to offset by a few hours... |
| 400 | 413 | $offset = $matches[1] * 3600 + $matches[2] * 60 - date('Z'); |
@@ -404,8 +417,9 @@ discard block |
||
| 404 | 417 | $unit = in_array(substr($_POST['unit'], 0, 1), array('m', 'h', 'd', 'w')) ? substr($_POST['unit'], 0, 1) : 'd'; |
| 405 | 418 | |
| 406 | 419 | // Don't allow one minute intervals. |
| 407 | - if ($interval == 1 && $unit == 'm') |
|
| 408 | - $interval = 2; |
|
| 420 | + if ($interval == 1 && $unit == 'm') { |
|
| 421 | + $interval = 2; |
|
| 422 | + } |
|
| 409 | 423 | |
| 410 | 424 | // Is it disabled? |
| 411 | 425 | $disabled = !isset($_POST['enabled']) ? 1 : 0; |
@@ -443,8 +457,9 @@ discard block |
||
| 443 | 457 | ); |
| 444 | 458 | |
| 445 | 459 | // Should never, ever, happen! |
| 446 | - if ($smcFunc['db_num_rows']($request) == 0) |
|
| 447 | - fatal_lang_error('no_access', false); |
|
| 460 | + if ($smcFunc['db_num_rows']($request) == 0) { |
|
| 461 | + fatal_lang_error('no_access', false); |
|
| 462 | + } |
|
| 448 | 463 | |
| 449 | 464 | while ($row = $smcFunc['db_fetch_assoc']($request)) |
| 450 | 465 | { |
@@ -602,13 +617,14 @@ discard block |
||
| 602 | 617 | ) |
| 603 | 618 | ); |
| 604 | 619 | $log_entries = array(); |
| 605 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
| 606 | - $log_entries[] = array( |
|
| 620 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
| 621 | + $log_entries[] = array( |
|
| 607 | 622 | 'id' => $row['id_log'], |
| 608 | 623 | 'name' => isset($txt['scheduled_task_' . $row['task']]) ? $txt['scheduled_task_' . $row['task']] : $row['task'], |
| 609 | 624 | 'time_run' => $row['time_run'], |
| 610 | 625 | 'time_taken' => $row['time_taken'], |
| 611 | 626 | ); |
| 627 | + } |
|
| 612 | 628 | $smcFunc['db_free_result']($request); |
| 613 | 629 | |
| 614 | 630 | return $log_entries; |
@@ -649,8 +665,9 @@ discard block |
||
| 649 | 665 | |
| 650 | 666 | call_integration_hook('integrate_scheduled_tasks_settings', array(&$config_vars)); |
| 651 | 667 | |
| 652 | - if ($return_config) |
|
| 653 | - return $config_vars; |
|
| 668 | + if ($return_config) { |
|
| 669 | + return $config_vars; |
|
| 670 | + } |
|
| 654 | 671 | |
| 655 | 672 | // Set up the template. |
| 656 | 673 | $context['page_title'] = $txt['scheduled_tasks_settings']; |
@@ -15,8 +15,9 @@ discard block |
||
| 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 | * Begin the registration process. |
@@ -29,19 +30,23 @@ discard block |
||
| 29 | 30 | global $language, $scripturl, $smcFunc, $sourcedir, $cur_profile; |
| 30 | 31 | |
| 31 | 32 | // Is this an incoming AJAX check? |
| 32 | - if (isset($_GET['sa']) && $_GET['sa'] == 'usernamecheck') |
|
| 33 | - return RegisterCheckUsername(); |
|
| 33 | + if (isset($_GET['sa']) && $_GET['sa'] == 'usernamecheck') { |
|
| 34 | + return RegisterCheckUsername(); |
|
| 35 | + } |
|
| 34 | 36 | |
| 35 | 37 | // Check if the administrator has it disabled. |
| 36 | - if (!empty($modSettings['registration_method']) && $modSettings['registration_method'] == '3') |
|
| 37 | - fatal_lang_error('registration_disabled', false); |
|
| 38 | + if (!empty($modSettings['registration_method']) && $modSettings['registration_method'] == '3') { |
|
| 39 | + fatal_lang_error('registration_disabled', false); |
|
| 40 | + } |
|
| 38 | 41 | |
| 39 | 42 | // If this user is an admin - redirect them to the admin registration page. |
| 40 | - if (allowedTo('moderate_forum') && !$user_info['is_guest']) |
|
| 41 | - redirectexit('action=admin;area=regcenter;sa=register'); |
|
| 43 | + if (allowedTo('moderate_forum') && !$user_info['is_guest']) { |
|
| 44 | + redirectexit('action=admin;area=regcenter;sa=register'); |
|
| 45 | + } |
|
| 42 | 46 | // You are not a guest, so you are a member - and members don't get to register twice! |
| 43 | - elseif (empty($user_info['is_guest'])) |
|
| 44 | - redirectexit(); |
|
| 47 | + elseif (empty($user_info['is_guest'])) { |
|
| 48 | + redirectexit(); |
|
| 49 | + } |
|
| 45 | 50 | |
| 46 | 51 | loadLanguage('Login'); |
| 47 | 52 | loadTemplate('Register'); |
@@ -82,16 +87,18 @@ discard block |
||
| 82 | 87 | } |
| 83 | 88 | } |
| 84 | 89 | // Make sure they don't squeeze through without agreeing. |
| 85 | - elseif ($current_step > 1 && $context['require_agreement'] && !$context['registration_passed_agreement']) |
|
| 86 | - $current_step = 1; |
|
| 90 | + elseif ($current_step > 1 && $context['require_agreement'] && !$context['registration_passed_agreement']) { |
|
| 91 | + $current_step = 1; |
|
| 92 | + } |
|
| 87 | 93 | |
| 88 | 94 | // Show the user the right form. |
| 89 | 95 | $context['sub_template'] = $current_step == 1 ? 'registration_agreement' : 'registration_form'; |
| 90 | 96 | $context['page_title'] = $current_step == 1 ? $txt['registration_agreement'] : $txt['registration_form']; |
| 91 | 97 | |
| 92 | 98 | // Kinda need this. |
| 93 | - if ($context['sub_template'] == 'registration_form') |
|
| 94 | - loadJavaScriptFile('register.js', array('defer' => false, 'minimize' => true), 'smf_register'); |
|
| 99 | + if ($context['sub_template'] == 'registration_form') { |
|
| 100 | + loadJavaScriptFile('register.js', array('defer' => false, 'minimize' => true), 'smf_register'); |
|
| 101 | + } |
|
| 95 | 102 | |
| 96 | 103 | // Add the register chain to the link tree. |
| 97 | 104 | $context['linktree'][] = array( |
@@ -100,24 +107,26 @@ discard block |
||
| 100 | 107 | ); |
| 101 | 108 | |
| 102 | 109 | // Prepare the time gate! Do it like so, in case later steps want to reset the limit for any reason, but make sure the time is the current one. |
| 103 | - if (!isset($_SESSION['register'])) |
|
| 104 | - $_SESSION['register'] = array( |
|
| 110 | + if (!isset($_SESSION['register'])) { |
|
| 111 | + $_SESSION['register'] = array( |
|
| 105 | 112 | 'timenow' => time(), |
| 106 | 113 | 'limit' => 10, // minimum number of seconds required on this page for registration |
| 107 | 114 | ); |
| 108 | - else |
|
| 109 | - $_SESSION['register']['timenow'] = time(); |
|
| 115 | + } else { |
|
| 116 | + $_SESSION['register']['timenow'] = time(); |
|
| 117 | + } |
|
| 110 | 118 | |
| 111 | 119 | // If you have to agree to the agreement, it needs to be fetched from the file. |
| 112 | 120 | if ($context['require_agreement']) |
| 113 | 121 | { |
| 114 | 122 | // Have we got a localized one? |
| 115 | - if (file_exists($boarddir . '/agreement.' . $user_info['language'] . '.txt')) |
|
| 116 | - $context['agreement'] = parse_bbc(file_get_contents($boarddir . '/agreement.' . $user_info['language'] . '.txt'), true, 'agreement_' . $user_info['language']); |
|
| 117 | - elseif (file_exists($boarddir . '/agreement.txt')) |
|
| 118 | - $context['agreement'] = parse_bbc(file_get_contents($boarddir . '/agreement.txt'), true, 'agreement'); |
|
| 119 | - else |
|
| 120 | - $context['agreement'] = ''; |
|
| 123 | + if (file_exists($boarddir . '/agreement.' . $user_info['language'] . '.txt')) { |
|
| 124 | + $context['agreement'] = parse_bbc(file_get_contents($boarddir . '/agreement.' . $user_info['language'] . '.txt'), true, 'agreement_' . $user_info['language']); |
|
| 125 | + } elseif (file_exists($boarddir . '/agreement.txt')) { |
|
| 126 | + $context['agreement'] = parse_bbc(file_get_contents($boarddir . '/agreement.txt'), true, 'agreement'); |
|
| 127 | + } else { |
|
| 128 | + $context['agreement'] = ''; |
|
| 129 | + } |
|
| 121 | 130 | |
| 122 | 131 | // Nothing to show, lets disable registration and inform the admin of this error |
| 123 | 132 | if (empty($context['agreement'])) |
@@ -133,8 +142,9 @@ discard block |
||
| 133 | 142 | $selectedLanguage = empty($_SESSION['language']) ? $language : $_SESSION['language']; |
| 134 | 143 | |
| 135 | 144 | // Do we have any languages? |
| 136 | - if (empty($context['languages'])) |
|
| 137 | - getLanguages(); |
|
| 145 | + if (empty($context['languages'])) { |
|
| 146 | + getLanguages(); |
|
| 147 | + } |
|
| 138 | 148 | |
| 139 | 149 | // Try to find our selected language. |
| 140 | 150 | foreach ($context['languages'] as $key => $lang) |
@@ -142,8 +152,9 @@ discard block |
||
| 142 | 152 | $context['languages'][$key]['name'] = strtr($lang['name'], array('-utf8' => '')); |
| 143 | 153 | |
| 144 | 154 | // Found it! |
| 145 | - if ($selectedLanguage == $lang['filename']) |
|
| 146 | - $context['languages'][$key]['selected'] = true; |
|
| 155 | + if ($selectedLanguage == $lang['filename']) { |
|
| 156 | + $context['languages'][$key]['selected'] = true; |
|
| 157 | + } |
|
| 147 | 158 | } |
| 148 | 159 | } |
| 149 | 160 | |
@@ -170,16 +181,19 @@ discard block |
||
| 170 | 181 | if (in_array('website', $reg_fields)) |
| 171 | 182 | { |
| 172 | 183 | unset($reg_fields['website']); |
| 173 | - if (isset($_POST['website_title'])) |
|
| 174 | - $cur_profile['website_title'] = $smcFunc['htmlspecialchars']($_POST['website_title']); |
|
| 175 | - if (isset($_POST['website_url'])) |
|
| 176 | - $cur_profile['website_url'] = $smcFunc['htmlspecialchars']($_POST['website_url']); |
|
| 184 | + if (isset($_POST['website_title'])) { |
|
| 185 | + $cur_profile['website_title'] = $smcFunc['htmlspecialchars']($_POST['website_title']); |
|
| 186 | + } |
|
| 187 | + if (isset($_POST['website_url'])) { |
|
| 188 | + $cur_profile['website_url'] = $smcFunc['htmlspecialchars']($_POST['website_url']); |
|
| 189 | + } |
|
| 177 | 190 | } |
| 178 | 191 | |
| 179 | 192 | // We might have had some submissions on this front - go check. |
| 180 | - foreach ($reg_fields as $field) |
|
| 181 | - if (isset($_POST[$field])) |
|
| 193 | + foreach ($reg_fields as $field) { |
|
| 194 | + if (isset($_POST[$field])) |
|
| 182 | 195 | $cur_profile[$field] = $smcFunc['htmlspecialchars']($_POST[$field]); |
| 196 | + } |
|
| 183 | 197 | |
| 184 | 198 | // Load all the fields in question. |
| 185 | 199 | setupProfileContext($reg_fields); |
@@ -196,8 +210,9 @@ discard block |
||
| 196 | 210 | $context['visual_verification_id'] = $verificationOptions['id']; |
| 197 | 211 | } |
| 198 | 212 | // Otherwise we have nothing to show. |
| 199 | - else |
|
| 200 | - $context['visual_verification'] = false; |
|
| 213 | + else { |
|
| 214 | + $context['visual_verification'] = false; |
|
| 215 | + } |
|
| 201 | 216 | |
| 202 | 217 | |
| 203 | 218 | $context += array( |
@@ -208,8 +223,9 @@ discard block |
||
| 208 | 223 | |
| 209 | 224 | // Were there any errors? |
| 210 | 225 | $context['registration_errors'] = array(); |
| 211 | - if (!empty($reg_errors)) |
|
| 212 | - $context['registration_errors'] = $reg_errors; |
|
| 226 | + if (!empty($reg_errors)) { |
|
| 227 | + $context['registration_errors'] = $reg_errors; |
|
| 228 | + } |
|
| 213 | 229 | |
| 214 | 230 | createToken('register'); |
| 215 | 231 | } |
@@ -226,27 +242,32 @@ discard block |
||
| 226 | 242 | validateToken('register'); |
| 227 | 243 | |
| 228 | 244 | // Check to ensure we're forcing SSL for authentication |
| 229 | - if (!empty($modSettings['force_ssl']) && empty($maintenance) && !httpsOn()) |
|
| 230 | - fatal_lang_error('register_ssl_required'); |
|
| 245 | + if (!empty($modSettings['force_ssl']) && empty($maintenance) && !httpsOn()) { |
|
| 246 | + fatal_lang_error('register_ssl_required'); |
|
| 247 | + } |
|
| 231 | 248 | |
| 232 | 249 | // Start collecting together any errors. |
| 233 | 250 | $reg_errors = array(); |
| 234 | 251 | |
| 235 | 252 | // You can't register if it's disabled. |
| 236 | - if (!empty($modSettings['registration_method']) && $modSettings['registration_method'] == 3) |
|
| 237 | - fatal_lang_error('registration_disabled', false); |
|
| 253 | + if (!empty($modSettings['registration_method']) && $modSettings['registration_method'] == 3) { |
|
| 254 | + fatal_lang_error('registration_disabled', false); |
|
| 255 | + } |
|
| 238 | 256 | |
| 239 | 257 | // Well, if you don't agree, you can't register. |
| 240 | - if (!empty($modSettings['requireAgreement']) && empty($_SESSION['registration_agreed'])) |
|
| 241 | - redirectexit(); |
|
| 258 | + if (!empty($modSettings['requireAgreement']) && empty($_SESSION['registration_agreed'])) { |
|
| 259 | + redirectexit(); |
|
| 260 | + } |
|
| 242 | 261 | |
| 243 | 262 | // Make sure they came from *somewhere*, have a session. |
| 244 | - if (!isset($_SESSION['old_url'])) |
|
| 245 | - redirectexit('action=signup'); |
|
| 263 | + if (!isset($_SESSION['old_url'])) { |
|
| 264 | + redirectexit('action=signup'); |
|
| 265 | + } |
|
| 246 | 266 | |
| 247 | 267 | // If we don't require an agreement, we need a extra check for coppa. |
| 248 | - if (empty($modSettings['requireAgreement']) && !empty($modSettings['coppaAge'])) |
|
| 249 | - $_SESSION['skip_coppa'] = !empty($_POST['accept_agreement']); |
|
| 268 | + if (empty($modSettings['requireAgreement']) && !empty($modSettings['coppaAge'])) { |
|
| 269 | + $_SESSION['skip_coppa'] = !empty($_POST['accept_agreement']); |
|
| 270 | + } |
|
| 250 | 271 | // Are they under age, and under age users are banned? |
| 251 | 272 | if (!empty($modSettings['coppaAge']) && empty($modSettings['coppaType']) && empty($_SESSION['skip_coppa'])) |
| 252 | 273 | { |
@@ -255,8 +276,9 @@ discard block |
||
| 255 | 276 | } |
| 256 | 277 | |
| 257 | 278 | // Check the time gate for miscreants. First make sure they came from somewhere that actually set it up. |
| 258 | - if (empty($_SESSION['register']['timenow']) || empty($_SESSION['register']['limit'])) |
|
| 259 | - redirectexit('action=signup'); |
|
| 279 | + if (empty($_SESSION['register']['timenow']) || empty($_SESSION['register']['limit'])) { |
|
| 280 | + redirectexit('action=signup'); |
|
| 281 | + } |
|
| 260 | 282 | // Failing that, check the time on it. |
| 261 | 283 | if (time() - $_SESSION['register']['timenow'] < $_SESSION['register']['limit']) |
| 262 | 284 | { |
@@ -276,8 +298,9 @@ discard block |
||
| 276 | 298 | if (is_array($context['visual_verification'])) |
| 277 | 299 | { |
| 278 | 300 | loadLanguage('Errors'); |
| 279 | - foreach ($context['visual_verification'] as $error) |
|
| 280 | - $reg_errors[] = $txt['error_' . $error]; |
|
| 301 | + foreach ($context['visual_verification'] as $error) { |
|
| 302 | + $reg_errors[] = $txt['error_' . $error]; |
|
| 303 | + } |
|
| 281 | 304 | } |
| 282 | 305 | } |
| 283 | 306 | |
@@ -286,14 +309,16 @@ discard block |
||
| 286 | 309 | if (!is_array($_POST[$key])) |
| 287 | 310 | { |
| 288 | 311 | // For UTF-8, replace any kind of space with a normal space, and remove any kind of control character (incl. "\n" and "\r"), then trim. |
| 289 | - if ($context['utf8']) |
|
| 290 | - $_POST[$key] = $smcFunc['htmltrim'](preg_replace(array('~\p{Z}+~u', '~\p{C}+~u'), array(' ', ''), $_POST[$key])); |
|
| 312 | + if ($context['utf8']) { |
|
| 313 | + $_POST[$key] = $smcFunc['htmltrim'](preg_replace(array('~\p{Z}+~u', '~\p{C}+~u'), array(' ', ''), $_POST[$key])); |
|
| 314 | + } |
|
| 291 | 315 | // Otherwise, just remove "\n" and "\r", then trim. |
| 292 | - else |
|
| 293 | - $_POST[$key] = $smcFunc['htmltrim'](str_replace(array("\n", "\r"), '', $_POST[$key])); |
|
| 316 | + else { |
|
| 317 | + $_POST[$key] = $smcFunc['htmltrim'](str_replace(array("\n", "\r"), '', $_POST[$key])); |
|
| 318 | + } |
|
| 319 | + } else { |
|
| 320 | + $_POST[$key] = htmltrim__recursive($_POST[$key]); |
|
| 294 | 321 | } |
| 295 | - else |
|
| 296 | - $_POST[$key] = htmltrim__recursive($_POST[$key]); |
|
| 297 | 322 | } |
| 298 | 323 | |
| 299 | 324 | // Collect all extra registration fields someone might have filled in. |
@@ -328,13 +353,15 @@ discard block |
||
| 328 | 353 | $possible_strings = array_merge(array('website_url', 'website_title'), $possible_strings); |
| 329 | 354 | |
| 330 | 355 | // Make sure their website URL is squeaky clean |
| 331 | - if (isset($_POST['website_url'])) |
|
| 332 | - $_POST['website_url'] = (string) validate_iri(sanitize_iri($_POST['website_url'])); |
|
| 356 | + if (isset($_POST['website_url'])) { |
|
| 357 | + $_POST['website_url'] = (string) validate_iri(sanitize_iri($_POST['website_url'])); |
|
| 358 | + } |
|
| 333 | 359 | } |
| 334 | 360 | } |
| 335 | 361 | |
| 336 | - if (isset($_POST['secret_answer']) && $_POST['secret_answer'] != '') |
|
| 337 | - $_POST['secret_answer'] = md5($_POST['secret_answer']); |
|
| 362 | + if (isset($_POST['secret_answer']) && $_POST['secret_answer'] != '') { |
|
| 363 | + $_POST['secret_answer'] = md5($_POST['secret_answer']); |
|
| 364 | + } |
|
| 338 | 365 | |
| 339 | 366 | // Needed for isReservedName() and registerMember(). |
| 340 | 367 | require_once($sourcedir . '/Subs-Members.php'); |
@@ -343,8 +370,9 @@ discard block |
||
| 343 | 370 | if (isset($_POST['real_name'])) |
| 344 | 371 | { |
| 345 | 372 | // Are you already allowed to edit the displayed name? |
| 346 | - if (allowedTo('profile_displayed_name') || allowedTo('moderate_forum')) |
|
| 347 | - $canEditDisplayName = true; |
|
| 373 | + if (allowedTo('profile_displayed_name') || allowedTo('moderate_forum')) { |
|
| 374 | + $canEditDisplayName = true; |
|
| 375 | + } |
|
| 348 | 376 | |
| 349 | 377 | // If you are a guest, will you be allowed to once you register? |
| 350 | 378 | else |
@@ -363,32 +391,37 @@ discard block |
||
| 363 | 391 | } |
| 364 | 392 | |
| 365 | 393 | // Only set it if you can and if we are sure it is good |
| 366 | - if ($canEditDisplayName && $smcFunc['htmltrim']($_POST['real_name']) != '' && !isReservedName($_POST['real_name']) && $smcFunc['strlen']($_POST['real_name']) < 60) |
|
| 367 | - $possible_strings[] = 'real_name'; |
|
| 394 | + if ($canEditDisplayName && $smcFunc['htmltrim']($_POST['real_name']) != '' && !isReservedName($_POST['real_name']) && $smcFunc['strlen']($_POST['real_name']) < 60) { |
|
| 395 | + $possible_strings[] = 'real_name'; |
|
| 396 | + } |
|
| 368 | 397 | } |
| 369 | 398 | |
| 370 | 399 | // Handle a string as a birthdate... |
| 371 | - if (isset($_POST['birthdate']) && $_POST['birthdate'] != '') |
|
| 372 | - $_POST['birthdate'] = strftime('%Y-%m-%d', strtotime($_POST['birthdate'])); |
|
| 400 | + if (isset($_POST['birthdate']) && $_POST['birthdate'] != '') { |
|
| 401 | + $_POST['birthdate'] = strftime('%Y-%m-%d', strtotime($_POST['birthdate'])); |
|
| 402 | + } |
|
| 373 | 403 | // Or birthdate parts... |
| 374 | - elseif (!empty($_POST['bday1']) && !empty($_POST['bday2'])) |
|
| 375 | - $_POST['birthdate'] = sprintf('%04d-%02d-%02d', empty($_POST['bday3']) ? 0 : (int) $_POST['bday3'], (int) $_POST['bday1'], (int) $_POST['bday2']); |
|
| 404 | + elseif (!empty($_POST['bday1']) && !empty($_POST['bday2'])) { |
|
| 405 | + $_POST['birthdate'] = sprintf('%04d-%02d-%02d', empty($_POST['bday3']) ? 0 : (int) $_POST['bday3'], (int) $_POST['bday1'], (int) $_POST['bday2']); |
|
| 406 | + } |
|
| 376 | 407 | |
| 377 | 408 | // Validate the passed language file. |
| 378 | 409 | if (isset($_POST['lngfile']) && !empty($modSettings['userLanguage'])) |
| 379 | 410 | { |
| 380 | 411 | // Do we have any languages? |
| 381 | - if (empty($context['languages'])) |
|
| 382 | - getLanguages(); |
|
| 412 | + if (empty($context['languages'])) { |
|
| 413 | + getLanguages(); |
|
| 414 | + } |
|
| 383 | 415 | |
| 384 | 416 | // Did we find it? |
| 385 | - if (isset($context['languages'][$_POST['lngfile']])) |
|
| 386 | - $_SESSION['language'] = $_POST['lngfile']; |
|
| 387 | - else |
|
| 417 | + if (isset($context['languages'][$_POST['lngfile']])) { |
|
| 418 | + $_SESSION['language'] = $_POST['lngfile']; |
|
| 419 | + } else { |
|
| 420 | + unset($_POST['lngfile']); |
|
| 421 | + } |
|
| 422 | + } else { |
|
| 388 | 423 | unset($_POST['lngfile']); |
| 389 | 424 | } |
| 390 | - else |
|
| 391 | - unset($_POST['lngfile']); |
|
| 392 | 425 | |
| 393 | 426 | // Set the options needed for registration. |
| 394 | 427 | $regOptions = array( |
@@ -408,22 +441,27 @@ discard block |
||
| 408 | 441 | ); |
| 409 | 442 | |
| 410 | 443 | // Include the additional options that might have been filled in. |
| 411 | - foreach ($possible_strings as $var) |
|
| 412 | - if (isset($_POST[$var])) |
|
| 444 | + foreach ($possible_strings as $var) { |
|
| 445 | + if (isset($_POST[$var])) |
|
| 413 | 446 | $regOptions['extra_register_vars'][$var] = $smcFunc['htmlspecialchars']($_POST[$var], ENT_QUOTES); |
| 414 | - foreach ($possible_ints as $var) |
|
| 415 | - if (isset($_POST[$var])) |
|
| 447 | + } |
|
| 448 | + foreach ($possible_ints as $var) { |
|
| 449 | + if (isset($_POST[$var])) |
|
| 416 | 450 | $regOptions['extra_register_vars'][$var] = (int) $_POST[$var]; |
| 417 | - foreach ($possible_floats as $var) |
|
| 418 | - if (isset($_POST[$var])) |
|
| 451 | + } |
|
| 452 | + foreach ($possible_floats as $var) { |
|
| 453 | + if (isset($_POST[$var])) |
|
| 419 | 454 | $regOptions['extra_register_vars'][$var] = (float) $_POST[$var]; |
| 420 | - foreach ($possible_bools as $var) |
|
| 421 | - if (isset($_POST[$var])) |
|
| 455 | + } |
|
| 456 | + foreach ($possible_bools as $var) { |
|
| 457 | + if (isset($_POST[$var])) |
|
| 422 | 458 | $regOptions['extra_register_vars'][$var] = empty($_POST[$var]) ? 0 : 1; |
| 459 | + } |
|
| 423 | 460 | |
| 424 | 461 | // Registration options are always default options... |
| 425 | - if (isset($_POST['default_options'])) |
|
| 426 | - $_POST['options'] = isset($_POST['options']) ? $_POST['options'] + $_POST['default_options'] : $_POST['default_options']; |
|
| 462 | + if (isset($_POST['default_options'])) { |
|
| 463 | + $_POST['options'] = isset($_POST['options']) ? $_POST['options'] + $_POST['default_options'] : $_POST['default_options']; |
|
| 464 | + } |
|
| 427 | 465 | $regOptions['theme_vars'] = isset($_POST['options']) && is_array($_POST['options']) ? $_POST['options'] : array(); |
| 428 | 466 | |
| 429 | 467 | // Make sure they are clean, dammit! |
@@ -443,12 +481,14 @@ discard block |
||
| 443 | 481 | while ($row = $smcFunc['db_fetch_assoc']($request)) |
| 444 | 482 | { |
| 445 | 483 | // Don't allow overriding of the theme variables. |
| 446 | - if (isset($regOptions['theme_vars'][$row['col_name']])) |
|
| 447 | - unset($regOptions['theme_vars'][$row['col_name']]); |
|
| 484 | + if (isset($regOptions['theme_vars'][$row['col_name']])) { |
|
| 485 | + unset($regOptions['theme_vars'][$row['col_name']]); |
|
| 486 | + } |
|
| 448 | 487 | |
| 449 | 488 | // Not actually showing it then? |
| 450 | - if (!$row['show_reg']) |
|
| 451 | - continue; |
|
| 489 | + if (!$row['show_reg']) { |
|
| 490 | + continue; |
|
| 491 | + } |
|
| 452 | 492 | |
| 453 | 493 | // Prepare the value! |
| 454 | 494 | $value = isset($_POST['customfield'][$row['col_name']]) ? trim($_POST['customfield'][$row['col_name']]) : ''; |
@@ -457,24 +497,27 @@ discard block |
||
| 457 | 497 | if (!in_array($row['field_type'], array('check', 'select', 'radio'))) |
| 458 | 498 | { |
| 459 | 499 | // Is it too long? |
| 460 | - if ($row['field_length'] && $row['field_length'] < $smcFunc['strlen']($value)) |
|
| 461 | - $custom_field_errors[] = array('custom_field_too_long', array($row['field_name'], $row['field_length'])); |
|
| 500 | + if ($row['field_length'] && $row['field_length'] < $smcFunc['strlen']($value)) { |
|
| 501 | + $custom_field_errors[] = array('custom_field_too_long', array($row['field_name'], $row['field_length'])); |
|
| 502 | + } |
|
| 462 | 503 | |
| 463 | 504 | // Any masks to apply? |
| 464 | 505 | if ($row['field_type'] == 'text' && !empty($row['mask']) && $row['mask'] != 'none') |
| 465 | 506 | { |
| 466 | - if ($row['mask'] == 'email' && (!filter_var($value, FILTER_VALIDATE_EMAIL) || strlen($value) > 255)) |
|
| 467 | - $custom_field_errors[] = array('custom_field_invalid_email', array($row['field_name'])); |
|
| 468 | - elseif ($row['mask'] == 'number' && preg_match('~[^\d]~', $value)) |
|
| 469 | - $custom_field_errors[] = array('custom_field_not_number', array($row['field_name'])); |
|
| 470 | - elseif (substr($row['mask'], 0, 5) == 'regex' && trim($value) != '' && preg_match(substr($row['mask'], 5), $value) === 0) |
|
| 471 | - $custom_field_errors[] = array('custom_field_inproper_format', array($row['field_name'])); |
|
| 507 | + if ($row['mask'] == 'email' && (!filter_var($value, FILTER_VALIDATE_EMAIL) || strlen($value) > 255)) { |
|
| 508 | + $custom_field_errors[] = array('custom_field_invalid_email', array($row['field_name'])); |
|
| 509 | + } elseif ($row['mask'] == 'number' && preg_match('~[^\d]~', $value)) { |
|
| 510 | + $custom_field_errors[] = array('custom_field_not_number', array($row['field_name'])); |
|
| 511 | + } elseif (substr($row['mask'], 0, 5) == 'regex' && trim($value) != '' && preg_match(substr($row['mask'], 5), $value) === 0) { |
|
| 512 | + $custom_field_errors[] = array('custom_field_inproper_format', array($row['field_name'])); |
|
| 513 | + } |
|
| 472 | 514 | } |
| 473 | 515 | } |
| 474 | 516 | |
| 475 | 517 | // Is this required but not there? |
| 476 | - if (trim($value) == '' && $row['show_reg'] > 1) |
|
| 477 | - $custom_field_errors[] = array('custom_field_empty', array($row['field_name'])); |
|
| 518 | + if (trim($value) == '' && $row['show_reg'] > 1) { |
|
| 519 | + $custom_field_errors[] = array('custom_field_empty', array($row['field_name'])); |
|
| 520 | + } |
|
| 478 | 521 | } |
| 479 | 522 | $smcFunc['db_free_result']($request); |
| 480 | 523 | |
@@ -482,8 +525,9 @@ discard block |
||
| 482 | 525 | if (!empty($custom_field_errors)) |
| 483 | 526 | { |
| 484 | 527 | loadLanguage('Errors'); |
| 485 | - foreach ($custom_field_errors as $error) |
|
| 486 | - $reg_errors[] = vsprintf($txt['error_' . $error[0]], $error[1]); |
|
| 528 | + foreach ($custom_field_errors as $error) { |
|
| 529 | + $reg_errors[] = vsprintf($txt['error_' . $error[0]], $error[1]); |
|
| 530 | + } |
|
| 487 | 531 | } |
| 488 | 532 | |
| 489 | 533 | // Lets check for other errors before trying to register the member. |
@@ -528,8 +572,9 @@ discard block |
||
| 528 | 572 | } |
| 529 | 573 | |
| 530 | 574 | // If COPPA has been selected then things get complicated, setup the template. |
| 531 | - if (!empty($modSettings['coppaAge']) && empty($_SESSION['skip_coppa'])) |
|
| 532 | - redirectexit('action=coppa;member=' . $memberID); |
|
| 575 | + if (!empty($modSettings['coppaAge']) && empty($_SESSION['skip_coppa'])) { |
|
| 576 | + redirectexit('action=coppa;member=' . $memberID); |
|
| 577 | + } |
|
| 533 | 578 | // Basic template variable setup. |
| 534 | 579 | elseif (!empty($modSettings['registration_method'])) |
| 535 | 580 | { |
@@ -541,8 +586,7 @@ discard block |
||
| 541 | 586 | 'sub_template' => 'after', |
| 542 | 587 | 'description' => $modSettings['registration_method'] == 2 ? $txt['approval_after_registration'] : $txt['activate_after_registration'] |
| 543 | 588 | ); |
| 544 | - } |
|
| 545 | - else |
|
| 589 | + } else |
|
| 546 | 590 | { |
| 547 | 591 | call_integration_hook('integrate_activate', array($regOptions['username'])); |
| 548 | 592 | |
@@ -562,16 +606,18 @@ discard block |
||
| 562 | 606 | global $context, $txt, $modSettings, $scripturl, $sourcedir, $smcFunc, $language, $user_info; |
| 563 | 607 | |
| 564 | 608 | // Logged in users should not bother to activate their accounts |
| 565 | - if (!empty($user_info['id'])) |
|
| 566 | - redirectexit(); |
|
| 609 | + if (!empty($user_info['id'])) { |
|
| 610 | + redirectexit(); |
|
| 611 | + } |
|
| 567 | 612 | |
| 568 | 613 | loadLanguage('Login'); |
| 569 | 614 | loadTemplate('Login'); |
| 570 | 615 | |
| 571 | 616 | if (empty($_REQUEST['u']) && empty($_POST['user'])) |
| 572 | 617 | { |
| 573 | - if (empty($modSettings['registration_method']) || $modSettings['registration_method'] == '3') |
|
| 574 | - fatal_lang_error('no_access', false); |
|
| 618 | + if (empty($modSettings['registration_method']) || $modSettings['registration_method'] == '3') { |
|
| 619 | + fatal_lang_error('no_access', false); |
|
| 620 | + } |
|
| 575 | 621 | |
| 576 | 622 | $context['member_id'] = 0; |
| 577 | 623 | $context['sub_template'] = 'resend'; |
@@ -611,11 +657,13 @@ discard block |
||
| 611 | 657 | // Change their email address? (they probably tried a fake one first :P.) |
| 612 | 658 | if (isset($_POST['new_email'], $_REQUEST['passwd']) && hash_password($row['member_name'], $_REQUEST['passwd']) == $row['passwd'] && ($row['is_activated'] == 0 || $row['is_activated'] == 2)) |
| 613 | 659 | { |
| 614 | - if (empty($modSettings['registration_method']) || $modSettings['registration_method'] == 3) |
|
| 615 | - fatal_lang_error('no_access', false); |
|
| 660 | + if (empty($modSettings['registration_method']) || $modSettings['registration_method'] == 3) { |
|
| 661 | + fatal_lang_error('no_access', false); |
|
| 662 | + } |
|
| 616 | 663 | |
| 617 | - if (!filter_var($_POST['new_email'], FILTER_VALIDATE_EMAIL)) |
|
| 618 | - fatal_error(sprintf($txt['valid_email_needed'], $smcFunc['htmlspecialchars']($_POST['new_email'])), false); |
|
| 664 | + if (!filter_var($_POST['new_email'], FILTER_VALIDATE_EMAIL)) { |
|
| 665 | + fatal_error(sprintf($txt['valid_email_needed'], $smcFunc['htmlspecialchars']($_POST['new_email'])), false); |
|
| 666 | + } |
|
| 619 | 667 | |
| 620 | 668 | // Make sure their email isn't banned. |
| 621 | 669 | isBannedEmail($_POST['new_email'], 'cannot_register', $txt['ban_register_prohibited']); |
@@ -631,8 +679,9 @@ discard block |
||
| 631 | 679 | ) |
| 632 | 680 | ); |
| 633 | 681 | |
| 634 | - if ($smcFunc['db_num_rows']($request) != 0) |
|
| 635 | - fatal_lang_error('email_in_use', false, array($smcFunc['htmlspecialchars']($_POST['new_email']))); |
|
| 682 | + if ($smcFunc['db_num_rows']($request) != 0) { |
|
| 683 | + fatal_lang_error('email_in_use', false, array($smcFunc['htmlspecialchars']($_POST['new_email']))); |
|
| 684 | + } |
|
| 636 | 685 | $smcFunc['db_free_result']($request); |
| 637 | 686 | |
| 638 | 687 | updateMemberData($row['id_member'], array('email_address' => $_POST['new_email'])); |
@@ -670,9 +719,9 @@ discard block |
||
| 670 | 719 | // Quit if this code is not right. |
| 671 | 720 | if (empty($_REQUEST['code']) || $row['validation_code'] != $_REQUEST['code']) |
| 672 | 721 | { |
| 673 | - if (!empty($row['is_activated'])) |
|
| 674 | - fatal_lang_error('already_activated', false); |
|
| 675 | - elseif ($row['validation_code'] == '') |
|
| 722 | + if (!empty($row['is_activated'])) { |
|
| 723 | + fatal_lang_error('already_activated', false); |
|
| 724 | + } elseif ($row['validation_code'] == '') |
|
| 676 | 725 | { |
| 677 | 726 | loadLanguage('Profile'); |
| 678 | 727 | fatal_error(sprintf($txt['registration_not_approved'], $scripturl . '?action=activate;user=' . $row['member_name']), false); |
@@ -722,8 +771,9 @@ discard block |
||
| 722 | 771 | loadTemplate('Register'); |
| 723 | 772 | |
| 724 | 773 | // No User ID?? |
| 725 | - if (!isset($_GET['member'])) |
|
| 726 | - fatal_lang_error('no_access', false); |
|
| 774 | + if (!isset($_GET['member'])) { |
|
| 775 | + fatal_lang_error('no_access', false); |
|
| 776 | + } |
|
| 727 | 777 | |
| 728 | 778 | // Get the user details... |
| 729 | 779 | $request = $smcFunc['db_query']('', ' |
@@ -736,8 +786,9 @@ discard block |
||
| 736 | 786 | 'is_coppa' => 5, |
| 737 | 787 | ) |
| 738 | 788 | ); |
| 739 | - if ($smcFunc['db_num_rows']($request) == 0) |
|
| 740 | - fatal_lang_error('no_access', false); |
|
| 789 | + if ($smcFunc['db_num_rows']($request) == 0) { |
|
| 790 | + fatal_lang_error('no_access', false); |
|
| 791 | + } |
|
| 741 | 792 | list ($username) = $smcFunc['db_fetch_row']($request); |
| 742 | 793 | $smcFunc['db_free_result']($request); |
| 743 | 794 | |
@@ -775,8 +826,7 @@ discard block |
||
| 775 | 826 | echo $data; |
| 776 | 827 | obExit(false); |
| 777 | 828 | } |
| 778 | - } |
|
| 779 | - else |
|
| 829 | + } else |
|
| 780 | 830 | { |
| 781 | 831 | $context += array( |
| 782 | 832 | 'page_title' => $txt['coppa_title'], |
@@ -829,8 +879,9 @@ discard block |
||
| 829 | 879 | { |
| 830 | 880 | require_once($sourcedir . '/Subs-Graphics.php'); |
| 831 | 881 | |
| 832 | - if (in_array('gd', get_loaded_extensions()) && !showCodeImage($code)) |
|
| 833 | - header('HTTP/1.1 400 Bad Request'); |
|
| 882 | + if (in_array('gd', get_loaded_extensions()) && !showCodeImage($code)) { |
|
| 883 | + header('HTTP/1.1 400 Bad Request'); |
|
| 884 | + } |
|
| 834 | 885 | |
| 835 | 886 | // Otherwise just show a pre-defined letter. |
| 836 | 887 | elseif (isset($_REQUEST['letter'])) |
@@ -848,14 +899,13 @@ discard block |
||
| 848 | 899 | header('content-type: image/gif'); |
| 849 | 900 | die("\x47\x49\x46\x38\x39\x61\x01\x00\x01\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x21\xF9\x04\x01\x00\x00\x00\x00\x2C\x00\x00\x00\x00\x01\x00\x01\x00\x00\x02\x02\x44\x01\x00\x3B"); |
| 850 | 901 | } |
| 851 | - } |
|
| 852 | - |
|
| 853 | - elseif ($_REQUEST['format'] === '.wav') |
|
| 902 | + } elseif ($_REQUEST['format'] === '.wav') |
|
| 854 | 903 | { |
| 855 | 904 | require_once($sourcedir . '/Subs-Sound.php'); |
| 856 | 905 | |
| 857 | - if (!createWaveFile($code)) |
|
| 858 | - header('HTTP/1.1 400 Bad Request'); |
|
| 906 | + if (!createWaveFile($code)) { |
|
| 907 | + header('HTTP/1.1 400 Bad Request'); |
|
| 908 | + } |
|
| 859 | 909 | } |
| 860 | 910 | |
| 861 | 911 | // We all die one day... |
@@ -13,8 +13,9 @@ discard block |
||
| 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 | * Get all birthdays within the given time range. |
@@ -60,8 +61,7 @@ discard block |
||
| 60 | 61 | 'max_year' => $year_high, |
| 61 | 62 | ) |
| 62 | 63 | ); |
| 63 | - } |
|
| 64 | - else |
|
| 64 | + } else |
|
| 65 | 65 | { |
| 66 | 66 | $result = $smcFunc['db_query']('birthday_array', ' |
| 67 | 67 | SELECT id_member, real_name, YEAR(birthdate) AS birth_year, birthdate |
@@ -91,10 +91,11 @@ discard block |
||
| 91 | 91 | $bday = array(); |
| 92 | 92 | while ($row = $smcFunc['db_fetch_assoc']($result)) |
| 93 | 93 | { |
| 94 | - if ($year_low != $year_high) |
|
| 95 | - $age_year = substr($row['birthdate'], 5) < substr($high_date, 5) ? $year_high : $year_low; |
|
| 96 | - else |
|
| 97 | - $age_year = $year_low; |
|
| 94 | + if ($year_low != $year_high) { |
|
| 95 | + $age_year = substr($row['birthdate'], 5) < substr($high_date, 5) ? $year_high : $year_low; |
|
| 96 | + } else { |
|
| 97 | + $age_year = $year_low; |
|
| 98 | + } |
|
| 98 | 99 | |
| 99 | 100 | $bday[$age_year . substr($row['birthdate'], 4)][] = array( |
| 100 | 101 | 'id' => $row['id_member'], |
@@ -108,8 +109,9 @@ discard block |
||
| 108 | 109 | ksort($bday); |
| 109 | 110 | |
| 110 | 111 | // Set is_last, so the themes know when to stop placing separators. |
| 111 | - foreach ($bday as $mday => $array) |
|
| 112 | - $bday[$mday][count($array) - 1]['is_last'] = true; |
|
| 112 | + foreach ($bday as $mday => $array) { |
|
| 113 | + $bday[$mday][count($array) - 1]['is_last'] = true; |
|
| 114 | + } |
|
| 113 | 115 | |
| 114 | 116 | return $bday; |
| 115 | 117 | } |
@@ -133,8 +135,9 @@ discard block |
||
| 133 | 135 | static $timezone_array = array(); |
| 134 | 136 | require_once($sourcedir . '/Subs.php'); |
| 135 | 137 | |
| 136 | - if (empty($timezone_array['default'])) |
|
| 137 | - $timezone_array['default'] = timezone_open(date_default_timezone_get()); |
|
| 138 | + if (empty($timezone_array['default'])) { |
|
| 139 | + $timezone_array['default'] = timezone_open(date_default_timezone_get()); |
|
| 140 | + } |
|
| 138 | 141 | |
| 139 | 142 | $low_object = date_create($low_date); |
| 140 | 143 | $high_object = date_create($high_date); |
@@ -161,8 +164,9 @@ discard block |
||
| 161 | 164 | while ($row = $smcFunc['db_fetch_assoc']($result)) |
| 162 | 165 | { |
| 163 | 166 | // If the attached topic is not approved then for the moment pretend it doesn't exist |
| 164 | - if (!empty($row['id_first_msg']) && $modSettings['postmod_active'] && !$row['approved']) |
|
| 165 | - continue; |
|
| 167 | + if (!empty($row['id_first_msg']) && $modSettings['postmod_active'] && !$row['approved']) { |
|
| 168 | + continue; |
|
| 169 | + } |
|
| 166 | 170 | |
| 167 | 171 | // Force a censor of the title - as often these are used by others. |
| 168 | 172 | censorText($row['title'], $use_permissions ? false : true); |
@@ -170,12 +174,14 @@ discard block |
||
| 170 | 174 | // Get the various time and date properties for this event |
| 171 | 175 | list($start, $end, $allday, $span, $tz, $tz_abbrev) = buildEventDatetimes($row); |
| 172 | 176 | |
| 173 | - if (empty($timezone_array[$tz])) |
|
| 174 | - $timezone_array[$tz] = timezone_open($tz); |
|
| 177 | + if (empty($timezone_array[$tz])) { |
|
| 178 | + $timezone_array[$tz] = timezone_open($tz); |
|
| 179 | + } |
|
| 175 | 180 | |
| 176 | 181 | // Sanity check |
| 177 | - if (!empty($start['error_count']) || !empty($start['warning_count']) || !empty($end['error_count']) || !empty($end['warning_count'])) |
|
| 178 | - continue; |
|
| 182 | + if (!empty($start['error_count']) || !empty($start['warning_count']) || !empty($end['error_count']) || !empty($end['warning_count'])) { |
|
| 183 | + continue; |
|
| 184 | + } |
|
| 179 | 185 | |
| 180 | 186 | // Get set up for the loop |
| 181 | 187 | $start_object = date_create($row['start_date'] . (!$allday ? ' ' . $row['start_time'] : ''), $timezone_array[$tz]); |
@@ -239,8 +245,8 @@ discard block |
||
| 239 | 245 | ); |
| 240 | 246 | |
| 241 | 247 | // If we're using permissions (calendar pages?) then just ouput normal contextual style information. |
| 242 | - if ($use_permissions) |
|
| 243 | - $events[date_format($cal_date, 'Y-m-d')][] = array_merge($eventProperties, array( |
|
| 248 | + if ($use_permissions) { |
|
| 249 | + $events[date_format($cal_date, 'Y-m-d')][] = array_merge($eventProperties, array( |
|
| 244 | 250 | 'href' => $row['id_board'] == 0 ? '' : $scripturl . '?topic=' . $row['id_topic'] . '.0', |
| 245 | 251 | 'link' => $row['id_board'] == 0 ? $row['title'] : '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.0">' . $row['title'] . '</a>', |
| 246 | 252 | 'can_edit' => allowedTo('calendar_edit_any') || ($row['id_member'] == $user_info['id'] && allowedTo('calendar_edit_own')), |
@@ -248,9 +254,10 @@ discard block |
||
| 248 | 254 | 'can_export' => !empty($modSettings['cal_export']) ? true : false, |
| 249 | 255 | 'export_href' => $scripturl . '?action=calendar;sa=ical;eventid=' . $row['id_event'] . ';' . $context['session_var'] . '=' . $context['session_id'], |
| 250 | 256 | )); |
| 257 | + } |
|
| 251 | 258 | // Otherwise, this is going to be cached and the VIEWER'S permissions should apply... just put together some info. |
| 252 | - else |
|
| 253 | - $events[date_format($cal_date, 'Y-m-d')][] = array_merge($eventProperties, array( |
|
| 259 | + else { |
|
| 260 | + $events[date_format($cal_date, 'Y-m-d')][] = array_merge($eventProperties, array( |
|
| 254 | 261 | 'href' => $row['id_topic'] == 0 ? '' : $scripturl . '?topic=' . $row['id_topic'] . '.0', |
| 255 | 262 | 'link' => $row['id_topic'] == 0 ? $row['title'] : '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.0">' . $row['title'] . '</a>', |
| 256 | 263 | 'can_edit' => false, |
@@ -260,6 +267,7 @@ discard block |
||
| 260 | 267 | 'poster' => $row['id_member'], |
| 261 | 268 | 'allowed_groups' => explode(',', $row['member_groups']), |
| 262 | 269 | )); |
| 270 | + } |
|
| 263 | 271 | |
| 264 | 272 | date_add($cal_date, date_interval_create_from_date_string('1 day')); |
| 265 | 273 | } |
@@ -269,8 +277,9 @@ discard block |
||
| 269 | 277 | // If we're doing normal contextual data, go through and make things clear to the templates ;). |
| 270 | 278 | if ($use_permissions) |
| 271 | 279 | { |
| 272 | - foreach ($events as $mday => $array) |
|
| 273 | - $events[$mday][count($array) - 1]['is_last'] = true; |
|
| 280 | + foreach ($events as $mday => $array) { |
|
| 281 | + $events[$mday][count($array) - 1]['is_last'] = true; |
|
| 282 | + } |
|
| 274 | 283 | } |
| 275 | 284 | |
| 276 | 285 | ksort($events); |
@@ -290,11 +299,12 @@ discard block |
||
| 290 | 299 | global $smcFunc; |
| 291 | 300 | |
| 292 | 301 | // Get the lowest and highest dates for "all years". |
| 293 | - if (substr($low_date, 0, 4) != substr($high_date, 0, 4)) |
|
| 294 | - $allyear_part = 'event_date BETWEEN {date:all_year_low} AND {date:all_year_dec} |
|
| 302 | + if (substr($low_date, 0, 4) != substr($high_date, 0, 4)) { |
|
| 303 | + $allyear_part = 'event_date BETWEEN {date:all_year_low} AND {date:all_year_dec} |
|
| 295 | 304 | OR event_date BETWEEN {date:all_year_jan} AND {date:all_year_high}'; |
| 296 | - else |
|
| 297 | - $allyear_part = 'event_date BETWEEN {date:all_year_low} AND {date:all_year_high}'; |
|
| 305 | + } else { |
|
| 306 | + $allyear_part = 'event_date BETWEEN {date:all_year_low} AND {date:all_year_high}'; |
|
| 307 | + } |
|
| 298 | 308 | |
| 299 | 309 | // Find some holidays... ;). |
| 300 | 310 | $result = $smcFunc['db_query']('', ' |
@@ -314,10 +324,11 @@ discard block |
||
| 314 | 324 | $holidays = array(); |
| 315 | 325 | while ($row = $smcFunc['db_fetch_assoc']($result)) |
| 316 | 326 | { |
| 317 | - if (substr($low_date, 0, 4) != substr($high_date, 0, 4)) |
|
| 318 | - $event_year = substr($row['event_date'], 5) < substr($high_date, 5) ? substr($high_date, 0, 4) : substr($low_date, 0, 4); |
|
| 319 | - else |
|
| 320 | - $event_year = substr($low_date, 0, 4); |
|
| 327 | + if (substr($low_date, 0, 4) != substr($high_date, 0, 4)) { |
|
| 328 | + $event_year = substr($row['event_date'], 5) < substr($high_date, 5) ? substr($high_date, 0, 4) : substr($low_date, 0, 4); |
|
| 329 | + } else { |
|
| 330 | + $event_year = substr($low_date, 0, 4); |
|
| 331 | + } |
|
| 321 | 332 | |
| 322 | 333 | $holidays[$event_year . substr($row['event_date'], 4)][] = $row['title']; |
| 323 | 334 | } |
@@ -343,10 +354,12 @@ discard block |
||
| 343 | 354 | isAllowedTo('calendar_post'); |
| 344 | 355 | |
| 345 | 356 | // No board? No topic?!? |
| 346 | - if (empty($board)) |
|
| 347 | - fatal_lang_error('missing_board_id', false); |
|
| 348 | - if (empty($topic)) |
|
| 349 | - fatal_lang_error('missing_topic_id', false); |
|
| 357 | + if (empty($board)) { |
|
| 358 | + fatal_lang_error('missing_board_id', false); |
|
| 359 | + } |
|
| 360 | + if (empty($topic)) { |
|
| 361 | + fatal_lang_error('missing_topic_id', false); |
|
| 362 | + } |
|
| 350 | 363 | |
| 351 | 364 | // Administrator, Moderator, or owner. Period. |
| 352 | 365 | if (!allowedTo('admin_forum') && !allowedTo('moderate_board')) |
@@ -364,12 +377,14 @@ discard block |
||
| 364 | 377 | if ($row = $smcFunc['db_fetch_assoc']($result)) |
| 365 | 378 | { |
| 366 | 379 | // Not the owner of the topic. |
| 367 | - if ($row['id_member_started'] != $user_info['id']) |
|
| 368 | - fatal_lang_error('not_your_topic', 'user'); |
|
| 380 | + if ($row['id_member_started'] != $user_info['id']) { |
|
| 381 | + fatal_lang_error('not_your_topic', 'user'); |
|
| 382 | + } |
|
| 369 | 383 | } |
| 370 | 384 | // Topic/Board doesn't exist..... |
| 371 | - else |
|
| 372 | - fatal_lang_error('calendar_no_topic', 'general'); |
|
| 385 | + else { |
|
| 386 | + fatal_lang_error('calendar_no_topic', 'general'); |
|
| 387 | + } |
|
| 373 | 388 | $smcFunc['db_free_result']($result); |
| 374 | 389 | } |
| 375 | 390 | } |
@@ -457,14 +472,16 @@ discard block |
||
| 457 | 472 | if (!empty($calendarOptions['start_day'])) |
| 458 | 473 | { |
| 459 | 474 | $nShift -= $calendarOptions['start_day']; |
| 460 | - if ($nShift < 0) |
|
| 461 | - $nShift = 7 + $nShift; |
|
| 475 | + if ($nShift < 0) { |
|
| 476 | + $nShift = 7 + $nShift; |
|
| 477 | + } |
|
| 462 | 478 | } |
| 463 | 479 | |
| 464 | 480 | // Number of rows required to fit the month. |
| 465 | 481 | $nRows = floor(($month_info['last_day']['day_of_month'] + $nShift) / 7); |
| 466 | - if (($month_info['last_day']['day_of_month'] + $nShift) % 7) |
|
| 467 | - $nRows++; |
|
| 482 | + if (($month_info['last_day']['day_of_month'] + $nShift) % 7) { |
|
| 483 | + $nRows++; |
|
| 484 | + } |
|
| 468 | 485 | |
| 469 | 486 | // Fetch the arrays for birthdays, posted events, and holidays. |
| 470 | 487 | $bday = $calendarOptions['show_birthdays'] ? getBirthdayRange($month_info['first_day']['date'], $month_info['last_day']['date']) : array(); |
@@ -477,8 +494,9 @@ discard block |
||
| 477 | 494 | { |
| 478 | 495 | $calendarGrid['week_days'][] = $count; |
| 479 | 496 | $count++; |
| 480 | - if ($count == 7) |
|
| 481 | - $count = 0; |
|
| 497 | + if ($count == 7) { |
|
| 498 | + $count = 0; |
|
| 499 | + } |
|
| 482 | 500 | } |
| 483 | 501 | |
| 484 | 502 | // Iterate through each week. |
@@ -495,8 +513,9 @@ discard block |
||
| 495 | 513 | { |
| 496 | 514 | $nDay = ($nRow * 7) + $nCol - $nShift + 1; |
| 497 | 515 | |
| 498 | - if ($nDay < 1 || $nDay > $month_info['last_day']['day_of_month']) |
|
| 499 | - $nDay = 0; |
|
| 516 | + if ($nDay < 1 || $nDay > $month_info['last_day']['day_of_month']) { |
|
| 517 | + $nDay = 0; |
|
| 518 | + } |
|
| 500 | 519 | |
| 501 | 520 | $date = sprintf('%04d-%02d-%02d', $year, $month, $nDay); |
| 502 | 521 | |
@@ -514,8 +533,9 @@ discard block |
||
| 514 | 533 | } |
| 515 | 534 | |
| 516 | 535 | // What is the last day of the month? |
| 517 | - if ($is_previous === true) |
|
| 518 | - $calendarGrid['last_of_month'] = $month_info['last_day']['day_of_month']; |
|
| 536 | + if ($is_previous === true) { |
|
| 537 | + $calendarGrid['last_of_month'] = $month_info['last_day']['day_of_month']; |
|
| 538 | + } |
|
| 519 | 539 | |
| 520 | 540 | // We'll use the shift in the template. |
| 521 | 541 | $calendarGrid['shift'] = $nShift; |
@@ -549,8 +569,9 @@ discard block |
||
| 549 | 569 | { |
| 550 | 570 | // Here we offset accordingly to get things to the real start of a week. |
| 551 | 571 | $date_diff = $day_of_week - $calendarOptions['start_day']; |
| 552 | - if ($date_diff < 0) |
|
| 553 | - $date_diff += 7; |
|
| 572 | + if ($date_diff < 0) { |
|
| 573 | + $date_diff += 7; |
|
| 574 | + } |
|
| 554 | 575 | $new_timestamp = mktime(0, 0, 0, $month, $day, $year) - $date_diff * 86400; |
| 555 | 576 | $day = (int) strftime('%d', $new_timestamp); |
| 556 | 577 | $month = (int) strftime('%m', $new_timestamp); |
@@ -680,18 +701,20 @@ discard block |
||
| 680 | 701 | { |
| 681 | 702 | foreach ($date_events as $event_key => $event_val) |
| 682 | 703 | { |
| 683 | - if (in_array($event_val['id'], $temp)) |
|
| 684 | - unset($calendarGrid['events'][$date][$event_key]); |
|
| 685 | - else |
|
| 686 | - $temp[] = $event_val['id']; |
|
| 704 | + if (in_array($event_val['id'], $temp)) { |
|
| 705 | + unset($calendarGrid['events'][$date][$event_key]); |
|
| 706 | + } else { |
|
| 707 | + $temp[] = $event_val['id']; |
|
| 708 | + } |
|
| 687 | 709 | } |
| 688 | 710 | } |
| 689 | 711 | |
| 690 | 712 | // Give birthdays and holidays a friendly format, without the year |
| 691 | - if (preg_match('~%[AaBbCcDdeGghjmuYy](?:[^%]*%[AaBbCcDdeGghjmuYy])*~', $user_info['time_format'], $matches) == 0 || empty($matches[0])) |
|
| 692 | - $date_format = '%b %d'; |
|
| 693 | - else |
|
| 694 | - $date_format = str_replace(array('%Y', '%y', '%G', '%g', '%C', '%c', '%D'), array('', '', '', '', '', '%b %d', '%m/%d'), $matches[0]); |
|
| 713 | + if (preg_match('~%[AaBbCcDdeGghjmuYy](?:[^%]*%[AaBbCcDdeGghjmuYy])*~', $user_info['time_format'], $matches) == 0 || empty($matches[0])) { |
|
| 714 | + $date_format = '%b %d'; |
|
| 715 | + } else { |
|
| 716 | + $date_format = str_replace(array('%Y', '%y', '%G', '%g', '%C', '%c', '%D'), array('', '', '', '', '', '%b %d', '%m/%d'), $matches[0]); |
|
| 717 | + } |
|
| 695 | 718 | |
| 696 | 719 | foreach (array('birthdays', 'holidays') as $type) |
| 697 | 720 | { |
@@ -790,8 +813,9 @@ discard block |
||
| 790 | 813 | // Holidays between now and now + days. |
| 791 | 814 | for ($i = $now; $i < $now + $days_for_index; $i += 86400) |
| 792 | 815 | { |
| 793 | - if (isset($cached_data['holidays'][strftime('%Y-%m-%d', $i)])) |
|
| 794 | - $return_data['calendar_holidays'] = array_merge($return_data['calendar_holidays'], $cached_data['holidays'][strftime('%Y-%m-%d', $i)]); |
|
| 816 | + if (isset($cached_data['holidays'][strftime('%Y-%m-%d', $i)])) { |
|
| 817 | + $return_data['calendar_holidays'] = array_merge($return_data['calendar_holidays'], $cached_data['holidays'][strftime('%Y-%m-%d', $i)]); |
|
| 818 | + } |
|
| 795 | 819 | } |
| 796 | 820 | } |
| 797 | 821 | |
@@ -803,8 +827,9 @@ discard block |
||
| 803 | 827 | $loop_date = strftime('%Y-%m-%d', $i); |
| 804 | 828 | if (isset($cached_data['birthdays'][$loop_date])) |
| 805 | 829 | { |
| 806 | - foreach ($cached_data['birthdays'][$loop_date] as $index => $dummy) |
|
| 807 | - $cached_data['birthdays'][strftime('%Y-%m-%d', $i)][$index]['is_today'] = $loop_date === $today['date']; |
|
| 830 | + foreach ($cached_data['birthdays'][$loop_date] as $index => $dummy) { |
|
| 831 | + $cached_data['birthdays'][strftime('%Y-%m-%d', $i)][$index]['is_today'] = $loop_date === $today['date']; |
|
| 832 | + } |
|
| 808 | 833 | $return_data['calendar_birthdays'] = array_merge($return_data['calendar_birthdays'], $cached_data['birthdays'][$loop_date]); |
| 809 | 834 | } |
| 810 | 835 | } |
@@ -819,8 +844,9 @@ discard block |
||
| 819 | 844 | $loop_date = strftime('%Y-%m-%d', $i); |
| 820 | 845 | |
| 821 | 846 | // No events today? Check the next day. |
| 822 | - if (empty($cached_data['events'][$loop_date])) |
|
| 823 | - continue; |
|
| 847 | + if (empty($cached_data['events'][$loop_date])) { |
|
| 848 | + continue; |
|
| 849 | + } |
|
| 824 | 850 | |
| 825 | 851 | // Loop through all events to add a few last-minute values. |
| 826 | 852 | foreach ($cached_data['events'][$loop_date] as $ev => $event) |
@@ -833,9 +859,9 @@ discard block |
||
| 833 | 859 | { |
| 834 | 860 | unset($cached_data['events'][$loop_date][$ev]); |
| 835 | 861 | continue; |
| 862 | + } else { |
|
| 863 | + $duplicates[$this_event['topic'] . $this_event['title']] = true; |
|
| 836 | 864 | } |
| 837 | - else |
|
| 838 | - $duplicates[$this_event['topic'] . $this_event['title']] = true; |
|
| 839 | 865 | |
| 840 | 866 | // Might be set to true afterwards, depending on the permissions. |
| 841 | 867 | $this_event['can_edit'] = false; |
@@ -843,16 +869,19 @@ discard block |
||
| 843 | 869 | $this_event['date'] = $loop_date; |
| 844 | 870 | } |
| 845 | 871 | |
| 846 | - if (!empty($cached_data['events'][$loop_date])) |
|
| 847 | - $return_data['calendar_events'] = array_merge($return_data['calendar_events'], $cached_data['events'][$loop_date]); |
|
| 872 | + if (!empty($cached_data['events'][$loop_date])) { |
|
| 873 | + $return_data['calendar_events'] = array_merge($return_data['calendar_events'], $cached_data['events'][$loop_date]); |
|
| 874 | + } |
|
| 848 | 875 | } |
| 849 | 876 | } |
| 850 | 877 | |
| 851 | 878 | // Mark the last item so that a list separator can be used in the template. |
| 852 | - for ($i = 0, $n = count($return_data['calendar_birthdays']); $i < $n; $i++) |
|
| 853 | - $return_data['calendar_birthdays'][$i]['is_last'] = !isset($return_data['calendar_birthdays'][$i + 1]); |
|
| 854 | - for ($i = 0, $n = count($return_data['calendar_events']); $i < $n; $i++) |
|
| 855 | - $return_data['calendar_events'][$i]['is_last'] = !isset($return_data['calendar_events'][$i + 1]); |
|
| 879 | + for ($i = 0, $n = count($return_data['calendar_birthdays']); $i < $n; $i++) { |
|
| 880 | + $return_data['calendar_birthdays'][$i]['is_last'] = !isset($return_data['calendar_birthdays'][$i + 1]); |
|
| 881 | + } |
|
| 882 | + for ($i = 0, $n = count($return_data['calendar_events']); $i < $n; $i++) { |
|
| 883 | + $return_data['calendar_events'][$i]['is_last'] = !isset($return_data['calendar_events'][$i + 1]); |
|
| 884 | + } |
|
| 856 | 885 | |
| 857 | 886 | return array( |
| 858 | 887 | 'data' => $return_data, |
@@ -900,37 +929,46 @@ discard block |
||
| 900 | 929 | if (isset($_POST['start_date'])) |
| 901 | 930 | { |
| 902 | 931 | $d = date_parse($_POST['start_date']); |
| 903 | - if (!empty($d['error_count']) || !empty($d['warning_count'])) |
|
| 904 | - fatal_lang_error('invalid_date', false); |
|
| 905 | - if (empty($d['year'])) |
|
| 906 | - fatal_lang_error('event_year_missing', false); |
|
| 907 | - if (empty($d['month'])) |
|
| 908 | - fatal_lang_error('event_month_missing', false); |
|
| 909 | - } |
|
| 910 | - elseif (isset($_POST['start_datetime'])) |
|
| 932 | + if (!empty($d['error_count']) || !empty($d['warning_count'])) { |
|
| 933 | + fatal_lang_error('invalid_date', false); |
|
| 934 | + } |
|
| 935 | + if (empty($d['year'])) { |
|
| 936 | + fatal_lang_error('event_year_missing', false); |
|
| 937 | + } |
|
| 938 | + if (empty($d['month'])) { |
|
| 939 | + fatal_lang_error('event_month_missing', false); |
|
| 940 | + } |
|
| 941 | + } elseif (isset($_POST['start_datetime'])) |
|
| 911 | 942 | { |
| 912 | 943 | $d = date_parse($_POST['start_datetime']); |
| 913 | - if (!empty($d['error_count']) || !empty($d['warning_count'])) |
|
| 914 | - fatal_lang_error('invalid_date', false); |
|
| 915 | - if (empty($d['year'])) |
|
| 916 | - fatal_lang_error('event_year_missing', false); |
|
| 917 | - if (empty($d['month'])) |
|
| 918 | - fatal_lang_error('event_month_missing', false); |
|
| 944 | + if (!empty($d['error_count']) || !empty($d['warning_count'])) { |
|
| 945 | + fatal_lang_error('invalid_date', false); |
|
| 946 | + } |
|
| 947 | + if (empty($d['year'])) { |
|
| 948 | + fatal_lang_error('event_year_missing', false); |
|
| 949 | + } |
|
| 950 | + if (empty($d['month'])) { |
|
| 951 | + fatal_lang_error('event_month_missing', false); |
|
| 952 | + } |
|
| 919 | 953 | } |
| 920 | 954 | // The 2.0 way |
| 921 | 955 | else |
| 922 | 956 | { |
| 923 | 957 | // No month? No year? |
| 924 | - if (!isset($_POST['month'])) |
|
| 925 | - fatal_lang_error('event_month_missing', false); |
|
| 926 | - if (!isset($_POST['year'])) |
|
| 927 | - fatal_lang_error('event_year_missing', false); |
|
| 958 | + if (!isset($_POST['month'])) { |
|
| 959 | + fatal_lang_error('event_month_missing', false); |
|
| 960 | + } |
|
| 961 | + if (!isset($_POST['year'])) { |
|
| 962 | + fatal_lang_error('event_year_missing', false); |
|
| 963 | + } |
|
| 928 | 964 | |
| 929 | 965 | // Check the month and year... |
| 930 | - if ($_POST['month'] < 1 || $_POST['month'] > 12) |
|
| 931 | - fatal_lang_error('invalid_month', false); |
|
| 932 | - if ($_POST['year'] < $modSettings['cal_minyear'] || $_POST['year'] > $modSettings['cal_maxyear']) |
|
| 933 | - fatal_lang_error('invalid_year', false); |
|
| 966 | + if ($_POST['month'] < 1 || $_POST['month'] > 12) { |
|
| 967 | + fatal_lang_error('invalid_month', false); |
|
| 968 | + } |
|
| 969 | + if ($_POST['year'] < $modSettings['cal_minyear'] || $_POST['year'] > $modSettings['cal_maxyear']) { |
|
| 970 | + fatal_lang_error('invalid_year', false); |
|
| 971 | + } |
|
| 934 | 972 | } |
| 935 | 973 | } |
| 936 | 974 | |
@@ -940,8 +978,9 @@ discard block |
||
| 940 | 978 | // If they want to us to calculate an end date, make sure it will fit in an acceptable range. |
| 941 | 979 | if (isset($_POST['span'])) |
| 942 | 980 | { |
| 943 | - if (($_POST['span'] < 1) || (!empty($modSettings['cal_maxspan']) && $_POST['span'] > $modSettings['cal_maxspan'])) |
|
| 944 | - fatal_lang_error('invalid_days_numb', false); |
|
| 981 | + if (($_POST['span'] < 1) || (!empty($modSettings['cal_maxspan']) && $_POST['span'] > $modSettings['cal_maxspan'])) { |
|
| 982 | + fatal_lang_error('invalid_days_numb', false); |
|
| 983 | + } |
|
| 945 | 984 | } |
| 946 | 985 | |
| 947 | 986 | // There is no need to validate the following values if we are just deleting the event. |
@@ -951,24 +990,29 @@ discard block |
||
| 951 | 990 | if (empty($_POST['start_date']) && empty($_POST['start_datetime'])) |
| 952 | 991 | { |
| 953 | 992 | // No day? |
| 954 | - if (!isset($_POST['day'])) |
|
| 955 | - fatal_lang_error('event_day_missing', false); |
|
| 993 | + if (!isset($_POST['day'])) { |
|
| 994 | + fatal_lang_error('event_day_missing', false); |
|
| 995 | + } |
|
| 956 | 996 | |
| 957 | 997 | // Bad day? |
| 958 | - if (!checkdate($_POST['month'], $_POST['day'], $_POST['year'])) |
|
| 959 | - fatal_lang_error('invalid_date', false); |
|
| 998 | + if (!checkdate($_POST['month'], $_POST['day'], $_POST['year'])) { |
|
| 999 | + fatal_lang_error('invalid_date', false); |
|
| 1000 | + } |
|
| 960 | 1001 | } |
| 961 | 1002 | |
| 962 | - if (!isset($_POST['evtitle']) && !isset($_POST['subject'])) |
|
| 963 | - fatal_lang_error('event_title_missing', false); |
|
| 964 | - elseif (!isset($_POST['evtitle'])) |
|
| 965 | - $_POST['evtitle'] = $_POST['subject']; |
|
| 1003 | + if (!isset($_POST['evtitle']) && !isset($_POST['subject'])) { |
|
| 1004 | + fatal_lang_error('event_title_missing', false); |
|
| 1005 | + } elseif (!isset($_POST['evtitle'])) { |
|
| 1006 | + $_POST['evtitle'] = $_POST['subject']; |
|
| 1007 | + } |
|
| 966 | 1008 | |
| 967 | 1009 | // No title? |
| 968 | - if ($smcFunc['htmltrim']($_POST['evtitle']) === '') |
|
| 969 | - fatal_lang_error('no_event_title', false); |
|
| 970 | - if ($smcFunc['strlen']($_POST['evtitle']) > 100) |
|
| 971 | - $_POST['evtitle'] = $smcFunc['substr']($_POST['evtitle'], 0, 100); |
|
| 1010 | + if ($smcFunc['htmltrim']($_POST['evtitle']) === '') { |
|
| 1011 | + fatal_lang_error('no_event_title', false); |
|
| 1012 | + } |
|
| 1013 | + if ($smcFunc['strlen']($_POST['evtitle']) > 100) { |
|
| 1014 | + $_POST['evtitle'] = $smcFunc['substr']($_POST['evtitle'], 0, 100); |
|
| 1015 | + } |
|
| 972 | 1016 | $_POST['evtitle'] = str_replace(';', '', $_POST['evtitle']); |
| 973 | 1017 | } |
| 974 | 1018 | } |
@@ -995,8 +1039,9 @@ discard block |
||
| 995 | 1039 | ); |
| 996 | 1040 | |
| 997 | 1041 | // No results, return false. |
| 998 | - if ($smcFunc['db_num_rows'] === 0) |
|
| 999 | - return false; |
|
| 1042 | + if ($smcFunc['db_num_rows'] === 0) { |
|
| 1043 | + return false; |
|
| 1044 | + } |
|
| 1000 | 1045 | |
| 1001 | 1046 | // Grab the results and return. |
| 1002 | 1047 | list ($poster) = $smcFunc['db_fetch_row']($request); |
@@ -1130,8 +1175,9 @@ discard block |
||
| 1130 | 1175 | call_integration_hook('integrate_modify_event', array($event_id, &$eventOptions, &$event_columns, &$event_parameters)); |
| 1131 | 1176 | |
| 1132 | 1177 | $column_clauses = array(); |
| 1133 | - foreach ($event_columns as $col => $crit) |
|
| 1134 | - $column_clauses[] = $col . ' = ' . $crit; |
|
| 1178 | + foreach ($event_columns as $col => $crit) { |
|
| 1179 | + $column_clauses[] = $col . ' = ' . $crit; |
|
| 1180 | + } |
|
| 1135 | 1181 | |
| 1136 | 1182 | $smcFunc['db_query']('', ' |
| 1137 | 1183 | UPDATE {db_prefix}calendar |
@@ -1216,8 +1262,9 @@ discard block |
||
| 1216 | 1262 | ); |
| 1217 | 1263 | |
| 1218 | 1264 | // If nothing returned, we are in poo, poo. |
| 1219 | - if ($smcFunc['db_num_rows']($request) === 0) |
|
| 1220 | - return false; |
|
| 1265 | + if ($smcFunc['db_num_rows']($request) === 0) { |
|
| 1266 | + return false; |
|
| 1267 | + } |
|
| 1221 | 1268 | |
| 1222 | 1269 | $row = $smcFunc['db_fetch_assoc']($request); |
| 1223 | 1270 | $smcFunc['db_free_result']($request); |
@@ -1225,8 +1272,9 @@ discard block |
||
| 1225 | 1272 | list($start, $end, $allday, $span, $tz, $tz_abbrev) = buildEventDatetimes($row); |
| 1226 | 1273 | |
| 1227 | 1274 | // Sanity check |
| 1228 | - if (!empty($start['error_count']) || !empty($start['warning_count']) || !empty($end['error_count']) || !empty($end['warning_count'])) |
|
| 1229 | - return false; |
|
| 1275 | + if (!empty($start['error_count']) || !empty($start['warning_count']) || !empty($end['error_count']) || !empty($end['warning_count'])) { |
|
| 1276 | + return false; |
|
| 1277 | + } |
|
| 1230 | 1278 | |
| 1231 | 1279 | $return_value = array( |
| 1232 | 1280 | 'boards' => array(), |
@@ -1363,24 +1411,27 @@ discard block |
||
| 1363 | 1411 | |
| 1364 | 1412 | // Set $span, in case we need it |
| 1365 | 1413 | $span = isset($eventOptions['span']) ? $eventOptions['span'] : (isset($_POST['span']) ? $_POST['span'] : 0); |
| 1366 | - if ($span > 0) |
|
| 1367 | - $span = !empty($modSettings['cal_maxspan']) ? min($modSettings['cal_maxspan'], $span - 1) : $span - 1; |
|
| 1414 | + if ($span > 0) { |
|
| 1415 | + $span = !empty($modSettings['cal_maxspan']) ? min($modSettings['cal_maxspan'], $span - 1) : $span - 1; |
|
| 1416 | + } |
|
| 1368 | 1417 | |
| 1369 | 1418 | // Define the timezone for this event, falling back to the default if not provided |
| 1370 | - if (!empty($eventOptions['tz']) && in_array($eventOptions['tz'], timezone_identifiers_list(DateTimeZone::ALL_WITH_BC))) |
|
| 1371 | - $tz = $eventOptions['tz']; |
|
| 1372 | - elseif (!empty($_POST['tz']) && in_array($_POST['tz'], timezone_identifiers_list(DateTimeZone::ALL_WITH_BC))) |
|
| 1373 | - $tz = $_POST['tz']; |
|
| 1374 | - else |
|
| 1375 | - $tz = getUserTimezone(); |
|
| 1419 | + if (!empty($eventOptions['tz']) && in_array($eventOptions['tz'], timezone_identifiers_list(DateTimeZone::ALL_WITH_BC))) { |
|
| 1420 | + $tz = $eventOptions['tz']; |
|
| 1421 | + } elseif (!empty($_POST['tz']) && in_array($_POST['tz'], timezone_identifiers_list(DateTimeZone::ALL_WITH_BC))) { |
|
| 1422 | + $tz = $_POST['tz']; |
|
| 1423 | + } else { |
|
| 1424 | + $tz = getUserTimezone(); |
|
| 1425 | + } |
|
| 1376 | 1426 | |
| 1377 | 1427 | // Is this supposed to be an all day event, or should it have specific start and end times? |
| 1378 | - if (isset($eventOptions['allday'])) |
|
| 1379 | - $allday = $eventOptions['allday']; |
|
| 1380 | - elseif (empty($_POST['allday'])) |
|
| 1381 | - $allday = false; |
|
| 1382 | - else |
|
| 1383 | - $allday = true; |
|
| 1428 | + if (isset($eventOptions['allday'])) { |
|
| 1429 | + $allday = $eventOptions['allday']; |
|
| 1430 | + } elseif (empty($_POST['allday'])) { |
|
| 1431 | + $allday = false; |
|
| 1432 | + } else { |
|
| 1433 | + $allday = true; |
|
| 1434 | + } |
|
| 1384 | 1435 | |
| 1385 | 1436 | // Input might come as individual parameters... |
| 1386 | 1437 | $start_year = isset($eventOptions['year']) ? $eventOptions['year'] : (isset($_POST['year']) ? $_POST['year'] : null); |
@@ -1407,10 +1458,12 @@ discard block |
||
| 1407 | 1458 | $end_time_string = isset($eventOptions['end_time']) ? $eventOptions['end_time'] : (isset($_POST['end_time']) ? $_POST['end_time'] : null); |
| 1408 | 1459 | |
| 1409 | 1460 | // If the date and time were given in separate strings, combine them |
| 1410 | - if (empty($start_string) && isset($start_date_string)) |
|
| 1411 | - $start_string = $start_date_string . (isset($start_time_string) ? ' ' . $start_time_string : ''); |
|
| 1412 | - if (empty($end_string) && isset($end_date_string)) |
|
| 1413 | - $end_string = $end_date_string . (isset($end_time_string) ? ' ' . $end_time_string : ''); |
|
| 1461 | + if (empty($start_string) && isset($start_date_string)) { |
|
| 1462 | + $start_string = $start_date_string . (isset($start_time_string) ? ' ' . $start_time_string : ''); |
|
| 1463 | + } |
|
| 1464 | + if (empty($end_string) && isset($end_date_string)) { |
|
| 1465 | + $end_string = $end_date_string . (isset($end_time_string) ? ' ' . $end_time_string : ''); |
|
| 1466 | + } |
|
| 1414 | 1467 | |
| 1415 | 1468 | // If some form of string input was given, override individually defined options with it |
| 1416 | 1469 | if (isset($start_string)) |
@@ -1501,10 +1554,11 @@ discard block |
||
| 1501 | 1554 | if ($start_object >= $end_object) |
| 1502 | 1555 | { |
| 1503 | 1556 | $end_object = date_create(sprintf('%04d-%02d-%02d %02d:%02d:%02d', $start_year, $start_month, $start_day, $start_hour, $start_minute, $start_second) . ' ' . $tz); |
| 1504 | - if ($span > 0) |
|
| 1505 | - date_add($end_object, date_interval_create_from_date_string($span . ' days')); |
|
| 1506 | - else |
|
| 1507 | - date_add($end_object, date_interval_create_from_date_string('1 hour')); |
|
| 1557 | + if ($span > 0) { |
|
| 1558 | + date_add($end_object, date_interval_create_from_date_string($span . ' days')); |
|
| 1559 | + } else { |
|
| 1560 | + date_add($end_object, date_interval_create_from_date_string('1 hour')); |
|
| 1561 | + } |
|
| 1508 | 1562 | } |
| 1509 | 1563 | |
| 1510 | 1564 | // Is $end_object too late? |
@@ -1517,9 +1571,9 @@ discard block |
||
| 1517 | 1571 | { |
| 1518 | 1572 | $end_object = date_create(sprintf('%04d-%02d-%02d %02d:%02d:%02d', $start_year, $start_month, $start_day, $start_hour, $start_minute, $start_second) . ' ' . $tz); |
| 1519 | 1573 | date_add($end_object, date_interval_create_from_date_string($modSettings['cal_maxspan'] . ' days')); |
| 1574 | + } else { |
|
| 1575 | + $end_object = date_create(sprintf('%04d-%02d-%02d %02d:%02d:%02d', $start_year, $start_month, $start_day, '11', '59', '59') . ' ' . $tz); |
|
| 1520 | 1576 | } |
| 1521 | - else |
|
| 1522 | - $end_object = date_create(sprintf('%04d-%02d-%02d %02d:%02d:%02d', $start_year, $start_month, $start_day, '11', '59', '59') . ' ' . $tz); |
|
| 1523 | 1577 | } |
| 1524 | 1578 | } |
| 1525 | 1579 | |
@@ -1532,8 +1586,7 @@ discard block |
||
| 1532 | 1586 | $start_time = null; |
| 1533 | 1587 | $end_time = null; |
| 1534 | 1588 | $tz = null; |
| 1535 | - } |
|
| 1536 | - else |
|
| 1589 | + } else |
|
| 1537 | 1590 | { |
| 1538 | 1591 | $start_time = date_format($start_object, 'H:i:s'); |
| 1539 | 1592 | $end_time = date_format($end_object, 'H:i:s'); |
@@ -1561,19 +1614,21 @@ discard block |
||
| 1561 | 1614 | // First, try to create a better date format, ignoring the "time" elements. |
| 1562 | 1615 | if (empty($date_format)) |
| 1563 | 1616 | { |
| 1564 | - if (preg_match('~%[AaBbCcDdeGghjmuYy](?:[^%]*%[AaBbCcDdeGghjmuYy])*~', $user_info['time_format'], $matches) == 0 || empty($matches[0])) |
|
| 1565 | - $date_format = '%F'; |
|
| 1566 | - else |
|
| 1567 | - $date_format = $matches[0]; |
|
| 1617 | + if (preg_match('~%[AaBbCcDdeGghjmuYy](?:[^%]*%[AaBbCcDdeGghjmuYy])*~', $user_info['time_format'], $matches) == 0 || empty($matches[0])) { |
|
| 1618 | + $date_format = '%F'; |
|
| 1619 | + } else { |
|
| 1620 | + $date_format = $matches[0]; |
|
| 1621 | + } |
|
| 1568 | 1622 | } |
| 1569 | 1623 | |
| 1570 | 1624 | // We want a fairly compact version of the time, but as close as possible to the user's settings. |
| 1571 | 1625 | if (empty($time_format)) |
| 1572 | 1626 | { |
| 1573 | - if (preg_match('~%[HkIlMpPrRSTX](?:[^%]*%[HkIlMpPrRSTX])*~', $user_info['time_format'], $matches) == 0 || empty($matches[0])) |
|
| 1574 | - $time_format = '%k:%M'; |
|
| 1575 | - else |
|
| 1576 | - $time_format = str_replace(array('%I', '%H', '%S', '%r', '%R', '%T'), array('%l', '%k', '', '%l:%M %p', '%k:%M', '%l:%M'), $matches[0]); |
|
| 1627 | + if (preg_match('~%[HkIlMpPrRSTX](?:[^%]*%[HkIlMpPrRSTX])*~', $user_info['time_format'], $matches) == 0 || empty($matches[0])) { |
|
| 1628 | + $time_format = '%k:%M'; |
|
| 1629 | + } else { |
|
| 1630 | + $time_format = str_replace(array('%I', '%H', '%S', '%r', '%R', '%T'), array('%l', '%k', '', '%l:%M %p', '%k:%M', '%l:%M'), $matches[0]); |
|
| 1631 | + } |
|
| 1577 | 1632 | } |
| 1578 | 1633 | |
| 1579 | 1634 | // Should this be an all day event? |
@@ -1583,11 +1638,13 @@ discard block |
||
| 1583 | 1638 | $span = 1 + date_interval_format(date_diff(date_create($row['start_date']), date_create($row['end_date'])), '%d'); |
| 1584 | 1639 | |
| 1585 | 1640 | // We need to have a defined timezone in the steps below |
| 1586 | - if (empty($row['timezone'])) |
|
| 1587 | - $row['timezone'] = getUserTimezone(); |
|
| 1641 | + if (empty($row['timezone'])) { |
|
| 1642 | + $row['timezone'] = getUserTimezone(); |
|
| 1643 | + } |
|
| 1588 | 1644 | |
| 1589 | - if (empty($timezone_array[$row['timezone']])) |
|
| 1590 | - $timezone_array[$row['timezone']] = timezone_open($row['timezone']); |
|
| 1645 | + if (empty($timezone_array[$row['timezone']])) { |
|
| 1646 | + $timezone_array[$row['timezone']] = timezone_open($row['timezone']); |
|
| 1647 | + } |
|
| 1591 | 1648 | |
| 1592 | 1649 | // Get most of the standard date information for the start and end datetimes |
| 1593 | 1650 | $start = date_parse($row['start_date'] . (!$allday ? ' ' . $row['start_time'] : '')); |
@@ -1622,8 +1679,9 @@ discard block |
||
| 1622 | 1679 | $tz_abbrev = date_format($start_object, 'T'); |
| 1623 | 1680 | |
| 1624 | 1681 | // If the abbreviation is just a numerical offset from UTC, make that clear. |
| 1625 | - if (strspn($tz_abbrev, '+-') > 0) |
|
| 1626 | - $tz_abbrev = 'UTC' . $tz_abbrev; |
|
| 1682 | + if (strspn($tz_abbrev, '+-') > 0) { |
|
| 1683 | + $tz_abbrev = 'UTC' . $tz_abbrev; |
|
| 1684 | + } |
|
| 1627 | 1685 | |
| 1628 | 1686 | return array($start, $end, $allday, $span, $tz, $tz_abbrev); |
| 1629 | 1687 | } |
@@ -1639,8 +1697,9 @@ discard block |
||
| 1639 | 1697 | global $smcFunc, $context, $user_info, $modSettings, $user_settings; |
| 1640 | 1698 | static $member_cache = array(); |
| 1641 | 1699 | |
| 1642 | - if (is_null($id_member) && $user_info['is_guest'] == false) |
|
| 1643 | - $id_member = $context['user']['id']; |
|
| 1700 | + if (is_null($id_member) && $user_info['is_guest'] == false) { |
|
| 1701 | + $id_member = $context['user']['id']; |
|
| 1702 | + } |
|
| 1644 | 1703 | |
| 1645 | 1704 | //check if the cache got the data |
| 1646 | 1705 | if (isset($id_member) && isset($member_cache[$id_member])) |
@@ -1669,11 +1728,13 @@ discard block |
||
| 1669 | 1728 | $smcFunc['db_free_result']($request); |
| 1670 | 1729 | } |
| 1671 | 1730 | |
| 1672 | - if (empty($timezone) || !in_array($timezone, timezone_identifiers_list(DateTimeZone::ALL_WITH_BC))) |
|
| 1673 | - $timezone = isset($modSettings['default_timezone']) ? $modSettings['default_timezone'] : date_default_timezone_get(); |
|
| 1731 | + if (empty($timezone) || !in_array($timezone, timezone_identifiers_list(DateTimeZone::ALL_WITH_BC))) { |
|
| 1732 | + $timezone = isset($modSettings['default_timezone']) ? $modSettings['default_timezone'] : date_default_timezone_get(); |
|
| 1733 | + } |
|
| 1674 | 1734 | |
| 1675 | - if (isset($id_member)) |
|
| 1676 | - $member_cache[$id_member] = $timezone; |
|
| 1735 | + if (isset($id_member)) { |
|
| 1736 | + $member_cache[$id_member] = $timezone; |
|
| 1737 | + } |
|
| 1677 | 1738 | |
| 1678 | 1739 | return $timezone; |
| 1679 | 1740 | } |
@@ -1702,8 +1763,9 @@ discard block |
||
| 1702 | 1763 | ) |
| 1703 | 1764 | ); |
| 1704 | 1765 | $holidays = array(); |
| 1705 | - while ($row = $smcFunc['db_fetch_assoc']($request)) |
|
| 1706 | - $holidays[] = $row; |
|
| 1766 | + while ($row = $smcFunc['db_fetch_assoc']($request)) { |
|
| 1767 | + $holidays[] = $row; |
|
| 1768 | + } |
|
| 1707 | 1769 | $smcFunc['db_free_result']($request); |
| 1708 | 1770 | |
| 1709 | 1771 | return $holidays; |
@@ -14,8 +14,9 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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>' => ' '))); |
| 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 |
||
| 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>' => ' '))); |
| 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 |
||
| 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 .= ' <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 .= ' <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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 | } |
