From dfb62c283394db31446363fe2796b8e0c54337b9 Mon Sep 17 00:00:00 2001
From: Walter Hupfeld <Walter.Hupfeld@gmx.de>
Date: Sun, 18 Feb 2024 19:46:30 +0100
Subject: [PATCH] fix

---
 admin/print_html.php |  2 +-
 config.php           | 75 ++++++++++++++++++++++----------------------
 2 files changed, 38 insertions(+), 39 deletions(-)

diff --git a/admin/print_html.php b/admin/print_html.php
index 4b00d86..a166462 100644
--- a/admin/print_html.php
+++ b/admin/print_html.php
@@ -126,7 +126,7 @@
 $( document ).ready(function() {
 
 
-    var url = 'https://api.mapbox.com/styles/v1/{id}/tiles/{z}/{x}/{y}?access_token=pk.eyJ1IjoibWFwYm94IiwiYSI6ImNpejY4NXVycTA2emYycXBndHRqcmZ3N3gifQ.rJcFIG214AriISLbB6B5aw';
+    var url = 'https://api.mapbox.com/styles/v1/{id}/tiles/{z}/{x}/{y}?access_token=<?=$mapbox_key?>';
     var attribution = 'Map data &copy; <a href="https://www.openstreetmap.org/">OpenStreetMap</a> contributors, ' +
                     '<a href="https://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, ' +
                     'Imagery © <a href="https://www.mapbox.com/">Mapbox</a>';
diff --git a/config.php b/config.php
index 2d141af..d1d01a3 100644
--- a/config.php
+++ b/config.php
@@ -43,7 +43,6 @@ while ($row = $result->fetch(PDO::FETCH_ASSOC)) {
         case "introText":
             $strIntroText =$row['value'];
         break;
-         
         case "impressum":
             $strImpressum =$row['value'];
         break;
@@ -72,7 +71,6 @@ while ($row = $result->fetch(PDO::FETCH_ASSOC)) {
         default: ;
                 //echo "Fehler bei ".$row['key'];
         // Ende Lokalisierung
-        
         break;
     }
     
@@ -86,41 +84,41 @@ if ($row=$result->fetch(PDO::FETCH_NUM)) {
     if ($row[0]==0) $strDistrict="hamm";
 }
    
-    // Spezifische Konfiguration für Districtt
-    $result= $db->prepare("SELECT * FROM district WHERE district=:district");
-    $result->bindParam(":district",$strDistrict);
-    $result->execute();
-    while ($row = $result->fetch(PDO::FETCH_ASSOC)) {
+// Spezifische Konfiguration für Districtt
+$result= $db->prepare("SELECT * FROM district WHERE district=:district");
+$result->bindParam(":district",$strDistrict);
+$result->execute();
+while ($row = $result->fetch(PDO::FETCH_ASSOC)) {
 
-        $boolActive = $row['active']==1;
-        $strDistrict = $row['district'];
-        $strDistrictTitle = $row['title'];
-        $strGeojson = $row['geojson'];
+    $boolActive = $row['active']==1;
+    $strDistrict = $row['district'];
+    $strDistrictTitle = $row['title'];
+    $strGeojson = $row['geojson'];
 
-        $numULAND=$row['ULAND'];
-        $numUREGBEZ=$row['UREGBEZ'];
-        $numUKREIS=$row['UKREIS'];
-        $numUGEMEINDE=$row['UGEMEINDE'];
+    $numULAND=$row['ULAND'];
+    $numUREGBEZ=$row['UREGBEZ'];
+    $numUKREIS=$row['UKREIS'];
+    $numUGEMEINDE=$row['UGEMEINDE'];
 
-        $numInfoLat=$row['lat'];
-        $numInfoLng=$row['lng'];
-        $numZoom=$row['zoom'];
+    $numInfoLat=$row['lat'];
+    $numInfoLng=$row['lng'];
+    $numZoom=$row['zoom'];
 
-        $strIntroText = ($boolActive) ? $strIntroText : "Dateneingabe nicht möglich";
-        $fileGeojson ="geojson/$strGeojson";
-        $strLocation = " AND ULAND=$numULAND AND UREGBEZ=$numUREGBEZ  AND UKREIS=$numUKREIS  ";
-        if ($numUGEMEINDE>0) {
-            $strLocation .= "AND UGEMEINDE=$numUGEMEINDE";
-        }
+    $strIntroText = ($boolActive) ? $strIntroText : "Dateneingabe nicht möglich";
+    $fileGeojson ="geojson/$strGeojson";
+    $strLocation = " AND ULAND=$numULAND AND UREGBEZ=$numUREGBEZ  AND UKREIS=$numUKREIS  ";
+    if ($numUGEMEINDE>0) {
+        $strLocation .= "AND UGEMEINDE=$numUGEMEINDE";
     }
+}
 
-    // Arrax mit allen Distrikten für Auswahl
-    $arrDisctrict = array ();
-    $strSQL = "SELECT district,title FROM district WHERE active=1 ORDER BY title ASC";
-    $result=$db->query($strSQL);
-    while ($row = $result->fetch(PDO::FETCH_ASSOC)) {
-        $arrDistrict[$row['district']]=$row['title'];
-    }
+// Arrax mit allen Distrikten für Auswahl
+$arrDisctrict = array ();
+$strSQL = "SELECT district,title FROM district WHERE active=1 ORDER BY title ASC";
+$result=$db->query($strSQL);
+while ($row = $result->fetch(PDO::FETCH_ASSOC)) {
+    $arrDistrict[$row['district']]=$row['title'];
+}
 
 
 
@@ -141,6 +139,14 @@ $arrMarkerType = array (
     5=>"truckMarker",
    );
 
+$arrIcon = array (
+    1 => "<i class='wa bg-info fa fa-male'></i>",
+    2 => "<i class='wa bg-success fa fa-bicycle'></i>",
+    3 => "<i class='wa bg-primary fa fa-bus'></i>",
+    4 => "<i class='wa bg-danger fa fa-car'></i>",
+    5 => "<i class='wa bg-warning fa fa-truck'></i>"
+);
+
 $arrAge = array (
     1 => "keine Angabe",
     2 => "bis 14 Jahre",
@@ -187,10 +193,3 @@ $arrTransport = array (
     6 => "Zu Fuß"
 );   
 
-$arrIcon = array (
-    1 => "<i class='wa bg-info fa fa-male'></i>",
-    2 => "<i class='wa bg-success fa fa-bicycle'></i>",
-    3 => "<i class='wa bg-primary fa fa-bus'></i>",
-    4 => "<i class='wa bg-danger fa fa-car'></i>",
-    5 => "<i class='wa bg-warning fa fa-truck'></i>"
-);
\ No newline at end of file