|
@@ 267-273 (lines=7) @@
|
| 264 |
|
$new_settings = array(); |
| 265 |
|
|
| 266 |
|
// Check $smileys_url, but only if it points to a subfolder of $boardurl |
| 267 |
|
if (BoardurlMatch($modSettings['smileys_url'])) |
| 268 |
|
{ |
| 269 |
|
if ($new_force_ssl == 2) |
| 270 |
|
$newval = strtr($modSettings['smileys_url'], array('http://' => 'https://')); |
| 271 |
|
else |
| 272 |
|
$newval = strtr($modSettings['smileys_url'], array('https://' => 'http://')); |
| 273 |
|
$new_settings['smileys_url'] = $newval; |
| 274 |
|
} |
| 275 |
|
|
| 276 |
|
// Check $avatar_url, but only if it points to a subfolder of $boardurl |
|
@@ 277-283 (lines=7) @@
|
| 274 |
|
} |
| 275 |
|
|
| 276 |
|
// Check $avatar_url, but only if it points to a subfolder of $boardurl |
| 277 |
|
if (BoardurlMatch($modSettings['avatar_url'])) |
| 278 |
|
{ |
| 279 |
|
if ($new_force_ssl == 2) |
| 280 |
|
$newval = strtr($modSettings['avatar_url'], array('http://' => 'https://')); |
| 281 |
|
else |
| 282 |
|
$newval = strtr($modSettings['avatar_url'], array('https://' => 'http://')); |
| 283 |
|
$new_settings['avatar_url'] = $newval; |
| 284 |
|
} |
| 285 |
|
|
| 286 |
|
// Check $custom_avatar_url, but only if it points to a subfolder of $boardurl |
|
@@ 288-294 (lines=7) @@
|
| 285 |
|
|
| 286 |
|
// Check $custom_avatar_url, but only if it points to a subfolder of $boardurl |
| 287 |
|
// This one had been optional in the past, make sure it is set first |
| 288 |
|
if (isset($modSettings['custom_avatar_url']) && BoardurlMatch($modSettings['custom_avatar_url'])) |
| 289 |
|
{ |
| 290 |
|
if ($new_force_ssl == 2) |
| 291 |
|
$newval = strtr($modSettings['custom_avatar_url'], array('http://' => 'https://')); |
| 292 |
|
else |
| 293 |
|
$newval = strtr($modSettings['custom_avatar_url'], array('https://' => 'http://')); |
| 294 |
|
$new_settings['custom_avatar_url'] = $newval; |
| 295 |
|
} |
| 296 |
|
|
| 297 |
|
// Save updates to the settings table |