From ce53b6e9e4e592b55a4f1918862e01ba50bbc4c5 Mon Sep 17 00:00:00 2001
From: Marijn Jansen <marijn@jansen.onl>
Date: Mon, 30 Jan 2017 22:42:47 +0100
Subject: [PATCH] Checkbox for showBday and showEmail

---
 website/queries/settings.php    |  7 ++--
 website/views/settings-view.php | 58 +++++++++++++--------------------
 2 files changed, 26 insertions(+), 39 deletions(-)

diff --git a/website/queries/settings.php b/website/queries/settings.php
index 6c52fc4..bdc9d38 100644
--- a/website/queries/settings.php
+++ b/website/queries/settings.php
@@ -110,7 +110,8 @@ function updateSettings() {
     WHERE
       `userID` = :userID
     ");
-    $bday = new DateTime(test_input($_POST["year"] . $_POST["month"] . $_POST["day"]));
+    $bday = new DateTime();
+    $bday->setDate(test_input($_POST["year"]), test_input($_POST["month"]), test_input($_POST["day"]));
     checkBday($bday);
 
     $stmt->bindValue(":fname", test_input($_POST["fname"]));
@@ -118,8 +119,8 @@ function updateSettings() {
     $stmt->bindValue(":location", test_input($_POST["location"]));
     $stmt->bindValue(":bday", $bday->format("Ymd"));
     $stmt->bindValue(":bio", test_input($_POST["bio"]));
-    $stmt->bindValue(":showEmail", test_input($_POST["showEmail"]));
-    $stmt->bindValue(":showBday",test_input($_POST["showBday"]));
+    $stmt->bindValue(":showEmail", (array_key_exists("showEmail", $_POST) ? "1" : "0"));
+    $stmt->bindValue(":showBday", (array_key_exists("showBday", $_POST) ? "1" : "0"));
 
     $stmt->bindValue(":userID", $_SESSION["userID"]);
     $stmt->execute();
diff --git a/website/views/settings-view.php b/website/views/settings-view.php
index 1079c91..6271a45 100644
--- a/website/views/settings-view.php
+++ b/website/views/settings-view.php
@@ -45,30 +45,30 @@ $settings = getSettings();
                 <li>
                     <label for="bday">Geboortedatum</label>
                     <?php $currentbday = new DateTime($settings["birthdate"]);?>
-                    <select name='day'>";
-                        <?php for ($day = 1; $day < 32; $day++):
-                        $day = sprintf("%02d", $day); ?>
+                    <select name='day' id="bday">
+                        <?php for ($day = 1; $day <= 31; $day++):?>
                         <option value='<?=$day?>'
                                 <?= ($day == $currentbday->format("d")) ? "selected" : ""?>
                         ><?=$day?></option>";
 
                         <?php endfor; ?>
                     </select>
-                    <select name='month'>
-                        <option value='01' <?=('01' == $currentbday->format("m")) ? "selected" : ""?>>januari</option>
-                        <option value='02' <?=('02' == $currentbday->format("m")) ? "selected" : ""?>>februari</option>
-                        <option value='03' <?=('03' == $currentbday->format("m")) ? "selected" : ""?>>maart</option>
-                        <option value='04' <?=('04' == $currentbday->format("m")) ? "selected" : ""?>>april</option>
-                        <option value='05' <?=('05' == $currentbday->format("m")) ? "selected" : ""?>>mei</option>
-                        <option value='06' <?=('06' == $currentbday->format("m")) ? "selected" : ""?>>juni</option>
-                        <option value='07' <?=('07' == $currentbday->format("m")) ? "selected" : ""?>>juli</option>
-                        <option value='08' <?=('08' == $currentbday->format("m")) ? "selected" : ""?>>augustus</option>
-                        <option value='09' <?=('09' == $currentbday->format("m")) ? "selected" : ""?>>september</option>
-                        <option value='10' <?=('10' == $currentbday->format("m")) ? "selected" : ""?>>oktober</option>
-                        <option value='11' <?=('11' == $currentbday->format("m")) ? "selected" : ""?>>november</option>
-                        <option value='12' <?=('12' == $currentbday->format("m")) ? "selected" : ""?>>december</option>
+                    <select name='month' id="bday">
+                        <?php
+                        $months = array ("januari", "februari", "maart", "april", "mei", "juni", "juli", "augustus",
+                            "september", "oktober", "november", "december");
+                        for ($month = 1; $month <= 12; $month++):
+                        ?>
+                            <option value='<?=$month?>'
+                                <?=($month == $currentbday->format("m")) ? "selected" : ""?>
+                            >
+                                <?= $months[$month - 1]?>
+                            </option>
+                        <?php endfor;?>
                     </select>
-                    <select name='year'>";
+
+
+                    <select name='year' id="bday">
                         <?php
                         $now = (new DateTime)->format("Y");
                         for ($year = $now; $year >= 1900; $year--): ?>
@@ -80,33 +80,19 @@ $settings = getSettings();
                 </li>
                 <li>
                     <label for="showBday">Toon leeftijd</label>
-                    <input type="radio"
+                    <input type="checkbox"
                            name="showBday"
                            id="showBday"
-                           value="1"
                            <?= ($settings["showBday"] ? "checked" : "")?>
-                    > Ja
-                    <input type="radio"
-                           name="showBday"
-                           id="showBday"
-                           value="0"
-                           <?= ($settings["showBday"] ? "" : "checked")?>
-                           > Nee
+                    >
                 </li>
                 <li>
                     <label for="showEmail">Toon Email</label>
-                    <input type="radio"
+                    <input type="checkbox"
                            name="showEmail"
                            id="showEmail"
-                           value="1"
                            <?= ($settings["showEmail"] ? "checked" : "")?>
-                    > Ja
-                    <input type="radio"
-                           name="showEmail"
-                           id="showEmail"
-                           value="0"
-                        <?= ($settings["showEmail"] ? "" : "checked")?>
-                    > Nee
+                    >
                 </li>
                 <li>
                     <label for="bio">Bio</label>
@@ -220,4 +206,4 @@ $settings = getSettings();
             </ul>
         </form>
     </div>
-</div>
+</div>
\ No newline at end of file