Merge branch 'master' into hendrik-post

2017-02-02 13:43:31 +01:00
parent d4d16661df ab5f243281
commit 6ed19d9060
29 changed files with 206 additions and 62 deletions
--- a/website/views/profile.php
+++ b/website/views/profile.php
@@ -33,7 +33,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>