Merge branch 'main' of https://gitlab.informatika.org/if3110-2023-01-32/if-3110-2023-01-32

src/app/baseclasses/BaseManager.php

 <?php
 
-require_once PROJECT_ROOT_PATH . "/app/core/Database.php";
+require_once SRC_ROOT_PATH . "/app/core/PDOHandler.php";
 
 abstract class BaseManager
 {
@@ -10,7 +10,7 @@ abstract class BaseManager
 
   protected function __construct()
   {
-    $this->pdo = Database::getInstance()->getPDO();
+    $this->pdo = PDOHandler::getInstance()->getPDO();
   }
 
   public static function getInstance()

src/app/controllers/Page/ComposePage.php

@@ -21,7 +21,7 @@ class ComposePage extends BaseController{
 
     public function post($urlParams)
     {
-        $srv->post();
+        $srv->compose();
         require PAGE_PATH . "/submission.php";
         exit();
     }

src/app/controllers/Post/PostController.php

@@ -2,7 +2,7 @@
 
 require_once SRC_ROOT_PATH . "/app/baseclasses/BaseController.php";
 
-require_once SRC_ROOT_PATH . "app/core/FileAccess.php";
+require_once SRC_ROOT_PATH . "/app/core/FileAccess.php";
 
 require_once SRC_ROOT_PATH . "/app/models/PostModel.php";
 require_once SRC_ROOT_PATH . "/app/models/PostResourceModel.php";

src/app/core/database.php → src/app/core/PDOHandler.php

 <?php
 
-
-
-
-class Database
+class PDOHandler
 {
     private static $instance;
 

src/app/modelmanagers/PostManager.php

 <?php
 
-require_once SRC_ROOT_PATH . "/baseclasses/BaseManager.php";
+require_once SRC_ROOT_PATH . "/app/baseclasses/BaseManager.php";
 
-require_once SRC_ROOT_PATH . "/models/PostModel.php";
+require_once SRC_ROOT_PATH . "/app/models/PostModel.php";
 
 class PostManager extends BaseManager
 {

src/app/modelmanagers/PostResourceManager.php

 <?php
 
-require_once SRC_ROOT_PATH . "/baseclasses/BaseManager.php";
+require_once SRC_ROOT_PATH . "/app/baseclasses/BaseManager.php";
 
-require_once SRC_ROOT_PATH . "/models/PostResourceModel.php";
+require_once SRC_ROOT_PATH . "/app/models/PostResourceModel.php";
 
 class PostResourceManager extends BaseManager
 {

src/app/models/AdminModel.php

 <?php
 
 require_once SRC_ROOT_PATH . "/app/baseclasses/BaseModel.php";
-require_once SRC_ROOT_PATH . "/app/core/database.php";
+require_once SRC_ROOT_PATH . "/app/core/PDOHandler.php";
 
 class AdminModel
 {
@@ -17,7 +17,7 @@ class AdminModel
 
     public function banUser($user_id){
         try{
-            $db = Database::getInstance()->getPDO();
+            $db = PDOHandler::getInstance()->getPDO();
             $sql = "UPDATE users SET status = 'ban' WHERE id = '$user_id'";
             $result = $db->query($sql);
             if($result){
@@ -33,7 +33,7 @@ class AdminModel
 
     public function unbanUser($user_id){
         try{
-            $db = Database::getInstance()->getPDO();
+            $db = PDOHandler::getInstance()->getPDO();
             $sql = "UPDATE users SET status = null WHERE id = '$user_id'";
             $result = $db->query($sql);
             if($result){
@@ -49,7 +49,7 @@ class AdminModel
 
     public function setAdmin($user_id){
         try{
-            $db = Database::getInstance()->getPDO();
+            $db = PDOHandler::getInstance()->getPDO();
             $sql = "UPDATE users SET role = 'admin' WHERE id = '$user_id'";
             $result = $db->query($sql);
             if($result){

src/app/models/LoginModel.php

 <?php
 
 require_once SRC_ROOT_PATH . "/app/baseclasses/BaseModel.php";
-require_once SRC_ROOT_PATH . "/app/core/database.php";
+require_once SRC_ROOT_PATH . "/app/core/PDOHandler.php";
 
 class LoginModel 
 {
@@ -21,7 +21,7 @@ class LoginModel
     public static function login($username, $password)
     {
         try{
-            $db = Database::getInstance()->getPDO();
+            $db = PDOHandler::getInstance()->getPDO();
             $sql = "SELECT * FROM users WHERE username = '$username'";
             $result = $db->query($sql);
             $row = $result->fetchAll(PDO::FETCH_ASSOC);

src/app/models/RegisterModel.php

 <?php
 
 require_once SRC_ROOT_PATH . "/app/baseclasses/BaseModel.php";
-require_once SRC_ROOT_PATH . "/app/core/database.php";
+require_once SRC_ROOT_PATH . "/app/core/PDOHandler.php";
 
 class RegisterModel
 {
@@ -21,7 +21,7 @@ class RegisterModel
     {
         try{
             $hashpass = password_hash($password, PASSWORD_DEFAULT);
-            $db = Database::getInstance()->getPDO();
+            $db = PDOHandler::getInstance()->getPDO();
             $check = "SELECT * FROM users WHERE username = '$username'";
             $hasilcek = $db->query($check);
             $row = $hasilcek->fetchAll(PDO::FETCH_ASSOC);

src/app/models/UserModel.php

 <?php
 
 require_once SRC_ROOT_PATH . "/app/baseclasses/BaseModel.php";
-require_once SRC_ROOT_PATH . "/app/core/database.php";
+require_once SRC_ROOT_PATH . "/app/core/PDOHandler.php";
 
 class UserModel
 {
@@ -28,7 +28,7 @@ class UserModel
 
     public function getAllUser(){
         try{
-            $db = Database::getInstance()->getPDO();
+            $db = PDOHandler::getInstance()->getPDO();
             $sql = "SELECT * FROM users";
             $result = $db->query($sql);
             $hasil = $result->fetchAll(PDO::FETCH_ASSOC);
@@ -40,7 +40,7 @@ class UserModel
     }
     public function getAllUserBan(){
         try{
-            $db = Database::getInstance()->getPDO();
+            $db = PDOHandler::getInstance()->getPDO();
             $sql = "SELECT * FROM users WHERE status = 'ban'";
             $result = $db->query($sql);
             $hasil = $result->fetchAll(PDO::FETCH_ASSOC);
@@ -52,7 +52,7 @@ class UserModel
     }
     public function getAllUserUnban(){
         try{
-            $db = Database::getInstance()->getPDO();
+            $db = PDOHandler::getInstance()->getPDO();
             $sql = "SELECT * FROM users WHERE status IS NULL and role = 'user'";
             $result = $db->query($sql);
             $hasil = $result->fetchAll(PDO::FETCH_ASSOC);