From f9845624d4b3604f46ee19745323298df9d888c4 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Tue, 17 Jan 2017 21:58:57 -0500
Subject: [PATCH] More API changes

---
 api/controllers/CategoryController.php |  2 +-
 api/core/common.php                    |  6 ++++++
 api/dao/CategoryGateway.php            |  8 +++++++-
 api/dao/Connection.php                 | 26 --------------------------
 api/index.php                          |  9 ++++++---
 inc/common.inc.php                     |  6 +++---
 6 files changed, 23 insertions(+), 34 deletions(-)
 create mode 100644 api/core/common.php
 delete mode 100644 api/dao/Connection.php

diff --git a/api/controllers/CategoryController.php b/api/controllers/CategoryController.php
index 46558d4e..07558d9d 100644
--- a/api/controllers/CategoryController.php
+++ b/api/controllers/CategoryController.php
@@ -14,6 +14,6 @@ class CategoryController {
     static function getAllCategories($hesk_settings) {
         require_once(__DIR__ . '/../businesslogic/category/CategoryRetriever.php');
 
-        return json_encode(CategoryRetriever::get_all_categories($hesk_settings));
+        return CategoryRetriever::get_all_categories($hesk_settings);
     }
 }
\ No newline at end of file
diff --git a/api/core/common.php b/api/core/common.php
new file mode 100644
index 00000000..77c14cd6
--- /dev/null
+++ b/api/core/common.php
@@ -0,0 +1,6 @@
+<?php
+
+// Contains all common requirements. Nothing more.
+require_once(__DIR__ . '/../../hesk_settings.inc.php');
+require_once(__DIR__ . '/../../inc/common.inc.php');
+require_once(__DIR__ . '/../core/output.php');
\ No newline at end of file
diff --git a/api/dao/CategoryGateway.php b/api/dao/CategoryGateway.php
index 465aae28..47886f2c 100644
--- a/api/dao/CategoryGateway.php
+++ b/api/dao/CategoryGateway.php
@@ -9,12 +9,18 @@
 namespace DataAccess;
 
 use BusinessObjects\Category;
+use Exception;
 
 class CategoryGateway {
     static function getAllCategories($hesk_settings) {
         require_once(__DIR__ . '/../businesslogic/category/Category.php');
 
-        $sql = 'SELECT * FROM `' . \hesk_dbEscape($hesk_settings['db_pfix']) . 'categories`';
+        if (!function_exists('hesk_dbConnect')) {
+            throw new Exception('Database not loaded!');
+        }
+        hesk_dbConnect();
+
+        $sql = 'SELECT * FROM `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'categories`';
 
         $response = hesk_dbQuery($sql);
 
diff --git a/api/dao/Connection.php b/api/dao/Connection.php
deleted file mode 100644
index d7da3228..00000000
--- a/api/dao/Connection.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: user
- * Date: 1/16/17
- * Time: 10:18 PM
- */
-
-namespace DataAccess;
-
-
-use mysqli;
-
-class Connection {
-    static function connect($hesk_settings) {
-        //-- Return mysqli_connection
-    }
-
-    /**
-     * @param $mysqliConnection mysqli The MySQLi connection obtained from Connection::connect
-     * @return bool true if connection closed, false otherwise
-     */
-    static function close($mysqliConnection) {
-        return $mysqliConnection->close();
-    }
-}
\ No newline at end of file
diff --git a/api/index.php b/api/index.php
index 27528b5e..cd9592ab 100644
--- a/api/index.php
+++ b/api/index.php
@@ -1,8 +1,11 @@
 <?php
 define('IN_SCRIPT', 1);
+define('HESK_PATH', '../');
 
-// Just call the controller
+require_once(__DIR__ . '/core/common.php');
 require_once(__DIR__ . '/controllers/CategoryController.php');
-require_once(__DIR__ . '/../hesk_settings.inc.php');
+hesk_load_api_database_functions();
 
-\Controllers\Category\CategoryController::getAllCategories($hesk_settings);
\ No newline at end of file
+$categories = \Controllers\Category\CategoryController::getAllCategories($hesk_settings);
+
+output($categories);
\ No newline at end of file
diff --git a/inc/common.inc.php b/inc/common.inc.php
index ba3c43ef..cf54fa9e 100644
--- a/inc/common.inc.php
+++ b/inc/common.inc.php
@@ -190,13 +190,13 @@ function hesk_load_database_functions()
 
 function hesk_load_api_database_functions()
 {
-    require(HESK_PATH . 'api/core/json_error.php');
+    require(__DIR__ . '/../api/core/json_error.php');
     // Preferrably use the MySQLi functions
     if (function_exists('mysqli_connect')) {
-        require(HESK_PATH . 'api/core/database_mysqli.inc.php');
+        require(__DIR__ . '/../api/core/database_mysqli.inc.php');
     } // Default to MySQL
     else {
-        require(HESK_PATH . 'api/core/database.inc.php');
+        require(__DIR__ . '/../api/core/database.inc.php');
     }
 } // END hesk_load_database_functions()