Merge branch 'master' into hendrik-testing

website/views/adminpanel.php

@@ -99,8 +99,15 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
         changeMultipleGroupStatusByID($db, $_POST["checkbox-group"], $_POST["groupbatchactions"]);
     }
 
+<<<<<<< HEAD
     if (isset($_POST["pageselect"])) {
         $currentpage = $_POST["pageselect"];
+=======
+    if (!empty($_POST["actions"]) && !empty($_POST["userID"])) {
+        changeUserStatusByID($_POST["userID"], $_POST["actions"]);
+    } elseif (!empty($_POST["actions"]) && !empty($_POST["groupID"])) {
+        changeGroupStatusByID($_POST["groupID"], $_POST["actions"]);
+>>>>>>> master
     }
 
 }

website/views/chat-view.php

@@ -6,11 +6,8 @@
                 <?php
                 include_once("../queries/friendship.php");
 
-                if (empty($_SESSION["userID"]))
-                    $_SESSION["userID"] = 2;
-
                 // Get all the friends of a user.
-                $friends = selectAllFriends($db, $_SESSION["userID"]);
+                $friends = selectAllFriends($_SESSION["userID"]);
                 $i = 0;
 
                 // Print all the users.
@@ -28,7 +25,7 @@
 
                     // Echo the friend.
                     echo "
-                        <li class='friend-item' onclick='switchUser(\"$userID\")'>
+                        <li class='friend-item' id='friend-item-$userID' onclick='switchUser(\"$userID\")'>
                             <div class='friend'>
                                 <img alt='PF' class='profile-picture' src='$pf'/>
                                 $username
@@ -38,12 +35,6 @@
                 }
                 ?>
             </ul>
-            <!--            <a href="#">-->
-            <!--                <div class="chat-conversation">-->
-            <!--                    <img class="profile-picture" src="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcTDnuRSeeyPve7KwDvJJ6OBzj3gyghwLcE2z9kZeYBOyZavh3mw">-->
-            <!--                    Rudolf Leslo-->
-            <!--                </div>-->
-            <!--            </a>-->
         </nav>
         <div class="chat-right right">
             <div id="chat-history" class="chat-history platform">
@@ -74,7 +65,7 @@
                         <input type="text"
                                name="content"
                                id="newContent"
-                               placeholder="Reageer..."
+                               placeholder="Schrijf een bericht..."
                                autofocus
                                required
                         />

website/views/head.php

@@ -18,3 +18,7 @@
 include_once("../queries/connect.php");
 
 session_start();
+
+if(!isset($_SESSION["userID"])){
+    header("location:login.php");
+}

website/views/header.php

@@ -1,3 +1,8 @@
+<?php
+include_once ("../queries/header.php");
+
+$userinfo = getHeaderInfo();
+?>
 <header>
     <div id="header-logo">
         <a href="profile.php"><img src="img/top-logo.png" alt="MyHyvesbook+" /></a>
@@ -15,7 +20,7 @@
     </div>
     <div class="right profile-menu">
         <div id="profile-menu-popup">
-            <a href="index.php"><span style="color: red;" class="fa fa-sign-out" data-title="Uitloggen"></span></a> |
+            <a href="logout.php"><span style="color: red;" class="fa fa-sign-out" data-title="Uitloggen"></span></a> |
             <a href="settings.php"><span style="color: blue;" class="fa fa-cog" data-title="Instellingen"></span></a> |
             <a href="profile.php"><span style="color: green;" class="fa fa-user" data-title="Profiel"></span></a>
         </div>
@@ -23,9 +28,9 @@
             <div id="hello-loop">
                 Hallo
             </div>
-            Bart
+            <?=$userinfo["fname"]?>
         </div>
