From bc52bf0c01919822eaac2eb8c04c6e39cf5e2362 Mon Sep 17 00:00:00 2001 From: Paul Traina <216482-pleasantone@users.noreply.gitlab.com> Date: Fri, 4 Dec 2020 17:50:14 -0800 Subject: [PATCH] Make app.gridtracker.org all http --- package.nw/GridTracker.html | 2 +- package.nw/lib/callsigns.js | 60 ++++++++++++++++++------------------- package.nw/lib/gt.js | 6 ++-- package.nw/lib/roster.js | 12 ++++---- 4 files changed, 39 insertions(+), 41 deletions(-) diff --git a/package.nw/GridTracker.html b/package.nw/GridTracker.html index 4d65f770..212f0594 100644 --- a/package.nw/GridTracker.html +++ b/package.nw/GridTracker.html @@ -1066,7 +1066,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Print
diff --git a/package.nw/lib/callsigns.js b/package.nw/lib/callsigns.js index 011dfb9f..f776b1d8 100644 --- a/package.nw/lib/callsigns.js +++ b/package.nw/lib/callsigns.js @@ -234,11 +234,11 @@ function oqrsValuesChanged() { function oqrsDownload(fromSettings) { oqrsUpdatedTd.innerHTML = "Downloading..."; getBuffer( - "https://app.gridtracker.org/clublog.json", + "http://app.gridtracker.org/clublog.json", processoqrsCallsigns, null, - "https", - 443 + "http", + 80 ); } @@ -449,11 +449,11 @@ function ulsDownload() { ulsUpdatedTd.innerHTML = "Downloading..."; ulsCountTd.innerHTML = 0; getChunkedBuffer( - "https://app.gridtracker.org/callsigns.txt", + "http://app.gridtracker.org/callsigns.txt", processulsCallsigns, null, - "https", - 443 + "http", + 80 ); } @@ -570,17 +570,16 @@ function processulsCallsigns(data, flag, cookies, starting, finished) { '")' ); if (g_ulsCallsignsCount % 10000 == 0) { - tx.executeSql( - "SELECT count(*) as cnt FROM calls", - [], - function (rx, results) { - var len = results.rows.length, - i; - if (len == 1) { - ulsCountTd.innerHTML = results.rows[0]["cnt"]; - } + tx.executeSql("SELECT count(*) as cnt FROM calls", [], function ( + rx, + results + ) { + var len = results.rows.length, + i; + if (len == 1) { + ulsCountTd.innerHTML = results.rows[0]["cnt"]; } - ); + }); } } } @@ -600,22 +599,21 @@ function processulsCallsigns(data, flag, cookies, starting, finished) { g_ulsLoadTimer = setTimeout(ulsDownload, ulsWhenTimer * 1000); g_ulsDatabase.transaction(function (tx) { - tx.executeSql( - "SELECT count(*) as cnt FROM calls", - [], - function (rx, results) { - var len = results.rows.length, - i; - if (len == 1) { - g_ulsCallsignsCount = results.rows[0]["cnt"]; - ulsCountTd.innerHTML = g_ulsCallsignsCount; - g_callsignLookups.ulsLastUpdate = timeNowSec(); - saveCallsignSettings(); - ulsSettingsDisplay(); - updateQSO(); - } + tx.executeSql("SELECT count(*) as cnt FROM calls", [], function ( + rx, + results + ) { + var len = results.rows.length, + i; + if (len == 1) { + g_ulsCallsignsCount = results.rows[0]["cnt"]; + ulsCountTd.innerHTML = g_ulsCallsignsCount; + g_callsignLookups.ulsLastUpdate = timeNowSec(); + saveCallsignSettings(); + ulsSettingsDisplay(); + updateQSO(); } - ); + }); }); } diff --git a/package.nw/lib/gt.js b/package.nw/lib/gt.js index cbc6c3b5..a5739dfe 100644 --- a/package.nw/lib/gt.js +++ b/package.nw/lib/gt.js @@ -9442,11 +9442,11 @@ function newMessageSetting(whichSetting) { function checkForNewVersion(showUptoDate) { if (typeof nw != "undefined") getBuffer( - "https://app.gridtracker.org/version.txt?lang=" + g_localeString, + "http://app.gridtracker.org/version.txt?lang=" + g_localeString, versionCheck, showUptoDate, - "https", - 443 + "http", + 80 ); } diff --git a/package.nw/lib/roster.js b/package.nw/lib/roster.js index 442ac354..812530ec 100644 --- a/package.nw/lib/roster.js +++ b/package.nw/lib/roster.js @@ -2663,11 +2663,11 @@ function stateChangedValue(what) { if (window.opener.g_mapSettings.offlineMode == false) { var callState = r_currentUSState.replace("CN-", ""); getBuffer( - "https://app.gridtracker.org/callsigns/" + callState + ".callsigns.json", + "http://app.gridtracker.org/callsigns/" + callState + ".callsigns.json", callsignResult, r_currentUSState, - "https", - 443 + "http", + 80 ); } else { window.opener.goProcessRoster(); @@ -2915,11 +2915,11 @@ function init() { if (window.opener.g_mapSettings.offlineMode == false) getBuffer( - "https://app.gridtracker.org/callsigns/manifest.json", + "http://app.gridtracker.org/callsigns/manifest.json", manifestResult, null, - "https", - 443 + "http", + 80 ); loadSettings();