From 929a848b23e8a1ef096570fa48a30bef9f2cd6cc Mon Sep 17 00:00:00 2001
From: Andreas <the.hion.v@gmail.com>
Date: Mon, 30 Sep 2019 14:17:21 +0200
Subject: [PATCH] Refactored code to use namespaces

---
 dev_mvc/controller/HUtils.php                 |  1 +
 dev_mvc/controller/MVCController.php          |  1 +
 dev_mvc/controller/UserSession.php            |  4 ++-
 dev_mvc/controller/db/DBBoard.php             |  4 ++-
 dev_mvc/controller/db/DBReply.php             |  5 +--
 dev_mvc/controller/db/DBThread.php            |  4 ++-
 dev_mvc/controller/db/DBUser.php              |  4 ++-
 dev_mvc/controller/db/Database.php            |  2 ++
 dev_mvc/index.php                             | 36 ++++++++++++++++---
 dev_mvc/model/actions/model_create_reply.php  |  8 ++---
 dev_mvc/model/actions/model_create_thread.php |  8 ++---
 dev_mvc/model/actions/model_do_register.php   |  3 ++
 dev_mvc/model/actions/model_login.php         | 10 +++---
 dev_mvc/model/actions/model_signout.php       |  4 ++-
 dev_mvc/model/forum/Board.php                 |  1 +
 dev_mvc/model/forum/Reply.php                 |  2 ++
 dev_mvc/model/forum/Thread.php                |  2 ++
 dev_mvc/model/forum/User.php                  |  2 +-
 dev_mvc/model/testactions/TA_CreateDB.php     |  2 ++
 dev_mvc/model/testactions/TA_PopulateDB.php   |  1 +
 dev_mvc/model/testactions/TA_TestDBReply.php  |  1 +
 dev_mvc/model/testactions/TA_TestDBThread.php |  1 +
 dev_mvc/model/testactions/TA_TestDBUser.php   |  1 +
 .../testactions/TA_TestSQLConnection.php      |  1 +
 dev_mvc/model/testactions/TestAction.php      |  1 +
 dev_mvc/view/content_pagetemplate.php         |  1 +
 dev_mvc/view/webcontent/content_boards.php    |  3 +-
 .../view/webcontent/content_createreply.php   |  3 ++
 dev_mvc/view/webcontent/content_header.php    |  2 +-
 .../view/webcontent/content_showthread.php    |  7 ++--
 .../webcontent/header/header_signedin.php     | 14 ++++----
 .../webcontent/header/header_signedout.php    | 16 ++++-----
 .../modules_boards/module_boardtable.php      | 10 ++++--
 dev_mvc/viewmodel/viewmodel_boards.php        | 16 +++++----
 dev_mvc/viewmodel/viewmodel_createreply.php   |  1 +
 dev_mvc/viewmodel/viewmodel_home.php          |  4 +--
 dev_mvc/viewmodel/viewmodel_showthread.php    |  6 ++++
 37 files changed, 135 insertions(+), 57 deletions(-)

diff --git a/dev_mvc/controller/HUtils.php b/dev_mvc/controller/HUtils.php
index abab026..8f295a3 100644
--- a/dev_mvc/controller/HUtils.php
+++ b/dev_mvc/controller/HUtils.php
@@ -1,4 +1,5 @@
 <?php
