From e2122741faf721e2d613cafad692f700d0f02850 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?s=C3=B8renpeter?= <sp@darch.dk>
Date: Thu, 13 Feb 2025 18:20:27 +0100
Subject: [PATCH] Image upload works now

---
 views/upload_img.php     |  41 +++++++++------
 views/upload_img_w3c.php | 109 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 134 insertions(+), 16 deletions(-)
 create mode 100644 views/upload_img_w3c.php

diff --git a/views/upload_img.php b/views/upload_img.php
index 68545a4..cc0a2bd 100644
--- a/views/upload_img.php
+++ b/views/upload_img.php
@@ -8,6 +8,20 @@ $title = "Upload - $title";
 
 include_once 'partials/header.php';
 
+?>
+
+<article>
+
+  <form action="" method="post" enctype="multipart/form-data">
+    <label>Select image to upload</label>
+    <input type="file" name="fileToUpload" id="fileToUpload"><br>
+    <input type="submit" value="Upload Image" name="submit">
+  </form>
+
+</article>
+
+<?php
+
 $media_upload = getcwd() . "/" . $config["media_upload"] .  "/";
 
 if (!empty($_POST)) {
@@ -17,20 +31,21 @@ if (!empty($_POST)) {
   //echo __DIR__ . "<br>";
   //echo "upload path: " . $config["media_upload"];
 
-  //$media_upload = getcwd()."/media/";
-  $media_upload = getcwd().$config["media_upload"];
   $target_file = $media_upload . basename($_FILES["fileToUpload"]["name"]);
+  $target_file = str_replace(' ', '-', strtolower($target_file)); // Replace spaces with dashes and set all lower case
   $uploadOk = 1;
   $imageFileType = strtolower(pathinfo($target_file,PATHINFO_EXTENSION));
 
+  echo "<p class='notice'>";
+
   // Check if image file is a actual image or fake image
   if(isset($_POST["submit"])) {
     $check = getimagesize($_FILES["fileToUpload"]["tmp_name"]);
     if($check !== false) {
-      echo "File is an image - " . $check["mime"] . ".";
+      //echo "File is an image - " . $check["mime"] . ".<br>";
       $uploadOk = 1;
     } else {
-      echo "File is not an image.";
+      echo "File is not an image.<br>";
       $uploadOk = 0;
     }
   }
@@ -43,7 +58,7 @@ if (!empty($_POST)) {
 
   // Check file size
   if ($_FILES["fileToUpload"]["size"] > 5000000) {
-    echo "<p class='notice'>Sorry, your file is too large.</p>";
+    echo "Sorry, your file is too large.<br>";
     $uploadOk = 0;
   }
 
@@ -60,24 +75,18 @@ if (!empty($_POST)) {
   // if everything is ok, try to upload file
   } else {
     if (move_uploaded_file($_FILES["fileToUpload"]["tmp_name"], $target_file)) {
-      echo "The file ". htmlspecialchars( basename( $_FILES["fileToUpload"]["name"])). " has been uploaded.<br>";
+      echo "The file <code>". htmlspecialchars( basename($target_file)). "</code> has been uploaded.<br>";
     } else {
       echo "Sorry, there was an error uploading your file.<br>";
     }
   }
 
+  echo "</p>";
+
 }
 
-?>
 
-<form action="" method="post" enctype="multipart/form-data">
-  Select image to upload:<br>
-  <input type="file" name="fileToUpload" id="fileToUpload"><br>
-  <input type="submit" value="Upload Image" name="submit">
-</form>
-
-
-<?php 
+// Show images already on server and markdown code
 
 $imgs_on_server = glob($media_upload."*.{jpg,jpeg,png,gif}", GLOB_BRACE);
 
@@ -92,7 +101,7 @@ foreach ($imgs_on_server as $img) {
 
   echo '<tr class="preview">';
   echo '<td><a href="'.$public_file.'">';
-      echo '<img src="'.$public_file.'" style="width=50px;">';
+  echo '<img src="'.$public_file.'" style="width=50px;">';
   echo '</a></td>';
 
   //$img = str_replace('../', $base_url, $img);
diff --git a/views/upload_img_w3c.php b/views/upload_img_w3c.php
new file mode 100644
index 0000000..68545a4
--- /dev/null
+++ b/views/upload_img_w3c.php
@@ -0,0 +1,109 @@
+<?php
+require_once "partials/base.php";
+require_once 'libs/session.php';
+
+checkValidSessionOrRedirectToLogin();
+
+$title = "Upload - $title";
+
+include_once 'partials/header.php';
+
+$media_upload = getcwd() . "/" . $config["media_upload"] .  "/";
+
+if (!empty($_POST)) {
+  // Based on code from: https://www.w3schools.com/php/php_file_upload.asp
+
+  //echo getcwd() ."<br>";
+  //echo __DIR__ . "<br>";
+  //echo "upload path: " . $config["media_upload"];
+
+  //$media_upload = getcwd()."/media/";
+  $media_upload = getcwd().$config["media_upload"];
+  $target_file = $media_upload . basename($_FILES["fileToUpload"]["name"]);
+  $uploadOk = 1;
+  $imageFileType = strtolower(pathinfo($target_file,PATHINFO_EXTENSION));
+
+  // Check if image file is a actual image or fake image
+  if(isset($_POST["submit"])) {
+    $check = getimagesize($_FILES["fileToUpload"]["tmp_name"]);
+    if($check !== false) {
+      echo "File is an image - " . $check["mime"] . ".";
+      $uploadOk = 1;
+    } else {
+      echo "File is not an image.";
+      $uploadOk = 0;
+    }
+  }
+
+  // Check if file already exists
+  if (file_exists($target_file)) {
+    echo "Sorry, file already exists.<br>";
+    $uploadOk = 0;
+  }
+
+  // Check file size
+  if ($_FILES["fileToUpload"]["size"] > 5000000) {
+    echo "<p class='notice'>Sorry, your file is too large.</p>";
+    $uploadOk = 0;
+  }
+
+  // Allow certain file formats
+  if($imageFileType != "jpg" && $imageFileType != "png" && $imageFileType != "jpeg"
+  && $imageFileType != "gif" ) {
+    echo "Sorry, only JPG, JPEG, PNG & GIF files are allowed.<br>";
+    $uploadOk = 0;
+  }
+
+  // Check if $uploadOk is set to 0 by an error
+  if ($uploadOk == 0) {
+    echo "Sorry, your file was not uploaded.<br>";
+  // if everything is ok, try to upload file
+  } else {
+    if (move_uploaded_file($_FILES["fileToUpload"]["tmp_name"], $target_file)) {
+      echo "The file ". htmlspecialchars( basename( $_FILES["fileToUpload"]["name"])). " has been uploaded.<br>";
+    } else {
+      echo "Sorry, there was an error uploading your file.<br>";
+    }
+  }
+
+}
+
+?>
+
+<form action="" method="post" enctype="multipart/form-data">
+  Select image to upload:<br>
+  <input type="file" name="fileToUpload" id="fileToUpload"><br>
+  <input type="submit" value="Upload Image" name="submit">
+</form>
+
+
+<?php 
+
+$imgs_on_server = glob($media_upload."*.{jpg,jpeg,png,gif}", GLOB_BRACE);
+
+// Sort image files by date (based on: https://stackoverflow.com/questions/124958/glob-sort-array-of-files-by-last-modified-datetime-stamp
+usort($imgs_on_server, fn($a, $b) => -(filemtime($a) - filemtime($b)));
+
+echo '<table class="center">';
+
+foreach ($imgs_on_server as $img) {
+
+  $public_file = $config["public_media"] . "/" . basename($img);
+
+  echo '<tr class="preview">';
+  echo '<td><a href="'.$public_file.'">';
+      echo '<img src="'.$public_file.'" style="width=50px;">';
+  echo '</a></td>';
+
+  //$img = str_replace('../', $base_url, $img);
+  echo '<td><code>![]('.$public_file.')</code></td>';
+  echo '</tr>';
+}
+
+echo '</table>';
+
+?>
+
+
+
+<!-- PHP: FOOTER  --><?php include_once 'partials/footer.php';?>