-        <img id="own-profile-picture" class="profile-picture" src="data:image/jpeg;base64,/9j/4AAQSkZJRgABAQAAAQABAAD/2wCEAAkGBwgHBgkIBwgKCgkLDRYPDQwMDRsUFRAWIB0iIiAdHx8kKDQsJCYxJx8fLT0tMTU3Ojo6Iys/RD84QzQ5OjcBCgoKDQwNGg8PGjclHyU3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3Nzc3N//AABEIAHkAeQMBIgACEQEDEQH/xAAcAAABBQEBAQAAAAAAAAAAAAACAQMEBQYHAAj/xAA/EAABAwMBBAcFBwIEBwAAAAABAAIDBAURIQYSMVETMkFhcYGRFCJyobEHFTNCUsHRQ5IkgrLhNDVEU1RidP/EABkBAAIDAQAAAAAAAAAAAAAAAAABAgQFA//EACYRAAMAAQMEAQQDAAAAAAAAAAABAgMRIUEEEhMxUSIygaEUYdH/2gAMAwEAAhEDEQA/AOn4RAJAjASA8Bqi3e1KAjAQAAaiDUTi1jS5xDWtGSScABck2++1QtkktmysjS4ZbLXYzryj5/F6c0N6DS1OrTTQ0zOkqZooWdrpHho9Sob75Z46f2h91oWw53ekNQzdzyzlfLNzqK6tkMtfUVFQ4nrTyF5PqVAG43rMJ88IT1G5PsVm69jXsIc1wy1wOQRzXiF8pWbau92R7DbLnVwsb/SMm9H/AGnRdz+y7bg7UUslLc5ovvSIbwa1m50rP1DXXB4oFobghCQniEJCBDJCFOkISEAN5Xt5KQkwgBWhOAJGhG0IAUBGAvBQNo7qyx2Ktub273s8Rc1p/M7gB6kIA499s+11dNdTs/RyOhoogDMGnBncef8A6jl2+i53aqKouVYIKGF0kp4uAzher5Kq83OarqX79RUSlzjz8Pp4Bdz2F2borLbIhGzNQ9gdI88SVwy5O1bey3gw9z39HN5diLm1g6aAgY6wKp7js2aPO80E8sld/udPPPCegDSR1Wk4HmqWHZTdPT1D2yz8RkaDwCqeXImXfBjaOKjZqq6EySNMenutxqom5WbP1tPWUsz4aiF4kje06tP+/Lku4ybPue8mbG73cSs7thshS1dG50Y3JwPcOTjxwpR1Nd31EMnST2/SbT7Ndsm7W2d7qoxMuVM7dnij0BH5Xgcjr6LWkr5l+zi8ybMbYwTTkime/wBmqfhcePkcH1X0zoRkHIPAhaBltaHigKIjCQoENlJhGUiYChONCFqcakAQWa+04xs2Cu7pGF+IhutA/MXDC04wol7ohcrVVUZxmaJzGkjgSND6oGj5f2OAqNraGNwBaXk48ASuy1l3r4ZHU9piidIzAe+cHcauQ7M2utoNtaGKaItMNd7O88NRkFdou9kmr48U9QYjnJIGqp5/aNLpdXLTM5FtLtVS1zRcn210B7IWu+R4Lcm4b1u9rHU3c5WZodlBS1U8wY55ldkuleXbgzn3Tx9VfPia2yyxN6oaQAFXptvYtTOxg5LntLX15dT3qGjpydGmAOz68VLNTc27orauOtaX7u+xu7u+XYrKfZqG5U0AlgidHG7fYeGvfz4DQo6PZptAyRz5Xua4l26ToO4d3ck62H2aN/6cUvTvZ77cGsOCJCWkdhAyvqykJdSQlxJcY25JGMnC+cKrZioum3hpGEtjqKvdL8ZAaQCT819JNG6AB2DC0oacrQxsqap6ikaICnDqgcpnIEhJhEQhTANqcCBqcakAYXjwXmpSgaMDtNaGUVTW3GNoL3zNqeGo3d3eA/t+ZV7bSySna7PFW9ZStqmbriAcEajI1WUsM7m04jkwHRvdGR3tcWn6KnljtbZpYciqUuUW1WS2CTo25cGnA5rKPv8AdhRyxx2qLOoYOk4jv00+auq6rnjdkUs87OUQHocqN7XVbmRa4W4zgPmHzwq73LsTqg9lameood6phEOujAcjy7lNu0jGU5x4YVRSTVstS1gt/QgdaRkoLAPDiiu8wDB0h97U4JUf6Fa0ZG2Ko+lvMtXJFloc58b3DhoG6LfjiqjZ6iZRW+Bg1fuAvceJKtmcVpYo7J0MjqMnfWoedEJRISuhXE7EmERQpgE1G1NtTjUgHAiCEJQgATxWJvbhQXd7I27rJCHjA7eJHrr5rcEZWW2loWV75o3jVpBaeRwuOb7S1033DMFb0p3dNRk68E3U25lS9kgIO7rw492Vk6mS5WuXOHVEYOoA1QO21mZ7ggcABjUbpB81ScmisnaausqG0LHYdu40wdMrPy1or7pT0ziSHyNZgHsJ1Koqy8Vt2kw1m40k5x/HNXFgoTTVcM0hJeJGnJ5ZCSSl7kabo6ZCN0cE+zgm+1OjgtQx2LlCcpSUmUxClAiJQoAUJxpTQRtSAeaUuVWV15obeP8AETt3/wBDdT6BVNXtZER/g4nSO5v91qhV6bJEklyaqPEhOOqBqqapjd7XMJeJcfTs+Sp7XtJUxXASVjs07/dcxowGjmFsXxQVkTZGkPaRlr28lG4qpOmLLM0ZOuoyfejAyOfaqWooqV3vS0sWeTmLbz26ZudwCQdyqamldnEkLwfhVSpa9mjFzXpmYpbbDJI3oomRtHENGFNqaZsMZLAQR3q5p6GTBLInnPYGqworK50jZaxuGjUMP5lzWOqexK8sQtyTSU8vscJkJMgYC7PgiY9rtOB5FNbRV4t9qlfnE0oLImjv7fJYCivNwoWlrJS9p/LL72FoN0vRkNrk6MV4LIW/a8gbtwh3tdJItNO8FaShr6Wuj36WZsnMDiPELomRJRSLyRMCFcLpS24N9ocd93VjY0lzvJZ24Xa6V+WU0LqaE6dYBx8Sru/0u9FBMxpLgd3TjqoMNtrJBllO/wDzDH1Ve8lKtEjR6fpcN4++6KCK0zuJMjmAnicklTIrPggul4cmq+jtFcRgta3xcFIjslUevJEPMn9lHuys6PF0c86/kpordTtxvtc/4yrWhq5KEBsOOj/R2KfFYh/VqCfhapcdoo28Wuf8Tj+yam29RVn6aVol+gYLzSyYEuY3eoUoVtKRpUx/3LzKGkbwp4/NuU62GFvVjYPBoXZKuSjbxa/SmMOrqVo1qGnubqoVTeo2AiCGR7v1OGArb3RwACQkIafyKbxp7zr+TGVdRLVS9JO455dgUR9PC/jEwnnurdSRxyDD2NcO8ZUR1BRvPvU8fkMLg8Ne9S/PXY9NHBiXUFN/2Gc+CbFFBE8SQB0Ug4OjeQVuPuyiGvszPPJTMlroX6dAB8JIS8V/JL+X0z9x+kUluu8rZWwVpDgdGyYwQe/+VeZKq67Z+IxOdTyuaQCQH6hRPvRn/kx/3LtDtLSir1CwNp4noUuxe185q4LXcnCRjxuQzHrBw4AntGO3iuiZxknQDtK4VY/+e0H/ANLfqtRtd+NU/F+6vZcSd7GXGRqdzf1F+tVNkTV8G8Dq1rt4jyChy7Y2aLO7LNIR2MiP74XNIuLfJTIusPEqS6eeSDz1wbaTbmmH4VBUu+Itb/KYdtxO78K3RjHHemzj0Cycv4zkQ/L4qfhhcEfLb5NFJtdd36sbTRjmGE/UqNJtJenf9bujh7sTB9Qq8fuo0nVHmmon4E7r5LB1+uxA3q+o4a6gfQIPve6k733jVAZ4dKobvyfEPqik/Cb8X8JuZXBFU3ySJL3d86XCoGuMF6Sm2iu8Lzivkec9V4DgfVR5uu/wH0Kqv6p+MfQoUy+AdNcmlm2qvUjSG1EcfwRNz88r1LtncKaTcq446lvYT7jvUafJUY6zPP8AdNu/4iXwCj44+BrJXvU2jdtKOpYYpqaaF7mkA5Dm8OYXIfaz+oepWgHXb4P/ANJVAkscz6OiyU1uf//Z" />
+        <img id="own-profile-picture" class="profile-picture" src="<?=$userinfo["profilepicture"]?>"/>
     </div>
     <a href="chat.php"><div class="right fa fa-comments-o" id="open-chat" data-title="Prive chats"></div></a>
 </header>

