PDO

admin/dump.php

@@ -30,7 +30,7 @@
   $query = $db->query($strSQL);      
   
   // Fetch the first row
-  $row = $query->fetchArray(SQLITE3_ASSOC);
+  $row = $query->fetch(PDO::FETCH_ASSOC);
   
   // If no results are found, echo a message and stop
   if ($row == false){
@@ -49,7 +49,7 @@
 
       echo $line . "\n";
         // Fetch the next line
-      $row = $query->fetchArray(SQLITE3_ASSOC);
+      $row = $query->fetch(PDO::FETCH_ASSOC);
   }
   
   // Prints the column names

admin/index.php

@@ -37,7 +37,7 @@
         $stmt = $db->prepare("SELECT * FROM files where loc_id = :loc_id");
         $stmt->bindValue(":loc_id", $numDelete, SQLITE3_TEXT);
         $result = $stmt->execute();
-        if ($row = $result->fetchArray()) {
+        if ($row = $result->fetch(PDO::FETCH_ASSOC)) {
             $strFilename = $row['filename'];
             $strFilename = $uploaddir . $strFilename;
             unset($strFilename);
@@ -67,7 +67,7 @@
         $stmt = $db->prepare("SELECT * FROM files where id = :id");
         $stmt->bindValue(":id", $numDelete, SQLITE3_TEXT);
         $result = $stmt->execute();
-        if ($row=$result->fetchArray()) {
+        if ($row=$result->fetch(PDO::FETCH_ASSOC)) {
             $strFilename = $row['filename'];
             $strFilename = $uploaddir . $strFilename;
             unset($strFilename);            
@@ -181,7 +181,7 @@
     //$strSQL="SELECT * FROM location ORDER BY created_at DESC";
     $strSQL="SELECT l.id as lid,l.*,adr.* FROM location l LEFT JOIN address adr ON l.id=adr.loc_id ORDER BY created_at ASC";
     $result = $db->query($strSQL);
-    while ($row = $result->fetchArray()) {
+    while ($row = $result->fetch(PDO::FETCH_ASSOC)) {
         $id = $row['lid'];
         echo "<tr>";
         echo "<td>".$id."</td>";
@@ -194,7 +194,7 @@
         echo "<td>";
         $strSQL = "SELECT id,username,comment,created_at FROM comment WHERE loc_id=".$id;
         $comments = $db->query($strSQL);
-        while ($comment = $comments->fetchArray()) {
+        while ($comment = $comments->fetch(PDO::FETCH_ASSOC)) {
             echo "<div class='comment'>";
             echo "<em>".$comment['username']." schrieb am ";
             $numDatum =  strtotime($comment['created_at']);
@@ -215,7 +215,7 @@
         echo "<td id='img_".$id."'>";
         $strSQL = "SELECT id,filename FROM files WHERE loc_id=".$id;
         $files=$db->query($strSQL);
-        if ($file=$files->fetchArray()) {
+        if ($file=$files->fetch(PDO::FETCH_ASSOC)) {
             echo "<a href='../images/".$file['filename']."' data-lightbox='radweg".$id."'>";
             echo "<img src='../images/".$file['filename']."' style='width:150px'></a>";
             echo "<a href='".$_SERVER['PHP_SELF']."?delfid=".$file['id']."&csrf=".$_SESSION['csrf_token']."'><i class='fa fa-trash'></i></a>";

admin/login.php

@@ -20,7 +20,7 @@ $boolLogin=true;
         $strPassword     = trim($_POST['password']);
         $strSQL = "SELECT username,passwordhash FROM user WHERE username='$strUser'";
         $result = $db->query($strSQL);
-        if ($row=$result->fetchArray())  {
+        if ($row=$result->fetch(PDO::FETCH_ASSOC))  {
             if (password_verify($strPassword,$row['passwordhash'])) {
                 session_start();
                 $_SESSION['user']=$strUser;

admin/print_html.php

@@ -72,7 +72,7 @@
         $strScript="";
         $strSQL="SELECT l.id as lid,l.*,adr.* FROM location l LEFT JOIN address adr ON l.id=adr.loc_id ORDER BY city,postcode,suburb,hamlet,road ASC";
         $result = $db->query($strSQL);
-        while ($row = $result->fetchArray()) {
+        while ($row = $result->fetch(PDO::FETCH_ASSOC)) {
             $id = $row['lid'];
             $numDatum= strtotime($row['created_at']);
             $strDatum= date("d.m.Y",$numDatum);
@@ -86,7 +86,7 @@
             echo "<td>";
             $strSQL = "SELECT id,username,comment,created_at FROM comment WHERE loc_id=".$id;
             $comments = $db->query($strSQL);
-            while ($comment = $comments->fetchArray()) {
+            while ($comment = $comments->fetch(PDO::FETCH_ASSOC)) {
                 echo "<div class='comment'>";
                 echo "<em>".$comment['username']." schrieb am ";
                 $numDatum =  strtotime($comment['created_at']);
@@ -102,7 +102,7 @@
             echo "<td>";
             $strSQL = "SELECT id,filename FROM files WHERE loc_id=".$id;
             $files=$db->query($strSQL);
-            if ($file=$files->fetchArray()) {
+            if ($file=$files->fetch(PDO::FETCH_ASSOC)) {
                 echo "<img src='../images/".$file['filename']."' style='width:200px'>";
             }
             echo "</td>";

admin/shapefile.php

@@ -11,7 +11,7 @@ $result = $db->query("SELECT * FROM location ORDER BY created_at ASC");
 
 $coords_array = array ();
 
-while ($row = $result->fetchArray(SQLITE3_ASSOC)) {
+while ($row = $result->fetch(PDO::FETCH_ASSOC)) {
    $coords_array[]=$row;
 }
 

ajax/ajax_location_push.php

@@ -1,6 +1,7 @@
 <?php 
 
 $dbFilename="../db/locations.db";
+require_once("../config.db.php");
 require_once("../config.php");
 require_once("../lib/functions.php");
 require_once("../lib/geocoding.php");
@@ -55,7 +56,7 @@ $stmt->execute();
 // fetch last_id - sqlite 
 $strSQL="SELECT id FROM location ORDER BY id DESC limit 1";
 $result = $db->query($strSQL);
-if ($row = $result->fetchArray()) {
+if ($row = $result->fetch(PDO::FETCH_ASSOC)) {
     $id = $row['id'];
 }
 
@@ -79,7 +80,7 @@ if ($boolUploadOk) {
 // Retrun Markertext of entry
 $strSQL="SELECT loc.*,f.filename FROM location loc LEFT JOIN  files f ON loc.id=f.loc_id ORDER BY loc.id DESC limit 1";
 $result = $db->query($strSQL);
-if ($row = $result->fetchArray()) {
+if ($row = $result->fetch(PDO::FETCH_ASSOC)) {
     $markerText=generate_tooltip_description($row);
     $markerText=stripcslashes($markerText);
 }    

config.db.php

@@ -0,0 +1,12 @@
+<?
+
+$db_server = "mariadb";
+$db_user   = "root";
+$db_passwd = "g0r@w@";
+
+$db_name =  "nrw_melder";
+$cachetime = 0;
+
+try {
+    $db = new PDO('mysql:host='.$db_server.';dbname='.$db_name.';charset=utf8mb4', $db_user, $db_passwd);
+} catch (PDOException $e) {echo "Fehler: ".$e->getMessage();  die();}

config.php

@@ -8,17 +8,12 @@
  * Datum: 18.05.2021
  ******************************** */
 
- 
+    require_once("config.db.php");
-    date_default_timezone_set('UTC');
-    if (!isset($dbFilename)) {
-        $dbFilename = "db/locations.db";
-    }
-    $db = new SQLite3($dbFilename);
 
-    $strSQL="select * from config";
+    $strSQL = "select * from config";
     $result = $db->query($strSQL);
 
-    while ($row = $result->fetchArray(SQLITE3_ASSOC)) {
+    while ($row = $result->fetch(PDO::FETCH_ASSOC)) {
         switch ($row['key']) {
             case "uploaddir" : 
                 $uploaddir=$row['value'];

index.php

@@ -4,15 +4,16 @@
  * Ideenmelder
  * Autor: Walter Hupfeld, Hamm
  * E-Mail: info@hupfeld-software.de
- * Version: 1.0
+ * Version: 2.0
- * Datum: 18.05.2021
+ * Datum: 16.02.2024
  ******************************** */
 
 
     if (!file_exists("db/locations.db")) {
         header("Location: setup.php");
     }
-    require("config.php");    
+    require("config.db.php");
+    require("config.php"); 
     require_once("lib/functions.php");
 
     $ref=(isset($_GET['ref']) && ($_GET['ref']==1));
@@ -32,7 +33,7 @@
     $arrMarker = array();
     $arrDescription = array();
     
-    while ($row = $result->fetchArray()) {
+    while ($row = $result->fetch(PDO::FETCH_ASSOC)) {
         $id=$row['id'];
         $topic = $row['topic'];
         $numLng = $row['lng'];

lib/functions.php

@@ -56,7 +56,7 @@ function generate_tooltip_description($row) {
 
         $strSQL = "SELECT username,comment,created_at FROM comment WHERE loc_id=".$id;
         $result = $db->query($strSQL);
-        while ($comment = $result->fetchArray()) {
+        while ($comment = $result->fetch(PDO::FETCH_ASSOC)) {
             $strDescription .= "<div class=\'comment\'>";
             $strDescription .= "<em>".$comment['username']." schrieb am ";
             $numDatum =  strtotime($comment['created_at']);

lib/geocoding.php

@@ -79,7 +79,7 @@ function fillAddressTable($db,$limit=20) {
     // Get all ids from address table and write to array
     $strSQL="select loc_id from address";
     $result=$db->query($strSQL);
-    while ($row=$result->fetchArray()) {
+    while ($row=$result->fetch(PDO::FETCH_ASSOC)) {
         $arrIds[]=$row['loc_id'];
     }
 
@@ -95,7 +95,7 @@ function fillAddressTable($db,$limit=20) {
         $strTable .=  "<th>".$key."</th>";
     }
     $strTable .= "</tr>";
-    while ($row=$result->fetchArray()) {
+    while ($row=$result->fetch(PDO::FETCH_ASSOC)) {
         $id=$row['id'];
         if (!in_array($id,$arrIds) && $counter<$limit) {
             $counter++;

liste.php

@@ -107,7 +107,7 @@
         $strSQL="SELECT loc.*,f.filename FROM location loc LEFT JOIN  files f ON loc.id=f.loc_id ORDER BY created_at DESC";
         $result = $db->query($strSQL);
         $numCounter=1;
-        while ($row = $result->fetchArray()) {
+        while ($row = $result->fetch(PDO::FETCH_ASSOC)) {
             $numDatum= strtotime($row['created_at']);
             $id=$row['id'];
             $datum= date("d.m.Y",$numDatum);
@@ -126,7 +126,7 @@
                 echo "<td>";
                 $strSQL = "SELECT username,comment,created_at FROM comment WHERE loc_id=".$id;
                 $comments = $db->query($strSQL);
-                while ($comment = $comments->fetchArray()) {
+                while ($comment = $comments->fetch(PDO::FETCH_ASSOC)) {
                     echo "<div class='comment'>";
                     echo "<em>".$comment['username']." schrieb am ";
                     $numDatum =  strtotime($comment['created_at']);

setup.php

@@ -71,33 +71,7 @@
  }
 ?>
 </li>
-<li class="list-group-item">
-<?php
-/** **************************************************
- * 
- * Datenbank anlegen
- * 
- **************************************************  */
 
-echo "Datenbankverzeichnis anlegen:  ";
-if (file_exists("db/locations.db")) {
-    echo "Datenbank existiert bereits.";
-    $boolError=true;
-    die ("Abbruch");
-} else {
-    if (file_exists("db") && is_writable("db")) {
-        echo "Datenbankverzeichnis existiert bereits";
-    } else {
-        if (mkdir("db",0755)) {
-            echo "Datenbankverzeichnis angelegt. ";
-        } else {
-            echo "<span class='error'>Datenbankverzeichnis konnte nicht angelegt werden.</span>";
-            $boolError=true;
-        }
-    }
-}
-?>
-</li>
 <li class="list-group-item">
 <?php
 /** **************************************************

setup_chk.php

@@ -9,9 +9,9 @@
  ******************************** */
 
 
-$dbFilename = "db/locations.db";
+require("config.db.php");
-$db = new SQLite3($dbFilename);
 
+$db->query("TRUNCATE config");
 
 $boolActive   = (isset($_POST['active'])) ? "1" : "0";
 $boolRating   = (isset($_POST['rating'])) ? "1" : "0";