From 1ead0a384711dddc100ec7778cf625c92b551b1e Mon Sep 17 00:00:00 2001
From: Per Qvarforth <per@qvarforth.se>
Date: Fri, 11 Feb 2022 20:15:51 +0000
Subject: [PATCH 1/3] modified bootstrap include path

---
 htdocs/public/data/coverage.php    | 2 +-
 htdocs/public/data/kml.php         | 4 ++--
 htdocs/public/data/trail.php       | 2 +-
 htdocs/public/views/about.php      | 2 +-
 htdocs/public/views/latest.php     | 2 +-
 htdocs/public/views/overview.php   | 4 ++--
 htdocs/public/views/raw.php        | 4 ++--
 htdocs/public/views/search.php     | 2 +-
 htdocs/public/views/statistics.php | 4 ++--
 htdocs/public/views/telemetry.php  | 4 ++--
 htdocs/public/views/trail.php      | 4 ++--
 htdocs/public/views/weather.php    | 4 ++--
 12 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/htdocs/public/data/coverage.php b/htdocs/public/data/coverage.php
index d8d6adc..b270edd 100644
--- a/htdocs/public/data/coverage.php
+++ b/htdocs/public/data/coverage.php
@@ -1,6 +1,6 @@
 <?php
 
-require "${_SERVER["DOCUMENT_ROOT"]}/includes/bootstrap.php";
+require "../../includes/bootstrap.php";
 
 $response = [];
 $station = StationRepository::getInstance()->getObjectById($_GET['id'] ?? null);
diff --git a/htdocs/public/data/kml.php b/htdocs/public/data/kml.php
index 92d0351..0efb5c0 100644
--- a/htdocs/public/data/kml.php
+++ b/htdocs/public/data/kml.php
@@ -1,6 +1,6 @@
 <?php
 
-require "${_SERVER["DOCUMENT_ROOT"]}/includes/bootstrap.php";
+require "../../includes/bootstrap.php";
 
 if (isset($_GET['id']) && isInt($_GET['id'])) {
     $station = StationRepository::getInstance()->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
+}
diff --git a/htdocs/public/data/trail.php b/htdocs/public/data/trail.php
index 8fca254..afcd647 100644
--- a/htdocs/public/data/trail.php
+++ b/htdocs/public/data/trail.php
@@ -1,6 +1,6 @@
 <?php
 
-require "${_SERVER["DOCUMENT_ROOT"]}/includes/bootstrap.php";
+require "../../includes/bootstrap.php";
 
 $response = [];
 $station = StationRepository::getInstance()->getObjectById($_GET['id'] ?? null);
diff --git a/htdocs/public/views/about.php b/htdocs/public/views/about.php
index 96b190e..9abcd2e 100644
--- a/htdocs/public/views/about.php
+++ b/htdocs/public/views/about.php
@@ -1,4 +1,4 @@
-<?php require "${_SERVER["DOCUMENT_ROOT"]}/includes/bootstrap.php"; ?>
+<?php require "../../includes/bootstrap.php"; ?>
 
 <title>About / FAQ</title>
 <div class="modal-inner-content modal-inner-content-about" style="padding-bottom: 30px;">
diff --git a/htdocs/public/views/latest.php b/htdocs/public/views/latest.php
index b8eba37..d97fa99 100644
--- a/htdocs/public/views/latest.php
+++ b/htdocs/public/views/latest.php
@@ -1,4 +1,4 @@
-<?php require "${_SERVER["DOCUMENT_ROOT"]}/includes/bootstrap.php"; ?>
+<?php require "../../includes/bootstrap.php"; ?>
 
 <?php
     $stations = [];
diff --git a/htdocs/public/views/overview.php b/htdocs/public/views/overview.php
index ac9ec8e..3cf62f9 100644
--- a/htdocs/public/views/overview.php
+++ b/htdocs/public/views/overview.php
@@ -1,4 +1,4 @@
-<?php require "${_SERVER["DOCUMENT_ROOT"]}/includes/bootstrap.php"; ?>
+<?php require "../../includes/bootstrap.php"; ?>
 
 <?php $station = StationRepository::getInstance()->getObjectById($_GET['id'] ?? null); ?>
 <?php if ($station->isExistingObject()) : ?>
@@ -545,4 +545,4 @@
             }
         });
     </script>
-<?php endif; ?>
\ No newline at end of file
+<?php endif; ?>
diff --git a/htdocs/public/views/raw.php b/htdocs/public/views/raw.php
index 4431606..e751af6 100644
--- a/htdocs/public/views/raw.php
+++ b/htdocs/public/views/raw.php
@@ -1,4 +1,4 @@
-<?php require "${_SERVER["DOCUMENT_ROOT"]}/includes/bootstrap.php"; ?>
+<?php require "../../includes/bootstrap.php"; ?>
 
 <?php $station = StationRepository::getInstance()->getObjectById($_GET['id'] ?? null); ?>
 <?php if ($station->isExistingObject()) : ?>
@@ -505,4 +505,4 @@
             }
         });
     </script>
