From c646a8c78879e8b4e7fbfa5678b31c407014b65f Mon Sep 17 00:00:00 2001
From: Thomas Zilio <Dasc3er@users.noreply.github.com>
Date: Sat, 17 Oct 2020 15:49:45 +0200
Subject: [PATCH] Correzioni minori su procedura di installazione

---
 assets/src/js/functions/functions.js | 17 ++++++++++++-----
 include/init/init.php                |  2 +-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/assets/src/js/functions/functions.js b/assets/src/js/functions/functions.js
index 21ff049b4..b676f5257 100755
--- a/assets/src/js/functions/functions.js
+++ b/assets/src/js/functions/functions.js
@@ -109,12 +109,19 @@ function scrollToOffset(offset) {
  * Ritorna un array associativo con i parametri passati via GET
  */
 function getUrlVars() {
-    var search = window.location.search.substring(1);
-    if (!search) return {};
+    let params = {};
 
-    return JSON.parse('{"' + search.replace(/&/g, '","').replace(/=/g, '":"') + '"}', function (key, value) {
-        return key === "" ? value : decodeURIComponent(value)
-    });
+    let query = window.location.search.substring(1);
+    let parameterArray = query.split('&');
+    if (parameterArray && parameterArray.length) {
+        parameterArray.map(param => {
+            let keyValuePair = param.split('=')
+            let key = keyValuePair[0];
+            params[key] = keyValuePair[1] ? decodeURIComponent(keyValuePair[1]) : null;
+        })
+    }
+
+    return params;
 }
 
 /**
diff --git a/include/init/init.php b/include/init/init.php
index e1226ca73..5c12b89c5 100755
--- a/include/init/init.php
+++ b/include/init/init.php
@@ -258,7 +258,7 @@ echo '
         $("button[type=submit]").not("#config").remove();
     });
 </script>
-<script src="'.base_path().'/lib/functions.js"></script>
+
 <script>$(document).ready(init)</script>';
 
 include_once App::filepath('include|custom|', 'bottom.php');