adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-08-06 08:43:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixes #1342i, fixes #1354 : new way to calculate dashboard storage

Browse Source
This commit is contained in:
plegall
2021-03-05 10:49:05 +01:00
parent 9cebf85c82
commit 370ba453a2
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/intro.php
+16 -10
View File
@@ -364,18 +364,18 @@ $data_storage = array();
//Select files in Image_Table //Select files in Image_Table
$query = ' $query = '
SELECT file, filesize SELECT
SUBSTRING_INDEX(path,".",-1) AS ext,
SUM(filesize) AS filesize
FROM `'.IMAGES_TABLE.'` FROM `'.IMAGES_TABLE.'`
GROUP BY ext
;'; ;';
$result = query2array($query, null); $file_extensions = query2array($query, 'ext', 'filesize');
foreach ($result as $file) foreach ($file_extensions as $ext => $size)
{ {
$tabString = explode('.',$file['file']); if (in_array(strtolower($ext), $conf['picture_ext']))
$ext = $tabString[count($tabString) -1];
$size = $file['filesize'];
if (in_array($ext, $conf['picture_ext']))
{ {
if (isset($data_storage['Photos'])) if (isset($data_storage['Photos']))
{ {
@@ -383,18 +383,24 @@ foreach ($result as $file)
} else { } else {
$data_storage['Photos'] = $size; $data_storage['Photos'] = $size;
} }
} elseif (in_array($ext, $video_format)) { }
elseif (in_array(strtolower($ext), $video_format))
{
if (isset($data_storage['Videos'])) if (isset($data_storage['Videos']))
{ {
$data_storage['Videos'] += $size; $data_storage['Videos'] += $size;
} else { } else {
$data_storage['Videos'] = $size; $data_storage['Videos'] = $size;
} }
} else { }
else
{
if (isset($data_storage['Other'])) if (isset($data_storage['Other']))
{ {
$data_storage['Other'] += $size; $data_storage['Other'] += $size;
} else { }
else
{
$data_storage['Other'] = $size; $data_storage['Other'] = $size;
} }
} }