| @@ -18,23 +18,25 @@ discard block | ||
| 18 | 18 | global $context; | 
| 19 | 19 | |
| 20 | 20 | // Prevent Chrome from auto completing fields when viewing/editing other members profiles | 
| 21 | -	if (isBrowser('is_chrome') && !$context['user']['is_owner']) | |
| 22 | - echo ' | |
| 21 | +	if (isBrowser('is_chrome') && !$context['user']['is_owner']) { | |
| 22 | + echo ' | |
| 23 | 23 | <script> | 
| 24 | 24 | disableAutoComplete(); | 
| 25 | 25 | </script>'; | 
| 26 | + } | |
| 26 | 27 | |
| 27 | 28 | // If an error occurred while trying to save previously, give the user a clue! | 
| 28 | 29 | echo ' | 
| 29 | 30 | ', template_error_message(); | 
| 30 | 31 | |
| 31 | 32 | // If the profile was update successfully, let the user know this. | 
| 32 | - if (!empty($context['profile_updated'])) | |
| 33 | - echo ' | |
| 33 | +	if (!empty($context['profile_updated'])) { | |
| 34 | + echo ' | |
| 34 | 35 | <div class="infobox"> | 
| 35 | 36 | ', $context['profile_updated'], ' | 
| 36 | 37 | </div>'; | 
| 37 | -} | |
| 38 | + } | |
| 39 | + } | |
| 38 | 40 | |
| 39 | 41 | /** | 
| 40 | 42 | * Template for any HTML needed below the profile (closing off divs/tables, etc.) | 
| @@ -99,19 +101,19 @@ discard block | ||
| 99 | 101 | </div> | 
| 100 | 102 | <div class="alerts_unread">'; | 
| 101 | 103 | |
| 102 | - if (empty($context['unread_alerts'])) | |
| 103 | - template_alerts_all_read(); | |
| 104 | - | |
| 105 | - else | |
| 104 | +	if (empty($context['unread_alerts'])) { | |
| 105 | + template_alerts_all_read(); | |
| 106 | + } else | |
| 106 | 107 |  	{ | 
| 107 | - foreach ($context['unread_alerts'] as $id_alert => $details) | |
| 108 | - echo ' | |
| 108 | +		foreach ($context['unread_alerts'] as $id_alert => $details) { | |
| 109 | + echo ' | |
| 109 | 110 | <div class="unread"> | 
| 110 | 111 | ', !empty($details['sender']) ? $details['sender']['avatar']['image'] : '', ' | 
| 111 | 112 | <div class="details"> | 
| 112 | 113 | ', !empty($details['icon']) ? $details['icon'] : '', '<span>', $details['text'], '</span> - ', $details['time'], ' | 
| 113 | 114 | </div> | 
| 114 | 115 | </div>'; | 
| 116 | + } | |
| 115 | 117 | } | 
| 116 | 118 | |
| 117 | 119 | echo ' | 
| @@ -161,10 +163,11 @@ discard block | ||
| 161 | 163 | <div class="custom_fields_above_name"> | 
| 162 | 164 | <ul>'; | 
| 163 | 165 | |
| 164 | - foreach ($context['print_custom_fields']['above_member'] as $field) | |
| 165 | - if (!empty($field['output_html'])) | |
| 166 | +		foreach ($context['print_custom_fields']['above_member'] as $field) { | |
| 167 | + if (!empty($field['output_html'])) | |
| 166 | 168 | echo ' | 
| 167 | 169 | <li>', $field['output_html'], '</li>'; | 
| 170 | + } | |
| 168 | 171 | |
| 169 | 172 | echo ' | 
| 170 | 173 | </ul> | 
| @@ -176,20 +179,22 @@ discard block | ||
| 176 | 179 | <div class="username clear"> | 
| 177 | 180 | <h4>'; | 
| 178 | 181 | |
| 179 | - if (!empty($context['print_custom_fields']['before_member'])) | |
| 180 | - foreach ($context['print_custom_fields']['before_member'] as $field) | |
| 182 | +	if (!empty($context['print_custom_fields']['before_member'])) { | |
| 183 | + foreach ($context['print_custom_fields']['before_member'] as $field) | |
| 181 | 184 | if (!empty($field['output_html'])) | 
| 182 | 185 | echo ' | 
| 183 | 186 | <span>', $field['output_html'], '</span>'; | 
| 187 | + } | |
| 184 | 188 | |
| 185 | 189 | echo ' | 
| 186 | 190 | ', $context['member']['name']; | 
| 187 | 191 | |
| 188 | - if (!empty($context['print_custom_fields']['after_member'])) | |
| 189 | - foreach ($context['print_custom_fields']['after_member'] as $field) | |
| 192 | +	if (!empty($context['print_custom_fields']['after_member'])) { | |
| 193 | + foreach ($context['print_custom_fields']['after_member'] as $field) | |
| 190 | 194 | if (!empty($field['output_html'])) | 
| 191 | 195 | echo ' | 
| 192 | 196 | <span>', $field['output_html'], '</span>'; | 
| 197 | + } | |
| 193 | 198 | |
| 194 | 199 | |
| 195 | 200 | echo ' | 
| @@ -205,10 +210,11 @@ discard block | ||
| 205 | 210 | <div class="custom_fields_below_avatar"> | 
| 206 | 211 | <ul>'; | 
| 207 | 212 | |
| 208 | - foreach ($context['print_custom_fields']['below_avatar'] as $field) | |
| 209 | - if (!empty($field['output_html'])) | |
| 213 | +		foreach ($context['print_custom_fields']['below_avatar'] as $field) { | |
| 214 | + if (!empty($field['output_html'])) | |
| 210 | 215 | echo ' | 
| 211 | 216 | <li>', $field['output_html'], '</li>'; | 
| 217 | + } | |
| 212 | 218 | |
| 213 | 219 | echo ' | 
| 214 | 220 | </ul> | 
| @@ -220,22 +226,25 @@ discard block | ||
| 220 | 226 | <ul class="clear">'; | 
| 221 | 227 | |
| 222 | 228 | // Email is only visible if it's your profile or you have the moderate_forum permission | 
| 223 | - if ($context['member']['show_email']) | |
| 224 | - echo ' | |
| 229 | +	if ($context['member']['show_email']) { | |
| 230 | + echo ' | |
| 225 | 231 | <li><a href="mailto:', $context['member']['email'], '" title="', $context['member']['email'], '" rel="nofollow"><span class="generic_icons mail" title="' . $txt['email'] . '"></span></a></li>'; | 
| 232 | + } | |
| 226 | 233 | |
| 227 | 234 | // Don't show an icon if they haven't specified a website. | 
| 228 | - if ($context['member']['website']['url'] !== '' && !isset($context['disabled_fields']['website'])) | |
| 229 | - echo ' | |
| 235 | +	if ($context['member']['website']['url'] !== '' && !isset($context['disabled_fields']['website'])) { | |
| 236 | + echo ' | |
| 230 | 237 | <li><a href="', $context['member']['website']['url'], '" title="' . $context['member']['website']['title'] . '" target="_blank" rel="noopener">', ($settings['use_image_buttons'] ? '<span class="generic_icons www" title="' . $context['member']['website']['title'] . '"></span>' : $txt['www']), '</a></li>'; | 
| 238 | + } | |
| 231 | 239 | |
| 232 | 240 | // Are there any custom profile fields as icons? | 
| 233 | 241 | if (!empty($context['print_custom_fields']['icons'])) | 
| 234 | 242 |  	{ | 
| 235 | - foreach ($context['print_custom_fields']['icons'] as $field) | |
| 236 | - if (!empty($field['output_html'])) | |
| 243 | +		foreach ($context['print_custom_fields']['icons'] as $field) { | |
| 244 | + if (!empty($field['output_html'])) | |
| 237 | 245 | echo ' | 
| 238 | 246 | <li class="custom_field">', $field['output_html'], '</li>'; | 
| 247 | + } | |
| 239 | 248 | } | 
| 240 | 249 | |
| 241 | 250 | echo ' | 
| @@ -244,24 +253,27 @@ discard block | ||
| 244 | 253 | ', $context['can_send_pm'] ? '<a href="' . $context['member']['online']['href'] . '" title="' . $context['member']['online']['text'] . '" rel="nofollow">' : '', $settings['use_image_buttons'] ? '<span class="' . ($context['member']['online']['is_online'] == 1 ? 'on' : 'off') . '" title="' . $context['member']['online']['text'] . '"></span>' : $context['member']['online']['label'], $context['can_send_pm'] ? '</a>' : '', $settings['use_image_buttons'] ? '<span class="smalltext"> ' . $context['member']['online']['label'] . '</span>' : ''; | 
| 245 | 254 | |
| 246 | 255 | // Can they add this member as a buddy? | 
| 247 | - if (!empty($context['can_have_buddy']) && !$context['user']['is_owner']) | |
| 248 | - echo ' | |
| 256 | +	if (!empty($context['can_have_buddy']) && !$context['user']['is_owner']) { | |
| 257 | + echo ' | |
| 249 | 258 | <br> | 
| 250 | 259 | <a href="', $scripturl, '?action=buddy;u=', $context['id_member'], ';', $context['session_var'], '=', $context['session_id'], '">[', $txt['buddy_' . ($context['member']['is_buddy'] ? 'remove' : 'add')], ']</a>'; | 
| 260 | + } | |
| 251 | 261 | |
| 252 | 262 | echo ' | 
| 253 | 263 | </span>'; | 
| 254 | 264 | |
| 255 | - if (!$context['user']['is_owner'] && $context['can_send_pm']) | |
| 256 | - echo ' | |
| 265 | +	if (!$context['user']['is_owner'] && $context['can_send_pm']) { | |
| 266 | + echo ' | |
| 257 | 267 | <a href="', $scripturl, '?action=pm;sa=send;u=', $context['id_member'], '" class="infolinks">', $txt['profile_sendpm_short'], '</a>'; | 
| 268 | + } | |
| 258 | 269 | |
| 259 | 270 | echo ' | 
| 260 | 271 | <a href="', $scripturl, '?action=profile;area=showposts;u=', $context['id_member'], '" class="infolinks">', $txt['showPosts'], '</a>'; | 
| 261 | 272 | |
| 262 | - if ($context['user']['is_owner'] && !empty($modSettings['drafts_post_enabled'])) | |
| 263 | - echo ' | |
| 273 | +	if ($context['user']['is_owner'] && !empty($modSettings['drafts_post_enabled'])) { | |
| 274 | + echo ' | |
| 264 | 275 | <a href="', $scripturl, '?action=profile;area=showdrafts;u=', $context['id_member'], '" class="infolinks">', $txt['drafts_show'], '</a>'; | 
| 276 | + } | |
| 265 | 277 | |
| 266 | 278 | echo ' | 
| 267 | 279 | <a href="', $scripturl, '?action=profile;area=statistics;u=', $context['id_member'], '" class="infolinks">', $txt['statPanel'], '</a>'; | 
| @@ -273,10 +285,11 @@ discard block | ||
| 273 | 285 | <div class="custom_fields_bottom"> | 
| 274 | 286 | <ul class="nolist">'; | 
| 275 | 287 | |
| 276 | - foreach ($context['print_custom_fields']['bottom_poster'] as $field) | |
| 277 | - if (!empty($field['output_html'])) | |
| 288 | +		foreach ($context['print_custom_fields']['bottom_poster'] as $field) { | |
| 289 | + if (!empty($field['output_html'])) | |
| 278 | 290 | echo ' | 
| 279 | 291 | <li>', $field['output_html'], '</li>'; | 
| 292 | + } | |
| 280 | 293 | |
| 281 | 294 | echo ' | 
| 282 | 295 | </ul> | 
| @@ -289,30 +302,35 @@ discard block | ||
| 289 | 302 | <div id="detailedinfo"> | 
| 290 | 303 | <dl class="settings">'; | 
| 291 | 304 | |
| 292 | - if ($context['user']['is_owner'] || $context['user']['is_admin']) | |
| 293 | - echo ' | |
| 305 | +	if ($context['user']['is_owner'] || $context['user']['is_admin']) { | |
| 306 | + echo ' | |
| 294 | 307 | <dt>', $txt['username'], ': </dt> | 
| 295 | 308 | <dd>', $context['member']['username'], '</dd>'; | 
| 309 | + } | |
| 296 | 310 | |
| 297 | - if (!isset($context['disabled_fields']['posts'])) | |
| 298 | - echo ' | |
| 311 | +	if (!isset($context['disabled_fields']['posts'])) { | |
| 312 | + echo ' | |
| 299 | 313 | <dt>', $txt['profile_posts'], ': </dt> | 
| 300 | 314 |  				<dd>', $context['member']['posts'], ' (', $context['member']['posts_per_day'], ' ', $txt['posts_per_day'], ')</dd>'; | 
| 315 | + } | |
| 301 | 316 | |
| 302 | - if ($context['member']['show_email']) | |
| 303 | - echo ' | |
| 317 | +	if ($context['member']['show_email']) { | |
| 318 | + echo ' | |
| 304 | 319 | <dt>', $txt['email'], ': </dt> | 
| 305 | 320 | <dd><a href="mailto:', $context['member']['email'], '">', $context['member']['email'], '</a></dd>'; | 
| 321 | + } | |
| 306 | 322 | |
| 307 | - if (!empty($modSettings['titlesEnable']) && !empty($context['member']['title'])) | |
| 308 | - echo ' | |
| 323 | +	if (!empty($modSettings['titlesEnable']) && !empty($context['member']['title'])) { | |
| 324 | + echo ' | |
| 309 | 325 | <dt>', $txt['custom_title'], ': </dt> | 
| 310 | 326 | <dd>', $context['member']['title'], '</dd>'; | 
| 327 | + } | |
| 311 | 328 | |
| 312 | - if (!empty($context['member']['blurb'])) | |
| 313 | - echo ' | |
| 329 | +	if (!empty($context['member']['blurb'])) { | |
| 330 | + echo ' | |
| 314 | 331 | <dt>', $txt['personal_text'], ': </dt> | 
| 315 | 332 | <dd>', $context['member']['blurb'], '</dd>'; | 
| 333 | + } | |
| 316 | 334 | |
| 317 | 335 | echo ' | 
| 318 | 336 | <dt>', $txt['age'], ':</dt> | 
| @@ -326,19 +344,21 @@ discard block | ||
| 326 | 344 |  	{ | 
| 327 | 345 | $fields = array(); | 
| 328 | 346 | |
| 329 | - foreach ($context['print_custom_fields']['standard'] as $field) | |
| 330 | - if (!empty($field['output_html'])) | |
| 347 | +		foreach ($context['print_custom_fields']['standard'] as $field) { | |
| 348 | + if (!empty($field['output_html'])) | |
| 331 | 349 | $fields[] = $field; | 
| 350 | + } | |
| 332 | 351 | |
| 333 | 352 | if (count($fields) > 0) | 
| 334 | 353 |  		{ | 
| 335 | 354 | echo ' | 
| 336 | 355 | <dl class="settings">'; | 
| 337 | 356 | |
| 338 | - foreach ($fields as $field) | |
| 339 | - echo ' | |
| 357 | +			foreach ($fields as $field) { | |
| 358 | + echo ' | |
| 340 | 359 | <dt>', $field['name'], ':</dt> | 
| 341 | 360 | <dd>', $field['output_html'], '</dd>'; | 
| 361 | + } | |
| 342 | 362 | |
| 343 | 363 | echo ' | 
| 344 | 364 | </dl>'; | 
| @@ -358,9 +378,10 @@ discard block | ||
| 358 | 378 | <a href="', $scripturl, '?action=profile;u=', $context['id_member'], ';area=', ($context['can_issue_warning'] && !$context['user']['is_owner'] ? 'issuewarning' : 'viewwarning'), '">', $context['member']['warning'], '%</a>'; | 
| 359 | 379 | |
| 360 | 380 | // Can we provide information on what this means? | 
| 361 | - if (!empty($context['warning_status'])) | |
| 362 | - echo ' | |
| 381 | +		if (!empty($context['warning_status'])) { | |
| 382 | + echo ' | |
| 363 | 383 |  					<span class="smalltext">(', $context['warning_status'], ')</span>'; | 
| 384 | + } | |
| 364 | 385 | |
| 365 | 386 | echo ' | 
| 366 | 387 | </dd>'; | 
| @@ -371,11 +392,12 @@ discard block | ||
| 371 | 392 |  	{ | 
| 372 | 393 | |
| 373 | 394 | // If the person looking at the summary has permission, and the account isn't activated, give the viewer the ability to do it themselves. | 
| 374 | - if (!empty($context['activate_message'])) | |
| 375 | - echo ' | |
| 395 | +		if (!empty($context['activate_message'])) { | |
| 396 | + echo ' | |
| 376 | 397 | <dt class="clear"> | 
| 377 | 398 | <span class="alert">', $context['activate_message'], '</span> (<a href="', $context['activate_link'], '"', ($context['activate_type'] == 4 ? ' class="you_sure" data-confirm="' . $txt['profileConfirm'] . '"' : ''), '>', $context['activate_link_text'], '</a>) | 
| 378 | 399 | </dt>'; | 
| 400 | + } | |
| 379 | 401 | |
| 380 | 402 | // If the current member is banned, show a message and possibly a link to the ban. | 
| 381 | 403 | if (!empty($context['member']['bans'])) | 
| @@ -387,10 +409,11 @@ discard block | ||
| 387 | 409 | <dt class="clear" id="ban_info" style="display: none;"> | 
| 388 | 410 | <strong>', $txt['user_banned_by_following'], ':</strong>'; | 
| 389 | 411 | |
| 390 | - foreach ($context['member']['bans'] as $ban) | |
| 391 | - echo ' | |
| 412 | +			foreach ($context['member']['bans'] as $ban) { | |
| 413 | + echo ' | |
| 392 | 414 | <br> | 
| 393 | 415 | <span class="smalltext">', $ban['explanation'], '</span>'; | 
| 416 | + } | |
| 394 | 417 | |
| 395 | 418 | echo ' | 
| 396 | 419 | </dt>'; | 
| @@ -404,30 +427,34 @@ discard block | ||
| 404 | 427 | // If the person looking is allowed, they can check the members IP address and hostname. | 
| 405 | 428 | if ($context['can_see_ip']) | 
| 406 | 429 |  	{ | 
| 407 | - if (!empty($context['member']['ip'])) | |
| 408 | - echo ' | |
| 430 | +		if (!empty($context['member']['ip'])) { | |
| 431 | + echo ' | |
| 409 | 432 | <dt>', $txt['ip'], ': </dt> | 
| 410 | 433 | <dd><a href="', $scripturl, '?action=profile;area=tracking;sa=ip;searchip=', $context['member']['ip'], ';u=', $context['member']['id'], '">', $context['member']['ip'], '</a></dd>'; | 
| 434 | + } | |
| 411 | 435 | |
| 412 | - if (empty($modSettings['disableHostnameLookup']) && !empty($context['member']['ip'])) | |
| 413 | - echo ' | |
| 436 | +		if (empty($modSettings['disableHostnameLookup']) && !empty($context['member']['ip'])) { | |
| 437 | + echo ' | |
| 414 | 438 | <dt>', $txt['hostname'], ': </dt> | 
| 415 | 439 | <dd>', $context['member']['hostname'], '</dd>'; | 
| 440 | + } | |
| 416 | 441 | } | 
| 417 | 442 | |
| 418 | 443 | echo ' | 
| 419 | 444 | <dt>', $txt['local_time'], ':</dt> | 
| 420 | 445 | <dd>', $context['member']['local_time'], '</dd>'; | 
| 421 | 446 | |
| 422 | - if (!empty($modSettings['userLanguage']) && !empty($context['member']['language'])) | |
| 423 | - echo ' | |
| 447 | +	if (!empty($modSettings['userLanguage']) && !empty($context['member']['language'])) { | |
| 448 | + echo ' | |
| 424 | 449 | <dt>', $txt['language'], ':</dt> | 
| 425 | 450 | <dd>', $context['member']['language'], '</dd>'; | 
| 451 | + } | |
| 426 | 452 | |
| 427 | - if ($context['member']['show_last_login']) | |
| 428 | - echo ' | |
| 453 | +	if ($context['member']['show_last_login']) { | |
| 454 | + echo ' | |
| 429 | 455 | <dt>', $txt['lastLoggedIn'], ': </dt> | 
| 430 | 456 |  				<dd>', $context['member']['last_login'], (!empty($context['member']['is_hidden']) ? ' (' . $txt['hidden'] . ')' : ''), '</dd>'; | 
| 457 | + } | |
| 431 | 458 | |
| 432 | 459 | echo ' | 
| 433 | 460 | </dl>'; | 
| @@ -439,10 +466,11 @@ discard block | ||
| 439 | 466 | <div class="custom_fields_above_signature"> | 
| 440 | 467 | <ul class="nolist">'; | 
| 441 | 468 | |
| 442 | - foreach ($context['print_custom_fields']['above_signature'] as $field) | |
| 443 | - if (!empty($field['output_html'])) | |
| 469 | +		foreach ($context['print_custom_fields']['above_signature'] as $field) { | |
| 470 | + if (!empty($field['output_html'])) | |
| 444 | 471 | echo ' | 
| 445 | 472 | <li>', $field['output_html'], '</li>'; | 
| 473 | + } | |
| 446 | 474 | |
| 447 | 475 | echo ' | 
| 448 | 476 | </ul> | 
| @@ -450,12 +478,13 @@ discard block | ||
| 450 | 478 | } | 
| 451 | 479 | |
| 452 | 480 | // Show the users signature. | 
| 453 | - if ($context['signature_enabled'] && !empty($context['member']['signature'])) | |
| 454 | - echo ' | |
| 481 | +	if ($context['signature_enabled'] && !empty($context['member']['signature'])) { | |
| 482 | + echo ' | |
| 455 | 483 | <div class="signature"> | 
| 456 | 484 | <h5>', $txt['signature'], ':</h5> | 
| 457 | 485 | ', $context['member']['signature'], ' | 
| 458 | 486 | </div>'; | 
| 487 | + } | |
| 459 | 488 | |
| 460 | 489 | // Are there any custom profile fields for below the signature? | 
| 461 | 490 | if (!empty($context['print_custom_fields']['below_signature'])) | 
| @@ -464,10 +493,11 @@ discard block | ||
| 464 | 493 | <div class="custom_fields_below_signature"> | 
| 465 | 494 | <ul class="nolist">'; | 
| 466 | 495 | |
| 467 | - foreach ($context['print_custom_fields']['below_signature'] as $field) | |
| 468 | - if (!empty($field['output_html'])) | |
| 496 | +		foreach ($context['print_custom_fields']['below_signature'] as $field) { | |
| 497 | + if (!empty($field['output_html'])) | |
| 469 | 498 | echo ' | 
| 470 | 499 | <li>', $field['output_html'], '</li>'; | 
| 500 | + } | |
| 471 | 501 | |
| 472 | 502 | echo ' | 
| 473 | 503 | </ul> | 
| @@ -513,62 +543,70 @@ discard block | ||
| 513 | 543 | </div> | 
| 514 | 544 | <div class="list_posts">'; | 
| 515 | 545 | |
| 516 | - if (!$post['approved']) | |
| 517 | - echo ' | |
| 546 | +			if (!$post['approved']) { | |
| 547 | + echo ' | |
| 518 | 548 | <div class="approve_post"> | 
| 519 | 549 | <em>', $txt['post_awaiting_approval'], '</em> | 
| 520 | 550 | </div>'; | 
| 551 | + } | |
| 521 | 552 | |
| 522 | 553 | echo ' | 
| 523 | 554 | ', $post['body'], ' | 
| 524 | 555 | </div>'; | 
| 525 | 556 | |
| 526 | - if ($post['can_reply'] || $post['can_quote'] || $post['can_delete']) | |
| 527 | - echo ' | |
| 557 | +			if ($post['can_reply'] || $post['can_quote'] || $post['can_delete']) { | |
| 558 | + echo ' | |
| 528 | 559 | <div class="floatright"> | 
| 529 | 560 | <ul class="quickbuttons">'; | 
| 561 | + } | |
| 530 | 562 | |
| 531 | 563 | // If they *can* reply? | 
| 532 | - if ($post['can_reply']) | |
| 533 | - echo ' | |
| 564 | +			if ($post['can_reply']) { | |
| 565 | + echo ' | |
| 534 | 566 | <li><a href="', $scripturl, '?action=post;topic=', $post['topic'], '.', $post['start'], '"><span class="generic_icons reply_button"></span>', $txt['reply'], '</a></li>'; | 
| 567 | + } | |
| 535 | 568 | |
| 536 | 569 | // If they *can* quote? | 
| 537 | - if ($post['can_quote']) | |
| 538 | - echo ' | |
| 570 | +			if ($post['can_quote']) { | |
| 571 | + echo ' | |
| 539 | 572 | <li><a href="', $scripturl . '?action=post;topic=', $post['topic'], '.', $post['start'], ';quote=', $post['id'], '"><span class="generic_icons quote"></span>', $txt['quote_action'], '</a></li>'; | 
| 573 | + } | |
| 540 | 574 | |
| 541 | 575 | // How about... even... remove it entirely?! | 
| 542 | - if ($post['can_delete']) | |
| 543 | - echo ' | |
| 576 | +			if ($post['can_delete']) { | |
| 577 | + echo ' | |
| 544 | 578 | <li><a href="', $scripturl, '?action=deletemsg;msg=', $post['id'], ';topic=', $post['topic'], ';profile;u=', $context['member']['id'], ';start=', $context['start'], ';', $context['session_var'], '=', $context['session_id'], '" data-confirm="', $txt['remove_message'], '" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['remove'], '</a></li>'; | 
| 579 | + } | |
| 545 | 580 | |
| 546 | - if ($post['can_reply'] || $post['can_quote'] || $post['can_delete']) | |
| 547 | - echo ' | |
| 581 | +			if ($post['can_reply'] || $post['can_quote'] || $post['can_delete']) { | |
| 582 | + echo ' | |
| 548 | 583 | </ul> | 
| 549 | 584 | </div><!-- .floatright -->'; | 
| 585 | + } | |
| 550 | 586 | |
| 551 | 587 | echo ' | 
| 552 | 588 | </div><!-- $post[css_class] -->'; | 
| 553 | 589 | } | 
| 590 | +	} else { | |
| 591 | +			template_show_list('attachments'); | |
| 554 | 592 | } | 
| 555 | - else | |
| 556 | -		template_show_list('attachments'); | |
| 557 | 593 | |
| 558 | 594 | // No posts? Just end with a informative message. | 
| 559 | - if ((isset($context['attachments']) && empty($context['attachments'])) || (!isset($context['attachments']) && empty($context['posts']))) | |
| 560 | - echo ' | |
| 595 | +	if ((isset($context['attachments']) && empty($context['attachments'])) || (!isset($context['attachments']) && empty($context['posts']))) { | |
| 596 | + echo ' | |
| 561 | 597 | <div class="windowbg2"> | 
| 562 | 598 | ', isset($context['attachments']) ? $txt['show_attachments_none'] : ($context['is_topics'] ? $txt['show_topics_none'] : $txt['show_posts_none']), ' | 
| 563 | 599 | </div>'; | 
| 600 | + } | |
| 564 | 601 | |
| 565 | 602 | // Show more page numbers. | 
| 566 | - if (!empty($context['page_index'])) | |
| 567 | - echo ' | |
| 603 | +	if (!empty($context['page_index'])) { | |
| 604 | + echo ' | |
| 568 | 605 | <div class="pagesection"> | 
| 569 | 606 | <div class="pagelinks">', $context['page_index'], '</div> | 
| 570 | 607 | </div>'; | 
| 571 | -} | |
| 608 | + } | |
| 609 | + } | |
| 572 | 610 | |
| 573 | 611 | /** | 
| 574 | 612 | * Template for showing alerts within the alerts popup | 
| @@ -578,11 +616,12 @@ discard block | ||
| 578 | 616 | global $context, $txt, $scripturl; | 
| 579 | 617 | |
| 580 | 618 | // Do we have an update message? | 
| 581 | - if (!empty($context['update_message'])) | |
| 582 | - echo ' | |
| 619 | +	if (!empty($context['update_message'])) { | |
| 620 | + echo ' | |
| 583 | 621 | <div class="infobox"> | 
| 584 | 622 | ', $context['update_message'], '. | 
| 585 | 623 | </div>'; | 
| 624 | + } | |
| 586 | 625 | |
| 587 | 626 | echo ' | 
| 588 | 627 | <div class="cat_bar"> | 
| @@ -591,13 +630,12 @@ discard block | ||
| 591 | 630 | </h3> | 
| 592 | 631 | </div>'; | 
| 593 | 632 | |
| 594 | - if (empty($context['alerts'])) | |
| 595 | - echo ' | |
| 633 | +	if (empty($context['alerts'])) { | |
| 634 | + echo ' | |
| 596 | 635 | <div class="information"> | 
| 597 | 636 | ', $txt['alerts_none'], ' | 
| 598 | 637 | </div>'; | 
| 599 | - | |
| 600 | - else | |
| 638 | + } else | |
| 601 | 639 |  	{ | 
| 602 | 640 | // Start the form. | 
| 603 | 641 | echo ' | 
| @@ -659,12 +697,12 @@ discard block | ||
| 659 | 697 | </div>' : ''; | 
| 660 | 698 | |
| 661 | 699 | // No drafts? Just show an informative message. | 
| 662 | - if (empty($context['drafts'])) | |
| 663 | - echo ' | |
| 700 | +	if (empty($context['drafts'])) { | |
| 701 | + echo ' | |
| 664 | 702 | <div class="windowbg2 centertext"> | 
| 665 | 703 | ', $txt['draft_none'], ' | 
| 666 | 704 | </div>'; | 
| 667 | - else | |
| 705 | + } else | |
| 668 | 706 |  	{ | 
| 669 | 707 | // For every draft to be displayed, give it its own div, and show the important details of the draft. | 
| 670 | 708 | foreach ($context['drafts'] as $draft) | 
| @@ -676,13 +714,15 @@ discard block | ||
| 676 | 714 | <h5> | 
| 677 | 715 | <strong><a href="', $scripturl, '?board=', $draft['board']['id'], '.0">', $draft['board']['name'], '</a> / ', $draft['topic']['link'], '</strong>    '; | 
| 678 | 716 | |
| 679 | - if (!empty($draft['sticky'])) | |
| 680 | - echo ' | |
| 717 | +			if (!empty($draft['sticky'])) { | |
| 718 | + echo ' | |
| 681 | 719 | <span class="generic_icons sticky" title="', $txt['sticky_topic'], '"></span>'; | 
| 720 | + } | |
| 682 | 721 | |
| 683 | - if (!empty($draft['locked'])) | |
| 684 | - echo ' | |
| 722 | +			if (!empty($draft['locked'])) { | |
| 723 | + echo ' | |
| 685 | 724 | <span class="generic_icons lock" title="', $txt['locked_topic'], '"></span>'; | 
| 725 | + } | |
| 686 | 726 | |
| 687 | 727 | echo ' | 
| 688 | 728 | </h5> | 
| @@ -715,13 +755,13 @@ discard block | ||
| 715 | 755 |  { | 
| 716 | 756 | global $context, $scripturl, $txt; | 
| 717 | 757 | |
| 718 | - if (!empty($context['saved_successful'])) | |
| 719 | - echo ' | |
| 758 | +	if (!empty($context['saved_successful'])) { | |
| 759 | + echo ' | |
| 720 | 760 | <div class="infobox">', $context['user']['is_owner'] ? $txt['profile_updated_own'] : sprintf($txt['profile_updated_else'], $context['member']['name']), '</div>'; | 
| 721 | - | |
| 722 | - elseif (!empty($context['saved_failed'])) | |
| 723 | - echo ' | |
| 761 | +	} elseif (!empty($context['saved_failed'])) { | |
| 762 | + echo ' | |
| 724 | 763 | <div class="errorbox">', $context['saved_failed'], '</div>'; | 
| 764 | + } | |
| 725 | 765 | |
| 726 | 766 | echo ' | 
| 727 | 767 | <div id="edit_buddies"> | 
| @@ -736,14 +776,16 @@ discard block | ||
| 736 | 776 | <th scope="col" class="quarter_table">', $txt['name'], '</th> | 
| 737 | 777 | <th scope="col">', $txt['status'], '</th>'; | 
| 738 | 778 | |
| 739 | -	if (allowedTo('moderate_forum')) | |
| 740 | - echo ' | |
| 779 | +	if (allowedTo('moderate_forum')) { | |
| 780 | + echo ' | |
| 741 | 781 | <th scope="col">', $txt['email'], '</th>'; | 
| 782 | + } | |
| 742 | 783 | |
| 743 | - if (!empty($context['custom_pf'])) | |
| 744 | - foreach ($context['custom_pf'] as $column) | |
| 784 | +	if (!empty($context['custom_pf'])) { | |
| 785 | + foreach ($context['custom_pf'] as $column) | |
| 745 | 786 | echo ' | 
| 746 | 787 | <th scope="col">', $column['label'], '</th>'; | 
| 788 | + } | |
| 747 | 789 | |
| 748 | 790 | echo ' | 
| 749 | 791 | <th scope="col">', $txt['remove'], '</th> | 
| @@ -752,13 +794,14 @@ discard block | ||
| 752 | 794 | <tbody>'; | 
| 753 | 795 | |
| 754 | 796 | // If they don't have any buddies don't list them! | 
| 755 | - if (empty($context['buddies'])) | |
| 756 | - echo ' | |
| 797 | +	if (empty($context['buddies'])) { | |
| 798 | + echo ' | |
| 757 | 799 | <tr class="windowbg"> | 
| 758 | 800 |  					<td colspan="', allowedTo('moderate_forum') ? '10' : '9', '"> | 
| 759 | 801 | <strong>', $txt['no_buddies'], '</strong> | 
| 760 | 802 | </td> | 
| 761 | 803 | </tr>'; | 
| 804 | + } | |
| 762 | 805 | |
| 763 | 806 | // Now loop through each buddy showing info on each. | 
| 764 | 807 | else | 
| @@ -772,17 +815,19 @@ discard block | ||
| 772 | 815 | <a href="', $buddy['online']['href'], '"><span class="' . ($buddy['online']['is_online'] == 1 ? 'on' : 'off') . '" title="' . $buddy['online']['text'] . '"></span></a> | 
| 773 | 816 | </td>'; | 
| 774 | 817 | |
| 775 | - if ($buddy['show_email']) | |
| 776 | - echo ' | |
| 818 | +			if ($buddy['show_email']) { | |
| 819 | + echo ' | |
| 777 | 820 | <td> | 
| 778 | 821 | <a href="mailto:' . $buddy['email'] . '" rel="nofollow"><span class="generic_icons mail icon" title="' . $txt['email'] . ' ' . $buddy['name'] . '"></span></a> | 
| 779 | 822 | </td>'; | 
| 823 | + } | |
| 780 | 824 | |
| 781 | 825 | // Show the custom profile fields for this user. | 
| 782 | - if (!empty($context['custom_pf'])) | |
| 783 | - foreach ($context['custom_pf'] as $key => $column) | |
| 826 | +			if (!empty($context['custom_pf'])) { | |
| 827 | + foreach ($context['custom_pf'] as $key => $column) | |
| 784 | 828 | echo ' | 
| 785 | 829 | <td class="lefttext">', $buddy['options'][$key], '</td>'; | 
| 830 | + } | |
| 786 | 831 | |
| 787 | 832 | echo ' | 
| 788 | 833 | <td> | 
| @@ -815,9 +860,10 @@ discard block | ||
| 815 | 860 | </dl> | 
| 816 | 861 | </div>'; | 
| 817 | 862 | |
| 818 | - if (!empty($context['token_check'])) | |
| 819 | - echo ' | |
| 863 | +	if (!empty($context['token_check'])) { | |
| 864 | + echo ' | |
| 820 | 865 | <input type="hidden" name="', $context[$context['token_check'] . '_token_var'], '" value="', $context[$context['token_check'] . '_token'], '">'; | 
| 866 | + } | |
| 821 | 867 | |
| 822 | 868 | echo ' | 
| 823 | 869 | <input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '"> | 
| @@ -843,13 +889,13 @@ discard block | ||
| 843 | 889 |  { | 
| 844 | 890 | global $context, $scripturl, $txt; | 
| 845 | 891 | |
| 846 | - if (!empty($context['saved_successful'])) | |
| 847 | - echo ' | |
| 892 | +	if (!empty($context['saved_successful'])) { | |
| 893 | + echo ' | |
| 848 | 894 | <div class="infobox">', $context['user']['is_owner'] ? $txt['profile_updated_own'] : sprintf($txt['profile_updated_else'], $context['member']['name']), '</div>'; | 
| 849 | - | |
| 850 | - elseif (!empty($context['saved_failed'])) | |
| 851 | - echo ' | |
| 895 | +	} elseif (!empty($context['saved_failed'])) { | |
| 896 | + echo ' | |
| 852 | 897 | <div class="errorbox">', $context['saved_failed'], '</div>'; | 
| 898 | + } | |
| 853 | 899 | |
| 854 | 900 | echo ' | 
| 855 | 901 | <div id="edit_buddies"> | 
| @@ -864,9 +910,10 @@ discard block | ||
| 864 | 910 | <th scope="col" class="quarter_table">', $txt['name'], '</th> | 
| 865 | 911 | <th scope="col">', $txt['status'], '</th>'; | 
| 866 | 912 | |
| 867 | -	if (allowedTo('moderate_forum')) | |
| 868 | - echo ' | |
| 913 | +	if (allowedTo('moderate_forum')) { | |
| 914 | + echo ' | |
| 869 | 915 | <th scope="col">', $txt['email'], '</th>'; | 
| 916 | + } | |
| 870 | 917 | |
| 871 | 918 | echo ' | 
| 872 | 919 | <th scope="col">', $txt['ignore_remove'], '</th> | 
| @@ -875,13 +922,14 @@ discard block | ||
| 875 | 922 | <tbody>'; | 
| 876 | 923 | |
| 877 | 924 | // If they don't have anyone on their ignore list, don't list it! | 
| 878 | - if (empty($context['ignore_list'])) | |
| 879 | - echo ' | |
| 925 | +	if (empty($context['ignore_list'])) { | |
| 926 | + echo ' | |
| 880 | 927 | <tr class="windowbg"> | 
| 881 | 928 |  					<td colspan="', allowedTo('moderate_forum') ? '4' : '3', '"> | 
| 882 | 929 | <strong>', $txt['no_ignore'], '</strong> | 
| 883 | 930 | </td> | 
| 884 | 931 | </tr>'; | 
| 932 | + } | |
| 885 | 933 | |
| 886 | 934 | // Now loop through each buddy showing info on each. | 
| 887 | 935 | foreach ($context['ignore_list'] as $member) | 
| @@ -893,11 +941,12 @@ discard block | ||
| 893 | 941 | <a href="', $member['online']['href'], '"><span class="' . ($member['online']['is_online'] == 1 ? 'on' : 'off') . '" title="' . $member['online']['text'] . '"></span></a> | 
| 894 | 942 | </td>'; | 
| 895 | 943 | |
| 896 | - if ($member['show_email']) | |
| 897 | - echo ' | |
| 944 | +		if ($member['show_email']) { | |
| 945 | + echo ' | |
| 898 | 946 | <td> | 
| 899 | 947 | <a href="mailto:' . $member['email'] . '" rel="nofollow"><span class="generic_icons mail icon" title="' . $txt['email'] . ' ' . $member['name'] . '"></span></a> | 
| 900 | 948 | </td>'; | 
| 949 | + } | |
| 901 | 950 | echo ' | 
| 902 | 951 | <td> | 
| 903 | 952 | <a href="', $scripturl, '?action=profile;u=', $context['id_member'], ';area=lists;sa=ignore;remove=', $member['id'], ';', $context['session_var'], '=', $context['session_id'], '"><span class="generic_icons delete" title="', $txt['ignore_remove'], '"></span></a> | 
| @@ -927,9 +976,10 @@ discard block | ||
| 927 | 976 | </dl> | 
| 928 | 977 | </div>'; | 
| 929 | 978 | |
| 930 | - if (!empty($context['token_check'])) | |
| 931 | - echo ' | |
| 979 | +	if (!empty($context['token_check'])) { | |
| 980 | + echo ' | |
| 932 | 981 | <input type="hidden" name="', $context[$context['token_check'] . '_token_var'], '" value="', $context[$context['token_check'] . '_token'], '">'; | 
| 982 | + } | |
| 933 | 983 | |
| 934 | 984 | echo ' | 
| 935 | 985 | <input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '"> | 
| @@ -975,9 +1025,10 @@ discard block | ||
| 975 | 1025 | <a href="', $scripturl, '?action=profile;area=tracking;sa=ip;searchip=', $context['last_ip'], ';u=', $context['member']['id'], '">', $context['last_ip'], '</a>'; | 
| 976 | 1026 | |
| 977 | 1027 | // Second address detected? | 
| 978 | - if (!empty($context['last_ip2'])) | |
| 979 | - echo ' | |
| 1028 | +	if (!empty($context['last_ip2'])) { | |
| 1029 | + echo ' | |
| 980 | 1030 | , <a href="', $scripturl, '?action=profile;area=tracking;sa=ip;searchip=', $context['last_ip2'], ';u=', $context['member']['id'], '">', $context['last_ip2'], '</a>'; | 
| 1031 | + } | |
| 981 | 1032 | |
| 982 | 1033 | echo ' | 
| 983 | 1034 | </dd>'; | 
| @@ -1043,9 +1094,10 @@ discard block | ||
| 1043 | 1094 | </div> | 
| 1044 | 1095 | <div class="windowbg2 noup">'; | 
| 1045 | 1096 | |
| 1046 | - foreach ($context['whois_servers'] as $server) | |
| 1047 | - echo ' | |
| 1097 | +		foreach ($context['whois_servers'] as $server) { | |
| 1098 | + echo ' | |
| 1048 | 1099 | <a href="', $server['url'], '" target="_blank" rel="noopener"', isset($context['auto_whois_server']) && $context['auto_whois_server']['name'] == $server['name'] ? ' style="font-weight: bold;"' : '', '>', $server['name'], '</a><br>'; | 
| 1100 | + } | |
| 1049 | 1101 | echo ' | 
| 1050 | 1102 | </div> | 
| 1051 | 1103 | <br>'; | 
| @@ -1057,13 +1109,12 @@ discard block | ||
| 1057 | 1109 | <h3 class="catbg">', $txt['members_from_ip'], ' ', $context['ip'], '</h3> | 
| 1058 | 1110 | </div>'; | 
| 1059 | 1111 | |
| 1060 | - if (empty($context['ips'])) | |
| 1061 | - echo ' | |
| 1112 | +	if (empty($context['ips'])) { | |
| 1113 | + echo ' | |
| 1062 | 1114 | <p class="windowbg2 description"> | 
| 1063 | 1115 | <em>', $txt['no_members_from_ip'], '</em> | 
| 1064 | 1116 | </p>'; | 
| 1065 | - | |
| 1066 | - else | |
| 1117 | + } else | |
| 1067 | 1118 |  	{ | 
| 1068 | 1119 | echo ' | 
| 1069 | 1120 | <table class="table_grid"> | 
| @@ -1076,12 +1127,13 @@ discard block | ||
| 1076 | 1127 | <tbody>'; | 
| 1077 | 1128 | |
| 1078 | 1129 | // Loop through each of the members and display them. | 
| 1079 | - foreach ($context['ips'] as $ip => $memberlist) | |
| 1080 | - echo ' | |
| 1130 | +		foreach ($context['ips'] as $ip => $memberlist) { | |
| 1131 | + echo ' | |
| 1081 | 1132 | <tr class="windowbg"> | 
| 1082 | 1133 | <td><a href="', $context['base_url'], ';searchip=', $ip, '">', $ip, '</a></td> | 
| 1083 | 1134 |  					<td>', implode(', ', $memberlist), '</td> | 
| 1084 | 1135 | </tr>'; | 
| 1136 | + } | |
| 1085 | 1137 | |
| 1086 | 1138 | echo ' | 
| 1087 | 1139 | </tbody> | 
| @@ -1123,11 +1175,10 @@ discard block | ||
| 1123 | 1175 | </h3> | 
| 1124 | 1176 | </div>'; | 
| 1125 | 1177 | |
| 1126 | - if ($context['member']['has_all_permissions']) | |
| 1127 | - echo ' | |
| 1178 | +	if ($context['member']['has_all_permissions']) { | |
| 1179 | + echo ' | |
| 1128 | 1180 | <div class="information">', $txt['showPermissions_all'], '</div>'; | 
| 1129 | - | |
| 1130 | - else | |
| 1181 | + } else | |
| 1131 | 1182 |  	{ | 
| 1132 | 1183 | echo ' | 
| 1133 | 1184 | <div class="information">',$txt['showPermissions_help'], '</div> | 
| @@ -1142,9 +1193,10 @@ discard block | ||
| 1142 | 1193 | <div class="windowbg smalltext"> | 
| 1143 | 1194 | ', $txt['showPermissions_restricted_boards_desc'], ':<br>'; | 
| 1144 | 1195 | |
| 1145 | - foreach ($context['no_access_boards'] as $no_access_board) | |
| 1146 | - echo ' | |
| 1196 | +			foreach ($context['no_access_boards'] as $no_access_board) { | |
| 1197 | + echo ' | |
| 1147 | 1198 | <a href="', $scripturl, '?board=', $no_access_board['id'], '.0">', $no_access_board['name'], '</a>', $no_access_board['is_last'] ? '' : ', '; | 
| 1199 | + } | |
| 1148 | 1200 | echo ' | 
| 1149 | 1201 | </div>'; | 
| 1150 | 1202 | } | 
| @@ -1176,12 +1228,13 @@ discard block | ||
| 1176 | 1228 | </td> | 
| 1177 | 1229 | <td class="smalltext">'; | 
| 1178 | 1230 | |
| 1179 | - if ($permission['is_denied']) | |
| 1180 | - echo ' | |
| 1231 | +				if ($permission['is_denied']) { | |
| 1232 | + echo ' | |
| 1181 | 1233 |  								<span class="alert">', $txt['showPermissions_denied'], ': ', implode(', ', $permission['groups']['denied']), '</span>'; | 
| 1182 | - else | |
| 1183 | - echo ' | |
| 1234 | +				} else { | |
| 1235 | + echo ' | |
| 1184 | 1236 |  								', $txt['showPermissions_given'], ': ', implode(', ', $permission['groups']['allowed']); | 
| 1237 | + } | |
| 1185 | 1238 | |
| 1186 | 1239 | echo ' | 
| 1187 | 1240 | </td> | 
| @@ -1192,10 +1245,10 @@ discard block | ||
| 1192 | 1245 | </table> | 
| 1193 | 1246 | </div><!-- .tborder --> | 
| 1194 | 1247 | <br>'; | 
| 1195 | - } | |
| 1196 | - else | |
| 1197 | - echo ' | |
| 1248 | +		} else { | |
| 1249 | + echo ' | |
| 1198 | 1250 | <p class="windowbg2">', $txt['showPermissions_none_general'], '</p>'; | 
| 1251 | + } | |
| 1199 | 1252 | |
| 1200 | 1253 | // Board permission section. | 
| 1201 | 1254 | echo ' | 
| @@ -1206,14 +1259,16 @@ discard block | ||
| 1206 | 1259 | <select name="board" onchange="if (this.options[this.selectedIndex].value) this.form.submit();"> | 
| 1207 | 1260 | <option value="0"', $context['board'] == 0 ? ' selected' : '', '>', $txt['showPermissions_global'], '</option>'; | 
| 1208 | 1261 | |
| 1209 | - if (!empty($context['boards'])) | |
| 1210 | - echo ' | |
| 1262 | +		if (!empty($context['boards'])) { | |
| 1263 | + echo ' | |
| 1211 | 1264 | <option value="" disabled>---------------------------</option>'; | 
| 1265 | + } | |
| 1212 | 1266 | |
| 1213 | 1267 | // Fill the box with any local permission boards. | 
| 1214 | - foreach ($context['boards'] as $board) | |
| 1215 | - echo ' | |
| 1268 | +		foreach ($context['boards'] as $board) { | |
| 1269 | + echo ' | |
| 1216 | 1270 |  							<option value="', $board['id'], '"', $board['selected'] ? ' selected' : '', '>', $board['name'], ' (', $board['profile_name'], ')</option>'; | 
| 1271 | + } | |
| 1217 | 1272 | |
| 1218 | 1273 | echo ' | 
| 1219 | 1274 | </select> | 
| @@ -1242,13 +1297,13 @@ discard block | ||
| 1242 | 1297 | </td> | 
| 1243 | 1298 | <td class="smalltext">'; | 
| 1244 | 1299 | |
| 1245 | - if ($permission['is_denied']) | |
| 1246 | - echo ' | |
| 1300 | +				if ($permission['is_denied']) { | |
| 1301 | + echo ' | |
| 1247 | 1302 |  							<span class="alert">', $txt['showPermissions_denied'], ': ', implode(', ', $permission['groups']['denied']), '</span>'; | 
| 1248 | - | |
| 1249 | - else | |
| 1250 | - echo ' | |
| 1303 | +				} else { | |
| 1304 | + echo ' | |
| 1251 | 1305 |  							', $txt['showPermissions_given'], ': ', implode(', ', $permission['groups']['allowed']); | 
| 1306 | + } | |
| 1252 | 1307 | |
| 1253 | 1308 | echo ' | 
| 1254 | 1309 | </td> | 
| @@ -1257,10 +1312,10 @@ discard block | ||
| 1257 | 1312 | echo ' | 
| 1258 | 1313 | </tbody> | 
| 1259 | 1314 | </table>'; | 
| 1260 | - } | |
| 1261 | - else | |
| 1262 | - echo ' | |
| 1315 | +		} else { | |
| 1316 | + echo ' | |
| 1263 | 1317 | <p class="windowbg2">', $txt['showPermissions_none_board'], '</p>'; | 
| 1318 | + } | |
| 1264 | 1319 | echo ' | 
| 1265 | 1320 | </div><!-- #permissions -->'; | 
| 1266 | 1321 | } | 
| @@ -1301,9 +1356,10 @@ discard block | ||
| 1301 | 1356 | </div>'; | 
| 1302 | 1357 | |
| 1303 | 1358 | // If they haven't post at all, don't draw the graph. | 
| 1304 | - if (empty($context['posts_by_time'])) | |
| 1305 | - echo ' | |
| 1359 | +	if (empty($context['posts_by_time'])) { | |
| 1360 | + echo ' | |
| 1306 | 1361 | <p class="centertext padding">', $txt['statPanel_noPosts'], '</p>'; | 
| 1362 | + } | |
| 1307 | 1363 | |
| 1308 | 1364 | // Otherwise do! | 
| 1309 | 1365 | else | 
| @@ -1312,8 +1368,8 @@ discard block | ||
| 1312 | 1368 | <ul class="activity_stats flow_hidden">'; | 
| 1313 | 1369 | |
| 1314 | 1370 | // The labels. | 
| 1315 | - foreach ($context['posts_by_time'] as $time_of_day) | |
| 1316 | - echo ' | |
| 1371 | +		foreach ($context['posts_by_time'] as $time_of_day) { | |
| 1372 | + echo ' | |
| 1317 | 1373 | <li', $time_of_day['is_last'] ? ' class="last"' : '', '> | 
| 1318 | 1374 | <div class="bar" style="padding-top: ', ((int) (100 - $time_of_day['relative_percent'])), 'px;" title="', sprintf($txt['statPanel_activityTime_posts'], $time_of_day['posts'], $time_of_day['posts_percent']), '"> | 
| 1319 | 1375 | <div style="height: ', (int) $time_of_day['relative_percent'], 'px;"> | 
| @@ -1322,6 +1378,7 @@ discard block | ||
| 1322 | 1378 | </div> | 
| 1323 | 1379 | <span class="stats_hour">', $time_of_day['hour_format'], '</span> | 
| 1324 | 1380 | </li>'; | 
| 1381 | + } | |
| 1325 | 1382 | |
| 1326 | 1383 | echo ' | 
| 1327 | 1384 | </ul>'; | 
| @@ -1340,11 +1397,10 @@ discard block | ||
| 1340 | 1397 | </h3> | 
| 1341 | 1398 | </div>'; | 
| 1342 | 1399 | |
| 1343 | - if (empty($context['popular_boards'])) | |
| 1344 | - echo ' | |
| 1400 | +	if (empty($context['popular_boards'])) { | |
| 1401 | + echo ' | |
| 1345 | 1402 | <p class="centertext padding">', $txt['statPanel_noPosts'], '</p>'; | 
| 1346 | - | |
| 1347 | - else | |
| 1403 | + } else | |
| 1348 | 1404 |  	{ | 
| 1349 | 1405 | echo ' | 
| 1350 | 1406 | <dl class="stats">'; | 
| @@ -1374,10 +1430,10 @@ discard block | ||
| 1374 | 1430 | </h3> | 
| 1375 | 1431 | </div>'; | 
| 1376 | 1432 | |
| 1377 | - if (empty($context['board_activity'])) | |
| 1378 | - echo ' | |
| 1433 | +	if (empty($context['board_activity'])) { | |
| 1434 | + echo ' | |
| 1379 | 1435 | <p class="centertext padding">', $txt['statPanel_noPosts'], '</p>'; | 
| 1380 | - else | |
| 1436 | + } else | |
| 1381 | 1437 |  	{ | 
| 1382 | 1438 | echo ' | 
| 1383 | 1439 | <dl class="stats">'; | 
| @@ -1428,90 +1484,97 @@ discard block | ||
| 1428 | 1484 | <h3 class="catbg profile_hd">'; | 
| 1429 | 1485 | |
| 1430 | 1486 | // Don't say "Profile" if this isn't the profile... | 
| 1431 | - if (!empty($context['profile_header_text'])) | |
| 1432 | - echo ' | |
| 1487 | +		if (!empty($context['profile_header_text'])) { | |
| 1488 | + echo ' | |
| 1433 | 1489 | ', $context['profile_header_text']; | 
| 1434 | - else | |
| 1435 | - echo ' | |
| 1490 | +		} else { | |
| 1491 | + echo ' | |
| 1436 | 1492 | ', $txt['profile']; | 
| 1493 | + } | |
| 1437 | 1494 | |
| 1438 | 1495 | echo ' | 
| 1439 | 1496 | </h3> | 
| 1440 | 1497 | </div>'; | 
| 1441 | 1498 | |
| 1442 | 1499 | // Have we some description? | 
| 1443 | - if ($context['page_desc']) | |
| 1444 | - echo ' | |
| 1500 | +	if ($context['page_desc']) { | |
| 1501 | + echo ' | |
| 1445 | 1502 | <p class="information">', $context['page_desc'], '</p>'; | 
| 1503 | + } | |
| 1446 | 1504 | |
| 1447 | 1505 | echo ' | 
| 1448 | 1506 | <div class="roundframe">'; | 
| 1449 | 1507 | |
| 1450 | 1508 | // Any bits at the start? | 
| 1451 | - if (!empty($context['profile_prehtml'])) | |
| 1452 | - echo ' | |
| 1509 | +	if (!empty($context['profile_prehtml'])) { | |
| 1510 | + echo ' | |
| 1453 | 1511 | <div>', $context['profile_prehtml'], '</div>'; | 
| 1512 | + } | |
| 1454 | 1513 | |
| 1455 | - if (!empty($context['profile_fields'])) | |
| 1456 | - echo ' | |
| 1514 | +	if (!empty($context['profile_fields'])) { | |
| 1515 | + echo ' | |
| 1457 | 1516 | <dl class="settings">'; | 
| 1517 | + } | |
| 1458 | 1518 | |
| 1459 | 1519 | // Start the big old loop 'of love. | 
| 1460 | 1520 | $lastItem = 'hr'; | 
| 1461 | 1521 | foreach ($context['profile_fields'] as $key => $field) | 
| 1462 | 1522 |  	{ | 
| 1463 | 1523 | // We add a little hack to be sure we never get more than one hr in a row! | 
| 1464 | - if ($lastItem == 'hr' && $field['type'] == 'hr') | |
| 1465 | - continue; | |
| 1524 | +		if ($lastItem == 'hr' && $field['type'] == 'hr') { | |
| 1525 | + continue; | |
| 1526 | + } | |
| 1466 | 1527 | |
| 1467 | 1528 | $lastItem = $field['type']; | 
| 1468 | - if ($field['type'] == 'hr') | |
| 1469 | - echo ' | |
| 1529 | +		if ($field['type'] == 'hr') { | |
| 1530 | + echo ' | |
| 1470 | 1531 | </dl> | 
| 1471 | 1532 | <hr> | 
| 1472 | 1533 | <dl class="settings">'; | 
| 1473 | - | |
| 1474 | - elseif ($field['type'] == 'callback') | |
| 1534 | + } elseif ($field['type'] == 'callback') | |
| 1475 | 1535 |  		{ | 
| 1476 | 1536 |  			if (isset($field['callback_func']) && function_exists('template_profile_' . $field['callback_func'])) | 
| 1477 | 1537 |  			{ | 
| 1478 | 1538 | $callback_func = 'template_profile_' . $field['callback_func']; | 
| 1479 | 1539 | $callback_func(); | 
| 1480 | 1540 | } | 
| 1481 | - } | |
| 1482 | - else | |
| 1541 | + } else | |
| 1483 | 1542 |  		{ | 
| 1484 | 1543 | echo ' | 
| 1485 | 1544 | <dt> | 
| 1486 | 1545 | <strong', !empty($field['is_error']) ? ' class="error"' : '', '>', $field['type'] !== 'label' ? '<label for="' . $key . '">' : '', $field['label'], $field['type'] !== 'label' ? '</label>' : '', '</strong>'; | 
| 1487 | 1546 | |
| 1488 | 1547 | // Does it have any subtext to show? | 
| 1489 | - if (!empty($field['subtext'])) | |
| 1490 | - echo ' | |
| 1548 | +			if (!empty($field['subtext'])) { | |
| 1549 | + echo ' | |
| 1491 | 1550 | <br> | 
| 1492 | 1551 | <span class="smalltext">', $field['subtext'], '</span>'; | 
| 1552 | + } | |
| 1493 | 1553 | |
| 1494 | 1554 | echo ' | 
| 1495 | 1555 | </dt> | 
| 1496 | 1556 | <dd>'; | 
| 1497 | 1557 | |
| 1498 | 1558 | // Want to put something infront of the box? | 
| 1499 | - if (!empty($field['preinput'])) | |
| 1500 | - echo ' | |
| 1559 | +			if (!empty($field['preinput'])) { | |
| 1560 | + echo ' | |
| 1501 | 1561 | ', $field['preinput']; | 
| 1562 | + } | |
| 1502 | 1563 | |
| 1503 | 1564 | // What type of data are we showing? | 
| 1504 | - if ($field['type'] == 'label') | |
| 1505 | - echo ' | |
| 1565 | +			if ($field['type'] == 'label') { | |
| 1566 | + echo ' | |
| 1506 | 1567 | ', $field['value']; | 
| 1568 | + } | |
| 1507 | 1569 | |
| 1508 | 1570 | // Maybe it's a text box - very likely! | 
| 1509 | 1571 |  			elseif (in_array($field['type'], array('int', 'float', 'text', 'password', 'color', 'date', 'datetime', 'datetime-local', 'email', 'month', 'number', 'time', 'url'))) | 
| 1510 | 1572 |  			{ | 
| 1511 | - if ($field['type'] == 'int' || $field['type'] == 'float') | |
| 1512 | - $type = 'number'; | |
| 1513 | - else | |
| 1514 | - $type = $field['type']; | |
| 1573 | +				if ($field['type'] == 'int' || $field['type'] == 'float') { | |
| 1574 | + $type = 'number'; | |
| 1575 | +				} else { | |
| 1576 | + $type = $field['type']; | |
| 1577 | + } | |
| 1515 | 1578 | $step = $field['type'] == 'float' ? ' step="0.1"' : ''; | 
| 1516 | 1579 | |
| 1517 | 1580 | |
| @@ -1519,10 +1582,11 @@ discard block | ||
| 1519 | 1582 | <input type="', $type, '" name="', $key, '" id="', $key, '" size="', empty($field['size']) ? 30 : $field['size'], '" value="', $field['value'], '" ', $field['input_attr'], ' ', $step, '>'; | 
| 1520 | 1583 | } | 
| 1521 | 1584 | // You "checking" me out? ;) | 
| 1522 | - elseif ($field['type'] == 'check') | |
| 1523 | - echo ' | |
| 1585 | +			elseif ($field['type'] == 'check') { | |
| 1586 | + echo ' | |
| 1524 | 1587 | <input type="hidden" name="', $key, '" value="0"> | 
| 1525 | 1588 | <input type="checkbox" name="', $key, '" id="', $key, '"', !empty($field['value']) ? ' checked' : '', ' value="1" ', $field['input_attr'], '>'; | 
| 1589 | + } | |
| 1526 | 1590 | |
| 1527 | 1591 | // Always fun - select boxes! | 
| 1528 | 1592 | elseif ($field['type'] == 'select') | 
| @@ -1533,14 +1597,16 @@ discard block | ||
| 1533 | 1597 | if (isset($field['options'])) | 
| 1534 | 1598 |  				{ | 
| 1535 | 1599 | // Is this some code to generate the options? | 
| 1536 | - if (!is_array($field['options'])) | |
| 1537 | - $field['options'] = $field['options'](); | |
| 1600 | +					if (!is_array($field['options'])) { | |
| 1601 | + $field['options'] = $field['options'](); | |
| 1602 | + } | |
| 1538 | 1603 | |
| 1539 | 1604 | // Assuming we now have some! | 
| 1540 | - if (is_array($field['options'])) | |
| 1541 | - foreach ($field['options'] as $value => $name) | |
| 1605 | +					if (is_array($field['options'])) { | |
| 1606 | + foreach ($field['options'] as $value => $name) | |
| 1542 | 1607 | echo ' | 
| 1543 | 1608 | <option value="', $value, '"', $value == $field['value'] ? ' selected' : '', '>', $name, '</option>'; | 
| 1609 | + } | |
| 1544 | 1610 | } | 
| 1545 | 1611 | |
| 1546 | 1612 | echo ' | 
| @@ -1548,31 +1614,34 @@ discard block | ||
| 1548 | 1614 | } | 
| 1549 | 1615 | |
| 1550 | 1616 | // Something to end with? | 
| 1551 | - if (!empty($field['postinput'])) | |
| 1552 | - echo ' | |
| 1617 | +			if (!empty($field['postinput'])) { | |
| 1618 | + echo ' | |
| 1553 | 1619 | ', $field['postinput']; | 
| 1620 | + } | |
| 1554 | 1621 | |
| 1555 | 1622 | echo ' | 
| 1556 | 1623 | </dd>'; | 
| 1557 | 1624 | } | 
| 1558 | 1625 | } | 
| 1559 | 1626 | |
| 1560 | - if (!empty($context['profile_fields'])) | |
| 1561 | - echo ' | |
| 1627 | +	if (!empty($context['profile_fields'])) { | |
| 1628 | + echo ' | |
| 1562 | 1629 | </dl>'; | 
| 1630 | + } | |
| 1563 | 1631 | |
| 1564 | 1632 | // Are there any custom profile fields - if so print them! | 
| 1565 | 1633 | if (!empty($context['custom_fields'])) | 
| 1566 | 1634 |  	{ | 
| 1567 | - if ($lastItem != 'hr') | |
| 1568 | - echo ' | |
| 1635 | +		if ($lastItem != 'hr') { | |
| 1636 | + echo ' | |
| 1569 | 1637 | <hr>'; | 
| 1638 | + } | |
| 1570 | 1639 | |
| 1571 | 1640 | echo ' | 
| 1572 | 1641 | <dl class="settings">'; | 
| 1573 | 1642 | |
| 1574 | - foreach ($context['custom_fields'] as $field) | |
| 1575 | - echo ' | |
| 1643 | +		foreach ($context['custom_fields'] as $field) { | |
| 1644 | + echo ' | |
| 1576 | 1645 | <dt> | 
| 1577 | 1646 | <strong>', $field['name'], ': </strong><br> | 
| 1578 | 1647 | <span class="smalltext">', $field['desc'], '</span> | 
| @@ -1580,6 +1649,7 @@ discard block | ||
| 1580 | 1649 | <dd> | 
| 1581 | 1650 | ', $field['input_html'], ' | 
| 1582 | 1651 | </dd>'; | 
| 1652 | + } | |
| 1583 | 1653 | |
| 1584 | 1654 | echo ' | 
| 1585 | 1655 | </dl>'; | 
| @@ -1587,13 +1657,14 @@ discard block | ||
| 1587 | 1657 | } | 
| 1588 | 1658 | |
| 1589 | 1659 | // Any closing HTML? | 
| 1590 | - if (!empty($context['profile_posthtml'])) | |
| 1591 | - echo ' | |
| 1660 | +	if (!empty($context['profile_posthtml'])) { | |
| 1661 | + echo ' | |
| 1592 | 1662 | <div>', $context['profile_posthtml'], '</div>'; | 
| 1663 | + } | |
| 1593 | 1664 | |
| 1594 | 1665 | // Only show the password box if it's actually needed. | 
| 1595 | - if ($context['require_password']) | |
| 1596 | - echo ' | |
| 1666 | +	if ($context['require_password']) { | |
| 1667 | + echo ' | |
| 1597 | 1668 | <dl class="settings"> | 
| 1598 | 1669 | <dt> | 
| 1599 | 1670 | <strong', isset($context['modify_error']['bad_password']) || isset($context['modify_error']['no_password']) ? ' class="error"' : '', '><label for="oldpasswrd">', $txt['current_password'], ': </label></strong><br> | 
| @@ -1603,18 +1674,21 @@ discard block | ||
| 1603 | 1674 | <input type="password" name="oldpasswrd" id="oldpasswrd" size="20"> | 
| 1604 | 1675 | </dd> | 
| 1605 | 1676 | </dl>'; | 
| 1677 | + } | |
| 1606 | 1678 | |
| 1607 | 1679 | // The button shouldn't say "Change profile" unless we're changing the profile... | 
| 1608 | - if (!empty($context['submit_button_text'])) | |
| 1609 | - echo ' | |
| 1680 | +	if (!empty($context['submit_button_text'])) { | |
| 1681 | + echo ' | |
| 1610 | 1682 | <input type="submit" name="save" value="', $context['submit_button_text'], '" class="button floatright">'; | 
| 1611 | - else | |
| 1612 | - echo ' | |
| 1683 | +	} else { | |
| 1684 | + echo ' | |
| 1613 | 1685 | <input type="submit" name="save" value="', $txt['change_profile'], '" class="button floatright">'; | 
| 1686 | + } | |
| 1614 | 1687 | |
| 1615 | - if (!empty($context['token_check'])) | |
| 1616 | - echo ' | |
| 1688 | +	if (!empty($context['token_check'])) { | |
| 1689 | + echo ' | |
| 1617 | 1690 | <input type="hidden" name="', $context[$context['token_check'] . '_token_var'], '" value="', $context[$context['token_check'] . '_token'], '">'; | 
| 1691 | + } | |
| 1618 | 1692 | |
| 1619 | 1693 | echo ' | 
| 1620 | 1694 | <input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '"> | 
| @@ -1624,10 +1698,11 @@ discard block | ||
| 1624 | 1698 | </form>'; | 
| 1625 | 1699 | |
| 1626 | 1700 | // Any final spellchecking stuff? | 
| 1627 | - if (!empty($context['show_spellchecking'])) | |
| 1628 | - echo ' | |
| 1701 | +	if (!empty($context['show_spellchecking'])) { | |
| 1702 | + echo ' | |
| 1629 | 1703 | <form name="spell_form" id="spell_form" method="post" accept-charset="', $context['character_set'], '" target="spellWindow" action="', $scripturl, '?action=spellcheck"><input type="hidden" name="spellstring" value=""></form>'; | 
| 1630 | -} | |
| 1704 | + } | |
| 1705 | + } | |
| 1631 | 1706 | |
| 1632 | 1707 | /** | 
| 1633 | 1708 | * Personal Message settings. | 
| @@ -1664,10 +1739,11 @@ discard block | ||
| 1664 | 1739 | <select name="pm_receive_from" id="pm_receive_from"> | 
| 1665 | 1740 | <option value="0"', empty($context['receive_from']) || (empty($modSettings['enable_buddylist']) && $context['receive_from'] < 3) ? ' selected' : '', '>', $txt['pm_receive_from_everyone'], '</option>'; | 
| 1666 | 1741 | |
| 1667 | - if (!empty($modSettings['enable_buddylist'])) | |
| 1668 | - echo ' | |
| 1742 | +	if (!empty($modSettings['enable_buddylist'])) { | |
| 1743 | + echo ' | |
| 1669 | 1744 | <option value="1"', !empty($context['receive_from']) && $context['receive_from'] == 1 ? ' selected' : '', '>', $txt['pm_receive_from_ignore'], '</option> | 
| 1670 | 1745 | <option value="2"', !empty($context['receive_from']) && $context['receive_from'] == 2 ? ' selected' : '', '>', $txt['pm_receive_from_buddies'], '</option>'; | 
| 1746 | + } | |
| 1671 | 1747 | |
| 1672 | 1748 | echo ' | 
| 1673 | 1749 | <option value="3"', !empty($context['receive_from']) && $context['receive_from'] > 2 ? ' selected' : '', '>', $txt['pm_receive_from_admins'], '</option> | 
| @@ -1710,11 +1786,12 @@ discard block | ||
| 1710 | 1786 | if (empty($setting) || !is_array($setting)) | 
| 1711 | 1787 |  		{ | 
| 1712 | 1788 | // Insert a separator (unless this is the first item in the list) | 
| 1713 | - if ($i !== $first_option_key) | |
| 1714 | - echo ' | |
| 1789 | +			if ($i !== $first_option_key) { | |
| 1790 | + echo ' | |
| 1715 | 1791 | </dl> | 
| 1716 | 1792 | <hr> | 
| 1717 | 1793 | <dl class="settings">'; | 
| 1794 | + } | |
| 1718 | 1795 | |
| 1719 | 1796 | // Should we give a name to this section? | 
| 1720 | 1797 | if (is_string($setting) && !empty($setting)) | 
| @@ -1723,69 +1800,67 @@ discard block | ||
| 1723 | 1800 | echo ' | 
| 1724 | 1801 | <dt><strong>' . $setting . '</strong></dt> | 
| 1725 | 1802 | <dd></dd>'; | 
| 1803 | +			} else { | |
| 1804 | + $titled_section = false; | |
| 1726 | 1805 | } | 
| 1727 | - else | |
| 1728 | - $titled_section = false; | |
| 1729 | 1806 | |
| 1730 | 1807 | continue; | 
| 1731 | 1808 | } | 
| 1732 | 1809 | |
| 1733 | 1810 | // Is this disabled? | 
| 1734 | - if ($setting['id'] == 'calendar_start_day' && empty($modSettings['cal_enabled'])) | |
| 1735 | - continue; | |
| 1736 | - | |
| 1737 | - elseif (($setting['id'] == 'topics_per_page' || $setting['id'] == 'messages_per_page') && !empty($modSettings['disableCustomPerPage'])) | |
| 1738 | - continue; | |
| 1739 | - | |
| 1740 | - elseif ($setting['id'] == 'show_no_censored' && empty($modSettings['allow_no_censored'])) | |
| 1741 | - continue; | |
| 1742 | - | |
| 1743 | - elseif ($setting['id'] == 'posts_apply_ignore_list' && empty($modSettings['enable_buddylist'])) | |
| 1744 | - continue; | |
| 1745 | - | |
| 1746 | - elseif ($setting['id'] == 'wysiwyg_default' && !empty($modSettings['disable_wysiwyg'])) | |
| 1747 | - continue; | |
| 1748 | - | |
| 1749 | - elseif ($setting['id'] == 'drafts_autosave_enabled' && (empty($modSettings['drafts_autosave_enabled']) || (empty($modSettings['drafts_post_enabled']) && empty($modSettings['drafts_pm_enabled'])))) | |
| 1750 | - continue; | |
| 1751 | - | |
| 1752 | - elseif ($setting['id'] == 'drafts_show_saved_enabled' && (empty($modSettings['drafts_show_saved_enabled']) || (empty($modSettings['drafts_post_enabled']) && empty($modSettings['drafts_pm_enabled'])))) | |
| 1753 | - continue; | |
| 1811 | +		if ($setting['id'] == 'calendar_start_day' && empty($modSettings['cal_enabled'])) { | |
| 1812 | + continue; | |
| 1813 | +		} elseif (($setting['id'] == 'topics_per_page' || $setting['id'] == 'messages_per_page') && !empty($modSettings['disableCustomPerPage'])) { | |
| 1814 | + continue; | |
| 1815 | +		} elseif ($setting['id'] == 'show_no_censored' && empty($modSettings['allow_no_censored'])) { | |
| 1816 | + continue; | |
| 1817 | +		} elseif ($setting['id'] == 'posts_apply_ignore_list' && empty($modSettings['enable_buddylist'])) { | |
| 1818 | + continue; | |
| 1819 | +		} elseif ($setting['id'] == 'wysiwyg_default' && !empty($modSettings['disable_wysiwyg'])) { | |
| 1820 | + continue; | |
| 1821 | +		} elseif ($setting['id'] == 'drafts_autosave_enabled' && (empty($modSettings['drafts_autosave_enabled']) || (empty($modSettings['drafts_post_enabled']) && empty($modSettings['drafts_pm_enabled'])))) { | |
| 1822 | + continue; | |
| 1823 | +		} elseif ($setting['id'] == 'drafts_show_saved_enabled' && (empty($modSettings['drafts_show_saved_enabled']) || (empty($modSettings['drafts_post_enabled']) && empty($modSettings['drafts_pm_enabled'])))) { | |
| 1824 | + continue; | |
| 1825 | + } | |
| 1754 | 1826 | |
| 1755 | 1827 | // Some of these may not be set... Set to defaults here | 
| 1756 | 1828 |  		$opts = array('topics_per_page', 'messages_per_page', 'display_quick_mod'); | 
| 1757 | - if (in_array($setting['id'], $opts) && !isset($context['member']['options'][$setting['id']])) | |
| 1758 | - $context['member']['options'][$setting['id']] = 0; | |
| 1759 | - | |
| 1760 | - if (!isset($setting['type']) || $setting['type'] == 'bool') | |
| 1761 | - $setting['type'] = 'checkbox'; | |
| 1762 | - | |
| 1763 | - elseif ($setting['type'] == 'int' || $setting['type'] == 'integer') | |
| 1764 | - $setting['type'] = 'number'; | |
| 1829 | +		if (in_array($setting['id'], $opts) && !isset($context['member']['options'][$setting['id']])) { | |
| 1830 | + $context['member']['options'][$setting['id']] = 0; | |
| 1831 | + } | |
| 1765 | 1832 | |
| 1766 | - elseif ($setting['type'] == 'string') | |
| 1767 | - $setting['type'] = 'text'; | |
| 1833 | +		if (!isset($setting['type']) || $setting['type'] == 'bool') { | |
| 1834 | + $setting['type'] = 'checkbox'; | |
| 1835 | +		} elseif ($setting['type'] == 'int' || $setting['type'] == 'integer') { | |
| 1836 | + $setting['type'] = 'number'; | |
| 1837 | +		} elseif ($setting['type'] == 'string') { | |
| 1838 | + $setting['type'] = 'text'; | |
| 1839 | + } | |
| 1768 | 1840 | |
| 1769 | - if (isset($setting['options'])) | |
| 1770 | - $setting['type'] = 'list'; | |
| 1841 | +		if (isset($setting['options'])) { | |
| 1842 | + $setting['type'] = 'list'; | |
| 1843 | + } | |
| 1771 | 1844 | |
| 1772 | 1845 | echo ' | 
| 1773 | 1846 | <dt> | 
| 1774 | 1847 | <label for="', $setting['id'], '">', !$titled_section ? '<strong>' : '', $setting['label'], !$titled_section ? '</strong>' : '', '</label>'; | 
| 1775 | 1848 | |
| 1776 | - if (isset($setting['description'])) | |
| 1777 | - echo ' | |
| 1849 | +		if (isset($setting['description'])) { | |
| 1850 | + echo ' | |
| 1778 | 1851 | <br> | 
| 1779 | 1852 | <span class="smalltext">', $setting['description'], '</span>'; | 
| 1853 | + } | |
| 1780 | 1854 | echo ' | 
| 1781 | 1855 | </dt> | 
| 1782 | 1856 | <dd>'; | 
| 1783 | 1857 | |
| 1784 | 1858 | // Display checkbox options | 
| 1785 | - if ($setting['type'] == 'checkbox') | |
| 1786 | - echo ' | |
| 1859 | +		if ($setting['type'] == 'checkbox') { | |
| 1860 | + echo ' | |
| 1787 | 1861 | <input type="hidden" name="default_options[' . $setting['id'] . ']" value="0"> | 
| 1788 | 1862 | <input type="checkbox" name="default_options[', $setting['id'], ']" id="', $setting['id'], '"', !empty($context['member']['options'][$setting['id']]) ? ' checked' : '', ' value="1">'; | 
| 1863 | + } | |
| 1789 | 1864 | |
| 1790 | 1865 | // How about selection lists, we all love them | 
| 1791 | 1866 | elseif ($setting['type'] == 'list') | 
| @@ -1793,9 +1868,10 @@ discard block | ||
| 1793 | 1868 | echo ' | 
| 1794 | 1869 | <select name="default_options[', $setting['id'], ']" id="', $setting['id'], '"', '>'; | 
| 1795 | 1870 | |
| 1796 | - foreach ($setting['options'] as $value => $label) | |
| 1797 | - echo ' | |
| 1871 | +			foreach ($setting['options'] as $value => $label) { | |
| 1872 | + echo ' | |
| 1798 | 1873 | <option value="', $value, '"', $value == $context['member']['options'][$setting['id']] ? ' selected' : '', '>', $label, '</option>'; | 
| 1874 | + } | |
| 1799 | 1875 | |
| 1800 | 1876 | echo ' | 
| 1801 | 1877 | </select>'; | 
| @@ -1811,14 +1887,13 @@ discard block | ||
| 1811 | 1887 | |
| 1812 | 1888 | echo ' | 
| 1813 | 1889 | <input type="number"', $min . $max . $step; | 
| 1814 | - } | |
| 1815 | - elseif (isset($setting['type']) && $setting['type'] == 'url') | |
| 1816 | - echo' | |
| 1890 | +			} elseif (isset($setting['type']) && $setting['type'] == 'url') { | |
| 1891 | + echo' | |
| 1817 | 1892 | <input type="url"'; | 
| 1818 | - | |
| 1819 | - else | |
| 1820 | - echo ' | |
| 1893 | +			} else { | |
| 1894 | + echo ' | |
| 1821 | 1895 | <input type="text"'; | 
| 1896 | + } | |
| 1822 | 1897 | |
| 1823 | 1898 | echo ' name="default_options[', $setting['id'], ']" id="', $setting['id'], '" value="', isset($context['member']['options'][$setting['id']]) ? $context['member']['options'][$setting['id']] : $setting['value'], '"', $setting['type'] == 'number' ? ' size="5"' : '', '>'; | 
| 1824 | 1899 | } | 
| @@ -1855,8 +1930,8 @@ discard block | ||
| 1855 | 1930 | <dl class="settings">'; | 
| 1856 | 1931 | |
| 1857 | 1932 | // Allow notification on announcements to be disabled? | 
| 1858 | - if (!empty($modSettings['allow_disableAnnounce'])) | |
| 1859 | - echo ' | |
| 1933 | +	if (!empty($modSettings['allow_disableAnnounce'])) { | |
| 1934 | + echo ' | |
| 1860 | 1935 | <dt> | 
| 1861 | 1936 | <label for="notify_announcements">', $txt['notify_important_email'], '</label> | 
| 1862 | 1937 | </dt> | 
| @@ -1864,15 +1939,17 @@ discard block | ||
| 1864 | 1939 | <input type="hidden" name="notify_announcements" value="0"> | 
| 1865 | 1940 | <input type="checkbox" id="notify_announcements" name="notify_announcements" value="1"', !empty($context['member']['notify_announcements']) ? ' checked' : '', '> | 
| 1866 | 1941 | </dd>'; | 
| 1942 | + } | |
| 1867 | 1943 | |
| 1868 | - if (!empty($modSettings['enable_ajax_alerts'])) | |
| 1869 | - echo ' | |
| 1944 | +	if (!empty($modSettings['enable_ajax_alerts'])) { | |
| 1945 | + echo ' | |
| 1870 | 1946 | <dt> | 
| 1871 | 1947 | <label for="notify_send_body">', $txt['notify_alert_timeout'], '</label> | 
| 1872 | 1948 | </dt> | 
| 1873 | 1949 | <dd> | 
| 1874 | 1950 | <input type="number" size="4" id="notify_alert_timeout" name="opt_alert_timeout" min="0" value="', $context['member']['alert_timeout'], '"> | 
| 1875 | 1951 | </dd>'; | 
| 1952 | + } | |
| 1876 | 1953 | |
| 1877 | 1954 | echo ' | 
| 1878 | 1955 | </dl> | 
| @@ -1904,9 +1981,10 @@ discard block | ||
| 1904 | 1981 | |
| 1905 | 1982 | $label = $txt['alert_opt_' . $opts[1]]; | 
| 1906 | 1983 | $label_pos = isset($opts['label']) ? $opts['label'] : ''; | 
| 1907 | - if ($label_pos == 'before') | |
| 1908 | - echo ' | |
| 1984 | +				if ($label_pos == 'before') { | |
| 1985 | + echo ' | |
| 1909 | 1986 | <label for="opt_', $opts[1], '">', $label, '</label>'; | 
| 1987 | + } | |
| 1910 | 1988 | |
| 1911 | 1989 | $this_value = isset($context['alert_prefs'][$opts[1]]) ? $context['alert_prefs'][$opts[1]] : 0; | 
| 1912 | 1990 | switch ($opts[0]) | 
| @@ -1920,17 +1998,19 @@ discard block | ||
| 1920 | 1998 | echo ' | 
| 1921 | 1999 | <select name="opt_', $opts[1], '" id="opt_', $opts[1], '">'; | 
| 1922 | 2000 | |
| 1923 | - foreach ($opts['opts'] as $k => $v) | |
| 1924 | - echo ' | |
| 2001 | +						foreach ($opts['opts'] as $k => $v) { | |
| 2002 | + echo ' | |
| 1925 | 2003 | <option value="', $k, '"', $this_value == $k ? ' selected' : '', '>', $v, '</option>'; | 
| 2004 | + } | |
| 1926 | 2005 | echo ' | 
| 1927 | 2006 | </select>'; | 
| 1928 | 2007 | break; | 
| 1929 | 2008 | } | 
| 1930 | 2009 | |
| 1931 | - if ($label_pos == 'after') | |
| 1932 | - echo ' | |
| 2010 | +				if ($label_pos == 'after') { | |
| 2011 | + echo ' | |
| 1933 | 2012 | <label for="opt_', $opts[1], '">', $label, '</label>'; | 
| 2013 | + } | |
| 1934 | 2014 | |
| 1935 | 2015 | echo ' | 
| 1936 | 2016 | </td> | 
| @@ -2047,11 +2127,12 @@ discard block | ||
| 2047 | 2127 | <p class="information">', $txt['groupMembership_info'], '</p>'; | 
| 2048 | 2128 | |
| 2049 | 2129 | // Do we have an update message? | 
| 2050 | - if (!empty($context['update_message'])) | |
| 2051 | - echo ' | |
| 2130 | +	if (!empty($context['update_message'])) { | |
| 2131 | + echo ' | |
| 2052 | 2132 | <div class="infobox"> | 
| 2053 | 2133 | ', $context['update_message'], '. | 
| 2054 | 2134 | </div>'; | 
| 2135 | + } | |
| 2055 | 2136 | |
| 2056 | 2137 | echo ' | 
| 2057 | 2138 | <div id="groups">'; | 
| @@ -2073,8 +2154,7 @@ discard block | ||
| 2073 | 2154 | </div> | 
| 2074 | 2155 | </div> | 
| 2075 | 2156 | </div><!-- .groupmembership -->'; | 
| 2076 | - } | |
| 2077 | - else | |
| 2157 | + } else | |
| 2078 | 2158 |  	{ | 
| 2079 | 2159 | echo ' | 
| 2080 | 2160 | <div class="title_bar"> | 
| @@ -2086,27 +2166,30 @@ discard block | ||
| 2086 | 2166 | echo ' | 
| 2087 | 2167 | <div class="windowbg" id="primdiv_', $group['id'], '">'; | 
| 2088 | 2168 | |
| 2089 | - if ($context['can_edit_primary']) | |
| 2090 | - echo ' | |
| 2169 | +				if ($context['can_edit_primary']) { | |
| 2170 | + echo ' | |
| 2091 | 2171 | <input type="radio" name="primary" id="primary_', $group['id'], '" value="', $group['id'], '"', $group['is_primary'] ? ' checked' : '', ' onclick="highlightSelected(\'primdiv_' . $group['id'] . '\');"', $group['can_be_primary'] ? '' : ' disabled', '>'; | 
| 2172 | + } | |
| 2092 | 2173 | |
| 2093 | 2174 | echo ' | 
| 2094 | 2175 | <label for="primary_', $group['id'], '"><strong>', (empty($group['color']) ? $group['name'] : '<span style="color: ' . $group['color'] . '">' . $group['name'] . '</span>'), '</strong>', (!empty($group['desc']) ? '<br><span class="smalltext">' . $group['desc'] . '</span>' : ''), '</label>'; | 
| 2095 | 2176 | |
| 2096 | 2177 | // Can they leave their group? | 
| 2097 | - if ($group['can_leave']) | |
| 2098 | - echo ' | |
| 2178 | +				if ($group['can_leave']) { | |
| 2179 | + echo ' | |
| 2099 | 2180 | <a href="' . $scripturl . '?action=profile;save;u=' . $context['id_member'] . ';area=groupmembership;' . $context['session_var'] . '=' . $context['session_id'] . ';gid=' . $group['id'] . ';', $context[$context['token_check'] . '_token_var'], '=', $context[$context['token_check'] . '_token'], '">' . $txt['leave_group'] . '</a>'; | 
| 2181 | + } | |
| 2100 | 2182 | |
| 2101 | 2183 | echo ' | 
| 2102 | 2184 | </div><!-- .windowbg -->'; | 
| 2103 | 2185 | } | 
| 2104 | 2186 | |
| 2105 | - if ($context['can_edit_primary']) | |
| 2106 | - echo ' | |
| 2187 | +		if ($context['can_edit_primary']) { | |
| 2188 | + echo ' | |
| 2107 | 2189 | <div class="padding righttext"> | 
| 2108 | 2190 | <input type="submit" value="', $txt['make_primary'], '" class="button"> | 
| 2109 | 2191 | </div>'; | 
| 2192 | + } | |
| 2110 | 2193 | |
| 2111 | 2194 | // Any groups they can join? | 
| 2112 | 2195 | if (!empty($context['groups']['available'])) | 
| @@ -2122,17 +2205,16 @@ discard block | ||
| 2122 | 2205 | <div class="windowbg"> | 
| 2123 | 2206 | <strong>', (empty($group['color']) ? $group['name'] : '<span style="color: ' . $group['color'] . '">' . $group['name'] . '</span>'), '</strong>', (!empty($group['desc']) ? '<br><span class="smalltext">' . $group['desc'] . '</span>' : ''), ''; | 
| 2124 | 2207 | |
| 2125 | - if ($group['type'] == 3) | |
| 2126 | - echo ' | |
| 2208 | +				if ($group['type'] == 3) { | |
| 2209 | + echo ' | |
| 2127 | 2210 | <a href="', $scripturl, '?action=profile;save;u=', $context['id_member'], ';area=groupmembership;', $context['session_var'], '=', $context['session_id'], ';gid=', $group['id'], ';', $context[$context['token_check'] . '_token_var'], '=', $context[$context['token_check'] . '_token'], '" class="button floatright">', $txt['join_group'], '</a>'; | 
| 2128 | - | |
| 2129 | - elseif ($group['type'] == 2 && $group['pending']) | |
| 2130 | - echo ' | |
| 2211 | +				} elseif ($group['type'] == 2 && $group['pending']) { | |
| 2212 | + echo ' | |
| 2131 | 2213 | <span class="floatright">', $txt['approval_pending'], '</span>'; | 
| 2132 | - | |
| 2133 | - elseif ($group['type'] == 2) | |
| 2134 | - echo ' | |
| 2214 | +				} elseif ($group['type'] == 2) { | |
| 2215 | + echo ' | |
| 2135 | 2216 | <a href="', $scripturl, '?action=profile;u=', $context['id_member'], ';area=groupmembership;request=', $group['id'], '" class="button floatright">', $txt['request_group'], '</a>'; | 
| 2217 | + } | |
| 2136 | 2218 | |
| 2137 | 2219 | echo ' | 
| 2138 | 2220 | </div><!-- .windowbg -->'; | 
| @@ -2155,9 +2237,10 @@ discard block | ||
| 2155 | 2237 | |
| 2156 | 2238 | prevDiv.className = "windowbg"; | 
| 2157 | 2239 | }'; | 
| 2158 | - if (isset($context['groups']['member'][$context['primary_group']])) | |
| 2159 | - echo ' | |
| 2240 | +		if (isset($context['groups']['member'][$context['primary_group']])) { | |
| 2241 | + echo ' | |
| 2160 | 2242 |  					highlightSelected("primdiv_' . $context['primary_group'] . '");'; | 
| 2243 | + } | |
| 2161 | 2244 | |
| 2162 | 2245 | echo ' | 
| 2163 | 2246 | </script>'; | 
| @@ -2166,9 +2249,10 @@ discard block | ||
| 2166 | 2249 | echo ' | 
| 2167 | 2250 | </div><!-- #groups -->'; | 
| 2168 | 2251 | |
| 2169 | - if (!empty($context['token_check'])) | |
| 2170 | - echo ' | |
| 2252 | +	if (!empty($context['token_check'])) { | |
| 2253 | + echo ' | |
| 2171 | 2254 | <input type="hidden" name="', $context[$context['token_check'] . '_token_var'], '" value="', $context[$context['token_check'] . '_token'], '">'; | 
| 2255 | + } | |
| 2172 | 2256 | |
| 2173 | 2257 | echo ' | 
| 2174 | 2258 | <input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '"> | 
| @@ -2216,14 +2300,15 @@ discard block | ||
| 2216 | 2300 | |
| 2217 | 2301 | foreach ($category['boards'] as $board) | 
| 2218 | 2302 |  		{ | 
| 2219 | - if ($i == $limit) | |
| 2220 | - echo ' | |
| 2303 | +			if ($i == $limit) { | |
| 2304 | + echo ' | |
| 2221 | 2305 | </ul> | 
| 2222 | 2306 | </li> | 
| 2223 | 2307 | </ul> | 
| 2224 | 2308 | <ul class="ignoreboards floatright"> | 
| 2225 | 2309 | <li class="category"> | 
| 2226 | 2310 | <ul>'; | 
| 2311 | + } | |
| 2227 | 2312 | |
| 2228 | 2313 | echo ' | 
| 2229 | 2314 | <li class="board" style="margin-', $context['right_to_left'] ? 'right' : 'left', ': ', $board['child_level'], 'em;"> | 
| @@ -2269,10 +2354,11 @@ discard block | ||
| 2269 | 2354 | |
| 2270 | 2355 | // Work out the starting color. | 
| 2271 | 2356 | $context['current_color'] = $context['colors'][0]; | 
| 2272 | - foreach ($context['colors'] as $limit => $color) | |
| 2273 | - if ($context['member']['warning'] >= $limit) | |
| 2357 | +	foreach ($context['colors'] as $limit => $color) { | |
| 2358 | + if ($context['member']['warning'] >= $limit) | |
| 2274 | 2359 | $context['current_color'] = $color; | 
| 2275 | -} | |
| 2360 | + } | |
| 2361 | + } | |
| 2276 | 2362 | |
| 2277 | 2363 | // Show all warnings of a user? | 
| 2278 | 2364 | function template_viewWarning() | 
| @@ -2311,14 +2397,15 @@ discard block | ||
| 2311 | 2397 | </dd>'; | 
| 2312 | 2398 | |
| 2313 | 2399 | // There's some impact of this? | 
| 2314 | - if (!empty($context['level_effects'][$context['current_level']])) | |
| 2315 | - echo ' | |
| 2400 | +	if (!empty($context['level_effects'][$context['current_level']])) { | |
| 2401 | + echo ' | |
| 2316 | 2402 | <dt> | 
| 2317 | 2403 | <strong>', $txt['profile_viewwarning_impact'], ':</strong> | 
| 2318 | 2404 | </dt> | 
| 2319 | 2405 | <dd> | 
| 2320 | 2406 | ', $context['level_effects'][$context['current_level']], ' | 
| 2321 | 2407 | </dd>'; | 
| 2408 | + } | |
| 2322 | 2409 | |
| 2323 | 2410 | echo ' | 
| 2324 | 2411 | </dl> | 
| @@ -2356,10 +2443,11 @@ discard block | ||
| 2356 | 2443 | |
| 2357 | 2444 | // Otherwise see what we can do...'; | 
| 2358 | 2445 | |
| 2359 | - foreach ($context['notification_templates'] as $k => $type) | |
| 2360 | - echo ' | |
| 2446 | +	foreach ($context['notification_templates'] as $k => $type) { | |
| 2447 | + echo ' | |
| 2361 | 2448 | if (index == ', $k, ') | 
| 2362 | 2449 |  				document.getElementById(\'warn_body\').value = "', strtr($type['body'], array('"' => "'", "\n" => '\\n', "\r" => '')), '";'; | 
| 2450 | + } | |
| 2363 | 2451 | |
| 2364 | 2452 | echo ' | 
| 2365 | 2453 | } | 
| @@ -2369,10 +2457,11 @@ discard block | ||
| 2369 | 2457 | // Also set the right effect. | 
| 2370 | 2458 | effectText = "";'; | 
| 2371 | 2459 | |
| 2372 | - foreach ($context['level_effects'] as $limit => $text) | |
| 2373 | - echo ' | |
| 2460 | +	foreach ($context['level_effects'] as $limit => $text) { | |
| 2461 | + echo ' | |
| 2374 | 2462 | if (slideAmount >= ', $limit, ') | 
| 2375 | 2463 | effectText = "', $text, '";'; | 
| 2464 | + } | |
| 2376 | 2465 | |
| 2377 | 2466 | echo ' | 
| 2378 | 2467 | setInnerHTML(document.getElementById(\'cur_level_div\'), slideAmount + \'% (\' + effectText + \')\'); | 
| @@ -2387,32 +2476,35 @@ discard block | ||
| 2387 | 2476 | </h3> | 
| 2388 | 2477 | </div>'; | 
| 2389 | 2478 | |
| 2390 | - if (!$context['user']['is_owner']) | |
| 2391 | - echo ' | |
| 2479 | +	if (!$context['user']['is_owner']) { | |
| 2480 | + echo ' | |
| 2392 | 2481 | <p class="information">', $txt['profile_warning_desc'], '</p>'; | 
| 2482 | + } | |
| 2393 | 2483 | |
| 2394 | 2484 | echo ' | 
| 2395 | 2485 | <div class="windowbg"> | 
| 2396 | 2486 | <dl class="settings">'; | 
| 2397 | 2487 | |
| 2398 | - if (!$context['user']['is_owner']) | |
| 2399 | - echo ' | |
| 2488 | +	if (!$context['user']['is_owner']) { | |
| 2489 | + echo ' | |
| 2400 | 2490 | <dt> | 
| 2401 | 2491 | <strong>', $txt['profile_warning_name'], ':</strong> | 
| 2402 | 2492 | </dt> | 
| 2403 | 2493 | <dd> | 
| 2404 | 2494 | <strong>', $context['member']['name'], '</strong> | 
| 2405 | 2495 | </dd>'; | 
| 2496 | + } | |
| 2406 | 2497 | |
| 2407 | 2498 | echo ' | 
| 2408 | 2499 | <dt> | 
| 2409 | 2500 | <strong>', $txt['profile_warning_level'], ':</strong>'; | 
| 2410 | 2501 | |
| 2411 | 2502 | // Is there only so much they can apply? | 
| 2412 | - if ($context['warning_limit']) | |
| 2413 | - echo ' | |
| 2503 | +	if ($context['warning_limit']) { | |
| 2504 | + echo ' | |
| 2414 | 2505 | <br> | 
| 2415 | 2506 | <span class="smalltext">', sprintf($txt['profile_warning_limit_attribute'], $context['warning_limit']), '</span>'; | 
| 2507 | + } | |
| 2416 | 2508 | |
| 2417 | 2509 | echo ' | 
| 2418 | 2510 | </dt> | 
| @@ -2467,9 +2559,10 @@ discard block | ||
| 2467 | 2559 | <option value="-1">', $txt['profile_warning_notify_template'], '</option> | 
| 2468 | 2560 | <option value="-1" disabled>------------------------------</option>'; | 
| 2469 | 2561 | |
| 2470 | - foreach ($context['notification_templates'] as $id_template => $template) | |
| 2471 | - echo ' | |
| 2562 | +		foreach ($context['notification_templates'] as $id_template => $template) { | |
| 2563 | + echo ' | |
| 2472 | 2564 | <option value="', $id_template, '">', $template['title'], '</option>'; | 
| 2565 | + } | |
| 2473 | 2566 | |
| 2474 | 2567 | echo ' | 
| 2475 | 2568 | </select> | 
| @@ -2482,9 +2575,10 @@ discard block | ||
| 2482 | 2575 | </dl> | 
| 2483 | 2576 | <div class="righttext">'; | 
| 2484 | 2577 | |
| 2485 | - if (!empty($context['token_check'])) | |
| 2486 | - echo ' | |
| 2578 | +	if (!empty($context['token_check'])) { | |
| 2579 | + echo ' | |
| 2487 | 2580 | <input type="hidden" name="', $context[$context['token_check'] . '_token_var'], '" value="', $context[$context['token_check'] . '_token'], '">'; | 
| 2581 | + } | |
| 2488 | 2582 | |
| 2489 | 2583 | echo ' | 
| 2490 | 2584 | <input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '"> | 
| @@ -2500,8 +2594,8 @@ discard block | ||
| 2500 | 2594 | echo ' | 
| 2501 | 2595 | <script>'; | 
| 2502 | 2596 | |
| 2503 | - if (!$context['user']['is_owner']) | |
| 2504 | - echo ' | |
| 2597 | +	if (!$context['user']['is_owner']) { | |
| 2598 | + echo ' | |
| 2505 | 2599 | modifyWarnNotify(); | 
| 2506 | 2600 |  		$(document).ready(function() { | 
| 2507 | 2601 |  			$("#preview_button").click(function() { | 
| @@ -2540,6 +2634,7 @@ discard block | ||
| 2540 | 2634 | }); | 
| 2541 | 2635 | return false; | 
| 2542 | 2636 | }'; | 
| 2637 | + } | |
| 2543 | 2638 | |
| 2544 | 2639 | echo ' | 
| 2545 | 2640 | </script>'; | 
| @@ -2562,17 +2657,19 @@ discard block | ||
| 2562 | 2657 | </div>'; | 
| 2563 | 2658 | |
| 2564 | 2659 | // If deleting another account give them a lovely info box. | 
| 2565 | - if (!$context['user']['is_owner']) | |
| 2566 | - echo ' | |
| 2660 | +	if (!$context['user']['is_owner']) { | |
| 2661 | + echo ' | |
| 2567 | 2662 | <p class="information">', $txt['deleteAccount_desc'], '</p>'; | 
| 2663 | + } | |
| 2568 | 2664 | |
| 2569 | 2665 | echo ' | 
| 2570 | 2666 | <div class="windowbg2">'; | 
| 2571 | 2667 | |
| 2572 | 2668 | // If they are deleting their account AND the admin needs to approve it - give them another piece of info ;) | 
| 2573 | - if ($context['needs_approval']) | |
| 2574 | - echo ' | |
| 2669 | +	if ($context['needs_approval']) { | |
| 2670 | + echo ' | |
| 2575 | 2671 | <div class="errorbox">', $txt['deleteAccount_approval'], '</div>'; | 
| 2672 | + } | |
| 2576 | 2673 | |
| 2577 | 2674 | // If the user is deleting their own account warn them first - and require a password! | 
| 2578 | 2675 | if ($context['user']['is_owner']) | 
| @@ -2584,9 +2681,10 @@ discard block | ||
| 2584 | 2681 | <input type="password" name="oldpasswrd" size="20"> | 
| 2585 | 2682 | <input type="submit" value="', $txt['yes'], '" class="button">'; | 
| 2586 | 2683 | |
| 2587 | - if (!empty($context['token_check'])) | |
| 2588 | - echo ' | |
| 2684 | +		if (!empty($context['token_check'])) { | |
| 2685 | + echo ' | |
| 2589 | 2686 | <input type="hidden" name="', $context[$context['token_check'] . '_token_var'], '" value="', $context[$context['token_check'] . '_token'], '">'; | 
| 2687 | + } | |
| 2590 | 2688 | |
| 2591 | 2689 | echo ' | 
| 2592 | 2690 | <input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '"> | 
| @@ -2616,10 +2714,11 @@ discard block | ||
| 2616 | 2714 | <option value="topics">', $txt['deleteAccount_topics'], '</option> | 
| 2617 | 2715 | </select>'; | 
| 2618 | 2716 | |
| 2619 | - if ($context['show_perma_delete']) | |
| 2620 | - echo ' | |
| 2717 | +			if ($context['show_perma_delete']) { | |
| 2718 | + echo ' | |
| 2621 | 2719 | <br> | 
| 2622 | 2720 | <label for="perma_delete"><input type="checkbox" name="perma_delete" id="perma_delete" value="1">', $txt['deleteAccount_permanent'], ':</label>'; | 
| 2721 | + } | |
| 2623 | 2722 | |
| 2624 | 2723 | echo ' | 
| 2625 | 2724 | </div>'; | 
| @@ -2632,9 +2731,10 @@ discard block | ||
| 2632 | 2731 | <div> | 
| 2633 | 2732 | <input type="submit" value="', $txt['delete'], '" class="button">'; | 
| 2634 | 2733 | |
| 2635 | - if (!empty($context['token_check'])) | |
| 2636 | - echo ' | |
| 2734 | +		if (!empty($context['token_check'])) { | |
| 2735 | + echo ' | |
| 2637 | 2736 | <input type="hidden" name="', $context[$context['token_check'] . '_token_var'], '" value="', $context[$context['token_check'] . '_token'], '">'; | 
| 2737 | + } | |
| 2638 | 2738 | |
| 2639 | 2739 | echo ' | 
| 2640 | 2740 | <input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '"> | 
| @@ -2660,8 +2760,8 @@ discard block | ||
| 2660 | 2760 | <hr>'; | 
| 2661 | 2761 | |
| 2662 | 2762 | // Only show the password box if it's actually needed. | 
| 2663 | - if ($context['require_password']) | |
| 2664 | - echo ' | |
| 2763 | +	if ($context['require_password']) { | |
| 2764 | + echo ' | |
| 2665 | 2765 | <dl class="settings"> | 
| 2666 | 2766 | <dt> | 
| 2667 | 2767 | <strong', isset($context['modify_error']['bad_password']) || isset($context['modify_error']['no_password']) ? ' class="error"' : '', '>', $txt['current_password'], ': </strong><br> | 
| @@ -2671,13 +2771,15 @@ discard block | ||
| 2671 | 2771 | <input type="password" name="oldpasswrd" size="20"> | 
| 2672 | 2772 | </dd> | 
| 2673 | 2773 | </dl>'; | 
| 2774 | + } | |
| 2674 | 2775 | |
| 2675 | 2776 | echo ' | 
| 2676 | 2777 | <div class="righttext">'; | 
| 2677 | 2778 | |
| 2678 | - if (!empty($context['token_check'])) | |
| 2679 | - echo ' | |
| 2779 | +	if (!empty($context['token_check'])) { | |
| 2780 | + echo ' | |
| 2680 | 2781 | <input type="hidden" name="', $context[$context['token_check'] . '_token_var'], '" value="', $context[$context['token_check'] . '_token'], '">'; | 
| 2782 | + } | |
| 2681 | 2783 | |
| 2682 | 2784 | echo ' | 
| 2683 | 2785 | <input type="submit" value="', $txt['change_profile'], '" class="button"> | 
| @@ -2704,9 +2806,10 @@ discard block | ||
| 2704 | 2806 | <ul id="list_errors">'; | 
| 2705 | 2807 | |
| 2706 | 2808 | // Cycle through each error and display an error message. | 
| 2707 | - foreach ($context['post_errors'] as $error) | |
| 2708 | - echo ' | |
| 2809 | +		foreach ($context['post_errors'] as $error) { | |
| 2810 | + echo ' | |
| 2709 | 2811 | <li>', isset($txt['profile_error_' . $error]) ? $txt['profile_error_' . $error] : $error, '</li>'; | 
| 2812 | + } | |
| 2710 | 2813 | |
| 2711 | 2814 | echo ' | 
| 2712 | 2815 | </ul>'; | 
| @@ -2732,12 +2835,13 @@ discard block | ||
| 2732 | 2835 | <select name="id_group" ', ($context['user']['is_owner'] && $context['member']['group_id'] == 1 ? 'onchange="if (this.value != 1 && !confirm(\'' . $txt['deadmin_confirm'] . '\')) this.value = 1;"' : ''), '>'; | 
| 2733 | 2836 | |
| 2734 | 2837 | // Fill the select box with all primary member groups that can be assigned to a member. | 
| 2735 | - foreach ($context['member_groups'] as $member_group) | |
| 2736 | - if (!empty($member_group['can_be_primary'])) | |
| 2838 | +	foreach ($context['member_groups'] as $member_group) { | |
| 2839 | + if (!empty($member_group['can_be_primary'])) | |
| 2737 | 2840 | echo ' | 
| 2738 | 2841 | <option value="', $member_group['id'], '"', $member_group['is_primary'] ? ' selected' : '', '> | 
| 2739 | 2842 | ', $member_group['name'], ' | 
| 2740 | 2843 | </option>'; | 
| 2844 | + } | |
| 2741 | 2845 | |
| 2742 | 2846 | echo ' | 
| 2743 | 2847 | </select> | 
| @@ -2750,10 +2854,11 @@ discard block | ||
| 2750 | 2854 | <input type="hidden" name="additional_groups[]" value="0">'; | 
| 2751 | 2855 | |
| 2752 | 2856 | // For each membergroup show a checkbox so members can be assigned to more than one group. | 
| 2753 | - foreach ($context['member_groups'] as $member_group) | |
| 2754 | - if ($member_group['can_be_additional']) | |
| 2857 | +	foreach ($context['member_groups'] as $member_group) { | |
| 2858 | + if ($member_group['can_be_additional']) | |
| 2755 | 2859 | echo ' | 
| 2756 | 2860 | <label for="additional_groups-', $member_group['id'], '"><input type="checkbox" name="additional_groups[]" value="', $member_group['id'], '" id="additional_groups-', $member_group['id'], '"', $member_group['is_additional'] ? ' checked' : '', '> ', $member_group['name'], '</label><br>'; | 
| 2861 | + } | |
| 2757 | 2862 | |
| 2758 | 2863 | echo ' | 
| 2759 | 2864 | </span> | 
| @@ -2813,9 +2918,10 @@ discard block | ||
| 2813 | 2918 | <span class="smalltext">', $txt['sig_info'], '</span><br> | 
| 2814 | 2919 | <br>'; | 
| 2815 | 2920 | |
| 2816 | - if ($context['show_spellchecking']) | |
| 2817 | - echo ' | |
| 2921 | +	if ($context['show_spellchecking']) { | |
| 2922 | + echo ' | |
| 2818 | 2923 | <input type="button" value="', $txt['spell_check'], '" onclick="spellCheck(\'creator\', \'signature\');" class="button">'; | 
| 2924 | + } | |
| 2819 | 2925 | |
| 2820 | 2926 | echo ' | 
| 2821 | 2927 | </dt> | 
| @@ -2823,17 +2929,20 @@ discard block | ||
| 2823 | 2929 | <textarea class="editor" onkeyup="calcCharLeft();" id="signature" name="signature" rows="5" cols="50">', $context['member']['signature'], '</textarea><br>'; | 
| 2824 | 2930 | |
| 2825 | 2931 | // If there is a limit at all! | 
| 2826 | - if (!empty($context['signature_limits']['max_length'])) | |
| 2827 | - echo ' | |
| 2932 | +	if (!empty($context['signature_limits']['max_length'])) { | |
| 2933 | + echo ' | |
| 2828 | 2934 | <span class="smalltext">', sprintf($txt['max_sig_characters'], $context['signature_limits']['max_length']), ' <span id="signatureLeft">', $context['signature_limits']['max_length'], '</span></span><br>'; | 
| 2935 | + } | |
| 2829 | 2936 | |
| 2830 | - if (!empty($context['show_preview_button'])) | |
| 2831 | - echo ' | |
| 2937 | +	if (!empty($context['show_preview_button'])) { | |
| 2938 | + echo ' | |
| 2832 | 2939 | <input type="button" name="preview_signature" id="preview_button" value="', $txt['preview_signature'], '" class="button floatright">'; | 
| 2940 | + } | |
| 2833 | 2941 | |
| 2834 | - if ($context['signature_warning']) | |
| 2835 | - echo ' | |
| 2942 | +	if ($context['signature_warning']) { | |
| 2943 | + echo ' | |
| 2836 | 2944 | <span class="smalltext">', $context['signature_warning'], '</span>'; | 
| 2945 | + } | |
| 2837 | 2946 | |
| 2838 | 2947 | // Some javascript used to count how many characters have been used so far in the signature. | 
| 2839 | 2948 | echo ' | 
| @@ -2878,9 +2987,10 @@ discard block | ||
| 2878 | 2987 | <select name="cat" id="cat" size="10" onchange="changeSel(\'\');" onfocus="selectRadioByName(document.forms.creator.avatar_choice, \'server_stored\');">'; | 
| 2879 | 2988 | |
| 2880 | 2989 | // This lists all the file categories. | 
| 2881 | - foreach ($context['avatars'] as $avatar) | |
| 2882 | - echo ' | |
| 2990 | +		foreach ($context['avatars'] as $avatar) { | |
| 2991 | + echo ' | |
| 2883 | 2992 | <option value="', $avatar['filename'] . ($avatar['is_dir'] ? '/' : ''), '"', ($avatar['checked'] ? ' selected' : ''), '>', $avatar['name'], '</option>'; | 
| 2993 | + } | |
| 2884 | 2994 | |
| 2885 | 2995 | echo ' | 
| 2886 | 2996 | </select> | 
| @@ -2912,20 +3022,22 @@ discard block | ||
| 2912 | 3022 | } | 
| 2913 | 3023 | |
| 2914 | 3024 | // If the user can link to an off server avatar, show them a box to input the address. | 
| 2915 | - if (!empty($context['member']['avatar']['allow_external'])) | |
| 2916 | - echo ' | |
| 3025 | +	if (!empty($context['member']['avatar']['allow_external'])) { | |
| 3026 | + echo ' | |
| 2917 | 3027 | <div id="avatar_external"> | 
| 2918 | 3028 |  									<div class="smalltext">', $txt['avatar_by_url'], '</div>', !empty($modSettings['avatar_action_too_large']) && $modSettings['avatar_action_too_large'] == 'option_download_and_resize' ? template_max_size('external') : '', ' | 
| 2919 | 3029 | <input type="text" name="userpicpersonal" size="45" value="', ((stristr($context['member']['avatar']['external'], 'http://') || stristr($context['member']['avatar']['external'], 'https://')) ? $context['member']['avatar']['external'] : 'http://'), '" onfocus="selectRadioByName(document.forms.creator.avatar_choice, \'external\');" onchange="if (typeof(previewExternalAvatar) != \'undefined\') previewExternalAvatar(this.value);"> | 
| 2920 | 3030 | </div>'; | 
| 3031 | + } | |
| 2921 | 3032 | |
| 2922 | 3033 | // If the user is able to upload avatars to the server show them an upload box. | 
| 2923 | - if (!empty($context['member']['avatar']['allow_upload'])) | |
| 2924 | - echo ' | |
| 3034 | +	if (!empty($context['member']['avatar']['allow_upload'])) { | |
| 3035 | + echo ' | |
| 2925 | 3036 | <div id="avatar_upload"> | 
| 2926 | 3037 |  									<input type="file" size="44" name="attachment" id="avatar_upload_box" value="" onchange="readfromUpload(this)"  onfocus="selectRadioByName(document.forms.creator.avatar_choice, \'upload\');" accept="image/gif, image/jpeg, image/jpg, image/png">', template_max_size('upload'), ' | 
| 2927 | 3038 | ', (!empty($context['member']['avatar']['id_attach']) ? '<br><img src="' . $context['member']['avatar']['href'] . (strpos($context['member']['avatar']['href'], '?') === false ? '?' : '&') . 'time=' . time() . '" alt="" id="attached_image"><input type="hidden" name="id_attach" value="' . $context['member']['avatar']['id_attach'] . '">' : ''), ' | 
| 2928 | 3039 | </div>'; | 
| 3040 | + } | |
| 2929 | 3041 | |
| 2930 | 3042 | // if the user is able to use Gravatar avatars show then the image preview | 
| 2931 | 3043 | if (!empty($context['member']['avatar']['allow_gravatar'])) | 
| @@ -2934,16 +3046,17 @@ discard block | ||
| 2934 | 3046 | <div id="avatar_gravatar"> | 
| 2935 | 3047 | <img src="' . $context['member']['avatar']['href'] . '" alt="">'; | 
| 2936 | 3048 | |
| 2937 | - if (empty($modSettings['gravatarAllowExtraEmail'])) | |
| 2938 | - echo ' | |
| 3049 | +		if (empty($modSettings['gravatarAllowExtraEmail'])) { | |
| 3050 | + echo ' | |
| 2939 | 3051 | <div class="smalltext">', $txt['gravatar_noAlternateEmail'], '</div>'; | 
| 2940 | - else | |
| 3052 | + } else | |
| 2941 | 3053 |  		{ | 
| 2942 | 3054 | // Depending on other stuff, the stored value here might have some odd things in it from other areas. | 
| 2943 | - if ($context['member']['avatar']['external'] == $context['member']['email']) | |
| 2944 | - $textbox_value = ''; | |
| 2945 | - else | |
| 2946 | - $textbox_value = $context['member']['avatar']['external']; | |
| 3055 | +			if ($context['member']['avatar']['external'] == $context['member']['email']) { | |
| 3056 | + $textbox_value = ''; | |
| 3057 | +			} else { | |
| 3058 | + $textbox_value = $context['member']['avatar']['external']; | |
| 3059 | + } | |
| 2947 | 3060 | |
| 2948 | 3061 | echo ' | 
| 2949 | 3062 | <div class="smalltext">', $txt['gravatar_alternateEmail'], '</div> | 
| @@ -3015,8 +3128,9 @@ discard block | ||
| 3015 | 3128 | $h = !empty($modSettings['avatar_max_height_' . $type]) ? comma_format($modSettings['avatar_max_height_' . $type]) : 0; | 
| 3016 | 3129 | |
| 3017 | 3130 | $suffix = (!empty($w) ? 'w' : '') . (!empty($h) ? 'h' : ''); | 
| 3018 | - if (empty($suffix)) | |
| 3019 | - return; | |
| 3131 | +	if (empty($suffix)) { | |
| 3132 | + return; | |
| 3133 | + } | |
| 3020 | 3134 | |
| 3021 | 3135 | echo ' | 
| 3022 | 3136 | <div class="smalltext">', sprintf($txt['avatar_max_size_' . $suffix], $w, $h), '</div>'; | 
| @@ -3041,9 +3155,10 @@ discard block | ||
| 3041 | 3155 | <select name="easyformat" id="easyformat" onchange="document.forms.creator.time_format.value = this.options[this.selectedIndex].value;">'; | 
| 3042 | 3156 | |
| 3043 | 3157 | // Help the user by showing a list of common time formats. | 
| 3044 | - foreach ($context['easy_timeformats'] as $time_format) | |
| 3045 | - echo ' | |
| 3158 | +	foreach ($context['easy_timeformats'] as $time_format) { | |
| 3159 | + echo ' | |
| 3046 | 3160 | <option value="', $time_format['format'], '"', $time_format['format'] == $context['member']['time_format'] ? ' selected' : '', '>', $time_format['title'], '</option>'; | 
| 3161 | + } | |
| 3047 | 3162 | |
| 3048 | 3163 | echo ' | 
| 3049 | 3164 | </select> | 
| @@ -3081,9 +3196,10 @@ discard block | ||
| 3081 | 3196 | <dd> | 
| 3082 | 3197 | <select name="smiley_set" id="smiley_set" onchange="document.getElementById(\'smileypr\').src = this.selectedIndex == 0 ? \'', $settings['images_url'], '/blank.png\' : \'', $modSettings['smileys_url'], '/\' + (this.selectedIndex != 1 ? this.options[this.selectedIndex].value : \'', !empty($settings['smiley_sets_default']) ? $settings['smiley_sets_default'] : $modSettings['smiley_sets_default'], '\') + \'/smiley.png\';">'; | 
| 3083 | 3198 | |
| 3084 | - foreach ($context['smiley_sets'] as $set) | |
| 3085 | - echo ' | |
| 3199 | +	foreach ($context['smiley_sets'] as $set) { | |
| 3200 | + echo ' | |
| 3086 | 3201 | <option value="', $set['id'], '"', $set['selected'] ? ' selected' : '', '>', $set['name'], '</option>'; | 
| 3202 | + } | |
| 3087 | 3203 | |
| 3088 | 3204 | echo ' | 
| 3089 | 3205 | </select> | 
| @@ -3135,10 +3251,11 @@ discard block | ||
| 3135 | 3251 | <img src="', $context['tfa_qr_url'], '" alt=""> | 
| 3136 | 3252 | </div>'; | 
| 3137 | 3253 | |
| 3138 | - if (!empty($context['from_ajax'])) | |
| 3139 | - echo ' | |
| 3254 | +	if (!empty($context['from_ajax'])) { | |
| 3255 | + echo ' | |
| 3140 | 3256 | <br> | 
| 3141 | 3257 | <a href="javascript:self.close();"></a>'; | 
| 3258 | + } | |
| 3142 | 3259 | |
| 3143 | 3260 | echo ' | 
| 3144 | 3261 | </div> | 
| @@ -3178,17 +3295,16 @@ discard block | ||
| 3178 | 3295 | </dt> | 
| 3179 | 3296 | <dd>'; | 
| 3180 | 3297 | |
| 3181 | - if (!$context['tfa_enabled'] && $context['user']['is_owner']) | |
| 3182 | - echo ' | |
| 3298 | +	if (!$context['tfa_enabled'] && $context['user']['is_owner']) { | |
| 3299 | + echo ' | |
| 3183 | 3300 |  								<a href="', !empty($modSettings['force_ssl']) ? strtr($scripturl, array('http://' => 'https://')) : $scripturl, '?action=profile;area=tfasetup" id="enable_tfa">', $txt['tfa_profile_enable'], '</a>'; | 
| 3184 | - | |
| 3185 | - elseif (!$context['tfa_enabled']) | |
| 3186 | - echo ' | |
| 3301 | +	} elseif (!$context['tfa_enabled']) { | |
| 3302 | + echo ' | |
| 3187 | 3303 | ', $txt['tfa_profile_disabled']; | 
| 3188 | - | |
| 3189 | - else | |
| 3190 | - echo ' | |
| 3304 | +	} else { | |
| 3305 | + echo ' | |
| 3191 | 3306 | ', sprintf($txt['tfa_profile_enabled'], $scripturl . '?action=profile;u=' . $context['id_member'] . ';area=tfasetup;disable'); | 
| 3307 | + } | |
| 3192 | 3308 | |
| 3193 | 3309 | echo ' | 
| 3194 | 3310 | </dd>'; |