From 27a84c09707cbc25d1dedda224874fd6b8332b8f Mon Sep 17 00:00:00 2001
From: Peter Hoppe <p.hoppe@gmx.de>
Date: Mon, 16 Jan 2023 23:32:51 +0100
Subject: [PATCH] upload

---
 php/php-dog/upload.php | 88 +++++++++++++++++++++---------------------
 1 file changed, 43 insertions(+), 45 deletions(-)

diff --git a/php/php-dog/upload.php b/php/php-dog/upload.php
index cbe3e0e..2c1b998 100644
--- a/php/php-dog/upload.php
+++ b/php/php-dog/upload.php
@@ -14,49 +14,47 @@ function deleteOldPic($qr_id, $qr)
     // get old pic_path
     try
     {
-        echo "qr_id   ". $qr_id . "\n";
-        echo "qr_set   ". $qr . "\n";
-        echo "isset qr_set   ". isset($qr) . "\n";
+//        echo "qr_id   ". $qr_id . "\n";
+//        echo "qr_set   ". $qr . "\n";
+//        echo "isset qr_set   ". isset($qr) . "\n";
         $db_connection = new Database();
-        //$conn = $db_connection->dbConnection();
+        $conn = $db_connection->dbConnection();
 
-        echo "db_connection   ". $db_connection . "\n";
-        //echo "conn   ". $conn . "\n";
-
-
-
-        // $fetch_user_qr_id = 
-        // "SELECT id, qr_code, picture FROM `dogs` WHERE `qr_id`=:qr_id";
-        // $query_stmt = $conn->prepare($fetch_user_qr_id);
-        // echo "query_stmt   ". $query_stmt . "\n";
-        // $query_stmt->bindValue(':qr_id', $qr_id,PDO::PARAM_STR);
-        // echo "bindValue   ". "\n";
-        // $query_stmt->execute();
-        // echo "execute   ". "\n";
+        $fetch_user_qr_id = 
+        "SELECT id, qr_code, picture FROM `dogs` WHERE `qr_id`=:qr_id";
+        $query_stmt = $conn->prepare($fetch_user_qr_id);
+//        echo "query_stmt   ". $query_stmt . "\n";
+        $query_stmt->bindValue(':qr_id', $qr_id,PDO::PARAM_STR);
+//        echo "bindValue   ". "\n";
+        $query_stmt->execute();
+//        echo "execute   ". "\n";
 
         // // IF THE dog IS FOUNDED BY qr_id
-        // if($query_stmt->rowCount())
-        // {
-        //     $row = $query_stmt->fetch(PDO::FETCH_ASSOC);
-        //     $file2del = "../uploads/";
-        //     if($qr_set)
-        //     {
-        //         $file2del += $row["qr_code"];
-        //     }
-        //     else
-        //     {
-        //         $file2del += $row["picture"];
-        //     }
-        //     if (file_exists($file2del))
-        //     {
-        //         unlink($file2del);
-        //     }
-        //     $result = new CMsg(1,200,'get old pic_path',null,$row);
-        // }
-        // else
-        // {
-        //     $result = new CMsg(0,422,'no dog',null);
-        // }
+        if($query_stmt->rowCount())
+        {
+            $row = $query_stmt->fetch(PDO::FETCH_ASSOC);
+
+//            echo "row " . $row["picture"] . "\n";
+            $file2del = "../uploads/";
+            if($qr)
+            {
+                $file2del .= $row["qr_code"];
+            }
+            else
+            {
+                $file2del .= $row["picture"];
+            }
+            if (file_exists($file2del))
+            {
+                unlink($file2del);
+//                echo "unlink " . $file2del . "\n";
+            }
+            $result = new CMsg(1,200,'get old pic_path',null,$row);
+        }
+        else
+        {
+            $result = new CMsg(0,422,'no dog',null);
+        }
     }
     catch(PDOException $e)
     {
@@ -72,15 +70,14 @@ try {
 // {
 //     "success": 1,
 //     "user": {
-//         "__PHP_Incomplete_Class_Name": "CUser",
 //         "id": 11,
 //         "qr_id": "YQiwEB",
-//         "email": "p.para@gmx.de"
+//         "email": "p.para@gmx.de",
+//         "qr": 1
 //     }
 // }');
 
-//     $_SESSION["user"] = $resp["user"];
-
+// $_SESSION["user"] = (array)((array)$resp)["user"];
 
     $result = new CMsg(0);
 
@@ -95,6 +92,7 @@ try {
     $allowTypes = array('jpg', 'png', 'jpeg', 'gif', 'pdf');
     //echo var_dump($user);
     // File upload path
+    //$targetDir = "../uploads/" . $user["qr_id"];
     $targetDir = "../uploads/" . $user["qr_id"];
     if (!file_exists($targetDir)) 
     {
@@ -103,6 +101,7 @@ try {
 //    echo "targetDir   ". $targetDir . "\n";
 
     $fileName = basename($_FILES["file"]["name"]);
+    //$fileName = "qr_blob.png";
     $fileType = pathinfo($fileName, PATHINFO_EXTENSION);
 
     // echo "fileName    ".$fileName . "\n";
@@ -119,11 +118,10 @@ try {
         return $result->jsonarray();
     }
     deleteOldPic($user["qr_id"], $_POST["qr"]);
+    // deleteOldPic($user["qr_id"], $user["qr"]);
     $newFilename = getNewFilename($targetDir, $fileType, 20);
 
 //    echo "newFilename    ".$newFilename . "\n";
-
-
     if (strlen($newFilename) == 0) 
     {
         $result = new CMsg(