website/views/login-view.php

@@ -3,49 +3,49 @@
          src="img/top-logo.png"
          alt="MyHyvesbook+">
 </div>
-
-<!-- Login content  -->
-<form action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>"
-      return= $correct
-      method="post">
+<div class="platform">
     <h1>Welkom bij MyHyvesbook+</h1>
+    <!-- Login content  -->
+    <form action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>"
+          return= $correct
+          method="post">
 
-    <!-- Login name -->
+        <!-- Login name -->
+        <div class="login_containerlogin">
+            <label><b>Gebruikersnaam</b></label>
+            <input type="text"
+                   placeholder="Voer uw gebruikersnaam in"
+                   name="uname"
+                   value="<?php echo $uname ?>"
+                   title="Moet 6 of meer karakters bevatten"
+                   >
+        </div>
+
+        <!-- Login password -->
+        <div class="login_containerlogin">
+            <label><b>Wachtwoord</b></label>
+            <input type="password"
+                   placeholder="Voer uw wachtwoord in"
+                   name="psw"
+                   title="Moet minstens 8 karakters lang zijn"
+                   >
+        </div>
+
+        <!-- Error message -->
+        <div class="login_containerfault"><span><?php echo $loginErr; ?></span></div>
+
+        <!-- Button for logging in -->
+        <div class="login_containerlogin">
+            <button type="submit"
+                   value="Login"
+                   name="submit"
+                   id="frm1_submit">
+            Login
+            </button>
+        </div>
+    </form>
+    <!-- Button for going to the register screen -->
     <div class="login_containerlogin">
