|
@@ 275-282 (lines=8) @@
|
| 272 |
|
$new_settings = array(); |
| 273 |
|
|
| 274 |
|
// Check $smileys_url, but only if it points to a subfolder of $boardurl |
| 275 |
|
if (BoardurlMatch($modSettings['smileys_url'])) |
| 276 |
|
{ |
| 277 |
|
if (!empty($new_force_ssl)) |
| 278 |
|
$newval = strtr($modSettings['smileys_url'], array('http://' => 'https://')); |
| 279 |
|
else |
| 280 |
|
$newval = strtr($modSettings['smileys_url'], array('https://' => 'http://')); |
| 281 |
|
$new_settings['smileys_url'] = $newval; |
| 282 |
|
} |
| 283 |
|
|
| 284 |
|
// Check $avatar_url, but only if it points to a subfolder of $boardurl |
| 285 |
|
if (BoardurlMatch($modSettings['avatar_url'])) |
|
@@ 285-292 (lines=8) @@
|
| 282 |
|
} |
| 283 |
|
|
| 284 |
|
// Check $avatar_url, but only if it points to a subfolder of $boardurl |
| 285 |
|
if (BoardurlMatch($modSettings['avatar_url'])) |
| 286 |
|
{ |
| 287 |
|
if (!empty($new_force_ssl)) |
| 288 |
|
$newval = strtr($modSettings['avatar_url'], array('http://' => 'https://')); |
| 289 |
|
else |
| 290 |
|
$newval = strtr($modSettings['avatar_url'], array('https://' => 'http://')); |
| 291 |
|
$new_settings['avatar_url'] = $newval; |
| 292 |
|
} |
| 293 |
|
|
| 294 |
|
// Check $custom_avatar_url, but only if it points to a subfolder of $boardurl |
| 295 |
|
// This one had been optional in the past, make sure it is set first |
|
@@ 296-303 (lines=8) @@
|
| 293 |
|
|
| 294 |
|
// Check $custom_avatar_url, but only if it points to a subfolder of $boardurl |
| 295 |
|
// This one had been optional in the past, make sure it is set first |
| 296 |
|
if (isset($modSettings['custom_avatar_url']) && BoardurlMatch($modSettings['custom_avatar_url'])) |
| 297 |
|
{ |
| 298 |
|
if (!empty($new_force_ssl)) |
| 299 |
|
$newval = strtr($modSettings['custom_avatar_url'], array('http://' => 'https://')); |
| 300 |
|
else |
| 301 |
|
$newval = strtr($modSettings['custom_avatar_url'], array('https://' => 'http://')); |
| 302 |
|
$new_settings['custom_avatar_url'] = $newval; |
| 303 |
|
} |
| 304 |
|
|
| 305 |
|
// Save updates to the settings table |
| 306 |
|
if (!empty($new_settings)) |