changed files to more updated version

This commit is contained in:
2019-09-12 12:02:17 +02:00
parent 53794ac310
commit d50b864082
84 changed files with 1560 additions and 933 deletions

View File

@@ -0,0 +1,15 @@
<?php
require_once './controller/UserSession.php';
require_once('./controller/HUtils.php');
require_once './controller/db/DBReply.php';
require_once './model/forum/Reply.php';
//dit bestand bestaat grotendeels uit dummy code.
//Ik heb onvoldoende tijd gehad tijdens de afgelopen paar weken en het was extreem druk in de klas tijdens de les.
$uid = $_SESSION['usersession']->uid;
if(HUtils::issetPost(['thread', 'content']));
{
$reply = new Reply(-1, $_POST['thread'], $uid, $_POST['content']);
print_r($reply);
DBReply::createReply($reply->getUserid(), $reply->getThreadID(), $reply->getContent());
}
?>

View File

@@ -0,0 +1,14 @@
<?php
require_once './controller/UserSession.php';
require_once('./controller/HUtils.php');
require_once './controller/db/DBThread.php';
require_once './model/forum/Thread.php';
//dit bestand bestaat grotendeels uit dummy code.
//Ik heb onvoldoende tijd gehad tijdens de afgelopen paar weken en het was extreem druk in de klas tijdens de les.
$uid = $_SESSION['usersession']->uid;
if(HUtils::issetPost(['title', 'content', 'board']));
{
$thread = new Thread(-1, $uid, $_POST['board'], $_POST['title'], $_POST['content']);
DBThread::createThread($thread);
}
?>

View File

@@ -1,4 +0,0 @@
<?php
session_destroy();
session_start();
?>

View File

@@ -0,0 +1,36 @@
<?php
//Include classes
require_once("./controller/db/Database.php");
require_once("./controller/db/DBUser.php");
require_once("./controller/HUtils.php");
if(HUtils::issetPost(['email', 'pass', 'pass2', 'name'])){
$email = $_POST['email'];
$pass = $_POST['pass'];
$pass2 = $_POST['pass2'];
$name = $_POST['name'];
if($pass == $pass2){
//Check of email aanwezig is in de database
if(!DBUser::checkUsedEmail($email) && !DBUser::checkUsedUsername($name)){
$verificationKey = HUtils::generateRandomKey();
while(DBUser::doesUserActivationKeyExist($verificationKey)){
$verificationKey = HUtils::generateRandomKey();
}
//TO DO: Create verification key
DBUser::registerUser($email, $pass, $name);
$uid = DBUser::getUID($email, $pass);
DBUser::registerActivationKey($uid,$verificationKey);
$message = 'Please follow the link to verify your account: http://localhost/webforum_redux/hforumphp/dev_mvc/index.php?p=verify&key='.$verificationKey;
$headers = 'From: webmaster@example.com' . "\r\n" .
'Reply-To: webmaster@example.com' . "\r\n" .
'X-Mailer: PHP/' . phpversion();
mail($email, "Account Verification", $message, $headers);
}
}
else{
echo("REGISTRATION FAILED: PASSWORD VERIFICATION MISSMATCH");
}
}
else{
echo "POST UNSUCCESFUL: POST DATA INCOMPLETE OR NOT FOUND";
}
?>

View File

@@ -0,0 +1,3 @@
<?php
//Nothing to see here
?>

View File

@@ -0,0 +1,59 @@
<?php
$debuginfo = false;
require_once("./controller/UserSession.php");
require_once("./controller/db/Database.php");
require_once("./controller/db/DBUser.php");
require_once("./controller/HUtils.php");
$skipoverride = false;
if(!UserSession::isUserSignedIn()){
if(HUtils::issetPost(['email','password'])){
if(DBUser::isLoginValid($_POST['email'], $_POST['password'])){
//obtain UID
$uid = DBUser::getUID($_POST['email'], $_POST['password']);
if($uid != -1){
if(DBUser::isUserActive($uid)){
//obtain username
//$username = DBUser::getUsername($uid);
//gen unique session token
$token = UserSession::generateToken();
//regen if already in use
while(Database::isSessionTokenInUse($token)){
$token = UserSession::generateToken();
}
$a = new UserSession($uid, $token);
if($debuginfo){
echo $a->getSessionToken();
echo "<br>";
echo $a->uid;
echo "<br>";
echo $a->username;
}
//clean up expired sessions from ANY users
Database::deleteExpiredSessions();
Database::registerNewSession($a->uid, $a->token, $a->getFormattedExpiry());
//logged in, time to continue with other stuff
}
else{
MVCController::getMVCController()->overrideView("account_inactive");
$skipoverride = true;
echo('ree');
}
}
else{
echo "uid returned -1 from db interface";
}
}
else{
echo("login invalid");
}
}
}
else{
//we're done, don't even need to log in, session already active
}
if(!UserSession::isUserSignedIn() &&!$skipoverride){
MVCController::getMVCController()->overrideView("error_login");
}
?>

View File

@@ -1,4 +1,6 @@
<?php
require_once('./controller/db/Database.php');
$_SESSION['usersession'] = null;
Database::invalidateSession($_COOKIE['usersession']);
session_destroy();
?>

View File

@@ -1,12 +0,0 @@
<?php
include_once("./controller/Database.php");
$key = '';
if(isset($_GET['key'])){
$key = $_GET['key'];
}
if(Database::doesUserActivationKeyExist($key)){
Database::activateUser($key);
}
$completed = true;
?>