From bf72fbad05b5a6adef974e7605e495ffd52f944d Mon Sep 17 00:00:00 2001
From: MadD3n <support@ave-cms.ru>
Date: Thu, 27 Aug 2020 11:45:24 +0300
Subject: [PATCH] Fixes

---
 admin/lang/ru/settings.txt                  |  4 ++--
 admin/templates/settings/settings_cache.tpl |  4 ++--
 class/class.settings.php                    | 22 +++++++++++++++------
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/admin/lang/ru/settings.txt b/admin/lang/ru/settings.txt
index 15ff53d..2177fdd 100644
--- a/admin/lang/ru/settings.txt
+++ b/admin/lang/ru/settings.txt
@@ -169,8 +169,8 @@ SETTINGS_CACHE_H_TITLE			= "Тип кеша"
 SETTINGS_CACHE_H_SHOW			= "Показать размер"
 SETTINGS_CACHE_SHOW				= "Показать"
 SETTINGS_CACHE_CLEAR			= "Очистить"
-SETTINGS_CACHE_SUCCES			= "Удачно"
-SETTINGS_CACHE_SUCCES_T			= "Кеш удачно удален"
+SETTINGS_CACHE_SUCCESS		= "Удачно"
+SETTINGS_CACHE_SUCCESS_T		= "Кеш удачно удален"
 SETTINGS_CACHE_ERROR			= "Ошибка"
 SETTINGS_CACHE_ERROR_T			= "Произошла ошибка. Попробуйте повторить операцию еще раз"
 SETTINGS_CACHE_T_SMARTY			= "Шаблоны Smarty"
diff --git a/admin/templates/settings/settings_cache.tpl b/admin/templates/settings/settings_cache.tpl
index 506297b..3b291b3 100644
--- a/admin/templates/settings/settings_cache.tpl
+++ b/admin/templates/settings/settings_cache.tpl
@@ -151,10 +151,10 @@
 					{#SETTINGS_CACHE_T_BLOCKS#}
 				</td>
 				<td align="center">
-					<strong class="code" id="btn-settings"><a href="javascript:void(0);" class="link btn-show" data-source="blocks">{#SETTINGS_CACHE_SHOW#}</a></strong>
+					<strong class="code" id="btn-settings"><a href="javascript:void(0);" class="link btn-show" data-source="block">{#SETTINGS_CACHE_SHOW#}</a></strong>
 				</td>
 				<td align="center">
-					<a href="javascript:void(0);" class="btn redBtn btn-clear" data-source="blocks">{#SETTINGS_CACHE_CLEAR#}</a>
+					<a href="javascript:void(0);" class="btn redBtn btn-clear" data-source="block">{#SETTINGS_CACHE_CLEAR#}</a>
 				</td>
 			</tr>
 			<tr>
diff --git a/class/class.settings.php b/class/class.settings.php
index 8447628..6140ed4 100755
--- a/class/class.settings.php
+++ b/class/class.settings.php
@@ -761,12 +761,18 @@
 
 		function showCacheSize ()
 		{
+			global $AVE_Template;
+
 			switch ($_REQUEST['source'])
 			{
 				case 'smarty':
 					$size = format_size(get_dir_size(BASE_DIR . '/tmp/cache/smarty'));
 					break;
 
+				case 'block':
+					$size = format_size(get_dir_size(BASE_DIR . '/tmp/cache/sql/block'));
+					break;
+
 				case 'documents':
 					$size = format_size(get_dir_size(BASE_DIR . '/tmp/cache/sql/documents'));
 					break;
@@ -799,6 +805,10 @@
 					$size = format_size(get_dir_size(BASE_DIR . '/tmp/session'));
 					break;
 
+				case 'sysblocks':
+					$size = format_size(get_dir_size(BASE_DIR . '/tmp/cache/sql/sysblocks'));
+					break;
+
 				case 'settings':
 					$size = format_size(get_dir_size(BASE_DIR . '/tmp/cache/sql/settings'));
 					break;
@@ -806,7 +816,7 @@
 
 			$return = [
 				'size' => $size,
-				'message' => 'Успешно выполнено',
+				'message' => $AVE_Template->get_config_vars('SETTINGS_SUCCESS'),
 				'theme' => 'accept'
 			];
 
@@ -824,8 +834,8 @@
 					$cache_dir = BASE_DIR . '/tmp/cache/smarty';
 					break;
 
-				case 'blocks':
-					$cache_dir = BASE_DIR . '/tmp/blocks';
+				case 'block':
+					$cache_dir = BASE_DIR . '/tmp/cache/sql/block';
 					break;
 
 				case 'documents':
@@ -857,7 +867,7 @@
 					break;
 
 				case 'sysblocks':
-					$cache_dir = BASE_DIR . '/tmp/sysblocks';
+					$cache_dir = BASE_DIR . '/tmp/cache/sql/sysblocks';
 					break;
 
 				case 'sessions':
@@ -873,8 +883,8 @@
 
 			$return = [
 				'size' => format_size(get_dir_size($cache_dir)),
-				'header' => $remove ? $AVE_Template->get_config_vars('SETTINGS_CACHE_SUCCES') : $AVE_Template->get_config_vars('SETTINGS_CACHE_ERROR'),
-				'message' => $remove ? $AVE_Template->get_config_vars('SETTINGS_CACHE_SUCCES_T') : $AVE_Template->get_config_vars('SETTINGS_CACHE_ERROR_T'),
+				'header' => $remove ? $AVE_Template->get_config_vars('SETTINGS_CACHE_SUCCESS') : $AVE_Template->get_config_vars('SETTINGS_CACHE_ERROR'),
+				'message' => $remove ? $AVE_Template->get_config_vars('SETTINGS_CACHE_SUCCESS_T') : $AVE_Template->get_config_vars('SETTINGS_CACHE_ERROR_T'),
 				'theme' => $remove ? 'accept' : 'error'
 			];