From 602e37454d340144a23d4ffe62a8b03e3b9af065 Mon Sep 17 00:00:00 2001
From: "M@dD3n" <support@ave-cms.ru>
Date: Wed, 16 Oct 2019 20:44:58 +0300
Subject: [PATCH] Fixes

---
 admin/functions/func.admin.common.php | 5 ++++-
 functions/func.users.php              | 8 +++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/admin/functions/func.admin.common.php b/admin/functions/func.admin.common.php
index cd9ac31..2ef043b 100644
--- a/admin/functions/func.admin.common.php
+++ b/admin/functions/func.admin.common.php
@@ -630,7 +630,10 @@
 	{
 		global $AVE_Template;
 
-		$showCache = format_size(get_dir_size($AVE_Template->cache_dir_root));
+		$showCache[] = format_size(get_dir_size($AVE_Template->compile_dir));
+		$showCache[] = format_size(get_dir_size($AVE_Template->sql_cache_dir));
+
+		$showCache = implode(' / ', $showCache);
 
 		echo json_encode(array($showCache, 'accept'));
 	}
diff --git a/functions/func.users.php b/functions/func.users.php
index 26a3618..00d2421 100644
--- a/functions/func.users.php
+++ b/functions/func.users.php
@@ -24,7 +24,7 @@
 	{
 		global $AVE_DB;
 
-		static $result = array();
+		static $result = [];
 
 		if ($id === null)
 			$id = $_SESSION['user_id'];
@@ -32,13 +32,15 @@
 		if (! isset($result[$id]))
 		{
 			$user = get_user_rec_by_id($id);
+
 			$avatar = ABS_PATH . UPLOAD_DIR . '/avatars/' . (($prefix === '') ? '' : $prefix) . md5($user->user_name);
+
 			$avatar = (file_exists(BASE_DIR . $avatar . '.jpg')
 				? $avatar . '.jpg'
 				: (file_exists(BASE_DIR . $avatar . '.png')
 					? $avatar . '.png'
 					: (file_exists(BASE_DIR . $avatar .'.gif')
-						? $ava . '.gif'
+						? $avatar . '.gif'
 						: '')));
 
 			$result[$id] = $avatar;
@@ -47,7 +49,7 @@
 		$avatar = $result[$id];
 
 		$src = (file_exists(BASE_DIR . $avatar)
-			? make_thumbnail(array('link' => $ava,'size' => 'c' . $size . 'x' . $size))
+			? make_thumbnail(array('link' => $avatar,'size' => 'c' . $size . 'x' . $size))
 			: make_thumbnail(array('link' => $AVE_DB->Query("SELECT default_avatar FROM " . PREFIX . "_user_groups WHERE user_group=" . (int)$user->user_group)->GetCell(), 'size' => 'c' . $size . 'x' . $size))
 		);