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

Hendrik search #104

Merged
11342374 merged 29 commits from hendrik-search into master 2017-01-24 10:21:20 +01:00
Conversation 2 Commits 29 Files Changed 26 +3 -3
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6ff70440e6 - Show all commits

2
website/public/js/registerAndLogin.js
View File

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

2
website/public/register.php
View File

@@ -29,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", "");

2
website/views/login_head.php
View File

@@ -7,6 +7,6 @@
<link rel="stylesheet" <link rel="stylesheet"
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="jqeury.js"></script>
<script src="registerAndLogin.js"></script> <script src="registerAndLogin.js"></script>
</head> </head>