+namespace controller;
 Class HUtils{
     static function issetPost($arr_postvars){
         for ($i=0; $i <sizeof($arr_postvars) ; $i++) 
diff --git a/dev_mvc/controller/MVCController.php b/dev_mvc/controller/MVCController.php
index 0ab33b0..8954dc2 100644
--- a/dev_mvc/controller/MVCController.php
+++ b/dev_mvc/controller/MVCController.php
@@ -1,4 +1,5 @@
 <?php
+namespace controller;
 class MVCController{
 	private $model;
 	private $testaction;
diff --git a/dev_mvc/controller/UserSession.php b/dev_mvc/controller/UserSession.php
index 5d7200c..854e05f 100644
--- a/dev_mvc/controller/UserSession.php
+++ b/dev_mvc/controller/UserSession.php
@@ -1,5 +1,7 @@
 <?php
-require_once(ROOT_DIR.'/controller/db/Database.php');
+namespace controller;
+use controller\db\Database;
+use DateTime;
 Class UserSession{
 	public $uid = -1;
 	public $token = "undefined";
diff --git a/dev_mvc/controller/db/DBBoard.php b/dev_mvc/controller/db/DBBoard.php
index ff202ce..bbe3798 100644
--- a/dev_mvc/controller/db/DBBoard.php
+++ b/dev_mvc/controller/db/DBBoard.php
@@ -1,5 +1,7 @@
 <?php
-require_once ROOT_DIR.'/controller/db/Database.php';
+namespace controller\db;
+use model\forum\Board;
+use PDO;
 class DBBoard extends Database{
 	static function getBoards():array
 	{
diff --git a/dev_mvc/controller/db/DBReply.php b/dev_mvc/controller/db/DBReply.php
index ed7197e..fe9a459 100644
--- a/dev_mvc/controller/db/DBReply.php
+++ b/dev_mvc/controller/db/DBReply.php
@@ -1,6 +1,7 @@
 <?php
-require_once ROOT_DIR.'/controller/db/Database.php';
-require_once ROOT_DIR.'/model/forum/Reply.php';
+namespace controller\db;
+use model\forum\Reply;
+use PDO;
 class DBReply extends Database{
 	static function createReply($uid, $threadID, $content){
 		$con = self::connectToDB();
diff --git a/dev_mvc/controller/db/DBThread.php b/dev_mvc/controller/db/DBThread.php
index d2d903a..45aa9ef 100644
--- a/dev_mvc/controller/db/DBThread.php
+++ b/dev_mvc/controller/db/DBThread.php
@@ -1,5 +1,7 @@
 <?php
-require_once ROOT_DIR.'/model/forum/Thread.php';
+namespace controller\db;
+use model\forum\Thread;
+use PDO;
 class DBThread extends Database {
 	static function getThreadByID($id){
 		$con = self::connectToDB();
diff --git a/dev_mvc/controller/db/DBUser.php b/dev_mvc/controller/db/DBUser.php
index be6eb53..4e0d96f 100644
--- a/dev_mvc/controller/db/DBUser.php
+++ b/dev_mvc/controller/db/DBUser.php
@@ -1,5 +1,7 @@
 <?php
-require_once(ROOT_DIR.'/model/forum/User.php');
+namespace controller\db;
+use model\forum\User;
+use PDO;
 class DBUser extends Database
 {
 	static function getUserByUID($uid){
diff --git a/dev_mvc/controller/db/Database.php b/dev_mvc/controller/db/Database.php
index 48f78c9..99b0d06 100644
--- a/dev_mvc/controller/db/Database.php
+++ b/dev_mvc/controller/db/Database.php
@@ -1,4 +1,6 @@
 <?php
+namespace controller\db;
+use PDO;
 Class Database{
 	static function connectToDB(){
 		try{
diff --git a/dev_mvc/index.php b/dev_mvc/index.php
index e45f319..efc2b0b 100644
--- a/dev_mvc/index.php
+++ b/dev_mvc/index.php
@@ -1,13 +1,41 @@
 <?php
+
+define('ROOT_DIR', __DIR__);
+function autoload($className){
+    $className = ltrim($className, '\\');
+    $fileName = '';
+    $namespace = '';
+    if($lastNsPos = strrpos($className, '\\')){
+        $namespace = substr($className, 0, $lastNsPos);
+        $className = substr($className, $lastNsPos + 1);
+        $fileName = str_replace('\\', DIRECTORY_SEPARATOR, $namespace) . DIRECTORY_SEPARATOR;
+    }
+    $fileName .= str_replace('_', DIRECTORY_SEPARATOR, $className) . '.php';
+
+    //echo $fileName;
+    require ROOT_DIR . '\\' . $fileName;
+}
+
+spl_autoload_register('autoload');
+
+use model\testactions\TestAction;
+use controller\MVCController;
+use controller\UserSession;
+use controller\HUtils;
+
+
+
+
+
+
 error_reporting(E_ALL);
 ini_set('log_errors','1');
 ini_set('display_errors','1');
-define('ROOT_DIR', __DIR__);
+
 session_start();
-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');
+
 $mvcController = new MVCController();
 $mvcController->executeModel();
 if(!isset($_POST['testaction'])){
diff --git a/dev_mvc/model/actions/model_create_reply.php b/dev_mvc/model/actions/model_create_reply.php
index e4bcbfc..70561d0 100644
--- a/dev_mvc/model/actions/model_create_reply.php
+++ b/dev_mvc/model/actions/model_create_reply.php
@@ -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';
+use controller\UserSession;
+use controller\HUtils;
+use controller\db\DBReply;
+Use model\forum\Reply;
 //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;
diff --git a/dev_mvc/model/actions/model_create_thread.php b/dev_mvc/model/actions/model_create_thread.php
index eeccadf..485b994 100644
--- a/dev_mvc/model/actions/model_create_thread.php
+++ b/dev_mvc/model/actions/model_create_thread.php
@@ -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';
+use controller\UserSession;
+use controller\HUtils;
+use controller\db\DBThread;
+use model\forum\Thread;
 //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;
diff --git a/dev_mvc/model/actions/model_do_register.php b/dev_mvc/model/actions/model_do_register.php
index d731a55..a8bf1b8 100644
--- a/dev_mvc/model/actions/model_do_register.php
+++ b/dev_mvc/model/actions/model_do_register.php
@@ -3,6 +3,9 @@
 require_once(ROOT_DIR."/controller/db/Database.php");
 require_once(ROOT_DIR."/controller/db/DBUser.php");
 require_once(ROOT_DIR."/controller/HUtils.php");
+use controller\db\Database;
+use controller\db\DBUser;
+use controller\HUtils;
 if(HUtils::issetPost(['email', 'pass', 'pass2', 'name'])){
     $email = $_POST['email'];
     $pass = $_POST['pass'];
diff --git a/dev_mvc/model/actions/model_login.php b/dev_mvc/model/actions/model_login.php
index 05717b0..3128862 100644
--- a/dev_mvc/model/actions/model_login.php
+++ b/dev_mvc/model/actions/model_login.php
@@ -1,9 +1,11 @@
 <?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");
+use controller\UserSession;
+use controller\db\Database;
+use controller\db\DBUser;
+use controller\HUtils;
+use controller\MVCController;
+use model\forum\User;
 $skipoverride = false;
 if(!UserSession::isUserSignedIn()){
 	if(HUtils::issetPost(['email','password'])){
diff --git a/dev_mvc/model/actions/model_signout.php b/dev_mvc/model/actions/model_signout.php
index f9c3664..2313cef 100644
--- a/dev_mvc/model/actions/model_signout.php
+++ b/dev_mvc/model/actions/model_signout.php
@@ -1,5 +1,7 @@
 <?php
-require_once(ROOT_DIR.'/controller/db/Database.php');
+use controller\db\Database;
+use controller\UserSession;
+
 $_SESSION['usersession'] = null;
 Database::invalidateSession($_COOKIE['usersession']);
 session_destroy();
diff --git a/dev_mvc/model/forum/Board.php b/dev_mvc/model/forum/Board.php
index 291839b..2bebf92 100644
--- a/dev_mvc/model/forum/Board.php
+++ b/dev_mvc/model/forum/Board.php
@@ -1,4 +1,5 @@
 <?php
+namespace model\forum;
 class Board {
 	public $id;
 	public $name;
diff --git a/dev_mvc/model/forum/Reply.php b/dev_mvc/model/forum/Reply.php
index c7df286..dbf5154 100644
--- a/dev_mvc/model/forum/Reply.php
+++ b/dev_mvc/model/forum/Reply.php
@@ -1,4 +1,6 @@
 <?php
+namespace model\forum;
+use DateTime;
 class Reply {
 	public $id;
 	public $threadID;
diff --git a/dev_mvc/model/forum/Thread.php b/dev_mvc/model/forum/Thread.php
index 492c013..9571de3 100644
--- a/dev_mvc/model/forum/Thread.php
+++ b/dev_mvc/model/forum/Thread.php
@@ -1,4 +1,6 @@
 <?php
+namespace model\forum;
+use DateTime;
 class Thread {
 	public $id;
 	public $title;
diff --git a/dev_mvc/model/forum/User.php b/dev_mvc/model/forum/User.php
index cb4f79b..cb74281 100644
--- a/dev_mvc/model/forum/User.php
+++ b/dev_mvc/model/forum/User.php
@@ -1,5 +1,5 @@
 <?php
-
+namespace model\forum;
 class User {
 	public $id;
 	public $username;
diff --git a/dev_mvc/model/testactions/TA_CreateDB.php b/dev_mvc/model/testactions/TA_CreateDB.php
index f90efb0..b0e2da9 100644
--- a/dev_mvc/model/testactions/TA_CreateDB.php
+++ b/dev_mvc/model/testactions/TA_CreateDB.php
@@ -1,4 +1,6 @@
 <?php
+namespace model\testactions;
+use DateTime;
 class TA_CreateDB extends TestAction{
     function TA_CreateDB(){
         
diff --git a/dev_mvc/model/testactions/TA_PopulateDB.php b/dev_mvc/model/testactions/TA_PopulateDB.php
index df8963b..ea70112 100644
--- a/dev_mvc/model/testactions/TA_PopulateDB.php
+++ b/dev_mvc/model/testactions/TA_PopulateDB.php
@@ -1,4 +1,5 @@
 <?php
+namespace model\testactions;
 class TA_PopulateDB extends TestAction{
     function TA_PopulateDB(){
         parent::__construct();
diff --git a/dev_mvc/model/testactions/TA_TestDBReply.php b/dev_mvc/model/testactions/TA_TestDBReply.php
index 6978d99..0344830 100644
--- a/dev_mvc/model/testactions/TA_TestDBReply.php
+++ b/dev_mvc/model/testactions/TA_TestDBReply.php
@@ -1,4 +1,5 @@
 <?php
+namespace model\testactions;
 require_once(ROOT_DIR.'/controller/db/DBReply.php');
 require_once(ROOT_DIR.'/model/forum/Reply.php');
 class TA_TestDBReply extends TestAction{
diff --git a/dev_mvc/model/testactions/TA_TestDBThread.php b/dev_mvc/model/testactions/TA_TestDBThread.php
index 45ff3a0..40eeba9 100644
--- a/dev_mvc/model/testactions/TA_TestDBThread.php
+++ b/dev_mvc/model/testactions/TA_TestDBThread.php
@@ -1,4 +1,5 @@
 <?php
+namespace model\testactions;
 require_once(ROOT_DIR.'/controller/db/DBThread.php');
 require_once(ROOT_DIR.'/model/forum/Thread.php');
 class TA_TestDBThread extends TestAction{
diff --git a/dev_mvc/model/testactions/TA_TestDBUser.php b/dev_mvc/model/testactions/TA_TestDBUser.php
index b47be16..f54ab4f 100644
--- a/dev_mvc/model/testactions/TA_TestDBUser.php
+++ b/dev_mvc/model/testactions/TA_TestDBUser.php
@@ -1,4 +1,5 @@
 <?php
+namespace model\testactions;
 require_once(ROOT_DIR.'/controller/db/DBUser.php');
 require_once(ROOT_DIR.'/model/forum/User.php');
 class TA_TestDBUser extends TestAction{
diff --git a/dev_mvc/model/testactions/TA_TestSQLConnection.php b/dev_mvc/model/testactions/TA_TestSQLConnection.php
index 4a84bff..9b957a4 100644
--- a/dev_mvc/model/testactions/TA_TestSQLConnection.php
+++ b/dev_mvc/model/testactions/TA_TestSQLConnection.php
@@ -1,4 +1,5 @@
 <?php
+namespace model\testactions;
 class TA_TestSQLConnection extends TestAction{
     function __construct(){
         parent::__construct();
diff --git a/dev_mvc/model/testactions/TestAction.php b/dev_mvc/model/testactions/TestAction.php
index 2f43a80..7d5574a 100644
--- a/dev_mvc/model/testactions/TestAction.php
+++ b/dev_mvc/model/testactions/TestAction.php
@@ -1,4 +1,5 @@
 <?php
+namespace model\testactions;
 class TestAction{
     function __construct(){
         if(isset($_POST['auth'])){
diff --git a/dev_mvc/view/content_pagetemplate.php b/dev_mvc/view/content_pagetemplate.php
index 427e56f..07c0007 100644
--- a/dev_mvc/view/content_pagetemplate.php
+++ b/dev_mvc/view/content_pagetemplate.php
@@ -12,6 +12,7 @@ require_once("index.php");
 <?php 
 include_once(ROOT_DIR."/view/webcontent/content_header.php");
 ?>
+
 		</header>
 		<div class="main">
 <?php 
diff --git a/dev_mvc/view/webcontent/content_boards.php b/dev_mvc/view/webcontent/content_boards.php
index 0e75d46..d17b295 100644
--- a/dev_mvc/view/webcontent/content_boards.php
+++ b/dev_mvc/view/webcontent/content_boards.php
@@ -1,6 +1,5 @@
 <?php
-require_once ROOT_DIR.'/model/forum/Thread.php';
-require_once ROOT_DIR.'/model/forum/User.php';
+use controller\MVCController;
 foreach (MVCController::$viewData['boards'] as $board){ 
 	include ROOT_DIR.'/view/webcontent/modules/modules_boards/module_boardtable.php';
 }
diff --git a/dev_mvc/view/webcontent/content_createreply.php b/dev_mvc/view/webcontent/content_createreply.php
index c18cec1..738f5d7 100644
--- a/dev_mvc/view/webcontent/content_createreply.php
+++ b/dev_mvc/view/webcontent/content_createreply.php
@@ -1,3 +1,6 @@
+<?php
+use controller\MVCController;
+?>
 <form action="./?p=showthread&thread=<?=MVCController::$viewData['threadid'];?>" method="post">
 <textarea placeholder="post content" name="content"></textarea><br>
 <input type="submit" value="Create Reply">
diff --git a/dev_mvc/view/webcontent/content_header.php b/dev_mvc/view/webcontent/content_header.php
index be02f0e..f1ea9f8 100644
--- a/dev_mvc/view/webcontent/content_header.php
+++ b/dev_mvc/view/webcontent/content_header.php
@@ -1,5 +1,5 @@
 <?php 
-require_once(ROOT_DIR.'/controller/UserSession.php');
+use controller\UserSession;
 if(UserSession::isUserSignedIn()){
 	include(ROOT_DIR.'/view/webcontent/header/header_signedin.php');
 }
diff --git a/dev_mvc/view/webcontent/content_showthread.php b/dev_mvc/view/webcontent/content_showthread.php
index bf60790..2056839 100644
--- a/dev_mvc/view/webcontent/content_showthread.php
+++ b/dev_mvc/view/webcontent/content_showthread.php
@@ -1,7 +1,8 @@
 <?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';
+use controller\MVCController;
+use model\forum\Thread;
+use model\forum\Reply;
+use model\forum\User;
 //$thread = new Thread();
 $thread = MVCController::$viewData['thread'];
 $replies = $thread->getReplies();
diff --git a/dev_mvc/view/webcontent/header/header_signedin.php b/dev_mvc/view/webcontent/header/header_signedin.php
index 3d38b1c..ec183bb 100644
--- a/dev_mvc/view/webcontent/header/header_signedin.php
+++ b/dev_mvc/view/webcontent/header/header_signedin.php
@@ -1,7 +1,7 @@
-<div class="logo">
-	hF
-</div>
-<nav>
-	<a href="./">Home</a>
-	<a href="?action=signout">Sign out</a>
-</nav>
\ No newline at end of file
+			<div class="logo">
+				hF
+			</div>
+			<nav>
+				<a href="./">Home</a>
+				<a href="?action=signout">Sign out</a>
+			</nav>
\ No newline at end of file
diff --git a/dev_mvc/view/webcontent/header/header_signedout.php b/dev_mvc/view/webcontent/header/header_signedout.php
index f0e3f4d..7c9c059 100644
--- a/dev_mvc/view/webcontent/header/header_signedout.php
+++ b/dev_mvc/view/webcontent/header/header_signedout.php
@@ -1,8 +1,8 @@
-<div class="logo">
-	hF
-</div>
-<nav>
-	<a href="./">Home</a>
-	<a href="?p=register">Register</a>
-	<a href="?p=signin">Sign in</a>
-</nav>
\ No newline at end of file
+			<div class="logo">
+				hF
+			</div>
+			<nav>
+				<a href="./">Home</a>
+				<a href="?p=register">Register</a>
+				<a href="?p=signin">Sign in</a>
+			</nav>
\ No newline at end of file
diff --git a/dev_mvc/view/webcontent/modules/modules_boards/module_boardtable.php b/dev_mvc/view/webcontent/modules/modules_boards/module_boardtable.php
index 02ed083..6c33854 100644
--- a/dev_mvc/view/webcontent/modules/modules_boards/module_boardtable.php
+++ b/dev_mvc/view/webcontent/modules/modules_boards/module_boardtable.php
@@ -1,3 +1,6 @@
+<?php
+use controller\MVCController;
+?>
 			<h2><?=$board->name?></h2>
 			<a href="?p=createthread&board=<?=$board->id?>">Create Thread</a>
 			<table>
@@ -6,7 +9,7 @@
 					<th width=10%>Started by</th>
 					<th width=15%>Last reply</th>
 				</tr>
-				<?php
+<?php
 foreach (MVCController::$viewData['threads'] as $thread){
 	if($thread->getBoardID() == $board->id){
 		$currentRow = [];
@@ -28,7 +31,7 @@ foreach (MVCController::$viewData['threads'] as $thread){
 				}
 			}
 		}
-		?>
+?>
 				<tr>
 					<td>
 						<a href="?p=showthread&thread=<?=$currentRow['threadID']?>"><?=$currentRow['threadTitle']?></a>
@@ -39,9 +42,10 @@ foreach (MVCController::$viewData['threads'] as $thread){
 					</td>
 					<td>
 						<?=$currentRow['lastUpdated']?>
+						
 					</td>
 				</tr>
-		<?php
+<?php
 	}
 }
 ?>
diff --git a/dev_mvc/viewmodel/viewmodel_boards.php b/dev_mvc/viewmodel/viewmodel_boards.php
index 7f663f1..c571193 100644
--- a/dev_mvc/viewmodel/viewmodel_boards.php
+++ b/dev_mvc/viewmodel/viewmodel_boards.php
@@ -1,11 +1,13 @@
 <?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';
+use controller\MVCController;
+use controller\db\DBBoard;
+use controller\db\DBThread;
+use controller\db\DBUser;
+use model\forum\Board;
+use model\forum\Thread;
+use model\forum\User;
+use model\forum\Reply;
+
 
 $boards = DBBoard::getBoards();
 $users = [];
diff --git a/dev_mvc/viewmodel/viewmodel_createreply.php b/dev_mvc/viewmodel/viewmodel_createreply.php
index 09aec04..2daf956 100644
--- a/dev_mvc/viewmodel/viewmodel_createreply.php
+++ b/dev_mvc/viewmodel/viewmodel_createreply.php
@@ -1,4 +1,5 @@
 <?php
+use controller\MVCController;
 if(isset($_GET['thread'])){
 	MVCController::$viewData['threadid'] = $_GET['thread'];
 }
diff --git a/dev_mvc/viewmodel/viewmodel_home.php b/dev_mvc/viewmodel/viewmodel_home.php
index dbfb73b..e0d2c05 100644
--- a/dev_mvc/viewmodel/viewmodel_home.php
+++ b/dev_mvc/viewmodel/viewmodel_home.php
@@ -1,6 +1,6 @@
 <?php 
-require_once ROOT_DIR.'/controller/UserSession.php';
-require_once ROOT_DIR.'/controller/MVCController.php';
+use controller\UserSession;
+use controller\MVCController;
 if(UserSession::isUserSignedIn()){
 	MVCController::getMVCController()->overrideView("boards");
 }
\ No newline at end of file
diff --git a/dev_mvc/viewmodel/viewmodel_showthread.php b/dev_mvc/viewmodel/viewmodel_showthread.php
index 76eb378..0b6c19f 100644
--- a/dev_mvc/viewmodel/viewmodel_showthread.php
+++ b/dev_mvc/viewmodel/viewmodel_showthread.php
@@ -1,4 +1,10 @@
 <?php
+use controller\MVCController;
+use controller\db\DBThread;
+use controller\db\DBReply;
+use controller\db\DBUser;
+use model\forum\User;
+use model\forum\Reply;
 require_once ROOT_DIR.'/controller/db/DBThread.php';
 require_once ROOT_DIR.'/controller/db/DBReply.php';
 require_once ROOT_DIR.'/controller/db/DBUser.php';