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

update relative links and other things

Browse Source
This commit is contained in:
Andreas
2019-09-23 12:30:13 +02:00
parent 72319118a4
commit fbffa866f1
29 changed files with 103 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
dev_mvc/controller/MVCController.php
View File

@@ -12,28 +12,28 @@ class MVCController{
self::$mvcController = $this;
//prepare current view and view model
if(isset($_GET['p']) && $_GET['p'] != ''){
$this->view = "./view/webcontent/content_".$_GET['p'].".php";
$this->viewmodel = "./viewmodel/viewmodel_".$_GET['p'].".php";
$this->view = ROOT_DIR."./view/webcontent/content_".$_GET['p'].".php";
$this->viewmodel = ROOT_DIR."./viewmodel/viewmodel_".$_GET['p'].".php";
}
else{
$this->view = "./view/webcontent/content_home.php";
$this->viewmodel = "./viewmodel/viewmodel_home.php";
$this->view = ROOT_DIR."./view/webcontent/content_home.php";
$this->viewmodel = ROOT_DIR."./viewmodel/viewmodel_home.php";
}
//prepare current action model
if(isset($_POST['action'])){
$this->model = "./model/actions/model_".$_POST['action'].".php";
$this->model = ROOT_DIR."./model/actions/model_".$_POST['action'].".php";
}
else if(isset($_GET['action'])){
$this->model = "./model/actions/model_".$_GET['action'].".php";
$this->model = ROOT_DIR."./model/actions/model_".$_GET['action'].".php";
}
else{
$this->model = "./model/actions/model_empty.php";
$this->model = ROOT_DIR."./model/actions/model_empty.php";
}
if(isset($_POST['testaction'])){
$this->testaction = "./model/testactions/TA_".$_POST['testaction'].".php";
$this->testaction = ROOT_DIR."./model/testactions/TA_".$_POST['testaction'].".php";
}
@@ -44,8 +44,8 @@ class MVCController{
}
function overrideView($view_target):void
{
$this->view = "./view/webcontent/content_".$view_target.".php";
$this->viewmodel = "./viewmodel/viewmodel_".$view_target.".php";
$this->view = ROOT_DIR."./view/webcontent/content_".$view_target.".php";
$this->viewmodel = ROOT_DIR."./viewmodel/viewmodel_".$view_target.".php";
$this->viewOverridden = true;
}
function executeAction():void
@@ -102,7 +102,7 @@ class MVCController{
include_once($this->view);
}
else{
include_once("./view/webcontent/content_404.php");
include_once(ROOT_DIR."./view/webcontent/content_404.php");
echo("view: ".$this->view." not found.");
}
}

2
dev_mvc/controller/UserSession.php
View File

@@ -1,5 +1,5 @@
<?php
require_once('./controller/db/Database.php');
require_once(ROOT_DIR.'./controller/db/Database.php');
Class UserSession{
public $uid = -1;
public $token = "undefined";

2
dev_mvc/controller/db/DBBoard.php
View File

@@ -1,5 +1,5 @@
<?php
require_once './controller/db/Database.php';
require_once ROOT_DIR.'./controller/db/Database.php';
class DBBoard extends Database{
static function getBoards():array
{

2
dev_mvc/controller/db/DBReply.php
View File

@@ -1,5 +1,5 @@
<?php
require_once './controller/db/Database.php';
require_once ROOT_DIR.'./controller/db/Database.php';
class DBReply extends Database{
static function createReply($uid, $threadID, $content){

5
dev_mvc/controller/db/DBThread.php
View File

@@ -1,12 +1,13 @@
<?php
require_once './model/forum/Thread.php';
require_once ROOT_DIR.'./model/forum/Thread.php';
class DBThread extends Database {
static function getThreadByID($id){
$con = self::connectToDB();
$query = $con->prepare("SELECT * FROM thread WHERE ID = :id");
$query->bindParam(":id", $id);
$query->execute();
return $query->fetch(PDO::FETCH_BOTH);
$result = $query->fetch(PDO::FETCH_BOTH);
return new Thread($result['ID'], $result['users_ID'], $result['board_ID'], $result['title'], $result['text'], $result['date_created']);
}
static function getThreadsByBoard($boardID){
$con = self::connectToDB();

19
dev_mvc/controller/db/DBUser.php
View File

@@ -1,5 +1,5 @@
<?php
require_once('./model/forum/User.php');
require_once(ROOT_DIR.'./model/forum/User.php');
class DBUser extends Database
{
static function getUserByUID($uid){
@@ -11,6 +11,23 @@ class DBUser extends Database
$user = new User($result['ID'], $result['username'], $result['email'], $result['password'], $result['reg_date'], $result['login_date'], $result['reg_ip'], $result['permissions'], $result['active']);
return $user;
}
static function getUserByEmail($email){
$con = self::connectToDB();
$query = $con->prepare("SELECT * FROM users WHERE email = :email");
$query->bindParam(":email", $email);
$query->execute();
$result = $query->fetch(PDO::FETCH_BOTH);
$user = new User($result['ID'], $result['username'], $result['email'], $result['password'], $result['reg_date'], $result['login_date'], $result['reg_ip'], $result['permissions'], $result['active']);
if($query->rowCount() == 1){
//Email adres is niet in gebruik, return false
return $user;
}
else{
//Email is al in gebruik of komt meer dan een keer voor. Beide gevallen zijn een probleem dus return true.
trigger_error("Multiple users for email $email returned by DB, value should be unique", E_USER_ERROR);
}
}
//Controleert of het email adres al in de database voorkomt. Returnt true indien wel.