-        <label><b>Gebruikersnaam</b></label>
-        <input type="text"
-               placeholder="Voer uw gebruikersnaam in"
-               name="uname"
-               value="<?php echo $uname ?>"
-               title="Moet 6 of meer karakters bevatten"
-               >
+      <a href="https://myhyvesbookplus.nl/register.php" class="button">Registreer een account</a>
     </div>
-
-    <!-- Login password -->
-    <div class="login_containerlogin">
-        <label><b>Wachtwoord</b></label>
-        <input type="password"
-               placeholder="Voer uw wachtwoord in"
-               name="psw"
-               title="Moet minstens 8 karakters lang zijn"
-               >
-    </div>
-
-    <!-- Error message -->
-    <div class="login_containerfault"><span><?php echo $loginErr; ?></span></div>
-
-    <!-- Button for logging in -->
-    <div class="login_containerlogin">
-        <button type="submit"
-               value="Login"
-               name="submit"
-               id="frm1_submit">
-        Login
-        </button>
-    </div>
-</form>
-
-<!-- Button for going to the register screen -->
-<div class="login_containerlogin">
-    <a href="https://myhyvesbookplus.nl/~joey/public/register.php" class="button">Registreer een account</a>
 </div>

website/views/login_head.php

@@ -1,6 +1,9 @@
 <head>
     <meta charset="utf-8">
     <title>MyHyvesbook+</title>
+    <link rel="stylesheet"
+          type="text/css"
+          href="styles/main.css">
     <link rel="stylesheet"
           type="text/css"
           href="styles/index.css">

website/views/menu.php

@@ -9,11 +9,8 @@
             // Load file.
             include_once("../queries/friendship.php");
 
-            if (empty($_SESSION["userID"]))
-                $_SESSION["userID"] = 2;
-
             // Get all the friends of a user.
-            $friends = selectAllFriends($db, $_SESSION["userID"]);
+            $friends = selectAllFriends($_SESSION["userID"]);
             $i = 0;
 
             // Print all the users.
@@ -69,7 +66,7 @@
             include_once("../queries/group_member.php");
 
             // Get all the friends of a user.
-            $groups = selectAllGroupsFromUser($db, $_SESSION["userID"]);
+            $groups = selectAllGroupsFromUser($_SESSION["userID"]);
             $i = 0;
 
             // Print all the users.

website/views/profile.php

@@ -1,113 +1,56 @@
 <div class="content">
     <div class="profile-box platform">
-        <img class="left profile-picture" src="http://i.imgur.com/afjEUx2.jpg">
+        <img class="left profile-picture" src="<?php echo $user["profilepicture"] ?>">
         <div class="profile-button">
             <p><img src="img/add-friend.png"> Als vriend toevoegen</p>
         </div>
