MyHyvesBookPlus/WebDB
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Marijn button #99

Merged
11166932 merged 152 commits from marijn-button into master 2017-01-23 13:25:08 +01:00
Conversation 2 Commits 152 Files Changed 52 +14 -14
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e17a55e82d - Show all commits

8
website/public/js/registerAndLogin.js Normal file
View File

@@ -0,0 +1,8 @@
function checkLoggedIn() {
if (confirm("You are already logged in!\nDo you want to logout?\nPress ok to logout.") == true) {
window.location.href = "logout.php";
} else {
window.history.back();
}
document.getElementById("demo").innerHTML = x;
}

13
website/public/login.php
View File

@@ -4,20 +4,9 @@
include("../views/login_head.php"); include("../views/login_head.php");
require_once("../queries/connect.php"); require_once("../queries/connect.php");
include_once("../queries/login.php"); include_once("../queries/login.php");
include_once("../queries/checkInput.php") include_once("../queries/checkInput.php");
?> ?>
<body> <body>
<script>
function checkLoggedIn() {
if (confirm("You are already logged in!\nDo you want to logout?\nPress ok to logout.") == true) {
window.location.href = "logout.php";
} else {
window.history.back();
}
document.getElementById("demo").innerHTML = x;
}
</script>
<?php <?php
session_start(); session_start();

6
website/public/register.php
View File

@@ -9,7 +9,9 @@
<body> <body>
<?php <?php
session_start(); session_start();
if(isset($_SESSION["userID"])){
header("location: profile.php");
}
// define variables and set to empty values // define variables and set to empty values
$name = $surname = $bday = $username = $password = $confirmpassword = $location = $housenumber = $email = ""; $name = $surname = $bday = $username = $password = $confirmpassword = $location = $housenumber = $email = "";
$genericErr = $nameErr = $surnameErr = $bdayErr = $usernameErr = $passwordErr = $confirmpasswordErr = $locationErr = $housenumberErr = $emailErr = ""; $genericErr = $nameErr = $surnameErr = $bdayErr = $usernameErr = $passwordErr = $confirmpasswordErr = $locationErr = $housenumberErr = $emailErr = "";
@@ -27,7 +29,7 @@
} else { } else {
$bday = test_input($_POST["bday"]); $bday = test_input($_POST["bday"]);
} }
g
checkInputChoice("username", "username"); checkInputChoice("username", "username");
checkInputChoice("password", "longerEight"); checkInputChoice("password", "longerEight");
checkInputChoice("confirmpassword", ""); checkInputChoice("confirmpassword", "");

1
website/views/login_head.php
View File

@@ -8,4 +8,5 @@
type="text/css" type="text/css"
href="styles/index.css"> href="styles/index.css">
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script> <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
<script src="registerAndLogin.js"></script>
</head> </head>