|
@@ 448-452 (lines=5) @@
|
| 445 |
|
$user_settings = $smcFunc['db_fetch_assoc']($request); |
| 446 |
|
$smcFunc['db_free_result']($request); |
| 447 |
|
|
| 448 |
|
if (!empty($modSettings['force_ssl']) && $image_proxy_enabled && stripos($user_settings['avatar'], 'http://') !== false && empty($user_info['possibly_robot'])) |
| 449 |
|
if ($image_proxy_enabled === 2 && !empty($image_proxy_url)) |
| 450 |
|
$user_settings['avatar'] = $image_proxy_url . urlencode($user_settings['avatar']); |
| 451 |
|
else |
| 452 |
|
$user_settings['avatar'] = strtr($boardurl, array('http://' => 'https://')) . '/proxy.php?request=' . urlencode($user_settings['avatar']) . '&hash=' . md5($user_settings['avatar'] . $image_proxy_secret); |
| 453 |
|
|
| 454 |
|
if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2) |
| 455 |
|
cache_put_data('user_settings-' . $id_member, $user_settings, 60); |
|
@@ 1277-1281 (lines=5) @@
|
| 1274 |
|
$row['avatar_original'] = !empty($row['avatar']) ? $row['avatar'] : ''; |
| 1275 |
|
|
| 1276 |
|
// Take care of proxying avatar if required, do this here for maximum reach |
| 1277 |
|
if ($image_proxy_enabled && !empty($row['avatar']) && stripos($row['avatar'], 'http://') !== false && empty($user_info['possibly_robot'])) |
| 1278 |
|
if ($image_proxy_enabled === 2 && !empty($image_proxy_url)) |
| 1279 |
|
$row['avatar'] = $image_proxy_url . urlencode($row['avatar']); |
| 1280 |
|
else |
| 1281 |
|
$row['avatar'] = $boardurl . '/proxy.php?request=' . urlencode($row['avatar']) . '&hash=' . md5($row['avatar'] . $image_proxy_secret); |
| 1282 |
|
|
| 1283 |
|
// Keep track of the member's normal member group |
| 1284 |
|
$row['primary_group'] = $row['member_group']; |