ave-cms-team/ave-cms
2
0
Fork 0
mirror of https://github.com/avecms/AVE.cms.git synced 2025-01-22 07:20:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
M@dD3n 2019-10-16 20:44:58 +03:00
parent 1bbc09b6fd
commit 602e37454d
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
admin/functions/func.admin.common.php
View File

@ -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'));
}

8
functions/func.users.php
View File

@ -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))
);