andreas/hForumPHP
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

updated a whole bunch of stuff

Browse Source
This commit is contained in:
Hion-V 2019-05-24 20:18:37 +02:00
parent 4a050eda84
commit ec5a13ccd1
9 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dev_mvc/controller/ActionHandler.php
View File

@ -3,10 +3,13 @@ class ActionHandler
{
static function doAction(){
$action = '';
if(isset($_GET['action'])){
if(!$action == ''){
include_once("./model/actions/model_".$action."php");
}
$action = $_GET['action'];
}
if(!$action == ''){
include_once("./model/actions/model_".$action.".php");
}
}
}

11
dev_mvc/controller/UserSession.php
View File

@ -39,7 +39,7 @@ Class UserSession{
public static function isSessionValid(){
if(isset($_SESSION['usersession'])){
if(!Database::isSessionValid($_SESSION['usersession']->token, $_SESSION['usersession']->uid)){
include_once("./model/model_attempt_logout.php");
echo('session invalid in db');
return false;
}
if(!UserSession::isSessionExpired($_SESSION['usersession'])){
@ -86,11 +86,20 @@ Class UserSession{
if(Database::isSessionValid(UserSession::getSession()->token, UserSession::getSession()->uid)){
return true;
}
}
else{
return false;
}
}
else{
return false;
}
}
public static function updateSigninState(){
if(!UserSession::isUserSignedIn()){
}
}
}
?>

4
dev_mvc/controller/Database.php → dev_mvc/controller/db/Database.php
View File

@ -121,7 +121,7 @@ Class Database{
}
else{
//something went wrong, return -1
return "dbfetcherror";
return "db_user_invalid";
}
}
@ -235,6 +235,7 @@ Class Database{
$query->execute();
//Check hoeveelheid teruggestuurde rijen
if($query->rowCount() == 1){
echo('session valid in db<br>');
return true;
}
else{
@ -242,6 +243,7 @@ Class Database{
}
}
static function invalidateSession($token){
echo("hek");
//Init db connection
$con = Database::connectToDB();
//Bereid query voor

5
dev_mvc/index.php
View File

@ -15,10 +15,11 @@ include_once("./controller/Database.php");
include_once("./controller/UserSession.php");
include_once("./controller/HUtils.php");
include_once("./controller/ActionHandler.php");
//Start session.
session_start();
//Execute Actie zo nodig.
ActionHandler::doAction();
UserSession::UpdateSigninState();
//Store de geselecteerde pagina in variabele $page

7
dev_mvc/model/actions/model_signout.php Normal file
View File

@ -0,0 +1,7 @@
<?php
include_once("./controller/UserSession.php");
if(UserSession::isSessionValid()){
Database::invalidateSession(UserSession::getSession()->token);
}
session_destroy();
?>

2
dev_mvc/model/model_do_register.php
View File

@ -18,7 +18,7 @@ if(HUtils::issetPost(['email', 'pass', 'pass2', 'name'])){
Database::registerUser($email, $pass, $name);
$uid = Database::getUID($email, $pass);
Database::registerActivationKey($uid,$verificationKey);
$message = 'Please follow the link to verify your account: http://localhost/webforum_redux/index.php?p=verify&key='.$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();

4
dev_mvc/view/pagecontent/content_header.php
View File

@ -4,4 +4,8 @@ if(UserSession::isUserSignedIn()){
}else{
include("./view/pagecontent/header/content_header_signedout.php");
}
if(!UserSession::isSessionValid()){
include_once("./model/actions/model_signout.php");
}
echo('content_header');
?>

2
dev_mvc/view/pagecontent/header/content_header_signedin.php
View File

@ -3,5 +3,5 @@ include_once("./controller/AssetHandler.php");
AssetHandler::printAsset("logo.png", true, 128);
?>
<nav>
<a href="?p=attempt_logout">log out</a> <a href="?p=">home</a> <a href="?p=create_topic">create thread</a> <a href="?p=destroy">simulate $_SESSION expiry</a>
<a href="?a=signout">log out</a> <a href="?p=">home</a> <a href="?p=create_topic">create thread</a> <a href="?p=destroy">simulate $_SESSION expiry</a>
</nav>