From 1652387e87215d6d4d6b677d982865eb27b44ba3 Mon Sep 17 00:00:00 2001 From: sijanec Date: Wed, 20 May 2020 22:44:41 +0200 Subject: report usernames too --- assets/js/app.js.bvr | 6 +++++- dist/js/app.js | 8 ++++++-- dist/pages/about.html | 2 +- dist/sw.js | 4 ++-- server/report/index.php | 9 +++++---- 5 files changed, 19 insertions(+), 10 deletions(-) diff --git a/assets/js/app.js.bvr b/assets/js/app.js.bvr index a75505e..8e150a2 100644 --- a/assets/js/app.js.bvr +++ b/assets/js/app.js.bvr @@ -62,7 +62,11 @@ var error_report_function = async function (msg, url, lineNo, columnNo, error) { if(selectedE == "on") { var data = {}; data.error = {"msg": msg, "url": url, "line": lineNo, "column": columnNo, "obj": error}; - data.client = {"ua": navigator.userAgent, "app_version": app_version, "previous_commit": previous_commit}; + data.client = {"ua": navigator.userAgent, "app_version": app_version, "previous_commit": previous_commit, "username": }; + + // Load required data + data.client.username = await localforage.getItem("username"); + data.type = "error"; $.post("https://beziapp-report.gimb.tk/", data); } else { diff --git a/dist/js/app.js b/dist/js/app.js index 594c9a1..798c4c2 100755 --- a/dist/js/app.js +++ b/dist/js/app.js @@ -3,7 +3,7 @@ const app_version = "1.0.14-beta"; -const previous_commit = "a6a552efe42f84f439c82e21ba5dcc0f66e43a82"; +const previous_commit = "dfd78d5fa91f1c3844a3c9b828ba699775a0c0d4"; if ("serviceWorker" in navigator) { navigator.serviceWorker.register("/sw.js") @@ -65,7 +65,11 @@ var error_report_function = async function (msg, url, lineNo, columnNo, error) { if(selectedE == "on") { var data = {}; data.error = {"msg": msg, "url": url, "line": lineNo, "column": columnNo, "obj": error}; - data.client = {"ua": navigator.userAgent, "app_version": app_version, "previous_commit": previous_commit}; + data.client = {"ua": navigator.userAgent, "app_version": app_version, "previous_commit": previous_commit, "username": }; + + // Load required data + data.client.username = await localforage.getItem("username"); + data.type = "error"; $.post("https://beziapp-report.gimb.tk/", data); } else { diff --git a/dist/pages/about.html b/dist/pages/about.html index a784497..fe07d3a 100755 --- a/dist/pages/about.html +++ b/dist/pages/about.html @@ -142,7 +142,7 @@

- ^HEAD a6a552efe42f84f439c82e21ba5dcc0f66e43a82 + ^HEAD dfd78d5fa91f1c3844a3c9b828ba699775a0c0d4

diff --git a/dist/sw.js b/dist/sw.js index 3494520..a759a9c 100755 --- a/dist/sw.js +++ b/dist/sw.js @@ -3,8 +3,8 @@ // Change version to cause cache refresh -const static_cache_name = "site-static-1.0.14-beta-a6a552e"; -// commit before the latest is a6a552efe42f84f439c82e21ba5dcc0f66e43a82 +const static_cache_name = "site-static-1.0.14-beta-dfd78d5"; +// commit before the latest is dfd78d5fa91f1c3844a3c9b828ba699775a0c0d4 // Got them with find . -not -path '*/\.*' | sed "s/.*/\"&\",/" | grep -v sw.js // sw.js NE SME BITI CACHAN, ker vsebuje verzijo! diff --git a/server/report/index.php b/server/report/index.php index 7b48b35..b9ead0b 100644 --- a/server/report/index.php +++ b/server/report/index.php @@ -37,14 +37,15 @@ app_version VARCHAR(420) , previous_commit VARCHAR(69) , ip VARCHAR(69) , + username VARCHAR(69) )"; $result = mysqli_query($conn, $query); - $stmt = $conn->prepare("INSERT INTO error_reports (msg, url, line, colno, obj, ua, app_version, previous_commit, ip) VALUES". - "(?, ?, ?, ?, ?, ?, ?, ?, ?)"); - $stmt->bind_param("ssiisssss", $_REQUEST["error"]["msg"], $_REQUEST["error"]["url"], $_REQUEST["error"]["line"], + $stmt = $conn->prepare("INSERT INTO error_reports (msg, url, line, colno, obj, ua, app_version, previous_commit, ip, username) VALUES". + "(?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"); + $stmt->bind_param("ssiissssss", $_REQUEST["error"]["msg"], $_REQUEST["error"]["url"], $_REQUEST["error"]["line"], $_REQUEST["error"]["column"], $_REQUEST["error"]["obj"], $_REQUEST["client"]["ua"], $_REQUEST["client"]["app_version"], - $_REQUEST["client"]["previous_commit"], $_SERVER["REMOTE_ADDR"]); + $_REQUEST["client"]["previous_commit"], $_SERVER["REMOTE_ADDR"], $_REQUEST["client"]["username"]); $stmt->execute(); -- cgit v1.2.3 From c40b1bd1b0c465663eef509464e3807019727caf Mon Sep 17 00:00:00 2001 From: sijanec Date: Wed, 20 May 2020 22:47:01 +0200 Subject: syntax errro fix --- assets/js/app.js.bvr | 2 +- dist/js/app.js | 4 ++-- dist/pages/about.html | 2 +- dist/sw.js | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/assets/js/app.js.bvr b/assets/js/app.js.bvr index 8e150a2..1ddf4a4 100644 --- a/assets/js/app.js.bvr +++ b/assets/js/app.js.bvr @@ -62,7 +62,7 @@ var error_report_function = async function (msg, url, lineNo, columnNo, error) { if(selectedE == "on") { var data = {}; data.error = {"msg": msg, "url": url, "line": lineNo, "column": columnNo, "obj": error}; - data.client = {"ua": navigator.userAgent, "app_version": app_version, "previous_commit": previous_commit, "username": }; + data.client = {"ua": navigator.userAgent, "app_version": app_version, "previous_commit": previous_commit, "username": null}; // Load required data data.client.username = await localforage.getItem("username"); diff --git a/dist/js/app.js b/dist/js/app.js index 798c4c2..f8340c1 100755 --- a/dist/js/app.js +++ b/dist/js/app.js @@ -3,7 +3,7 @@ const app_version = "1.0.14-beta"; -const previous_commit = "dfd78d5fa91f1c3844a3c9b828ba699775a0c0d4"; +const previous_commit = "1652387e87215d6d4d6b677d982865eb27b44ba3"; if ("serviceWorker" in navigator) { navigator.serviceWorker.register("/sw.js") @@ -65,7 +65,7 @@ var error_report_function = async function (msg, url, lineNo, columnNo, error) { if(selectedE == "on") { var data = {}; data.error = {"msg": msg, "url": url, "line": lineNo, "column": columnNo, "obj": error}; - data.client = {"ua": navigator.userAgent, "app_version": app_version, "previous_commit": previous_commit, "username": }; + data.client = {"ua": navigator.userAgent, "app_version": app_version, "previous_commit": previous_commit, "username": null}; // Load required data data.client.username = await localforage.getItem("username"); diff --git a/dist/pages/about.html b/dist/pages/about.html index fe07d3a..05dad2f 100755 --- a/dist/pages/about.html +++ b/dist/pages/about.html @@ -142,7 +142,7 @@

- ^HEAD dfd78d5fa91f1c3844a3c9b828ba699775a0c0d4 + ^HEAD 1652387e87215d6d4d6b677d982865eb27b44ba3

diff --git a/dist/sw.js b/dist/sw.js index a759a9c..324fe05 100755 --- a/dist/sw.js +++ b/dist/sw.js @@ -3,8 +3,8 @@ // Change version to cause cache refresh -const static_cache_name = "site-static-1.0.14-beta-dfd78d5"; -// commit before the latest is dfd78d5fa91f1c3844a3c9b828ba699775a0c0d4 +const static_cache_name = "site-static-1.0.14-beta-1652387"; +// commit before the latest is 1652387e87215d6d4d6b677d982865eb27b44ba3 // Got them with find . -not -path '*/\.*' | sed "s/.*/\"&\",/" | grep -v sw.js // sw.js NE SME BITI CACHAN, ker vsebuje verzijo! -- cgit v1.2.3 From a1705397ab7bcadc6025fda819bd46855d7f82a7 Mon Sep 17 00:00:00 2001 From: sijanec Date: Wed, 20 May 2020 22:47:59 +0200 Subject: i should check code before pushing --- assets/js/app.js.bvr | 2 +- dist/js/app.js | 4 ++-- dist/pages/about.html | 2 +- dist/sw.js | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/assets/js/app.js.bvr b/assets/js/app.js.bvr index 1ddf4a4..d19c1d6 100644 --- a/assets/js/app.js.bvr +++ b/assets/js/app.js.bvr @@ -54,7 +54,7 @@ function gsecErrorHandlerUI(err) { var error_report_function = async function (msg, url, lineNo, columnNo, error) { - localforage.getItem("errorReporting").then((value) => { + localforage.getItem("errorReporting").then(async function(value) { let selectedE = value; if(value == null || value.length < 1) { selectedE = "on"; diff --git a/dist/js/app.js b/dist/js/app.js index f8340c1..40c5cf2 100755 --- a/dist/js/app.js +++ b/dist/js/app.js @@ -3,7 +3,7 @@ const app_version = "1.0.14-beta"; -const previous_commit = "1652387e87215d6d4d6b677d982865eb27b44ba3"; +const previous_commit = "c40b1bd1b0c465663eef509464e3807019727caf"; if ("serviceWorker" in navigator) { navigator.serviceWorker.register("/sw.js") @@ -57,7 +57,7 @@ function gsecErrorHandlerUI(err) { var error_report_function = async function (msg, url, lineNo, columnNo, error) { - localforage.getItem("errorReporting").then((value) => { + localforage.getItem("errorReporting").then(async function(value) { let selectedE = value; if(value == null || value.length < 1) { selectedE = "on"; diff --git a/dist/pages/about.html b/dist/pages/about.html index 05dad2f..c1e9dfb 100755 --- a/dist/pages/about.html +++ b/dist/pages/about.html @@ -142,7 +142,7 @@

- ^HEAD 1652387e87215d6d4d6b677d982865eb27b44ba3 + ^HEAD c40b1bd1b0c465663eef509464e3807019727caf

diff --git a/dist/sw.js b/dist/sw.js index 324fe05..d0b5964 100755 --- a/dist/sw.js +++ b/dist/sw.js @@ -3,8 +3,8 @@ // Change version to cause cache refresh -const static_cache_name = "site-static-1.0.14-beta-1652387"; -// commit before the latest is 1652387e87215d6d4d6b677d982865eb27b44ba3 +const static_cache_name = "site-static-1.0.14-beta-c40b1bd"; +// commit before the latest is c40b1bd1b0c465663eef509464e3807019727caf // Got them with find . -not -path '*/\.*' | sed "s/.*/\"&\",/" | grep -v sw.js // sw.js NE SME BITI CACHAN, ker vsebuje verzijo! -- cgit v1.2.3