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

Actionhandler geimplementeerd.

Browse Source
This commit is contained in:
Andreas Schaafsma 2019-05-17 16:33:24 +02:00
parent 89dcca3021
commit 4a050eda84
12 changed files with 105 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dev_mvc/controller/Database.php
View File

@ -140,7 +140,7 @@ Class Database{
static function doesUserActivationKeyExist($activationKey){
$con = Database::connectToDB();
$query = $con->prepare("SELECT * FROM email_activation_keys WHERE activationkey = :activationKey");
$query->bindParam(':activationKey', $activationKey, PDO::PARAM_STR, 256);
$query->bindParam(':activationKey', $activationKey, PDO::PARAM_STR, 256);
$query->execute();
if($query->rowCount() == 0){
//bestaat nog niet
@ -151,6 +151,16 @@ Class Database{
return true;
}
}
static function registerActivationKey($users_id, $activationKey){
$con = Database::connectToDB();
$query = $con->prepare("INSERT INTO email_activation_keys (users_id, activationkey) VALUES (:users_id, :activationkey)");
$query->bindParam(':users_id', $users_id);
$query->bindParam(':activationkey', $activationKey);
$query->execute();
}
//Activeer gebruiker en verwijder activation key uit de activation key tabel
static function activateUser($activationKey){
$con = Database::connectToDb();

10
dev_mvc/controller/HUtils.php
View File

@ -21,7 +21,6 @@ Class HUtils{
return true;
}
static function sqlDateToPhpDate($date){
return new DateTime($date);
}
static function getPage($fetchmethod){
@ -42,5 +41,14 @@ Class HUtils{
static function getSiteTitle(){
return "hPHPForum";
}
static function generateRandomKey(){
$token = "";
$chars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
$verificationKey = "";
for ($i=0; $i < 32 ; $i++) {
$token .= $chars[rand(0, strlen($chars) - 1)];
}
return $token;
}
}
?>

13
dev_mvc/index.php
View File

@ -2,19 +2,28 @@
/*Code door Andreas Schaafsma ITA4-1b
*
* Notities voor bij nakijken
* $_POST[] is gebruikt binnen de model_attempt_login.php en model_attempt_register.php bestanden
* Model wordt opgevraagd via POST (of via GET doormiddel van de ActionHandler controller.)
* MAIL is werkend en stuurt een verificatiecode op zie: model_do_register
* Activeringscode wordt correct opgeslagen in de database maar de pagina voor activeren is nog niet geimplementeerd.
* Alle regeling van de database connectie zit in ./controller/Database.php doormiddel van static class members om alles makkelijk te groeperen
* Er is ook een rudimentair login token systeem om ervoor te zorgen dat gebruikers ingelogd blijven zelfs als de $_SESSION[] vervalt.
* Deze login status verdwijnt weer na ongeveer een uurtje
* Deze login status verdwijnt weer na ongeveer een uurtje.
*
*/
//include class lib.
include_once("./controller/Database.php");
include_once("./controller/UserSession.php");
include_once("./controller/HUtils.php");
include_once("./controller/ActionHandler.php");
session_start();
ActionHandler::doAction();
//Store de geselecteerde pagina in variabele $page
$page=HUtils::getPage(HUtils::FETCHPOST);
//Model side operaties die afgerond moeten worden voor de paginacontent in wordt geladen
$path = "./model/model_".$page.".php";
if($page != ""){

12
dev_mvc/model/actions/model_verify.php Normal file
View File

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

11
dev_mvc/model/model_create_topic.php Normal file
View File

@ -0,0 +1,11 @@
<?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.
if(HUtils::issetPost(['topic_title', 'topic_content', 'topic_author']));
{
$topic_title = $_GET['topic_title'];
$topic_content = $_GET['topic_content'];
$topic_author = $_GET['topic_author'];
Database::createThread($topic_title, $topic_content, $topic_author);
}
?>

22
dev_mvc/model/model_do_register.php
View File

@ -3,10 +3,26 @@
include_once("./controller/Database.php");
include_once("./controller/HUtils.php");
if(HUtils::issetPost(['email', 'pass', 'pass2', 'name'])){
if($_POST['pass'] == $_POST['pass2']){
$email = $_POST['email'];
$pass = $_POST['pass'];
$pass2 = $_POST['pass2'];
$name = $_POST['name'];
if($pass == $pass2){
//Check of email aanwezig is in de database
if(!Database::checkUsedEmail($_POST['email']) && !Database::checkUsedUsername($_POST['name'])){
Database::registerUser($_POST['email'], $_POST['pass'], $_POST['name']);
if(!Database::checkUsedEmail($email) && !Database::checkUsedUsername($name)){
$verificationKey = HUtils::generateRandomKey();
while(Database::doesUserActivationKeyExist($verificationKey)){
$verificationKey = HUtils::generateRandomKey();
}
//TO DO: Create verification key
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;
$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{

2
dev_mvc/view/pagecontent/content_createthread.php → dev_mvc/view/pagecontent/content_create_topic.php
View File

@ -1,6 +1,4 @@
<?php
?>

2
dev_mvc/view/pagecontent/content_login.php
View File

@ -1,5 +1,5 @@
<article>
<form action="" method="post">
<form action="?p=showtopics" method="post">
E-mail: <input type="text" name="email"><br>
Password: <input type="password" name="password"><br>
<input type="hidden" name="p" value="do_login" />

2
dev_mvc/view/pagecontent/content_showboards.php
View File

@ -1,10 +1,8 @@
<?php
if(UserSession::isUserSignedIn()){
echo "LIST OF BOARDS LMAO";
}
else{
echo "You must be signed in to view this page.";
}
?>

14
dev_mvc/view/pagecontent/content_showtopics.php Normal file
View File

@ -0,0 +1,14 @@
<h1>TOPICS:</h1>
<?php
//Gedeeltelijk dummy code omdat de database nog niet zo ver is. Verder al wel functioneel. Gebrukersnamen worden ingeladen.
if(UserSession::isUserSignedIn()){
//$topics = Database::GetTopicList();
$topics = [ [0, "Hoeveel ICTers heb je nodig om een forum te bouwen?", 2],
[1, "LOREM IPSUM DOLOR", 3]];
for($i = 0; $i < sizeof($topics); $i++){
echo '<a href="?p=showthread&topic='.$i.'">'.$topics[$i][1].'</a> - Gestart door: '.Database::getUsername($topics[$i][2]);
echo '<br>';
}
}
?>

16
dev_mvc/view/pagecontent/content_verify.php Normal file
View File

@ -0,0 +1,16 @@
<?php
if(isset($completed)){
echo("account activated!");
}
else{
echo("account activation went wrong!
<br> Go here: <a href='?p=resend_email'>Resend email verification</a>
<br>
");
}
?>

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=destroy">simulate $_SESSION expiry</a>
<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>
</nav>