From ad4753664ab95cba6eaba93bc0e8c859c4ba99e8 Mon Sep 17 00:00:00 2001
From: Luca <lucas@devcode.it>
Date: Thu, 6 Oct 2022 13:30:07 +0200
Subject: [PATCH] Fix widget top 10 allegati

---
 modules/stato_servizi/actions.php             | 10 +++++-----
 .../widgets/spazio_utilizzato.php             | 19 ++++++++++---------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/modules/stato_servizi/actions.php b/modules/stato_servizi/actions.php
index 58979b695..8259f6153 100755
--- a/modules/stato_servizi/actions.php
+++ b/modules/stato_servizi/actions.php
@@ -279,16 +279,16 @@ switch (filter('op')) {
         ];
 
         foreach ($dirs as $dir => $description) {
-            $size = FileSystem::folderSize($dir, ['htaccess']);
+            $size = FileSystem::folderSize($dir, ['htaccess','gitkeep','ini','xml']);
 
             $results[] = [
                 'description' => $description,
                 'size' => $size,
                 'formattedSize' => FileSystem::formatBytes($size),
-                'count' => FileSystem::fileCount($dir, ['htaccess']) ?: 0,
-                'dbSize' => ($description == 'Allegati') ? $dbo->fetchOne('SELECT SUM(`size`) AS dbsize FROM zz_files')['dbsize'] : '',
-                'dbCount' => ($description == 'Allegati') ? $dbo->fetchOne('SELECT COUNT(`id`) AS dbcount FROM zz_files')['dbcount'] : '',
-                'dbExtensions' => ($description == 'Allegati') ? $dbo->fetchArray("SELECT SUBSTRING_INDEX(filename, '.', -1) AS extension, COUNT(*) AS num FROM zz_files GROUP BY extension ORDER BY num DESC LIMIT 10") : '',
+                'count' => FileSystem::fileCount($dir, ['htaccess','gitkeep','ini','xml']) ?: 0,
+                'dbSize' => ($description == 'Allegati') ? $dbo->fetchOne('SELECT SUM(`size`) AS dbsize FROM zz_files')['dbsize'] : 0,
+                'dbCount' => ($description == 'Allegati') ? $dbo->fetchOne('SELECT COUNT(`id`) AS dbcount FROM zz_files')['dbcount'] : 0,
+                'dbExtensions' => ($description == 'Allegati') ? $dbo->fetchArray("SELECT SUBSTRING_INDEX(filename, '.', -1) AS extension, COUNT(*) AS num FROM zz_files GROUP BY extension ORDER BY num DESC LIMIT 10") : 0,
             ];
         }
 
diff --git a/modules/stato_servizi/widgets/spazio_utilizzato.php b/modules/stato_servizi/widgets/spazio_utilizzato.php
index c5a9abd23..f3b26b93c 100755
--- a/modules/stato_servizi/widgets/spazio_utilizzato.php
+++ b/modules/stato_servizi/widgets/spazio_utilizzato.php
@@ -51,38 +51,39 @@ function crea_grafico(values){
 
 	$data = [];
 	$labels = [];
+    
 	values.forEach(function(element) {
         $data.push(element.size);
 
         //Segnalazione se sul server sembrano mancare file rispetto a quanto previsto a DB
-        if (element.dbSize!==""){
+        if (element.dbSize>0 && element.description == "Allegati"){
            if (element.size<element.dbSize){
                 var diff = (element.dbSize-element.size);
 
                 if (diff>1000){
-                    $("#message").append("<div class=\"label label-warning\" ><i class=\"fa fa-exclamation-triangle\" aria-hidden=\"true\"></i> "+formatBytes(diff)+" di file mancanti per allegati.</div><br>");
+                    $("#message").append("<div class=\"label label-warning\" ><i class=\"fa fa-exclamation-triangle\" aria-hidden=\"true\"></i> "+formatBytes(diff)+" di files mancanti per allegati.</div><br>");
                 }
             }
         }
 
+
         //Segnalazione se sul server sembrano mancare file rispetto a quanto previsto a DB
-        if (element.dbCount!==""){
+        if (element.dbCount>0 && element.description == "Allegati" ){
            if (element.count<element.dbCount){
                 var diff = (element.dbCount-element.count);
 
-                $("#message").append("<div class=\"label label-warning\" ><i class=\"fa fa-exclamation-triangle\" aria-hidden=\"true\"></i> "+diff+" file non trovati sul disco.</div><br>");
+                $("#message").append("<div class=\"label label-warning\" ><i class=\"fa fa-exclamation-triangle\" aria-hidden=\"true\"></i> "+diff+" files non trovati sul disco per allegati.</div><br>");
 
             }
         }
-
-        //Numero di file in Allegati per estensione
+        
+        //Numero di file in Allegati suddivisi per estensione
         if (element.dbExtensions.length > 0){
 
             $("#message").append("<br><p><b>Top 10 allegati:</b></p>");
 
-            element.dbExtensions.forEach(function(extension) {
-
-                $("#message").append("<div class=\"label label-info\" ><i class=\"fa fa-file\" aria-hidden=\"true\"></i> <b>"+extension["NUM"]+"</b> file con estensione <b>"+extension["EXTENSION"]+"</b>.</div><br>");
+            element.dbExtensions.forEach(function(ext) {
+                $("#message").append("<div class=\"label label-info\" ><i class=\"fa fa-file\" aria-hidden=\"true\"></i> <b>"+ext["num"]+"</b> files con estensione <b>"+ext["extension"]+"</b>.</div><br>");
 
             });