-        <h1 class="profile-username">[gebruikersnaam]</h1>
-        <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dictum turpis quam, eu ultrices sapien hendrerit tincidunt. Nunc aliquam neque turpis, id porta quam iaculis id. Sed suscipit, nisl a fermentum congue, nunc augue finibus lectus, id varius nunc purus nec dolor. Integer laoreet tellus sit amet sapien auctor congue. Mauris laoreet eu elit vel rhoncus. Nam et tortor arcu. Maecenas sit amet leo quis tellus varius gravida. Sed quis fermentum odio, sed dictum nulla. Donec aliquam rutrum orci cursus tempus. Quisque sit amet ipsum eget velit aliquam facilisis ultricies quis ligula. Nunc nisi lacus, luctus non bibendum quis, sagittis sit amet odio.</p>
+        <h1 class="profile-username"><?= $user["fname"]?> <?=$user["lname"]?> (<?=$user["username"]?>)</h1>
+        <p><?=$user["bio"]?></p>
     </div>
 
     <div class="item-box left platform">
         <h2>Vrienden</h2>
         <p>
-            <a href="#" data-title="[gebruikersnaam]"><img class="profile-picture" src="http://i.imgur.com/afjEUx2.jpg" alt="[gebruikersnaam]'s profielfoto"></a>
-            <a href="#" data-title="[gebruikersnaam]"><img class="profile-picture" src="http://i.imgur.com/afjEUx2.jpg" alt="[gebruikersnaam]'s profielfoto"></a>
-            <a href="#" data-title="[gebruikersnaam]"><img class="profile-picture" src="http://i.imgur.com/afjEUx2.jpg" alt="[gebruikersnaam]'s profielfoto"></a>
-            <a href="#" data-title="[gebruikersnaam]"><img class="profile-picture" src="http://i.imgur.com/afjEUx2.jpg" alt="[gebruikersnaam]'s profielfoto"></a>
-            <a href="#" data-title="[gebruikersnaam]"><img class="profile-picture" src="http://i.imgur.com/afjEUx2.jpg" alt="[gebruikersnaam]'s profielfoto"></a>
-            <a href="#vrienden">...en nog 25 anderen!</a>
+            <?php
+                while($friend = $profile_friends->fetch()) {
+                    echo "<a href='#' data-title='${friend["username"]}'><img class='profile-picture' src='${friend["profilepicture"]}' alt='${friend["username"]}'s profielfoto></a>";
+                }
+
+
+                if($friends->rowCount() === 0) {
+                    echo "<p>Deze gebruiker heeft nog geen vrienden gemaakt.</p>";
+                }
+            ?>
         </p>
     </div>
 
     <div class="item-box right platform">
         <h2>Groepen</h2>
         <p>
-            <a href="#" data-title="[groepsnaam]"><img class="group-picture" src="http://i.imgur.com/ztYhYro.png" alt="[groepsnaam]'s logo"></a>
-            <a href="#" data-title="[groepsnaam]"><img class="group-picture" src="http://i.imgur.com/ztYhYro.png" alt="[groepsnaam]'s logo"></a>
-            <a href="#" data-title="[groepsnaam]"><img class="group-picture" src="http://i.imgur.com/ztYhYro.png" alt="[groepsnaam]'s logo"></a>
-            <a href="#" data-title="[groepsnaam]"><img class="group-picture" src="http://i.imgur.com/ztYhYro.png" alt="[groepsnaam]'s logo"></a>
-            <a href="#" data-title="[groepsnaam]"><img class="group-picture" src="http://i.imgur.com/ztYhYro.png" alt="[groepsnaam]'s logo"></a>
-            <a href="#groepen">...en nog 6 anderen!</a>
+            <?php
+                while($group = $profile_groups->fetch()) {
+                    echo "<a href='#' data-title='${group["name"]}'><img class='group-picture' src='${group["picture"]}' alt='${group["name"]}s logo'></a>";
+                }
+
+                if($groups->rowCount() === 0) {
+                    echo "<p>Deze gebruiker is nog geen lid van een groep.</p>";
+                }
+            ?>
         </p>
     </div>
 
     <div class="posts">