-<?php endif; ?>
\ No newline at end of file
+<?php endif; ?>
diff --git a/htdocs/public/views/search.php b/htdocs/public/views/search.php
index 23faf74..939b64c 100644
--- a/htdocs/public/views/search.php
+++ b/htdocs/public/views/search.php
@@ -1,4 +1,4 @@
-<?php require "${_SERVER["DOCUMENT_ROOT"]}/includes/bootstrap.php"; ?>
+<?php require "../../includes/bootstrap.php"; ?>
 
 <?php
     $stations = [];
diff --git a/htdocs/public/views/statistics.php b/htdocs/public/views/statistics.php
index 8c36019..9212f5d 100644
--- a/htdocs/public/views/statistics.php
+++ b/htdocs/public/views/statistics.php
@@ -1,4 +1,4 @@
-<?php require "${_SERVER["DOCUMENT_ROOT"]}/includes/bootstrap.php"; ?>
+<?php require "../../includes/bootstrap.php"; ?>
 
 <?php $station = StationRepository::getInstance()->getObjectById($_GET['id'] ?? null); ?>
 <?php if ($station->isExistingObject()) : ?>
@@ -146,4 +146,4 @@
             }
         });
     </script>
-<?php endif; ?>
\ No newline at end of file
+<?php endif; ?>
diff --git a/htdocs/public/views/telemetry.php b/htdocs/public/views/telemetry.php
index 2e9a08a..7e2bf08 100644
--- a/htdocs/public/views/telemetry.php
+++ b/htdocs/public/views/telemetry.php
@@ -1,4 +1,4 @@
-<?php require "${_SERVER["DOCUMENT_ROOT"]}/includes/bootstrap.php"; ?>
+<?php require "../../includes/bootstrap.php"; ?>
 
 <?php $station = StationRepository::getInstance()->getObjectById($_GET['id'] ?? null); ?>
 <?php if ($station->isExistingObject()) : ?>
@@ -282,4 +282,4 @@
             }
         });
     </script>
-<?php endif; ?>
\ No newline at end of file
+<?php endif; ?>
diff --git a/htdocs/public/views/trail.php b/htdocs/public/views/trail.php
index c12fb15..0e89a90 100644
--- a/htdocs/public/views/trail.php
+++ b/htdocs/public/views/trail.php
@@ -1,4 +1,4 @@
-<?php require "${_SERVER["DOCUMENT_ROOT"]}/includes/bootstrap.php"; ?>
+<?php require "../../includes/bootstrap.php"; ?>
 
 <?php $station = StationRepository::getInstance()->getObjectById($_GET['id'] ?? null); ?>
 <?php if ($station->isExistingObject()) : ?>
@@ -189,4 +189,4 @@
 
         });
     </script>
-<?php endif; ?>
\ No newline at end of file
+<?php endif; ?>
diff --git a/htdocs/public/views/weather.php b/htdocs/public/views/weather.php
index 94a3b0c..a054d33 100644
--- a/htdocs/public/views/weather.php
+++ b/htdocs/public/views/weather.php
@@ -1,4 +1,4 @@
-<?php require "${_SERVER["DOCUMENT_ROOT"]}/includes/bootstrap.php"; ?>
+<?php require "../../includes/bootstrap.php"; ?>
 
 <?php $station = StationRepository::getInstance()->getObjectById($_GET['id'] ?? null); ?>
 <?php if ($station->isExistingObject()) : ?>
@@ -234,4 +234,4 @@
             }
         });
     </script>
-<?php endif; ?>
\ No newline at end of file
+<?php endif; ?>

From 349c7bbcf59a187e8c23b6125f86c8714142705b Mon Sep 17 00:00:00 2001
From: Per Qvarforth <per@qvarforth.se>
Date: Fri, 11 Feb 2022 20:16:16 +0000
Subject: [PATCH 2/3] modified bootstrap include path

---
 htdocs/public/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/public/index.php b/htdocs/public/index.php
index c622f06..508f81a 100755
--- a/htdocs/public/index.php
+++ b/htdocs/public/index.php
@@ -1,4 +1,4 @@
-<?php require "${_SERVER["DOCUMENT_ROOT"]}/includes/bootstrap.php"; ?>
+<?php require "../../includes/bootstrap.php"; ?>
 
 <!DOCTYPE html>
 <html lang="en">

From 4063cf5983c030eb54042b0c312e3d0991342737 Mon Sep 17 00:00:00 2001
From: Per Qvarforth <per@qvarforth.se>
Date: Fri, 11 Feb 2022 20:18:03 +0000
Subject: [PATCH 3/3] modified bootstrap include path

---
 htdocs/public/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/public/index.php b/htdocs/public/index.php
index 508f81a..6d7f855 100755
--- a/htdocs/public/index.php
+++ b/htdocs/public/index.php
@@ -1,4 +1,4 @@
-<?php require "../../includes/bootstrap.php"; ?>
+<?php require "../includes/bootstrap.php"; ?>
 
 <!DOCTYPE html>
 <html lang="en">