From 33f7fd1d7b869b500a226f518ba7d17aa22427b7 Mon Sep 17 00:00:00 2001
From: Luca <lucas@openstamanager.com>
Date: Thu, 11 Jun 2020 12:59:33 +0200
Subject: [PATCH] Aggiunta ricerca per altre potenziali cartelle custom

Migliorie minori
---
 modules/aggiornamenti/actions.php        |  4 +-
 modules/aggiornamenti/modutil.php        | 52 ++++++++++++++++++++++++
 modules/aggiornamenti/src/UpdateHook.php |  5 ++-
 update/tables.php                        |  1 +
 4 files changed, 58 insertions(+), 4 deletions(-)

diff --git a/modules/aggiornamenti/actions.php b/modules/aggiornamenti/actions.php
index 5b434a7eb..eeab8db90 100755
--- a/modules/aggiornamenti/actions.php
+++ b/modules/aggiornamenti/actions.php
@@ -11,9 +11,9 @@ switch (filter('op')) {
     case 'check':
         $result = UpdateHook::isAvailable();
 
-        Cache::get('Ultima versione di OpenSTAManager disponibile')->set($result);
+        Cache::get('Ultima versione di OpenSTAManager disponibile')->set($result[0].' ('.$result[1].')');
 
-        echo $result;
+        echo $result[0];
 
         break;
 
diff --git a/modules/aggiornamenti/modutil.php b/modules/aggiornamenti/modutil.php
index be79cbfca..f9639d4eb 100755
--- a/modules/aggiornamenti/modutil.php
+++ b/modules/aggiornamenti/modutil.php
@@ -26,6 +26,58 @@ function customStructure()
                 $results[] = $result;
             }
         }
+
+        $files = glob(DOCROOT.'/'.$dir.'/*/custom/src/*.{php,html}', GLOB_BRACE);
+        foreach ($files as $file) {
+            $file = str_replace(DOCROOT.'/', '', $file);
+            $result = explode('/custom/', $file)[0];
+
+            if (!in_array($result, $results)) {
+                $results[] = $result;
+            }
+        }
+
+        $files = glob(DOCROOT.'/'.$dir.'/*/custom/src/Components/*.{php,html}', GLOB_BRACE);
+        foreach ($files as $file) {
+            $file = str_replace(DOCROOT.'/', '', $file);
+            $result = explode('/custom/', $file)[0];
+
+            if (!in_array($result, $results)) {
+                $results[] = $result;
+            }
+        }
+
+        $files = glob(DOCROOT.'/'.$dir.'/*/custom/src/API/*.{php,html}', GLOB_BRACE);
+        foreach ($files as $file) {
+            $file = str_replace(DOCROOT.'/', '', $file);
+            $result = explode('/custom/', $file)[0];
+
+            if (!in_array($result, $results)) {
+                $results[] = $result;
+            }
+        }
+
+
+        $files = glob(DOCROOT.'/'.$dir.'/*/custom/ajax/*.{php,html}', GLOB_BRACE);
+        foreach ($files as $file) {
+            $file = str_replace(DOCROOT.'/', '', $file);
+            $result = explode('/custom/', $file)[0];
+
+            if (!in_array($result, $results)) {
+                $results[] = $result;
+            }
+        }
+
+        $files = glob(DOCROOT.'/'.$dir.'/*/custom/widgets/*.{php,html}', GLOB_BRACE);
+        foreach ($files as $file) {
+            $file = str_replace(DOCROOT.'/', '', $file);
+            $result = explode('/custom/', $file)[0];
+
+            if (!in_array($result, $results)) {
+                $results[] = $result;
+            }
+        }
+
     }
 
     return $results;
diff --git a/modules/aggiornamenti/src/UpdateHook.php b/modules/aggiornamenti/src/UpdateHook.php
index ad204f20d..21f2bc202 100755
--- a/modules/aggiornamenti/src/UpdateHook.php
+++ b/modules/aggiornamenti/src/UpdateHook.php
@@ -50,10 +50,11 @@ class UpdateHook extends CachedManager
         $api = self::getAPI();
 
         if (!$api['prerelease'] or setting('Abilita canale pre-release per aggiornamenti')) {
-            $version = ltrim($api['tag_name'], 'v');
+            $version[0] = ltrim($api['tag_name'], 'v');
+            $version[1] = (($api['prerelease']) ? 'prerelease' : 'stable' ); 
             $current = Update::getVersion();
 
-            if (version_compare($current, $version) < 0) {
+            if (version_compare($current, $version[0]) < 0) {
                 return $version;
             }
         }
diff --git a/update/tables.php b/update/tables.php
index 82de33fae..d3d87d2bc 100755
--- a/update/tables.php
+++ b/update/tables.php
@@ -25,6 +25,7 @@ return [
     'co_pianodeiconti2',
     'co_pianodeiconti3',
     'co_preventivi',
+    'co_riferimenti_righe',
     'co_righe_contratti',
     'co_righe_promemoria',
     'co_righe_documenti',