-        <div class="post platform">
-            <h2>Lorem</h2>
-            <p>Lorem ipsum dolor sit amet, consectetur.</p>
-            <p class="subscript">Enkele minuten geleden geplaatst</p>
-        </div>
-        <div class="post platform">
-            <h2>Image</h2>
-            <img src="http://i.imgur.com/ypIQKjE.jpg" alt="Olympic Mountains, Washington">
-            <p class="subscript">Gisteren geplaatst</p>
-        </div>
-        <div class="post platform">
-            <h2>Ipsum</h2>
-            <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Rem nihil alias amet dolores fuga totam sequi a cupiditate ipsa voluptas id facilis nobis.</p>
-            <p class="subscript">Maandag geplaatst</p>
-        </div>
-        <div class="post platform">
-            <h2>Dolor</h2>
-            <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit.</p>
-            <p class="subscript">4 Januari geplaatst</p>
-        </div>
-        <div class="post platform">
-            <h2>Sit</h2>
-            <p>Lorem ipsum dolor sit.</p>
-            <p class="subscript">4 Januari geplaatst</p>
-        </div>
-        <div class="post platform">
-            <h2>Image</h2>
-            <img src="https://i.redditmedia.com/EBWWiEojgkRrdn89R7qF7tBZjJszJaIqgkWUH23s11A.jpg?w=576&s=ba4fe1f02485cb2327305924ef869a66" alt="Nunobiki Falls, Kobe Japan">
-            <p class="subscript">4 Januari geplaatst</p>
-        </div>
-        <div class="post platform">
-            <h2>Amet</h2>
-            <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Minima asperiores eveniet vero velit eligendi aliquid in.</p>
-            <p class="subscript">4 Januari geplaatst</p>
-        </div>
-        <div class="post platform">
-            <h2>Consectetur</h2>
-            <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Error aliquid reprehenderit expedita odio beatae est.</p>
-            <p class="subscript">4 Januari geplaatst</p>
-        </div>
-        <div class="post platform">
-            <h2>Adipisicing</h2>
-            <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Quaerat architecto quis tenetur fugiat veniam iste molestiae fuga labore!</p>
-            <p class="subscript">4 Januari geplaatst</p>
-        </div>
-        <div class="post platform">
-            <h2>Elit</h2>
-            <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Rem ut debitis dolorum earum expedita eveniet voluptatem quibusdam facere eos numquam commodi ad iusto laboriosam rerum aliquam.</p>
-            <p class="subscript">4 Januari geplaatst</p>
-        </div>
-        <div class="post platform">
-            <h2>Geen error</h2>
-            <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Doloribus dolorem maxime minima animi cum.</p>
-            <p class="subscript">4 Januari geplaatst</p>
-        </div>
-        <div class="post platform">
-            <h2>Image</h2>
-            <img src="https://i.reddituploads.com/82c1c4dd0cfb4a4aa1cfa16f93f5dbfa?fit=max&h=1536&w=1536&s=dd629d407f3646ee6e3adb4da78c93f2" alt="Oregon cliffs are no joke.">
-            <p class="subscript">4 Januari geplaatst</p>
-        </div>
-        <div class="post platform">
-            <h2>Aliquid</h2>
-            <p>Lorem ipsum dolor sit amet, consectetur.</p>
-            <p class="subscript">4 Januari geplaatst</p>
-        </div>
-        <div class="post platform">
-            <h2>Odit</h2>
-            <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Odit accusamus tempore at porro officia rerum est impedit ea ipsa tenetur. Labore libero hic error sunt laborum expedita.</p>
-            <p class="subscript">4 Januari geplaatst</p>
-        </div>
-        <div class="post platform">
-            <h2>Accusamus</h2>
-            <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Nobis quaerat suscipit ad.</p>
-            <p class="subscript">4 Januari geplaatst</p>
-        </div>
+        <?php
+            while($post = $posts->fetch()) {
+                $nicetime = nicetime($post["creationdate"]);
+                echo "
+                    <div class='post platform'>
+                        <h2>${post["title"]}</h2>
+                        <p>${post["content"]}</p>
+                        <p class=\"subscript\">${nicetime} geplaatst.</p>
+                    </div>
+                ";
+            }
+        ?>
     </div>
-
 </div>

website/views/register-view.php

@@ -4,132 +4,132 @@
          alt="MyHyvesbook+">
 </div>
 
