github/torrentpier
1
0
Fork 0
mirror of https://github.com/torrentpier/torrentpier synced 2025-08-20 05:13:54 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix avatars display bug.

Browse source
This commit is contained in:
Yuriy Pikhtarev 2017-06-10 12:19:54 +03:00
commit 06684aae4c
No known key found for this signature in database
GPG key ID: 3A9B5A757B48ECC6
3 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
library/config.php
View file

@ -388,6 +388,7 @@ $bb_cfg['avatars'] = [
'max_height' => 100, // высота аватара в px
'max_width' => 100, // ширина аватара в px
'no_avatar' => '/gallery/noavatar.png', // дефолтная аватара
'display_path' => '/data/avatars', // путь к директории с аватарами
'upload_path' => BB_PATH . '/data/avatars/', // путь к директории с аватарами
'up_allowed' => true, // разрешить загрузку аватар
];
@ -399,6 +400,7 @@ $bb_cfg['group_avatars'] = [
'max_height' => 300, // высота аватара в px
'max_width' => 300, // ширина аватара в px
'no_avatar' => '/gallery/noavatar.png', // дефолтная аватара
'display_path' => '/data/avatars', // путь к директории с аватарами
'upload_path' => BB_PATH . '/data/avatars/', // путь к директории с аватарами
'up_allowed' => true, // разрешить загрузку аватар
];

10
library/includes/functions.php
View file

@ -50,7 +50,7 @@ function get_attach_path($id, $ext_id = '', $base_path = null, $first_div = 1000
function delete_avatar($user_id, $avatar_ext_id)
{
$avatar_file = ($avatar_ext_id) ? get_avatar_path($user_id, $avatar_ext_id) : '';
$avatar_file = $avatar_ext_id ? get_avatar_path($user_id, $avatar_ext_id) : '';
return ($avatar_file && file_exists($avatar_file)) ? @unlink($avatar_file) : false;
}
@ -72,7 +72,7 @@ function get_tracks($type)
trigger_error(__FUNCTION__ . ": invalid type '$type'", E_USER_ERROR);
}
$tracks = !empty($_COOKIE[$c_name]) ? @unserialize($_COOKIE[$c_name]) : false;
return ($tracks) ?: array();
return $tracks ?: [];
}
function set_tracks($cookie_name, &$tracking_ary, $tracks = null, $val = TIMENOW)
@ -2032,13 +2032,13 @@ function get_avatar($user_id, $ext_id, $allow_avatar = true, $size = true, $heig
$height = !$height ? 'height="' . $height . '"' : '';
$width = !$width ? 'width="' . $width . '"' : '';
$user_avatar = '<img src="' . make_url($bb_cfg['avatars']['upload_path'] . $bb_cfg['avatars']['no_avatar']) . '" alt="' . $user_id . '" ' . $height . ' ' . $width . ' />';
$user_avatar = '<img src="' . make_url($bb_cfg['avatars']['display_path'] . $bb_cfg['avatars']['no_avatar']) . '" alt="' . $user_id . '" ' . $height . ' ' . $width . ' />';
if ($user_id == BOT_UID && $bb_cfg['avatars']['bot_avatar']) {
$user_avatar = '<img src="' . make_url($bb_cfg['avatars']['upload_path'] . $bb_cfg['avatars']['bot_avatar']) . '" alt="' . $user_id . '" ' . $height . ' ' . $width . ' />';
$user_avatar = '<img src="' . make_url($bb_cfg['avatars']['display_path'] . $bb_cfg['avatars']['bot_avatar']) . '" alt="' . $user_id . '" ' . $height . ' ' . $width . ' />';
} elseif ($allow_avatar && $ext_id) {
if (file_exists(get_avatar_path($user_id, $ext_id))) {
$user_avatar = '<img src="' . make_url(get_avatar_path($user_id, $ext_id)) . '" alt="' . $user_id . '" ' . $height . ' ' . $width . ' />';
$user_avatar = '<img src="' . make_url(get_avatar_path($user_id, $ext_id, $bb_cfg['avatars']['display_path'])) . '" alt="' . $user_id . '" ' . $height . ' ' . $width . ' />';
}
}

4
styles/templates/default/group_edit.tpl
View file

@ -80,11 +80,11 @@ function manage_group(mode, value) {
<br />
<form action="{S_GROUP_CONFIG_ACTION}" method="post" enctype="multipart/form-data">
{S_HIDDEN_FIELDS}
<input type="hidden" name="MAX_FILE_SIZE" value="{$bb_cfg['avatars']['max_size']}" />
<input type="hidden" name="MAX_FILE_SIZE" value="{$bb_cfg['group_avatars']['max_size']}" />
<input type="file" name="avatar" />
<input class="mainoption" type="submit" name="submit" value="{L_UPLOAD_AVATAR_FILE}" />
</form>
<!-- ENDIF -->
</td>
</tr>
</table>
</table>