Merge branch 'marijn-settings' into 'master'

Settings work with sql, session is hardcoded to 2 glob db See merge request !53
2017-01-17 16:50:19 +01:00
parent 0966b3528e 176851b486
commit 683fec805c
6 changed files with 125 additions and 29 deletions
--- a/website/public/settings.php
+++ b/website/public/settings.php
@@ -1,7 +1,12 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <?php include("../views/head.php"); ?>
+    <?php
+    include("../views/head.php");
+    $_SESSION["userID"] = 2;
+    include_once("../queries/connect.php");
+    include_once("../queries/settings.php");
+    ?>
    <style>
        @import url("styles/settings.css");
    </style>
@@ -12,13 +17,20 @@
 * This view adds the main layout over the screen.
 * Header and menu.
 */
+
 include("../views/main.php");

+if ($_SERVER["REQUEST_METHOD"] == "POST") {
+    updateSettings();
+}?>
+
+<?php
 /* Add your view files here. */
 include("../views/settings-view.php");

 /* This adds the footer. */
 include("../views/footer.php");
+
 ?>
 </body>
 </html>
--- a/website/public/styles/settings.css
+++ b/website/public/styles/settings.css
@@ -21,6 +21,10 @@
    text-align: right;
 }

+.settings-password label, .settings-email label {
+    text-align: left;
+}
+
 /* All the fields for typing things. */
 .settings input[type="password"],
 .settings input[type="text"],