From adf447fe1a3197908e4f4bbce956f2a123c0df62 Mon Sep 17 00:00:00 2001
From: Joshua Ramon Enslin <joshua@museum-digital.de>
Date: Fri, 30 Aug 2019 23:14:18 +0200
Subject: [PATCH] Transfer upload page to new design

---
 assets/css/csvxml.css |  6 ++++-
 upload.php            | 54 ++++++++++++++++++++++---------------------
 2 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/assets/css/csvxml.css b/assets/css/csvxml.css
index 937c36f..b041558 100644
--- a/assets/css/csvxml.css
+++ b/assets/css/csvxml.css
@@ -18,7 +18,7 @@
 body { margin: 2em; background: #FFF;
        font-family: sourceSansPro, Arial, Helvetica, Times; font-size: 1.2em; line-height: 1.5em; }
 
-a { text-decoration: none; }
+a { text-decoration: none; color: inherit; }
 
 h1     { display: block; max-width: 600px; margin: 0 auto 1.5em auto; }
 h1 > * { display: inline-block; vertical-align: middle; color: #212121; }
@@ -101,3 +101,7 @@ ul.fieldList > li.humanTLToggled { border-color: #CB9B8C; background: #CB9B8C; b
     opacity: 1;
     transition: background .4s, opacity .4s; }
 .options > a.buttonLike:hover { background: #D6D6D6; }
+
+.actionList { margin: 1em 0 1em 1em; padding: .5em 0; }
+.actionList > li a { display: inline-block; padding: .3em; border-radius: .3em; transition: background .4s; }
+.actionList > li a:hover { background: #CB9B8C; }
diff --git a/upload.php b/upload.php
index 408a0a1..217534f 100644
--- a/upload.php
+++ b/upload.php
@@ -1,36 +1,38 @@
 <?PHP
-echo '<link rel="stylesheet" type="text/css" href="css/main.css">';
-echo '<div class="title">';
-echo 'museum-digital CSV to XML converter';
-echo '</div>';
-echo '<div class="maincontent">';
+declare(strict_types = 1);
+require_once __DIR__ . "/functions/functions.php";
+
 $target = "csv/";
-$target = $target . basename( $_FILES['uploaded']['name']);
+$target .= basename( $_FILES['uploaded']['name']);
 $targetpart = basename( $_FILES['uploaded']['name']);
-$ok = 1;
-$semikoma = $_POST['deli'];
 //This is our size condition
 if ($uploaded_size > 40000000) {
     echo "Your file is too large.<br>";
-    $ok = 0;
+    return;
 }
 
 //Here we check that $ok was not set to 0 by an error
-if ($ok == 0) {
-    echo "Sorry your file was not uploaded";
+//If everything is ok we try to upload it
+if(!move_uploaded_file($_FILES['uploaded']['tmp_name'], $target)) {
+    echo "Sorry, there was a problem uploading your file.";
+    return;
 }
-else
-{
-    //If everything is ok we try to upload it
-    if(move_uploaded_file($_FILES['uploaded']['tmp_name'], $target)) {
-        echo "The file <b>" . basename( $_FILES['uploaded']['name']) . "</b> has been uploaded<hr>";
-        echo '<a href="index2.php?fnam=' . basename( $_FILES['uploaded']['name']) . '"><img src="img/go.gif"> Create XML (iso8859)</a><br>';
-        echo '<a href="index4.php?fnam=' . basename( $_FILES['uploaded']['name']) . '"><img src="img/go.gif"> Create XML (utf-8)</a><br>';
-        echo '<a href="index3.php?fnam=' . basename( $_FILES['uploaded']['name']) . '"><img src="img/go.gif"> Check validity for museum-digital import</a>';
-    }
-    else
-    {
-        echo "Sorry, there was a problem uploading your file.";
-    }
-}
-echo '</div>';
+
+echo printHTMLHead();
+
+echo "
+<div>
+    <p>The file has been uploaded: <b>" . basename( $_FILES['uploaded']['name']) . "</b>.</p>
+    <hr>
+    <h3>How to proceed?</h3>
+    <ul class='actionList'>
+        <li><a href='index2.php?fnam=" . basename( $_FILES['uploaded']['name']) . "'>Create XML (iso8859)</a></li>
+        <li><a href='index4.php?fnam=" . basename( $_FILES['uploaded']['name']) . "'>Create XML (utf-8)</a></li>
+        <li><a href='index3.php?fnam=" . basename( $_FILES['uploaded']['name']) . "'>Check validity for museum-digital import</a></li>
+    </ul>
+</div>
+
+
+</body>
+</html>
+";