From 9426f4d6acfaa759254944587197e0e4e04bc5b1 Mon Sep 17 00:00:00 2001
From: Hendrik <hendrik.huang@student.uva.nl>
Date: Thu, 2 Feb 2017 15:00:01 +0100
Subject: [PATCH 1/3] add name field check in settings

---
 website/public/settings.php  | 2 +-
 website/queries/settings.php | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/website/public/settings.php b/website/public/settings.php
index e40f042..9247d26 100644
--- a/website/public/settings.php
+++ b/website/public/settings.php
@@ -18,7 +18,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
     try {
         switch ($_POST["form"]) {
             case "profile":
-                updateSettings();
+                checkUpdateSettings();
                 break;
             case "password":
                 changePassword();
diff --git a/website/queries/settings.php b/website/queries/settings.php
index dfd65a0..9b17d17 100644
--- a/website/queries/settings.php
+++ b/website/queries/settings.php
@@ -50,6 +50,15 @@ function getPasswordHash() {
     return $stmt->fetch();
 }
 
+function checkUpdateSettings() {
+    if (empty(test_input($_POST['fname'])) || empty(test_input($_POST['lname']))) {
+        throw new AngryAlert("Geen voornaam of achternaam.");
+        return;
+    }
+
+    updateSettings();
+}
+
 /**
  * Changes the setting from post.
  * @throws HappyAlert

From e60578dc43ed51810e6c54bc0e8105d14a53db38 Mon Sep 17 00:00:00 2001
From: Hendrik <hendrik.huang@student.uva.nl>
Date: Thu, 2 Feb 2017 15:11:41 +0100
Subject: [PATCH 2/3] add unvalidated option and fixed text

---
 website/views/adminpanel-grouptable.php | 10 +++++-----
 website/views/adminpanel-table.php      |  3 ++-
 website/views/adminpanel.php            | 15 ++++++++-------
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/website/views/adminpanel-grouptable.php b/website/views/adminpanel-grouptable.php
index 9d2c8e8..2449b3d 100644
--- a/website/views/adminpanel-grouptable.php
+++ b/website/views/adminpanel-grouptable.php
@@ -1,8 +1,8 @@
 <tr>
     <th><input class="table-checkbox" type="checkbox" id="checkall" name="checkall" onchange="checkAll(this)"></th>
-    <th class="table-username">Gebruikersnaam</th>
+    <th class="table-username">Groepsnaam</th>
     <th class="table-status">Status</th>
-    <th class="table-comment">Aantekening</th>
+    <th class="table-comment">Beschrijving</th>
     <th class="table-action">Actie</th>
 </tr>
 
@@ -33,9 +33,9 @@ while ($group = $q->fetch(PDO::FETCH_ASSOC)) {
                 <form class='admin-groupaction'
                       onsubmit=\"adminUpdate(this);  return false;\">
                     <select class='action' name='actions'>
-                        <option value='hidden'>Hidden</option>
-                        <option value='public'>Public</option>
-                        <option value='membersonly'>Members</option>
+                        <option value='hidden'>Verborgen</option>
+                        <option value='public'>Publiek</option>
+                        <option value='membersonly'>Alleen Leden</option>
                     </select>
                     <input type='hidden' name='groupID' value='$groupID'>
                     <input type='submit' value='Confirm'>
diff --git a/website/views/adminpanel-table.php b/website/views/adminpanel-table.php
index aa790e6..f7bc966 100644
--- a/website/views/adminpanel-table.php
+++ b/website/views/adminpanel-table.php
@@ -55,7 +55,8 @@ while($user = $q->fetch(PDO::FETCH_ASSOC)) {
                               OR $user['role'] == 'owner'))) {
                             echo "<option value='frozen'>Bevries</option>
                                   <option value='banned'>Ban</option>
-                                  <option value='user'>Activeer</option>";
+                                  <option value='user'>Activeer</option>
+                                  <option value='unconfirmed'>Ongevalideerd</option>";
 
                             if ($userinfo == 'owner') {
                                 echo "<option value='admin'>Admin</option>
diff --git a/website/views/adminpanel.php b/website/views/adminpanel.php
index a4da648..2c0bec2 100644
--- a/website/views/adminpanel.php
+++ b/website/views/adminpanel.php
@@ -67,13 +67,13 @@ if (isset($_GET["groupstatus"])) {
                            id="frozen"
                            value="frozen"
                         <?php if (in_array("frozen", $status)) echo "checked";?>>
-                    <label for="frozen">Gefrozen</label><br>
+                    <label for="frozen">Bevroren</label><br>
                     <input type="checkbox"
                            name="status[]"
                            id="banned"
                            value="banned"
                         <?php if (in_array("banned", $status)) echo "checked";?>>
-                    <label for="banned">Gebant</label><br>
+                    <label for="banned">Verbannen</label><br>
                     <input type="checkbox"
                            name="status[]"
                            id="admin"
@@ -91,7 +91,7 @@ if (isset($_GET["groupstatus"])) {
                            id="owner"
                            value="owner"
                         <?php if (in_array("owner", $status)) echo "checked";?>>
-                    <label for="owner">Owner</label>
+                    <label for="owner">Eigenaar</label>
                 </div>
 
                 <div id="admin-groupfilter">
@@ -122,6 +122,7 @@ if (isset($_GET["groupstatus"])) {
                     <button type="submit" name="batchactions" id="freeze" value="frozen">Bevries</button>
                     <button type="submit" name="batchactions" id="ban" value="banned">Ban</button>
                     <button type="submit" name="batchactions" id="restore" value="user">Activeer</button>
+                    <button type="submit" name="batchactions" id="unconfirm" value="unconfirmed">Maak Ongevalideerd</button>
                     <?php
                     if ($userinfo == 'owner') {
                         echo "<button type=\"submit\" 
@@ -131,7 +132,7 @@ if (isset($_GET["groupstatus"])) {
                               <button type=\"submit\" 
                                       name=\"batchactions\" 
                                       id=\"owner\" 
-                                      value=\"owner\">Maak Owner</button>";
+                                      value=\"owner\">Maak Eigenaar</button>";
                     }
                     ?>
                 </form>
@@ -139,9 +140,9 @@ if (isset($_GET["groupstatus"])) {
                       onsubmit="adminUpdate(this);  return false;">
 
                     <input type="hidden" name="groupbatchactions" id="groupbatchinput">
-                    <button type="submit" name="batchactions" id="hide" value="hidden">Hide</button>
-                    <button type="submit" name="batchactions" id="ban" value="public">Public</button>
-                    <button type="submit" name="batchactions" id="members" value="membersonly">Members</button>
+                    <button type="submit" name="batchactions" id="hide" value="hidden">Verborgen</button>
+                    <button type="submit" name="batchactions" id="ban" value="public">Publiek</button>
+                    <button type="submit" name="batchactions" id="members" value="membersonly">Alleen Leden</button>
                 </form>
             </div>
 

From cfa7c870f08417b80d5d7c285207deb0e94db228 Mon Sep 17 00:00:00 2001
From: Hendrik <hendrik.huang@student.uva.nl>
Date: Thu, 2 Feb 2017 15:13:35 +0100
Subject: [PATCH 3/3] fix profile error color

---
 website/public/styles/profile.css | 4 ++++
 website/views/profile.php         | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/website/public/styles/profile.css b/website/public/styles/profile.css
index dbb3d24..46906d2 100644
--- a/website/public/styles/profile.css
+++ b/website/public/styles/profile.css
@@ -5,6 +5,10 @@
     background-color: firebrick;
 }
 
+.alerttext {
+    color: white;
+}
+
 .user-box {
     text-align: center;
 }
diff --git a/website/views/profile.php b/website/views/profile.php
index 7348642..4139099 100644
--- a/website/views/profile.php
+++ b/website/views/profile.php
@@ -1,6 +1,6 @@
 <div class="content">
     <div class='platform alertbox' id="alertbox">
-        <span id="alerttext"></span>
+        <span class="alerttext" id="alerttext"></span>
     </div>
 
     <div class="user-box">