From e381050e1db6ec33872c185b45cff83af8d9c18b Mon Sep 17 00:00:00 2001
From: Furentes <Furentes@users.noreply.github.com>
Date: Thu, 23 May 2019 09:12:05 +0200
Subject: [PATCH] Fixed error messages

---
 css/main.css     |  1 +
 css/main.css.map |  2 +-
 post.php         | 41 ++++++++++++++++++++++++++++++-----------
 scss/main.scss   |  1 +
 users.php        | 11 ++++++++++-
 5 files changed, 43 insertions(+), 13 deletions(-)

diff --git a/css/main.css b/css/main.css
index 9c8e6a6..044411b 100644
--- a/css/main.css
+++ b/css/main.css
@@ -8,6 +8,7 @@ section.main {
   max-width: 960px;
   margin: 0 auto;
   padding: 80px 0 0;
+  margin-bottom: 100px;
 }
 
 /*# sourceMappingURL=main.css.map */
diff --git a/css/main.css.map b/css/main.css.map
index 1491ca3..09e6618 100644
--- a/css/main.css.map
+++ b/css/main.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["../scss/main.scss"],"names":[],"mappings":"AAAA;EACE;;;AAGF;EACE;EACA;EACA;EACA;EACA","file":"main.css"}
\ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["../scss/main.scss"],"names":[],"mappings":"AAAA;EACE;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA","file":"main.css"}
\ No newline at end of file
diff --git a/post.php b/post.php
index d743fc5..bf250fc 100644
--- a/post.php
+++ b/post.php
@@ -101,17 +101,6 @@ require_once(__DIR__."/inc/head.php");
     }
     ?>
     <?php
-    foreach ($errors as $key=>$value):
-    ?>
-    <span style="color: red;">
-      <?= $value ?>
-      </span><br>
-    <?php
-    endforeach;
-
-    if($success == true) {
-      echo '<span style="color: green;">Post bearbeitet!</span><br>';
-    }
     if ($action == 'view'):
     ?>
     <div>
@@ -131,6 +120,15 @@ require_once(__DIR__."/inc/head.php");
     ?>
     </div>
     <?php
+    foreach ($errors as $key=>$value):
+      ?>
+      <br><span style="color: red;">
+        <?= $value ?>
+        </span>
+      <?php
+    endforeach;
+    ?>
+    <?php
     if ($auth->isLoggedIn()) {
     ?>
     <p>
@@ -162,6 +160,15 @@ require_once(__DIR__."/inc/head.php");
     if ($action == 'new'):
     ?>
     <h2>Neuer Beitrag</h2>
+    <?php
+    foreach ($errors as $key=>$value):
+      ?>
+      <span style="color: red;">
+        <?= $value ?>
+        </span><br>
+      <?php
+    endforeach;
+    ?>
     <form action="<?= htmlspecialchars($_SERVER['REQUEST_URI']) ?>" method="post" class="clearfix">
       <label for="title">Titel</label>
       <input type="text" name="title" id="title" value="<?= (isset($_POST['title'])) ? htmlspecialchars($_POST['title']) : ''; ?>"><br>
@@ -175,6 +182,18 @@ require_once(__DIR__."/inc/head.php");
     if ($action == 'edit'):
     ?>
     <h2>Beitrag Bearbeiten</h2>
+    <?php
+    if($success == true) {
+      echo '<span style="color: green;">Post bearbeitet!</span><br>';
+    }
+    foreach ($errors as $key=>$value):
+      ?>
+      <span style="color: red;">
+        <?= $value ?>
+        </span><br>
+      <?php
+    endforeach;
+    ?>
     <form action="<?= htmlspecialchars($_SERVER['REQUEST_URI']) ?>" method="post" class="clearfix">
       <label for="title">Titel</label>
       <input type="text" name="title" id="title" value="<?= (isset($data['title'])) ? $data['title'] : $ptitle; ?>"><br>
diff --git a/scss/main.scss b/scss/main.scss
index f49833a..cdb1049 100644
--- a/scss/main.scss
+++ b/scss/main.scss
@@ -8,4 +8,5 @@ section.main {
   max-width: 960px;
   margin: 0 auto;
   padding: 80px 0 0;
+  margin-bottom: 100px;
 }
\ No newline at end of file
diff --git a/users.php b/users.php
index acf0fae..7e5da14 100644
--- a/users.php
+++ b/users.php
@@ -10,7 +10,7 @@ $errors = [];
 $action = '';
 $data = [];
 $view = false;
-
+$success = false;
 
 if(isset($_GET['view'])) {
   if (!empty($_GET['view']) && \is_numeric($_GET['view'])) {
@@ -19,6 +19,12 @@ if(isset($_GET['view'])) {
 
   if(isset($_POST['update'])) {
     $update = $auth->updateUserRole($view, $_POST['role']);
+
+    if(is_array($update)) {
+      $errors = $update;
+    } else {
+      $success = true;
+    }
   }
 
   if(isset($_POST['delete'])) {
@@ -46,6 +52,9 @@ require_once(__DIR__."/inc/head.php");
     <?= ($view) ? '<a href="/users.php">Zurück</a>' : '<a href="/">Zurück</a>' ?>
     <h2>Benutzer</h2>
     <?php
+    if($success == true) {
+      echo '<span style="color: green;">Benutzer bearbeitet!</span><br>';
+    }
     foreach ($errors as $key=>$value):
     ?>
     <span style="color: red;">