Merge branch 'master' into kevin-prototype

2017-02-02 13:15:29 +01:00
parent 9d675dd897 ab5f243281
commit 328ce69144
36 changed files with 408 additions and 125 deletions
--- a/website/views/profile.php
+++ b/website/views/profile.php
@@ -31,7 +31,12 @@
        <h3>Informatie</h3>
        <p>
            <ul>
+                <?php if ($user["showBday"]) { ?>
                <li>Leeftijd: <?= getAge($user["birthdate"]) ?> jaar</li>
+                <?php } ?>
+                <?php if ($user["showEmail"]) { ?>
+                    <li>Email: <?= $user["email"] ?></li>
+                <?php } ?>
                <li>Locatie: <?= $user["location"] ?></li>
                <li>Lid sinds: <?= nicetime($user["creationdate"]) ?></li>
            </ul>