-<!-- Register Content -->
-<form action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>"
-      return= $correct
-      method="post">
-    <h2>Registreer uw account</h2>
+<div class="platform">
+  <h1>Registreer uw account</h1>
+    <!-- Register Content -->
+    <form action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>"
+          return= $correct
+          method="post">
 
-    <!-- Error message -->
-    <div class="login_containerfault"><?php echo $genericErr;?></span></div>
+        <!-- Error message -->
+        <div class="login_containerfault"><?php echo $genericErr;?></span></div>
 
-    <!-- Register name -->
-    <div class="login_containerregister">
-        <label><b>Naam</b></label>
-        <input type="text"
-               placeholder="Voer uw naam in"
-               name="name"
-               value="<?php echo $name ?>"
-               title="Mag alleen letters bevatten"
-               >
-        <span class="error">* <?php echo $nameErr;?></span>
+        <!-- Register name -->
+        <div class="login_containerregister">
+            <label><b>Naam</b></label>
+            <input type="text"
+                   placeholder="Voer uw naam in"
+                   name="name"
+                   value="<?php echo $name ?>"
+                   title="Mag alleen letters bevatten"
+                   >
+            *<span class="error"><?php echo $nameErr;?></span>
+        </div>
+
+        <!-- Register surname -->
+        <div class="login_containerregister">
+            <label><b>Achternaam</b></label>
+            <input type="text"
+                   placeholder="Voer uw achternaam in"
+                   name="surname"
+                   value="<?php echo $surname ?>"
+                   title="Mag alleen letters bevatten"
+                   >
+            *<span class="error"> <?php echo $surnameErr;?></span>
+        </div>
+
+        <!-- Register birthday -->
+        <div class="login_containerregister">
+            <label><b>Geboortedatum</b></label>
+            <input type="date"
+                   name="bday"
+                   value="<?php echo $bday ?>"
+                   id="bday"
+                   placeholder="01/01/1900"
+                   >
+            *<span class="error"> <?php echo $bdayErr;?></span>
+        </div>
+
+        <!-- Register username -->
+        <div class="login_containerregister">
+            <label><b>Gebruikersnaam</b></label>
+            <input type="text"
+                   placeholder="Voer uw gebruikersnaam in"
+                   name="username"
+                   value="<?php echo $username ?>"
+                   title="Moet minimaal 6 karakters bevatten"
+                   >
+            *<span class="error"> <?php echo $usernameErr;?></span>
+            <ul>
+                <li>Minstens 6 karakters</li>
+            </ul>
+          </div>
+
+
+        <!-- Register password -->
+        <div class="login_containerregister">
+            <label><b>Wachtwoord</b></label>
+            <input type="password"
+                   placeholder="Voer uw wachtwoord in"
+                   name="password"
+                   value="<?php echo $password ?>"
+                   id="password"
+                   >
+            *<span class="error"> <?php echo $passwordErr;?></span>
+        <ul>
+          <li>Minstens 8 karakters</li>
+        </ul>
+        </div>
+        <!-- Repeat password -->
+        <div class="login_containerregister">
+            <label><b>Herhaal wachtwoord</b></label>
+            <input type="password"
+                   placeholder="Herhaal wachtwoord"
+                   name="confirmpassword"
+                   value="<?php echo $confirmpassword ?>"
+                   id="confirmpassword"
+                   title="Herhaal wachtwoord"
+                  >
+            *<span class="error"> <?php echo $confirmpasswordErr;?></span>
+        </div>
+
+        <!-- Register location -->
+        <div class="login_containerregister">
+            <label><b>Woonplaats</b></label>
+            <input type="text"
+                   placeholder="Voer uw woonplaats in"
+                   name="location"
+                   value="<?php echo $location ?>"
+                   pattern="[A-Za-z]{1,}"
+                   title="Mag alleen letters bevatten">
+            *<span class="error"> <?php echo $locationErr;?></span>
+        </div>
+
+        <!-- Register email -->
+        <div class="login_containerregister">
+            <label><b>Email</b></label>
+            <input type="text"
+                   placeholder="Voer uw email in"
+                   name="email"
+                   value="<?php echo $email ?>"
+                   id="email"
+                   title="Voer een geldige email in">
+            *<span class="error"> <?php echo $emailErr;?></span>
+        </div>
+
+        <!-- Button for registering -->
+        <div class="login_containerregister">
+            <button type="submit"
+                   value="Registreer uw account"
+                   name="Submit"
+                   id="frm1_submit">
+            Registreer uw account
+            </button>
+        </div>
+    </form>
+
+    <!-- Button for going back to login screen -->
+    <div class="login_containerlogin">
+        <a href="https://myhyvesbookplus.nl/login.php" class="button">Login met een account</a>
     </div>
