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

updated references

Browse Source
This commit is contained in:
Andreas 2019-09-23 12:37:09 +02:00
parent f20288ef71
commit b5f56b7c53
23 changed files with 67 additions and 67 deletions
Show Stats 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 = ROOT_DIR."./view/webcontent/content_".$_GET['p'].".php";
$this->viewmodel = ROOT_DIR."./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 = ROOT_DIR."./view/webcontent/content_home.php";
$this->viewmodel = ROOT_DIR."./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 = ROOT_DIR."./model/actions/model_".$_POST['action'].".php";
$this->model = ROOT_DIR."/model/actions/model_".$_POST['action'].".php";
}
else if(isset($_GET['action'])){
$this->model = ROOT_DIR."./model/actions/model_".$_GET['action'].".php";
$this->model = ROOT_DIR."/model/actions/model_".$_GET['action'].".php";
}
else{
$this->model = ROOT_DIR."./model/actions/model_empty.php";
$this->model = ROOT_DIR."/model/actions/model_empty.php";
}
if(isset($_POST['testaction'])){
$this->testaction = ROOT_DIR."./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 = ROOT_DIR."./view/webcontent/content_".$view_target.".php";
$this->viewmodel = ROOT_DIR."./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(ROOT_DIR."./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(ROOT_DIR.'./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 ROOT_DIR.'./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 ROOT_DIR.'./controller/db/Database.php';
require_once ROOT_DIR.'/controller/db/Database.php';
class DBReply extends Database{
static function createReply($uid, $threadID, $content){

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

@ -1,5 +1,5 @@
<?php
require_once ROOT_DIR.'./model/forum/Thread.php';
require_once ROOT_DIR.'/model/forum/Thread.php';
class DBThread extends Database {
static function getThreadByID($id){
$con = self::connectToDB();

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

@ -1,5 +1,5 @@
<?php
require_once(ROOT_DIR.'./model/forum/User.php');
require_once(ROOT_DIR.'/model/forum/User.php');
class DBUser extends Database
{
static function getUserByUID($uid){

8
dev_mvc/index.php
View File

@ -34,15 +34,15 @@ register_shutdown_function(function() {
http_response_code(500);
} */
});
require_once(ROOT_DIR.'./model/testactions/TestAction.php');
require_once(ROOT_DIR.'/model/testactions/TestAction.php');
//date_default_timezone_set('Europe/Amsterdam');
require_once(ROOT_DIR.'./controller/MVCController.php');
require_once(ROOT_DIR.'./controller/UserSession.php');
require_once(ROOT_DIR.'/controller/MVCController.php');
require_once(ROOT_DIR.'/controller/UserSession.php');
session_start();
$mvcController = new MVCController();
$mvcController->executeModel();
if(!isset($_POST['testaction'])){
include_once(ROOT_DIR."./view/content_pagetemplate.php");
include_once(ROOT_DIR."/view/content_pagetemplate.php");
}
//require_once('aaaadea');
//http_response_code(200);

8
dev_mvc/model/actions/model_create_reply.php
View File

@ -1,8 +1,8 @@
<?php
require_once ROOT_DIR.'./controller/UserSession.php';
require_once(ROOT_DIR.'./controller/HUtils.php');
require_once ROOT_DIR.'./controller/db/DBReply.php';
require_once ROOT_DIR.'./model/forum/Reply.php';
require_once ROOT_DIR.'/controller/UserSession.php';
require_once(ROOT_DIR.'/controller/HUtils.php');
require_once ROOT_DIR.'/controller/db/DBReply.php';
require_once ROOT_DIR.'/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;

8
dev_mvc/model/actions/model_create_thread.php
View File

@ -1,8 +1,8 @@
<?php
require_once ROOT_DIR.'./controller/UserSession.php';
require_once(ROOT_DIR.'./controller/HUtils.php');
require_once ROOT_DIR.'./controller/db/DBThread.php';
require_once ROOT_DIR.'./model/forum/Thread.php';
require_once ROOT_DIR.'/controller/UserSession.php';
require_once(ROOT_DIR.'/controller/HUtils.php');
require_once ROOT_DIR.'/controller/db/DBThread.php';
require_once ROOT_DIR.'/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;

6
dev_mvc/model/actions/model_do_register.php
View File

@ -1,8 +1,8 @@
<?php
//Include classes
require_once(ROOT_DIR."./controller/db/Database.php");
require_once(ROOT_DIR."./controller/db/DBUser.php");
require_once(ROOT_DIR."./controller/HUtils.php");
require_once(ROOT_DIR."/controller/db/Database.php");
require_once(ROOT_DIR."/controller/db/DBUser.php");
require_once(ROOT_DIR."/controller/HUtils.php");
if(HUtils::issetPost(['email', 'pass', 'pass2', 'name'])){
$email = $_POST['email'];
$pass = $_POST['pass'];

8
dev_mvc/model/actions/model_login.php
View File

@ -1,9 +1,9 @@
<?php
$debuginfo = false;
require_once(ROOT_DIR."./controller/UserSession.php");
require_once(ROOT_DIR."./controller/db/Database.php");
require_once(ROOT_DIR."./controller/db/DBUser.php");
require_once(ROOT_DIR."./controller/HUtils.php");
require_once(ROOT_DIR."/controller/UserSession.php");
require_once(ROOT_DIR."/controller/db/Database.php");
require_once(ROOT_DIR."/controller/db/DBUser.php");
require_once(ROOT_DIR."/controller/HUtils.php");
$skipoverride = false;
if(!UserSession::isUserSignedIn()){
if(HUtils::issetPost(['email','password'])){

2
dev_mvc/model/actions/model_signout.php
View File

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

4
dev_mvc/model/testactions/TA_TestDBUser.php
View File

@ -1,6 +1,6 @@
<?php
require_once(ROOT_DIR.'./controller/db/DBUser.php');
require_once(ROOT_DIR.'./model/forum/User.php');
require_once(ROOT_DIR.'/controller/db/DBUser.php');
require_once(ROOT_DIR.'/model/forum/User.php');
class TA_TestDBUser extends TestAction{
public function __construct()
{

4
dev_mvc/view/content_pagetemplate.php
View File

@ -1,5 +1,5 @@
<?php
require_once(ROOT_DIR."./controller/MVCController.php");
require_once(ROOT_DIR."/controller/MVCController.php");
require_once("index.php");
?>
<!DOCTYPE html>
@ -10,7 +10,7 @@ require_once("index.php");
<body>
<header class="row">
<?php
include_once(ROOT_DIR."./view/webcontent/content_header.php");
include_once(ROOT_DIR."/view/webcontent/content_header.php");
?>
</header>
<div class="main">

6
dev_mvc/view/webcontent/content_boards.php
View File

@ -1,7 +1,7 @@
<?php
require_once ROOT_DIR.'./model/forum/Thread.php';
require_once ROOT_DIR.'./model/forum/User.php';
require_once ROOT_DIR.'/model/forum/Thread.php';
require_once ROOT_DIR.'/model/forum/User.php';
foreach (MVCController::$viewData['boards'] as $board){
include './view/webcontent/modules/modules_boards/module_boardtable.php';
include '/view/webcontent/modules/modules_boards/module_boardtable.php';
}
?>

2
dev_mvc/view/webcontent/content_error_login.php
View File

@ -1,4 +1,4 @@
Incorrect Email or Password.
<?php
include_once(ROOT_DIR.'./view/webcontent/content_signin.php');
include_once(ROOT_DIR.'/view/webcontent/content_signin.php');
?>

6
dev_mvc/view/webcontent/content_header.php
View File

@ -1,9 +1,9 @@
<?php
require_once(ROOT_DIR.'./controller/UserSession.php');
require_once(ROOT_DIR.'/controller/UserSession.php');
if(UserSession::isUserSignedIn()){
include(ROOT_DIR.'./view/webcontent/header/header_signedin.php');
include(ROOT_DIR.'/view/webcontent/header/header_signedin.php');
}
else{
include(ROOT_DIR.'./view/webcontent/header/header_signedout.php');
include(ROOT_DIR.'/view/webcontent/header/header_signedout.php');
}
?>

6
dev_mvc/view/webcontent/content_showthread.php
View File

@ -1,7 +1,7 @@
<?php
require_once ROOT_DIR.'./model/forum/Thread.php';
require_once ROOT_DIR.'./model/forum/Reply.php';
require_once ROOT_DIR.'./model/forum/User.php';
require_once ROOT_DIR.'/model/forum/Thread.php';
require_once ROOT_DIR.'/model/forum/Reply.php';
require_once ROOT_DIR.'/model/forum/User.php';
//$thread = new Thread();
$thread = MVCController::$viewData['thread'];
$replies = $thread->getReplies();

14
dev_mvc/viewmodel/viewmodel_boards.php
View File

@ -1,11 +1,11 @@
<?php
require_once ROOT_DIR.'./controller/db/DBBoard.php';
require_once ROOT_DIR.'./controller/db/DBThread.php';
require_once ROOT_DIR.'./controller/db/DBUser.php';
require_once ROOT_DIR.'./model/forum/Board.php';
require_once ROOT_DIR.'./model/forum/Thread.php';
require_once ROOT_DIR.'./model/forum/User.php';
require_once ROOT_DIR.'./model/forum/Reply.php';
require_once ROOT_DIR.'/controller/db/DBBoard.php';
require_once ROOT_DIR.'/controller/db/DBThread.php';
require_once ROOT_DIR.'/controller/db/DBUser.php';
require_once ROOT_DIR.'/model/forum/Board.php';
require_once ROOT_DIR.'/model/forum/Thread.php';
require_once ROOT_DIR.'/model/forum/User.php';
require_once ROOT_DIR.'/model/forum/Reply.php';
$boardTable = DBBoard::getBoards();
$threadsTable = [];

4
dev_mvc/viewmodel/viewmodel_home.php
View File

@ -1,6 +1,6 @@
<?php
require_once ROOT_DIR.'./controller/UserSession.php';
require_once ROOT_DIR.'./controller/MVCController.php';
require_once ROOT_DIR.'/controller/UserSession.php';
require_once ROOT_DIR.'/controller/MVCController.php';
if(UserSession::isUserSignedIn()){
MVCController::getMVCController()->overrideView("boards");
}

10
dev_mvc/viewmodel/viewmodel_showthread.php
View File

@ -1,9 +1,9 @@
<?php
require_once ROOT_DIR.'./controller/db/DBThread.php';
require_once ROOT_DIR.'./controller/db/DBReply.php';
require_once ROOT_DIR.'./controller/db/DBUser.php';
require_once ROOT_DIR.'./model/forum/User.php';
require_once ROOT_DIR.'./model/forum/Reply.php';
require_once ROOT_DIR.'/controller/db/DBThread.php';
require_once ROOT_DIR.'/controller/db/DBReply.php';
require_once ROOT_DIR.'/controller/db/DBUser.php';
require_once ROOT_DIR.'/model/forum/User.php';
require_once ROOT_DIR.'/model/forum/Reply.php';
if(isset($_GET['thread'])) {
$threadid = $_GET['thread'];
} else {

2
dev_mvc/viewmodel/viewmodel_signout.php
View File

@ -1,5 +1,5 @@
<?php
require_once(ROOT_DIR.'./controller/db/Database.php');
require_once(ROOT_DIR.'/controller/db/Database.php');
Database::invalidateSession($_COOKIE['usersession']);
session_destroy();
?>

4
dev_mvc/viewmodel/viewmodel_verify.php
View File

@ -1,6 +1,6 @@
<?php
require_once ROOT_DIR.'./controller/db/Database.php';
require_once ROOT_DIR.'./controller/db/DBUser.php';
require_once ROOT_DIR.'/controller/db/Database.php';
require_once ROOT_DIR.'/controller/db/DBUser.php';
$key = '';
if(isset($_GET['key'])){
$key = $_GET['key'];