From fbcb2c67dc780b02a9fb66ec78adf7bbb29b92f3 Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Sun, 6 Feb 2022 21:02:22 +0000 Subject: [PATCH 01/14] fixing docker build fail --- trackdirect-apache.dockerfile | 2 ++ trackdirect-python2.dockerfile | 2 ++ 2 files changed, 4 insertions(+) diff --git a/trackdirect-apache.dockerfile b/trackdirect-apache.dockerfile index c8309c8..5c71015 100644 --- a/trackdirect-apache.dockerfile +++ b/trackdirect-apache.dockerfile @@ -20,5 +20,7 @@ RUN a2enmod rewrite RUN chmod a+rx / && chmod a+rx -R /root RUN chmod 777 /root/trackdirect/htdocs/public/symbols +RUN rm /root/trackdirect/config/trackdirect.ini + VOLUME /root/trackdirect/config/trackdirect.ini VOLUME /root/trackdirect/htdocs/public/heatmaps diff --git a/trackdirect-python2.dockerfile b/trackdirect-python2.dockerfile index b3acf7c..f949e6b 100644 --- a/trackdirect-python2.dockerfile +++ b/trackdirect-python2.dockerfile @@ -17,5 +17,7 @@ RUN wget http://jjguy.com/heatmap/heatmap-2.2.1.tar.gz && tar xzf heatmap-2.2.1. COPY . /root/trackdirect +RUN rm /root/trackdirect/config/trackdirect.ini + VOLUME /root/trackdirect/config/trackdirect.ini VOLUME /root/trackdirect/htdocs/public/heatmaps From 260bada95876843362f35fa050544a3fcda350fd Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Sun, 6 Feb 2022 21:02:53 +0000 Subject: [PATCH 02/14] fixing path include and HTTP_X_FORWARD for load balancer --- htdocs/public/index.php | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/htdocs/public/index.php b/htdocs/public/index.php index c622f06..cc11fbf 100755 --- a/htdocs/public/index.php +++ b/htdocs/public/index.php @@ -1,4 +1,14 @@ - + + @@ -132,7 +142,7 @@ var supportsWebSockets = 'WebSocket' in window || 'MozWebSocket' in window; if (supportsWebSockets) { - + var wsServerUrl = 'wss://:9000/ws'; var wsServerUrl = 'ws://:9000/ws'; From e8c7a8c34dd827584043b358f8889771a2a91dda Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Thu, 10 Feb 2022 00:58:53 +0100 Subject: [PATCH 03/14] Update about.php --- htdocs/public/views/about.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/public/views/about.php b/htdocs/public/views/about.php index 96b190e..e26925f 100644 --- a/htdocs/public/views/about.php +++ b/htdocs/public/views/about.php @@ -1,4 +1,4 @@ - + About / FAQ
From d27996ddf972283a9d62bc03914964fb971c9fbf Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Thu, 10 Feb 2022 00:59:33 +0100 Subject: [PATCH 04/14] Update latest.php --- htdocs/public/views/latest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/public/views/latest.php b/htdocs/public/views/latest.php index b8eba37..98bafe7 100644 --- a/htdocs/public/views/latest.php +++ b/htdocs/public/views/latest.php @@ -1,4 +1,4 @@ - + Date: Thu, 10 Feb 2022 00:59:55 +0100 Subject: [PATCH 05/14] Update overview.php --- htdocs/public/views/overview.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/public/views/overview.php b/htdocs/public/views/overview.php index ac9ec8e..af4c584 100644 --- a/htdocs/public/views/overview.php +++ b/htdocs/public/views/overview.php @@ -1,4 +1,4 @@ - + getObjectById($_GET['id'] ?? null); ?> isExistingObject()) : ?> @@ -545,4 +545,4 @@ } }); - \ No newline at end of file + From a317baec27d732f223298a7caaf11e258e33ac62 Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Thu, 10 Feb 2022 01:00:33 +0100 Subject: [PATCH 06/14] Update raw.php --- htdocs/public/views/raw.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/public/views/raw.php b/htdocs/public/views/raw.php index 4431606..55cac12 100644 --- a/htdocs/public/views/raw.php +++ b/htdocs/public/views/raw.php @@ -1,4 +1,4 @@ - + getObjectById($_GET['id'] ?? null); ?> isExistingObject()) : ?> @@ -505,4 +505,4 @@ } }); - \ No newline at end of file + From c81870055dbe2b5b81f1000efacaf296c9a71497 Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Thu, 10 Feb 2022 01:01:00 +0100 Subject: [PATCH 07/14] Update search.php --- htdocs/public/views/search.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/public/views/search.php b/htdocs/public/views/search.php index 23faf74..31f8a44 100644 --- a/htdocs/public/views/search.php +++ b/htdocs/public/views/search.php @@ -1,4 +1,4 @@ - + Date: Thu, 10 Feb 2022 01:01:21 +0100 Subject: [PATCH 08/14] Update statistics.php --- htdocs/public/views/statistics.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/public/views/statistics.php b/htdocs/public/views/statistics.php index 8c36019..52a026d 100644 --- a/htdocs/public/views/statistics.php +++ b/htdocs/public/views/statistics.php @@ -1,4 +1,4 @@ - + getObjectById($_GET['id'] ?? null); ?> isExistingObject()) : ?> @@ -146,4 +146,4 @@ } }); - \ No newline at end of file + From dd5cf5ce1140d27a697bcf30a8dcd24b75a8848f Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Thu, 10 Feb 2022 01:01:40 +0100 Subject: [PATCH 09/14] Update telemetry.php --- htdocs/public/views/telemetry.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/public/views/telemetry.php b/htdocs/public/views/telemetry.php index 2e9a08a..58f0ea9 100644 --- a/htdocs/public/views/telemetry.php +++ b/htdocs/public/views/telemetry.php @@ -1,4 +1,4 @@ - + getObjectById($_GET['id'] ?? null); ?> isExistingObject()) : ?> @@ -282,4 +282,4 @@ } }); - \ No newline at end of file + From b406f4d2f75f4a58bd25ceace88a2b20dee9b163 Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Thu, 10 Feb 2022 01:02:00 +0100 Subject: [PATCH 10/14] Update trail.php --- htdocs/public/views/trail.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/public/views/trail.php b/htdocs/public/views/trail.php index c12fb15..9ad2102 100644 --- a/htdocs/public/views/trail.php +++ b/htdocs/public/views/trail.php @@ -1,4 +1,4 @@ - + getObjectById($_GET['id'] ?? null); ?> isExistingObject()) : ?> @@ -189,4 +189,4 @@ }); - \ No newline at end of file + From ddcab34ba2cd046608688013d8f1de1641a67d23 Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Thu, 10 Feb 2022 01:02:21 +0100 Subject: [PATCH 11/14] Update weather.php --- htdocs/public/views/weather.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/public/views/weather.php b/htdocs/public/views/weather.php index 94a3b0c..f293a1b 100644 --- a/htdocs/public/views/weather.php +++ b/htdocs/public/views/weather.php @@ -1,4 +1,4 @@ - + getObjectById($_GET['id'] ?? null); ?> isExistingObject()) : ?> @@ -234,4 +234,4 @@ } }); - \ No newline at end of file + From 79da5b329e26d1149bc9e089392b10f8085e3b7d Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Thu, 10 Feb 2022 01:03:55 +0100 Subject: [PATCH 12/14] Update coverage.php --- htdocs/public/data/coverage.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/public/data/coverage.php b/htdocs/public/data/coverage.php index d8d6adc..bfb6311 100644 --- a/htdocs/public/data/coverage.php +++ b/htdocs/public/data/coverage.php @@ -1,6 +1,6 @@ getObjectById($_GET['id'] ?? null); From 42b7e3f1dc0018b6b4dad5bed3c7fd5ce9af6571 Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Thu, 10 Feb 2022 01:04:22 +0100 Subject: [PATCH 13/14] Update kml.php --- htdocs/public/data/kml.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/public/data/kml.php b/htdocs/public/data/kml.php index 92d0351..1790c28 100644 --- a/htdocs/public/data/kml.php +++ b/htdocs/public/data/kml.php @@ -1,6 +1,6 @@ getObjectById($_GET['id']); @@ -57,4 +57,4 @@ if ($station->isExistingObject()) { header('Content-type: application/vnd.google-earth.kml+xml'); header('Content-Disposition: attachment; filename="' . htmlspecialchars($lateststation->name) . '-' . $startTimestampString . '-' . $endTimestampString . '.kml"'); echo Kml::getInstance()->formatKmlContent($kmlOutput, " ", 4); -} \ No newline at end of file +} From d6f306bec45508a09b5588da6ff4568a74dbcceb Mon Sep 17 00:00:00 2001 From: Peter Buchegger Date: Thu, 10 Feb 2022 01:04:46 +0100 Subject: [PATCH 14/14] Update trail.php --- htdocs/public/data/trail.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/public/data/trail.php b/htdocs/public/data/trail.php index 8fca254..9cb0774 100644 --- a/htdocs/public/data/trail.php +++ b/htdocs/public/data/trail.php @@ -1,6 +1,6 @@ getObjectById($_GET['id'] ?? null);