From 06684aae4cb56f7227221ecd6e79b65b8fb28bb2 Mon Sep 17 00:00:00 2001
From: Yuriy Pikhtarev <iglix@me.com>
Date: Sat, 10 Jun 2017 12:19:54 +0300
Subject: [PATCH] Fix avatars display bug.

---
 library/config.php                      |  2 ++
 library/includes/functions.php          | 10 +++++-----
 styles/templates/default/group_edit.tpl |  4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/library/config.php b/library/config.php
index f4a1c54b2..b9ee94631 100644
--- a/library/config.php
+++ b/library/config.php
@@ -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, // разрешить загрузку аватар
 ];
diff --git a/library/includes/functions.php b/library/includes/functions.php
index ef7dc9d77..9861f98a8 100644
--- a/library/includes/functions.php
+++ b/library/includes/functions.php
@@ -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 . ' />';
         }
     }
 
diff --git a/styles/templates/default/group_edit.tpl b/styles/templates/default/group_edit.tpl
index e66ce14ac..d6b687eb8 100644
--- a/styles/templates/default/group_edit.tpl
+++ b/styles/templates/default/group_edit.tpl
@@ -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>
\ No newline at end of file
+</table>