From 984d44ac75b420b9394d8c13b4e15a3e9ce94785 Mon Sep 17 00:00:00 2001
From: Andreas <the.hion.v@gmail.com>
Date: Tue, 24 Sep 2019 17:02:26 +0200
Subject: [PATCH] cleaned up the code

---
 dev_mvc/controller/db/DBBoard.php      |  7 +++++-
 dev_mvc/controller/db/DBThread.php     |  7 +++++-
 dev_mvc/model/forum/Board.php          |  9 +++++++
 dev_mvc/viewmodel/viewmodel_boards.php | 34 +++++++-------------------
 4 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/dev_mvc/controller/db/DBBoard.php b/dev_mvc/controller/db/DBBoard.php
index 7dc693f..ff202ce 100644
--- a/dev_mvc/controller/db/DBBoard.php
+++ b/dev_mvc/controller/db/DBBoard.php
@@ -6,7 +6,12 @@ class DBBoard extends Database{
 		$con = self::connectToDB();
 		$query = $con->prepare("SELECT * FROM board");
 		$query->execute();
-		return $query->fetchAll(PDO::FETCH_BOTH);
+		$boardArray = [];
+		while($result = $query->fetch(PDO::FETCH_BOTH)){
+			$board = new Board($result['ID'],$result['name'],$result['permLevel']);
+			array_push($boardArray, $board);
+		}
+		return $boardArray;
 	}
 	
 }
\ No newline at end of file
diff --git a/dev_mvc/controller/db/DBThread.php b/dev_mvc/controller/db/DBThread.php
index 0c25e0a..d2d903a 100644
--- a/dev_mvc/controller/db/DBThread.php
+++ b/dev_mvc/controller/db/DBThread.php
@@ -25,7 +25,12 @@ class DBThread extends Database {
 		$query = $con->prepare("SELECT * FROM thread WHERE board_ID = :boardID");
 		$query->bindParam(":boardID", $boardID);
 		$query->execute();
-		return $query->fetchAll(PDO::FETCH_BOTH);
+		$threadArray = [];
+		while($result = $query->fetch(PDO::FETCH_BOTH)){
+			$thread = new Thread($result['ID'], $result['users_ID'], $result['board_ID'], $result['title'], $result['text'], $result['date_created']);
+			array_push($threadArray, $thread);
+		}
+		return $threadArray;
 	}
 	static function createThread($threadObject){
 		$con = self::connectToDB();
diff --git a/dev_mvc/model/forum/Board.php b/dev_mvc/model/forum/Board.php
index 40722df..ca01b87 100644
--- a/dev_mvc/model/forum/Board.php
+++ b/dev_mvc/model/forum/Board.php
@@ -8,6 +8,15 @@ class Board {
 		$this->name = $name;
 		$this->permLevel = $permLevel;
 	}
+	function getId(){
+		return $this->id;
+	}
+	function getName(){
+		return $this->$name;
+	}
+	function getPermLevel(){
+		return $this->$permLevel;
+	}
 	
 }
 
diff --git a/dev_mvc/viewmodel/viewmodel_boards.php b/dev_mvc/viewmodel/viewmodel_boards.php
index 2bc7c87..7f663f1 100644
--- a/dev_mvc/viewmodel/viewmodel_boards.php
+++ b/dev_mvc/viewmodel/viewmodel_boards.php
@@ -7,35 +7,19 @@ 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 = [];
-$usersTable = [];
-$boards = [];
-$threads = [];
+$boards = DBBoard::getBoards();
 $users = [];
-foreach ($boardTable as $row)
+$threads = [];
+$threadUsers = [];
+foreach ($boards as $board)
 {	
-	$threadsTable = array_merge($threadsTable, DBThread::getThreadsByBoard($row['ID'])); 
-	array_push($boards, new Board($row['ID'], $row['name'], $row['permLevel']));
+	$threads = array_merge($threads, DBThread::getThreadsByBoard($board->getId())); 
+}
+foreach($threads as $thread)
+{	
+	array_push($users, DBUser::getUserByUID($thread->getUserID()));
 }
-foreach($threadsTable as $row)
-{
-	
-	array_push($threads, new Thread($row['ID'],$row['users_ID'],$row['board_ID'],$row['title'],$row['text'],$row['date_created']));
-	array_push($usersTable, DBUser::getUserByUID($row['users_ID']));
 
-}
-foreach($usersTable as $row){
-	$skipUser = false;
-	foreach($users as $user){
-		if($row->getId() == $user->getId()){
-			$skipUser = true;
-		}
-	}
-	if(!$skipUser){
-		array_push($users, $row);
-	}
-}