-
-    <!-- Register surname -->
-    <div class="login_containerregister">
-        <label><b>Achternaam</b></label>
-        <input type="text"
-               placeholder="Voer uw achternaam in"
-               name="surname"
-               value="<?php echo $surname ?>"
-               title="Mag alleen letters bevatten"
-               >
-        <span class="error">* <?php echo $surnameErr;?></span>
-    </div>
-
-    <!-- Register birthday -->
-    <div class="login_containerregister">
-        <label><b>Geboortedatum</b></label>
-        <input type="date"
-               name="bday"
-               value="<?php echo $bday ?>"
-               id="bday"
-               placeholder="01/01/1900"
-               >
-        <span class="error">* <?php echo $bdayErr;?></span>
-    </div>
-
-    <!-- Register username -->
-    <div class="login_containerregister">
-        <label><b>Gebruikersnaam</b></label>
-        <input type="text"
-               placeholder="Voer uw gebruikersnaam in"
-               name="username"
-               value="<?php echo $username ?>"
-               title="Moet minimaal 6 karakters bevatten"
-               >
-        <span class="error">* <?php echo $usernameErr;?></span>
-    </div>
-
-    <ul>
-      <li>Minstens 6 karakters</li>
-    </ul>
-
-    <!-- Register password -->
-    <div class="login_containerregister">
-        <label><b>Wachtwoord</b></label>
-        <input type="password"
-               placeholder="Voer uw wachtwoord in"
-               name="password"
-               value="<?php echo $password ?>"
-               id="password"
-               >
-        <span class="error">* <?php echo $passwordErr;?></span>
-    </div>
-
-    <ul>
-      <li>Minstens 8 karakters</li>
-    </ul>
-
-    <!-- Repeat password -->
-    <div class="login_containerregister">
-        <label><b>Herhaal wachtwoord</b></label>
-        <input type="password"
-               placeholder="Herhaal wachtwoord"
-               name="confirmpassword"
-               value="<?php echo $confirmpassword ?>"
-               id="confirmpassword"
-               title="Herhaal wachtwoord"
-              >
-        <span class="error">* <?php echo $confirmpasswordErr;?></span>
-    </div>
-
-    <!-- Register location -->
-    <div class="login_containerregister">
-        <label><b>Woonplaats</b></label>
-        <input type="text"
-               placeholder="Voer uw woonplaats in"
-               name="location"
-               value="<?php echo $location ?>"
-               pattern="[A-Za-z]{1,}"
-               title="Mag alleen letters bevatten">
-        <span class="error">* <?php echo $locationErr;?></span>
-    </div>
-
-    <!-- Register email -->
-    <div class="login_containerregister">
-        <label><b>Email</b></label>
-        <input type="email"
-               placeholder="Voer uw email in"
-               name="email"
-               value="<?php echo $email ?>"
-               id="email"
-               title="Voer een geldige email in">
-        <span class="error">* <?php echo $emailErr;?></span>
-    </div>
-
-    <!-- Button for registering -->
-    <div class="login_containerregister">
-        <button type="submit"
-               value="Registreer uw account"
-               name="Submit"
-               id="frm1_submit">
-        Registreer uw account
-        </button>
-    </div>
-</form>
-
-<!-- Button for going back to login screen -->
-<div class="login_containerlogin">
-    <a href="https://myhyvesbookplus.nl/~joey/public/login.php" class="button">Login met een account</a>
 </div>

website/views/settings-view.php

@@ -6,9 +6,9 @@ $settings = getSettings();
     <div class="settings">
         <?php
         if ($_SERVER["REQUEST_METHOD"] == "POST") {
-            echo "<div class='platform settings-message ${result["type"]}'>
-            ${result["message"]}
-        </div>";
+            echo "<div class='platform settings-message ". $result->getClass()."'>".
+            $result->getMessage().
+        "</div>";
         }
         ?>
         <form class="settings-profile platform" method="post">