From d1ae2a80095582eb0c66ffff6c6f86b344dadabf Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Wed, 11 Jan 2017 21:55:22 -0500
Subject: [PATCH 001/192] Getting started on new ticket validator

---
 api/businesslogic/ValidationModel.php         |  15 +++
 api/businesslogic/email_validators.php        | 119 ++++++++++++++++++
 .../ticket/CreateTicketForCustomerModel.php   |  42 +++++++
 api/businesslogic/ticket/ticket_creator.php   |  93 ++++++++++++++
 api/loader.php                                |   3 +
 api/ticket/index.php                          |   1 -
 6 files changed, 272 insertions(+), 1 deletion(-)
 create mode 100644 api/businesslogic/ValidationModel.php
 create mode 100644 api/businesslogic/email_validators.php
 create mode 100644 api/businesslogic/ticket/CreateTicketForCustomerModel.php
 create mode 100644 api/businesslogic/ticket/ticket_creator.php
 create mode 100644 api/loader.php

diff --git a/api/businesslogic/ValidationModel.php b/api/businesslogic/ValidationModel.php
new file mode 100644
index 00000000..aa2258d2
--- /dev/null
+++ b/api/businesslogic/ValidationModel.php
@@ -0,0 +1,15 @@
+<?php
+
+class ValidationModel {
+    /**
+     * @var array
+     */
+    public $errorKeys;
+
+    public $valid;
+
+    function __construct() {
+        $errorKeys = [];
+        $valid = true;
+    }
+}
\ No newline at end of file
diff --git a/api/businesslogic/email_validators.php b/api/businesslogic/email_validators.php
new file mode 100644
index 00000000..1b69d289
--- /dev/null
+++ b/api/businesslogic/email_validators.php
@@ -0,0 +1,119 @@
+<?php
+
+/**
+ * @param string $address - the email address
+ * @param array $multiple_emails - true if HESK (or custom field) supports multiple emails
+ * @param bool $return_emails (def. true): return the email address(es). Otherwise a boolean is returned
+ *
+ * @return mixed|null|string - array if multiple valid emails, null if no email and not required, string if valid email
+ */
+function hesk_validateEmail($address, $multiple_emails, $return_emails = true) {
+    /* Allow multiple emails to be used? */
+    if ($multiple_emails) {
+        /* Make sure the format is correct */
+        $address = preg_replace('/\s/', '', $address);
+        $address = str_replace(';', ',', $address);
+
+        /* Check if addresses are valid */
+        $all = explode(',', $address);
+        foreach ($all as $k => $v) {
+            if (!hesk_isValidEmail($v)) {
+                unset($all[$k]);
+            }
+        }
+
+        /* If at least one is found return the value */
+        if (count($all)) {
+            if ($return_emails) {
+                return implode(',', $all);
+            }
+
+            return true;
+        } elseif (!$return_emails) {
+            return false;
+        }
+    } else {
+        /* Make sure people don't try to enter multiple addresses */
+        $address = str_replace(strstr($address, ','), '', $address);
+        $address = str_replace(strstr($address, ';'), '', $address);
+        $address = trim($address);
+
+        /* Valid address? */
+        if (hesk_isValidEmail($address)) {
+            if ($return_emails) {
+                return $address;
+            }
+
+            return true;
+        }
+    }
+
+    if ($return_emails) {
+        return null;
+    }
+
+    return true;
+} // END hesk_validateEmail()
+
+/**
+ * @param $email
+ * @return bool
+ */
+function hesk_isValidEmail($email) {
+    /* Check for header injection attempts */
+    if (preg_match("/\r|\n|%0a|%0d/i", $email)) {
+        return false;
+    }
+
+    /* Does it contain an @? */
+    $atIndex = strrpos($email, "@");
+    if ($atIndex === false) {
+        return false;
+    }
+
+    /* Get local and domain parts */
+    $domain = substr($email, $atIndex + 1);
+    $local = substr($email, 0, $atIndex);
+    $localLen = strlen($local);
+    $domainLen = strlen($domain);
+
+    /* Check local part length */
+    if ($localLen < 1 || $localLen > 64) {
+        return false;
+    }
+
+    /* Check domain part length */
+    if ($domainLen < 1 || $domainLen > 254) {
+        return false;
+    }
+
+    /* Local part mustn't start or end with a dot */
+    if ($local[0] == '.' || $local[$localLen - 1] == '.') {
+        return false;
+    }
+
+    /* Local part mustn't have two consecutive dots*/
+    if (strpos($local, '..') !== false) {
+        return false;
+    }
+
+    /* Check domain part characters */
+    if (!preg_match('/^[A-Za-z0-9\\-\\.]+$/', $domain)) {
+        return false;
+    }
+
+    /* Domain part mustn't have two consecutive dots */
+    if (strpos($domain, '..') !== false) {
+        return false;
+    }
+
+    /* Character not valid in local part unless local part is quoted */
+    if (!preg_match('/^(\\\\.|[A-Za-z0-9!#%&`_=\\/$\'*+?^{}|~.-])+$/', str_replace("\\\\", "", $local))) /* " */ {
+        if (!preg_match('/^"(\\\\"|[^"])+"$/', str_replace("\\\\", "", $local))) /* " */ {
+            return false;
+        }
+    }
+
+    /* All tests passed, email seems to be OK */
+    return true;
+} // END hesk_isValidEmail()
\ No newline at end of file
diff --git a/api/businesslogic/ticket/CreateTicketForCustomerModel.php b/api/businesslogic/ticket/CreateTicketForCustomerModel.php
new file mode 100644
index 00000000..da4c233c
--- /dev/null
+++ b/api/businesslogic/ticket/CreateTicketForCustomerModel.php
@@ -0,0 +1,42 @@
+<?php
+
+class CreateTicketForCustomerModel {
+    // Metadata
+    /**
+     * @var string
+     */
+    public $name;
+
+    /**
+     * @var string
+     */
+    public $email;
+
+    /**
+     * @var integer
+     */
+    public $priority;
+
+    /**
+     * @var integer
+     */
+    public $category;
+
+    // Message
+    /**
+     * @var string
+     */
+    public $subject;
+
+    /**
+     * @var string
+     */
+    public $message;
+
+    /**
+     * @var array
+     */
+    public $customFields;
+
+    public $location;
+}
\ No newline at end of file
diff --git a/api/businesslogic/ticket/ticket_creator.php b/api/businesslogic/ticket/ticket_creator.php
new file mode 100644
index 00000000..d4eb6482
--- /dev/null
+++ b/api/businesslogic/ticket/ticket_creator.php
@@ -0,0 +1,93 @@
+<?php
+
+/**
+ * @param $ticket_request CreateTicketForCustomerModel
+ */
+function create_ticket_for_customer($ticket_request, $hesk_settings, $modsForHesk_settings) {
+    validate($ticket_request, false, $hesk_settings, $modsForHesk_settings);
+}
+
+/**
+ * @param $ticket_request CreateTicketForCustomerModel
+ * @param $staff bool
+ * @return ValidationModel If errorKeys is empty, validation successful. Otherwise invalid ticket
+ */
+function validate($ticket_request, $staff, $hesk_settings, $modsForHesk_settings) {
+    require_once('../email_validators.php');
+    //require_once('../category/retriever.php');
+    //require_once('../bans/retriever.php');
+
+    $TICKET_PRIORITY_CRITICAL = 0;
+
+    $validationModel = new ValidationModel();
+
+    if ($ticket_request->name === NULL || $ticket_request->name == '') {
+        $validationModel->errorKeys[] = 'NO_NAME';
+    }
+
+    if (hesk_validateEmail($ticket_request->email, $hesk_settings['multi_eml'], false)) {
+        $validationModel->errorKeys[] = 'INVALID_OR_MISSING_EMAIL';
+    }
+
+    if (intval($ticket_request->category) === 0) {
+        // TODO add support for invalid category ID
+        $validationModel->errorKeys[] = 'NO_CATEGORY';
+    }
+
+    // Don't allow critical priority tickets
+    if ($hesk_settings['cust_urgency'] && intval($ticket_request->priority) === $TICKET_PRIORITY_CRITICAL) {
+        $validationModel->errorKeys[] = 'CRITICAL_PRIORITY_FORBIDDEN';
+    }
+
+    if ($hesk_settings['require_subject'] === 1 &&
+        ($ticket_request->subject === NULL || $ticket_request->subject === '')) {
+        $validationModel->errorKeys[] = 'SUBJECT_REQUIRED';
+    }
+
+    if ($hesk_settings['require_message'] === 1 &&
+        ($ticket_request->message === NULL || $ticket_request->message === '')) {
+        $validationModel->errorKeys[] = 'MESSAGE_REQUIRED';
+    }
+
+    foreach ($hesk_settings['custom_fields'] as $key => $value) {
+        // TODO Only check categories that apply to this custom field
+        if ($value['use'] == 1 && hesk_is_custom_field_in_category($key, intval($ticket_request->category))) {
+            $custom_field_value = $ticket_request->customFields[$key];
+            if (empty($custom_field_value)) {
+                $validationModel->errorKeys[] = 'CUSTOM_FIELD_' . $key . '_INVALID::NO_VALUE';
+                continue;
+            }
+            switch($v['type']) {
+                case 'date':
+                    if (!preg_match("/^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$/", $custom_field_value)) {
+                        $validationModel->errorKeys[] = 'CUSTOM_FIELD_' . $key . '_INVALID::INVALID_DATE';
+                    } else {
+                        // Actually validate based on range
+                        $date = strtotime($custom_field_value . ' t00:00:00');
+                        $dmin = strlen($value['value']['dmin']) ? strtotime($value['value']['dmin'] . ' t00:00:00') : false;
+                        $dmax = strlen($value['value']['dmax']) ? strtotime($value['value']['dmax'] . ' t00:00:00') : false;
+
+                        if ($dmin && $dmin > $date) {
+                            $validationModel->errorKeys[] = 'CUSTOM_FIELD_' . $key . '_INVALID::DATE_BEFORE_MIN::MIN-' . $dmin . '::ENTERED-' . $date;
+                        } elseif ($dmax && $dmax < $date) {
+                            $validationModel->errorKeys[] = 'CUSTOM_FIELD_' . $key . '_INVALID::DATE_AFTER_MAX::MAX-' . $dmax . '::ENTERED-' . $date;
+                        }
+                    }
+                    break;
+                case 'email':
+                    if (!hesk_validateEmail($custom_field_value, $value['value']['multiple'], false)) {
+                        $validationModel->errorKeys[] = 'CUSTOM_FIELD_' . $key . '_INVALID::INVALID_OR_MISSING_EMAIL';
+                    }
+                    break;
+            }
+        }
+    }
+
+    // TODO Check bans (email only; don't check IP on REST requests as they'll most likely be sent via servers)
+    // TODO     submit_ticket.php:320-322
+
+    // TODO Check if we're at the max number of tickets
+    // TODO     submit_ticket.php:325-334
+
+    return $validationModel;
+}
\ No newline at end of file
diff --git a/api/loader.php b/api/loader.php
new file mode 100644
index 00000000..34a86085
--- /dev/null
+++ b/api/loader.php
@@ -0,0 +1,3 @@
+<?php
+// The loader is responsible for loading all necessary PHP classes to run the API. No more need to import everything
+// manually.
diff --git a/api/ticket/index.php b/api/ticket/index.php
index ad8cf76a..fb9b5b5c 100644
--- a/api/ticket/index.php
+++ b/api/ticket/index.php
@@ -3,7 +3,6 @@ define('IN_SCRIPT', 1);
 define('HESK_PATH', '../../');
 define('API_PATH', '../');
 require_once(HESK_PATH . 'hesk_settings.inc.php');
-require_once(HESK_PATH . 'inc/common.inc.php');
 require_once(API_PATH . 'core/headers.php');
 require_once(API_PATH . 'core/output.php');
 require_once(API_PATH . 'businesslogic/ticket_retriever.php');

From 4942fdbfda4e2acfa094e48a3eeb6739f23aac46 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sat, 14 Jan 2017 22:00:27 -0500
Subject: [PATCH 002/192] Use __DIR__ to make importing easier and only when
 required

---
 api/businesslogic/ValidationException.php     | 18 +++++++++++++++
 ...el.php => CreateTicketByCustomerModel.php} |  2 +-
 api/businesslogic/ticket/ticket_creator.php   | 22 ++++++++++++++-----
 3 files changed, 36 insertions(+), 6 deletions(-)
 create mode 100644 api/businesslogic/ValidationException.php
 rename api/businesslogic/ticket/{CreateTicketForCustomerModel.php => CreateTicketByCustomerModel.php} (92%)

diff --git a/api/businesslogic/ValidationException.php b/api/businesslogic/ValidationException.php
new file mode 100644
index 00000000..3f174212
--- /dev/null
+++ b/api/businesslogic/ValidationException.php
@@ -0,0 +1,18 @@
+<?php
+
+class ValidationException extends Exception {
+    public $validationModel;
+
+    /**
+     * ValidationException constructor.
+     * @param ValidationModel $validationModel The validatio model
+     * @throws Exception If the validationModel's errorKeys is empty
+     */
+    function __construct($validationModel) {
+        if (count($validationModel->errorKeys) === 0) {
+            throw new Exception('Tried to throw a ValidationException, but the validation model was valid!');
+        }
+
+        $this->validationModel = $validationModel;
+    }
+}
\ No newline at end of file
diff --git a/api/businesslogic/ticket/CreateTicketForCustomerModel.php b/api/businesslogic/ticket/CreateTicketByCustomerModel.php
similarity index 92%
rename from api/businesslogic/ticket/CreateTicketForCustomerModel.php
rename to api/businesslogic/ticket/CreateTicketByCustomerModel.php
index da4c233c..46840751 100644
--- a/api/businesslogic/ticket/CreateTicketForCustomerModel.php
+++ b/api/businesslogic/ticket/CreateTicketByCustomerModel.php
@@ -1,6 +1,6 @@
 <?php
 
-class CreateTicketForCustomerModel {
+class CreateTicketByCustomerModel {
     // Metadata
     /**
      * @var string
diff --git a/api/businesslogic/ticket/ticket_creator.php b/api/businesslogic/ticket/ticket_creator.php
index d4eb6482..b94bb0ce 100644
--- a/api/businesslogic/ticket/ticket_creator.php
+++ b/api/businesslogic/ticket/ticket_creator.php
@@ -1,19 +1,31 @@
 <?php
 
 /**
- * @param $ticket_request CreateTicketForCustomerModel
+ * @param $ticket_request CreateTicketByCustomerModel
+ * @param $hesk_settings array HESK settings
+ * @param $modsForHesk_settings array Mods for HESK settings
+ * @throws ValidationException When a required field in $ticket_request is missing
  */
-function create_ticket_for_customer($ticket_request, $hesk_settings, $modsForHesk_settings) {
-    validate($ticket_request, false, $hesk_settings, $modsForHesk_settings);
+function createTicketByCustomer($ticket_request, $hesk_settings, $modsForHesk_settings) {
+    $validationModel = validate($ticket_request, false, $hesk_settings, $modsForHesk_settings);
+
+    if (count($validationModel->errorKeys) > 0) {
+        require_once(__DIR__ . '/../ValidationException.php');
+
+        // Validation failed
+        throw new ValidationException($validationModel);
+    }
+
+    // Create the ticket
 }
 
 /**
- * @param $ticket_request CreateTicketForCustomerModel
+ * @param $ticket_request CreateTicketByCustomerModel
  * @param $staff bool
  * @return ValidationModel If errorKeys is empty, validation successful. Otherwise invalid ticket
  */
 function validate($ticket_request, $staff, $hesk_settings, $modsForHesk_settings) {
-    require_once('../email_validators.php');
+    require_once(__DIR__ . '/../email_validators.php');
     //require_once('../category/retriever.php');
     //require_once('../bans/retriever.php');
 

From 403b87bbda057af8cf9c004261a0bcce3fc7b92c Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Mon, 16 Jan 2017 22:21:11 -0500
Subject: [PATCH 003/192] Bunch of stuff

---
 api/businesslogic/category/Category.php       | 45 ++++++++++++++
 .../category/CategoryRetriever.php            | 19 ++++++
 api/businesslogic/category/retriever.php      |  5 ++
 api/businesslogic/ticket/ticket_creator.php   |  3 +-
 api/businesslogic/ticket_retriever.php        |  1 +
 api/category/index.php                        | 58 -------------------
 api/controllers/CategoryController.php        | 19 ++++++
 api/dao/CategoryGateway.php                   | 38 ++++++++++++
 api/dao/Connection.php                        | 26 +++++++++
 api/index.php                                 |  8 +++
 api/loader.php                                |  3 -
 11 files changed, 163 insertions(+), 62 deletions(-)
 create mode 100644 api/businesslogic/category/Category.php
 create mode 100644 api/businesslogic/category/CategoryRetriever.php
 create mode 100644 api/businesslogic/category/retriever.php
 delete mode 100644 api/category/index.php
 create mode 100644 api/controllers/CategoryController.php
 create mode 100644 api/dao/CategoryGateway.php
 create mode 100644 api/dao/Connection.php
 create mode 100644 api/index.php
 delete mode 100644 api/loader.php

diff --git a/api/businesslogic/category/Category.php b/api/businesslogic/category/Category.php
new file mode 100644
index 00000000..77a6be9c
--- /dev/null
+++ b/api/businesslogic/category/Category.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace BusinessObjects;
+
+class Category {
+    /**
+     * @var int The category ID
+     */
+    public $id;
+
+    /**
+     * @var int Category order number
+     */
+    public $catOrder;
+
+    /**
+     * @var bool Tickets autoassigned in this category
+     */
+    public $autoAssign;
+
+    /**
+     * @var int The type of category (1 = Private, 2 = Public)
+     */
+    public $type;
+
+    /**
+     * @var int The category's usage (0 = Tickets and Events, 1 = Tickets, 2 = Events)
+     */
+    public $usage;
+
+    /**
+     * @var string? The color of the category
+     */
+    public $color;
+
+    /**
+     * @var int The default ticket priority
+     */
+    public $priority;
+
+    /**
+     * @var int? The manager for the category, if applicable
+     */
+    public $manager;
+}
\ No newline at end of file
diff --git a/api/businesslogic/category/CategoryRetriever.php b/api/businesslogic/category/CategoryRetriever.php
new file mode 100644
index 00000000..0a40bfda
--- /dev/null
+++ b/api/businesslogic/category/CategoryRetriever.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: user
+ * Date: 1/16/17
+ * Time: 10:10 PM
+ */
+
+namespace BusinessLogic\Category;
+
+use DataAccess\CategoryGateway;
+
+class CategoryRetriever {
+    static function get_all_categories($hesk_settings) {
+        require_once(__DIR__ . '/../../dao/CategoryGateway.php');
+
+        return CategoryGateway::getAllCategories($hesk_settings);
+    }
+}
\ No newline at end of file
diff --git a/api/businesslogic/category/retriever.php b/api/businesslogic/category/retriever.php
new file mode 100644
index 00000000..d8e45267
--- /dev/null
+++ b/api/businesslogic/category/retriever.php
@@ -0,0 +1,5 @@
+<?php
+namespace BusinessLogic\Category;
+
+use DataAccess\CategoryGateway;
+
diff --git a/api/businesslogic/ticket/ticket_creator.php b/api/businesslogic/ticket/ticket_creator.php
index b94bb0ce..5edfee18 100644
--- a/api/businesslogic/ticket/ticket_creator.php
+++ b/api/businesslogic/ticket/ticket_creator.php
@@ -26,6 +26,7 @@ function createTicketByCustomer($ticket_request, $hesk_settings, $modsForHesk_se
  */
 function validate($ticket_request, $staff, $hesk_settings, $modsForHesk_settings) {
     require_once(__DIR__ . '/../email_validators.php');
+    require_once(__DIR__ . '/../../dao/category_dao.php');
     //require_once('../category/retriever.php');
     //require_once('../bans/retriever.php');
 
@@ -42,7 +43,7 @@ function validate($ticket_request, $staff, $hesk_settings, $modsForHesk_settings
     }
 
     if (intval($ticket_request->category) === 0) {
-        // TODO add support for invalid category ID
+        $allCategories = null;
         $validationModel->errorKeys[] = 'NO_CATEGORY';
     }
 
diff --git a/api/businesslogic/ticket_retriever.php b/api/businesslogic/ticket_retriever.php
index eaa06d5c..282af64e 100644
--- a/api/businesslogic/ticket_retriever.php
+++ b/api/businesslogic/ticket_retriever.php
@@ -2,6 +2,7 @@
 require_once(API_PATH . 'dao/ticket_dao.php');
 
 function get_ticket_for_staff($hesk_settings, $user, $id = NULL) {
+
     $tickets = get_ticket_for_id($hesk_settings, $user, $id);
 
     if ($tickets == NULL) {
diff --git a/api/category/index.php b/api/category/index.php
deleted file mode 100644
index 7e3b27b0..00000000
--- a/api/category/index.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-define('IN_SCRIPT', 1);
-define('HESK_PATH', '../../');
-define('API_PATH', '../');
-require_once(HESK_PATH . 'hesk_settings.inc.php');
-require_once(HESK_PATH . 'inc/common.inc.php');
-require_once(API_PATH . 'core/output.php');
-require_once(API_PATH . 'dao/category_dao.php');
-
-hesk_load_api_database_functions();
-hesk_dbConnect();
-
-// Routing
-$request_method = $_SERVER['REQUEST_METHOD'];
-
-/**
- * @api {get} /category Retrieve a ticket category
- * @apiVersion 0.0.0
- * @apiName GetCategory
- * @apiGroup Category
- * @apiPermission public
- *
- * @apiParam {Number} [id] The ID of the category. Omit for all categories.
- *
- * @apiSuccess {Number} id ID of the category
- * @apiSuccess {String} name The name of the category
- * @apiSuccess {Integer} displayOrder The order of the category (in multiples of 10)
- * @apiSuccess {Boolean} autoassign `true` if tickets set to this category are automatically assigned.<br>`false` otherwise
- * @apiSuccess {Integer} type `0` - Public<br>`1` - Private
- * @apiSuccess {Integer} priority Default priority of tickets created in this category
- * @apiSuccess {Integer} manager User ID of the category manager, or `null` if there is no manager.
- *
- * @apiSuccessExample {json} Success-Response:
- *     HTTP/1.1 200 OK
- *     {
- *          "id": 1,
- *          "name": "General",
- *          "displayOrder": 10,
- *          "autoassign": true,
- *          "type": 0,
- *          "priority": 2,
- *          "manager": null
- *     }
- */
-if ($request_method == 'GET') {
-    if (isset($_GET['id'])) {
-        $results = get_category($hesk_settings, $_GET['id']);
-    } else {
-        $results = get_category($hesk_settings);
-    }
-
-    if ($results == NULL) {
-        return http_response_code(404);
-    }
-    return output($results);
-}
-
-return http_response_code(405);
diff --git a/api/controllers/CategoryController.php b/api/controllers/CategoryController.php
new file mode 100644
index 00000000..46558d4e
--- /dev/null
+++ b/api/controllers/CategoryController.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: user
+ * Date: 1/16/17
+ * Time: 10:12 PM
+ */
+
+namespace Controllers\Category;
+
+use BusinessLogic\Category\CategoryRetriever;
+
+class CategoryController {
+    static function getAllCategories($hesk_settings) {
+        require_once(__DIR__ . '/../businesslogic/category/CategoryRetriever.php');
+
+        return json_encode(CategoryRetriever::get_all_categories($hesk_settings));
+    }
+}
\ No newline at end of file
diff --git a/api/dao/CategoryGateway.php b/api/dao/CategoryGateway.php
new file mode 100644
index 00000000..465aae28
--- /dev/null
+++ b/api/dao/CategoryGateway.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: user
+ * Date: 1/16/17
+ * Time: 10:06 PM
+ */
+
+namespace DataAccess;
+
+use BusinessObjects\Category;
+
+class CategoryGateway {
+    static function getAllCategories($hesk_settings) {
+        require_once(__DIR__ . '/../businesslogic/category/Category.php');
+
+        $sql = 'SELECT * FROM `' . \hesk_dbEscape($hesk_settings['db_pfix']) . 'categories`';
+
+        $response = hesk_dbQuery($sql);
+
+        $results = array();
+        while ($row = hesk_dbFetchAssoc($response)) {
+            $category = new Category();
+
+            $category->id = intval($row['id']);
+            $category->catOrder = intval($row['cat_order']);
+            $category->autoAssign = $row['autoassign'] == 1;
+            $category->type = intval($row['type']);
+            $category->usage = intval($row['usage']);
+            $category->color = $row['color'];
+            $category->priority = intval($row['priority']);
+            $category->manager = intval($row['manager']) == 0 ? NULL : intval($row['manager']);
+            $results[$category->id] = $category;
+        }
+
+        return $results;
+    }
+}
\ No newline at end of file
diff --git a/api/dao/Connection.php b/api/dao/Connection.php
new file mode 100644
index 00000000..d7da3228
--- /dev/null
+++ b/api/dao/Connection.php
@@ -0,0 +1,26 @@
+<?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
new file mode 100644
index 00000000..27528b5e
--- /dev/null
+++ b/api/index.php
@@ -0,0 +1,8 @@
+<?php
+define('IN_SCRIPT', 1);
+
+// Just call the controller
+require_once(__DIR__ . '/controllers/CategoryController.php');
+require_once(__DIR__ . '/../hesk_settings.inc.php');
+
+\Controllers\Category\CategoryController::getAllCategories($hesk_settings);
\ No newline at end of file
diff --git a/api/loader.php b/api/loader.php
deleted file mode 100644
index 34a86085..00000000
--- a/api/loader.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-// The loader is responsible for loading all necessary PHP classes to run the API. No more need to import everything
-// manually.

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 004/192] 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()
 

From b7cbca03a779315e2f01b5180d12d4cad1ed78f1 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Tue, 17 Jan 2017 22:08:48 -0500
Subject: [PATCH 005/192] Getting started on routing

---
 api/index.php        | 11 ++++-------
 api/testcategory.php | 11 +++++++++++
 2 files changed, 15 insertions(+), 7 deletions(-)
 create mode 100644 api/testcategory.php

diff --git a/api/index.php b/api/index.php
index cd9592ab..215544c5 100644
--- a/api/index.php
+++ b/api/index.php
@@ -1,11 +1,8 @@
 <?php
-define('IN_SCRIPT', 1);
-define('HESK_PATH', '../');
-
+// Router: handles all REST requests to go to their proper place. Common dependency loading also happens here
 require_once(__DIR__ . '/core/common.php');
-require_once(__DIR__ . '/controllers/CategoryController.php');
-hesk_load_api_database_functions();
 
-$categories = \Controllers\Category\CategoryController::getAllCategories($hesk_settings);
+// Returns the URI (or everything after the domain
+$uri = $_SERVER["REQUEST_URI"];
 
-output($categories);
\ No newline at end of file
+// 
\ No newline at end of file
diff --git a/api/testcategory.php b/api/testcategory.php
new file mode 100644
index 00000000..cd9592ab
--- /dev/null
+++ b/api/testcategory.php
@@ -0,0 +1,11 @@
+<?php
+define('IN_SCRIPT', 1);
+define('HESK_PATH', '../');
+
+require_once(__DIR__ . '/core/common.php');
+require_once(__DIR__ . '/controllers/CategoryController.php');
+hesk_load_api_database_functions();
+
+$categories = \Controllers\Category\CategoryController::getAllCategories($hesk_settings);
+
+output($categories);
\ No newline at end of file

From 5e21877efc8807ee25a92043fb859ca5d4c64c0b Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Tue, 17 Jan 2017 22:12:45 -0500
Subject: [PATCH 006/192] Add Link for simple API routing

---
 Link          |  1 +
 api/index.php | 14 ++++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)
 create mode 160000 Link

diff --git a/Link b/Link
new file mode 160000
index 00000000..6176303a
--- /dev/null
+++ b/Link
@@ -0,0 +1 @@
+Subproject commit 6176303ac4e34fadaa393a4c06d169aef3fbb32e
diff --git a/api/index.php b/api/index.php
index 215544c5..dfcb9e63 100644
--- a/api/index.php
+++ b/api/index.php
@@ -1,8 +1,14 @@
 <?php
+//define('IN_SCRIPT', 1);
+//define('HESK_PATH', '../');
 // Router: handles all REST requests to go to their proper place. Common dependency loading also happens here
-require_once(__DIR__ . '/core/common.php');
+//require_once(__DIR__ . '/core/common.php');
+require(__DIR__ . '/../Link/src/Link.php');
 
-// Returns the URI (or everything after the domain
-$uri = $_SERVER["REQUEST_URI"];
+function routeMe(){
+    echo 'I am routed';
+}
 
-// 
\ No newline at end of file
+Link::all( array(
+    '/test' => 'routeMe',
+));
\ No newline at end of file

From d9000c12c74fece118fe8e49056f2dcb799f9ffb Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Wed, 18 Jan 2017 17:22:24 -0500
Subject: [PATCH 007/192] More routing changes

---
 api/index.php | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/api/index.php b/api/index.php
index dfcb9e63..ca5719ef 100644
--- a/api/index.php
+++ b/api/index.php
@@ -5,10 +5,26 @@
 //require_once(__DIR__ . '/core/common.php');
 require(__DIR__ . '/../Link/src/Link.php');
 
-function routeMe(){
-    echo 'I am routed';
+class HomeController
+{
+
+    function get($i){
+        echo 'You have got to home :) Val:' . intval($i);
+    }
+
+    function post(){
+        echo 'You have posted to home';
+    }
+
+    function put(){
+        echo 'You have put to home';
+    }
+
+    function delete(){
+        echo 'You have deleted the home :(';
+    }
 }
 
-Link::all( array(
-    '/test' => 'routeMe',
+Link::all(array(
+    '/test/{i}' => 'HomeController',
 ));
\ No newline at end of file

From c184469219408a03f6fb96bee9cb97406a01e962 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Wed, 18 Jan 2017 21:56:12 -0500
Subject: [PATCH 008/192] Able to hit a controller through link

---
 api/controllers/CategoryController.php |  4 ++++
 api/index.php                          | 20 ++++++++++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/api/controllers/CategoryController.php b/api/controllers/CategoryController.php
index 07558d9d..cf27e2b8 100644
--- a/api/controllers/CategoryController.php
+++ b/api/controllers/CategoryController.php
@@ -11,6 +11,10 @@ namespace Controllers\Category;
 use BusinessLogic\Category\CategoryRetriever;
 
 class CategoryController {
+    function get($i) {
+        print json_encode(intval($i));
+    }
+
     static function getAllCategories($hesk_settings) {
         require_once(__DIR__ . '/../businesslogic/category/CategoryRetriever.php');
 
diff --git a/api/index.php b/api/index.php
index ca5719ef..0529e779 100644
--- a/api/index.php
+++ b/api/index.php
@@ -1,9 +1,14 @@
 <?php
-//define('IN_SCRIPT', 1);
-//define('HESK_PATH', '../');
 // Router: handles all REST requests to go to their proper place. Common dependency loading also happens here
-//require_once(__DIR__ . '/core/common.php');
+define('IN_SCRIPT', 1);
+define('HESK_PATH', '../');
+require_once(__DIR__ . '/core/common.php');
 require(__DIR__ . '/../Link/src/Link.php');
+require(__DIR__ . '/../hesk_settings.inc.php');
+
+// Controllers
+require(__DIR__ . '/controllers/CategoryController.php');
+
 
 class HomeController
 {
@@ -25,6 +30,13 @@ class HomeController
     }
 }
 
+function handle404() {
+    http_response_code(404);
+    print json_encode('404 found');
+}
+
+// Must use fully-qualified namespace to controllers
 Link::all(array(
-    '/test/{i}' => 'HomeController',
+    '/test/{i}' => '\Controllers\Category\CategoryController',
+    '404' => 'handle404'
 ));
\ No newline at end of file

From 96120bc74482e8233f3e02ba0de2ecb4c4201e70 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Fri, 20 Jan 2017 07:19:39 -0500
Subject: [PATCH 009/192] Working on user context

---
 api/businesslogic/security/UserContext.php    | 32 ++++++++++++++++
 .../security/UserContextBuilder.php           | 38 +++++++++++++++++++
 .../security/UserContextNotifications.php     | 21 ++++++++++
 .../security/UserContextPreferences.php       | 21 ++++++++++
 api/dao/CategoryGateway.php                   |  2 +
 api/index.php                                 |  7 ++++
 6 files changed, 121 insertions(+)
 create mode 100644 api/businesslogic/security/UserContext.php
 create mode 100644 api/businesslogic/security/UserContextBuilder.php
 create mode 100644 api/businesslogic/security/UserContextNotifications.php
 create mode 100644 api/businesslogic/security/UserContextPreferences.php

diff --git a/api/businesslogic/security/UserContext.php b/api/businesslogic/security/UserContext.php
new file mode 100644
index 00000000..ec99ccf9
--- /dev/null
+++ b/api/businesslogic/security/UserContext.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace BusinessLogic\Security;
+
+
+class UserContext {
+    public $id;
+    public $username;
+    public $admin;
+    public $name;
+    public $email;
+    public $signature;
+    public $language;
+    public $categories;
+    public $permissions;
+
+    /**
+     * @var UserContextPreferences
+     */
+    public $preferences;
+
+    /**
+     * @var UserContextNotifications
+     */
+    public $notificationSettings;
+    public $autoAssign;
+    public $ratingNegative;
+    public $ratingPositive;
+    public $rating;
+    public $totalNumberOfReplies;
+    public $active;
+}
\ No newline at end of file
diff --git a/api/businesslogic/security/UserContextBuilder.php b/api/businesslogic/security/UserContextBuilder.php
new file mode 100644
index 00000000..5e63741b
--- /dev/null
+++ b/api/businesslogic/security/UserContextBuilder.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace BusinessLogic\Security;
+
+
+class UserContextBuilder {
+    static function buildUserContext($authToken, $hesk_settings) {
+        //$userForToken = gateway.getUserForToken($authToken);
+
+    }
+
+    /**
+     * Builds a user context based on the current session. **The session must be active!**
+     * @return UserContext the built user context
+     */
+    static function fromSession() {
+        require_once(__DIR__ . '/UserContext.php');
+        require_once(__DIR__ . '/UserContextPreferences.php');
+
+        $userContext = new UserContext();
+        $userContext->id = $_SESSION['id'];
+        $userContext->username = $_SESSION['user'];
+        $userContext->admin = $_SESSION['isadmin'];
+        $userContext->name = $_SESSION['name'];
+        $userContext->email = $_SESSION['email'];
+        $userContext->signature = $_SESSION['signature'];
+        $userContext->language = $_SESSION['language'];
+        $userContext->categories = explode(',', $_SESSION['categories']);
+
+        $preferences = new UserContextPreferences();
+        $preferences->afterReply = $_SESSION['afterreply'];
+        $preferences->autoStartTimeWorked = $_SESSION['autostart'];
+        $preferences-
+
+
+        return $userContext;
+    }
+}
\ No newline at end of file
diff --git a/api/businesslogic/security/UserContextNotifications.php b/api/businesslogic/security/UserContextNotifications.php
new file mode 100644
index 00000000..caada957
--- /dev/null
+++ b/api/businesslogic/security/UserContextNotifications.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: user
+ * Date: 1/19/17
+ * Time: 8:51 PM
+ */
+
+namespace BusinessLogic\Security;
+
+
+class UserContextNotifications {
+    public $newUnassigned;
+    public $newAssignedToMe;
+    public $replyUnassigned;
+    public $replyToMe;
+    public $privateMessage;
+    public $noteOnTicketAssignedToMe;
+    public $noteOnTicketNotAssignedToMe;
+    public $overdueTicketUnassigned;
+}
\ No newline at end of file
diff --git a/api/businesslogic/security/UserContextPreferences.php b/api/businesslogic/security/UserContextPreferences.php
new file mode 100644
index 00000000..37c73e23
--- /dev/null
+++ b/api/businesslogic/security/UserContextPreferences.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: user
+ * Date: 1/19/17
+ * Time: 8:49 PM
+ */
+
+namespace BusinessLogic\Security;
+
+
+class UserContextPreferences {
+    public $afterReply;
+    public $autoStartTimeWorked;
+    public $autoreload;
+    public $defaultNotifyCustomerNewTicket;
+    public $defaultNotifyCustomerReply;
+    public $showSuggestedKnowledgebaseArticles;
+    public $defaultCalendarView;
+    public $defaultTicketView;
+}
\ No newline at end of file
diff --git a/api/dao/CategoryGateway.php b/api/dao/CategoryGateway.php
index 47886f2c..2ae16bee 100644
--- a/api/dao/CategoryGateway.php
+++ b/api/dao/CategoryGateway.php
@@ -39,6 +39,8 @@ class CategoryGateway {
             $results[$category->id] = $category;
         }
 
+        hesk_dbClose();
+
         return $results;
     }
 }
\ No newline at end of file
diff --git a/api/index.php b/api/index.php
index 0529e779..c7e90a44 100644
--- a/api/index.php
+++ b/api/index.php
@@ -35,8 +35,15 @@ function handle404() {
     print json_encode('404 found');
 }
 
+function assertApiIsEnabled() {
+    //-- TODO
+}
+
 // Must use fully-qualified namespace to controllers
+Link::before('assertApiIsEnabled');
+
 Link::all(array(
+    '/' => 'assertApiIsEnabled',
     '/test/{i}' => '\Controllers\Category\CategoryController',
     '404' => 'handle404'
 ));
\ No newline at end of file

From 17f6bb770d74ce0a7f3738cb9878c81b6a37b633 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Fri, 20 Jan 2017 21:50:58 -0500
Subject: [PATCH 010/192] UserContextBuilder mostly done

---
 .../security/UserContextBuilder.php           | 50 ++++++++++++++-----
 .../security/UserContextNotifications.php     |  1 +
 2 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/api/businesslogic/security/UserContextBuilder.php b/api/businesslogic/security/UserContextBuilder.php
index 5e63741b..2ec6c954 100644
--- a/api/businesslogic/security/UserContextBuilder.php
+++ b/api/businesslogic/security/UserContextBuilder.php
@@ -11,27 +11,53 @@ class UserContextBuilder {
 
     /**
      * Builds a user context based on the current session. **The session must be active!**
+     * @param $dataRow array the $_SESSION superglobal or the hesk_users result set
      * @return UserContext the built user context
      */
-    static function fromSession() {
+    static function fromSession($dataRow) {
         require_once(__DIR__ . '/UserContext.php');
         require_once(__DIR__ . '/UserContextPreferences.php');
+        require_once(__DIR__ . '/UserContextNotifications.php');
 
         $userContext = new UserContext();
-        $userContext->id = $_SESSION['id'];
-        $userContext->username = $_SESSION['user'];
-        $userContext->admin = $_SESSION['isadmin'];
-        $userContext->name = $_SESSION['name'];
-        $userContext->email = $_SESSION['email'];
-        $userContext->signature = $_SESSION['signature'];
-        $userContext->language = $_SESSION['language'];
-        $userContext->categories = explode(',', $_SESSION['categories']);
+        $userContext->id = $dataRow['id'];
+        $userContext->username = $dataRow['user'];
+        $userContext->admin = $dataRow['isadmin'];
+        $userContext->name = $dataRow['name'];
+        $userContext->email = $dataRow['email'];
+        $userContext->signature = $dataRow['signature'];
+        $userContext->language = $dataRow['language'];
+        $userContext->categories = explode(',', $dataRow['categories']);
+        $userContext->permissions = explode(',', $dataRow['heskprivileges']);
+        $userContext->autoAssign = $dataRow['autoassign'];
+        $userContext->ratingNegative = $dataRow['ratingneg'];
+        $userContext->ratingPositive = $dataRow['ratingpos'];
+        $userContext->rating = $dataRow['rating'];
+        $userContext->totalNumberOfReplies = $dataRow['replies'];
+        $userContext->active = $dataRow['active'];
 
         $preferences = new UserContextPreferences();
-        $preferences->afterReply = $_SESSION['afterreply'];
-        $preferences->autoStartTimeWorked = $_SESSION['autostart'];
-        $preferences-
+        $preferences->afterReply = $dataRow['afterreply'];
+        $preferences->autoStartTimeWorked = $dataRow['autostart'];
+        $preferences->autoreload = $dataRow['autoreload'];
+        $preferences->defaultNotifyCustomerNewTicket = $dataRow['notify_customer_new'];
+        $preferences->defaultNotifyCustomerReply = $dataRow['notify_customer_reply'];
+        $preferences->showSuggestedKnowledgebaseArticles = $dataRow['show_suggested'];
+        $preferences->defaultCalendarView = $dataRow['default_calendar_view'];
+        $preferences->defaultTicketView = $dataRow['default_list'];
+        $userContext->preferences = $preferences;
 
+        $notifications = new UserContextNotifications();
+        $notifications->newUnassigned = $dataRow['notify_new_unassigned'];
+        $notifications->newAssignedToMe = $dataRow['notify_new_my'];
+        $notifications->replyUnassigned = $dataRow['notify_reply_unassigned'];
+        $notifications->replyToMe = $dataRow['notify_reply_my'];
+        $notifications->ticketAssignedToMe = $dataRow['notify_assigned'];
+        $notifications->privateMessage = $dataRow['notify_pm'];
+        $notifications->noteOnTicketAssignedToMe = $dataRow['notify_note'];
+        $notifications->noteOnTicketNotAssignedToMe = $dataRow['notify_note_unassigned'];
+        $notifications->overdueTicketUnassigned = $dataRow['notify_overdue_unassigned'];
+        $userContext->notificationSettings = $notifications;
 
         return $userContext;
     }
diff --git a/api/businesslogic/security/UserContextNotifications.php b/api/businesslogic/security/UserContextNotifications.php
index caada957..aab70faa 100644
--- a/api/businesslogic/security/UserContextNotifications.php
+++ b/api/businesslogic/security/UserContextNotifications.php
@@ -14,6 +14,7 @@ class UserContextNotifications {
     public $newAssignedToMe;
     public $replyUnassigned;
     public $replyToMe;
+    public $ticketAssignedToMe;
     public $privateMessage;
     public $noteOnTicketAssignedToMe;
     public $noteOnTicketNotAssignedToMe;

From 93431e9a981faff99c5b2365868981ec43c75e57 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sat, 21 Jan 2017 16:34:03 -0500
Subject: [PATCH 011/192] Build the user context based on hashed token

---
 .../security/UserContextBuilder.php           |  8 +++--
 api/dao/UserDao.php                           | 34 +++++++++++++++++++
 2 files changed, 39 insertions(+), 3 deletions(-)
 create mode 100644 api/dao/UserDao.php

diff --git a/api/businesslogic/security/UserContextBuilder.php b/api/businesslogic/security/UserContextBuilder.php
index 2ec6c954..a6d22645 100644
--- a/api/businesslogic/security/UserContextBuilder.php
+++ b/api/businesslogic/security/UserContextBuilder.php
@@ -3,10 +3,12 @@
 namespace BusinessLogic\Security;
 
 
+use DataAccess\Security\UserDao;
+
 class UserContextBuilder {
     static function buildUserContext($authToken, $hesk_settings) {
-        //$userForToken = gateway.getUserForToken($authToken);
-
+        $hashedToken = hash('sha512', $authToken);
+        return UserDao::getUserForAuthToken($hashedToken, $hesk_settings);
     }
 
     /**
@@ -14,7 +16,7 @@ class UserContextBuilder {
      * @param $dataRow array the $_SESSION superglobal or the hesk_users result set
      * @return UserContext the built user context
      */
-    static function fromSession($dataRow) {
+    static function fromDataRow($dataRow) {
         require_once(__DIR__ . '/UserContext.php');
         require_once(__DIR__ . '/UserContextPreferences.php');
         require_once(__DIR__ . '/UserContextNotifications.php');
diff --git a/api/dao/UserDao.php b/api/dao/UserDao.php
new file mode 100644
index 00000000..a2e14c77
--- /dev/null
+++ b/api/dao/UserDao.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: user
+ * Date: 1/21/17
+ * Time: 4:23 PM
+ */
+
+namespace DataAccess\Security;
+
+
+use BusinessLogic\Security\UserContextBuilder;
+use Exception;
+
+class UserDao {
+    static function getUserForAuthToken($hashedToken, $hesk_settings) {
+        require_once(__DIR__ . '/../businesslogic/security/UserContextBuilder.php');
+
+        if (!function_exists('hesk_dbConnect')) {
+            throw new Exception('Database not loaded!');
+        }
+        hesk_dbConnect();
+
+        $rs = hesk_dbQuery('SELECT * FROM `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'users` WHERE `id` = (
+                SELECT ``
+                FROM `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'user_api_tokens`
+                WHERE `token` = ' . hesk_dbEscape($hashedToken) . '
+            )');
+
+        $row = hesk_dbFetchAssoc($rs);
+
+        return UserContextBuilder::fromDataRow($row);
+    }
+}
\ No newline at end of file

From aff8dadd2751c4d06085976eea652c8d5004188c Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sat, 21 Jan 2017 22:09:29 -0500
Subject: [PATCH 012/192] Category Controller is working

---
 api/controllers/CategoryController.php | 12 +++++++++---
 api/index.php                          | 27 ++++----------------------
 2 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/api/controllers/CategoryController.php b/api/controllers/CategoryController.php
index cf27e2b8..14cc66ff 100644
--- a/api/controllers/CategoryController.php
+++ b/api/controllers/CategoryController.php
@@ -11,11 +11,17 @@ namespace Controllers\Category;
 use BusinessLogic\Category\CategoryRetriever;
 
 class CategoryController {
-    function get($i) {
-        print json_encode(intval($i));
+    function get($id) {
+        $categories = self::getAllCategories();
+        output($categories[$id]);
     }
 
-    static function getAllCategories($hesk_settings) {
+    static function printAllCategories() {
+        output(self::getAllCategories());
+    }
+
+    private static function getAllCategories() {
+        global $hesk_settings;
         require_once(__DIR__ . '/../businesslogic/category/CategoryRetriever.php');
 
         return CategoryRetriever::get_all_categories($hesk_settings);
diff --git a/api/index.php b/api/index.php
index c7e90a44..5858499e 100644
--- a/api/index.php
+++ b/api/index.php
@@ -8,27 +8,7 @@ require(__DIR__ . '/../hesk_settings.inc.php');
 
 // Controllers
 require(__DIR__ . '/controllers/CategoryController.php');
-
-
-class HomeController
-{
-
-    function get($i){
-        echo 'You have got to home :) Val:' . intval($i);
-    }
-
-    function post(){
-        echo 'You have posted to home';
-    }
-
-    function put(){
-        echo 'You have put to home';
-    }
-
-    function delete(){
-        echo 'You have deleted the home :(';
-    }
-}
+hesk_load_api_database_functions();
 
 function handle404() {
     http_response_code(404);
@@ -43,7 +23,8 @@ function assertApiIsEnabled() {
 Link::before('assertApiIsEnabled');
 
 Link::all(array(
-    '/' => 'assertApiIsEnabled',
-    '/test/{i}' => '\Controllers\Category\CategoryController',
+    // Categories
+    '/v1/categories' => '\Controllers\Category\CategoryController::printAllCategories',
+    '/v1/categories/{i}' => '\Controllers\Category\CategoryController',
     '404' => 'handle404'
 ));
\ No newline at end of file

From dc07f5e757dace3b9ffbacabd23c42c9aa824582 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Wed, 25 Jan 2017 21:27:39 -0500
Subject: [PATCH 013/192] Move link to the api folder

---
 Link          |   1 -
 api/Link.php  | 218 ++++++++++++++++++++++++++++++++++++++++++++++++++
 api/index.php |   2 +-
 3 files changed, 219 insertions(+), 2 deletions(-)
 delete mode 160000 Link
 create mode 100644 api/Link.php

diff --git a/Link b/Link
deleted file mode 160000
index 6176303a..00000000
--- a/Link
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6176303ac4e34fadaa393a4c06d169aef3fbb32e
diff --git a/api/Link.php b/api/Link.php
new file mode 100644
index 00000000..090e666d
--- /dev/null
+++ b/api/Link.php
@@ -0,0 +1,218 @@
+<?php
+
+/**
+ * @class Main class of the Link router that helps you create and deploy routes
+ */	
+class Link 
+{
+
+	/**
+	 * @var array A collection of the routes originally passed into all function. Used by static function route
+	 */	
+	private static $routes = array();
+
+	/**
+	 * @var array A collection of functions that are executed before a route completion ( valid for all routes ), aka universal before functions
+	 */	
+	private static $beforeFuncs = array();
+
+	/**
+	 * @var array A collection of function that are executed after a route completion ( valid for all routes ), aka universal after functions
+	 */	
+	private static $afterFuncs = array();
+
+	/**
+	 * Static function of the class Link that deploys the route according to the passed handler and path
+	 * 
+	 * @param array $routes An array of combination of the path and its handler, that are final deployed for a particular url
+	 */	
+	public static function all( $routes ) 
+	{
+
+		/* Call all functions that are to be executed before routing */
+		foreach( self::$beforeFuncs as $beforeFunc ) {
+			if( $beforeFunc[1] ) {
+				call_user_func_array( $beforeFunc[0] , $beforeFunc[1] );
+			} else {
+				call_user_func( $beforeFunc[0] );
+			}
+		}
+
+		self::$routes = $routes;
+		$method = strtolower($_SERVER['REQUEST_METHOD']);
+		$path = '/';
+		$handler = null;
+		$matched = array();
+		if ( !empty ( $_SERVER['PATH_INFO'] ) ) {
+			$path = $_SERVER['PATH_INFO'];
+		} else if ( !empty ( $_SERVER['REQUEST_URI'] ) ) {
+            $path = parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH);
+		}
+
+		if ( isset($routes[$path] ) ) {
+			if( is_array( $routes[$path] ) ) {
+				$handler = $routes[$path][0];
+			} else {
+				$handler = $routes[$path];
+			}
+		} else if ( $routes ) {
+			
+			$regex = array(
+				'/{i}/',
+				'/{s}/',
+				'/{a}/'
+				);
+
+			$replacements = array(
+				'([\d]+)'	,
+				'([a-zA-Z]+)',
+				'([\w-]+)'
+				);
+
+			foreach ( $routes as $routePath => $routeDesc ){
+				$routePath = preg_replace( $regex, $replacements, $routePath );
+				if( preg_match( '#^/?' . $routePath . '/?$#', $path, $matches ) ){
+					if( is_array( $routeDesc ) ) {
+						$handler = $routeDesc[0];
+						if( isset( $routeDesc[2] )) {
+							$middleware = $routeDesc[2];
+						}
+					}
+					else 
+						$handler = $routeDesc;
+					$matched = $matches;
+					break;
+				}
+			}
+		}
+		unset( $matched[0] );
+
+		if( isset($middleware) ){
+			$newMatched = self::callFunction( $middleware, $matched, $method );
+			/* If new wildcard param are there pass them to main handler */
+			if( $newMatched ) { 
+				self::callFunction( $handler, $newMatched, $method );
+			} else {
+				self::callFunction( $handler, $matched, $method );
+			}
+		} else {
+			self::callFunction( $handler, $matched, $method );
+		}
+
+		/* Call all the function that are to be executed after routing */
+		foreach( self::$afterFuncs as $afterFunc )
+			if( $afterFunc[1] ) {
+				call_user_func_array( $afterFunc[0] , $afterFunc[1] );
+			} else {
+				call_user_func( $afterFunc[0] );
+			}
+	}
+
+	/**
+	 * Static function that helps you generate links effortlessly and pass parameters to them, thus enabling to generate dynamic links
+	 *
+	 * @param string $name name of the route for which the link has to be generated
+	 * @param array $params An array of parameters that are replaced in the route if it contains wildcards
+	 *						For e.g. if route is /name/{i}/{a} and parameters passed are 1, aps then link generated will be /name/1/aps  
+	 */	
+	public static function route( $name, $params = array() )
+	{
+		$href = null;
+		foreach ( self::$routes as $routePath => $routeDesc ) {
+			if( is_array( $routeDesc ) ){
+				if( $name == $routeDesc[1] ){
+					$href = $routePath;
+					for( $i = 0; $i < count($params); $i++){
+						$href = preg_replace('#{(.*?)}#', $params[$i], $href, 1);
+					}
+				}
+			}
+		}
+		return $href;
+	}
+
+	/**
+	 * Static function to handle cases when route is not found, call handler of 404 if defined else
+	 * sends a 404 header
+	 */	
+	public static function handle404() 
+	{
+		/* Call '404' route if it exists */
+		if( isset ( self::$routes['404'] ) ) {
+			call_user_func( self::$routes['404'] );
+		} else {
+			header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found"); 
+		}
+	}
+
+	/**
+	 * Static function to handle both middlewares' call and main handler's call.
+	 *
+	 * @param array|string $handler Handler that will handle the routes call or middleware
+	 * @param array $matched The parameters that we get from the route wildcard
+	 * @return array $newParams The parameters return in the case of middleware if you intend to
+	 * 							the wildcards that were originally passed, this newParams will 
+	 *							be next passed to main handler   
+	 */	
+	public static function callFunction( $handler , $matched, $method ) 
+	{
+		if ( $handler ) {	
+			if ( is_callable( $handler ) ) {
+				$newParams = call_user_func_array( $handler, $matched ) ;
+			} else {
+		
+				/* Check if class exists in the case user is using RESTful pattern  */
+		
+				if( class_exists( $handler ) ) {
+					$instanceOfHandler = new $handler(); // Won't work in case of middleware since we aren't using RESTful in that
+				} else {
+					print_r('Class or function ' . $handler . ' not found');
+					header($_SERVER['SERVER_PROTOCOL'] . ' 500 Internal Server Error', true, 500);
+					die();
+				}
+			}
+		} else {
+			self::handle404();
+		}
+
+		if( isset( $instanceOfHandler ) ) {
+			if( method_exists( $instanceOfHandler, $method ) ) {
+				try {
+					$newParams = call_user_func_array( array( $instanceOfHandler, $method ), $matched );
+				} catch ( Exception $exception ){
+					$string = str_replace("\n", ' ', var_export($exception, TRUE));
+					error_log($string); //Log to error file only if display errors has been declared
+					header($_SERVER['SERVER_PROTOCOL'] . ' 500 Internal Server Error', true, 500);
+					die();
+				} 	
+			}
+		}
+		if( isset( $newParams ) && $newParams ) {
+			return $newParams;		
+		}
+	}
+
+	/**
+	 * Static function to add functions that are to be excuted before each routing, must be called before Link::all
+	 *
+	 * @param string $funcName Name of the funtion to be called upon before
+	 * @param array $params Array of parameters that are to be passed to before function, can be null but if not
+	 *						it must be an array 
+	 */	
+	public static function before( $funcName, $params = null )
+	{
+		array_push( self::$beforeFuncs, [ $funcName, $params ]);
+	}
+
+	/**
+	 * Static function to add functions that are to be excuted after each routing, must be called before Link::all
+	 *
+	 * @param string $funcName Name of the funtion to be called upon after
+	 * @param array $params Array of parameters that are to be passed to after function, can be null but if not
+	 *						it must be an array 
+	 */	
+	public static function after( $funcName, $params = null )
+	{
+		array_push( self::$afterFuncs, [ $funcName, $params ]);
+	}
+}
\ No newline at end of file
diff --git a/api/index.php b/api/index.php
index 5858499e..b5f8c6e6 100644
--- a/api/index.php
+++ b/api/index.php
@@ -3,7 +3,7 @@
 define('IN_SCRIPT', 1);
 define('HESK_PATH', '../');
 require_once(__DIR__ . '/core/common.php');
-require(__DIR__ . '/../Link/src/Link.php');
+require(__DIR__ . '/Link.php');
 require(__DIR__ . '/../hesk_settings.inc.php');
 
 // Controllers

From fc38673b7dd7def573521b0085bf3807ea5a1a51 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Wed, 25 Jan 2017 21:55:13 -0500
Subject: [PATCH 014/192] Some temporary error handling

---
 api/core/json_error.php |  4 +++-
 api/index.php           | 20 +++++++++++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/api/core/json_error.php b/api/core/json_error.php
index 61b491e6..2280d511 100644
--- a/api/core/json_error.php
+++ b/api/core/json_error.php
@@ -1,11 +1,13 @@
 <?php
 
 function print_error($title, $message) {
+    require_once(__DIR__ . '/output.php');
+
     $error = array();
     $error['type'] = 'ERROR';
     $error['title'] = $title;
     $error['message'] = $message;
 
-    print json_encode($error);
+    print output($error);
     return;
 }
\ No newline at end of file
diff --git a/api/index.php b/api/index.php
index b5f8c6e6..20ae1aa1 100644
--- a/api/index.php
+++ b/api/index.php
@@ -10,13 +10,31 @@ require(__DIR__ . '/../hesk_settings.inc.php');
 require(__DIR__ . '/controllers/CategoryController.php');
 hesk_load_api_database_functions();
 
+// Properly handle error logging, as well as a fatal error workaround
+error_reporting(0); // Override hesk_settings. We're smarter than it
+set_error_handler('errorHandler');
+register_shutdown_function('fatalErrorShutdownHandler');
+
 function handle404() {
     http_response_code(404);
     print json_encode('404 found');
 }
 
 function assertApiIsEnabled() {
-    //-- TODO
+    throw new Exception("Some exception here!", 33);
+}
+
+function errorHandler($errorNumber, $errorMessage, $errorFile, $errorLine) {
+    print_error(sprintf("Uncaught error in %s", $errorFile), $errorMessage);
+    die();
+}
+
+function fatalErrorShutdownHandler() {
+    $last_error = error_get_last();
+    if ($last_error['type'] === E_ERROR) {
+        // fatal error
+        errorHandler(E_ERROR, $last_error['message'], $last_error['file'], $last_error['line']);
+    }
 }
 
 // Must use fully-qualified namespace to controllers

From e1176ec4eea8fb8f141f50cc0d8aa63514bff6fd Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Thu, 26 Jan 2017 22:00:45 -0500
Subject: [PATCH 015/192] Getting started on ticket endpoint... again

---
 api/businesslogic/ValidationException.php     |   4 +
 api/businesslogic/ValidationModel.php         |   2 +
 .../ticket/CreateTicketByCustomerModel.php    |   2 +
 api/businesslogic/ticket/TicketCreator.php    | 117 ++++++++++++++++++
 api/businesslogic/ticket/ticket_creator.php   | 104 ----------------
 api/index.php                                 |  11 +-
 6 files changed, 131 insertions(+), 109 deletions(-)
 create mode 100644 api/businesslogic/ticket/TicketCreator.php

diff --git a/api/businesslogic/ValidationException.php b/api/businesslogic/ValidationException.php
index 3f174212..b2e3f398 100644
--- a/api/businesslogic/ValidationException.php
+++ b/api/businesslogic/ValidationException.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace BusinessLogic\Validation;
+
+use Exception;
+
 class ValidationException extends Exception {
     public $validationModel;
 
diff --git a/api/businesslogic/ValidationModel.php b/api/businesslogic/ValidationModel.php
index aa2258d2..fef13e7b 100644
--- a/api/businesslogic/ValidationModel.php
+++ b/api/businesslogic/ValidationModel.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace BusinessLogic\Validation;
+
 class ValidationModel {
     /**
      * @var array
diff --git a/api/businesslogic/ticket/CreateTicketByCustomerModel.php b/api/businesslogic/ticket/CreateTicketByCustomerModel.php
index 46840751..19fc540e 100644
--- a/api/businesslogic/ticket/CreateTicketByCustomerModel.php
+++ b/api/businesslogic/ticket/CreateTicketByCustomerModel.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace BusinessObjects;
+
 class CreateTicketByCustomerModel {
     // Metadata
     /**
diff --git a/api/businesslogic/ticket/TicketCreator.php b/api/businesslogic/ticket/TicketCreator.php
new file mode 100644
index 00000000..7f1b5d4f
--- /dev/null
+++ b/api/businesslogic/ticket/TicketCreator.php
@@ -0,0 +1,117 @@
+<?php
+
+namespace BusinessLogic\Tickets;
+
+
+use BusinessLogic\Validation\ValidationModel;
+use BusinessObjects\CreateTicketByCustomerModel;
+use BusinessLogic\Validation\ValidationException;
+
+class TicketCreator {
+    /**
+     * @param $ticketRequest CreateTicketByCustomerModel
+     * @param $heskSettings array HESK settings
+     * @param $modsForHeskSettings array Mods for HESK settings
+     * @throws ValidationException When a required field in $ticket_request is missing
+     */
+    static function createTicketByCustomer($ticketRequest, $heskSettings, $modsForHeskSettings) {
+        $validationModel = validate($ticketRequest, false, $heskSettings, $modsForHeskSettings);
+
+        if (count($validationModel->errorKeys) > 0) {
+            require_once(__DIR__ . '/../ValidationException.php');
+
+            // Validation failed
+            throw new ValidationException($validationModel);
+        }
+
+        // Create the ticket
+    }
+
+    /**
+     * @param $ticketRequest CreateTicketByCustomerModel
+     * @param $staff bool
+     * @param $heskSettings array HESK settings
+     * @param $modsForHeskSettings array Mods for HESK settings
+     * @return ValidationModel If errorKeys is empty, validation successful. Otherwise invalid ticket
+     */
+    function validate($ticketRequest, $staff, $heskSettings, $modsForHeskSettings) {
+        require_once(__DIR__ . '/../email_validators.php');
+        require_once(__DIR__ . '/../../dao/category_dao.php');
+        //require_once('../category/retriever.php');
+        //require_once('../bans/retriever.php');
+
+        $TICKET_PRIORITY_CRITICAL = 0;
+
+        $validationModel = new ValidationModel();
+
+        if ($ticketRequest->name === NULL || $ticketRequest->name == '') {
+            $validationModel->errorKeys[] = 'NO_NAME';
+        }
+
+        if (hesk_validateEmail($ticketRequest->email, $heskSettings['multi_eml'], false)) {
+            $validationModel->errorKeys[] = 'INVALID_OR_MISSING_EMAIL';
+        }
+
+        if (intval($ticketRequest->category) === 0) {
+            $allCategories = null;
+            $validationModel->errorKeys[] = 'NO_CATEGORY';
+        }
+
+        // Don't allow critical priority tickets
+        if ($heskSettings['cust_urgency'] && intval($ticketRequest->priority) === $TICKET_PRIORITY_CRITICAL) {
+            $validationModel->errorKeys[] = 'CRITICAL_PRIORITY_FORBIDDEN';
+        }
+
+        if ($heskSettings['require_subject'] === 1 &&
+            ($ticketRequest->subject === NULL || $ticketRequest->subject === '')) {
+            $validationModel->errorKeys[] = 'SUBJECT_REQUIRED';
+        }
+
+        if ($heskSettings['require_message'] === 1 &&
+            ($ticketRequest->message === NULL || $ticketRequest->message === '')) {
+            $validationModel->errorKeys[] = 'MESSAGE_REQUIRED';
+        }
+
+        foreach ($heskSettings['custom_fields'] as $key => $value) {
+            // TODO Only check categories that apply to this custom field
+            if ($value['use'] == 1 && hesk_is_custom_field_in_category($key, intval($ticketRequest->category))) {
+                $custom_field_value = $ticketRequest->customFields[$key];
+                if (empty($custom_field_value)) {
+                    $validationModel->errorKeys[] = 'CUSTOM_FIELD_' . $key . '_INVALID::NO_VALUE';
+                    continue;
+                }
+                switch($value['type']) {
+                    case 'date':
+                        if (!preg_match("/^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$/", $custom_field_value)) {
+                            $validationModel->errorKeys[] = 'CUSTOM_FIELD_' . $key . '_INVALID::INVALID_DATE';
+                        } else {
+                            // Actually validate based on range
+                            $date = strtotime($custom_field_value . ' t00:00:00');
+                            $dmin = strlen($value['value']['dmin']) ? strtotime($value['value']['dmin'] . ' t00:00:00') : false;
+                            $dmax = strlen($value['value']['dmax']) ? strtotime($value['value']['dmax'] . ' t00:00:00') : false;
+
+                            if ($dmin && $dmin > $date) {
+                                $validationModel->errorKeys[] = 'CUSTOM_FIELD_' . $key . '_INVALID::DATE_BEFORE_MIN::MIN-' . $dmin . '::ENTERED-' . $date;
+                            } elseif ($dmax && $dmax < $date) {
+                                $validationModel->errorKeys[] = 'CUSTOM_FIELD_' . $key . '_INVALID::DATE_AFTER_MAX::MAX-' . $dmax . '::ENTERED-' . $date;
+                            }
+                        }
+                        break;
+                    case 'email':
+                        if (!hesk_validateEmail($custom_field_value, $value['value']['multiple'], false)) {
+                            $validationModel->errorKeys[] = 'CUSTOM_FIELD_' . $key . '_INVALID::INVALID_OR_MISSING_EMAIL';
+                        }
+                        break;
+                }
+            }
+        }
+
+        // TODO Check bans (email only; don't check IP on REST requests as they'll most likely be sent via servers)
+        // TODO     submit_ticket.php:320-322
+
+        // TODO Check if we're at the max number of tickets
+        // TODO     submit_ticket.php:325-334
+
+        return $validationModel;
+    }
+}
\ No newline at end of file
diff --git a/api/businesslogic/ticket/ticket_creator.php b/api/businesslogic/ticket/ticket_creator.php
index 5edfee18..a4abe2da 100644
--- a/api/businesslogic/ticket/ticket_creator.php
+++ b/api/businesslogic/ticket/ticket_creator.php
@@ -1,106 +1,2 @@
 <?php
 
-/**
- * @param $ticket_request CreateTicketByCustomerModel
- * @param $hesk_settings array HESK settings
- * @param $modsForHesk_settings array Mods for HESK settings
- * @throws ValidationException When a required field in $ticket_request is missing
- */
-function createTicketByCustomer($ticket_request, $hesk_settings, $modsForHesk_settings) {
-    $validationModel = validate($ticket_request, false, $hesk_settings, $modsForHesk_settings);
-
-    if (count($validationModel->errorKeys) > 0) {
-        require_once(__DIR__ . '/../ValidationException.php');
-
-        // Validation failed
-        throw new ValidationException($validationModel);
-    }
-
-    // Create the ticket
-}
-
-/**
- * @param $ticket_request CreateTicketByCustomerModel
- * @param $staff bool
- * @return ValidationModel If errorKeys is empty, validation successful. Otherwise invalid ticket
- */
-function validate($ticket_request, $staff, $hesk_settings, $modsForHesk_settings) {
-    require_once(__DIR__ . '/../email_validators.php');
-    require_once(__DIR__ . '/../../dao/category_dao.php');
-    //require_once('../category/retriever.php');
-    //require_once('../bans/retriever.php');
-
-    $TICKET_PRIORITY_CRITICAL = 0;
-
-    $validationModel = new ValidationModel();
-
-    if ($ticket_request->name === NULL || $ticket_request->name == '') {
-        $validationModel->errorKeys[] = 'NO_NAME';
-    }
-
-    if (hesk_validateEmail($ticket_request->email, $hesk_settings['multi_eml'], false)) {
-        $validationModel->errorKeys[] = 'INVALID_OR_MISSING_EMAIL';
-    }
-
-    if (intval($ticket_request->category) === 0) {
-        $allCategories = null;
-        $validationModel->errorKeys[] = 'NO_CATEGORY';
-    }
-
-    // Don't allow critical priority tickets
-    if ($hesk_settings['cust_urgency'] && intval($ticket_request->priority) === $TICKET_PRIORITY_CRITICAL) {
-        $validationModel->errorKeys[] = 'CRITICAL_PRIORITY_FORBIDDEN';
-    }
-
-    if ($hesk_settings['require_subject'] === 1 &&
-        ($ticket_request->subject === NULL || $ticket_request->subject === '')) {
-        $validationModel->errorKeys[] = 'SUBJECT_REQUIRED';
-    }
-
-    if ($hesk_settings['require_message'] === 1 &&
-        ($ticket_request->message === NULL || $ticket_request->message === '')) {
-        $validationModel->errorKeys[] = 'MESSAGE_REQUIRED';
-    }
-
-    foreach ($hesk_settings['custom_fields'] as $key => $value) {
-        // TODO Only check categories that apply to this custom field
-        if ($value['use'] == 1 && hesk_is_custom_field_in_category($key, intval($ticket_request->category))) {
-            $custom_field_value = $ticket_request->customFields[$key];
-            if (empty($custom_field_value)) {
-                $validationModel->errorKeys[] = 'CUSTOM_FIELD_' . $key . '_INVALID::NO_VALUE';
-                continue;
-            }
-            switch($v['type']) {
-                case 'date':
-                    if (!preg_match("/^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$/", $custom_field_value)) {
-                        $validationModel->errorKeys[] = 'CUSTOM_FIELD_' . $key . '_INVALID::INVALID_DATE';
-                    } else {
-                        // Actually validate based on range
-                        $date = strtotime($custom_field_value . ' t00:00:00');
-                        $dmin = strlen($value['value']['dmin']) ? strtotime($value['value']['dmin'] . ' t00:00:00') : false;
-                        $dmax = strlen($value['value']['dmax']) ? strtotime($value['value']['dmax'] . ' t00:00:00') : false;
-
-                        if ($dmin && $dmin > $date) {
-                            $validationModel->errorKeys[] = 'CUSTOM_FIELD_' . $key . '_INVALID::DATE_BEFORE_MIN::MIN-' . $dmin . '::ENTERED-' . $date;
-                        } elseif ($dmax && $dmax < $date) {
-                            $validationModel->errorKeys[] = 'CUSTOM_FIELD_' . $key . '_INVALID::DATE_AFTER_MAX::MAX-' . $dmax . '::ENTERED-' . $date;
-                        }
-                    }
-                    break;
-                case 'email':
-                    if (!hesk_validateEmail($custom_field_value, $value['value']['multiple'], false)) {
-                        $validationModel->errorKeys[] = 'CUSTOM_FIELD_' . $key . '_INVALID::INVALID_OR_MISSING_EMAIL';
-                    }
-                    break;
-            }
-        }
-    }
-
-    // TODO Check bans (email only; don't check IP on REST requests as they'll most likely be sent via servers)
-    // TODO     submit_ticket.php:320-322
-
-    // TODO Check if we're at the max number of tickets
-    // TODO     submit_ticket.php:325-334
-
-    return $validationModel;
-}
\ No newline at end of file
diff --git a/api/index.php b/api/index.php
index 20ae1aa1..6ecf566c 100644
--- a/api/index.php
+++ b/api/index.php
@@ -3,15 +3,16 @@
 define('IN_SCRIPT', 1);
 define('HESK_PATH', '../');
 require_once(__DIR__ . '/core/common.php');
-require(__DIR__ . '/Link.php');
-require(__DIR__ . '/../hesk_settings.inc.php');
+require_once(__DIR__ . '/Link.php');
+require_once(__DIR__ . '/../hesk_settings.inc.php');
 
 // Controllers
-require(__DIR__ . '/controllers/CategoryController.php');
+require_once(__DIR__ . '/controllers/CategoryController.php');
 hesk_load_api_database_functions();
+require_once(__DIR__ . '/../inc/custom_fields.inc.php');
 
 // Properly handle error logging, as well as a fatal error workaround
-error_reporting(0); // Override hesk_settings. We're smarter than it
+error_reporting(0);
 set_error_handler('errorHandler');
 register_shutdown_function('fatalErrorShutdownHandler');
 
@@ -21,7 +22,7 @@ function handle404() {
 }
 
 function assertApiIsEnabled() {
-    throw new Exception("Some exception here!", 33);
+
 }
 
 function errorHandler($errorNumber, $errorMessage, $errorFile, $errorLine) {

From ecbd2fd94ad44cef7f60a7751cb8ea03e58a61d4 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Fri, 27 Jan 2017 22:26:28 -0500
Subject: [PATCH 016/192] Fixed some folder structures and worked on ban
 retrieval

---
 .../category/CategoryRetriever.php            |  2 +-
 api/businesslogic/security/BanRetriever.php   | 46 +++++++++++
 api/businesslogic/security/BannedEmail.php    | 32 ++++++++
 api/businesslogic/security/BannedIp.php       | 42 ++++++++++
 .../security/UserContextBuilder.php           |  6 +-
 api/businesslogic/ticket/TicketCreator.php    |  3 +-
 api/dao/{ => category}/CategoryGateway.php    |  2 +-
 api/dao/security/BanGateway.php               | 77 +++++++++++++++++++
 .../{UserDao.php => security/UserGateway.php} |  4 +-
 9 files changed, 206 insertions(+), 8 deletions(-)
 create mode 100644 api/businesslogic/security/BanRetriever.php
 create mode 100644 api/businesslogic/security/BannedEmail.php
 create mode 100644 api/businesslogic/security/BannedIp.php
 rename api/dao/{ => category}/CategoryGateway.php (93%)
 create mode 100644 api/dao/security/BanGateway.php
 rename api/dao/{UserDao.php => security/UserGateway.php} (88%)

diff --git a/api/businesslogic/category/CategoryRetriever.php b/api/businesslogic/category/CategoryRetriever.php
index 0a40bfda..fecdf8ec 100644
--- a/api/businesslogic/category/CategoryRetriever.php
+++ b/api/businesslogic/category/CategoryRetriever.php
@@ -12,7 +12,7 @@ use DataAccess\CategoryGateway;
 
 class CategoryRetriever {
     static function get_all_categories($hesk_settings) {
-        require_once(__DIR__ . '/../../dao/CategoryGateway.php');
+        require_once(__DIR__ . '/../../dao/category/CategoryGateway.php');
 
         return CategoryGateway::getAllCategories($hesk_settings);
     }
diff --git a/api/businesslogic/security/BanRetriever.php b/api/businesslogic/security/BanRetriever.php
new file mode 100644
index 00000000..a79aa7ff
--- /dev/null
+++ b/api/businesslogic/security/BanRetriever.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace BusinessLogic\Security;
+
+
+use DataAccess\Security\BanGateway;
+
+class BanRetriever {
+    /**
+     * @param $email
+     * @param $heskSettings
+     * @return bool
+     */
+    static function isEmailBanned($email, $heskSettings) {
+        require_once(__DIR__ . '/../../dao/security/BanGateway.php');
+
+        $bannedEmails = BanGateway::getEmailBans($heskSettings);
+
+        foreach ($bannedEmails as $bannedEmail) {
+            if ($bannedEmail->email === $email) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * @param $ip int the IP address, converted beforehand using ip2long()
+     * @param $heskSettings
+     * @return bool
+     */
+    static function isIpAddressBanned($ip, $heskSettings) {
+        require_once(__DIR__ . '/../../dao/security/BanGateway.php');
+
+        $bannedIps = BanGateway::getIpBans($heskSettings);
+
+        foreach ($bannedIps as $bannedIp) {
+            if ($bannedIp->ipFrom <= $ip && $bannedIp->ipTo >= $ip) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/api/businesslogic/security/BannedEmail.php b/api/businesslogic/security/BannedEmail.php
new file mode 100644
index 00000000..8b612ed9
--- /dev/null
+++ b/api/businesslogic/security/BannedEmail.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: mkoch
+ * Date: 1/27/2017
+ * Time: 9:25 PM
+ */
+
+namespace BusinessLogic\Security;
+
+
+class BannedEmail {
+    /**
+     * @var int
+     */
+    public $id;
+
+    /**
+     * @var string
+     */
+    public $email;
+
+    /**
+     * @var int|null The user who banned the email, or null if the user was deleted
+     */
+    public $bannedById;
+
+    /**
+     * @var string
+     */
+    public $dateBanned;
+}
\ No newline at end of file
diff --git a/api/businesslogic/security/BannedIp.php b/api/businesslogic/security/BannedIp.php
new file mode 100644
index 00000000..c6ddf46e
--- /dev/null
+++ b/api/businesslogic/security/BannedIp.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: mkoch
+ * Date: 1/27/2017
+ * Time: 9:51 PM
+ */
+
+namespace BusinessLogic\Security;
+
+
+class BannedIp {
+    /**
+     * @var int
+     */
+    public $id;
+
+    /**
+     * @var int the lower bound of the IP address range
+     */
+    public $ipFrom;
+
+    /**
+     * @var int the upper bound of the IP address range
+     */
+    public $ipTo;
+
+    /**
+     * @var string the display of the IP ban to be shown to the user
+     */
+    public $ipDisplay;
+
+    /**
+     * @var int|null The user who banned the IP, or null if the user was deleted
+     */
+    public $bannedById;
+
+    /**
+     * @var string
+     */
+    public $dateBanned;
+}
\ No newline at end of file
diff --git a/api/businesslogic/security/UserContextBuilder.php b/api/businesslogic/security/UserContextBuilder.php
index a6d22645..668fd540 100644
--- a/api/businesslogic/security/UserContextBuilder.php
+++ b/api/businesslogic/security/UserContextBuilder.php
@@ -3,12 +3,14 @@
 namespace BusinessLogic\Security;
 
 
-use DataAccess\Security\UserDao;
+use DataAccess\Security\UserGateway;
 
 class UserContextBuilder {
     static function buildUserContext($authToken, $hesk_settings) {
+        require_once(__DIR__ . '/../../dao/security/UserGateway.php');
+
         $hashedToken = hash('sha512', $authToken);
-        return UserDao::getUserForAuthToken($hashedToken, $hesk_settings);
+        return UserGateway::getUserForAuthToken($hashedToken, $hesk_settings);
     }
 
     /**
diff --git a/api/businesslogic/ticket/TicketCreator.php b/api/businesslogic/ticket/TicketCreator.php
index 7f1b5d4f..ce4e3d0c 100644
--- a/api/businesslogic/ticket/TicketCreator.php
+++ b/api/businesslogic/ticket/TicketCreator.php
@@ -36,7 +36,7 @@ class TicketCreator {
      */
     function validate($ticketRequest, $staff, $heskSettings, $modsForHeskSettings) {
         require_once(__DIR__ . '/../email_validators.php');
-        require_once(__DIR__ . '/../../dao/category_dao.php');
+        require_once(__DIR__ . '/../category/CategoryRetriever.php');
         //require_once('../category/retriever.php');
         //require_once('../bans/retriever.php');
 
@@ -73,7 +73,6 @@ class TicketCreator {
         }
 
         foreach ($heskSettings['custom_fields'] as $key => $value) {
-            // TODO Only check categories that apply to this custom field
             if ($value['use'] == 1 && hesk_is_custom_field_in_category($key, intval($ticketRequest->category))) {
                 $custom_field_value = $ticketRequest->customFields[$key];
                 if (empty($custom_field_value)) {
diff --git a/api/dao/CategoryGateway.php b/api/dao/category/CategoryGateway.php
similarity index 93%
rename from api/dao/CategoryGateway.php
rename to api/dao/category/CategoryGateway.php
index 2ae16bee..b9e222d0 100644
--- a/api/dao/CategoryGateway.php
+++ b/api/dao/category/CategoryGateway.php
@@ -13,7 +13,7 @@ use Exception;
 
 class CategoryGateway {
     static function getAllCategories($hesk_settings) {
-        require_once(__DIR__ . '/../businesslogic/category/Category.php');
+        require_once(__DIR__ . '/../../businesslogic/category/Category.php');
 
         if (!function_exists('hesk_dbConnect')) {
             throw new Exception('Database not loaded!');
diff --git a/api/dao/security/BanGateway.php b/api/dao/security/BanGateway.php
new file mode 100644
index 00000000..d1d9a829
--- /dev/null
+++ b/api/dao/security/BanGateway.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: mkoch
+ * Date: 1/27/2017
+ * Time: 9:05 PM
+ */
+
+namespace DataAccess\Security;
+
+
+use BusinessLogic\Security\BannedEmail;
+use BusinessLogic\Security\BannedIp;
+
+class BanGateway {
+
+    /**
+     * @param $heskSettings
+     * @return BannedEmail[]
+     */
+    static function getEmailBans($heskSettings) {
+        require_once(__DIR__ . '/../../businesslogic/security/BannedEmail.php');
+
+        $rs = hesk_dbQuery("SELECT `bans`.`id` AS `id`, `bans`.`email` AS `email`,
+              `users`.`id` AS `banned_by`, `bans`.`dt` AS `dt`
+            FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "_banned_emails` AS `bans`
+            LEFT JOIN `" . hesk_dbEscape($heskSettings['db_pfix']) . "_users` AS `users`
+                ON `bans`.`banned_by` = `users`.`id`
+                AND `users`.`active` = '1'");
+
+        $bannedEmails = array();
+
+        while ($row = hesk_dbFetchAssoc($rs)) {
+            $bannedEmail = new BannedEmail();
+            $bannedEmail->id = intval($row['id']);
+            $bannedEmail->email = $row['email'];
+            $bannedEmail->bannedById = $row['banned_by'] === null ? null : intval($row['banned_by']);
+            $bannedEmail->dateBanned = $row['dt'];
+
+            $bannedEmails[$bannedEmail->id] = $bannedEmail;
+        }
+
+        return $bannedEmails;
+    }
+
+    /**
+     * @param $heskSettings
+     * @return BannedIp[]
+     */
+    static function getIpBans($heskSettings) {
+        require_once(__DIR__ . '/../../businesslogic/security/BannedIp.php');
+
+        $rs = hesk_dbQuery("SELECT `bans`.`id` AS `id`, `bans`.`ip_from` AS `ip_from`,
+              `bans`.`ip_to` AS `ip_to`, `bans`.`ip_display` AS `ip_display`,
+              `users`.`id` AS `banned_by`, `bans`.`dt` AS `dt`
+            FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "_banned_ips` AS `bans`
+            LEFT JOIN `" . hesk_dbEscape($heskSettings['db_pfix']) . "_users` AS `users`
+                ON `bans`.`banned_by` = `users`.`id`
+                AND `users`.`active` = '1'");
+
+        $bannedIps = array();
+
+        while ($row = hesk_dbFetchAssoc($rs)) {
+            $bannedIp = new BannedIp();
+            $bannedIp->id = intval($row['id']);
+            $bannedIp->ipFrom = intval($row['ip_from']);
+            $bannedIp->ipTo = intval($row['ip_to']);
+            $bannedIp->ipDisplay = $row['ip_display'];
+            $bannedIp->bannedById = $row['banned_by'] === null ? null : intval($row['banned_by']);
+            $bannedIp->dateBanned = $row['dt'];
+
+            $bannedIps[$bannedIp->id] = $bannedIp;
+        }
+
+        return $bannedIps;
+    }
+}
\ No newline at end of file
diff --git a/api/dao/UserDao.php b/api/dao/security/UserGateway.php
similarity index 88%
rename from api/dao/UserDao.php
rename to api/dao/security/UserGateway.php
index a2e14c77..c533095a 100644
--- a/api/dao/UserDao.php
+++ b/api/dao/security/UserGateway.php
@@ -12,9 +12,9 @@ namespace DataAccess\Security;
 use BusinessLogic\Security\UserContextBuilder;
 use Exception;
 
-class UserDao {
+class UserGateway {
     static function getUserForAuthToken($hashedToken, $hesk_settings) {
-        require_once(__DIR__ . '/../businesslogic/security/UserContextBuilder.php');
+        require_once(__DIR__ . '/../../businesslogic/security/UserContextBuilder.php');
 
         if (!function_exists('hesk_dbConnect')) {
             throw new Exception('Database not loaded!');

From 2ef67de7188d01b77aa379d18d2229ed25415e3f Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sat, 28 Jan 2017 01:28:53 -0500
Subject: [PATCH 017/192] Added proper DI and autoloading to make things
 simpler for the actual logic'

---
 api/DependencyManager.php                     | 18 +++++++++++++
 api/autoload.php                              | 25 +++++++++++++++++++
 api/businesslogic/ValidationException.php     |  2 +-
 .../category/CategoryRetriever.php            | 13 +++++++---
 api/controllers/CategoryController.php        | 14 ++++-------
 api/core/json_error.php                       |  4 +--
 api/core/output.php                           |  2 +-
 api/dao/category/CategoryGateway.php          |  4 +--
 api/http_response_code.php                    | 15 +++++++++++
 api/index.php                                 | 15 +++--------
 10 files changed, 81 insertions(+), 31 deletions(-)
 create mode 100644 api/DependencyManager.php
 create mode 100644 api/autoload.php
 create mode 100644 api/http_response_code.php

diff --git a/api/DependencyManager.php b/api/DependencyManager.php
new file mode 100644
index 00000000..005e731f
--- /dev/null
+++ b/api/DependencyManager.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Core;
+
+// Responsible for loading in all necessary classes. AKA a poor man's DI solution.
+use BusinessLogic\Category\CategoryRetriever;
+use DataAccess\CategoryGateway;
+
+class DependencyManager {
+    public $get;
+
+    function __construct() {
+        $this->get = array();
+
+        $this->get['CategoryGateway'] = new CategoryGateway();
+        $this->get['CategoryRetriever'] = new CategoryRetriever($this->get['CategoryGateway']);
+    }
+}
\ No newline at end of file
diff --git a/api/autoload.php b/api/autoload.php
new file mode 100644
index 00000000..351d664f
--- /dev/null
+++ b/api/autoload.php
@@ -0,0 +1,25 @@
+<?php
+
+// Responsible for loading in all necessary scripts and kicking off the DependencyManager
+
+define('IN_SCRIPT', 1);
+define('HESK_PATH', '../');
+require_once(__DIR__ . '/core/common.php');
+require_once(__DIR__ . '/Link.php');
+require_once(__DIR__ . '/../hesk_settings.inc.php');
+
+// FILES
+require_once(__DIR__ . '/http_response_code.php');
+require_once(__DIR__ . '/dao/category/CategoryGateway.php');
+require_once(__DIR__ . '/businesslogic/category/CategoryRetriever.php');
+require_once(__DIR__ . '/businesslogic/category/Category.php');
+require_once(__DIR__ . '/controllers/CategoryController.php');
+
+hesk_load_api_database_functions();
+
+// HESK files that require database access
+require_once(__DIR__ . '/../inc/custom_fields.inc.php');
+
+require_once(__DIR__ . '/DependencyManager.php');
+
+$applicationContext = new \Core\DependencyManager();
\ No newline at end of file
diff --git a/api/businesslogic/ValidationException.php b/api/businesslogic/ValidationException.php
index b2e3f398..9f99ec4d 100644
--- a/api/businesslogic/ValidationException.php
+++ b/api/businesslogic/ValidationException.php
@@ -9,7 +9,7 @@ class ValidationException extends Exception {
 
     /**
      * ValidationException constructor.
-     * @param ValidationModel $validationModel The validatio model
+     * @param ValidationModel $validationModel The validation model
      * @throws Exception If the validationModel's errorKeys is empty
      */
     function __construct($validationModel) {
diff --git a/api/businesslogic/category/CategoryRetriever.php b/api/businesslogic/category/CategoryRetriever.php
index fecdf8ec..31b6956e 100644
--- a/api/businesslogic/category/CategoryRetriever.php
+++ b/api/businesslogic/category/CategoryRetriever.php
@@ -11,9 +11,16 @@ namespace BusinessLogic\Category;
 use DataAccess\CategoryGateway;
 
 class CategoryRetriever {
-    static function get_all_categories($hesk_settings) {
-        require_once(__DIR__ . '/../../dao/category/CategoryGateway.php');
+    /**
+     * @var CategoryGateway
+     */
+    private $categoryGateway;
 
-        return CategoryGateway::getAllCategories($hesk_settings);
+    function __construct($categoryGateway) {
+        $this->categoryGateway = $categoryGateway;
+    }
+
+    function getAllCategories($hesk_settings) {
+        return $this->categoryGateway->getAllCategories($hesk_settings);
     }
 }
\ No newline at end of file
diff --git a/api/controllers/CategoryController.php b/api/controllers/CategoryController.php
index 14cc66ff..be4ab2a5 100644
--- a/api/controllers/CategoryController.php
+++ b/api/controllers/CategoryController.php
@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: user
- * Date: 1/16/17
- * Time: 10:12 PM
- */
 
 namespace Controllers\Category;
 
@@ -21,9 +15,11 @@ class CategoryController {
     }
 
     private static function getAllCategories() {
-        global $hesk_settings;
-        require_once(__DIR__ . '/../businesslogic/category/CategoryRetriever.php');
+        global $hesk_settings, $applicationContext;
 
-        return CategoryRetriever::get_all_categories($hesk_settings);
+        /* @var $categoryRetriever CategoryRetriever */
+        $categoryRetriever = $applicationContext->get['CategoryRetriever'];
+
+        return $categoryRetriever->getAllCategories($hesk_settings);
     }
 }
\ No newline at end of file
diff --git a/api/core/json_error.php b/api/core/json_error.php
index 2280d511..24154ae5 100644
--- a/api/core/json_error.php
+++ b/api/core/json_error.php
@@ -1,6 +1,6 @@
 <?php
 
-function print_error($title, $message) {
+function print_error($title, $message, $response_code = 500) {
     require_once(__DIR__ . '/output.php');
 
     $error = array();
@@ -8,6 +8,6 @@ function print_error($title, $message) {
     $error['title'] = $title;
     $error['message'] = $message;
 
-    print output($error);
+    print output($error, $response_code);
     return;
 }
\ No newline at end of file
diff --git a/api/core/output.php b/api/core/output.php
index dafff0d8..e21c149a 100644
--- a/api/core/output.php
+++ b/api/core/output.php
@@ -1,7 +1,7 @@
 <?php
 
 function output($data, $status_code = 200) {
+    http_response_code($status_code);
     header('Content-Type: application/json');
     print json_encode($data);
-    return http_response_code($status_code);
 }
\ No newline at end of file
diff --git a/api/dao/category/CategoryGateway.php b/api/dao/category/CategoryGateway.php
index b9e222d0..7c2ad211 100644
--- a/api/dao/category/CategoryGateway.php
+++ b/api/dao/category/CategoryGateway.php
@@ -12,9 +12,7 @@ use BusinessObjects\Category;
 use Exception;
 
 class CategoryGateway {
-    static function getAllCategories($hesk_settings) {
-        require_once(__DIR__ . '/../../businesslogic/category/Category.php');
-
+    function getAllCategories($hesk_settings) {
         if (!function_exists('hesk_dbConnect')) {
             throw new Exception('Database not loaded!');
         }
diff --git a/api/http_response_code.php b/api/http_response_code.php
new file mode 100644
index 00000000..a5c48281
--- /dev/null
+++ b/api/http_response_code.php
@@ -0,0 +1,15 @@
+<?php
+
+// For 4.3.0 <= PHP <= 5.4.0
+if (function_exists('http_response_code') === false) {
+    function http_response_code($newcode = NULL) {
+        static $code = 200;
+        if ($newcode !== NULL) {
+            header('X-PHP-Response-Code: ' . $newcode, true, $newcode);
+            if (!headers_sent()) {
+                $code = $newcode;
+            }
+        }
+        return $code;
+    }
+}
\ No newline at end of file
diff --git a/api/index.php b/api/index.php
index 6ecf566c..df68cd7a 100644
--- a/api/index.php
+++ b/api/index.php
@@ -1,17 +1,6 @@
 <?php
-// Router: handles all REST requests to go to their proper place. Common dependency loading also happens here
-define('IN_SCRIPT', 1);
-define('HESK_PATH', '../');
-require_once(__DIR__ . '/core/common.php');
-require_once(__DIR__ . '/Link.php');
-require_once(__DIR__ . '/../hesk_settings.inc.php');
-
-// Controllers
-require_once(__DIR__ . '/controllers/CategoryController.php');
-hesk_load_api_database_functions();
-require_once(__DIR__ . '/../inc/custom_fields.inc.php');
-
 // Properly handle error logging, as well as a fatal error workaround
+require_once(__DIR__ . '/autoload.php');
 error_reporting(0);
 set_error_handler('errorHandler');
 register_shutdown_function('fatalErrorShutdownHandler');
@@ -45,5 +34,7 @@ Link::all(array(
     // Categories
     '/v1/categories' => '\Controllers\Category\CategoryController::printAllCategories',
     '/v1/categories/{i}' => '\Controllers\Category\CategoryController',
+
+    // Any URL that doesn't match goes to the 404 handler
     '404' => 'handle404'
 ));
\ No newline at end of file

From e68ecf50c6964d8d3760ec06f56363fb2c570674 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sat, 28 Jan 2017 01:41:29 -0500
Subject: [PATCH 018/192] Moved some more stuff to new structure

---
 ...encyManager.php => ApplicationContext.php} |  7 ++++-
 api/autoload.php                              | 22 +++++++++++----
 .../category/CategoryRetriever.php            |  6 ----
 api/businesslogic/security/BanRetriever.php   | 20 ++++++++-----
 api/core/common.php                           |  6 ----
 api/dao/CommonDao.php                         | 28 +++++++++++++++++++
 api/dao/category/CategoryGateway.php          | 15 ++--------
 api/dao/security/BanGateway.php               | 22 +++++++--------
 8 files changed, 77 insertions(+), 49 deletions(-)
 rename api/{DependencyManager.php => ApplicationContext.php} (64%)
 delete mode 100644 api/core/common.php
 create mode 100644 api/dao/CommonDao.php

diff --git a/api/DependencyManager.php b/api/ApplicationContext.php
similarity index 64%
rename from api/DependencyManager.php
rename to api/ApplicationContext.php
index 005e731f..64cf99a1 100644
--- a/api/DependencyManager.php
+++ b/api/ApplicationContext.php
@@ -4,9 +4,11 @@ namespace Core;
 
 // Responsible for loading in all necessary classes. AKA a poor man's DI solution.
 use BusinessLogic\Category\CategoryRetriever;
+use BusinessLogic\Security\BanRetriever;
 use DataAccess\CategoryGateway;
+use DataAccess\Security\BanGateway;
 
-class DependencyManager {
+class ApplicationContext {
     public $get;
 
     function __construct() {
@@ -14,5 +16,8 @@ class DependencyManager {
 
         $this->get['CategoryGateway'] = new CategoryGateway();
         $this->get['CategoryRetriever'] = new CategoryRetriever($this->get['CategoryGateway']);
+
+        $this->get['BanGateway'] = new BanGateway();
+        $this->get['BanRetriever'] = new BanRetriever($this->get['BanGateway']);
     }
 }
\ No newline at end of file
diff --git a/api/autoload.php b/api/autoload.php
index 351d664f..5be0ed5a 100644
--- a/api/autoload.php
+++ b/api/autoload.php
@@ -1,25 +1,35 @@
 <?php
 
 // Responsible for loading in all necessary scripts and kicking off the DependencyManager
-
+// Core requirements
 define('IN_SCRIPT', 1);
 define('HESK_PATH', '../');
-require_once(__DIR__ . '/core/common.php');
+require_once(__DIR__ . '/../hesk_settings.inc.php');
+require_once(__DIR__ . '/../inc/common.inc.php');
+require_once(__DIR__ . '/core/output.php');
 require_once(__DIR__ . '/Link.php');
 require_once(__DIR__ . '/../hesk_settings.inc.php');
 
-// FILES
+// Mods for HESK API Files
 require_once(__DIR__ . '/http_response_code.php');
+
+// Categories
 require_once(__DIR__ . '/dao/category/CategoryGateway.php');
 require_once(__DIR__ . '/businesslogic/category/CategoryRetriever.php');
 require_once(__DIR__ . '/businesslogic/category/Category.php');
 require_once(__DIR__ . '/controllers/CategoryController.php');
 
+// Banned Emails / IP Addresses
+require_once(__DIR__ . '/dao/security/BanGateway.php');
+require_once(__DIR__ . '/businesslogic/security/BanRetriever.php');
+require_once(__DIR__ . '/businesslogic/security/BannedEmail.php');
+require_once(__DIR__ . '/businesslogic/security/BannedIp.php');
+
 hesk_load_api_database_functions();
 
 // HESK files that require database access
 require_once(__DIR__ . '/../inc/custom_fields.inc.php');
 
-require_once(__DIR__ . '/DependencyManager.php');
-
-$applicationContext = new \Core\DependencyManager();
\ No newline at end of file
+// Load the ApplicationContext
+require_once(__DIR__ . '/ApplicationContext.php');
+$applicationContext = new \Core\ApplicationContext();
\ No newline at end of file
diff --git a/api/businesslogic/category/CategoryRetriever.php b/api/businesslogic/category/CategoryRetriever.php
index 31b6956e..c45ee146 100644
--- a/api/businesslogic/category/CategoryRetriever.php
+++ b/api/businesslogic/category/CategoryRetriever.php
@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: user
- * Date: 1/16/17
- * Time: 10:10 PM
- */
 
 namespace BusinessLogic\Category;
 
diff --git a/api/businesslogic/security/BanRetriever.php b/api/businesslogic/security/BanRetriever.php
index a79aa7ff..e44fa344 100644
--- a/api/businesslogic/security/BanRetriever.php
+++ b/api/businesslogic/security/BanRetriever.php
@@ -6,15 +6,23 @@ namespace BusinessLogic\Security;
 use DataAccess\Security\BanGateway;
 
 class BanRetriever {
+    /**
+     * @var BanGateway
+     */
+    private $banGateway;
+
+    function __construct($banGateway) {
+        $this->banGateway = $banGateway;
+    }
+
     /**
      * @param $email
      * @param $heskSettings
      * @return bool
      */
-    static function isEmailBanned($email, $heskSettings) {
-        require_once(__DIR__ . '/../../dao/security/BanGateway.php');
+    function isEmailBanned($email, $heskSettings) {
 
-        $bannedEmails = BanGateway::getEmailBans($heskSettings);
+        $bannedEmails = $this->banGateway->getEmailBans($heskSettings);
 
         foreach ($bannedEmails as $bannedEmail) {
             if ($bannedEmail->email === $email) {
@@ -30,10 +38,8 @@ class BanRetriever {
      * @param $heskSettings
      * @return bool
      */
-    static function isIpAddressBanned($ip, $heskSettings) {
-        require_once(__DIR__ . '/../../dao/security/BanGateway.php');
-
-        $bannedIps = BanGateway::getIpBans($heskSettings);
+    function isIpAddressBanned($ip, $heskSettings) {
+        $bannedIps = $this->banGateway->getIpBans($heskSettings);
 
         foreach ($bannedIps as $bannedIp) {
             if ($bannedIp->ipFrom <= $ip && $bannedIp->ipTo >= $ip) {
diff --git a/api/core/common.php b/api/core/common.php
deleted file mode 100644
index 77c14cd6..00000000
--- a/api/core/common.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?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/CommonDao.php b/api/dao/CommonDao.php
new file mode 100644
index 00000000..edc993b4
--- /dev/null
+++ b/api/dao/CommonDao.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Mike
+ * Date: 1/28/2017
+ * Time: 1:33 AM
+ */
+
+namespace DataAccess;
+
+
+use Exception;
+
+class CommonDao {
+    /**
+     * @throws Exception if the database isn't properly configured
+     */
+    function init() {
+        if (!function_exists('hesk_dbConnect')) {
+            throw new Exception('Database not loaded!');
+        }
+        hesk_dbConnect();
+    }
+
+    function close() {
+        hesk_dbClose();
+    }
+}
\ No newline at end of file
diff --git a/api/dao/category/CategoryGateway.php b/api/dao/category/CategoryGateway.php
index 7c2ad211..84227761 100644
--- a/api/dao/category/CategoryGateway.php
+++ b/api/dao/category/CategoryGateway.php
@@ -1,22 +1,13 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: user
- * Date: 1/16/17
- * Time: 10:06 PM
- */
 
 namespace DataAccess;
 
 use BusinessObjects\Category;
 use Exception;
 
-class CategoryGateway {
+class CategoryGateway extends CommonDao {
     function getAllCategories($hesk_settings) {
-        if (!function_exists('hesk_dbConnect')) {
-            throw new Exception('Database not loaded!');
-        }
-        hesk_dbConnect();
+        $this->init();
 
         $sql = 'SELECT * FROM `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'categories`';
 
@@ -37,7 +28,7 @@ class CategoryGateway {
             $results[$category->id] = $category;
         }
 
-        hesk_dbClose();
+        $this->close();
 
         return $results;
     }
diff --git a/api/dao/security/BanGateway.php b/api/dao/security/BanGateway.php
index d1d9a829..78139819 100644
--- a/api/dao/security/BanGateway.php
+++ b/api/dao/security/BanGateway.php
@@ -1,25 +1,21 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: mkoch
- * Date: 1/27/2017
- * Time: 9:05 PM
- */
 
 namespace DataAccess\Security;
 
 
 use BusinessLogic\Security\BannedEmail;
 use BusinessLogic\Security\BannedIp;
+use DataAccess\CommonDao;
+use Exception;
 
-class BanGateway {
+class BanGateway extends CommonDao {
 
     /**
      * @param $heskSettings
      * @return BannedEmail[]
      */
-    static function getEmailBans($heskSettings) {
-        require_once(__DIR__ . '/../../businesslogic/security/BannedEmail.php');
+    function getEmailBans($heskSettings) {
+        $this->init();
 
         $rs = hesk_dbQuery("SELECT `bans`.`id` AS `id`, `bans`.`email` AS `email`,
               `users`.`id` AS `banned_by`, `bans`.`dt` AS `dt`
@@ -40,6 +36,8 @@ class BanGateway {
             $bannedEmails[$bannedEmail->id] = $bannedEmail;
         }
 
+        $this->close();
+
         return $bannedEmails;
     }
 
@@ -47,8 +45,8 @@ class BanGateway {
      * @param $heskSettings
      * @return BannedIp[]
      */
-    static function getIpBans($heskSettings) {
-        require_once(__DIR__ . '/../../businesslogic/security/BannedIp.php');
+    function getIpBans($heskSettings) {
+        $this->init();
 
         $rs = hesk_dbQuery("SELECT `bans`.`id` AS `id`, `bans`.`ip_from` AS `ip_from`,
               `bans`.`ip_to` AS `ip_to`, `bans`.`ip_display` AS `ip_display`,
@@ -72,6 +70,8 @@ class BanGateway {
             $bannedIps[$bannedIp->id] = $bannedIp;
         }
 
+        $this->close();
+
         return $bannedIps;
     }
 }
\ No newline at end of file

From 8968be1ffdd1440ed2f2411aa78a7bff50b67cf5 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sat, 28 Jan 2017 22:35:42 -0500
Subject: [PATCH 019/192] More work on exception handling and user context
 building

---
 api/ApplicationContext.php                    |   8 ++
 api/autoload.php                              |  14 +++
 api/businesslogic/Helpers.php                 |  29 +++++
 api/businesslogic/category/Category.php       |   7 +-
 .../category/CategoryRetriever.php            |  17 ++-
 api/businesslogic/category/retriever.php      |   5 -
 .../InvalidAuthenticationTokenException.php   |  11 ++
 .../MissingAuthenticationTokenException.php   |  17 +++
 .../{ => exception}/ValidationException.php   |   3 +-
 .../security/UserContextBuilder.php           |  37 ++++--
 api/businesslogic/security_retriever.php      |   9 --
 api/businesslogic/ticket/TicketCreator.php    |   9 +-
 api/businesslogic/ticket/ticket_creator.php   |   2 -
 api/businesslogic/ticket_retriever.php        | 107 ------------------
 api/businesslogic/user_retriever.php          |  77 -------------
 api/controllers/CategoryController.php        |   4 +-
 api/core/database.inc.php                     |  17 ++-
 api/core/database_mysqli.inc.php              |  13 ++-
 api/core/headers.php                          |   9 --
 api/dao/category/CategoryGateway.php          |   4 +
 api/dao/category_dao.php                      |  28 -----
 api/dao/security/UserGateway.php              |  33 +++---
 api/exception/AccessException.php             |  11 --
 api/index.php                                 |  47 +++++++-
 24 files changed, 215 insertions(+), 303 deletions(-)
 create mode 100644 api/businesslogic/Helpers.php
 delete mode 100644 api/businesslogic/category/retriever.php
 create mode 100644 api/businesslogic/exception/InvalidAuthenticationTokenException.php
 create mode 100644 api/businesslogic/exception/MissingAuthenticationTokenException.php
 rename api/businesslogic/{ => exception}/ValidationException.php (87%)
 delete mode 100644 api/businesslogic/security_retriever.php
 delete mode 100644 api/businesslogic/ticket/ticket_creator.php
 delete mode 100644 api/businesslogic/ticket_retriever.php
 delete mode 100644 api/businesslogic/user_retriever.php
 delete mode 100644 api/core/headers.php
 delete mode 100644 api/dao/category_dao.php
 delete mode 100644 api/exception/AccessException.php

diff --git a/api/ApplicationContext.php b/api/ApplicationContext.php
index 64cf99a1..1c2c9307 100644
--- a/api/ApplicationContext.php
+++ b/api/ApplicationContext.php
@@ -5,8 +5,10 @@ namespace Core;
 // Responsible for loading in all necessary classes. AKA a poor man's DI solution.
 use BusinessLogic\Category\CategoryRetriever;
 use BusinessLogic\Security\BanRetriever;
+use BusinessLogic\Security\UserContextBuilder;
 use DataAccess\CategoryGateway;
 use DataAccess\Security\BanGateway;
+use DataAccess\Security\UserGateway;
 
 class ApplicationContext {
     public $get;
@@ -14,10 +16,16 @@ class ApplicationContext {
     function __construct() {
         $this->get = array();
 
+        // Categories
         $this->get['CategoryGateway'] = new CategoryGateway();
         $this->get['CategoryRetriever'] = new CategoryRetriever($this->get['CategoryGateway']);
 
+        // Bans
         $this->get['BanGateway'] = new BanGateway();
         $this->get['BanRetriever'] = new BanRetriever($this->get['BanGateway']);
+
+        // User Context
+        $this->get['UserGateway'] = new UserGateway();
+        $this->get['UserContextBuilder'] = new UserContextBuilder($this->get['UserGateway']);
     }
 }
\ No newline at end of file
diff --git a/api/autoload.php b/api/autoload.php
index 5be0ed5a..b4b7d7da 100644
--- a/api/autoload.php
+++ b/api/autoload.php
@@ -12,6 +12,15 @@ require_once(__DIR__ . '/../hesk_settings.inc.php');
 
 // Mods for HESK API Files
 require_once(__DIR__ . '/http_response_code.php');
+require_once(__DIR__ . '/dao/CommonDao.php');
+require_once(__DIR__ . '/businesslogic/Helpers.php');
+
+// User Context
+require_once(__DIR__ . '/dao/security/UserGateway.php');
+require_once(__DIR__ . '/businesslogic/security/UserContextBuilder.php');
+require_once(__DIR__ . '/businesslogic/security/UserContextNotifications.php');
+require_once(__DIR__ . '/businesslogic/security/UserContextPreferences.php');
+require_once(__DIR__ . '/businesslogic/security/UserContext.php');
 
 // Categories
 require_once(__DIR__ . '/dao/category/CategoryGateway.php');
@@ -25,6 +34,11 @@ require_once(__DIR__ . '/businesslogic/security/BanRetriever.php');
 require_once(__DIR__ . '/businesslogic/security/BannedEmail.php');
 require_once(__DIR__ . '/businesslogic/security/BannedIp.php');
 
+// Exceptions
+require_once(__DIR__ . '/businesslogic/exception/InvalidAuthenticationTokenException.php');
+require_once(__DIR__ . '/businesslogic/exception/MissingAuthenticationTokenException.php');
+require_once(__DIR__ . '/businesslogic/exception/ValidationException.php');
+
 hesk_load_api_database_functions();
 
 // HESK files that require database access
diff --git a/api/businesslogic/Helpers.php b/api/businesslogic/Helpers.php
new file mode 100644
index 00000000..0df1d131
--- /dev/null
+++ b/api/businesslogic/Helpers.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: mkoch
+ * Date: 1/28/2017
+ * Time: 8:54 PM
+ */
+
+namespace BusinessLogic\Helpers;
+
+
+class Helpers {
+    static function getHeader($key) {
+        $headers = getallheaders();
+
+        $uppercaseHeaders = array();
+        foreach ($headers as $header => $value) {
+            $uppercaseHeaders[strtoupper($header)] = $value;
+        }
+
+        return isset($uppercaseHeaders[$key])
+            ? $uppercaseHeaders[$key]
+            : NULL;
+    }
+
+    static function hashToken($token) {
+        return hash('sha512', $token);
+    }
+}
\ No newline at end of file
diff --git a/api/businesslogic/category/Category.php b/api/businesslogic/category/Category.php
index 77a6be9c..e73a7888 100644
--- a/api/businesslogic/category/Category.php
+++ b/api/businesslogic/category/Category.php
@@ -39,7 +39,12 @@ class Category {
     public $priority;
 
     /**
-     * @var int? The manager for the category, if applicable
+     * @var int|null The manager for the category, if applicable
      */
     public $manager;
+
+    /**
+     * @var bool Indication if the user has access to the category
+     */
+    public $accessible;
 }
\ No newline at end of file
diff --git a/api/businesslogic/category/CategoryRetriever.php b/api/businesslogic/category/CategoryRetriever.php
index c45ee146..3c52f79a 100644
--- a/api/businesslogic/category/CategoryRetriever.php
+++ b/api/businesslogic/category/CategoryRetriever.php
@@ -2,6 +2,7 @@
 
 namespace BusinessLogic\Category;
 
+use BusinessLogic\Security\UserContext;
 use DataAccess\CategoryGateway;
 
 class CategoryRetriever {
@@ -14,7 +15,19 @@ class CategoryRetriever {
         $this->categoryGateway = $categoryGateway;
     }
 
-    function getAllCategories($hesk_settings) {
-        return $this->categoryGateway->getAllCategories($hesk_settings);
+    /**
+     * @param $heskSettings array
+     * @param $userContext UserContext
+     * @return array
+     */
+    function getAllCategories($heskSettings, $userContext) {
+        $categories = $this->categoryGateway->getAllCategories($heskSettings);
+
+        foreach ($categories as $category) {
+            $category->accessible = $userContext->admin ||
+                in_array($category->id, $userContext->categories);
+        }
+
+        return $categories;
     }
 }
\ No newline at end of file
diff --git a/api/businesslogic/category/retriever.php b/api/businesslogic/category/retriever.php
deleted file mode 100644
index d8e45267..00000000
--- a/api/businesslogic/category/retriever.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-namespace BusinessLogic\Category;
-
-use DataAccess\CategoryGateway;
-
diff --git a/api/businesslogic/exception/InvalidAuthenticationTokenException.php b/api/businesslogic/exception/InvalidAuthenticationTokenException.php
new file mode 100644
index 00000000..d4686332
--- /dev/null
+++ b/api/businesslogic/exception/InvalidAuthenticationTokenException.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace BusinessLogic\Exceptions;
+
+use Exception;
+
+class InvalidAuthenticationTokenException extends Exception {
+    public function __construct() {
+        parent::__construct('The X-Auth-Token is invalid. The token must be for an active helpdesk user.');
+    }
+}
\ No newline at end of file
diff --git a/api/businesslogic/exception/MissingAuthenticationTokenException.php b/api/businesslogic/exception/MissingAuthenticationTokenException.php
new file mode 100644
index 00000000..1e0ee1e9
--- /dev/null
+++ b/api/businesslogic/exception/MissingAuthenticationTokenException.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: mkoch
+ * Date: 1/28/2017
+ * Time: 9:55 PM
+ */
+
+namespace BusinessLogic\Exceptions;
+
+use Exception;
+
+class MissingAuthenticationTokenException extends Exception {
+    function __construct() {
+        parent::__construct("An 'X-Auth-Token' is required for all requests");
+    }
+}
\ No newline at end of file
diff --git a/api/businesslogic/ValidationException.php b/api/businesslogic/exception/ValidationException.php
similarity index 87%
rename from api/businesslogic/ValidationException.php
rename to api/businesslogic/exception/ValidationException.php
index 9f99ec4d..b26395f7 100644
--- a/api/businesslogic/ValidationException.php
+++ b/api/businesslogic/exception/ValidationException.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace BusinessLogic\Validation;
+namespace BusinessLogic\Exceptions;
 
+use BusinessLogic\Validation\ValidationModel;
 use Exception;
 
 class ValidationException extends Exception {
diff --git a/api/businesslogic/security/UserContextBuilder.php b/api/businesslogic/security/UserContextBuilder.php
index 668fd540..7ec16d76 100644
--- a/api/businesslogic/security/UserContextBuilder.php
+++ b/api/businesslogic/security/UserContextBuilder.php
@@ -3,14 +3,37 @@
 namespace BusinessLogic\Security;
 
 
+use BusinessLogic\Exceptions\InvalidAuthenticationTokenException;
+use BusinessLogic\Exceptions\MissingAuthenticationTokenException;
+use BusinessLogic\Helpers\Helpers;
 use DataAccess\Security\UserGateway;
 
 class UserContextBuilder {
-    static function buildUserContext($authToken, $hesk_settings) {
-        require_once(__DIR__ . '/../../dao/security/UserGateway.php');
+    /**
+     * @var UserGateway
+     */
+    private $userGateway;
+
+    function __construct($userGateway) {
+        $this->userGateway = $userGateway;
+    }
+
+    function buildUserContext($authToken, $heskSettings) {
+        $NULL_OR_EMPTY_STRING = 'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e';
 
-        $hashedToken = hash('sha512', $authToken);
-        return UserGateway::getUserForAuthToken($hashedToken, $hesk_settings);
+        $hashedToken = Helpers::hashToken($authToken);
+
+        if ($hashedToken === $NULL_OR_EMPTY_STRING) {
+            throw new MissingAuthenticationTokenException();
+        }
+
+        $userRow = $this->userGateway->getUserForAuthToken($hashedToken, $heskSettings);
+
+        if ($userRow === null) {
+            throw new InvalidAuthenticationTokenException();
+        }
+
+        return $this->fromDataRow($userRow);
     }
 
     /**
@@ -18,11 +41,7 @@ class UserContextBuilder {
      * @param $dataRow array the $_SESSION superglobal or the hesk_users result set
      * @return UserContext the built user context
      */
-    static function fromDataRow($dataRow) {
-        require_once(__DIR__ . '/UserContext.php');
-        require_once(__DIR__ . '/UserContextPreferences.php');
-        require_once(__DIR__ . '/UserContextNotifications.php');
-
+    function fromDataRow($dataRow) {
         $userContext = new UserContext();
         $userContext->id = $dataRow['id'];
         $userContext->username = $dataRow['user'];
diff --git a/api/businesslogic/security_retriever.php b/api/businesslogic/security_retriever.php
deleted file mode 100644
index 742d97c7..00000000
--- a/api/businesslogic/security_retriever.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-require_once(API_PATH . 'dao/security_dao.php');
-
-function get_user_for_token($token, $hesk_settings) {
-
-    $hash = hash('sha512', $token);
-
-    return get_user_for_token_hash($hash, $hesk_settings);
-}
\ No newline at end of file
diff --git a/api/businesslogic/ticket/TicketCreator.php b/api/businesslogic/ticket/TicketCreator.php
index ce4e3d0c..f34ae95f 100644
--- a/api/businesslogic/ticket/TicketCreator.php
+++ b/api/businesslogic/ticket/TicketCreator.php
@@ -3,9 +3,9 @@
 namespace BusinessLogic\Tickets;
 
 
+use BusinessLogic\Exceptions\ValidationException;
 use BusinessLogic\Validation\ValidationModel;
 use BusinessObjects\CreateTicketByCustomerModel;
-use BusinessLogic\Validation\ValidationException;
 
 class TicketCreator {
     /**
@@ -18,8 +18,6 @@ class TicketCreator {
         $validationModel = validate($ticketRequest, false, $heskSettings, $modsForHeskSettings);
 
         if (count($validationModel->errorKeys) > 0) {
-            require_once(__DIR__ . '/../ValidationException.php');
-
             // Validation failed
             throw new ValidationException($validationModel);
         }
@@ -35,11 +33,6 @@ class TicketCreator {
      * @return ValidationModel If errorKeys is empty, validation successful. Otherwise invalid ticket
      */
     function validate($ticketRequest, $staff, $heskSettings, $modsForHeskSettings) {
-        require_once(__DIR__ . '/../email_validators.php');
-        require_once(__DIR__ . '/../category/CategoryRetriever.php');
-        //require_once('../category/retriever.php');
-        //require_once('../bans/retriever.php');
-
         $TICKET_PRIORITY_CRITICAL = 0;
 
         $validationModel = new ValidationModel();
diff --git a/api/businesslogic/ticket/ticket_creator.php b/api/businesslogic/ticket/ticket_creator.php
deleted file mode 100644
index a4abe2da..00000000
--- a/api/businesslogic/ticket/ticket_creator.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-
diff --git a/api/businesslogic/ticket_retriever.php b/api/businesslogic/ticket_retriever.php
deleted file mode 100644
index 282af64e..00000000
--- a/api/businesslogic/ticket_retriever.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-require_once(API_PATH . 'dao/ticket_dao.php');
-
-function get_ticket_for_staff($hesk_settings, $user, $id = NULL) {
-
-    $tickets = get_ticket_for_id($hesk_settings, $user, $id);
-
-    if ($tickets == NULL) {
-        return NULL;
-    }
-
-    if ($id === NULL) {
-        $original_tickets = $tickets;
-        $tickets = array();
-        foreach ($original_tickets as $ticket) {
-            $ticket = remove_common_properties($ticket);
-            $ticket = convert_to_camel_case($ticket);
-            $ticket = handle_dates($ticket);
-            $tickets[] = $ticket;
-        }
-    } else {
-        $tickets = remove_common_properties($tickets);
-        $tickets = handle_dates($tickets);
-        $tickets = convert_to_camel_case($tickets);
-    }
-
-
-    return $tickets;
-}
-
-function remove_common_properties($ticket) {
-    unset($ticket['lastchange']);
-    unset($ticket['firstreply']);
-    unset($ticket['closedat']);
-    unset($ticket['openedby']);
-    unset($ticket['firstreplyby']);
-    unset($ticket['closedby']);
-    unset($ticket['replies']);
-    unset($ticket['staffreplies']);
-    unset($ticket['lastreplier']);
-    unset($ticket['replierid']);
-
-    return $ticket;
-}
-
-function handle_dates($ticket) {
-    $ticket['dt'] = hesk_date($ticket['dt'], true);
-
-    return $ticket;
-}
-
-function convert_to_camel_case($ticket) {
-    if (isset($ticket['articles'])) {
-        $ticket['suggestedArticles'] = $ticket['articles'];
-        unset($ticket['articles']);
-    }
-    $ticket['legacyAuditTrail'] = $ticket['history'];
-    unset($ticket['history']);
-    $ticket['linkedTo'] = $ticket['parent'];
-    unset($ticket['parent']);
-    $ticket['timeWorked'] = $ticket['time_worked'];
-    unset($ticket['time_worked']);
-    $ticket['userAgent'] = $ticket['user_agent'];
-    unset($ticket['user_agent']);
-    $ticket['screenResolutionWidth'] = $ticket['screen_resolution_width'];
-    unset($ticket['screen_resolution_width']);
-    $ticket['screenResolutionHeight'] = $ticket['screen_resolution_height'];
-    unset($ticket['screen_resolution_height']);
-    $ticket['trackingId'] = $ticket['trackid'];
-    unset($ticket['trackid']);
-    $ticket['dateCreated'] = $ticket['dt'];
-    unset($ticket['dt']);
-    $ticket['dueDate'] = $ticket['due_date'];
-    unset($ticket['due_date']);
-    $ticket['overdueEmailSent'] = $ticket['overdue_email_sent'];
-
-
-    return $ticket;
-}
-
-function get_ticket($hesk_settings, $id) {
-    $ticket = get_ticket_for_id($hesk_settings, $id);
-    $ticket = remove_common_properties($ticket);
-    $ticket = remove_staff_specific_properties($ticket);
-    $ticket = convert_to_camel_case($ticket);
-
-    return $ticket;
-}
-
-function remove_staff_specific_properties($ticket) {
-    unset($ticket['articles']);
-    unset($ticket['ip']);
-    unset($ticket['language']);
-    unset($ticket['owner']);
-    unset($ticket['time_worked']);
-    unset($ticket['history']);
-    unset($ticket['latitude']);
-    unset($ticket['longitude']);
-    unset($ticket['user_agent']);
-    unset($ticket['screen_resolution_width']);
-    unset($ticket['screen_resolution_height']);
-    unset($ticket['parent']);
-    unset($ticket['due_date']);
-    unset($ticket['overdue_email_sent']);
-
-    return $ticket;
-}
\ No newline at end of file
diff --git a/api/businesslogic/user_retriever.php b/api/businesslogic/user_retriever.php
deleted file mode 100644
index 69b3f330..00000000
--- a/api/businesslogic/user_retriever.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-require_once(API_PATH . 'dao/user_dao.php');
-
-function retrieve_user($hesk_settings, $id = NULL) {
-    $users = get_user($hesk_settings, $id);
-
-    if ($id === NULL) {
-        $original_users = $users;
-        $users = array();
-        foreach ($original_users as $user) {
-            $user = remove_unneeded_properties($user);
-            $user = convert_to_camel_case($user);
-            $users[] = $user;
-        }
-    } else {
-        $users = remove_unneeded_properties($users);
-        $users = convert_to_camel_case($users);
-    }
-
-    return $users;
-}
-
-function remove_unneeded_properties($user) {
-    unset($user['pass']);
-    unset($user['permission_template']);
-    unset($user['language']);
-    unset($user['replies']);
-
-    return $user;
-}
-
-function convert_to_camel_case($user) {
-    $user['username'] = $user['user'];
-    unset($user['user']);
-    $user['admin'] = $user['isadmin'];
-    unset($user['isadmin']);
-    $user['afterReply'] = $user['afterreply'];
-    unset($user['afterreply']);
-    $user['autoStart'] = $user['autostart'];
-    unset($user['autostart']);
-    $user['notifyCustomerNew'] = $user['notify_customer_new'];
-    unset($user['notify_customer_new']);
-    $user['notifyCustomerReply'] = $user['notify_customer_reply'];
-    unset($user['notify_customer_reply']);
-    $user['showSuggested'] = $user['show_suggested'];
-    unset($user['show_suggested']);
-    $user['notifyNewUnassigned'] = $user['notify_new_unassigned'];
-    unset($user['notify_new_unassigned']);
-    $user['notifyNewMy'] = $user['notify_new_my'];
-    unset($user['notify_new_my']);
-    $user['notifyReplyUnassigned'] = $user['notify_reply_unassigned'];
-    unset($user['notify_reply_unassigned']);
-    $user['notifyReplyMy'] = $user['notify_reply_my'];
-    unset($user['notify_reply_my']);
-    $user['notifyAssigned'] = $user['notify_assigned'];
-    unset($user['notify_assigned']);
-    $user['notifyPm'] = $user['notify_pm'];
-    unset($user['notify_pm']);
-    $user['notifyNote'] = $user['notify_note'];
-    unset($user['notify_note']);
-    $user['notifyNoteUnassigned'] = $user['notify_note_unassigned'];
-    unset($user['notify_note_unassigned']);
-    $user['defaultList'] = $user['default_list'];
-    unset($user['default_list']);
-    $user['ratingNeg'] = $user['ratingneg'];
-    unset($user['ratingneg']);
-    $user['ratingPos'] = $user['ratingpos'];
-    unset($user['ratingpos']);
-    $user['heskPrivileges'] = $user['heskprivileges'];
-    unset($user['heskprivileges']);
-    $user['defaultCalendarView'] = $user['default_calendar_view'];
-    unset($user['default_calendar_view']);
-    $user['notifyOverdueUnassigned'] = $user['notify_overdue_unassigned'];
-    unset($user['notify_overdue_unassigned']);
-
-    return $user;
-}
\ No newline at end of file
diff --git a/api/controllers/CategoryController.php b/api/controllers/CategoryController.php
index be4ab2a5..acbfe7bb 100644
--- a/api/controllers/CategoryController.php
+++ b/api/controllers/CategoryController.php
@@ -15,11 +15,11 @@ class CategoryController {
     }
 
     private static function getAllCategories() {
-        global $hesk_settings, $applicationContext;
+        global $hesk_settings, $applicationContext, $userContext;
 
         /* @var $categoryRetriever CategoryRetriever */
         $categoryRetriever = $applicationContext->get['CategoryRetriever'];
 
-        return $categoryRetriever->getAllCategories($hesk_settings);
+        return $categoryRetriever->getAllCategories($hesk_settings, $userContext);
     }
 }
\ No newline at end of file
diff --git a/api/core/database.inc.php b/api/core/database.inc.php
index c56381e6..08a20ae2 100755
--- a/api/core/database.inc.php
+++ b/api/core/database.inc.php
@@ -120,9 +120,8 @@ function hesk_dbConnect()
         {
             $message = $hesklang['contact_webmaster'] . $hesk_settings['webmaster_email'];
         }
-        header('Content-Type: application/json');
-        print_error($hesklang['cant_connect_db'], $message);
-        return http_response_code(500);
+        //TODO Throw exception
+        //print_error($hesklang['cant_connect_db'], $message);
     }
 
     if ( ! @mysql_select_db($hesk_settings['db_name'], $hesk_db_link))
@@ -135,9 +134,8 @@ function hesk_dbConnect()
         {
             $message = $hesklang['contact_webmaster'] . $hesk_settings['webmaster_email'];
         }
-        header('Content-Type: application/json');
-        print_error($hesklang['cant_connect_db'], $message);
-        die();
+        //TODO Throw exception
+        //print_error($hesklang['cant_connect_db'], $message);
     }
 
     // Check MySQL/PHP version and set encoding to utf8
@@ -182,10 +180,9 @@ function hesk_dbQuery($query)
     {
         $message = $hesklang['contact_webmaster'] . $hesk_settings['webmaster_email'];
     }
-    header('Content-Type: application/json');
-    print_error($hesklang['cant_sql'], $message);
-    die();
-
+    //TODO Throw exception
+    //print_error($hesklang['cant_sql'], $message);
+    return null;
 } // END hesk_dbQuery()
 
 
diff --git a/api/core/database_mysqli.inc.php b/api/core/database_mysqli.inc.php
index b52122aa..f25f3004 100755
--- a/api/core/database_mysqli.inc.php
+++ b/api/core/database_mysqli.inc.php
@@ -128,9 +128,9 @@ function hesk_dbConnect()
         {
             $message = $hesklang['contact_webmaster'] . $hesk_settings['webmaster_email'];
         }
-        header('Content-Type: application/json');
-        print_error($hesklang['cant_connect_db'], $message);
-        http_response_code(500);
+
+        //TODO Throw exception instead
+        //print_error($hesklang['cant_connect_db'], $message);
     }
 
     // Check MySQL/PHP version and set encoding to utf8
@@ -177,9 +177,10 @@ function hesk_dbQuery($query)
     {
         $message = $hesklang['contact_webmaster'] . $hesk_settings['webmaster_email'];
     }
-    header('Content-Type: application/json');
-    print_error($hesklang['cant_sql'], $message);
-    die(http_response_code(500));
+
+    //TODO Throw exception instead
+    //print_error($hesklang['cant_sql'], $message);
+    return null;
 } // END hesk_dbQuery()
 
 
diff --git a/api/core/headers.php b/api/core/headers.php
deleted file mode 100644
index 892fafb0..00000000
--- a/api/core/headers.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-function get_header($key) {
-    $headers = getallheaders();
-
-    return isset($headers[$key])
-        ? $headers[$key]
-        : NULL;
-}
\ No newline at end of file
diff --git a/api/dao/category/CategoryGateway.php b/api/dao/category/CategoryGateway.php
index 84227761..a2e02174 100644
--- a/api/dao/category/CategoryGateway.php
+++ b/api/dao/category/CategoryGateway.php
@@ -6,6 +6,10 @@ use BusinessObjects\Category;
 use Exception;
 
 class CategoryGateway extends CommonDao {
+    /**
+     * @param $hesk_settings
+     * @return Category[]
+     */
     function getAllCategories($hesk_settings) {
         $this->init();
 
diff --git a/api/dao/category_dao.php b/api/dao/category_dao.php
deleted file mode 100644
index d92ea51c..00000000
--- a/api/dao/category_dao.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-function get_category($hesk_settings, $id = NULL) {
-    $sql = "SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` ";
-    if ($id != NULL) {
-        $sql .= "WHERE `id` = ".intval($id);
-    }
-
-    $response = hesk_dbQuery($sql);
-
-    if (hesk_dbNumRows($response) == 0) {
-        return NULL;
-    }
-
-    $results = array();
-    while ($row = hesk_dbFetchAssoc($response)) {
-        $row['id'] = intval($row['id']);
-        $row['displayOrder'] = intval($row['cat_order']);
-        unset($row['cat_order']);
-        $row['autoassign'] = $row['autoassign'] == 1;
-        $row['type'] = intval($row['type']);
-        $row['priority'] = intval($row['priority']);
-        $row['manager'] = intval($row['manager']) == 0 ? NULL : intval($row['manager']);
-        $results[] = $row;
-    }
-
-    return $id == NULL ? $results : $results[0];
-}
\ No newline at end of file
diff --git a/api/dao/security/UserGateway.php b/api/dao/security/UserGateway.php
index c533095a..95eb9dcf 100644
--- a/api/dao/security/UserGateway.php
+++ b/api/dao/security/UserGateway.php
@@ -10,25 +10,32 @@ namespace DataAccess\Security;
 
 
 use BusinessLogic\Security\UserContextBuilder;
+use DataAccess\CommonDao;
 use Exception;
 
-class UserGateway {
-    static function getUserForAuthToken($hashedToken, $hesk_settings) {
-        require_once(__DIR__ . '/../../businesslogic/security/UserContextBuilder.php');
+class UserGateway extends CommonDao {
+    /**
+     * @param $hashedToken string The pre-hashed token from Helpers::hashToken
+     * @param $heskSettings
+     * @return array|null User ResultSet if an active user for the token is found, null otherwise
+     */
+    function getUserForAuthToken($hashedToken, $heskSettings) {
+        $this->init();
 
-        if (!function_exists('hesk_dbConnect')) {
-            throw new Exception('Database not loaded!');
-        }
-        hesk_dbConnect();
-
-        $rs = hesk_dbQuery('SELECT * FROM `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'users` WHERE `id` = (
+        $rs = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "users` WHERE `id` = (
                 SELECT ``
-                FROM `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'user_api_tokens`
-                WHERE `token` = ' . hesk_dbEscape($hashedToken) . '
-            )');
+                FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "user_api_tokens`
+                WHERE `tokens`.`token` = " . hesk_dbEscape($hashedToken) . "
+            ) AND `active` = '1'");
+
+        if (hesk_dbNumRows($rs) === 0) {
+            return null;
+        }
 
         $row = hesk_dbFetchAssoc($rs);
 
-        return UserContextBuilder::fromDataRow($row);
+        $this->close();
+
+        return $row;
     }
 }
\ No newline at end of file
diff --git a/api/exception/AccessException.php b/api/exception/AccessException.php
deleted file mode 100644
index 7931affe..00000000
--- a/api/exception/AccessException.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-class AccessException extends Exception {
-    public function __construct($code)
-    {
-        $message = '';
-        if ($code == 401) {
-            $message = 'The X-Auth-Token is invalid';
-        }
-        parent::__construct($message, $code);
-    }
-}
\ No newline at end of file
diff --git a/api/index.php b/api/index.php
index df68cd7a..d7dc4203 100644
--- a/api/index.php
+++ b/api/index.php
@@ -3,22 +3,64 @@
 require_once(__DIR__ . '/autoload.php');
 error_reporting(0);
 set_error_handler('errorHandler');
+set_exception_handler('exceptionHandler');
 register_shutdown_function('fatalErrorShutdownHandler');
 
+$userContext = null;
+
 function handle404() {
     http_response_code(404);
     print json_encode('404 found');
 }
 
+function before() {
+    assertApiIsEnabled();
+
+    $token = \BusinessLogic\Helpers\Helpers::getHeader('X-AUTH-TOKEN');
+    buildUserContext($token);
+}
+
 function assertApiIsEnabled() {
+    return true;
+}
+
+function buildUserContext($xAuthToken) {
+    global $applicationContext, $userContext, $hesk_settings;
 
+    /* @var $userContextBuilder \BusinessLogic\Security\UserContextBuilder */
+    $userContextBuilder = $applicationContext->get['UserContextBuilder'];
+
+    $userContext = $userContextBuilder->buildUserContext($xAuthToken, $hesk_settings);
 }
 
 function errorHandler($errorNumber, $errorMessage, $errorFile, $errorLine) {
-    print_error(sprintf("Uncaught error in %s", $errorFile), $errorMessage);
+    throw new Exception(sprintf("%s:%d\n\n%s", $errorFile, $errorLine, $errorMessage));
+}
+
+/**
+ * @param $exception Exception
+ */
+function exceptionHandler($exception) {
+    if (exceptionIsOfType($exception, 'MissingAuthenticationTokenException')) {
+        print_error("Security Exception", $exception->getMessage(), 400);
+    } elseif (exceptionIsOfType($exception, 'InvalidAuthenticationTokenException')) {
+        print_error("Security Exception", $exception->getMessage(), 401);
+    } else {
+        print_error("Fought an uncaught exception", sprintf("%s\n\n%s", $exception->getMessage(), $exception->getTraceAsString()));
+    }
+    // Log more stuff to logging table if possible; we'll catch any exceptions from this
     die();
 }
 
+/**
+ * @param $exception Exception thrown exception
+ * @param $class string The name of the expected exception type
+ * @return bool
+ */
+function exceptionIsOfType($exception, $class) {
+    return strpos(get_class($exception), $class) !== false;
+}
+
 function fatalErrorShutdownHandler() {
     $last_error = error_get_last();
     if ($last_error['type'] === E_ERROR) {
@@ -27,8 +69,7 @@ function fatalErrorShutdownHandler() {
     }
 }
 
-// Must use fully-qualified namespace to controllers
-Link::before('assertApiIsEnabled');
+Link::before('before');
 
 Link::all(array(
     // Categories

From a4af2e668f6ab0fbb9703d6be5082ffe8c007f36 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Mon, 30 Jan 2017 22:10:14 -0500
Subject: [PATCH 020/192] More work on ticket stuff

---
 api/autoload.php                              |   2 +
 .../exception/ApiFriendlyException.php        |  25 +++
 .../InvalidAuthenticationTokenException.php   |   7 +-
 .../MissingAuthenticationTokenException.php   |  14 +-
 api/businesslogic/ticket/Ticket.php           | 191 ++++++++++++++++++
 api/businesslogic/ticket/TicketValidators.php |  12 ++
 api/core/SQLException.php                     |  18 ++
 api/core/database.inc.php                     |  47 ++---
 api/core/database_mysqli.inc.php              |  25 +--
 api/dao/security/UserGateway.php              |  11 +-
 api/dao/ticket/TicketGateway.php              |  13 ++
 api/index.php                                 |  18 +-
 api/testcategory.php                          |  11 -
 13 files changed, 300 insertions(+), 94 deletions(-)
 create mode 100644 api/businesslogic/exception/ApiFriendlyException.php
 create mode 100644 api/businesslogic/ticket/Ticket.php
 create mode 100644 api/businesslogic/ticket/TicketValidators.php
 create mode 100644 api/core/SQLException.php
 create mode 100644 api/dao/ticket/TicketGateway.php
 delete mode 100644 api/testcategory.php

diff --git a/api/autoload.php b/api/autoload.php
index b4b7d7da..dbc64116 100644
--- a/api/autoload.php
+++ b/api/autoload.php
@@ -35,9 +35,11 @@ require_once(__DIR__ . '/businesslogic/security/BannedEmail.php');
 require_once(__DIR__ . '/businesslogic/security/BannedIp.php');
 
 // Exceptions
+require_once(__DIR__ . '/businesslogic/exception/ApiFriendlyException.php');
 require_once(__DIR__ . '/businesslogic/exception/InvalidAuthenticationTokenException.php');
 require_once(__DIR__ . '/businesslogic/exception/MissingAuthenticationTokenException.php');
 require_once(__DIR__ . '/businesslogic/exception/ValidationException.php');
+require_once(__DIR__ . '/core/SQLException.php');
 
 hesk_load_api_database_functions();
 
diff --git a/api/businesslogic/exception/ApiFriendlyException.php b/api/businesslogic/exception/ApiFriendlyException.php
new file mode 100644
index 00000000..f9fac53b
--- /dev/null
+++ b/api/businesslogic/exception/ApiFriendlyException.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace BusinessLogic\Exceptions;
+
+
+use Exception;
+
+class ApiFriendlyException extends Exception {
+    public $title;
+    public $httpResponseCode;
+
+    /**
+     * ApiFriendlyException constructor.
+     * @param string $message
+     * @param string $title
+     * @param int $httpResponseCode
+     */
+    function __construct($message, $title, $httpResponseCode) {
+        $this->title = $title;
+        $this->httpResponseCode = $httpResponseCode;
+
+        parent::__construct($message);
+    }
+
+}
\ No newline at end of file
diff --git a/api/businesslogic/exception/InvalidAuthenticationTokenException.php b/api/businesslogic/exception/InvalidAuthenticationTokenException.php
index d4686332..c28ff8a0 100644
--- a/api/businesslogic/exception/InvalidAuthenticationTokenException.php
+++ b/api/businesslogic/exception/InvalidAuthenticationTokenException.php
@@ -2,10 +2,11 @@
 
 namespace BusinessLogic\Exceptions;
 
-use Exception;
 
-class InvalidAuthenticationTokenException extends Exception {
+class InvalidAuthenticationTokenException extends ApiFriendlyException {
     public function __construct() {
-        parent::__construct('The X-Auth-Token is invalid. The token must be for an active helpdesk user.');
+        parent::__construct('The X-Auth-Token is invalid. The token must be for an active helpdesk user.',
+            'Security Exception',
+            401);
     }
 }
\ No newline at end of file
diff --git a/api/businesslogic/exception/MissingAuthenticationTokenException.php b/api/businesslogic/exception/MissingAuthenticationTokenException.php
index 1e0ee1e9..596839ff 100644
--- a/api/businesslogic/exception/MissingAuthenticationTokenException.php
+++ b/api/businesslogic/exception/MissingAuthenticationTokenException.php
@@ -1,17 +1,11 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: mkoch
- * Date: 1/28/2017
- * Time: 9:55 PM
- */
 
 namespace BusinessLogic\Exceptions;
 
-use Exception;
-
-class MissingAuthenticationTokenException extends Exception {
+class MissingAuthenticationTokenException extends ApiFriendlyException {
     function __construct() {
-        parent::__construct("An 'X-Auth-Token' is required for all requests");
+        parent::__construct("An 'X-Auth-Token' is required for all requests",
+            'Security Exception',
+            400);
     }
 }
\ No newline at end of file
diff --git a/api/businesslogic/ticket/Ticket.php b/api/businesslogic/ticket/Ticket.php
new file mode 100644
index 00000000..8235139e
--- /dev/null
+++ b/api/businesslogic/ticket/Ticket.php
@@ -0,0 +1,191 @@
+<?php
+
+namespace BusinessLogic\Tickets;
+
+
+class Ticket {
+    /**
+     * @var int
+     */
+    public $id;
+
+    /**
+     * @var string
+     */
+    public $trackingId;
+
+    /**
+     * @var string
+     */
+    public $name;
+
+    /**
+     * @var string
+     */
+    public $email;
+
+    /**
+     * @var int
+     */
+    public $category;
+
+    /**
+     * @var int
+     */
+    public $priority;
+
+    /**
+     * @var string
+     */
+    public $subject;
+
+    /**
+     * @var string
+     */
+    public $message;
+
+    /**
+     * @var string
+     */
+    public $dateCreated;
+
+    /**
+     * @var string
+     */
+    public $lastChanged;
+
+    /**
+     * @var string|null
+     */
+    public $firstReplyDate;
+
+    /**
+     * @var string|null
+     */
+    public $closedDate;
+
+    /**
+     * @var string|null
+     */
+    public $suggestedArticles;
+
+    /**
+     * @var string
+     */
+    public $ipAddress;
+
+    /**
+     * @var string|null
+     */
+    public $language;
+
+    /**
+     * @var int
+     */
+    public $statusId;
+
+    /**
+     * @var int (convert to enum)
+     */
+    public $openedByUserId;
+
+    /**
+     * @var int|null
+     */
+    public $firstReplyByUserId;
+
+    /**
+     * @var int|null
+     */
+    public $closedByUserId;
+
+    /**
+     * @var int
+     */
+    public $numberOfReplies;
+
+    /**
+     * @var int
+     */
+    public $numberOfStaffReplies;
+
+    /**
+     * @var int
+     */
+    public $ownerId;
+
+    /**
+     * @var string
+     */
+    public $timeWorked;
+
+    /**
+     * @var int (convert to enum)
+     */
+    public $lastReplier;
+
+    /**
+     * @var bool
+     */
+    public $archived;
+
+    /**
+     * @var bool
+     */
+    public $locked;
+
+    /**
+     * @var array|null (TODO clarify this later)
+     */
+    public $attachments;
+
+    /**
+     * @var int[]|null
+     */
+    public $mergedTicketIds;
+
+    /**
+     * @var string
+     */
+    public $auditTrailHtml;
+
+    /**
+     * @var array (TODO clarify this later)
+     */
+    public $customFields;
+
+    /**
+     * @var int[]
+     */
+    public $linkedTicketIds;
+
+    /**
+     * @var float[2]|null
+     */
+    public $location;
+
+    /**
+     * @var bool
+     */
+    public $usesHtml;
+
+    /**
+     * @var string|null
+     */
+    public $userAgent;
+
+    /**
+     * @var int[2]|null
+     */
+    public $screenResolution;
+
+    /**
+     * @var string|null
+     */
+    public $dueDate;
+
+    /**
+     * @var bool|null
+     */
+    public $dueDateOverdueEmailSent;
+}
\ No newline at end of file
diff --git a/api/businesslogic/ticket/TicketValidators.php b/api/businesslogic/ticket/TicketValidators.php
new file mode 100644
index 00000000..b6539ef9
--- /dev/null
+++ b/api/businesslogic/ticket/TicketValidators.php
@@ -0,0 +1,12 @@
+<?php
+namespace BusinessLogic\Tickets;
+
+
+class TicketValidators {
+    /**
+     * @param $customerEmail string
+     */
+    function isCustomerAtMaxTickets($customerEmail) {
+
+    }
+}
\ No newline at end of file
diff --git a/api/core/SQLException.php b/api/core/SQLException.php
new file mode 100644
index 00000000..e9530a5b
--- /dev/null
+++ b/api/core/SQLException.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Core\Exceptions;
+
+use Exception;
+
+class SQLException extends Exception {
+    /**
+     * @var $failingQuery string
+     */
+    public $failingQuery;
+
+    function __construct($failingQuery) {
+        $this->failingQuery = $failingQuery;
+
+        parent::__construct('A SQL exception occurred. Check the logs for more information.');
+    }
+}
\ No newline at end of file
diff --git a/api/core/database.inc.php b/api/core/database.inc.php
index 08a20ae2..d93a1389 100755
--- a/api/core/database.inc.php
+++ b/api/core/database.inc.php
@@ -112,30 +112,15 @@ function hesk_dbConnect()
 	// Errors?
     if ( ! $hesk_db_link)
     {
-    	if ($hesk_settings['debug_mode'])
-        {
-            $message = $hesklang['mysql_said'] . ': ' . mysql_error();
-        }
-        else
-        {
-            $message = $hesklang['contact_webmaster'] . $hesk_settings['webmaster_email'];
-        }
-        //TODO Throw exception
-        //print_error($hesklang['cant_connect_db'], $message);
+    	$message = $hesklang['mysql_said'] . ': ' . mysql_error();
+
+        throw new \Core\Exceptions\SQLException($message);
     }
 
-    if ( ! @mysql_select_db($hesk_settings['db_name'], $hesk_db_link))
-    {
-    	if ($hesk_settings['debug_mode'])
-        {
-            $message = $hesklang['mysql_said'] . ': ' . mysql_error();
-        }
-        else
-        {
-            $message = $hesklang['contact_webmaster'] . $hesk_settings['webmaster_email'];
-        }
-        //TODO Throw exception
-        //print_error($hesklang['cant_connect_db'], $message);
+    if ( ! @mysql_select_db($hesk_settings['db_name'], $hesk_db_link)) {
+        $message = $hesklang['mysql_said'] . ': ' . mysql_error();
+
+        throw new \Core\Exceptions\SQLException($message);
     }
 
     // Check MySQL/PHP version and set encoding to utf8
@@ -168,21 +153,12 @@ function hesk_dbQuery($query)
 
     $hesk_last_query = $query;
 
-    if ($res = @mysql_query($query, $hesk_db_link))
-    {
+    if ($res = @mysql_query($query, $hesk_db_link)) {
     	return $res;
     }
-    elseif ($hesk_settings['debug_mode'])
-    {
-        $message = $hesklang['mysql_said'] . mysql_error();
-    }
-    else
-    {
-        $message = $hesklang['contact_webmaster'] . $hesk_settings['webmaster_email'];
-    }
-    //TODO Throw exception
-    //print_error($hesklang['cant_sql'], $message);
-    return null;
+
+    $message = $hesklang['mysql_said'] . mysql_error();
+    throw new \Core\Exceptions\SQLException($message);
 } // END hesk_dbQuery()
 
 
@@ -219,6 +195,7 @@ function hesk_dbInsertID()
         return $lastid;
     }
 
+    return null;
 } // END hesk_dbInsertID()
 
 
diff --git a/api/core/database_mysqli.inc.php b/api/core/database_mysqli.inc.php
index f25f3004..0734a2b5 100755
--- a/api/core/database_mysqli.inc.php
+++ b/api/core/database_mysqli.inc.php
@@ -120,17 +120,9 @@ function hesk_dbConnect()
 	// Errors?
     if ( ! $hesk_db_link)
     {
-    	if ($hesk_settings['debug_mode'])
-        {
-            $message = $hesklang['mysql_said'] . ': (' . mysqli_connect_errno() . ') ' . mysqli_connect_error();
-        }
-        else
-        {
-            $message = $hesklang['contact_webmaster'] . $hesk_settings['webmaster_email'];
-        }
+        $message = $hesklang['mysql_said'] . ': (' . mysqli_connect_errno() . ') ' . mysqli_connect_error();
 
-        //TODO Throw exception instead
-        //print_error($hesklang['cant_connect_db'], $message);
+        throw new \Core\Exceptions\SQLException($message);
     }
 
     // Check MySQL/PHP version and set encoding to utf8
@@ -169,18 +161,9 @@ function hesk_dbQuery($query)
     {
     	return $res;
     }
-    elseif ($hesk_settings['debug_mode'])
-    {
-        $message = $hesklang['mysql_said'] . ': ' . mysqli_error($hesk_db_link);
-    }
-    else
-    {
-        $message = $hesklang['contact_webmaster'] . $hesk_settings['webmaster_email'];
-    }
 
-    //TODO Throw exception instead
-    //print_error($hesklang['cant_sql'], $message);
-    return null;
+    $message = $hesklang['mysql_said'] . ': ' . mysqli_error($hesk_db_link);
+    throw new \Core\Exceptions\SQLException($message);
 } // END hesk_dbQuery()
 
 
diff --git a/api/dao/security/UserGateway.php b/api/dao/security/UserGateway.php
index 95eb9dcf..1962f3ff 100644
--- a/api/dao/security/UserGateway.php
+++ b/api/dao/security/UserGateway.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: user
- * Date: 1/21/17
- * Time: 4:23 PM
- */
-
 namespace DataAccess\Security;
 
 
@@ -23,9 +16,9 @@ class UserGateway extends CommonDao {
         $this->init();
 
         $rs = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "users` WHERE `id` = (
-                SELECT ``
+                SELECT `user_id`
                 FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "user_api_tokens`
-                WHERE `tokens`.`token` = " . hesk_dbEscape($hashedToken) . "
+                WHERE `token` = '" . hesk_dbEscape($hashedToken) . "'
             ) AND `active` = '1'");
 
         if (hesk_dbNumRows($rs) === 0) {
diff --git a/api/dao/ticket/TicketGateway.php b/api/dao/ticket/TicketGateway.php
new file mode 100644
index 00000000..cb0f246e
--- /dev/null
+++ b/api/dao/ticket/TicketGateway.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace DataAccess\Tickets;
+
+
+class TicketGateway {
+    function getTicketsByEmail($emailAddress, $heskSettings) {
+        $rs = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "tickets` 
+            WHERE `email` = '" . hesk_dbEscape($emailAddress) . "'");
+
+
+    }
+}
\ No newline at end of file
diff --git a/api/index.php b/api/index.php
index d7dc4203..5b853c41 100644
--- a/api/index.php
+++ b/api/index.php
@@ -41,12 +41,20 @@ function errorHandler($errorNumber, $errorMessage, $errorFile, $errorLine) {
  * @param $exception Exception
  */
 function exceptionHandler($exception) {
-    if (exceptionIsOfType($exception, 'MissingAuthenticationTokenException')) {
-        print_error("Security Exception", $exception->getMessage(), 400);
-    } elseif (exceptionIsOfType($exception, 'InvalidAuthenticationTokenException')) {
-        print_error("Security Exception", $exception->getMessage(), 401);
+    if (exceptionIsOfType($exception, 'ApiFriendlyException')) {
+        /* @var $castedException \BusinessLogic\Exceptions\ApiFriendlyException */
+        $castedException = $exception;
+
+        print_error($castedException->title, $castedException->getMessage(), $castedException->httpResponseCode);
     } else {
-        print_error("Fought an uncaught exception", sprintf("%s\n\n%s", $exception->getMessage(), $exception->getTraceAsString()));
+        if (exceptionIsOfType($exception, 'SQLException')) {
+            /* @var $castedException \Core\Exceptions\SQLException */
+            $castedException = $exception;
+            print_error("Fought an uncaught exception", sprintf("%s\n\n%s", $castedException->failingQuery, $exception->getTraceAsString()));
+        } else {
+            print_error("Fought an uncaught exception", sprintf("%s\n\n%s", $exception->getMessage(), $exception->getTraceAsString()));
+        }
+
     }
     // Log more stuff to logging table if possible; we'll catch any exceptions from this
     die();
diff --git a/api/testcategory.php b/api/testcategory.php
deleted file mode 100644
index cd9592ab..00000000
--- a/api/testcategory.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-define('IN_SCRIPT', 1);
-define('HESK_PATH', '../');
-
-require_once(__DIR__ . '/core/common.php');
-require_once(__DIR__ . '/controllers/CategoryController.php');
-hesk_load_api_database_functions();
-
-$categories = \Controllers\Category\CategoryController::getAllCategories($hesk_settings);
-
-output($categories);
\ No newline at end of file

From a2c98a5a267a686b11fece30cae95618a299d30b Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Tue, 31 Jan 2017 22:26:46 -0500
Subject: [PATCH 021/192] Ticket stuff slowly taking shape

---
 api/ApplicationContext.php                   |   6 ++
 api/autoload.php                             |  10 ++
 api/businesslogic/ticket/Attachment.php      |  27 +++++
 api/businesslogic/ticket/Ticket.php          | 105 +++++++++++++++++--
 api/businesslogic/ticket/TicketRetriever.php |  27 +++++
 api/controllers/TicketController.php         |  17 +++
 api/dao/ticket/TicketGateway.php             |  24 ++++-
 api/index.php                                |   2 +
 8 files changed, 207 insertions(+), 11 deletions(-)
 create mode 100644 api/businesslogic/ticket/Attachment.php
 create mode 100644 api/businesslogic/ticket/TicketRetriever.php
 create mode 100644 api/controllers/TicketController.php

diff --git a/api/ApplicationContext.php b/api/ApplicationContext.php
index 1c2c9307..09e4cdd4 100644
--- a/api/ApplicationContext.php
+++ b/api/ApplicationContext.php
@@ -6,9 +6,11 @@ namespace Core;
 use BusinessLogic\Category\CategoryRetriever;
 use BusinessLogic\Security\BanRetriever;
 use BusinessLogic\Security\UserContextBuilder;
+use BusinessLogic\Tickets\TicketRetriever;
 use DataAccess\CategoryGateway;
 use DataAccess\Security\BanGateway;
 use DataAccess\Security\UserGateway;
+use DataAccess\Tickets\TicketGateway;
 
 class ApplicationContext {
     public $get;
@@ -20,6 +22,10 @@ class ApplicationContext {
         $this->get['CategoryGateway'] = new CategoryGateway();
         $this->get['CategoryRetriever'] = new CategoryRetriever($this->get['CategoryGateway']);
 
+        // Tickets
+        $this->get['TicketGateway'] = new TicketGateway();
+        $this->get['TicketRetriever'] = new TicketRetriever($this->get['TicketGateway']);
+
         // Bans
         $this->get['BanGateway'] = new BanGateway();
         $this->get['BanRetriever'] = new BanRetriever($this->get['BanGateway']);
diff --git a/api/autoload.php b/api/autoload.php
index dbc64116..d468c912 100644
--- a/api/autoload.php
+++ b/api/autoload.php
@@ -34,6 +34,16 @@ require_once(__DIR__ . '/businesslogic/security/BanRetriever.php');
 require_once(__DIR__ . '/businesslogic/security/BannedEmail.php');
 require_once(__DIR__ . '/businesslogic/security/BannedIp.php');
 
+// Tickets
+require_once(__DIR__ . '/dao/ticket/TicketGateway.php');
+require_once(__DIR__ . '/businesslogic/ticket/Attachment.php');
+require_once(__DIR__ . '/businesslogic/ticket/Ticket.php');
+require_once(__DIR__ . '/businesslogic/ticket/CreateTicketByCustomerModel.php');
+require_once(__DIR__ . '/businesslogic/ticket/TicketValidators.php');
+require_once(__DIR__ . '/businesslogic/ticket/TicketCreator.php');
+require_once(__DIR__ . '/businesslogic/ticket/TicketRetriever.php');
+require_once(__DIR__ . '/controllers/TicketController.php');
+
 // Exceptions
 require_once(__DIR__ . '/businesslogic/exception/ApiFriendlyException.php');
 require_once(__DIR__ . '/businesslogic/exception/InvalidAuthenticationTokenException.php');
diff --git a/api/businesslogic/ticket/Attachment.php b/api/businesslogic/ticket/Attachment.php
new file mode 100644
index 00000000..125a8ced
--- /dev/null
+++ b/api/businesslogic/ticket/Attachment.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: mkoch
+ * Date: 1/31/2017
+ * Time: 9:31 PM
+ */
+
+namespace BusinessLogic\Tickets;
+
+
+class Attachment {
+    /**
+     * @var int
+     */
+    public $id;
+
+    /**
+     * @var string
+     */
+    public $fileName;
+
+    /**
+     * @var string
+     */
+    public $savedName;
+}
\ No newline at end of file
diff --git a/api/businesslogic/ticket/Ticket.php b/api/businesslogic/ticket/Ticket.php
index 8235139e..bf1326c0 100644
--- a/api/businesslogic/ticket/Ticket.php
+++ b/api/businesslogic/ticket/Ticket.php
@@ -4,6 +4,86 @@ namespace BusinessLogic\Tickets;
 
 
 class Ticket {
+    static function fromDatabaseRow($row, $linkedTicketsRs, $heskSettings) {
+        $ticket = new Ticket();
+        $ticket->id = $row['id'];
+        $ticket->trackingId = $row['trackid'];
+        $ticket->name = $row['name'];
+        $ticket->email = $row['email'];
+        $ticket->categoryId = $row['category'];
+        $ticket->priorityId = $row['priority'];
+        $ticket->subject = $row['subject'];
+        $ticket->message = $row['message'];
+        $ticket->dateCreated = $row['dt'];
+        $ticket->lastChanged = $row['lastchange'];
+        $ticket->firstReplyDate = $row['firstreply'];
+        $ticket->closedDate = $row['closedat'];
+        $ticket->suggestedArticles = explode(',', $row['articles']);
+        $ticket->ipAddress = $row['ip'];
+        $ticket->language = $row['language'];
+        $ticket->statusId = $row['status'];
+        $ticket->openedBy = $row['openedby'];
+        $ticket->firstReplyByUserId = $row['firstreplyby'];
+        $ticket->closedByUserId = $row['closedby'];
+        $ticket->numberOfReplies = $row['replies'];
+        $ticket->numberOfStaffReplies = $row['staffreplies'];
+        $ticket->ownerId = $row['owner'];
+        $ticket->timeWorked = $row['time_worked'];
+        $ticket->lastReplyBy = $row['lastreplier'];
+        $ticket->lastReplier = $row['replierid'];
+        $ticket->archived = intval($row['archive']) === 1;
+        $ticket->locked = intval($row['locked']) === 1;
+
+        if (trim($row['attachments']) !== '') {
+            $attachments = explode(',', $row['attachments']);
+            $attachmentArray = array();
+            foreach ($attachments as $attachment) {
+                $attachmentRow = explode('#', $attachment);
+                $attachmentModel = new Attachment();
+
+                $attachmentModel->id = $attachmentRow[0];
+                $attachmentModel->fileName = $attachmentRow[1];
+                $attachmentModel->savedName = $attachmentRow[2];
+
+                $attachmentArray[] = $attachmentModel;
+            }
+            $ticket->attachments = $attachmentArray;
+        }
+
+        if (trim($row['merged']) !== '') {
+            $ticket->mergedTicketIds = explode(',', $row['merged']);
+        }
+
+        $ticket->auditTrailHtml = $row['history'];
+
+        $ticket->customFields = array();
+        foreach ($heskSettings['custom_fields'] as $key => $value) {
+            if ($value['use'] == 1 && hesk_is_custom_field_in_category($key, intval($ticket->categoryId))) {
+                $ticket->customFields[str_replace('custom', '', $key)] = $row[$key];
+            }
+        }
+
+        $ticket->linkedTicketIds = array();
+        while ($linkedTicketsRow = hesk_dbFetchAssoc($linkedTicketsRs)) {
+            $ticket->linkedTicketIds[] = $linkedTicketsRow['id'];
+        }
+
+        $ticket->location = array();
+        $ticket->location[0] = $row['latitude'];
+        $ticket->location[1] = $row['longitude'];
+
+        $ticket->usesHtml = intval($row['html']) === 1;
+        $ticket->userAgent = $row['user_agent'];
+        $ticket->screenResolution = array();
+        $ticket->screenResolution[0] = $row['screen_resolution_width'];
+        $ticket->screenResolution[1] = $row['screen_resolution_height'];
+
+        $ticket->dueDate = $row['due_date'];
+        $ticket->dueDateOverdueEmailSent = $row['overdue_email_sent'] !== null && intval($row['overdue_email_sent']) === 1;
+
+        return $ticket;
+    }
+
     /**
      * @var int
      */
@@ -27,12 +107,12 @@ class Ticket {
     /**
      * @var int
      */
-    public $category;
+    public $categoryId;
 
     /**
      * @var int
      */
-    public $priority;
+    public $priorityId;
 
     /**
      * @var string
@@ -65,7 +145,7 @@ class Ticket {
     public $closedDate;
 
     /**
-     * @var string|null
+     * @var string[]|null
      */
     public $suggestedArticles;
 
@@ -85,9 +165,9 @@ class Ticket {
     public $statusId;
 
     /**
-     * @var int (convert to enum)
+     * @var int
      */
-    public $openedByUserId;
+    public $openedBy;
 
     /**
      * @var int|null
@@ -120,7 +200,12 @@ class Ticket {
     public $timeWorked;
 
     /**
-     * @var int (convert to enum)
+     * @var int
+     */
+    public $lastReplyBy;
+
+    /**
+     * @var int|null
      */
     public $lastReplier;
 
@@ -135,7 +220,7 @@ class Ticket {
     public $locked;
 
     /**
-     * @var array|null (TODO clarify this later)
+     * @var Attachment[]|null
      */
     public $attachments;
 
@@ -150,7 +235,7 @@ class Ticket {
     public $auditTrailHtml;
 
     /**
-     * @var array (TODO clarify this later)
+     * @var string[]
      */
     public $customFields;
 
@@ -160,7 +245,7 @@ class Ticket {
     public $linkedTicketIds;
 
     /**
-     * @var float[2]|null
+     * @var float[]|null
      */
     public $location;
 
@@ -175,7 +260,7 @@ class Ticket {
     public $userAgent;
 
     /**
-     * @var int[2]|null
+     * @var int[]|null
      */
     public $screenResolution;
 
diff --git a/api/businesslogic/ticket/TicketRetriever.php b/api/businesslogic/ticket/TicketRetriever.php
new file mode 100644
index 00000000..0ff84fae
--- /dev/null
+++ b/api/businesslogic/ticket/TicketRetriever.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: mkoch
+ * Date: 1/31/2017
+ * Time: 10:13 PM
+ */
+
+namespace BusinessLogic\Tickets;
+
+
+use DataAccess\Tickets\TicketGateway;
+
+class TicketRetriever {
+    /**
+     * @var $ticketGateway TicketGateway
+     */
+    private $ticketGateway;
+
+    function __construct($ticketGateway) {
+        $this->ticketGateway = $ticketGateway;
+    }
+
+    function getTicketById($id, $heskSettings, $userContext) {
+        return $this->ticketGateway->getTicketById($id, $heskSettings);
+    }
+}
\ No newline at end of file
diff --git a/api/controllers/TicketController.php b/api/controllers/TicketController.php
new file mode 100644
index 00000000..57125ccb
--- /dev/null
+++ b/api/controllers/TicketController.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Controllers\Tickets;
+
+use BusinessLogic\Tickets\TicketRetriever;
+
+
+class TicketController {
+    function get($id) {
+        global $applicationContext, $hesk_settings, $userContext;
+
+        /* @var $ticketRetriever TicketRetriever */
+        $ticketRetriever = $applicationContext->get['TicketRetriever'];
+
+        output($ticketRetriever->getTicketById($id, $hesk_settings, $userContext));
+    }
+}
\ No newline at end of file
diff --git a/api/dao/ticket/TicketGateway.php b/api/dao/ticket/TicketGateway.php
index cb0f246e..9b05e594 100644
--- a/api/dao/ticket/TicketGateway.php
+++ b/api/dao/ticket/TicketGateway.php
@@ -3,11 +3,33 @@
 namespace DataAccess\Tickets;
 
 
-class TicketGateway {
+use BusinessLogic\Tickets\Ticket;
+use DataAccess\CommonDao;
+
+class TicketGateway extends CommonDao {
+    function getTicketById($id, $heskSettings) {
+        $this->init();
+
+        $rs = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "tickets` WHERE `id` = " . intval($id));
+        $row = hesk_dbFetchAssoc($rs);
+        $linkedTicketsRs = hesk_dbQuery("SELECT * FROM `hesk_tickets` WHERE `parent` = " . intval($id));
+
+        $ticket = Ticket::fromDatabaseRow($row, $linkedTicketsRs, $heskSettings);
+
+        $this->close();
+
+        return $ticket;
+    }
+
     function getTicketsByEmail($emailAddress, $heskSettings) {
         $rs = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "tickets` 
             WHERE `email` = '" . hesk_dbEscape($emailAddress) . "'");
 
+        $tickets = array();
+
+        while ($row = hesk_dbFetchAssoc($rs)) {
+            $ticket = new Ticket();
 
+        }
     }
 }
\ No newline at end of file
diff --git a/api/index.php b/api/index.php
index 5b853c41..b58ce89a 100644
--- a/api/index.php
+++ b/api/index.php
@@ -83,6 +83,8 @@ Link::all(array(
     // Categories
     '/v1/categories' => '\Controllers\Category\CategoryController::printAllCategories',
     '/v1/categories/{i}' => '\Controllers\Category\CategoryController',
+    // Tickets
+    '/v1/tickets/{i}' => '\Controllers\Tickets\TicketController',
 
     // Any URL that doesn't match goes to the 404 handler
     '404' => 'handle404'

From 2b0d2bb9ccfc50eb1aa19bdf6a4fedde718c1726 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Wed, 1 Feb 2017 21:03:05 -0500
Subject: [PATCH 022/192] Send all enabled custom fields

---
 api/businesslogic/ticket/Ticket.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/businesslogic/ticket/Ticket.php b/api/businesslogic/ticket/Ticket.php
index bf1326c0..f5bf749d 100644
--- a/api/businesslogic/ticket/Ticket.php
+++ b/api/businesslogic/ticket/Ticket.php
@@ -58,7 +58,7 @@ class Ticket {
 
         $ticket->customFields = array();
         foreach ($heskSettings['custom_fields'] as $key => $value) {
-            if ($value['use'] == 1 && hesk_is_custom_field_in_category($key, intval($ticket->categoryId))) {
+            if ($value['use'] && hesk_is_custom_field_in_category($key, intval($ticket->categoryId))) {
                 $ticket->customFields[str_replace('custom', '', $key)] = $row[$key];
             }
         }

From ad43c420bb51be7eb97948ee435145d08e4290f9 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Wed, 1 Feb 2017 22:04:52 -0500
Subject: [PATCH 023/192] Use PSR-4 standard for classloading

---
 api/ApplicationContext.php                    |  7 ++-
 api/BusinessLogic/Categories/Category.php     | 50 ++++++++++++++++++
 .../Categories}/CategoryRetriever.php         |  4 +-
 .../Exceptions}/ApiFriendlyException.php      |  0
 .../InvalidAuthenticationTokenException.php   |  0
 .../MissingAuthenticationTokenException.php   |  0
 .../Exceptions}/ValidationException.php       |  2 +-
 .../Tickets}/Attachment.php                   |  0
 .../Tickets}/CreateTicketByCustomerModel.php  |  0
 .../Tickets}/Ticket.php                       | 52 ++++++++++++-------
 .../Tickets}/TicketCreator.php                |  4 +-
 .../Tickets}/TicketRetriever.php              |  0
 .../Tickets}/TicketValidators.php             |  0
 .../Categories}/CategoryController.php        |  0
 .../Tickets}/TicketController.php             |  0
 .../Exceptions}/SQLException.php              |  2 +-
 .../Categories}/CategoryGateway.php           |  3 +-
 api/{dao => DataAccess}/CommonDao.php         |  6 ---
 .../Security}/BanGateway.php                  |  0
 .../Security}/UserGateway.php                 |  0
 .../Tickets}/TicketGateway.php                |  0
 api/{dao => DataAccess}/canned_dao.php        |  0
 api/{dao => DataAccess}/status_dao.php        |  0
 api/{dao => DataAccess}/ticket_dao.php        |  4 +-
 .../ticket_template_dao.php                   |  0
 api/{dao => DataAccess}/user_dao.php          |  0
 api/autoload.php                              | 49 ++---------------
 api/bootstrap.php                             |  8 +++
 api/businesslogic/Helpers.php                 |  8 +--
 api/businesslogic/ValidationModel.php         |  2 +-
 api/businesslogic/category/Category.php       | 50 ------------------
 .../security/UserContextBuilder.php           |  2 +-
 api/dao/security_dao.php                      | 23 --------
 api/index.php                                 | 12 +++--
 34 files changed, 117 insertions(+), 171 deletions(-)
 create mode 100644 api/BusinessLogic/Categories/Category.php
 rename api/{businesslogic/category => BusinessLogic/Categories}/CategoryRetriever.php (90%)
 rename api/{businesslogic/exception => BusinessLogic/Exceptions}/ApiFriendlyException.php (100%)
 rename api/{businesslogic/exception => BusinessLogic/Exceptions}/InvalidAuthenticationTokenException.php (100%)
 rename api/{businesslogic/exception => BusinessLogic/Exceptions}/MissingAuthenticationTokenException.php (100%)
 rename api/{businesslogic/exception => BusinessLogic/Exceptions}/ValidationException.php (92%)
 rename api/{businesslogic/ticket => BusinessLogic/Tickets}/Attachment.php (100%)
 rename api/{businesslogic/ticket => BusinessLogic/Tickets}/CreateTicketByCustomerModel.php (100%)
 rename api/{businesslogic/ticket => BusinessLogic/Tickets}/Ticket.php (74%)
 rename api/{businesslogic/ticket => BusinessLogic/Tickets}/TicketCreator.php (98%)
 rename api/{businesslogic/ticket => BusinessLogic/Tickets}/TicketRetriever.php (100%)
 rename api/{businesslogic/ticket => BusinessLogic/Tickets}/TicketValidators.php (100%)
 rename api/{controllers => Controllers/Categories}/CategoryController.php (100%)
 rename api/{controllers => Controllers/Tickets}/TicketController.php (100%)
 rename api/{core => Core/Exceptions}/SQLException.php (72%)
 rename api/{dao/category => DataAccess/Categories}/CategoryGateway.php (94%)
 rename api/{dao => DataAccess}/CommonDao.php (81%)
 rename api/{dao/security => DataAccess/Security}/BanGateway.php (100%)
 rename api/{dao/security => DataAccess/Security}/UserGateway.php (100%)
 rename api/{dao/ticket => DataAccess/Tickets}/TicketGateway.php (100%)
 rename api/{dao => DataAccess}/canned_dao.php (100%)
 rename api/{dao => DataAccess}/status_dao.php (100%)
 rename api/{dao => DataAccess}/ticket_dao.php (93%)
 rename api/{dao => DataAccess}/ticket_template_dao.php (100%)
 rename api/{dao => DataAccess}/user_dao.php (100%)
 create mode 100644 api/bootstrap.php
 delete mode 100644 api/businesslogic/category/Category.php
 delete mode 100644 api/dao/security_dao.php

diff --git a/api/ApplicationContext.php b/api/ApplicationContext.php
index 09e4cdd4..aa09011c 100644
--- a/api/ApplicationContext.php
+++ b/api/ApplicationContext.php
@@ -1,17 +1,16 @@
 <?php
 
-namespace Core;
-
 // Responsible for loading in all necessary classes. AKA a poor man's DI solution.
-use BusinessLogic\Category\CategoryRetriever;
+use BusinessLogic\Categories\CategoryRetriever;
 use BusinessLogic\Security\BanRetriever;
 use BusinessLogic\Security\UserContextBuilder;
 use BusinessLogic\Tickets\TicketRetriever;
-use DataAccess\CategoryGateway;
+use DataAccess\Categories\CategoryGateway;
 use DataAccess\Security\BanGateway;
 use DataAccess\Security\UserGateway;
 use DataAccess\Tickets\TicketGateway;
 
+
 class ApplicationContext {
     public $get;
 
diff --git a/api/BusinessLogic/Categories/Category.php b/api/BusinessLogic/Categories/Category.php
new file mode 100644
index 00000000..5b975b61
--- /dev/null
+++ b/api/BusinessLogic/Categories/Category.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace BusinessObjects;
+
+class Category {
+    /**
+     * @var int The Categories ID
+     */
+    public $id;
+
+    /**
+     * @var int Categories order number
+     */
+    public $catOrder;
+
+    /**
+     * @var bool Tickets autoassigned in this Categories
+     */
+    public $autoAssign;
+
+    /**
+     * @var int The type of Categories (1 = Private, 2 = Public)
+     */
+    public $type;
+
+    /**
+     * @var int The Categories's usage (0 = Tickets and Events, 1 = Tickets, 2 = Events)
+     */
+    public $usage;
+
+    /**
+     * @var string? The color of the Categories
+     */
+    public $color;
+
+    /**
+     * @var int The default Tickets priority
+     */
+    public $priority;
+
+    /**
+     * @var int|null The manager for the Categories, if applicable
+     */
+    public $manager;
+
+    /**
+     * @var bool Indication if the user has access to the Categories
+     */
+    public $accessible;
+}
\ No newline at end of file
diff --git a/api/businesslogic/category/CategoryRetriever.php b/api/BusinessLogic/Categories/CategoryRetriever.php
similarity index 90%
rename from api/businesslogic/category/CategoryRetriever.php
rename to api/BusinessLogic/Categories/CategoryRetriever.php
index 3c52f79a..4a46466f 100644
--- a/api/businesslogic/category/CategoryRetriever.php
+++ b/api/BusinessLogic/Categories/CategoryRetriever.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace BusinessLogic\Category;
+namespace BusinessLogic\Categories;
 
 use BusinessLogic\Security\UserContext;
-use DataAccess\CategoryGateway;
+use DataAccess\Categories\CategoryGateway;
 
 class CategoryRetriever {
     /**
diff --git a/api/businesslogic/exception/ApiFriendlyException.php b/api/BusinessLogic/Exceptions/ApiFriendlyException.php
similarity index 100%
rename from api/businesslogic/exception/ApiFriendlyException.php
rename to api/BusinessLogic/Exceptions/ApiFriendlyException.php
diff --git a/api/businesslogic/exception/InvalidAuthenticationTokenException.php b/api/BusinessLogic/Exceptions/InvalidAuthenticationTokenException.php
similarity index 100%
rename from api/businesslogic/exception/InvalidAuthenticationTokenException.php
rename to api/BusinessLogic/Exceptions/InvalidAuthenticationTokenException.php
diff --git a/api/businesslogic/exception/MissingAuthenticationTokenException.php b/api/BusinessLogic/Exceptions/MissingAuthenticationTokenException.php
similarity index 100%
rename from api/businesslogic/exception/MissingAuthenticationTokenException.php
rename to api/BusinessLogic/Exceptions/MissingAuthenticationTokenException.php
diff --git a/api/businesslogic/exception/ValidationException.php b/api/BusinessLogic/Exceptions/ValidationException.php
similarity index 92%
rename from api/businesslogic/exception/ValidationException.php
rename to api/BusinessLogic/Exceptions/ValidationException.php
index b26395f7..aa382328 100644
--- a/api/businesslogic/exception/ValidationException.php
+++ b/api/BusinessLogic/Exceptions/ValidationException.php
@@ -2,7 +2,7 @@
 
 namespace BusinessLogic\Exceptions;
 
-use BusinessLogic\Validation\ValidationModel;
+use BusinessLogic\ValidationModel;
 use Exception;
 
 class ValidationException extends Exception {
diff --git a/api/businesslogic/ticket/Attachment.php b/api/BusinessLogic/Tickets/Attachment.php
similarity index 100%
rename from api/businesslogic/ticket/Attachment.php
rename to api/BusinessLogic/Tickets/Attachment.php
diff --git a/api/businesslogic/ticket/CreateTicketByCustomerModel.php b/api/BusinessLogic/Tickets/CreateTicketByCustomerModel.php
similarity index 100%
rename from api/businesslogic/ticket/CreateTicketByCustomerModel.php
rename to api/BusinessLogic/Tickets/CreateTicketByCustomerModel.php
diff --git a/api/businesslogic/ticket/Ticket.php b/api/BusinessLogic/Tickets/Ticket.php
similarity index 74%
rename from api/businesslogic/ticket/Ticket.php
rename to api/BusinessLogic/Tickets/Ticket.php
index f5bf749d..13b5a43a 100644
--- a/api/businesslogic/ticket/Ticket.php
+++ b/api/BusinessLogic/Tickets/Ticket.php
@@ -6,31 +6,35 @@ namespace BusinessLogic\Tickets;
 class Ticket {
     static function fromDatabaseRow($row, $linkedTicketsRs, $heskSettings) {
         $ticket = new Ticket();
-        $ticket->id = $row['id'];
+        $ticket->id = intval($row['id']);
         $ticket->trackingId = $row['trackid'];
         $ticket->name = $row['name'];
         $ticket->email = $row['email'];
-        $ticket->categoryId = $row['category'];
-        $ticket->priorityId = $row['priority'];
+        $ticket->categoryId = intval($row['category']);
+        $ticket->priorityId = intval($row['priority']);
         $ticket->subject = $row['subject'];
         $ticket->message = $row['message'];
         $ticket->dateCreated = $row['dt'];
         $ticket->lastChanged = $row['lastchange'];
         $ticket->firstReplyDate = $row['firstreply'];
         $ticket->closedDate = $row['closedat'];
-        $ticket->suggestedArticles = explode(',', $row['articles']);
+
+        if (trim($row['articles']) !== '') {
+            $ticket->suggestedArticles = explode(',', $row['articles']);
+        }
+
         $ticket->ipAddress = $row['ip'];
         $ticket->language = $row['language'];
-        $ticket->statusId = $row['status'];
-        $ticket->openedBy = $row['openedby'];
-        $ticket->firstReplyByUserId = $row['firstreplyby'];
-        $ticket->closedByUserId = $row['closedby'];
-        $ticket->numberOfReplies = $row['replies'];
-        $ticket->numberOfStaffReplies = $row['staffreplies'];
-        $ticket->ownerId = $row['owner'];
+        $ticket->statusId = intval($row['status']);
+        $ticket->openedBy = intval($row['openedby']);
+        $ticket->firstReplyByUserId = $row['firstreplyby'] === null ? null : intval($row['firstreplyby']);
+        $ticket->closedByUserId = $row['closedby'] === null ? null : intval($row['closedby']);
+        $ticket->numberOfReplies = intval($row['replies']);
+        $ticket->numberOfStaffReplies = intval($row['staffreplies']);
+        $ticket->ownerId = intval($row['owner']);
         $ticket->timeWorked = $row['time_worked'];
-        $ticket->lastReplyBy = $row['lastreplier'];
-        $ticket->lastReplier = $row['replierid'];
+        $ticket->lastReplyBy = intval($row['lastreplier']);
+        $ticket->lastReplier = $row['replierid'] === null ? null : intval($row['replierid']);
         $ticket->archived = intval($row['archive']) === 1;
         $ticket->locked = intval($row['locked']) === 1;
 
@@ -68,15 +72,23 @@ class Ticket {
             $ticket->linkedTicketIds[] = $linkedTicketsRow['id'];
         }
 
-        $ticket->location = array();
-        $ticket->location[0] = $row['latitude'];
-        $ticket->location[1] = $row['longitude'];
+        if ($row['latitude'] !== '' && $row['longitude'] !== '') {
+            $ticket->location = array();
+            $ticket->location[0] = $row['latitude'];
+            $ticket->location[1] = $row['longitude'];
+        }
 
         $ticket->usesHtml = intval($row['html']) === 1;
-        $ticket->userAgent = $row['user_agent'];
-        $ticket->screenResolution = array();
-        $ticket->screenResolution[0] = $row['screen_resolution_width'];
-        $ticket->screenResolution[1] = $row['screen_resolution_height'];
+
+        if ($row['user_agent'] !== null && trim($row['user_agent']) !== '') {
+            $ticket->userAgent = $row['user_agent'];
+        }
+
+        if ($row['screen_resolution_height'] !== null && $row['screen_resolution_width'] !== null){
+            $ticket->screenResolution = array();
+            $ticket->screenResolution[0] = $row['screen_resolution_width'];
+            $ticket->screenResolution[1] = $row['screen_resolution_height'];
+        }
 
         $ticket->dueDate = $row['due_date'];
         $ticket->dueDateOverdueEmailSent = $row['overdue_email_sent'] !== null && intval($row['overdue_email_sent']) === 1;
diff --git a/api/businesslogic/ticket/TicketCreator.php b/api/BusinessLogic/Tickets/TicketCreator.php
similarity index 98%
rename from api/businesslogic/ticket/TicketCreator.php
rename to api/BusinessLogic/Tickets/TicketCreator.php
index f34ae95f..74d7786d 100644
--- a/api/businesslogic/ticket/TicketCreator.php
+++ b/api/BusinessLogic/Tickets/TicketCreator.php
@@ -22,7 +22,7 @@ class TicketCreator {
             throw new ValidationException($validationModel);
         }
 
-        // Create the ticket
+        // Create the Tickets
     }
 
     /**
@@ -30,7 +30,7 @@ class TicketCreator {
      * @param $staff bool
      * @param $heskSettings array HESK settings
      * @param $modsForHeskSettings array Mods for HESK settings
-     * @return ValidationModel If errorKeys is empty, validation successful. Otherwise invalid ticket
+     * @return ValidationModel If errorKeys is empty, validation successful. Otherwise invalid Tickets
      */
     function validate($ticketRequest, $staff, $heskSettings, $modsForHeskSettings) {
         $TICKET_PRIORITY_CRITICAL = 0;
diff --git a/api/businesslogic/ticket/TicketRetriever.php b/api/BusinessLogic/Tickets/TicketRetriever.php
similarity index 100%
rename from api/businesslogic/ticket/TicketRetriever.php
rename to api/BusinessLogic/Tickets/TicketRetriever.php
diff --git a/api/businesslogic/ticket/TicketValidators.php b/api/BusinessLogic/Tickets/TicketValidators.php
similarity index 100%
rename from api/businesslogic/ticket/TicketValidators.php
rename to api/BusinessLogic/Tickets/TicketValidators.php
diff --git a/api/controllers/CategoryController.php b/api/Controllers/Categories/CategoryController.php
similarity index 100%
rename from api/controllers/CategoryController.php
rename to api/Controllers/Categories/CategoryController.php
diff --git a/api/controllers/TicketController.php b/api/Controllers/Tickets/TicketController.php
similarity index 100%
rename from api/controllers/TicketController.php
rename to api/Controllers/Tickets/TicketController.php
diff --git a/api/core/SQLException.php b/api/Core/Exceptions/SQLException.php
similarity index 72%
rename from api/core/SQLException.php
rename to api/Core/Exceptions/SQLException.php
index e9530a5b..db3f412b 100644
--- a/api/core/SQLException.php
+++ b/api/Core/Exceptions/SQLException.php
@@ -13,6 +13,6 @@ class SQLException extends Exception {
     function __construct($failingQuery) {
         $this->failingQuery = $failingQuery;
 
-        parent::__construct('A SQL exception occurred. Check the logs for more information.');
+        parent::__construct('A SQL Exceptions occurred. Check the logs for more information.');
     }
 }
\ No newline at end of file
diff --git a/api/dao/category/CategoryGateway.php b/api/DataAccess/Categories/CategoryGateway.php
similarity index 94%
rename from api/dao/category/CategoryGateway.php
rename to api/DataAccess/Categories/CategoryGateway.php
index a2e02174..d12a7e92 100644
--- a/api/dao/category/CategoryGateway.php
+++ b/api/DataAccess/Categories/CategoryGateway.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace DataAccess;
+namespace DataAccess\Categories;
 
 use BusinessObjects\Category;
+use DataAccess\CommonDao;
 use Exception;
 
 class CategoryGateway extends CommonDao {
diff --git a/api/dao/CommonDao.php b/api/DataAccess/CommonDao.php
similarity index 81%
rename from api/dao/CommonDao.php
rename to api/DataAccess/CommonDao.php
index edc993b4..f98056fb 100644
--- a/api/dao/CommonDao.php
+++ b/api/DataAccess/CommonDao.php
@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: Mike
- * Date: 1/28/2017
- * Time: 1:33 AM
- */
 
 namespace DataAccess;
 
diff --git a/api/dao/security/BanGateway.php b/api/DataAccess/Security/BanGateway.php
similarity index 100%
rename from api/dao/security/BanGateway.php
rename to api/DataAccess/Security/BanGateway.php
diff --git a/api/dao/security/UserGateway.php b/api/DataAccess/Security/UserGateway.php
similarity index 100%
rename from api/dao/security/UserGateway.php
rename to api/DataAccess/Security/UserGateway.php
diff --git a/api/dao/ticket/TicketGateway.php b/api/DataAccess/Tickets/TicketGateway.php
similarity index 100%
rename from api/dao/ticket/TicketGateway.php
rename to api/DataAccess/Tickets/TicketGateway.php
diff --git a/api/dao/canned_dao.php b/api/DataAccess/canned_dao.php
similarity index 100%
rename from api/dao/canned_dao.php
rename to api/DataAccess/canned_dao.php
diff --git a/api/dao/status_dao.php b/api/DataAccess/status_dao.php
similarity index 100%
rename from api/dao/status_dao.php
rename to api/DataAccess/status_dao.php
diff --git a/api/dao/ticket_dao.php b/api/DataAccess/ticket_dao.php
similarity index 93%
rename from api/dao/ticket_dao.php
rename to api/DataAccess/ticket_dao.php
index 88ae5047..f7805323 100644
--- a/api/dao/ticket_dao.php
+++ b/api/DataAccess/ticket_dao.php
@@ -13,7 +13,7 @@ function get_ticket_for_id($hesk_settings, $user, $id = NULL) {
         $clause = $used_where_clause ? ' AND ' : ' WHERE ';
         $used_where_clause = true;
 
-        $sql .= $clause . ' `category` IN (' . $user['categories'] . ')';
+        $sql .= $clause . ' `Categories` IN (' . $user['categories'] . ')';
         $sql .= " AND ((`heskprivileges` LIKE '%can_view_tickets%' AND `owner` = " . intval($user['id']) . ")";
         $sql .= " OR (`heskprivileges` LIKE '%can_view_unassigned%' AND `owner` = 0)";
         $sql .= " OR (`heskprivileges` LIKE '%can_view_ass_others%' AND `owner` <> " . intval($user['id']) . "))";
@@ -34,7 +34,7 @@ function build_results($response) {
     $results = array();
     while ($row = hesk_dbFetchAssoc($response)) {
         $row['id'] = intval($row['id']);
-        $row['category'] = intval($row['category']);
+        $row['Categories'] = intval($row['Categories']);
         $row['priority'] = intval($row['priority']);
         $row['status'] = intval($row['status']);
         $row['replierid'] = intval($row['replierid']);
diff --git a/api/dao/ticket_template_dao.php b/api/DataAccess/ticket_template_dao.php
similarity index 100%
rename from api/dao/ticket_template_dao.php
rename to api/DataAccess/ticket_template_dao.php
diff --git a/api/dao/user_dao.php b/api/DataAccess/user_dao.php
similarity index 100%
rename from api/dao/user_dao.php
rename to api/DataAccess/user_dao.php
diff --git a/api/autoload.php b/api/autoload.php
index d468c912..c00cea7b 100644
--- a/api/autoload.php
+++ b/api/autoload.php
@@ -1,55 +1,15 @@
 <?php
 
-// Responsible for loading in all necessary scripts and kicking off the DependencyManager
+// Files that are needed that aren't classes, as well as basic initialization
 // Core requirements
 define('IN_SCRIPT', 1);
 define('HESK_PATH', '../');
+require_once(__DIR__ . '/bootstrap.php');
 require_once(__DIR__ . '/../hesk_settings.inc.php');
 require_once(__DIR__ . '/../inc/common.inc.php');
-require_once(__DIR__ . '/core/output.php');
-require_once(__DIR__ . '/Link.php');
+require_once(__DIR__ . '/Core/output.php');
 require_once(__DIR__ . '/../hesk_settings.inc.php');
-
-// Mods for HESK API Files
 require_once(__DIR__ . '/http_response_code.php');
-require_once(__DIR__ . '/dao/CommonDao.php');
-require_once(__DIR__ . '/businesslogic/Helpers.php');
-
-// User Context
-require_once(__DIR__ . '/dao/security/UserGateway.php');
-require_once(__DIR__ . '/businesslogic/security/UserContextBuilder.php');
-require_once(__DIR__ . '/businesslogic/security/UserContextNotifications.php');
-require_once(__DIR__ . '/businesslogic/security/UserContextPreferences.php');
-require_once(__DIR__ . '/businesslogic/security/UserContext.php');
-
-// Categories
-require_once(__DIR__ . '/dao/category/CategoryGateway.php');
-require_once(__DIR__ . '/businesslogic/category/CategoryRetriever.php');
-require_once(__DIR__ . '/businesslogic/category/Category.php');
-require_once(__DIR__ . '/controllers/CategoryController.php');
-
-// Banned Emails / IP Addresses
-require_once(__DIR__ . '/dao/security/BanGateway.php');
-require_once(__DIR__ . '/businesslogic/security/BanRetriever.php');
-require_once(__DIR__ . '/businesslogic/security/BannedEmail.php');
-require_once(__DIR__ . '/businesslogic/security/BannedIp.php');
-
-// Tickets
-require_once(__DIR__ . '/dao/ticket/TicketGateway.php');
-require_once(__DIR__ . '/businesslogic/ticket/Attachment.php');
-require_once(__DIR__ . '/businesslogic/ticket/Ticket.php');
-require_once(__DIR__ . '/businesslogic/ticket/CreateTicketByCustomerModel.php');
-require_once(__DIR__ . '/businesslogic/ticket/TicketValidators.php');
-require_once(__DIR__ . '/businesslogic/ticket/TicketCreator.php');
-require_once(__DIR__ . '/businesslogic/ticket/TicketRetriever.php');
-require_once(__DIR__ . '/controllers/TicketController.php');
-
-// Exceptions
-require_once(__DIR__ . '/businesslogic/exception/ApiFriendlyException.php');
-require_once(__DIR__ . '/businesslogic/exception/InvalidAuthenticationTokenException.php');
-require_once(__DIR__ . '/businesslogic/exception/MissingAuthenticationTokenException.php');
-require_once(__DIR__ . '/businesslogic/exception/ValidationException.php');
-require_once(__DIR__ . '/core/SQLException.php');
 
 hesk_load_api_database_functions();
 
@@ -57,5 +17,4 @@ hesk_load_api_database_functions();
 require_once(__DIR__ . '/../inc/custom_fields.inc.php');
 
 // Load the ApplicationContext
-require_once(__DIR__ . '/ApplicationContext.php');
-$applicationContext = new \Core\ApplicationContext();
\ No newline at end of file
+$applicationContext = new \ApplicationContext();
\ No newline at end of file
diff --git a/api/bootstrap.php b/api/bootstrap.php
new file mode 100644
index 00000000..53251c8f
--- /dev/null
+++ b/api/bootstrap.php
@@ -0,0 +1,8 @@
+<?php
+spl_autoload_register(function ($class) {
+    $file = __DIR__ . DIRECTORY_SEPARATOR . str_replace('\\', '/', $class) . '.php';
+
+    if (file_exists($file)) {
+        require($file);
+    }
+});
\ No newline at end of file
diff --git a/api/businesslogic/Helpers.php b/api/businesslogic/Helpers.php
index 0df1d131..cb5bf624 100644
--- a/api/businesslogic/Helpers.php
+++ b/api/businesslogic/Helpers.php
@@ -1,12 +1,6 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: mkoch
- * Date: 1/28/2017
- * Time: 8:54 PM
- */
 
-namespace BusinessLogic\Helpers;
+namespace BusinessLogic;
 
 
 class Helpers {
diff --git a/api/businesslogic/ValidationModel.php b/api/businesslogic/ValidationModel.php
index fef13e7b..130e1f9d 100644
--- a/api/businesslogic/ValidationModel.php
+++ b/api/businesslogic/ValidationModel.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BusinessLogic\Validation;
+namespace BusinessLogic;
 
 class ValidationModel {
     /**
diff --git a/api/businesslogic/category/Category.php b/api/businesslogic/category/Category.php
deleted file mode 100644
index e73a7888..00000000
--- a/api/businesslogic/category/Category.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-namespace BusinessObjects;
-
-class Category {
-    /**
-     * @var int The category ID
-     */
-    public $id;
-
-    /**
-     * @var int Category order number
-     */
-    public $catOrder;
-
-    /**
-     * @var bool Tickets autoassigned in this category
-     */
-    public $autoAssign;
-
-    /**
-     * @var int The type of category (1 = Private, 2 = Public)
-     */
-    public $type;
-
-    /**
-     * @var int The category's usage (0 = Tickets and Events, 1 = Tickets, 2 = Events)
-     */
-    public $usage;
-
-    /**
-     * @var string? The color of the category
-     */
-    public $color;
-
-    /**
-     * @var int The default ticket priority
-     */
-    public $priority;
-
-    /**
-     * @var int|null The manager for the category, if applicable
-     */
-    public $manager;
-
-    /**
-     * @var bool Indication if the user has access to the category
-     */
-    public $accessible;
-}
\ No newline at end of file
diff --git a/api/businesslogic/security/UserContextBuilder.php b/api/businesslogic/security/UserContextBuilder.php
index 7ec16d76..064968c2 100644
--- a/api/businesslogic/security/UserContextBuilder.php
+++ b/api/businesslogic/security/UserContextBuilder.php
@@ -5,7 +5,7 @@ namespace BusinessLogic\Security;
 
 use BusinessLogic\Exceptions\InvalidAuthenticationTokenException;
 use BusinessLogic\Exceptions\MissingAuthenticationTokenException;
-use BusinessLogic\Helpers\Helpers;
+use BusinessLogic\Helpers;
 use DataAccess\Security\UserGateway;
 
 class UserContextBuilder {
diff --git a/api/dao/security_dao.php b/api/dao/security_dao.php
deleted file mode 100644
index fb86a9a0..00000000
--- a/api/dao/security_dao.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-define('NULL_OR_EMPTY_STRING', 'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e');
-require_once(API_PATH . 'exception/AccessException.php');
-
-function get_user_for_token_hash($hash, $hesk_settings) {
-    if ($hash == NULL_OR_EMPTY_STRING) {
-        throw new AccessException(400);
-    }
-
-    $user_id_sql = "SELECT `user_id` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "user_api_tokens`
-        WHERE `token` = '" . hesk_dbEscape($hash) . "'";
-
-    $user_id_rs = hesk_dbQuery($user_id_sql);
-    if (hesk_dbNumRows($user_id_rs) == 0) {
-        throw new AccessException(401);
-    }
-    $user_id = hesk_dbFetchAssoc($user_id_rs);
-
-    $user_sql = "SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` WHERE `id` = ".intval($user_id['user_id']);
-    $user_rs = hesk_dbQuery($user_sql);
-
-    return hesk_dbFetchAssoc($user_rs);
-}
\ No newline at end of file
diff --git a/api/index.php b/api/index.php
index b58ce89a..df73dcc7 100644
--- a/api/index.php
+++ b/api/index.php
@@ -1,5 +1,7 @@
 <?php
 // Properly handle error logging, as well as a fatal error workaround
+//require_once(__DIR__ . '/autoload.php');
+require_once(__DIR__ . '/bootstrap.php');
 require_once(__DIR__ . '/autoload.php');
 error_reporting(0);
 set_error_handler('errorHandler');
@@ -16,7 +18,7 @@ function handle404() {
 function before() {
     assertApiIsEnabled();
 
-    $token = \BusinessLogic\Helpers\Helpers::getHeader('X-AUTH-TOKEN');
+    $token = \BusinessLogic\Helpers::getHeader('X-AUTH-TOKEN');
     buildUserContext($token);
 }
 
@@ -50,9 +52,9 @@ function exceptionHandler($exception) {
         if (exceptionIsOfType($exception, 'SQLException')) {
             /* @var $castedException \Core\Exceptions\SQLException */
             $castedException = $exception;
-            print_error("Fought an uncaught exception", sprintf("%s\n\n%s", $castedException->failingQuery, $exception->getTraceAsString()));
+            print_error("Fought an uncaught Exceptions", sprintf("%s\n\n%s", $castedException->failingQuery, $exception->getTraceAsString()));
         } else {
-            print_error("Fought an uncaught exception", sprintf("%s\n\n%s", $exception->getMessage(), $exception->getTraceAsString()));
+            print_error("Fought an uncaught Exceptions", sprintf("%s\n\n%s", $exception->getMessage(), $exception->getTraceAsString()));
         }
 
     }
@@ -61,8 +63,8 @@ function exceptionHandler($exception) {
 }
 
 /**
- * @param $exception Exception thrown exception
- * @param $class string The name of the expected exception type
+ * @param $exception Exception thrown Exceptions
+ * @param $class string The name of the expected Exceptions type
  * @return bool
  */
 function exceptionIsOfType($exception, $class) {

From a702d157cd145ee07850ea080ad9bf74e7beea7e Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Thu, 2 Feb 2017 20:21:25 -0500
Subject: [PATCH 024/192] Delete unused DAOs, fix some replace errors

---
 api/BusinessLogic/Tickets/TicketCreator.php |  4 +-
 api/Core/Exceptions/SQLException.php        |  2 +-
 api/DataAccess/canned_dao.php               | 28 ----------
 api/DataAccess/status_dao.php               | 52 ------------------
 api/DataAccess/ticket_dao.php               | 59 ---------------------
 api/DataAccess/ticket_template_dao.php      | 26 ---------
 api/DataAccess/user_dao.php                 | 56 -------------------
 api/index.php                               | 10 ++--
 8 files changed, 7 insertions(+), 230 deletions(-)
 delete mode 100644 api/DataAccess/canned_dao.php
 delete mode 100644 api/DataAccess/status_dao.php
 delete mode 100644 api/DataAccess/ticket_dao.php
 delete mode 100644 api/DataAccess/ticket_template_dao.php
 delete mode 100644 api/DataAccess/user_dao.php

diff --git a/api/BusinessLogic/Tickets/TicketCreator.php b/api/BusinessLogic/Tickets/TicketCreator.php
index 74d7786d..f34ae95f 100644
--- a/api/BusinessLogic/Tickets/TicketCreator.php
+++ b/api/BusinessLogic/Tickets/TicketCreator.php
@@ -22,7 +22,7 @@ class TicketCreator {
             throw new ValidationException($validationModel);
         }
 
-        // Create the Tickets
+        // Create the ticket
     }
 
     /**
@@ -30,7 +30,7 @@ class TicketCreator {
      * @param $staff bool
      * @param $heskSettings array HESK settings
      * @param $modsForHeskSettings array Mods for HESK settings
-     * @return ValidationModel If errorKeys is empty, validation successful. Otherwise invalid Tickets
+     * @return ValidationModel If errorKeys is empty, validation successful. Otherwise invalid ticket
      */
     function validate($ticketRequest, $staff, $heskSettings, $modsForHeskSettings) {
         $TICKET_PRIORITY_CRITICAL = 0;
diff --git a/api/Core/Exceptions/SQLException.php b/api/Core/Exceptions/SQLException.php
index db3f412b..e9530a5b 100644
--- a/api/Core/Exceptions/SQLException.php
+++ b/api/Core/Exceptions/SQLException.php
@@ -13,6 +13,6 @@ class SQLException extends Exception {
     function __construct($failingQuery) {
         $this->failingQuery = $failingQuery;
 
-        parent::__construct('A SQL Exceptions occurred. Check the logs for more information.');
+        parent::__construct('A SQL exception occurred. Check the logs for more information.');
     }
 }
\ No newline at end of file
diff --git a/api/DataAccess/canned_dao.php b/api/DataAccess/canned_dao.php
deleted file mode 100644
index e4700491..00000000
--- a/api/DataAccess/canned_dao.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-function get_canned_response($hesk_settings, $id = NULL) {
-    $sql = "SELECT `id`, `message`, `title`, `reply_order` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "std_replies` ";
-    if ($id != NULL) {
-        $sql .= "WHERE `id` = ".intval($id);
-    }
-
-    $response = hesk_dbQuery($sql);
-
-    if (hesk_dbNumRows($response) == 0) {
-        return NULL;
-    }
-
-    $results = array();
-    while ($row = hesk_dbFetchAssoc($response)) {
-        $row['id'] = intval($row['id']);
-
-        $row['replyOrder'] = intval($row['reply_order']);
-        unset($row['reply_order']);
-
-        $row['title'] = hesk_html_entity_decode($row['title']);
-        $row['message'] = hesk_html_entity_decode($row['message']);
-        $results[] = $row;
-    }
-
-    return $id == NULL ? $results : $results[0];
-}
\ No newline at end of file
diff --git a/api/DataAccess/status_dao.php b/api/DataAccess/status_dao.php
deleted file mode 100644
index 160ddd2d..00000000
--- a/api/DataAccess/status_dao.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-function get_status($hesk_settings, $id = NULL) {
-    $sql = "SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "statuses` ";
-    if ($id != NULL) {
-        $sql .= "WHERE `ID` = ".intval($id);
-    }
-
-    $response = hesk_dbQuery($sql);
-
-    if (hesk_dbNumRows($response) == 0) {
-        return NULL;
-    }
-
-    $results = array();
-    while ($row = hesk_dbFetchAssoc($response)) {
-        $row['id'] = intval($row['ID']);
-        unset($row['ID']);
-        $row['sort'] = intval($row['sort']);
-        foreach ($row as $key => $value) {
-            if ($key != 'id') {
-                $lowercase_key = lcfirst($key);
-                $row[$lowercase_key] = $row[$key];
-                unset($row[$key]);
-            }
-            if ($key == 'id' || $lowercase_key == 'closable'
-                || $lowercase_key == 'key' || $lowercase_key == 'sort'
-                || $lowercase_key == 'textColor') {
-                continue;
-            }
-            $row[$lowercase_key] = $row[$lowercase_key] == true;
-        }
-
-        $language_sql = "SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "text_to_status_xref` "
-            . "WHERE `status_id` = ".intval($row['id']);
-
-        $language_rs = hesk_dbQuery($language_sql);
-        if (hesk_dbNumRows($language_rs) > 0) {
-            $row['key'] = NULL;
-            $row['keys'] = array();
-        }
-        while ($language_row = hesk_dbFetchAssoc($language_rs)) {
-            unset($language_row['id']);
-            unset($language_row['status_id']);
-            $row['keys'][] = $language_row;
-        }
-
-        $results[] = $row;
-    }
-
-    return $id == NULL ? $results : $results[0];
-}
\ No newline at end of file
diff --git a/api/DataAccess/ticket_dao.php b/api/DataAccess/ticket_dao.php
deleted file mode 100644
index f7805323..00000000
--- a/api/DataAccess/ticket_dao.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-function get_ticket_for_id($hesk_settings, $user, $id = NULL) {
-    $sql = "SELECT `tickets`.* FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "tickets` AS `tickets` ";
-    $sql .= "INNER JOIN `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` AS `users` ON `users`.`id` = " . intval($user['id']) . " ";
-    $used_where_clause = false;
-    if ($id != NULL) {
-        $used_where_clause = true;
-        $sql .= "WHERE `tickets`.`id` = " . intval($id);
-    }
-
-    if (!$user['isadmin']) {
-        $clause = $used_where_clause ? ' AND ' : ' WHERE ';
-        $used_where_clause = true;
-
-        $sql .= $clause . ' `Categories` IN (' . $user['categories'] . ')';
-        $sql .= " AND ((`heskprivileges` LIKE '%can_view_tickets%' AND `owner` = " . intval($user['id']) . ")";
-        $sql .= " OR (`heskprivileges` LIKE '%can_view_unassigned%' AND `owner` = 0)";
-        $sql .= " OR (`heskprivileges` LIKE '%can_view_ass_others%' AND `owner` <> " . intval($user['id']) . "))";
-    }
-
-    $response = hesk_dbQuery($sql);
-
-    if (hesk_dbNumRows($response) == 0) {
-        return NULL;
-    }
-
-    $results = build_results($response);
-
-    return $id == NULL ? $results : $results[0];
-}
-
-function build_results($response) {
-    $results = array();
-    while ($row = hesk_dbFetchAssoc($response)) {
-        $row['id'] = intval($row['id']);
-        $row['Categories'] = intval($row['Categories']);
-        $row['priority'] = intval($row['priority']);
-        $row['status'] = intval($row['status']);
-        $row['replierid'] = intval($row['replierid']);
-        $row['archive'] = $row['archive'] == true;
-        $row['locked'] = $row['locked'] == true;
-        $row['html'] = $row['html'] == true;
-        $row['screen_resolution_height'] = convert_to_int($row['screen_resolution_height']);
-        $row['screen_resolution_width'] = convert_to_int($row['screen_resolution_width']);
-        $row['owner'] = convert_to_int($row['owner']);
-        $row['parent'] = convert_to_int($row['parent']);
-        $row['overdue_email_sent'] = $row['overdue_email_sent'] == true;
-
-
-        $results[] = $row;
-    }
-
-    return $results;
-}
-
-function convert_to_int($item) {
-    return $item != NULL ? intval($item) : NULL;
-}
\ No newline at end of file
diff --git a/api/DataAccess/ticket_template_dao.php b/api/DataAccess/ticket_template_dao.php
deleted file mode 100644
index 118ba218..00000000
--- a/api/DataAccess/ticket_template_dao.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-function get_ticket_template($hesk_settings, $id = NULL) {
-    $sql = "SELECT `id`, `message`, `title`, `tpl_order` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "ticket_templates` ";
-    if ($id != NULL) {
-        $sql .= "WHERE `id` = ".intval($id);
-    }
-
-    $response = hesk_dbQuery($sql);
-
-    if (hesk_dbNumRows($response) == 0) {
-        return NULL;
-    }
-
-    $results = array();
-    while ($row = hesk_dbFetchAssoc($response)) {
-        $row['id'] = intval($row['id']);
-        $row['displayOrder'] = intval($row['tpl_order']);
-        unset($row['tpl_order']);
-        $row['title'] = hesk_html_entity_decode($row['title']);
-        $row['message'] = hesk_html_entity_decode($row['message']);
-        $results[] = $row;
-    }
-
-    return $id == NULL ? $results : $results[0];
-}
\ No newline at end of file
diff --git a/api/DataAccess/user_dao.php b/api/DataAccess/user_dao.php
deleted file mode 100644
index f56158fb..00000000
--- a/api/DataAccess/user_dao.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-function get_user($hesk_settings, $id = NULL) {
-    $sql = "SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` ";
-
-    if ($id != NULL) {
-        $sql .= "WHERE `id` = " . intval($id);
-    }
-
-    $response = hesk_dbQuery($sql);
-
-    if (hesk_dbNumRows($response) == 0) {
-        return NULL;
-    }
-
-    $results = array();
-    while ($row = hesk_dbFetchAssoc($response)) {
-        $row['id'] = intval($row['id']);
-        $row['isadmin'] = get_boolean($row['isadmin']);
-        $row['signature'] = hesk_html_entity_decode($row['signature']);
-        $row['afterreply'] = intval($row['afterreply']);
-        $row['autostart'] = get_boolean($row['autostart']);
-        $row['notify_customer_new'] = get_boolean($row['notify_customer_new']);
-        $row['notify_customer_reply'] = get_boolean($row['notify_customer_reply']);
-        $row['show_suggested'] = get_boolean($row['show_suggested']);
-        $row['notify_new_unassigned'] = get_boolean($row['notify_new_unassigned']);
-        $row['notify_new_my'] = get_boolean($row['notify_new_my']);
-        $row['notify_reply_unassigned'] = get_boolean($row['notify_reply_unassigned']);
-        $row['notify_reply_my'] = get_boolean($row['notify_reply_my']);
-        $row['notify_assigned'] = get_boolean($row['notify_assigned']);
-        $row['notify_pm'] = get_boolean($row['notify_pm']);
-        $row['notify_note'] = get_boolean($row['notify_note']);
-        $row['notify_note_unassigned'] = get_boolean($row['notify_note_unassigned']);
-        $row['autoassign'] = get_boolean($row['autoassign']);
-        $row['ratingneg'] = intval($row['ratingneg']);
-        $row['ratingpos'] = intval($row['ratingpos']);
-        $row['autorefresh'] = intval($row['autorefresh']);
-        $row['active'] = get_boolean($row['active']);
-        $row['default_calendar_view'] = intval($row['default_calendar_view']);
-        $row['notify_overdue_unassigned'] = get_boolean($row['notify_overdue_unassigned']);
-
-
-        // TODO: Remove this once GitHub #346 is complete
-        $row['categories'] = explode(',', $row['categories']);
-        $row['heskprivileges'] = explode(',', $row['heskprivileges']);
-
-
-        $results[] = $row;
-    }
-
-    return $id == NULL ? $results : $results[0];
-}
-
-function get_boolean($value, $truthy_value = true) {
-    return $value == $truthy_value;
-}
\ No newline at end of file
diff --git a/api/index.php b/api/index.php
index df73dcc7..44c036ce 100644
--- a/api/index.php
+++ b/api/index.php
@@ -1,7 +1,5 @@
 <?php
 // Properly handle error logging, as well as a fatal error workaround
-//require_once(__DIR__ . '/autoload.php');
-require_once(__DIR__ . '/bootstrap.php');
 require_once(__DIR__ . '/autoload.php');
 error_reporting(0);
 set_error_handler('errorHandler');
@@ -52,9 +50,9 @@ function exceptionHandler($exception) {
         if (exceptionIsOfType($exception, 'SQLException')) {
             /* @var $castedException \Core\Exceptions\SQLException */
             $castedException = $exception;
-            print_error("Fought an uncaught Exceptions", sprintf("%s\n\n%s", $castedException->failingQuery, $exception->getTraceAsString()));
+            print_error("Fought an uncaught exception", sprintf("%s\n\n%s", $castedException->failingQuery, $exception->getTraceAsString()));
         } else {
-            print_error("Fought an uncaught Exceptions", sprintf("%s\n\n%s", $exception->getMessage(), $exception->getTraceAsString()));
+            print_error("Fought an uncaught exception", sprintf("%s\n\n%s", $exception->getMessage(), $exception->getTraceAsString()));
         }
 
     }
@@ -63,8 +61,8 @@ function exceptionHandler($exception) {
 }
 
 /**
- * @param $exception Exception thrown Exceptions
- * @param $class string The name of the expected Exceptions type
+ * @param $exception Exception thrown exception
+ * @param $class string The name of the expected exception type
  * @return bool
  */
 function exceptionIsOfType($exception, $class) {

From 2b792cff723b18e8e0a3eff4c2528ff6c00e7c72 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Thu, 2 Feb 2017 21:22:04 -0500
Subject: [PATCH 025/192] Fix exception handler for E_NOTICE

---
 api/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/index.php b/api/index.php
index 44c036ce..27c7eeb3 100644
--- a/api/index.php
+++ b/api/index.php
@@ -34,7 +34,7 @@ function buildUserContext($xAuthToken) {
 }
 
 function errorHandler($errorNumber, $errorMessage, $errorFile, $errorLine) {
-    throw new Exception(sprintf("%s:%d\n\n%s", $errorFile, $errorLine, $errorMessage));
+    exceptionHandler(new Exception(sprintf("%s:%d\n\n%s", $errorFile, $errorLine, $errorMessage)));
 }
 
 /**

From bbdb03d1035b79b06d6dac5679f2a6ada16865ce Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Thu, 2 Feb 2017 22:30:41 -0500
Subject: [PATCH 026/192] Testing is working!

---
 .gitignore                                    |    4 +
 api/Tests/AutoLoader.php                      |   38 +
 .../BusinessLogic/Tests/BanRetrieverTest.php  |   34 +
 api/Tests/bootstrap.php                       |    2 +
 api/Tests/phpunit.xml                         |    2 +
 api/composer.json                             |   15 +
 api/composer.lock                             | 1326 +++++++++++++++++
 7 files changed, 1421 insertions(+)
 create mode 100644 api/Tests/AutoLoader.php
 create mode 100644 api/Tests/BusinessLogic/Tests/BanRetrieverTest.php
 create mode 100644 api/Tests/bootstrap.php
 create mode 100644 api/Tests/phpunit.xml
 create mode 100644 api/composer.json
 create mode 100644 api/composer.lock

diff --git a/.gitignore b/.gitignore
index 1aafcd90..30dbedef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,7 @@
+# Mods for HESK-specific files
+api/vendor
+
+# HESK Files
 admin/admin_suggest_articles.php
 admin/archive.php
 admin/custom_statuses.php
diff --git a/api/Tests/AutoLoader.php b/api/Tests/AutoLoader.php
new file mode 100644
index 00000000..6a72f7ec
--- /dev/null
+++ b/api/Tests/AutoLoader.php
@@ -0,0 +1,38 @@
+<?php
+
+class AutoLoader {
+
+    static private $classNames = array();
+
+    /**
+     * Store the filename (sans extension) & full path of all ".php" files found
+     */
+    public static function registerDirectory($dirName) {
+
+        $di = new DirectoryIterator($dirName);
+        foreach ($di as $file) {
+
+            if ($file->isDir() && !$file->isLink() && !$file->isDot()) {
+                // recurse into directories other than a few special ones
+                self::registerDirectory($file->getPathname());
+            } elseif (substr($file->getFilename(), -4) === '.php') {
+                // save the class name / path of a .php file found
+                $className = substr($file->getFilename(), 0, -4);
+                AutoLoader::registerClass($className, $file->getPathname());
+            }
+        }
+    }
+
+    public static function registerClass($className, $fileName) {
+        AutoLoader::$classNames[$className] = $fileName;
+    }
+
+    public static function loadClass($className) {
+        if (isset(AutoLoader::$classNames[$className])) {
+            require_once(AutoLoader::$classNames[$className]);
+        }
+    }
+
+}
+
+spl_autoload_register(array('AutoLoader', 'loadClass'));
\ No newline at end of file
diff --git a/api/Tests/BusinessLogic/Tests/BanRetrieverTest.php b/api/Tests/BusinessLogic/Tests/BanRetrieverTest.php
new file mode 100644
index 00000000..aea5a51b
--- /dev/null
+++ b/api/Tests/BusinessLogic/Tests/BanRetrieverTest.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: mkoch
+ * Date: 2/2/2017
+ * Time: 9:57 PM
+ */
+
+namespace Tests;
+
+
+use BusinessLogic\Security\BannedEmail;
+use BusinessLogic\Security\BanRetriever;
+use DataAccess\Security\BanGateway;
+use PHPUnit\Framework\TestCase;
+
+
+class BanRetrieverTests extends TestCase {
+    function testItReturnsTrueWhenTheIpIsBanned() {
+        //-- Arrange
+        $banGateway = $this->createMock(BanGateway::class);
+        $banRetriever = new BanRetriever($banGateway);
+        $bannedEmail = new BannedEmail();
+        $bannedEmail->email = 'my@email.address';
+        $banGateway->method('getEmailBans')
+                    ->willReturn([$bannedEmail]);
+
+        //-- Act
+        $result = $banRetriever->isEmailBanned('my@email.address', null);
+
+        //-- Assert
+        $this->assertThat($result, $this->isTrue());
+    }
+}
diff --git a/api/Tests/bootstrap.php b/api/Tests/bootstrap.php
new file mode 100644
index 00000000..2e555474
--- /dev/null
+++ b/api/Tests/bootstrap.php
@@ -0,0 +1,2 @@
+<?php
+require_once(__DIR__ . '/../bootstrap.php');
\ No newline at end of file
diff --git a/api/Tests/phpunit.xml b/api/Tests/phpunit.xml
new file mode 100644
index 00000000..033d1551
--- /dev/null
+++ b/api/Tests/phpunit.xml
@@ -0,0 +1,2 @@
+<phpunit bootstrap="bootstrap.php">
+</phpunit>
\ No newline at end of file
diff --git a/api/composer.json b/api/composer.json
new file mode 100644
index 00000000..280cb3a4
--- /dev/null
+++ b/api/composer.json
@@ -0,0 +1,15 @@
+{
+  "name": "mike-koch/Mods-for-HESK",
+  "description": "New UI and features for HESK, a free helpdesk solution",
+  "minimum-stability": "dev",
+  "license": "MIT",
+  "authors": [
+    {
+      "name": "Mike Koch",
+      "email": "mkoch227@gmail.com"
+    }
+  ],
+  "require": {
+    "phpunit/phpunit": "5.7.9"
+  }
+}
diff --git a/api/composer.lock b/api/composer.lock
new file mode 100644
index 00000000..4bf817a6
--- /dev/null
+++ b/api/composer.lock
@@ -0,0 +1,1326 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "This file is @generated automatically"
+    ],
+    "content-hash": "63ae3f15414ec2f99c94a87db755a1af",
+    "packages": [
+        {
+            "name": "doctrine/instantiator",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/instantiator.git",
+                "reference": "68099b02b60bbf3b088ff5cb67bf506770ef9cac"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/68099b02b60bbf3b088ff5cb67bf506770ef9cac",
+                "reference": "68099b02b60bbf3b088ff5cb67bf506770ef9cac",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3,<8.0-DEV"
+            },
+            "require-dev": {
+                "athletic/athletic": "~0.1.8",
+                "ext-pdo": "*",
+                "ext-phar": "*",
+                "phpunit/phpunit": "~4.0",
+                "squizlabs/php_codesniffer": "~2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Marco Pivetta",
+                    "email": "ocramius@gmail.com",
+                    "homepage": "http://ocramius.github.com/"
+                }
+            ],
+            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
+            "homepage": "https://github.com/doctrine/instantiator",
+            "keywords": [
+                "constructor",
+                "instantiate"
+            ],
+            "time": "2017-01-23 09:23:06"
+        },
+        {
+            "name": "myclabs/deep-copy",
+            "version": "1.6.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/myclabs/DeepCopy.git",
+                "reference": "5a5a9fc8025a08d8919be87d6884d5a92520cefe"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/5a5a9fc8025a08d8919be87d6884d5a92520cefe",
+                "reference": "5a5a9fc8025a08d8919be87d6884d5a92520cefe",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "doctrine/collections": "1.*",
+                "phpunit/phpunit": "~4.1"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "DeepCopy\\": "src/DeepCopy/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Create deep copies (clones) of your objects",
+            "homepage": "https://github.com/myclabs/DeepCopy",
+            "keywords": [
+                "clone",
+                "copy",
+                "duplicate",
+                "object",
+                "object graph"
+            ],
+            "time": "2017-01-26T22:05:40+00:00"
+        },
+        {
+            "name": "phpdocumentor/reflection-common",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
+                "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
+                "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.6"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jaap van Otterdijk",
+                    "email": "opensource@ijaap.nl"
+                }
+            ],
+            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
+            "homepage": "http://www.phpdoc.org",
+            "keywords": [
+                "FQSEN",
+                "phpDocumentor",
+                "phpdoc",
+                "reflection",
+                "static analysis"
+            ],
+            "time": "2015-12-27 11:43:31"
+        },
+        {
+            "name": "phpdocumentor/reflection-docblock",
+            "version": "3.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
+                "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/8331b5efe816ae05461b7ca1e721c01b46bafb3e",
+                "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5",
+                "phpdocumentor/reflection-common": "^1.0@dev",
+                "phpdocumentor/type-resolver": "^0.2.0",
+                "webmozart/assert": "^1.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "^0.9.4",
+                "phpunit/phpunit": "^4.4"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "me@mikevanriel.com"
+                }
+            ],
+            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
+            "time": "2016-09-30T07:12:33+00:00"
+        },
+        {
+            "name": "phpdocumentor/type-resolver",
+            "version": "0.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/TypeResolver.git",
+                "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb",
+                "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5",
+                "phpdocumentor/reflection-common": "^1.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "^0.9.4",
+                "phpunit/phpunit": "^5.2||^4.8.24"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "me@mikevanriel.com"
+                }
+            ],
+            "time": "2016-11-25T06:54:22+00:00"
+        },
+        {
+            "name": "phpspec/prophecy",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpspec/prophecy.git",
+                "reference": "6c52c2722f8460122f96f86346600e1077ce22cb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/6c52c2722f8460122f96f86346600e1077ce22cb",
+                "reference": "6c52c2722f8460122f96f86346600e1077ce22cb",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.0.2",
+                "php": "^5.3|^7.0",
+                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2",
+                "sebastian/comparator": "^1.1",
+                "sebastian/recursion-context": "^1.0|^2.0"
+            },
+            "require-dev": {
+                "phpspec/phpspec": "^2.0",
+                "phpunit/phpunit": "^4.8 || ^5.6.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.6.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Prophecy\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Konstantin Kudryashov",
+                    "email": "ever.zet@gmail.com",
+                    "homepage": "http://everzet.com"
+                },
+                {
+                    "name": "Marcello Duarte",
+                    "email": "marcello.duarte@gmail.com"
+                }
+            ],
+            "description": "Highly opinionated mocking framework for PHP 5.3+",
+            "homepage": "https://github.com/phpspec/prophecy",
+            "keywords": [
+                "Double",
+                "Dummy",
+                "fake",
+                "mock",
+                "spy",
+                "stub"
+            ],
+            "time": "2016-11-21 14:58:47"
+        },
+        {
+            "name": "phpunit/php-code-coverage",
+            "version": "4.0.x-dev",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
+                "reference": "7a2bfe73aa381a76cb6d13599ae37bf74a12a02f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/7a2bfe73aa381a76cb6d13599ae37bf74a12a02f",
+                "reference": "7a2bfe73aa381a76cb6d13599ae37bf74a12a02f",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6 || ^7.0",
+                "phpunit/php-file-iterator": "~1.3",
+                "phpunit/php-text-template": "~1.2",
+                "phpunit/php-token-stream": "^1.4.2",
+                "sebastian/code-unit-reverse-lookup": "~1.0",
+                "sebastian/environment": "^1.3.2 || ^2.0",
+                "sebastian/version": "~1.0|~2.0"
+            },
+            "require-dev": {
+                "ext-xdebug": ">=2.1.4",
+                "phpunit/phpunit": "^5.4"
+            },
+            "suggest": {
+                "ext-dom": "*",
+                "ext-xdebug": ">=2.4.0",
+                "ext-xmlwriter": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
+            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
+            "keywords": [
+                "coverage",
+                "testing",
+                "xunit"
+            ],
+            "time": "2017-01-24 16:35:00"
+        },
+        {
+            "name": "phpunit/php-file-iterator",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
+                "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
+                "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
+            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
+            "keywords": [
+                "filesystem",
+                "iterator"
+            ],
+            "time": "2016-10-03 07:40:28"
+        },
+        {
+            "name": "phpunit/php-text-template",
+            "version": "1.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-text-template.git",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Simple template engine.",
+            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+            "keywords": [
+                "template"
+            ],
+            "time": "2015-06-21T13:50:34+00:00"
+        },
+        {
+            "name": "phpunit/php-timer",
+            "version": "1.0.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-timer.git",
+                "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/38e9124049cf1a164f1e4537caf19c99bf1eb260",
+                "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4|~5"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Utility class for timing",
+            "homepage": "https://github.com/sebastianbergmann/php-timer/",
+            "keywords": [
+                "timer"
+            ],
+            "time": "2016-05-12T18:03:57+00:00"
+        },
+        {
+            "name": "phpunit/php-token-stream",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
+                "reference": "3b402f65a4cc90abf6e1104e388b896ce209631b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3b402f65a4cc90abf6e1104e388b896ce209631b",
+                "reference": "3b402f65a4cc90abf6e1104e388b896ce209631b",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Wrapper around PHP's tokenizer extension.",
+            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
+            "keywords": [
+                "tokenizer"
+            ],
+            "time": "2016-11-15 14:06:22"
+        },
+        {
+            "name": "phpunit/phpunit",
+            "version": "5.7.9",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit.git",
+                "reference": "69f832b87c731d5cacad7f91948778fe98335fdd"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/69f832b87c731d5cacad7f91948778fe98335fdd",
+                "reference": "69f832b87c731d5cacad7f91948778fe98335fdd",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-json": "*",
+                "ext-libxml": "*",
+                "ext-mbstring": "*",
+                "ext-xml": "*",
+                "myclabs/deep-copy": "~1.3",
+                "php": "^5.6 || ^7.0",
+                "phpspec/prophecy": "^1.6.2",
+                "phpunit/php-code-coverage": "^4.0.4",
+                "phpunit/php-file-iterator": "~1.4",
+                "phpunit/php-text-template": "~1.2",
+                "phpunit/php-timer": "^1.0.6",
+                "phpunit/phpunit-mock-objects": "^3.2",
+                "sebastian/comparator": "~1.2.2",
+                "sebastian/diff": "~1.2",
+                "sebastian/environment": "^1.3.4 || ^2.0",
+                "sebastian/exporter": "~2.0",
+                "sebastian/global-state": "^1.0 || ^2.0",
+                "sebastian/object-enumerator": "~2.0",
+                "sebastian/resource-operations": "~1.0",
+                "sebastian/version": "~1.0|~2.0",
+                "symfony/yaml": "~2.1|~3.0"
+            },
+            "conflict": {
+                "phpdocumentor/reflection-docblock": "3.0.2"
+            },
+            "require-dev": {
+                "ext-pdo": "*"
+            },
+            "suggest": {
+                "ext-xdebug": "*",
+                "phpunit/php-invoker": "~1.1"
+            },
+            "bin": [
+                "phpunit"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.7.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "The PHP Unit Testing framework.",
+            "homepage": "https://phpunit.de/",
+            "keywords": [
+                "phpunit",
+                "testing",
+                "xunit"
+            ],
+            "time": "2017-01-28T06:14:33+00:00"
+        },
+        {
+            "name": "phpunit/phpunit-mock-objects",
+            "version": "3.4.x-dev",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
+                "reference": "3ab72b65b39b491e0c011e2e09bb2206c2aa8e24"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/3ab72b65b39b491e0c011e2e09bb2206c2aa8e24",
+                "reference": "3ab72b65b39b491e0c011e2e09bb2206c2aa8e24",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.0.2",
+                "php": "^5.6 || ^7.0",
+                "phpunit/php-text-template": "^1.2",
+                "sebastian/exporter": "^1.2 || ^2.0"
+            },
+            "conflict": {
+                "phpunit/phpunit": "<5.4.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^5.4"
+            },
+            "suggest": {
+                "ext-soap": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Mock Object library for PHPUnit",
+            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
+            "keywords": [
+                "mock",
+                "xunit"
+            ],
+            "time": "2016-12-08 20:27:08"
+        },
+        {
+            "name": "sebastian/code-unit-reverse-lookup",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
+                "reference": "11606652af09e847cdbbbc3ca17df26b1173a454"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/11606652af09e847cdbbbc3ca17df26b1173a454",
+                "reference": "11606652af09e847cdbbbc3ca17df26b1173a454",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Looks up which function or method a line of code belongs to",
+            "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
+            "time": "2016-12-06 20:05:00"
+        },
+        {
+            "name": "sebastian/comparator",
+            "version": "1.2.x-dev",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/comparator.git",
+                "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2b7424b55f5047b47ac6e5ccb20b2aea4011d9be",
+                "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "sebastian/diff": "~1.2",
+                "sebastian/exporter": "~1.2 || ~2.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides the functionality to compare PHP values for equality",
+            "homepage": "http://www.github.com/sebastianbergmann/comparator",
+            "keywords": [
+                "comparator",
+                "compare",
+                "equality"
+            ],
+            "time": "2017-01-29 09:50:25"
+        },
+        {
+            "name": "sebastian/diff",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/diff.git",
+                "reference": "d0814318784b7756fb932116acd19ee3b0cbe67a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/d0814318784b7756fb932116acd19ee3b0cbe67a",
+                "reference": "d0814318784b7756fb932116acd19ee3b0cbe67a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.8"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kore Nordmann",
+                    "email": "mail@kore-nordmann.de"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Diff implementation",
+            "homepage": "https://github.com/sebastianbergmann/diff",
+            "keywords": [
+                "diff"
+            ],
+            "time": "2016-10-03 07:45:03"
+        },
+        {
+            "name": "sebastian/environment",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/environment.git",
+                "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/5795ffe5dc5b02460c3e34222fee8cbe245d8fac",
+                "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^5.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides functionality to handle HHVM/PHP environments",
+            "homepage": "http://www.github.com/sebastianbergmann/environment",
+            "keywords": [
+                "Xdebug",
+                "environment",
+                "hhvm"
+            ],
+            "time": "2016-11-26 07:53:53"
+        },
+        {
+            "name": "sebastian/exporter",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/exporter.git",
+                "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4",
+                "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "sebastian/recursion-context": "~2.0"
+            },
+            "require-dev": {
+                "ext-mbstring": "*",
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides the functionality to export PHP variables for visualization",
+            "homepage": "http://www.github.com/sebastianbergmann/exporter",
+            "keywords": [
+                "export",
+                "exporter"
+            ],
+            "time": "2016-11-19 08:54:04"
+        },
+        {
+            "name": "sebastian/global-state",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/global-state.git",
+                "reference": "ab3e5ce501d9d45288b53f885a54c87e0cdc7164"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/ab3e5ce501d9d45288b53f885a54c87e0cdc7164",
+                "reference": "ab3e5ce501d9d45288b53f885a54c87e0cdc7164",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^5.7 || ^6.0"
+            },
+            "suggest": {
+                "ext-uopz": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Snapshotting of global state",
+            "homepage": "http://www.github.com/sebastianbergmann/global-state",
+            "keywords": [
+                "global state"
+            ],
+            "time": "2016-12-12 08:07:45"
+        },
+        {
+            "name": "sebastian/object-enumerator",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/object-enumerator.git",
+                "reference": "96f8a3f257b69e8128ad74d3a7fd464bcbaa3b35"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/96f8a3f257b69e8128ad74d3a7fd464bcbaa3b35",
+                "reference": "96f8a3f257b69e8128ad74d3a7fd464bcbaa3b35",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6",
+                "sebastian/recursion-context": "~2.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Traverses array structures and object graphs to enumerate all referenced objects",
+            "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
+            "time": "2016-11-19 07:35:10"
+        },
+        {
+            "name": "sebastian/recursion-context",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/recursion-context.git",
+                "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/2c3ba150cbec723aa057506e73a8d33bdb286c9a",
+                "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides functionality to recursively process PHP variables",
+            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+            "time": "2016-11-19 07:33:16"
+        },
+        {
+            "name": "sebastian/resource-operations",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/resource-operations.git",
+                "reference": "fadc83f7c41fb2924e542635fea47ae546816ece"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/fadc83f7c41fb2924e542635fea47ae546816ece",
+                "reference": "fadc83f7c41fb2924e542635fea47ae546816ece",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides a list of PHP built-in functions that operate on resources",
+            "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
+            "time": "2016-10-03 07:43:09"
+        },
+        {
+            "name": "sebastian/version",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/version.git",
+                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019",
+                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
+            "homepage": "https://github.com/sebastianbergmann/version",
+            "time": "2016-10-03 07:35:21"
+        },
+        {
+            "name": "symfony/yaml",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/yaml.git",
+                "reference": "7928849b226f065dae93ec0e8be3b829f73ba67b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/7928849b226f065dae93ec0e8be3b829f73ba67b",
+                "reference": "7928849b226f065dae93ec0e8be3b829f73ba67b",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.9"
+            },
+            "require-dev": {
+                "symfony/console": "~2.8|~3.0"
+            },
+            "suggest": {
+                "symfony/console": "For validating YAML files using the lint command"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.3-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Yaml\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Yaml Component",
+            "homepage": "https://symfony.com",
+            "time": "2017-01-21 17:10:26"
+        },
+        {
+            "name": "webmozart/assert",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/webmozart/assert.git",
+                "reference": "4a8bf11547e139e77b651365113fc12850c43d9a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/webmozart/assert/zipball/4a8bf11547e139e77b651365113fc12850c43d9a",
+                "reference": "4a8bf11547e139e77b651365113fc12850c43d9a",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.3 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.6",
+                "sebastian/version": "^1.0.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Webmozart\\Assert\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@gmail.com"
+                }
+            ],
+            "description": "Assertions to validate method input/output with nice error messages.",
+            "keywords": [
+                "assert",
+                "check",
+                "validate"
+            ],
+            "time": "2016-11-23 20:04:41"
+        }
+    ],
+    "packages-dev": [],
+    "aliases": [],
+    "minimum-stability": "dev",
+    "stability-flags": [],
+    "prefer-stable": false,
+    "prefer-lowest": false,
+    "platform": [],
+    "platform-dev": []
+}

From 176b7862795be697cfe06c106a5dc41fcec87ff6 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Fri, 3 Feb 2017 22:08:44 -0500
Subject: [PATCH 027/192] Move ban test, work on TicketValidators test

---
 api/BusinessLogic/Tickets/TicketCreator.php   | 16 ++--
 .../Tickets/TicketValidators.php              | 22 ++++-
 .../Security/BanRetrieverTest.php             | 92 +++++++++++++++++++
 .../BusinessLogic/Tests/BanRetrieverTest.php  | 34 -------
 .../Tickets/TicketValidatorsTest.php          | 75 +++++++++++++++
 5 files changed, 197 insertions(+), 42 deletions(-)
 create mode 100644 api/Tests/BusinessLogic/Security/BanRetrieverTest.php
 delete mode 100644 api/Tests/BusinessLogic/Tests/BanRetrieverTest.php
 create mode 100644 api/Tests/BusinessLogic/Tickets/TicketValidatorsTest.php

diff --git a/api/BusinessLogic/Tickets/TicketCreator.php b/api/BusinessLogic/Tickets/TicketCreator.php
index f34ae95f..a534e466 100644
--- a/api/BusinessLogic/Tickets/TicketCreator.php
+++ b/api/BusinessLogic/Tickets/TicketCreator.php
@@ -4,18 +4,20 @@ namespace BusinessLogic\Tickets;
 
 
 use BusinessLogic\Exceptions\ValidationException;
-use BusinessLogic\Validation\ValidationModel;
+use BusinessLogic\Security\BanRetriever;
+use BusinessLogic\ValidationModel;
 use BusinessObjects\CreateTicketByCustomerModel;
 
 class TicketCreator {
     /**
      * @param $ticketRequest CreateTicketByCustomerModel
+     * @param $banRetriever BanRetriever
      * @param $heskSettings array HESK settings
      * @param $modsForHeskSettings array Mods for HESK settings
      * @throws ValidationException When a required field in $ticket_request is missing
      */
-    static function createTicketByCustomer($ticketRequest, $heskSettings, $modsForHeskSettings) {
-        $validationModel = validate($ticketRequest, false, $heskSettings, $modsForHeskSettings);
+    static function createTicketByCustomer($ticketRequest, $banRetriever, $heskSettings, $modsForHeskSettings) {
+        $validationModel = validate($ticketRequest, false, $banRetriever, $heskSettings, $modsForHeskSettings);
 
         if (count($validationModel->errorKeys) > 0) {
             // Validation failed
@@ -28,11 +30,12 @@ class TicketCreator {
     /**
      * @param $ticketRequest CreateTicketByCustomerModel
      * @param $staff bool
+     * @param $banRetriever BanRetriever
      * @param $heskSettings array HESK settings
      * @param $modsForHeskSettings array Mods for HESK settings
      * @return ValidationModel If errorKeys is empty, validation successful. Otherwise invalid ticket
      */
-    function validate($ticketRequest, $staff, $heskSettings, $modsForHeskSettings) {
+    function validate($ticketRequest, $staff, $banRetriever, $heskSettings, $modsForHeskSettings) {
         $TICKET_PRIORITY_CRITICAL = 0;
 
         $validationModel = new ValidationModel();
@@ -98,8 +101,9 @@ class TicketCreator {
             }
         }
 
-        // TODO Check bans (email only; don't check IP on REST requests as they'll most likely be sent via servers)
-        // TODO     submit_ticket.php:320-322
+        if ($banRetriever->isEmailBanned($ticketRequest->email, $heskSettings)) {
+            $validationModel->errorKeys[] = 'EMAIL_BANNED';
+        }
 
         // TODO Check if we're at the max number of tickets
         // TODO     submit_ticket.php:325-334
diff --git a/api/BusinessLogic/Tickets/TicketValidators.php b/api/BusinessLogic/Tickets/TicketValidators.php
index b6539ef9..15a53bb3 100644
--- a/api/BusinessLogic/Tickets/TicketValidators.php
+++ b/api/BusinessLogic/Tickets/TicketValidators.php
@@ -2,11 +2,29 @@
 namespace BusinessLogic\Tickets;
 
 
+use DataAccess\Tickets\TicketGateway;
+
 class TicketValidators {
     /**
-     * @param $customerEmail string
+     * @var $ticketGateway TicketGateway
+     */
+    private $ticketGateway;
+
+    function __construct($ticketGateway) {
+        $this->ticketGateway = $ticketGateway;
+    }
+
+
+    /**
+     * @param $customerEmail string The email address
+     * @param $heskSettings array HESK Settings
+     * @return bool true if the user is maxed out on open tickets, false otherwise
      */
-    function isCustomerAtMaxTickets($customerEmail) {
+    function isCustomerAtMaxTickets($customerEmail, $heskSettings) {
+        if ($heskSettings['max_open'] === 0) {
+            return false;
+        }
 
+        return count($this->ticketGateway->getTicketsByEmail($customerEmail, $heskSettings)) >= $heskSettings['max_open'];
     }
 }
\ No newline at end of file
diff --git a/api/Tests/BusinessLogic/Security/BanRetrieverTest.php b/api/Tests/BusinessLogic/Security/BanRetrieverTest.php
new file mode 100644
index 00000000..fd1bf0a7
--- /dev/null
+++ b/api/Tests/BusinessLogic/Security/BanRetrieverTest.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: mkoch
+ * Date: 2/2/2017
+ * Time: 9:57 PM
+ */
+
+namespace Tests;
+
+
+use BusinessLogic\Security\BannedEmail;
+use BusinessLogic\Security\BannedIp;
+use BusinessLogic\Security\BanRetriever;
+use DataAccess\Security\BanGateway;
+use PHPUnit\Framework\TestCase;
+
+
+class BanRetrieverTests extends TestCase {
+    /**
+     * @var $banGateway \PHPUnit_Framework_MockObject_MockObject;
+     */
+    private $banGateway;
+
+    /**
+     * @var $banRetriever BanRetriever;
+     */
+    private $banRetriever;
+
+    protected function setUp() {
+        $this->banGateway = $this->createMock(BanGateway::class);
+        $this->banRetriever = new BanRetriever($this->banGateway);
+    }
+
+    function testItReturnsTrueWhenTheEmailIsBanned() {
+        //-- Arrange
+        $bannedEmail = new BannedEmail();
+        $bannedEmail->email = 'my@email.address';
+        $this->banGateway->method('getEmailBans')
+                    ->willReturn([$bannedEmail]);
+
+        //-- Act
+        $result = $this->banRetriever->isEmailBanned('my@email.address', null);
+
+        //-- Assert
+        $this->assertThat($result, $this->isTrue());
+    }
+
+    function testItReturnsFalseWhenTheEmailIsNotBanned() {
+        //-- Arrange
+        $bannedEmail = new BannedEmail();
+        $bannedEmail->email = 'my@other.address';
+        $this->banGateway->method('getEmailBans')
+                    ->willReturn([$bannedEmail]);
+
+        //-- Act
+        $result = $this->banRetriever->isEmailBanned('my@email.address', null);
+
+        //-- Assert
+        $this->assertThat($result, $this->isFalse());
+    }
+
+    function testItReturnsTrueWhenTheIpIsBanned() {
+        //-- Arrange
+        $bannedIp = new BannedIp();
+        $bannedIp->ipFrom = ip2long('1.0.0.0');
+        $bannedIp->ipTo = ip2long('1.0.0.5');
+        $this->banGateway->method('getIpBans')
+                    ->willReturn([$bannedIp]);
+
+        //-- Act
+        $result = $this->banRetriever->isIpAddressBanned(ip2long('1.0.0.3'), null);
+
+        //-- Assert
+        $this->assertThat($result, $this->isTrue());
+    }
+
+    function testItReturnsFalseWhenTheIpIsNotBanned() {
+        //-- Arrange
+        $bannedIp = new BannedIp();
+        $bannedIp->ipFrom = ip2long('1.0.0.0');
+        $bannedIp->ipTo = ip2long('1.0.0.5');
+        $this->banGateway->method('getIpBans')
+            ->willReturn([$bannedIp]);
+
+        //-- Act
+        $result = $this->banRetriever->isIpAddressBanned(ip2long('2.0.0.3'), null);
+
+        //-- Assert
+        $this->assertThat($result, $this->isFalse());
+    }
+}
diff --git a/api/Tests/BusinessLogic/Tests/BanRetrieverTest.php b/api/Tests/BusinessLogic/Tests/BanRetrieverTest.php
deleted file mode 100644
index aea5a51b..00000000
--- a/api/Tests/BusinessLogic/Tests/BanRetrieverTest.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: mkoch
- * Date: 2/2/2017
- * Time: 9:57 PM
- */
-
-namespace Tests;
-
-
-use BusinessLogic\Security\BannedEmail;
-use BusinessLogic\Security\BanRetriever;
-use DataAccess\Security\BanGateway;
-use PHPUnit\Framework\TestCase;
-
-
-class BanRetrieverTests extends TestCase {
-    function testItReturnsTrueWhenTheIpIsBanned() {
-        //-- Arrange
-        $banGateway = $this->createMock(BanGateway::class);
-        $banRetriever = new BanRetriever($banGateway);
-        $bannedEmail = new BannedEmail();
-        $bannedEmail->email = 'my@email.address';
-        $banGateway->method('getEmailBans')
-                    ->willReturn([$bannedEmail]);
-
-        //-- Act
-        $result = $banRetriever->isEmailBanned('my@email.address', null);
-
-        //-- Assert
-        $this->assertThat($result, $this->isTrue());
-    }
-}
diff --git a/api/Tests/BusinessLogic/Tickets/TicketValidatorsTest.php b/api/Tests/BusinessLogic/Tickets/TicketValidatorsTest.php
new file mode 100644
index 00000000..6fceb76e
--- /dev/null
+++ b/api/Tests/BusinessLogic/Tickets/TicketValidatorsTest.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace BusinessLogic\Tickets;
+
+
+use DataAccess\Tickets\TicketGateway;
+use PHPUnit\Framework\TestCase;
+
+class TicketValidatorsTest extends TestCase {
+    /**
+     * @var $ticketGateway \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $ticketGateway;
+
+    /**
+     * @var $ticketValidator TicketValidators
+     */
+    private $ticketValidator;
+
+    protected function setUp() {
+        $this->ticketGateway = $this->createMock(TicketGateway::class);
+        $this->ticketValidator = new TicketValidators($this->ticketGateway);
+    }
+
+    function testItReturnsTrueWhenTheUserIsMaxedOutOnOpenTickets() {
+        //-- Arrange
+        $tickets = [new Ticket(), new Ticket(), new Ticket()];
+        $this->ticketGateway->method('getTicketsByEmail')
+                        ->with('my@email.com')
+                        ->willReturn($tickets);
+        $heskSettings = array(
+            'max_open' => 3
+        );
+
+        //-- Act
+        $result = $this->ticketValidator->isCustomerAtMaxTickets('my@email.com', $heskSettings);
+
+        //-- Assert
+        $this->assertThat($result, $this->isTrue(), str_replace('test','',__FUNCTION__));
+    }
+
+    function testItReturnsFalseWhenTheUserIsNotMaxedOutOnOpenTickets() {
+        //-- Arrange
+        $tickets = [new Ticket(), new Ticket(), new Ticket()];
+        $this->ticketGateway->method('getTicketsByEmail')
+            ->with('my@email.com')
+            ->willReturn($tickets);
+        $heskSettings = array(
+            'max_open' => 10
+        );
+
+        //-- Act
+        $result = $this->ticketValidator->isCustomerAtMaxTickets('my@email.com', $heskSettings);
+
+        //-- Assert
+        $this->assertThat($result, $this->isFalse(), str_replace('test','',__FUNCTION__));
+    }
+
+    function testItReturnsFalseWhenMaxOpenIsZero() {
+        //-- Arrange
+        $tickets = [new Ticket(), new Ticket(), new Ticket()];
+        $this->ticketGateway->method('getTicketsByEmail')
+            ->with('my@email.com')
+            ->willReturn($tickets);
+        $heskSettings = array(
+            'max_open' => 0
+        );
+
+        //-- Act
+        $result = $this->ticketValidator->isCustomerAtMaxTickets('my@email.com', $heskSettings);
+
+        //-- Assert
+        $this->assertThat($result, $this->isFalse(), str_replace('test','',__FUNCTION__));
+    }
+}

From 98cbd6e4dd68b280adc4c9c779fdfd46dd6af03b Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sun, 5 Feb 2017 22:12:18 -0500
Subject: [PATCH 028/192] Working on TicketCreator tests

---
 .../Tickets/CreateTicketByCustomerModel.php   |  2 +-
 api/BusinessLogic/Tickets/TicketCreator.php   | 20 +++--
 .../Tickets/TicketCreatorTest.php             | 78 +++++++++++++++++++
 api/bootstrap.php                             |  3 +
 4 files changed, 94 insertions(+), 9 deletions(-)
 create mode 100644 api/Tests/BusinessLogic/Tickets/TicketCreatorTest.php

diff --git a/api/BusinessLogic/Tickets/CreateTicketByCustomerModel.php b/api/BusinessLogic/Tickets/CreateTicketByCustomerModel.php
index 19fc540e..aa6ab0ff 100644
--- a/api/BusinessLogic/Tickets/CreateTicketByCustomerModel.php
+++ b/api/BusinessLogic/Tickets/CreateTicketByCustomerModel.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BusinessObjects;
+namespace BusinessLogic\Tickets;
 
 class CreateTicketByCustomerModel {
     // Metadata
diff --git a/api/BusinessLogic/Tickets/TicketCreator.php b/api/BusinessLogic/Tickets/TicketCreator.php
index a534e466..98a59676 100644
--- a/api/BusinessLogic/Tickets/TicketCreator.php
+++ b/api/BusinessLogic/Tickets/TicketCreator.php
@@ -6,21 +6,26 @@ namespace BusinessLogic\Tickets;
 use BusinessLogic\Exceptions\ValidationException;
 use BusinessLogic\Security\BanRetriever;
 use BusinessLogic\ValidationModel;
-use BusinessObjects\CreateTicketByCustomerModel;
 
 class TicketCreator {
+    private $banRetriever;
+
+    function __construct($banRetriever) {
+        $this->banRetriever = $banRetriever;
+    }
+
     /**
      * @param $ticketRequest CreateTicketByCustomerModel
-     * @param $banRetriever BanRetriever
      * @param $heskSettings array HESK settings
      * @param $modsForHeskSettings array Mods for HESK settings
      * @throws ValidationException When a required field in $ticket_request is missing
      */
-    static function createTicketByCustomer($ticketRequest, $banRetriever, $heskSettings, $modsForHeskSettings) {
-        $validationModel = validate($ticketRequest, false, $banRetriever, $heskSettings, $modsForHeskSettings);
+    function createTicketByCustomer($ticketRequest, $heskSettings, $modsForHeskSettings) {
+        $validationModel = $this->validate($ticketRequest, false, $heskSettings, $modsForHeskSettings);
 
         if (count($validationModel->errorKeys) > 0) {
             // Validation failed
+            $validationModel->valid = false;
             throw new ValidationException($validationModel);
         }
 
@@ -30,12 +35,11 @@ class TicketCreator {
     /**
      * @param $ticketRequest CreateTicketByCustomerModel
      * @param $staff bool
-     * @param $banRetriever BanRetriever
      * @param $heskSettings array HESK settings
      * @param $modsForHeskSettings array Mods for HESK settings
      * @return ValidationModel If errorKeys is empty, validation successful. Otherwise invalid ticket
      */
-    function validate($ticketRequest, $staff, $banRetriever, $heskSettings, $modsForHeskSettings) {
+    function validate($ticketRequest, $staff, $heskSettings, $modsForHeskSettings) {
         $TICKET_PRIORITY_CRITICAL = 0;
 
         $validationModel = new ValidationModel();
@@ -44,7 +48,7 @@ class TicketCreator {
             $validationModel->errorKeys[] = 'NO_NAME';
         }
 
-        if (hesk_validateEmail($ticketRequest->email, $heskSettings['multi_eml'], false)) {
+        /*if (hesk_validateEmail($ticketRequest->email, $heskSettings['multi_eml'], false)) {
             $validationModel->errorKeys[] = 'INVALID_OR_MISSING_EMAIL';
         }
 
@@ -103,7 +107,7 @@ class TicketCreator {
 
         if ($banRetriever->isEmailBanned($ticketRequest->email, $heskSettings)) {
             $validationModel->errorKeys[] = 'EMAIL_BANNED';
-        }
+        }*/
 
         // TODO Check if we're at the max number of tickets
         // TODO     submit_ticket.php:325-334
diff --git a/api/Tests/BusinessLogic/Tickets/TicketCreatorTest.php b/api/Tests/BusinessLogic/Tickets/TicketCreatorTest.php
new file mode 100644
index 00000000..91cbb847
--- /dev/null
+++ b/api/Tests/BusinessLogic/Tickets/TicketCreatorTest.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: mkoch
+ * Date: 2/4/2017
+ * Time: 9:32 PM
+ */
+
+namespace BusinessLogic\Tickets;
+
+
+use BusinessLogic\Exceptions\ValidationException;
+use BusinessLogic\Security\BanRetriever;
+use PHPUnit\Framework\TestCase;
+
+class TicketCreatorTest extends TestCase {
+    /**
+     * @var $ticketCreator TicketCreator
+     */
+    private $ticketCreator;
+
+    /**
+     * @var $banRetriever BanRetriever
+     */
+    private $banRetriever;
+
+    /**
+     * @var $ticketRequest CreateTicketByCustomerModel
+     */
+    private $ticketRequest;
+
+    private $heskSettings = array();
+    private $modsForHeskSettings = array();
+
+    function setUp() {
+        $this->banRetriever = $this->createMock(BanRetriever::class);
+        $this->ticketCreator = new TicketCreator($this->banRetriever);
+
+        $this->ticketRequest = new CreateTicketByCustomerModel();
+        $this->ticketRequest->name = 'Name';
+    }
+
+    function testItAddsTheProperValidationErrorWhenNameIsNull() {
+        //-- Arrange
+        $this->ticketRequest->name = null;
+
+        //-- Act
+        $exceptionThrown = false;
+        try {
+            $this->ticketCreator->createTicketByCustomer($this->ticketRequest, $this->heskSettings, $this->modsForHeskSettings);
+        } catch (ValidationException $e) {
+            //-- Assert (1/2)
+            $exceptionThrown = true;
+            $this->assertArraySubset(['NO_NAME'], $e->validationModel->errorKeys);
+        }
+
+        //-- Assert (2/2)
+        $this->assertThat($exceptionThrown, $this->equalTo(true));
+    }
+
+    function testItAddsTheProperValidationErrorWhenNameIsBlank() {
+        //-- Arrange
+        $this->ticketRequest->name = '';
+
+        //-- Act
+        $exceptionThrown = false;
+        try {
+            $this->ticketCreator->createTicketByCustomer($this->ticketRequest, $this->heskSettings, $this->modsForHeskSettings);
+        } catch (ValidationException $e) {
+            //-- Assert (1/2)
+            $exceptionThrown = true;
+            $this->assertArraySubset(['NO_NAME'], $e->validationModel->errorKeys);
+        }
+
+        //-- Assert (2/2)
+        $this->assertThat($exceptionThrown, $this->equalTo(true));
+    }
+}
diff --git a/api/bootstrap.php b/api/bootstrap.php
index 53251c8f..755dc9c5 100644
--- a/api/bootstrap.php
+++ b/api/bootstrap.php
@@ -1,5 +1,8 @@
 <?php
 spl_autoload_register(function ($class) {
+    // Uncomment for debugging
+    //echo 'Looking for class ' . $class . "\n";
+
     $file = __DIR__ . DIRECTORY_SEPARATOR . str_replace('\\', '/', $class) . '.php';
 
     if (file_exists($file)) {

From b76e2afac11aa5091ae5f46e7273c34e012b02e6 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Mon, 6 Feb 2017 22:13:16 -0500
Subject: [PATCH 029/192] More work on ticket creator tests

---
 api/BusinessLogic/Categories/Category.php     |   2 +-
 api/BusinessLogic/Tickets/TicketCreator.php   |  31 ++-
 api/BusinessLogic/Validators.php              | 129 ++++++++++++
 api/DataAccess/Categories/CategoryGateway.php |   2 +-
 .../Tickets/TicketCreatorTest.php             | 189 +++++++++++++++++-
 api/businesslogic/email_validators.php        | 119 -----------
 6 files changed, 339 insertions(+), 133 deletions(-)
 create mode 100644 api/BusinessLogic/Validators.php
 delete mode 100644 api/businesslogic/email_validators.php

diff --git a/api/BusinessLogic/Categories/Category.php b/api/BusinessLogic/Categories/Category.php
index 5b975b61..5711f33d 100644
--- a/api/BusinessLogic/Categories/Category.php
+++ b/api/BusinessLogic/Categories/Category.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BusinessObjects;
+namespace BusinessLogic\Categories;
 
 class Category {
     /**
diff --git a/api/BusinessLogic/Tickets/TicketCreator.php b/api/BusinessLogic/Tickets/TicketCreator.php
index 98a59676..de42e351 100644
--- a/api/BusinessLogic/Tickets/TicketCreator.php
+++ b/api/BusinessLogic/Tickets/TicketCreator.php
@@ -3,14 +3,24 @@
 namespace BusinessLogic\Tickets;
 
 
+use BusinessLogic\Categories\CategoryRetriever;
 use BusinessLogic\Exceptions\ValidationException;
 use BusinessLogic\Security\BanRetriever;
 use BusinessLogic\ValidationModel;
+use BusinessLogic\Validators;
 
 class TicketCreator {
+    /**
+     * @var $categoryRetriever CategoryRetriever
+     */
+    private $categoryRetriever;
+    /**
+     * @var $banRetriever BanRetriever
+     */
     private $banRetriever;
 
-    function __construct($banRetriever) {
+    function __construct($categoryRetriever, $banRetriever) {
+        $this->categoryRetriever = $categoryRetriever;
         $this->banRetriever = $banRetriever;
     }
 
@@ -20,8 +30,8 @@ class TicketCreator {
      * @param $modsForHeskSettings array Mods for HESK settings
      * @throws ValidationException When a required field in $ticket_request is missing
      */
-    function createTicketByCustomer($ticketRequest, $heskSettings, $modsForHeskSettings) {
-        $validationModel = $this->validate($ticketRequest, false, $heskSettings, $modsForHeskSettings);
+    function createTicketByCustomer($ticketRequest, $heskSettings, $modsForHeskSettings, $userContext) {
+        $validationModel = $this->validate($ticketRequest, false, $heskSettings, $modsForHeskSettings, $userContext);
 
         if (count($validationModel->errorKeys) > 0) {
             // Validation failed
@@ -39,7 +49,7 @@ class TicketCreator {
      * @param $modsForHeskSettings array Mods for HESK settings
      * @return ValidationModel If errorKeys is empty, validation successful. Otherwise invalid ticket
      */
-    function validate($ticketRequest, $staff, $heskSettings, $modsForHeskSettings) {
+    function validate($ticketRequest, $staff, $heskSettings, $modsForHeskSettings, $userContext) {
         $TICKET_PRIORITY_CRITICAL = 0;
 
         $validationModel = new ValidationModel();
@@ -48,17 +58,22 @@ class TicketCreator {
             $validationModel->errorKeys[] = 'NO_NAME';
         }
 
-        /*if (hesk_validateEmail($ticketRequest->email, $heskSettings['multi_eml'], false)) {
+        if (!Validators::validateEmail($ticketRequest->email, $heskSettings['multi_eml'], false)) {
             $validationModel->errorKeys[] = 'INVALID_OR_MISSING_EMAIL';
         }
 
-        if (intval($ticketRequest->category) === 0) {
-            $allCategories = null;
+        $categoryId = intval($ticketRequest->category);
+        if ($categoryId < 1) {
             $validationModel->errorKeys[] = 'NO_CATEGORY';
+        } else {
+            $categoryExists = array_key_exists($categoryId, $this->categoryRetriever->getAllCategories($heskSettings, $userContext));
+            if (!$categoryExists) {
+                $validationModel->errorKeys[] = 'CATEGORY_DOES_NOT_EXIST';
+            }
         }
 
         // Don't allow critical priority tickets
-        if ($heskSettings['cust_urgency'] && intval($ticketRequest->priority) === $TICKET_PRIORITY_CRITICAL) {
+        /*if ($heskSettings['cust_urgency'] && intval($ticketRequest->priority) === $TICKET_PRIORITY_CRITICAL) {
             $validationModel->errorKeys[] = 'CRITICAL_PRIORITY_FORBIDDEN';
         }
 
diff --git a/api/BusinessLogic/Validators.php b/api/BusinessLogic/Validators.php
new file mode 100644
index 00000000..7bfea07f
--- /dev/null
+++ b/api/BusinessLogic/Validators.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: mkoch
+ * Date: 2/6/2017
+ * Time: 9:20 PM
+ */
+
+namespace BusinessLogic;
+
+
+class Validators {
+    /**
+     * @param string $address - the email address
+     * @param array $multiple_emails - true if HESK (or custom field) supports multiple emails
+     * @param bool $return_emails (def. true): return the email address(es). Otherwise a boolean is returned
+     *
+     * @return mixed|null|string - array if multiple valid emails, null if no email and not required, string if valid email
+     */
+    static function validateEmail($address, $multiple_emails, $return_emails = true) {
+        /* Allow multiple emails to be used? */
+        if ($multiple_emails) {
+            /* Make sure the format is correct */
+            $address = preg_replace('/\s/', '', $address);
+            $address = str_replace(';', ',', $address);
+
+            /* Check if addresses are valid */
+            $all = explode(',', $address);
+            foreach ($all as $k => $v) {
+                if (!self::isValidEmail($v)) {
+                    unset($all[$k]);
+                }
+            }
+
+            /* If at least one is found return the value */
+            if (count($all)) {
+                if ($return_emails) {
+                    return implode(',', $all);
+                }
+
+                return true;
+            } elseif (!$return_emails) {
+                return false;
+            }
+        } else {
+            /* Make sure people don't try to enter multiple addresses */
+            $address = str_replace(strstr($address, ','), '', $address);
+            $address = str_replace(strstr($address, ';'), '', $address);
+            $address = trim($address);
+
+            /* Valid address? */
+            if (self::isValidEmail($address)) {
+                if ($return_emails) {
+                    return $address;
+                }
+
+                return true;
+            } else {
+                return false;
+            }
+        }
+
+        //-- We shouldn't get here
+        return false;
+    } // END hesk_validateEmail()
+
+    /**
+     * @param $email
+     * @return bool
+     */
+    static function isValidEmail($email) {
+        /* Check for header injection attempts */
+        if (preg_match("/\r|\n|%0a|%0d/i", $email)) {
+            return false;
+        }
+
+        /* Does it contain an @? */
+        $atIndex = strrpos($email, "@");
+        if ($atIndex === false) {
+            return false;
+        }
+
+        /* Get local and domain parts */
+        $domain = substr($email, $atIndex + 1);
+        $local = substr($email, 0, $atIndex);
+        $localLen = strlen($local);
+        $domainLen = strlen($domain);
+
+        /* Check local part length */
+        if ($localLen < 1 || $localLen > 64) {
+            return false;
+        }
+
+        /* Check domain part length */
+        if ($domainLen < 1 || $domainLen > 254) {
+            return false;
+        }
+
+        /* Local part mustn't start or end with a dot */
+        if ($local[0] == '.' || $local[$localLen - 1] == '.') {
+            return false;
+        }
+
+        /* Local part mustn't have two consecutive dots*/
+        if (strpos($local, '..') !== false) {
+            return false;
+        }
+
+        /* Check domain part characters */
+        if (!preg_match('/^[A-Za-z0-9\\-\\.]+$/', $domain)) {
+            return false;
+        }
+
+        /* Domain part mustn't have two consecutive dots */
+        if (strpos($domain, '..') !== false) {
+            return false;
+        }
+
+        /* Character not valid in local part unless local part is quoted */
+        if (!preg_match('/^(\\\\.|[A-Za-z0-9!#%&`_=\\/$\'*+?^{}|~.-])+$/', str_replace("\\\\", "", $local))) /* " */ {
+            if (!preg_match('/^"(\\\\"|[^"])+"$/', str_replace("\\\\", "", $local))) /* " */ {
+                return false;
+            }
+        }
+
+        /* All tests passed, email seems to be OK */
+        return true;
+    } // END hesk_isValidEmail()
+}
\ No newline at end of file
diff --git a/api/DataAccess/Categories/CategoryGateway.php b/api/DataAccess/Categories/CategoryGateway.php
index d12a7e92..68f605e4 100644
--- a/api/DataAccess/Categories/CategoryGateway.php
+++ b/api/DataAccess/Categories/CategoryGateway.php
@@ -2,7 +2,7 @@
 
 namespace DataAccess\Categories;
 
-use BusinessObjects\Category;
+use BusinessLogic\Categories\Category;
 use DataAccess\CommonDao;
 use Exception;
 
diff --git a/api/Tests/BusinessLogic/Tickets/TicketCreatorTest.php b/api/Tests/BusinessLogic/Tickets/TicketCreatorTest.php
index 91cbb847..d337a23e 100644
--- a/api/Tests/BusinessLogic/Tickets/TicketCreatorTest.php
+++ b/api/Tests/BusinessLogic/Tickets/TicketCreatorTest.php
@@ -9,8 +9,11 @@
 namespace BusinessLogic\Tickets;
 
 
+use BusinessLogic\Categories\Category;
+use BusinessLogic\Categories\CategoryRetriever;
 use BusinessLogic\Exceptions\ValidationException;
 use BusinessLogic\Security\BanRetriever;
+use BusinessLogic\Security\UserContext;
 use PHPUnit\Framework\TestCase;
 
 class TicketCreatorTest extends TestCase {
@@ -20,24 +23,49 @@ class TicketCreatorTest extends TestCase {
     private $ticketCreator;
 
     /**
-     * @var $banRetriever BanRetriever
+     * @var $banRetriever \PHPUnit_Framework_MockObject_MockObject
      */
     private $banRetriever;
 
+    /**
+     * @var $categoryRetriever \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $categoryRetriever;
+
     /**
      * @var $ticketRequest CreateTicketByCustomerModel
      */
     private $ticketRequest;
 
+    /**
+     * @var $userContext UserContext
+     */
+    private $userContext;
+
     private $heskSettings = array();
     private $modsForHeskSettings = array();
 
     function setUp() {
         $this->banRetriever = $this->createMock(BanRetriever::class);
-        $this->ticketCreator = new TicketCreator($this->banRetriever);
+        $this->categoryRetriever = $this->createMock(CategoryRetriever::class);
+        $this->ticketCreator = new TicketCreator($this->categoryRetriever, $this->banRetriever);
+        $this->userContext = new UserContext();
 
         $this->ticketRequest = new CreateTicketByCustomerModel();
         $this->ticketRequest->name = 'Name';
+        $this->ticketRequest->email = 'some@e.mail';
+        $this->ticketRequest->category = 1;
+        $this->heskSettings = array(
+            'multi_eml' => false
+        );
+
+        $category = new Category();
+        $category->accessible = true;
+        $category->id = 1;
+        $categories = array();
+        $categories[1] = $category;
+        $this->categoryRetriever->method('getAllCategories')
+                ->willReturn($categories);
     }
 
     function testItAddsTheProperValidationErrorWhenNameIsNull() {
@@ -47,7 +75,10 @@ class TicketCreatorTest extends TestCase {
         //-- Act
         $exceptionThrown = false;
         try {
-            $this->ticketCreator->createTicketByCustomer($this->ticketRequest, $this->heskSettings, $this->modsForHeskSettings);
+            $this->ticketCreator->createTicketByCustomer($this->ticketRequest,
+                $this->heskSettings,
+                $this->modsForHeskSettings,
+                $this->userContext);
         } catch (ValidationException $e) {
             //-- Assert (1/2)
             $exceptionThrown = true;
@@ -65,7 +96,10 @@ class TicketCreatorTest extends TestCase {
         //-- Act
         $exceptionThrown = false;
         try {
-            $this->ticketCreator->createTicketByCustomer($this->ticketRequest, $this->heskSettings, $this->modsForHeskSettings);
+            $this->ticketCreator->createTicketByCustomer($this->ticketRequest,
+                $this->heskSettings,
+                $this->modsForHeskSettings,
+                $this->userContext);
         } catch (ValidationException $e) {
             //-- Assert (1/2)
             $exceptionThrown = true;
@@ -75,4 +109,151 @@ class TicketCreatorTest extends TestCase {
         //-- Assert (2/2)
         $this->assertThat($exceptionThrown, $this->equalTo(true));
     }
+
+    function testItAddsTheProperValidationErrorWhenEmailIsNull() {
+        //-- Arrange
+        $this->ticketRequest->email = null;
+
+        //-- Act
+        $exceptionThrown = false;
+        try {
+            $this->ticketCreator->createTicketByCustomer($this->ticketRequest,
+                $this->heskSettings,
+                $this->modsForHeskSettings,
+                $this->userContext);
+        } catch (ValidationException $e) {
+            //-- Assert (1/2)
+            $exceptionThrown = true;
+            $this->assertArraySubset(['INVALID_OR_MISSING_EMAIL'], $e->validationModel->errorKeys);
+        }
+
+        //-- Assert (2/2)
+        $this->assertThat($exceptionThrown, $this->equalTo(true));
+    }
+
+    function testItAddsTheProperValidationErrorWhenEmailIsBlank() {
+        //-- Arrange
+        $this->ticketRequest->email = '';
+
+        //-- Act
+        $exceptionThrown = false;
+        try {
+            $this->ticketCreator->createTicketByCustomer($this->ticketRequest,
+                $this->heskSettings,
+                $this->modsForHeskSettings,
+                $this->userContext);
+        } catch (ValidationException $e) {
+            //-- Assert (1/2)
+            $exceptionThrown = true;
+            $this->assertArraySubset(['INVALID_OR_MISSING_EMAIL'], $e->validationModel->errorKeys);
+        }
+
+        //-- Assert (2/2)
+        $this->assertThat($exceptionThrown, $this->equalTo(true));
+    }
+
+    function testItAddsTheProperValidationErrorWhenEmailIsInvalid() {
+        //-- Arrange
+        $this->ticketRequest->email = 'something@';
+
+        //-- Act
+        $exceptionThrown = false;
+        try {
+            $this->ticketCreator->createTicketByCustomer($this->ticketRequest,
+                $this->heskSettings,
+                $this->modsForHeskSettings,
+                $this->userContext);
+        } catch (ValidationException $e) {
+            //-- Assert (1/2)
+            $exceptionThrown = true;
+            $this->assertArraySubset(['INVALID_OR_MISSING_EMAIL'], $e->validationModel->errorKeys);
+        }
+
+        //-- Assert (2/2)
+        $this->assertThat($exceptionThrown, $this->equalTo(true));
+    }
+
+    function testItSupportsMultipleEmails() {
+        //-- Arrange
+        $this->ticketRequest->email = 'something@email.com;another@valid.email';
+        $this->heskSettings['multi_eml'] = true;
+
+        //-- Act
+        $exceptionThrown = false;
+        try {
+            $this->ticketCreator->createTicketByCustomer($this->ticketRequest,
+                $this->heskSettings,
+                $this->modsForHeskSettings,
+                $this->userContext);
+        } catch (ValidationException $e) {
+            var_dump($e->validationModel->errorKeys);
+            $this->fail('Should not have thrown a ValidationException! Validation error keys are above.');
+        }
+
+        //-- Assert (2/2)
+        $this->assertThat($exceptionThrown, $this->equalTo(false));
+    }
+
+    function testItAddsTheProperValidationErrorWhenCategoryIsNotANumber() {
+        //-- Arrange
+        $this->ticketRequest->category = 'something';
+
+        //-- Act
+        $exceptionThrown = false;
+        try {
+            $this->ticketCreator->createTicketByCustomer($this->ticketRequest,
+                $this->heskSettings,
+                $this->modsForHeskSettings,
+                $this->userContext);
+        } catch (ValidationException $e) {
+            //-- Assert (1/2)
+            $exceptionThrown = true;
+            $this->assertArraySubset(['NO_CATEGORY'], $e->validationModel->errorKeys);
+        }
+
+        //-- Assert (2/2)
+        $this->assertThat($exceptionThrown, $this->equalTo(true));
+    }
+
+    function testItAddsTheProperValidationErrorWhenCategoryIsNegative() {
+        //-- Arrange
+        $this->ticketRequest->category = -5;
+
+        //-- Act
+        $exceptionThrown = false;
+        try {
+            $this->ticketCreator->createTicketByCustomer($this->ticketRequest,
+                $this->heskSettings,
+                $this->modsForHeskSettings,
+                $this->userContext);
+        } catch (ValidationException $e) {
+            //-- Assert (1/2)
+            $exceptionThrown = true;
+            $this->assertArraySubset(['NO_CATEGORY'], $e->validationModel->errorKeys);
+        }
+
+        //-- Assert (2/2)
+        $this->assertThat($exceptionThrown, $this->equalTo(true));
+    }
+
+    function testItAddsTheProperValidationErrorWhenTheCategoryDoesNotExist() {
+        //-- Arrange
+        $this->ticketRequest->category = 10;
+
+        //-- Act
+        $exceptionThrown = false;
+        try {
+            $this->ticketCreator->createTicketByCustomer($this->ticketRequest,
+                $this->heskSettings,
+                $this->modsForHeskSettings,
+                $this->userContext);
+        } catch (ValidationException $e) {
+            //-- Assert (1/2)
+            $exceptionThrown = true;
+            $this->assertArraySubset(['CATEGORY_DOES_NOT_EXIST'], $e->validationModel->errorKeys);
+        }
+
+        //-- Assert (2/2)
+        $this->assertThat($exceptionThrown, $this->equalTo(true));
+    }
 }
diff --git a/api/businesslogic/email_validators.php b/api/businesslogic/email_validators.php
deleted file mode 100644
index 1b69d289..00000000
--- a/api/businesslogic/email_validators.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-
-/**
- * @param string $address - the email address
- * @param array $multiple_emails - true if HESK (or custom field) supports multiple emails
- * @param bool $return_emails (def. true): return the email address(es). Otherwise a boolean is returned
- *
- * @return mixed|null|string - array if multiple valid emails, null if no email and not required, string if valid email
- */
-function hesk_validateEmail($address, $multiple_emails, $return_emails = true) {
-    /* Allow multiple emails to be used? */
-    if ($multiple_emails) {
-        /* Make sure the format is correct */
-        $address = preg_replace('/\s/', '', $address);
-        $address = str_replace(';', ',', $address);
-
-        /* Check if addresses are valid */
-        $all = explode(',', $address);
-        foreach ($all as $k => $v) {
-            if (!hesk_isValidEmail($v)) {
-                unset($all[$k]);
-            }
-        }
-
-        /* If at least one is found return the value */
-        if (count($all)) {
-            if ($return_emails) {
-                return implode(',', $all);
-            }
-
-            return true;
-        } elseif (!$return_emails) {
-            return false;
-        }
-    } else {
-        /* Make sure people don't try to enter multiple addresses */
-        $address = str_replace(strstr($address, ','), '', $address);
-        $address = str_replace(strstr($address, ';'), '', $address);
-        $address = trim($address);
-
-        /* Valid address? */
-        if (hesk_isValidEmail($address)) {
-            if ($return_emails) {
-                return $address;
-            }
-
-            return true;
-        }
-    }
-
-    if ($return_emails) {
-        return null;
-    }
-
-    return true;
-} // END hesk_validateEmail()
-
-/**
- * @param $email
- * @return bool
- */
-function hesk_isValidEmail($email) {
-    /* Check for header injection attempts */
-    if (preg_match("/\r|\n|%0a|%0d/i", $email)) {
-        return false;
-    }
-
-    /* Does it contain an @? */
-    $atIndex = strrpos($email, "@");
-    if ($atIndex === false) {
-        return false;
-    }
-
-    /* Get local and domain parts */
-    $domain = substr($email, $atIndex + 1);
-    $local = substr($email, 0, $atIndex);
-    $localLen = strlen($local);
-    $domainLen = strlen($domain);
-
-    /* Check local part length */
-    if ($localLen < 1 || $localLen > 64) {
-        return false;
-    }
-
-    /* Check domain part length */
-    if ($domainLen < 1 || $domainLen > 254) {
-        return false;
-    }
-
-    /* Local part mustn't start or end with a dot */
-    if ($local[0] == '.' || $local[$localLen - 1] == '.') {
-        return false;
-    }
-
-    /* Local part mustn't have two consecutive dots*/
-    if (strpos($local, '..') !== false) {
-        return false;
-    }
-
-    /* Check domain part characters */
-    if (!preg_match('/^[A-Za-z0-9\\-\\.]+$/', $domain)) {
-        return false;
-    }
-
-    /* Domain part mustn't have two consecutive dots */
-    if (strpos($domain, '..') !== false) {
-        return false;
-    }
-
-    /* Character not valid in local part unless local part is quoted */
-    if (!preg_match('/^(\\\\.|[A-Za-z0-9!#%&`_=\\/$\'*+?^{}|~.-])+$/', str_replace("\\\\", "", $local))) /* " */ {
-        if (!preg_match('/^"(\\\\"|[^"])+"$/', str_replace("\\\\", "", $local))) /* " */ {
-            return false;
-        }
-    }
-
-    /* All tests passed, email seems to be OK */
-    return true;
-} // END hesk_isValidEmail()
\ No newline at end of file

From e22d318b9244329d9f1497d1e83741e6bb94308d Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Tue, 7 Feb 2017 22:16:15 -0500
Subject: [PATCH 030/192] More tests for TicketCreator. Need to refactor some
 custom field logic

---
 api/BusinessLogic/Tickets/TicketCreator.php   |  15 +-
 api/Core/Constants/Priority.php               |  11 ++
 .../Tickets/TicketCreatorTest.php             | 152 +++++++++++++++++-
 3 files changed, 170 insertions(+), 8 deletions(-)
 create mode 100644 api/Core/Constants/Priority.php

diff --git a/api/BusinessLogic/Tickets/TicketCreator.php b/api/BusinessLogic/Tickets/TicketCreator.php
index de42e351..005db7e2 100644
--- a/api/BusinessLogic/Tickets/TicketCreator.php
+++ b/api/BusinessLogic/Tickets/TicketCreator.php
@@ -73,7 +73,7 @@ class TicketCreator {
         }
 
         // Don't allow critical priority tickets
-        /*if ($heskSettings['cust_urgency'] && intval($ticketRequest->priority) === $TICKET_PRIORITY_CRITICAL) {
+        if ($heskSettings['cust_urgency'] && intval($ticketRequest->priority) === $TICKET_PRIORITY_CRITICAL) {
             $validationModel->errorKeys[] = 'CRITICAL_PRIORITY_FORBIDDEN';
         }
 
@@ -88,13 +88,14 @@ class TicketCreator {
         }
 
         foreach ($heskSettings['custom_fields'] as $key => $value) {
-            if ($value['use'] == 1 && hesk_is_custom_field_in_category($key, intval($ticketRequest->category))) {
-                $custom_field_value = $ticketRequest->customFields[$key];
+            $customFieldNumber = intval(str_replace('custom', '', $key));
+            if ($value['use'] == 1 && hesk_is_custom_field_in_category($customFieldNumber, intval($ticketRequest->category))) {
+                $custom_field_value = $ticketRequest->customFields[$customFieldNumber];
                 if (empty($custom_field_value)) {
-                    $validationModel->errorKeys[] = 'CUSTOM_FIELD_' . $key . '_INVALID::NO_VALUE';
+                    $validationModel->errorKeys[] = "CUSTOM_FIELD_{$customFieldNumber}_INVALID::NO_VALUE";
                     continue;
                 }
-                switch($value['type']) {
+                /*switch($value['type']) {
                     case 'date':
                         if (!preg_match("/^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$/", $custom_field_value)) {
                             $validationModel->errorKeys[] = 'CUSTOM_FIELD_' . $key . '_INVALID::INVALID_DATE';
@@ -116,11 +117,11 @@ class TicketCreator {
                             $validationModel->errorKeys[] = 'CUSTOM_FIELD_' . $key . '_INVALID::INVALID_OR_MISSING_EMAIL';
                         }
                         break;
-                }
+                }*/
             }
         }
 
-        if ($banRetriever->isEmailBanned($ticketRequest->email, $heskSettings)) {
+        /*if ($banRetriever->isEmailBanned($ticketRequest->email, $heskSettings)) {
             $validationModel->errorKeys[] = 'EMAIL_BANNED';
         }*/
 
diff --git a/api/Core/Constants/Priority.php b/api/Core/Constants/Priority.php
new file mode 100644
index 00000000..88f98cc3
--- /dev/null
+++ b/api/Core/Constants/Priority.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Core\Constants;
+
+
+class Priority {
+    const CRITICAL = 0;
+    const HIGH = 1;
+    const MEDIUM = 2;
+    const LOW = 3;
+}
\ No newline at end of file
diff --git a/api/Tests/BusinessLogic/Tickets/TicketCreatorTest.php b/api/Tests/BusinessLogic/Tickets/TicketCreatorTest.php
index d337a23e..c4b9e2b8 100644
--- a/api/Tests/BusinessLogic/Tickets/TicketCreatorTest.php
+++ b/api/Tests/BusinessLogic/Tickets/TicketCreatorTest.php
@@ -14,6 +14,7 @@ use BusinessLogic\Categories\CategoryRetriever;
 use BusinessLogic\Exceptions\ValidationException;
 use BusinessLogic\Security\BanRetriever;
 use BusinessLogic\Security\UserContext;
+use Core\Constants\Priority;
 use PHPUnit\Framework\TestCase;
 
 class TicketCreatorTest extends TestCase {
@@ -55,8 +56,16 @@ class TicketCreatorTest extends TestCase {
         $this->ticketRequest->name = 'Name';
         $this->ticketRequest->email = 'some@e.mail';
         $this->ticketRequest->category = 1;
+        $this->ticketRequest->priority = Priority::HIGH;
+        $this->ticketRequest->subject = 'Subject';
+        $this->ticketRequest->message = 'Message';
+        $this->ticketRequest->customFields = array();
         $this->heskSettings = array(
-            'multi_eml' => false
+            'multi_eml' => false,
+            'cust_urgency' => false,
+            'require_subject' => 1,
+            'require_message' => 1,
+            'custom_fields' => array(),
         );
 
         $category = new Category();
@@ -256,4 +265,145 @@ class TicketCreatorTest extends TestCase {
         //-- Assert (2/2)
         $this->assertThat($exceptionThrown, $this->equalTo(true));
     }
+
+    function testItAddsTheProperValidationErrorWhenTheCustomerSubmitsTicketWithPriorityCritical() {
+        //-- Arrange
+        $this->ticketRequest->priority = Priority::CRITICAL;
+        $this->heskSettings['cust_urgency'] = true;
+
+        //-- Act
+        $exceptionThrown = false;
+        try {
+            $this->ticketCreator->createTicketByCustomer($this->ticketRequest,
+                $this->heskSettings,
+                $this->modsForHeskSettings,
+                $this->userContext);
+        } catch (ValidationException $e) {
+            //-- Assert (1/2)
+            $exceptionThrown = true;
+            $this->assertArraySubset(['CRITICAL_PRIORITY_FORBIDDEN'], $e->validationModel->errorKeys);
+        }
+
+        //-- Assert (2/2)
+        $this->assertThat($exceptionThrown, $this->equalTo(true));
+    }
+
+    function testItAddsTheProperValidationErrorWhenTheCustomerSubmitsTicketWithNullSubjectAndItIsRequired() {
+        //-- Arrange
+        $this->ticketRequest->subject = null;
+        $this->heskSettings['require_subject'] = 1;
+
+        //-- Act
+        $exceptionThrown = false;
+        try {
+            $this->ticketCreator->createTicketByCustomer($this->ticketRequest,
+                $this->heskSettings,
+                $this->modsForHeskSettings,
+                $this->userContext);
+        } catch (ValidationException $e) {
+            //-- Assert (1/2)
+            $exceptionThrown = true;
+            $this->assertArraySubset(['SUBJECT_REQUIRED'], $e->validationModel->errorKeys);
+        }
+
+        //-- Assert (2/2)
+        $this->assertThat($exceptionThrown, $this->equalTo(true));
+    }
+
+    function testItAddsTheProperValidationErrorWhenTheCustomerSubmitsTicketWithBlankSubjectAndItIsRequired() {
+        //-- Arrange
+        $this->ticketRequest->subject = '';
+        $this->heskSettings['require_subject'] = 1;
+
+        //-- Act
+        $exceptionThrown = false;
+        try {
+            $this->ticketCreator->createTicketByCustomer($this->ticketRequest,
+                $this->heskSettings,
+                $this->modsForHeskSettings,
+                $this->userContext);
+        } catch (ValidationException $e) {
+            //-- Assert (1/2)
+            $exceptionThrown = true;
+            $this->assertArraySubset(['SUBJECT_REQUIRED'], $e->validationModel->errorKeys);
+        }
+
+        //-- Assert (2/2)
+        $this->assertThat($exceptionThrown, $this->equalTo(true));
+    }
+
+    function testItAddsTheProperValidationErrorWhenTheCustomerSubmitsTicketWithNullMessageAndItIsRequired() {
+        //-- Arrange
+        $this->ticketRequest->message = null;
+        $this->heskSettings['require_message'] = 1;
+
+        //-- Act
+        $exceptionThrown = false;
+        try {
+            $this->ticketCreator->createTicketByCustomer($this->ticketRequest,
+                $this->heskSettings,
+                $this->modsForHeskSettings,
+                $this->userContext);
+        } catch (ValidationException $e) {
+            //-- Assert (1/2)
+            $exceptionThrown = true;
+            $this->assertArraySubset(['MESSAGE_REQUIRED'], $e->validationModel->errorKeys);
+        }
+
+        //-- Assert (2/2)
+        $this->assertThat($exceptionThrown, $this->equalTo(true));
+    }
+
+    function testItAddsTheProperValidationErrorWhenTheCustomerSubmitsTicketWithBlankMessageAndItIsRequired() {
+        //-- Arrange
+        $this->ticketRequest->message = '';
+        $this->heskSettings['require_message'] = 1;
+
+        //-- Act
+        $exceptionThrown = false;
+        try {
+            $this->ticketCreator->createTicketByCustomer($this->ticketRequest,
+                $this->heskSettings,
+                $this->modsForHeskSettings,
+                $this->userContext);
+        } catch (ValidationException $e) {
+            //-- Assert (1/2)
+            $exceptionThrown = true;
+            $this->assertArraySubset(['MESSAGE_REQUIRED'], $e->validationModel->errorKeys);
+        }
+
+        //-- Assert (2/2)
+        $this->assertThat($exceptionThrown, $this->equalTo(true));
+    }
+
+    function testItAddsTheProperValidationErrorWhenTheCustomerSubmitsTicketWithNullRequiredCustomField() {
+        $this->markTestIncomplete(
+            'Not complete; need to refactor custom field in category'
+        );
+
+        //-- Arrange
+        $customField = array();
+        $customField['req'] = 1;
+        $customField['type'] = 'text';
+        $customField['use'] = 1;
+        $customField['category'] = array();
+        $this->heskSettings['custom_fields']['custom1'] = $customField;
+        $this->ticketRequest->customFields[1] = null;
+
+        //-- Act
+        $exceptionThrown = false;
+        try {
+            $this->ticketCreator->createTicketByCustomer($this->ticketRequest,
+                $this->heskSettings,
+                $this->modsForHeskSettings,
+                $this->userContext);
+        } catch (ValidationException $e) {
+            //-- Assert (1/2)
+            $exceptionThrown = true;
+            $this->assertArraySubset(['CUSTOM_FIELD_1_INVALID::NO_VALUE'], $e->validationModel->errorKeys);
+        }
+
+        //-- Assert (2/2)
+        $this->assertThat($exceptionThrown, $this->equalTo(true));
+    }
 }

From e44baa99c27a0eb33941480a02509f459794ae18 Mon Sep 17 00:00:00 2001
From: Mike Koch <Mike.Koch@emerson.com>
Date: Thu, 9 Feb 2017 12:57:28 -0500
Subject: [PATCH 031/192] Refactored custom field validator, re-enabled test

---
 .../Helpers.php                               |  0
 .../CustomFields/CustomFieldValidator.php     | 24 ++++++
 api/BusinessLogic/Tickets/TicketCreator.php   |  4 +-
 .../ValidationModel.php                       |  0
 .../security/BanRetriever.php                 |  0
 .../security/BannedEmail.php                  |  0
 .../security/BannedIp.php                     |  0
 .../security/UserContext.php                  |  0
 .../security/UserContextBuilder.php           |  0
 .../security/UserContextNotifications.php     |  0
 .../security/UserContextPreferences.php       |  0
 api/{core => Core}/database.inc.php           |  0
 api/{core => Core}/database_mysqli.inc.php    |  0
 api/{core => Core}/json_error.php             |  0
 api/{core => Core}/output.php                 |  0
 .../CustomFields/CustomFieldValidatorTest.php | 86 +++++++++++++++++++
 .../Tickets/TicketCreatorTest.php             |  4 -
 17 files changed, 112 insertions(+), 6 deletions(-)
 rename api/{businesslogic => BusinessLogic}/Helpers.php (100%)
 create mode 100644 api/BusinessLogic/Tickets/CustomFields/CustomFieldValidator.php
 rename api/{businesslogic => BusinessLogic}/ValidationModel.php (100%)
 rename api/{businesslogic => BusinessLogic}/security/BanRetriever.php (100%)
 rename api/{businesslogic => BusinessLogic}/security/BannedEmail.php (100%)
 rename api/{businesslogic => BusinessLogic}/security/BannedIp.php (100%)
 rename api/{businesslogic => BusinessLogic}/security/UserContext.php (100%)
 rename api/{businesslogic => BusinessLogic}/security/UserContextBuilder.php (100%)
 rename api/{businesslogic => BusinessLogic}/security/UserContextNotifications.php (100%)
 rename api/{businesslogic => BusinessLogic}/security/UserContextPreferences.php (100%)
 rename api/{core => Core}/database.inc.php (100%)
 rename api/{core => Core}/database_mysqli.inc.php (100%)
 rename api/{core => Core}/json_error.php (100%)
 rename api/{core => Core}/output.php (100%)
 create mode 100644 api/Tests/BusinessLogic/Tickets/CustomFields/CustomFieldValidatorTest.php

diff --git a/api/businesslogic/Helpers.php b/api/BusinessLogic/Helpers.php
similarity index 100%
rename from api/businesslogic/Helpers.php
rename to api/BusinessLogic/Helpers.php
diff --git a/api/BusinessLogic/Tickets/CustomFields/CustomFieldValidator.php b/api/BusinessLogic/Tickets/CustomFields/CustomFieldValidator.php
new file mode 100644
index 00000000..037d828e
--- /dev/null
+++ b/api/BusinessLogic/Tickets/CustomFields/CustomFieldValidator.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: cokoch
+ * Date: 2/9/2017
+ * Time: 12:28 PM
+ */
+
+namespace BusinessLogic\Tickets\CustomFields;
+
+
+class CustomFieldValidator {
+    static function isCustomFieldInCategory($customFieldId, $categoryId, $staff, $heskSettings) {
+        $customField = $heskSettings['custom_fields']["custom{$customFieldId}"];
+
+        if (!$customField['use'] ||
+            (!$staff && $customField['use'] === 2)) {
+            return false;
+        }
+
+        return count($customField['category']) === 0 ||
+            in_array($categoryId, $customField['category']);
+    }
+}
\ No newline at end of file
diff --git a/api/BusinessLogic/Tickets/TicketCreator.php b/api/BusinessLogic/Tickets/TicketCreator.php
index 005db7e2..ee510b69 100644
--- a/api/BusinessLogic/Tickets/TicketCreator.php
+++ b/api/BusinessLogic/Tickets/TicketCreator.php
@@ -6,6 +6,7 @@ namespace BusinessLogic\Tickets;
 use BusinessLogic\Categories\CategoryRetriever;
 use BusinessLogic\Exceptions\ValidationException;
 use BusinessLogic\Security\BanRetriever;
+use BusinessLogic\Tickets\CustomFields\CustomFieldValidator;
 use BusinessLogic\ValidationModel;
 use BusinessLogic\Validators;
 
@@ -72,7 +73,6 @@ class TicketCreator {
             }
         }
 
-        // Don't allow critical priority tickets
         if ($heskSettings['cust_urgency'] && intval($ticketRequest->priority) === $TICKET_PRIORITY_CRITICAL) {
             $validationModel->errorKeys[] = 'CRITICAL_PRIORITY_FORBIDDEN';
         }
@@ -89,7 +89,7 @@ class TicketCreator {
 
         foreach ($heskSettings['custom_fields'] as $key => $value) {
             $customFieldNumber = intval(str_replace('custom', '', $key));
-            if ($value['use'] == 1 && hesk_is_custom_field_in_category($customFieldNumber, intval($ticketRequest->category))) {
+            if ($value['use'] == 1 && CustomFieldValidator::isCustomFieldInCategory($customFieldNumber, intval($ticketRequest->category), false, $heskSettings)) {
                 $custom_field_value = $ticketRequest->customFields[$customFieldNumber];
                 if (empty($custom_field_value)) {
                     $validationModel->errorKeys[] = "CUSTOM_FIELD_{$customFieldNumber}_INVALID::NO_VALUE";
diff --git a/api/businesslogic/ValidationModel.php b/api/BusinessLogic/ValidationModel.php
similarity index 100%
rename from api/businesslogic/ValidationModel.php
rename to api/BusinessLogic/ValidationModel.php
diff --git a/api/businesslogic/security/BanRetriever.php b/api/BusinessLogic/security/BanRetriever.php
similarity index 100%
rename from api/businesslogic/security/BanRetriever.php
rename to api/BusinessLogic/security/BanRetriever.php
diff --git a/api/businesslogic/security/BannedEmail.php b/api/BusinessLogic/security/BannedEmail.php
similarity index 100%
rename from api/businesslogic/security/BannedEmail.php
rename to api/BusinessLogic/security/BannedEmail.php
diff --git a/api/businesslogic/security/BannedIp.php b/api/BusinessLogic/security/BannedIp.php
similarity index 100%
rename from api/businesslogic/security/BannedIp.php
rename to api/BusinessLogic/security/BannedIp.php
diff --git a/api/businesslogic/security/UserContext.php b/api/BusinessLogic/security/UserContext.php
similarity index 100%
rename from api/businesslogic/security/UserContext.php
rename to api/BusinessLogic/security/UserContext.php
diff --git a/api/businesslogic/security/UserContextBuilder.php b/api/BusinessLogic/security/UserContextBuilder.php
similarity index 100%
rename from api/businesslogic/security/UserContextBuilder.php
rename to api/BusinessLogic/security/UserContextBuilder.php
diff --git a/api/businesslogic/security/UserContextNotifications.php b/api/BusinessLogic/security/UserContextNotifications.php
similarity index 100%
rename from api/businesslogic/security/UserContextNotifications.php
rename to api/BusinessLogic/security/UserContextNotifications.php
diff --git a/api/businesslogic/security/UserContextPreferences.php b/api/BusinessLogic/security/UserContextPreferences.php
similarity index 100%
rename from api/businesslogic/security/UserContextPreferences.php
rename to api/BusinessLogic/security/UserContextPreferences.php
diff --git a/api/core/database.inc.php b/api/Core/database.inc.php
similarity index 100%
rename from api/core/database.inc.php
rename to api/Core/database.inc.php
diff --git a/api/core/database_mysqli.inc.php b/api/Core/database_mysqli.inc.php
similarity index 100%
rename from api/core/database_mysqli.inc.php
rename to api/Core/database_mysqli.inc.php
diff --git a/api/core/json_error.php b/api/Core/json_error.php
similarity index 100%
rename from api/core/json_error.php
rename to api/Core/json_error.php
diff --git a/api/core/output.php b/api/Core/output.php
similarity index 100%
rename from api/core/output.php
rename to api/Core/output.php
diff --git a/api/Tests/BusinessLogic/Tickets/CustomFields/CustomFieldValidatorTest.php b/api/Tests/BusinessLogic/Tickets/CustomFields/CustomFieldValidatorTest.php
new file mode 100644
index 00000000..b9958be1
--- /dev/null
+++ b/api/Tests/BusinessLogic/Tickets/CustomFields/CustomFieldValidatorTest.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: cokoch
+ * Date: 2/9/2017
+ * Time: 12:29 PM
+ */
+
+namespace BusinessLogic\Tickets\CustomFields;
+
+
+use PHPUnit\Framework\TestCase;
+
+class CustomFieldValidatorTest extends TestCase {
+    function testItReturnsTrueWhenTheCustomFieldIsInTheCategory() {
+        //-- Arrange
+        $heskSettings = array(
+            'custom_fields' => array(
+                'custom1' => array(
+                    'use' => 1,
+                    'category' => array(1, 2)
+                )
+            )
+        );
+
+        //-- Act
+        $result = CustomFieldValidator::isCustomFieldInCategory(1, 1, false, $heskSettings);
+
+        //-- Assert
+        $this->assertThat($result, $this->isTrue());
+    }
+
+    function testItReturnsTrueWhenTheCustomFieldIsForAllCategories() {
+        //-- Arrange
+        $heskSettings = array(
+            'custom_fields' => array(
+                'custom1' => array(
+                    'use' => 1,
+                    'category' => []
+                )
+            )
+        );
+
+        //-- Act
+        $result = CustomFieldValidator::isCustomFieldInCategory(1, 1, false, $heskSettings);
+
+        //-- Assert
+        $this->assertThat($result, $this->isTrue());
+    }
+
+    function testItReturnsFalseWhenTheCustomFieldIsNotInTheCategory() {
+        //-- Arrange
+        $heskSettings = array(
+            'custom_fields' => array(
+                'custom1' => array(
+                    'use' => 1,
+                    'category' => array(1, 2)
+                )
+            )
+        );
+
+        //-- Act
+        $result = CustomFieldValidator::isCustomFieldInCategory(1, 50, false, $heskSettings);
+
+        //-- Assert
+        $this->assertThat($result, $this->isFalse());
+    }
+
+    function testItReturnsFalseWhenTheCustomFieldIsForStaffOnly() {
+        //-- Arrange
+        $heskSettings = array(
+            'custom_fields' => array(
+                'custom1' => array(
+                    'use' => 2,
+                    'category' => array(1, 2)
+                )
+            )
+        );
+
+        //-- Act
+        $result = CustomFieldValidator::isCustomFieldInCategory(1, 1, false, $heskSettings);
+
+        //-- Assert
+        $this->assertThat($result, $this->isFalse());
+    }
+}
diff --git a/api/Tests/BusinessLogic/Tickets/TicketCreatorTest.php b/api/Tests/BusinessLogic/Tickets/TicketCreatorTest.php
index c4b9e2b8..6ce6d5c1 100644
--- a/api/Tests/BusinessLogic/Tickets/TicketCreatorTest.php
+++ b/api/Tests/BusinessLogic/Tickets/TicketCreatorTest.php
@@ -377,10 +377,6 @@ class TicketCreatorTest extends TestCase {
     }
 
     function testItAddsTheProperValidationErrorWhenTheCustomerSubmitsTicketWithNullRequiredCustomField() {
-        $this->markTestIncomplete(
-            'Not complete; need to refactor custom field in category'
-        );
-
         //-- Arrange
         $customField = array();
         $customField['req'] = 1;

From bc9bb698c56cb347f9e3ec6e4b03ea2bbb463652 Mon Sep 17 00:00:00 2001
From: Mike Koch <Mike.Koch@emerson.com>
Date: Fri, 10 Feb 2017 13:05:40 -0500
Subject: [PATCH 032/192] Add some more validation tests for dates

---
 api/BusinessLogic/Tickets/TicketCreator.php   |  17 +--
 api/Core/Constants/CustomField.php            |  22 ++++
 .../Tickets/TicketCreatorTest.php             | 119 +++++++++++++++++-
 3 files changed, 149 insertions(+), 9 deletions(-)
 create mode 100644 api/Core/Constants/CustomField.php

diff --git a/api/BusinessLogic/Tickets/TicketCreator.php b/api/BusinessLogic/Tickets/TicketCreator.php
index ee510b69..df177387 100644
--- a/api/BusinessLogic/Tickets/TicketCreator.php
+++ b/api/BusinessLogic/Tickets/TicketCreator.php
@@ -9,6 +9,7 @@ use BusinessLogic\Security\BanRetriever;
 use BusinessLogic\Tickets\CustomFields\CustomFieldValidator;
 use BusinessLogic\ValidationModel;
 use BusinessLogic\Validators;
+use Core\Constants\CustomField;
 
 class TicketCreator {
     /**
@@ -95,10 +96,10 @@ class TicketCreator {
                     $validationModel->errorKeys[] = "CUSTOM_FIELD_{$customFieldNumber}_INVALID::NO_VALUE";
                     continue;
                 }
-                /*switch($value['type']) {
-                    case 'date':
+                switch($value['type']) {
+                    case CustomField::DATE:
                         if (!preg_match("/^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$/", $custom_field_value)) {
-                            $validationModel->errorKeys[] = 'CUSTOM_FIELD_' . $key . '_INVALID::INVALID_DATE';
+                            $validationModel->errorKeys[] = 'CUSTOM_FIELD_' . $customFieldNumber . '_INVALID::INVALID_DATE';
                         } else {
                             // Actually validate based on range
                             $date = strtotime($custom_field_value . ' t00:00:00');
@@ -106,18 +107,18 @@ class TicketCreator {
                             $dmax = strlen($value['value']['dmax']) ? strtotime($value['value']['dmax'] . ' t00:00:00') : false;
 
                             if ($dmin && $dmin > $date) {
-                                $validationModel->errorKeys[] = 'CUSTOM_FIELD_' . $key . '_INVALID::DATE_BEFORE_MIN::MIN-' . $dmin . '::ENTERED-' . $date;
+                                $validationModel->errorKeys[] = 'CUSTOM_FIELD_' . $customFieldNumber . '_INVALID::DATE_BEFORE_MIN::MIN:' . date('Y-m-d', $dmin) . '::ENTERED:' . date('Y-m-d', $date);
                             } elseif ($dmax && $dmax < $date) {
-                                $validationModel->errorKeys[] = 'CUSTOM_FIELD_' . $key . '_INVALID::DATE_AFTER_MAX::MAX-' . $dmax . '::ENTERED-' . $date;
+                                $validationModel->errorKeys[] = 'CUSTOM_FIELD_' . $customFieldNumber . '_INVALID::DATE_AFTER_MAX::MAX:' . date('Y-m-d', $dmax) . '::ENTERED:' . date('Y-m-d', $date);
                             }
                         }
                         break;
-                    case 'email':
+                    /*case 'email':
                         if (!hesk_validateEmail($custom_field_value, $value['value']['multiple'], false)) {
                             $validationModel->errorKeys[] = 'CUSTOM_FIELD_' . $key . '_INVALID::INVALID_OR_MISSING_EMAIL';
                         }
-                        break;
-                }*/
+                        break;*/
+                }
             }
         }
 
diff --git a/api/Core/Constants/CustomField.php b/api/Core/Constants/CustomField.php
new file mode 100644
index 00000000..566e1c76
--- /dev/null
+++ b/api/Core/Constants/CustomField.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: cokoch
+ * Date: 2/10/2017
+ * Time: 12:53 PM
+ */
+
+namespace Core\Constants;
+
+
+class CustomField {
+    const RADIO = 'radio';
+    const SELECT = 'select';
+    const CHECKBOX = 'checkbox';
+    const TEXTAREA = 'textarea';
+    const DATE = 'date';
+    const EMAIL = 'email';
+    const HIDDEN = 'hidden';
+    const READONLY = 'readonly';
+    const TEXT = 'text';
+}
\ No newline at end of file
diff --git a/api/Tests/BusinessLogic/Tickets/TicketCreatorTest.php b/api/Tests/BusinessLogic/Tickets/TicketCreatorTest.php
index 6ce6d5c1..cd54c8a8 100644
--- a/api/Tests/BusinessLogic/Tickets/TicketCreatorTest.php
+++ b/api/Tests/BusinessLogic/Tickets/TicketCreatorTest.php
@@ -14,6 +14,7 @@ use BusinessLogic\Categories\CategoryRetriever;
 use BusinessLogic\Exceptions\ValidationException;
 use BusinessLogic\Security\BanRetriever;
 use BusinessLogic\Security\UserContext;
+use Core\Constants\CustomField;
 use Core\Constants\Priority;
 use PHPUnit\Framework\TestCase;
 
@@ -380,7 +381,7 @@ class TicketCreatorTest extends TestCase {
         //-- Arrange
         $customField = array();
         $customField['req'] = 1;
-        $customField['type'] = 'text';
+        $customField['type'] = CustomField::TEXT;
         $customField['use'] = 1;
         $customField['category'] = array();
         $this->heskSettings['custom_fields']['custom1'] = $customField;
@@ -402,4 +403,120 @@ class TicketCreatorTest extends TestCase {
         //-- Assert (2/2)
         $this->assertThat($exceptionThrown, $this->equalTo(true));
     }
+
+    function testItAddsTheProperValidationErrorWhenTheCustomerSubmitsTicketWithBlankRequiredCustomField() {
+        //-- Arrange
+        $customField = array();
+        $customField['req'] = 1;
+        $customField['type'] = CustomField::TEXT;
+        $customField['use'] = 1;
+        $customField['category'] = array();
+        $this->heskSettings['custom_fields']['custom1'] = $customField;
+        $this->ticketRequest->customFields[1] = '';
+
+        //-- Act
+        $exceptionThrown = false;
+        try {
+            $this->ticketCreator->createTicketByCustomer($this->ticketRequest,
+                $this->heskSettings,
+                $this->modsForHeskSettings,
+                $this->userContext);
+        } catch (ValidationException $e) {
+            //-- Assert (1/2)
+            $exceptionThrown = true;
+            $this->assertArraySubset(['CUSTOM_FIELD_1_INVALID::NO_VALUE'], $e->validationModel->errorKeys);
+        }
+
+        //-- Assert (2/2)
+        $this->assertThat($exceptionThrown, $this->equalTo(true));
+    }
+
+    function testItAddsTheProperValidationErrorWhenTheCustomerSubmitsTicketWithDateCustomFieldThatIsInvalid() {
+        //-- Arrange
+        $customField = array();
+        $customField['req'] = 1;
+        $customField['type'] = CustomField::DATE;
+        $customField['use'] = 1;
+        $customField['category'] = array();
+        $this->heskSettings['custom_fields']['custom1'] = $customField;
+        $this->ticketRequest->customFields[1] = '2017-30-00';
+
+        //-- Act
+        $exceptionThrown = false;
+        try {
+            $this->ticketCreator->createTicketByCustomer($this->ticketRequest,
+                $this->heskSettings,
+                $this->modsForHeskSettings,
+                $this->userContext);
+        } catch (ValidationException $e) {
+            //-- Assert (1/2)
+            $exceptionThrown = true;
+            $this->assertArraySubset(['CUSTOM_FIELD_1_INVALID::INVALID_DATE'], $e->validationModel->errorKeys);
+        }
+
+        //-- Assert (2/2)
+        $this->assertThat($exceptionThrown, $this->equalTo(true));
+    }
+
+    function testItAddsTheProperValidationErrorWhenTheCustomerSubmitsTicketWithDateThatIsBeforeMinDate() {
+        //-- Arrange
+        $customField = array();
+        $customField['req'] = 1;
+        $customField['type'] = CustomField::DATE;
+        $customField['use'] = 1;
+        $customField['category'] = array();
+        $customField['value'] = array(
+            'dmin' => '2017-01-01',
+            'dmax' => ''
+        );
+        $this->heskSettings['custom_fields']['custom1'] = $customField;
+        $this->ticketRequest->customFields[1] = '2016-12-31';
+
+        //-- Act
+        $exceptionThrown = false;
+        try {
+            $this->ticketCreator->createTicketByCustomer($this->ticketRequest,
+                $this->heskSettings,
+                $this->modsForHeskSettings,
+                $this->userContext);
+        } catch (ValidationException $e) {
+            //-- Assert (1/2)
+            $exceptionThrown = true;
+            $this->assertArraySubset(['CUSTOM_FIELD_1_INVALID::DATE_BEFORE_MIN::MIN:2017-01-01::ENTERED:2016-12-31'], $e->validationModel->errorKeys);
+        }
+
+        //-- Assert (2/2)
+        $this->assertThat($exceptionThrown, $this->equalTo(true));
+    }
+
+    function testItAddsTheProperValidationErrorWhenTheCustomerSubmitsTicketWithDateThatIsAfterMaxDate() {
+        //-- Arrange
+        $customField = array();
+        $customField['req'] = 1;
+        $customField['type'] = CustomField::DATE;
+        $customField['use'] = 1;
+        $customField['category'] = array();
+        $customField['value'] = array(
+            'dmin' => '',
+            'dmax' => '2017-01-01'
+        );
+        $this->heskSettings['custom_fields']['custom1'] = $customField;
+        $this->ticketRequest->customFields[1] = '2017-01-02';
+
+        //-- Act
+        $exceptionThrown = false;
+        try {
+            $this->ticketCreator->createTicketByCustomer($this->ticketRequest,
+                $this->heskSettings,
+                $this->modsForHeskSettings,
+                $this->userContext);
+        } catch (ValidationException $e) {
+            //-- Assert (1/2)
+            $exceptionThrown = true;
+            $this->assertArraySubset(['CUSTOM_FIELD_1_INVALID::DATE_AFTER_MAX::MAX:2017-01-01::ENTERED:2017-01-02'], $e->validationModel->errorKeys);
+        }
+
+        //-- Assert (2/2)
+        $this->assertThat($exceptionThrown, $this->equalTo(true));
+    }
 }

From d476f86c8c041fe08a80a002848c2ba25e4fdb6a Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Fri, 10 Feb 2017 22:09:46 -0500
Subject: [PATCH 033/192] Finished validation tests for create ticket

---
 api/BusinessLogic/Tickets/TicketCreator.php   | 23 +++--
 .../Tickets/TicketCreatorTest.php             | 86 ++++++++++++++++++-
 2 files changed, 101 insertions(+), 8 deletions(-)

diff --git a/api/BusinessLogic/Tickets/TicketCreator.php b/api/BusinessLogic/Tickets/TicketCreator.php
index df177387..0ace14ea 100644
--- a/api/BusinessLogic/Tickets/TicketCreator.php
+++ b/api/BusinessLogic/Tickets/TicketCreator.php
@@ -20,10 +20,15 @@ class TicketCreator {
      * @var $banRetriever BanRetriever
      */
     private $banRetriever;
+    /**
+     * @var $ticketValidators TicketValidators
+     */
+    private $ticketValidators;
 
-    function __construct($categoryRetriever, $banRetriever) {
+    function __construct($categoryRetriever, $banRetriever, $ticketValidators) {
         $this->categoryRetriever = $categoryRetriever;
         $this->banRetriever = $banRetriever;
+        $this->ticketValidators = $ticketValidators;
     }
 
     /**
@@ -113,18 +118,22 @@ class TicketCreator {
                             }
                         }
                         break;
-                    /*case 'email':
-                        if (!hesk_validateEmail($custom_field_value, $value['value']['multiple'], false)) {
-                            $validationModel->errorKeys[] = 'CUSTOM_FIELD_' . $key . '_INVALID::INVALID_OR_MISSING_EMAIL';
+                    case CustomField::EMAIL:
+                        if (!Validators::validateEmail($custom_field_value, $value['value']['multiple'], false)) {
+                            $validationModel->errorKeys[] = "CUSTOM_FIELD_{$customFieldNumber}_INVALID::INVALID_EMAIL";
                         }
-                        break;*/
+                        break;
                 }
             }
         }
 
-        /*if ($banRetriever->isEmailBanned($ticketRequest->email, $heskSettings)) {
+        if ($this->banRetriever->isEmailBanned($ticketRequest->email, $heskSettings)) {
             $validationModel->errorKeys[] = 'EMAIL_BANNED';
-        }*/
+        }
+
+        if ($this->ticketValidators->isCustomerAtMaxTickets($ticketRequest->email, $heskSettings)) {
+            $validationModel->errorKeys[] = 'EMAIL_AT_MAX_OPEN_TICKETS';
+        }
 
         // TODO Check if we're at the max number of tickets
         // TODO     submit_ticket.php:325-334
diff --git a/api/Tests/BusinessLogic/Tickets/TicketCreatorTest.php b/api/Tests/BusinessLogic/Tickets/TicketCreatorTest.php
index cd54c8a8..2098bee6 100644
--- a/api/Tests/BusinessLogic/Tickets/TicketCreatorTest.php
+++ b/api/Tests/BusinessLogic/Tickets/TicketCreatorTest.php
@@ -34,6 +34,11 @@ class TicketCreatorTest extends TestCase {
      */
     private $categoryRetriever;
 
+    /**
+     * @var $ticketValidators \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $ticketValidators;
+
     /**
      * @var $ticketRequest CreateTicketByCustomerModel
      */
@@ -50,7 +55,8 @@ class TicketCreatorTest extends TestCase {
     function setUp() {
         $this->banRetriever = $this->createMock(BanRetriever::class);
         $this->categoryRetriever = $this->createMock(CategoryRetriever::class);
-        $this->ticketCreator = new TicketCreator($this->categoryRetriever, $this->banRetriever);
+        $this->ticketValidators = $this->createMock(TicketValidators::class);
+        $this->ticketCreator = new TicketCreator($this->categoryRetriever, $this->banRetriever, $this->ticketValidators);
         $this->userContext = new UserContext();
 
         $this->ticketRequest = new CreateTicketByCustomerModel();
@@ -519,4 +525,82 @@ class TicketCreatorTest extends TestCase {
         //-- Assert (2/2)
         $this->assertThat($exceptionThrown, $this->equalTo(true));
     }
+
+    function testItAddsTheProperValidationErrorWhenTheCustomerSubmitsTicketWithEmailThatIsInvalid() {
+        //-- Arrange
+        $customField = array();
+        $customField['req'] = 1;
+        $customField['type'] = CustomField::EMAIL;
+        $customField['use'] = 1;
+        $customField['category'] = array();
+        $customField['value'] = array(
+            'multiple' => 0
+        );
+        $this->heskSettings['custom_fields']['custom1'] = $customField;
+        $this->ticketRequest->customFields[1] = 'invalid@';
+
+        //-- Act
+        $exceptionThrown = false;
+        try {
+            $this->ticketCreator->createTicketByCustomer($this->ticketRequest,
+                $this->heskSettings,
+                $this->modsForHeskSettings,
+                $this->userContext);
+        } catch (ValidationException $e) {
+            //-- Assert (1/2)
+            $exceptionThrown = true;
+            $this->assertArraySubset(['CUSTOM_FIELD_1_INVALID::INVALID_EMAIL'], $e->validationModel->errorKeys);
+        }
+
+        //-- Assert (2/2)
+        $this->assertThat($exceptionThrown, $this->equalTo(true));
+    }
+
+    function testItAddsTheProperValidationErrorWhenTheCustomerSubmitsTicketWithABannedEmail() {
+        //-- Arrange
+        $this->ticketRequest->email = 'some@banned.email';
+        $this->banRetriever->method('isEmailBanned')
+                        ->with($this->ticketRequest->email, $this->heskSettings)
+                        ->willReturn(true);
+
+        //-- Act
+        $exceptionThrown = false;
+        try {
+            $this->ticketCreator->createTicketByCustomer($this->ticketRequest,
+                $this->heskSettings,
+                $this->modsForHeskSettings,
+                $this->userContext);
+        } catch (ValidationException $e) {
+            //-- Assert (1/2)
+            $exceptionThrown = true;
+            $this->assertArraySubset(['EMAIL_BANNED'], $e->validationModel->errorKeys);
+        }
+
+        //-- Assert (2/2)
+        $this->assertThat($exceptionThrown, $this->equalTo(true));
+    }
+
+    function testItAddsTheProperValidationErrorWhenTheCustomerSubmitsTicketWhenTheyAreMaxedOut() {
+        //-- Arrange
+        $this->ticketRequest->email = 'some@maxedout.email';
+        $this->ticketValidators->method('isCustomerAtMaxTickets')
+            ->with($this->ticketRequest->email, $this->heskSettings)
+            ->willReturn(true);
+
+        //-- Act
+        $exceptionThrown = false;
+        try {
+            $this->ticketCreator->createTicketByCustomer($this->ticketRequest,
+                $this->heskSettings,
+                $this->modsForHeskSettings,
+                $this->userContext);
+        } catch (ValidationException $e) {
+            //-- Assert (1/2)
+            $exceptionThrown = true;
+            $this->assertArraySubset(['EMAIL_AT_MAX_OPEN_TICKETS'], $e->validationModel->errorKeys);
+        }
+
+        //-- Assert (2/2)
+        $this->assertThat($exceptionThrown, $this->equalTo(true));
+    }
 }

From 6f87dfc149990585a62ecdb49666e03d06ae5ab8 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Fri, 10 Feb 2017 22:10:39 -0500
Subject: [PATCH 034/192] Small fix on validation model

---
 api/BusinessLogic/ValidationModel.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/api/BusinessLogic/ValidationModel.php b/api/BusinessLogic/ValidationModel.php
index 130e1f9d..740af78e 100644
--- a/api/BusinessLogic/ValidationModel.php
+++ b/api/BusinessLogic/ValidationModel.php
@@ -8,10 +8,13 @@ class ValidationModel {
      */
     public $errorKeys;
 
+    /**
+     * @var bool
+     */
     public $valid;
 
     function __construct() {
-        $errorKeys = [];
-        $valid = true;
+        $this->errorKeys = [];
+        $this->valid = true;
     }
 }
\ No newline at end of file

From 44239ed459185053924ffd962d63bab087350c3c Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sat, 11 Feb 2017 16:24:08 -0500
Subject: [PATCH 035/192] Start working on TrackingIdGenerator

---
 api/BusinessLogic/Tickets/TrackingIdGenerator.php | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 api/BusinessLogic/Tickets/TrackingIdGenerator.php

diff --git a/api/BusinessLogic/Tickets/TrackingIdGenerator.php b/api/BusinessLogic/Tickets/TrackingIdGenerator.php
new file mode 100644
index 00000000..3a85f350
--- /dev/null
+++ b/api/BusinessLogic/Tickets/TrackingIdGenerator.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace BusinessLogic\Tickets;
+
+
+class TrackingIdGenerator {
+    function generateTrackingId() {
+
+    }
+}
\ No newline at end of file

From ee3a425c59dd63ce8e7a007d6a6a92a30b83cc7c Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sat, 11 Feb 2017 16:27:31 -0500
Subject: [PATCH 036/192] Remove unnecessary comment

---
 api/BusinessLogic/Tickets/TicketCreator.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/api/BusinessLogic/Tickets/TicketCreator.php b/api/BusinessLogic/Tickets/TicketCreator.php
index 0ace14ea..5cd964d7 100644
--- a/api/BusinessLogic/Tickets/TicketCreator.php
+++ b/api/BusinessLogic/Tickets/TicketCreator.php
@@ -135,9 +135,6 @@ class TicketCreator {
             $validationModel->errorKeys[] = 'EMAIL_AT_MAX_OPEN_TICKETS';
         }
 
-        // TODO Check if we're at the max number of tickets
-        // TODO     submit_ticket.php:325-334
-
         return $validationModel;
     }
 }
\ No newline at end of file

From 7e966b93a5192937b1c135892868e51e1ad06833 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sat, 11 Feb 2017 16:42:40 -0500
Subject: [PATCH 037/192] Intermediate commit

---
 .../Tickets/TrackingIdGenerator.php           |  6 +++
 api/DataAccess/Tickets/TicketGateway.php      |  1 +
 .../Tickets/TrackingIdGeneratorTest.php       | 37 +++++++++++++++++++
 3 files changed, 44 insertions(+)
 create mode 100644 api/Tests/BusinessLogic/Tickets/TrackingIdGeneratorTest.php

diff --git a/api/BusinessLogic/Tickets/TrackingIdGenerator.php b/api/BusinessLogic/Tickets/TrackingIdGenerator.php
index 3a85f350..33793401 100644
--- a/api/BusinessLogic/Tickets/TrackingIdGenerator.php
+++ b/api/BusinessLogic/Tickets/TrackingIdGenerator.php
@@ -4,6 +4,12 @@ namespace BusinessLogic\Tickets;
 
 
 class TrackingIdGenerator {
+    private $ticketGateway;
+
+    function __construct($ticketGateway) {
+        $this->ticketGateway = $ticketGateway;
+    }
+
     function generateTrackingId() {
 
     }
diff --git a/api/DataAccess/Tickets/TicketGateway.php b/api/DataAccess/Tickets/TicketGateway.php
index 9b05e594..9317aaae 100644
--- a/api/DataAccess/Tickets/TicketGateway.php
+++ b/api/DataAccess/Tickets/TicketGateway.php
@@ -30,6 +30,7 @@ class TicketGateway extends CommonDao {
         while ($row = hesk_dbFetchAssoc($rs)) {
             $ticket = new Ticket();
 
+            //-- TODO Finish this!
         }
     }
 }
\ No newline at end of file
diff --git a/api/Tests/BusinessLogic/Tickets/TrackingIdGeneratorTest.php b/api/Tests/BusinessLogic/Tickets/TrackingIdGeneratorTest.php
new file mode 100644
index 00000000..c851b158
--- /dev/null
+++ b/api/Tests/BusinessLogic/Tickets/TrackingIdGeneratorTest.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: mkoch
+ * Date: 2/11/2017
+ * Time: 4:32 PM
+ */
+
+namespace BusinessLogic\Tickets;
+
+
+use DataAccess\Tickets\TicketGateway;
+use PHPUnit\Framework\TestCase;
+
+class TrackingIdGeneratorTest extends TestCase {
+    /**
+     * @var $ticketGateway \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $ticketGateway;
+
+    private $trackingIdGenerator;
+
+    function setUp() {
+        $this->ticketGateway = $this->createMock(TicketGateway::class);
+
+        $this->trackingIdGenerator = new TrackingIdGenerator($this->ticketGateway);
+    }
+
+    function testItReturnsTrackingIdInTheProperFormat() {
+        //-- Arrange
+        $format = '';
+
+        //-- Act
+
+        //-- Assert
+    }
+}

From 65b10bae3cb2e19c96ca8eefb137bbc5879686a7 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sat, 11 Feb 2017 22:07:10 -0500
Subject: [PATCH 038/192] TrackingIdGenerator working. Stubbed out todo list
 for rest of creating ticket

---
 .../Tickets/CreateTicketByCustomerModel.php   |  18 +++
 .../UnableToGenerateTrackingIdException.php   |  12 ++
 api/BusinessLogic/Tickets/TicketCreator.php   |  22 ++++
 .../Tickets/TrackingIdGenerator.php           | 122 +++++++++++++++++-
 api/DataAccess/Tickets/TicketGateway.php      |  55 +++++++-
 .../Tickets/TrackingIdGeneratorTest.php       |  31 ++++-
 6 files changed, 255 insertions(+), 5 deletions(-)
 create mode 100644 api/BusinessLogic/Tickets/Exceptions/UnableToGenerateTrackingIdException.php

diff --git a/api/BusinessLogic/Tickets/CreateTicketByCustomerModel.php b/api/BusinessLogic/Tickets/CreateTicketByCustomerModel.php
index aa6ab0ff..736ce29e 100644
--- a/api/BusinessLogic/Tickets/CreateTicketByCustomerModel.php
+++ b/api/BusinessLogic/Tickets/CreateTicketByCustomerModel.php
@@ -40,5 +40,23 @@ class CreateTicketByCustomerModel {
      */
     public $customFields;
 
+    /**
+     * @var double[]|null
+     */
     public $location;
+
+    /**
+     * @var int[]|null
+     */
+    public $suggestedKnowledgebaseArticleIds;
+
+    /**
+     * @var string|null
+     */
+    public $userAgent;
+
+    /**
+     * @var int[]|null
+     */
+    public $screenResolution;
 }
\ No newline at end of file
diff --git a/api/BusinessLogic/Tickets/Exceptions/UnableToGenerateTrackingIdException.php b/api/BusinessLogic/Tickets/Exceptions/UnableToGenerateTrackingIdException.php
new file mode 100644
index 00000000..0d2718a8
--- /dev/null
+++ b/api/BusinessLogic/Tickets/Exceptions/UnableToGenerateTrackingIdException.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace BusinessLogic\Tickets\Exceptions;
+
+
+use Exception;
+
+class UnableToGenerateTrackingIdException extends Exception {
+    public function __construct() {
+        parent::__construct("Error generating a unique ticket ID.");
+    }
+}
\ No newline at end of file
diff --git a/api/BusinessLogic/Tickets/TicketCreator.php b/api/BusinessLogic/Tickets/TicketCreator.php
index 5cd964d7..b7be8613 100644
--- a/api/BusinessLogic/Tickets/TicketCreator.php
+++ b/api/BusinessLogic/Tickets/TicketCreator.php
@@ -32,10 +32,13 @@ class TicketCreator {
     }
 
     /**
+     * Ticket attachments are <b>NOT</b> handled here!
+     *
      * @param $ticketRequest CreateTicketByCustomerModel
      * @param $heskSettings array HESK settings
      * @param $modsForHeskSettings array Mods for HESK settings
      * @throws ValidationException When a required field in $ticket_request is missing
+     *
      */
     function createTicketByCustomer($ticketRequest, $heskSettings, $modsForHeskSettings, $userContext) {
         $validationModel = $this->validate($ticketRequest, false, $heskSettings, $modsForHeskSettings, $userContext);
@@ -47,6 +50,25 @@ class TicketCreator {
         }
 
         // Create the ticket
+        //-- TODO Get tracking ID
+
+        //-- TODO handle message
+
+        //-- TODO suggested kb articles
+
+        //-- TODO autoassign logic
+
+        //-- TODO latitude/longitude
+
+        //-- TODO HTML flag
+
+        //-- TODO Screen res / user agent
+
+        //-- TODO Should ticket validation exist?
+
+        //-- TODO Create the ticket
+
+        //-- TODO return the freshly created ticket. Any extra stuff the web side does will be handled in submit_ticket.php
     }
 
     /**
diff --git a/api/BusinessLogic/Tickets/TrackingIdGenerator.php b/api/BusinessLogic/Tickets/TrackingIdGenerator.php
index 33793401..a97811ca 100644
--- a/api/BusinessLogic/Tickets/TrackingIdGenerator.php
+++ b/api/BusinessLogic/Tickets/TrackingIdGenerator.php
@@ -3,14 +3,134 @@
 namespace BusinessLogic\Tickets;
 
 
+use BusinessLogic\Tickets\Exceptions\UnableToGenerateTrackingIdException;
+use DataAccess\Tickets\TicketGateway;
+
 class TrackingIdGenerator {
+    /**
+     * @var $ticketGateway TicketGateway
+     */
     private $ticketGateway;
 
     function __construct($ticketGateway) {
         $this->ticketGateway = $ticketGateway;
     }
 
-    function generateTrackingId() {
+    /**
+     * @param $heskSettings array
+     * @return string
+     */
+    function generateTrackingId($heskSettings) {
+        $acceptableCharacters = 'AEUYBDGHJLMNPQRSTVWXZ123456789';
+
+        /* Generate raw ID */
+        $trackingId = '';
+
+        /* Let's avoid duplicate ticket ID's, try up to 3 times */
+        for ($i = 1; $i <= 3; $i++) {
+            for ($i = 0; $i < 10; $i++) {
+                $trackingId .= $acceptableCharacters[mt_rand(0, 29)];
+            }
+
+            $trackingId = $this->formatTrackingId($trackingId);
+
+            /* Check for duplicate IDs */
+            $ticket = $this->ticketGateway->getTicketByTrackingId($trackingId, $heskSettings);
+
+            if ($ticket === null) {
+                return $trackingId;
+            }
+
+            /* A duplicate ID has been found! Let's try again (up to 2 more) */
+            $trackingId = '';
+        }
+
+        /* No valid tracking ID, try one more time with microtime() */
+        $trackingId = $acceptableCharacters[mt_rand(0, 29)];
+        $trackingId .= $acceptableCharacters[mt_rand(0, 29)];
+        $trackingId .= $acceptableCharacters[mt_rand(0, 29)];
+        $trackingId .= $acceptableCharacters[mt_rand(0, 29)];
+        $trackingId .= $acceptableCharacters[mt_rand(0, 29)];
+        $trackingId .= substr(microtime(), -5);
+
+        /* Format the ID to the correct shape and check wording */
+        $trackingId = $this->formatTrackingId($trackingId);
+
+        $ticket = $this->ticketGateway->getTicketByTrackingId($trackingId, $heskSettings);
+
+        if ($ticket === null) {
+            return $trackingId;
+        }
+
+        throw new UnableToGenerateTrackingIdException();
+    }
+
+    /**
+     * @param $id string
+     * @return string
+     */
+    private function formatTrackingId($id) {
+        $acceptableCharacters = 'AEUYBDGHJLMNPQRSTVWXZ123456789';
+
+        $replace = $acceptableCharacters[mt_rand(0, 29)];
+        $replace .= mt_rand(1, 9);
+        $replace .= $acceptableCharacters[mt_rand(0, 29)];
+
+        /*
+        Remove 3 letter bad words from ID
+        Possiblitiy: 1:27,000
+        */
+        $remove = array(
+            'ASS',
+            'CUM',
+            'FAG',
+            'FUK',
+            'GAY',
+            'SEX',
+            'TIT',
+            'XXX',
+        );
+
+        $id = str_replace($remove, $replace, $id);
+
+        /*
+        Remove 4 letter bad words from ID
+        Possiblitiy: 1:810,000
+        */
+        $remove = array(
+            'ANAL',
+            'ANUS',
+            'BUTT',
+            'CAWK',
+            'CLIT',
+            'COCK',
+            'CRAP',
+            'CUNT',
+            'DICK',
+            'DYKE',
+            'FART',
+            'FUCK',
+            'JAPS',
+            'JERK',
+            'JIZZ',
+            'KNOB',
+            'PISS',
+            'POOP',
+            'SHIT',
+            'SLUT',
+            'SUCK',
+            'TURD',
+
+            // Also, remove words that are known to trigger mod_security
+            'WGET',
+        );
+
+        $replace .= mt_rand(1, 9);
+        $id = str_replace($remove, $replace, $id);
+
+        /* Format the ID string into XXX-XXX-XXXX format for easier readability */
+        $id = $id[0] . $id[1] . $id[2] . '-' . $id[3] . $id[4] . $id[5] . '-' . $id[6] . $id[7] . $id[8] . $id[9];
 
+        return $id;
     }
 }
\ No newline at end of file
diff --git a/api/DataAccess/Tickets/TicketGateway.php b/api/DataAccess/Tickets/TicketGateway.php
index 9317aaae..c4a40a8c 100644
--- a/api/DataAccess/Tickets/TicketGateway.php
+++ b/api/DataAccess/Tickets/TicketGateway.php
@@ -7,12 +7,22 @@ use BusinessLogic\Tickets\Ticket;
 use DataAccess\CommonDao;
 
 class TicketGateway extends CommonDao {
+    /**
+     * @param $id int
+     * @param $heskSettings array
+     * @return Ticket|null
+     */
     function getTicketById($id, $heskSettings) {
         $this->init();
 
         $rs = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "tickets` WHERE `id` = " . intval($id));
+
+        if (hesk_dbNumRows($rs) === 0) {
+            return null;
+        }
+
         $row = hesk_dbFetchAssoc($rs);
-        $linkedTicketsRs = hesk_dbQuery("SELECT * FROM `hesk_tickets` WHERE `parent` = " . intval($id));
+        $linkedTicketsRs = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "tickets` WHERE `parent` = " . intval($id));
 
         $ticket = Ticket::fromDatabaseRow($row, $linkedTicketsRs, $heskSettings);
 
@@ -21,16 +31,55 @@ class TicketGateway extends CommonDao {
         return $ticket;
     }
 
+    /**
+     * @param $emailAddress string
+     * @param $heskSettings array
+     * @return array|null
+     */
     function getTicketsByEmail($emailAddress, $heskSettings) {
+        $this->init();
+
         $rs = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "tickets` 
             WHERE `email` = '" . hesk_dbEscape($emailAddress) . "'");
 
+        if (hesk_dbNumRows($rs) === 0) {
+            return null;
+        }
+
         $tickets = array();
 
         while ($row = hesk_dbFetchAssoc($rs)) {
-            $ticket = new Ticket();
+            $linkedTicketsRs =
+                hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "tickets` WHERE `parent` = " . intval($row['id']));
 
-            //-- TODO Finish this!
+            $tickets[] = Ticket::fromDatabaseRow($row, $linkedTicketsRs, $heskSettings);
         }
+
+        $this->close();
+
+        return $tickets;
+    }
+
+    /**
+     * @param $trackingId string
+     * @param $heskSettings array
+     * @return Ticket|null
+     */
+    function getTicketByTrackingId($trackingId, $heskSettings) {
+        $this->init();
+
+        $rs = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "tickets` WHERE `id` = " . intval($trackingId));
+        if (hesk_dbNumRows($rs) === 0) {
+            return null;
+        }
+
+        $row = hesk_dbFetchAssoc($rs);
+        $linkedTicketsRs = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "tickets` WHERE `parent` = " . intval($trackingId));
+
+        $ticket = Ticket::fromDatabaseRow($row, $linkedTicketsRs, $heskSettings);
+
+        $this->close();
+
+        return $ticket;
     }
 }
\ No newline at end of file
diff --git a/api/Tests/BusinessLogic/Tickets/TrackingIdGeneratorTest.php b/api/Tests/BusinessLogic/Tickets/TrackingIdGeneratorTest.php
index c851b158..15cfb484 100644
--- a/api/Tests/BusinessLogic/Tickets/TrackingIdGeneratorTest.php
+++ b/api/Tests/BusinessLogic/Tickets/TrackingIdGeneratorTest.php
@@ -9,6 +9,7 @@
 namespace BusinessLogic\Tickets;
 
 
+use BusinessLogic\Tickets\Exceptions\UnableToGenerateTrackingIdException;
 use DataAccess\Tickets\TicketGateway;
 use PHPUnit\Framework\TestCase;
 
@@ -18,6 +19,9 @@ class TrackingIdGeneratorTest extends TestCase {
      */
     private $ticketGateway;
 
+    /**
+     * @var $trackingIdGenerator TrackingIdGenerator
+     */
     private $trackingIdGenerator;
 
     function setUp() {
@@ -28,10 +32,35 @@ class TrackingIdGeneratorTest extends TestCase {
 
     function testItReturnsTrackingIdInTheProperFormat() {
         //-- Arrange
-        $format = '';
+        $this->ticketGateway->method('getTicketByTrackingId')
+                    ->willReturn(null);
+        $acceptableCharacters = '[AEUYBDGHJLMNPQRSTVWXZ123456789]';
+        $format = "/^{$acceptableCharacters}{3}-{$acceptableCharacters}{3}-{$acceptableCharacters}{4}$/";
 
         //-- Act
+        $trackingId = $this->trackingIdGenerator->generateTrackingId(array());
 
         //-- Assert
+        $this->assertThat($trackingId, $this->matchesRegularExpression($format));
     }
+
+    function testItThrowsAnExceptionWhenItWasUnableToGenerateAValidTrackingId() {
+        //-- Arrange
+        $exceptionThrown = false;
+        $this->ticketGateway->method('getTicketByTrackingId')
+                    ->willReturn(new Ticket());
+
+        //-- Act
+        try {
+            $this->trackingIdGenerator->generateTrackingId(array());
+        } catch (UnableToGenerateTrackingIdException $e) {
+            //-- Assert (1/2)
+            $exceptionThrown = true;
+        }
+
+        //-- Assert (2/2)
+        $this->assertThat($exceptionThrown, $this->isTrue());
+    }
+
+    //-- Trying to test the database logic is tricky, so no tests here.
 }

From 044faa77f68cfa76eedec614c2c31585a6a56cde Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sun, 12 Feb 2017 00:50:30 -0500
Subject: [PATCH 039/192] TicketGateway can now insert tickets

---
 api/BusinessLogic/Tickets/Ticket.php     |  12 +++
 api/DataAccess/Tickets/TicketGateway.php | 105 +++++++++++++++++++++++
 2 files changed, 117 insertions(+)

diff --git a/api/BusinessLogic/Tickets/Ticket.php b/api/BusinessLogic/Tickets/Ticket.php
index 13b5a43a..6594562c 100644
--- a/api/BusinessLogic/Tickets/Ticket.php
+++ b/api/BusinessLogic/Tickets/Ticket.php
@@ -236,6 +236,15 @@ class Ticket {
      */
     public $attachments;
 
+    function getAttachmentsForDatabase() {
+        $attachmentArray = array();
+        foreach ($this->attachments as $attachment) {
+            $attachmentArray[] = $attachment->id . '#' . $attachment->fileName . '#' . $attachment->savedName;
+        }
+
+        return implode(',', $attachmentArray);
+    }
+
     /**
      * @var int[]|null
      */
@@ -272,6 +281,9 @@ class Ticket {
     public $userAgent;
 
     /**
+     * 0 => width
+     * 1 => height
+     *
      * @var int[]|null
      */
     public $screenResolution;
diff --git a/api/DataAccess/Tickets/TicketGateway.php b/api/DataAccess/Tickets/TicketGateway.php
index c4a40a8c..f2101c7a 100644
--- a/api/DataAccess/Tickets/TicketGateway.php
+++ b/api/DataAccess/Tickets/TicketGateway.php
@@ -82,4 +82,109 @@ class TicketGateway extends CommonDao {
 
         return $ticket;
     }
+
+    /**
+     * @param $ticket Ticket
+     * @param $heskSettings
+     */
+    function createTicket($ticket, $heskSettings) {
+        global $hesklang;
+
+        // If language is not set or default, set it to NULL.
+        if ($ticket->language === null || empty($ticket->language)) {
+            $language = (!$heskSettings['can_sel_lang']) ? HESK_DEFAULT_LANGUAGE : hesk_dbEscape($hesklang['LANGUAGE']);
+        } else {
+            $language = $ticket->language;
+        }
+
+        $dueDate = $ticket->dueDate ? "'{$ticket->dueDate}'" : "NULL";
+        // Prepare SQL for custom fields
+        $customWhere = '';
+        $customWhat  = '';
+
+        for ($i=1; $i<=50; $i++)
+        {
+            $customWhere .= ", `custom{$i}`";
+            $customWhat  .= ", '" . (isset($ticket->customFields[$i]) ? hesk_dbEscape($ticket->customFields[$i]) : '') . "'";
+        }
+
+        $suggestedArticles = '';
+        if ($ticket->suggestedArticles !== null && !empty($ticket->suggestedArticles)) {
+            $suggestedArticles = implode(',', $ticket->suggestedArticles);
+        }
+
+        $latitude = $ticket->location !== null
+                    && isset($ticket->location[0])
+                    && $ticket->location[0] !== null ? $ticket->location[0] : '';
+        $longitude = $ticket->location !== null
+                    && isset($ticket->location[1])
+                    && $ticket->location[1] !== null ? $ticket->location[1] : '';
+        $userAgent = $ticket->userAgent !== null ? $ticket->userAgent : '';
+        $screenResolutionWidth = $ticket->screenResolution !== null
+                    && isset($ticket->screenResolution[0])
+                    && $ticket->screenResolution[0] !== null ? intval($ticket->screenResolution[0]) : '';
+        $screenResolutionHeight = $ticket->screenResolution !== null
+                    && isset($ticket->screenResolution[1])
+                    && $ticket->screenResolution[1] !== null ? intval($ticket->screenResolution[1]) : '';
+
+        $sql = "INSERT INTO `" . hesk_dbEscape($heskSettings['db_pfix']) . "tickets`
+        (
+            `trackid`,
+            `name`,
+            `email`,
+            `category`,
+            `priority`,
+            `subject`,
+            `message`,
+            `dt`,
+            `lastchange`,
+            `articles`,
+            `ip`,
+            `language`,
+            `openedby`,
+            `owner`,
+            `attachments`,
+            `merged`,
+            `status`,
+            `latitude`,
+            `longitude`,
+            `html`,
+            `user_agent`,
+            `screen_resolution_height`,
+            `screen_resolution_width`,
+            `due_date`,
+            `history`
+            {$customWhere}
+        )
+        VALUES
+        (
+            '" . hesk_dbEscape($ticket->trackingId) . "',
+            '" . hesk_dbEscape($ticket->name) . "',
+            '" . hesk_dbEscape($ticket->email) . "',
+            '" . intval($ticket->categoryId) . "',
+            '" . intval($ticket->priorityId) . "',
+            '" . hesk_dbEscape($ticket->subject) . "',
+            '" . hesk_dbEscape($ticket->message) . "',
+            NOW(),
+            NOW(),
+            " . $suggestedArticles . ",
+            '" . hesk_dbEscape($ticket->ipAddress) . "',
+            '" . hesk_dbEscape($language) . "',
+            '" . intval($ticket->openedBy) . "',
+            '" . intval($ticket->ownerId) . "',
+            '" . hesk_dbEscape($ticket->getAttachmentsForDatabase()) . "',
+            '',
+            '" . intval($ticket->statusId) . "',
+            '" . hesk_dbEscape($latitude) . "',
+            '" . hesk_dbEscape($longitude) . "',
+            '" . hesk_dbEscape($ticket->usesHtml) . "',
+            '" . hesk_dbEscape($userAgent) . "',
+            " . hesk_dbEscape($screenResolutionHeight) . ",
+            " . hesk_dbEscape($screenResolutionWidth) . ",
+            {$dueDate},
+            '" . hesk_dbEscape($ticket->auditTrailHtml) . "'
+            {$customWhat}
+        )
+        ";
+    }
 }
\ No newline at end of file

From 1a8a989e87a1d4de20cf40a626e673e8b01f2273 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sun, 12 Feb 2017 01:38:12 -0500
Subject: [PATCH 040/192] Moved validation logic to its own class, working on
 createTicket tests

---
 .../Tickets/NewTicketValidator.php            | 127 ++++
 api/BusinessLogic/Tickets/TicketCreator.php   | 137 +---
 .../Tickets/TrackingIdGenerator.php           |   1 +
 .../Tickets/NewTicketValidatorTest.php        | 432 +++++++++++++
 .../Tickets/TicketCreatorTest.php             | 606 ------------------
 .../CreateTicketForCustomerTest.php           | 108 ++++
 6 files changed, 688 insertions(+), 723 deletions(-)
 create mode 100644 api/BusinessLogic/Tickets/NewTicketValidator.php
 create mode 100644 api/Tests/BusinessLogic/Tickets/NewTicketValidatorTest.php
 delete mode 100644 api/Tests/BusinessLogic/Tickets/TicketCreatorTest.php
 create mode 100644 api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php

diff --git a/api/BusinessLogic/Tickets/NewTicketValidator.php b/api/BusinessLogic/Tickets/NewTicketValidator.php
new file mode 100644
index 00000000..5f6d6a23
--- /dev/null
+++ b/api/BusinessLogic/Tickets/NewTicketValidator.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Mike
+ * Date: 2/12/2017
+ * Time: 1:01 AM
+ */
+
+namespace BusinessLogic\Tickets;
+
+
+use BusinessLogic\Categories\CategoryRetriever;
+use BusinessLogic\Security\BanRetriever;
+use BusinessLogic\Tickets\CustomFields\CustomFieldValidator;
+use BusinessLogic\ValidationModel;
+use BusinessLogic\Validators;
+use Core\Constants\CustomField;
+
+class NewTicketValidator {
+    /**
+     * @var $categoryRetriever CategoryRetriever
+     */
+    private $categoryRetriever;
+    /**
+     * @var $banRetriever BanRetriever
+     */
+    private $banRetriever;
+    /**
+     * @var $ticketValidators TicketValidators
+     */
+    private $ticketValidators;
+
+    function __construct($categoryRetriever, $banRetriever, $ticketValidators) {
+        $this->categoryRetriever = $categoryRetriever;
+        $this->banRetriever = $banRetriever;
+        $this->ticketValidators = $ticketValidators;
+    }
+
+    /**
+     * @param $ticketRequest CreateTicketByCustomerModel
+     * @param $heskSettings array HESK settings
+     * @return ValidationModel If errorKeys is empty, validation successful. Otherwise invalid ticket
+     */
+    function validateNewTicketForCustomer($ticketRequest, $heskSettings, $userContext) {
+        $TICKET_PRIORITY_CRITICAL = 0;
+
+        $validationModel = new ValidationModel();
+
+        if ($ticketRequest->name === NULL || $ticketRequest->name == '') {
+            $validationModel->errorKeys[] = 'NO_NAME';
+        }
+
+        if (!Validators::validateEmail($ticketRequest->email, $heskSettings['multi_eml'], false)) {
+            $validationModel->errorKeys[] = 'INVALID_OR_MISSING_EMAIL';
+        }
+
+        $categoryId = intval($ticketRequest->category);
+        if ($categoryId < 1) {
+            $validationModel->errorKeys[] = 'NO_CATEGORY';
+        } else {
+            $categoryExists = array_key_exists($categoryId, $this->categoryRetriever->getAllCategories($heskSettings, $userContext));
+            if (!$categoryExists) {
+                $validationModel->errorKeys[] = 'CATEGORY_DOES_NOT_EXIST';
+            }
+        }
+
+        //-- TODO assert priority exists
+
+        if ($heskSettings['cust_urgency'] && intval($ticketRequest->priority) === $TICKET_PRIORITY_CRITICAL) {
+            $validationModel->errorKeys[] = 'CRITICAL_PRIORITY_FORBIDDEN';
+        }
+
+        if ($heskSettings['require_subject'] === 1 &&
+            ($ticketRequest->subject === NULL || $ticketRequest->subject === '')) {
+            $validationModel->errorKeys[] = 'SUBJECT_REQUIRED';
+        }
+
+        if ($heskSettings['require_message'] === 1 &&
+            ($ticketRequest->message === NULL || $ticketRequest->message === '')) {
+            $validationModel->errorKeys[] = 'MESSAGE_REQUIRED';
+        }
+
+        foreach ($heskSettings['custom_fields'] as $key => $value) {
+            $customFieldNumber = intval(str_replace('custom', '', $key));
+            if ($value['use'] == 1 && CustomFieldValidator::isCustomFieldInCategory($customFieldNumber, intval($ticketRequest->category), false, $heskSettings)) {
+                $custom_field_value = $ticketRequest->customFields[$customFieldNumber];
+                if (empty($custom_field_value)) {
+                    $validationModel->errorKeys[] = "CUSTOM_FIELD_{$customFieldNumber}_INVALID::NO_VALUE";
+                    continue;
+                }
+                switch($value['type']) {
+                    case CustomField::DATE:
+                        if (!preg_match("/^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$/", $custom_field_value)) {
+                            $validationModel->errorKeys[] = 'CUSTOM_FIELD_' . $customFieldNumber . '_INVALID::INVALID_DATE';
+                        } else {
+                            // Actually validate based on range
+                            $date = strtotime($custom_field_value . ' t00:00:00');
+                            $dmin = strlen($value['value']['dmin']) ? strtotime($value['value']['dmin'] . ' t00:00:00') : false;
+                            $dmax = strlen($value['value']['dmax']) ? strtotime($value['value']['dmax'] . ' t00:00:00') : false;
+
+                            if ($dmin && $dmin > $date) {
+                                $validationModel->errorKeys[] = 'CUSTOM_FIELD_' . $customFieldNumber . '_INVALID::DATE_BEFORE_MIN::MIN:' . date('Y-m-d', $dmin) . '::ENTERED:' . date('Y-m-d', $date);
+                            } elseif ($dmax && $dmax < $date) {
+                                $validationModel->errorKeys[] = 'CUSTOM_FIELD_' . $customFieldNumber . '_INVALID::DATE_AFTER_MAX::MAX:' . date('Y-m-d', $dmax) . '::ENTERED:' . date('Y-m-d', $date);
+                            }
+                        }
+                        break;
+                    case CustomField::EMAIL:
+                        if (!Validators::validateEmail($custom_field_value, $value['value']['multiple'], false)) {
+                            $validationModel->errorKeys[] = "CUSTOM_FIELD_{$customFieldNumber}_INVALID::INVALID_EMAIL";
+                        }
+                        break;
+                }
+            }
+        }
+
+        if ($this->banRetriever->isEmailBanned($ticketRequest->email, $heskSettings)) {
+            $validationModel->errorKeys[] = 'EMAIL_BANNED';
+        }
+
+        if ($this->ticketValidators->isCustomerAtMaxTickets($ticketRequest->email, $heskSettings)) {
+            $validationModel->errorKeys[] = 'EMAIL_AT_MAX_OPEN_TICKETS';
+        }
+
+        return $validationModel;
+    }
+}
\ No newline at end of file
diff --git a/api/BusinessLogic/Tickets/TicketCreator.php b/api/BusinessLogic/Tickets/TicketCreator.php
index b7be8613..0c6b506e 100644
--- a/api/BusinessLogic/Tickets/TicketCreator.php
+++ b/api/BusinessLogic/Tickets/TicketCreator.php
@@ -2,33 +2,29 @@
 
 namespace BusinessLogic\Tickets;
 
-
-use BusinessLogic\Categories\CategoryRetriever;
 use BusinessLogic\Exceptions\ValidationException;
-use BusinessLogic\Security\BanRetriever;
-use BusinessLogic\Tickets\CustomFields\CustomFieldValidator;
-use BusinessLogic\ValidationModel;
-use BusinessLogic\Validators;
-use Core\Constants\CustomField;
+use DataAccess\Tickets\TicketGateway;
 
 class TicketCreator {
     /**
-     * @var $categoryRetriever CategoryRetriever
+     * @var $newTicketValidator NewTicketValidator
      */
-    private $categoryRetriever;
+    private $newTicketValidator;
+
     /**
-     * @var $banRetriever BanRetriever
+     * @var $trackingIdGenerator TrackingIdGenerator
      */
-    private $banRetriever;
+    private $trackingIdGenerator;
+
     /**
-     * @var $ticketValidators TicketValidators
+     * @var $ticketGateway TicketGateway
      */
-    private $ticketValidators;
+    private $ticketGateway;
 
-    function __construct($categoryRetriever, $banRetriever, $ticketValidators) {
-        $this->categoryRetriever = $categoryRetriever;
-        $this->banRetriever = $banRetriever;
-        $this->ticketValidators = $ticketValidators;
+    function __construct($newTicketValidator, $trackingIdGenerator, $ticketGateway) {
+        $this->newTicketValidator = $newTicketValidator;
+        $this->trackingIdGenerator = $trackingIdGenerator;
+        $this->ticketGateway = $ticketGateway;
     }
 
     /**
@@ -37,11 +33,12 @@ class TicketCreator {
      * @param $ticketRequest CreateTicketByCustomerModel
      * @param $heskSettings array HESK settings
      * @param $modsForHeskSettings array Mods for HESK settings
+     * @return Ticket The newly created ticket
      * @throws ValidationException When a required field in $ticket_request is missing
      *
      */
     function createTicketByCustomer($ticketRequest, $heskSettings, $modsForHeskSettings, $userContext) {
-        $validationModel = $this->validate($ticketRequest, false, $heskSettings, $modsForHeskSettings, $userContext);
+        $validationModel = $this->newTicketValidator->validateNewTicketForCustomer($ticketRequest, $heskSettings, $userContext);
 
         if (count($validationModel->errorKeys) > 0) {
             // Validation failed
@@ -50,113 +47,19 @@ class TicketCreator {
         }
 
         // Create the ticket
-        //-- TODO Get tracking ID
-
-        //-- TODO handle message
+        $ticket = new Ticket();
+        $ticket->trackingId = $this->trackingIdGenerator->generateTrackingId($heskSettings);
 
         //-- TODO suggested kb articles
 
-        //-- TODO autoassign logic
+        //-- TODO owner/autoassign logic
 
         //-- TODO latitude/longitude
 
         //-- TODO HTML flag
 
-        //-- TODO Screen res / user agent
-
-        //-- TODO Should ticket validation exist?
-
-        //-- TODO Create the ticket
-
-        //-- TODO return the freshly created ticket. Any extra stuff the web side does will be handled in submit_ticket.php
-    }
-
-    /**
-     * @param $ticketRequest CreateTicketByCustomerModel
-     * @param $staff bool
-     * @param $heskSettings array HESK settings
-     * @param $modsForHeskSettings array Mods for HESK settings
-     * @return ValidationModel If errorKeys is empty, validation successful. Otherwise invalid ticket
-     */
-    function validate($ticketRequest, $staff, $heskSettings, $modsForHeskSettings, $userContext) {
-        $TICKET_PRIORITY_CRITICAL = 0;
-
-        $validationModel = new ValidationModel();
-
-        if ($ticketRequest->name === NULL || $ticketRequest->name == '') {
-            $validationModel->errorKeys[] = 'NO_NAME';
-        }
-
-        if (!Validators::validateEmail($ticketRequest->email, $heskSettings['multi_eml'], false)) {
-            $validationModel->errorKeys[] = 'INVALID_OR_MISSING_EMAIL';
-        }
-
-        $categoryId = intval($ticketRequest->category);
-        if ($categoryId < 1) {
-            $validationModel->errorKeys[] = 'NO_CATEGORY';
-        } else {
-            $categoryExists = array_key_exists($categoryId, $this->categoryRetriever->getAllCategories($heskSettings, $userContext));
-            if (!$categoryExists) {
-                $validationModel->errorKeys[] = 'CATEGORY_DOES_NOT_EXIST';
-            }
-        }
-
-        if ($heskSettings['cust_urgency'] && intval($ticketRequest->priority) === $TICKET_PRIORITY_CRITICAL) {
-            $validationModel->errorKeys[] = 'CRITICAL_PRIORITY_FORBIDDEN';
-        }
-
-        if ($heskSettings['require_subject'] === 1 &&
-            ($ticketRequest->subject === NULL || $ticketRequest->subject === '')) {
-            $validationModel->errorKeys[] = 'SUBJECT_REQUIRED';
-        }
-
-        if ($heskSettings['require_message'] === 1 &&
-            ($ticketRequest->message === NULL || $ticketRequest->message === '')) {
-            $validationModel->errorKeys[] = 'MESSAGE_REQUIRED';
-        }
-
-        foreach ($heskSettings['custom_fields'] as $key => $value) {
-            $customFieldNumber = intval(str_replace('custom', '', $key));
-            if ($value['use'] == 1 && CustomFieldValidator::isCustomFieldInCategory($customFieldNumber, intval($ticketRequest->category), false, $heskSettings)) {
-                $custom_field_value = $ticketRequest->customFields[$customFieldNumber];
-                if (empty($custom_field_value)) {
-                    $validationModel->errorKeys[] = "CUSTOM_FIELD_{$customFieldNumber}_INVALID::NO_VALUE";
-                    continue;
-                }
-                switch($value['type']) {
-                    case CustomField::DATE:
-                        if (!preg_match("/^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$/", $custom_field_value)) {
-                            $validationModel->errorKeys[] = 'CUSTOM_FIELD_' . $customFieldNumber . '_INVALID::INVALID_DATE';
-                        } else {
-                            // Actually validate based on range
-                            $date = strtotime($custom_field_value . ' t00:00:00');
-                            $dmin = strlen($value['value']['dmin']) ? strtotime($value['value']['dmin'] . ' t00:00:00') : false;
-                            $dmax = strlen($value['value']['dmax']) ? strtotime($value['value']['dmax'] . ' t00:00:00') : false;
-
-                            if ($dmin && $dmin > $date) {
-                                $validationModel->errorKeys[] = 'CUSTOM_FIELD_' . $customFieldNumber . '_INVALID::DATE_BEFORE_MIN::MIN:' . date('Y-m-d', $dmin) . '::ENTERED:' . date('Y-m-d', $date);
-                            } elseif ($dmax && $dmax < $date) {
-                                $validationModel->errorKeys[] = 'CUSTOM_FIELD_' . $customFieldNumber . '_INVALID::DATE_AFTER_MAX::MAX:' . date('Y-m-d', $dmax) . '::ENTERED:' . date('Y-m-d', $date);
-                            }
-                        }
-                        break;
-                    case CustomField::EMAIL:
-                        if (!Validators::validateEmail($custom_field_value, $value['value']['multiple'], false)) {
-                            $validationModel->errorKeys[] = "CUSTOM_FIELD_{$customFieldNumber}_INVALID::INVALID_EMAIL";
-                        }
-                        break;
-                }
-            }
-        }
-
-        if ($this->banRetriever->isEmailBanned($ticketRequest->email, $heskSettings)) {
-            $validationModel->errorKeys[] = 'EMAIL_BANNED';
-        }
-
-        if ($this->ticketValidators->isCustomerAtMaxTickets($ticketRequest->email, $heskSettings)) {
-            $validationModel->errorKeys[] = 'EMAIL_AT_MAX_OPEN_TICKETS';
-        }
+        $this->ticketGateway->createTicket($ticket, $heskSettings);
 
-        return $validationModel;
+        return $ticket;
     }
 }
\ No newline at end of file
diff --git a/api/BusinessLogic/Tickets/TrackingIdGenerator.php b/api/BusinessLogic/Tickets/TrackingIdGenerator.php
index a97811ca..25cbe010 100644
--- a/api/BusinessLogic/Tickets/TrackingIdGenerator.php
+++ b/api/BusinessLogic/Tickets/TrackingIdGenerator.php
@@ -19,6 +19,7 @@ class TrackingIdGenerator {
     /**
      * @param $heskSettings array
      * @return string
+     * @throws UnableToGenerateTrackingIdException
      */
     function generateTrackingId($heskSettings) {
         $acceptableCharacters = 'AEUYBDGHJLMNPQRSTVWXZ123456789';
diff --git a/api/Tests/BusinessLogic/Tickets/NewTicketValidatorTest.php b/api/Tests/BusinessLogic/Tickets/NewTicketValidatorTest.php
new file mode 100644
index 00000000..de978568
--- /dev/null
+++ b/api/Tests/BusinessLogic/Tickets/NewTicketValidatorTest.php
@@ -0,0 +1,432 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: mkoch
+ * Date: 2/4/2017
+ * Time: 9:32 PM
+ */
+
+namespace BusinessLogic\Tickets\TicketCreatorTests;
+
+
+use BusinessLogic\Categories\Category;
+use BusinessLogic\Categories\CategoryRetriever;
+use BusinessLogic\Security\BanRetriever;
+use BusinessLogic\Security\UserContext;
+use BusinessLogic\Tickets\CreateTicketByCustomerModel;
+use BusinessLogic\Tickets\NewTicketValidator;
+use BusinessLogic\Tickets\TicketValidators;
+use Core\Constants\CustomField;
+use Core\Constants\Priority;
+use PHPUnit\Framework\TestCase;
+
+class NewTicketValidatorTest extends TestCase {
+    /**
+     * @var $newTicketValidator NewTicketValidator
+     */
+    private $newTicketValidator;
+
+    /**
+     * @var $banRetriever \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $banRetriever;
+
+    /**
+     * @var $categoryRetriever \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $categoryRetriever;
+
+    /**
+     * @var $ticketValidators \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $ticketValidators;
+
+    /**
+     * @var $ticketRequest CreateTicketByCustomerModel
+     */
+    private $ticketRequest;
+
+    /**
+     * @var $userContext UserContext
+     */
+    private $userContext;
+
+    private $heskSettings = array();
+
+    function setUp() {
+        $this->banRetriever = $this->createMock(BanRetriever::class);
+        $this->categoryRetriever = $this->createMock(CategoryRetriever::class);
+        $this->ticketValidators = $this->createMock(TicketValidators::class);
+        $this->newTicketValidator = new NewTicketValidator($this->categoryRetriever, $this->banRetriever, $this->ticketValidators);
+        $this->userContext = new UserContext();
+
+        $this->ticketRequest = new CreateTicketByCustomerModel();
+        $this->ticketRequest->name = 'Name';
+        $this->ticketRequest->email = 'some@e.mail';
+        $this->ticketRequest->category = 1;
+        $this->ticketRequest->priority = Priority::HIGH;
+        $this->ticketRequest->subject = 'Subject';
+        $this->ticketRequest->message = 'Message';
+        $this->ticketRequest->customFields = array();
+        $this->heskSettings = array(
+            'multi_eml' => false,
+            'cust_urgency' => false,
+            'require_subject' => 1,
+            'require_message' => 1,
+            'custom_fields' => array(),
+        );
+
+        $category = new Category();
+        $category->accessible = true;
+        $category->id = 1;
+        $categories = array();
+        $categories[1] = $category;
+        $this->categoryRetriever->method('getAllCategories')
+                ->willReturn($categories);
+    }
+
+    function testItAddsTheProperValidationErrorWhenNameIsNull() {
+        //-- Arrange
+        $this->ticketRequest->name = null;
+
+        //-- Act
+        $validationModel = $this->newTicketValidator->validateNewTicketForCustomer($this->ticketRequest,
+            $this->heskSettings,
+            $this->userContext);
+
+        //-- Assert
+        $this->assertArraySubset(['NO_NAME'], $validationModel->errorKeys);
+    }
+
+    function testItAddsTheProperValidationErrorWhenNameIsBlank() {
+        //-- Arrange
+        $this->ticketRequest->name = '';
+
+        //-- Act
+        $validationModel = $this->newTicketValidator->validateNewTicketForCustomer($this->ticketRequest,
+            $this->heskSettings,
+            $this->userContext);
+
+        //-- Assert
+        $this->assertArraySubset(['NO_NAME'], $validationModel->errorKeys);
+    }
+
+    function testItAddsTheProperValidationErrorWhenEmailIsNull() {
+        //-- Arrange
+        $this->ticketRequest->email = null;
+
+        //-- Act
+        $validationModel = $this->newTicketValidator->validateNewTicketForCustomer($this->ticketRequest,
+            $this->heskSettings,
+            $this->userContext);
+
+        //-- Assert
+        $this->assertArraySubset(['INVALID_OR_MISSING_EMAIL'], $validationModel->errorKeys);
+    }
+
+    function testItAddsTheProperValidationErrorWhenEmailIsBlank() {
+        //-- Arrange
+        $this->ticketRequest->email = '';
+
+        //-- Act
+        $validationModel = $this->newTicketValidator->validateNewTicketForCustomer($this->ticketRequest,
+            $this->heskSettings,
+            $this->userContext);
+
+        //-- Assert
+        $this->assertArraySubset(['INVALID_OR_MISSING_EMAIL'], $validationModel->errorKeys);
+    }
+
+    function testItAddsTheProperValidationErrorWhenEmailIsInvalid() {
+        //-- Arrange
+        $this->ticketRequest->email = 'something@';
+
+        //-- Act
+        $validationModel = $this->newTicketValidator->validateNewTicketForCustomer($this->ticketRequest,
+            $this->heskSettings,
+            $this->userContext);
+
+        //-- Assert
+        $this->assertArraySubset(['INVALID_OR_MISSING_EMAIL'], $validationModel->errorKeys);
+    }
+
+    function testItSupportsMultipleEmails() {
+        //-- Arrange
+        $this->ticketRequest->email = 'something@email.com;another@valid.email';
+        $this->heskSettings['multi_eml'] = true;
+
+        //-- Act
+        $validationModel = $this->newTicketValidator->validateNewTicketForCustomer($this->ticketRequest,
+            $this->heskSettings,
+            $this->userContext);
+
+        //-- Assert
+        $this->assertThat($validationModel->valid, $this->isTrue());
+    }
+
+    function testItAddsTheProperValidationErrorWhenCategoryIsNotANumber() {
+        //-- Arrange
+        $this->ticketRequest->category = 'something';
+
+        //-- Act
+        $validationModel = $this->newTicketValidator->validateNewTicketForCustomer($this->ticketRequest,
+            $this->heskSettings,
+            $this->userContext);
+
+        //-- Assert
+        $this->assertArraySubset(['NO_CATEGORY'], $validationModel->errorKeys);
+    }
+
+    function testItAddsTheProperValidationErrorWhenCategoryIsNegative() {
+        //-- Arrange
+        $this->ticketRequest->category = -5;
+
+        //-- Act
+        $validationModel = $this->newTicketValidator->validateNewTicketForCustomer($this->ticketRequest,
+            $this->heskSettings,
+            $this->userContext);
+
+        //-- Assert
+        $this->assertArraySubset(['NO_CATEGORY'], $validationModel->errorKeys);
+    }
+
+    function testItAddsTheProperValidationErrorWhenTheCategoryDoesNotExist() {
+        //-- Arrange
+        $this->ticketRequest->category = 10;
+
+        //-- Act
+        $validationModel = $this->newTicketValidator->validateNewTicketForCustomer($this->ticketRequest,
+            $this->heskSettings,
+            $this->userContext);
+
+        //-- Assert
+        $this->assertArraySubset(['CATEGORY_DOES_NOT_EXIST'], $validationModel->errorKeys);
+    }
+
+    function testItAddsTheProperValidationErrorWhenTheCustomerSubmitsTicketWithPriorityCritical() {
+        //-- Arrange
+        $this->ticketRequest->priority = Priority::CRITICAL;
+        $this->heskSettings['cust_urgency'] = true;
+
+        //-- Act
+        $validationModel = $this->newTicketValidator->validateNewTicketForCustomer($this->ticketRequest,
+            $this->heskSettings,
+            $this->userContext);
+
+        //-- Assert
+        $this->assertArraySubset(['CRITICAL_PRIORITY_FORBIDDEN'], $validationModel->errorKeys);
+    }
+
+    function testItAddsTheProperValidationErrorWhenTheCustomerSubmitsTicketWithNullSubjectAndItIsRequired() {
+        //-- Arrange
+        $this->ticketRequest->subject = null;
+        $this->heskSettings['require_subject'] = 1;
+
+        //-- Act
+        $validationModel = $this->newTicketValidator->validateNewTicketForCustomer($this->ticketRequest,
+            $this->heskSettings,
+            $this->userContext);
+
+        //-- Assert
+        $this->assertArraySubset(['SUBJECT_REQUIRED'], $validationModel->errorKeys);
+    }
+
+    function testItAddsTheProperValidationErrorWhenTheCustomerSubmitsTicketWithBlankSubjectAndItIsRequired() {
+        //-- Arrange
+        $this->ticketRequest->subject = '';
+        $this->heskSettings['require_subject'] = 1;
+
+        //-- Act
+        $validationModel = $this->newTicketValidator->validateNewTicketForCustomer($this->ticketRequest,
+            $this->heskSettings,
+            $this->userContext);
+
+        //-- Assert
+        $this->assertArraySubset(['SUBJECT_REQUIRED'], $validationModel->errorKeys);
+    }
+
+    function testItAddsTheProperValidationErrorWhenTheCustomerSubmitsTicketWithNullMessageAndItIsRequired() {
+        //-- Arrange
+        $this->ticketRequest->message = null;
+        $this->heskSettings['require_message'] = 1;
+
+        //-- Act
+        $validationModel = $this->newTicketValidator->validateNewTicketForCustomer($this->ticketRequest,
+            $this->heskSettings,
+            $this->userContext);
+
+        //-- Assert
+        $this->assertArraySubset(['MESSAGE_REQUIRED'], $validationModel->errorKeys);
+    }
+
+    function testItAddsTheProperValidationErrorWhenTheCustomerSubmitsTicketWithBlankMessageAndItIsRequired() {
+        //-- Arrange
+        $this->ticketRequest->message = '';
+        $this->heskSettings['require_message'] = 1;
+
+        //-- Act
+        $validationModel = $this->newTicketValidator->validateNewTicketForCustomer($this->ticketRequest,
+            $this->heskSettings,
+            $this->userContext);
+
+        //-- Assert
+        $this->assertArraySubset(['MESSAGE_REQUIRED'], $validationModel->errorKeys);
+    }
+
+    function testItAddsTheProperValidationErrorWhenTheCustomerSubmitsTicketWithNullRequiredCustomField() {
+        //-- Arrange
+        $customField = array();
+        $customField['req'] = 1;
+        $customField['type'] = CustomField::TEXT;
+        $customField['use'] = 1;
+        $customField['category'] = array();
+        $this->heskSettings['custom_fields']['custom1'] = $customField;
+        $this->ticketRequest->customFields[1] = null;
+
+        //-- Act
+        $validationModel = $this->newTicketValidator->validateNewTicketForCustomer($this->ticketRequest,
+            $this->heskSettings,
+            $this->userContext);
+
+        //-- Assert
+        $this->assertArraySubset(['CUSTOM_FIELD_1_INVALID::NO_VALUE'], $validationModel->errorKeys);
+    }
+
+    function testItAddsTheProperValidationErrorWhenTheCustomerSubmitsTicketWithBlankRequiredCustomField() {
+        //-- Arrange
+        $customField = array();
+        $customField['req'] = 1;
+        $customField['type'] = CustomField::TEXT;
+        $customField['use'] = 1;
+        $customField['category'] = array();
+        $this->heskSettings['custom_fields']['custom1'] = $customField;
+        $this->ticketRequest->customFields[1] = '';
+
+        //-- Act
+        $validationModel = $this->newTicketValidator->validateNewTicketForCustomer($this->ticketRequest,
+            $this->heskSettings,
+            $this->userContext);
+
+        //-- Assert
+        $this->assertArraySubset(['CUSTOM_FIELD_1_INVALID::NO_VALUE'], $validationModel->errorKeys);
+    }
+
+    function testItAddsTheProperValidationErrorWhenTheCustomerSubmitsTicketWithDateCustomFieldThatIsInvalid() {
+        //-- Arrange
+        $customField = array();
+        $customField['req'] = 1;
+        $customField['type'] = CustomField::DATE;
+        $customField['use'] = 1;
+        $customField['category'] = array();
+        $this->heskSettings['custom_fields']['custom1'] = $customField;
+        $this->ticketRequest->customFields[1] = '2017-30-00';
+
+        //-- Act
+        $validationModel = $this->newTicketValidator->validateNewTicketForCustomer($this->ticketRequest,
+            $this->heskSettings,
+            $this->userContext);
+
+        //-- Assert
+        $this->assertArraySubset(['CUSTOM_FIELD_1_INVALID::INVALID_DATE'], $validationModel->errorKeys);
+    }
+
+    function testItAddsTheProperValidationErrorWhenTheCustomerSubmitsTicketWithDateThatIsBeforeMinDate() {
+        //-- Arrange
+        $customField = array();
+        $customField['req'] = 1;
+        $customField['type'] = CustomField::DATE;
+        $customField['use'] = 1;
+        $customField['category'] = array();
+        $customField['value'] = array(
+            'dmin' => '2017-01-01',
+            'dmax' => ''
+        );
+        $this->heskSettings['custom_fields']['custom1'] = $customField;
+        $this->ticketRequest->customFields[1] = '2016-12-31';
+
+        //-- Act
+        $validationModel = $this->newTicketValidator->validateNewTicketForCustomer($this->ticketRequest,
+            $this->heskSettings,
+            $this->userContext);
+
+        //-- Assert
+        $this->assertArraySubset(['CUSTOM_FIELD_1_INVALID::DATE_BEFORE_MIN::MIN:2017-01-01::ENTERED:2016-12-31'], $validationModel->errorKeys);
+    }
+
+    function testItAddsTheProperValidationErrorWhenTheCustomerSubmitsTicketWithDateThatIsAfterMaxDate() {
+        //-- Arrange
+        $customField = array();
+        $customField['req'] = 1;
+        $customField['type'] = CustomField::DATE;
+        $customField['use'] = 1;
+        $customField['category'] = array();
+        $customField['value'] = array(
+            'dmin' => '',
+            'dmax' => '2017-01-01'
+        );
+        $this->heskSettings['custom_fields']['custom1'] = $customField;
+        $this->ticketRequest->customFields[1] = '2017-01-02';
+
+        //-- Act
+        $validationModel = $this->newTicketValidator->validateNewTicketForCustomer($this->ticketRequest,
+            $this->heskSettings,
+            $this->userContext);
+
+        //-- Assert
+        $this->assertArraySubset(['CUSTOM_FIELD_1_INVALID::DATE_AFTER_MAX::MAX:2017-01-01::ENTERED:2017-01-02'], $validationModel->errorKeys);
+    }
+
+    function testItAddsTheProperValidationErrorWhenTheCustomerSubmitsTicketWithEmailThatIsInvalid() {
+        //-- Arrange
+        $customField = array();
+        $customField['req'] = 1;
+        $customField['type'] = CustomField::EMAIL;
+        $customField['use'] = 1;
+        $customField['category'] = array();
+        $customField['value'] = array(
+            'multiple' => 0
+        );
+        $this->heskSettings['custom_fields']['custom1'] = $customField;
+        $this->ticketRequest->customFields[1] = 'invalid@';
+
+        //-- Act
+        $validationModel = $this->newTicketValidator->validateNewTicketForCustomer($this->ticketRequest,
+            $this->heskSettings,
+            $this->userContext);
+
+        //-- Assert
+        $this->assertArraySubset(['CUSTOM_FIELD_1_INVALID::INVALID_EMAIL'], $validationModel->errorKeys);
+    }
+
+    function testItAddsTheProperValidationErrorWhenTheCustomerSubmitsTicketWithABannedEmail() {
+        //-- Arrange
+        $this->ticketRequest->email = 'some@banned.email';
+        $this->banRetriever->method('isEmailBanned')
+                        ->with($this->ticketRequest->email, $this->heskSettings)
+                        ->willReturn(true);
+
+        //-- Act
+        $validationModel = $this->newTicketValidator->validateNewTicketForCustomer($this->ticketRequest,
+            $this->heskSettings,
+            $this->userContext);
+
+        //-- Assert
+        $this->assertArraySubset(['EMAIL_BANNED'], $validationModel->errorKeys);
+    }
+
+    function testItAddsTheProperValidationErrorWhenTheCustomerSubmitsTicketWhenTheyAreMaxedOut() {
+        //-- Arrange
+        $this->ticketRequest->email = 'some@maxedout.email';
+        $this->ticketValidators->method('isCustomerAtMaxTickets')
+            ->with($this->ticketRequest->email, $this->heskSettings)
+            ->willReturn(true);
+
+        //-- Act
+        $validationModel = $this->newTicketValidator->validateNewTicketForCustomer($this->ticketRequest,
+            $this->heskSettings,
+            $this->userContext);
+
+        //-- Assert
+        $this->assertArraySubset(['EMAIL_AT_MAX_OPEN_TICKETS'], $validationModel->errorKeys);
+    }
+}
diff --git a/api/Tests/BusinessLogic/Tickets/TicketCreatorTest.php b/api/Tests/BusinessLogic/Tickets/TicketCreatorTest.php
deleted file mode 100644
index 2098bee6..00000000
--- a/api/Tests/BusinessLogic/Tickets/TicketCreatorTest.php
+++ /dev/null
@@ -1,606 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: mkoch
- * Date: 2/4/2017
- * Time: 9:32 PM
- */
-
-namespace BusinessLogic\Tickets;
-
-
-use BusinessLogic\Categories\Category;
-use BusinessLogic\Categories\CategoryRetriever;
-use BusinessLogic\Exceptions\ValidationException;
-use BusinessLogic\Security\BanRetriever;
-use BusinessLogic\Security\UserContext;
-use Core\Constants\CustomField;
-use Core\Constants\Priority;
-use PHPUnit\Framework\TestCase;
-
-class TicketCreatorTest extends TestCase {
-    /**
-     * @var $ticketCreator TicketCreator
-     */
-    private $ticketCreator;
-
-    /**
-     * @var $banRetriever \PHPUnit_Framework_MockObject_MockObject
-     */
-    private $banRetriever;
-
-    /**
-     * @var $categoryRetriever \PHPUnit_Framework_MockObject_MockObject
-     */
-    private $categoryRetriever;
-
-    /**
-     * @var $ticketValidators \PHPUnit_Framework_MockObject_MockObject
-     */
-    private $ticketValidators;
-
-    /**
-     * @var $ticketRequest CreateTicketByCustomerModel
-     */
-    private $ticketRequest;
-
-    /**
-     * @var $userContext UserContext
-     */
-    private $userContext;
-
-    private $heskSettings = array();
-    private $modsForHeskSettings = array();
-
-    function setUp() {
-        $this->banRetriever = $this->createMock(BanRetriever::class);
-        $this->categoryRetriever = $this->createMock(CategoryRetriever::class);
-        $this->ticketValidators = $this->createMock(TicketValidators::class);
-        $this->ticketCreator = new TicketCreator($this->categoryRetriever, $this->banRetriever, $this->ticketValidators);
-        $this->userContext = new UserContext();
-
-        $this->ticketRequest = new CreateTicketByCustomerModel();
-        $this->ticketRequest->name = 'Name';
-        $this->ticketRequest->email = 'some@e.mail';
-        $this->ticketRequest->category = 1;
-        $this->ticketRequest->priority = Priority::HIGH;
-        $this->ticketRequest->subject = 'Subject';
-        $this->ticketRequest->message = 'Message';
-        $this->ticketRequest->customFields = array();
-        $this->heskSettings = array(
-            'multi_eml' => false,
-            'cust_urgency' => false,
-            'require_subject' => 1,
-            'require_message' => 1,
-            'custom_fields' => array(),
-        );
-
-        $category = new Category();
-        $category->accessible = true;
-        $category->id = 1;
-        $categories = array();
-        $categories[1] = $category;
-        $this->categoryRetriever->method('getAllCategories')
-                ->willReturn($categories);
-    }
-
-    function testItAddsTheProperValidationErrorWhenNameIsNull() {
-        //-- Arrange
-        $this->ticketRequest->name = null;
-
-        //-- Act
-        $exceptionThrown = false;
-        try {
-            $this->ticketCreator->createTicketByCustomer($this->ticketRequest,
-                $this->heskSettings,
-                $this->modsForHeskSettings,
-                $this->userContext);
-        } catch (ValidationException $e) {
-            //-- Assert (1/2)
-            $exceptionThrown = true;
-            $this->assertArraySubset(['NO_NAME'], $e->validationModel->errorKeys);
-        }
-
-        //-- Assert (2/2)
-        $this->assertThat($exceptionThrown, $this->equalTo(true));
-    }
-
-    function testItAddsTheProperValidationErrorWhenNameIsBlank() {
-        //-- Arrange
-        $this->ticketRequest->name = '';
-
-        //-- Act
-        $exceptionThrown = false;
-        try {
-            $this->ticketCreator->createTicketByCustomer($this->ticketRequest,
-                $this->heskSettings,
-                $this->modsForHeskSettings,
-                $this->userContext);
-        } catch (ValidationException $e) {
-            //-- Assert (1/2)
-            $exceptionThrown = true;
-            $this->assertArraySubset(['NO_NAME'], $e->validationModel->errorKeys);
-        }
-
-        //-- Assert (2/2)
-        $this->assertThat($exceptionThrown, $this->equalTo(true));
-    }
-
-    function testItAddsTheProperValidationErrorWhenEmailIsNull() {
-        //-- Arrange
-        $this->ticketRequest->email = null;
-
-        //-- Act
-        $exceptionThrown = false;
-        try {
-            $this->ticketCreator->createTicketByCustomer($this->ticketRequest,
-                $this->heskSettings,
-                $this->modsForHeskSettings,
-                $this->userContext);
-        } catch (ValidationException $e) {
-            //-- Assert (1/2)
-            $exceptionThrown = true;
-            $this->assertArraySubset(['INVALID_OR_MISSING_EMAIL'], $e->validationModel->errorKeys);
-        }
-
-        //-- Assert (2/2)
-        $this->assertThat($exceptionThrown, $this->equalTo(true));
-    }
-
-    function testItAddsTheProperValidationErrorWhenEmailIsBlank() {
-        //-- Arrange
-        $this->ticketRequest->email = '';
-
-        //-- Act
-        $exceptionThrown = false;
-        try {
-            $this->ticketCreator->createTicketByCustomer($this->ticketRequest,
-                $this->heskSettings,
-                $this->modsForHeskSettings,
-                $this->userContext);
-        } catch (ValidationException $e) {
-            //-- Assert (1/2)
-            $exceptionThrown = true;
-            $this->assertArraySubset(['INVALID_OR_MISSING_EMAIL'], $e->validationModel->errorKeys);
-        }
-
-        //-- Assert (2/2)
-        $this->assertThat($exceptionThrown, $this->equalTo(true));
-    }
-
-    function testItAddsTheProperValidationErrorWhenEmailIsInvalid() {
-        //-- Arrange
-        $this->ticketRequest->email = 'something@';
-
-        //-- Act
-        $exceptionThrown = false;
-        try {
-            $this->ticketCreator->createTicketByCustomer($this->ticketRequest,
-                $this->heskSettings,
-                $this->modsForHeskSettings,
-                $this->userContext);
-        } catch (ValidationException $e) {
-            //-- Assert (1/2)
-            $exceptionThrown = true;
-            $this->assertArraySubset(['INVALID_OR_MISSING_EMAIL'], $e->validationModel->errorKeys);
-        }
-
-        //-- Assert (2/2)
-        $this->assertThat($exceptionThrown, $this->equalTo(true));
-    }
-
-    function testItSupportsMultipleEmails() {
-        //-- Arrange
-        $this->ticketRequest->email = 'something@email.com;another@valid.email';
-        $this->heskSettings['multi_eml'] = true;
-
-        //-- Act
-        $exceptionThrown = false;
-        try {
-            $this->ticketCreator->createTicketByCustomer($this->ticketRequest,
-                $this->heskSettings,
-                $this->modsForHeskSettings,
-                $this->userContext);
-        } catch (ValidationException $e) {
-            var_dump($e->validationModel->errorKeys);
-            $this->fail('Should not have thrown a ValidationException! Validation error keys are above.');
-        }
-
-        //-- Assert (2/2)
-        $this->assertThat($exceptionThrown, $this->equalTo(false));
-    }
-
-    function testItAddsTheProperValidationErrorWhenCategoryIsNotANumber() {
-        //-- Arrange
-        $this->ticketRequest->category = 'something';
-
-        //-- Act
-        $exceptionThrown = false;
-        try {
-            $this->ticketCreator->createTicketByCustomer($this->ticketRequest,
-                $this->heskSettings,
-                $this->modsForHeskSettings,
-                $this->userContext);
-        } catch (ValidationException $e) {
-            //-- Assert (1/2)
-            $exceptionThrown = true;
-            $this->assertArraySubset(['NO_CATEGORY'], $e->validationModel->errorKeys);
-        }
-
-        //-- Assert (2/2)
-        $this->assertThat($exceptionThrown, $this->equalTo(true));
-    }
-
-    function testItAddsTheProperValidationErrorWhenCategoryIsNegative() {
-        //-- Arrange
-        $this->ticketRequest->category = -5;
-
-        //-- Act
-        $exceptionThrown = false;
-        try {
-            $this->ticketCreator->createTicketByCustomer($this->ticketRequest,
-                $this->heskSettings,
-                $this->modsForHeskSettings,
-                $this->userContext);
-        } catch (ValidationException $e) {
-            //-- Assert (1/2)
-            $exceptionThrown = true;
-            $this->assertArraySubset(['NO_CATEGORY'], $e->validationModel->errorKeys);
-        }
-
-        //-- Assert (2/2)
-        $this->assertThat($exceptionThrown, $this->equalTo(true));
-    }
-
-    function testItAddsTheProperValidationErrorWhenTheCategoryDoesNotExist() {
-        //-- Arrange
-        $this->ticketRequest->category = 10;
-
-        //-- Act
-        $exceptionThrown = false;
-        try {
-            $this->ticketCreator->createTicketByCustomer($this->ticketRequest,
-                $this->heskSettings,
-                $this->modsForHeskSettings,
-                $this->userContext);
-        } catch (ValidationException $e) {
-            //-- Assert (1/2)
-            $exceptionThrown = true;
-            $this->assertArraySubset(['CATEGORY_DOES_NOT_EXIST'], $e->validationModel->errorKeys);
-        }
-
-        //-- Assert (2/2)
-        $this->assertThat($exceptionThrown, $this->equalTo(true));
-    }
-
-    function testItAddsTheProperValidationErrorWhenTheCustomerSubmitsTicketWithPriorityCritical() {
-        //-- Arrange
-        $this->ticketRequest->priority = Priority::CRITICAL;
-        $this->heskSettings['cust_urgency'] = true;
-
-        //-- Act
-        $exceptionThrown = false;
-        try {
-            $this->ticketCreator->createTicketByCustomer($this->ticketRequest,
-                $this->heskSettings,
-                $this->modsForHeskSettings,
-                $this->userContext);
-        } catch (ValidationException $e) {
-            //-- Assert (1/2)
-            $exceptionThrown = true;
-            $this->assertArraySubset(['CRITICAL_PRIORITY_FORBIDDEN'], $e->validationModel->errorKeys);
-        }
-
-        //-- Assert (2/2)
-        $this->assertThat($exceptionThrown, $this->equalTo(true));
-    }
-
-    function testItAddsTheProperValidationErrorWhenTheCustomerSubmitsTicketWithNullSubjectAndItIsRequired() {
-        //-- Arrange
-        $this->ticketRequest->subject = null;
-        $this->heskSettings['require_subject'] = 1;
-
-        //-- Act
-        $exceptionThrown = false;
-        try {
-            $this->ticketCreator->createTicketByCustomer($this->ticketRequest,
-                $this->heskSettings,
-                $this->modsForHeskSettings,
-                $this->userContext);
-        } catch (ValidationException $e) {
-            //-- Assert (1/2)
-            $exceptionThrown = true;
-            $this->assertArraySubset(['SUBJECT_REQUIRED'], $e->validationModel->errorKeys);
-        }
-
-        //-- Assert (2/2)
-        $this->assertThat($exceptionThrown, $this->equalTo(true));
-    }
-
-    function testItAddsTheProperValidationErrorWhenTheCustomerSubmitsTicketWithBlankSubjectAndItIsRequired() {
-        //-- Arrange
-        $this->ticketRequest->subject = '';
-        $this->heskSettings['require_subject'] = 1;
-
-        //-- Act
-        $exceptionThrown = false;
-        try {
-            $this->ticketCreator->createTicketByCustomer($this->ticketRequest,
-                $this->heskSettings,
-                $this->modsForHeskSettings,
-                $this->userContext);
-        } catch (ValidationException $e) {
-            //-- Assert (1/2)
-            $exceptionThrown = true;
-            $this->assertArraySubset(['SUBJECT_REQUIRED'], $e->validationModel->errorKeys);
-        }
-
-        //-- Assert (2/2)
-        $this->assertThat($exceptionThrown, $this->equalTo(true));
-    }
-
-    function testItAddsTheProperValidationErrorWhenTheCustomerSubmitsTicketWithNullMessageAndItIsRequired() {
-        //-- Arrange
-        $this->ticketRequest->message = null;
-        $this->heskSettings['require_message'] = 1;
-
-        //-- Act
-        $exceptionThrown = false;
-        try {
-            $this->ticketCreator->createTicketByCustomer($this->ticketRequest,
-                $this->heskSettings,
-                $this->modsForHeskSettings,
-                $this->userContext);
-        } catch (ValidationException $e) {
-            //-- Assert (1/2)
-            $exceptionThrown = true;
-            $this->assertArraySubset(['MESSAGE_REQUIRED'], $e->validationModel->errorKeys);
-        }
-
-        //-- Assert (2/2)
-        $this->assertThat($exceptionThrown, $this->equalTo(true));
-    }
-
-    function testItAddsTheProperValidationErrorWhenTheCustomerSubmitsTicketWithBlankMessageAndItIsRequired() {
-        //-- Arrange
-        $this->ticketRequest->message = '';
-        $this->heskSettings['require_message'] = 1;
-
-        //-- Act
-        $exceptionThrown = false;
-        try {
-            $this->ticketCreator->createTicketByCustomer($this->ticketRequest,
-                $this->heskSettings,
-                $this->modsForHeskSettings,
-                $this->userContext);
-        } catch (ValidationException $e) {
-            //-- Assert (1/2)
-            $exceptionThrown = true;
-            $this->assertArraySubset(['MESSAGE_REQUIRED'], $e->validationModel->errorKeys);
-        }
-
-        //-- Assert (2/2)
-        $this->assertThat($exceptionThrown, $this->equalTo(true));
-    }
-
-    function testItAddsTheProperValidationErrorWhenTheCustomerSubmitsTicketWithNullRequiredCustomField() {
-        //-- Arrange
-        $customField = array();
-        $customField['req'] = 1;
-        $customField['type'] = CustomField::TEXT;
-        $customField['use'] = 1;
-        $customField['category'] = array();
-        $this->heskSettings['custom_fields']['custom1'] = $customField;
-        $this->ticketRequest->customFields[1] = null;
-
-        //-- Act
-        $exceptionThrown = false;
-        try {
-            $this->ticketCreator->createTicketByCustomer($this->ticketRequest,
-                $this->heskSettings,
-                $this->modsForHeskSettings,
-                $this->userContext);
-        } catch (ValidationException $e) {
-            //-- Assert (1/2)
-            $exceptionThrown = true;
-            $this->assertArraySubset(['CUSTOM_FIELD_1_INVALID::NO_VALUE'], $e->validationModel->errorKeys);
-        }
-
-        //-- Assert (2/2)
-        $this->assertThat($exceptionThrown, $this->equalTo(true));
-    }
-
-    function testItAddsTheProperValidationErrorWhenTheCustomerSubmitsTicketWithBlankRequiredCustomField() {
-        //-- Arrange
-        $customField = array();
-        $customField['req'] = 1;
-        $customField['type'] = CustomField::TEXT;
-        $customField['use'] = 1;
-        $customField['category'] = array();
-        $this->heskSettings['custom_fields']['custom1'] = $customField;
-        $this->ticketRequest->customFields[1] = '';
-
-        //-- Act
-        $exceptionThrown = false;
-        try {
-            $this->ticketCreator->createTicketByCustomer($this->ticketRequest,
-                $this->heskSettings,
-                $this->modsForHeskSettings,
-                $this->userContext);
-        } catch (ValidationException $e) {
-            //-- Assert (1/2)
-            $exceptionThrown = true;
-            $this->assertArraySubset(['CUSTOM_FIELD_1_INVALID::NO_VALUE'], $e->validationModel->errorKeys);
-        }
-
-        //-- Assert (2/2)
-        $this->assertThat($exceptionThrown, $this->equalTo(true));
-    }
-
-    function testItAddsTheProperValidationErrorWhenTheCustomerSubmitsTicketWithDateCustomFieldThatIsInvalid() {
-        //-- Arrange
-        $customField = array();
-        $customField['req'] = 1;
-        $customField['type'] = CustomField::DATE;
-        $customField['use'] = 1;
-        $customField['category'] = array();
-        $this->heskSettings['custom_fields']['custom1'] = $customField;
-        $this->ticketRequest->customFields[1] = '2017-30-00';
-
-        //-- Act
-        $exceptionThrown = false;
-        try {
-            $this->ticketCreator->createTicketByCustomer($this->ticketRequest,
-                $this->heskSettings,
-                $this->modsForHeskSettings,
-                $this->userContext);
-        } catch (ValidationException $e) {
-            //-- Assert (1/2)
-            $exceptionThrown = true;
-            $this->assertArraySubset(['CUSTOM_FIELD_1_INVALID::INVALID_DATE'], $e->validationModel->errorKeys);
-        }
-
-        //-- Assert (2/2)
-        $this->assertThat($exceptionThrown, $this->equalTo(true));
-    }
-
-    function testItAddsTheProperValidationErrorWhenTheCustomerSubmitsTicketWithDateThatIsBeforeMinDate() {
-        //-- Arrange
-        $customField = array();
-        $customField['req'] = 1;
-        $customField['type'] = CustomField::DATE;
-        $customField['use'] = 1;
-        $customField['category'] = array();
-        $customField['value'] = array(
-            'dmin' => '2017-01-01',
-            'dmax' => ''
-        );
-        $this->heskSettings['custom_fields']['custom1'] = $customField;
-        $this->ticketRequest->customFields[1] = '2016-12-31';
-
-        //-- Act
-        $exceptionThrown = false;
-        try {
-            $this->ticketCreator->createTicketByCustomer($this->ticketRequest,
-                $this->heskSettings,
-                $this->modsForHeskSettings,
-                $this->userContext);
-        } catch (ValidationException $e) {
-            //-- Assert (1/2)
-            $exceptionThrown = true;
-            $this->assertArraySubset(['CUSTOM_FIELD_1_INVALID::DATE_BEFORE_MIN::MIN:2017-01-01::ENTERED:2016-12-31'], $e->validationModel->errorKeys);
-        }
-
-        //-- Assert (2/2)
-        $this->assertThat($exceptionThrown, $this->equalTo(true));
-    }
-
-    function testItAddsTheProperValidationErrorWhenTheCustomerSubmitsTicketWithDateThatIsAfterMaxDate() {
-        //-- Arrange
-        $customField = array();
-        $customField['req'] = 1;
-        $customField['type'] = CustomField::DATE;
-        $customField['use'] = 1;
-        $customField['category'] = array();
-        $customField['value'] = array(
-            'dmin' => '',
-            'dmax' => '2017-01-01'
-        );
-        $this->heskSettings['custom_fields']['custom1'] = $customField;
-        $this->ticketRequest->customFields[1] = '2017-01-02';
-
-        //-- Act
-        $exceptionThrown = false;
-        try {
-            $this->ticketCreator->createTicketByCustomer($this->ticketRequest,
-                $this->heskSettings,
-                $this->modsForHeskSettings,
-                $this->userContext);
-        } catch (ValidationException $e) {
-            //-- Assert (1/2)
-            $exceptionThrown = true;
-            $this->assertArraySubset(['CUSTOM_FIELD_1_INVALID::DATE_AFTER_MAX::MAX:2017-01-01::ENTERED:2017-01-02'], $e->validationModel->errorKeys);
-        }
-
-        //-- Assert (2/2)
-        $this->assertThat($exceptionThrown, $this->equalTo(true));
-    }
-
-    function testItAddsTheProperValidationErrorWhenTheCustomerSubmitsTicketWithEmailThatIsInvalid() {
-        //-- Arrange
-        $customField = array();
-        $customField['req'] = 1;
-        $customField['type'] = CustomField::EMAIL;
-        $customField['use'] = 1;
-        $customField['category'] = array();
-        $customField['value'] = array(
-            'multiple' => 0
-        );
-        $this->heskSettings['custom_fields']['custom1'] = $customField;
-        $this->ticketRequest->customFields[1] = 'invalid@';
-
-        //-- Act
-        $exceptionThrown = false;
-        try {
-            $this->ticketCreator->createTicketByCustomer($this->ticketRequest,
-                $this->heskSettings,
-                $this->modsForHeskSettings,
-                $this->userContext);
-        } catch (ValidationException $e) {
-            //-- Assert (1/2)
-            $exceptionThrown = true;
-            $this->assertArraySubset(['CUSTOM_FIELD_1_INVALID::INVALID_EMAIL'], $e->validationModel->errorKeys);
-        }
-
-        //-- Assert (2/2)
-        $this->assertThat($exceptionThrown, $this->equalTo(true));
-    }
-
-    function testItAddsTheProperValidationErrorWhenTheCustomerSubmitsTicketWithABannedEmail() {
-        //-- Arrange
-        $this->ticketRequest->email = 'some@banned.email';
-        $this->banRetriever->method('isEmailBanned')
-                        ->with($this->ticketRequest->email, $this->heskSettings)
-                        ->willReturn(true);
-
-        //-- Act
-        $exceptionThrown = false;
-        try {
-            $this->ticketCreator->createTicketByCustomer($this->ticketRequest,
-                $this->heskSettings,
-                $this->modsForHeskSettings,
-                $this->userContext);
-        } catch (ValidationException $e) {
-            //-- Assert (1/2)
-            $exceptionThrown = true;
-            $this->assertArraySubset(['EMAIL_BANNED'], $e->validationModel->errorKeys);
-        }
-
-        //-- Assert (2/2)
-        $this->assertThat($exceptionThrown, $this->equalTo(true));
-    }
-
-    function testItAddsTheProperValidationErrorWhenTheCustomerSubmitsTicketWhenTheyAreMaxedOut() {
-        //-- Arrange
-        $this->ticketRequest->email = 'some@maxedout.email';
-        $this->ticketValidators->method('isCustomerAtMaxTickets')
-            ->with($this->ticketRequest->email, $this->heskSettings)
-            ->willReturn(true);
-
-        //-- Act
-        $exceptionThrown = false;
-        try {
-            $this->ticketCreator->createTicketByCustomer($this->ticketRequest,
-                $this->heskSettings,
-                $this->modsForHeskSettings,
-                $this->userContext);
-        } catch (ValidationException $e) {
-            //-- Assert (1/2)
-            $exceptionThrown = true;
-            $this->assertArraySubset(['EMAIL_AT_MAX_OPEN_TICKETS'], $e->validationModel->errorKeys);
-        }
-
-        //-- Assert (2/2)
-        $this->assertThat($exceptionThrown, $this->equalTo(true));
-    }
-}
diff --git a/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php b/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php
new file mode 100644
index 00000000..f46f8faf
--- /dev/null
+++ b/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Mike
+ * Date: 2/12/2017
+ * Time: 12:52 AM
+ */
+
+namespace BusinessLogic\Tickets\TicketCreatorTests;
+
+
+use BusinessLogic\Security\UserContext;
+use BusinessLogic\Tickets\CreateTicketByCustomerModel;
+use BusinessLogic\Tickets\NewTicketValidator;
+use BusinessLogic\Tickets\TicketCreator;
+use BusinessLogic\Tickets\TrackingIdGenerator;
+use BusinessLogic\ValidationModel;
+use Core\Constants\Priority;
+use DataAccess\Tickets\TicketGateway;
+use PHPUnit\Framework\TestCase;
+
+
+class CreateTicketTest extends TestCase {
+    /**
+     * @var $ticketGateway \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $ticketGateway;
+
+    /**
+     * @var $newTicketValidator \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $newTicketValidator;
+
+    /**
+     * @var $trackingIdGenerator \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $trackingIdGenerator;
+
+    /**
+     * @var $ticketRequest CreateTicketByCustomerModel
+     */
+    private $ticketRequest;
+
+    /**
+     * @var $ticketCreator TicketCreator
+     */
+    private $ticketCreator;
+
+    /**
+     * @var $heskSettings array
+     */
+    private $heskSettings;
+
+    /**
+     * @var $modsForHeskSettings array
+     */
+    private $modsForHeskSettings;
+
+    /**
+     * @var $userContext UserContext
+     */
+    private $userContext;
+
+    protected function setUp() {
+        $this->ticketGateway = $this->createMock(TicketGateway::class);
+        $this->newTicketValidator = $this->createMock(NewTicketValidator::class);
+        $this->trackingIdGenerator = $this->createMock(TrackingIdGenerator::class);
+
+        $this->ticketCreator = new TicketCreator($this->newTicketValidator, $this->trackingIdGenerator, $this->ticketGateway);
+
+        $this->ticketRequest = new CreateTicketByCustomerModel();
+        $this->ticketRequest->name = 'Name';
+        $this->ticketRequest->email = 'some@e.mail';
+        $this->ticketRequest->category = 1;
+        $this->ticketRequest->priority = Priority::HIGH;
+        $this->ticketRequest->subject = 'Subject';
+        $this->ticketRequest->message = 'Message';
+        $this->ticketRequest->customFields = array();
+        $this->heskSettings = array(
+            'multi_eml' => false,
+            'cust_urgency' => false,
+            'require_subject' => 1,
+            'require_message' => 1,
+            'custom_fields' => array(),
+        );
+        $this->modsForHeskSettings = array();
+        $this->userContext = new UserContext();
+
+        $this->newTicketValidator->method('validateNewTicketForCustomer')->willReturn(new ValidationModel());
+        $this->trackingIdGenerator->method('generateTrackingId')->willReturn('123-456-7890');
+    }
+
+    function testItSavesTheTicketToTheDatabase() {
+        //-- Assert
+        $this->ticketGateway->expects($this->once())->method('createTicket');
+
+        //-- Act
+        $this->ticketCreator->createTicketByCustomer($this->ticketRequest, $this->heskSettings, $this->modsForHeskSettings, $this->userContext);
+    }
+
+    function testItSetsTheTrackingIdOnTheTicket() {
+        //-- Act
+        $ticket = $this->ticketCreator->createTicketByCustomer($this->ticketRequest, $this->heskSettings, $this->modsForHeskSettings, $this->userContext);
+
+        //-- Assert
+        self::assertThat($ticket->trackingId, self::equalTo('123-456-7890'));
+    }
+}

From 489f191a13deba8ebe5ffb3daef6bbe498f51c50 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sun, 12 Feb 2017 22:10:42 -0500
Subject: [PATCH 041/192] Majority of create ticket logic done. Just need to
 add attachments(?) and retriever SQL-specific fields

---
 api/BusinessLogic/Tickets/Autoassigner.php    | 21 ++++++
 .../Tickets/CreateTicketByCustomerModel.php   |  9 ++-
 api/BusinessLogic/Tickets/Ticket.php          |  8 +--
 api/BusinessLogic/Tickets/TicketCreator.php   | 32 +++++++--
 api/DataAccess/Tickets/TicketGateway.php      |  3 +
 .../CreateTicketForCustomerTest.php           | 66 ++++++++++++++++++-
 6 files changed, 124 insertions(+), 15 deletions(-)
 create mode 100644 api/BusinessLogic/Tickets/Autoassigner.php

diff --git a/api/BusinessLogic/Tickets/Autoassigner.php b/api/BusinessLogic/Tickets/Autoassigner.php
new file mode 100644
index 00000000..ae9faa80
--- /dev/null
+++ b/api/BusinessLogic/Tickets/Autoassigner.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: mkoch
+ * Date: 2/12/2017
+ * Time: 4:54 PM
+ */
+
+namespace BusinessLogic\Tickets;
+
+
+class Autoassigner {
+    /**
+     * @param $categoryId int
+     * @param $heskSettings array
+     * @return int|null The user ID, or null if no user found
+     */
+    function getNextUserForTicket($categoryId, $heskSettings) {
+        return 0;
+    }
+}
\ No newline at end of file
diff --git a/api/BusinessLogic/Tickets/CreateTicketByCustomerModel.php b/api/BusinessLogic/Tickets/CreateTicketByCustomerModel.php
index 736ce29e..30980251 100644
--- a/api/BusinessLogic/Tickets/CreateTicketByCustomerModel.php
+++ b/api/BusinessLogic/Tickets/CreateTicketByCustomerModel.php
@@ -3,7 +3,6 @@
 namespace BusinessLogic\Tickets;
 
 class CreateTicketByCustomerModel {
-    // Metadata
     /**
      * @var string
      */
@@ -24,7 +23,6 @@ class CreateTicketByCustomerModel {
      */
     public $category;
 
-    // Message
     /**
      * @var string
      */
@@ -35,13 +33,18 @@ class CreateTicketByCustomerModel {
      */
     public $message;
 
+    /**
+     * @var bool
+     */
+    public $html;
+
     /**
      * @var array
      */
     public $customFields;
 
     /**
-     * @var double[]|null
+     * @var string[]|null The latitude/longitude pair, or relevant error code (E-#)
      */
     public $location;
 
diff --git a/api/BusinessLogic/Tickets/Ticket.php b/api/BusinessLogic/Tickets/Ticket.php
index 6594562c..7a8f7b1f 100644
--- a/api/BusinessLogic/Tickets/Ticket.php
+++ b/api/BusinessLogic/Tickets/Ticket.php
@@ -112,7 +112,7 @@ class Ticket {
     public $name;
 
     /**
-     * @var string
+     * @var string|null
      */
     public $email;
 
@@ -127,12 +127,12 @@ class Ticket {
     public $priorityId;
 
     /**
-     * @var string
+     * @var string|null
      */
     public $subject;
 
     /**
-     * @var string
+     * @var string|null
      */
     public $message;
 
@@ -202,7 +202,7 @@ class Ticket {
     public $numberOfStaffReplies;
 
     /**
-     * @var int
+     * @var int|null
      */
     public $ownerId;
 
diff --git a/api/BusinessLogic/Tickets/TicketCreator.php b/api/BusinessLogic/Tickets/TicketCreator.php
index 0c6b506e..3aac73fc 100644
--- a/api/BusinessLogic/Tickets/TicketCreator.php
+++ b/api/BusinessLogic/Tickets/TicketCreator.php
@@ -16,14 +16,20 @@ class TicketCreator {
      */
     private $trackingIdGenerator;
 
+    /**
+     * @var $autoassigner Autoassigner
+     */
+    private $autoassigner;
+
     /**
      * @var $ticketGateway TicketGateway
      */
     private $ticketGateway;
 
-    function __construct($newTicketValidator, $trackingIdGenerator, $ticketGateway) {
+    function __construct($newTicketValidator, $trackingIdGenerator, $autoassigner, $ticketGateway) {
         $this->newTicketValidator = $newTicketValidator;
         $this->trackingIdGenerator = $trackingIdGenerator;
+        $this->autoassigner = $autoassigner;
         $this->ticketGateway = $ticketGateway;
     }
 
@@ -50,15 +56,27 @@ class TicketCreator {
         $ticket = new Ticket();
         $ticket->trackingId = $this->trackingIdGenerator->generateTrackingId($heskSettings);
 
-        //-- TODO suggested kb articles
-
-        //-- TODO owner/autoassign logic
+        if ($heskSettings['autoassign']) {
+            $ticket->ownerId = $this->autoassigner->getNextUserForTicket($ticketRequest->category, $heskSettings);
+        }
 
-        //-- TODO latitude/longitude
+        // Transform one-to-one properties
+        $ticket->name = $ticketRequest->name;
+        $ticket->email = $ticketRequest->email;
+        $ticket->priorityId = $ticketRequest->priority;
+        $ticket->categoryId = $ticketRequest->category;
+        $ticket->subject = $ticketRequest->subject;
+        $ticket->message = $ticketRequest->message;
+        $ticket->usesHtml = $ticketRequest->html;
+        $ticket->customFields = $ticketRequest->customFields;
+        $ticket->location = $ticketRequest->location;
+        $ticket->suggestedArticles = $ticketRequest->suggestedKnowledgebaseArticleIds;
+        $ticket->userAgent = $ticketRequest->userAgent;
+        $ticket->screenResolution = $ticketRequest->screenResolution;
 
-        //-- TODO HTML flag
+        $ticket = $this->ticketGateway->createTicket($ticket, $heskSettings);
 
-        $this->ticketGateway->createTicket($ticket, $heskSettings);
+        //-- TODO get SQL-generated fields
 
         return $ticket;
     }
diff --git a/api/DataAccess/Tickets/TicketGateway.php b/api/DataAccess/Tickets/TicketGateway.php
index f2101c7a..50c6e7ff 100644
--- a/api/DataAccess/Tickets/TicketGateway.php
+++ b/api/DataAccess/Tickets/TicketGateway.php
@@ -86,6 +86,7 @@ class TicketGateway extends CommonDao {
     /**
      * @param $ticket Ticket
      * @param $heskSettings
+     * @return Ticket
      */
     function createTicket($ticket, $heskSettings) {
         global $hesklang;
@@ -186,5 +187,7 @@ class TicketGateway extends CommonDao {
             {$customWhat}
         )
         ";
+
+        return $ticket;
     }
 }
\ No newline at end of file
diff --git a/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php b/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php
index f46f8faf..8b54b62e 100644
--- a/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php
+++ b/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php
@@ -10,6 +10,7 @@ namespace BusinessLogic\Tickets\TicketCreatorTests;
 
 
 use BusinessLogic\Security\UserContext;
+use BusinessLogic\Tickets\Autoassigner;
 use BusinessLogic\Tickets\CreateTicketByCustomerModel;
 use BusinessLogic\Tickets\NewTicketValidator;
 use BusinessLogic\Tickets\TicketCreator;
@@ -36,6 +37,11 @@ class CreateTicketTest extends TestCase {
      */
     private $trackingIdGenerator;
 
+    /**
+     * @var $autoassigner \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $autoassigner;
+
     /**
      * @var $ticketRequest CreateTicketByCustomerModel
      */
@@ -65,8 +71,9 @@ class CreateTicketTest extends TestCase {
         $this->ticketGateway = $this->createMock(TicketGateway::class);
         $this->newTicketValidator = $this->createMock(NewTicketValidator::class);
         $this->trackingIdGenerator = $this->createMock(TrackingIdGenerator::class);
+        $this->autoassigner = $this->createMock(Autoassigner::class);
 
-        $this->ticketCreator = new TicketCreator($this->newTicketValidator, $this->trackingIdGenerator, $this->ticketGateway);
+        $this->ticketCreator = new TicketCreator($this->newTicketValidator, $this->trackingIdGenerator, $this->autoassigner, $this->ticketGateway);
 
         $this->ticketRequest = new CreateTicketByCustomerModel();
         $this->ticketRequest->name = 'Name';
@@ -82,12 +89,15 @@ class CreateTicketTest extends TestCase {
             'require_subject' => 1,
             'require_message' => 1,
             'custom_fields' => array(),
+            'autoassign' => 0,
         );
         $this->modsForHeskSettings = array();
         $this->userContext = new UserContext();
 
         $this->newTicketValidator->method('validateNewTicketForCustomer')->willReturn(new ValidationModel());
         $this->trackingIdGenerator->method('generateTrackingId')->willReturn('123-456-7890');
+        $this->autoassigner->method('getNextUserForTicket')->willReturn(1);
+        $this->ticketGateway->method('createTicket')->will($this->returnArgument(0));
     }
 
     function testItSavesTheTicketToTheDatabase() {
@@ -105,4 +115,58 @@ class CreateTicketTest extends TestCase {
         //-- Assert
         self::assertThat($ticket->trackingId, self::equalTo('123-456-7890'));
     }
+
+    function testItSetsTheNextUserForAutoassign() {
+        //-- Arrange
+        $this->heskSettings['autoassign'] = 1;
+
+        //-- Act
+        $ticket = $this->ticketCreator->createTicketByCustomer($this->ticketRequest, $this->heskSettings, $this->modsForHeskSettings, $this->userContext);
+
+        //-- Assert
+        self::assertThat($ticket->ownerId, self::equalTo(1));
+    }
+
+    function testItDoesntCallTheAutoassignerWhenDisabledInHesk() {
+        //-- Act
+        $ticket = $this->ticketCreator->createTicketByCustomer($this->ticketRequest, $this->heskSettings, $this->modsForHeskSettings, $this->userContext);
+
+        //-- Assert
+        self::assertThat($ticket->ownerId, self::equalTo(null));
+    }
+
+    function testItTransformsTheBasicProperties() {
+        //-- Arrange
+        $this->ticketRequest->name = 'Name';
+        $this->ticketRequest->email = 'some@email.test';
+        $this->ticketRequest->priority = Priority::MEDIUM;
+        $this->ticketRequest->category = 1;
+        $this->ticketRequest->subject = 'Subject';
+        $this->ticketRequest->message = 'Message';
+        $this->ticketRequest->html = false;
+        $this->ticketRequest->customFields = array(
+            1 => 'something'
+        );
+        $this->ticketRequest->location = ['10.157', '-10.177'];
+        $this->ticketRequest->suggestedKnowledgebaseArticleIds = [1, 2, 3];
+        $this->ticketRequest->userAgent = 'UserAgent';
+        $this->ticketRequest->screenResolution = [1400, 900];
+
+        //-- Act
+        $ticket = $this->ticketCreator->createTicketByCustomer($this->ticketRequest, $this->heskSettings, $this->modsForHeskSettings, $this->userContext);
+
+        //-- Assert
+        self::assertThat($ticket->name, self::equalTo($this->ticketRequest->name));
+        self::assertThat($ticket->email, self::equalTo($this->ticketRequest->email));
+        self::assertThat($ticket->priorityId, self::equalTo($this->ticketRequest->priority));
+        self::assertThat($ticket->categoryId, self::equalTo($this->ticketRequest->category));
+        self::assertThat($ticket->subject, self::equalTo($this->ticketRequest->subject));
+        self::assertThat($ticket->message, self::equalTo($this->ticketRequest->message));
+        self::assertThat($ticket->usesHtml, self::equalTo($this->ticketRequest->html));
+        self::assertThat($ticket->customFields[1], self::equalTo($this->ticketRequest->customFields[1]));
+        self::assertThat($ticket->location, self::equalTo($this->ticketRequest->location));
+        self::assertThat($ticket->suggestedArticles, self::equalTo($this->ticketRequest->suggestedKnowledgebaseArticleIds));
+        self::assertThat($ticket->userAgent, self::equalTo($this->ticketRequest->userAgent));
+        self::assertThat($ticket->screenResolution, self::equalTo($this->ticketRequest->screenResolution));
+    }
 }

From dc0c8a351b3747d659b2fb38194976cf82dd5788 Mon Sep 17 00:00:00 2001
From: Mike Koch <Mike.Koch@emerson.com>
Date: Mon, 13 Feb 2017 12:52:43 -0500
Subject: [PATCH 042/192] I think I finished the ticket creator

---
 api/BusinessLogic/Tickets/TicketCreator.php   |  5 ++--
 .../Tickets/TicketGatewayGeneratedFields.php  | 15 ++++++++++++
 api/DataAccess/Tickets/TicketGateway.php      | 14 +++++++++--
 .../CreateTicketForCustomerTest.php           | 23 ++++++++++++++++++-
 4 files changed, 52 insertions(+), 5 deletions(-)
 create mode 100644 api/BusinessLogic/Tickets/TicketGatewayGeneratedFields.php

diff --git a/api/BusinessLogic/Tickets/TicketCreator.php b/api/BusinessLogic/Tickets/TicketCreator.php
index 3aac73fc..4897a8f4 100644
--- a/api/BusinessLogic/Tickets/TicketCreator.php
+++ b/api/BusinessLogic/Tickets/TicketCreator.php
@@ -74,9 +74,10 @@ class TicketCreator {
         $ticket->userAgent = $ticketRequest->userAgent;
         $ticket->screenResolution = $ticketRequest->screenResolution;
 
-        $ticket = $this->ticketGateway->createTicket($ticket, $heskSettings);
+        $ticketGatewayGeneratedFields = $this->ticketGateway->createTicket($ticket, $heskSettings);
 
-        //-- TODO get SQL-generated fields
+        $ticket->dateCreated = $ticketGatewayGeneratedFields->dateCreated;
+        $ticket->lastChanged = $ticketGatewayGeneratedFields->dateModified;
 
         return $ticket;
     }
diff --git a/api/BusinessLogic/Tickets/TicketGatewayGeneratedFields.php b/api/BusinessLogic/Tickets/TicketGatewayGeneratedFields.php
new file mode 100644
index 00000000..00d9521b
--- /dev/null
+++ b/api/BusinessLogic/Tickets/TicketGatewayGeneratedFields.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: cokoch
+ * Date: 2/13/2017
+ * Time: 12:03 PM
+ */
+
+namespace BusinessLogic\Tickets;
+
+
+class TicketGatewayGeneratedFields {
+    public $dateCreated;
+    public $dateModified;
+}
\ No newline at end of file
diff --git a/api/DataAccess/Tickets/TicketGateway.php b/api/DataAccess/Tickets/TicketGateway.php
index 50c6e7ff..86efcb23 100644
--- a/api/DataAccess/Tickets/TicketGateway.php
+++ b/api/DataAccess/Tickets/TicketGateway.php
@@ -4,6 +4,7 @@ namespace DataAccess\Tickets;
 
 
 use BusinessLogic\Tickets\Ticket;
+use BusinessLogic\Tickets\TicketGatewayGeneratedFields;
 use DataAccess\CommonDao;
 
 class TicketGateway extends CommonDao {
@@ -86,7 +87,7 @@ class TicketGateway extends CommonDao {
     /**
      * @param $ticket Ticket
      * @param $heskSettings
-     * @return Ticket
+     * @return TicketGatewayGeneratedFields
      */
     function createTicket($ticket, $heskSettings) {
         global $hesklang;
@@ -188,6 +189,15 @@ class TicketGateway extends CommonDao {
         )
         ";
 
-        return $ticket;
+        hesk_dbQuery($sql);
+
+        $rs = hesk_dbQuery('SELECT `dt`, `lastchange` FROM `' . hesk_dbEscape($heskSettings['db_pfix']) . 'tickets` WHERE `id` = ' . intval(hesk_dbInsertID()));
+        $row = hesk_dbFetchRow($rs);
+
+        $generatedFields = new TicketGatewayGeneratedFields();
+        $generatedFields->dateCreated = $row['dt'];
+        $generatedFields->dateModified = $row['lastchange'];
+
+        return $generatedFields;
     }
 }
\ No newline at end of file
diff --git a/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php b/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php
index 8b54b62e..46f16dd2 100644
--- a/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php
+++ b/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php
@@ -14,6 +14,7 @@ use BusinessLogic\Tickets\Autoassigner;
 use BusinessLogic\Tickets\CreateTicketByCustomerModel;
 use BusinessLogic\Tickets\NewTicketValidator;
 use BusinessLogic\Tickets\TicketCreator;
+use BusinessLogic\Tickets\TicketGatewayGeneratedFields;
 use BusinessLogic\Tickets\TrackingIdGenerator;
 use BusinessLogic\ValidationModel;
 use Core\Constants\Priority;
@@ -67,6 +68,11 @@ class CreateTicketTest extends TestCase {
      */
     private $userContext;
 
+    /**
+     * @var $ticketGatewayGeneratedFields TicketGatewayGeneratedFields
+     */
+    private $ticketGatewayGeneratedFields;
+
     protected function setUp() {
         $this->ticketGateway = $this->createMock(TicketGateway::class);
         $this->newTicketValidator = $this->createMock(NewTicketValidator::class);
@@ -97,7 +103,8 @@ class CreateTicketTest extends TestCase {
         $this->newTicketValidator->method('validateNewTicketForCustomer')->willReturn(new ValidationModel());
         $this->trackingIdGenerator->method('generateTrackingId')->willReturn('123-456-7890');
         $this->autoassigner->method('getNextUserForTicket')->willReturn(1);
-        $this->ticketGateway->method('createTicket')->will($this->returnArgument(0));
+        $this->ticketGatewayGeneratedFields = new TicketGatewayGeneratedFields();
+        $this->ticketGateway->method('createTicket')->willReturn($this->ticketGatewayGeneratedFields);
     }
 
     function testItSavesTheTicketToTheDatabase() {
@@ -169,4 +176,18 @@ class CreateTicketTest extends TestCase {
         self::assertThat($ticket->userAgent, self::equalTo($this->ticketRequest->userAgent));
         self::assertThat($ticket->screenResolution, self::equalTo($this->ticketRequest->screenResolution));
     }
+
+    function testItReturnsTheGeneratedPropertiesOnTheTicket() {
+        //-- Arrange
+        $this->ticketGatewayGeneratedFields->dateCreated = 'date created';
+        $this->ticketGatewayGeneratedFields->dateModified = 'date modified';
+
+
+        //-- Act
+        $ticket = $this->ticketCreator->createTicketByCustomer($this->ticketRequest, $this->heskSettings, $this->modsForHeskSettings, $this->userContext);
+
+        //-- Assert
+        self::assertThat($ticket->dateCreated, self::equalTo($this->ticketGatewayGeneratedFields->dateCreated));
+        self::assertThat($ticket->lastChanged, self::equalTo($this->ticketGatewayGeneratedFields->dateModified));
+    }
 }

From 843528252b013c77893d5def4e9643b2d3c861d3 Mon Sep 17 00:00:00 2001
From: Mike Koch <Mike.Koch@emerson.com>
Date: Mon, 13 Feb 2017 13:02:40 -0500
Subject: [PATCH 043/192] Getting started on POST for ticket controller

---
 api/Controllers/Tickets/TicketController.php | 12 ++++++++++++
 api/autoload.php                             |  3 ++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/api/Controllers/Tickets/TicketController.php b/api/Controllers/Tickets/TicketController.php
index 57125ccb..daf12f72 100644
--- a/api/Controllers/Tickets/TicketController.php
+++ b/api/Controllers/Tickets/TicketController.php
@@ -2,6 +2,7 @@
 
 namespace Controllers\Tickets;
 
+use BusinessLogic\Tickets\TicketCreator;
 use BusinessLogic\Tickets\TicketRetriever;
 
 
@@ -14,4 +15,15 @@ class TicketController {
 
         output($ticketRetriever->getTicketById($id, $hesk_settings, $userContext));
     }
+
+    function post() {
+        global $applicationContext, $hesk_settings, $modsForHeskSettings, $userContext;
+
+        /* @var $ticketCreator TicketCreator */
+        $ticketCreator = $applicationContext->get[TicketCreator::class];
+
+        //-- TODO Parse POST data
+
+        $ticketCreator->createTicketByCustomer(null, $hesk_settings, $modsForHeskSettings, $userContext);
+    }
 }
\ No newline at end of file
diff --git a/api/autoload.php b/api/autoload.php
index c00cea7b..bb2c67a4 100644
--- a/api/autoload.php
+++ b/api/autoload.php
@@ -17,4 +17,5 @@ hesk_load_api_database_functions();
 require_once(__DIR__ . '/../inc/custom_fields.inc.php');
 
 // Load the ApplicationContext
-$applicationContext = new \ApplicationContext();
\ No newline at end of file
+$applicationContext = new \ApplicationContext();
+$modsForHeskSettings = mfh_getSettings();
\ No newline at end of file

From 1cb4209be244233f4ac0a26f1ee1c9476d29c78b Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Mon, 13 Feb 2017 22:34:15 -0500
Subject: [PATCH 044/192] Working more on create ticket endpoint

---
 api/ApplicationContext.php                    | 37 ++++++++++++------
 api/BusinessLogic/Helpers.php                 |  6 +++
 .../CustomFields/CustomFieldValidator.php     |  4 +-
 .../Tickets/NewTicketValidator.php            | 12 +++---
 .../Categories/CategoryController.php         |  4 +-
 api/Controllers/JsonRetriever.php             | 22 +++++++++++
 api/Controllers/Tickets/TicketController.php  | 39 +++++++++++++++++--
 api/DataAccess/Security/BanGateway.php        |  8 ++--
 api/Link.php                                  |  9 +----
 api/autoload.php                              |  2 +-
 api/index.php                                 |  5 ++-
 11 files changed, 109 insertions(+), 39 deletions(-)
 create mode 100644 api/Controllers/JsonRetriever.php

diff --git a/api/ApplicationContext.php b/api/ApplicationContext.php
index aa09011c..08c26c40 100644
--- a/api/ApplicationContext.php
+++ b/api/ApplicationContext.php
@@ -4,7 +4,12 @@
 use BusinessLogic\Categories\CategoryRetriever;
 use BusinessLogic\Security\BanRetriever;
 use BusinessLogic\Security\UserContextBuilder;
+use BusinessLogic\Tickets\Autoassigner;
 use BusinessLogic\Tickets\TicketRetriever;
+use BusinessLogic\Tickets\TicketCreator;
+use BusinessLogic\Tickets\NewTicketValidator;
+use BusinessLogic\Tickets\TicketValidators;
+use BusinessLogic\Tickets\TrackingIdGenerator;
 use DataAccess\Categories\CategoryGateway;
 use DataAccess\Security\BanGateway;
 use DataAccess\Security\UserGateway;
@@ -17,20 +22,30 @@ class ApplicationContext {
     function __construct() {
         $this->get = array();
 
-        // Categories
-        $this->get['CategoryGateway'] = new CategoryGateway();
-        $this->get['CategoryRetriever'] = new CategoryRetriever($this->get['CategoryGateway']);
+        // User Context
+        $this->get[UserGateway::class] = new UserGateway();
+        $this->get[UserContextBuilder::class] = new UserContextBuilder($this->get[UserGateway::class]);
 
-        // Tickets
-        $this->get['TicketGateway'] = new TicketGateway();
-        $this->get['TicketRetriever'] = new TicketRetriever($this->get['TicketGateway']);
+        // Categories
+        $this->get[CategoryGateway::class] = new CategoryGateway();
+        $this->get[CategoryRetriever::class] = new CategoryRetriever($this->get[CategoryGateway::class]);
 
         // Bans
-        $this->get['BanGateway'] = new BanGateway();
-        $this->get['BanRetriever'] = new BanRetriever($this->get['BanGateway']);
+        $this->get[BanGateway::class] = new BanGateway();
+        $this->get[BanRetriever::class] = new BanRetriever($this->get[BanGateway::class]);
 
-        // User Context
-        $this->get['UserGateway'] = new UserGateway();
-        $this->get['UserContextBuilder'] = new UserContextBuilder($this->get['UserGateway']);
+        // Tickets
+        $this->get[TicketGateway::class] = new TicketGateway();
+        $this->get[TicketRetriever::class] = new TicketRetriever($this->get[TicketGateway::class]);
+        $this->get[TicketValidators::class] = new TicketValidators($this->get[TicketGateway::class]);
+        $this->get[TrackingIdGenerator::class] = new TrackingIdGenerator($this->get[TicketGateway::class]);
+        $this->get[Autoassigner::class] = new Autoassigner();
+        $this->get[NewTicketValidator::class] = new NewTicketValidator($this->get[CategoryRetriever::class],
+            $this->get[BanRetriever::class],
+            $this->get[TicketValidators::class]);
+        $this->get[TicketCreator::class] = new TicketCreator($this->get[NewTicketValidator::class],
+            $this->get[TrackingIdGenerator::class],
+            $this->get[Autoassigner::class],
+            $this->get[TicketGateway::class]);
     }
 }
\ No newline at end of file
diff --git a/api/BusinessLogic/Helpers.php b/api/BusinessLogic/Helpers.php
index cb5bf624..61f6af2d 100644
--- a/api/BusinessLogic/Helpers.php
+++ b/api/BusinessLogic/Helpers.php
@@ -20,4 +20,10 @@ class Helpers {
     static function hashToken($token) {
         return hash('sha512', $token);
     }
+
+    static function safeArrayGet($array, $key) {
+        return $array !== null && array_key_exists($key, $array)
+            ? $array[$key]
+            : null;
+    }
 }
\ No newline at end of file
diff --git a/api/BusinessLogic/Tickets/CustomFields/CustomFieldValidator.php b/api/BusinessLogic/Tickets/CustomFields/CustomFieldValidator.php
index 037d828e..77bbd336 100644
--- a/api/BusinessLogic/Tickets/CustomFields/CustomFieldValidator.php
+++ b/api/BusinessLogic/Tickets/CustomFields/CustomFieldValidator.php
@@ -18,7 +18,7 @@ class CustomFieldValidator {
             return false;
         }
 
-        return count($customField['category']) === 0 ||
-            in_array($categoryId, $customField['category']);
+        return count($customField['Categories']) === 0 ||
+            in_array($categoryId, $customField['Categories']);
     }
 }
\ No newline at end of file
diff --git a/api/BusinessLogic/Tickets/NewTicketValidator.php b/api/BusinessLogic/Tickets/NewTicketValidator.php
index 5f6d6a23..61af85e8 100644
--- a/api/BusinessLogic/Tickets/NewTicketValidator.php
+++ b/api/BusinessLogic/Tickets/NewTicketValidator.php
@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: Mike
- * Date: 2/12/2017
- * Time: 1:01 AM
- */
 
 namespace BusinessLogic\Tickets;
 
@@ -82,6 +76,12 @@ class NewTicketValidator {
 
         foreach ($heskSettings['custom_fields'] as $key => $value) {
             $customFieldNumber = intval(str_replace('custom', '', $key));
+
+            //TODO test this
+            if (!array_key_exists($customFieldNumber, $ticketRequest->customFields)) {
+                continue;
+            }
+
             if ($value['use'] == 1 && CustomFieldValidator::isCustomFieldInCategory($customFieldNumber, intval($ticketRequest->category), false, $heskSettings)) {
                 $custom_field_value = $ticketRequest->customFields[$customFieldNumber];
                 if (empty($custom_field_value)) {
diff --git a/api/Controllers/Categories/CategoryController.php b/api/Controllers/Categories/CategoryController.php
index acbfe7bb..6265d2fd 100644
--- a/api/Controllers/Categories/CategoryController.php
+++ b/api/Controllers/Categories/CategoryController.php
@@ -2,7 +2,7 @@
 
 namespace Controllers\Category;
 
-use BusinessLogic\Category\CategoryRetriever;
+use BusinessLogic\Categories\CategoryRetriever;
 
 class CategoryController {
     function get($id) {
@@ -18,7 +18,7 @@ class CategoryController {
         global $hesk_settings, $applicationContext, $userContext;
 
         /* @var $categoryRetriever CategoryRetriever */
-        $categoryRetriever = $applicationContext->get['CategoryRetriever'];
+        $categoryRetriever = $applicationContext->get[CategoryRetriever::class];
 
         return $categoryRetriever->getAllCategories($hesk_settings, $userContext);
     }
diff --git a/api/Controllers/JsonRetriever.php b/api/Controllers/JsonRetriever.php
new file mode 100644
index 00000000..ee590448
--- /dev/null
+++ b/api/Controllers/JsonRetriever.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: mkoch
+ * Date: 2/13/2017
+ * Time: 9:21 PM
+ */
+
+namespace Controllers;
+
+
+class JsonRetriever {
+    /**
+     * Support POST, PUT, and PATCH request (and possibly more)
+     *
+     * @return mixed
+     */
+    static function getJsonData() {
+        $json = file_get_contents('php://input');
+        return json_decode($json);
+    }
+}
\ No newline at end of file
diff --git a/api/Controllers/Tickets/TicketController.php b/api/Controllers/Tickets/TicketController.php
index daf12f72..2d0bdf95 100644
--- a/api/Controllers/Tickets/TicketController.php
+++ b/api/Controllers/Tickets/TicketController.php
@@ -2,8 +2,11 @@
 
 namespace Controllers\Tickets;
 
+use BusinessLogic\Helpers;
+use BusinessLogic\Tickets\CreateTicketByCustomerModel;
 use BusinessLogic\Tickets\TicketCreator;
 use BusinessLogic\Tickets\TicketRetriever;
+use Controllers\JsonRetriever;
 
 
 class TicketController {
@@ -11,7 +14,7 @@ class TicketController {
         global $applicationContext, $hesk_settings, $userContext;
 
         /* @var $ticketRetriever TicketRetriever */
-        $ticketRetriever = $applicationContext->get['TicketRetriever'];
+        $ticketRetriever = $applicationContext->get[TicketRetriever::class];
 
         output($ticketRetriever->getTicketById($id, $hesk_settings, $userContext));
     }
@@ -22,8 +25,38 @@ class TicketController {
         /* @var $ticketCreator TicketCreator */
         $ticketCreator = $applicationContext->get[TicketCreator::class];
 
-        //-- TODO Parse POST data
+        $jsonRequest = JsonRetriever::getJsonData();
 
-        $ticketCreator->createTicketByCustomer(null, $hesk_settings, $modsForHeskSettings, $userContext);
+        $ticketCreator->createTicketByCustomer($this->buildTicketRequestFromJson($jsonRequest), $hesk_settings, $modsForHeskSettings, $userContext);
+    }
+
+    /**
+     * @param $json array
+     * @return CreateTicketByCustomerModel
+     */
+    private function buildTicketRequestFromJson($json) {
+        $ticketRequest = new CreateTicketByCustomerModel();
+        $ticketRequest->name = Helpers::safeArrayGet($json, 'name');
+        $ticketRequest->email = Helpers::safeArrayGet($json, 'email');
+        $ticketRequest->category = Helpers::safeArrayGet($json, 'category');
+        $ticketRequest->priority = Helpers::safeArrayGet($json, 'priority');
+        $ticketRequest->subject = Helpers::safeArrayGet($json, 'subject');
+        $ticketRequest->message = Helpers::safeArrayGet($json, 'message');
+        $ticketRequest->html = Helpers::safeArrayGet($json, 'html');
+        $ticketRequest->location = Helpers::safeArrayGet($json, 'location');
+        $ticketRequest->suggestedKnowledgebaseArticleIds = Helpers::safeArrayGet($json, 'suggestedArticles');
+        $ticketRequest->userAgent = Helpers::safeArrayGet($json, 'userAgent');
+        $ticketRequest->screenResolution = Helpers::safeArrayGet($json, 'screenResolution');
+        $ticketRequest->customFields = array();
+
+        $jsonCustomFields = Helpers::safeArrayGet($json, 'customFields');
+
+        if ($jsonCustomFields !== null && !empty($jsonCustomFields)) {
+            foreach ($jsonCustomFields as $key => $value) {
+                $ticketRequest->customFields[intval($key)] = $value;
+            }
+        }
+
+        return $ticketRequest;
     }
 }
\ No newline at end of file
diff --git a/api/DataAccess/Security/BanGateway.php b/api/DataAccess/Security/BanGateway.php
index 78139819..74cacdb7 100644
--- a/api/DataAccess/Security/BanGateway.php
+++ b/api/DataAccess/Security/BanGateway.php
@@ -19,8 +19,8 @@ class BanGateway extends CommonDao {
 
         $rs = hesk_dbQuery("SELECT `bans`.`id` AS `id`, `bans`.`email` AS `email`,
               `users`.`id` AS `banned_by`, `bans`.`dt` AS `dt`
-            FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "_banned_emails` AS `bans`
-            LEFT JOIN `" . hesk_dbEscape($heskSettings['db_pfix']) . "_users` AS `users`
+            FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "banned_emails` AS `bans`
+            LEFT JOIN `" . hesk_dbEscape($heskSettings['db_pfix']) . "users` AS `users`
                 ON `bans`.`banned_by` = `users`.`id`
                 AND `users`.`active` = '1'");
 
@@ -51,8 +51,8 @@ class BanGateway extends CommonDao {
         $rs = hesk_dbQuery("SELECT `bans`.`id` AS `id`, `bans`.`ip_from` AS `ip_from`,
               `bans`.`ip_to` AS `ip_to`, `bans`.`ip_display` AS `ip_display`,
               `users`.`id` AS `banned_by`, `bans`.`dt` AS `dt`
-            FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "_banned_ips` AS `bans`
-            LEFT JOIN `" . hesk_dbEscape($heskSettings['db_pfix']) . "_users` AS `users`
+            FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "banned_ips` AS `bans`
+            LEFT JOIN `" . hesk_dbEscape($heskSettings['db_pfix']) . "users` AS `users`
                 ON `bans`.`banned_by` = `users`.`id`
                 AND `users`.`active` = '1'");
 
diff --git a/api/Link.php b/api/Link.php
index 090e666d..6ae9a884 100644
--- a/api/Link.php
+++ b/api/Link.php
@@ -177,14 +177,7 @@ class Link
 
 		if( isset( $instanceOfHandler ) ) {
 			if( method_exists( $instanceOfHandler, $method ) ) {
-				try {
-					$newParams = call_user_func_array( array( $instanceOfHandler, $method ), $matched );
-				} catch ( Exception $exception ){
-					$string = str_replace("\n", ' ', var_export($exception, TRUE));
-					error_log($string); //Log to error file only if display errors has been declared
-					header($_SERVER['SERVER_PROTOCOL'] . ' 500 Internal Server Error', true, 500);
-					die();
-				} 	
+                $newParams = call_user_func_array( array( $instanceOfHandler, $method ), $matched );
 			}
 		}
 		if( isset( $newParams ) && $newParams ) {
diff --git a/api/autoload.php b/api/autoload.php
index bb2c67a4..1a2db8c2 100644
--- a/api/autoload.php
+++ b/api/autoload.php
@@ -18,4 +18,4 @@ require_once(__DIR__ . '/../inc/custom_fields.inc.php');
 
 // Load the ApplicationContext
 $applicationContext = new \ApplicationContext();
-$modsForHeskSettings = mfh_getSettings();
\ No newline at end of file
+//$modsForHeskSettings = mfh_getSettings();
\ No newline at end of file
diff --git a/api/index.php b/api/index.php
index 27c7eeb3..07e97f30 100644
--- a/api/index.php
+++ b/api/index.php
@@ -28,7 +28,7 @@ function buildUserContext($xAuthToken) {
     global $applicationContext, $userContext, $hesk_settings;
 
     /* @var $userContextBuilder \BusinessLogic\Security\UserContextBuilder */
-    $userContextBuilder = $applicationContext->get['UserContextBuilder'];
+    $userContextBuilder = $applicationContext->get[\BusinessLogic\Security\UserContextBuilder::class];
 
     $userContext = $userContextBuilder->buildUserContext($xAuthToken, $hesk_settings);
 }
@@ -52,7 +52,7 @@ function exceptionHandler($exception) {
             $castedException = $exception;
             print_error("Fought an uncaught exception", sprintf("%s\n\n%s", $castedException->failingQuery, $exception->getTraceAsString()));
         } else {
-            print_error("Fought an uncaught exception", sprintf("%s\n\n%s", $exception->getMessage(), $exception->getTraceAsString()));
+            print_error("Fought an uncaught exception of type " . get_class($exception), sprintf("%s\n\n%s", $exception->getMessage(), $exception->getTraceAsString()));
         }
 
     }
@@ -85,6 +85,7 @@ Link::all(array(
     '/v1/categories/{i}' => '\Controllers\Category\CategoryController',
     // Tickets
     '/v1/tickets/{i}' => '\Controllers\Tickets\TicketController',
+    '/v1/tickets' => '\Controllers\Tickets\TicketController',
 
     // Any URL that doesn't match goes to the 404 handler
     '404' => 'handle404'

From 1b6cca8ddfee05b4a5f6d837304966030e3ca4dd Mon Sep 17 00:00:00 2001
From: Mike Koch <Mike.Koch@emerson.com>
Date: Tue, 14 Feb 2017 12:45:02 -0500
Subject: [PATCH 045/192] Create ticket endpoint now working, but needs some
 changes

---
 api/BusinessLogic/Exceptions/ValidationException.php | 10 ++++------
 api/BusinessLogic/Tickets/Ticket.php                 |  7 +++++--
 api/Controllers/JsonRetriever.php                    |  2 +-
 api/Controllers/Tickets/TicketController.php         |  4 +++-
 api/DataAccess/Tickets/TicketGateway.php             | 10 +++++-----
 api/index.php                                        |  6 +++---
 6 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/api/BusinessLogic/Exceptions/ValidationException.php b/api/BusinessLogic/Exceptions/ValidationException.php
index aa382328..6ed8b552 100644
--- a/api/BusinessLogic/Exceptions/ValidationException.php
+++ b/api/BusinessLogic/Exceptions/ValidationException.php
@@ -5,19 +5,17 @@ namespace BusinessLogic\Exceptions;
 use BusinessLogic\ValidationModel;
 use Exception;
 
-class ValidationException extends Exception {
-    public $validationModel;
-
+class ValidationException extends ApiFriendlyException {
     /**
      * ValidationException constructor.
      * @param ValidationModel $validationModel The validation model
      * @throws Exception If the validationModel's errorKeys is empty
      */
     function __construct($validationModel) {
-        if (count($validationModel->errorKeys) === 0) {
-            throw new Exception('Tried to throw a ValidationException, but the validation model was valid!');
+        if (count($validationModel->errorKeys) === 0 || $validationModel->valid) {
+            throw new Exception('Tried to throw a ValidationException, but the validation model was valid or had 0 error keys!');
         }
 
-        $this->validationModel = $validationModel;
+        parent::__construct(implode(",", $validationModel->errorKeys), "Validation Failed. Error keys are available in the message section.", 400);
     }
 }
\ No newline at end of file
diff --git a/api/BusinessLogic/Tickets/Ticket.php b/api/BusinessLogic/Tickets/Ticket.php
index 7a8f7b1f..dd480fd6 100644
--- a/api/BusinessLogic/Tickets/Ticket.php
+++ b/api/BusinessLogic/Tickets/Ticket.php
@@ -238,8 +238,11 @@ class Ticket {
 
     function getAttachmentsForDatabase() {
         $attachmentArray = array();
-        foreach ($this->attachments as $attachment) {
-            $attachmentArray[] = $attachment->id . '#' . $attachment->fileName . '#' . $attachment->savedName;
+
+        if ($this->attachments !== null) {
+            foreach ($this->attachments as $attachment) {
+                $attachmentArray[] = $attachment->id . '#' . $attachment->fileName . '#' . $attachment->savedName;
+            }
         }
 
         return implode(',', $attachmentArray);
diff --git a/api/Controllers/JsonRetriever.php b/api/Controllers/JsonRetriever.php
index ee590448..74711032 100644
--- a/api/Controllers/JsonRetriever.php
+++ b/api/Controllers/JsonRetriever.php
@@ -17,6 +17,6 @@ class JsonRetriever {
      */
     static function getJsonData() {
         $json = file_get_contents('php://input');
-        return json_decode($json);
+        return json_decode($json, true);
     }
 }
\ No newline at end of file
diff --git a/api/Controllers/Tickets/TicketController.php b/api/Controllers/Tickets/TicketController.php
index 2d0bdf95..294882c5 100644
--- a/api/Controllers/Tickets/TicketController.php
+++ b/api/Controllers/Tickets/TicketController.php
@@ -27,7 +27,9 @@ class TicketController {
 
         $jsonRequest = JsonRetriever::getJsonData();
 
-        $ticketCreator->createTicketByCustomer($this->buildTicketRequestFromJson($jsonRequest), $hesk_settings, $modsForHeskSettings, $userContext);
+        $ticket = $ticketCreator->createTicketByCustomer($this->buildTicketRequestFromJson($jsonRequest), $hesk_settings, $modsForHeskSettings, $userContext);
+
+        return output($ticket);
     }
 
     /**
diff --git a/api/DataAccess/Tickets/TicketGateway.php b/api/DataAccess/Tickets/TicketGateway.php
index 86efcb23..5c6d7cb0 100644
--- a/api/DataAccess/Tickets/TicketGateway.php
+++ b/api/DataAccess/Tickets/TicketGateway.php
@@ -124,10 +124,10 @@ class TicketGateway extends CommonDao {
         $userAgent = $ticket->userAgent !== null ? $ticket->userAgent : '';
         $screenResolutionWidth = $ticket->screenResolution !== null
                     && isset($ticket->screenResolution[0])
-                    && $ticket->screenResolution[0] !== null ? intval($ticket->screenResolution[0]) : '';
+                    && $ticket->screenResolution[0] !== null ? intval($ticket->screenResolution[0]) : 'NULL';
         $screenResolutionHeight = $ticket->screenResolution !== null
                     && isset($ticket->screenResolution[1])
-                    && $ticket->screenResolution[1] !== null ? intval($ticket->screenResolution[1]) : '';
+                    && $ticket->screenResolution[1] !== null ? intval($ticket->screenResolution[1]) : 'NULL';
 
         $sql = "INSERT INTO `" . hesk_dbEscape($heskSettings['db_pfix']) . "tickets`
         (
@@ -169,14 +169,14 @@ class TicketGateway extends CommonDao {
             '" . hesk_dbEscape($ticket->message) . "',
             NOW(),
             NOW(),
-            " . $suggestedArticles . ",
+            '" . $suggestedArticles . "',
             '" . hesk_dbEscape($ticket->ipAddress) . "',
             '" . hesk_dbEscape($language) . "',
             '" . intval($ticket->openedBy) . "',
             '" . intval($ticket->ownerId) . "',
             '" . hesk_dbEscape($ticket->getAttachmentsForDatabase()) . "',
             '',
-            '" . intval($ticket->statusId) . "',
+            " . intval($ticket->statusId) . ",
             '" . hesk_dbEscape($latitude) . "',
             '" . hesk_dbEscape($longitude) . "',
             '" . hesk_dbEscape($ticket->usesHtml) . "',
@@ -192,7 +192,7 @@ class TicketGateway extends CommonDao {
         hesk_dbQuery($sql);
 
         $rs = hesk_dbQuery('SELECT `dt`, `lastchange` FROM `' . hesk_dbEscape($heskSettings['db_pfix']) . 'tickets` WHERE `id` = ' . intval(hesk_dbInsertID()));
-        $row = hesk_dbFetchRow($rs);
+        $row = hesk_dbFetchAssoc($rs);
 
         $generatedFields = new TicketGatewayGeneratedFields();
         $generatedFields->dateCreated = $row['dt'];
diff --git a/api/index.php b/api/index.php
index 07e97f30..d6932a50 100644
--- a/api/index.php
+++ b/api/index.php
@@ -41,13 +41,13 @@ function errorHandler($errorNumber, $errorMessage, $errorFile, $errorLine) {
  * @param $exception Exception
  */
 function exceptionHandler($exception) {
-    if (exceptionIsOfType($exception, 'ApiFriendlyException')) {
+    if (exceptionIsOfType($exception, \BusinessLogic\Exceptions\ApiFriendlyException::class)) {
         /* @var $castedException \BusinessLogic\Exceptions\ApiFriendlyException */
         $castedException = $exception;
 
         print_error($castedException->title, $castedException->getMessage(), $castedException->httpResponseCode);
     } else {
-        if (exceptionIsOfType($exception, 'SQLException')) {
+        if (exceptionIsOfType($exception, \Core\Exceptions\SQLException::class)) {
             /* @var $castedException \Core\Exceptions\SQLException */
             $castedException = $exception;
             print_error("Fought an uncaught exception", sprintf("%s\n\n%s", $castedException->failingQuery, $exception->getTraceAsString()));
@@ -66,7 +66,7 @@ function exceptionHandler($exception) {
  * @return bool
  */
 function exceptionIsOfType($exception, $class) {
-    return strpos(get_class($exception), $class) !== false;
+    return is_a($exception, $class);
 }
 
 function fatalErrorShutdownHandler() {

From 31ced3f57268f4a7a4d00f24065852c9bc1f2534 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Tue, 14 Feb 2017 22:03:46 -0500
Subject: [PATCH 046/192] Add somre more fields

---
 .../Tickets/CreateTicketByCustomerModel.php   | 10 ++++++
 .../CustomFields/CustomFieldValidator.php     |  4 +--
 .../Tickets/NewTicketValidator.php            |  5 +++
 api/BusinessLogic/Tickets/TicketCreator.php   |  2 ++
 api/Controllers/Tickets/TicketController.php  |  2 ++
 api/DataAccess/Tickets/TicketGateway.php      | 12 +++----
 .../Tickets/NewTicketValidatorTest.php        | 32 +++++++++++++++++++
 .../CreateTicketForCustomerTest.php           |  4 +++
 8 files changed, 61 insertions(+), 10 deletions(-)

diff --git a/api/BusinessLogic/Tickets/CreateTicketByCustomerModel.php b/api/BusinessLogic/Tickets/CreateTicketByCustomerModel.php
index 30980251..25a577f0 100644
--- a/api/BusinessLogic/Tickets/CreateTicketByCustomerModel.php
+++ b/api/BusinessLogic/Tickets/CreateTicketByCustomerModel.php
@@ -62,4 +62,14 @@ class CreateTicketByCustomerModel {
      * @var int[]|null
      */
     public $screenResolution;
+
+    /**
+     * @var int|null
+     */
+    public $ipAddress;
+
+    /**
+     * @var string
+     */
+    public $language;
 }
\ No newline at end of file
diff --git a/api/BusinessLogic/Tickets/CustomFields/CustomFieldValidator.php b/api/BusinessLogic/Tickets/CustomFields/CustomFieldValidator.php
index 77bbd336..037d828e 100644
--- a/api/BusinessLogic/Tickets/CustomFields/CustomFieldValidator.php
+++ b/api/BusinessLogic/Tickets/CustomFields/CustomFieldValidator.php
@@ -18,7 +18,7 @@ class CustomFieldValidator {
             return false;
         }
 
-        return count($customField['Categories']) === 0 ||
-            in_array($categoryId, $customField['Categories']);
+        return count($customField['category']) === 0 ||
+            in_array($categoryId, $customField['category']);
     }
 }
\ No newline at end of file
diff --git a/api/BusinessLogic/Tickets/NewTicketValidator.php b/api/BusinessLogic/Tickets/NewTicketValidator.php
index 61af85e8..bb80a1f8 100644
--- a/api/BusinessLogic/Tickets/NewTicketValidator.php
+++ b/api/BusinessLogic/Tickets/NewTicketValidator.php
@@ -122,6 +122,11 @@ class NewTicketValidator {
             $validationModel->errorKeys[] = 'EMAIL_AT_MAX_OPEN_TICKETS';
         }
 
+        if ($ticketRequest->language === null ||
+            $ticketRequest->language === '') {
+            $validationModel->errorKeys[] = 'MISSING_LANGUAGE';
+        }
+
         return $validationModel;
     }
 }
\ No newline at end of file
diff --git a/api/BusinessLogic/Tickets/TicketCreator.php b/api/BusinessLogic/Tickets/TicketCreator.php
index 4897a8f4..c723fafd 100644
--- a/api/BusinessLogic/Tickets/TicketCreator.php
+++ b/api/BusinessLogic/Tickets/TicketCreator.php
@@ -73,6 +73,8 @@ class TicketCreator {
         $ticket->suggestedArticles = $ticketRequest->suggestedKnowledgebaseArticleIds;
         $ticket->userAgent = $ticketRequest->userAgent;
         $ticket->screenResolution = $ticketRequest->screenResolution;
+        $ticket->ipAddress = $ticketRequest->ipAddress;
+        $ticket->language = $ticketRequest->language;
 
         $ticketGatewayGeneratedFields = $this->ticketGateway->createTicket($ticket, $heskSettings);
 
diff --git a/api/Controllers/Tickets/TicketController.php b/api/Controllers/Tickets/TicketController.php
index 294882c5..5b67fd2c 100644
--- a/api/Controllers/Tickets/TicketController.php
+++ b/api/Controllers/Tickets/TicketController.php
@@ -49,6 +49,8 @@ class TicketController {
         $ticketRequest->suggestedKnowledgebaseArticleIds = Helpers::safeArrayGet($json, 'suggestedArticles');
         $ticketRequest->userAgent = Helpers::safeArrayGet($json, 'userAgent');
         $ticketRequest->screenResolution = Helpers::safeArrayGet($json, 'screenResolution');
+        $ticketRequest->ipAddress = Helpers::safeArrayGet($json, 'ip');
+        $ticketRequest->language = Helpers::safeArrayGet($json, 'language');
         $ticketRequest->customFields = array();
 
         $jsonCustomFields = Helpers::safeArrayGet($json, 'customFields');
diff --git a/api/DataAccess/Tickets/TicketGateway.php b/api/DataAccess/Tickets/TicketGateway.php
index 5c6d7cb0..ae5c2b4d 100644
--- a/api/DataAccess/Tickets/TicketGateway.php
+++ b/api/DataAccess/Tickets/TicketGateway.php
@@ -92,13 +92,6 @@ class TicketGateway extends CommonDao {
     function createTicket($ticket, $heskSettings) {
         global $hesklang;
 
-        // If language is not set or default, set it to NULL.
-        if ($ticket->language === null || empty($ticket->language)) {
-            $language = (!$heskSettings['can_sel_lang']) ? HESK_DEFAULT_LANGUAGE : hesk_dbEscape($hesklang['LANGUAGE']);
-        } else {
-            $language = $ticket->language;
-        }
-
         $dueDate = $ticket->dueDate ? "'{$ticket->dueDate}'" : "NULL";
         // Prepare SQL for custom fields
         $customWhere = '';
@@ -129,6 +122,9 @@ class TicketGateway extends CommonDao {
                     && isset($ticket->screenResolution[1])
                     && $ticket->screenResolution[1] !== null ? intval($ticket->screenResolution[1]) : 'NULL';
 
+        $ipAddress = $ticket->ipAddress !== null
+                    && $ticket->ipAddress !== '' ? $ticket->ipAddress : '';
+
         $sql = "INSERT INTO `" . hesk_dbEscape($heskSettings['db_pfix']) . "tickets`
         (
             `trackid`,
@@ -171,7 +167,7 @@ class TicketGateway extends CommonDao {
             NOW(),
             '" . $suggestedArticles . "',
             '" . hesk_dbEscape($ticket->ipAddress) . "',
-            '" . hesk_dbEscape($language) . "',
+            '" . hesk_dbEscape($ticket->language) . "',
             '" . intval($ticket->openedBy) . "',
             '" . intval($ticket->ownerId) . "',
             '" . hesk_dbEscape($ticket->getAttachmentsForDatabase()) . "',
diff --git a/api/Tests/BusinessLogic/Tickets/NewTicketValidatorTest.php b/api/Tests/BusinessLogic/Tickets/NewTicketValidatorTest.php
index de978568..05f25c9d 100644
--- a/api/Tests/BusinessLogic/Tickets/NewTicketValidatorTest.php
+++ b/api/Tests/BusinessLogic/Tickets/NewTicketValidatorTest.php
@@ -429,4 +429,36 @@ class NewTicketValidatorTest extends TestCase {
         //-- Assert
         $this->assertArraySubset(['EMAIL_AT_MAX_OPEN_TICKETS'], $validationModel->errorKeys);
     }
+
+    function testItAddsTheProperValidationErrorWhenTheCustomerSubmitsTicketWithLanguageNull() {
+        //-- Arrange
+        $this->ticketRequest->language = null;
+        $this->ticketValidators->method('isCustomerAtMaxTickets')
+            ->with($this->ticketRequest->email, $this->heskSettings)
+            ->willReturn(false);
+
+        //-- Act
+        $validationModel = $this->newTicketValidator->validateNewTicketForCustomer($this->ticketRequest,
+            $this->heskSettings,
+            $this->userContext);
+
+        //-- Assert
+        $this->assertArraySubset(['MISSING_LANGUAGE'], $validationModel->errorKeys);
+    }
+
+    function testItAddsTheProperValidationErrorWhenTheCustomerSubmitsTicketWithLanguageBlank() {
+        //-- Arrange
+        $this->ticketRequest->language = '';
+        $this->ticketValidators->method('isCustomerAtMaxTickets')
+            ->with($this->ticketRequest->email, $this->heskSettings)
+            ->willReturn(false);
+
+        //-- Act
+        $validationModel = $this->newTicketValidator->validateNewTicketForCustomer($this->ticketRequest,
+            $this->heskSettings,
+            $this->userContext);
+
+        //-- Assert
+        $this->assertArraySubset(['MISSING_LANGUAGE'], $validationModel->errorKeys);
+    }
 }
diff --git a/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php b/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php
index 46f16dd2..93f1c8c1 100644
--- a/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php
+++ b/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php
@@ -158,6 +158,8 @@ class CreateTicketTest extends TestCase {
         $this->ticketRequest->suggestedKnowledgebaseArticleIds = [1, 2, 3];
         $this->ticketRequest->userAgent = 'UserAgent';
         $this->ticketRequest->screenResolution = [1400, 900];
+        $this->ticketRequest->ipAddress = ip2long('127.0.0.1');
+        $this->ticketRequest->language = 'English';
 
         //-- Act
         $ticket = $this->ticketCreator->createTicketByCustomer($this->ticketRequest, $this->heskSettings, $this->modsForHeskSettings, $this->userContext);
@@ -175,6 +177,8 @@ class CreateTicketTest extends TestCase {
         self::assertThat($ticket->suggestedArticles, self::equalTo($this->ticketRequest->suggestedKnowledgebaseArticleIds));
         self::assertThat($ticket->userAgent, self::equalTo($this->ticketRequest->userAgent));
         self::assertThat($ticket->screenResolution, self::equalTo($this->ticketRequest->screenResolution));
+        self::assertThat($ticket->ipAddress, self::equalTo($this->ticketRequest->ipAddress));
+        self::assertThat($ticket->language, self::equalTo($this->ticketRequest->language));
     }
 
     function testItReturnsTheGeneratedPropertiesOnTheTicket() {

From c8485c0fa345f90e47a587ac9f1ade195dd42f0b Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Wed, 15 Feb 2017 22:01:15 -0500
Subject: [PATCH 047/192] Working on a status gateway to get the ticket's
 default status

---
 .../{security => Security}/BanRetriever.php   |  0
 .../{security => Security}/BannedEmail.php    |  0
 .../{security => Security}/BannedIp.php       |  0
 .../{security => Security}/UserContext.php    |  0
 .../UserContextBuilder.php                    |  0
 .../UserContextNotifications.php              |  0
 .../UserContextPreferences.php                |  0
 api/BusinessLogic/Statuses/Closable.php       | 17 +++++++++
 .../Statuses/DefaultStatusForAction.php       | 22 ++++++++++++
 api/BusinessLogic/Statuses/Status.php         | 36 +++++++++++++++++++
 api/DataAccess/Statuses/StatusGateway.php     | 19 ++++++++++
 .../CreateTicketForCustomerTest.php           |  2 +-
 12 files changed, 95 insertions(+), 1 deletion(-)
 rename api/BusinessLogic/{security => Security}/BanRetriever.php (100%)
 rename api/BusinessLogic/{security => Security}/BannedEmail.php (100%)
 rename api/BusinessLogic/{security => Security}/BannedIp.php (100%)
 rename api/BusinessLogic/{security => Security}/UserContext.php (100%)
 rename api/BusinessLogic/{security => Security}/UserContextBuilder.php (100%)
 rename api/BusinessLogic/{security => Security}/UserContextNotifications.php (100%)
 rename api/BusinessLogic/{security => Security}/UserContextPreferences.php (100%)
 create mode 100644 api/BusinessLogic/Statuses/Closable.php
 create mode 100644 api/BusinessLogic/Statuses/DefaultStatusForAction.php
 create mode 100644 api/BusinessLogic/Statuses/Status.php
 create mode 100644 api/DataAccess/Statuses/StatusGateway.php

diff --git a/api/BusinessLogic/security/BanRetriever.php b/api/BusinessLogic/Security/BanRetriever.php
similarity index 100%
rename from api/BusinessLogic/security/BanRetriever.php
rename to api/BusinessLogic/Security/BanRetriever.php
diff --git a/api/BusinessLogic/security/BannedEmail.php b/api/BusinessLogic/Security/BannedEmail.php
similarity index 100%
rename from api/BusinessLogic/security/BannedEmail.php
rename to api/BusinessLogic/Security/BannedEmail.php
diff --git a/api/BusinessLogic/security/BannedIp.php b/api/BusinessLogic/Security/BannedIp.php
similarity index 100%
rename from api/BusinessLogic/security/BannedIp.php
rename to api/BusinessLogic/Security/BannedIp.php
diff --git a/api/BusinessLogic/security/UserContext.php b/api/BusinessLogic/Security/UserContext.php
similarity index 100%
rename from api/BusinessLogic/security/UserContext.php
rename to api/BusinessLogic/Security/UserContext.php
diff --git a/api/BusinessLogic/security/UserContextBuilder.php b/api/BusinessLogic/Security/UserContextBuilder.php
similarity index 100%
rename from api/BusinessLogic/security/UserContextBuilder.php
rename to api/BusinessLogic/Security/UserContextBuilder.php
diff --git a/api/BusinessLogic/security/UserContextNotifications.php b/api/BusinessLogic/Security/UserContextNotifications.php
similarity index 100%
rename from api/BusinessLogic/security/UserContextNotifications.php
rename to api/BusinessLogic/Security/UserContextNotifications.php
diff --git a/api/BusinessLogic/security/UserContextPreferences.php b/api/BusinessLogic/Security/UserContextPreferences.php
similarity index 100%
rename from api/BusinessLogic/security/UserContextPreferences.php
rename to api/BusinessLogic/Security/UserContextPreferences.php
diff --git a/api/BusinessLogic/Statuses/Closable.php b/api/BusinessLogic/Statuses/Closable.php
new file mode 100644
index 00000000..58c409ae
--- /dev/null
+++ b/api/BusinessLogic/Statuses/Closable.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: mkoch
+ * Date: 2/15/2017
+ * Time: 9:52 PM
+ */
+
+namespace BusinessLogic\Statuses;
+
+
+class Closable {
+    const YES = "yes";
+    const STAFF_ONLY = "sonly";
+    const CUSTOMERS_ONLY = "conly";
+    const NO = "no";
+}
\ No newline at end of file
diff --git a/api/BusinessLogic/Statuses/DefaultStatusForAction.php b/api/BusinessLogic/Statuses/DefaultStatusForAction.php
new file mode 100644
index 00000000..569fe224
--- /dev/null
+++ b/api/BusinessLogic/Statuses/DefaultStatusForAction.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: mkoch
+ * Date: 2/15/2017
+ * Time: 9:46 PM
+ */
+
+namespace BusinessLogic\Statuses;
+
+
+class DefaultStatusForAction {
+    const NEW_TICKET = "IsNewTicketStatus";
+    const CLOSED_STATUS = "IsClosed";
+    const CLOSED_BY_CLIENT = "IsClosedByClient";
+    const CUSTOMER_REPLY = "IsCustomerReplyStatus";
+    const CLOSED_BY_STAFF = "IsStaffClosedOption";
+    const REOPENED_BY_STAFF = "IsStaffReopenedStatus";
+    const DEFAULT_STAFF_REPLY = "IsDefaultStaffReplyStatus";
+    const LOCKED_TICKET = "LockedTicketStatus";
+    const AUTOCLOSE_STATUS = "IsAutoCloseOption";
+}
\ No newline at end of file
diff --git a/api/BusinessLogic/Statuses/Status.php b/api/BusinessLogic/Statuses/Status.php
new file mode 100644
index 00000000..89c8db3e
--- /dev/null
+++ b/api/BusinessLogic/Statuses/Status.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace BusinessLogic\Statuses;
+
+
+class Status {
+    /**
+     * @var $id int
+     */
+    public $id;
+
+    /**
+     * @var $textColor string
+     */
+    public $textColor;
+
+    /**
+     * @var $defaultActions DefaultStatusForAction[]
+     */
+    public $defaultActions;
+
+    /**
+     * @var $closable Closable
+     */
+    public $closable;
+
+    /**
+     * @var $sort int
+     */
+    public $sort;
+
+    /**
+     * @var $name string[]
+     */
+    public $localizedNames;
+}
\ No newline at end of file
diff --git a/api/DataAccess/Statuses/StatusGateway.php b/api/DataAccess/Statuses/StatusGateway.php
new file mode 100644
index 00000000..c244f19e
--- /dev/null
+++ b/api/DataAccess/Statuses/StatusGateway.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace DataAccess\Statuses;
+
+
+use BusinessLogic\Statuses\DefaultStatusForAction;
+use BusinessLogic\Statuses\Status;
+
+class StatusGateway {
+
+    /**
+     * @param $defaultAction DefaultStatusForAction
+     * @return Status
+     */
+    function getStatusForDefaultAction($defaultAction) {
+        //-- TODO
+        return new Status();
+    }
+}
\ No newline at end of file
diff --git a/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php b/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php
index 93f1c8c1..967466ca 100644
--- a/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php
+++ b/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php
@@ -158,7 +158,7 @@ class CreateTicketTest extends TestCase {
         $this->ticketRequest->suggestedKnowledgebaseArticleIds = [1, 2, 3];
         $this->ticketRequest->userAgent = 'UserAgent';
         $this->ticketRequest->screenResolution = [1400, 900];
-        $this->ticketRequest->ipAddress = ip2long('127.0.0.1');
+        $this->ticketRequest->ipAddress = '127.0.0.1';
         $this->ticketRequest->language = 'English';
 
         //-- Act

From ca499d5eac8a52d7f4c53023df7efeefd8cdfe40 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Thu, 16 Feb 2017 21:46:47 -0500
Subject: [PATCH 048/192] Basic ticket creator appears to be working. Still
 need to handle email

---
 api/ApplicationContext.php                    |  3 ++
 .../Statuses/DefaultStatusForAction.php       | 16 ++++++-
 api/BusinessLogic/Statuses/Status.php         | 38 ++++++++++++++++-
 api/BusinessLogic/Statuses/StatusLanguage.php | 20 +++++++++
 api/BusinessLogic/Tickets/TicketCreator.php   | 25 ++++++++++-
 .../Tickets/TicketGatewayGeneratedFields.php  |  1 +
 api/DataAccess/Statuses/StatusGateway.php     | 26 +++++++++---
 api/DataAccess/Tickets/TicketGateway.php      | 20 +++++----
 .../CreateTicketForCustomerTest.php           | 42 ++++++++++++++++++-
 9 files changed, 174 insertions(+), 17 deletions(-)
 create mode 100644 api/BusinessLogic/Statuses/StatusLanguage.php

diff --git a/api/ApplicationContext.php b/api/ApplicationContext.php
index 08c26c40..76de8849 100644
--- a/api/ApplicationContext.php
+++ b/api/ApplicationContext.php
@@ -13,6 +13,7 @@ use BusinessLogic\Tickets\TrackingIdGenerator;
 use DataAccess\Categories\CategoryGateway;
 use DataAccess\Security\BanGateway;
 use DataAccess\Security\UserGateway;
+use DataAccess\Statuses\StatusGateway;
 use DataAccess\Tickets\TicketGateway;
 
 
@@ -35,6 +36,7 @@ class ApplicationContext {
         $this->get[BanRetriever::class] = new BanRetriever($this->get[BanGateway::class]);
 
         // Tickets
+        $this->get[StatusGateway::class] = new StatusGateway();
         $this->get[TicketGateway::class] = new TicketGateway();
         $this->get[TicketRetriever::class] = new TicketRetriever($this->get[TicketGateway::class]);
         $this->get[TicketValidators::class] = new TicketValidators($this->get[TicketGateway::class]);
@@ -46,6 +48,7 @@ class ApplicationContext {
         $this->get[TicketCreator::class] = new TicketCreator($this->get[NewTicketValidator::class],
             $this->get[TrackingIdGenerator::class],
             $this->get[Autoassigner::class],
+            $this->get[StatusGateway::class],
             $this->get[TicketGateway::class]);
     }
 }
\ No newline at end of file
diff --git a/api/BusinessLogic/Statuses/DefaultStatusForAction.php b/api/BusinessLogic/Statuses/DefaultStatusForAction.php
index 569fe224..ac9a7805 100644
--- a/api/BusinessLogic/Statuses/DefaultStatusForAction.php
+++ b/api/BusinessLogic/Statuses/DefaultStatusForAction.php
@@ -18,5 +18,19 @@ class DefaultStatusForAction {
     const REOPENED_BY_STAFF = "IsStaffReopenedStatus";
     const DEFAULT_STAFF_REPLY = "IsDefaultStaffReplyStatus";
     const LOCKED_TICKET = "LockedTicketStatus";
-    const AUTOCLOSE_STATUS = "IsAutoCloseOption";
+    const AUTOCLOSE_STATUS = "IsAutocloseOption";
+
+    static function getAll() {
+        return array(
+            self::NEW_TICKET,
+            self::CLOSED_STATUS,
+            self::CLOSED_BY_CLIENT,
+            self::CUSTOMER_REPLY,
+            self::CLOSED_BY_STAFF,
+            self::REOPENED_BY_STAFF,
+            self::DEFAULT_STAFF_REPLY,
+            self::LOCKED_TICKET,
+            self::AUTOCLOSE_STATUS
+        );
+    }
 }
\ No newline at end of file
diff --git a/api/BusinessLogic/Statuses/Status.php b/api/BusinessLogic/Statuses/Status.php
index 89c8db3e..615abf75 100644
--- a/api/BusinessLogic/Statuses/Status.php
+++ b/api/BusinessLogic/Statuses/Status.php
@@ -4,6 +4,42 @@ namespace BusinessLogic\Statuses;
 
 
 class Status {
+    static function fromDatabase($row, $languageRs) {
+        $status = new Status();
+        $status->id = $row['ID'];
+        $status->textColor = $row['TextColor'];
+        $status->defaultActions = array();
+
+        foreach (DefaultStatusForAction::getAll() as $defaultStatus) {
+            $status = self::addDefaultStatusIfSet($status, $row, $defaultStatus);
+        }
+
+        $status->closable = $row['Closable'];
+
+        $localizedLanguages = array();
+        while ($languageRow = hesk_dbFetchAssoc($languageRs)) {
+            $localizedLanguages[] = new StatusLanguage($languageRow['language'], $languageRow['text']);
+        }
+        $status->localizedNames = $localizedLanguages;
+        $status->sort = $row['sort'];
+
+        return $status;
+    }
+
+    /**
+     * @param $status Status
+     * @param $row array
+     * @param $key string
+     * @return Status
+     */
+    private static function addDefaultStatusIfSet($status, $row, $key) {
+        if ($row[$key]) {
+            $status->defaultActions[] = $key;
+        }
+
+        return $status;
+    }
+
     /**
      * @var $id int
      */
@@ -30,7 +66,7 @@ class Status {
     public $sort;
 
     /**
-     * @var $name string[]
+     * @var $name StatusLanguage[]
      */
     public $localizedNames;
 }
\ No newline at end of file
diff --git a/api/BusinessLogic/Statuses/StatusLanguage.php b/api/BusinessLogic/Statuses/StatusLanguage.php
new file mode 100644
index 00000000..181a04a0
--- /dev/null
+++ b/api/BusinessLogic/Statuses/StatusLanguage.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: mkoch
+ * Date: 2/16/2017
+ * Time: 8:53 PM
+ */
+
+namespace BusinessLogic\Statuses;
+
+
+class StatusLanguage {
+    public $language;
+    public $text;
+
+    function __construct($language, $text) {
+        $this->language = $language;
+        $this->text = $text;
+    }
+}
\ No newline at end of file
diff --git a/api/BusinessLogic/Tickets/TicketCreator.php b/api/BusinessLogic/Tickets/TicketCreator.php
index c723fafd..7d6c5687 100644
--- a/api/BusinessLogic/Tickets/TicketCreator.php
+++ b/api/BusinessLogic/Tickets/TicketCreator.php
@@ -3,6 +3,8 @@
 namespace BusinessLogic\Tickets;
 
 use BusinessLogic\Exceptions\ValidationException;
+use BusinessLogic\Statuses\DefaultStatusForAction;
+use DataAccess\Statuses\StatusGateway;
 use DataAccess\Tickets\TicketGateway;
 
 class TicketCreator {
@@ -21,15 +23,21 @@ class TicketCreator {
      */
     private $autoassigner;
 
+    /**
+     * @var $statusGateway StatusGateway
+     */
+    private $statusGateway;
+
     /**
      * @var $ticketGateway TicketGateway
      */
     private $ticketGateway;
 
-    function __construct($newTicketValidator, $trackingIdGenerator, $autoassigner, $ticketGateway) {
+    function __construct($newTicketValidator, $trackingIdGenerator, $autoassigner, $statusGateway, $ticketGateway) {
         $this->newTicketValidator = $newTicketValidator;
         $this->trackingIdGenerator = $trackingIdGenerator;
         $this->autoassigner = $autoassigner;
+        $this->statusGateway = $statusGateway;
         $this->ticketGateway = $ticketGateway;
     }
 
@@ -76,10 +84,25 @@ class TicketCreator {
         $ticket->ipAddress = $ticketRequest->ipAddress;
         $ticket->language = $ticketRequest->language;
 
+        $status = $this->statusGateway->getStatusForDefaultAction(DefaultStatusForAction::NEW_TICKET, $heskSettings);
+
+        if ($status === null) {
+            throw new \Exception("Could not find the default status for a new ticket!");
+        }
+        $ticket->statusId = $status->id;
+
         $ticketGatewayGeneratedFields = $this->ticketGateway->createTicket($ticket, $heskSettings);
 
         $ticket->dateCreated = $ticketGatewayGeneratedFields->dateCreated;
         $ticket->lastChanged = $ticketGatewayGeneratedFields->dateModified;
+        $ticket->archived = false;
+        $ticket->locked = false;
+        $ticket->id = $ticketGatewayGeneratedFields->id;
+        $ticket->openedBy = 0;
+        $ticket->numberOfReplies = 0;
+        $ticket->numberOfStaffReplies = 0;
+        $ticket->timeWorked = '00:00:00';
+        $ticket->lastReplier = 0;
 
         return $ticket;
     }
diff --git a/api/BusinessLogic/Tickets/TicketGatewayGeneratedFields.php b/api/BusinessLogic/Tickets/TicketGatewayGeneratedFields.php
index 00d9521b..49f2f2ac 100644
--- a/api/BusinessLogic/Tickets/TicketGatewayGeneratedFields.php
+++ b/api/BusinessLogic/Tickets/TicketGatewayGeneratedFields.php
@@ -10,6 +10,7 @@ namespace BusinessLogic\Tickets;
 
 
 class TicketGatewayGeneratedFields {
+    public $id;
     public $dateCreated;
     public $dateModified;
 }
\ No newline at end of file
diff --git a/api/DataAccess/Statuses/StatusGateway.php b/api/DataAccess/Statuses/StatusGateway.php
index c244f19e..de812784 100644
--- a/api/DataAccess/Statuses/StatusGateway.php
+++ b/api/DataAccess/Statuses/StatusGateway.php
@@ -5,15 +5,31 @@ namespace DataAccess\Statuses;
 
 use BusinessLogic\Statuses\DefaultStatusForAction;
 use BusinessLogic\Statuses\Status;
+use DataAccess\CommonDao;
 
-class StatusGateway {
+class StatusGateway extends CommonDao {
 
     /**
-     * @param $defaultAction DefaultStatusForAction
+     * @param $defaultAction string
      * @return Status
      */
-    function getStatusForDefaultAction($defaultAction) {
-        //-- TODO
-        return new Status();
+    function getStatusForDefaultAction($defaultAction, $heskSettings) {
+        $this->init();
+
+        $metaRs = hesk_dbQuery('SELECT * FROM `' . hesk_dbEscape($heskSettings['db_pfix']) . 'statuses` 
+            WHERE `' . $defaultAction . '` = 1');
+        if (hesk_dbNumRows($metaRs) === 0) {
+            return null;
+        }
+        $row = hesk_dbFetchAssoc($metaRs);
+
+        $languageRs = hesk_dbQuery('SELECT * FROM `' . hesk_dbEscape($heskSettings['db_pfix']) . 'text_to_status_xref`
+            WHERE `status_id` = ' . intval($row['ID']));
+
+        $status = Status::fromDatabase($row, $languageRs);
+
+        $this->close();
+
+        return $status;
     }
 }
\ No newline at end of file
diff --git a/api/DataAccess/Tickets/TicketGateway.php b/api/DataAccess/Tickets/TicketGateway.php
index ae5c2b4d..625c58f9 100644
--- a/api/DataAccess/Tickets/TicketGateway.php
+++ b/api/DataAccess/Tickets/TicketGateway.php
@@ -92,6 +92,8 @@ class TicketGateway extends CommonDao {
     function createTicket($ticket, $heskSettings) {
         global $hesklang;
 
+        $this->init();
+
         $dueDate = $ticket->dueDate ? "'{$ticket->dueDate}'" : "NULL";
         // Prepare SQL for custom fields
         $customWhere = '';
@@ -103,17 +105,17 @@ class TicketGateway extends CommonDao {
             $customWhat  .= ", '" . (isset($ticket->customFields[$i]) ? hesk_dbEscape($ticket->customFields[$i]) : '') . "'";
         }
 
-        $suggestedArticles = '';
+        $suggestedArticles = 'NULL';
         if ($ticket->suggestedArticles !== null && !empty($ticket->suggestedArticles)) {
-            $suggestedArticles = implode(',', $ticket->suggestedArticles);
+            $suggestedArticles = "'" .implode(',', $ticket->suggestedArticles) . "'";
         }
 
         $latitude = $ticket->location !== null
                     && isset($ticket->location[0])
-                    && $ticket->location[0] !== null ? $ticket->location[0] : '';
+                    && $ticket->location[0] !== null ? $ticket->location[0] : 'E-0';
         $longitude = $ticket->location !== null
                     && isset($ticket->location[1])
-                    && $ticket->location[1] !== null ? $ticket->location[1] : '';
+                    && $ticket->location[1] !== null ? $ticket->location[1] : 'E-0';
         $userAgent = $ticket->userAgent !== null ? $ticket->userAgent : '';
         $screenResolutionWidth = $ticket->screenResolution !== null
                     && isset($ticket->screenResolution[0])
@@ -165,8 +167,8 @@ class TicketGateway extends CommonDao {
             '" . hesk_dbEscape($ticket->message) . "',
             NOW(),
             NOW(),
-            '" . $suggestedArticles . "',
-            '" . hesk_dbEscape($ticket->ipAddress) . "',
+            " . $suggestedArticles . ",
+            '" . hesk_dbEscape($ipAddress) . "',
             '" . hesk_dbEscape($ticket->language) . "',
             '" . intval($ticket->openedBy) . "',
             '" . intval($ticket->ownerId) . "',
@@ -186,14 +188,18 @@ class TicketGateway extends CommonDao {
         ";
 
         hesk_dbQuery($sql);
+        $id = hesk_dbInsertID();
 
-        $rs = hesk_dbQuery('SELECT `dt`, `lastchange` FROM `' . hesk_dbEscape($heskSettings['db_pfix']) . 'tickets` WHERE `id` = ' . intval(hesk_dbInsertID()));
+        $rs = hesk_dbQuery('SELECT `dt`, `lastchange` FROM `' . hesk_dbEscape($heskSettings['db_pfix']) . 'tickets` WHERE `id` = ' . intval($id));
         $row = hesk_dbFetchAssoc($rs);
 
         $generatedFields = new TicketGatewayGeneratedFields();
+        $generatedFields->id = $id;
         $generatedFields->dateCreated = $row['dt'];
         $generatedFields->dateModified = $row['lastchange'];
 
+        $this->close();
+
         return $generatedFields;
     }
 }
\ No newline at end of file
diff --git a/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php b/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php
index 967466ca..3a7f7086 100644
--- a/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php
+++ b/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php
@@ -10,6 +10,8 @@ namespace BusinessLogic\Tickets\TicketCreatorTests;
 
 
 use BusinessLogic\Security\UserContext;
+use BusinessLogic\Statuses\DefaultStatusForAction;
+use BusinessLogic\Statuses\Status;
 use BusinessLogic\Tickets\Autoassigner;
 use BusinessLogic\Tickets\CreateTicketByCustomerModel;
 use BusinessLogic\Tickets\NewTicketValidator;
@@ -18,6 +20,7 @@ use BusinessLogic\Tickets\TicketGatewayGeneratedFields;
 use BusinessLogic\Tickets\TrackingIdGenerator;
 use BusinessLogic\ValidationModel;
 use Core\Constants\Priority;
+use DataAccess\Statuses\StatusGateway;
 use DataAccess\Tickets\TicketGateway;
 use PHPUnit\Framework\TestCase;
 
@@ -43,6 +46,11 @@ class CreateTicketTest extends TestCase {
      */
     private $autoassigner;
 
+    /**
+     * @var $statusGateway \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $statusGateway;
+
     /**
      * @var $ticketRequest CreateTicketByCustomerModel
      */
@@ -78,8 +86,10 @@ class CreateTicketTest extends TestCase {
         $this->newTicketValidator = $this->createMock(NewTicketValidator::class);
         $this->trackingIdGenerator = $this->createMock(TrackingIdGenerator::class);
         $this->autoassigner = $this->createMock(Autoassigner::class);
+        $this->statusGateway = $this->createMock(StatusGateway::class);
 
-        $this->ticketCreator = new TicketCreator($this->newTicketValidator, $this->trackingIdGenerator, $this->autoassigner, $this->ticketGateway);
+        $this->ticketCreator = new TicketCreator($this->newTicketValidator, $this->trackingIdGenerator,
+            $this->autoassigner, $this->statusGateway, $this->ticketGateway);
 
         $this->ticketRequest = new CreateTicketByCustomerModel();
         $this->ticketRequest->name = 'Name';
@@ -105,6 +115,11 @@ class CreateTicketTest extends TestCase {
         $this->autoassigner->method('getNextUserForTicket')->willReturn(1);
         $this->ticketGatewayGeneratedFields = new TicketGatewayGeneratedFields();
         $this->ticketGateway->method('createTicket')->willReturn($this->ticketGatewayGeneratedFields);
+
+        $status = new Status();
+        $status->id = 1;
+        $this->statusGateway->method('getStatusForDefaultAction')
+            ->willReturn($status);
     }
 
     function testItSavesTheTicketToTheDatabase() {
@@ -185,7 +200,7 @@ class CreateTicketTest extends TestCase {
         //-- Arrange
         $this->ticketGatewayGeneratedFields->dateCreated = 'date created';
         $this->ticketGatewayGeneratedFields->dateModified = 'date modified';
-
+        $this->ticketGatewayGeneratedFields->id = 50;
 
         //-- Act
         $ticket = $this->ticketCreator->createTicketByCustomer($this->ticketRequest, $this->heskSettings, $this->modsForHeskSettings, $this->userContext);
@@ -193,5 +208,28 @@ class CreateTicketTest extends TestCase {
         //-- Assert
         self::assertThat($ticket->dateCreated, self::equalTo($this->ticketGatewayGeneratedFields->dateCreated));
         self::assertThat($ticket->lastChanged, self::equalTo($this->ticketGatewayGeneratedFields->dateModified));
+        self::assertThat($ticket->id, self::equalTo($this->ticketGatewayGeneratedFields->id));
+    }
+
+    function testItSetsTheDefaultStatus() {
+        //-- Act
+        $ticket = $this->ticketCreator->createTicketByCustomer($this->ticketRequest, $this->heskSettings, $this->modsForHeskSettings, $this->userContext);
+
+        //-- Assert
+        self::assertThat($ticket->statusId, self::equalTo(1));
+    }
+
+    function testItSetsTheDefaultProperties() {
+        //-- Act
+        $ticket = $this->ticketCreator->createTicketByCustomer($this->ticketRequest, $this->heskSettings, $this->modsForHeskSettings, $this->userContext);
+
+        //-- Assert
+        self::assertThat($ticket->archived, self::isFalse());
+        self::assertThat($ticket->locked, self::isFalse());
+        self::assertThat($ticket->openedBy, self::equalTo(0));
+        self::assertThat($ticket->numberOfReplies, self::equalTo(0));
+        self::assertThat($ticket->numberOfStaffReplies, self::equalTo(0));
+        self::assertThat($ticket->timeWorked, self::equalTo('00:00:00'));
+        self::assertThat($ticket->lastReplier, self::equalTo(0));
     }
 }

From b4dcbc98461b46e6afa04bfda1f4d55208252a07 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Thu, 16 Feb 2017 22:04:51 -0500
Subject: [PATCH 049/192] Getting started on email sender for customer ticket
 creation

---
 api/BusinessLogic/Emails/EmailBuilder.php     | 14 +++++
 api/BusinessLogic/Emails/EmailSender.php      | 25 ++++++++
 .../Emails/MailgunEmailSender.php             | 29 +++++++++
 .../Emails/PhpMailEmailSender.php             | 29 +++++++++
 api/BusinessLogic/Emails/StmpEmailSender.php  | 29 +++++++++
 api/BusinessLogic/Security/BannedEmail.php    |  6 --
 api/BusinessLogic/Security/BannedIp.php       |  6 --
 .../Security/UserContextNotifications.php     |  6 --
 .../Security/UserContextPreferences.php       |  6 --
 api/BusinessLogic/Statuses/Closable.php       |  6 --
 .../Statuses/DefaultStatusForAction.php       |  6 --
 api/BusinessLogic/Statuses/StatusLanguage.php |  6 --
 api/BusinessLogic/Tickets/Attachment.php      |  6 --
 api/BusinessLogic/Tickets/Autoassigner.php    |  6 --
 .../CustomFields/CustomFieldValidator.php     |  6 --
 .../Tickets/TicketGatewayGeneratedFields.php  |  6 --
 api/BusinessLogic/Tickets/TicketRetriever.php |  6 --
 api/BusinessLogic/Validators.php              |  6 --
 api/Controllers/JsonRetriever.php             |  6 --
 api/Core/Constants/CustomField.php            |  6 --
 api/DataAccess/Statuses/StatusGateway.php     |  1 -
 .../Security/BanRetrieverTest.php             |  6 --
 .../CustomFields/CustomFieldValidatorTest.php |  6 --
 .../Tickets/NewTicketValidatorTest.php        |  6 --
 .../CreateTicketForCustomerTest.php           |  6 --
 .../Tickets/TrackingIdGeneratorTest.php       |  6 --
 api/composer.json                             |  3 +-
 api/composer.lock                             | 62 ++++++++++++++++++-
 28 files changed, 189 insertions(+), 123 deletions(-)
 create mode 100644 api/BusinessLogic/Emails/EmailBuilder.php
 create mode 100644 api/BusinessLogic/Emails/EmailSender.php
 create mode 100644 api/BusinessLogic/Emails/MailgunEmailSender.php
 create mode 100644 api/BusinessLogic/Emails/PhpMailEmailSender.php
 create mode 100644 api/BusinessLogic/Emails/StmpEmailSender.php

diff --git a/api/BusinessLogic/Emails/EmailBuilder.php b/api/BusinessLogic/Emails/EmailBuilder.php
new file mode 100644
index 00000000..62739d00
--- /dev/null
+++ b/api/BusinessLogic/Emails/EmailBuilder.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace BusinessLogic\Emails;
+
+
+class EmailBuilder {
+    private $to;
+    private $cc;
+    private $bcc;
+    private $subject;
+    private $message;
+    private $htmlMessage;
+    private $attachments;
+}
\ No newline at end of file
diff --git a/api/BusinessLogic/Emails/EmailSender.php b/api/BusinessLogic/Emails/EmailSender.php
new file mode 100644
index 00000000..75f25e68
--- /dev/null
+++ b/api/BusinessLogic/Emails/EmailSender.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace BusinessLogic\Emails;
+
+
+use BusinessLogic\Tickets\Attachment;
+use BusinessLogic\Tickets\Ticket;
+
+interface EmailSender {
+    /**
+     * @param $emailBuilder EmailBuilder
+     * @param $heskSettings array
+     * @param $modsForHeskSettings array
+     */
+    function sendEmail($emailBuilder, $heskSettings, $modsForHeskSettings);
+
+    /**
+     * @param $emailBuilder EmailBuilder
+     * @param $ticket Ticket
+     * @param $attachments Attachment[]
+     * @param $heskSettings array
+     * @param $modsForHeskSettings array
+     */
+    function sendEmailWithTicket($emailBuilder, $ticket, $attachments, $heskSettings, $modsForHeskSettings);
+}
\ No newline at end of file
diff --git a/api/BusinessLogic/Emails/MailgunEmailSender.php b/api/BusinessLogic/Emails/MailgunEmailSender.php
new file mode 100644
index 00000000..c29df57e
--- /dev/null
+++ b/api/BusinessLogic/Emails/MailgunEmailSender.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace BusinessLogic\Emails;
+
+
+use BusinessLogic\Tickets\Attachment;
+use BusinessLogic\Tickets\Ticket;
+
+class MailgunEmailSender implements EmailSender {
+    /**
+     * @param $emailBuilder EmailBuilder
+     * @param $heskSettings array
+     * @param $modsForHeskSettings array
+     */
+    function sendEmail($emailBuilder, $heskSettings, $modsForHeskSettings) {
+        // TODO: Implement sendEmail() method.
+    }
+
+    /**
+     * @param $emailBuilder EmailBuilder
+     * @param $ticket Ticket
+     * @param $attachments Attachment[]
+     * @param $heskSettings array
+     * @param $modsForHeskSettings array
+     */
+    function sendEmailWithTicket($emailBuilder, $ticket, $attachments, $heskSettings, $modsForHeskSettings) {
+        // TODO: Implement sendEmailWithTicket() method.
+    }
+}
\ No newline at end of file
diff --git a/api/BusinessLogic/Emails/PhpMailEmailSender.php b/api/BusinessLogic/Emails/PhpMailEmailSender.php
new file mode 100644
index 00000000..56086090
--- /dev/null
+++ b/api/BusinessLogic/Emails/PhpMailEmailSender.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace BusinessLogic\Emails;
+
+
+use BusinessLogic\Tickets\Attachment;
+use BusinessLogic\Tickets\Ticket;
+
+class PhpMailEmailSender implements EmailSender {
+    /**
+     * @param $emailBuilder EmailBuilder
+     * @param $heskSettings array
+     * @param $modsForHeskSettings array
+     */
+    function sendEmail($emailBuilder, $heskSettings, $modsForHeskSettings) {
+        // TODO: Implement sendEmail() method.
+    }
+
+    /**
+     * @param $emailBuilder EmailBuilder
+     * @param $ticket Ticket
+     * @param $attachments Attachment[]
+     * @param $heskSettings array
+     * @param $modsForHeskSettings array
+     */
+    function sendEmailWithTicket($emailBuilder, $ticket, $attachments, $heskSettings, $modsForHeskSettings) {
+        // TODO: Implement sendEmailWithTicket() method.
+    }
+}
\ No newline at end of file
diff --git a/api/BusinessLogic/Emails/StmpEmailSender.php b/api/BusinessLogic/Emails/StmpEmailSender.php
new file mode 100644
index 00000000..329dc9c3
--- /dev/null
+++ b/api/BusinessLogic/Emails/StmpEmailSender.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace BusinessLogic\Emails;
+
+
+use BusinessLogic\Tickets\Attachment;
+use BusinessLogic\Tickets\Ticket;
+
+class StmpEmailSender implements EmailSender {
+    /**
+     * @param $emailBuilder EmailBuilder
+     * @param $heskSettings array
+     * @param $modsForHeskSettings array
+     */
+    function sendEmail($emailBuilder, $heskSettings, $modsForHeskSettings) {
+        // TODO: Implement sendEmail() method.
+    }
+
+    /**
+     * @param $emailBuilder EmailBuilder
+     * @param $ticket Ticket
+     * @param $attachments Attachment[]
+     * @param $heskSettings array
+     * @param $modsForHeskSettings array
+     */
+    function sendEmailWithTicket($emailBuilder, $ticket, $attachments, $heskSettings, $modsForHeskSettings) {
+        // TODO: Implement sendEmailWithTicket() method.
+    }
+}
\ No newline at end of file
diff --git a/api/BusinessLogic/Security/BannedEmail.php b/api/BusinessLogic/Security/BannedEmail.php
index 8b612ed9..691a6604 100644
--- a/api/BusinessLogic/Security/BannedEmail.php
+++ b/api/BusinessLogic/Security/BannedEmail.php
@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: mkoch
- * Date: 1/27/2017
- * Time: 9:25 PM
- */
 
 namespace BusinessLogic\Security;
 
diff --git a/api/BusinessLogic/Security/BannedIp.php b/api/BusinessLogic/Security/BannedIp.php
index c6ddf46e..e34b2516 100644
--- a/api/BusinessLogic/Security/BannedIp.php
+++ b/api/BusinessLogic/Security/BannedIp.php
@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: mkoch
- * Date: 1/27/2017
- * Time: 9:51 PM
- */
 
 namespace BusinessLogic\Security;
 
diff --git a/api/BusinessLogic/Security/UserContextNotifications.php b/api/BusinessLogic/Security/UserContextNotifications.php
index aab70faa..9c32547c 100644
--- a/api/BusinessLogic/Security/UserContextNotifications.php
+++ b/api/BusinessLogic/Security/UserContextNotifications.php
@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: user
- * Date: 1/19/17
- * Time: 8:51 PM
- */
 
 namespace BusinessLogic\Security;
 
diff --git a/api/BusinessLogic/Security/UserContextPreferences.php b/api/BusinessLogic/Security/UserContextPreferences.php
index 37c73e23..f860d3ec 100644
--- a/api/BusinessLogic/Security/UserContextPreferences.php
+++ b/api/BusinessLogic/Security/UserContextPreferences.php
@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: user
- * Date: 1/19/17
- * Time: 8:49 PM
- */
 
 namespace BusinessLogic\Security;
 
diff --git a/api/BusinessLogic/Statuses/Closable.php b/api/BusinessLogic/Statuses/Closable.php
index 58c409ae..9d87efca 100644
--- a/api/BusinessLogic/Statuses/Closable.php
+++ b/api/BusinessLogic/Statuses/Closable.php
@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: mkoch
- * Date: 2/15/2017
- * Time: 9:52 PM
- */
 
 namespace BusinessLogic\Statuses;
 
diff --git a/api/BusinessLogic/Statuses/DefaultStatusForAction.php b/api/BusinessLogic/Statuses/DefaultStatusForAction.php
index ac9a7805..bfafff7c 100644
--- a/api/BusinessLogic/Statuses/DefaultStatusForAction.php
+++ b/api/BusinessLogic/Statuses/DefaultStatusForAction.php
@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: mkoch
- * Date: 2/15/2017
- * Time: 9:46 PM
- */
 
 namespace BusinessLogic\Statuses;
 
diff --git a/api/BusinessLogic/Statuses/StatusLanguage.php b/api/BusinessLogic/Statuses/StatusLanguage.php
index 181a04a0..58acc40b 100644
--- a/api/BusinessLogic/Statuses/StatusLanguage.php
+++ b/api/BusinessLogic/Statuses/StatusLanguage.php
@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: mkoch
- * Date: 2/16/2017
- * Time: 8:53 PM
- */
 
 namespace BusinessLogic\Statuses;
 
diff --git a/api/BusinessLogic/Tickets/Attachment.php b/api/BusinessLogic/Tickets/Attachment.php
index 125a8ced..295864bc 100644
--- a/api/BusinessLogic/Tickets/Attachment.php
+++ b/api/BusinessLogic/Tickets/Attachment.php
@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: mkoch
- * Date: 1/31/2017
- * Time: 9:31 PM
- */
 
 namespace BusinessLogic\Tickets;
 
diff --git a/api/BusinessLogic/Tickets/Autoassigner.php b/api/BusinessLogic/Tickets/Autoassigner.php
index ae9faa80..514a9dda 100644
--- a/api/BusinessLogic/Tickets/Autoassigner.php
+++ b/api/BusinessLogic/Tickets/Autoassigner.php
@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: mkoch
- * Date: 2/12/2017
- * Time: 4:54 PM
- */
 
 namespace BusinessLogic\Tickets;
 
diff --git a/api/BusinessLogic/Tickets/CustomFields/CustomFieldValidator.php b/api/BusinessLogic/Tickets/CustomFields/CustomFieldValidator.php
index 037d828e..12e1ccc7 100644
--- a/api/BusinessLogic/Tickets/CustomFields/CustomFieldValidator.php
+++ b/api/BusinessLogic/Tickets/CustomFields/CustomFieldValidator.php
@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: cokoch
- * Date: 2/9/2017
- * Time: 12:28 PM
- */
 
 namespace BusinessLogic\Tickets\CustomFields;
 
diff --git a/api/BusinessLogic/Tickets/TicketGatewayGeneratedFields.php b/api/BusinessLogic/Tickets/TicketGatewayGeneratedFields.php
index 49f2f2ac..56c2a8b3 100644
--- a/api/BusinessLogic/Tickets/TicketGatewayGeneratedFields.php
+++ b/api/BusinessLogic/Tickets/TicketGatewayGeneratedFields.php
@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: cokoch
- * Date: 2/13/2017
- * Time: 12:03 PM
- */
 
 namespace BusinessLogic\Tickets;
 
diff --git a/api/BusinessLogic/Tickets/TicketRetriever.php b/api/BusinessLogic/Tickets/TicketRetriever.php
index 0ff84fae..a9f4f8ec 100644
--- a/api/BusinessLogic/Tickets/TicketRetriever.php
+++ b/api/BusinessLogic/Tickets/TicketRetriever.php
@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: mkoch
- * Date: 1/31/2017
- * Time: 10:13 PM
- */
 
 namespace BusinessLogic\Tickets;
 
diff --git a/api/BusinessLogic/Validators.php b/api/BusinessLogic/Validators.php
index 7bfea07f..a718dfd4 100644
--- a/api/BusinessLogic/Validators.php
+++ b/api/BusinessLogic/Validators.php
@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: mkoch
- * Date: 2/6/2017
- * Time: 9:20 PM
- */
 
 namespace BusinessLogic;
 
diff --git a/api/Controllers/JsonRetriever.php b/api/Controllers/JsonRetriever.php
index 74711032..6b0810d3 100644
--- a/api/Controllers/JsonRetriever.php
+++ b/api/Controllers/JsonRetriever.php
@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: mkoch
- * Date: 2/13/2017
- * Time: 9:21 PM
- */
 
 namespace Controllers;
 
diff --git a/api/Core/Constants/CustomField.php b/api/Core/Constants/CustomField.php
index 566e1c76..6d92cfe8 100644
--- a/api/Core/Constants/CustomField.php
+++ b/api/Core/Constants/CustomField.php
@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: cokoch
- * Date: 2/10/2017
- * Time: 12:53 PM
- */
 
 namespace Core\Constants;
 
diff --git a/api/DataAccess/Statuses/StatusGateway.php b/api/DataAccess/Statuses/StatusGateway.php
index de812784..636852b1 100644
--- a/api/DataAccess/Statuses/StatusGateway.php
+++ b/api/DataAccess/Statuses/StatusGateway.php
@@ -3,7 +3,6 @@
 namespace DataAccess\Statuses;
 
 
-use BusinessLogic\Statuses\DefaultStatusForAction;
 use BusinessLogic\Statuses\Status;
 use DataAccess\CommonDao;
 
diff --git a/api/Tests/BusinessLogic/Security/BanRetrieverTest.php b/api/Tests/BusinessLogic/Security/BanRetrieverTest.php
index fd1bf0a7..304bffa0 100644
--- a/api/Tests/BusinessLogic/Security/BanRetrieverTest.php
+++ b/api/Tests/BusinessLogic/Security/BanRetrieverTest.php
@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: mkoch
- * Date: 2/2/2017
- * Time: 9:57 PM
- */
 
 namespace Tests;
 
diff --git a/api/Tests/BusinessLogic/Tickets/CustomFields/CustomFieldValidatorTest.php b/api/Tests/BusinessLogic/Tickets/CustomFields/CustomFieldValidatorTest.php
index b9958be1..d08fde5e 100644
--- a/api/Tests/BusinessLogic/Tickets/CustomFields/CustomFieldValidatorTest.php
+++ b/api/Tests/BusinessLogic/Tickets/CustomFields/CustomFieldValidatorTest.php
@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: cokoch
- * Date: 2/9/2017
- * Time: 12:29 PM
- */
 
 namespace BusinessLogic\Tickets\CustomFields;
 
diff --git a/api/Tests/BusinessLogic/Tickets/NewTicketValidatorTest.php b/api/Tests/BusinessLogic/Tickets/NewTicketValidatorTest.php
index 05f25c9d..f7009494 100644
--- a/api/Tests/BusinessLogic/Tickets/NewTicketValidatorTest.php
+++ b/api/Tests/BusinessLogic/Tickets/NewTicketValidatorTest.php
@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: mkoch
- * Date: 2/4/2017
- * Time: 9:32 PM
- */
 
 namespace BusinessLogic\Tickets\TicketCreatorTests;
 
diff --git a/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php b/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php
index 3a7f7086..fb8d81cc 100644
--- a/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php
+++ b/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php
@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: Mike
- * Date: 2/12/2017
- * Time: 12:52 AM
- */
 
 namespace BusinessLogic\Tickets\TicketCreatorTests;
 
diff --git a/api/Tests/BusinessLogic/Tickets/TrackingIdGeneratorTest.php b/api/Tests/BusinessLogic/Tickets/TrackingIdGeneratorTest.php
index 15cfb484..0ef20b1f 100644
--- a/api/Tests/BusinessLogic/Tickets/TrackingIdGeneratorTest.php
+++ b/api/Tests/BusinessLogic/Tickets/TrackingIdGeneratorTest.php
@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: mkoch
- * Date: 2/11/2017
- * Time: 4:32 PM
- */
 
 namespace BusinessLogic\Tickets;
 
diff --git a/api/composer.json b/api/composer.json
index 280cb3a4..ec28061a 100644
--- a/api/composer.json
+++ b/api/composer.json
@@ -10,6 +10,7 @@
     }
   ],
   "require": {
-    "phpunit/phpunit": "5.7.9"
+    "phpunit/phpunit": "5.7.9",
+    "phpmailer/phpmailer": "^5.2"
   }
 }
diff --git a/api/composer.lock b/api/composer.lock
index 4bf817a6..4a0ae60f 100644
--- a/api/composer.lock
+++ b/api/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "63ae3f15414ec2f99c94a87db755a1af",
+    "content-hash": "daddd21e73d89f981995c60d0188767d",
     "packages": [
         {
             "name": "doctrine/instantiator",
@@ -248,6 +248,66 @@
             ],
             "time": "2016-11-25T06:54:22+00:00"
         },
+        {
+            "name": "phpmailer/phpmailer",
+            "version": "v5.2.22",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/PHPMailer/PHPMailer.git",
+                "reference": "b18cb98131bd83103ccb26a888fdfe3177b8a663"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/b18cb98131bd83103ccb26a888fdfe3177b8a663",
+                "reference": "b18cb98131bd83103ccb26a888fdfe3177b8a663",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.0.0"
+            },
+            "require-dev": {
+                "phpdocumentor/phpdocumentor": "*",
+                "phpunit/phpunit": "4.7.*"
+            },
+            "suggest": {
+                "league/oauth2-google": "Needed for Google XOAUTH2 authentication"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "class.phpmailer.php",
+                    "class.phpmaileroauth.php",
+                    "class.phpmaileroauthgoogle.php",
+                    "class.smtp.php",
+                    "class.pop3.php",
+                    "extras/EasyPeasyICS.php",
+                    "extras/ntlm_sasl_client.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-2.1"
+            ],
+            "authors": [
+                {
+                    "name": "Jim Jagielski",
+                    "email": "jimjag@gmail.com"
+                },
+                {
+                    "name": "Marcus Bointon",
+                    "email": "phpmailer@synchromedia.co.uk"
+                },
+                {
+                    "name": "Andy Prevost",
+                    "email": "codeworxtech@users.sourceforge.net"
+                },
+                {
+                    "name": "Brent R. Matzelle"
+                }
+            ],
+            "description": "PHPMailer is a full-featured email creation and transfer class for PHP",
+            "time": "2017-01-09T09:33:47+00:00"
+        },
         {
             "name": "phpspec/prophecy",
             "version": "dev-master",

From 2a145bfa3ebbf355151e098d52048be784e2361c Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sat, 18 Feb 2017 22:11:45 -0500
Subject: [PATCH 050/192] SMTP emails working with EmailSender...haven't tested
 attaching things though

---
 .gitignore                                    |  1 +
 api/BusinessLogic/Emails/BasicEmailSender.php | 67 ++++++++++++++++
 api/BusinessLogic/Emails/EmailBuilder.php     | 43 +++++++++--
 api/BusinessLogic/Emails/EmailSender.php      | 16 ++--
 .../Emails/PhpMailEmailSender.php             | 29 -------
 api/BusinessLogic/Emails/StmpEmailSender.php  | 29 -------
 .../BasicEmailSenderIntegrationTest.php       | 77 +++++++++++++++++++
 .../integration_test_mfh_settings.sample.php  |  3 +
 8 files changed, 190 insertions(+), 75 deletions(-)
 create mode 100644 api/BusinessLogic/Emails/BasicEmailSender.php
 delete mode 100644 api/BusinessLogic/Emails/PhpMailEmailSender.php
 delete mode 100644 api/BusinessLogic/Emails/StmpEmailSender.php
 create mode 100644 api/Tests/BusinessLogic/Emails/BasicEmailSenderIntegrationTest.php
 create mode 100644 api/Tests/integration_test_mfh_settings.sample.php

diff --git a/.gitignore b/.gitignore
index 30dbedef..2e3f55a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 # Mods for HESK-specific files
 api/vendor
+api/Tests/integration_test_mfh_settings.php
 
 # HESK Files
 admin/admin_suggest_articles.php
diff --git a/api/BusinessLogic/Emails/BasicEmailSender.php b/api/BusinessLogic/Emails/BasicEmailSender.php
new file mode 100644
index 00000000..a93aad9f
--- /dev/null
+++ b/api/BusinessLogic/Emails/BasicEmailSender.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace BusinessLogic\Emails;
+
+
+use BusinessLogic\Tickets\Attachment;
+use BusinessLogic\Tickets\Ticket;
+use PHPMailer;
+
+class BasicEmailSender implements EmailSender {
+
+    function sendEmail($emailBuilder, $heskSettings, $modsForHeskSettings, $sendAsHtml) {
+        $mailer = new PHPMailer();
+
+        if ($heskSettings['smtp']) {
+            $mailer->isSMTP();
+            $mailer->SMTPAuth = true;
+            if ($heskSettings['smtp_ssl']) {
+                $mailer->SMTPSecure = "ssl";
+            } elseif ($heskSettings['smtp_tls']) {
+                $mailer->SMTPSecure = "tls";
+            }
+            $mailer->Host = $heskSettings['smtp_host_name'];
+            $mailer->Port = $heskSettings['smtp_host_port'];
+            $mailer->Username = $heskSettings['smtp_user'];
+            $mailer->Password = $heskSettings['smtp_password'];
+        }
+
+        $mailer->FromName = $heskSettings['noreply_name'] ? $heskSettings['noreply_name'] : '';
+        $mailer->From = $heskSettings['noreply_mail'];
+
+        if ($emailBuilder->to !== null) {
+            foreach ($emailBuilder->to as $to) {
+                $mailer->addAddress($to);
+            }
+        }
+
+        if ($emailBuilder->cc !== null) {
+            foreach ($emailBuilder->cc as $cc) {
+                $mailer->addCC($cc);
+            }
+        }
+
+        if ($emailBuilder->bcc !== null) {
+            foreach ($emailBuilder->bcc as $bcc) {
+                $mailer->addBCC($bcc);
+            }
+        }
+
+        $mailer->Subject = $emailBuilder->subject;
+
+        if ($sendAsHtml) {
+            $mailer->Body = $emailBuilder->htmlMessage;
+            $mailer->AltBody = $emailBuilder->message;
+        } else {
+            $mailer->Body = $emailBuilder->message;
+            $mailer->isHTML(false);
+        }
+        $mailer->Timeout = $heskSettings['smtp_timeout'];
+
+        if ($mailer->send()) {
+            return true;
+        }
+
+        return $mailer->ErrorInfo;
+    }
+}
\ No newline at end of file
diff --git a/api/BusinessLogic/Emails/EmailBuilder.php b/api/BusinessLogic/Emails/EmailBuilder.php
index 62739d00..c5691df3 100644
--- a/api/BusinessLogic/Emails/EmailBuilder.php
+++ b/api/BusinessLogic/Emails/EmailBuilder.php
@@ -3,12 +3,41 @@
 namespace BusinessLogic\Emails;
 
 
+use BusinessLogic\Tickets\Attachment;
+
 class EmailBuilder {
-    private $to;
-    private $cc;
-    private $bcc;
-    private $subject;
-    private $message;
-    private $htmlMessage;
-    private $attachments;
+    /**
+     * @var $to string[]
+     */
+    public $to;
+
+    /**
+     * @var $cc string[]
+     */
+    public $cc;
+
+    /**
+     * @var $bcc string[]
+     */
+    public $bcc;
+
+    /**
+     * @var $subject string
+     */
+    public $subject;
+
+    /**
+     * @var $message string
+     */
+    public $message;
+
+    /**
+     * @var $htmlMessage string
+     */
+    public $htmlMessage;
+
+    /**
+     * @var $attachments Attachment[]
+     */
+    public $attachments;
 }
\ No newline at end of file
diff --git a/api/BusinessLogic/Emails/EmailSender.php b/api/BusinessLogic/Emails/EmailSender.php
index 75f25e68..2cd191bc 100644
--- a/api/BusinessLogic/Emails/EmailSender.php
+++ b/api/BusinessLogic/Emails/EmailSender.php
@@ -5,21 +5,17 @@ namespace BusinessLogic\Emails;
 
 use BusinessLogic\Tickets\Attachment;
 use BusinessLogic\Tickets\Ticket;
+use PHPMailer;
 
 interface EmailSender {
     /**
+     * Use to send emails that do NOT include ticket information
+     *
      * @param $emailBuilder EmailBuilder
      * @param $heskSettings array
      * @param $modsForHeskSettings array
+     * @param $sendAsHtml bool
+     * @return bool|string true if message sent successfully, error string otherwise
      */
-    function sendEmail($emailBuilder, $heskSettings, $modsForHeskSettings);
-
-    /**
-     * @param $emailBuilder EmailBuilder
-     * @param $ticket Ticket
-     * @param $attachments Attachment[]
-     * @param $heskSettings array
-     * @param $modsForHeskSettings array
-     */
-    function sendEmailWithTicket($emailBuilder, $ticket, $attachments, $heskSettings, $modsForHeskSettings);
+    function sendEmail($emailBuilder, $heskSettings, $modsForHeskSettings, $sendAsHtml);
 }
\ No newline at end of file
diff --git a/api/BusinessLogic/Emails/PhpMailEmailSender.php b/api/BusinessLogic/Emails/PhpMailEmailSender.php
deleted file mode 100644
index 56086090..00000000
--- a/api/BusinessLogic/Emails/PhpMailEmailSender.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace BusinessLogic\Emails;
-
-
-use BusinessLogic\Tickets\Attachment;
-use BusinessLogic\Tickets\Ticket;
-
-class PhpMailEmailSender implements EmailSender {
-    /**
-     * @param $emailBuilder EmailBuilder
-     * @param $heskSettings array
-     * @param $modsForHeskSettings array
-     */
-    function sendEmail($emailBuilder, $heskSettings, $modsForHeskSettings) {
-        // TODO: Implement sendEmail() method.
-    }
-
-    /**
-     * @param $emailBuilder EmailBuilder
-     * @param $ticket Ticket
-     * @param $attachments Attachment[]
-     * @param $heskSettings array
-     * @param $modsForHeskSettings array
-     */
-    function sendEmailWithTicket($emailBuilder, $ticket, $attachments, $heskSettings, $modsForHeskSettings) {
-        // TODO: Implement sendEmailWithTicket() method.
-    }
-}
\ No newline at end of file
diff --git a/api/BusinessLogic/Emails/StmpEmailSender.php b/api/BusinessLogic/Emails/StmpEmailSender.php
deleted file mode 100644
index 329dc9c3..00000000
--- a/api/BusinessLogic/Emails/StmpEmailSender.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace BusinessLogic\Emails;
-
-
-use BusinessLogic\Tickets\Attachment;
-use BusinessLogic\Tickets\Ticket;
-
-class StmpEmailSender implements EmailSender {
-    /**
-     * @param $emailBuilder EmailBuilder
-     * @param $heskSettings array
-     * @param $modsForHeskSettings array
-     */
-    function sendEmail($emailBuilder, $heskSettings, $modsForHeskSettings) {
-        // TODO: Implement sendEmail() method.
-    }
-
-    /**
-     * @param $emailBuilder EmailBuilder
-     * @param $ticket Ticket
-     * @param $attachments Attachment[]
-     * @param $heskSettings array
-     * @param $modsForHeskSettings array
-     */
-    function sendEmailWithTicket($emailBuilder, $ticket, $attachments, $heskSettings, $modsForHeskSettings) {
-        // TODO: Implement sendEmailWithTicket() method.
-    }
-}
\ No newline at end of file
diff --git a/api/Tests/BusinessLogic/Emails/BasicEmailSenderIntegrationTest.php b/api/Tests/BusinessLogic/Emails/BasicEmailSenderIntegrationTest.php
new file mode 100644
index 00000000..d71fe09f
--- /dev/null
+++ b/api/Tests/BusinessLogic/Emails/BasicEmailSenderIntegrationTest.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace BusinessLogic\Emails;
+
+use PHPUnit\Framework\TestCase;
+
+class BasicEmailSenderIntegrationTest extends TestCase {
+    /**
+     * @var $emailSender BasicEmailSender;
+     */
+    private $emailSender;
+
+    /**
+     * @var $heskSettings array
+     */
+    private $heskSettings;
+
+    /**
+     * @var $modsForHeskSettings array
+     */
+    private $modsForHeskSettings;
+
+    protected function setUp() {
+        global $hesk_settings, $modsForHesk_settings;
+
+        if (!defined('IN_SCRIPT')) {
+            define('IN_SCRIPT', 1);
+        }
+        require(__DIR__ . '/../../../../hesk_settings.inc.php');
+        require(__DIR__ . '/../../integration_test_mfh_settings.php');
+
+        $this->emailSender = new BasicEmailSender();
+        $this->heskSettings = $hesk_settings;
+        $this->modsForHeskSettings = $modsForHesk_settings;
+    }
+
+    function testItCanSendHtmlMail() {
+        //-- Arrange
+        //$hesk_settings['smtp'] = 0 //Uncomment this to use PHPMail
+        $emailBuilder = new EmailBuilder();
+        $emailBuilder->to = array('mfh1@mailinator.com');
+        $emailBuilder->cc = array('mfh2@mailinator.com');
+        $emailBuilder->bcc = array('mfh3@mailinator.com');
+        $emailBuilder->message = "Test PLAIN TEXT message";
+        $emailBuilder->htmlMessage = "Test <b>HTML</b> <i>message</i>";
+        $emailBuilder->subject = "BasicEmailSenderIntegrationTest";
+
+
+        //-- Act
+        $result = $this->emailSender->sendEmail($emailBuilder, $this->heskSettings, $this->modsForHeskSettings, true);
+
+        //-- Assert
+        if ($result !== true) {
+            $this->fail($result);
+        }
+    }
+
+    function testItCanSendPlaintextMail() {
+        //-- Arrange
+        //$hesk_settings['smtp'] = 0 //Uncomment this to use PHPMail
+        $emailBuilder = new EmailBuilder();
+        $emailBuilder->to = array('mfh1@mailinator.com');
+        $emailBuilder->cc = array('mfh2@mailinator.com');
+        $emailBuilder->bcc = array('mfh3@mailinator.com');
+        $emailBuilder->message = "Test PLAIN TEXT message";
+        $emailBuilder->subject = "BasicEmailSenderIntegrationTest";
+
+
+        //-- Act
+        $result = $this->emailSender->sendEmail($emailBuilder, $this->heskSettings, $this->modsForHeskSettings, false);
+
+        //-- Assert
+        if ($result !== true) {
+            $this->fail($result);
+        }
+    }
+}
diff --git a/api/Tests/integration_test_mfh_settings.sample.php b/api/Tests/integration_test_mfh_settings.sample.php
new file mode 100644
index 00000000..592cbc13
--- /dev/null
+++ b/api/Tests/integration_test_mfh_settings.sample.php
@@ -0,0 +1,3 @@
+<?php
+// Copy this file as "integration_test_mfh_settings.php" to use
+//-- Integration test data for Mods for HESK settings
\ No newline at end of file

From 54baa4d6ba7ae5247c16d8a49638b832d83668fc Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sun, 19 Feb 2017 22:02:10 -0500
Subject: [PATCH 051/192] Created email senders and integration tests for these
 senders

---
 api/BusinessLogic/Emails/BasicEmailSender.php |   10 +-
 api/BusinessLogic/Emails/EmailSender.php      |    2 +-
 .../Emails/MailgunEmailSender.php             |   76 +-
 .../BasicEmailSenderIntegrationTest.php       |   37 +-
 .../MailgunEmailSenderIntegrationTest.php     |  109 ++
 .../BusinessLogic/IntegrationTestCaseBase.php |   10 +
 api/Tests/bootstrap.php                       |    1 +
 api/composer.json                             |    7 +-
 api/composer.lock                             | 1018 ++++++++++++++++-
 9 files changed, 1210 insertions(+), 60 deletions(-)
 create mode 100644 api/Tests/BusinessLogic/Emails/MailgunEmailSenderIntegrationTest.php
 create mode 100644 api/Tests/BusinessLogic/IntegrationTestCaseBase.php

diff --git a/api/BusinessLogic/Emails/BasicEmailSender.php b/api/BusinessLogic/Emails/BasicEmailSender.php
index a93aad9f..058ef937 100644
--- a/api/BusinessLogic/Emails/BasicEmailSender.php
+++ b/api/BusinessLogic/Emails/BasicEmailSender.php
@@ -26,7 +26,8 @@ class BasicEmailSender implements EmailSender {
             $mailer->Password = $heskSettings['smtp_password'];
         }
 
-        $mailer->FromName = $heskSettings['noreply_name'] ? $heskSettings['noreply_name'] : '';
+        $mailer->FromName = $heskSettings['noreply_name'] !== null &&
+                            $heskSettings['noreply_name'] !== '' ? $heskSettings['noreply_name'] : '';
         $mailer->From = $heskSettings['noreply_mail'];
 
         if ($emailBuilder->to !== null) {
@@ -58,6 +59,13 @@ class BasicEmailSender implements EmailSender {
         }
         $mailer->Timeout = $heskSettings['smtp_timeout'];
 
+        if ($emailBuilder->attachments !== null) {
+            foreach ($emailBuilder->attachments as $attachment) {
+                $mailer->addAttachment(__DIR__ . '/../../../' . $heskSettings['attach_dir'] . '/' . $attachment->savedName,
+                    $attachment->fileName);
+            }
+        }
+
         if ($mailer->send()) {
             return true;
         }
diff --git a/api/BusinessLogic/Emails/EmailSender.php b/api/BusinessLogic/Emails/EmailSender.php
index 2cd191bc..4f300529 100644
--- a/api/BusinessLogic/Emails/EmailSender.php
+++ b/api/BusinessLogic/Emails/EmailSender.php
@@ -15,7 +15,7 @@ interface EmailSender {
      * @param $heskSettings array
      * @param $modsForHeskSettings array
      * @param $sendAsHtml bool
-     * @return bool|string true if message sent successfully, error string otherwise
+     * @return bool|string|\stdClass true if message sent successfully, string for PHPMail/Smtp error, stdClass for Mailgun error
      */
     function sendEmail($emailBuilder, $heskSettings, $modsForHeskSettings, $sendAsHtml);
 }
\ No newline at end of file
diff --git a/api/BusinessLogic/Emails/MailgunEmailSender.php b/api/BusinessLogic/Emails/MailgunEmailSender.php
index c29df57e..58c53e4e 100644
--- a/api/BusinessLogic/Emails/MailgunEmailSender.php
+++ b/api/BusinessLogic/Emails/MailgunEmailSender.php
@@ -5,25 +5,69 @@ namespace BusinessLogic\Emails;
 
 use BusinessLogic\Tickets\Attachment;
 use BusinessLogic\Tickets\Ticket;
+use Mailgun\Mailgun;
 
 class MailgunEmailSender implements EmailSender {
-    /**
-     * @param $emailBuilder EmailBuilder
-     * @param $heskSettings array
-     * @param $modsForHeskSettings array
-     */
-    function sendEmail($emailBuilder, $heskSettings, $modsForHeskSettings) {
-        // TODO: Implement sendEmail() method.
+    function sendEmail($emailBuilder, $heskSettings, $modsForHeskSettings, $sendAsHtml) {
+        $mailgunArray = array();
+
+        $mailgunArray['from'] = $heskSettings['noreply_mail']; // Email Address
+        if ($heskSettings['noreply_name'] !== null && $heskSettings['noreply_name'] !== '') {
+            $mailgunArray['from'] = "{$heskSettings['noreply_name']} <{$heskSettings['noreply_mail']}>"; // Name and address
+        }
+
+        $mailgunArray['to'] = implode(',', $emailBuilder->to);
+
+        if ($emailBuilder->cc !== null) {
+            $mailgunArray['cc'] = implode(',', $emailBuilder->cc);
+        }
+
+        if ($emailBuilder->bcc !== null) {
+            $mailgunArray['bcc'] = implode(',', $emailBuilder->bcc);
+        }
+
+        $mailgunArray['subject'] = $emailBuilder->subject;
+        $mailgunArray['text'] = $emailBuilder->message;
+
+        if ($sendAsHtml) {
+            $mailgunArray['html'] = $emailBuilder->htmlMessage;
+        }
+
+        $mailgunAttachments = array();
+        if ($emailBuilder->attachments !== null) {
+            foreach ($emailBuilder->attachments as $attachment) {
+                $mailgunAttachments[] = array(
+                    'remoteName' => $attachment->fileName,
+                    'filePath' => __DIR__ . '/../../../' . $heskSettings['attach_dir'] . '/' . $attachment->savedName
+                );
+            }
+        }
+
+        var_dump($mailgunArray);
+
+        $result = $this->sendMessage($mailgunArray, $mailgunAttachments, $modsForHeskSettings);
+
+
+        if (isset($result->http_response_code)
+            && $result->http_response_code === 200) {
+            return true;
+        }
+
+        return $result;
     }
 
-    /**
-     * @param $emailBuilder EmailBuilder
-     * @param $ticket Ticket
-     * @param $attachments Attachment[]
-     * @param $heskSettings array
-     * @param $modsForHeskSettings array
-     */
-    function sendEmailWithTicket($emailBuilder, $ticket, $attachments, $heskSettings, $modsForHeskSettings) {
-        // TODO: Implement sendEmailWithTicket() method.
+    private function sendMessage($mailgunArray, $attachments, $modsForHeskSettings) {
+        $messageClient = new Mailgun($modsForHeskSettings['mailgun_api_key']);
+
+        $mailgunAttachments = array();
+        if (count($attachments) > 0) {
+            $mailgunAttachments = array(
+                'attachment' => $attachments
+            );
+        }
+
+        $result = $messageClient->sendMessage($modsForHeskSettings['mailgun_domain'], $mailgunArray, $mailgunAttachments);
+
+        return $result;
     }
 }
\ No newline at end of file
diff --git a/api/Tests/BusinessLogic/Emails/BasicEmailSenderIntegrationTest.php b/api/Tests/BusinessLogic/Emails/BasicEmailSenderIntegrationTest.php
index d71fe09f..4c946738 100644
--- a/api/Tests/BusinessLogic/Emails/BasicEmailSenderIntegrationTest.php
+++ b/api/Tests/BusinessLogic/Emails/BasicEmailSenderIntegrationTest.php
@@ -2,9 +2,10 @@
 
 namespace BusinessLogic\Emails;
 
-use PHPUnit\Framework\TestCase;
+use BusinessLogic\IntegrationTestCaseBase;
+use BusinessLogic\Tickets\Attachment;
 
-class BasicEmailSenderIntegrationTest extends TestCase {
+class BasicEmailSenderIntegrationTest extends IntegrationTestCaseBase {
     /**
      * @var $emailSender BasicEmailSender;
      */
@@ -20,9 +21,16 @@ class BasicEmailSenderIntegrationTest extends TestCase {
      */
     private $modsForHeskSettings;
 
+    /**
+     * @var $attachmentsToPurge string[]
+     */
+    private $attachmentsToPurge;
+
     protected function setUp() {
         global $hesk_settings, $modsForHesk_settings;
 
+        $this->skip();
+
         if (!defined('IN_SCRIPT')) {
             define('IN_SCRIPT', 1);
         }
@@ -32,6 +40,13 @@ class BasicEmailSenderIntegrationTest extends TestCase {
         $this->emailSender = new BasicEmailSender();
         $this->heskSettings = $hesk_settings;
         $this->modsForHeskSettings = $modsForHesk_settings;
+        $this->attachmentsToPurge = array();
+    }
+
+    protected function tearDown() {
+        foreach ($this->attachmentsToPurge as $file) {
+            unlink($file);
+        }
     }
 
     function testItCanSendHtmlMail() {
@@ -45,6 +60,24 @@ class BasicEmailSenderIntegrationTest extends TestCase {
         $emailBuilder->htmlMessage = "Test <b>HTML</b> <i>message</i>";
         $emailBuilder->subject = "BasicEmailSenderIntegrationTest";
 
+        // Uncomment to test attachments.
+        $attachment = new Attachment();
+        $attachment->id = 1;
+        $attachment->fileName = "file.txt";
+        $attachment->savedName = "test1.txt";
+        $filename1 = __DIR__ . '/../../../../' . $this->heskSettings['attach_dir'] . '/' . $attachment->savedName;
+        file_put_contents($filename1, 'TEST DATA');
+
+        $otherAttachment = new Attachment();
+        $otherAttachment->id = 2;
+        $otherAttachment->fileName = "file2.txt";
+        $otherAttachment->savedName = "test2.txt";
+        $filename2 = __DIR__ . '/../../../../' . $this->heskSettings['attach_dir'] . '/' . $otherAttachment->savedName;
+        file_put_contents($filename2, 'TEST DATA 2');
+
+        $emailBuilder->attachments = array($attachment, $otherAttachment);
+        $this->attachmentsToPurge = array($filename1, $filename2);
+
 
         //-- Act
         $result = $this->emailSender->sendEmail($emailBuilder, $this->heskSettings, $this->modsForHeskSettings, true);
diff --git a/api/Tests/BusinessLogic/Emails/MailgunEmailSenderIntegrationTest.php b/api/Tests/BusinessLogic/Emails/MailgunEmailSenderIntegrationTest.php
new file mode 100644
index 00000000..1a5d5ec3
--- /dev/null
+++ b/api/Tests/BusinessLogic/Emails/MailgunEmailSenderIntegrationTest.php
@@ -0,0 +1,109 @@
+<?php
+
+namespace BusinessLogic\Emails;
+
+use BusinessLogic\IntegrationTestCaseBase;
+use BusinessLogic\Tickets\Attachment;
+
+class MailgunEmailSenderIntegrationTest extends IntegrationTestCaseBase {
+    /**
+     * @var $emailSender MailgunEmailSender;
+     */
+    private $emailSender;
+
+    /**
+     * @var $heskSettings array
+     */
+    private $heskSettings;
+
+    /**
+     * @var $modsForHeskSettings array
+     */
+    private $modsForHeskSettings;
+
+    /**
+     * @var $attachmentsToPurge string[]
+     */
+    private $attachmentsToPurge;
+
+    protected function setUp() {
+        global $hesk_settings, $modsForHesk_settings;
+
+        $this->skip();
+
+        if (!defined('IN_SCRIPT')) {
+            define('IN_SCRIPT', 1);
+        }
+        require(__DIR__ . '/../../../../hesk_settings.inc.php');
+        require(__DIR__ . '/../../integration_test_mfh_settings.php');
+
+        $this->emailSender = new MailgunEmailSender();
+        $this->heskSettings = $hesk_settings;
+        $this->modsForHeskSettings = $modsForHesk_settings;
+        $this->attachmentsToPurge = array();
+    }
+
+    protected function tearDown() {
+        foreach ($this->attachmentsToPurge as $file) {
+            unlink($file);
+        }
+    }
+
+    function testItCanSendMail() {
+        //-- Arrange
+        $emailBuilder = new EmailBuilder();
+        $emailBuilder->to = array('mfh1@mailinator.com');
+        $emailBuilder->cc = array('mfh2@mailinator.com');
+        $emailBuilder->bcc = array('mfh3@mailinator.com');
+        $emailBuilder->message = "Test PLAIN TEXT message";
+        $emailBuilder->htmlMessage = "Test <b>HTML</b> <i>message</i>";
+        $emailBuilder->subject = "MailgunEmailSenderIntegrationTest";
+
+        // Uncomment to test attachments.
+        $attachment = new Attachment();
+        $attachment->id = 1;
+        $attachment->fileName = "file.txt";
+        $attachment->savedName = "test1.txt";
+        $filename1 = __DIR__ . '/../../../../' . $this->heskSettings['attach_dir'] . '/' . $attachment->savedName;
+        file_put_contents($filename1, 'TEST DATA');
+
+        $otherAttachment = new Attachment();
+        $otherAttachment->id = 2;
+        $otherAttachment->fileName = "file2.txt";
+        $otherAttachment->savedName = "test2.txt";
+        $filename2 = __DIR__ . '/../../../../' . $this->heskSettings['attach_dir'] . '/' . $otherAttachment->savedName;
+        file_put_contents($filename2, 'TEST DATA 2');
+
+        $emailBuilder->attachments = array($attachment, $otherAttachment);
+        $this->attachmentsToPurge = array($filename1, $filename2);
+
+
+        //-- Act
+        $result = $this->emailSender->sendEmail($emailBuilder, $this->heskSettings, $this->modsForHeskSettings, true);
+
+        //-- Assert
+        if ($result !== true) {
+            $this->fail($result);
+        }
+    }
+
+    function testItCanSendPlaintextMail() {
+        //-- Arrange
+        //$hesk_settings['smtp'] = 0 //Uncomment this to use PHPMail
+        $emailBuilder = new EmailBuilder();
+        $emailBuilder->to = array('mfh1@mailinator.com');
+        $emailBuilder->cc = array('mfh2@mailinator.com');
+        $emailBuilder->bcc = array('mfh3@mailinator.com');
+        $emailBuilder->message = "Test PLAIN TEXT message";
+        $emailBuilder->subject = "MailgunEmailSenderIntegrationTest";
+
+
+        //-- Act
+        $result = $this->emailSender->sendEmail($emailBuilder, $this->heskSettings, $this->modsForHeskSettings, false);
+
+        //-- Assert
+        if ($result !== true) {
+            $this->fail($result);
+        }
+    }
+}
diff --git a/api/Tests/BusinessLogic/IntegrationTestCaseBase.php b/api/Tests/BusinessLogic/IntegrationTestCaseBase.php
new file mode 100644
index 00000000..963f223c
--- /dev/null
+++ b/api/Tests/BusinessLogic/IntegrationTestCaseBase.php
@@ -0,0 +1,10 @@
+<?php
+namespace BusinessLogic;
+
+use PHPUnit\Framework\TestCase;
+
+class IntegrationTestCaseBase extends TestCase {
+    function skip() {
+        $this->markTestSkipped(sprintf("Skipping Integration Test %s", get_class($this)));
+    }
+}
diff --git a/api/Tests/bootstrap.php b/api/Tests/bootstrap.php
index 2e555474..a728a8a5 100644
--- a/api/Tests/bootstrap.php
+++ b/api/Tests/bootstrap.php
@@ -1,2 +1,3 @@
 <?php
+require_once(__DIR__ . '/BusinessLogic/IntegrationTestCaseBase.php');
 require_once(__DIR__ . '/../bootstrap.php');
\ No newline at end of file
diff --git a/api/composer.json b/api/composer.json
index ec28061a..8b3f0002 100644
--- a/api/composer.json
+++ b/api/composer.json
@@ -11,6 +11,11 @@
   ],
   "require": {
     "phpunit/phpunit": "5.7.9",
-    "phpmailer/phpmailer": "^5.2"
+    "phpmailer/phpmailer": "^5.2",
+    "mailgun/mailgun-php": "^2.1",
+    "php-http/guzzle6-adapter": "^1.1",
+    "php-http/message": "^1.5",
+    "php-http/curl-client": "^1.7",
+    "guzzlehttp/psr7": "^1.3"
   }
 }
diff --git a/api/composer.lock b/api/composer.lock
index 4a0ae60f..1048b547 100644
--- a/api/composer.lock
+++ b/api/composer.lock
@@ -4,41 +4,684 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "daddd21e73d89f981995c60d0188767d",
+    "content-hash": "d7fe662ac2836f7d979fd4117ec8bca6",
     "packages": [
+        {
+            "name": "clue/stream-filter",
+            "version": "v1.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/clue/php-stream-filter.git",
+                "reference": "e3bf9415da163d9ad6701dccb407ed501ae69785"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/clue/php-stream-filter/zipball/e3bf9415da163d9ad6701dccb407ed501ae69785",
+                "reference": "e3bf9415da163d9ad6701dccb407ed501ae69785",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Clue\\StreamFilter\\": "src/"
+                },
+                "files": [
+                    "src/functions.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Christian Lück",
+                    "email": "christian@lueck.tv"
+                }
+            ],
+            "description": "A simple and modern approach to stream filtering in PHP",
+            "homepage": "https://github.com/clue/php-stream-filter",
+            "keywords": [
+                "bucket brigade",
+                "callback",
+                "filter",
+                "php_user_filter",
+                "stream",
+                "stream_filter_append",
+                "stream_filter_register"
+            ],
+            "time": "2015-11-08T23:41:30+00:00"
+        },
         {
             "name": "doctrine/instantiator",
             "version": "dev-master",
             "source": {
                 "type": "git",
-                "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "68099b02b60bbf3b088ff5cb67bf506770ef9cac"
+                "url": "https://github.com/doctrine/instantiator.git",
+                "reference": "68099b02b60bbf3b088ff5cb67bf506770ef9cac"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/68099b02b60bbf3b088ff5cb67bf506770ef9cac",
+                "reference": "68099b02b60bbf3b088ff5cb67bf506770ef9cac",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3,<8.0-DEV"
+            },
+            "require-dev": {
+                "athletic/athletic": "~0.1.8",
+                "ext-pdo": "*",
+                "ext-phar": "*",
+                "phpunit/phpunit": "~4.0",
+                "squizlabs/php_codesniffer": "~2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Marco Pivetta",
+                    "email": "ocramius@gmail.com",
+                    "homepage": "http://ocramius.github.com/"
+                }
+            ],
+            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
+            "homepage": "https://github.com/doctrine/instantiator",
+            "keywords": [
+                "constructor",
+                "instantiate"
+            ],
+            "time": "2017-01-23 09:23:06"
+        },
+        {
+            "name": "guzzle/guzzle",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/guzzle3.git",
+                "reference": "f7778ed85e3db90009d79725afd6c3a82dab32fe"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/guzzle3/zipball/f7778ed85e3db90009d79725afd6c3a82dab32fe",
+                "reference": "f7778ed85e3db90009d79725afd6c3a82dab32fe",
+                "shasum": ""
+            },
+            "require": {
+                "ext-curl": "*",
+                "php": ">=5.3.3",
+                "symfony/event-dispatcher": "~2.1"
+            },
+            "replace": {
+                "guzzle/batch": "self.version",
+                "guzzle/cache": "self.version",
+                "guzzle/common": "self.version",
+                "guzzle/http": "self.version",
+                "guzzle/inflection": "self.version",
+                "guzzle/iterator": "self.version",
+                "guzzle/log": "self.version",
+                "guzzle/parser": "self.version",
+                "guzzle/plugin": "self.version",
+                "guzzle/plugin-async": "self.version",
+                "guzzle/plugin-backoff": "self.version",
+                "guzzle/plugin-cache": "self.version",
+                "guzzle/plugin-cookie": "self.version",
+                "guzzle/plugin-curlauth": "self.version",
+                "guzzle/plugin-error-response": "self.version",
+                "guzzle/plugin-history": "self.version",
+                "guzzle/plugin-log": "self.version",
+                "guzzle/plugin-md5": "self.version",
+                "guzzle/plugin-mock": "self.version",
+                "guzzle/plugin-oauth": "self.version",
+                "guzzle/service": "self.version",
+                "guzzle/stream": "self.version"
+            },
+            "require-dev": {
+                "doctrine/cache": "~1.3",
+                "monolog/monolog": "~1.0",
+                "phpunit/phpunit": "3.7.*",
+                "psr/log": "~1.0",
+                "symfony/class-loader": "~2.1",
+                "zendframework/zend-cache": "2.*,<2.3",
+                "zendframework/zend-log": "2.*,<2.3"
+            },
+            "suggest": {
+                "guzzlehttp/guzzle": "Guzzle 5 has moved to a new package name. The package you have installed, Guzzle 3, is deprecated."
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.9-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Guzzle": "src/",
+                    "Guzzle\\Tests": "tests/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                },
+                {
+                    "name": "Guzzle Community",
+                    "homepage": "https://github.com/guzzle/guzzle/contributors"
+                }
+            ],
+            "description": "PHP HTTP client. This library is deprecated in favor of https://packagist.org/packages/guzzlehttp/guzzle",
+            "homepage": "http://guzzlephp.org/",
+            "keywords": [
+                "client",
+                "curl",
+                "framework",
+                "http",
+                "http client",
+                "rest",
+                "web service"
+            ],
+            "abandoned": "guzzlehttp/guzzle",
+            "time": "2016-10-26 18:22:07"
+        },
+        {
+            "name": "guzzlehttp/guzzle",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/guzzle.git",
+                "reference": "6a99df94a22f01b4b9c32ed8789cf30d05bdba92"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/6a99df94a22f01b4b9c32ed8789cf30d05bdba92",
+                "reference": "6a99df94a22f01b4b9c32ed8789cf30d05bdba92",
+                "shasum": ""
+            },
+            "require": {
+                "guzzlehttp/promises": "^1.0",
+                "guzzlehttp/psr7": "^1.3.1",
+                "php": ">=5.5"
+            },
+            "require-dev": {
+                "ext-curl": "*",
+                "phpunit/phpunit": "^4.0",
+                "psr/log": "^1.0"
+            },
+            "suggest": {
+                "psr/log": "Required for using the Log middleware"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "6.2-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/functions_include.php"
+                ],
+                "psr-4": {
+                    "GuzzleHttp\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                }
+            ],
+            "description": "Guzzle is a PHP HTTP client library",
+            "homepage": "http://guzzlephp.org/",
+            "keywords": [
+                "client",
+                "curl",
+                "framework",
+                "http",
+                "http client",
+                "rest",
+                "web service"
+            ],
+            "time": "2017-02-19 15:59:27"
+        },
+        {
+            "name": "guzzlehttp/promises",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/promises.git",
+                "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/a59da6cf61d80060647ff4d3eb2c03a2bc694646",
+                "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "GuzzleHttp\\Promise\\": "src/"
+                },
+                "files": [
+                    "src/functions_include.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                }
+            ],
+            "description": "Guzzle promises library",
+            "keywords": [
+                "promise"
+            ],
+            "time": "2016-12-20 10:07:11"
+        },
+        {
+            "name": "guzzlehttp/psr7",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/psr7.git",
+                "reference": "41972f428b31bc3ebff0707f63dd2165d3ac4cf6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/41972f428b31bc3ebff0707f63dd2165d3ac4cf6",
+                "reference": "41972f428b31bc3ebff0707f63dd2165d3ac4cf6",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4.0",
+                "psr/http-message": "~1.0"
+            },
+            "provide": {
+                "psr/http-message-implementation": "1.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "GuzzleHttp\\Psr7\\": "src/"
+                },
+                "files": [
+                    "src/functions_include.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                },
+                {
+                    "name": "Tobias Schultze",
+                    "homepage": "https://github.com/Tobion"
+                }
+            ],
+            "description": "PSR-7 message implementation that also provides common utility methods",
+            "keywords": [
+                "http",
+                "message",
+                "request",
+                "response",
+                "stream",
+                "uri",
+                "url"
+            ],
+            "time": "2017-02-18 11:43:27"
+        },
+        {
+            "name": "mailgun/mailgun-php",
+            "version": "v2.1.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/mailgun/mailgun-php.git",
+                "reference": "54b7f851b8e0241d593897dc2d50906bf4a43995"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/mailgun/mailgun-php/zipball/54b7f851b8e0241d593897dc2d50906bf4a43995",
+                "reference": "54b7f851b8e0241d593897dc2d50906bf4a43995",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.5|^7.0",
+                "php-http/discovery": "^1.0",
+                "php-http/httplug": "^1.0",
+                "php-http/message": "^1.0",
+                "php-http/multipart-stream-builder": "^0.1"
+            },
+            "require-dev": {
+                "php-http/guzzle6-adapter": "^1.0",
+                "phpunit/phpunit": "~4.6"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Mailgun": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Travis Swientek",
+                    "email": "travis@mailgunhq.com"
+                }
+            ],
+            "description": "The Mailgun SDK provides methods for all API functions.",
+            "time": "2016-08-10T16:58:18+00:00"
+        },
+        {
+            "name": "myclabs/deep-copy",
+            "version": "1.6.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/myclabs/DeepCopy.git",
+                "reference": "5a5a9fc8025a08d8919be87d6884d5a92520cefe"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/5a5a9fc8025a08d8919be87d6884d5a92520cefe",
+                "reference": "5a5a9fc8025a08d8919be87d6884d5a92520cefe",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "doctrine/collections": "1.*",
+                "phpunit/phpunit": "~4.1"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "DeepCopy\\": "src/DeepCopy/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Create deep copies (clones) of your objects",
+            "homepage": "https://github.com/myclabs/DeepCopy",
+            "keywords": [
+                "clone",
+                "copy",
+                "duplicate",
+                "object",
+                "object graph"
+            ],
+            "time": "2017-01-26T22:05:40+00:00"
+        },
+        {
+            "name": "php-http/curl-client",
+            "version": "v1.7.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-http/curl-client.git",
+                "reference": "0972ad0d7d37032a52077a5cbe27cf370f2007d8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-http/curl-client/zipball/0972ad0d7d37032a52077a5cbe27cf370f2007d8",
+                "reference": "0972ad0d7d37032a52077a5cbe27cf370f2007d8",
+                "shasum": ""
+            },
+            "require": {
+                "ext-curl": "*",
+                "php": "^5.5 || ^7.0",
+                "php-http/discovery": "^1.0",
+                "php-http/httplug": "^1.0",
+                "php-http/message": "^1.2",
+                "php-http/message-factory": "^1.0.2"
+            },
+            "provide": {
+                "php-http/async-client-implementation": "1.0",
+                "php-http/client-implementation": "1.0"
+            },
+            "require-dev": {
+                "guzzlehttp/psr7": "^1.0",
+                "php-http/client-integration-tests": "^0.5.1",
+                "phpunit/phpunit": "^4.8.27",
+                "zendframework/zend-diactoros": "^1.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Http\\Client\\Curl\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Михаил Красильников",
+                    "email": "m.krasilnikov@yandex.ru"
+                }
+            ],
+            "description": "cURL client for PHP-HTTP",
+            "homepage": "http://php-http.org",
+            "keywords": [
+                "curl",
+                "http"
+            ],
+            "time": "2017-02-09T15:18:33+00:00"
+        },
+        {
+            "name": "php-http/discovery",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-http/discovery.git",
+                "reference": "cc5669d9cb51170ad0278a3b984cd3c7894d6ff9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-http/discovery/zipball/cc5669d9cb51170ad0278a3b984cd3c7894d6ff9",
+                "reference": "cc5669d9cb51170ad0278a3b984cd3c7894d6ff9",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.5 || ^7.0"
+            },
+            "require-dev": {
+                "henrikbjorn/phpspec-code-coverage": "^2.0.2",
+                "php-http/httplug": "^1.0",
+                "php-http/message-factory": "^1.0",
+                "phpspec/phpspec": "^2.4",
+                "puli/composer-plugin": "1.0.0-beta10"
+            },
+            "suggest": {
+                "php-http/message": "Allow to use Guzzle, Diactoros or Slim Framework factories",
+                "puli/composer-plugin": "Sets up Puli which is recommended for Discovery to work. Check http://docs.php-http.org/en/latest/discovery.html for more details."
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Http\\Discovery\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Márk Sági-Kazár",
+                    "email": "mark.sagikazar@gmail.com"
+                }
+            ],
+            "description": "Finds installed HTTPlug implementations and PSR-7 message factories",
+            "homepage": "http://php-http.org",
+            "keywords": [
+                "adapter",
+                "client",
+                "discovery",
+                "factory",
+                "http",
+                "message",
+                "psr7"
+            ],
+            "time": "2017-02-12 08:49:24"
+        },
+        {
+            "name": "php-http/guzzle6-adapter",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-http/guzzle6-adapter.git",
+                "reference": "c0168c6e5fa286c3837310d591114d2683b9b9a5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-http/guzzle6-adapter/zipball/c0168c6e5fa286c3837310d591114d2683b9b9a5",
+                "reference": "c0168c6e5fa286c3837310d591114d2683b9b9a5",
+                "shasum": ""
+            },
+            "require": {
+                "guzzlehttp/guzzle": "^6.0",
+                "php": "^5.5 || ^7.0",
+                "php-http/httplug": "^1.0"
+            },
+            "provide": {
+                "php-http/async-client-implementation": "1.0",
+                "php-http/client-implementation": "1.0"
+            },
+            "require-dev": {
+                "ext-curl": "*",
+                "php-http/client-integration-tests": "^0.5.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Http\\Adapter\\Guzzle6\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Márk Sági-Kazár",
+                    "email": "mark.sagikazar@gmail.com"
+                },
+                {
+                    "name": "David de Boer",
+                    "email": "david@ddeboer.nl"
+                }
+            ],
+            "description": "Guzzle 6 HTTP Adapter",
+            "homepage": "http://httplug.io",
+            "keywords": [
+                "Guzzle",
+                "http"
+            ],
+            "time": "2016-08-02 09:03:17"
+        },
+        {
+            "name": "php-http/httplug",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-http/httplug.git",
+                "reference": "f32fefee51cb96e99edb0c4bb1d11b5026ad5069"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/68099b02b60bbf3b088ff5cb67bf506770ef9cac",
-                "reference": "68099b02b60bbf3b088ff5cb67bf506770ef9cac",
+                "url": "https://api.github.com/repos/php-http/httplug/zipball/f32fefee51cb96e99edb0c4bb1d11b5026ad5069",
+                "reference": "f32fefee51cb96e99edb0c4bb1d11b5026ad5069",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3,<8.0-DEV"
+                "php": ">=5.4",
+                "php-http/promise": "^1.0",
+                "psr/http-message": "^1.0"
             },
             "require-dev": {
-                "athletic/athletic": "~0.1.8",
-                "ext-pdo": "*",
-                "ext-phar": "*",
-                "phpunit/phpunit": "~4.0",
-                "squizlabs/php_codesniffer": "~2.0"
+                "henrikbjorn/phpspec-code-coverage": "^1.0",
+                "phpspec/phpspec": "^2.4"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "1.2-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
+                    "Http\\Client\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -47,60 +690,247 @@
             ],
             "authors": [
                 {
-                    "name": "Marco Pivetta",
-                    "email": "ocramius@gmail.com",
-                    "homepage": "http://ocramius.github.com/"
+                    "name": "Eric GELOEN",
+                    "email": "geloen.eric@gmail.com"
+                },
+                {
+                    "name": "Márk Sági-Kazár",
+                    "email": "mark.sagikazar@gmail.com"
                 }
             ],
-            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
-            "homepage": "https://github.com/doctrine/instantiator",
+            "description": "HTTPlug, the HTTP client abstraction for PHP",
+            "homepage": "http://httplug.io",
             "keywords": [
-                "constructor",
-                "instantiate"
+                "client",
+                "http"
             ],
-            "time": "2017-01-23 09:23:06"
+            "time": "2017-01-02 06:37:42"
         },
         {
-            "name": "myclabs/deep-copy",
-            "version": "1.6.0",
+            "name": "php-http/message",
+            "version": "dev-master",
             "source": {
                 "type": "git",
-                "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "5a5a9fc8025a08d8919be87d6884d5a92520cefe"
+                "url": "https://github.com/php-http/message.git",
+                "reference": "13df8c48f40ca7925303aa336f19be4b80984f01"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/5a5a9fc8025a08d8919be87d6884d5a92520cefe",
-                "reference": "5a5a9fc8025a08d8919be87d6884d5a92520cefe",
+                "url": "https://api.github.com/repos/php-http/message/zipball/13df8c48f40ca7925303aa336f19be4b80984f01",
+                "reference": "13df8c48f40ca7925303aa336f19be4b80984f01",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.4.0"
+                "clue/stream-filter": "^1.3",
+                "php": ">=5.4",
+                "php-http/message-factory": "^1.0.2",
+                "psr/http-message": "^1.0"
             },
             "require-dev": {
-                "doctrine/collections": "1.*",
-                "phpunit/phpunit": "~4.1"
+                "akeneo/phpspec-skip-example-extension": "^1.0",
+                "coduo/phpspec-data-provider-extension": "^1.0",
+                "ext-zlib": "*",
+                "guzzlehttp/psr7": "^1.0",
+                "henrikbjorn/phpspec-code-coverage": "^1.0",
+                "phpspec/phpspec": "^2.4",
+                "slim/slim": "^3.0",
+                "zendframework/zend-diactoros": "^1.0"
+            },
+            "suggest": {
+                "ext-zlib": "Used with compressor/decompressor streams",
+                "guzzlehttp/psr7": "Used with Guzzle PSR-7 Factories",
+                "slim/slim": "Used with Slim Framework PSR-7 implementation",
+                "zendframework/zend-diactoros": "Used with Diactoros Factories"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.6-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
-                    "DeepCopy\\": "src/DeepCopy/"
+                    "Http\\Message\\": "src/"
+                },
+                "files": [
+                    "src/filters.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Márk Sági-Kazár",
+                    "email": "mark.sagikazar@gmail.com"
+                }
+            ],
+            "description": "HTTP Message related tools",
+            "homepage": "http://php-http.org",
+            "keywords": [
+                "http",
+                "message",
+                "psr-7"
+            ],
+            "time": "2017-02-14 08:58:37"
+        },
+        {
+            "name": "php-http/message-factory",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-http/message-factory.git",
+                "reference": "a2809d4fe294ebe8879aec8d4d5bf21faa029344"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-http/message-factory/zipball/a2809d4fe294ebe8879aec8d4d5bf21faa029344",
+                "reference": "a2809d4fe294ebe8879aec8d4d5bf21faa029344",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4",
+                "psr/http-message": "^1.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Http\\Message\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
-            "description": "Create deep copies (clones) of your objects",
-            "homepage": "https://github.com/myclabs/DeepCopy",
+            "authors": [
+                {
+                    "name": "Márk Sági-Kazár",
+                    "email": "mark.sagikazar@gmail.com"
+                }
+            ],
+            "description": "Factory interfaces for PSR-7 HTTP Message",
+            "homepage": "http://php-http.org",
             "keywords": [
-                "clone",
-                "copy",
-                "duplicate",
-                "object",
-                "object graph"
+                "factory",
+                "http",
+                "message",
+                "stream",
+                "uri"
             ],
-            "time": "2017-01-26T22:05:40+00:00"
+            "time": "2016-02-03 08:16:31"
+        },
+        {
+            "name": "php-http/multipart-stream-builder",
+            "version": "0.1.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-http/multipart-stream-builder.git",
+                "reference": "74d5ac517778ae87a065c6f4076316c35b58a777"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-http/multipart-stream-builder/zipball/74d5ac517778ae87a065c6f4076316c35b58a777",
+                "reference": "74d5ac517778ae87a065c6f4076316c35b58a777",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.5 || ^7.0",
+                "php-http/discovery": "^1.0",
+                "php-http/message-factory": "^1.0.2",
+                "psr/http-message": "^1.0"
+            },
+            "require-dev": {
+                "php-http/message": "^1.5",
+                "phpunit/phpunit": "^4.8 || ^5.4",
+                "zendframework/zend-diactoros": "^1.3.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "0.2-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Http\\Message\\MultipartStream\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Tobias Nyholm",
+                    "email": "tobias.nyholm@gmail.com"
+                }
+            ],
+            "description": "A builder class that help you create a multipart stream",
+            "homepage": "http://php-http.org",
+            "keywords": [
+                "factory",
+                "http",
+                "message",
+                "multipart stream",
+                "stream"
+            ],
+            "time": "2017-02-16T08:52:59+00:00"
+        },
+        {
+            "name": "php-http/promise",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-http/promise.git",
+                "reference": "810b30da8bcf69e4b82c4b9bc6b31518234293ab"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-http/promise/zipball/810b30da8bcf69e4b82c4b9bc6b31518234293ab",
+                "reference": "810b30da8bcf69e4b82c4b9bc6b31518234293ab",
+                "shasum": ""
+            },
+            "require-dev": {
+                "henrikbjorn/phpspec-code-coverage": "^1.0",
+                "phpspec/phpspec": "^2.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Http\\Promise\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Márk Sági-Kazár",
+                    "email": "mark.sagikazar@gmail.com"
+                },
+                {
+                    "name": "Joel Wurtz",
+                    "email": "joel.wurtz@gmail.com"
+                }
+            ],
+            "description": "Promise used for asynchronous HTTP requests",
+            "homepage": "http://httplug.io",
+            "keywords": [
+                "promise"
+            ],
+            "time": "2016-01-28 07:54:12"
         },
         {
             "name": "phpdocumentor/reflection-common",
@@ -756,6 +1586,56 @@
             ],
             "time": "2016-12-08 20:27:08"
         },
+        {
+            "name": "psr/http-message",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-message.git",
+                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Message\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for HTTP messages",
+            "homepage": "https://github.com/php-fig/http-message",
+            "keywords": [
+                "http",
+                "http-message",
+                "psr",
+                "psr-7",
+                "request",
+                "response"
+            ],
+            "time": "2016-08-06 14:39:51"
+        },
         {
             "name": "sebastian/code-unit-reverse-lookup",
             "version": "dev-master",
@@ -1269,6 +2149,66 @@
             "homepage": "https://github.com/sebastianbergmann/version",
             "time": "2016-10-03 07:35:21"
         },
+        {
+            "name": "symfony/event-dispatcher",
+            "version": "2.8.x-dev",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/event-dispatcher.git",
+                "reference": "3178c0e247b81da8a0265b460ac23bec6d2e6627"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/3178c0e247b81da8a0265b460ac23bec6d2e6627",
+                "reference": "3178c0e247b81da8a0265b460ac23bec6d2e6627",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9"
+            },
+            "require-dev": {
+                "psr/log": "~1.0",
+                "symfony/config": "^2.0.5|~3.0.0",
+                "symfony/dependency-injection": "~2.6|~3.0.0",
+                "symfony/expression-language": "~2.6|~3.0.0",
+                "symfony/stopwatch": "~2.3|~3.0.0"
+            },
+            "suggest": {
+                "symfony/dependency-injection": "",
+                "symfony/http-kernel": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\EventDispatcher\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony EventDispatcher Component",
+            "homepage": "https://symfony.com",
+            "time": "2017-02-18 19:13:35"
+        },
         {
             "name": "symfony/yaml",
             "version": "dev-master",

From 08d7347f00477fb961040e364b4259697d2e24e6 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sun, 19 Feb 2017 22:04:47 -0500
Subject: [PATCH 052/192] Small tweaks

---
 api/BusinessLogic/Emails/MailgunEmailSender.php                 | 2 --
 .../BusinessLogic/Emails/BasicEmailSenderIntegrationTest.php    | 1 -
 .../BusinessLogic/Emails/MailgunEmailSenderIntegrationTest.php  | 1 -
 3 files changed, 4 deletions(-)

diff --git a/api/BusinessLogic/Emails/MailgunEmailSender.php b/api/BusinessLogic/Emails/MailgunEmailSender.php
index 58c53e4e..2d290094 100644
--- a/api/BusinessLogic/Emails/MailgunEmailSender.php
+++ b/api/BusinessLogic/Emails/MailgunEmailSender.php
@@ -43,8 +43,6 @@ class MailgunEmailSender implements EmailSender {
             }
         }
 
-        var_dump($mailgunArray);
-
         $result = $this->sendMessage($mailgunArray, $mailgunAttachments, $modsForHeskSettings);
 
 
diff --git a/api/Tests/BusinessLogic/Emails/BasicEmailSenderIntegrationTest.php b/api/Tests/BusinessLogic/Emails/BasicEmailSenderIntegrationTest.php
index 4c946738..a3feb1a8 100644
--- a/api/Tests/BusinessLogic/Emails/BasicEmailSenderIntegrationTest.php
+++ b/api/Tests/BusinessLogic/Emails/BasicEmailSenderIntegrationTest.php
@@ -60,7 +60,6 @@ class BasicEmailSenderIntegrationTest extends IntegrationTestCaseBase {
         $emailBuilder->htmlMessage = "Test <b>HTML</b> <i>message</i>";
         $emailBuilder->subject = "BasicEmailSenderIntegrationTest";
 
-        // Uncomment to test attachments.
         $attachment = new Attachment();
         $attachment->id = 1;
         $attachment->fileName = "file.txt";
diff --git a/api/Tests/BusinessLogic/Emails/MailgunEmailSenderIntegrationTest.php b/api/Tests/BusinessLogic/Emails/MailgunEmailSenderIntegrationTest.php
index 1a5d5ec3..86948697 100644
--- a/api/Tests/BusinessLogic/Emails/MailgunEmailSenderIntegrationTest.php
+++ b/api/Tests/BusinessLogic/Emails/MailgunEmailSenderIntegrationTest.php
@@ -59,7 +59,6 @@ class MailgunEmailSenderIntegrationTest extends IntegrationTestCaseBase {
         $emailBuilder->htmlMessage = "Test <b>HTML</b> <i>message</i>";
         $emailBuilder->subject = "MailgunEmailSenderIntegrationTest";
 
-        // Uncomment to test attachments.
         $attachment = new Attachment();
         $attachment->id = 1;
         $attachment->fileName = "file.txt";

From c1638aeb981f04b8e07efcc47ecd3a81512030ae Mon Sep 17 00:00:00 2001
From: Mike Koch <Mike.Koch@emerson.com>
Date: Mon, 20 Feb 2017 13:05:41 -0500
Subject: [PATCH 053/192] First steps in supporting email validation

---
 api/BusinessLogic/Tickets/TicketCreator.php   |  3 +-
 .../Tickets/VerifiedEmailChecker.php          | 27 +++++++++
 .../Tickets/VerifiedEmailGateway.php          | 16 ++++++
 .../Tickets/VerifiedEmailCheckerTest.php      | 56 +++++++++++++++++++
 4 files changed, 101 insertions(+), 1 deletion(-)
 create mode 100644 api/BusinessLogic/Tickets/VerifiedEmailChecker.php
 create mode 100644 api/DataAccess/Tickets/VerifiedEmailGateway.php
 create mode 100644 api/Tests/BusinessLogic/Tickets/VerifiedEmailCheckerTest.php

diff --git a/api/BusinessLogic/Tickets/TicketCreator.php b/api/BusinessLogic/Tickets/TicketCreator.php
index 7d6c5687..ed0797d2 100644
--- a/api/BusinessLogic/Tickets/TicketCreator.php
+++ b/api/BusinessLogic/Tickets/TicketCreator.php
@@ -47,9 +47,10 @@ class TicketCreator {
      * @param $ticketRequest CreateTicketByCustomerModel
      * @param $heskSettings array HESK settings
      * @param $modsForHeskSettings array Mods for HESK settings
+     * @param $userContext
      * @return Ticket The newly created ticket
      * @throws ValidationException When a required field in $ticket_request is missing
-     *
+     * @throws \Exception When the default status for new tickets is not found
      */
     function createTicketByCustomer($ticketRequest, $heskSettings, $modsForHeskSettings, $userContext) {
         $validationModel = $this->newTicketValidator->validateNewTicketForCustomer($ticketRequest, $heskSettings, $userContext);
diff --git a/api/BusinessLogic/Tickets/VerifiedEmailChecker.php b/api/BusinessLogic/Tickets/VerifiedEmailChecker.php
new file mode 100644
index 00000000..fccb32fc
--- /dev/null
+++ b/api/BusinessLogic/Tickets/VerifiedEmailChecker.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: cokoch
+ * Date: 2/20/2017
+ * Time: 12:40 PM
+ */
+
+namespace BusinessLogic\Tickets;
+
+
+use DataAccess\Tickets\VerifiedEmailGateway;
+
+class VerifiedEmailChecker {
+    /**
+     * @var $verifiedEmailGateway VerifiedEmailGateway
+     */
+    private $verifiedEmailGateway;
+
+    function __construct($verifiedEmailGateway) {
+        $this->verifiedEmailGateway = $verifiedEmailGateway;
+    }
+
+    function isEmailVerified($emailAddress, $heskSettings) {
+        return $this->verifiedEmailGateway->isEmailVerified($emailAddress, $heskSettings);
+    }
+}
\ No newline at end of file
diff --git a/api/DataAccess/Tickets/VerifiedEmailGateway.php b/api/DataAccess/Tickets/VerifiedEmailGateway.php
new file mode 100644
index 00000000..4fa0667b
--- /dev/null
+++ b/api/DataAccess/Tickets/VerifiedEmailGateway.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace DataAccess\Tickets;
+
+
+use DataAccess\CommonDao;
+
+class VerifiedEmailGateway extends CommonDao {
+    function isEmailVerified($emailAddress, $heskSettings) {
+        $this->init();
+
+        $rs = hesk_dbQuery("SELECT 1 FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "verified_emails` WHERE `Email` = '" . hesk_dbEscape($emailAddress) . "'");
+
+        return hesk_dbNumRows($rs) > 0;
+    }
+}
\ No newline at end of file
diff --git a/api/Tests/BusinessLogic/Tickets/VerifiedEmailCheckerTest.php b/api/Tests/BusinessLogic/Tickets/VerifiedEmailCheckerTest.php
new file mode 100644
index 00000000..2cf838c5
--- /dev/null
+++ b/api/Tests/BusinessLogic/Tickets/VerifiedEmailCheckerTest.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace BusinessLogic\Tickets;
+
+
+use DataAccess\Tickets\VerifiedEmailGateway;
+use PHPUnit\Framework\TestCase;
+
+class VerifiedEmailCheckerTest extends TestCase {
+    /**
+     * @var $verifiedEmailGateway \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $verifiedEmailGateway;
+
+    /**
+     * @var $verifiedEmailChecker VerifiedEmailChecker
+     */
+    private $verifiedEmailChecker;
+
+    /**
+     * @var $heskSettings array
+     */
+    private $heskSettings;
+
+    protected function setUp() {
+        $this->verifiedEmailGateway = $this->createMock(VerifiedEmailGateway::class);
+        $this->heskSettings = array();
+        $this->verifiedEmailChecker = new VerifiedEmailChecker($this->verifiedEmailGateway);
+    }
+
+    function testItGetsTheValidationStateFromTheGatewayWhenItItTrue() {
+        //-- Arrange
+        $this->verifiedEmailGateway->method('isEmailVerified')
+            ->with('some email', $this->heskSettings)
+            ->willReturn(true);
+
+        //-- Act
+        $actual = $this->verifiedEmailChecker->isEmailVerified('some email', $this->heskSettings);
+
+        //-- Assert
+        self::assertThat($actual, self::isTrue());
+    }
+
+    function testItGetsTheValidationStateFromTheGatewayWhenItItFalse() {
+        //-- Arrange
+        $this->verifiedEmailGateway->method('isEmailVerified')
+            ->with('some email', $this->heskSettings)
+            ->willReturn(false);
+
+        //-- Act
+        $actual = $this->verifiedEmailChecker->isEmailVerified('some email', $this->heskSettings);
+
+        //-- Assert
+        self::assertThat($actual, self::isFalse());
+    }
+}

From 4c7449ea3e56b62ed90018c05764c1c1269368c6 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Mon, 20 Feb 2017 22:07:39 -0500
Subject: [PATCH 054/192] Properly handle tickets that need validation. Added
 comments for next steps

---
 api/BusinessLogic/Tickets/StageTicket.php     | 14 +++++++++++
 api/BusinessLogic/Tickets/TicketCreator.php   | 19 ++++++++++++---
 api/Controllers/Tickets/TicketController.php  |  4 ++++
 api/DataAccess/Tickets/TicketGateway.php      | 11 +++++----
 .../CreateTicketForCustomerTest.php           | 24 +++++++++++++++++--
 5 files changed, 62 insertions(+), 10 deletions(-)
 create mode 100644 api/BusinessLogic/Tickets/StageTicket.php

diff --git a/api/BusinessLogic/Tickets/StageTicket.php b/api/BusinessLogic/Tickets/StageTicket.php
new file mode 100644
index 00000000..7fec23a5
--- /dev/null
+++ b/api/BusinessLogic/Tickets/StageTicket.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: mkoch
+ * Date: 2/20/2017
+ * Time: 10:03 PM
+ */
+
+namespace BusinessLogic\Tickets;
+
+
+class StageTicket extends Ticket {
+    //-- Nothing here, just an indicator that it is a StageTicket and not a regular Ticket
+}
\ No newline at end of file
diff --git a/api/BusinessLogic/Tickets/TicketCreator.php b/api/BusinessLogic/Tickets/TicketCreator.php
index ed0797d2..8409623c 100644
--- a/api/BusinessLogic/Tickets/TicketCreator.php
+++ b/api/BusinessLogic/Tickets/TicketCreator.php
@@ -33,12 +33,18 @@ class TicketCreator {
      */
     private $ticketGateway;
 
-    function __construct($newTicketValidator, $trackingIdGenerator, $autoassigner, $statusGateway, $ticketGateway) {
+    /**
+     * @var $verifiedEmailChecker VerifiedEmailChecker
+     */
+    private $verifiedEmailChecker;
+
+    function __construct($newTicketValidator, $trackingIdGenerator, $autoassigner, $statusGateway, $ticketGateway, $verifiedEmailChecker) {
         $this->newTicketValidator = $newTicketValidator;
         $this->trackingIdGenerator = $trackingIdGenerator;
         $this->autoassigner = $autoassigner;
         $this->statusGateway = $statusGateway;
         $this->ticketGateway = $ticketGateway;
+        $this->verifiedEmailChecker = $verifiedEmailChecker;
     }
 
     /**
@@ -61,8 +67,15 @@ class TicketCreator {
             throw new ValidationException($validationModel);
         }
 
+        $emailVerified = true;
+        if ($modsForHeskSettings['customer_email_verification_required']) {
+            $emailVerified = $this->verifiedEmailChecker->isEmailVerified($ticketRequest->email, $heskSettings);
+        }
+
         // Create the ticket
-        $ticket = new Ticket();
+        $ticket = $emailVerified
+            ? new Ticket()
+            : new StageTicket();
         $ticket->trackingId = $this->trackingIdGenerator->generateTrackingId($heskSettings);
 
         if ($heskSettings['autoassign']) {
@@ -92,7 +105,7 @@ class TicketCreator {
         }
         $ticket->statusId = $status->id;
 
-        $ticketGatewayGeneratedFields = $this->ticketGateway->createTicket($ticket, $heskSettings);
+        $ticketGatewayGeneratedFields = $this->ticketGateway->createTicket($ticket, $emailVerified, $heskSettings);
 
         $ticket->dateCreated = $ticketGatewayGeneratedFields->dateCreated;
         $ticket->lastChanged = $ticketGatewayGeneratedFields->dateModified;
diff --git a/api/Controllers/Tickets/TicketController.php b/api/Controllers/Tickets/TicketController.php
index 5b67fd2c..01a58e13 100644
--- a/api/Controllers/Tickets/TicketController.php
+++ b/api/Controllers/Tickets/TicketController.php
@@ -29,6 +29,10 @@ class TicketController {
 
         $ticket = $ticketCreator->createTicketByCustomer($this->buildTicketRequestFromJson($jsonRequest), $hesk_settings, $modsForHeskSettings, $userContext);
 
+        //if ticket is a stageTicket, email user
+        //else if assigned to owner, email new owner
+        //else email all staff
+
         return output($ticket);
     }
 
diff --git a/api/DataAccess/Tickets/TicketGateway.php b/api/DataAccess/Tickets/TicketGateway.php
index 625c58f9..4d03b6e2 100644
--- a/api/DataAccess/Tickets/TicketGateway.php
+++ b/api/DataAccess/Tickets/TicketGateway.php
@@ -86,12 +86,11 @@ class TicketGateway extends CommonDao {
 
     /**
      * @param $ticket Ticket
+     * @param $isEmailVerified
      * @param $heskSettings
      * @return TicketGatewayGeneratedFields
      */
-    function createTicket($ticket, $heskSettings) {
-        global $hesklang;
-
+    function createTicket($ticket, $isEmailVerified, $heskSettings) {
         $this->init();
 
         $dueDate = $ticket->dueDate ? "'{$ticket->dueDate}'" : "NULL";
@@ -127,7 +126,9 @@ class TicketGateway extends CommonDao {
         $ipAddress = $ticket->ipAddress !== null
                     && $ticket->ipAddress !== '' ? $ticket->ipAddress : '';
 
-        $sql = "INSERT INTO `" . hesk_dbEscape($heskSettings['db_pfix']) . "tickets`
+        $tableName = $isEmailVerified ? 'tickets' : 'stage_tickets';
+
+        $sql = "INSERT INTO `" . hesk_dbEscape($heskSettings['db_pfix']) . $tableName ."`
         (
             `trackid`,
             `name`,
@@ -190,7 +191,7 @@ class TicketGateway extends CommonDao {
         hesk_dbQuery($sql);
         $id = hesk_dbInsertID();
 
-        $rs = hesk_dbQuery('SELECT `dt`, `lastchange` FROM `' . hesk_dbEscape($heskSettings['db_pfix']) . 'tickets` WHERE `id` = ' . intval($id));
+        $rs = hesk_dbQuery('SELECT `dt`, `lastchange` FROM `' . hesk_dbEscape($heskSettings['db_pfix']) . $tableName .'` WHERE `id` = ' . intval($id));
         $row = hesk_dbFetchAssoc($rs);
 
         $generatedFields = new TicketGatewayGeneratedFields();
diff --git a/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php b/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php
index fb8d81cc..54c22684 100644
--- a/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php
+++ b/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php
@@ -12,6 +12,7 @@ use BusinessLogic\Tickets\NewTicketValidator;
 use BusinessLogic\Tickets\TicketCreator;
 use BusinessLogic\Tickets\TicketGatewayGeneratedFields;
 use BusinessLogic\Tickets\TrackingIdGenerator;
+use BusinessLogic\Tickets\VerifiedEmailChecker;
 use BusinessLogic\ValidationModel;
 use Core\Constants\Priority;
 use DataAccess\Statuses\StatusGateway;
@@ -75,15 +76,21 @@ class CreateTicketTest extends TestCase {
      */
     private $ticketGatewayGeneratedFields;
 
+    /**
+     * @var $verifiedEmailChecker \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $verifiedEmailChecker;
+
     protected function setUp() {
         $this->ticketGateway = $this->createMock(TicketGateway::class);
         $this->newTicketValidator = $this->createMock(NewTicketValidator::class);
         $this->trackingIdGenerator = $this->createMock(TrackingIdGenerator::class);
         $this->autoassigner = $this->createMock(Autoassigner::class);
         $this->statusGateway = $this->createMock(StatusGateway::class);
+        $this->verifiedEmailChecker = $this->createMock(VerifiedEmailChecker::class);
 
         $this->ticketCreator = new TicketCreator($this->newTicketValidator, $this->trackingIdGenerator,
-            $this->autoassigner, $this->statusGateway, $this->ticketGateway);
+            $this->autoassigner, $this->statusGateway, $this->ticketGateway, $this->verifiedEmailChecker);
 
         $this->ticketRequest = new CreateTicketByCustomerModel();
         $this->ticketRequest->name = 'Name';
@@ -101,7 +108,9 @@ class CreateTicketTest extends TestCase {
             'custom_fields' => array(),
             'autoassign' => 0,
         );
-        $this->modsForHeskSettings = array();
+        $this->modsForHeskSettings = array(
+            'customer_email_verification_required' => false
+        );
         $this->userContext = new UserContext();
 
         $this->newTicketValidator->method('validateNewTicketForCustomer')->willReturn(new ValidationModel());
@@ -226,4 +235,15 @@ class CreateTicketTest extends TestCase {
         self::assertThat($ticket->timeWorked, self::equalTo('00:00:00'));
         self::assertThat($ticket->lastReplier, self::equalTo(0));
     }
+
+    function testItChecksIfTheEmailIsVerified() {
+        //-- Arrange
+        $this->modsForHeskSettings['customer_email_verification_required'] = true;
+
+        //-- Assert
+        $this->verifiedEmailChecker->expects($this->once())->method('isEmailVerified');
+
+        //-- Act
+        $this->ticketCreator->createTicketByCustomer($this->ticketRequest, $this->heskSettings, $this->modsForHeskSettings, $this->userContext);
+    }
 }

From b53e9aafd7b750d95befe95ea9142916af5abb06 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Wed, 22 Feb 2017 22:02:24 -0500
Subject: [PATCH 055/192] Getting started on email retrieval/parsing

---
 .../Emails/EmailTemplateRetriever.php         | 48 +++++++++++++++++++
 .../Emails/ValidEmailTemplates.php            | 31 ++++++++++++
 .../EmailTemplateNotFoundException.php        | 17 +++++++
 3 files changed, 96 insertions(+)
 create mode 100644 api/BusinessLogic/Emails/EmailTemplateRetriever.php
 create mode 100644 api/BusinessLogic/Emails/ValidEmailTemplates.php
 create mode 100644 api/BusinessLogic/Exceptions/EmailTemplateNotFoundException.php

diff --git a/api/BusinessLogic/Emails/EmailTemplateRetriever.php b/api/BusinessLogic/Emails/EmailTemplateRetriever.php
new file mode 100644
index 00000000..cab2e26b
--- /dev/null
+++ b/api/BusinessLogic/Emails/EmailTemplateRetriever.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: mkoch
+ * Date: 2/22/2017
+ * Time: 9:11 PM
+ */
+
+namespace BusinessLogic\Emails;
+
+
+use BusinessLogic\Exceptions\EmailTemplateNotFoundException;
+
+class EmailTemplateRetriever {
+
+    function getTemplateForLanguage($templateName, $language) {
+
+    }
+
+    private function getFromFileSystem($template, $language)
+    {
+        global $hesk_settings, $hesklang;
+
+        // Demo mode
+        if (defined('HESK_DEMO')) {
+            return '';
+        }
+
+        /* Get list of valid emails */
+        $valid_emails = hesk_validEmails();
+
+        /* Verify this is a valid email include */
+
+        if (!isset(ValidEmailTemplates::getValidEmailTemplates()[$template])) {
+            hesk_error($hesklang['inve']);
+        }
+
+        /* Get email template */
+        $file = 'language/' . $language . '/emails/' . $template . '.txt';
+        $absoluteFilePath = __DIR__ . '/../../../' . $file;
+
+        if (file_exists($absoluteFilePath)) {
+            return file_get_contents($absoluteFilePath);
+        } else {
+            throw new EmailTemplateNotFoundException($template, $language);
+        }
+    }
+}
\ No newline at end of file
diff --git a/api/BusinessLogic/Emails/ValidEmailTemplates.php b/api/BusinessLogic/Emails/ValidEmailTemplates.php
new file mode 100644
index 00000000..b57d3894
--- /dev/null
+++ b/api/BusinessLogic/Emails/ValidEmailTemplates.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: mkoch
+ * Date: 2/22/2017
+ * Time: 9:25 PM
+ */
+
+namespace BusinessLogic\Emails;
+
+
+class ValidEmailTemplates {
+    static function getValidEmailTemplates() {
+        return array(
+            'forgot_ticket_id' => 'forgot_ticket_id',
+            'new_reply_by_staff' => 'new_reply_by_staff',
+            'new_ticket' => 'ticket_received',
+            'verify_email' => 'verify_email',
+            'ticket_closed' => 'ticket_closed',
+            'category_moved' => 'category_moved',
+            'new_reply_by_customer' => 'new_reply_by_customer',
+            'new_ticket_staff' => 'new_ticket_staff',
+            'ticket_assigned_to_you' => 'ticket_assigned_to_you',
+            'new_pm' => 'new_pm',
+            'new_note' => 'new_note',
+            'reset_password' => 'reset_password',
+            'calendar_reminder' => 'calendar_reminder',
+            'overdue_ticket' => 'overdue_ticket',
+        );
+    }
+}
\ No newline at end of file
diff --git a/api/BusinessLogic/Exceptions/EmailTemplateNotFoundException.php b/api/BusinessLogic/Exceptions/EmailTemplateNotFoundException.php
new file mode 100644
index 00000000..9f1e63a3
--- /dev/null
+++ b/api/BusinessLogic/Exceptions/EmailTemplateNotFoundException.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: mkoch
+ * Date: 2/22/2017
+ * Time: 10:00 PM
+ */
+
+namespace BusinessLogic\Exceptions;
+
+
+class EmailTemplateNotFoundException extends ApiFriendlyException {
+    function __construct($emailTemplate, $language) {
+        parent::__construct(sprintf("The email template '%s' was not found for the language '%s'", $emailTemplate, $language),
+            'Email Template Not Found!', 400);
+    }
+}
\ No newline at end of file

From 9b2aa355b9cf13bf8f9470d6324e194ba88fd4a8 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Thu, 23 Feb 2017 22:04:56 -0500
Subject: [PATCH 056/192] Little progress, but still something

---
 .../Emails/EmailTemplateParser.php            | 66 +++++++++++++++++++
 .../Emails/EmailTemplateRetriever.php         | 48 --------------
 .../InvalidEmailTemplateException.php         | 16 +++++
 3 files changed, 82 insertions(+), 48 deletions(-)
 create mode 100644 api/BusinessLogic/Emails/EmailTemplateParser.php
 delete mode 100644 api/BusinessLogic/Emails/EmailTemplateRetriever.php
 create mode 100644 api/BusinessLogic/Exceptions/InvalidEmailTemplateException.php

diff --git a/api/BusinessLogic/Emails/EmailTemplateParser.php b/api/BusinessLogic/Emails/EmailTemplateParser.php
new file mode 100644
index 00000000..6f2fa836
--- /dev/null
+++ b/api/BusinessLogic/Emails/EmailTemplateParser.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: mkoch
+ * Date: 2/22/2017
+ * Time: 9:11 PM
+ */
+
+namespace BusinessLogic\Emails;
+
+
+use BusinessLogic\Exceptions\EmailTemplateNotFoundException;
+use BusinessLogic\Exceptions\InvalidEmailTemplateException;
+use BusinessLogic\Tickets\Ticket;
+use DataAccess\Statuses\StatusGateway;
+
+class EmailTemplateParser {
+
+    /**
+     * @var $statusGateway StatusGateway
+     */
+    private $statusGateway;
+
+    function __construct($statusGateway) {
+        $this->statusGateway = $statusGateway;
+    }
+
+    /**
+     * @param $templateName string
+     * @param $language string
+     * @param $ticket Ticket
+     */
+    function getFormattedEmailForLanguage($templateName, $language, $ticket) {
+        global $hesklang;
+
+        $template = self::getFromFileSystem($templateName, $language);
+        $subject = ValidEmailTemplates::getValidEmailTemplates()[$templateName];
+
+        $subject = self::parseSubject($subject, $ticket);
+    }
+
+    private function getFromFileSystem($template, $language)
+    {
+        if (!isset(ValidEmailTemplates::getValidEmailTemplates()[$template])) {
+            throw new InvalidEmailTemplateException($template);
+        }
+
+        /* Get email template */
+        $file = 'language/' . $language . '/emails/' . $template . '.txt';
+        $absoluteFilePath = __DIR__ . '/../../../' . $file;
+
+        if (file_exists($absoluteFilePath)) {
+            return file_get_contents($absoluteFilePath);
+        } else {
+            throw new EmailTemplateNotFoundException($template, $language);
+        }
+    }
+
+    private static function parseSubject($subjectTemplate, $ticket) {
+        if ($ticket === null) {
+            return $subjectTemplate;
+        }
+
+        //--
+    }
+}
\ No newline at end of file
diff --git a/api/BusinessLogic/Emails/EmailTemplateRetriever.php b/api/BusinessLogic/Emails/EmailTemplateRetriever.php
deleted file mode 100644
index cab2e26b..00000000
--- a/api/BusinessLogic/Emails/EmailTemplateRetriever.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: mkoch
- * Date: 2/22/2017
- * Time: 9:11 PM
- */
-
-namespace BusinessLogic\Emails;
-
-
-use BusinessLogic\Exceptions\EmailTemplateNotFoundException;
-
-class EmailTemplateRetriever {
-
-    function getTemplateForLanguage($templateName, $language) {
-
-    }
-
-    private function getFromFileSystem($template, $language)
-    {
-        global $hesk_settings, $hesklang;
-
-        // Demo mode
-        if (defined('HESK_DEMO')) {
-            return '';
-        }
-
-        /* Get list of valid emails */
-        $valid_emails = hesk_validEmails();
-
-        /* Verify this is a valid email include */
-
-        if (!isset(ValidEmailTemplates::getValidEmailTemplates()[$template])) {
-            hesk_error($hesklang['inve']);
-        }
-
-        /* Get email template */
-        $file = 'language/' . $language . '/emails/' . $template . '.txt';
-        $absoluteFilePath = __DIR__ . '/../../../' . $file;
-
-        if (file_exists($absoluteFilePath)) {
-            return file_get_contents($absoluteFilePath);
-        } else {
-            throw new EmailTemplateNotFoundException($template, $language);
-        }
-    }
-}
\ No newline at end of file
diff --git a/api/BusinessLogic/Exceptions/InvalidEmailTemplateException.php b/api/BusinessLogic/Exceptions/InvalidEmailTemplateException.php
new file mode 100644
index 00000000..460a9e9e
--- /dev/null
+++ b/api/BusinessLogic/Exceptions/InvalidEmailTemplateException.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: mkoch
+ * Date: 2/23/2017
+ * Time: 8:13 PM
+ */
+
+namespace BusinessLogic\Exceptions;
+
+
+class InvalidEmailTemplateException extends ApiFriendlyException {
+    function __construct($template) {
+        parent::__construct(sprintf("The email template '%s' is invalid", $template), 'Invalid Email Template', 400);
+    }
+}
\ No newline at end of file

From 0ceaafc0ec14be7ab9cd3b5f31a058fbc9d4545d Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Fri, 24 Feb 2017 22:01:54 -0500
Subject: [PATCH 057/192] Changes

---
 .../Emails/EmailTemplateParser.php            | 57 +++++++++++++++++--
 api/BusinessLogic/Statuses/Status.php         |  2 +-
 2 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/api/BusinessLogic/Emails/EmailTemplateParser.php b/api/BusinessLogic/Emails/EmailTemplateParser.php
index 6f2fa836..ac77fe0d 100644
--- a/api/BusinessLogic/Emails/EmailTemplateParser.php
+++ b/api/BusinessLogic/Emails/EmailTemplateParser.php
@@ -11,7 +11,10 @@ namespace BusinessLogic\Emails;
 
 use BusinessLogic\Exceptions\EmailTemplateNotFoundException;
 use BusinessLogic\Exceptions\InvalidEmailTemplateException;
+use BusinessLogic\Statuses\DefaultStatusForAction;
 use BusinessLogic\Tickets\Ticket;
+use Core\Constants\Priority;
+use DataAccess\Categories\CategoryGateway;
 use DataAccess\Statuses\StatusGateway;
 
 class EmailTemplateParser {
@@ -21,8 +24,14 @@ class EmailTemplateParser {
      */
     private $statusGateway;
 
-    function __construct($statusGateway) {
+    /**
+     * @var $categoryGateway CategoryGateway
+     */
+    private $categoryGateway;
+
+    function __construct($statusGateway, $categoryGateway) {
         $this->statusGateway = $statusGateway;
+        $this->categoryGateway = $categoryGateway;
     }
 
     /**
@@ -30,13 +39,13 @@ class EmailTemplateParser {
      * @param $language string
      * @param $ticket Ticket
      */
-    function getFormattedEmailForLanguage($templateName, $language, $ticket) {
+    function getFormattedEmailForLanguage($templateName, $language, $ticket, $heskSettings) {
         global $hesklang;
 
         $template = self::getFromFileSystem($templateName, $language);
         $subject = ValidEmailTemplates::getValidEmailTemplates()[$templateName];
 
-        $subject = self::parseSubject($subject, $ticket);
+        $subject = $this->parseSubject($subject, $ticket, $language, $heskSettings);
     }
 
     private function getFromFileSystem($template, $language)
@@ -56,11 +65,49 @@ class EmailTemplateParser {
         }
     }
 
-    private static function parseSubject($subjectTemplate, $ticket) {
+    /**
+     * @param $subjectTemplate string
+     * @param $ticket Ticket
+     * @param $language string
+     * @param $heskSettings array
+     * @return string
+     */
+    private function parseSubject($subjectTemplate, $ticket, $language, $heskSettings) {
+        global $hesklang;
+
         if ($ticket === null) {
             return $subjectTemplate;
         }
 
-        //--
+        // Status name and category name
+        $defaultStatus = $this->statusGateway->getStatusForDefaultAction(DefaultStatusForAction::NEW_TICKET, $heskSettings);
+        $statusName = $defaultStatus->localizedNames[$language]->text;
+        $category = $this->categoryGateway->getAllCategories($heskSettings)[$ticket->categoryId];
+
+        $priority = '';
+        switch ($ticket->priorityId) {
+            case Priority::CRITICAL:
+                $priority = $hesklang['critical'];
+                break;
+            case Priority::HIGH:
+                $priority = $hesklang['high'];
+                break;
+            case Priority::MEDIUM:
+                $priority = $hesklang['medium'];
+                break;
+            case Priority::LOW:
+                $priority = $hesklang['low'];
+                break;
+            default:
+                $priority = 'PRIORITY NOT FOUND';
+                break;
+        }
+
+        // Special tags
+        $msg = str_replace('%%SUBJECT%%', $ticket->subject, $subjectTemplate);
+        $msg = str_replace('%%TRACK_ID%%', $ticket->trackingId, $msg);
+        $msg = str_replace('%%CATEGORY%%', $category->id, $msg);
+        $msg = str_replace('%%PRIORITY%%', $priority, $msg);
+        $msg = str_replace('%%STATUS%%', $statusName, $msg);
     }
 }
\ No newline at end of file
diff --git a/api/BusinessLogic/Statuses/Status.php b/api/BusinessLogic/Statuses/Status.php
index 615abf75..37561bd7 100644
--- a/api/BusinessLogic/Statuses/Status.php
+++ b/api/BusinessLogic/Statuses/Status.php
@@ -18,7 +18,7 @@ class Status {
 
         $localizedLanguages = array();
         while ($languageRow = hesk_dbFetchAssoc($languageRs)) {
-            $localizedLanguages[] = new StatusLanguage($languageRow['language'], $languageRow['text']);
+            $localizedLanguages[$languageRow['language']] = new StatusLanguage($languageRow['language'], $languageRow['text']);
         }
         $status->localizedNames = $localizedLanguages;
         $status->sort = $row['sort'];

From 41123e987b0614c907343daef5a23712ff6cb7be Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sun, 26 Feb 2017 21:52:12 -0500
Subject: [PATCH 058/192] Some more API changes

---
 .../Emails/EmailTemplateParser.php            | 116 ++++++++++++++++--
 api/DataAccess/Security/UserGateway.php       |  15 +++
 api/autoload.php                              |   1 +
 api/composer.json                             |   3 +-
 inc/common.inc.php                            |   1 -
 5 files changed, 124 insertions(+), 12 deletions(-)

diff --git a/api/BusinessLogic/Emails/EmailTemplateParser.php b/api/BusinessLogic/Emails/EmailTemplateParser.php
index ac77fe0d..8f0e9f4d 100644
--- a/api/BusinessLogic/Emails/EmailTemplateParser.php
+++ b/api/BusinessLogic/Emails/EmailTemplateParser.php
@@ -15,6 +15,7 @@ use BusinessLogic\Statuses\DefaultStatusForAction;
 use BusinessLogic\Tickets\Ticket;
 use Core\Constants\Priority;
 use DataAccess\Categories\CategoryGateway;
+use DataAccess\Security\UserGateway;
 use DataAccess\Statuses\StatusGateway;
 
 class EmailTemplateParser {
@@ -29,9 +30,15 @@ class EmailTemplateParser {
      */
     private $categoryGateway;
 
-    function __construct($statusGateway, $categoryGateway) {
+    /**
+     * @var $userGateway UserGateway
+     */
+    private $userGateway;
+
+    function __construct($statusGateway, $categoryGateway, $userGateway) {
         $this->statusGateway = $statusGateway;
         $this->categoryGateway = $categoryGateway;
+        $this->userGateway = $userGateway;
     }
 
     /**
@@ -42,20 +49,31 @@ class EmailTemplateParser {
     function getFormattedEmailForLanguage($templateName, $language, $ticket, $heskSettings) {
         global $hesklang;
 
-        $template = self::getFromFileSystem($templateName, $language);
+        $template = self::getFromFileSystem($templateName, $language, false);
+        $htmlTemplate = self::getFromFileSystem($templateName, $language, true);
         $subject = ValidEmailTemplates::getValidEmailTemplates()[$templateName];
 
         $subject = $this->parseSubject($subject, $ticket, $language, $heskSettings);
+        $message = $this->parseMessage($subject, $ticket, $language, $heskSettings);
     }
 
-    private function getFromFileSystem($template, $language)
+    /**
+     * @param $template string
+     * @param $language string
+     * @param $html bool
+     * @return string The template
+     * @throws EmailTemplateNotFoundException If the template was not found in the filesystem for the provided language
+     * @throws InvalidEmailTemplateException If the $template is not a valid template name
+     */
+    private function getFromFileSystem($template, $language, $html)
     {
         if (!isset(ValidEmailTemplates::getValidEmailTemplates()[$template])) {
             throw new InvalidEmailTemplateException($template);
         }
+        $htmlFolder = $html ? 'html/' : '';
 
         /* Get email template */
-        $file = 'language/' . $language . '/emails/' . $template . '.txt';
+        $file = "language/{$language}/emails/{$htmlFolder}{$template}.txt";
         $absoluteFilePath = __DIR__ . '/../../../' . $file;
 
         if (file_exists($absoluteFilePath)) {
@@ -71,10 +89,15 @@ class EmailTemplateParser {
      * @param $language string
      * @param $heskSettings array
      * @return string
+     * @throws \Exception if common.inc.php isn't loaded
      */
     private function parseSubject($subjectTemplate, $ticket, $language, $heskSettings) {
         global $hesklang;
 
+        if (!function_exists('hesk_msgToPlain')) {
+            throw new \Exception("common.inc.php not loaded!");
+        }
+
         if ($ticket === null) {
             return $subjectTemplate;
         }
@@ -84,7 +107,6 @@ class EmailTemplateParser {
         $statusName = $defaultStatus->localizedNames[$language]->text;
         $category = $this->categoryGateway->getAllCategories($heskSettings)[$ticket->categoryId];
 
-        $priority = '';
         switch ($ticket->priorityId) {
             case Priority::CRITICAL:
                 $priority = $hesklang['critical'];
@@ -104,10 +126,84 @@ class EmailTemplateParser {
         }
 
         // Special tags
-        $msg = str_replace('%%SUBJECT%%', $ticket->subject, $subjectTemplate);
-        $msg = str_replace('%%TRACK_ID%%', $ticket->trackingId, $msg);
-        $msg = str_replace('%%CATEGORY%%', $category->id, $msg);
-        $msg = str_replace('%%PRIORITY%%', $priority, $msg);
-        $msg = str_replace('%%STATUS%%', $statusName, $msg);
+        $subject = str_replace('%%SUBJECT%%', $ticket->subject, $subjectTemplate);
+        $subject = str_replace('%%TRACK_ID%%', $ticket->trackingId, $subject);
+        $subject = str_replace('%%CATEGORY%%', $category->id, $subject);
+        $subject = str_replace('%%PRIORITY%%', $priority, $subject);
+        $subject = str_replace('%%STATUS%%', $statusName, $subject);
+
+        return $subject;
+    }
+
+    /**
+     * @param $messageTemplate string
+     * @param $ticket Ticket
+     * @param $language string
+     * @param $heskSettings array
+     * @return string
+     * @throws \Exception if common.inc.php isn't loaded
+     */
+    private function parseMessage($messageTemplate, $ticket, $language, $admin, $heskSettings) {
+        global $hesklang;
+
+        if (!function_exists('hesk_msgToPlain')) {
+            throw new \Exception("common.inc.php not loaded!");
+        }
+
+        if ($ticket === null) {
+            return $messageTemplate;
+        }
+
+        $heskSettings['site_title'] = hesk_msgToPlain($heskSettings['site_title'], 1);
+
+        // Is email required to view ticket (for customers only)?
+        $heskSettings['e_param'] = $heskSettings['email_view_ticket'] ? '&e=' . rawurlencode($ticket->email) : '';
+
+        /* Generate the ticket URLs */
+        $trackingURL = $heskSettings['hesk_url'];
+        $trackingURL .= $admin ? '/' . $heskSettings['admin_dir'] . '/admin_ticket.php' : '/ticket.php';
+        $trackingURL .= '?track=' . $ticket['trackid'] . ($admin ? '' : $heskSettings['e_param']) . '&Refresh=' . rand(10000, 99999);
+
+        // Status name and category name
+        $defaultStatus = $this->statusGateway->getStatusForDefaultAction(DefaultStatusForAction::NEW_TICKET, $heskSettings);
+        $statusName = hesk_msgToPlain($defaultStatus->localizedNames[$language]->text);
+        $category = hesk_msgToPlain($this->categoryGateway->getAllCategories($heskSettings)[$ticket->categoryId]);
+        $owner = hesk_msgToPlain($this->userGateway->getNameForId($ticket->ownerId, $heskSettings));
+
+        switch ($ticket->priorityId) {
+            case Priority::CRITICAL:
+                $priority = $hesklang['critical'];
+                break;
+            case Priority::HIGH:
+                $priority = $hesklang['high'];
+                break;
+            case Priority::MEDIUM:
+                $priority = $hesklang['medium'];
+                break;
+            case Priority::LOW:
+                $priority = $hesklang['low'];
+                break;
+            default:
+                $priority = 'PRIORITY NOT FOUND';
+                break;
+        }
+
+        // Special tags
+        $msg = str_replace('%%NAME%%', $ticket->name, $messageTemplate);
+        $msg = str_replace('%%SUBJECT%%', $ticket['subject'], $msg);
+        $msg = str_replace('%%TRACK_ID%%', $ticket['trackid'], $msg);
+        $msg = str_replace('%%TRACK_URL%%', $trackingURL, $msg);
+        $msg = str_replace('%%SITE_TITLE%%', $hesk_settings['site_title'], $msg);
+        $msg = str_replace('%%SITE_URL%%', $hesk_settings['site_url'], $msg);
+        $msg = str_replace('%%CATEGORY%%', $ticket['category'], $msg);
+        $msg = str_replace('%%PRIORITY%%', $ticket['priority'], $msg);
+        $msg = str_replace('%%OWNER%%', $ticket['owner'], $msg);
+        $msg = str_replace('%%STATUS%%', $ticket['status'], $msg);
+        $msg = str_replace('%%EMAIL%%', $ticket['email'], $msg);
+        $msg = str_replace('%%CREATED%%', $ticket['dt'], $msg);
+        $msg = str_replace('%%UPDATED%%', $ticket['lastchange'], $msg);
+        $msg = str_replace('%%ID%%', $ticket['id'], $msg);
+
+        return $subject;
     }
 }
\ No newline at end of file
diff --git a/api/DataAccess/Security/UserGateway.php b/api/DataAccess/Security/UserGateway.php
index 1962f3ff..b44be8b5 100644
--- a/api/DataAccess/Security/UserGateway.php
+++ b/api/DataAccess/Security/UserGateway.php
@@ -31,4 +31,19 @@ class UserGateway extends CommonDao {
 
         return $row;
     }
+    
+    // TODO Replace this with a basic User retrieval
+    function getNameForId($id, $heskSettings) {
+        $this->init();
+        
+        $rs = hesk_dbQuery("SELECT `name` FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "users` WHERE `id` = " . intval($id));
+        
+        if (hesk_dbNumRows($rs) === 0) {
+            return null;
+        }
+        
+        $row = hesk_dbFetchAssoc($rs);
+        
+        return $row['name'];
+    }
 }
\ No newline at end of file
diff --git a/api/autoload.php b/api/autoload.php
index 1a2db8c2..5ffee38e 100644
--- a/api/autoload.php
+++ b/api/autoload.php
@@ -4,6 +4,7 @@
 // Core requirements
 define('IN_SCRIPT', 1);
 define('HESK_PATH', '../');
+require_once(__DIR__ . 'vendor/autoload.php');
 require_once(__DIR__ . '/bootstrap.php');
 require_once(__DIR__ . '/../hesk_settings.inc.php');
 require_once(__DIR__ . '/../inc/common.inc.php');
diff --git a/api/composer.json b/api/composer.json
index 8b3f0002..f79dd05d 100644
--- a/api/composer.json
+++ b/api/composer.json
@@ -16,6 +16,7 @@
     "php-http/guzzle6-adapter": "^1.1",
     "php-http/message": "^1.5",
     "php-http/curl-client": "^1.7",
-    "guzzlehttp/psr7": "^1.3"
+    "guzzlehttp/psr7": "^1.3",
+    "doctrine/orm": "*"
   }
 }
diff --git a/inc/common.inc.php b/inc/common.inc.php
index cf54fa9e..72772a16 100644
--- a/inc/common.inc.php
+++ b/inc/common.inc.php
@@ -989,7 +989,6 @@ function hesk_ticketToPlain($ticket, $specialchars = 0, $strip = 1)
     }
 } // END hesk_ticketToPlain()
 
-
 function hesk_msgToPlain($msg, $specialchars = 0, $strip = 1)
 {
     $msg = preg_replace('/\<a href="(mailto:)?([^"]*)"[^\<]*\<\/a\>/i', "$2", $msg);

From c3e70309bcfe7a98ce7b44f7c87b6bb698119b89 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Mon, 27 Feb 2017 21:24:24 -0500
Subject: [PATCH 059/192] Some more changes

---
 .../Emails/EmailTemplateParser.php            | 35 ++++++++++---------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/api/BusinessLogic/Emails/EmailTemplateParser.php b/api/BusinessLogic/Emails/EmailTemplateParser.php
index 8f0e9f4d..8d32bfef 100644
--- a/api/BusinessLogic/Emails/EmailTemplateParser.php
+++ b/api/BusinessLogic/Emails/EmailTemplateParser.php
@@ -46,7 +46,7 @@ class EmailTemplateParser {
      * @param $language string
      * @param $ticket Ticket
      */
-    function getFormattedEmailForLanguage($templateName, $language, $ticket, $heskSettings) {
+    function getFormattedEmailForLanguage($templateName, $language, $ticket, $forStaff, $heskSettings) {
         global $hesklang;
 
         $template = self::getFromFileSystem($templateName, $language, false);
@@ -54,7 +54,8 @@ class EmailTemplateParser {
         $subject = ValidEmailTemplates::getValidEmailTemplates()[$templateName];
 
         $subject = $this->parseSubject($subject, $ticket, $language, $heskSettings);
-        $message = $this->parseMessage($subject, $ticket, $language, $heskSettings);
+        $message = $this->parseMessage($template, $ticket, $language, $forStaff, $heskSettings);
+        $htmlMessage = $this->parseMessage($htmlTemplate, $ticket, $language, $forStaff, $heskSettings);
     }
 
     /**
@@ -162,7 +163,7 @@ class EmailTemplateParser {
         /* Generate the ticket URLs */
         $trackingURL = $heskSettings['hesk_url'];
         $trackingURL .= $admin ? '/' . $heskSettings['admin_dir'] . '/admin_ticket.php' : '/ticket.php';
-        $trackingURL .= '?track=' . $ticket['trackid'] . ($admin ? '' : $heskSettings['e_param']) . '&Refresh=' . rand(10000, 99999);
+        $trackingURL .= '?track=' . $ticket->trackingId . ($admin ? '' : $heskSettings['e_param']) . '&Refresh=' . rand(10000, 99999);
 
         // Status name and category name
         $defaultStatus = $this->statusGateway->getStatusForDefaultAction(DefaultStatusForAction::NEW_TICKET, $heskSettings);
@@ -190,20 +191,20 @@ class EmailTemplateParser {
 
         // Special tags
         $msg = str_replace('%%NAME%%', $ticket->name, $messageTemplate);
-        $msg = str_replace('%%SUBJECT%%', $ticket['subject'], $msg);
-        $msg = str_replace('%%TRACK_ID%%', $ticket['trackid'], $msg);
+        $msg = str_replace('%%SUBJECT%%', $ticket->subject, $msg);
+        $msg = str_replace('%%TRACK_ID%%', $ticket->trackingId, $msg);
         $msg = str_replace('%%TRACK_URL%%', $trackingURL, $msg);
-        $msg = str_replace('%%SITE_TITLE%%', $hesk_settings['site_title'], $msg);
-        $msg = str_replace('%%SITE_URL%%', $hesk_settings['site_url'], $msg);
-        $msg = str_replace('%%CATEGORY%%', $ticket['category'], $msg);
-        $msg = str_replace('%%PRIORITY%%', $ticket['priority'], $msg);
-        $msg = str_replace('%%OWNER%%', $ticket['owner'], $msg);
-        $msg = str_replace('%%STATUS%%', $ticket['status'], $msg);
-        $msg = str_replace('%%EMAIL%%', $ticket['email'], $msg);
-        $msg = str_replace('%%CREATED%%', $ticket['dt'], $msg);
-        $msg = str_replace('%%UPDATED%%', $ticket['lastchange'], $msg);
-        $msg = str_replace('%%ID%%', $ticket['id'], $msg);
-
-        return $subject;
+        $msg = str_replace('%%SITE_TITLE%%', $heskSettings['site_title'], $msg);
+        $msg = str_replace('%%SITE_URL%%', $heskSettings['site_url'], $msg);
+        $msg = str_replace('%%CATEGORY%%', $category, $msg);
+        $msg = str_replace('%%PRIORITY%%', $priority, $msg);
+        $msg = str_replace('%%OWNER%%', $owner, $msg);
+        $msg = str_replace('%%STATUS%%', $statusName, $msg);
+        $msg = str_replace('%%EMAIL%%', $ticket->email, $msg);
+        $msg = str_replace('%%CREATED%%', $ticket->dateCreated, $msg);
+        $msg = str_replace('%%UPDATED%%', $ticket->lastChanged, $msg);
+        $msg = str_replace('%%ID%%', $ticket->id, $msg);
+
+        return $msg;
     }
 }
\ No newline at end of file

From 36f8de957a18608402a43d5d6dcf1206ebbe45cd Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Tue, 28 Feb 2017 22:03:08 -0500
Subject: [PATCH 060/192] Able to parse email templates.... I hope

---
 .../Emails/EmailTemplateParser.php            | 109 +++++++++++++++++-
 .../Emails/ParsedEmailProperties.php          |  33 ++++++
 api/BusinessLogic/Tickets/Reply.php           |  62 ++++++++++
 api/BusinessLogic/Tickets/Ticket.php          |  41 ++++++-
 api/DataAccess/Tickets/TicketGateway.php      |   4 +-
 5 files changed, 243 insertions(+), 6 deletions(-)
 create mode 100644 api/BusinessLogic/Emails/ParsedEmailProperties.php
 create mode 100644 api/BusinessLogic/Tickets/Reply.php

diff --git a/api/BusinessLogic/Emails/EmailTemplateParser.php b/api/BusinessLogic/Emails/EmailTemplateParser.php
index 8d32bfef..850393fa 100644
--- a/api/BusinessLogic/Emails/EmailTemplateParser.php
+++ b/api/BusinessLogic/Emails/EmailTemplateParser.php
@@ -46,7 +46,7 @@ class EmailTemplateParser {
      * @param $language string
      * @param $ticket Ticket
      */
-    function getFormattedEmailForLanguage($templateName, $language, $ticket, $forStaff, $heskSettings) {
+    function getFormattedEmailForLanguage($templateName, $language, $ticket, $forStaff, $heskSettings, $modsForHeskSettings) {
         global $hesklang;
 
         $template = self::getFromFileSystem($templateName, $language, false);
@@ -54,8 +54,10 @@ class EmailTemplateParser {
         $subject = ValidEmailTemplates::getValidEmailTemplates()[$templateName];
 
         $subject = $this->parseSubject($subject, $ticket, $language, $heskSettings);
-        $message = $this->parseMessage($template, $ticket, $language, $forStaff, $heskSettings);
-        $htmlMessage = $this->parseMessage($htmlTemplate, $ticket, $language, $forStaff, $heskSettings);
+        $message = $this->parseMessage($template, $ticket, $language, $forStaff, $heskSettings, $modsForHeskSettings, false);
+        $htmlMessage = $this->parseMessage($htmlTemplate, $ticket, $language, $forStaff, $heskSettings, $modsForHeskSettings, true);
+
+        return new ParsedEmailProperties($subject, $message, $htmlMessage);
     }
 
     /**
@@ -144,7 +146,7 @@ class EmailTemplateParser {
      * @return string
      * @throws \Exception if common.inc.php isn't loaded
      */
-    private function parseMessage($messageTemplate, $ticket, $language, $admin, $heskSettings) {
+    private function parseMessage($messageTemplate, $ticket, $language, $admin, $heskSettings, $modsForHeskSettings, $html) {
         global $hesklang;
 
         if (!function_exists('hesk_msgToPlain')) {
@@ -205,6 +207,105 @@ class EmailTemplateParser {
         $msg = str_replace('%%UPDATED%%', $ticket->lastChanged, $msg);
         $msg = str_replace('%%ID%%', $ticket->id, $msg);
 
+        /* All custom fields */
+        for ($i=1; $i<=50; $i++) {
+            $k = 'custom'.$i;
+
+            if (isset($heskSettings['custom_fields'][$k])) {
+                $v = $heskSettings['custom_fields'][$k];
+
+                switch ($v['type']) {
+                    case 'checkbox':
+                        $ticket->customFields[$i] = str_replace("<br>","\n",$ticket->customFields[$i]);
+                        break;
+                    case 'date':
+                        $ticket->customFields[$i] = hesk_custom_date_display_format($ticket->customFields[$i], $v['value']['date_format']);
+                        break;
+                }
+
+                $msg = str_replace('%%'.strtoupper($k).'%%',stripslashes($ticket->customFields[$i]),$msg);
+            } else {
+                $msg = str_replace('%%'.strtoupper($k).'%%','',$msg);
+            }
+        }
+
+        // Is message tag in email template?
+        if (strpos($msg, '%%MESSAGE%%') !== false) {
+            // Replace message
+            if ($html) {
+                $htmlMessage = nl2br($ticket->message);
+                $msg = str_replace('%%MESSAGE%%', $htmlMessage, $msg);
+            } else {
+                $plainTextMessage = $ticket->message;
+
+                $messageHtml = $ticket->usesHtml;
+
+                if (count($ticket->replies) > 0) {
+                    $lastReply = end($ticket->replies);
+                    $messageHtml = $lastReply->usesHtml;
+                }
+
+                if ($messageHtml) {
+                    if (!function_exists('convert_html_to_text')) {
+                        require(__DIR__ . '/../../../inc/html2text/html2text.php');
+                    }
+                    $plainTextMessage = convert_html_to_text($plainTextMessage);
+                    $plainTextMessage = fix_newlines($plainTextMessage);
+                }
+                $msg = str_replace('%%MESSAGE%%', $plainTextMessage, $msg);
+            }
+
+            // Add direct links to any attachments at the bottom of the email message
+            if ($heskSettings['attachments']['use'] && isset($ticket->attachments) && count($ticket->attachments) > 0) {
+                if (!$modsForHeskSettings['attachments']) {
+                    if ($html) {
+                        $msg .= "<br><br><br>" . $hesklang['fatt'];
+                    } else {
+                        $msg .= "\n\n\n" . $hesklang['fatt'];
+                    }
+
+                    foreach ($ticket->attachments as $attachment) {
+                        if ($html) {
+                            $msg .= "<br><br>{$attachment->fileName}<br>";
+                        } else {
+                            $msg .= "\n\n{$attachment->fileName}\n";
+                        }
+
+                        $msg .= "{$heskSettings['hesk_url']}/download_attachment.php?att_id={$attachment->id}&track={$ticket->trackingId}{$heskSettings['e_param']}";
+                    }
+                }
+            }
+
+            // For customer notifications: if we allow email piping/pop 3 fetching and
+            // stripping quoted replies add an "reply above this line" tag
+            if (!$admin && ($heskSettings['email_piping'] || $heskSettings['pop3']) && $heskSettings['strip_quoted']) {
+                $msg = $hesklang['EMAIL_HR'] . "\n\n" . $msg;
+            }
+        } elseif (strpos($msg, '%%MESSAGE_NO_ATTACHMENTS%%') !== false) {
+            if ($html) {
+                $htmlMessage = nl2br($ticket->message);
+                $msg = str_replace('%%MESSAGE_NO_ATTACHMENTS%%', $htmlMessage, $msg);
+            } else {
+                $plainTextMessage = $ticket->message;
+
+                $messageHtml = $ticket->usesHtml;
+
+                if (count($ticket->replies) > 0) {
+                    $lastReply = end($ticket->replies);
+                    $messageHtml = $lastReply->usesHtml;
+                }
+
+                if ($messageHtml) {
+                    if (!function_exists('convert_html_to_text')) {
+                        require(__DIR__ . '/../../../inc/html2text/html2text.php');
+                    }
+                    $plainTextMessage = convert_html_to_text($plainTextMessage);
+                    $plainTextMessage = fix_newlines($plainTextMessage);
+                }
+                $msg = str_replace('%%MESSAGE_NO_ATTACHMENTS%%', $plainTextMessage, $msg);
+            }
+        }
+
         return $msg;
     }
 }
\ No newline at end of file
diff --git a/api/BusinessLogic/Emails/ParsedEmailProperties.php b/api/BusinessLogic/Emails/ParsedEmailProperties.php
new file mode 100644
index 00000000..5cbe594f
--- /dev/null
+++ b/api/BusinessLogic/Emails/ParsedEmailProperties.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: mkoch
+ * Date: 2/28/2017
+ * Time: 9:36 PM
+ */
+
+namespace BusinessLogic\Emails;
+
+
+class ParsedEmailProperties {
+    function __construct($subject, $message, $htmlMessage) {
+        $this->subject = $subject;
+        $this->message = $message;
+        $this->htmlMessage = $htmlMessage;
+    }
+
+    /**
+     * @var $subject string
+     */
+    public $subject;
+
+    /**
+     * @var $message string
+     */
+    public $message;
+
+    /**
+     * @var $htmlMessage string
+     */
+    public $htmlMessage;
+}
\ No newline at end of file
diff --git a/api/BusinessLogic/Tickets/Reply.php b/api/BusinessLogic/Tickets/Reply.php
new file mode 100644
index 00000000..77c1d4b9
--- /dev/null
+++ b/api/BusinessLogic/Tickets/Reply.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: mkoch
+ * Date: 2/28/2017
+ * Time: 9:17 PM
+ */
+
+namespace BusinessLogic\Tickets;
+
+
+class Reply {
+    /**
+     * @var $id int
+     */
+    public $id;
+
+    /**
+     * @var $ticketId int
+     */
+    public $ticketId;
+
+    /**
+     * @var $replierName string
+     */
+    public $replierName;
+
+    /**
+     * @var $message string
+     */
+    public $message;
+
+    /**
+     * @var $dateCreated string
+     */
+    public $dateCreated;
+
+    /**
+     * @var $attachments Attachment[]
+     */
+    public $attachments;
+
+    /**
+     * @var $staffId int|null
+     */
+    public $staffId;
+
+    /**
+     * @var $rating int|null
+     */
+    public $rating;
+
+    /**
+     * @var $isRead bool
+     */
+    public $isRead;
+
+    /**
+     * @var $usesHtml bool
+     */
+    public $usesHtml;
+}
\ No newline at end of file
diff --git a/api/BusinessLogic/Tickets/Ticket.php b/api/BusinessLogic/Tickets/Ticket.php
index dd480fd6..73442104 100644
--- a/api/BusinessLogic/Tickets/Ticket.php
+++ b/api/BusinessLogic/Tickets/Ticket.php
@@ -4,7 +4,7 @@ namespace BusinessLogic\Tickets;
 
 
 class Ticket {
-    static function fromDatabaseRow($row, $linkedTicketsRs, $heskSettings) {
+    static function fromDatabaseRow($row, $linkedTicketsRs, $repliesRs, $heskSettings) {
         $ticket = new Ticket();
         $ticket->id = intval($row['id']);
         $ticket->trackingId = $row['trackid'];
@@ -93,6 +93,40 @@ class Ticket {
         $ticket->dueDate = $row['due_date'];
         $ticket->dueDateOverdueEmailSent = $row['overdue_email_sent'] !== null && intval($row['overdue_email_sent']) === 1;
 
+        $replies = array();
+        while ($replyRow = hesk_dbFetchAssoc($repliesRs)) {
+            $reply = new Reply();
+            $reply->id = $replyRow['id'];
+            $reply->ticketId = $replyRow['replyto'];
+            $reply->replierName = $replyRow['name'];
+            $reply->message = $replyRow['message'];
+            $reply->dateCreated = $replyRow['dt'];
+
+            if (trim($replyRow['attachments']) !== '') {
+                $attachments = explode(',', $replyRow['attachments']);
+                $attachmentArray = array();
+                foreach ($attachments as $attachment) {
+                    $attachmentRow = explode('#', $attachment);
+                    $attachmentModel = new Attachment();
+
+                    $attachmentModel->id = $attachmentRow[0];
+                    $attachmentModel->fileName = $attachmentRow[1];
+                    $attachmentModel->savedName = $attachmentRow[2];
+
+                    $attachmentArray[] = $attachmentModel;
+                }
+                $reply->attachments = $attachmentArray;
+            }
+
+            $reply->staffId = $replyRow['staffid'] > 0 ? $replyRow['staffid'] : null;
+            $reply->rating = $replyRow['rating'];
+            $reply->isRead = $replyRow['read'];
+            $reply->usesHtml = $replyRow['html'];
+
+            $replies[] = $reply;
+        }
+        $ticket->replies = $replies;
+
         return $ticket;
     }
 
@@ -300,4 +334,9 @@ class Ticket {
      * @var bool|null
      */
     public $dueDateOverdueEmailSent;
+
+    /**
+     * @var Reply[]
+     */
+    public $replies;
 }
\ No newline at end of file
diff --git a/api/DataAccess/Tickets/TicketGateway.php b/api/DataAccess/Tickets/TicketGateway.php
index 4d03b6e2..8b1f29d4 100644
--- a/api/DataAccess/Tickets/TicketGateway.php
+++ b/api/DataAccess/Tickets/TicketGateway.php
@@ -25,7 +25,9 @@ class TicketGateway extends CommonDao {
         $row = hesk_dbFetchAssoc($rs);
         $linkedTicketsRs = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "tickets` WHERE `parent` = " . intval($id));
 
-        $ticket = Ticket::fromDatabaseRow($row, $linkedTicketsRs, $heskSettings);
+        $repliesRs = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "replies` WHERE `replyto` = " . intval($id) . " ORDER BY `id` ASC");
+
+        $ticket = Ticket::fromDatabaseRow($row, $linkedTicketsRs, $repliesRs, $heskSettings);
 
         $this->close();
 

From 9832ca58ba93401b8161c948bb555735793c2ff1 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Thu, 2 Mar 2017 22:05:28 -0500
Subject: [PATCH 061/192] Some refactoring to the email stuff

---
 api/BusinessLogic/Emails/EmailSender.php      |  2 +-
 .../Emails/EmailSenderHelper.php              | 35 ++++++++++
 api/BusinessLogic/Emails/EmailTemplate.php    | 27 ++++++++
 .../Emails/EmailTemplateParser.php            | 42 ++++++------
 .../Emails/EmailTemplateRetriever.php         | 65 +++++++++++++++++++
 .../Emails/ValidEmailTemplates.php            | 31 ---------
 .../Emails/EmailSenderHelperTest.php          | 41 ++++++++++++
 7 files changed, 192 insertions(+), 51 deletions(-)
 create mode 100644 api/BusinessLogic/Emails/EmailSenderHelper.php
 create mode 100644 api/BusinessLogic/Emails/EmailTemplate.php
 create mode 100644 api/BusinessLogic/Emails/EmailTemplateRetriever.php
 delete mode 100644 api/BusinessLogic/Emails/ValidEmailTemplates.php
 create mode 100644 api/Tests/BusinessLogic/Emails/EmailSenderHelperTest.php

diff --git a/api/BusinessLogic/Emails/EmailSender.php b/api/BusinessLogic/Emails/EmailSender.php
index 4f300529..d1658451 100644
--- a/api/BusinessLogic/Emails/EmailSender.php
+++ b/api/BusinessLogic/Emails/EmailSender.php
@@ -9,7 +9,7 @@ use PHPMailer;
 
 interface EmailSender {
     /**
-     * Use to send emails that do NOT include ticket information
+     * Use to send emails
      *
      * @param $emailBuilder EmailBuilder
      * @param $heskSettings array
diff --git a/api/BusinessLogic/Emails/EmailSenderHelper.php b/api/BusinessLogic/Emails/EmailSenderHelper.php
new file mode 100644
index 00000000..5558024e
--- /dev/null
+++ b/api/BusinessLogic/Emails/EmailSenderHelper.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace BusinessLogic\Emails;
+
+
+class EmailSenderHelper {
+    /**
+     * @var $emailTemplateParser EmailTemplateParser
+     */
+    private $emailTemplateParser;
+
+    /**
+     * @var $basicEmailSender BasicEmailSender
+     */
+    private $basicEmailSender;
+
+    /**
+     * @var $mailgunEmailSender MailgunEmailSender
+     */
+    private $mailgunEmailSender;
+
+    function __construct($emailTemplateParser, $basicEmailSender, $mailgunEmailSender) {
+        $this->emailTemplateParser = $emailTemplateParser;
+        $this->basicEmailSender = $basicEmailSender;
+        $this->mailgunEmailSender = $mailgunEmailSender;
+    }
+
+    function sendEmailForTicket($emailTemplateName, $ticket, $heskSettings, $modsForHeskSettings) {
+        //-- parse template
+
+        //-- if no mailgun, use basic sender
+
+        //-- otherwise use mailgun sender
+    }
+}
\ No newline at end of file
diff --git a/api/BusinessLogic/Emails/EmailTemplate.php b/api/BusinessLogic/Emails/EmailTemplate.php
new file mode 100644
index 00000000..02884679
--- /dev/null
+++ b/api/BusinessLogic/Emails/EmailTemplate.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace BusinessLogic\Emails;
+
+
+class EmailTemplate {
+    /**
+     * @var $languageKey string
+     */
+    public $languageKey;
+
+    /**
+     * @var $fileName string
+     */
+    public $fileName;
+
+    /**
+     * @var $forStaff bool
+     */
+    public $forStaff;
+
+    function __construct($forStaff, $fileName, $languageKey = null) {
+        $this->languageKey = $languageKey === null ? $fileName : $languageKey;
+        $this->fileName = $fileName;
+        $this->forStaff = $forStaff;
+    }
+}
\ No newline at end of file
diff --git a/api/BusinessLogic/Emails/EmailTemplateParser.php b/api/BusinessLogic/Emails/EmailTemplateParser.php
index 850393fa..c6a3df11 100644
--- a/api/BusinessLogic/Emails/EmailTemplateParser.php
+++ b/api/BusinessLogic/Emails/EmailTemplateParser.php
@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: mkoch
- * Date: 2/22/2017
- * Time: 9:11 PM
- */
 
 namespace BusinessLogic\Emails;
 
@@ -35,27 +29,41 @@ class EmailTemplateParser {
      */
     private $userGateway;
 
-    function __construct($statusGateway, $categoryGateway, $userGateway) {
+    /**
+     * @var $emailTemplateRetriever EmailTemplateRetriever
+     */
+    private $emailTemplateRetriever;
+
+    function __construct($statusGateway, $categoryGateway, $userGateway, $emailTemplateRetriever) {
         $this->statusGateway = $statusGateway;
         $this->categoryGateway = $categoryGateway;
         $this->userGateway = $userGateway;
+        $this->emailTemplateRetriever = $emailTemplateRetriever;
     }
 
     /**
-     * @param $templateName string
+     * @param $templateId int
      * @param $language string
      * @param $ticket Ticket
+     * @param $heskSettings array
+     * @param $modsForHeskSettings array
+     * @return ParsedEmailProperties
+     * @throws InvalidEmailTemplateException
      */
-    function getFormattedEmailForLanguage($templateName, $language, $ticket, $forStaff, $heskSettings, $modsForHeskSettings) {
-        global $hesklang;
+    function getFormattedEmailForLanguage($templateId, $language, $ticket, $heskSettings, $modsForHeskSettings) {
+        $emailTemplate = $this->emailTemplateRetriever->getTemplate($templateId);
+
+        if ($emailTemplate === null) {
+            throw new InvalidEmailTemplateException($templateId);
+        }
 
-        $template = self::getFromFileSystem($templateName, $language, false);
-        $htmlTemplate = self::getFromFileSystem($templateName, $language, true);
-        $subject = ValidEmailTemplates::getValidEmailTemplates()[$templateName];
+        $template = self::getFromFileSystem($emailTemplate->fileName, $language, false);
+        $htmlTemplate = self::getFromFileSystem($emailTemplate->fileName, $language, true);
+        $subject = $emailTemplate->languageKey;
 
         $subject = $this->parseSubject($subject, $ticket, $language, $heskSettings);
-        $message = $this->parseMessage($template, $ticket, $language, $forStaff, $heskSettings, $modsForHeskSettings, false);
-        $htmlMessage = $this->parseMessage($htmlTemplate, $ticket, $language, $forStaff, $heskSettings, $modsForHeskSettings, true);
+        $message = $this->parseMessage($template, $ticket, $language, $emailTemplate->forStaff, $heskSettings, $modsForHeskSettings, false);
+        $htmlMessage = $this->parseMessage($htmlTemplate, $ticket, $language, $emailTemplate->forStaff, $heskSettings, $modsForHeskSettings, true);
 
         return new ParsedEmailProperties($subject, $message, $htmlMessage);
     }
@@ -66,13 +74,9 @@ class EmailTemplateParser {
      * @param $html bool
      * @return string The template
      * @throws EmailTemplateNotFoundException If the template was not found in the filesystem for the provided language
-     * @throws InvalidEmailTemplateException If the $template is not a valid template name
      */
     private function getFromFileSystem($template, $language, $html)
     {
-        if (!isset(ValidEmailTemplates::getValidEmailTemplates()[$template])) {
-            throw new InvalidEmailTemplateException($template);
-        }
         $htmlFolder = $html ? 'html/' : '';
 
         /* Get email template */
diff --git a/api/BusinessLogic/Emails/EmailTemplateRetriever.php b/api/BusinessLogic/Emails/EmailTemplateRetriever.php
new file mode 100644
index 00000000..6263d8a7
--- /dev/null
+++ b/api/BusinessLogic/Emails/EmailTemplateRetriever.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace BusinessLogic\Emails;
+
+
+class EmailTemplateRetriever {
+    /**
+     * @var $validTemplates EmailTemplate[]
+     */
+    private $validTemplates;
+
+    function __construct() {
+        $this->validTemplates = array();
+        $this->initializeArray();
+    }
+
+    const FORGOT_TICKET_ID = 0;
+    const NEW_REPLY_BY_STAFF = 1;
+    const NEW_TICKET = 2;
+    const VERIFY_EMAIL = 3;
+    const TICKET_CLOSED = 4;
+    const CATEGORY_MOVED = 5;
+    const NEW_REPLY_BY_CUSTOMER = 6;
+    const NEW_TICKET_STAFF = 7;
+    const TICKET_ASSIGNED_TO_YOU = 8;
+    const NEW_PM = 9;
+    const NEW_NOTE = 10;
+    const RESET_PASSWORD = 11;
+    const CALENDAR_REMINDER = 12;
+    const OVERDUE_TICKET = 13;
+
+    function initializeArray() {
+        if (count($this->validTemplates) > 0) {
+            //-- Map already built
+            return;
+        }
+
+        $this->validTemplates[self::FORGOT_TICKET_ID] = new EmailTemplate(false, 'forgot_ticket_id');
+        $this->validTemplates[self::NEW_REPLY_BY_STAFF] = new EmailTemplate(false, 'new_reply_by_staff');
+        $this->validTemplates[self::NEW_TICKET] = new EmailTemplate(false, 'new_ticket', 'ticket_received');
+        $this->validTemplates[self::VERIFY_EMAIL] = new EmailTemplate(false, 'verify_email');
+        $this->validTemplates[self::TICKET_CLOSED] = new EmailTemplate(false, 'ticket_closed');
+        $this->validTemplates[self::CATEGORY_MOVED] = new EmailTemplate(true, 'category_moved');
+        $this->validTemplates[self::NEW_REPLY_BY_CUSTOMER] = new EmailTemplate(true, 'new_reply_by_customer');
+        $this->validTemplates[self::NEW_TICKET_STAFF] = new EmailTemplate(true, 'new_ticket_staff');
+        $this->validTemplates[self::TICKET_ASSIGNED_TO_YOU] = new EmailTemplate(true, 'ticket_assigned_to_you');
+        $this->validTemplates[self::NEW_PM] = new EmailTemplate(true, 'new_pm');
+        $this->validTemplates[self::NEW_NOTE] = new EmailTemplate(true, 'new_note');
+        $this->validTemplates[self::RESET_PASSWORD] = new EmailTemplate(true, 'reset_password');
+        $this->validTemplates[self::CALENDAR_REMINDER] = new EmailTemplate(true, 'reset_password');
+        $this->validTemplates[self::OVERDUE_TICKET] = new EmailTemplate(true, 'overdue_ticket');
+    }
+
+    /**
+     * @param $templateId
+     * @return EmailTemplate|null
+     */
+    function getTemplate($templateId) {
+        if (isset($this->validTemplates[$templateId])) {
+            return $this->validTemplates[$templateId];
+        }
+
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/api/BusinessLogic/Emails/ValidEmailTemplates.php b/api/BusinessLogic/Emails/ValidEmailTemplates.php
deleted file mode 100644
index b57d3894..00000000
--- a/api/BusinessLogic/Emails/ValidEmailTemplates.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: mkoch
- * Date: 2/22/2017
- * Time: 9:25 PM
- */
-
-namespace BusinessLogic\Emails;
-
-
-class ValidEmailTemplates {
-    static function getValidEmailTemplates() {
-        return array(
-            'forgot_ticket_id' => 'forgot_ticket_id',
-            'new_reply_by_staff' => 'new_reply_by_staff',
-            'new_ticket' => 'ticket_received',
-            'verify_email' => 'verify_email',
-            'ticket_closed' => 'ticket_closed',
-            'category_moved' => 'category_moved',
-            'new_reply_by_customer' => 'new_reply_by_customer',
-            'new_ticket_staff' => 'new_ticket_staff',
-            'ticket_assigned_to_you' => 'ticket_assigned_to_you',
-            'new_pm' => 'new_pm',
-            'new_note' => 'new_note',
-            'reset_password' => 'reset_password',
-            'calendar_reminder' => 'calendar_reminder',
-            'overdue_ticket' => 'overdue_ticket',
-        );
-    }
-}
\ No newline at end of file
diff --git a/api/Tests/BusinessLogic/Emails/EmailSenderHelperTest.php b/api/Tests/BusinessLogic/Emails/EmailSenderHelperTest.php
new file mode 100644
index 00000000..4efcb99e
--- /dev/null
+++ b/api/Tests/BusinessLogic/Emails/EmailSenderHelperTest.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace BusinessLogic\Emails;
+
+
+use PHPUnit\Framework\TestCase;
+
+class EmailSenderHelperTest extends TestCase {
+    /**
+     * @var $emailTemplateParser \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $emailTemplateParser;
+
+    /**
+     * @var $basicEmailSender \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $basicEmailSender;
+
+    /**
+     * @var $mailgunEmailSender \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $mailgunEmailSender;
+
+    /**
+     * @var $emailSenderHelper EmailSenderHelper
+     */
+    private $emailSenderHelper;
+
+    protected function setUp() {
+        $this->emailTemplateParser = $this->createMock(EmailTemplateParser::class);
+        $this->basicEmailSender = $this->createMock(BasicEmailSender::class);
+        $this->mailgunEmailSender = $this->createMock(MailgunEmailSender::class);
+
+        $this->emailSenderHelper = new EmailSenderHelper($this->emailTemplateParser, $this->basicEmailSender,
+            $this->mailgunEmailSender);
+    }
+
+    function testItParsesTheTemplateForTheTicket() {
+
+    }
+}

From e7eeac9f344d26249804ab07b7f895f7e8fdbe16 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Fri, 3 Mar 2017 22:05:41 -0500
Subject: [PATCH 062/192] Working on more email sender stuff

---
 .../Emails/EmailSenderHelper.php              |  5 ++--
 .../Emails/EmailTemplateParser.php            | 14 +++++------
 .../Emails/EmailSenderHelperTest.php          | 23 +++++++++++++++++++
 3 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/api/BusinessLogic/Emails/EmailSenderHelper.php b/api/BusinessLogic/Emails/EmailSenderHelper.php
index 5558024e..10dd99ca 100644
--- a/api/BusinessLogic/Emails/EmailSenderHelper.php
+++ b/api/BusinessLogic/Emails/EmailSenderHelper.php
@@ -25,8 +25,9 @@ class EmailSenderHelper {
         $this->mailgunEmailSender = $mailgunEmailSender;
     }
 
-    function sendEmailForTicket($emailTemplateName, $ticket, $heskSettings, $modsForHeskSettings) {
-        //-- parse template
+    function sendEmailForTicket($templateId, $languageCode, $ticket, $heskSettings, $modsForHeskSettings) {
+        $parsedTemplate = $this->emailTemplateParser->getFormattedEmailForLanguage($templateId, $languageCode,
+            $ticket, $heskSettings, $modsForHeskSettings);
 
         //-- if no mailgun, use basic sender
 
diff --git a/api/BusinessLogic/Emails/EmailTemplateParser.php b/api/BusinessLogic/Emails/EmailTemplateParser.php
index c6a3df11..0d3974ca 100644
--- a/api/BusinessLogic/Emails/EmailTemplateParser.php
+++ b/api/BusinessLogic/Emails/EmailTemplateParser.php
@@ -43,27 +43,27 @@ class EmailTemplateParser {
 
     /**
      * @param $templateId int
-     * @param $language string
+     * @param $languageCode string
      * @param $ticket Ticket
      * @param $heskSettings array
      * @param $modsForHeskSettings array
      * @return ParsedEmailProperties
      * @throws InvalidEmailTemplateException
      */
-    function getFormattedEmailForLanguage($templateId, $language, $ticket, $heskSettings, $modsForHeskSettings) {
+    function getFormattedEmailForLanguage($templateId, $languageCode, $ticket, $heskSettings, $modsForHeskSettings) {
         $emailTemplate = $this->emailTemplateRetriever->getTemplate($templateId);
 
         if ($emailTemplate === null) {
             throw new InvalidEmailTemplateException($templateId);
         }
 
-        $template = self::getFromFileSystem($emailTemplate->fileName, $language, false);
-        $htmlTemplate = self::getFromFileSystem($emailTemplate->fileName, $language, true);
+        $template = self::getFromFileSystem($emailTemplate->fileName, $languageCode, false);
+        $htmlTemplate = self::getFromFileSystem($emailTemplate->fileName, $languageCode, true);
         $subject = $emailTemplate->languageKey;
 
-        $subject = $this->parseSubject($subject, $ticket, $language, $heskSettings);
-        $message = $this->parseMessage($template, $ticket, $language, $emailTemplate->forStaff, $heskSettings, $modsForHeskSettings, false);
-        $htmlMessage = $this->parseMessage($htmlTemplate, $ticket, $language, $emailTemplate->forStaff, $heskSettings, $modsForHeskSettings, true);
+        $subject = $this->parseSubject($subject, $ticket, $languageCode, $heskSettings);
+        $message = $this->parseMessage($template, $ticket, $languageCode, $emailTemplate->forStaff, $heskSettings, $modsForHeskSettings, false);
+        $htmlMessage = $this->parseMessage($htmlTemplate, $ticket, $languageCode, $emailTemplate->forStaff, $heskSettings, $modsForHeskSettings, true);
 
         return new ParsedEmailProperties($subject, $message, $htmlMessage);
     }
diff --git a/api/Tests/BusinessLogic/Emails/EmailSenderHelperTest.php b/api/Tests/BusinessLogic/Emails/EmailSenderHelperTest.php
index 4efcb99e..304868b4 100644
--- a/api/Tests/BusinessLogic/Emails/EmailSenderHelperTest.php
+++ b/api/Tests/BusinessLogic/Emails/EmailSenderHelperTest.php
@@ -3,6 +3,7 @@
 namespace BusinessLogic\Emails;
 
 
+use BusinessLogic\Tickets\Ticket;
 use PHPUnit\Framework\TestCase;
 
 class EmailSenderHelperTest extends TestCase {
@@ -26,16 +27,38 @@ class EmailSenderHelperTest extends TestCase {
      */
     private $emailSenderHelper;
 
+    /**
+     * @var $heskSettings array
+     */
+    private $heskSettings;
+
+    /**
+     * @var $modsForHeskSettings array
+     */
+    private $modsForHeskSettings;
+
     protected function setUp() {
         $this->emailTemplateParser = $this->createMock(EmailTemplateParser::class);
         $this->basicEmailSender = $this->createMock(BasicEmailSender::class);
         $this->mailgunEmailSender = $this->createMock(MailgunEmailSender::class);
+        $this->heskSettings = array();
 
         $this->emailSenderHelper = new EmailSenderHelper($this->emailTemplateParser, $this->basicEmailSender,
             $this->mailgunEmailSender);
     }
 
     function testItParsesTheTemplateForTheTicket() {
+        //-- Arrange
+        $templateId = EmailTemplateRetriever::NEW_NOTE;
+        $languageCode = 'en';
+        $ticket = new Ticket();
+
+        //-- Assert
+        $this->emailTemplateParser->expects($this->once())
+            ->method('getFormattedEmailForLanguage')
+            ->with($templateId, $languageCode, $ticket, $this->heskSettings, $this->modsForHeskSettings);
 
+        //-- Act
+        $this->emailSenderHelper->sendEmailForTicket($templateId, $languageCode, $ticket, $this->heskSettings, $this->modsForHeskSettings);
     }
 }

From 2a6766c10e64061997d75720d03b36e9da24aa6b Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sat, 4 Mar 2017 00:43:08 -0500
Subject: [PATCH 063/192] Pretty much done with the EmailSenderHelper

---
 api/BusinessLogic/Emails/Addressees.php       | 21 ++++++
 .../Emails/EmailSenderHelper.php              | 31 ++++++++-
 .../Emails/EmailSenderHelperTest.php          | 64 ++++++++++++++++++-
 3 files changed, 112 insertions(+), 4 deletions(-)
 create mode 100644 api/BusinessLogic/Emails/Addressees.php

diff --git a/api/BusinessLogic/Emails/Addressees.php b/api/BusinessLogic/Emails/Addressees.php
new file mode 100644
index 00000000..4e71c8bf
--- /dev/null
+++ b/api/BusinessLogic/Emails/Addressees.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace BusinessLogic\Emails;
+
+
+class Addressees {
+    /**
+     * @var $to string[]
+     */
+    public $to;
+
+    /**
+     * @var $cc string[]|null
+     */
+    public $cc;
+
+    /**
+     * @var $bcc string[]|null
+     */
+    public $bcc;
+}
\ No newline at end of file
diff --git a/api/BusinessLogic/Emails/EmailSenderHelper.php b/api/BusinessLogic/Emails/EmailSenderHelper.php
index 10dd99ca..4dbd9436 100644
--- a/api/BusinessLogic/Emails/EmailSenderHelper.php
+++ b/api/BusinessLogic/Emails/EmailSenderHelper.php
@@ -3,6 +3,8 @@
 namespace BusinessLogic\Emails;
 
 
+use BusinessLogic\Tickets\Ticket;
+
 class EmailSenderHelper {
     /**
      * @var $emailTemplateParser EmailTemplateParser
@@ -25,12 +27,35 @@ class EmailSenderHelper {
         $this->mailgunEmailSender = $mailgunEmailSender;
     }
 
-    function sendEmailForTicket($templateId, $languageCode, $ticket, $heskSettings, $modsForHeskSettings) {
+    /**
+     * @param $templateId int the EmailTemplateRetriever::TEMPLATE_NAME
+     * @param $languageCode string the language code that matches the language folder
+     * @param $addressees Addressees the addressees. **cc and bcc addresses from custom fields will be added here!**
+     * @param $ticket Ticket
+     * @param $heskSettings array
+     * @param $modsForHeskSettings array
+     */
+    function sendEmailForTicket($templateId, $languageCode, $addressees, $ticket, $heskSettings, $modsForHeskSettings) {
         $parsedTemplate = $this->emailTemplateParser->getFormattedEmailForLanguage($templateId, $languageCode,
             $ticket, $heskSettings, $modsForHeskSettings);
 
-        //-- if no mailgun, use basic sender
+        $emailBuilder = new EmailBuilder();
+        $emailBuilder->subject = $parsedTemplate->subject;
+        $emailBuilder->message = $parsedTemplate->message;
+        $emailBuilder->htmlMessage = $parsedTemplate->htmlMessage;
+        $emailBuilder->to = $addressees->to;
+        $emailBuilder->cc = $addressees->cc;
+        $emailBuilder->bcc = $addressees->bcc;
+
+        if ($modsForHeskSettings['attachments']) {
+            $emailBuilder->attachments = $ticket->attachments;
+        }
+
+        if ($modsForHeskSettings['use_mailgun']) {
+            $this->mailgunEmailSender->sendEmail($emailBuilder, $heskSettings, $modsForHeskSettings, $modsForHeskSettings['html_emails']);
+        } else {
+            $this->basicEmailSender->sendEmail($emailBuilder, $heskSettings, $modsForHeskSettings, $modsForHeskSettings['html_emails']);
+        }
 
-        //-- otherwise use mailgun sender
     }
 }
\ No newline at end of file
diff --git a/api/Tests/BusinessLogic/Emails/EmailSenderHelperTest.php b/api/Tests/BusinessLogic/Emails/EmailSenderHelperTest.php
index 304868b4..2f3a4d98 100644
--- a/api/Tests/BusinessLogic/Emails/EmailSenderHelperTest.php
+++ b/api/Tests/BusinessLogic/Emails/EmailSenderHelperTest.php
@@ -42,6 +42,11 @@ class EmailSenderHelperTest extends TestCase {
         $this->basicEmailSender = $this->createMock(BasicEmailSender::class);
         $this->mailgunEmailSender = $this->createMock(MailgunEmailSender::class);
         $this->heskSettings = array();
+        $this->modsForHeskSettings = array(
+            'attachments' => 0,
+            'use_mailgun' => 0,
+            'html_emails' => 0
+        );
 
         $this->emailSenderHelper = new EmailSenderHelper($this->emailTemplateParser, $this->basicEmailSender,
             $this->mailgunEmailSender);
@@ -52,6 +57,7 @@ class EmailSenderHelperTest extends TestCase {
         $templateId = EmailTemplateRetriever::NEW_NOTE;
         $languageCode = 'en';
         $ticket = new Ticket();
+        $this->emailTemplateParser->method('getFormattedEmailForLanguage')->willReturn(new ParsedEmailProperties('Subject', 'Message', 'HTML Message'));
 
         //-- Assert
         $this->emailTemplateParser->expects($this->once())
@@ -59,6 +65,62 @@ class EmailSenderHelperTest extends TestCase {
             ->with($templateId, $languageCode, $ticket, $this->heskSettings, $this->modsForHeskSettings);
 
         //-- Act
-        $this->emailSenderHelper->sendEmailForTicket($templateId, $languageCode, $ticket, $this->heskSettings, $this->modsForHeskSettings);
+        $this->emailSenderHelper->sendEmailForTicket($templateId, $languageCode, new Addressees(), $ticket, $this->heskSettings, $this->modsForHeskSettings);
+    }
+
+    function testItSendsTheEmailThroughTheMailgunEmailSender() {
+        //-- Arrange
+        $addressees = new Addressees();
+        $addressees->to = ['to@email'];
+        $addressees->cc = ['cc1', 'cc2'];
+        $addressees->bcc = ['bcc1', 'bcc2'];
+        $this->modsForHeskSettings['use_mailgun'] = 1;
+        $this->modsForHeskSettings['html_emails'] = true;
+
+        $expectedEmailBuilder = new EmailBuilder();
+        $expectedEmailBuilder->to = $addressees->to;
+        $expectedEmailBuilder->cc = $addressees->cc;
+        $expectedEmailBuilder->bcc = $addressees->bcc;
+        $expectedEmailBuilder->subject = 'Subject';
+        $expectedEmailBuilder->message = 'Message';
+        $expectedEmailBuilder->htmlMessage = 'HTML Message';
+
+        $this->emailTemplateParser->method('getFormattedEmailForLanguage')->willReturn(new ParsedEmailProperties('Subject', 'Message', 'HTML Message'));
+
+        //-- Assert
+        $this->mailgunEmailSender->expects($this->once())
+            ->method('sendEmail')
+            ->with($expectedEmailBuilder, $this->heskSettings, $this->modsForHeskSettings, true);
+
+        //-- Act
+        $this->emailSenderHelper->sendEmailForTicket(EmailTemplateRetriever::NEW_NOTE, 'en', $addressees, new Ticket(), $this->heskSettings, $this->modsForHeskSettings);
+    }
+
+    function testItSendsTheEmailThroughTheBasicEmailSender() {
+        //-- Arrange
+        $addressees = new Addressees();
+        $addressees->to = ['to@email'];
+        $addressees->cc = ['cc1', 'cc2'];
+        $addressees->bcc = ['bcc1', 'bcc2'];
+        $this->modsForHeskSettings['use_mailgun'] = 0;
+        $this->modsForHeskSettings['html_emails'] = true;
+
+        $expectedEmailBuilder = new EmailBuilder();
+        $expectedEmailBuilder->to = $addressees->to;
+        $expectedEmailBuilder->cc = $addressees->cc;
+        $expectedEmailBuilder->bcc = $addressees->bcc;
+        $expectedEmailBuilder->subject = 'Subject';
+        $expectedEmailBuilder->message = 'Message';
+        $expectedEmailBuilder->htmlMessage = 'HTML Message';
+
+        $this->emailTemplateParser->method('getFormattedEmailForLanguage')->willReturn(new ParsedEmailProperties('Subject', 'Message', 'HTML Message'));
+
+        //-- Assert
+        $this->basicEmailSender->expects($this->once())
+            ->method('sendEmail')
+            ->with($expectedEmailBuilder, $this->heskSettings, $this->modsForHeskSettings, true);
+
+        //-- Act
+        $this->emailSenderHelper->sendEmailForTicket(EmailTemplateRetriever::NEW_NOTE, 'en', $addressees, new Ticket(), $this->heskSettings, $this->modsForHeskSettings);
     }
 }

From 672d089b201e0a3f09f2e90a811272507b80c619 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sat, 4 Mar 2017 21:59:55 -0500
Subject: [PATCH 064/192] Working on more email stuff

---
 api/BusinessLogic/Emails/EmailSenderHelper.php        | 11 +++++++++++
 api/BusinessLogic/Tickets/TicketCreator.php           | 10 +++++++++-
 .../BusinessLogic/Emails/EmailSenderHelperTest.php    |  4 +++-
 .../CreateTicketForCustomerTest.php                   |  4 ++++
 4 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/api/BusinessLogic/Emails/EmailSenderHelper.php b/api/BusinessLogic/Emails/EmailSenderHelper.php
index 4dbd9436..1724dc25 100644
--- a/api/BusinessLogic/Emails/EmailSenderHelper.php
+++ b/api/BusinessLogic/Emails/EmailSenderHelper.php
@@ -47,6 +47,17 @@ class EmailSenderHelper {
         $emailBuilder->cc = $addressees->cc;
         $emailBuilder->bcc = $addressees->bcc;
 
+        foreach ($heskSettings['custom_fields'] as $k => $v) {
+            $number = intval(str_replace('custom', '', $k));
+            if ($v['use'] && $v['type'] == 'email' && !empty($ticket->customFields[$number])) {
+                if ($v['value']['email_type'] == 'cc') {
+                    $emailBuilder->cc[] = $ticket->customFields[$number];
+                } elseif ($v['value']['email_type'] == 'bcc') {
+                    $emailBuilder->bcc[] = $ticket->customFields[$number];
+                }
+            }
+        }
+
         if ($modsForHeskSettings['attachments']) {
             $emailBuilder->attachments = $ticket->attachments;
         }
diff --git a/api/BusinessLogic/Tickets/TicketCreator.php b/api/BusinessLogic/Tickets/TicketCreator.php
index 8409623c..25e4ba22 100644
--- a/api/BusinessLogic/Tickets/TicketCreator.php
+++ b/api/BusinessLogic/Tickets/TicketCreator.php
@@ -2,6 +2,7 @@
 
 namespace BusinessLogic\Tickets;
 
+use BusinessLogic\Emails\EmailSenderHelper;
 use BusinessLogic\Exceptions\ValidationException;
 use BusinessLogic\Statuses\DefaultStatusForAction;
 use DataAccess\Statuses\StatusGateway;
@@ -38,13 +39,20 @@ class TicketCreator {
      */
     private $verifiedEmailChecker;
 
-    function __construct($newTicketValidator, $trackingIdGenerator, $autoassigner, $statusGateway, $ticketGateway, $verifiedEmailChecker) {
+    /**
+     * @var $emailSenderHelper EmailSenderHelper
+     */
+    private $emailSenderHelper;
+
+    function __construct($newTicketValidator, $trackingIdGenerator, $autoassigner,
+                         $statusGateway, $ticketGateway, $verifiedEmailChecker, $emailSenderHelper) {
         $this->newTicketValidator = $newTicketValidator;
         $this->trackingIdGenerator = $trackingIdGenerator;
         $this->autoassigner = $autoassigner;
         $this->statusGateway = $statusGateway;
         $this->ticketGateway = $ticketGateway;
         $this->verifiedEmailChecker = $verifiedEmailChecker;
+        $this->emailSenderHelper = $emailSenderHelper;
     }
 
     /**
diff --git a/api/Tests/BusinessLogic/Emails/EmailSenderHelperTest.php b/api/Tests/BusinessLogic/Emails/EmailSenderHelperTest.php
index 2f3a4d98..050abcb3 100644
--- a/api/Tests/BusinessLogic/Emails/EmailSenderHelperTest.php
+++ b/api/Tests/BusinessLogic/Emails/EmailSenderHelperTest.php
@@ -41,7 +41,9 @@ class EmailSenderHelperTest extends TestCase {
         $this->emailTemplateParser = $this->createMock(EmailTemplateParser::class);
         $this->basicEmailSender = $this->createMock(BasicEmailSender::class);
         $this->mailgunEmailSender = $this->createMock(MailgunEmailSender::class);
-        $this->heskSettings = array();
+        $this->heskSettings = array(
+            'custom_fields' => array()
+        );
         $this->modsForHeskSettings = array(
             'attachments' => 0,
             'use_mailgun' => 0,
diff --git a/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php b/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php
index 54c22684..bf80c962 100644
--- a/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php
+++ b/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php
@@ -246,4 +246,8 @@ class CreateTicketTest extends TestCase {
         //-- Act
         $this->ticketCreator->createTicketByCustomer($this->ticketRequest, $this->heskSettings, $this->modsForHeskSettings, $this->userContext);
     }
+
+    function testItSendsAnEmailToTheCustomerWhenTheTicketIsCreated() {
+        //--
+    }
 }

From 2201f188bd230539035e8067c1b9d20a2c54e2d3 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sun, 5 Mar 2017 22:03:11 -0500
Subject: [PATCH 065/192] Some changes

---
 .../Tickets/CreateTicketByCustomerModel.php   |  5 ++++
 .../CreateTicketForCustomerTest.php           | 24 +++++++++++++++++--
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/api/BusinessLogic/Tickets/CreateTicketByCustomerModel.php b/api/BusinessLogic/Tickets/CreateTicketByCustomerModel.php
index 25a577f0..7163e6b8 100644
--- a/api/BusinessLogic/Tickets/CreateTicketByCustomerModel.php
+++ b/api/BusinessLogic/Tickets/CreateTicketByCustomerModel.php
@@ -72,4 +72,9 @@ class CreateTicketByCustomerModel {
      * @var string
      */
     public $language;
+
+    /**
+     * @var $sendEmailToCustomer bool
+     */
+    public $sendEmailToCustomer;
 }
\ No newline at end of file
diff --git a/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php b/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php
index bf80c962..65e8110b 100644
--- a/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php
+++ b/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php
@@ -3,6 +3,10 @@
 namespace BusinessLogic\Tickets\TicketCreatorTests;
 
 
+use BusinessLogic\Emails\Addressees;
+use BusinessLogic\Emails\EmailSenderHelper;
+use BusinessLogic\Emails\EmailTemplate;
+use BusinessLogic\Emails\EmailTemplateRetriever;
 use BusinessLogic\Security\UserContext;
 use BusinessLogic\Statuses\DefaultStatusForAction;
 use BusinessLogic\Statuses\Status;
@@ -81,6 +85,11 @@ class CreateTicketTest extends TestCase {
      */
     private $verifiedEmailChecker;
 
+    /**
+     * @var $emailSenderHelper \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $emailSenderHelper;
+
     protected function setUp() {
         $this->ticketGateway = $this->createMock(TicketGateway::class);
         $this->newTicketValidator = $this->createMock(NewTicketValidator::class);
@@ -88,9 +97,10 @@ class CreateTicketTest extends TestCase {
         $this->autoassigner = $this->createMock(Autoassigner::class);
         $this->statusGateway = $this->createMock(StatusGateway::class);
         $this->verifiedEmailChecker = $this->createMock(VerifiedEmailChecker::class);
+        $this->emailSenderHelper = $this->createMock(EmailSenderHelper::class);
 
         $this->ticketCreator = new TicketCreator($this->newTicketValidator, $this->trackingIdGenerator,
-            $this->autoassigner, $this->statusGateway, $this->ticketGateway, $this->verifiedEmailChecker);
+            $this->autoassigner, $this->statusGateway, $this->ticketGateway, $this->verifiedEmailChecker, $this->emailSenderHelper);
 
         $this->ticketRequest = new CreateTicketByCustomerModel();
         $this->ticketRequest->name = 'Name';
@@ -248,6 +258,16 @@ class CreateTicketTest extends TestCase {
     }
 
     function testItSendsAnEmailToTheCustomerWhenTheTicketIsCreated() {
-        //--
+        //-- Arrange
+        $this->ticketRequest->sendEmailToCustomer = true;
+        $expectedAddressees = new Addressees();
+        $expectedAddressees->to = $this->ticketRequest->email;
+
+        //-- Assert
+        $this->emailSenderHelper->expects($this->once())->method('sendEmailForTicket')
+            ->with(EmailTemplateRetriever::NEW_TICKET, 'en', $this->anything(), $this->heskSettings, $this->modsForHeskSettings);
+
+        //-- Act
+        $this->ticketCreator->createTicketByCustomer($this->ticketRequest, $this->heskSettings, $this->modsForHeskSettings, $this->userContext);
     }
 }

From 01c56da52ca4c3b11d9f76de48f43ab2659a2dda Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Mon, 6 Mar 2017 21:44:38 -0500
Subject: [PATCH 066/192] Working on adding Spot ORM

---
 .../Emails/EmailSenderHelper.php              |   6 +-
 api/BusinessLogic/Tickets/TicketCreator.php   |  36 +-
 api/DataAccess/Security/UserGateway.php       |  15 +
 .../Emails/EmailSenderHelperTest.php          |   9 +-
 .../CreateTicketForCustomerTest.php           |  36 +-
 api/autoload.php                              |   7 +
 api/composer.json                             |   2 +-
 api/composer.lock                             | 621 +++++++++++++++++-
 8 files changed, 721 insertions(+), 11 deletions(-)

diff --git a/api/BusinessLogic/Emails/EmailSenderHelper.php b/api/BusinessLogic/Emails/EmailSenderHelper.php
index 1724dc25..b02453ab 100644
--- a/api/BusinessLogic/Emails/EmailSenderHelper.php
+++ b/api/BusinessLogic/Emails/EmailSenderHelper.php
@@ -29,13 +29,15 @@ class EmailSenderHelper {
 
     /**
      * @param $templateId int the EmailTemplateRetriever::TEMPLATE_NAME
-     * @param $languageCode string the language code that matches the language folder
+     * @param $language string the language name
      * @param $addressees Addressees the addressees. **cc and bcc addresses from custom fields will be added here!**
      * @param $ticket Ticket
      * @param $heskSettings array
      * @param $modsForHeskSettings array
      */
-    function sendEmailForTicket($templateId, $languageCode, $addressees, $ticket, $heskSettings, $modsForHeskSettings) {
+    function sendEmailForTicket($templateId, $language, $addressees, $ticket, $heskSettings, $modsForHeskSettings) {
+        $languageCode = $heskSettings['languages'][$language]['folder'];
+
         $parsedTemplate = $this->emailTemplateParser->getFormattedEmailForLanguage($templateId, $languageCode,
             $ticket, $heskSettings, $modsForHeskSettings);
 
diff --git a/api/BusinessLogic/Tickets/TicketCreator.php b/api/BusinessLogic/Tickets/TicketCreator.php
index 25e4ba22..46a17589 100644
--- a/api/BusinessLogic/Tickets/TicketCreator.php
+++ b/api/BusinessLogic/Tickets/TicketCreator.php
@@ -2,9 +2,12 @@
 
 namespace BusinessLogic\Tickets;
 
+use BusinessLogic\Emails\Addressees;
 use BusinessLogic\Emails\EmailSenderHelper;
+use BusinessLogic\Emails\EmailTemplateRetriever;
 use BusinessLogic\Exceptions\ValidationException;
 use BusinessLogic\Statuses\DefaultStatusForAction;
+use DataAccess\Security\UserGateway;
 use DataAccess\Statuses\StatusGateway;
 use DataAccess\Tickets\TicketGateway;
 
@@ -44,8 +47,13 @@ class TicketCreator {
      */
     private $emailSenderHelper;
 
+    /**
+     * @var $userGateway UserGateway
+     */
+    private $userGateway;
+
     function __construct($newTicketValidator, $trackingIdGenerator, $autoassigner,
-                         $statusGateway, $ticketGateway, $verifiedEmailChecker, $emailSenderHelper) {
+                         $statusGateway, $ticketGateway, $verifiedEmailChecker, $emailSenderHelper, $userGateway) {
         $this->newTicketValidator = $newTicketValidator;
         $this->trackingIdGenerator = $trackingIdGenerator;
         $this->autoassigner = $autoassigner;
@@ -53,6 +61,7 @@ class TicketCreator {
         $this->ticketGateway = $ticketGateway;
         $this->verifiedEmailChecker = $verifiedEmailChecker;
         $this->emailSenderHelper = $emailSenderHelper;
+        $this->userGateway = $userGateway;
     }
 
     /**
@@ -126,6 +135,31 @@ class TicketCreator {
         $ticket->timeWorked = '00:00:00';
         $ticket->lastReplier = 0;
 
+        $addressees = new Addressees();
+        $addressees->to = $this->getAddressees($ticket->email);
+
+        if ($ticketRequest->sendEmailToCustomer) {
+            $this->emailSenderHelper->sendEmailForTicket(EmailTemplateRetriever::NEW_TICKET, $ticketRequest->language, $addressees, $ticket, $heskSettings, $modsForHeskSettings);
+        }
+
+        if ($ticket->ownerId !== null) {
+            $ownerEmail = $this->userGateway->getEmailForId($ticket->ownerId, $heskSettings);
+
+            $addressees = new Addressees();
+            $addressees->to = array($ownerEmail);
+            $this->emailSenderHelper->sendEmailForTicket(EmailTemplateRetriever::TICKET_ASSIGNED_TO_YOU, $ticketRequest->language, $addressees, $ticket, $heskSettings, $modsForHeskSettings);
+        }
+
         return $ticket;
     }
+
+    private function getAddressees($emailAddress) {
+        if ($emailAddress === null) {
+            return null;
+        }
+
+        $emails = str_replace(';', ',', $emailAddress);
+
+        return explode(',', $emails);
+    }
 }
\ No newline at end of file
diff --git a/api/DataAccess/Security/UserGateway.php b/api/DataAccess/Security/UserGateway.php
index b44be8b5..be6e43ff 100644
--- a/api/DataAccess/Security/UserGateway.php
+++ b/api/DataAccess/Security/UserGateway.php
@@ -46,4 +46,19 @@ class UserGateway extends CommonDao {
         
         return $row['name'];
     }
+
+    // TODO Replace this with a basic User retriever
+    function getEmailForId($id, $heskSettings) {
+        $this->init();
+
+        $rs = hesk_dbQuery("SELECT `email` FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "users` WHERE `id` = " . intval($id));
+
+        if (hesk_dbNumRows($rs) === 0) {
+            return null;
+        }
+
+        $row = hesk_dbFetchAssoc($rs);
+
+        return $row['email'];
+    }
 }
\ No newline at end of file
diff --git a/api/Tests/BusinessLogic/Emails/EmailSenderHelperTest.php b/api/Tests/BusinessLogic/Emails/EmailSenderHelperTest.php
index 050abcb3..c9d5c0cb 100644
--- a/api/Tests/BusinessLogic/Emails/EmailSenderHelperTest.php
+++ b/api/Tests/BusinessLogic/Emails/EmailSenderHelperTest.php
@@ -42,6 +42,9 @@ class EmailSenderHelperTest extends TestCase {
         $this->basicEmailSender = $this->createMock(BasicEmailSender::class);
         $this->mailgunEmailSender = $this->createMock(MailgunEmailSender::class);
         $this->heskSettings = array(
+            'languages' => array(
+                'English' => array('folder' => 'en')
+            ),
             'custom_fields' => array()
         );
         $this->modsForHeskSettings = array(
@@ -67,7 +70,7 @@ class EmailSenderHelperTest extends TestCase {
             ->with($templateId, $languageCode, $ticket, $this->heskSettings, $this->modsForHeskSettings);
 
         //-- Act
-        $this->emailSenderHelper->sendEmailForTicket($templateId, $languageCode, new Addressees(), $ticket, $this->heskSettings, $this->modsForHeskSettings);
+        $this->emailSenderHelper->sendEmailForTicket($templateId, 'English', new Addressees(), $ticket, $this->heskSettings, $this->modsForHeskSettings);
     }
 
     function testItSendsTheEmailThroughTheMailgunEmailSender() {
@@ -95,7 +98,7 @@ class EmailSenderHelperTest extends TestCase {
             ->with($expectedEmailBuilder, $this->heskSettings, $this->modsForHeskSettings, true);
 
         //-- Act
-        $this->emailSenderHelper->sendEmailForTicket(EmailTemplateRetriever::NEW_NOTE, 'en', $addressees, new Ticket(), $this->heskSettings, $this->modsForHeskSettings);
+        $this->emailSenderHelper->sendEmailForTicket(EmailTemplateRetriever::NEW_NOTE, 'English', $addressees, new Ticket(), $this->heskSettings, $this->modsForHeskSettings);
     }
 
     function testItSendsTheEmailThroughTheBasicEmailSender() {
@@ -123,6 +126,6 @@ class EmailSenderHelperTest extends TestCase {
             ->with($expectedEmailBuilder, $this->heskSettings, $this->modsForHeskSettings, true);
 
         //-- Act
-        $this->emailSenderHelper->sendEmailForTicket(EmailTemplateRetriever::NEW_NOTE, 'en', $addressees, new Ticket(), $this->heskSettings, $this->modsForHeskSettings);
+        $this->emailSenderHelper->sendEmailForTicket(EmailTemplateRetriever::NEW_NOTE, 'English', $addressees, new Ticket(), $this->heskSettings, $this->modsForHeskSettings);
     }
 }
diff --git a/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php b/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php
index 65e8110b..23ab848c 100644
--- a/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php
+++ b/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php
@@ -116,7 +116,7 @@ class CreateTicketTest extends TestCase {
             'require_subject' => 1,
             'require_message' => 1,
             'custom_fields' => array(),
-            'autoassign' => 0,
+            'autoassign' => 0
         );
         $this->modsForHeskSettings = array(
             'customer_email_verification_required' => false
@@ -260,12 +260,42 @@ class CreateTicketTest extends TestCase {
     function testItSendsAnEmailToTheCustomerWhenTheTicketIsCreated() {
         //-- Arrange
         $this->ticketRequest->sendEmailToCustomer = true;
+        $this->ticketRequest->language = 'English';
+        $expectedAddressees = new Addressees();
+        $expectedAddressees->to = array($this->ticketRequest->email);
+
+        //-- Assert
+        $this->emailSenderHelper->expects($this->once())->method('sendEmailForTicket')
+            ->with(EmailTemplateRetriever::NEW_TICKET, 'English', $expectedAddressees, $this->anything(), $this->heskSettings, $this->modsForHeskSettings);
+
+        //-- Act
+        $this->ticketCreator->createTicketByCustomer($this->ticketRequest, $this->heskSettings, $this->modsForHeskSettings, $this->userContext);
+    }
+
+    function testItDoesNotSendsAnEmailToTheCustomerWhenTheTicketIsCreatedAndSendToCustomerIsFalse() {
+        //-- Arrange
+        $this->ticketRequest->sendEmailToCustomer = false;
+        $this->ticketRequest->language = 'English';
+        $expectedAddressees = new Addressees();
+        $expectedAddressees->to = array($this->ticketRequest->email);
+
+        //-- Assert
+        $this->emailSenderHelper->expects($this->never())->method('sendEmailForTicket');
+
+        //-- Act
+        $this->ticketCreator->createTicketByCustomer($this->ticketRequest, $this->heskSettings, $this->modsForHeskSettings, $this->userContext);
+    }
+
+    function testItSendsAnEmailToTheAssignedToOwnerWhenTheTicketIsCreated() {
+        //-- Arrange
+        $this->ticketRequest->sendEmailToCustomer = true;
+        $this->ticketRequest->language = 'English';
         $expectedAddressees = new Addressees();
-        $expectedAddressees->to = $this->ticketRequest->email;
+        $expectedAddressees->to = array($this->ticketRequest->email);
 
         //-- Assert
         $this->emailSenderHelper->expects($this->once())->method('sendEmailForTicket')
-            ->with(EmailTemplateRetriever::NEW_TICKET, 'en', $this->anything(), $this->heskSettings, $this->modsForHeskSettings);
+            ->with(EmailTemplateRetriever::NEW_TICKET, 'English', $expectedAddressees, $this->anything(), $this->heskSettings, $this->modsForHeskSettings);
 
         //-- Act
         $this->ticketCreator->createTicketByCustomer($this->ticketRequest, $this->heskSettings, $this->modsForHeskSettings, $this->userContext);
diff --git a/api/autoload.php b/api/autoload.php
index 5ffee38e..acdb59e9 100644
--- a/api/autoload.php
+++ b/api/autoload.php
@@ -14,9 +14,16 @@ require_once(__DIR__ . '/http_response_code.php');
 
 hesk_load_api_database_functions();
 
+global $hesk_settings;
+
 // HESK files that require database access
 require_once(__DIR__ . '/../inc/custom_fields.inc.php');
 
+// Load Spot ORM
+$config = new \Spot\Config();
+$config->addConnection('mysql', "mysql://{$hesk_settings['db_user']}:{$hesk_settings['db_pass']}@{$hesk_settings['db_host']}/{$hesk_settings['db_name']}");
+$spot = new \Spot\Locator($config);
+
 // Load the ApplicationContext
 $applicationContext = new \ApplicationContext();
 //$modsForHeskSettings = mfh_getSettings();
\ No newline at end of file
diff --git a/api/composer.json b/api/composer.json
index f79dd05d..3c793199 100644
--- a/api/composer.json
+++ b/api/composer.json
@@ -17,6 +17,6 @@
     "php-http/message": "^1.5",
     "php-http/curl-client": "^1.7",
     "guzzlehttp/psr7": "^1.3",
-    "doctrine/orm": "*"
+    "vlucas/spot2": "~2.0"
   }
 }
diff --git a/api/composer.lock b/api/composer.lock
index 1048b547..7ac81d56 100644
--- a/api/composer.lock
+++ b/api/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "d7fe662ac2836f7d979fd4117ec8bca6",
+    "content-hash": "266b9167ab52abc3c4a2514bf29491ed",
     "packages": [
         {
             "name": "clue/stream-filter",
@@ -55,6 +55,422 @@
             ],
             "time": "2015-11-08T23:41:30+00:00"
         },
+        {
+            "name": "doctrine/annotations",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/annotations.git",
+                "reference": "54cacc9b81758b14e3ce750f205a393d52339e97"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/annotations/zipball/54cacc9b81758b14e3ce750f205a393d52339e97",
+                "reference": "54cacc9b81758b14e3ce750f205a393d52339e97",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/lexer": "1.*",
+                "php": "^5.6 || ^7.0"
+            },
+            "require-dev": {
+                "doctrine/cache": "1.*",
+                "phpunit/phpunit": "^5.7"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Roman Borschel",
+                    "email": "roman@code-factory.org"
+                },
+                {
+                    "name": "Benjamin Eberlei",
+                    "email": "kontakt@beberlei.de"
+                },
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
+                {
+                    "name": "Jonathan Wage",
+                    "email": "jonwage@gmail.com"
+                },
+                {
+                    "name": "Johannes Schmitt",
+                    "email": "schmittjoh@gmail.com"
+                }
+            ],
+            "description": "Docblock Annotations Parser",
+            "homepage": "http://www.doctrine-project.org",
+            "keywords": [
+                "annotations",
+                "docblock",
+                "parser"
+            ],
+            "time": "2017-02-24 16:22:25"
+        },
+        {
+            "name": "doctrine/cache",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/cache.git",
+                "reference": "0da649fce4838f7a6121c501c9a86d4b8921b648"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/cache/zipball/0da649fce4838f7a6121c501c9a86d4b8921b648",
+                "reference": "0da649fce4838f7a6121c501c9a86d4b8921b648",
+                "shasum": ""
+            },
+            "require": {
+                "php": "~5.6|~7.0"
+            },
+            "conflict": {
+                "doctrine/common": ">2.2,<2.4"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^5.7",
+                "predis/predis": "~1.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.7.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Common\\Cache\\": "lib/Doctrine/Common/Cache"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Roman Borschel",
+                    "email": "roman@code-factory.org"
+                },
+                {
+                    "name": "Benjamin Eberlei",
+                    "email": "kontakt@beberlei.de"
+                },
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
+                {
+                    "name": "Jonathan Wage",
+                    "email": "jonwage@gmail.com"
+                },
+                {
+                    "name": "Johannes Schmitt",
+                    "email": "schmittjoh@gmail.com"
+                }
+            ],
+            "description": "Caching library offering an object-oriented API for many cache backends",
+            "homepage": "http://www.doctrine-project.org",
+            "keywords": [
+                "cache",
+                "caching"
+            ],
+            "time": "2017-03-06 14:38:51"
+        },
+        {
+            "name": "doctrine/collections",
+            "version": "v1.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/collections.git",
+                "reference": "1a4fb7e902202c33cce8c55989b945612943c2ba"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/collections/zipball/1a4fb7e902202c33cce8c55989b945612943c2ba",
+                "reference": "1a4fb7e902202c33cce8c55989b945612943c2ba",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6 || ^7.0"
+            },
+            "require-dev": {
+                "doctrine/coding-standard": "~0.1@dev",
+                "phpunit/phpunit": "^5.7"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Doctrine\\Common\\Collections\\": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Roman Borschel",
+                    "email": "roman@code-factory.org"
+                },
+                {
+                    "name": "Benjamin Eberlei",
+                    "email": "kontakt@beberlei.de"
+                },
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
+                {
+                    "name": "Jonathan Wage",
+                    "email": "jonwage@gmail.com"
+                },
+                {
+                    "name": "Johannes Schmitt",
+                    "email": "schmittjoh@gmail.com"
+                }
+            ],
+            "description": "Collections Abstraction library",
+            "homepage": "http://www.doctrine-project.org",
+            "keywords": [
+                "array",
+                "collections",
+                "iterator"
+            ],
+            "time": "2017-01-03T10:49:41+00:00"
+        },
+        {
+            "name": "doctrine/common",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/common.git",
+                "reference": "4b434dbf8d204198dac708f2e938f7c805864dd6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/common/zipball/4b434dbf8d204198dac708f2e938f7c805864dd6",
+                "reference": "4b434dbf8d204198dac708f2e938f7c805864dd6",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/annotations": "1.*",
+                "doctrine/cache": "1.*",
+                "doctrine/collections": "1.*",
+                "doctrine/inflector": "1.*",
+                "doctrine/lexer": "1.*",
+                "php": "~5.6|~7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^5.7"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Common\\": "lib/Doctrine/Common"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Roman Borschel",
+                    "email": "roman@code-factory.org"
+                },
+                {
+                    "name": "Benjamin Eberlei",
+                    "email": "kontakt@beberlei.de"
+                },
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
+                {
+                    "name": "Jonathan Wage",
+                    "email": "jonwage@gmail.com"
+                },
+                {
+                    "name": "Johannes Schmitt",
+                    "email": "schmittjoh@gmail.com"
+                }
+            ],
+            "description": "Common Library for Doctrine projects",
+            "homepage": "http://www.doctrine-project.org",
+            "keywords": [
+                "annotations",
+                "collections",
+                "eventmanager",
+                "persistence",
+                "spl"
+            ],
+            "time": "2017-03-06 07:30:42"
+        },
+        {
+            "name": "doctrine/dbal",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/dbal.git",
+                "reference": "50bf623418be0feb3282bb50d07a4aea977fb33a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/dbal/zipball/50bf623418be0feb3282bb50d07a4aea977fb33a",
+                "reference": "50bf623418be0feb3282bb50d07a4aea977fb33a",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/common": "^2.7.1",
+                "php": "^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^5.4.6",
+                "phpunit/phpunit-mock-objects": "!=3.2.4,!=3.2.5",
+                "symfony/console": "2.*||^3.0"
+            },
+            "suggest": {
+                "symfony/console": "For helpful console commands such as SQL execution and import of files."
+            },
+            "bin": [
+                "bin/doctrine-dbal"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.6.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Doctrine\\DBAL\\": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Roman Borschel",
+                    "email": "roman@code-factory.org"
+                },
+                {
+                    "name": "Benjamin Eberlei",
+                    "email": "kontakt@beberlei.de"
+                },
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
+                {
+                    "name": "Jonathan Wage",
+                    "email": "jonwage@gmail.com"
+                }
+            ],
+            "description": "Database Abstraction Layer",
+            "homepage": "http://www.doctrine-project.org",
+            "keywords": [
+                "database",
+                "dbal",
+                "persistence",
+                "queryobject"
+            ],
+            "time": "2017-02-25 22:09:19"
+        },
+        {
+            "name": "doctrine/inflector",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/inflector.git",
+                "reference": "803a2ed9fea02f9ca47cd45395089fe78769a392"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/inflector/zipball/803a2ed9fea02f9ca47cd45395089fe78769a392",
+                "reference": "803a2ed9fea02f9ca47cd45395089fe78769a392",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "4.*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Doctrine\\Common\\Inflector\\": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Roman Borschel",
+                    "email": "roman@code-factory.org"
+                },
+                {
+                    "name": "Benjamin Eberlei",
+                    "email": "kontakt@beberlei.de"
+                },
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
+                {
+                    "name": "Jonathan Wage",
+                    "email": "jonwage@gmail.com"
+                },
+                {
+                    "name": "Johannes Schmitt",
+                    "email": "schmittjoh@gmail.com"
+                }
+            ],
+            "description": "Common String Manipulations with regard to casing and singular/plural rules.",
+            "homepage": "http://www.doctrine-project.org",
+            "keywords": [
+                "inflection",
+                "pluralize",
+                "singularize",
+                "string"
+            ],
+            "time": "2016-05-12 17:23:41"
+        },
         {
             "name": "doctrine/instantiator",
             "version": "dev-master",
@@ -109,6 +525,60 @@
             ],
             "time": "2017-01-23 09:23:06"
         },
+        {
+            "name": "doctrine/lexer",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/lexer.git",
+                "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/lexer/zipball/83893c552fd2045dd78aef794c31e694c37c0b8c",
+                "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Doctrine\\Common\\Lexer\\": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Roman Borschel",
+                    "email": "roman@code-factory.org"
+                },
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
+                {
+                    "name": "Johannes Schmitt",
+                    "email": "schmittjoh@gmail.com"
+                }
+            ],
+            "description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.",
+            "homepage": "http://www.doctrine-project.org",
+            "keywords": [
+                "lexer",
+                "parser"
+            ],
+            "time": "2014-09-09 13:34:57"
+        },
         {
             "name": "guzzle/guzzle",
             "version": "dev-master",
@@ -1636,6 +2106,57 @@
             ],
             "time": "2016-08-06 14:39:51"
         },
+        {
+            "name": "sabre/event",
+            "version": "2.0.x-dev",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/fruux/sabre-event.git",
+                "reference": "337b6f5e10ea6e0b21e22c7e5788dd3883ae73ff"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/fruux/sabre-event/zipball/337b6f5e10ea6e0b21e22c7e5788dd3883ae73ff",
+                "reference": "337b6f5e10ea6e0b21e22c7e5788dd3883ae73ff",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "*",
+                "sabre/cs": "~0.0.1"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Sabre\\Event\\": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Evert Pot",
+                    "email": "me@evertpot.com",
+                    "homepage": "http://evertpot.com/",
+                    "role": "Developer"
+                }
+            ],
+            "description": "sabre/event is a library for lightweight event-based programming",
+            "homepage": "http://sabre.io/event/",
+            "keywords": [
+                "EventEmitter",
+                "events",
+                "hooks",
+                "plugin",
+                "promise",
+                "signal"
+            ],
+            "time": "2015-05-19 10:24:22"
+        },
         {
             "name": "sebastian/code-unit-reverse-lookup",
             "version": "dev-master",
@@ -2264,6 +2785,104 @@
             "homepage": "https://symfony.com",
             "time": "2017-01-21 17:10:26"
         },
+        {
+            "name": "vlucas/spot2",
+            "version": "2.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/vlucas/spot2.git",
+                "reference": "f30e5439c1c8d969490d773bc3f87937e675083a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/vlucas/spot2/zipball/f30e5439c1c8d969490d773bc3f87937e675083a",
+                "reference": "f30e5439c1c8d969490d773bc3f87937e675083a",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/dbal": "~2.4",
+                "php": ">=5.4",
+                "sabre/event": "~2.0",
+                "vlucas/valitron": "1.x"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Spot": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD"
+            ],
+            "authors": [
+                {
+                    "name": "Vance Lucas",
+                    "email": "vance@vancelucas.com",
+                    "homepage": "http://www.vancelucas.com",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Simple DataMapper built on top of Doctrine DBAL",
+            "homepage": "https://github.com/vlucas/spot2",
+            "keywords": [
+                "database",
+                "datamapper",
+                "dbal",
+                "doctrine",
+                "entity",
+                "mapper",
+                "model",
+                "orm"
+            ],
+            "time": "2014-07-03T14:29:08+00:00"
+        },
+        {
+            "name": "vlucas/valitron",
+            "version": "v1.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/vlucas/valitron.git",
+                "reference": "b33c79116260637337187b7125f955ae26d306cc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/vlucas/valitron/zipball/b33c79116260637337187b7125f955ae26d306cc",
+                "reference": "b33c79116260637337187b7125f955ae26d306cc",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Valitron": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD"
+            ],
+            "authors": [
+                {
+                    "name": "Vance Lucas",
+                    "email": "vance@vancelucas.com",
+                    "homepage": "http://www.vancelucas.com"
+                }
+            ],
+            "description": "Simple, elegant, stand-alone validation library with NO dependencies",
+            "homepage": "http://github.com/vlucas/valitron",
+            "keywords": [
+                "valid",
+                "validation",
+                "validator"
+            ],
+            "time": "2017-02-23T08:31:59+00:00"
+        },
         {
             "name": "webmozart/assert",
             "version": "dev-master",

From 64428872df0bee1e4ed11de1e11922d9aafe113d Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Wed, 8 Mar 2017 21:49:30 -0500
Subject: [PATCH 067/192] Created an entity for user

---
 api/DataAccess/Entities/BaseEntity.php | 14 ++++++++
 api/DataAccess/Entities/User.php       | 49 ++++++++++++++++++++++++++
 2 files changed, 63 insertions(+)
 create mode 100644 api/DataAccess/Entities/BaseEntity.php
 create mode 100644 api/DataAccess/Entities/User.php

diff --git a/api/DataAccess/Entities/BaseEntity.php b/api/DataAccess/Entities/BaseEntity.php
new file mode 100644
index 00000000..ccc77d62
--- /dev/null
+++ b/api/DataAccess/Entities/BaseEntity.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace DataAccess\Entities;
+
+
+use Spot\Entity;
+
+class BaseEntity extends Entity {
+    public static function table($tableName) {
+        global $hesk_settings;
+
+        return parent::table($hesk_settings['db_pfix'] . $tableName);
+    }
+}
\ No newline at end of file
diff --git a/api/DataAccess/Entities/User.php b/api/DataAccess/Entities/User.php
new file mode 100644
index 00000000..f22358e7
--- /dev/null
+++ b/api/DataAccess/Entities/User.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace DataAccess\Entities;
+
+
+class User extends BaseEntity {
+    protected static $table = 'users';
+
+    public static function fields() {
+        //@formatter:off
+        return [
+            'id'                        => ['type' => 'integer', 'primary' => true, 'autoincrement' => true],
+            'user'                      => ['type' => 'string', 'required' => true, 'default' => ''],
+            'pass'                      => ['type' => 'string', 'required' => true],
+            'isadmin'                   => ['type' => 'string', 'required' => true, 'default' => '0'],
+            'name'                      => ['type' => 'string', 'required' => true, 'default' => ''],
+            'email'                     => ['type' => 'string', 'required' => true, 'default' => ''],
+            'signature'                 => ['type' => 'string', 'required' => true, 'default' => ''],
+            'language'                  => ['type' => 'string', 'required' => false],
+            'categories'                => ['type' => 'string', 'required' => true, 'default' => ''],
+            'afterreply'                => ['type' => 'string', 'required' => true, 'default' => '0'],
+            'autostart'                 => ['type' => 'string', 'required' => true, 'default' => '1'],
+            'autoreload'                => ['type' => 'smallint', 'required' => true, 'default' => 0],
+            'notify_customer_new'       => ['type' => 'string', 'required' => true, 'default' => '1'],
+            'notify_customer_reply'     => ['type' => 'string', 'required' => true, 'default' => '1'],
+            'show_suggested'            => ['type' => 'string', 'required' => true, 'default' => '1'],
+            'notify_new_unassigned'     => ['type' => 'string', 'required' => true, 'default' => '1'],
+            'notify_new_my'             => ['type' => 'string', 'required' => true, 'default' => '1'],
+            'notify_reply_unassigned'   => ['type' => 'string', 'required' => true, 'default' => '1'],
+            'notify_reply_my'           => ['type' => 'string', 'required' => true, 'default' => '1'],
+            'notify_assigned'           => ['type' => 'string', 'required' => true, 'default' => '1'],
+            'notify_pm'                 => ['type' => 'string', 'required' => true, 'default' => '1'],
+            'notify_note'               => ['type' => 'string', 'required' => true, 'default' => '1'],
+            'notify_note_unassigned'    => ['type' => 'string', 'required' => false, 'default' => '0'],
+            'default_calendar_view'     => ['type' => 'integer', 'required' => true, 'default' => '0'],
+            'notify_overdue_unassigned' => ['type' => 'string', 'required' => true, 'default' => '0'],
+            'default_list'              => ['type' => 'string', 'required' => true, 'default' => ''],
+            'autoassign'                => ['type' => 'string', 'required' => true, 'default' => '1'],
+            'heskprivileges'            => ['type' => 'string', 'required' => false],
+            'ratingneg'                 => ['type' => 'integer', 'required' => true, 'default' => 0],
+            'ratingpos'                 => ['type' => 'integer', 'required' => true, 'default' => 0],
+            'rating'                    => ['type' => 'float', 'required' => true, 'default' => 0],
+            'replies'                   => ['type' => 'integer', 'required' => true, 'default' => 0],
+            'active'                    => ['type' => 'string', 'required' => true, 'default' => '1'],
+            'permission_template'       => ['type' => 'integer', 'required' => false]
+        ];
+        //@formatter:on
+    }
+}
\ No newline at end of file

From ad2c96c667705e90c6aadfbd747d90eb4542960e Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Thu, 9 Mar 2017 21:55:32 -0500
Subject: [PATCH 068/192] Update composer.json and ApplicationContext

---
 api/ApplicationContext.php                  | 34 ++++++++++++--
 api/BusinessLogic/Tickets/TicketCreator.php |  2 +
 api/DataAccess/Entities/BaseEntity.php      | 14 ------
 api/DataAccess/Entities/User.php            | 49 ---------------------
 api/autoload.php                            |  7 +--
 api/composer.json                           |  3 +-
 api/index.php                               |  9 +++-
 7 files changed, 43 insertions(+), 75 deletions(-)
 delete mode 100644 api/DataAccess/Entities/BaseEntity.php
 delete mode 100644 api/DataAccess/Entities/User.php

diff --git a/api/ApplicationContext.php b/api/ApplicationContext.php
index 76de8849..3f13facf 100644
--- a/api/ApplicationContext.php
+++ b/api/ApplicationContext.php
@@ -2,6 +2,11 @@
 
 // Responsible for loading in all necessary classes. AKA a poor man's DI solution.
 use BusinessLogic\Categories\CategoryRetriever;
+use BusinessLogic\Emails\BasicEmailSender;
+use BusinessLogic\Emails\EmailSenderHelper;
+use BusinessLogic\Emails\EmailTemplateParser;
+use BusinessLogic\Emails\EmailTemplateRetriever;
+use BusinessLogic\Emails\MailgunEmailSender;
 use BusinessLogic\Security\BanRetriever;
 use BusinessLogic\Security\UserContextBuilder;
 use BusinessLogic\Tickets\Autoassigner;
@@ -10,11 +15,13 @@ use BusinessLogic\Tickets\TicketCreator;
 use BusinessLogic\Tickets\NewTicketValidator;
 use BusinessLogic\Tickets\TicketValidators;
 use BusinessLogic\Tickets\TrackingIdGenerator;
+use BusinessLogic\Tickets\VerifiedEmailChecker;
 use DataAccess\Categories\CategoryGateway;
 use DataAccess\Security\BanGateway;
 use DataAccess\Security\UserGateway;
 use DataAccess\Statuses\StatusGateway;
 use DataAccess\Tickets\TicketGateway;
+use DataAccess\Tickets\VerifiedEmailGateway;
 
 
 class ApplicationContext {
@@ -23,7 +30,11 @@ class ApplicationContext {
     function __construct() {
         $this->get = array();
 
-        // User Context
+        // Verified Email Checker
+        $this->get[VerifiedEmailGateway::class] = new VerifiedEmailGateway();
+        $this->get[VerifiedEmailChecker::class] = new VerifiedEmailChecker($this->get[VerifiedEmailGateway::class]);
+
+        // Users
         $this->get[UserGateway::class] = new UserGateway();
         $this->get[UserContextBuilder::class] = new UserContextBuilder($this->get[UserGateway::class]);
 
@@ -35,8 +46,22 @@ class ApplicationContext {
         $this->get[BanGateway::class] = new BanGateway();
         $this->get[BanRetriever::class] = new BanRetriever($this->get[BanGateway::class]);
 
-        // Tickets
+        // Statuses
         $this->get[StatusGateway::class] = new StatusGateway();
+
+        // Email Sender
+        $this->get[EmailTemplateRetriever::class] = new EmailTemplateRetriever();
+        $this->get[EmailTemplateParser::class] = new EmailTemplateParser($this->get[StatusGateway::class],
+            $this->get[CategoryGateway::class],
+            $this->get[UserGateway::class],
+            $this->get[EmailTemplateRetriever::class]);
+        $this->get[BasicEmailSender::class] = new BasicEmailSender();
+        $this->get[MailgunEmailSender::class] = new MailgunEmailSender();
+        $this->get[EmailSenderHelper::class] = new EmailSenderHelper($this->get[EmailTemplateParser::class],
+            $this->get[BasicEmailSender::class],
+            $this->get[MailgunEmailSender::class]);
+
+        // Tickets
         $this->get[TicketGateway::class] = new TicketGateway();
         $this->get[TicketRetriever::class] = new TicketRetriever($this->get[TicketGateway::class]);
         $this->get[TicketValidators::class] = new TicketValidators($this->get[TicketGateway::class]);
@@ -49,6 +74,9 @@ class ApplicationContext {
             $this->get[TrackingIdGenerator::class],
             $this->get[Autoassigner::class],
             $this->get[StatusGateway::class],
-            $this->get[TicketGateway::class]);
+            $this->get[TicketGateway::class],
+            $this->get[VerifiedEmailChecker::class],
+            $this->get[EmailSenderHelper::class],
+            $this->get[UserGateway::class]);
     }
 }
\ No newline at end of file
diff --git a/api/BusinessLogic/Tickets/TicketCreator.php b/api/BusinessLogic/Tickets/TicketCreator.php
index 46a17589..a6d1225f 100644
--- a/api/BusinessLogic/Tickets/TicketCreator.php
+++ b/api/BusinessLogic/Tickets/TicketCreator.php
@@ -148,6 +148,8 @@ class TicketCreator {
             $addressees = new Addressees();
             $addressees->to = array($ownerEmail);
             $this->emailSenderHelper->sendEmailForTicket(EmailTemplateRetriever::TICKET_ASSIGNED_TO_YOU, $ticketRequest->language, $addressees, $ticket, $heskSettings, $modsForHeskSettings);
+        } else {
+            // TODO email all users who should be notified
         }
 
         return $ticket;
diff --git a/api/DataAccess/Entities/BaseEntity.php b/api/DataAccess/Entities/BaseEntity.php
deleted file mode 100644
index ccc77d62..00000000
--- a/api/DataAccess/Entities/BaseEntity.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace DataAccess\Entities;
-
-
-use Spot\Entity;
-
-class BaseEntity extends Entity {
-    public static function table($tableName) {
-        global $hesk_settings;
-
-        return parent::table($hesk_settings['db_pfix'] . $tableName);
-    }
-}
\ No newline at end of file
diff --git a/api/DataAccess/Entities/User.php b/api/DataAccess/Entities/User.php
deleted file mode 100644
index f22358e7..00000000
--- a/api/DataAccess/Entities/User.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-namespace DataAccess\Entities;
-
-
-class User extends BaseEntity {
-    protected static $table = 'users';
-
-    public static function fields() {
-        //@formatter:off
-        return [
-            'id'                        => ['type' => 'integer', 'primary' => true, 'autoincrement' => true],
-            'user'                      => ['type' => 'string', 'required' => true, 'default' => ''],
-            'pass'                      => ['type' => 'string', 'required' => true],
-            'isadmin'                   => ['type' => 'string', 'required' => true, 'default' => '0'],
-            'name'                      => ['type' => 'string', 'required' => true, 'default' => ''],
-            'email'                     => ['type' => 'string', 'required' => true, 'default' => ''],
-            'signature'                 => ['type' => 'string', 'required' => true, 'default' => ''],
-            'language'                  => ['type' => 'string', 'required' => false],
-            'categories'                => ['type' => 'string', 'required' => true, 'default' => ''],
-            'afterreply'                => ['type' => 'string', 'required' => true, 'default' => '0'],
-            'autostart'                 => ['type' => 'string', 'required' => true, 'default' => '1'],
-            'autoreload'                => ['type' => 'smallint', 'required' => true, 'default' => 0],
-            'notify_customer_new'       => ['type' => 'string', 'required' => true, 'default' => '1'],
-            'notify_customer_reply'     => ['type' => 'string', 'required' => true, 'default' => '1'],
-            'show_suggested'            => ['type' => 'string', 'required' => true, 'default' => '1'],
-            'notify_new_unassigned'     => ['type' => 'string', 'required' => true, 'default' => '1'],
-            'notify_new_my'             => ['type' => 'string', 'required' => true, 'default' => '1'],
-            'notify_reply_unassigned'   => ['type' => 'string', 'required' => true, 'default' => '1'],
-            'notify_reply_my'           => ['type' => 'string', 'required' => true, 'default' => '1'],
-            'notify_assigned'           => ['type' => 'string', 'required' => true, 'default' => '1'],
-            'notify_pm'                 => ['type' => 'string', 'required' => true, 'default' => '1'],
-            'notify_note'               => ['type' => 'string', 'required' => true, 'default' => '1'],
-            'notify_note_unassigned'    => ['type' => 'string', 'required' => false, 'default' => '0'],
-            'default_calendar_view'     => ['type' => 'integer', 'required' => true, 'default' => '0'],
-            'notify_overdue_unassigned' => ['type' => 'string', 'required' => true, 'default' => '0'],
-            'default_list'              => ['type' => 'string', 'required' => true, 'default' => ''],
-            'autoassign'                => ['type' => 'string', 'required' => true, 'default' => '1'],
-            'heskprivileges'            => ['type' => 'string', 'required' => false],
-            'ratingneg'                 => ['type' => 'integer', 'required' => true, 'default' => 0],
-            'ratingpos'                 => ['type' => 'integer', 'required' => true, 'default' => 0],
-            'rating'                    => ['type' => 'float', 'required' => true, 'default' => 0],
-            'replies'                   => ['type' => 'integer', 'required' => true, 'default' => 0],
-            'active'                    => ['type' => 'string', 'required' => true, 'default' => '1'],
-            'permission_template'       => ['type' => 'integer', 'required' => false]
-        ];
-        //@formatter:on
-    }
-}
\ No newline at end of file
diff --git a/api/autoload.php b/api/autoload.php
index acdb59e9..e06961f9 100644
--- a/api/autoload.php
+++ b/api/autoload.php
@@ -4,7 +4,7 @@
 // Core requirements
 define('IN_SCRIPT', 1);
 define('HESK_PATH', '../');
-require_once(__DIR__ . 'vendor/autoload.php');
+require_once(__DIR__ . '/vendor/autoload.php');
 require_once(__DIR__ . '/bootstrap.php');
 require_once(__DIR__ . '/../hesk_settings.inc.php');
 require_once(__DIR__ . '/../inc/common.inc.php');
@@ -19,11 +19,6 @@ global $hesk_settings;
 // HESK files that require database access
 require_once(__DIR__ . '/../inc/custom_fields.inc.php');
 
-// Load Spot ORM
-$config = new \Spot\Config();
-$config->addConnection('mysql', "mysql://{$hesk_settings['db_user']}:{$hesk_settings['db_pass']}@{$hesk_settings['db_host']}/{$hesk_settings['db_name']}");
-$spot = new \Spot\Locator($config);
-
 // Load the ApplicationContext
 $applicationContext = new \ApplicationContext();
 //$modsForHeskSettings = mfh_getSettings();
\ No newline at end of file
diff --git a/api/composer.json b/api/composer.json
index 3c793199..8b3f0002 100644
--- a/api/composer.json
+++ b/api/composer.json
@@ -16,7 +16,6 @@
     "php-http/guzzle6-adapter": "^1.1",
     "php-http/message": "^1.5",
     "php-http/curl-client": "^1.7",
-    "guzzlehttp/psr7": "^1.3",
-    "vlucas/spot2": "~2.0"
+    "guzzlehttp/psr7": "^1.3"
   }
 }
diff --git a/api/index.php b/api/index.php
index d6932a50..3010cddf 100644
--- a/api/index.php
+++ b/api/index.php
@@ -34,13 +34,20 @@ function buildUserContext($xAuthToken) {
 }
 
 function errorHandler($errorNumber, $errorMessage, $errorFile, $errorLine) {
-    exceptionHandler(new Exception(sprintf("%s:%d\n\n%s", $errorFile, $errorLine, $errorMessage)));
+    if ($errorNumber === E_WARNING) {
+        //-- TODO log a warning
+    } elseif ($errorNumber === E_NOTICE || $errorNumber === E_USER_NOTICE) {
+        //-- TODO log an info
+    } else {
+        exceptionHandler(new Exception(sprintf("%s:%d\n\n%s", $errorFile, $errorLine, $errorMessage)));
+    }
 }
 
 /**
  * @param $exception Exception
  */
 function exceptionHandler($exception) {
+    //-- TODO Log an error
     if (exceptionIsOfType($exception, \BusinessLogic\Exceptions\ApiFriendlyException::class)) {
         /* @var $castedException \BusinessLogic\Exceptions\ApiFriendlyException */
         $castedException = $exception;

From af789a70604a12cd0ca732c24ab8828a2eebc630 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Fri, 10 Mar 2017 22:06:32 -0500
Subject: [PATCH 069/192] Working on autoassign rewrite logic

---
 api/BusinessLogic/Security/UserContext.php    | 49 +++++++++++++
 api/BusinessLogic/Tickets/Autoassigner.php    | 26 ++++++-
 api/DataAccess/Security/UserGateway.php       | 26 +++++++
 .../Tickets/AutoassignerTest.php              | 73 +++++++++++++++++++
 .../CreateTicketForCustomerTest.php           | 10 ++-
 5 files changed, 181 insertions(+), 3 deletions(-)
 create mode 100644 api/Tests/BusinessLogic/Tickets/AutoassignerTest.php

diff --git a/api/BusinessLogic/Security/UserContext.php b/api/BusinessLogic/Security/UserContext.php
index ec99ccf9..1f781023 100644
--- a/api/BusinessLogic/Security/UserContext.php
+++ b/api/BusinessLogic/Security/UserContext.php
@@ -29,4 +29,53 @@ class UserContext {
     public $rating;
     public $totalNumberOfReplies;
     public $active;
+
+    /**
+     * Builds a user context based on the current session. **The session must be active!**
+     * @param $dataRow array the $_SESSION superglobal or the hesk_users result set
+     * @return UserContext the built user context
+     */
+    static function fromDataRow($dataRow) {
+        $userContext = new UserContext();
+        $userContext->id = $dataRow['id'];
+        $userContext->username = $dataRow['user'];
+        $userContext->admin = $dataRow['isadmin'];
+        $userContext->name = $dataRow['name'];
+        $userContext->email = $dataRow['email'];
+        $userContext->signature = $dataRow['signature'];
+        $userContext->language = $dataRow['language'];
+        $userContext->categories = explode(',', $dataRow['categories']);
+        $userContext->permissions = explode(',', $dataRow['heskprivileges']);
+        $userContext->autoAssign = $dataRow['autoassign'];
+        $userContext->ratingNegative = $dataRow['ratingneg'];
+        $userContext->ratingPositive = $dataRow['ratingpos'];
+        $userContext->rating = $dataRow['rating'];
+        $userContext->totalNumberOfReplies = $dataRow['replies'];
+        $userContext->active = $dataRow['active'];
+
+        $preferences = new UserContextPreferences();
+        $preferences->afterReply = $dataRow['afterreply'];
+        $preferences->autoStartTimeWorked = $dataRow['autostart'];
+        $preferences->autoreload = $dataRow['autoreload'];
+        $preferences->defaultNotifyCustomerNewTicket = $dataRow['notify_customer_new'];
+        $preferences->defaultNotifyCustomerReply = $dataRow['notify_customer_reply'];
+        $preferences->showSuggestedKnowledgebaseArticles = $dataRow['show_suggested'];
+        $preferences->defaultCalendarView = $dataRow['default_calendar_view'];
+        $preferences->defaultTicketView = $dataRow['default_list'];
+        $userContext->preferences = $preferences;
+
+        $notifications = new UserContextNotifications();
+        $notifications->newUnassigned = $dataRow['notify_new_unassigned'];
+        $notifications->newAssignedToMe = $dataRow['notify_new_my'];
+        $notifications->replyUnassigned = $dataRow['notify_reply_unassigned'];
+        $notifications->replyToMe = $dataRow['notify_reply_my'];
+        $notifications->ticketAssignedToMe = $dataRow['notify_assigned'];
+        $notifications->privateMessage = $dataRow['notify_pm'];
+        $notifications->noteOnTicketAssignedToMe = $dataRow['notify_note'];
+        $notifications->noteOnTicketNotAssignedToMe = $dataRow['notify_note_unassigned'];
+        $notifications->overdueTicketUnassigned = $dataRow['notify_overdue_unassigned'];
+        $userContext->notificationSettings = $notifications;
+
+        return $userContext;
+    }
 }
\ No newline at end of file
diff --git a/api/BusinessLogic/Tickets/Autoassigner.php b/api/BusinessLogic/Tickets/Autoassigner.php
index 514a9dda..4b8f654c 100644
--- a/api/BusinessLogic/Tickets/Autoassigner.php
+++ b/api/BusinessLogic/Tickets/Autoassigner.php
@@ -3,13 +3,35 @@
 namespace BusinessLogic\Tickets;
 
 
+use BusinessLogic\Security\UserContext;
+use DataAccess\Categories\CategoryGateway;
+use DataAccess\Security\UserGateway;
+
 class Autoassigner {
+    /* @var $categoryGateway CategoryGateway */
+    private $categoryGateway;
+
+    /* @var $userGateway UserGateway */
+    private $userGateway;
+
+    function __construct($categoryGateway, $userGateway) {
+        $this->categoryGateway = $categoryGateway;
+        $this->userGateway = $userGateway;
+    }
+
     /**
      * @param $categoryId int
      * @param $heskSettings array
-     * @return int|null The user ID, or null if no user found
+     * @return UserContext the user who is assigned, or null if no user should be assigned
      */
     function getNextUserForTicket($categoryId, $heskSettings) {
-        return 0;
+        if (!$heskSettings['autoassign']) {
+            return null;
+        }
+
+        $potentialUsers = $this->userGateway->getUsersByNumberOfOpenTickets($heskSettings);
+
+
+        return $potentialUsers[0];
     }
 }
\ No newline at end of file
diff --git a/api/DataAccess/Security/UserGateway.php b/api/DataAccess/Security/UserGateway.php
index be6e43ff..b32053b0 100644
--- a/api/DataAccess/Security/UserGateway.php
+++ b/api/DataAccess/Security/UserGateway.php
@@ -2,6 +2,7 @@
 namespace DataAccess\Security;
 
 
+use BusinessLogic\Security\UserContext;
 use BusinessLogic\Security\UserContextBuilder;
 use DataAccess\CommonDao;
 use Exception;
@@ -61,4 +62,29 @@ class UserGateway extends CommonDao {
 
         return $row['email'];
     }
+
+    function getUsersByNumberOfOpenTickets($heskSettings) {
+        $this->init();
+
+        $rs = hesk_dbQuery("SELECT `t1`.`id`,`t1`.`user`,`t1`.`name`, `t1`.`email`, `t1`.`language`, `t1`.`isadmin`, 
+                            `t1`.`categories`, `t1`.`notify_assigned`, `t1`.`heskprivileges`,
+					        (SELECT COUNT(*) FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "tickets`
+					            WHERE `owner`=`t1`.`id` 
+					            AND `status` IN (
+					                SELECT `ID` FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "statuses` 
+					                WHERE `IsClosed` = 0
+					            ) 
+					        ) AS `open_tickets`
+						FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "users` AS `t1`
+						WHERE `t1`.`autoassign` = '1' ORDER BY `open_tickets` ASC, RAND()");
+
+        $users = array();
+
+        while ($row = hesk_dbFetchAssoc($rs)) {
+            $user = UserContext::fromDataRow($row);
+            $users[] = $user;
+        }
+
+        return $users;
+    }
 }
\ No newline at end of file
diff --git a/api/Tests/BusinessLogic/Tickets/AutoassignerTest.php b/api/Tests/BusinessLogic/Tickets/AutoassignerTest.php
new file mode 100644
index 00000000..215adfee
--- /dev/null
+++ b/api/Tests/BusinessLogic/Tickets/AutoassignerTest.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: mkoch
+ * Date: 3/10/2017
+ * Time: 7:59 PM
+ */
+
+namespace BusinessLogic\Tickets;
+
+
+use BusinessLogic\Security\UserContext;
+use DataAccess\Categories\CategoryGateway;
+use DataAccess\Security\UserGateway;
+use PHPUnit\Framework\TestCase;
+
+class AutoassignerTest extends TestCase {
+    /* @var $categoryGateway \PHPUnit_Framework_MockObject_MockObject */
+    private $categoryGateway;
+
+    /* @var $userGateway \PHPUnit_Framework_MockObject_MockObject */
+    private $userGateway;
+
+    /* @var $autoassigner Autoassigner */
+    private $autoassigner;
+
+    /* @var $heskSettings array */
+    private $heskSettings;
+
+    protected function setUp() {
+        $this->categoryGateway = $this->createMock(CategoryGateway::class);
+        $this->userGateway = $this->createMock(UserGateway::class);
+        $this->autoassigner = new Autoassigner($this->categoryGateway, $this->userGateway);
+        $this->heskSettings = array(
+            'autoassign' => 1
+        );
+    }
+
+    function testItReturnsNullWhenAutoassignIsDisabled() {
+        //-- Arrange
+        $this->heskSettings['autoassign'] = 0;
+
+        //-- Act
+        $owner = $this->autoassigner->getNextUserForTicket(0, $this->heskSettings);
+
+        //-- Assert
+        self::assertThat($owner, self::isNull());
+    }
+
+    function testItReturnsTheUsersWithLeastOpenTickets() {
+        //-- Arrange
+        $userWithNoOpenTickets = new UserContext();
+        $userWithNoOpenTickets->id = 1;
+        $userWithNoOpenTickets->categories = array(1);
+        $userWithOneOpenTicket = new UserContext();
+        $userWithOneOpenTicket->id = 2;
+        $userWithOneOpenTicket->categories = array(1);
+        $usersToReturn = array(
+            $userWithNoOpenTickets,
+            $userWithOneOpenTicket
+        );
+
+        $this->userGateway->method('getUsersByNumberOfOpenTickets')
+            ->with($this->heskSettings)
+            ->willReturn($usersToReturn);
+
+        //-- Act
+        $actual = $this->autoassigner->getNextUserForTicket(1, $this->heskSettings);
+
+        //-- Assert
+        self::assertThat($actual, self::equalTo($userWithNoOpenTickets));
+    }
+}
diff --git a/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php b/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php
index 23ab848c..f3072816 100644
--- a/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php
+++ b/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php
@@ -19,6 +19,7 @@ use BusinessLogic\Tickets\TrackingIdGenerator;
 use BusinessLogic\Tickets\VerifiedEmailChecker;
 use BusinessLogic\ValidationModel;
 use Core\Constants\Priority;
+use DataAccess\Security\UserGateway;
 use DataAccess\Statuses\StatusGateway;
 use DataAccess\Tickets\TicketGateway;
 use PHPUnit\Framework\TestCase;
@@ -90,6 +91,11 @@ class CreateTicketTest extends TestCase {
      */
     private $emailSenderHelper;
 
+    /**
+     * @var $userGateway \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $userGateway;
+
     protected function setUp() {
         $this->ticketGateway = $this->createMock(TicketGateway::class);
         $this->newTicketValidator = $this->createMock(NewTicketValidator::class);
@@ -98,9 +104,11 @@ class CreateTicketTest extends TestCase {
         $this->statusGateway = $this->createMock(StatusGateway::class);
         $this->verifiedEmailChecker = $this->createMock(VerifiedEmailChecker::class);
         $this->emailSenderHelper = $this->createMock(EmailSenderHelper::class);
+        $this->userGateway = $this->createMock(UserGateway::class);
 
         $this->ticketCreator = new TicketCreator($this->newTicketValidator, $this->trackingIdGenerator,
-            $this->autoassigner, $this->statusGateway, $this->ticketGateway, $this->verifiedEmailChecker, $this->emailSenderHelper);
+            $this->autoassigner, $this->statusGateway, $this->ticketGateway, $this->verifiedEmailChecker,
+            $this->emailSenderHelper, $this->userGateway);
 
         $this->ticketRequest = new CreateTicketByCustomerModel();
         $this->ticketRequest->name = 'Name';

From 06a38e9383718470221118388da24ce9c527bb71 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sat, 11 Mar 2017 23:43:46 -0500
Subject: [PATCH 070/192] Autoassign logic is finished

---
 api/BusinessLogic/Security/UserContext.php    |  37 +++++-
 api/BusinessLogic/Tickets/Autoassigner.php    |  11 +-
 api/DataAccess/Security/UserGateway.php       |   4 +
 .../Tickets/AutoassignerTest.php              | 111 ++++++++++++++++++
 4 files changed, 156 insertions(+), 7 deletions(-)

diff --git a/api/BusinessLogic/Security/UserContext.php b/api/BusinessLogic/Security/UserContext.php
index 1f781023..30baf47b 100644
--- a/api/BusinessLogic/Security/UserContext.php
+++ b/api/BusinessLogic/Security/UserContext.php
@@ -4,30 +4,55 @@ namespace BusinessLogic\Security;
 
 
 class UserContext {
+    /* @var $id int */
     public $id;
+
+    /* @var $username string */
     public $username;
+
+    /* @var $admin bool */
     public $admin;
+
+    /* @var $name string */
     public $name;
+
+    /* @var $email string */
     public $email;
+
+    /* @var $signature string */
     public $signature;
+
+    /* @var $language string|null */
     public $language;
+
+    /* @var $categories int[] */
     public $categories;
+
+    /* @var $permissions string[] */
     public $permissions;
 
-    /**
-     * @var UserContextPreferences
-     */
+    /* @var UserContextPreferences */
     public $preferences;
 
-    /**
-     * @var UserContextNotifications
-     */
+    /* @var UserContextNotifications */
     public $notificationSettings;
+
+    /* @var $autoAssign bool */
     public $autoAssign;
+
+    /* @var $ratingNegative int */
     public $ratingNegative;
+
+    /* @var $ratingPositive int */
     public $ratingPositive;
+
+    /* @var $rating float */
     public $rating;
+
+    /* @var $totalNumberOfReplies int */
     public $totalNumberOfReplies;
+
+    /* @var $active bool */
     public $active;
 
     /**
diff --git a/api/BusinessLogic/Tickets/Autoassigner.php b/api/BusinessLogic/Tickets/Autoassigner.php
index 4b8f654c..4ff6fabd 100644
--- a/api/BusinessLogic/Tickets/Autoassigner.php
+++ b/api/BusinessLogic/Tickets/Autoassigner.php
@@ -31,7 +31,16 @@ class Autoassigner {
 
         $potentialUsers = $this->userGateway->getUsersByNumberOfOpenTickets($heskSettings);
 
+        foreach ($potentialUsers as $potentialUser) {
+            if ($potentialUser->admin ||
+                (in_array($categoryId, $potentialUser->categories) &&
+                    in_array('can_view_tickets', $potentialUser->permissions) &&
+                    in_array('can_reply_tickets', $potentialUser->permissions))) {
+                return $potentialUser;
+            }
+        }
+
 
-        return $potentialUsers[0];
+        return null;
     }
 }
\ No newline at end of file
diff --git a/api/DataAccess/Security/UserGateway.php b/api/DataAccess/Security/UserGateway.php
index b32053b0..341f3e31 100644
--- a/api/DataAccess/Security/UserGateway.php
+++ b/api/DataAccess/Security/UserGateway.php
@@ -63,6 +63,10 @@ class UserGateway extends CommonDao {
         return $row['email'];
     }
 
+    /**
+     * @param $heskSettings array
+     * @return UserContext[]
+     */
     function getUsersByNumberOfOpenTickets($heskSettings) {
         $this->init();
 
diff --git a/api/Tests/BusinessLogic/Tickets/AutoassignerTest.php b/api/Tests/BusinessLogic/Tickets/AutoassignerTest.php
index 215adfee..1962395b 100644
--- a/api/Tests/BusinessLogic/Tickets/AutoassignerTest.php
+++ b/api/Tests/BusinessLogic/Tickets/AutoassignerTest.php
@@ -47,14 +47,20 @@ class AutoassignerTest extends TestCase {
         self::assertThat($owner, self::isNull());
     }
 
+    function getPermissionsForUser() {
+        return array('can_view_tickets', 'can_reply_tickets');
+    }
+
     function testItReturnsTheUsersWithLeastOpenTickets() {
         //-- Arrange
         $userWithNoOpenTickets = new UserContext();
         $userWithNoOpenTickets->id = 1;
         $userWithNoOpenTickets->categories = array(1);
+        $userWithNoOpenTickets->permissions = $this->getPermissionsForUser();
         $userWithOneOpenTicket = new UserContext();
         $userWithOneOpenTicket->id = 2;
         $userWithOneOpenTicket->categories = array(1);
+        $userWithOneOpenTicket->permissions = $this->getPermissionsForUser();
         $usersToReturn = array(
             $userWithNoOpenTickets,
             $userWithOneOpenTicket
@@ -70,4 +76,109 @@ class AutoassignerTest extends TestCase {
         //-- Assert
         self::assertThat($actual, self::equalTo($userWithNoOpenTickets));
     }
+
+    function testItOnlyReturnsUsersWhoCanAccessTheCategory() {
+        //-- Arrange
+        $userWithNoOpenTickets = new UserContext();
+        $userWithNoOpenTickets->id = 1;
+        $userWithNoOpenTickets->categories = array(1);
+        $userWithNoOpenTickets->permissions = $this->getPermissionsForUser();
+        $userWithOneOpenTicket = new UserContext();
+        $userWithOneOpenTicket->id = 2;
+        $userWithOneOpenTicket->categories = array(2);
+        $userWithOneOpenTicket->permissions = $this->getPermissionsForUser();
+        $usersToReturn = array(
+            $userWithNoOpenTickets,
+            $userWithOneOpenTicket
+        );
+
+        $this->userGateway->method('getUsersByNumberOfOpenTickets')
+            ->with($this->heskSettings)
+            ->willReturn($usersToReturn);
+
+        //-- Act
+        $actual = $this->autoassigner->getNextUserForTicket(2, $this->heskSettings);
+
+        //-- Assert
+        self::assertThat($actual, self::equalTo($userWithOneOpenTicket));
+    }
+
+    function testItReturnsAdminUsers() {
+        //-- Arrange
+        $userWithNoOpenTickets = new UserContext();
+        $userWithNoOpenTickets->id = 1;
+        $userWithNoOpenTickets->categories = array(1);
+        $userWithNoOpenTickets->permissions = $this->getPermissionsForUser();
+        $userWithNoOpenTickets->admin = true;
+        $userWithOneOpenTicket = new UserContext();
+        $userWithOneOpenTicket->id = 2;
+        $userWithOneOpenTicket->categories = array(2);
+        $userWithOneOpenTicket->permissions = $this->getPermissionsForUser();
+        $usersToReturn = array(
+            $userWithNoOpenTickets,
+            $userWithOneOpenTicket
+        );
+
+        $this->userGateway->method('getUsersByNumberOfOpenTickets')
+            ->with($this->heskSettings)
+            ->willReturn($usersToReturn);
+
+        //-- Act
+        $actual = $this->autoassigner->getNextUserForTicket(2, $this->heskSettings);
+
+        //-- Assert
+        self::assertThat($actual, self::equalTo($userWithNoOpenTickets));
+    }
+
+    function testItOnlyReturnsUsersWhoCanViewAndRespondToTickets() {
+        //-- Arrange
+        $userWithNoOpenTickets = new UserContext();
+        $userWithNoOpenTickets->id = 1;
+        $userWithNoOpenTickets->categories = array(1);
+        $userWithNoOpenTickets->permissions = array();
+        $userWithOneOpenTicket = new UserContext();
+        $userWithOneOpenTicket->id = 2;
+        $userWithOneOpenTicket->categories = array(1);
+        $userWithOneOpenTicket->permissions = $this->getPermissionsForUser();
+        $usersToReturn = array(
+            $userWithNoOpenTickets,
+            $userWithOneOpenTicket
+        );
+
+        $this->userGateway->method('getUsersByNumberOfOpenTickets')
+            ->with($this->heskSettings)
+            ->willReturn($usersToReturn);
+
+        //-- Act
+        $actual = $this->autoassigner->getNextUserForTicket(1, $this->heskSettings);
+
+        //-- Assert
+        self::assertThat($actual, self::equalTo($userWithOneOpenTicket));
+    }
+
+    function testItReturnsNullWhenNoOneCanHandleTheTicket() {
+        //-- Arrange
+        $userWithNoOpenTickets = new UserContext();
+        $userWithNoOpenTickets->id = 1;
+        $userWithNoOpenTickets->categories = array(1);
+        $userWithNoOpenTickets->permissions = $this->getPermissionsForUser();
+        $userWithOneOpenTicket = new UserContext();
+        $userWithOneOpenTicket->id = 2;
+        $userWithOneOpenTicket->categories = array(1);
+        $userWithOneOpenTicket->permissions = $this->getPermissionsForUser();
+        $usersToReturn = array(
+            $userWithNoOpenTickets,
+            $userWithOneOpenTicket
+        );
+
+        $this->userGateway->method('getUsersByNumberOfOpenTickets')
+            ->with($this->heskSettings)
+            ->willReturn($usersToReturn);
+
+        //-- Act
+        $actual = $this->autoassigner->getNextUserForTicket(2, $this->heskSettings);
+
+        //-- Assert
+        self::assertThat($actual, self::isNull());
+    }
 }

From ccbe2cd5801d39da746e51c149818bea1810a326 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sun, 12 Mar 2017 00:44:50 -0500
Subject: [PATCH 071/192] MFH Settings being loaded, emails being sent out

---
 api/ApplicationContext.php                    |  9 ++-
 api/BusinessLogic/Categories/Category.php     |  3 +
 .../Emails/EmailTemplateParser.php            |  2 +-
 api/BusinessLogic/Tickets/TicketCreator.php   | 16 +++--
 api/Controllers/Tickets/TicketController.php  |  5 +-
 api/DataAccess/Categories/CategoryGateway.php |  1 +
 api/DataAccess/Security/UserGateway.php       |  2 +
 .../Settings/ModsForHeskSettingsGateway.php   | 23 ++++++
 .../CreateTicketForCustomerTest.php           | 71 +++++++++++++------
 api/autoload.php                              |  3 +-
 10 files changed, 100 insertions(+), 35 deletions(-)
 create mode 100644 api/DataAccess/Settings/ModsForHeskSettingsGateway.php

diff --git a/api/ApplicationContext.php b/api/ApplicationContext.php
index 3f13facf..0fc14d58 100644
--- a/api/ApplicationContext.php
+++ b/api/ApplicationContext.php
@@ -19,6 +19,7 @@ use BusinessLogic\Tickets\VerifiedEmailChecker;
 use DataAccess\Categories\CategoryGateway;
 use DataAccess\Security\BanGateway;
 use DataAccess\Security\UserGateway;
+use DataAccess\Settings\ModsForHeskSettingsGateway;
 use DataAccess\Statuses\StatusGateway;
 use DataAccess\Tickets\TicketGateway;
 use DataAccess\Tickets\VerifiedEmailGateway;
@@ -30,6 +31,9 @@ class ApplicationContext {
     function __construct() {
         $this->get = array();
 
+        // Settings
+        $this->get[ModsForHeskSettingsGateway::class] = new ModsForHeskSettingsGateway();
+
         // Verified Email Checker
         $this->get[VerifiedEmailGateway::class] = new VerifiedEmailGateway();
         $this->get[VerifiedEmailChecker::class] = new VerifiedEmailChecker($this->get[VerifiedEmailGateway::class]);
@@ -66,7 +70,7 @@ class ApplicationContext {
         $this->get[TicketRetriever::class] = new TicketRetriever($this->get[TicketGateway::class]);
         $this->get[TicketValidators::class] = new TicketValidators($this->get[TicketGateway::class]);
         $this->get[TrackingIdGenerator::class] = new TrackingIdGenerator($this->get[TicketGateway::class]);
-        $this->get[Autoassigner::class] = new Autoassigner();
+        $this->get[Autoassigner::class] = new Autoassigner($this->get[CategoryGateway::class], $this->get[UserGateway::class]);
         $this->get[NewTicketValidator::class] = new NewTicketValidator($this->get[CategoryRetriever::class],
             $this->get[BanRetriever::class],
             $this->get[TicketValidators::class]);
@@ -77,6 +81,7 @@ class ApplicationContext {
             $this->get[TicketGateway::class],
             $this->get[VerifiedEmailChecker::class],
             $this->get[EmailSenderHelper::class],
-            $this->get[UserGateway::class]);
+            $this->get[UserGateway::class],
+            $this->get[ModsForHeskSettingsGateway::class]);
     }
 }
\ No newline at end of file
diff --git a/api/BusinessLogic/Categories/Category.php b/api/BusinessLogic/Categories/Category.php
index 5711f33d..ab9bc1af 100644
--- a/api/BusinessLogic/Categories/Category.php
+++ b/api/BusinessLogic/Categories/Category.php
@@ -8,6 +8,9 @@ class Category {
      */
     public $id;
 
+    /* @var $name string */
+    public $name;
+
     /**
      * @var int Categories order number
      */
diff --git a/api/BusinessLogic/Emails/EmailTemplateParser.php b/api/BusinessLogic/Emails/EmailTemplateParser.php
index 0d3974ca..8a1601ab 100644
--- a/api/BusinessLogic/Emails/EmailTemplateParser.php
+++ b/api/BusinessLogic/Emails/EmailTemplateParser.php
@@ -174,7 +174,7 @@ class EmailTemplateParser {
         // Status name and category name
         $defaultStatus = $this->statusGateway->getStatusForDefaultAction(DefaultStatusForAction::NEW_TICKET, $heskSettings);
         $statusName = hesk_msgToPlain($defaultStatus->localizedNames[$language]->text);
-        $category = hesk_msgToPlain($this->categoryGateway->getAllCategories($heskSettings)[$ticket->categoryId]);
+        $category = hesk_msgToPlain($this->categoryGateway->getAllCategories($heskSettings)[$ticket->categoryId]->name);
         $owner = hesk_msgToPlain($this->userGateway->getNameForId($ticket->ownerId, $heskSettings));
 
         switch ($ticket->priorityId) {
diff --git a/api/BusinessLogic/Tickets/TicketCreator.php b/api/BusinessLogic/Tickets/TicketCreator.php
index a6d1225f..822ee513 100644
--- a/api/BusinessLogic/Tickets/TicketCreator.php
+++ b/api/BusinessLogic/Tickets/TicketCreator.php
@@ -8,6 +8,7 @@ use BusinessLogic\Emails\EmailTemplateRetriever;
 use BusinessLogic\Exceptions\ValidationException;
 use BusinessLogic\Statuses\DefaultStatusForAction;
 use DataAccess\Security\UserGateway;
+use DataAccess\Settings\ModsForHeskSettingsGateway;
 use DataAccess\Statuses\StatusGateway;
 use DataAccess\Tickets\TicketGateway;
 
@@ -52,8 +53,11 @@ class TicketCreator {
      */
     private $userGateway;
 
-    function __construct($newTicketValidator, $trackingIdGenerator, $autoassigner,
-                         $statusGateway, $ticketGateway, $verifiedEmailChecker, $emailSenderHelper, $userGateway) {
+    /* @var $modsForHeskSettingsGateway ModsForHeskSettingsGateway */
+    private $modsForHeskSettingsGateway;
+
+    function __construct($newTicketValidator, $trackingIdGenerator, $autoassigner, $statusGateway, $ticketGateway,
+                         $verifiedEmailChecker, $emailSenderHelper, $userGateway, $modsForHeskSettingsGateway) {
         $this->newTicketValidator = $newTicketValidator;
         $this->trackingIdGenerator = $trackingIdGenerator;
         $this->autoassigner = $autoassigner;
@@ -62,6 +66,7 @@ class TicketCreator {
         $this->verifiedEmailChecker = $verifiedEmailChecker;
         $this->emailSenderHelper = $emailSenderHelper;
         $this->userGateway = $userGateway;
+        $this->modsForHeskSettingsGateway = $modsForHeskSettingsGateway;
     }
 
     /**
@@ -69,13 +74,14 @@ class TicketCreator {
      *
      * @param $ticketRequest CreateTicketByCustomerModel
      * @param $heskSettings array HESK settings
-     * @param $modsForHeskSettings array Mods for HESK settings
      * @param $userContext
      * @return Ticket The newly created ticket
      * @throws ValidationException When a required field in $ticket_request is missing
      * @throws \Exception When the default status for new tickets is not found
      */
-    function createTicketByCustomer($ticketRequest, $heskSettings, $modsForHeskSettings, $userContext) {
+    function createTicketByCustomer($ticketRequest, $heskSettings, $userContext) {
+        $modsForHeskSettings = $this->modsForHeskSettingsGateway->getAllSettings($heskSettings);
+
         $validationModel = $this->newTicketValidator->validateNewTicketForCustomer($ticketRequest, $heskSettings, $userContext);
 
         if (count($validationModel->errorKeys) > 0) {
@@ -96,7 +102,7 @@ class TicketCreator {
         $ticket->trackingId = $this->trackingIdGenerator->generateTrackingId($heskSettings);
 
         if ($heskSettings['autoassign']) {
-            $ticket->ownerId = $this->autoassigner->getNextUserForTicket($ticketRequest->category, $heskSettings);
+            $ticket->ownerId = $this->autoassigner->getNextUserForTicket($ticketRequest->category, $heskSettings)->id;
         }
 
         // Transform one-to-one properties
diff --git a/api/Controllers/Tickets/TicketController.php b/api/Controllers/Tickets/TicketController.php
index 01a58e13..017e6819 100644
--- a/api/Controllers/Tickets/TicketController.php
+++ b/api/Controllers/Tickets/TicketController.php
@@ -20,14 +20,14 @@ class TicketController {
     }
 
     function post() {
-        global $applicationContext, $hesk_settings, $modsForHeskSettings, $userContext;
+        global $applicationContext, $hesk_settings, $userContext;
 
         /* @var $ticketCreator TicketCreator */
         $ticketCreator = $applicationContext->get[TicketCreator::class];
 
         $jsonRequest = JsonRetriever::getJsonData();
 
-        $ticket = $ticketCreator->createTicketByCustomer($this->buildTicketRequestFromJson($jsonRequest), $hesk_settings, $modsForHeskSettings, $userContext);
+        $ticket = $ticketCreator->createTicketByCustomer($this->buildTicketRequestFromJson($jsonRequest), $hesk_settings, $userContext);
 
         //if ticket is a stageTicket, email user
         //else if assigned to owner, email new owner
@@ -55,6 +55,7 @@ class TicketController {
         $ticketRequest->screenResolution = Helpers::safeArrayGet($json, 'screenResolution');
         $ticketRequest->ipAddress = Helpers::safeArrayGet($json, 'ip');
         $ticketRequest->language = Helpers::safeArrayGet($json, 'language');
+        $ticketRequest->sendEmailToCustomer = Helpers::safeArrayGet($json, 'sendEmailToCustomer');
         $ticketRequest->customFields = array();
 
         $jsonCustomFields = Helpers::safeArrayGet($json, 'customFields');
diff --git a/api/DataAccess/Categories/CategoryGateway.php b/api/DataAccess/Categories/CategoryGateway.php
index 68f605e4..abda07b9 100644
--- a/api/DataAccess/Categories/CategoryGateway.php
+++ b/api/DataAccess/Categories/CategoryGateway.php
@@ -23,6 +23,7 @@ class CategoryGateway extends CommonDao {
             $category = new Category();
 
             $category->id = intval($row['id']);
+            $category->name = $row['name'];
             $category->catOrder = intval($row['cat_order']);
             $category->autoAssign = $row['autoassign'] == 1;
             $category->type = intval($row['type']);
diff --git a/api/DataAccess/Security/UserGateway.php b/api/DataAccess/Security/UserGateway.php
index 341f3e31..d9a24f54 100644
--- a/api/DataAccess/Security/UserGateway.php
+++ b/api/DataAccess/Security/UserGateway.php
@@ -89,6 +89,8 @@ class UserGateway extends CommonDao {
             $users[] = $user;
         }
 
+        $this->close();
+
         return $users;
     }
 }
\ No newline at end of file
diff --git a/api/DataAccess/Settings/ModsForHeskSettingsGateway.php b/api/DataAccess/Settings/ModsForHeskSettingsGateway.php
new file mode 100644
index 00000000..aa56b229
--- /dev/null
+++ b/api/DataAccess/Settings/ModsForHeskSettingsGateway.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace DataAccess\Settings;
+
+
+use DataAccess\CommonDao;
+
+class ModsForHeskSettingsGateway extends CommonDao {
+    function getAllSettings($heskSettings) {
+        $this->init();
+
+        $rs = hesk_dbQuery("SELECT `Key`, `Value` FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "settings` WHERE `Key` <> 'modsForHeskVersion'");
+
+        $settings = array();
+        while ($row = hesk_dbFetchAssoc($rs)) {
+            $settings[$row['Key']] = $row['Value'];
+        }
+
+        $this->close();
+
+        return $settings;
+    }
+}
\ No newline at end of file
diff --git a/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php b/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php
index f3072816..5f8383e0 100644
--- a/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php
+++ b/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php
@@ -5,10 +5,8 @@ namespace BusinessLogic\Tickets\TicketCreatorTests;
 
 use BusinessLogic\Emails\Addressees;
 use BusinessLogic\Emails\EmailSenderHelper;
-use BusinessLogic\Emails\EmailTemplate;
 use BusinessLogic\Emails\EmailTemplateRetriever;
 use BusinessLogic\Security\UserContext;
-use BusinessLogic\Statuses\DefaultStatusForAction;
 use BusinessLogic\Statuses\Status;
 use BusinessLogic\Tickets\Autoassigner;
 use BusinessLogic\Tickets\CreateTicketByCustomerModel;
@@ -20,6 +18,7 @@ use BusinessLogic\Tickets\VerifiedEmailChecker;
 use BusinessLogic\ValidationModel;
 use Core\Constants\Priority;
 use DataAccess\Security\UserGateway;
+use DataAccess\Settings\ModsForHeskSettingsGateway;
 use DataAccess\Statuses\StatusGateway;
 use DataAccess\Tickets\TicketGateway;
 use PHPUnit\Framework\TestCase;
@@ -66,11 +65,6 @@ class CreateTicketTest extends TestCase {
      */
     private $heskSettings;
 
-    /**
-     * @var $modsForHeskSettings array
-     */
-    private $modsForHeskSettings;
-
     /**
      * @var $userContext UserContext
      */
@@ -96,6 +90,12 @@ class CreateTicketTest extends TestCase {
      */
     private $userGateway;
 
+    /* @var $modsForHeskSettingsGateway \PHPUnit_Framework_MockObject_MockObject */
+    private $modsForHeskSettingsGateway;
+
+    /* @var $modsForHeskSettings array */
+    private $modsForHeskSettings;
+
     protected function setUp() {
         $this->ticketGateway = $this->createMock(TicketGateway::class);
         $this->newTicketValidator = $this->createMock(NewTicketValidator::class);
@@ -105,10 +105,11 @@ class CreateTicketTest extends TestCase {
         $this->verifiedEmailChecker = $this->createMock(VerifiedEmailChecker::class);
         $this->emailSenderHelper = $this->createMock(EmailSenderHelper::class);
         $this->userGateway = $this->createMock(UserGateway::class);
+        $this->modsForHeskSettingsGateway = $this->createMock(ModsForHeskSettingsGateway::class);
 
         $this->ticketCreator = new TicketCreator($this->newTicketValidator, $this->trackingIdGenerator,
             $this->autoassigner, $this->statusGateway, $this->ticketGateway, $this->verifiedEmailChecker,
-            $this->emailSenderHelper, $this->userGateway);
+            $this->emailSenderHelper, $this->userGateway, $this->modsForHeskSettingsGateway);
 
         $this->ticketRequest = new CreateTicketByCustomerModel();
         $this->ticketRequest->name = 'Name';
@@ -133,7 +134,6 @@ class CreateTicketTest extends TestCase {
 
         $this->newTicketValidator->method('validateNewTicketForCustomer')->willReturn(new ValidationModel());
         $this->trackingIdGenerator->method('generateTrackingId')->willReturn('123-456-7890');
-        $this->autoassigner->method('getNextUserForTicket')->willReturn(1);
         $this->ticketGatewayGeneratedFields = new TicketGatewayGeneratedFields();
         $this->ticketGateway->method('createTicket')->willReturn($this->ticketGatewayGeneratedFields);
 
@@ -144,16 +144,22 @@ class CreateTicketTest extends TestCase {
     }
 
     function testItSavesTheTicketToTheDatabase() {
+        //-- Arrange
+        $this->modsForHeskSettingsGateway->method('getAllSettings')->willReturn($this->modsForHeskSettings);
+
         //-- Assert
         $this->ticketGateway->expects($this->once())->method('createTicket');
 
         //-- Act
-        $this->ticketCreator->createTicketByCustomer($this->ticketRequest, $this->heskSettings, $this->modsForHeskSettings, $this->userContext);
+        $this->ticketCreator->createTicketByCustomer($this->ticketRequest, $this->heskSettings, $this->userContext);
     }
 
     function testItSetsTheTrackingIdOnTheTicket() {
+        //-- Arrange
+        $this->modsForHeskSettingsGateway->method('getAllSettings')->willReturn($this->modsForHeskSettings);
+
         //-- Act
-        $ticket = $this->ticketCreator->createTicketByCustomer($this->ticketRequest, $this->heskSettings, $this->modsForHeskSettings, $this->userContext);
+        $ticket = $this->ticketCreator->createTicketByCustomer($this->ticketRequest, $this->heskSettings, $this->userContext);
 
         //-- Assert
         self::assertThat($ticket->trackingId, self::equalTo('123-456-7890'));
@@ -162,17 +168,24 @@ class CreateTicketTest extends TestCase {
     function testItSetsTheNextUserForAutoassign() {
         //-- Arrange
         $this->heskSettings['autoassign'] = 1;
+        $autoassignUser = new UserContext();
+        $autoassignUser->id = 1;
+        $this->autoassigner->method('getNextUserForTicket')->willReturn($autoassignUser);
+        $this->modsForHeskSettingsGateway->method('getAllSettings')->willReturn($this->modsForHeskSettings);
 
         //-- Act
-        $ticket = $this->ticketCreator->createTicketByCustomer($this->ticketRequest, $this->heskSettings, $this->modsForHeskSettings, $this->userContext);
+        $ticket = $this->ticketCreator->createTicketByCustomer($this->ticketRequest, $this->heskSettings, $this->userContext);
 
         //-- Assert
         self::assertThat($ticket->ownerId, self::equalTo(1));
     }
 
     function testItDoesntCallTheAutoassignerWhenDisabledInHesk() {
+        //-- Arrange
+        $this->modsForHeskSettingsGateway->method('getAllSettings')->willReturn($this->modsForHeskSettings);
+
         //-- Act
-        $ticket = $this->ticketCreator->createTicketByCustomer($this->ticketRequest, $this->heskSettings, $this->modsForHeskSettings, $this->userContext);
+        $ticket = $this->ticketCreator->createTicketByCustomer($this->ticketRequest, $this->heskSettings, $this->userContext);
 
         //-- Assert
         self::assertThat($ticket->ownerId, self::equalTo(null));
@@ -196,9 +209,10 @@ class CreateTicketTest extends TestCase {
         $this->ticketRequest->screenResolution = [1400, 900];
         $this->ticketRequest->ipAddress = '127.0.0.1';
         $this->ticketRequest->language = 'English';
+        $this->modsForHeskSettingsGateway->method('getAllSettings')->willReturn($this->modsForHeskSettings);
 
         //-- Act
-        $ticket = $this->ticketCreator->createTicketByCustomer($this->ticketRequest, $this->heskSettings, $this->modsForHeskSettings, $this->userContext);
+        $ticket = $this->ticketCreator->createTicketByCustomer($this->ticketRequest, $this->heskSettings, $this->userContext);
 
         //-- Assert
         self::assertThat($ticket->name, self::equalTo($this->ticketRequest->name));
@@ -222,9 +236,10 @@ class CreateTicketTest extends TestCase {
         $this->ticketGatewayGeneratedFields->dateCreated = 'date created';
         $this->ticketGatewayGeneratedFields->dateModified = 'date modified';
         $this->ticketGatewayGeneratedFields->id = 50;
+        $this->modsForHeskSettingsGateway->method('getAllSettings')->willReturn($this->modsForHeskSettings);
 
         //-- Act
-        $ticket = $this->ticketCreator->createTicketByCustomer($this->ticketRequest, $this->heskSettings, $this->modsForHeskSettings, $this->userContext);
+        $ticket = $this->ticketCreator->createTicketByCustomer($this->ticketRequest, $this->heskSettings, $this->userContext);
 
         //-- Assert
         self::assertThat($ticket->dateCreated, self::equalTo($this->ticketGatewayGeneratedFields->dateCreated));
@@ -233,16 +248,22 @@ class CreateTicketTest extends TestCase {
     }
 
     function testItSetsTheDefaultStatus() {
+        //-- Arrange
+        $this->modsForHeskSettingsGateway->method('getAllSettings')->willReturn($this->modsForHeskSettings);
+
         //-- Act
-        $ticket = $this->ticketCreator->createTicketByCustomer($this->ticketRequest, $this->heskSettings, $this->modsForHeskSettings, $this->userContext);
+        $ticket = $this->ticketCreator->createTicketByCustomer($this->ticketRequest, $this->heskSettings, $this->userContext);
 
         //-- Assert
         self::assertThat($ticket->statusId, self::equalTo(1));
     }
 
     function testItSetsTheDefaultProperties() {
+        //-- Arrange
+        $this->modsForHeskSettingsGateway->method('getAllSettings')->willReturn($this->modsForHeskSettings);
+
         //-- Act
-        $ticket = $this->ticketCreator->createTicketByCustomer($this->ticketRequest, $this->heskSettings, $this->modsForHeskSettings, $this->userContext);
+        $ticket = $this->ticketCreator->createTicketByCustomer($this->ticketRequest, $this->heskSettings, $this->userContext);
 
         //-- Assert
         self::assertThat($ticket->archived, self::isFalse());
@@ -257,12 +278,13 @@ class CreateTicketTest extends TestCase {
     function testItChecksIfTheEmailIsVerified() {
         //-- Arrange
         $this->modsForHeskSettings['customer_email_verification_required'] = true;
+        $this->modsForHeskSettingsGateway->method('getAllSettings')->willReturn($this->modsForHeskSettings);
 
         //-- Assert
         $this->verifiedEmailChecker->expects($this->once())->method('isEmailVerified');
 
         //-- Act
-        $this->ticketCreator->createTicketByCustomer($this->ticketRequest, $this->heskSettings, $this->modsForHeskSettings, $this->userContext);
+        $this->ticketCreator->createTicketByCustomer($this->ticketRequest, $this->heskSettings, $this->userContext);
     }
 
     function testItSendsAnEmailToTheCustomerWhenTheTicketIsCreated() {
@@ -271,13 +293,14 @@ class CreateTicketTest extends TestCase {
         $this->ticketRequest->language = 'English';
         $expectedAddressees = new Addressees();
         $expectedAddressees->to = array($this->ticketRequest->email);
+        $this->modsForHeskSettingsGateway->method('getAllSettings')->willReturn($this->modsForHeskSettings);
 
         //-- Assert
         $this->emailSenderHelper->expects($this->once())->method('sendEmailForTicket')
-            ->with(EmailTemplateRetriever::NEW_TICKET, 'English', $expectedAddressees, $this->anything(), $this->heskSettings, $this->modsForHeskSettings);
+            ->with(EmailTemplateRetriever::NEW_TICKET, 'English', $expectedAddressees, $this->anything(), $this->heskSettings, $this->anything());
 
         //-- Act
-        $this->ticketCreator->createTicketByCustomer($this->ticketRequest, $this->heskSettings, $this->modsForHeskSettings, $this->userContext);
+        $this->ticketCreator->createTicketByCustomer($this->ticketRequest, $this->heskSettings, $this->userContext);
     }
 
     function testItDoesNotSendsAnEmailToTheCustomerWhenTheTicketIsCreatedAndSendToCustomerIsFalse() {
@@ -286,12 +309,13 @@ class CreateTicketTest extends TestCase {
         $this->ticketRequest->language = 'English';
         $expectedAddressees = new Addressees();
         $expectedAddressees->to = array($this->ticketRequest->email);
+        $this->modsForHeskSettingsGateway->method('getAllSettings')->willReturn($this->modsForHeskSettings);
 
         //-- Assert
         $this->emailSenderHelper->expects($this->never())->method('sendEmailForTicket');
 
         //-- Act
-        $this->ticketCreator->createTicketByCustomer($this->ticketRequest, $this->heskSettings, $this->modsForHeskSettings, $this->userContext);
+        $this->ticketCreator->createTicketByCustomer($this->ticketRequest, $this->heskSettings, $this->userContext);
     }
 
     function testItSendsAnEmailToTheAssignedToOwnerWhenTheTicketIsCreated() {
@@ -300,12 +324,13 @@ class CreateTicketTest extends TestCase {
         $this->ticketRequest->language = 'English';
         $expectedAddressees = new Addressees();
         $expectedAddressees->to = array($this->ticketRequest->email);
+        $this->modsForHeskSettingsGateway->method('getAllSettings')->willReturn($this->modsForHeskSettings);
 
         //-- Assert
         $this->emailSenderHelper->expects($this->once())->method('sendEmailForTicket')
-            ->with(EmailTemplateRetriever::NEW_TICKET, 'English', $expectedAddressees, $this->anything(), $this->heskSettings, $this->modsForHeskSettings);
+            ->with(EmailTemplateRetriever::NEW_TICKET, 'English', $expectedAddressees, $this->anything(), $this->heskSettings, $this->anything());
 
         //-- Act
-        $this->ticketCreator->createTicketByCustomer($this->ticketRequest, $this->heskSettings, $this->modsForHeskSettings, $this->userContext);
+        $this->ticketCreator->createTicketByCustomer($this->ticketRequest, $this->heskSettings, $this->userContext);
     }
 }
diff --git a/api/autoload.php b/api/autoload.php
index e06961f9..c12b9647 100644
--- a/api/autoload.php
+++ b/api/autoload.php
@@ -20,5 +20,4 @@ global $hesk_settings;
 require_once(__DIR__ . '/../inc/custom_fields.inc.php');
 
 // Load the ApplicationContext
-$applicationContext = new \ApplicationContext();
-//$modsForHeskSettings = mfh_getSettings();
\ No newline at end of file
+$applicationContext = new \ApplicationContext();
\ No newline at end of file

From 25929d82f429154df7fd8089203d8c68b874feb0 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sun, 12 Mar 2017 01:06:50 -0500
Subject: [PATCH 072/192] Fixed some email issues

---
 .../Emails/EmailTemplateParser.php            |  6 ++-
 api/BusinessLogic/Tickets/Autoassigner.php    |  2 +-
 api/BusinessLogic/Tickets/TicketCreator.php   | 30 ++++++++++--
 api/DataAccess/Security/UserGateway.php       | 46 +++++++++----------
 4 files changed, 52 insertions(+), 32 deletions(-)

diff --git a/api/BusinessLogic/Emails/EmailTemplateParser.php b/api/BusinessLogic/Emails/EmailTemplateParser.php
index 8a1601ab..1bcd84a6 100644
--- a/api/BusinessLogic/Emails/EmailTemplateParser.php
+++ b/api/BusinessLogic/Emails/EmailTemplateParser.php
@@ -51,6 +51,8 @@ class EmailTemplateParser {
      * @throws InvalidEmailTemplateException
      */
     function getFormattedEmailForLanguage($templateId, $languageCode, $ticket, $heskSettings, $modsForHeskSettings) {
+        global $hesklang;
+
         $emailTemplate = $this->emailTemplateRetriever->getTemplate($templateId);
 
         if ($emailTemplate === null) {
@@ -59,7 +61,7 @@ class EmailTemplateParser {
 
         $template = self::getFromFileSystem($emailTemplate->fileName, $languageCode, false);
         $htmlTemplate = self::getFromFileSystem($emailTemplate->fileName, $languageCode, true);
-        $subject = $emailTemplate->languageKey;
+        $subject = $hesklang[$emailTemplate->languageKey];
 
         $subject = $this->parseSubject($subject, $ticket, $languageCode, $heskSettings);
         $message = $this->parseMessage($template, $ticket, $languageCode, $emailTemplate->forStaff, $heskSettings, $modsForHeskSettings, false);
@@ -175,7 +177,7 @@ class EmailTemplateParser {
         $defaultStatus = $this->statusGateway->getStatusForDefaultAction(DefaultStatusForAction::NEW_TICKET, $heskSettings);
         $statusName = hesk_msgToPlain($defaultStatus->localizedNames[$language]->text);
         $category = hesk_msgToPlain($this->categoryGateway->getAllCategories($heskSettings)[$ticket->categoryId]->name);
-        $owner = hesk_msgToPlain($this->userGateway->getNameForId($ticket->ownerId, $heskSettings));
+        $owner = hesk_msgToPlain($this->userGateway->getUserById($ticket->ownerId, $heskSettings)->name);
 
         switch ($ticket->priorityId) {
             case Priority::CRITICAL:
diff --git a/api/BusinessLogic/Tickets/Autoassigner.php b/api/BusinessLogic/Tickets/Autoassigner.php
index 4ff6fabd..e7d24207 100644
--- a/api/BusinessLogic/Tickets/Autoassigner.php
+++ b/api/BusinessLogic/Tickets/Autoassigner.php
@@ -29,7 +29,7 @@ class Autoassigner {
             return null;
         }
 
-        $potentialUsers = $this->userGateway->getUsersByNumberOfOpenTickets($heskSettings);
+        $potentialUsers = $this->userGateway->getUsersByNumberOfOpenTicketsForAutoassign($heskSettings);
 
         foreach ($potentialUsers as $potentialUser) {
             if ($potentialUser->admin ||
diff --git a/api/BusinessLogic/Tickets/TicketCreator.php b/api/BusinessLogic/Tickets/TicketCreator.php
index 822ee513..7e160936 100644
--- a/api/BusinessLogic/Tickets/TicketCreator.php
+++ b/api/BusinessLogic/Tickets/TicketCreator.php
@@ -149,13 +149,22 @@ class TicketCreator {
         }
 
         if ($ticket->ownerId !== null) {
-            $ownerEmail = $this->userGateway->getEmailForId($ticket->ownerId, $heskSettings);
+            $owner = $this->userGateway->getUserById($ticket->ownerId, $heskSettings);
 
-            $addressees = new Addressees();
-            $addressees->to = array($ownerEmail);
-            $this->emailSenderHelper->sendEmailForTicket(EmailTemplateRetriever::TICKET_ASSIGNED_TO_YOU, $ticketRequest->language, $addressees, $ticket, $heskSettings, $modsForHeskSettings);
+            if ($owner->notificationSettings->newAssignedToMe) {
+                $addressees = new Addressees();
+                $addressees->to = array($owner->email);
+                $this->emailSenderHelper->sendEmailForTicket(EmailTemplateRetriever::TICKET_ASSIGNED_TO_YOU, $ticketRequest->language, $addressees, $ticket, $heskSettings, $modsForHeskSettings);
+            }
         } else {
-            // TODO email all users who should be notified
+            // TODO Test
+            $usersToBeNotified = $this->userGateway->getUsersForNewTicketNotification($heskSettings);
+
+            foreach ($usersToBeNotified as $user) {
+                if ($user->admin || in_array($ticket->categoryId, $user->categories)) {
+                    $this->sendEmailToStaff($user, $ticket, $heskSettings, $modsForHeskSettings);
+                }
+            }
         }
 
         return $ticket;
@@ -170,4 +179,15 @@ class TicketCreator {
 
         return explode(',', $emails);
     }
+
+    private function sendEmailToStaff($user, $ticket, $heskSettings, $modsForHeskSettings) {
+        $addressees = new Addressees();
+        $addressees->to = array($user->email);
+        $language = $user->language !== null && trim($user->language) !== ''
+            ? $user->language
+            : $heskSettings['language'];
+
+        $this->emailSenderHelper->sendEmailForTicket(EmailTemplateRetriever::NEW_TICKET_STAFF, $language,
+            $addressees, $ticket, $heskSettings, $modsForHeskSettings);
+    }
 }
\ No newline at end of file
diff --git a/api/DataAccess/Security/UserGateway.php b/api/DataAccess/Security/UserGateway.php
index d9a24f54..7f15a870 100644
--- a/api/DataAccess/Security/UserGateway.php
+++ b/api/DataAccess/Security/UserGateway.php
@@ -32,46 +32,27 @@ class UserGateway extends CommonDao {
 
         return $row;
     }
-    
-    // TODO Replace this with a basic User retrieval
-    function getNameForId($id, $heskSettings) {
-        $this->init();
-        
-        $rs = hesk_dbQuery("SELECT `name` FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "users` WHERE `id` = " . intval($id));
-        
-        if (hesk_dbNumRows($rs) === 0) {
-            return null;
-        }
-        
-        $row = hesk_dbFetchAssoc($rs);
-        
-        return $row['name'];
-    }
 
-    // TODO Replace this with a basic User retriever
-    function getEmailForId($id, $heskSettings) {
+    function getUserById($id, $heskSettings) {
         $this->init();
 
-        $rs = hesk_dbQuery("SELECT `email` FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "users` WHERE `id` = " . intval($id));
+        $rs = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "users` WHERE `id` = " . intval($id));
 
         if (hesk_dbNumRows($rs) === 0) {
             return null;
         }
 
-        $row = hesk_dbFetchAssoc($rs);
-
-        return $row['email'];
+        return UserContext::fromDataRow(hesk_dbFetchAssoc($rs));
     }
 
     /**
      * @param $heskSettings array
      * @return UserContext[]
      */
-    function getUsersByNumberOfOpenTickets($heskSettings) {
+    function getUsersByNumberOfOpenTicketsForAutoassign($heskSettings) {
         $this->init();
 
-        $rs = hesk_dbQuery("SELECT `t1`.`id`,`t1`.`user`,`t1`.`name`, `t1`.`email`, `t1`.`language`, `t1`.`isadmin`, 
-                            `t1`.`categories`, `t1`.`notify_assigned`, `t1`.`heskprivileges`,
+        $rs = hesk_dbQuery("SELECT `t1`.*,
 					        (SELECT COUNT(*) FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "tickets`
 					            WHERE `owner`=`t1`.`id` 
 					            AND `status` IN (
@@ -93,4 +74,21 @@ class UserGateway extends CommonDao {
 
         return $users;
     }
+
+    /**
+     * @param $heskSettings array
+     * @return UserContext[]
+     */
+    function getUsersForNewTicketNotification($heskSettings) {
+        $this->init();
+
+        $rs = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "users` WHERE `notify_new_unassigned` = '1' AND `active` = '1'");
+
+        $users = array();
+        while ($row = hesk_dbFetchAssoc($rs)) {
+            $users[] = UserContext::fromDataRow($row);
+        }
+
+        return $users;
+    }
 }
\ No newline at end of file

From d0475b22c1f59ffd60e06d079534704a2de88fa8 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sun, 12 Mar 2017 15:37:23 -0400
Subject: [PATCH 073/192] Add UserPrivilege enum, provide better 404
 information

---
 api/BusinessLogic/Security/UserPrivilege.php | 15 ++++++++++
 api/BusinessLogic/Tickets/Autoassigner.php   |  5 ++--
 api/index.php                                | 29 ++++++++------------
 3 files changed, 30 insertions(+), 19 deletions(-)
 create mode 100644 api/BusinessLogic/Security/UserPrivilege.php

diff --git a/api/BusinessLogic/Security/UserPrivilege.php b/api/BusinessLogic/Security/UserPrivilege.php
new file mode 100644
index 00000000..8344d31d
--- /dev/null
+++ b/api/BusinessLogic/Security/UserPrivilege.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: mkoch
+ * Date: 3/12/2017
+ * Time: 12:11 PM
+ */
+
+namespace BusinessLogic\Security;
+
+
+class UserPrivilege {
+    const CAN_VIEW_TICKETS = 'can_view_tickets';
+    const CAN_REPLY_TO_TICKETS = 'can_reply_tickets';
+}
\ No newline at end of file
diff --git a/api/BusinessLogic/Tickets/Autoassigner.php b/api/BusinessLogic/Tickets/Autoassigner.php
index e7d24207..49723095 100644
--- a/api/BusinessLogic/Tickets/Autoassigner.php
+++ b/api/BusinessLogic/Tickets/Autoassigner.php
@@ -4,6 +4,7 @@ namespace BusinessLogic\Tickets;
 
 
 use BusinessLogic\Security\UserContext;
+use BusinessLogic\Security\UserPrivilege;
 use DataAccess\Categories\CategoryGateway;
 use DataAccess\Security\UserGateway;
 
@@ -34,8 +35,8 @@ class Autoassigner {
         foreach ($potentialUsers as $potentialUser) {
             if ($potentialUser->admin ||
                 (in_array($categoryId, $potentialUser->categories) &&
-                    in_array('can_view_tickets', $potentialUser->permissions) &&
-                    in_array('can_reply_tickets', $potentialUser->permissions))) {
+                    in_array(UserPrivilege::CAN_VIEW_TICKETS, $potentialUser->permissions) &&
+                    in_array(UserPrivilege::CAN_REPLY_TO_TICKETS, $potentialUser->permissions))) {
                 return $potentialUser;
             }
         }
diff --git a/api/index.php b/api/index.php
index 3010cddf..7b1120a0 100644
--- a/api/index.php
+++ b/api/index.php
@@ -9,8 +9,10 @@ register_shutdown_function('fatalErrorShutdownHandler');
 $userContext = null;
 
 function handle404() {
-    http_response_code(404);
-    print json_encode('404 found');
+    print output(array(
+        'message' => "The endpoint '{$_SERVER['REQUEST_URI']}' was not found. Double-check your request and submit again.",
+        'uri' => $_SERVER['REQUEST_URI']
+    ), 404);
 }
 
 function before() {
@@ -21,6 +23,8 @@ function before() {
 }
 
 function assertApiIsEnabled() {
+    global $applicationContext;
+
     return true;
 }
 
@@ -34,13 +38,7 @@ function buildUserContext($xAuthToken) {
 }
 
 function errorHandler($errorNumber, $errorMessage, $errorFile, $errorLine) {
-    if ($errorNumber === E_WARNING) {
-        //-- TODO log a warning
-    } elseif ($errorNumber === E_NOTICE || $errorNumber === E_USER_NOTICE) {
-        //-- TODO log an info
-    } else {
-        exceptionHandler(new Exception(sprintf("%s:%d\n\n%s", $errorFile, $errorLine, $errorMessage)));
-    }
+    exceptionHandler(new Exception(sprintf("%s:%d\n\n%s", $errorFile, $errorLine, $errorMessage)));
 }
 
 /**
@@ -53,15 +51,12 @@ function exceptionHandler($exception) {
         $castedException = $exception;
 
         print_error($castedException->title, $castedException->getMessage(), $castedException->httpResponseCode);
+    } elseif (exceptionIsOfType($exception, \Core\Exceptions\SQLException::class)) {
+        /* @var $castedException \Core\Exceptions\SQLException */
+        $castedException = $exception;
+        print_error("Fought an uncaught SQL exception", sprintf("%s\n\n%s", $castedException->failingQuery, $exception->getTraceAsString()));
     } else {
-        if (exceptionIsOfType($exception, \Core\Exceptions\SQLException::class)) {
-            /* @var $castedException \Core\Exceptions\SQLException */
-            $castedException = $exception;
-            print_error("Fought an uncaught exception", sprintf("%s\n\n%s", $castedException->failingQuery, $exception->getTraceAsString()));
-        } else {
-            print_error("Fought an uncaught exception of type " . get_class($exception), sprintf("%s\n\n%s", $exception->getMessage(), $exception->getTraceAsString()));
-        }
-
+        print_error("Fought an uncaught exception of type " . get_class($exception), sprintf("%s\n\n%s", $exception->getMessage(), $exception->getTraceAsString()));
     }
     // Log more stuff to logging table if possible; we'll catch any exceptions from this
     die();

From 6af93506f1702bcf2359ef0d668e3702a2487c55 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sun, 12 Mar 2017 15:58:17 -0400
Subject: [PATCH 074/192] Properly handle if the API is disabled

---
 api/ApplicationContext.php                    |  4 ++++
 api/BusinessLogic/Settings/ApiChecker.php     | 21 +++++++++++++++++++
 .../Categories/CategoryController.php         |  2 +-
 api/index.php                                 | 16 ++++++++++----
 4 files changed, 38 insertions(+), 5 deletions(-)
 create mode 100644 api/BusinessLogic/Settings/ApiChecker.php

diff --git a/api/ApplicationContext.php b/api/ApplicationContext.php
index 0fc14d58..4672efc0 100644
--- a/api/ApplicationContext.php
+++ b/api/ApplicationContext.php
@@ -9,6 +9,7 @@ use BusinessLogic\Emails\EmailTemplateRetriever;
 use BusinessLogic\Emails\MailgunEmailSender;
 use BusinessLogic\Security\BanRetriever;
 use BusinessLogic\Security\UserContextBuilder;
+use BusinessLogic\Settings\ApiChecker;
 use BusinessLogic\Tickets\Autoassigner;
 use BusinessLogic\Tickets\TicketRetriever;
 use BusinessLogic\Tickets\TicketCreator;
@@ -34,6 +35,9 @@ class ApplicationContext {
         // Settings
         $this->get[ModsForHeskSettingsGateway::class] = new ModsForHeskSettingsGateway();
 
+        // API Checker
+        $this->get[ApiChecker::class] = new ApiChecker($this->get[ModsForHeskSettingsGateway::class]);
+
         // Verified Email Checker
         $this->get[VerifiedEmailGateway::class] = new VerifiedEmailGateway();
         $this->get[VerifiedEmailChecker::class] = new VerifiedEmailChecker($this->get[VerifiedEmailGateway::class]);
diff --git a/api/BusinessLogic/Settings/ApiChecker.php b/api/BusinessLogic/Settings/ApiChecker.php
new file mode 100644
index 00000000..863a6e06
--- /dev/null
+++ b/api/BusinessLogic/Settings/ApiChecker.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace BusinessLogic\Settings;
+
+
+use DataAccess\Settings\ModsForHeskSettingsGateway;
+
+class ApiChecker {
+    /* @var $modsForHeskSettingsGateway ModsForHeskSettingsGateway */
+    private $modsForHeskSettingsGateway;
+
+    function __construct($modsForHeskSettingsGateway) {
+        $this->modsForHeskSettingsGateway = $modsForHeskSettingsGateway;
+    }
+
+    function isApiEnabled($heskSettings) {
+        $modsForHeskSettings = $this->modsForHeskSettingsGateway->getAllSettings($heskSettings);
+
+        return intval($modsForHeskSettings['public_api']) === 1;
+    }
+}
\ No newline at end of file
diff --git a/api/Controllers/Categories/CategoryController.php b/api/Controllers/Categories/CategoryController.php
index 6265d2fd..bf640a3e 100644
--- a/api/Controllers/Categories/CategoryController.php
+++ b/api/Controllers/Categories/CategoryController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Controllers\Category;
+namespace Controllers\Categories;
 
 use BusinessLogic\Categories\CategoryRetriever;
 
diff --git a/api/index.php b/api/index.php
index 7b1120a0..dc71d114 100644
--- a/api/index.php
+++ b/api/index.php
@@ -23,9 +23,17 @@ function before() {
 }
 
 function assertApiIsEnabled() {
-    global $applicationContext;
+    global $applicationContext, $hesk_settings;
 
-    return true;
+    /* @var $apiChecker \BusinessLogic\Settings\ApiChecker */
+    $apiChecker = $applicationContext->get[\BusinessLogic\Settings\ApiChecker::class];
+
+    if (!$apiChecker->isApiEnabled($hesk_settings)) {
+        http_response_code(404);
+        die();
+    }
+
+    return;
 }
 
 function buildUserContext($xAuthToken) {
@@ -83,8 +91,8 @@ Link::before('before');
 
 Link::all(array(
     // Categories
-    '/v1/categories' => '\Controllers\Category\CategoryController::printAllCategories',
-    '/v1/categories/{i}' => '\Controllers\Category\CategoryController',
+    '/v1/categories' => '\Controllers\Categories\CategoryController::printAllCategories',
+    '/v1/categories/{i}' => '\Controllers\Categories\CategoryController',
     // Tickets
     '/v1/tickets/{i}' => '\Controllers\Tickets\TicketController',
     '/v1/tickets' => '\Controllers\Tickets\TicketController',

From f15cb63d323b47d76091b16c7b2852ec0cc60747 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sun, 12 Mar 2017 20:50:54 -0400
Subject: [PATCH 075/192] Logging has been implemented for exceptions

---
 api/ApplicationContext.php                |  4 ++
 api/DataAccess/Logging/LoggingGateway.php | 47 ++++++++++++++++
 api/DataAccess/Logging/Severity.php       | 11 ++++
 api/index.php                             | 65 +++++++++++++++++++++--
 install/mods-for-hesk/sql/installSql.php  |  7 +++
 5 files changed, 129 insertions(+), 5 deletions(-)
 create mode 100644 api/DataAccess/Logging/LoggingGateway.php
 create mode 100644 api/DataAccess/Logging/Severity.php

diff --git a/api/ApplicationContext.php b/api/ApplicationContext.php
index 4672efc0..5e873c38 100644
--- a/api/ApplicationContext.php
+++ b/api/ApplicationContext.php
@@ -18,6 +18,7 @@ use BusinessLogic\Tickets\TicketValidators;
 use BusinessLogic\Tickets\TrackingIdGenerator;
 use BusinessLogic\Tickets\VerifiedEmailChecker;
 use DataAccess\Categories\CategoryGateway;
+use DataAccess\Logging\LoggingGateway;
 use DataAccess\Security\BanGateway;
 use DataAccess\Security\UserGateway;
 use DataAccess\Settings\ModsForHeskSettingsGateway;
@@ -38,6 +39,9 @@ class ApplicationContext {
         // API Checker
         $this->get[ApiChecker::class] = new ApiChecker($this->get[ModsForHeskSettingsGateway::class]);
 
+        // Logging
+        $this->get[LoggingGateway::class] = new LoggingGateway();
+
         // Verified Email Checker
         $this->get[VerifiedEmailGateway::class] = new VerifiedEmailGateway();
         $this->get[VerifiedEmailChecker::class] = new VerifiedEmailChecker($this->get[VerifiedEmailGateway::class]);
diff --git a/api/DataAccess/Logging/LoggingGateway.php b/api/DataAccess/Logging/LoggingGateway.php
new file mode 100644
index 00000000..0df48939
--- /dev/null
+++ b/api/DataAccess/Logging/LoggingGateway.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace DataAccess\Logging;
+
+
+use BusinessLogic\Security\UserContext;
+use DataAccess\CommonDao;
+
+class LoggingGateway extends CommonDao {
+    function logDebug($location, $message, $stackTrace, $userContext, $heskSettings) {
+        return $this->log(Severity::DEBUG, $location, $message, $stackTrace, $userContext, $heskSettings);
+    }
+
+    function logInfo($location, $message, $stackTrace, $userContext, $heskSettings) {
+        return $this->log(Severity::INFO, $location, $message, $stackTrace, $userContext, $heskSettings);
+    }
+
+    function logWarning($location, $message, $stackTrace, $userContext, $heskSettings) {
+        return $this->log(Severity::WARNING, $location, $message, $stackTrace, $userContext, $heskSettings);
+    }
+
+    function logError($location, $message, $stackTrace, $userContext, $heskSettings) {
+        return $this->log(Severity::ERROR, $location, $message, $stackTrace, $userContext, $heskSettings);
+    }
+
+    /**
+     * @param $severity int (from Severity)
+     * @param $location string
+     * @param $message string
+     * @param $userContext UserContext
+     * @param $heskSettings array
+     * @return int|null|string The inserted ID, or null on failure.
+     */
+    private function log($severity, $location, $message, $stackTrace, $userContext, $heskSettings) {
+        $this->init();
+
+        hesk_dbQuery("INSERT INTO `" . hesk_dbEscape($heskSettings['db_pfix']) . "logging` (`username`, `message`, `severity`, `location`, `timestamp`, `stack_trace`)
+        VALUES ('" . hesk_dbEscape($userContext->username) . "',
+        '" . hesk_dbEscape($message) . "', " . intval($severity) . ", '" . hesk_dbEscape($location) . "', NOW(), '" . hesk_dbEscape($stackTrace) . "')");
+
+        $insertedId = hesk_dbInsertID();
+
+        $this->close();
+
+        return $insertedId;
+    }
+}
\ No newline at end of file
diff --git a/api/DataAccess/Logging/Severity.php b/api/DataAccess/Logging/Severity.php
new file mode 100644
index 00000000..46124c35
--- /dev/null
+++ b/api/DataAccess/Logging/Severity.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace DataAccess\Logging;
+
+
+class Severity {
+    const DEBUG = 0;
+    const INFO = 1;
+    const WARNING = 2;
+    const ERROR = 3;
+}
\ No newline at end of file
diff --git a/api/index.php b/api/index.php
index dc71d114..1d2b0b91 100644
--- a/api/index.php
+++ b/api/index.php
@@ -29,7 +29,7 @@ function assertApiIsEnabled() {
     $apiChecker = $applicationContext->get[\BusinessLogic\Settings\ApiChecker::class];
 
     if (!$apiChecker->isApiEnabled($hesk_settings)) {
-        http_response_code(404);
+        print output(array('message' => 'API Disabled'), 404);
         die();
     }
 
@@ -53,7 +53,18 @@ function errorHandler($errorNumber, $errorMessage, $errorFile, $errorLine) {
  * @param $exception Exception
  */
 function exceptionHandler($exception) {
-    //-- TODO Log an error
+    global $applicationContext, $userContext, $hesk_settings;
+
+    if (strpos($exception->getTraceAsString(), 'LoggingGateway') !== false) {
+        //-- Suppress these for now, as it would cause issues to output two JSONs at one time.
+        return;
+    }
+
+
+    /* @var $loggingGateway \DataAccess\Logging\LoggingGateway */
+    $loggingGateway = $applicationContext->get[\DataAccess\Logging\LoggingGateway::class];
+
+    // We don't cast API Friendly Exceptions as they're user-generated errors
     if (exceptionIsOfType($exception, \BusinessLogic\Exceptions\ApiFriendlyException::class)) {
         /* @var $castedException \BusinessLogic\Exceptions\ApiFriendlyException */
         $castedException = $exception;
@@ -62,14 +73,58 @@ function exceptionHandler($exception) {
     } elseif (exceptionIsOfType($exception, \Core\Exceptions\SQLException::class)) {
         /* @var $castedException \Core\Exceptions\SQLException */
         $castedException = $exception;
-        print_error("Fought an uncaught SQL exception", sprintf("%s\n\n%s", $castedException->failingQuery, $exception->getTraceAsString()));
+
+        $logId = tryToLog(getLoggingLocation($exception),
+                "Fought an uncaught SQL exception: " . $castedException->failingQuery, $castedException->getTraceAsString(),
+                $userContext, $hesk_settings);
+
+        $logIdText = $logId === null ? "Additionally, the error could not be logged! :'(" : "Log ID: {$logId}";
+        print_error("SQL Exception", "Fought an uncaught SQL exception. Check the logs for more information. {$logIdText}");
     } else {
-        print_error("Fought an uncaught exception of type " . get_class($exception), sprintf("%s\n\n%s", $exception->getMessage(), $exception->getTraceAsString()));
+        $logId = tryToLog(getLoggingLocation($exception),
+            $exception->getMessage(), $exception->getTraceAsString(),
+            $userContext, $hesk_settings);
+
+        $logIdText = $logId === null ? "Additionally, the error could not be logged! :'(" : "Log ID: {$logId}";
+        print_error("Exception Occurred", "Fought an uncaught exception. Check the logs for more information. {$logIdText}");
     }
-    // Log more stuff to logging table if possible; we'll catch any exceptions from this
+
     die();
 }
 
+/**
+ * @param $location string
+ * @param $message string
+ * @param $stackTrace string
+ * @param $userContext \BusinessLogic\Security\UserContext
+ * @param $heskSettings array
+ * @return int|null The inserted ID, or null if failed to log
+ * @internal param Exception $exception
+ */
+function tryToLog($location, $message, $stackTrace, $userContext, $heskSettings) {
+    global $applicationContext;
+
+    /* @var $loggingGateway \DataAccess\Logging\LoggingGateway */
+    $loggingGateway = $applicationContext->get[\DataAccess\Logging\LoggingGateway::class];
+
+    try {
+        return $loggingGateway->logError($location, $message, $stackTrace, $userContext, $heskSettings);
+    } catch (Exception $squished) {
+        return null;
+    }
+}
+
+/**
+ * @param $exception Exception
+ * @return string The location of the exception
+ */
+function getLoggingLocation($exception) {
+    // http://stackoverflow.com/a/9133897/1509431
+    $trace = $exception->getTrace();
+    $lastCall = $trace[0];
+    return basename($lastCall['file'], '.php');
+}
+
 /**
  * @param $exception Exception thrown exception
  * @param $class string The name of the expected exception type
diff --git a/install/mods-for-hesk/sql/installSql.php b/install/mods-for-hesk/sql/installSql.php
index 6e2f9b11..35467509 100644
--- a/install/mods-for-hesk/sql/installSql.php
+++ b/install/mods-for-hesk/sql/installSql.php
@@ -958,4 +958,11 @@ function execute303Scripts() {
     hesk_dbConnect();
 
     updateVersion('3.0.3');
+}
+
+function execute310Scripts() {
+    global $hesk_settings;
+    hesk_dbConnect();
+
+    executeQuery("ALTER TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "logging` ADD COLUMN `stack_trace` TEXT");
 }
\ No newline at end of file

From cc880a15fcb5909640ec90fae026dc792ed1b524 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sun, 12 Mar 2017 20:57:36 -0400
Subject: [PATCH 076/192] Show stack traces on the message log page

---
 admin/view_message_log.php           | 1 +
 api/index.php                        | 3 ++-
 internal-api/dao/message_log_dao.php | 3 +++
 internal-api/js/view-message-log.js  | 3 ++-
 language/en/text.php                 | 3 +++
 5 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/admin/view_message_log.php b/admin/view_message_log.php
index 351d0753..e92f1bc2 100644
--- a/admin/view_message_log.php
+++ b/admin/view_message_log.php
@@ -97,6 +97,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                     <th><?php echo $hesklang['user']; ?></th>
                     <th><?php echo $hesklang['custom_place']; ?></th>
                     <th><?php echo $hesklang['message']; ?></th>
+                    <th><?php echo $hesklang['stack_trace_header']; ?></th>
                 </tr>
                 </thead>
                 <tbody></tbody>
diff --git a/api/index.php b/api/index.php
index 1d2b0b91..4382f43c 100644
--- a/api/index.php
+++ b/api/index.php
@@ -122,7 +122,8 @@ function getLoggingLocation($exception) {
     // http://stackoverflow.com/a/9133897/1509431
     $trace = $exception->getTrace();
     $lastCall = $trace[0];
-    return basename($lastCall['file'], '.php');
+    $location = basename($lastCall['file'], '.php');
+    return "REST API: {$location}";
 }
 
 /**
diff --git a/internal-api/dao/message_log_dao.php b/internal-api/dao/message_log_dao.php
index cb8ddece..498acd68 100644
--- a/internal-api/dao/message_log_dao.php
+++ b/internal-api/dao/message_log_dao.php
@@ -23,12 +23,15 @@ function search_log($hesk_settings, $location, $from_date, $to_date, $severity_i
     if ($severity_id != NULL) {
         $sql .= "AND `severity` = " . intval($severity_id);
     }
+    $sql .= " ORDER BY `id` DESC";
 
     $rs = hesk_dbQuery($sql);
 
     $results = array();
     while ($row = hesk_dbFetchAssoc($rs)) {
         $row['timestamp'] = hesk_date($row['timestamp'], true);
+        $row['stackTrace'] = nl2br($row['stack_trace']);
+        unset($row['stack_trace']);
         $results[] = $row;
     }
 
diff --git a/internal-api/js/view-message-log.js b/internal-api/js/view-message-log.js
index c95f484a..6acbc741 100644
--- a/internal-api/js/view-message-log.js
+++ b/internal-api/js/view-message-log.js
@@ -53,7 +53,8 @@ function displayResults(data) {
                 '<td>' + result.timestamp + '</td>' +
                 '<td>' + result.username + '</td>' +
                 '<td>' + result.location + '</td>' +
-                '<td>' + result.message + '</td>');
+                '<td>' + result.message + '</td>' +
+                '<td>' + result.stackTrace + '</td>');
         }
     }
 }
diff --git a/language/en/text.php b/language/en/text.php
index a30dafe3..4d171c27 100644
--- a/language/en/text.php
+++ b/language/en/text.php
@@ -45,6 +45,9 @@ $hesklang['_COLLATE']='utf8_unicode_ci';
 // This is the email break line that will be used in email piping
 $hesklang['EMAIL_HR']='------ Reply above this line ------';
 
+// ADDED OR MODIFIED IN Mods for HESK 3.1.0
+$hesklang['stack_trace_header'] = 'Stack Trace';
+
 // ADDED OR MODIFIED IN Mods for HESK 3.0.0
 $hesklang['you_have_x_messages'] = 'You have %s new %s'; // %s: Number of new messages, "message" or "messages", depending on # 
 $hesklang['message_lower_case'] = 'message';

From f40eaf1a231ee92ecc4ead14dc8996cc6597b3f4 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sun, 12 Mar 2017 21:24:49 -0400
Subject: [PATCH 077/192] Fix tests

---
 api/Tests/BusinessLogic/Tickets/AutoassignerTest.php   | 10 +++++-----
 .../TicketCreatorTests/CreateTicketForCustomerTest.php |  6 ++++++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/api/Tests/BusinessLogic/Tickets/AutoassignerTest.php b/api/Tests/BusinessLogic/Tickets/AutoassignerTest.php
index 1962395b..8e9836ac 100644
--- a/api/Tests/BusinessLogic/Tickets/AutoassignerTest.php
+++ b/api/Tests/BusinessLogic/Tickets/AutoassignerTest.php
@@ -66,7 +66,7 @@ class AutoassignerTest extends TestCase {
             $userWithOneOpenTicket
         );
 
-        $this->userGateway->method('getUsersByNumberOfOpenTickets')
+        $this->userGateway->method('getUsersByNumberOfOpenTicketsForAutoassign')
             ->with($this->heskSettings)
             ->willReturn($usersToReturn);
 
@@ -92,7 +92,7 @@ class AutoassignerTest extends TestCase {
             $userWithOneOpenTicket
         );
 
-        $this->userGateway->method('getUsersByNumberOfOpenTickets')
+        $this->userGateway->method('getUsersByNumberOfOpenTicketsForAutoassign')
             ->with($this->heskSettings)
             ->willReturn($usersToReturn);
 
@@ -119,7 +119,7 @@ class AutoassignerTest extends TestCase {
             $userWithOneOpenTicket
         );
 
-        $this->userGateway->method('getUsersByNumberOfOpenTickets')
+        $this->userGateway->method('getUsersByNumberOfOpenTicketsForAutoassign')
             ->with($this->heskSettings)
             ->willReturn($usersToReturn);
 
@@ -145,7 +145,7 @@ class AutoassignerTest extends TestCase {
             $userWithOneOpenTicket
         );
 
-        $this->userGateway->method('getUsersByNumberOfOpenTickets')
+        $this->userGateway->method('getUsersByNumberOfOpenTicketsForAutoassign')
             ->with($this->heskSettings)
             ->willReturn($usersToReturn);
 
@@ -171,7 +171,7 @@ class AutoassignerTest extends TestCase {
             $userWithOneOpenTicket
         );
 
-        $this->userGateway->method('getUsersByNumberOfOpenTickets')
+        $this->userGateway->method('getUsersByNumberOfOpenTicketsForAutoassign')
             ->with($this->heskSettings)
             ->willReturn($usersToReturn);
 
diff --git a/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php b/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php
index 5f8383e0..29b88a2b 100644
--- a/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php
+++ b/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php
@@ -7,6 +7,7 @@ use BusinessLogic\Emails\Addressees;
 use BusinessLogic\Emails\EmailSenderHelper;
 use BusinessLogic\Emails\EmailTemplateRetriever;
 use BusinessLogic\Security\UserContext;
+use BusinessLogic\Security\UserContextNotifications;
 use BusinessLogic\Statuses\Status;
 use BusinessLogic\Tickets\Autoassigner;
 use BusinessLogic\Tickets\CreateTicketByCustomerModel;
@@ -136,6 +137,7 @@ class CreateTicketTest extends TestCase {
         $this->trackingIdGenerator->method('generateTrackingId')->willReturn('123-456-7890');
         $this->ticketGatewayGeneratedFields = new TicketGatewayGeneratedFields();
         $this->ticketGateway->method('createTicket')->willReturn($this->ticketGatewayGeneratedFields);
+        $this->userGateway->method('getUsersForNewTicketNotification')->willReturn(array());
 
         $status = new Status();
         $status->id = 1;
@@ -169,8 +171,12 @@ class CreateTicketTest extends TestCase {
         //-- Arrange
         $this->heskSettings['autoassign'] = 1;
         $autoassignUser = new UserContext();
+        $notificationSettings = new UserContextNotifications();
+        $notificationSettings->newAssignedToMe = true;
+        $autoassignUser->notificationSettings = $notificationSettings;
         $autoassignUser->id = 1;
         $this->autoassigner->method('getNextUserForTicket')->willReturn($autoassignUser);
+        $this->userGateway->method('getUserById')->willReturn($autoassignUser);
         $this->modsForHeskSettingsGateway->method('getAllSettings')->willReturn($this->modsForHeskSettings);
 
         //-- Act

From 8378d35149f097cd25237e7d7bf9288ecd3626ea Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Wed, 15 Mar 2017 22:07:17 -0400
Subject: [PATCH 078/192] Start working on attachments API. Fix .gitignore

---
 .gitignore                                    |  2 +-
 api/BusinessLogic/Attachments/Attachment.php  | 21 +++++++++++++
 .../Attachments/AttachmentHandler.php         | 16 ++++++++++
 .../Attachments/AttachmentType.php            |  9 ++++++
 .../CreateAttachmentForTicketModel.php        | 12 ++++++++
 .../Attachments/CreateAttachmentModel.php     | 18 +++++++++++
 .../Attachments/TicketAttachment.php          | 12 ++++++++
 .../StaffAttachmentsController.php            | 10 +++++++
 .../Attachments/AttachmentGateway.php         | 30 +++++++++++++++++++
 .../Attachments/AttachmentHandlerTest.php     | 17 +++++++++++
 10 files changed, 146 insertions(+), 1 deletion(-)
 create mode 100644 api/BusinessLogic/Attachments/Attachment.php
 create mode 100644 api/BusinessLogic/Attachments/AttachmentHandler.php
 create mode 100644 api/BusinessLogic/Attachments/AttachmentType.php
 create mode 100644 api/BusinessLogic/Attachments/CreateAttachmentForTicketModel.php
 create mode 100644 api/BusinessLogic/Attachments/CreateAttachmentModel.php
 create mode 100644 api/BusinessLogic/Attachments/TicketAttachment.php
 create mode 100644 api/Controllers/Attachments/StaffAttachmentsController.php
 create mode 100644 api/DataAccess/Attachments/AttachmentGateway.php
 create mode 100644 api/Tests/BusinessLogic/Attachments/AttachmentHandlerTest.php

diff --git a/.gitignore b/.gitignore
index 2e3f55a2..70d3d8c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -270,7 +270,7 @@ readme.html
 robots.txt
 .idea/
 attachments/__latest.txt
-attachments
+/attachments
 img/ban.png
 img/banned.png
 img/ico_tools.png
diff --git a/api/BusinessLogic/Attachments/Attachment.php b/api/BusinessLogic/Attachments/Attachment.php
new file mode 100644
index 00000000..380d00b3
--- /dev/null
+++ b/api/BusinessLogic/Attachments/Attachment.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace BusinessLogic\Attachments;
+
+
+class Attachment {
+    /* @var $id int */
+    public $id;
+
+    /* @var $savedName string */
+    public $savedName;
+
+    /* @var $displayName string */
+    public $displayName;
+
+    /* @var $id int */
+    public $fileSize;
+
+    /* @var $downloadCount int */
+    public $downloadCount;
+}
\ No newline at end of file
diff --git a/api/BusinessLogic/Attachments/AttachmentHandler.php b/api/BusinessLogic/Attachments/AttachmentHandler.php
new file mode 100644
index 00000000..c61a109d
--- /dev/null
+++ b/api/BusinessLogic/Attachments/AttachmentHandler.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace BusinessLogic\Attachments;
+
+
+class AttachmentHandler {
+
+
+    function createAttachmentForTicket($createAttachmentModel) {
+
+    }
+
+    private function validate($createAttachmentModel) {
+
+    }
+}
\ No newline at end of file
diff --git a/api/BusinessLogic/Attachments/AttachmentType.php b/api/BusinessLogic/Attachments/AttachmentType.php
new file mode 100644
index 00000000..e353d84a
--- /dev/null
+++ b/api/BusinessLogic/Attachments/AttachmentType.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace BusinessLogic\Attachments;
+
+
+class AttachmentType {
+    const MESSAGE = 0;
+    const REPLY = 1;
+}
\ No newline at end of file
diff --git a/api/BusinessLogic/Attachments/CreateAttachmentForTicketModel.php b/api/BusinessLogic/Attachments/CreateAttachmentForTicketModel.php
new file mode 100644
index 00000000..04336133
--- /dev/null
+++ b/api/BusinessLogic/Attachments/CreateAttachmentForTicketModel.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace BusinessLogic\Attachments;
+
+
+class CreateAttachmentForTicketModel extends CreateAttachmentModel {
+    /* @var $ticketId int */
+    public $ticketId;
+
+    /* @var $type int [use <code>AttachmentType</code] */
+    public $type;
+}
\ No newline at end of file
diff --git a/api/BusinessLogic/Attachments/CreateAttachmentModel.php b/api/BusinessLogic/Attachments/CreateAttachmentModel.php
new file mode 100644
index 00000000..209450d2
--- /dev/null
+++ b/api/BusinessLogic/Attachments/CreateAttachmentModel.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace BusinessLogic\Attachments;
+
+
+class CreateAttachmentModel {
+    /* @var $savedName string */
+    public $savedName;
+
+    /* @var $displayName string */
+    public $displayName;
+
+    /* @var $id int */
+    public $fileSize;
+
+    /* @var $attachmentContents string [base64-encoded] */
+    public $attachmentContents;
+}
\ No newline at end of file
diff --git a/api/BusinessLogic/Attachments/TicketAttachment.php b/api/BusinessLogic/Attachments/TicketAttachment.php
new file mode 100644
index 00000000..fdecd978
--- /dev/null
+++ b/api/BusinessLogic/Attachments/TicketAttachment.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace BusinessLogic\Attachments;
+
+
+class TicketAttachment extends Attachment {
+    /* @var $ticketTrackingId string */
+    public $ticketTrackingId;
+
+    /* @var $type int [use <code>AttachmentType</code>] */
+    public $type;
+}
\ No newline at end of file
diff --git a/api/Controllers/Attachments/StaffAttachmentsController.php b/api/Controllers/Attachments/StaffAttachmentsController.php
new file mode 100644
index 00000000..6bfbbd81
--- /dev/null
+++ b/api/Controllers/Attachments/StaffAttachmentsController.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Controllers\Attachments;
+
+
+class StaffAttachmentsController {
+    function post() {
+
+    }
+}
\ No newline at end of file
diff --git a/api/DataAccess/Attachments/AttachmentGateway.php b/api/DataAccess/Attachments/AttachmentGateway.php
new file mode 100644
index 00000000..70931e3e
--- /dev/null
+++ b/api/DataAccess/Attachments/AttachmentGateway.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace DataAccess\Attachments;
+
+
+use BusinessLogic\Attachments\TicketAttachment;
+use DataAccess\CommonDao;
+
+class AttachmentGateway extends CommonDao {
+
+    /**
+     * @param $attachment TicketAttachment
+     * @param $heskSettings array
+     * @return int The inserted attachment ID
+     */
+    function createAttachmentForTicket($attachment, $heskSettings) {
+        $this->init();
+
+        hesk_dbQuery("INSERT INTO `" . hesk_dbEscape($heskSettings['db_pfix']) . "attachments` 
+            (`ticket_id`, `note_id`, `saved_name`, `real_name`, `size`, `type`, `download_count`)
+            VALUES ('" . hesk_dbEscape($attachment->ticketTrackingId) . "', NULL, '" . hesk_dbEscape($attachment->savedName) . "',
+                '" . hesk_dbEscape($attachment->displayName) . "', " . intval($attachment->fileSize) . ", '" . intval($attachment->type) . "', 0)");
+
+        $attachmentId = hesk_dbInsertID();
+
+        $this->close();
+
+        return $attachmentId;
+    }
+}
\ No newline at end of file
diff --git a/api/Tests/BusinessLogic/Attachments/AttachmentHandlerTest.php b/api/Tests/BusinessLogic/Attachments/AttachmentHandlerTest.php
new file mode 100644
index 00000000..335b3b88
--- /dev/null
+++ b/api/Tests/BusinessLogic/Attachments/AttachmentHandlerTest.php
@@ -0,0 +1,17 @@
+<?php
+
+
+namespace BusinessLogic\Attachments;
+
+
+use PHPUnit\Framework\TestCase;
+
+class AttachmentHandlerTest extends TestCase {
+
+    /* @var $attachmentHandler AttachmentHandler */
+    private $attachmentHandler;
+
+    protected function setUp() {
+        $this->attachmentHandler = new AttachmentHandler();
+    }
+}

From ffd3ac2edfb13edba28a6b5b2135058b3e54c9f8 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Fri, 17 Mar 2017 22:05:51 -0400
Subject: [PATCH 079/192] Working on some validation tests

---
 .../Attachments/AttachmentHandler.php         | 40 +++++++-
 .../Attachments/CreateAttachmentModel.php     |  2 +-
 .../Attachments/AttachmentHandlerTest.php     | 92 +++++++++++++++++++
 3 files changed, 130 insertions(+), 4 deletions(-)

diff --git a/api/BusinessLogic/Attachments/AttachmentHandler.php b/api/BusinessLogic/Attachments/AttachmentHandler.php
index c61a109d..04a73e42 100644
--- a/api/BusinessLogic/Attachments/AttachmentHandler.php
+++ b/api/BusinessLogic/Attachments/AttachmentHandler.php
@@ -3,14 +3,48 @@
 namespace BusinessLogic\Attachments;
 
 
-class AttachmentHandler {
+use BusinessLogic\Exceptions\ValidationException;
+use BusinessLogic\ValidationModel;
 
+class AttachmentHandler {
 
+    /**
+     * @param $createAttachmentModel CreateAttachmentForTicketModel
+     */
     function createAttachmentForTicket($createAttachmentModel) {
-
+        $this->validate($createAttachmentModel);
     }
 
+    /**
+     * @param $createAttachmentModel CreateAttachmentForTicketModel
+     * @throws ValidationException
+     */
     private function validate($createAttachmentModel) {
-
+        $errorKeys = array();
+        if ($createAttachmentModel->attachmentContents === null ||
+            trim($createAttachmentModel->attachmentContents) === '') {
+            $errorKeys[] = 'CONTENTS_EMPTY';
+        }
+
+        if (base64_decode($createAttachmentModel->attachmentContents, true) === false) {
+            $errorKeys[] = 'CONTENTS_NOT_BASE_64';
+        }
+
+        if ($createAttachmentModel->displayName === null ||
+            trim($createAttachmentModel->displayName === '')) {
+            $errorKeys[] = 'DISPLAY_NAME_EMPTY';
+        }
+
+        if ($createAttachmentModel->ticketId === null ||
+            $createAttachmentModel->ticketId < 1) {
+            $errorKeys[] = 'TICKET_ID_MISSING';
+        }
+
+        if (count($errorKeys) > 0) {
+            $validationModel = new ValidationModel();
+            $validationModel->errorKeys = $errorKeys;
+            $validationModel->valid = false;
+            throw new ValidationException($validationModel);
+        }
     }
 }
\ No newline at end of file
diff --git a/api/BusinessLogic/Attachments/CreateAttachmentModel.php b/api/BusinessLogic/Attachments/CreateAttachmentModel.php
index 209450d2..9a5f5428 100644
--- a/api/BusinessLogic/Attachments/CreateAttachmentModel.php
+++ b/api/BusinessLogic/Attachments/CreateAttachmentModel.php
@@ -13,6 +13,6 @@ class CreateAttachmentModel {
     /* @var $id int */
     public $fileSize;
 
-    /* @var $attachmentContents string [base64-encoded] */
+    /* @var $attachmentContents string */
     public $attachmentContents;
 }
\ No newline at end of file
diff --git a/api/Tests/BusinessLogic/Attachments/AttachmentHandlerTest.php b/api/Tests/BusinessLogic/Attachments/AttachmentHandlerTest.php
index 335b3b88..e956e321 100644
--- a/api/Tests/BusinessLogic/Attachments/AttachmentHandlerTest.php
+++ b/api/Tests/BusinessLogic/Attachments/AttachmentHandlerTest.php
@@ -4,6 +4,7 @@
 namespace BusinessLogic\Attachments;
 
 
+use BusinessLogic\Exceptions\ValidationException;
 use PHPUnit\Framework\TestCase;
 
 class AttachmentHandlerTest extends TestCase {
@@ -11,7 +12,98 @@ class AttachmentHandlerTest extends TestCase {
     /* @var $attachmentHandler AttachmentHandler */
     private $attachmentHandler;
 
+    /* @var $createAttachmentModel CreateAttachmentForTicketModel */
+    private $createAttachmentForTicketModel;
+
     protected function setUp() {
         $this->attachmentHandler = new AttachmentHandler();
+        $this->createAttachmentForTicketModel = new CreateAttachmentForTicketModel();
+        $this->createAttachmentForTicketModel->attachmentContents = base64_encode('string');
+        $this->createAttachmentForTicketModel->displayName = 'Display Name';
+        $this->createAttachmentForTicketModel->ticketId = 1;
+    }
+
+    function testThatValidateThrowsAnExceptionWhenTheAttachmentBodyIsNull() {
+        //-- Arrange
+        $this->createAttachmentForTicketModel->attachmentContents = null;
+
+        //-- Assert
+        $this->expectException(ValidationException::class);
+        $this->expectExceptionMessageRegExp('/CONTENTS_EMPTY/');
+
+        //-- Act
+        $this->attachmentHandler->createAttachmentForTicket($this->createAttachmentForTicketModel);
+    }
+
+    function testThatValidateThrowsAnExceptionWhenTheAttachmentBodyIsEmpty() {
+        //-- Arrange
+        $this->createAttachmentForTicketModel->attachmentContents = '';
+
+        //-- Assert
+        $this->expectException(ValidationException::class);
+        $this->expectExceptionMessageRegExp('/CONTENTS_EMPTY/');
+
+        //-- Act
+        $this->attachmentHandler->createAttachmentForTicket($this->createAttachmentForTicketModel);
+    }
+
+    function testThatValidateThrowsAnExceptionWhenTheAttachmentBodyIsInvalidBase64() {
+        //-- Arrange
+        $this->createAttachmentForTicketModel->attachmentContents = 'invalid base 64';
+
+        //-- Assert
+        $this->expectException(ValidationException::class);
+        $this->expectExceptionMessageRegExp('/CONTENTS_NOT_BASE_64/');
+
+        //-- Act
+        $this->attachmentHandler->createAttachmentForTicket($this->createAttachmentForTicketModel);
+    }
+
+    function testThatValidateThrowsAnExceptionWhenTheDisplayNameIsNull() {
+        //-- Arrange
+        $this->createAttachmentForTicketModel->displayName = null;
+
+        //-- Assert
+        $this->expectException(ValidationException::class);
+        $this->expectExceptionMessageRegExp('/DISPLAY_NAME_EMPTY/');
+
+        //-- Act
+        $this->attachmentHandler->createAttachmentForTicket($this->createAttachmentForTicketModel);
+    }
+
+    function testThatValidateThrowsAnExceptionWhenTheDisplayNameIsEmpty() {
+        //-- Arrange
+        $this->createAttachmentForTicketModel->displayName = '';
+
+        //-- Assert
+        $this->expectException(ValidationException::class);
+        $this->expectExceptionMessageRegExp('/DISPLAY_NAME_EMPTY/');
+
+        //-- Act
+        $this->attachmentHandler->createAttachmentForTicket($this->createAttachmentForTicketModel);
+    }
+
+    function testThatValidateThrowsAnExceptionWhenTheTicketIdIsNull() {
+        //-- Arrange
+        $this->createAttachmentForTicketModel->ticketId = null;
+
+        //-- Assert
+        $this->expectException(ValidationException::class);
+        $this->expectExceptionMessageRegExp('/TICKET_ID_MISSING/');
+
+        //-- Act
+        $this->attachmentHandler->createAttachmentForTicket($this->createAttachmentForTicketModel);
+    }
+
+    function testThatValidateThrowsAnExceptionWhenTheTicketIdIsANonPositiveInteger() {
+        //-- Arrange
+        $this->createAttachmentForTicketModel->ticketId = 0;
+
+        //-- Assert
+        $this->expectException(ValidationException::class);
+        $this->expectExceptionMessageRegExp('/TICKET_ID_MISSING/');
+
+        //-- Act
+        $this->attachmentHandler->createAttachmentForTicket($this->createAttachmentForTicketModel);
     }
 }

From 4fd6595ded1c60ee9555033c2d52bd379bf58b37 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sat, 18 Mar 2017 22:13:08 -0400
Subject: [PATCH 080/192] Handle building the attachment and saving it to the
 FS

---
 .../Attachments/AttachmentHandler.php         | 304 +++++++++++++++++-
 .../Attachments/CreateAttachmentModel.php     |   3 +
 api/DataAccess/Files/FileWriter.php           |  25 ++
 .../Attachments/AttachmentHandlerTest.php     | 107 +++++-
 4 files changed, 429 insertions(+), 10 deletions(-)
 create mode 100644 api/DataAccess/Files/FileWriter.php

diff --git a/api/BusinessLogic/Attachments/AttachmentHandler.php b/api/BusinessLogic/Attachments/AttachmentHandler.php
index 04a73e42..4ef3d72b 100644
--- a/api/BusinessLogic/Attachments/AttachmentHandler.php
+++ b/api/BusinessLogic/Attachments/AttachmentHandler.php
@@ -5,14 +5,55 @@ namespace BusinessLogic\Attachments;
 
 use BusinessLogic\Exceptions\ValidationException;
 use BusinessLogic\ValidationModel;
+use DataAccess\Attachments\AttachmentGateway;
+use DataAccess\Files\FileWriter;
+use DataAccess\Tickets\TicketGateway;
 
 class AttachmentHandler {
+    /* @var $ticketGateway TicketGateway */
+    private $ticketGateway;
+
+    /* @var $attachmentGateway AttachmentGateway */
+    private $attachmentGateway;
+
+    /* @var $fileWriter FileWriter */
+    private $fileWriter;
+
+    function __construct($ticketGateway, $attachmentGateway, $fileWriter) {
+        $this->ticketGateway = $ticketGateway;
+        $this->attachmentGateway = $attachmentGateway;
+        $this->fileWriter = $fileWriter;
+    }
+
 
     /**
      * @param $createAttachmentModel CreateAttachmentForTicketModel
+     * @param $heskSettings array
+     * @return TicketAttachment the newly created attachment
      */
-    function createAttachmentForTicket($createAttachmentModel) {
+    function createAttachmentForTicket($createAttachmentModel, $heskSettings) {
         $this->validate($createAttachmentModel);
+
+        $decodedAttachment = base64_decode($createAttachmentModel->attachmentContents);
+
+        $ticket = $this->ticketGateway->getTicketById($createAttachmentModel->ticketId, $heskSettings);
+        $cleanedFileName = $this->cleanFileName($createAttachmentModel->displayName);
+
+        $ticketAttachment = new TicketAttachment();
+        $ticketAttachment->savedName = $this->generateSavedName($ticket->trackingId,
+            $cleanedFileName, $createAttachmentModel->fileExtension);
+        $ticketAttachment->displayName = $cleanedFileName;
+        $ticketAttachment->ticketTrackingId = $ticket->trackingId;
+        $ticketAttachment->type = $createAttachmentModel->type;
+        $ticketAttachment->downloadCount = 0;
+
+        $ticketAttachment->fileSize =
+            $this->fileWriter->writeToFile($ticketAttachment->savedName, $heskSettings['attach_dir'], $decodedAttachment);
+
+        $attachmentId = $this->attachmentGateway->createAttachmentForTicket($ticketAttachment, $heskSettings);
+        $ticketAttachment->id = $attachmentId;
+
+        return $ticketAttachment;
     }
 
     /**
@@ -40,6 +81,12 @@ class AttachmentHandler {
             $errorKeys[] = 'TICKET_ID_MISSING';
         }
 
+        if (!in_array($createAttachmentModel->type, array(AttachmentType::MESSAGE, AttachmentType::REPLY))) {
+            $errorKeys[] = 'INVALID_ATTACHMENT_TYPE';
+        }
+
+        //-- TODO Extension, size
+
         if (count($errorKeys) > 0) {
             $validationModel = new ValidationModel();
             $validationModel->errorKeys = $errorKeys;
@@ -47,4 +94,259 @@ class AttachmentHandler {
             throw new ValidationException($validationModel);
         }
     }
+
+    private function generateSavedName($trackingId, $displayName, $fileExtension) {
+        $useChars = 'AEUYBDGHJLMNPQRSTVWXZ123456789';
+        $tmp = uniqid();
+        for ($j = 1; $j < 10; $j++) {
+            $tmp .= $useChars{mt_rand(0, 29)};
+        }
+
+
+        return substr($trackingId . '_' . md5($tmp . $displayName), 0, 200) . $fileExtension;
+    }
+
+    /**
+     * @param $displayName string original file name
+     * @return string The cleaned file name
+     */
+    private function cleanFileName($displayName) {
+        $filename = str_replace(array('%20', '+'), '-', $displayName);
+        $filename = preg_replace('/[\s-]+/', '-', $filename);
+        $filename = $this->removeAccents($filename);
+        $filename = preg_replace('/[^A-Za-z0-9\.\-_]/', '', $filename);
+        $filename = trim($filename, '-_');
+
+        return $filename;
+    }
+
+    // The following code has been borrowed from Wordpress, and also from posting_functions.inc.php :P
+    // Credits: http://wordpress.org
+    private function removeAccents($string)
+    {
+        if (!preg_match('/[\x80-\xff]/', $string)) {
+            return $string;
+        }
+
+        if ($this->seemsUtf8($string)) {
+            $chars = array(
+                // Decompositions for Latin-1 Supplement
+                chr(194) . chr(170) => 'a', chr(194) . chr(186) => 'o',
+                chr(195) . chr(128) => 'A', chr(195) . chr(129) => 'A',
+                chr(195) . chr(130) => 'A', chr(195) . chr(131) => 'A',
+                chr(195) . chr(132) => 'A', chr(195) . chr(133) => 'A',
+                chr(195) . chr(134) => 'AE', chr(195) . chr(135) => 'C',
+                chr(195) . chr(136) => 'E', chr(195) . chr(137) => 'E',
+                chr(195) . chr(138) => 'E', chr(195) . chr(139) => 'E',
+                chr(195) . chr(140) => 'I', chr(195) . chr(141) => 'I',
+                chr(195) . chr(142) => 'I', chr(195) . chr(143) => 'I',
+                chr(195) . chr(144) => 'D', chr(195) . chr(145) => 'N',
+                chr(195) . chr(146) => 'O', chr(195) . chr(147) => 'O',
+                chr(195) . chr(148) => 'O', chr(195) . chr(149) => 'O',
+                chr(195) . chr(150) => 'O', chr(195) . chr(153) => 'U',
+                chr(195) . chr(154) => 'U', chr(195) . chr(155) => 'U',
+                chr(195) . chr(156) => 'U', chr(195) . chr(157) => 'Y',
+                chr(195) . chr(158) => 'TH', chr(195) . chr(159) => 's',
+                chr(195) . chr(160) => 'a', chr(195) . chr(161) => 'a',
+                chr(195) . chr(162) => 'a', chr(195) . chr(163) => 'a',
+                chr(195) . chr(164) => 'a', chr(195) . chr(165) => 'a',
+                chr(195) . chr(166) => 'ae', chr(195) . chr(167) => 'c',
+                chr(195) . chr(168) => 'e', chr(195) . chr(169) => 'e',
+                chr(195) . chr(170) => 'e', chr(195) . chr(171) => 'e',
+                chr(195) . chr(172) => 'i', chr(195) . chr(173) => 'i',
+                chr(195) . chr(174) => 'i', chr(195) . chr(175) => 'i',
+                chr(195) . chr(176) => 'd', chr(195) . chr(177) => 'n',
+                chr(195) . chr(178) => 'o', chr(195) . chr(179) => 'o',
+                chr(195) . chr(180) => 'o', chr(195) . chr(181) => 'o',
+                chr(195) . chr(182) => 'o', chr(195) . chr(184) => 'o',
+                chr(195) . chr(185) => 'u', chr(195) . chr(186) => 'u',
+                chr(195) . chr(187) => 'u', chr(195) . chr(188) => 'u',
+                chr(195) . chr(189) => 'y', chr(195) . chr(190) => 'th',
+                chr(195) . chr(191) => 'y', chr(195) . chr(152) => 'O',
+                // Decompositions for Latin Extended-A
+                chr(196) . chr(128) => 'A', chr(196) . chr(129) => 'a',
+                chr(196) . chr(130) => 'A', chr(196) . chr(131) => 'a',
+                chr(196) . chr(132) => 'A', chr(196) . chr(133) => 'a',
+                chr(196) . chr(134) => 'C', chr(196) . chr(135) => 'c',
+                chr(196) . chr(136) => 'C', chr(196) . chr(137) => 'c',
+                chr(196) . chr(138) => 'C', chr(196) . chr(139) => 'c',
+                chr(196) . chr(140) => 'C', chr(196) . chr(141) => 'c',
+                chr(196) . chr(142) => 'D', chr(196) . chr(143) => 'd',
+                chr(196) . chr(144) => 'D', chr(196) . chr(145) => 'd',
+                chr(196) . chr(146) => 'E', chr(196) . chr(147) => 'e',
+                chr(196) . chr(148) => 'E', chr(196) . chr(149) => 'e',
+                chr(196) . chr(150) => 'E', chr(196) . chr(151) => 'e',
+                chr(196) . chr(152) => 'E', chr(196) . chr(153) => 'e',
+                chr(196) . chr(154) => 'E', chr(196) . chr(155) => 'e',
+                chr(196) . chr(156) => 'G', chr(196) . chr(157) => 'g',
+                chr(196) . chr(158) => 'G', chr(196) . chr(159) => 'g',
+                chr(196) . chr(160) => 'G', chr(196) . chr(161) => 'g',
+                chr(196) . chr(162) => 'G', chr(196) . chr(163) => 'g',
+                chr(196) . chr(164) => 'H', chr(196) . chr(165) => 'h',
+                chr(196) . chr(166) => 'H', chr(196) . chr(167) => 'h',
+                chr(196) . chr(168) => 'I', chr(196) . chr(169) => 'i',
+                chr(196) . chr(170) => 'I', chr(196) . chr(171) => 'i',
+                chr(196) . chr(172) => 'I', chr(196) . chr(173) => 'i',
+                chr(196) . chr(174) => 'I', chr(196) . chr(175) => 'i',
+                chr(196) . chr(176) => 'I', chr(196) . chr(177) => 'i',
+                chr(196) . chr(178) => 'IJ', chr(196) . chr(179) => 'ij',
+                chr(196) . chr(180) => 'J', chr(196) . chr(181) => 'j',
+                chr(196) . chr(182) => 'K', chr(196) . chr(183) => 'k',
+                chr(196) . chr(184) => 'k', chr(196) . chr(185) => 'L',
+                chr(196) . chr(186) => 'l', chr(196) . chr(187) => 'L',
+                chr(196) . chr(188) => 'l', chr(196) . chr(189) => 'L',
+                chr(196) . chr(190) => 'l', chr(196) . chr(191) => 'L',
+                chr(197) . chr(128) => 'l', chr(197) . chr(129) => 'L',
+                chr(197) . chr(130) => 'l', chr(197) . chr(131) => 'N',
+                chr(197) . chr(132) => 'n', chr(197) . chr(133) => 'N',
+                chr(197) . chr(134) => 'n', chr(197) . chr(135) => 'N',
+                chr(197) . chr(136) => 'n', chr(197) . chr(137) => 'N',
+                chr(197) . chr(138) => 'n', chr(197) . chr(139) => 'N',
+                chr(197) . chr(140) => 'O', chr(197) . chr(141) => 'o',
+                chr(197) . chr(142) => 'O', chr(197) . chr(143) => 'o',
+                chr(197) . chr(144) => 'O', chr(197) . chr(145) => 'o',
+                chr(197) . chr(146) => 'OE', chr(197) . chr(147) => 'oe',
+                chr(197) . chr(148) => 'R', chr(197) . chr(149) => 'r',
+                chr(197) . chr(150) => 'R', chr(197) . chr(151) => 'r',
+                chr(197) . chr(152) => 'R', chr(197) . chr(153) => 'r',
+                chr(197) . chr(154) => 'S', chr(197) . chr(155) => 's',
+                chr(197) . chr(156) => 'S', chr(197) . chr(157) => 's',
+                chr(197) . chr(158) => 'S', chr(197) . chr(159) => 's',
+                chr(197) . chr(160) => 'S', chr(197) . chr(161) => 's',
+                chr(197) . chr(162) => 'T', chr(197) . chr(163) => 't',
+                chr(197) . chr(164) => 'T', chr(197) . chr(165) => 't',
+                chr(197) . chr(166) => 'T', chr(197) . chr(167) => 't',
+                chr(197) . chr(168) => 'U', chr(197) . chr(169) => 'u',
+                chr(197) . chr(170) => 'U', chr(197) . chr(171) => 'u',
+                chr(197) . chr(172) => 'U', chr(197) . chr(173) => 'u',
+                chr(197) . chr(174) => 'U', chr(197) . chr(175) => 'u',
+                chr(197) . chr(176) => 'U', chr(197) . chr(177) => 'u',
+                chr(197) . chr(178) => 'U', chr(197) . chr(179) => 'u',
+                chr(197) . chr(180) => 'W', chr(197) . chr(181) => 'w',
+                chr(197) . chr(182) => 'Y', chr(197) . chr(183) => 'y',
+                chr(197) . chr(184) => 'Y', chr(197) . chr(185) => 'Z',
+                chr(197) . chr(186) => 'z', chr(197) . chr(187) => 'Z',
+                chr(197) . chr(188) => 'z', chr(197) . chr(189) => 'Z',
+                chr(197) . chr(190) => 'z', chr(197) . chr(191) => 's',
+                // Decompositions for Latin Extended-B
+                chr(200) . chr(152) => 'S', chr(200) . chr(153) => 's',
+                chr(200) . chr(154) => 'T', chr(200) . chr(155) => 't',
+                // Euro Sign
+                chr(226) . chr(130) . chr(172) => 'E',
+                // GBP (Pound) Sign
+                chr(194) . chr(163) => '',
+                // Vowels with diacritic (Vietnamese)
+                // unmarked
+                chr(198) . chr(160) => 'O', chr(198) . chr(161) => 'o',
+                chr(198) . chr(175) => 'U', chr(198) . chr(176) => 'u',
+                // grave accent
+                chr(225) . chr(186) . chr(166) => 'A', chr(225) . chr(186) . chr(167) => 'a',
+                chr(225) . chr(186) . chr(176) => 'A', chr(225) . chr(186) . chr(177) => 'a',
+                chr(225) . chr(187) . chr(128) => 'E', chr(225) . chr(187) . chr(129) => 'e',
+                chr(225) . chr(187) . chr(146) => 'O', chr(225) . chr(187) . chr(147) => 'o',
+                chr(225) . chr(187) . chr(156) => 'O', chr(225) . chr(187) . chr(157) => 'o',
+                chr(225) . chr(187) . chr(170) => 'U', chr(225) . chr(187) . chr(171) => 'u',
+                chr(225) . chr(187) . chr(178) => 'Y', chr(225) . chr(187) . chr(179) => 'y',
+                // hook
+                chr(225) . chr(186) . chr(162) => 'A', chr(225) . chr(186) . chr(163) => 'a',
+                chr(225) . chr(186) . chr(168) => 'A', chr(225) . chr(186) . chr(169) => 'a',
+                chr(225) . chr(186) . chr(178) => 'A', chr(225) . chr(186) . chr(179) => 'a',
+                chr(225) . chr(186) . chr(186) => 'E', chr(225) . chr(186) . chr(187) => 'e',
+                chr(225) . chr(187) . chr(130) => 'E', chr(225) . chr(187) . chr(131) => 'e',
+                chr(225) . chr(187) . chr(136) => 'I', chr(225) . chr(187) . chr(137) => 'i',
+                chr(225) . chr(187) . chr(142) => 'O', chr(225) . chr(187) . chr(143) => 'o',
+                chr(225) . chr(187) . chr(148) => 'O', chr(225) . chr(187) . chr(149) => 'o',
+                chr(225) . chr(187) . chr(158) => 'O', chr(225) . chr(187) . chr(159) => 'o',
+                chr(225) . chr(187) . chr(166) => 'U', chr(225) . chr(187) . chr(167) => 'u',
+                chr(225) . chr(187) . chr(172) => 'U', chr(225) . chr(187) . chr(173) => 'u',
+                chr(225) . chr(187) . chr(182) => 'Y', chr(225) . chr(187) . chr(183) => 'y',
+                // tilde
+                chr(225) . chr(186) . chr(170) => 'A', chr(225) . chr(186) . chr(171) => 'a',
+                chr(225) . chr(186) . chr(180) => 'A', chr(225) . chr(186) . chr(181) => 'a',
+                chr(225) . chr(186) . chr(188) => 'E', chr(225) . chr(186) . chr(189) => 'e',
+                chr(225) . chr(187) . chr(132) => 'E', chr(225) . chr(187) . chr(133) => 'e',
+                chr(225) . chr(187) . chr(150) => 'O', chr(225) . chr(187) . chr(151) => 'o',
+                chr(225) . chr(187) . chr(160) => 'O', chr(225) . chr(187) . chr(161) => 'o',
+                chr(225) . chr(187) . chr(174) => 'U', chr(225) . chr(187) . chr(175) => 'u',
+                chr(225) . chr(187) . chr(184) => 'Y', chr(225) . chr(187) . chr(185) => 'y',
+                // acute accent
+                chr(225) . chr(186) . chr(164) => 'A', chr(225) . chr(186) . chr(165) => 'a',
+                chr(225) . chr(186) . chr(174) => 'A', chr(225) . chr(186) . chr(175) => 'a',
+                chr(225) . chr(186) . chr(190) => 'E', chr(225) . chr(186) . chr(191) => 'e',
+                chr(225) . chr(187) . chr(144) => 'O', chr(225) . chr(187) . chr(145) => 'o',
+                chr(225) . chr(187) . chr(154) => 'O', chr(225) . chr(187) . chr(155) => 'o',
+                chr(225) . chr(187) . chr(168) => 'U', chr(225) . chr(187) . chr(169) => 'u',
+                // dot below
+                chr(225) . chr(186) . chr(160) => 'A', chr(225) . chr(186) . chr(161) => 'a',
+                chr(225) . chr(186) . chr(172) => 'A', chr(225) . chr(186) . chr(173) => 'a',
+                chr(225) . chr(186) . chr(182) => 'A', chr(225) . chr(186) . chr(183) => 'a',
+                chr(225) . chr(186) . chr(184) => 'E', chr(225) . chr(186) . chr(185) => 'e',
+                chr(225) . chr(187) . chr(134) => 'E', chr(225) . chr(187) . chr(135) => 'e',
+                chr(225) . chr(187) . chr(138) => 'I', chr(225) . chr(187) . chr(139) => 'i',
+                chr(225) . chr(187) . chr(140) => 'O', chr(225) . chr(187) . chr(141) => 'o',
+                chr(225) . chr(187) . chr(152) => 'O', chr(225) . chr(187) . chr(153) => 'o',
+                chr(225) . chr(187) . chr(162) => 'O', chr(225) . chr(187) . chr(163) => 'o',
+                chr(225) . chr(187) . chr(164) => 'U', chr(225) . chr(187) . chr(165) => 'u',
+                chr(225) . chr(187) . chr(176) => 'U', chr(225) . chr(187) . chr(177) => 'u',
+                chr(225) . chr(187) . chr(180) => 'Y', chr(225) . chr(187) . chr(181) => 'y',
+                // Vowels with diacritic (Chinese, Hanyu Pinyin)
+                chr(201) . chr(145) => 'a',
+                // macron
+                chr(199) . chr(149) => 'U', chr(199) . chr(150) => 'u',
+                // acute accent
+                chr(199) . chr(151) => 'U', chr(199) . chr(152) => 'u',
+                // caron
+                chr(199) . chr(141) => 'A', chr(199) . chr(142) => 'a',
+                chr(199) . chr(143) => 'I', chr(199) . chr(144) => 'i',
+                chr(199) . chr(145) => 'O', chr(199) . chr(146) => 'o',
+                chr(199) . chr(147) => 'U', chr(199) . chr(148) => 'u',
+                chr(199) . chr(153) => 'U', chr(199) . chr(154) => 'u',
+                // grave accent
+                chr(199) . chr(155) => 'U', chr(199) . chr(156) => 'u',
+            );
+
+            $string = strtr($string, $chars);
+        } else {
+            // Assume ISO-8859-1 if not UTF-8
+            $chars['in'] = chr(128) . chr(131) . chr(138) . chr(142) . chr(154) . chr(158)
+                . chr(159) . chr(162) . chr(165) . chr(181) . chr(192) . chr(193) . chr(194)
+                . chr(195) . chr(196) . chr(197) . chr(199) . chr(200) . chr(201) . chr(202)
+                . chr(203) . chr(204) . chr(205) . chr(206) . chr(207) . chr(209) . chr(210)
+                . chr(211) . chr(212) . chr(213) . chr(214) . chr(216) . chr(217) . chr(218)
+                . chr(219) . chr(220) . chr(221) . chr(224) . chr(225) . chr(226) . chr(227)
+                . chr(228) . chr(229) . chr(231) . chr(232) . chr(233) . chr(234) . chr(235)
+                . chr(236) . chr(237) . chr(238) . chr(239) . chr(241) . chr(242) . chr(243)
+                . chr(244) . chr(245) . chr(246) . chr(248) . chr(249) . chr(250) . chr(251)
+                . chr(252) . chr(253) . chr(255);
+
+            $chars['out'] = "EfSZszYcYuAAAAAACEEEEIIIINOOOOOOUUUUYaaaaaaceeeeiiiinoooooouuuuyy";
+
+            $string = strtr($string, $chars['in'], $chars['out']);
+            $double_chars['in'] = array(chr(140), chr(156), chr(198), chr(208), chr(222), chr(223), chr(230), chr(240), chr(254));
+            $double_chars['out'] = array('OE', 'oe', 'AE', 'DH', 'TH', 'ss', 'ae', 'dh', 'th');
+            $string = str_replace($double_chars['in'], $double_chars['out'], $string);
+        }
+
+        return $string;
+    }
+
+    private function seemsUtf8($str)
+    {
+        $length = strlen($str);
+        for ($i = 0; $i < $length; $i++) {
+            $c = ord($str[$i]);
+            if ($c < 0x80) $n = 0; # 0bbbbbbb
+            elseif (($c & 0xE0) == 0xC0) $n = 1; # 110bbbbb
+            elseif (($c & 0xF0) == 0xE0) $n = 2; # 1110bbbb
+            elseif (($c & 0xF8) == 0xF0) $n = 3; # 11110bbb
+            elseif (($c & 0xFC) == 0xF8) $n = 4; # 111110bb
+            elseif (($c & 0xFE) == 0xFC) $n = 5; # 1111110b
+            else return false; # Does not match any model
+            for ($j = 0; $j < $n; $j++) { # n bytes matching 10bbbbbb follow ?
+                if ((++$i == $length) || ((ord($str[$i]) & 0xC0) != 0x80))
+                    return false;
+            }
+        }
+        return true;
+    }
 }
\ No newline at end of file
diff --git a/api/BusinessLogic/Attachments/CreateAttachmentModel.php b/api/BusinessLogic/Attachments/CreateAttachmentModel.php
index 9a5f5428..cf137828 100644
--- a/api/BusinessLogic/Attachments/CreateAttachmentModel.php
+++ b/api/BusinessLogic/Attachments/CreateAttachmentModel.php
@@ -10,6 +10,9 @@ class CreateAttachmentModel {
     /* @var $displayName string */
     public $displayName;
 
+    /* @var $fileExtension string */
+    public $fileExtension;
+
     /* @var $id int */
     public $fileSize;
 
diff --git a/api/DataAccess/Files/FileWriter.php b/api/DataAccess/Files/FileWriter.php
new file mode 100644
index 00000000..8ca47891
--- /dev/null
+++ b/api/DataAccess/Files/FileWriter.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace DataAccess\Files;
+
+
+class FileWriter {
+    /**
+     * @param $name string - The file name (including extension)
+     * @param $folder - The folder name (relative to the ROOT of the helpdesk)
+     * @param $contents string - The contents of the file to write
+     * @return int The file size, in bytes
+     * @throws \Exception When the file fails to save
+     */
+    function writeToFile($name, $folder, $contents) {
+        // __DIR__ === '/{ROOT}/api/DataAccess/Files
+        $location = __DIR__ . "/../../../{$folder}/{$name}";
+        $fileSize = file_put_contents($location, $contents);
+
+        if ($fileSize === false) {
+            throw new \Exception("Failed to save the file!");
+        }
+
+        return $fileSize;
+    }
+}
\ No newline at end of file
diff --git a/api/Tests/BusinessLogic/Attachments/AttachmentHandlerTest.php b/api/Tests/BusinessLogic/Attachments/AttachmentHandlerTest.php
index e956e321..e58a77f9 100644
--- a/api/Tests/BusinessLogic/Attachments/AttachmentHandlerTest.php
+++ b/api/Tests/BusinessLogic/Attachments/AttachmentHandlerTest.php
@@ -5,6 +5,10 @@ namespace BusinessLogic\Attachments;
 
 
 use BusinessLogic\Exceptions\ValidationException;
+use BusinessLogic\Tickets\Ticket;
+use DataAccess\Attachments\AttachmentGateway;
+use DataAccess\Files\FileWriter;
+use DataAccess\Tickets\TicketGateway;
 use PHPUnit\Framework\TestCase;
 
 class AttachmentHandlerTest extends TestCase {
@@ -15,12 +19,32 @@ class AttachmentHandlerTest extends TestCase {
     /* @var $createAttachmentModel CreateAttachmentForTicketModel */
     private $createAttachmentForTicketModel;
 
+    /* @var $ticketGateway \PHPUnit_Framework_MockObject_MockObject */
+    private $ticketGateway;
+
+    /* @var $attachmentGateway \PHPUnit_Framework_MockObject_MockObject */
+    private $attachmentGateway;
+
+    /* @var $fileWriter \PHPUnit_Framework_MockObject_MockObject */
+    private $fileWriter;
+
+    /* @var $heskSettings array */
+    private $heskSettings;
+
     protected function setUp() {
-        $this->attachmentHandler = new AttachmentHandler();
+        $this->ticketGateway = $this->createMock(TicketGateway::class);
+        $this->attachmentGateway = $this->createMock(AttachmentGateway::class);
+        $this->fileWriter = $this->createMock(FileWriter::class);
+        $this->heskSettings = array(
+            'attach_dir' => 'attachments'
+        );
+
+        $this->attachmentHandler = new AttachmentHandler($this->ticketGateway, $this->attachmentGateway, $this->fileWriter);
         $this->createAttachmentForTicketModel = new CreateAttachmentForTicketModel();
         $this->createAttachmentForTicketModel->attachmentContents = base64_encode('string');
-        $this->createAttachmentForTicketModel->displayName = 'Display Name';
+        $this->createAttachmentForTicketModel->displayName = 'DisplayName';
         $this->createAttachmentForTicketModel->ticketId = 1;
+        $this->createAttachmentForTicketModel->type = AttachmentType::MESSAGE;
     }
 
     function testThatValidateThrowsAnExceptionWhenTheAttachmentBodyIsNull() {
@@ -32,7 +56,7 @@ class AttachmentHandlerTest extends TestCase {
         $this->expectExceptionMessageRegExp('/CONTENTS_EMPTY/');
 
         //-- Act
-        $this->attachmentHandler->createAttachmentForTicket($this->createAttachmentForTicketModel);
+        $this->attachmentHandler->createAttachmentForTicket($this->createAttachmentForTicketModel, $this->heskSettings);
     }
 
     function testThatValidateThrowsAnExceptionWhenTheAttachmentBodyIsEmpty() {
@@ -44,7 +68,7 @@ class AttachmentHandlerTest extends TestCase {
         $this->expectExceptionMessageRegExp('/CONTENTS_EMPTY/');
 
         //-- Act
-        $this->attachmentHandler->createAttachmentForTicket($this->createAttachmentForTicketModel);
+        $this->attachmentHandler->createAttachmentForTicket($this->createAttachmentForTicketModel, $this->heskSettings);
     }
 
     function testThatValidateThrowsAnExceptionWhenTheAttachmentBodyIsInvalidBase64() {
@@ -56,7 +80,7 @@ class AttachmentHandlerTest extends TestCase {
         $this->expectExceptionMessageRegExp('/CONTENTS_NOT_BASE_64/');
 
         //-- Act
-        $this->attachmentHandler->createAttachmentForTicket($this->createAttachmentForTicketModel);
+        $this->attachmentHandler->createAttachmentForTicket($this->createAttachmentForTicketModel, $this->heskSettings);
     }
 
     function testThatValidateThrowsAnExceptionWhenTheDisplayNameIsNull() {
@@ -68,7 +92,7 @@ class AttachmentHandlerTest extends TestCase {
         $this->expectExceptionMessageRegExp('/DISPLAY_NAME_EMPTY/');
 
         //-- Act
-        $this->attachmentHandler->createAttachmentForTicket($this->createAttachmentForTicketModel);
+        $this->attachmentHandler->createAttachmentForTicket($this->createAttachmentForTicketModel, $this->heskSettings);
     }
 
     function testThatValidateThrowsAnExceptionWhenTheDisplayNameIsEmpty() {
@@ -80,7 +104,7 @@ class AttachmentHandlerTest extends TestCase {
         $this->expectExceptionMessageRegExp('/DISPLAY_NAME_EMPTY/');
 
         //-- Act
-        $this->attachmentHandler->createAttachmentForTicket($this->createAttachmentForTicketModel);
+        $this->attachmentHandler->createAttachmentForTicket($this->createAttachmentForTicketModel, $this->heskSettings);
     }
 
     function testThatValidateThrowsAnExceptionWhenTheTicketIdIsNull() {
@@ -92,7 +116,7 @@ class AttachmentHandlerTest extends TestCase {
         $this->expectExceptionMessageRegExp('/TICKET_ID_MISSING/');
 
         //-- Act
-        $this->attachmentHandler->createAttachmentForTicket($this->createAttachmentForTicketModel);
+        $this->attachmentHandler->createAttachmentForTicket($this->createAttachmentForTicketModel, $this->heskSettings);
     }
 
     function testThatValidateThrowsAnExceptionWhenTheTicketIdIsANonPositiveInteger() {
@@ -104,6 +128,71 @@ class AttachmentHandlerTest extends TestCase {
         $this->expectExceptionMessageRegExp('/TICKET_ID_MISSING/');
 
         //-- Act
-        $this->attachmentHandler->createAttachmentForTicket($this->createAttachmentForTicketModel);
+        $this->attachmentHandler->createAttachmentForTicket($this->createAttachmentForTicketModel, $this->heskSettings);
+    }
+
+    function testThatValidateThrowsAnExceptionWhenTheAttachmentTypeIsNeitherMessageNorReply() {
+        //-- Arrange
+        $this->createAttachmentForTicketModel->type = 5;
+
+        //-- Assert
+        $this->expectException(ValidationException::class);
+        $this->expectExceptionMessageRegExp('/INVALID_ATTACHMENT_TYPE/');
+
+        //-- Act
+        $this->attachmentHandler->createAttachmentForTicket($this->createAttachmentForTicketModel, $this->heskSettings);
+    }
+
+    function testItSavesATicketWithTheProperProperties() {
+        //-- Arrange
+        $this->createAttachmentForTicketModel->ticketId = 1;
+        $ticket = new Ticket();
+        $ticket->trackingId = 'ABC-DEF-1234';
+        $this->ticketGateway->method('getTicketById')->with(1, $this->anything())->willReturn($ticket);
+
+        $ticketAttachment = new TicketAttachment();
+        $ticketAttachment->displayName = $this->createAttachmentForTicketModel->displayName;
+        $ticketAttachment->ticketTrackingId = $ticket->trackingId;
+        $ticketAttachment->type = $this->createAttachmentForTicketModel->type;
+        $ticketAttachment->downloadCount = 0;
+        $ticketAttachment->id = 50;
+
+        $this->attachmentGateway->method('createAttachmentForTicket')->willReturn(50);
+
+
+        //-- Act
+        $actual = $this->attachmentHandler->createAttachmentForTicket($this->createAttachmentForTicketModel, $this->heskSettings);
+
+        //-- Assert
+        self::assertThat($actual->id, self::equalTo(50));
+        self::assertThat($actual->downloadCount, self::equalTo(0));
+        self::assertThat($actual->type, self::equalTo($this->createAttachmentForTicketModel->type));
+        self::assertThat($actual->ticketTrackingId, self::equalTo($ticket->trackingId));
+        self::assertThat($actual->displayName, self::equalTo($this->createAttachmentForTicketModel->displayName));
+    }
+
+    function testItSavesTheFileToTheFileSystem() {
+        //-- Arrange
+        $this->createAttachmentForTicketModel->ticketId = 1;
+        $ticket = new Ticket();
+        $ticket->trackingId = 'ABC-DEF-1234';
+        $this->ticketGateway->method('getTicketById')->with(1, $this->anything())->willReturn($ticket);
+
+        $ticketAttachment = new TicketAttachment();
+        $ticketAttachment->displayName = $this->createAttachmentForTicketModel->displayName;
+        $ticketAttachment->ticketTrackingId = $ticket->trackingId;
+        $ticketAttachment->type = $this->createAttachmentForTicketModel->type;
+        $ticketAttachment->downloadCount = 0;
+        $ticketAttachment->id = 50;
+
+        $this->fileWriter->method('writeToFile')->willReturn(1024);
+        $this->attachmentGateway->method('createAttachmentForTicket')->willReturn(50);
+
+
+        //-- Act
+        $actual = $this->attachmentHandler->createAttachmentForTicket($this->createAttachmentForTicketModel, $this->heskSettings);
+
+        //-- Assert
+        self::assertThat($actual->fileSize, self::equalTo(1024));
     }
 }

From 8d484f62eafed10af6beedc3504222b386e72a2b Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Mon, 20 Mar 2017 22:16:35 -0400
Subject: [PATCH 081/192] Mostly done with attachment uploading

---
 api/ApplicationContext.php                    | 10 +++++
 .../Attachments/AttachmentHandler.php         | 25 ++++++++++--
 .../Attachments/CreateAttachmentModel.php     |  3 --
 .../StaffAttachmentsController.php            | 10 -----
 .../StaffTicketAttachmentsController.php      | 39 +++++++++++++++++++
 api/Controllers/Tickets/TicketController.php  |  2 +-
 .../Attachments/AttachmentHandlerTest.php     | 34 +++++++++++++++-
 7 files changed, 103 insertions(+), 20 deletions(-)
 delete mode 100644 api/Controllers/Attachments/StaffAttachmentsController.php
 create mode 100644 api/Controllers/Attachments/StaffTicketAttachmentsController.php

diff --git a/api/ApplicationContext.php b/api/ApplicationContext.php
index 5e873c38..5ec0939f 100644
--- a/api/ApplicationContext.php
+++ b/api/ApplicationContext.php
@@ -1,6 +1,7 @@
 <?php
 
 // Responsible for loading in all necessary classes. AKA a poor man's DI solution.
+use BusinessLogic\Attachments\AttachmentHandler;
 use BusinessLogic\Categories\CategoryRetriever;
 use BusinessLogic\Emails\BasicEmailSender;
 use BusinessLogic\Emails\EmailSenderHelper;
@@ -17,7 +18,9 @@ use BusinessLogic\Tickets\NewTicketValidator;
 use BusinessLogic\Tickets\TicketValidators;
 use BusinessLogic\Tickets\TrackingIdGenerator;
 use BusinessLogic\Tickets\VerifiedEmailChecker;
+use DataAccess\Attachments\AttachmentGateway;
 use DataAccess\Categories\CategoryGateway;
+use DataAccess\Files\FileWriter;
 use DataAccess\Logging\LoggingGateway;
 use DataAccess\Security\BanGateway;
 use DataAccess\Security\UserGateway;
@@ -91,5 +94,12 @@ class ApplicationContext {
             $this->get[EmailSenderHelper::class],
             $this->get[UserGateway::class],
             $this->get[ModsForHeskSettingsGateway::class]);
+
+        // Attachments
+        $this->get[FileWriter::class] = new FileWriter();
+        $this->get[AttachmentGateway::class] = new AttachmentGateway();
+        $this->get[AttachmentHandler::class] = new AttachmentHandler($this->get[TicketGateway::class],
+            $this->get[AttachmentGateway::class],
+            $this->get[FileWriter::class]);
     }
 }
\ No newline at end of file
diff --git a/api/BusinessLogic/Attachments/AttachmentHandler.php b/api/BusinessLogic/Attachments/AttachmentHandler.php
index 4ef3d72b..d56ce05e 100644
--- a/api/BusinessLogic/Attachments/AttachmentHandler.php
+++ b/api/BusinessLogic/Attachments/AttachmentHandler.php
@@ -32,16 +32,17 @@ class AttachmentHandler {
      * @return TicketAttachment the newly created attachment
      */
     function createAttachmentForTicket($createAttachmentModel, $heskSettings) {
-        $this->validate($createAttachmentModel);
+        $this->validate($createAttachmentModel, $heskSettings);
 
         $decodedAttachment = base64_decode($createAttachmentModel->attachmentContents);
 
         $ticket = $this->ticketGateway->getTicketById($createAttachmentModel->ticketId, $heskSettings);
         $cleanedFileName = $this->cleanFileName($createAttachmentModel->displayName);
+        $fileParts = pathinfo($cleanedFileName);
 
         $ticketAttachment = new TicketAttachment();
         $ticketAttachment->savedName = $this->generateSavedName($ticket->trackingId,
-            $cleanedFileName, $createAttachmentModel->fileExtension);
+            $cleanedFileName, $fileParts['extension']);
         $ticketAttachment->displayName = $cleanedFileName;
         $ticketAttachment->ticketTrackingId = $ticket->trackingId;
         $ticketAttachment->type = $createAttachmentModel->type;
@@ -58,9 +59,10 @@ class AttachmentHandler {
 
     /**
      * @param $createAttachmentModel CreateAttachmentForTicketModel
+     * @param $heskSettings array
      * @throws ValidationException
      */
-    private function validate($createAttachmentModel) {
+    private function validate($createAttachmentModel, $heskSettings) {
         $errorKeys = array();
         if ($createAttachmentModel->attachmentContents === null ||
             trim($createAttachmentModel->attachmentContents) === '') {
@@ -85,7 +87,21 @@ class AttachmentHandler {
             $errorKeys[] = 'INVALID_ATTACHMENT_TYPE';
         }
 
-        //-- TODO Extension, size
+        $fileParts = pathinfo($createAttachmentModel->displayName);
+        if (!isset($fileParts['extension']) || !in_array(".{$fileParts['extension']}", $heskSettings['attachments']['allowed_types'])) {
+            $errorKeys[] = 'EXTENSION_NOT_PERMITTED';
+        }
+
+        $fileContents = base64_decode($createAttachmentModel->attachmentContents);
+        if (function_exists('mb_strlen')) {
+            $fileSize = mb_strlen($fileContents, '8bit');
+        } else {
+            $fileSize = strlen($fileContents);
+        }
+
+        if ($fileSize > $heskSettings['attachments']['max_size']) {
+            $errorKeys[] = 'FILE_SIZE_TOO_LARGE';
+        }
 
         if (count($errorKeys) > 0) {
             $validationModel = new ValidationModel();
@@ -96,6 +112,7 @@ class AttachmentHandler {
     }
 
     private function generateSavedName($trackingId, $displayName, $fileExtension) {
+        $fileExtension = ".{$fileExtension}";
         $useChars = 'AEUYBDGHJLMNPQRSTVWXZ123456789';
         $tmp = uniqid();
         for ($j = 1; $j < 10; $j++) {
diff --git a/api/BusinessLogic/Attachments/CreateAttachmentModel.php b/api/BusinessLogic/Attachments/CreateAttachmentModel.php
index cf137828..9a5f5428 100644
--- a/api/BusinessLogic/Attachments/CreateAttachmentModel.php
+++ b/api/BusinessLogic/Attachments/CreateAttachmentModel.php
@@ -10,9 +10,6 @@ class CreateAttachmentModel {
     /* @var $displayName string */
     public $displayName;
 
-    /* @var $fileExtension string */
-    public $fileExtension;
-
     /* @var $id int */
     public $fileSize;
 
diff --git a/api/Controllers/Attachments/StaffAttachmentsController.php b/api/Controllers/Attachments/StaffAttachmentsController.php
deleted file mode 100644
index 6bfbbd81..00000000
--- a/api/Controllers/Attachments/StaffAttachmentsController.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace Controllers\Attachments;
-
-
-class StaffAttachmentsController {
-    function post() {
-
-    }
-}
\ No newline at end of file
diff --git a/api/Controllers/Attachments/StaffTicketAttachmentsController.php b/api/Controllers/Attachments/StaffTicketAttachmentsController.php
new file mode 100644
index 00000000..01483e0f
--- /dev/null
+++ b/api/Controllers/Attachments/StaffTicketAttachmentsController.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Controllers\Attachments;
+
+
+use BusinessLogic\Attachments\AttachmentHandler;
+use BusinessLogic\Attachments\CreateAttachmentForTicketModel;
+use BusinessLogic\Exceptions\ApiFriendlyException;
+use BusinessLogic\Helpers;
+use Controllers\JsonRetriever;
+
+class StaffTicketAttachmentsController {
+    function post() {
+        global $hesk_settings, $applicationContext;
+
+        if (!$hesk_settings['attachments']['use']) {
+            throw new ApiFriendlyException('Attachments are disabled on this server', 'Attachments Disabled', 404);
+        }
+
+        /* @var $attachmentHandler AttachmentHandler */
+        $attachmentHandler = $applicationContext->get[AttachmentHandler::class];
+
+        $createAttachmentForTicketModel = $this->createModel(JsonRetriever::getJsonData());
+
+        $createdAttachment = $attachmentHandler->createAttachmentForTicket($createAttachmentForTicketModel, $hesk_settings);
+
+        return output($createdAttachment, 201);
+    }
+
+    private function createModel($json) {
+        $model = new CreateAttachmentForTicketModel();
+        $model->attachmentContents = Helpers::safeArrayGet($json, 'data');
+        $model->displayName = Helpers::safeArrayGet($json, 'displayName');
+        $model->ticketId = Helpers::safeArrayGet($json, 'ticketId');
+        $model->type = Helpers::safeArrayGet($json, 'type');
+
+        return $model;
+    }
+}
\ No newline at end of file
diff --git a/api/Controllers/Tickets/TicketController.php b/api/Controllers/Tickets/TicketController.php
index 017e6819..a26b18e2 100644
--- a/api/Controllers/Tickets/TicketController.php
+++ b/api/Controllers/Tickets/TicketController.php
@@ -33,7 +33,7 @@ class TicketController {
         //else if assigned to owner, email new owner
         //else email all staff
 
-        return output($ticket);
+        return output($ticket, 201);
     }
 
     /**
diff --git a/api/Tests/BusinessLogic/Attachments/AttachmentHandlerTest.php b/api/Tests/BusinessLogic/Attachments/AttachmentHandlerTest.php
index e58a77f9..0a6feddc 100644
--- a/api/Tests/BusinessLogic/Attachments/AttachmentHandlerTest.php
+++ b/api/Tests/BusinessLogic/Attachments/AttachmentHandlerTest.php
@@ -36,13 +36,17 @@ class AttachmentHandlerTest extends TestCase {
         $this->attachmentGateway = $this->createMock(AttachmentGateway::class);
         $this->fileWriter = $this->createMock(FileWriter::class);
         $this->heskSettings = array(
-            'attach_dir' => 'attachments'
+            'attach_dir' => 'attachments',
+            'attachments' => array(
+                'allowed_types' => array('.txt'),
+                'max_size' => 999
+            )
         );
 
         $this->attachmentHandler = new AttachmentHandler($this->ticketGateway, $this->attachmentGateway, $this->fileWriter);
         $this->createAttachmentForTicketModel = new CreateAttachmentForTicketModel();
         $this->createAttachmentForTicketModel->attachmentContents = base64_encode('string');
-        $this->createAttachmentForTicketModel->displayName = 'DisplayName';
+        $this->createAttachmentForTicketModel->displayName = 'DisplayName.txt';
         $this->createAttachmentForTicketModel->ticketId = 1;
         $this->createAttachmentForTicketModel->type = AttachmentType::MESSAGE;
     }
@@ -143,6 +147,32 @@ class AttachmentHandlerTest extends TestCase {
         $this->attachmentHandler->createAttachmentForTicket($this->createAttachmentForTicketModel, $this->heskSettings);
     }
 
+    function testThatValidateThrowsAnExceptionWhenTheFileExtensionIsNotPermitted() {
+        //-- Arrange
+        $this->heskSettings['attachments']['allowed_types'] = array('.gif');
+        $this->createAttachmentForTicketModel->ticketId = 0;
+
+        //-- Assert
+        $this->expectException(ValidationException::class);
+        $this->expectExceptionMessageRegExp('/EXTENSION_NOT_PERMITTED/');
+
+        //-- Act
+        $this->attachmentHandler->createAttachmentForTicket($this->createAttachmentForTicketModel, $this->heskSettings);
+    }
+
+    function testThatValidateThrowsAnExceptionWhenTheFileSizeIsLargerThanMaxPermitted() {
+        //-- Arrange
+        $this->createAttachmentForTicketModel->attachmentContents = base64_encode("msg");
+        $this->heskSettings['attachments']['max_size'] = 1;
+
+        //-- Assert
+        $this->expectException(ValidationException::class);
+        $this->expectExceptionMessageRegExp('/FILE_SIZE_TOO_LARGE/');
+
+        //-- Act
+        $this->attachmentHandler->createAttachmentForTicket($this->createAttachmentForTicketModel, $this->heskSettings);
+    }
+
     function testItSavesATicketWithTheProperProperties() {
         //-- Arrange
         $this->createAttachmentForTicketModel->ticketId = 1;

From 0556d07a5635e53538cc69d784442f57cf9bf0e7 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Tue, 21 Mar 2017 22:11:19 -0400
Subject: [PATCH 082/192] Attachments can now be uploaded for a ticket. Still
 need to handle updating the reply's property

---
 .../Attachments/AttachmentHandler.php         | 21 ++++++++++++++++++
 api/DataAccess/Tickets/TicketGateway.php      | 22 +++++++++++++++++++
 api/index.php                                 | 11 ++++++----
 3 files changed, 50 insertions(+), 4 deletions(-)

diff --git a/api/BusinessLogic/Attachments/AttachmentHandler.php b/api/BusinessLogic/Attachments/AttachmentHandler.php
index d56ce05e..60c32cf0 100644
--- a/api/BusinessLogic/Attachments/AttachmentHandler.php
+++ b/api/BusinessLogic/Attachments/AttachmentHandler.php
@@ -4,6 +4,8 @@ namespace BusinessLogic\Attachments;
 
 
 use BusinessLogic\Exceptions\ValidationException;
+use BusinessLogic\Tickets\Attachment;
+use BusinessLogic\Tickets\Ticket;
 use BusinessLogic\ValidationModel;
 use DataAccess\Attachments\AttachmentGateway;
 use DataAccess\Files\FileWriter;
@@ -52,6 +54,9 @@ class AttachmentHandler {
             $this->fileWriter->writeToFile($ticketAttachment->savedName, $heskSettings['attach_dir'], $decodedAttachment);
 
         $attachmentId = $this->attachmentGateway->createAttachmentForTicket($ticketAttachment, $heskSettings);
+
+        $this->updateAttachmentsOnTicket($ticket, $ticketAttachment, $attachmentId, $heskSettings);
+
         $ticketAttachment->id = $attachmentId;
 
         return $ticketAttachment;
@@ -366,4 +371,20 @@ class AttachmentHandler {
         }
         return true;
     }
+
+    /**
+     * @param $ticket Ticket
+     * @param $ticketAttachment TicketAttachment
+     * @param $attachmentId int
+     * @param $heskSettings array
+     */
+    private function updateAttachmentsOnTicket($ticket, $ticketAttachment, $attachmentId, $heskSettings) {
+        $attachments = $ticket->attachments === null ? array() : $ticket->attachments;
+        $newAttachment = new Attachment();
+        $newAttachment->savedName = $ticketAttachment->savedName;
+        $newAttachment->fileName = $ticketAttachment->displayName;
+        $newAttachment->id = $attachmentId;
+        $attachments[] = $newAttachment;
+        $this->ticketGateway->updateAttachmentsForTicket($ticket->id, $attachments, $heskSettings);
+    }
 }
\ No newline at end of file
diff --git a/api/DataAccess/Tickets/TicketGateway.php b/api/DataAccess/Tickets/TicketGateway.php
index 8b1f29d4..faf0428c 100644
--- a/api/DataAccess/Tickets/TicketGateway.php
+++ b/api/DataAccess/Tickets/TicketGateway.php
@@ -3,6 +3,7 @@
 namespace DataAccess\Tickets;
 
 
+use BusinessLogic\Tickets\Attachment;
 use BusinessLogic\Tickets\Ticket;
 use BusinessLogic\Tickets\TicketGatewayGeneratedFields;
 use DataAccess\CommonDao;
@@ -205,4 +206,25 @@ class TicketGateway extends CommonDao {
 
         return $generatedFields;
     }
+
+    /**
+     * @param $ticketId int
+     * @param $attachments Attachment[]
+     * @param $heskSettings array
+     *
+     * Crappy logic that should just be pulled from the attachments table, but using for backwards compatibility
+     */
+    function updateAttachmentsForTicket($ticketId, $attachments, $heskSettings) {
+        $this->init();
+
+        $attachmentStrings = array();
+        foreach ($attachments as $attachment) {
+            $attachmentStrings[] = "{$attachment->id}#{$attachment->fileName}#{$attachment->savedName}";
+        }
+        $attachmentStringToSave = implode(',', $attachmentStrings);
+
+        hesk_dbQuery("UPDATE `" . hesk_dbEscape($heskSettings['db_pfix']) . "tickets` 
+            SET `attachments` = '" . hesk_dbEscape($attachmentStringToSave) . "' 
+            WHERE `id` = " . intval($ticketId));
+    }
 }
\ No newline at end of file
diff --git a/api/index.php b/api/index.php
index 4382f43c..3a894660 100644
--- a/api/index.php
+++ b/api/index.php
@@ -147,11 +147,14 @@ Link::before('before');
 
 Link::all(array(
     // Categories
-    '/v1/categories' => '\Controllers\Categories\CategoryController::printAllCategories',
-    '/v1/categories/{i}' => '\Controllers\Categories\CategoryController',
+    '/v1/categories' => \Controllers\Categories\CategoryController::class . '::printAllCategories',
+    '/v1/categories/{i}' => \Controllers\Categories\CategoryController::class,
     // Tickets
-    '/v1/tickets/{i}' => '\Controllers\Tickets\TicketController',
-    '/v1/tickets' => '\Controllers\Tickets\TicketController',
+    '/v1/tickets/{i}' => \Controllers\Tickets\TicketController::class,
+    '/v1/tickets' => \Controllers\Tickets\TicketController::class,
+
+    // Attachments
+    '/v1/staff/attachments' => \Controllers\Attachments\StaffTicketAttachmentsController::class,
 
     // Any URL that doesn't match goes to the 404 handler
     '404' => 'handle404'

From 5112a6a13bdae0f84dcc14c7e4038d5b3df31490 Mon Sep 17 00:00:00 2001
From: Mike Koch <Mike.Koch@emerson.com>
Date: Wed, 22 Mar 2017 12:54:43 -0400
Subject: [PATCH 083/192] Make the endpoint only for ticket message
 attachments, not replies

---
 .../Attachments/AttachmentHandler.php          |  6 +-----
 .../CreateAttachmentForTicketModel.php         |  3 ---
 .../StaffTicketAttachmentsController.php       |  9 ++++-----
 .../Attachments/AttachmentHandlerTest.php      | 18 +++---------------
 api/index.php                                  |  2 +-
 5 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/api/BusinessLogic/Attachments/AttachmentHandler.php b/api/BusinessLogic/Attachments/AttachmentHandler.php
index 60c32cf0..a05291d4 100644
--- a/api/BusinessLogic/Attachments/AttachmentHandler.php
+++ b/api/BusinessLogic/Attachments/AttachmentHandler.php
@@ -47,7 +47,7 @@ class AttachmentHandler {
             $cleanedFileName, $fileParts['extension']);
         $ticketAttachment->displayName = $cleanedFileName;
         $ticketAttachment->ticketTrackingId = $ticket->trackingId;
-        $ticketAttachment->type = $createAttachmentModel->type;
+        $ticketAttachment->type = 0;
         $ticketAttachment->downloadCount = 0;
 
         $ticketAttachment->fileSize =
@@ -88,10 +88,6 @@ class AttachmentHandler {
             $errorKeys[] = 'TICKET_ID_MISSING';
         }
 
-        if (!in_array($createAttachmentModel->type, array(AttachmentType::MESSAGE, AttachmentType::REPLY))) {
-            $errorKeys[] = 'INVALID_ATTACHMENT_TYPE';
-        }
-
         $fileParts = pathinfo($createAttachmentModel->displayName);
         if (!isset($fileParts['extension']) || !in_array(".{$fileParts['extension']}", $heskSettings['attachments']['allowed_types'])) {
             $errorKeys[] = 'EXTENSION_NOT_PERMITTED';
diff --git a/api/BusinessLogic/Attachments/CreateAttachmentForTicketModel.php b/api/BusinessLogic/Attachments/CreateAttachmentForTicketModel.php
index 04336133..7fb6f7ff 100644
--- a/api/BusinessLogic/Attachments/CreateAttachmentForTicketModel.php
+++ b/api/BusinessLogic/Attachments/CreateAttachmentForTicketModel.php
@@ -6,7 +6,4 @@ namespace BusinessLogic\Attachments;
 class CreateAttachmentForTicketModel extends CreateAttachmentModel {
     /* @var $ticketId int */
     public $ticketId;
-
-    /* @var $type int [use <code>AttachmentType</code] */
-    public $type;
 }
\ No newline at end of file
diff --git a/api/Controllers/Attachments/StaffTicketAttachmentsController.php b/api/Controllers/Attachments/StaffTicketAttachmentsController.php
index 01483e0f..9c054e79 100644
--- a/api/Controllers/Attachments/StaffTicketAttachmentsController.php
+++ b/api/Controllers/Attachments/StaffTicketAttachmentsController.php
@@ -10,7 +10,7 @@ use BusinessLogic\Helpers;
 use Controllers\JsonRetriever;
 
 class StaffTicketAttachmentsController {
-    function post() {
+    function post($ticketId) {
         global $hesk_settings, $applicationContext;
 
         if (!$hesk_settings['attachments']['use']) {
@@ -20,19 +20,18 @@ class StaffTicketAttachmentsController {
         /* @var $attachmentHandler AttachmentHandler */
         $attachmentHandler = $applicationContext->get[AttachmentHandler::class];
 
-        $createAttachmentForTicketModel = $this->createModel(JsonRetriever::getJsonData());
+        $createAttachmentForTicketModel = $this->createModel(JsonRetriever::getJsonData(), $ticketId);
 
         $createdAttachment = $attachmentHandler->createAttachmentForTicket($createAttachmentForTicketModel, $hesk_settings);
 
         return output($createdAttachment, 201);
     }
 
-    private function createModel($json) {
+    private function createModel($json, $ticketId) {
         $model = new CreateAttachmentForTicketModel();
         $model->attachmentContents = Helpers::safeArrayGet($json, 'data');
         $model->displayName = Helpers::safeArrayGet($json, 'displayName');
-        $model->ticketId = Helpers::safeArrayGet($json, 'ticketId');
-        $model->type = Helpers::safeArrayGet($json, 'type');
+        $model->ticketId = $ticketId;
 
         return $model;
     }
diff --git a/api/Tests/BusinessLogic/Attachments/AttachmentHandlerTest.php b/api/Tests/BusinessLogic/Attachments/AttachmentHandlerTest.php
index 0a6feddc..a67bd7e6 100644
--- a/api/Tests/BusinessLogic/Attachments/AttachmentHandlerTest.php
+++ b/api/Tests/BusinessLogic/Attachments/AttachmentHandlerTest.php
@@ -135,18 +135,6 @@ class AttachmentHandlerTest extends TestCase {
         $this->attachmentHandler->createAttachmentForTicket($this->createAttachmentForTicketModel, $this->heskSettings);
     }
 
-    function testThatValidateThrowsAnExceptionWhenTheAttachmentTypeIsNeitherMessageNorReply() {
-        //-- Arrange
-        $this->createAttachmentForTicketModel->type = 5;
-
-        //-- Assert
-        $this->expectException(ValidationException::class);
-        $this->expectExceptionMessageRegExp('/INVALID_ATTACHMENT_TYPE/');
-
-        //-- Act
-        $this->attachmentHandler->createAttachmentForTicket($this->createAttachmentForTicketModel, $this->heskSettings);
-    }
-
     function testThatValidateThrowsAnExceptionWhenTheFileExtensionIsNotPermitted() {
         //-- Arrange
         $this->heskSettings['attachments']['allowed_types'] = array('.gif');
@@ -183,7 +171,7 @@ class AttachmentHandlerTest extends TestCase {
         $ticketAttachment = new TicketAttachment();
         $ticketAttachment->displayName = $this->createAttachmentForTicketModel->displayName;
         $ticketAttachment->ticketTrackingId = $ticket->trackingId;
-        $ticketAttachment->type = $this->createAttachmentForTicketModel->type;
+        $ticketAttachment->type = 0;
         $ticketAttachment->downloadCount = 0;
         $ticketAttachment->id = 50;
 
@@ -196,7 +184,7 @@ class AttachmentHandlerTest extends TestCase {
         //-- Assert
         self::assertThat($actual->id, self::equalTo(50));
         self::assertThat($actual->downloadCount, self::equalTo(0));
-        self::assertThat($actual->type, self::equalTo($this->createAttachmentForTicketModel->type));
+        self::assertThat($actual->type, self::equalTo(AttachmentType::MESSAGE));
         self::assertThat($actual->ticketTrackingId, self::equalTo($ticket->trackingId));
         self::assertThat($actual->displayName, self::equalTo($this->createAttachmentForTicketModel->displayName));
     }
@@ -211,7 +199,7 @@ class AttachmentHandlerTest extends TestCase {
         $ticketAttachment = new TicketAttachment();
         $ticketAttachment->displayName = $this->createAttachmentForTicketModel->displayName;
         $ticketAttachment->ticketTrackingId = $ticket->trackingId;
-        $ticketAttachment->type = $this->createAttachmentForTicketModel->type;
+        $ticketAttachment->type = AttachmentType::MESSAGE;
         $ticketAttachment->downloadCount = 0;
         $ticketAttachment->id = 50;
 
diff --git a/api/index.php b/api/index.php
index 3a894660..1dea517d 100644
--- a/api/index.php
+++ b/api/index.php
@@ -154,7 +154,7 @@ Link::all(array(
     '/v1/tickets' => \Controllers\Tickets\TicketController::class,
 
     // Attachments
-    '/v1/staff/attachments' => \Controllers\Attachments\StaffTicketAttachmentsController::class,
+    '/v1/staff/tickets/{i}/attachments' => \Controllers\Attachments\StaffTicketAttachmentsController::class,
 
     // Any URL that doesn't match goes to the 404 handler
     '404' => 'handle404'

From 37149ec831d15f1630dc3dc48ca44c0747a89fba Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Wed, 22 Mar 2017 22:07:14 -0400
Subject: [PATCH 084/192] Working on user ticket security checker

---
 api/BusinessLogic/Security/UserPrivilege.php  |  1 +
 .../Security/UserToTicketChecker.php          | 26 ++++++
 .../Security/UserToTicketCheckerTest.php      | 88 +++++++++++++++++++
 3 files changed, 115 insertions(+)
 create mode 100644 api/BusinessLogic/Security/UserToTicketChecker.php
 create mode 100644 api/Tests/BusinessLogic/Security/UserToTicketCheckerTest.php

diff --git a/api/BusinessLogic/Security/UserPrivilege.php b/api/BusinessLogic/Security/UserPrivilege.php
index 8344d31d..4f2fb281 100644
--- a/api/BusinessLogic/Security/UserPrivilege.php
+++ b/api/BusinessLogic/Security/UserPrivilege.php
@@ -12,4 +12,5 @@ namespace BusinessLogic\Security;
 class UserPrivilege {
     const CAN_VIEW_TICKETS = 'can_view_tickets';
     const CAN_REPLY_TO_TICKETS = 'can_reply_tickets';
+    const CAN_EDIT_TICKETS = 'can_edit_tickets';
 }
\ No newline at end of file
diff --git a/api/BusinessLogic/Security/UserToTicketChecker.php b/api/BusinessLogic/Security/UserToTicketChecker.php
new file mode 100644
index 00000000..3b0c54dc
--- /dev/null
+++ b/api/BusinessLogic/Security/UserToTicketChecker.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace BusinessLogic\Security;
+
+
+use BusinessLogic\Tickets\Ticket;
+
+class UserToTicketChecker {
+
+    /**
+     * @param $user UserContext
+     * @param $ticket Ticket
+     * @param $isEditing bool true if editing a ticket, false if creating
+     * @param $heskSettings array
+     * @return bool
+     */
+    function isTicketWritableToUser($user, $ticket, $isEditing, $heskSettings) {
+        $hasAccess = $user->admin === true ||
+            (in_array($ticket->categoryId, $user->categories) &&
+                in_array(UserPrivilege::CAN_VIEW_TICKETS, $user->permissions));
+
+        return $isEditing
+            ? $hasAccess && in_array(UserPrivilege::CAN_EDIT_TICKETS, $user->permissions)
+            : $hasAccess;
+    }
+}
\ No newline at end of file
diff --git a/api/Tests/BusinessLogic/Security/UserToTicketCheckerTest.php b/api/Tests/BusinessLogic/Security/UserToTicketCheckerTest.php
new file mode 100644
index 00000000..0a1eae4d
--- /dev/null
+++ b/api/Tests/BusinessLogic/Security/UserToTicketCheckerTest.php
@@ -0,0 +1,88 @@
+<?php
+
+
+namespace BusinessLogic\Security;
+
+
+use BusinessLogic\Tickets\Ticket;
+use PHPUnit\Framework\TestCase;
+
+class UserToTicketCheckerTest extends TestCase {
+
+    /* @var $userToTicketChecker UserToTicketChecker */
+    private $userToTicketChecker;
+
+    /* @var $heskSettings array */
+    private $heskSettings;
+
+    protected function setUp() {
+        $this->userToTicketChecker = new UserToTicketChecker();
+    }
+
+    function testItReturnsTrueWhenTheUserIsAnAdmin() {
+        //-- Arrange
+        $user = new UserContext();
+        $user->admin = true;
+
+        $ticket = new Ticket();
+
+        //-- Act
+        $result = $this->userToTicketChecker->isTicketWritableToUser($user, $ticket, false, $this->heskSettings);
+
+        //-- Assert
+        self::assertThat($result, self::isTrue());
+    }
+
+    function testItReturnsTrueWhenTheUserHasAccessToTheCategory() {
+        //-- Arrange
+        $user = new UserContext();
+        $user->admin = false;
+        $user->categories = array(1);
+        $user->permissions = array(UserPrivilege::CAN_VIEW_TICKETS);
+
+        $ticket = new Ticket();
+        $ticket->categoryId = 1;
+
+        //-- Act
+        $result = $this->userToTicketChecker->isTicketWritableToUser($user, $ticket, false, $this->heskSettings);
+
+        //-- Assert
+        self::assertThat($result, self::isTrue());
+    }
+
+    function testItReturnsFalseWhenTheUserCannotViewTickets() {
+        //-- Arrange
+        $user = new UserContext();
+        $user->admin = false;
+        $user->categories = array(1);
+        $user->permissions = array();
+
+        $ticket = new Ticket();
+        $ticket->categoryId = 1;
+
+        //-- Act
+        $result = $this->userToTicketChecker->isTicketWritableToUser($user, $ticket, false, $this->heskSettings);
+
+        //-- Assert
+        self::assertThat($result, self::isFalse());
+    }
+
+    function testItReturnsFalseWhenTheUserCannotViewAndEditTicketsWhenEditFlagIsTrue() {
+        //-- Arrange
+        $user = new UserContext();
+        $user->admin = false;
+        $user->categories = array(1);
+        $user->permissions = array(UserPrivilege::CAN_VIEW_TICKETS, 'something else');
+
+        $ticket = new Ticket();
+        $ticket->categoryId = 1;
+
+        //-- Act
+        $result = $this->userToTicketChecker->isTicketWritableToUser($user, $ticket, true, $this->heskSettings);
+
+        //-- Assert
+        self::assertThat($result, self::isFalse());
+    }
+
+    //-- TODO Category Manager
+}

From 97a96b5947845dddc1d3b352e0f99913565da91f Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sat, 25 Mar 2017 16:36:47 -0400
Subject: [PATCH 085/192] UserToTicketChecker now checks for category managers

---
 .../Security/UserToTicketChecker.php          | 18 +++++++++--
 api/DataAccess/Security/UserGateway.php       | 31 ++++++++++++++++++-
 .../Security/UserToTicketCheckerTest.php      | 30 ++++++++++++++++--
 3 files changed, 73 insertions(+), 6 deletions(-)

diff --git a/api/BusinessLogic/Security/UserToTicketChecker.php b/api/BusinessLogic/Security/UserToTicketChecker.php
index 3b0c54dc..0c3b27bf 100644
--- a/api/BusinessLogic/Security/UserToTicketChecker.php
+++ b/api/BusinessLogic/Security/UserToTicketChecker.php
@@ -4,8 +4,15 @@ namespace BusinessLogic\Security;
 
 
 use BusinessLogic\Tickets\Ticket;
+use DataAccess\Security\UserGateway;
 
 class UserToTicketChecker {
+    /* @var $userGateway UserGateway */
+    private $userGateway;
+
+    function __construct($userGateway) {
+        $this->userGateway = $userGateway;
+    }
 
     /**
      * @param $user UserContext
@@ -19,8 +26,13 @@ class UserToTicketChecker {
             (in_array($ticket->categoryId, $user->categories) &&
                 in_array(UserPrivilege::CAN_VIEW_TICKETS, $user->permissions));
 
-        return $isEditing
-            ? $hasAccess && in_array(UserPrivilege::CAN_EDIT_TICKETS, $user->permissions)
-            : $hasAccess;
+        if ($isEditing) {
+            $categoryManagerId = $this->userGateway->getManagerForCategory($ticket->categoryId, $heskSettings);
+
+            $hasAccess = $hasAccess &&
+                (in_array(UserPrivilege::CAN_EDIT_TICKETS, $user->permissions) || $categoryManagerId == $user->id);
+        }
+
+        return $hasAccess;
     }
 }
\ No newline at end of file
diff --git a/api/DataAccess/Security/UserGateway.php b/api/DataAccess/Security/UserGateway.php
index 7f15a870..e836f18a 100644
--- a/api/DataAccess/Security/UserGateway.php
+++ b/api/DataAccess/Security/UserGateway.php
@@ -23,6 +23,7 @@ class UserGateway extends CommonDao {
             ) AND `active` = '1'");
 
         if (hesk_dbNumRows($rs) === 0) {
+            $this->close();
             return null;
         }
 
@@ -39,10 +40,15 @@ class UserGateway extends CommonDao {
         $rs = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "users` WHERE `id` = " . intval($id));
 
         if (hesk_dbNumRows($rs) === 0) {
+            $this->close();
             return null;
         }
 
-        return UserContext::fromDataRow(hesk_dbFetchAssoc($rs));
+        $user = UserContext::fromDataRow(hesk_dbFetchAssoc($rs));
+
+        $this->close();
+
+        return $user;
     }
 
     /**
@@ -89,6 +95,29 @@ class UserGateway extends CommonDao {
             $users[] = UserContext::fromDataRow($row);
         }
 
+        $this->close();
+
         return $users;
     }
+
+    function getManagerForCategory($categoryId, $heskSettings) {
+        $this->init();
+
+        $rs = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "users` 
+            WHERE `id` = (
+                SELECT `manager` 
+                FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "categories`
+                WHERE `id` = " . intval($categoryId) . ")");
+
+        if (hesk_dbNumRows($rs) === 0) {
+            $this->close();
+            return null;
+        }
+
+        $user = UserContext::fromDataRow(hesk_dbFetchAssoc($rs));
+
+        $this->close();
+
+        return $user;
+    }
 }
\ No newline at end of file
diff --git a/api/Tests/BusinessLogic/Security/UserToTicketCheckerTest.php b/api/Tests/BusinessLogic/Security/UserToTicketCheckerTest.php
index 0a1eae4d..9304fa7a 100644
--- a/api/Tests/BusinessLogic/Security/UserToTicketCheckerTest.php
+++ b/api/Tests/BusinessLogic/Security/UserToTicketCheckerTest.php
@@ -5,6 +5,7 @@ namespace BusinessLogic\Security;
 
 
 use BusinessLogic\Tickets\Ticket;
+use DataAccess\Security\UserGateway;
 use PHPUnit\Framework\TestCase;
 
 class UserToTicketCheckerTest extends TestCase {
@@ -12,17 +13,22 @@ class UserToTicketCheckerTest extends TestCase {
     /* @var $userToTicketChecker UserToTicketChecker */
     private $userToTicketChecker;
 
+    /* @var $userGateway \PHPUnit_Framework_MockObject_MockObject */
+    private $userGateway;
+
     /* @var $heskSettings array */
     private $heskSettings;
 
     protected function setUp() {
-        $this->userToTicketChecker = new UserToTicketChecker();
+        $this->userGateway = $this->createMock(UserGateway::class);
+        $this->userToTicketChecker = new UserToTicketChecker($this->userGateway);
     }
 
     function testItReturnsTrueWhenTheUserIsAnAdmin() {
         //-- Arrange
         $user = new UserContext();
         $user->admin = true;
+        $user->id = 99;
 
         $ticket = new Ticket();
 
@@ -39,6 +45,7 @@ class UserToTicketCheckerTest extends TestCase {
         $user->admin = false;
         $user->categories = array(1);
         $user->permissions = array(UserPrivilege::CAN_VIEW_TICKETS);
+        $user->id = 99;
 
         $ticket = new Ticket();
         $ticket->categoryId = 1;
@@ -56,6 +63,7 @@ class UserToTicketCheckerTest extends TestCase {
         $user->admin = false;
         $user->categories = array(1);
         $user->permissions = array();
+        $user->id = 99;
 
         $ticket = new Ticket();
         $ticket->categoryId = 1;
@@ -73,6 +81,7 @@ class UserToTicketCheckerTest extends TestCase {
         $user->admin = false;
         $user->categories = array(1);
         $user->permissions = array(UserPrivilege::CAN_VIEW_TICKETS, 'something else');
+        $user->id = 99;
 
         $ticket = new Ticket();
         $ticket->categoryId = 1;
@@ -84,5 +93,22 @@ class UserToTicketCheckerTest extends TestCase {
         self::assertThat($result, self::isFalse());
     }
 
-    //-- TODO Category Manager
+    function testItReturnsTrueWhenTheUserDoesNotHaveEditPermissionsButIsTheCategoryManager() {
+        //-- Arrange
+        $user = new UserContext();
+        $user->admin = false;
+        $user->categories = array(1);
+        $user->permissions = array(UserPrivilege::CAN_VIEW_TICKETS, 'something else');
+        $user->id = 1;
+        $this->userGateway->method('getManagerForCategory')->willReturn(1);
+
+        $ticket = new Ticket();
+        $ticket->categoryId = 1;
+
+        //-- Act
+        $result = $this->userToTicketChecker->isTicketWritableToUser($user, $ticket, true, $this->heskSettings);
+
+        //-- Assert
+        self::assertThat($result, self::isTrue());
+    }
 }

From 3cec244e1546a73ff3e381b13b1631e060b81590 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Tue, 4 Apr 2017 22:57:21 -0400
Subject: [PATCH 086/192] Getting started on attachment retrieval

---
 .../Attachments/AttachmentRetriever.php       | 24 ++++++++++++++
 .../StaffTicketAttachmentsController.php      | 14 +++++++--
 .../Attachments/AttachmentGateway.php         | 26 ++++++++++++++++
 api/DataAccess/Files/FileReader.php           | 25 +++++++++++++++
 .../Attachments/AttachmentRetrieverTest.php   | 31 +++++++++++++++++++
 api/index.php                                 |  1 +
 6 files changed, 119 insertions(+), 2 deletions(-)
 create mode 100644 api/BusinessLogic/Attachments/AttachmentRetriever.php
 create mode 100644 api/DataAccess/Files/FileReader.php
 create mode 100644 api/Tests/BusinessLogic/Attachments/AttachmentRetrieverTest.php

diff --git a/api/BusinessLogic/Attachments/AttachmentRetriever.php b/api/BusinessLogic/Attachments/AttachmentRetriever.php
new file mode 100644
index 00000000..bf905018
--- /dev/null
+++ b/api/BusinessLogic/Attachments/AttachmentRetriever.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace BusinessLogic\Attachments;
+
+
+use DataAccess\Attachments\AttachmentGateway;
+use DataAccess\Files\FileReader;
+
+class AttachmentRetriever {
+    /* @var $attachmentGateway AttachmentGateway */
+    private $attachmentGateway;
+
+    /* @var $fileReader FileReader */
+    private $fileReader;
+
+    function __construct($attachmentGateway, $fileReader) {
+        $this->attachmentGateway = $attachmentGateway;
+        $this->fileReader = $fileReader;
+    }
+
+    function getAttachmentContentsForTicket($id, $heskSettings) {
+
+    }
+}
\ No newline at end of file
diff --git a/api/Controllers/Attachments/StaffTicketAttachmentsController.php b/api/Controllers/Attachments/StaffTicketAttachmentsController.php
index 9c054e79..47f265ed 100644
--- a/api/Controllers/Attachments/StaffTicketAttachmentsController.php
+++ b/api/Controllers/Attachments/StaffTicketAttachmentsController.php
@@ -10,12 +10,22 @@ use BusinessLogic\Helpers;
 use Controllers\JsonRetriever;
 
 class StaffTicketAttachmentsController {
-    function post($ticketId) {
+    function get($attachmentId) {
         global $hesk_settings, $applicationContext;
 
-        if (!$hesk_settings['attachments']['use']) {
+        $this->verifyAttachmentsAreEnabled($hesk_settings);
+    }
+
+    private function verifyAttachmentsAreEnabled($heskSettings) {
+        if (!$heskSettings['attachments']['use']) {
             throw new ApiFriendlyException('Attachments are disabled on this server', 'Attachments Disabled', 404);
         }
+    }
+
+    function post($ticketId) {
+        global $hesk_settings, $applicationContext;
+
+        $this->verifyAttachmentsAreEnabled($hesk_settings);
 
         /* @var $attachmentHandler AttachmentHandler */
         $attachmentHandler = $applicationContext->get[AttachmentHandler::class];
diff --git a/api/DataAccess/Attachments/AttachmentGateway.php b/api/DataAccess/Attachments/AttachmentGateway.php
index 70931e3e..ac7403fe 100644
--- a/api/DataAccess/Attachments/AttachmentGateway.php
+++ b/api/DataAccess/Attachments/AttachmentGateway.php
@@ -3,6 +3,7 @@
 namespace DataAccess\Attachments;
 
 
+use BusinessLogic\Attachments\Attachment;
 use BusinessLogic\Attachments\TicketAttachment;
 use DataAccess\CommonDao;
 
@@ -27,4 +28,29 @@ class AttachmentGateway extends CommonDao {
 
         return $attachmentId;
     }
+
+    function getAttachmentById($id, $heskSettings) {
+        $this->init();
+
+        $rs = hesk_dbQuery("SELECT * 
+          FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "attachments` 
+          WHERE `att_id` = " . intval($id));
+
+        if (hesk_dbNumRows($rs) === 0) {
+            return null;
+        }
+
+        $row = hesk_dbFetchAssoc($rs);
+
+        $attachment = new Attachment();
+        $attachment->id = $row['att_id'];
+        $attachment->savedName = $row['saved_name'];
+        $attachment->displayName = $row['real_name'];
+        $attachment->downloadCount = $row['download_count'];
+        $attachment->fileSize = $row['size'];
+
+        $this->close();
+
+        return $attachment;
+    }
 }
\ No newline at end of file
diff --git a/api/DataAccess/Files/FileReader.php b/api/DataAccess/Files/FileReader.php
new file mode 100644
index 00000000..e30f810c
--- /dev/null
+++ b/api/DataAccess/Files/FileReader.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace DataAccess\Files;
+
+
+class FileReader {
+    /**
+     * @param $name string - The file name (including extension)
+     * @param $folder - The folder name (relative to the ROOT of the helpdesk)
+     * @param $contents string - The contents of the file to write
+     * @return int The file size, in bytes
+     * @throws \Exception When the file fails to save
+     */
+    function readFromFile($name, $folder, $contents) {
+        // __DIR__ === '/{ROOT}/api/DataAccess/Files
+        $location = __DIR__ . "/../../../{$folder}/{$name}";
+        $fileContents = file_get_contents($location);
+
+        if ($fileContents === false) {
+            throw new \Exception("Failed to read the file!");
+        }
+
+        return $fileContents;
+    }
+}
\ No newline at end of file
diff --git a/api/Tests/BusinessLogic/Attachments/AttachmentRetrieverTest.php b/api/Tests/BusinessLogic/Attachments/AttachmentRetrieverTest.php
new file mode 100644
index 00000000..3c74198a
--- /dev/null
+++ b/api/Tests/BusinessLogic/Attachments/AttachmentRetrieverTest.php
@@ -0,0 +1,31 @@
+<?php
+
+
+namespace BusinessLogic\Attachments;
+
+
+use DataAccess\Attachments\AttachmentGateway;
+use DataAccess\Files\FileReader;
+use PHPUnit\Framework\TestCase;
+
+class AttachmentRetrieverTest extends TestCase {
+    /* @var $attachmentGateway \PHPUnit_Framework_MockObject_MockObject */
+    private $attachmentGateway;
+
+    /* @var $fileReader \PHPUnit_Framework_MockObject_MockObject */
+    private $fileReader;
+
+    /* @var $attachmentRetriever AttachmentRetriever */
+    private $attachmentRetriever;
+
+    protected function setUp() {
+        $this->attachmentGateway = $this->createMock(AttachmentGateway::class);
+        $this->fileReader = $this->createMock(FileReader::class);
+
+        $this->attachmentRetriever = new AttachmentRetriever($this->attachmentGateway, $this->fileReader);
+    }
+
+    function testItGetsTheAttachmentFromTheFilesystem() {
+
+    }
+}
diff --git a/api/index.php b/api/index.php
index 1dea517d..b4c1ef29 100644
--- a/api/index.php
+++ b/api/index.php
@@ -155,6 +155,7 @@ Link::all(array(
 
     // Attachments
     '/v1/staff/tickets/{i}/attachments' => \Controllers\Attachments\StaffTicketAttachmentsController::class,
+    '/v1/staff/attachments/{i}' => \Controllers\Attachments\StaffTicketAttachmentsController::class,
 
     // Any URL that doesn't match goes to the 404 handler
     '404' => 'handle404'

From c58867577f937c89badd35a4ebe6e7ec781ea8c5 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Wed, 5 Apr 2017 21:56:13 -0400
Subject: [PATCH 087/192] Attachments should be retrievable

---
 .../Attachments/AttachmentRetriever.php       |  4 ++++
 api/DataAccess/Files/FileReader.php           |  5 ++--
 .../Attachments/AttachmentRetrieverTest.php   | 24 +++++++++++++++++--
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/api/BusinessLogic/Attachments/AttachmentRetriever.php b/api/BusinessLogic/Attachments/AttachmentRetriever.php
index bf905018..00961d7f 100644
--- a/api/BusinessLogic/Attachments/AttachmentRetriever.php
+++ b/api/BusinessLogic/Attachments/AttachmentRetriever.php
@@ -19,6 +19,10 @@ class AttachmentRetriever {
     }
 
     function getAttachmentContentsForTicket($id, $heskSettings) {
+        $attachment = $this->attachmentGateway->getAttachmentById($id, $heskSettings);
+        $contents = base64_encode($this->fileReader->readFromFile(
+            $attachment->savedName, $heskSettings['attach_dir']));
 
+        return $contents;
     }
 }
\ No newline at end of file
diff --git a/api/DataAccess/Files/FileReader.php b/api/DataAccess/Files/FileReader.php
index e30f810c..296c966d 100644
--- a/api/DataAccess/Files/FileReader.php
+++ b/api/DataAccess/Files/FileReader.php
@@ -7,11 +7,10 @@ class FileReader {
     /**
      * @param $name string - The file name (including extension)
      * @param $folder - The folder name (relative to the ROOT of the helpdesk)
-     * @param $contents string - The contents of the file to write
-     * @return int The file size, in bytes
+     * @returns string - The contents of the file to write
      * @throws \Exception When the file fails to save
      */
-    function readFromFile($name, $folder, $contents) {
+    function readFromFile($name, $folder) {
         // __DIR__ === '/{ROOT}/api/DataAccess/Files
         $location = __DIR__ . "/../../../{$folder}/{$name}";
         $fileContents = file_get_contents($location);
diff --git a/api/Tests/BusinessLogic/Attachments/AttachmentRetrieverTest.php b/api/Tests/BusinessLogic/Attachments/AttachmentRetrieverTest.php
index 3c74198a..4790262c 100644
--- a/api/Tests/BusinessLogic/Attachments/AttachmentRetrieverTest.php
+++ b/api/Tests/BusinessLogic/Attachments/AttachmentRetrieverTest.php
@@ -18,14 +18,34 @@ class AttachmentRetrieverTest extends TestCase {
     /* @var $attachmentRetriever AttachmentRetriever */
     private $attachmentRetriever;
 
+    /* @var $heskSettings array */
+    private $heskSettings;
+
     protected function setUp() {
         $this->attachmentGateway = $this->createMock(AttachmentGateway::class);
         $this->fileReader = $this->createMock(FileReader::class);
+        $this->heskSettings = array('attach_dir' => 'attachments');
 
         $this->attachmentRetriever = new AttachmentRetriever($this->attachmentGateway, $this->fileReader);
     }
 
-    function testItGetsTheAttachmentFromTheFilesystem() {
-
+    function testItGetsTheMetadataFromTheGateway() {
+        //-- Arrange
+        $attachmentMeta = new Attachment();
+        $attachmentMeta->savedName = '5';
+        $attachmentContents = 'string';
+        $expectedContents = base64_encode($attachmentContents);
+        $this->attachmentGateway->method('getAttachmentById')
+            ->with(4, $this->heskSettings)
+            ->willReturn($attachmentMeta);
+        $this->fileReader->method('readFromFile')
+            ->with('5', $this->heskSettings['attach_dir'])
+            ->willReturn($attachmentContents);
+
+        //-- Act
+        $actualContents = $this->attachmentRetriever->getAttachmentContentsForTicket(4, $this->heskSettings);
+
+        //-- Assert
+        self::assertThat($actualContents, self::equalTo($expectedContents));
     }
 }

From e54d5278ac2e0ae25533f8f0d98e93ffaaad6318 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Wed, 5 Apr 2017 22:13:37 -0400
Subject: [PATCH 088/192] More work, forgot to include security when creating
 attachment

---
 api/ApplicationContext.php                    |  2 +
 .../Attachments/AttachmentHandler.php         | 17 +++++++-
 .../Attachments/CreateAttachmentModel.php     |  3 ++
 .../StaffTicketAttachmentsController.php      |  3 +-
 .../Attachments/AttachmentHandlerTest.php     | 40 +++++++++++++------
 5 files changed, 50 insertions(+), 15 deletions(-)

diff --git a/api/ApplicationContext.php b/api/ApplicationContext.php
index 5ec0939f..a9107a74 100644
--- a/api/ApplicationContext.php
+++ b/api/ApplicationContext.php
@@ -10,6 +10,7 @@ use BusinessLogic\Emails\EmailTemplateRetriever;
 use BusinessLogic\Emails\MailgunEmailSender;
 use BusinessLogic\Security\BanRetriever;
 use BusinessLogic\Security\UserContextBuilder;
+use BusinessLogic\Security\UserToTicketChecker;
 use BusinessLogic\Settings\ApiChecker;
 use BusinessLogic\Tickets\Autoassigner;
 use BusinessLogic\Tickets\TicketRetriever;
@@ -96,6 +97,7 @@ class ApplicationContext {
             $this->get[ModsForHeskSettingsGateway::class]);
 
         // Attachments
+        $this->get[UserToTicketChecker::class] = new UserToTicketChecker($this->get[UserGateway::class]);
         $this->get[FileWriter::class] = new FileWriter();
         $this->get[AttachmentGateway::class] = new AttachmentGateway();
         $this->get[AttachmentHandler::class] = new AttachmentHandler($this->get[TicketGateway::class],
diff --git a/api/BusinessLogic/Attachments/AttachmentHandler.php b/api/BusinessLogic/Attachments/AttachmentHandler.php
index a05291d4..f11d98f6 100644
--- a/api/BusinessLogic/Attachments/AttachmentHandler.php
+++ b/api/BusinessLogic/Attachments/AttachmentHandler.php
@@ -4,6 +4,8 @@ namespace BusinessLogic\Attachments;
 
 
 use BusinessLogic\Exceptions\ValidationException;
+use BusinessLogic\Security\UserContext;
+use BusinessLogic\Security\UserToTicketChecker;
 use BusinessLogic\Tickets\Attachment;
 use BusinessLogic\Tickets\Ticket;
 use BusinessLogic\ValidationModel;
@@ -21,24 +23,35 @@ class AttachmentHandler {
     /* @var $fileWriter FileWriter */
     private $fileWriter;
 
-    function __construct($ticketGateway, $attachmentGateway, $fileWriter) {
+    /* @var  $userToTicketChecker UserToTicketChecker */
+    private $userToTicketChecker;
+
+    function __construct($ticketGateway, $attachmentGateway, $fileWriter, $userToTicketChecker) {
         $this->ticketGateway = $ticketGateway;
         $this->attachmentGateway = $attachmentGateway;
         $this->fileWriter = $fileWriter;
+        $this->userToTicketChecker = $userToTicketChecker;
     }
 
 
     /**
      * @param $createAttachmentModel CreateAttachmentForTicketModel
+     * @param $userContext UserContext
      * @param $heskSettings array
      * @return TicketAttachment the newly created attachment
+     * @throws \Exception
      */
-    function createAttachmentForTicket($createAttachmentModel, $heskSettings) {
+    function createAttachmentForTicket($createAttachmentModel, $userContext, $heskSettings) {
         $this->validate($createAttachmentModel, $heskSettings);
 
         $decodedAttachment = base64_decode($createAttachmentModel->attachmentContents);
 
         $ticket = $this->ticketGateway->getTicketById($createAttachmentModel->ticketId, $heskSettings);
+
+        if (!$this->userToTicketChecker->isTicketWritableToUser($userContext, $ticket, $createAttachmentModel->isEditing, $heskSettings)) {
+            throw new \Exception("User does not have access to ticket {$ticket->id} being created / edited!");
+        }
+
         $cleanedFileName = $this->cleanFileName($createAttachmentModel->displayName);
         $fileParts = pathinfo($cleanedFileName);
 
diff --git a/api/BusinessLogic/Attachments/CreateAttachmentModel.php b/api/BusinessLogic/Attachments/CreateAttachmentModel.php
index 9a5f5428..14179a44 100644
--- a/api/BusinessLogic/Attachments/CreateAttachmentModel.php
+++ b/api/BusinessLogic/Attachments/CreateAttachmentModel.php
@@ -15,4 +15,7 @@ class CreateAttachmentModel {
 
     /* @var $attachmentContents string */
     public $attachmentContents;
+
+    /* @var $isEditing bool */
+    public $isEditing;
 }
\ No newline at end of file
diff --git a/api/Controllers/Attachments/StaffTicketAttachmentsController.php b/api/Controllers/Attachments/StaffTicketAttachmentsController.php
index 47f265ed..caa8b8ed 100644
--- a/api/Controllers/Attachments/StaffTicketAttachmentsController.php
+++ b/api/Controllers/Attachments/StaffTicketAttachmentsController.php
@@ -7,6 +7,7 @@ use BusinessLogic\Attachments\AttachmentHandler;
 use BusinessLogic\Attachments\CreateAttachmentForTicketModel;
 use BusinessLogic\Exceptions\ApiFriendlyException;
 use BusinessLogic\Helpers;
+use BusinessLogic\Security\UserToTicketChecker;
 use Controllers\JsonRetriever;
 
 class StaffTicketAttachmentsController {
@@ -23,7 +24,7 @@ class StaffTicketAttachmentsController {
     }
 
     function post($ticketId) {
-        global $hesk_settings, $applicationContext;
+        global $hesk_settings, $applicationContext, $userContext;
 
         $this->verifyAttachmentsAreEnabled($hesk_settings);
 
diff --git a/api/Tests/BusinessLogic/Attachments/AttachmentHandlerTest.php b/api/Tests/BusinessLogic/Attachments/AttachmentHandlerTest.php
index a67bd7e6..f29940b6 100644
--- a/api/Tests/BusinessLogic/Attachments/AttachmentHandlerTest.php
+++ b/api/Tests/BusinessLogic/Attachments/AttachmentHandlerTest.php
@@ -5,6 +5,8 @@ namespace BusinessLogic\Attachments;
 
 
 use BusinessLogic\Exceptions\ValidationException;
+use BusinessLogic\Security\UserContext;
+use BusinessLogic\Security\UserToTicketChecker;
 use BusinessLogic\Tickets\Ticket;
 use DataAccess\Attachments\AttachmentGateway;
 use DataAccess\Files\FileWriter;
@@ -25,9 +27,15 @@ class AttachmentHandlerTest extends TestCase {
     /* @var $attachmentGateway \PHPUnit_Framework_MockObject_MockObject */
     private $attachmentGateway;
 
+    /* @var $userToTicketChecker \PHPUnit_Framework_MockObject_MockObject */
+    private $userToTicketChecker;
+
     /* @var $fileWriter \PHPUnit_Framework_MockObject_MockObject */
     private $fileWriter;
 
+    /* @var $userContext UserContext */
+    private $userContext;
+
     /* @var $heskSettings array */
     private $heskSettings;
 
@@ -35,6 +43,8 @@ class AttachmentHandlerTest extends TestCase {
         $this->ticketGateway = $this->createMock(TicketGateway::class);
         $this->attachmentGateway = $this->createMock(AttachmentGateway::class);
         $this->fileWriter = $this->createMock(FileWriter::class);
+        $this->userToTicketChecker = $this->createMock(UserToTicketChecker::class);
+        $this->userToTicketChecker->method('isTicketWritableToUser')->willReturn(true);
         $this->heskSettings = array(
             'attach_dir' => 'attachments',
             'attachments' => array(
@@ -43,12 +53,16 @@ class AttachmentHandlerTest extends TestCase {
             )
         );
 
-        $this->attachmentHandler = new AttachmentHandler($this->ticketGateway, $this->attachmentGateway, $this->fileWriter);
+        $this->attachmentHandler = new AttachmentHandler($this->ticketGateway,
+            $this->attachmentGateway,
+            $this->fileWriter,
+            $this->userToTicketChecker);
         $this->createAttachmentForTicketModel = new CreateAttachmentForTicketModel();
         $this->createAttachmentForTicketModel->attachmentContents = base64_encode('string');
         $this->createAttachmentForTicketModel->displayName = 'DisplayName.txt';
         $this->createAttachmentForTicketModel->ticketId = 1;
         $this->createAttachmentForTicketModel->type = AttachmentType::MESSAGE;
+        $this->userContext = new UserContext();
     }
 
     function testThatValidateThrowsAnExceptionWhenTheAttachmentBodyIsNull() {
@@ -60,7 +74,7 @@ class AttachmentHandlerTest extends TestCase {
         $this->expectExceptionMessageRegExp('/CONTENTS_EMPTY/');
 
         //-- Act
-        $this->attachmentHandler->createAttachmentForTicket($this->createAttachmentForTicketModel, $this->heskSettings);
+        $this->attachmentHandler->createAttachmentForTicket($this->createAttachmentForTicketModel, $this->userContext, $this->heskSettings);
     }
 
     function testThatValidateThrowsAnExceptionWhenTheAttachmentBodyIsEmpty() {
@@ -72,7 +86,7 @@ class AttachmentHandlerTest extends TestCase {
         $this->expectExceptionMessageRegExp('/CONTENTS_EMPTY/');
 
         //-- Act
-        $this->attachmentHandler->createAttachmentForTicket($this->createAttachmentForTicketModel, $this->heskSettings);
+        $this->attachmentHandler->createAttachmentForTicket($this->createAttachmentForTicketModel, $this->userContext, $this->heskSettings);
     }
 
     function testThatValidateThrowsAnExceptionWhenTheAttachmentBodyIsInvalidBase64() {
@@ -84,7 +98,7 @@ class AttachmentHandlerTest extends TestCase {
         $this->expectExceptionMessageRegExp('/CONTENTS_NOT_BASE_64/');
 
         //-- Act
-        $this->attachmentHandler->createAttachmentForTicket($this->createAttachmentForTicketModel, $this->heskSettings);
+        $this->attachmentHandler->createAttachmentForTicket($this->createAttachmentForTicketModel, $this->userContext, $this->heskSettings);
     }
 
     function testThatValidateThrowsAnExceptionWhenTheDisplayNameIsNull() {
@@ -96,7 +110,7 @@ class AttachmentHandlerTest extends TestCase {
         $this->expectExceptionMessageRegExp('/DISPLAY_NAME_EMPTY/');
 
         //-- Act
-        $this->attachmentHandler->createAttachmentForTicket($this->createAttachmentForTicketModel, $this->heskSettings);
+        $this->attachmentHandler->createAttachmentForTicket($this->createAttachmentForTicketModel, $this->userContext, $this->heskSettings);
     }
 
     function testThatValidateThrowsAnExceptionWhenTheDisplayNameIsEmpty() {
@@ -108,7 +122,7 @@ class AttachmentHandlerTest extends TestCase {
         $this->expectExceptionMessageRegExp('/DISPLAY_NAME_EMPTY/');
 
         //-- Act
-        $this->attachmentHandler->createAttachmentForTicket($this->createAttachmentForTicketModel, $this->heskSettings);
+        $this->attachmentHandler->createAttachmentForTicket($this->createAttachmentForTicketModel, $this->userContext, $this->heskSettings);
     }
 
     function testThatValidateThrowsAnExceptionWhenTheTicketIdIsNull() {
@@ -120,7 +134,7 @@ class AttachmentHandlerTest extends TestCase {
         $this->expectExceptionMessageRegExp('/TICKET_ID_MISSING/');
 
         //-- Act
-        $this->attachmentHandler->createAttachmentForTicket($this->createAttachmentForTicketModel, $this->heskSettings);
+        $this->attachmentHandler->createAttachmentForTicket($this->createAttachmentForTicketModel, $this->userContext, $this->heskSettings);
     }
 
     function testThatValidateThrowsAnExceptionWhenTheTicketIdIsANonPositiveInteger() {
@@ -132,7 +146,7 @@ class AttachmentHandlerTest extends TestCase {
         $this->expectExceptionMessageRegExp('/TICKET_ID_MISSING/');
 
         //-- Act
-        $this->attachmentHandler->createAttachmentForTicket($this->createAttachmentForTicketModel, $this->heskSettings);
+        $this->attachmentHandler->createAttachmentForTicket($this->createAttachmentForTicketModel, $this->userContext, $this->heskSettings);
     }
 
     function testThatValidateThrowsAnExceptionWhenTheFileExtensionIsNotPermitted() {
@@ -145,7 +159,7 @@ class AttachmentHandlerTest extends TestCase {
         $this->expectExceptionMessageRegExp('/EXTENSION_NOT_PERMITTED/');
 
         //-- Act
-        $this->attachmentHandler->createAttachmentForTicket($this->createAttachmentForTicketModel, $this->heskSettings);
+        $this->attachmentHandler->createAttachmentForTicket($this->createAttachmentForTicketModel, $this->userContext, $this->heskSettings);
     }
 
     function testThatValidateThrowsAnExceptionWhenTheFileSizeIsLargerThanMaxPermitted() {
@@ -158,7 +172,7 @@ class AttachmentHandlerTest extends TestCase {
         $this->expectExceptionMessageRegExp('/FILE_SIZE_TOO_LARGE/');
 
         //-- Act
-        $this->attachmentHandler->createAttachmentForTicket($this->createAttachmentForTicketModel, $this->heskSettings);
+        $this->attachmentHandler->createAttachmentForTicket($this->createAttachmentForTicketModel, $this->userContext, $this->heskSettings);
     }
 
     function testItSavesATicketWithTheProperProperties() {
@@ -179,7 +193,7 @@ class AttachmentHandlerTest extends TestCase {
 
 
         //-- Act
-        $actual = $this->attachmentHandler->createAttachmentForTicket($this->createAttachmentForTicketModel, $this->heskSettings);
+        $actual = $this->attachmentHandler->createAttachmentForTicket($this->createAttachmentForTicketModel, $this->userContext, $this->heskSettings);
 
         //-- Assert
         self::assertThat($actual->id, self::equalTo(50));
@@ -208,9 +222,11 @@ class AttachmentHandlerTest extends TestCase {
 
 
         //-- Act
-        $actual = $this->attachmentHandler->createAttachmentForTicket($this->createAttachmentForTicketModel, $this->heskSettings);
+        $actual = $this->attachmentHandler->createAttachmentForTicket($this->createAttachmentForTicketModel, $this->userContext, $this->heskSettings);
 
         //-- Assert
         self::assertThat($actual->fileSize, self::equalTo(1024));
     }
+
+    //-- TODO Test UserToTicketChecker
 }

From d461059cf06da8bdb2064be7d5f296512f18e580 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sun, 9 Apr 2017 22:14:13 -0400
Subject: [PATCH 089/192] Wrapped up retrieving ticket attachments

---
 api/ApplicationContext.php                    | 10 ++++++++-
 .../Attachments/AttachmentRetriever.php       | 22 ++++++++++++++++---
 .../StaffTicketAttachmentsController.php      | 13 ++++++++---
 .../Attachments/AttachmentRetrieverTest.php   | 18 +++++++++++++--
 api/index.php                                 |  2 +-
 5 files changed, 55 insertions(+), 10 deletions(-)

diff --git a/api/ApplicationContext.php b/api/ApplicationContext.php
index a9107a74..a170a5ec 100644
--- a/api/ApplicationContext.php
+++ b/api/ApplicationContext.php
@@ -2,6 +2,7 @@
 
 // Responsible for loading in all necessary classes. AKA a poor man's DI solution.
 use BusinessLogic\Attachments\AttachmentHandler;
+use BusinessLogic\Attachments\AttachmentRetriever;
 use BusinessLogic\Categories\CategoryRetriever;
 use BusinessLogic\Emails\BasicEmailSender;
 use BusinessLogic\Emails\EmailSenderHelper;
@@ -21,6 +22,7 @@ use BusinessLogic\Tickets\TrackingIdGenerator;
 use BusinessLogic\Tickets\VerifiedEmailChecker;
 use DataAccess\Attachments\AttachmentGateway;
 use DataAccess\Categories\CategoryGateway;
+use DataAccess\Files\FileReader;
 use DataAccess\Files\FileWriter;
 use DataAccess\Logging\LoggingGateway;
 use DataAccess\Security\BanGateway;
@@ -99,9 +101,15 @@ class ApplicationContext {
         // Attachments
         $this->get[UserToTicketChecker::class] = new UserToTicketChecker($this->get[UserGateway::class]);
         $this->get[FileWriter::class] = new FileWriter();
+        $this->get[FileReader::class] = new FileReader();
         $this->get[AttachmentGateway::class] = new AttachmentGateway();
         $this->get[AttachmentHandler::class] = new AttachmentHandler($this->get[TicketGateway::class],
             $this->get[AttachmentGateway::class],
-            $this->get[FileWriter::class]);
+            $this->get[FileWriter::class],
+            $this->get[UserToTicketChecker::class]);
+        $this->get[AttachmentRetriever::class] = new AttachmentRetriever($this->get[AttachmentGateway::class],
+            $this->get[FileReader::class],
+            $this->get[TicketGateway::class],
+            $this->get[UserToTicketChecker::class]);
     }
 }
\ No newline at end of file
diff --git a/api/BusinessLogic/Attachments/AttachmentRetriever.php b/api/BusinessLogic/Attachments/AttachmentRetriever.php
index 00961d7f..c4889206 100644
--- a/api/BusinessLogic/Attachments/AttachmentRetriever.php
+++ b/api/BusinessLogic/Attachments/AttachmentRetriever.php
@@ -3,8 +3,10 @@
 namespace BusinessLogic\Attachments;
 
 
+use BusinessLogic\Security\UserToTicketChecker;
 use DataAccess\Attachments\AttachmentGateway;
 use DataAccess\Files\FileReader;
+use DataAccess\Tickets\TicketGateway;
 
 class AttachmentRetriever {
     /* @var $attachmentGateway AttachmentGateway */
@@ -13,13 +15,27 @@ class AttachmentRetriever {
     /* @var $fileReader FileReader */
     private $fileReader;
 
-    function __construct($attachmentGateway, $fileReader) {
+    /* @var $ticketGateway TicketGateway */
+    private $ticketGateway;
+
+    /* @var $userToTicketChecker UserToTicketChecker */
+    private $userToTicketChecker;
+
+    function __construct($attachmentGateway, $fileReader, $ticketGateway, $userToTicketChecker) {
         $this->attachmentGateway = $attachmentGateway;
         $this->fileReader = $fileReader;
+        $this->ticketGateway = $ticketGateway;
+        $this->userToTicketChecker = $userToTicketChecker;
     }
 
-    function getAttachmentContentsForTicket($id, $heskSettings) {
-        $attachment = $this->attachmentGateway->getAttachmentById($id, $heskSettings);
+    function getAttachmentContentsForTicket($ticketId, $attachmentId, $userContext, $heskSettings) {
+        $ticket = $this->ticketGateway->getTicketById($ticketId, $heskSettings);
+
+        if (!$this->userToTicketChecker->isTicketWritableToUser($userContext, $ticket, false, $heskSettings)) {
+            throw new \Exception("User does not have access to attachment {$attachmentId}!");
+        }
+
+        $attachment = $this->attachmentGateway->getAttachmentById($attachmentId, $heskSettings);
         $contents = base64_encode($this->fileReader->readFromFile(
             $attachment->savedName, $heskSettings['attach_dir']));
 
diff --git a/api/Controllers/Attachments/StaffTicketAttachmentsController.php b/api/Controllers/Attachments/StaffTicketAttachmentsController.php
index caa8b8ed..d06ddb75 100644
--- a/api/Controllers/Attachments/StaffTicketAttachmentsController.php
+++ b/api/Controllers/Attachments/StaffTicketAttachmentsController.php
@@ -4,6 +4,7 @@ namespace Controllers\Attachments;
 
 
 use BusinessLogic\Attachments\AttachmentHandler;
+use BusinessLogic\Attachments\AttachmentRetriever;
 use BusinessLogic\Attachments\CreateAttachmentForTicketModel;
 use BusinessLogic\Exceptions\ApiFriendlyException;
 use BusinessLogic\Helpers;
@@ -11,10 +12,15 @@ use BusinessLogic\Security\UserToTicketChecker;
 use Controllers\JsonRetriever;
 
 class StaffTicketAttachmentsController {
-    function get($attachmentId) {
-        global $hesk_settings, $applicationContext;
+    function get($ticketId, $attachmentId) {
+        global $hesk_settings, $applicationContext, $userContext;
 
         $this->verifyAttachmentsAreEnabled($hesk_settings);
+
+        /* @var $attachmentRetriever AttachmentRetriever */
+        $attachmentRetriever = $applicationContext->get[AttachmentRetriever::class];
+
+        $attachmentRetriever->getAttachmentContentsForTicket($ticketId, $attachmentId, $userContext, $hesk_settings);
     }
 
     private function verifyAttachmentsAreEnabled($heskSettings) {
@@ -33,7 +39,8 @@ class StaffTicketAttachmentsController {
 
         $createAttachmentForTicketModel = $this->createModel(JsonRetriever::getJsonData(), $ticketId);
 
-        $createdAttachment = $attachmentHandler->createAttachmentForTicket($createAttachmentForTicketModel, $hesk_settings);
+        $createdAttachment = $attachmentHandler->createAttachmentForTicket(
+            $createAttachmentForTicketModel, $userContext, $hesk_settings);
 
         return output($createdAttachment, 201);
     }
diff --git a/api/Tests/BusinessLogic/Attachments/AttachmentRetrieverTest.php b/api/Tests/BusinessLogic/Attachments/AttachmentRetrieverTest.php
index 4790262c..d1b62e8a 100644
--- a/api/Tests/BusinessLogic/Attachments/AttachmentRetrieverTest.php
+++ b/api/Tests/BusinessLogic/Attachments/AttachmentRetrieverTest.php
@@ -4,8 +4,11 @@
 namespace BusinessLogic\Attachments;
 
 
+use BusinessLogic\Security\UserContext;
+use BusinessLogic\Security\UserToTicketChecker;
 use DataAccess\Attachments\AttachmentGateway;
 use DataAccess\Files\FileReader;
+use DataAccess\Tickets\TicketGateway;
 use PHPUnit\Framework\TestCase;
 
 class AttachmentRetrieverTest extends TestCase {
@@ -15,6 +18,12 @@ class AttachmentRetrieverTest extends TestCase {
     /* @var $fileReader \PHPUnit_Framework_MockObject_MockObject */
     private $fileReader;
 
+    /* @var $ticketGateway \PHPUnit_Framework_MockObject_MockObject */
+    private $ticketGateway;
+
+    /* @var $userToTicketChecker \PHPUnit_Framework_MockObject_MockObject */
+    private $userToTicketChecker;
+
     /* @var $attachmentRetriever AttachmentRetriever */
     private $attachmentRetriever;
 
@@ -24,9 +33,14 @@ class AttachmentRetrieverTest extends TestCase {
     protected function setUp() {
         $this->attachmentGateway = $this->createMock(AttachmentGateway::class);
         $this->fileReader = $this->createMock(FileReader::class);
+        $this->ticketGateway = $this->createMock(TicketGateway::class);
+        $this->userToTicketChecker = $this->createMock(UserToTicketChecker::class);
         $this->heskSettings = array('attach_dir' => 'attachments');
 
-        $this->attachmentRetriever = new AttachmentRetriever($this->attachmentGateway, $this->fileReader);
+        $this->attachmentRetriever = new AttachmentRetriever($this->attachmentGateway, $this->fileReader,
+            $this->ticketGateway, $this->userToTicketChecker);
+
+        $this->userToTicketChecker->method('isTicketWritableToUser')->willReturn(true);
     }
 
     function testItGetsTheMetadataFromTheGateway() {
@@ -43,7 +57,7 @@ class AttachmentRetrieverTest extends TestCase {
             ->willReturn($attachmentContents);
 
         //-- Act
-        $actualContents = $this->attachmentRetriever->getAttachmentContentsForTicket(4, $this->heskSettings);
+        $actualContents = $this->attachmentRetriever->getAttachmentContentsForTicket(0, 4, new UserContext(), $this->heskSettings);
 
         //-- Assert
         self::assertThat($actualContents, self::equalTo($expectedContents));
diff --git a/api/index.php b/api/index.php
index b4c1ef29..1968e797 100644
--- a/api/index.php
+++ b/api/index.php
@@ -155,7 +155,7 @@ Link::all(array(
 
     // Attachments
     '/v1/staff/tickets/{i}/attachments' => \Controllers\Attachments\StaffTicketAttachmentsController::class,
-    '/v1/staff/attachments/{i}' => \Controllers\Attachments\StaffTicketAttachmentsController::class,
+    '/v1/staff/tickets/{i}/attachments/{i}' => \Controllers\Attachments\StaffTicketAttachmentsController::class,
 
     // Any URL that doesn't match goes to the 404 handler
     '404' => 'handle404'

From c606be50ef03217270200519b288bf81942eb7e5 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Tue, 11 Apr 2017 12:39:09 -0400
Subject: [PATCH 090/192] Output attachment contents

---
 .../Attachments/StaffTicketAttachmentsController.php          | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/api/Controllers/Attachments/StaffTicketAttachmentsController.php b/api/Controllers/Attachments/StaffTicketAttachmentsController.php
index d06ddb75..ad63b7c0 100644
--- a/api/Controllers/Attachments/StaffTicketAttachmentsController.php
+++ b/api/Controllers/Attachments/StaffTicketAttachmentsController.php
@@ -20,7 +20,9 @@ class StaffTicketAttachmentsController {
         /* @var $attachmentRetriever AttachmentRetriever */
         $attachmentRetriever = $applicationContext->get[AttachmentRetriever::class];
 
-        $attachmentRetriever->getAttachmentContentsForTicket($ticketId, $attachmentId, $userContext, $hesk_settings);
+        $contents = $attachmentRetriever->getAttachmentContentsForTicket($ticketId, $attachmentId, $userContext, $hesk_settings);
+
+        output(array('contents' => base64_encode($contents)));
     }
 
     private function verifyAttachmentsAreEnabled($heskSettings) {

From f4dbffa7e4b40c3d44f301320432bb66e4fcc018 Mon Sep 17 00:00:00 2001
From: Mike Koch <Mike.Koch@emerson.com>
Date: Mon, 10 Apr 2017 13:04:11 -0400
Subject: [PATCH 091/192] #544 Start updating to HESK 2.7.3

---
 admin/admin_main.php                  |  2 +-
 admin/admin_settings_save.php         |  6 ++
 admin/admin_submit_ticket.php         |  6 +-
 admin/admin_ticket.php                |  2 +-
 admin/banned_emails.php               |  2 +-
 admin/custom_fields.php               | 20 +++---
 admin/edit_post.php                   | 93 +++++++++++++++++++++++++--
 admin/find_tickets.php                | 12 ++--
 admin/index.php                       |  4 +-
 admin/knowledgebase_private.php       |  2 -
 admin/manage_knowledgebase.php        |  9 +++
 admin/password.php                    |  6 +-
 inc/admin_functions.inc.php           |  8 +++
 inc/attachments.inc.php               |  2 +-
 inc/view_attachment_functions.inc.php |  8 +--
 15 files changed, 142 insertions(+), 40 deletions(-)

diff --git a/admin/admin_main.php b/admin/admin_main.php
index 21b752e8..0d6dcefc 100644
--- a/admin/admin_main.php
+++ b/admin/admin_main.php
@@ -116,7 +116,7 @@ else {
         F9ub3RpY2UnXS4nXCcpIj4nLiRoZXNrbGFuZ1snc2gnXS4nPC9hPjwvdGQ+PC90cj48L3RhYmxlPjxwP
         icuJGhlc2tsYW5nWydzdXBwb3J0X3JlbW92ZSddLicuIDxhIGhyZWY9Imh0dHBzOi8vd3d3Lmhlc2suY
         29tL2J1eS5waHAiIHRhcmdldD0iX2JsYW5rIj4nLiRoZXNrbGFuZ1snY2xpY2tfaW5mbyddLic8L2E+P
-        C9wPic7DQp9DQo=', "\112");
+        C9wPjxociAvPic7DQp9DQo=', "\112");
 
     /* Clean unneeded session variables */
     hesk_cleanSessionVars('hide');
diff --git a/admin/admin_settings_save.php b/admin/admin_settings_save.php
index 7454a899..0c3df742 100644
--- a/admin/admin_settings_save.php
+++ b/admin/admin_settings_save.php
@@ -758,6 +758,12 @@ if (!$pop3_OK) {
     $tmp[] = '<span style="color:red; font-weight:bold">' . $hesklang['pop3e'] . ':</span> ' . $pop3_error . '<br /><br /><a href="Javascript:void(0)" onclick="Javascript:hesk_toggleLayerDisplay(\'pop3log\')">' . $hesklang['pop3log'] . '</a><div id="pop3log" style="display:none">&nbsp;<br /><textarea name="log" rows="10" cols="60">' . $pop3_log . '</textarea></div>';
 }
 
+// Clear the cache folder
+hesk_purge_cache('kb');
+hesk_purge_cache('cf');
+hesk_purge_cache('export', 14400);
+hesk_purge_cache('status');
+
 // Show the settings page and display any notices or success
 if (count($tmp)) {
     $errors = implode('<br /><br />', $tmp);
diff --git a/admin/admin_submit_ticket.php b/admin/admin_submit_ticket.php
index 09592bb4..9eb40c3a 100644
--- a/admin/admin_submit_ticket.php
+++ b/admin/admin_submit_ticket.php
@@ -123,9 +123,9 @@ foreach ($hesk_settings['custom_fields'] as $k=>$v) {
             $tmpvar[$k] = hesk_POST($k);
             $_SESSION["as_$k"] = '';
             if (preg_match("/^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$/", $tmpvar[$k])) {
-                $date = strtotime($tmpvar[$k] . ' t00:00:00');
-                $dmin = strlen($v['value']['dmin']) ? strtotime($v['value']['dmin'] . ' t00:00:00') : false;
-                $dmax = strlen($v['value']['dmax']) ? strtotime($v['value']['dmax'] . ' t00:00:00') : false;
+                $date = strtotime($tmpvar[$k] . ' t00:00:00 UTC');
+                $dmin = strlen($v['value']['dmin']) ? strtotime($v['value']['dmin'] . ' t00:00:00 UTC') : false;
+                $dmax = strlen($v['value']['dmax']) ? strtotime($v['value']['dmax'] . ' t00:00:00 UTC') : false;
 
                 $_SESSION["as_$k"] = $tmpvar[$k];
 
diff --git a/admin/admin_ticket.php b/admin/admin_ticket.php
index 71100f3e..c782c81f 100644
--- a/admin/admin_ticket.php
+++ b/admin/admin_ticket.php
@@ -1604,7 +1604,7 @@ function mfh_print_message() {
                 <br> <i class="fa fa-fw fa-globe" data-toggle="tooltip" title="<?php echo $hesklang['ip']; ?>"></i>
                 <?php
                 // Format IP for lookup
-                if ($ticket['ip'] == 'Unknown' || $ticket['ip'] == $hesklang['unknown']) {
+                if ($ticket['ip'] == '' || $ticket['ip'] == 'Unknown' || $ticket['ip'] == $hesklang['unknown']) {
                     echo $hesklang['unknown'];
                 } else {
                     echo '<a href="../ip_whois.php?ip=' . urlencode($ticket['ip']) . '">' . $ticket['ip'] . '</a>';
diff --git a/admin/banned_emails.php b/admin/banned_emails.php
index 643b4da8..add9b597 100644
--- a/admin/banned_emails.php
+++ b/admin/banned_emails.php
@@ -239,7 +239,7 @@ function ban_email()
     hesk_token_check();
 
     // Get the email
-    $email = strtolower(hesk_input(hesk_REQUEST('email')));
+    $email = hesk_emailCleanup(strtolower(hesk_input(hesk_REQUEST('email'))));
 
     // Nothing entered?
     if (!strlen($email)) {
diff --git a/admin/custom_fields.php b/admin/custom_fields.php
index f23c7f35..a71b6a5a 100755
--- a/admin/custom_fields.php
+++ b/admin/custom_fields.php
@@ -732,7 +732,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 									$num_before = 0;
 									$num_after = 0;
 
-									foreach ($hesk_settings['custom_fields'] as $id => $cf) {
+									foreach ($hesk_settings['custom_fields'] as $tmp_id => $cf) {
 										if ($cf['place']) {
 											$num_after++;
 										} else {
@@ -741,8 +741,8 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 									}
 
 									$k = 1;
-									foreach ($hesk_settings['custom_fields'] as $id => $cf) {
-										$id = intval(str_replace('custom', '', $id));
+									foreach ($hesk_settings['custom_fields'] as $tmp_id => $cf) {
+                                        $tmp_id = intval(str_replace('custom', '', $tmp_id));
 
 										if ($hide_up) {
 											$hide_up = false;
@@ -771,7 +771,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 										$cf['category'] = count($cf['category']) ? $hesklang['cf_cat'] : $hesklang['cf_all'];
 										?>
 										<tr>
-											<td><?php echo $id; ?></td>
+											<td><?php echo $tmp_id; ?></td>
 											<td><?php echo $cf['name']; ?></td>
 											<td><?php echo $cf['type']; ?></td>
 											<td><?php echo $cf['use']; ?></td>
@@ -791,33 +791,33 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 													} elseif ($k == 1 || $hide_up) {
 														?>
 														<i class="fa fa-fw icon-link">&nbsp;</i>
-														<a href="custom_fields.php?a=order_cf&amp;id=<?php echo $id; ?>&amp;move=15&amp;token=<?php hesk_token_echo(); ?>">
+														<a href="custom_fields.php?a=order_cf&amp;id=<?php echo $tmp_id; ?>&amp;move=15&amp;token=<?php hesk_token_echo(); ?>">
 															<i class="fa fa-arrow-down fa-fw icon-link green" data-toggle="tooltip" title="<?php echo $hesklang['move_dn']; ?>"></i>
 														</a>
 														<?php
 													} elseif ($k == $hesk_settings['num_custom_fields'] || $k == $num_before) {
 														?>
-														<a href="custom_fields.php?a=order_cf&amp;id=<?php echo $id; ?>&amp;move=-15&amp;token=<?php hesk_token_echo(); ?>">
+														<a href="custom_fields.php?a=order_cf&amp;id=<?php echo $tmp_id; ?>&amp;move=-15&amp;token=<?php hesk_token_echo(); ?>">
 															<i class="fa fa-arrow-up fa-fw icon-link green" data-toggle="tooltip" title="<?php echo $hesklang['move_up']; ?>"></i>
 														</a>
 														<i class="fa fa-fw icon-link">&nbsp;</i>
 														<?php
 													} else {
 														?>
-														<a href="custom_fields.php?a=order_cf&amp;id=<?php echo $id; ?>&amp;move=-15&amp;token=<?php hesk_token_echo(); ?>">
+														<a href="custom_fields.php?a=order_cf&amp;id=<?php echo $tmp_id; ?>&amp;move=-15&amp;token=<?php hesk_token_echo(); ?>">
 															<i class="fa fa-arrow-up fa-fw icon-link green" data-toggle="tooltip" title="<?php echo $hesklang['move_up']; ?>"></i>
 														</a>
-														<a href="custom_fields.php?a=order_cf&amp;id=<?php echo $id; ?>&amp;move=15&amp;token=<?php hesk_token_echo(); ?>">
+														<a href="custom_fields.php?a=order_cf&amp;id=<?php echo $tmp_id; ?>&amp;move=15&amp;token=<?php hesk_token_echo(); ?>">
 															<i class="fa fa-arrow-down fa-fw icon-link green" data-toggle="tooltip" title="<?php echo $hesklang['move_dn']; ?>"></i>
 														</a>
 														<?php
 													}
 												}
 												?>
-												<a href="custom_fields.php?a=edit_cf&amp;id=<?php echo $id; ?>">
+												<a href="custom_fields.php?a=edit_cf&amp;id=<?php echo $tmp_id; ?>">
 													<i class="fa fa-pencil fa-fw icon-link orange" data-toggle="tooltip" title="<?php echo $hesklang['edit']; ?>"></i>
 												</a>
-												<a href="custom_fields.php?a=remove_cf&amp;id=<?php echo $id; ?>&amp;token=<?php hesk_token_echo(); ?>"
+												<a href="custom_fields.php?a=remove_cf&amp;id=<?php echo $tmp_id; ?>&amp;token=<?php hesk_token_echo(); ?>"
 												   onclick="return hesk_confirmExecute('<?php echo hesk_makeJsString($hesklang['del_cf']); ?>');">
 													<i class="fa fa-times fa-fw icon-link red" data-toggle="tooltip" title="<?php echo $hesklang['delete']; ?>"></i>
 												</a>
diff --git a/admin/edit_post.php b/admin/edit_post.php
index 9052fb8b..289faf83 100644
--- a/admin/edit_post.php
+++ b/admin/edit_post.php
@@ -24,6 +24,8 @@ require(HESK_PATH . 'inc/admin_functions.inc.php');
 require(HESK_PATH . 'inc/mail_functions.inc.php');
 require(HESK_PATH . 'inc/custom_fields.inc.php');
 hesk_load_database_functions();
+require(HESK_PATH . 'inc/posting_functions.inc.php');
+require(HESK_PATH . 'inc/view_attachment_functions.inc.php');
 
 hesk_session_start();
 hesk_dbConnect();
@@ -76,16 +78,51 @@ if (hesk_isREQUEST('reply')) {
     $is_reply = 1;
 }
 
+// Count number of existing attachments for this post
+$number_of_attachments = $is_reply ? hesk_countAttachments($reply['attachments']) : hesk_countAttachments($ticket['attachments']);
+
 if (isset($_POST['save'])) {
     /* A security check */
     hesk_token_check('POST');
 
     $hesk_error_buffer = array();
 
+    // Add attachments?
+    if ($hesk_settings['attachments']['use'] && $number_of_attachments < $hesk_settings['attachments']['max_number']) {
+        require_once(HESK_PATH . 'inc/attachments.inc.php');
+
+        $attachments = array();
+
+        $use_legacy_attachments = hesk_POST('use-legacy-attachments', 0);
+
+        if ($use_legacy_attachments) {
+            for ($i = $number_of_attachments + 1; $i <= $hesk_settings['attachments']['max_number']; $i++) {
+                $att = hesk_uploadFile($i);
+                if ($att !== false && !empty($att)) {
+                    $attachments[$i] = $att;
+                }
+            }
+        } else {
+            // The user used the new drag-and-drop system.
+            $temp_attachment_ids = hesk_POST_array('attachment-ids');
+            foreach ($temp_attachment_ids as $temp_attachment_id) {
+                // Simply get the temp info and move it to the attachments table
+                $temp_attachment = mfh_getTemporaryAttachment($temp_attachment_id);
+                $attachments[] = $temp_attachment;
+                mfh_deleteTemporaryAttachment($temp_attachment_id);
+            }
+        }
+    }
+
     if ($is_reply) {
         $tmpvar['message'] = hesk_input(hesk_POST('message')) or $hesk_error_buffer[] = $hesklang['enter_message'];
 
         if (count($hesk_error_buffer)) {
+            // Remove any successfully uploaded attachments
+            if ($hesk_settings['attachments']['use'] && isset($attachments)) {
+                hesk_removeAttachments($attachments);
+            }
+
             $myerror = '<ul>';
             foreach ($hesk_error_buffer as $error) {
                 $myerror .= "<li>$error</li>\n";
@@ -101,7 +138,14 @@ if (isset($_POST['save'])) {
 
         $tmpvar['html'] = hesk_POST('html');
 
-        hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "replies` SET `html`='" . $tmpvar['html'] . "', `message`='" . hesk_dbEscape($tmpvar['message']) . "' WHERE `id`='" . intval($tmpvar['id']) . "' AND `replyto`='" . intval($ticket['id']) . "'");
+        if ($hesk_settings['attachments']['use'] && !empty($attachments)) {
+            foreach ($attachments as $myatt) {
+                hesk_dbQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."attachments` (`ticket_id`,`saved_name`,`real_name`,`size`) VALUES ('".hesk_dbEscape($trackingID)."','".hesk_dbEscape($myatt['saved_name'])."','".hesk_dbEscape($myatt['real_name'])."','".intval($myatt['size'])."')");
+                $myattachments .= hesk_dbInsertID() . '#' . $myatt['real_name'] . '#' . $myatt['saved_name'] . ',';
+            }
+        }
+
+        hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "replies` SET `html`='" . $tmpvar['html'] . "', `message`='" . hesk_dbEscape($tmpvar['message']) . "', `attachments`=CONCAT(`attachments`, '".hesk_dbEscape($myattachments)."') WHERE `id`='" . intval($tmpvar['id']) . "' AND `replyto`='" . intval($ticket['id']) . "'");
     } else {
         $tmpvar['language'] = hesk_POST('customerLanguage');
         $tmpvar['name'] = hesk_input(hesk_POST('name')) or $hesk_error_buffer[] = $hesklang['enter_your_name'];
@@ -161,9 +205,9 @@ if (isset($_POST['save'])) {
                     $_SESSION["as_$k"] = '';
 
                     if (preg_match("/^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$/", $tmpvar[$k])) {
-                        $date = strtotime($tmpvar[$k] . ' t00:00:00');
-                        $dmin = strlen($v['value']['dmin']) ? strtotime($v['value']['dmin'] . ' t00:00:00') : false;
-                        $dmax = strlen($v['value']['dmax']) ? strtotime($v['value']['dmax'] . ' t00:00:00') : false;
+                        $date = strtotime($tmpvar[$k] . ' t00:00:00 UTC');
+                        $dmin = strlen($v['value']['dmin']) ? strtotime($v['value']['dmin'] . ' t00:00:00 UTC') : false;
+                        $dmax = strlen($v['value']['dmax']) ? strtotime($v['value']['dmax'] . ' t00:00:00 UTC') : false;
 
                         $_SESSION["as_$k"] = $tmpvar[$k];
 
@@ -208,6 +252,11 @@ if (isset($_POST['save'])) {
         }
 
         if (count($hesk_error_buffer)) {
+            // Remove any successfully uploaded attachments
+            if ($hesk_settings['attachments']['use'] && isset($attachments)) {
+                hesk_removeAttachments($attachments);
+            }
+
             $myerror = '<ul>';
             foreach ($hesk_error_buffer as $error) {
                 $myerror .= "<li>$error</li>\n";
@@ -221,6 +270,13 @@ if (isset($_POST['save'])) {
             $tmpvar['message'] = nl2br($tmpvar['message']);
         }
 
+        if ($hesk_settings['attachments']['use'] && !empty($attachments)) {
+            foreach ($attachments as $myatt) {
+                hesk_dbQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."attachments` (`ticket_id`,`saved_name`,`real_name`,`size`) VALUES ('".hesk_dbEscape($trackingID)."','".hesk_dbEscape($myatt['saved_name'])."','".hesk_dbEscape($myatt['real_name'])."','".intval($myatt['size'])."')");
+                $myattachments .= hesk_dbInsertID() . '#' . $myatt['real_name'] . '#' . $myatt['saved_name'] . ',';
+            }
+        }
+
         $custom_SQL = '';
         for ($i = 1; $i <= 50; $i++) {
             $custom_SQL .= '`custom'.$i.'`=' . (isset($tmpvar['custom'.$i]) ? "'".hesk_dbEscape($tmpvar['custom'.$i])."'" : "''") . ',';
@@ -232,6 +288,7 @@ if (isset($_POST['save'])) {
 		`email`='" . hesk_dbEscape($tmpvar['email']) . "',
 		`subject`='" . hesk_dbEscape($tmpvar['subject']) . "',
 		`message`='" . hesk_dbEscape($tmpvar['message']) . "',
+		`attachments`=CONCAT(`attachments`, '".hesk_dbEscape($myattachments)."'),
 		`language`='" . hesk_dbEscape($tmpvar['language']) . "',
 		`html`='" . hesk_dbEscape($tmpvar['html']) . "',
 		$custom_SQL
@@ -278,7 +335,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                     $onsubmit = 'onsubmit="return validateRichText(\'message-help-block\', \'message-group\', \'message\', \''.htmlspecialchars($hesklang['this_field_is_required']).'\')"';
                 }
                 ?>
-                <form role="form" class="form-horizontal" method="post" action="edit_post.php" name="form1" <?php echo $onsubmit; ?>>
+                <form role="form" class="form-horizontal" method="post" action="edit_post.php" name="form1" enctype="multipart/form-data" <?php echo $onsubmit; ?>>
                     <?php
                     /* If it's not a reply edit all the fields */
                     if (!$is_reply) {
@@ -542,6 +599,19 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                                 <div class="help-block with-errors" id="message-help-block"></div>
                             </div>
                         </div>
+                    <?php if ($hesk_settings['attachments']['use'] && $number_of_attachments < $hesk_settings['attachments']['max_number']) : ?>
+                        <div class="form-group">
+                            <label for="attachments" class="control-label col-sm-3"><?php echo $hesklang['attachments']; ?>:</label>
+
+                            <div class="col-sm-9">
+                                <?php build_dropzone_markup(true, 'filedrop', $number_of_attachments + 1); ?>
+                            </div>
+                        </div>
+                        <?php
+                        display_dropzone_field($hesk_settings['hesk_url'] . '/internal-api/ticket/upload-attachment.php',
+                            'filedrop',
+                            $hesk_settings['attachments']['max_number'] - $number_of_attachments);
+                    endif; ?>
                 <div class="form-group">
                     <input type="hidden" name="save" value="1">
                     <input type="hidden" name="track" value="<?php echo $trackingID; ?>">
@@ -598,4 +668,15 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 </div>
 <?php
 require_once(HESK_PATH . 'inc/footer.inc.php');
-exit();
\ No newline at end of file
+exit();
+
+function hesk_countAttachments($attachments_string) {
+    if ( ! strlen($attachments_string) || strpos($attachments_string, ',') === false) {
+        return 0;
+    }
+
+    $att = explode(',', substr($attachments_string, 0, -1));
+
+    return count($att);
+
+} // END hesk_countAttachments()
\ No newline at end of file
diff --git a/admin/find_tickets.php b/admin/find_tickets.php
index e2385105..c9bcd812 100644
--- a/admin/find_tickets.php
+++ b/admin/find_tickets.php
@@ -145,21 +145,21 @@ LEFT(`message`, 400) AS `message`,
                                 $sql .= " ( `trackid` = '" . hesk_dbEscape($q) . "' OR `merged` LIKE '%#" . hesk_dbEscape($q) . "#%' ) ";
                                 break;
                             case 'name':
-                                $sql .= "`name` LIKE '%" . hesk_dbEscape($q) . "%' COLLATE '" . hesk_dbEscape($hesklang['_COLLATE']) . "' ";
+                                $sql .= "`name` LIKE '%" . hesk_dbEscape($q) . "%' COLLATE '" . hesk_dbCollate() . "' ";
                                 break;
                             case 'email':
                                 $sql .= "`email` LIKE '%" . hesk_dbEscape($q) . "%' ";
                                 break;
                             case 'subject':
-                                $sql .= "`subject` LIKE '%" . hesk_dbEscape($q) . "%' COLLATE '" . hesk_dbEscape($hesklang['_COLLATE']) . "' ";
+                                $sql .= "`subject` LIKE '%" . hesk_dbEscape($q) . "%' COLLATE '" . hesk_dbCollate() . "' ";
                                 break;
                             case 'message':
-                                $sql .= " ( `message` LIKE '%" . hesk_dbEscape($q) . "%' COLLATE '" . hesk_dbEscape($hesklang['_COLLATE']) . "'
+                                $sql .= " ( `message` LIKE '%" . hesk_dbEscape($q) . "%' COLLATE '" . hesk_dbCollate() . "'
             		OR
                     `id` IN (
             		SELECT DISTINCT `replyto`
                 	FROM   `" . hesk_dbEscape($hesk_settings['db_pfix']) . "replies`
-                	WHERE  `message` LIKE '%" . hesk_dbEscape($q) . "%' COLLATE '" . hesk_dbEscape($hesklang['_COLLATE']) . "' )
+                	WHERE  `message` LIKE '%" . hesk_dbEscape($q) . "%' COLLATE '" . hesk_dbCollate() . "' )
                     )
                     ";
                                 break;
@@ -170,12 +170,12 @@ LEFT(`message`, 400) AS `message`,
                                 $sql .= "`id` IN (
             		SELECT DISTINCT `ticket`
                 	FROM   `" . hesk_dbEscape($hesk_settings['db_pfix']) . "notes`
-                	WHERE  `message` LIKE '%" . hesk_dbEscape($q) . "%' COLLATE '" . hesk_dbEscape($hesklang['_COLLATE']) . "' )
+                	WHERE  `message` LIKE '%" . hesk_dbEscape($q) . "%' COLLATE '" . hesk_dbCollate() . "' )
                 	";
                                 break;
                             default:
                                 if (isset($hesk_settings['custom_fields'][$what]) && $hesk_settings['custom_fields'][$what]['use']) {
-                                    $sql .= "`" . hesk_dbEscape($what) . "` LIKE '%" . hesk_dbEscape($q) . "%' COLLATE '" . hesk_dbEscape($hesklang['_COLLATE']) . "' ";
+                                    $sql .= "`" . hesk_dbEscape($what) . "` LIKE '%" . hesk_dbEscape($q) . "%' COLLATE '" . hesk_dbCollate() . "' ";
                                 } else {
                                     $hesk_error_buffer .= '<br />' . $hesklang['invalid_search'];
                                 }
diff --git a/admin/index.php b/admin/index.php
index 627e803c..25f9f651 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -69,7 +69,7 @@ function do_login()
             require_once(HESK_PATH . 'inc/recaptcha/recaptchalib.php');
 
             $resp = recaptcha_check_answer($hesk_settings['recaptcha_private_key'],
-                $_SERVER['REMOTE_ADDR'],
+                hesk_getClientIP(),
                 hesk_POST('recaptcha_challenge_field', ''),
                 hesk_POST('recaptcha_response_field', '')
             );
@@ -88,7 +88,7 @@ function do_login()
 
             // Was there a reCAPTCHA response?
             if (isset($_POST["g-recaptcha-response"])) {
-                $resp = $reCaptcha->verifyResponse($_SERVER["REMOTE_ADDR"], hesk_POST("g-recaptcha-response"));
+                $resp = $reCaptcha->verifyResponse(hesk_getClientIP(), hesk_POST("g-recaptcha-response"));
             }
 
             if ($resp != null && $resp->success) {
diff --git a/admin/knowledgebase_private.php b/admin/knowledgebase_private.php
index 565ad3fe..944aa878 100644
--- a/admin/knowledgebase_private.php
+++ b/admin/knowledgebase_private.php
@@ -146,8 +146,6 @@ function hesk_kb_search($query)
 {
 	global $hesk_settings, $hesklang;
 
-    define('HESK_NO_ROBOTS',1);
-
     $res = hesk_dbQuery('SELECT t1.`id`, t1.`subject`, LEFT(`t1`.`content`, '.max(200, $hesk_settings['kb_substrart'] * 2).') AS `content`, t1.`rating` FROM `'.hesk_dbEscape($hesk_settings['db_pfix']).'kb_articles` AS t1 LEFT JOIN `'.hesk_dbEscape($hesk_settings['db_pfix']).'kb_categories` AS t2 ON t1.`catid` = t2.`id` '." WHERE t1.`type` IN ('0','1') AND MATCH(`subject`,`content`,`keywords`) AGAINST ('".hesk_dbEscape($query)."') LIMIT ".intval($hesk_settings['kb_search_limit']));
     $num = hesk_dbNumRows($res);
 	$show_default_category = false;
diff --git a/admin/manage_knowledgebase.php b/admin/manage_knowledgebase.php
index 33066f06..47a1db5a 100644
--- a/admin/manage_knowledgebase.php
+++ b/admin/manage_knowledgebase.php
@@ -1080,6 +1080,9 @@ function edit_category()
         // Now delete the category
         hesk_dbQuery("DELETE FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."kb_categories` WHERE `id`='".intval($catid)."'");
 
+    	// Clear KB cache
+        hesk_purge_cache('kb');
+
 		$_SESSION['hide'] = array(
 			//'treemenu' => 1,
 			'new_article' => 1,
@@ -1252,6 +1255,9 @@ function save_article()
     // Update article order
     update_article_order($catid);
 
+    // Clear KB cache
+    hesk_purge_cache('kb');
+
     // Redirect to the correct page
     switch ($from) {
         case 'draft':
@@ -2174,6 +2180,9 @@ function remove_article()
 	    hesk_dbQuery("UPDATE `".hesk_dbEscape($hesk_settings['db_pfix'])."kb_categories` SET `articles_draft`=`articles_draft`-1 WHERE `id`='{$catid}'");
 	}
 
+	// Clear KB cache
+    hesk_purge_cache('kb');
+
     // Redirect to the correct page
     switch ($from) {
         case 'draft':
diff --git a/admin/password.php b/admin/password.php
index b6c35830..ddec4903 100644
--- a/admin/password.php
+++ b/admin/password.php
@@ -51,7 +51,7 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             require_once(HESK_PATH . 'inc/recaptcha/recaptchalib.php');
 
             $resp = recaptcha_check_answer($hesk_settings['recaptcha_private_key'],
-                $_SERVER['REMOTE_ADDR'],
+                hesk_getClientIP(),
                 hesk_POST('recaptcha_challenge_field', ''),
                 hesk_POST('recaptcha_response_field', '')
             );
@@ -70,7 +70,7 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
 
             // Was there a reCAPTCHA response?
             if (isset($_POST["g-recaptcha-response"])) {
-                $resp = $reCaptcha->verifyResponse($_SERVER["REMOTE_ADDR"], hesk_POST("g-recaptcha-response"));
+                $resp = $reCaptcha->verifyResponse(hesk_getClientIP(), hesk_POST("g-recaptcha-response"));
             }
 
             if ($resp != null && $resp->success) {
@@ -121,7 +121,7 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             hesk_process_messages($hesklang['noace'], 'NOREDIRECT');
         } else {
             $row = hesk_dbFetchAssoc($res);
-            $hash = sha1(microtime() . $_SERVER['REMOTE_ADDR'] . mt_rand() . $row['id'] . $row['name'] . $row['pass']);
+            $hash = sha1(microtime() . hesk_getClientIP() . mt_rand() . $row['id'] . $row['name'] . $row['pass']);
 
             // Insert the verification hash into the database
             hesk_dbQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "reset_password` (`user`, `hash`, `ip`) VALUES (" . intval($row['id']) . ", '{$hash}', '" . hesk_dbEscape($_SERVER['REMOTE_ADDR']) . "') ");
diff --git a/inc/admin_functions.inc.php b/inc/admin_functions.inc.php
index f2eb5e04..832c5cd4 100644
--- a/inc/admin_functions.inc.php
+++ b/inc/admin_functions.inc.php
@@ -34,6 +34,8 @@ $hesk_settings['possible_ticket_list'] = array(
     'time_worked' => $hesklang['ts'],
 );
 
+define('HESK_NO_ROBOTS', true);
+
 /*** FUNCTIONS ***/
 
 
@@ -564,6 +566,8 @@ function hesk_verifyGoto()
 		'banned_emails.php' => '',
 		'banned_ips.php' => '',
         'change_status.php' => '',
+        'custom_fields.php' => '',
+        'custom_statuses.php' => '',
         'edit_post.php' => '',
 		'email_templates.php' => '',
         'export.php' => '',
@@ -572,6 +576,7 @@ function hesk_verifyGoto()
         'knowledgebase_private.php' => '',
         'lock.php' => '',
         'mail.php' => '',
+        'mail.php?a=read&id=1' => '',
         'manage_canned.php' => '',
         'manage_categories.php' => '',
         'manage_knowledgebase.php' => '',
@@ -715,6 +720,9 @@ function hesk_purge_cache($type = '', $expire_after_seconds = 0)
         case 'cf':
             $files = glob($cache_dir.'cf_*', GLOB_NOSORT);
             break;
+        case 'kb':
+            $files = array($cache_dir.'kb.cache.php');
+            break;
         default:
             hesk_rrmdir(trim($cache_dir, '/'), true);
             return true;
diff --git a/inc/attachments.inc.php b/inc/attachments.inc.php
index 37535af7..b2c9886e 100644
--- a/inc/attachments.inc.php
+++ b/inc/attachments.inc.php
@@ -103,7 +103,7 @@ function hesk_fileError($error)
 } // End hesk_fileError()
 
 
-function hesk_removeAttachments($attachments, $isTicket)
+function hesk_removeAttachments($attachments, $isTicket = true)
 {
     global $hesk_settings, $hesklang, $modsForHesk_settings;
 
diff --git a/inc/view_attachment_functions.inc.php b/inc/view_attachment_functions.inc.php
index a65c00e6..6ff6cc69 100644
--- a/inc/view_attachment_functions.inc.php
+++ b/inc/view_attachment_functions.inc.php
@@ -207,14 +207,14 @@ function output_attachment_id_holder_container($id) {
     echo '<div id="attachment-holder-' . $id . '" class="hide"></div>';
 }
 
-function build_dropzone_markup($admin = false, $id = 'filedrop') {
+function build_dropzone_markup($admin = false, $id = 'filedrop', $startingId = 1) {
     global $hesklang, $hesk_settings;
 
     $directory_separator = $admin ? '../' : '';
     echo '<div class="dropzone" id="' . $id . '">
         <div class="fallback">
             <input type="hidden" name="use-legacy-attachments" value="1">';
-            for ($i = 1; $i <= $hesk_settings['attachments']['max_number']; $i++) {
+            for ($i = $startingId; $i <= $hesk_settings['attachments']['max_number']; $i++) {
                 $cls = ($i == 1 && isset($_SESSION['iserror']) && in_array('attachments', $_SESSION['iserror'])) ? ' class="isError" ' : '';
                 echo '<input type="file" name="attachment[' . $i . ']" size="50" ' . $cls . ' /><br />';
             }
@@ -225,7 +225,7 @@ function build_dropzone_markup($admin = false, $id = 'filedrop') {
        onclick="Javascript:hesk_window(\'' . $directory_separator . 'file_limits.php\',250,500);return false;">'. $hesklang['ful'] . '</a>';
 }
 
-function display_dropzone_field($url, $id = 'filedrop') {
+function display_dropzone_field($url, $id = 'filedrop', $max_files_override = -1) {
     global $hesk_settings, $hesklang;
 
     output_dropzone_window();
@@ -233,7 +233,7 @@ function display_dropzone_field($url, $id = 'filedrop') {
 
     $acceptedFiles = implode(',', $hesk_settings['attachments']['allowed_types']);
     $size = mfh_bytesToUnits($hesk_settings['attachments']['max_size']);
-    $max_files = $hesk_settings['attachments']['max_number'];
+    $max_files = $max_files_override > -1 ? $max_files_override : $hesk_settings['attachments']['max_number'];
 
     echo "
     <script type=\"text/javascript\">

From 925ad5f53804e915bd187b8cf350e49b60451c24 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Mon, 10 Apr 2017 21:32:29 -0400
Subject: [PATCH 092/192] #544 Rest of the 2.7.3 updates

---
 inc/common.inc.php                  | 158 ++++++++++++++++++++++++----
 inc/knowledgebase_functions.inc.php |   6 +-
 inc/pipe_functions.inc.php          |   1 -
 inc/posting_functions.inc.php       |   2 +-
 index.php                           |  79 +++++++++++---
 install/install_functions.inc.php   |   2 +-
 knowledgebase.php                   |  20 +++-
 reply_ticket.php                    |   4 +-
 submit_ticket.php                   |  10 +-
 ticket.php                          |   4 +-
 10 files changed, 230 insertions(+), 56 deletions(-)

diff --git a/inc/common.inc.php b/inc/common.inc.php
index 72772a16..26b4a314 100644
--- a/inc/common.inc.php
+++ b/inc/common.inc.php
@@ -77,9 +77,81 @@ if (isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') {
 // Load language file
 hesk_getLanguage();
 
+// Set timezone
+hesk_setTimezone();
+
 
 /*** FUNCTIONS ***/
 
+function hesk_getClientIP() {
+    global $hesk_settings;
+
+    // Already set? Just return it
+    if (isset($hesk_settings['client_IP'])) {
+        return $hesk_settings['client_IP'];
+    }
+
+    // Empty client IP, for example when used in CLI (piping, cron jobs, ...)
+    $hesk_settings['client_IP'] = '';
+
+    // Server (environment) variables to loop through
+    // the first valid one found will be returned as client IP
+    // Uncomment those used on your server
+    $server_client_IP_variables = array(
+        // 'HTTP_CF_CONNECTING_IP', // CloudFlare
+        // 'HTTP_CLIENT_IP',
+        // 'HTTP_X_FORWARDED_FOR',
+        // 'HTTP_X_FORWARDED',
+        // 'HTTP_FORWARDED_FOR',
+        // 'HTTP_FORWARDED',
+        'REMOTE_ADDR',
+    );
+
+    // The first valid environment variable is our client IP
+    foreach ($server_client_IP_variables as $server_client_IP_variable) {
+        // Must be set
+        if (!isset($_SERVER[$server_client_IP_variable])) {
+            continue;
+        }
+
+        // Must be a valid IP
+        if (!hesk_isValidIP($_SERVER[$server_client_IP_variable])) {
+            continue;
+        }
+
+        // Bingo!
+        $hesk_settings['client_IP'] = $_SERVER[$server_client_IP_variable];
+        break;
+    }
+
+    return $hesk_settings['client_IP'];
+
+} // END hesk_getClientIP()
+
+
+function hesk_isValidIP($ip) {
+    // Use filter_var for PHP 5.2.0
+    if (function_exists('filter_var') && filter_var($ip, FILTER_VALIDATE_IP) !== false) {
+        return true;
+    }
+
+    // Use regex for PHP < 5.2.0
+
+    // -> IPv4
+    if (preg_match('/^[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}$/', $ip)) {
+        return true;
+    }
+
+    // -> IPv6
+    if (preg_match('/^[0-9A-Fa-f\:\.]$/', $ip)) {
+        return true;
+    }
+
+    // Not a valid IP
+    return false;
+
+} // END hesk_isValidIP()
+
 function hesk_setcookie($name, $value, $expire=0, $path=""){
     if (HESK_SSL) {
         setcookie($name, $value, $expire, $path, "", true, true);
@@ -415,6 +487,9 @@ function hesk_getCustomerEmail($can_remember = 0, $field = '')
         }
     }
 
+    // Remove unwanted side-effects
+    $my_email = hesk_emailCleanup($my_email);
+
     $hesk_settings['e_param'] = '&e=' . rawurlencode($my_email);
     $hesk_settings['e_query'] = '&amp;e=' . rawurlencode($my_email);
     $hesk_settings['e_email'] = $my_email;
@@ -423,6 +498,10 @@ function hesk_getCustomerEmail($can_remember = 0, $field = '')
 
 } // END hesk_getCustomerEmail()
 
+function hesk_emailCleanup($my_email) {
+    return preg_replace("/(\\\)'/", "'", $my_email);
+} // END hesk_emailCleanup()
+
 
 function hesk_formatBytes($size, $translate_unit = 1, $precision = 2)
 {
@@ -670,7 +749,7 @@ function hesk_cleanBfAttempts()
     }
 
     /* Delete expired logs from the database */
-    $res = hesk_dbQuery("DELETE FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "logins` WHERE `ip`='" . hesk_dbEscape($_SERVER['REMOTE_ADDR']) . "'");
+    hesk_dbQuery("DELETE FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."logins` WHERE `ip`='".hesk_dbEscape(hesk_getClientIP())."'");
 
     define('HESK_BF_CLEAN', 1);
 
@@ -683,7 +762,7 @@ function hesk_limitBfAttempts($showError = 1)
     global $hesk_settings, $hesklang;
 
     // Check if this IP is banned permanently
-    if (hesk_isBannedIP($_SERVER['REMOTE_ADDR'])) {
+    if (hesk_isBannedIP(hesk_getClientIP())) {
         hesk_error($hesklang['baned_ip'], 0);
     }
 
@@ -695,7 +774,7 @@ function hesk_limitBfAttempts($showError = 1)
     /* Define this constant to avoid duplicate checks */
     define('HESK_BF_LIMIT', 1);
 
-    $ip = $_SERVER['REMOTE_ADDR'];
+    $ip = hesk_getClientIP();
 
     /* Get number of failed attempts from the database */
     $res = hesk_dbQuery("SELECT `number`, (CASE WHEN `last_attempt` IS NOT NULL AND DATE_ADD(`last_attempt`, INTERVAL " . intval($hesk_settings['attempt_banmin']) . " MINUTE ) > NOW() THEN 1 ELSE 0 END) AS `banned` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "logins` WHERE `ip`='" . hesk_dbEscape($ip) . "' LIMIT 1");
@@ -1206,6 +1285,58 @@ function hesk_returnLanguage()
     return true;
 } // END hesk_returnLanguage()
 
+function hesk_setTimezone() {
+    global $hesk_settings;
+
+    // Get Hesk time difference from UTC in seconds
+    $seconds = date('Z') + 3600*$hesk_settings['diff_hours'] + 60*$hesk_settings['diff_minutes'];
+
+    // Daylight saving?
+    if ($hesk_settings['daylight'] && date('I')) {
+        $seconds = 3600;
+        $is_daylight = 1;
+    } else {
+        $is_daylight = 0;
+    }
+
+    // Get timezone name from seconds
+    $tz = timezone_name_from_abbr('', $seconds, $is_daylight);
+
+    // Workaround for bug #44780
+    if($tz === false) {
+        $tz = timezone_name_from_abbr('', $seconds, 0);
+    }
+
+    // Still false? Disregards minutes
+    if($tz === false) {
+        $seconds = date('Z') + 3600*$hesk_settings['diff_hours'];
+        $tz = timezone_name_from_abbr('', $seconds, 0);
+    }
+
+    // Set timezone
+    date_default_timezone_set($tz);
+
+    return true;
+
+} // END hesk_setTimezone()
+
+
+function hesk_timeToHHMM($time, $time_format="seconds", $signed=true) {
+    if ($time < 0) {
+        $time = abs($time);
+        $sign = "-";
+    } else {
+        $sign = "";
+    }
+
+    if ($time_format == 'minutes') {
+        $time *= 60;
+    }
+
+    return ($signed ? $sign : '') . gmdate('H:i', $time);
+
+} // END hesk_timeToHHMM()
+
 
 function hesk_date($dt = '', $from_database = false, $is_str = true, $return_str = true)
 {
@@ -1217,25 +1348,6 @@ function hesk_date($dt = '', $from_database = false, $is_str = true, $return_str
         $dt = strtotime($dt);
     }
 
-    // Adjust MySQL time if different from PHP time
-    if ($from_database) {
-        if (!defined('MYSQL_TIME_DIFF')) {
-            define('MYSQL_TIME_DIFF', time() - hesk_dbTime());
-        }
-
-        if (MYSQL_TIME_DIFF != 0) {
-            $dt += MYSQL_TIME_DIFF;
-        }
-    }
-
-    // Add HESK set time difference
-    $dt += 3600 * $hesk_settings['diff_hours'] + 60 * $hesk_settings['diff_minutes'];
-
-    // Daylight savings?
-    if ($hesk_settings['daylight'] && date('I', $dt)) {
-        $dt += 3600;
-    }
-
     // Return formatted date
     return $return_str ? date($hesk_settings['timeformat'], $dt) : $dt;
 
@@ -1728,7 +1840,7 @@ function hesk_check_maintenance($dodie = true)
             $hesk_settings['maintenance_mode'] == 0 &&
             $hesk_settings['question_ans'] == 'PB6YM' &&
 
-            $hesk_settings['site_title'] == 'My Web site' &&
+            $hesk_settings['site_title'] == 'Website' &&
             $hesk_settings['site_url'] == 'http://www.example.com' &&
             $hesk_settings['webmaster_mail'] == 'support@example.com' &&
             $hesk_settings['noreply_mail'] == 'support@example.com' &&
diff --git a/inc/knowledgebase_functions.inc.php b/inc/knowledgebase_functions.inc.php
index b5f8df6b..8d4b7f7f 100644
--- a/inc/knowledgebase_functions.inc.php
+++ b/inc/knowledgebase_functions.inc.php
@@ -59,9 +59,6 @@ function hesk_kbTopArticles($how_many, $index = 1)
 
         // Show title in bold
         $font_weight = 'b';
-
-        // Print a line for spacing
-        echo '<hr />';
     }
     ?>
 
@@ -108,6 +105,8 @@ function hesk_kbTopArticles($how_many, $index = 1)
             $hesk_settings['kb_top_articles_printed'] = array();
 
             while ($article = hesk_dbFetchAssoc($res)) {
+                $hesk_settings['kb_spacing']--;
+
                 $hesk_settings['kb_top_articles_printed'][] = $article['id'];
 
                 $icon = 'fa fa-file';
@@ -217,6 +216,7 @@ function hesk_kbLatestArticles($how_many, $index = 1)
             /* We have some results, print them out */
             $colspan = $hesk_settings['kb_date'] ? '' : 'colspan="2"';
             while ($article = hesk_dbFetchAssoc($res)) {
+                $hesk_settings['kb_spacing']--;
                 $icon = 'fa fa-file';
                 $style = '';
 
diff --git a/inc/pipe_functions.inc.php b/inc/pipe_functions.inc.php
index df064e07..4b92df4a 100755
--- a/inc/pipe_functions.inc.php
+++ b/inc/pipe_functions.inc.php
@@ -266,7 +266,6 @@ function hesk_email2ticket($results, $pop3 = 0, $set_category = 1, $set_priority
     // Not a reply, but a new ticket. Add it to the database
     $tmpvar['category'] = $set_category;
     $tmpvar['priority'] = $set_priority < 0 ? hesk_getCategoryPriority($tmpvar['category']) : $set_priority;
-    $_SERVER['REMOTE_ADDR'] = $hesklang['unknown'];
 
     // Auto assign tickets if aplicable
     $tmpvar['owner'] = 0;
diff --git a/inc/posting_functions.inc.php b/inc/posting_functions.inc.php
index a3471411..a2cd5221 100644
--- a/inc/posting_functions.inc.php
+++ b/inc/posting_functions.inc.php
@@ -101,7 +101,7 @@ function hesk_newTicket($ticket, $isVerified = true)
 		NOW(),
 		NOW(),
 		" . (isset($ticket['articles']) ? "'{$ticket['articles']}'" : 'NULL') . ",
-		'" . hesk_dbEscape($_SERVER['REMOTE_ADDR']) . "',
+		'" . hesk_dbEscape(hesk_getClientIP()) . "',
 		'" . hesk_dbEscape($language) . "',
 		'" . (isset($ticket['openedby']) ? intval($ticket['openedby']) : 0) . "',
 		'" . intval($ticket['owner']) . "',
diff --git a/index.php b/index.php
index a3b5f43c..41fddc81 100644
--- a/index.php
+++ b/index.php
@@ -721,7 +721,7 @@ function print_add_ticket()
 
                 <!-- START KNOWLEDGEBASE SUGGEST -->
                 <?php
-                if ($hesk_settings['kb_enable'] && $hesk_settings['kb_recommendanswers']) {
+                if (has_public_kb() && $hesk_settings['kb_recommendanswers']) {
                     ?>
                     <div id="kb_suggestions" style="display:none">
                         <br/>&nbsp;<br/>
@@ -1116,7 +1116,7 @@ function print_add_ticket()
 
                                     <b><?php echo $hesklang['we_have']; ?>:</b>
                                     <ul>
-                                        <li><?php echo hesk_htmlspecialchars($_SERVER['REMOTE_ADDR']) . ' ' . $hesklang['recorded_ip']; ?></li>
+                                        <li><?php echo hesk_htmlspecialchars(hesk_getClientIP()) . ' ' . $hesklang['recorded_ip']; ?></li>
                                         <li><?php echo $hesklang['recorded_time']; ?></li>
                                     </ul>
                                 </div>
@@ -1206,16 +1206,26 @@ function print_start()
 {
 	global $hesk_settings, $hesklang;
 
-	if ($hesk_settings['kb_enable'])
-	{
-        require(HESK_PATH . 'inc/knowledgebase_functions.inc.php');
-	}
-
     // Connect to database
+    hesk_load_database_functions();
     hesk_dbConnect();
 
     define('PAGE_TITLE', 'CUSTOMER_HOME');
 
+    // This will be used to determine how much space to print after KB
+    $hesk_settings['kb_spacing'] = 4;
+
+    // Include KB functionality only if we have any public articles
+    has_public_kb();
+    if ($hesk_settings['kb_enable'])
+    {
+        require(HESK_PATH . 'inc/knowledgebase_functions.inc.php');
+    }
+    else
+    {
+        $hesk_settings['kb_spacing'] += 2;
+    }
+
 	/* Print header */
 	require_once(HESK_PATH . 'inc/header.inc.php');
 
@@ -1418,7 +1428,7 @@ require(HESK_PATH . 'inc/email_functions.inc.php');
 /* Get ticket(s) from database */
 hesk_dbConnect();
 
-$email = hesk_validateEmail(hesk_POST('email'), 'ERR', 0) or hesk_process_messages($hesklang['enter_valid_email'], 'ticket.php?remind=1');
+$email = hesk_emailCleanup(hesk_validateEmail(hesk_POST('email'), 'ERR', 0)) or hesk_process_messages($hesklang['enter_valid_email'], 'ticket.php?remind=1');
 
 if (isset($_POST['open_only'])) {
     $hesk_settings['open_only'] = $_POST['open_only'] == 1 ? 1 : 0;
@@ -1437,9 +1447,9 @@ $res = hesk_dbQuery('SELECT * FROM `' . hesk_dbEscape($hesk_settings['db_pfix'])
 $num = hesk_dbNumRows($res);
 if ($num < 1) {
     if ($hesk_settings['open_only']) {
-        hesk_process_messages($hesklang['noopen'], 'ticket.php?remind=1&e=' . $email);
+        hesk_process_messages($hesklang['noopen'],'ticket.php?remind=1&e='.rawurlencode($email));
     } else {
-        hesk_process_messages($hesklang['tid_not_found'], 'ticket.php?remind=1&e=' . $email);
+        hesk_process_messages($hesklang['tid_not_found'],'ticket.php?remind=1&e='.rawurlencode($email));
     }
 }
 
@@ -1505,8 +1515,7 @@ require_once(HESK_PATH . 'inc/header.inc.php');
 
         } // End forgot_tid()
 
-        function processEmail($msg, $name, $num, $tid_list)
-        {
+        function processEmail($msg, $name, $num, $tid_list) {
             global $hesk_settings;
 
             $msg = str_replace('%%NAME%%', $name, $msg);
@@ -1517,4 +1526,48 @@ require_once(HESK_PATH . 'inc/header.inc.php');
             return $msg;
         }
 
-        ?>
+function has_public_kb($use_cache=1) {
+    global $hesk_settings;
+
+    // Return if KB is disabled
+    if ( ! $hesk_settings['kb_enable']) {
+        return 0;
+    }
+
+    // Do we have a cached version available
+    $cache_dir = $hesk_settings['cache_dir'].'/';
+    $cache_file = $cache_dir . 'kb.cache.php';
+
+    if ($use_cache && file_exists($cache_file)) {
+        require($cache_file);
+        return $hesk_settings['kb_enable'];
+    }
+
+    // Make sure we have database connection
+    hesk_load_database_functions();
+    hesk_dbConnect();
+
+    // Do we have any public articles at all?
+    $res = hesk_dbQuery("SELECT `t1`.`id` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."kb_articles` AS `t1`
+                        LEFT JOIN `".hesk_dbEscape($hesk_settings['db_pfix'])."kb_categories` AS `t2` ON `t1`.`catid` = `t2`.`id`
+                        WHERE `t1`.`type`='0' AND `t2`.`type`='0' LIMIT 1");
+
+    // If no public articles, disable the KB functionality
+    if (hesk_dbNumRows($res) < 1) {
+        $hesk_settings['kb_enable'] = 0;
+    }
+
+    // Try to cache results
+    if ($use_cache && (is_dir($cache_dir) || (@mkdir($cache_dir, 0777) && is_writable($cache_dir)))) {
+        // Is there an index.htm file?
+        if ( ! file_exists($cache_dir.'index.htm')) {
+            @file_put_contents($cache_dir.'index.htm', '');
+        }
+
+        // Write data
+        @file_put_contents($cache_file, '<?php if (!defined(\'IN_SCRIPT\')) {die();} $hesk_settings[\'kb_enable\']=' . $hesk_settings['kb_enable'] . ';' );
+    }
+
+    return $hesk_settings['kb_enable'];
+
+} // End has_public_kb()
\ No newline at end of file
diff --git a/install/install_functions.inc.php b/install/install_functions.inc.php
index c7d9d040..7e8914ec 100644
--- a/install/install_functions.inc.php
+++ b/install/install_functions.inc.php
@@ -36,7 +36,7 @@
 if (!defined('IN_SCRIPT')) {die('Invalid attempt');}
 
 // We will be installing this HESK version:
-define('HESK_NEW_VERSION','2.7.2');
+define('HESK_NEW_VERSION','2.7.3');
 define('MODS_FOR_HESK_NEW_VERSION','3.0.5');
 define('REQUIRE_PHP_VERSION','5.3.0');
 define('REQUIRE_MYSQL_VERSION','5.0.7');
diff --git a/knowledgebase.php b/knowledgebase.php
index a5ebb4eb..0aa13f69 100644
--- a/knowledgebase.php
+++ b/knowledgebase.php
@@ -20,10 +20,7 @@ require(HESK_PATH . 'inc/common.inc.php');
 require(HESK_PATH . 'inc/knowledgebase_functions.inc.php');
 
 
-// Load Knowledgebase-related functions
-hesk_load_database_functions();
-
-/* Connect to database */
+// Connect to database
 hesk_dbConnect();
 
 // Are we in maintenance mode?
@@ -31,11 +28,24 @@ hesk_check_maintenance();
 
 define('PAGE_TITLE', 'CUSTOMER_KB');
 
-/* Is Knowledgebase enabled? */
+// Is Knowledgebase enabled?
 if (!$hesk_settings['kb_enable']) {
     hesk_error($hesklang['kbdis']);
 }
 
+// Do we have any public articles at all?
+$res = hesk_dbQuery("SELECT `t1`.`id` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."kb_articles` AS `t1`
+                    LEFT JOIN `".hesk_dbEscape($hesk_settings['db_pfix'])."kb_categories` AS `t2` ON `t1`.`catid` = `t2`.`id`
+                    WHERE `t1`.`type`='0' AND `t2`.`type`='0' LIMIT 1");
+
+// If yes, load KB functions; if not, disable and hide the KB
+if (hesk_dbNumRows($res) < 1) {
+    hesk_error($hesklang['noa']);
+}
+
+// Load KB functions
+require(HESK_PATH . 'inc/knowledgebase_functions.inc.php');
+
 /* Rating? */
 if (isset($_GET['rating'])) {
     // Detect and block robots
diff --git a/reply_ticket.php b/reply_ticket.php
index e4e96fdf..499f3d1f 100644
--- a/reply_ticket.php
+++ b/reply_ticket.php
@@ -125,7 +125,7 @@ if (count($hesk_error_buffer) != 0) {
 }
 
 // Check if this IP is temporarily locked out
-$res = hesk_dbQuery("SELECT `number` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "logins` WHERE `ip`='" . hesk_dbEscape($_SERVER['REMOTE_ADDR']) . "' AND `last_attempt` IS NOT NULL AND DATE_ADD(`last_attempt`, INTERVAL " . intval($hesk_settings['attempt_banmin']) . " MINUTE ) > NOW() LIMIT 1");
+$res = hesk_dbQuery("SELECT `number` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."logins` WHERE `ip`='".hesk_dbEscape(hesk_getClientIP())."' AND `last_attempt` IS NOT NULL AND DATE_ADD(`last_attempt`, INTERVAL ".intval($hesk_settings['attempt_banmin'])." MINUTE ) > NOW() LIMIT 1");
 if (hesk_dbNumRows($res) == 1) {
     if (hesk_dbResult($res) >= $hesk_settings['attempt_limit']) {
         unset($_SESSION);
@@ -157,7 +157,7 @@ if (hesk_dbNumRows($res) > 0) {
         $sequential_customer_replies = $tmp['staffid'] ? 0 : $sequential_customer_replies + 1;
     }
     if ($sequential_customer_replies > 10) {
-        hesk_dbQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "logins` (`ip`, `number`) VALUES ('" . hesk_dbEscape($_SERVER['REMOTE_ADDR']) . "', " . intval($hesk_settings['attempt_limit'] + 1) . ")");
+        hesk_dbQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."logins` (`ip`, `number`) VALUES ('".hesk_dbEscape(hesk_getClientIP())."', ".intval($hesk_settings['attempt_limit'] + 1).")");
         hesk_error(sprintf($hesklang['yhbr'], $hesk_settings['attempt_banmin']), 0);
     }
 }
diff --git a/submit_ticket.php b/submit_ticket.php
index 00fafb1b..03c710e4 100644
--- a/submit_ticket.php
+++ b/submit_ticket.php
@@ -87,7 +87,7 @@ if ($hesk_settings['secimg_use'] && !isset($_SESSION['img_verified'])) {
         require(HESK_PATH . 'inc/recaptcha/recaptchalib.php');
 
         $resp = recaptcha_check_answer($hesk_settings['recaptcha_private_key'],
-            $_SERVER['REMOTE_ADDR'],
+            hesk_getClientIP(),
             hesk_POST('recaptcha_challenge_field', ''),
             hesk_POST('recaptcha_response_field', '')
         );
@@ -268,9 +268,9 @@ foreach ($hesk_settings['custom_fields'] as $k=>$v) {
             $_SESSION["c_$k"] = '';
 
             if (preg_match("/^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$/", $tmpvar[$k])) {
-                $date = strtotime($tmpvar[$k] . ' t00:00:00');
-                $dmin = strlen($v['value']['dmin']) ? strtotime($v['value']['dmin'] . ' t00:00:00') : false;
-                $dmax = strlen($v['value']['dmax']) ? strtotime($v['value']['dmax'] . ' t00:00:00') : false;
+                $date = strtotime($tmpvar[$k] . ' t00:00:00 UTC');
+                $dmin = strlen($v['value']['dmin']) ? strtotime($v['value']['dmin'] . ' t00:00:00 UTC') : false;
+                $dmax = strlen($v['value']['dmax']) ? strtotime($v['value']['dmax'] . ' t00:00:00 UTC') : false;
 
                 $_SESSION["c_$k"] = $tmpvar[$k];
 
@@ -317,7 +317,7 @@ foreach ($hesk_settings['custom_fields'] as $k=>$v) {
 }
 
 // Check bans
-if ($email_available && ! isset($hesk_error_buffer['email']) && hesk_isBannedEmail($tmpvar['email']) || hesk_isBannedIP($_SERVER['REMOTE_ADDR'])) {
+if ($email_available && ! isset($hesk_error_buffer['email']) && hesk_isBannedEmail($tmpvar['email']) || hesk_isBannedIP(hesk_getClientIP())) {
     hesk_error($hesklang['baned_e']);
 }
 
diff --git a/ticket.php b/ticket.php
index ad46c9ef..fd413808 100644
--- a/ticket.php
+++ b/ticket.php
@@ -159,8 +159,8 @@ if ($ticket['lastreplier']) {
 }
 
 // If IP is unknown (tickets via email pipe/pop3 fetching) assume current visitor IP as customer IP
-if ($ticket['ip'] == 'Unknown' || $ticket['ip'] == $hesklang['unknown']) {
-    hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "tickets` SET `ip` = '" . hesk_dbEscape($_SERVER['REMOTE_ADDR']) . "' WHERE `id`=" . intval($ticket['id']));
+if ($ticket['ip'] == '' || $ticket['ip'] == 'Unknown' || $ticket['ip'] == $hesklang['unknown']) {
+    hesk_dbQuery("UPDATE `".hesk_dbEscape($hesk_settings['db_pfix'])."tickets` SET `ip` = '".hesk_dbEscape(hesk_getClientIP())."' WHERE `id`=".intval($ticket['id']));
 }
 
 /* Get category name and ID */

From 7a8f960bc0814de7cb43d98ebcc3ddd6aa1d22ef Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Tue, 11 Apr 2017 08:09:59 -0400
Subject: [PATCH 093/192] Fix installer

---
 install/mods-for-hesk/modsForHesk.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/install/mods-for-hesk/modsForHesk.php b/install/mods-for-hesk/modsForHesk.php
index 6e743146..f765a295 100644
--- a/install/mods-for-hesk/modsForHesk.php
+++ b/install/mods-for-hesk/modsForHesk.php
@@ -118,6 +118,7 @@ hesk_dbConnect();
                                         <select name="current-version" class="form-control">
                                             <option disabled>Select One, or "No Previous Installation" Below</option>
                                             <optgroup label="Mods for HESK 3">
+                                                <option value="39">3.0.5</option>
                                                 <option value="38">3.0.4</option>
                                                 <option value="37">3.0.3</option>
                                                 <option value="36">3.0.2</option>

From 8bba31b0e2abdb793e46a7a780afaa9d6d31cce9 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Tue, 11 Apr 2017 08:15:39 -0400
Subject: [PATCH 094/192] Fix missing +s

---
 inc/common.inc.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/inc/common.inc.php b/inc/common.inc.php
index 26b4a314..920e0787 100644
--- a/inc/common.inc.php
+++ b/inc/common.inc.php
@@ -130,7 +130,7 @@ function hesk_getClientIP() {
 
 
 function hesk_isValidIP($ip) {
-    // Use filter_var for PHP 5.2.0
+    // Use filter_var for PHP 5.2.0+
     if (function_exists('filter_var') && filter_var($ip, FILTER_VALIDATE_IP) !== false) {
         return true;
     }
@@ -143,7 +143,7 @@ function hesk_isValidIP($ip) {
     }
 
     // -> IPv6
-    if (preg_match('/^[0-9A-Fa-f\:\.]$/', $ip)) {
+    if (preg_match('/^[0-9A-Fa-f\:\.]+$/', $ip)) {
         return true;
     }
 
@@ -499,7 +499,7 @@ function hesk_getCustomerEmail($can_remember = 0, $field = '')
 } // END hesk_getCustomerEmail()
 
 function hesk_emailCleanup($my_email) {
-    return preg_replace("/(\\\)'/", "'", $my_email);
+    return preg_replace("/(\\\)+'/", "'", $my_email);
 } // END hesk_emailCleanup()
 
 
@@ -1293,7 +1293,7 @@ function hesk_setTimezone() {
 
     // Daylight saving?
     if ($hesk_settings['daylight'] && date('I')) {
-        $seconds = 3600;
+        $seconds += 3600;
         $is_daylight = 1;
     } else {
         $is_daylight = 0;
@@ -1326,7 +1326,7 @@ function hesk_timeToHHMM($time, $time_format="seconds", $signed=true) {
         $time = abs($time);
         $sign = "-";
     } else {
-        $sign = "";
+        $sign = "+";
     }
 
     if ($time_format == 'minutes') {

From bed05b0592c7f79a48db4abfa1237e13068ccb6b Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Tue, 11 Apr 2017 08:19:09 -0400
Subject: [PATCH 095/192] Fix version

---
 install/install_functions.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/install_functions.inc.php b/install/install_functions.inc.php
index 7e8914ec..84691287 100644
--- a/install/install_functions.inc.php
+++ b/install/install_functions.inc.php
@@ -37,7 +37,7 @@ if (!defined('IN_SCRIPT')) {die('Invalid attempt');}
 
 // We will be installing this HESK version:
 define('HESK_NEW_VERSION','2.7.3');
-define('MODS_FOR_HESK_NEW_VERSION','3.0.5');
+define('MODS_FOR_HESK_NEW_VERSION','3.0.6');
 define('REQUIRE_PHP_VERSION','5.3.0');
 define('REQUIRE_MYSQL_VERSION','5.0.7');
 

From 027ff8f0291648bbc601742bef5b092e6f954f30 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Tue, 11 Apr 2017 12:13:59 -0400
Subject: [PATCH 096/192] Update installer the right way

---
 build.php                                            | 2 +-
 install/mods-for-hesk/ajax/install-database-ajax.php | 2 ++
 install/mods-for-hesk/installModsForHesk.php         | 1 +
 install/mods-for-hesk/js/version-scripts.js          | 3 +++
 install/mods-for-hesk/sql/installSql.php             | 6 ++++++
 5 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/build.php b/build.php
index 5011a29c..354f8da4 100644
--- a/build.php
+++ b/build.php
@@ -1,4 +1,4 @@
 <?php
 
 // Define the current build
-define('MODS_FOR_HESK_BUILD', 38);
\ No newline at end of file
+define('MODS_FOR_HESK_BUILD', 40);
\ No newline at end of file
diff --git a/install/mods-for-hesk/ajax/install-database-ajax.php b/install/mods-for-hesk/ajax/install-database-ajax.php
index 9d503760..2b798bbf 100644
--- a/install/mods-for-hesk/ajax/install-database-ajax.php
+++ b/install/mods-for-hesk/ajax/install-database-ajax.php
@@ -84,6 +84,8 @@ if ($version == 2) {
     execute304Scripts();
 } elseif ($version == 39) {
     execute305Scripts();
+} elseif ($version == 40) {
+    execute306Scripts();
 } else {
     $response = 'The version "' . $version . '" was not recognized. Check the value submitted and try again.';
     print $response;
diff --git a/install/mods-for-hesk/installModsForHesk.php b/install/mods-for-hesk/installModsForHesk.php
index 3af224ae..d0f71caa 100644
--- a/install/mods-for-hesk/installModsForHesk.php
+++ b/install/mods-for-hesk/installModsForHesk.php
@@ -48,6 +48,7 @@ $buildToVersionMap = array(
     37 => '3.0.3',
     38 => '3.0.4',
     39 => '3.0.5',
+    40 => '3.0.6',
 );
 
 function echoInitialVersionRows($version, $build_to_version_map)
diff --git a/install/mods-for-hesk/js/version-scripts.js b/install/mods-for-hesk/js/version-scripts.js
index f902ae7d..b0210ce5 100644
--- a/install/mods-for-hesk/js/version-scripts.js
+++ b/install/mods-for-hesk/js/version-scripts.js
@@ -113,6 +113,9 @@ function processUpdates(startingVersion) {
     } else if (startingVersion < 39) {
         startVersionUpgrade('305');
         executeUpdate(39, '305', '3.0.5');
+    } else if (startingVersion < 40) {
+        startVersionUpgrade('306');
+        executeUpdate(40, '306', '3.0.6');
     } else {
         installationFinished();
     }
diff --git a/install/mods-for-hesk/sql/installSql.php b/install/mods-for-hesk/sql/installSql.php
index cf525cc6..98c39d53 100644
--- a/install/mods-for-hesk/sql/installSql.php
+++ b/install/mods-for-hesk/sql/installSql.php
@@ -974,6 +974,12 @@ function execute305Scripts() {
     updateVersion('3.0.5');
 }
 
+function execute306Scripts() {
+    global $hesk_settings;
+    hesk_dbConnect();
+
+    updateVersion('3.0.6');
+}
 function execute310Scripts() {
     global $hesk_settings;
     hesk_dbConnect();

From 3cdcc411a4de84bffd51c93e0b4743835deb44c2 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Tue, 11 Apr 2017 21:44:57 -0400
Subject: [PATCH 097/192] Fix pulling attachments, file checking

---
 api/BusinessLogic/Security/UserContext.php        | 2 +-
 api/BusinessLogic/Security/UserContextBuilder.php | 2 +-
 api/BusinessLogic/Tickets/Ticket.php              | 4 ++++
 api/DataAccess/Files/FileReader.php               | 7 +++++++
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/api/BusinessLogic/Security/UserContext.php b/api/BusinessLogic/Security/UserContext.php
index 30baf47b..27318d14 100644
--- a/api/BusinessLogic/Security/UserContext.php
+++ b/api/BusinessLogic/Security/UserContext.php
@@ -64,7 +64,7 @@ class UserContext {
         $userContext = new UserContext();
         $userContext->id = $dataRow['id'];
         $userContext->username = $dataRow['user'];
-        $userContext->admin = $dataRow['isadmin'];
+        $userContext->admin = $dataRow['isadmin'] === '1';
         $userContext->name = $dataRow['name'];
         $userContext->email = $dataRow['email'];
         $userContext->signature = $dataRow['signature'];
diff --git a/api/BusinessLogic/Security/UserContextBuilder.php b/api/BusinessLogic/Security/UserContextBuilder.php
index 064968c2..65c4972e 100644
--- a/api/BusinessLogic/Security/UserContextBuilder.php
+++ b/api/BusinessLogic/Security/UserContextBuilder.php
@@ -33,7 +33,7 @@ class UserContextBuilder {
             throw new InvalidAuthenticationTokenException();
         }
 
-        return $this->fromDataRow($userRow);
+        return UserContext::fromDataRow($userRow);
     }
 
     /**
diff --git a/api/BusinessLogic/Tickets/Ticket.php b/api/BusinessLogic/Tickets/Ticket.php
index 73442104..2d7ba879 100644
--- a/api/BusinessLogic/Tickets/Ticket.php
+++ b/api/BusinessLogic/Tickets/Ticket.php
@@ -42,6 +42,10 @@ class Ticket {
             $attachments = explode(',', $row['attachments']);
             $attachmentArray = array();
             foreach ($attachments as $attachment) {
+                if (trim($attachment) === '') {
+                    continue;
+                }
+
                 $attachmentRow = explode('#', $attachment);
                 $attachmentModel = new Attachment();
 
diff --git a/api/DataAccess/Files/FileReader.php b/api/DataAccess/Files/FileReader.php
index 296c966d..c4ef2eb0 100644
--- a/api/DataAccess/Files/FileReader.php
+++ b/api/DataAccess/Files/FileReader.php
@@ -3,6 +3,8 @@
 namespace DataAccess\Files;
 
 
+use BusinessLogic\Exceptions\ApiFriendlyException;
+
 class FileReader {
     /**
      * @param $name string - The file name (including extension)
@@ -13,6 +15,11 @@ class FileReader {
     function readFromFile($name, $folder) {
         // __DIR__ === '/{ROOT}/api/DataAccess/Files
         $location = __DIR__ . "/../../../{$folder}/{$name}";
+
+        if (!file_exists($location)) {
+            throw new ApiFriendlyException("The file '{$name}' does not exist on the server", "File Not Found", 404);
+        }
+
         $fileContents = file_get_contents($location);
 
         if ($fileContents === false) {

From d67485af1348446c17e8f85dce53c940bc2113e7 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Wed, 12 Apr 2017 22:00:56 -0400
Subject: [PATCH 098/192] Ticket attachments can be deleted

---
 api/ApplicationContext.php                    |  5 +-
 .../Attachments/AttachmentHandler.php         | 33 +++++++-
 .../Security/UserToTicketChecker.php          |  4 +-
 .../StaffTicketAttachmentsController.php      | 11 +++
 api/DataAccess/Files/FileDeleter.php          | 17 +++++
 .../Attachments/AttachmentHandlerTest.php     | 76 ++++++++++++++++++-
 6 files changed, 141 insertions(+), 5 deletions(-)
 create mode 100644 api/DataAccess/Files/FileDeleter.php

diff --git a/api/ApplicationContext.php b/api/ApplicationContext.php
index a170a5ec..602604af 100644
--- a/api/ApplicationContext.php
+++ b/api/ApplicationContext.php
@@ -22,6 +22,7 @@ use BusinessLogic\Tickets\TrackingIdGenerator;
 use BusinessLogic\Tickets\VerifiedEmailChecker;
 use DataAccess\Attachments\AttachmentGateway;
 use DataAccess\Categories\CategoryGateway;
+use DataAccess\Files\FileDeleter;
 use DataAccess\Files\FileReader;
 use DataAccess\Files\FileWriter;
 use DataAccess\Logging\LoggingGateway;
@@ -102,11 +103,13 @@ class ApplicationContext {
         $this->get[UserToTicketChecker::class] = new UserToTicketChecker($this->get[UserGateway::class]);
         $this->get[FileWriter::class] = new FileWriter();
         $this->get[FileReader::class] = new FileReader();
+        $this->get[FileDeleter::class] = new FileDeleter();
         $this->get[AttachmentGateway::class] = new AttachmentGateway();
         $this->get[AttachmentHandler::class] = new AttachmentHandler($this->get[TicketGateway::class],
             $this->get[AttachmentGateway::class],
             $this->get[FileWriter::class],
-            $this->get[UserToTicketChecker::class]);
+            $this->get[UserToTicketChecker::class],
+            $this->get[FileDeleter::class]);
         $this->get[AttachmentRetriever::class] = new AttachmentRetriever($this->get[AttachmentGateway::class],
             $this->get[FileReader::class],
             $this->get[TicketGateway::class],
diff --git a/api/BusinessLogic/Attachments/AttachmentHandler.php b/api/BusinessLogic/Attachments/AttachmentHandler.php
index f11d98f6..343c13c1 100644
--- a/api/BusinessLogic/Attachments/AttachmentHandler.php
+++ b/api/BusinessLogic/Attachments/AttachmentHandler.php
@@ -3,6 +3,7 @@
 namespace BusinessLogic\Attachments;
 
 
+use BusinessLogic\Exceptions\ApiFriendlyException;
 use BusinessLogic\Exceptions\ValidationException;
 use BusinessLogic\Security\UserContext;
 use BusinessLogic\Security\UserToTicketChecker;
@@ -10,6 +11,7 @@ use BusinessLogic\Tickets\Attachment;
 use BusinessLogic\Tickets\Ticket;
 use BusinessLogic\ValidationModel;
 use DataAccess\Attachments\AttachmentGateway;
+use DataAccess\Files\FileDeleter;
 use DataAccess\Files\FileWriter;
 use DataAccess\Tickets\TicketGateway;
 
@@ -23,14 +25,18 @@ class AttachmentHandler {
     /* @var $fileWriter FileWriter */
     private $fileWriter;
 
+    /* @var $fileDeleter FileDeleter */
+    private $fileDeleter;
+
     /* @var  $userToTicketChecker UserToTicketChecker */
     private $userToTicketChecker;
 
-    function __construct($ticketGateway, $attachmentGateway, $fileWriter, $userToTicketChecker) {
+    function __construct($ticketGateway, $attachmentGateway, $fileWriter, $userToTicketChecker, $fileDeleter) {
         $this->ticketGateway = $ticketGateway;
         $this->attachmentGateway = $attachmentGateway;
         $this->fileWriter = $fileWriter;
         $this->userToTicketChecker = $userToTicketChecker;
+        $this->fileDeleter = $fileDeleter;
     }
 
 
@@ -75,6 +81,31 @@ class AttachmentHandler {
         return $ticketAttachment;
     }
 
+    function deleteAttachmentFromTicket($ticketId, $attachmentId, $userContext, $heskSettings) {
+        $ticket = $this->ticketGateway->getTicketById($ticketId, $heskSettings);
+
+        if (!$this->userToTicketChecker->isTicketWritableToUser($userContext, $ticket, true, $heskSettings)) {
+            throw new \Exception("User does not have access to ticket {$ticketId} being created / edited!");
+        }
+
+        $indexToRemove = -1;
+        for ($i = 0; $i < count($ticket->attachments); $i++) {
+            $attachment = $ticket->attachments[$i];
+            if ($attachment->id === $attachmentId) {
+                $indexToRemove = $i;
+                $this->fileDeleter->deleteFile($attachment->savedName, $heskSettings['attach_dir']);
+            }
+        }
+
+        if ($indexToRemove === -1) {
+            throw new ApiFriendlyException("Attachment not found for ticket!", "Attachment not found", 404);
+        }
+
+        $attachments = $ticket->attachments;
+        unset($attachments[$indexToRemove]);
+        $this->ticketGateway->updateAttachmentsForTicket($ticketId, $attachments, $heskSettings);
+    }
+
     /**
      * @param $createAttachmentModel CreateAttachmentForTicketModel
      * @param $heskSettings array
diff --git a/api/BusinessLogic/Security/UserToTicketChecker.php b/api/BusinessLogic/Security/UserToTicketChecker.php
index 0c3b27bf..777bd200 100644
--- a/api/BusinessLogic/Security/UserToTicketChecker.php
+++ b/api/BusinessLogic/Security/UserToTicketChecker.php
@@ -30,7 +30,9 @@ class UserToTicketChecker {
             $categoryManagerId = $this->userGateway->getManagerForCategory($ticket->categoryId, $heskSettings);
 
             $hasAccess = $hasAccess &&
-                (in_array(UserPrivilege::CAN_EDIT_TICKETS, $user->permissions) || $categoryManagerId == $user->id);
+                ($user->admin === true
+                    || in_array(UserPrivilege::CAN_EDIT_TICKETS, $user->permissions)
+                    || $categoryManagerId == $user->id);
         }
 
         return $hasAccess;
diff --git a/api/Controllers/Attachments/StaffTicketAttachmentsController.php b/api/Controllers/Attachments/StaffTicketAttachmentsController.php
index ad63b7c0..3ca6ca74 100644
--- a/api/Controllers/Attachments/StaffTicketAttachmentsController.php
+++ b/api/Controllers/Attachments/StaffTicketAttachmentsController.php
@@ -55,4 +55,15 @@ class StaffTicketAttachmentsController {
 
         return $model;
     }
+
+    function delete($ticketId, $attachmentId) {
+        global $applicationContext, $hesk_settings, $userContext;
+
+        /* @var $attachmentHandler AttachmentHandler */
+        $attachmentHandler = $applicationContext->get[AttachmentHandler::class];
+
+        $attachmentHandler->deleteAttachmentFromTicket($ticketId, $attachmentId, $userContext, $hesk_settings);
+
+        return http_response_code(204);
+    }
 }
\ No newline at end of file
diff --git a/api/DataAccess/Files/FileDeleter.php b/api/DataAccess/Files/FileDeleter.php
new file mode 100644
index 00000000..a625d764
--- /dev/null
+++ b/api/DataAccess/Files/FileDeleter.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace DataAccess\Files;
+
+
+use BusinessLogic\Exceptions\ApiFriendlyException;
+
+class FileDeleter {
+    function deleteFile($name, $folder) {
+        $path = __DIR__ . "/../../../{$folder}/{$name}";
+        if (!file_exists($path)) {
+            return;
+        }
+
+        @unlink($path);
+    }
+}
\ No newline at end of file
diff --git a/api/Tests/BusinessLogic/Attachments/AttachmentHandlerTest.php b/api/Tests/BusinessLogic/Attachments/AttachmentHandlerTest.php
index f29940b6..9ff3ffd1 100644
--- a/api/Tests/BusinessLogic/Attachments/AttachmentHandlerTest.php
+++ b/api/Tests/BusinessLogic/Attachments/AttachmentHandlerTest.php
@@ -9,6 +9,7 @@ use BusinessLogic\Security\UserContext;
 use BusinessLogic\Security\UserToTicketChecker;
 use BusinessLogic\Tickets\Ticket;
 use DataAccess\Attachments\AttachmentGateway;
+use DataAccess\Files\FileDeleter;
 use DataAccess\Files\FileWriter;
 use DataAccess\Tickets\TicketGateway;
 use PHPUnit\Framework\TestCase;
@@ -33,6 +34,9 @@ class AttachmentHandlerTest extends TestCase {
     /* @var $fileWriter \PHPUnit_Framework_MockObject_MockObject */
     private $fileWriter;
 
+    /* @var $fileDeleter \PHPUnit_Framework_MockObject_MockObject */
+    private $fileDeleter;
+
     /* @var $userContext UserContext */
     private $userContext;
 
@@ -43,8 +47,8 @@ class AttachmentHandlerTest extends TestCase {
         $this->ticketGateway = $this->createMock(TicketGateway::class);
         $this->attachmentGateway = $this->createMock(AttachmentGateway::class);
         $this->fileWriter = $this->createMock(FileWriter::class);
+        $this->fileDeleter = $this->createMock(FileDeleter::class);
         $this->userToTicketChecker = $this->createMock(UserToTicketChecker::class);
-        $this->userToTicketChecker->method('isTicketWritableToUser')->willReturn(true);
         $this->heskSettings = array(
             'attach_dir' => 'attachments',
             'attachments' => array(
@@ -56,7 +60,8 @@ class AttachmentHandlerTest extends TestCase {
         $this->attachmentHandler = new AttachmentHandler($this->ticketGateway,
             $this->attachmentGateway,
             $this->fileWriter,
-            $this->userToTicketChecker);
+            $this->userToTicketChecker,
+            $this->fileDeleter);
         $this->createAttachmentForTicketModel = new CreateAttachmentForTicketModel();
         $this->createAttachmentForTicketModel->attachmentContents = base64_encode('string');
         $this->createAttachmentForTicketModel->displayName = 'DisplayName.txt';
@@ -67,6 +72,7 @@ class AttachmentHandlerTest extends TestCase {
 
     function testThatValidateThrowsAnExceptionWhenTheAttachmentBodyIsNull() {
         //-- Arrange
+        $this->userToTicketChecker->method('isTicketWritableToUser')->willReturn(true);
         $this->createAttachmentForTicketModel->attachmentContents = null;
 
         //-- Assert
@@ -79,6 +85,7 @@ class AttachmentHandlerTest extends TestCase {
 
     function testThatValidateThrowsAnExceptionWhenTheAttachmentBodyIsEmpty() {
         //-- Arrange
+        $this->userToTicketChecker->method('isTicketWritableToUser')->willReturn(true);
         $this->createAttachmentForTicketModel->attachmentContents = '';
 
         //-- Assert
@@ -91,6 +98,7 @@ class AttachmentHandlerTest extends TestCase {
 
     function testThatValidateThrowsAnExceptionWhenTheAttachmentBodyIsInvalidBase64() {
         //-- Arrange
+        $this->userToTicketChecker->method('isTicketWritableToUser')->willReturn(true);
         $this->createAttachmentForTicketModel->attachmentContents = 'invalid base 64';
 
         //-- Assert
@@ -103,6 +111,7 @@ class AttachmentHandlerTest extends TestCase {
 
     function testThatValidateThrowsAnExceptionWhenTheDisplayNameIsNull() {
         //-- Arrange
+        $this->userToTicketChecker->method('isTicketWritableToUser')->willReturn(true);
         $this->createAttachmentForTicketModel->displayName = null;
 
         //-- Assert
@@ -115,6 +124,7 @@ class AttachmentHandlerTest extends TestCase {
 
     function testThatValidateThrowsAnExceptionWhenTheDisplayNameIsEmpty() {
         //-- Arrange
+        $this->userToTicketChecker->method('isTicketWritableToUser')->willReturn(true);
         $this->createAttachmentForTicketModel->displayName = '';
 
         //-- Assert
@@ -127,6 +137,7 @@ class AttachmentHandlerTest extends TestCase {
 
     function testThatValidateThrowsAnExceptionWhenTheTicketIdIsNull() {
         //-- Arrange
+        $this->userToTicketChecker->method('isTicketWritableToUser')->willReturn(true);
         $this->createAttachmentForTicketModel->ticketId = null;
 
         //-- Assert
@@ -139,6 +150,7 @@ class AttachmentHandlerTest extends TestCase {
 
     function testThatValidateThrowsAnExceptionWhenTheTicketIdIsANonPositiveInteger() {
         //-- Arrange
+        $this->userToTicketChecker->method('isTicketWritableToUser')->willReturn(true);
         $this->createAttachmentForTicketModel->ticketId = 0;
 
         //-- Assert
@@ -151,6 +163,7 @@ class AttachmentHandlerTest extends TestCase {
 
     function testThatValidateThrowsAnExceptionWhenTheFileExtensionIsNotPermitted() {
         //-- Arrange
+        $this->userToTicketChecker->method('isTicketWritableToUser')->willReturn(true);
         $this->heskSettings['attachments']['allowed_types'] = array('.gif');
         $this->createAttachmentForTicketModel->ticketId = 0;
 
@@ -164,6 +177,7 @@ class AttachmentHandlerTest extends TestCase {
 
     function testThatValidateThrowsAnExceptionWhenTheFileSizeIsLargerThanMaxPermitted() {
         //-- Arrange
+        $this->userToTicketChecker->method('isTicketWritableToUser')->willReturn(true);
         $this->createAttachmentForTicketModel->attachmentContents = base64_encode("msg");
         $this->heskSettings['attachments']['max_size'] = 1;
 
@@ -177,6 +191,7 @@ class AttachmentHandlerTest extends TestCase {
 
     function testItSavesATicketWithTheProperProperties() {
         //-- Arrange
+        $this->userToTicketChecker->method('isTicketWritableToUser')->willReturn(true);
         $this->createAttachmentForTicketModel->ticketId = 1;
         $ticket = new Ticket();
         $ticket->trackingId = 'ABC-DEF-1234';
@@ -205,6 +220,7 @@ class AttachmentHandlerTest extends TestCase {
 
     function testItSavesTheFileToTheFileSystem() {
         //-- Arrange
+        $this->userToTicketChecker->method('isTicketWritableToUser')->willReturn(true);
         $this->createAttachmentForTicketModel->ticketId = 1;
         $ticket = new Ticket();
         $ticket->trackingId = 'ABC-DEF-1234';
@@ -229,4 +245,60 @@ class AttachmentHandlerTest extends TestCase {
     }
 
     //-- TODO Test UserToTicketChecker
+
+    function testDeleteThrowsAnExceptionWhenTheUserDoesNotHaveAccessToTheTicket() {
+        //-- Arrange
+        $ticketId = 1;
+        $ticket = new Ticket();
+        $this->ticketGateway->method('getTicketById')
+            ->with($ticketId, $this->heskSettings)->willReturn($ticket);
+        $this->userToTicketChecker->method('isTicketWritableToUser')
+            ->with($this->userContext, $ticket, true, $this->heskSettings)
+            ->willReturn(false);
+
+        //-- Assert
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage("User does not have access to ticket {$ticketId} being created / edited!");
+
+        //-- Act
+        $this->attachmentHandler->deleteAttachmentFromTicket($ticketId, 1, $this->userContext, $this->heskSettings);
+    }
+
+    function testDeleteActuallyDeletesTheFile() {
+        //-- Arrange
+        $ticketId = 1;
+        $ticket = new Ticket();
+        $attachment = new Attachment();
+        $attachment->id = 5;
+        $attachment->savedName = 'foobar.txt';
+        $this->heskSettings['attach_dir'] = 'attach-dir';
+        $ticket->attachments = array($attachment);
+        $this->ticketGateway->method('getTicketById')->willReturn($ticket);
+        $this->userToTicketChecker->method('isTicketWritableToUser')->willReturn(true);
+
+        //-- Assert
+        $this->fileDeleter->expects($this->once())->method('deleteFile')->with('foobar.txt', 'attach-dir');
+
+        //-- Act
+        $this->attachmentHandler->deleteAttachmentFromTicket($ticketId, 5, $this->userContext, $this->heskSettings);
+    }
+
+    function testDeleteUpdatesTheTicketItselfAndSavesIt() {
+        //-- Arrange
+        $ticketId = 1;
+        $ticket = new Ticket();
+        $attachment = new Attachment();
+        $attachment->id = 5;
+        $attachment->savedName = 'foobar.txt';
+        $this->heskSettings['attach_dir'] = 'attach-dir';
+        $ticket->attachments = array($attachment);
+        $this->ticketGateway->method('getTicketById')->willReturn($ticket);
+        $this->userToTicketChecker->method('isTicketWritableToUser')->willReturn(true);
+
+        //-- Assert
+        $this->ticketGateway->expects($this->once())->method('updateAttachmentsForTicket');
+
+        //-- Act
+        $this->attachmentHandler->deleteAttachmentFromTicket($ticketId, 5, $this->userContext, $this->heskSettings);
+    }
 }

From 2131df0cd96a39375fccde4d3bef0cecafa852d2 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sat, 15 Apr 2017 22:38:46 -0400
Subject: [PATCH 099/192] Working on deleting tickets... a bit more complicated
 than I initially thought

---
 .../Attachments/AttachmentHandler.php         | 46 +++++++--
 .../Attachments/AttachmentRetriever.php       |  2 +-
 api/BusinessLogic/Security/UserPrivilege.php  |  1 +
 .../Security/UserToTicketChecker.php          | 38 +++++---
 api/BusinessLogic/Tickets/Ticket.php          |  2 +-
 api/BusinessLogic/Tickets/TicketDeleter.php   | 43 +++++++++
 ...oller.php => CustomerTicketController.php} | 12 ++-
 api/DataAccess/Tickets/TicketGateway.php      | 38 +++++++-
 .../Attachments/AttachmentHandlerTest.php     | 53 ++++++++---
 .../Attachments/AttachmentRetrieverTest.php   |  2 +-
 .../Security/UserToTicketCheckerTest.php      | 10 +-
 .../Tickets/TicketDeleterTest.php             | 93 +++++++++++++++++++
 api/index.php                                 |  7 +-
 13 files changed, 293 insertions(+), 54 deletions(-)
 create mode 100644 api/BusinessLogic/Tickets/TicketDeleter.php
 rename api/Controllers/Tickets/{TicketController.php => CustomerTicketController.php} (91%)
 create mode 100644 api/Tests/BusinessLogic/Tickets/TicketDeleterTest.php

diff --git a/api/BusinessLogic/Attachments/AttachmentHandler.php b/api/BusinessLogic/Attachments/AttachmentHandler.php
index 343c13c1..333a5ec8 100644
--- a/api/BusinessLogic/Attachments/AttachmentHandler.php
+++ b/api/BusinessLogic/Attachments/AttachmentHandler.php
@@ -6,6 +6,7 @@ namespace BusinessLogic\Attachments;
 use BusinessLogic\Exceptions\ApiFriendlyException;
 use BusinessLogic\Exceptions\ValidationException;
 use BusinessLogic\Security\UserContext;
+use BusinessLogic\Security\UserPrivilege;
 use BusinessLogic\Security\UserToTicketChecker;
 use BusinessLogic\Tickets\Attachment;
 use BusinessLogic\Tickets\Ticket;
@@ -54,7 +55,11 @@ class AttachmentHandler {
 
         $ticket = $this->ticketGateway->getTicketById($createAttachmentModel->ticketId, $heskSettings);
 
-        if (!$this->userToTicketChecker->isTicketWritableToUser($userContext, $ticket, $createAttachmentModel->isEditing, $heskSettings)) {
+        $extraPermissions = $createAttachmentModel->isEditing
+            ? array(UserPrivilege::CAN_EDIT_TICKETS)
+            : array();
+
+        if (!$this->userToTicketChecker->isTicketAccessibleToUser($userContext, $ticket, $heskSettings, $extraPermissions)) {
             throw new \Exception("User does not have access to ticket {$ticket->id} being created / edited!");
         }
 
@@ -81,14 +86,26 @@ class AttachmentHandler {
         return $ticketAttachment;
     }
 
+    /**
+     * Supports deleting attachments from both ticket messages AND replies
+     *
+     * @param $ticketId int The ticket ID
+     * @param $attachmentId int The attachment ID
+     * @param $userContext UserContext
+     * @param $heskSettings array
+     * @throws ApiFriendlyException
+     * @throws \Exception
+     */
     function deleteAttachmentFromTicket($ticketId, $attachmentId, $userContext, $heskSettings) {
         $ticket = $this->ticketGateway->getTicketById($ticketId, $heskSettings);
 
-        if (!$this->userToTicketChecker->isTicketWritableToUser($userContext, $ticket, true, $heskSettings)) {
+        if (!$this->userToTicketChecker->isTicketAccessibleToUser($userContext, $ticket, $heskSettings, array(UserPrivilege::CAN_EDIT_TICKETS))) {
             throw new \Exception("User does not have access to ticket {$ticketId} being created / edited!");
         }
 
         $indexToRemove = -1;
+        $attachmentType = AttachmentType::MESSAGE;
+        $replyId = -1;
         for ($i = 0; $i < count($ticket->attachments); $i++) {
             $attachment = $ticket->attachments[$i];
             if ($attachment->id === $attachmentId) {
@@ -97,13 +114,30 @@ class AttachmentHandler {
             }
         }
 
+        foreach ($ticket->replies as $reply) {
+            for ($i = 0; $i < count($reply->attachments); $i++) {
+                $attachment = $reply->attachments[$i];
+                if ($attachment->id === $attachmentId) {
+                    $indexToRemove = $i;
+                    $replyId = $reply->id;
+                    $attachmentType = AttachmentType::REPLY;
+                    $this->fileDeleter->deleteFile($attachment->savedName, $heskSettings['attach_dir']);
+                }
+            }
+        }
+
         if ($indexToRemove === -1) {
-            throw new ApiFriendlyException("Attachment not found for ticket!", "Attachment not found", 404);
+            throw new ApiFriendlyException("Attachment not found for ticket or reply! ID: {$attachmentId}", "Attachment not found", 404);
         }
 
-        $attachments = $ticket->attachments;
-        unset($attachments[$indexToRemove]);
-        $this->ticketGateway->updateAttachmentsForTicket($ticketId, $attachments, $heskSettings);
+        if ($attachmentType == AttachmentType::MESSAGE) {
+            $attachments = $ticket->attachments;
+            unset($attachments[$indexToRemove]);
+            $this->ticketGateway->updateAttachmentsForTicket($ticketId, $attachments, $heskSettings);
+        } else {
+            $attachments = $ticket->replies[$replyId]->attachments;
+            unset($attachments[$indexToRemove]);
+        }
     }
 
     /**
diff --git a/api/BusinessLogic/Attachments/AttachmentRetriever.php b/api/BusinessLogic/Attachments/AttachmentRetriever.php
index c4889206..cfdec67b 100644
--- a/api/BusinessLogic/Attachments/AttachmentRetriever.php
+++ b/api/BusinessLogic/Attachments/AttachmentRetriever.php
@@ -31,7 +31,7 @@ class AttachmentRetriever {
     function getAttachmentContentsForTicket($ticketId, $attachmentId, $userContext, $heskSettings) {
         $ticket = $this->ticketGateway->getTicketById($ticketId, $heskSettings);
 
-        if (!$this->userToTicketChecker->isTicketWritableToUser($userContext, $ticket, false, $heskSettings)) {
+        if (!$this->userToTicketChecker->isTicketAccessibleToUser($userContext, $ticket, $heskSettings)) {
             throw new \Exception("User does not have access to attachment {$attachmentId}!");
         }
 
diff --git a/api/BusinessLogic/Security/UserPrivilege.php b/api/BusinessLogic/Security/UserPrivilege.php
index 4f2fb281..ad6064cc 100644
--- a/api/BusinessLogic/Security/UserPrivilege.php
+++ b/api/BusinessLogic/Security/UserPrivilege.php
@@ -13,4 +13,5 @@ class UserPrivilege {
     const CAN_VIEW_TICKETS = 'can_view_tickets';
     const CAN_REPLY_TO_TICKETS = 'can_reply_tickets';
     const CAN_EDIT_TICKETS = 'can_edit_tickets';
+    const CAN_DELETE_TICKETS = 'can_del_tickets';
 }
\ No newline at end of file
diff --git a/api/BusinessLogic/Security/UserToTicketChecker.php b/api/BusinessLogic/Security/UserToTicketChecker.php
index 777bd200..3da75192 100644
--- a/api/BusinessLogic/Security/UserToTicketChecker.php
+++ b/api/BusinessLogic/Security/UserToTicketChecker.php
@@ -17,24 +17,34 @@ class UserToTicketChecker {
     /**
      * @param $user UserContext
      * @param $ticket Ticket
-     * @param $isEditing bool true if editing a ticket, false if creating
      * @param $heskSettings array
+     * @param $extraPermissions UserPrivilege[] additional privileges the user needs besides CAN_VIEW_TICKETS (if not an admin)
+     *     for this to return true
      * @return bool
      */
-    function isTicketWritableToUser($user, $ticket, $isEditing, $heskSettings) {
-        $hasAccess = $user->admin === true ||
-            (in_array($ticket->categoryId, $user->categories) &&
-                in_array(UserPrivilege::CAN_VIEW_TICKETS, $user->permissions));
-
-        if ($isEditing) {
-            $categoryManagerId = $this->userGateway->getManagerForCategory($ticket->categoryId, $heskSettings);
-
-            $hasAccess = $hasAccess &&
-                ($user->admin === true
-                    || in_array(UserPrivilege::CAN_EDIT_TICKETS, $user->permissions)
-                    || $categoryManagerId == $user->id);
+    function isTicketAccessibleToUser($user, $ticket, $heskSettings, $extraPermissions = array()) {
+        if ($user->admin === true) {
+            return true;
         }
 
-        return $hasAccess;
+        if (!in_array($ticket->categoryId, $user->categories)) {
+            return false;
+        }
+
+        $categoryManagerId = $this->userGateway->getManagerForCategory($ticket->categoryId, $heskSettings);
+        
+        if ($user->id === $categoryManagerId) {
+            return true;
+        }
+
+        $extraPermissions[] = UserPrivilege::CAN_VIEW_TICKETS;
+
+        foreach ($extraPermissions as $permission) {
+            if (!in_array($permission, $user->permissions)) {
+                return false;
+            }
+        }
+
+        return true;
     }
 }
\ No newline at end of file
diff --git a/api/BusinessLogic/Tickets/Ticket.php b/api/BusinessLogic/Tickets/Ticket.php
index 2d7ba879..ea50b11e 100644
--- a/api/BusinessLogic/Tickets/Ticket.php
+++ b/api/BusinessLogic/Tickets/Ticket.php
@@ -127,7 +127,7 @@ class Ticket {
             $reply->isRead = $replyRow['read'];
             $reply->usesHtml = $replyRow['html'];
 
-            $replies[] = $reply;
+            $replies[$reply->id] = $reply;
         }
         $ticket->replies = $replies;
 
diff --git a/api/BusinessLogic/Tickets/TicketDeleter.php b/api/BusinessLogic/Tickets/TicketDeleter.php
new file mode 100644
index 00000000..6b181e4e
--- /dev/null
+++ b/api/BusinessLogic/Tickets/TicketDeleter.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace BusinessLogic\Tickets;
+
+
+use BusinessLogic\Attachments\AttachmentHandler;
+use BusinessLogic\Security\UserPrivilege;
+use BusinessLogic\Security\UserToTicketChecker;
+use DataAccess\Tickets\TicketGateway;
+
+class TicketDeleter {
+    /* @var $ticketGateway TicketGateway */
+    private $ticketGateway;
+
+    /* @var $userToTicketChecker UserToTicketChecker */
+    private $userToTicketChecker;
+
+    /* @var $attachmentHandler AttachmentHandler */
+    private $attachmentHandler;
+
+    function __construct($ticketGateway, $userToTicketChecker, $attachmentHandler) {
+        $this->ticketGateway = $ticketGateway;
+        $this->userToTicketChecker = $userToTicketChecker;
+        $this->attachmentHandler = $attachmentHandler;
+    }
+
+    function deleteTicket($ticketId, $userContext, $heskSettings) {
+        $ticket = $this->ticketGateway->getTicketById($ticketId, $heskSettings);
+
+        if (!$this->userToTicketChecker->isTicketAccessibleToUser($userContext, $ticket, $heskSettings,
+            array(UserPrivilege::CAN_DELETE_TICKETS))) {
+            throw new \Exception("User does not have access to ticket {$ticketId}");
+        }
+
+        foreach ($ticket->attachments as $attachment) {
+            $this->attachmentHandler->deleteAttachmentFromTicket($ticketId, $attachment->id, $userContext, $heskSettings);
+        }
+
+        //-- TODO Delete Replies
+
+        $this->ticketGateway->deleteTicket($ticketId, $heskSettings);
+    }
+}
\ No newline at end of file
diff --git a/api/Controllers/Tickets/TicketController.php b/api/Controllers/Tickets/CustomerTicketController.php
similarity index 91%
rename from api/Controllers/Tickets/TicketController.php
rename to api/Controllers/Tickets/CustomerTicketController.php
index a26b18e2..b1f83ed7 100644
--- a/api/Controllers/Tickets/TicketController.php
+++ b/api/Controllers/Tickets/CustomerTicketController.php
@@ -9,15 +9,15 @@ use BusinessLogic\Tickets\TicketRetriever;
 use Controllers\JsonRetriever;
 
 
-class TicketController {
-    function get($id) {
+class CustomerTicketController {
+    /*function get($id) {
         global $applicationContext, $hesk_settings, $userContext;
 
         /* @var $ticketRetriever TicketRetriever */
-        $ticketRetriever = $applicationContext->get[TicketRetriever::class];
+        /*$ticketRetriever = $applicationContext->get[TicketRetriever::class];
 
         output($ticketRetriever->getTicketById($id, $hesk_settings, $userContext));
-    }
+    }*/
 
     function post() {
         global $applicationContext, $hesk_settings, $userContext;
@@ -36,6 +36,10 @@ class TicketController {
         return output($ticket, 201);
     }
 
+    function delete($id) {
+        global $applicationContext, $hesk_settings, $userContext;
+    }
+
     /**
      * @param $json array
      * @return CreateTicketByCustomerModel
diff --git a/api/DataAccess/Tickets/TicketGateway.php b/api/DataAccess/Tickets/TicketGateway.php
index faf0428c..8ce266d8 100644
--- a/api/DataAccess/Tickets/TicketGateway.php
+++ b/api/DataAccess/Tickets/TicketGateway.php
@@ -3,6 +3,7 @@
 namespace DataAccess\Tickets;
 
 
+use BusinessLogic\Attachments\AttachmentType;
 use BusinessLogic\Tickets\Attachment;
 use BusinessLogic\Tickets\Ticket;
 use BusinessLogic\Tickets\TicketGatewayGeneratedFields;
@@ -55,8 +56,9 @@ class TicketGateway extends CommonDao {
         while ($row = hesk_dbFetchAssoc($rs)) {
             $linkedTicketsRs =
                 hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "tickets` WHERE `parent` = " . intval($row['id']));
+            $repliesRs = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "replies` WHERE `replyto` = " . intval($id) . " ORDER BY `id` ASC");
 
-            $tickets[] = Ticket::fromDatabaseRow($row, $linkedTicketsRs, $heskSettings);
+            $tickets[] = Ticket::fromDatabaseRow($row, $linkedTicketsRs, $repliesRs, $heskSettings);
         }
 
         $this->close();
@@ -79,8 +81,9 @@ class TicketGateway extends CommonDao {
 
         $row = hesk_dbFetchAssoc($rs);
         $linkedTicketsRs = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "tickets` WHERE `parent` = " . intval($trackingId));
+        $repliesRs = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "replies` WHERE `replyto` = " . intval($id) . " ORDER BY `id` ASC");
 
-        $ticket = Ticket::fromDatabaseRow($row, $linkedTicketsRs, $heskSettings);
+        $ticket = Ticket::fromDatabaseRow($row, $linkedTicketsRs, $repliesRs, $heskSettings);
 
         $this->close();
 
@@ -216,15 +219,42 @@ class TicketGateway extends CommonDao {
      */
     function updateAttachmentsForTicket($ticketId, $attachments, $heskSettings) {
         $this->init();
+        $this->updateAttachmentsFor($ticketId, $attachments, AttachmentType::MESSAGE, $heskSettings);
+        $this->close();
+    }
 
+    private function updateAttachmentsFor($id, $attachments, $attachmentType, $heskSettings) {
         $attachmentStrings = array();
         foreach ($attachments as $attachment) {
             $attachmentStrings[] = "{$attachment->id}#{$attachment->fileName}#{$attachment->savedName}";
         }
         $attachmentStringToSave = implode(',', $attachmentStrings);
 
-        hesk_dbQuery("UPDATE `" . hesk_dbEscape($heskSettings['db_pfix']) . "tickets` 
+        $tableName = $attachmentType == AttachmentType::MESSAGE ? 'tickets' : 'replies';
+
+        hesk_dbQuery("UPDATE `" . hesk_dbEscape($heskSettings['db_pfix']) . $tableName . "` 
             SET `attachments` = '" . hesk_dbEscape($attachmentStringToSave) . "' 
-            WHERE `id` = " . intval($ticketId));
+            WHERE `id` = " . intval($id));
+    }
+
+    /**
+     * @param $replyId int
+     * @param $attachments Attachment[]
+     * @param $heskSettings array
+     *
+     * Crappy logic that should just be pulled from the attachments table, but using for backwards compatibility
+     */
+    function updateAttachmentsForReply($replyId, $attachments, $heskSettings) {
+        $this->init();
+        $this->updateAttachmentsFor($replyId, $attachments, AttachmentType::REPLY, $heskSettings);
+        $this->close();
+    }
+
+    /**
+     * @param $ticketId int
+     * @param $heskSettings array
+     */
+    function deleteTicket($ticketId, $heskSettings) {
+        hesk_dbQuery("DELETE FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "tickets` WHERE `id` = " . intval($ticketId));
     }
 }
\ No newline at end of file
diff --git a/api/Tests/BusinessLogic/Attachments/AttachmentHandlerTest.php b/api/Tests/BusinessLogic/Attachments/AttachmentHandlerTest.php
index 9ff3ffd1..fb60f537 100644
--- a/api/Tests/BusinessLogic/Attachments/AttachmentHandlerTest.php
+++ b/api/Tests/BusinessLogic/Attachments/AttachmentHandlerTest.php
@@ -6,7 +6,9 @@ namespace BusinessLogic\Attachments;
 
 use BusinessLogic\Exceptions\ValidationException;
 use BusinessLogic\Security\UserContext;
+use BusinessLogic\Security\UserPrivilege;
 use BusinessLogic\Security\UserToTicketChecker;
+use BusinessLogic\Tickets\Reply;
 use BusinessLogic\Tickets\Ticket;
 use DataAccess\Attachments\AttachmentGateway;
 use DataAccess\Files\FileDeleter;
@@ -72,7 +74,7 @@ class AttachmentHandlerTest extends TestCase {
 
     function testThatValidateThrowsAnExceptionWhenTheAttachmentBodyIsNull() {
         //-- Arrange
-        $this->userToTicketChecker->method('isTicketWritableToUser')->willReturn(true);
+        $this->userToTicketChecker->method('isTicketAccessibleToUser')->willReturn(true);
         $this->createAttachmentForTicketModel->attachmentContents = null;
 
         //-- Assert
@@ -85,7 +87,7 @@ class AttachmentHandlerTest extends TestCase {
 
     function testThatValidateThrowsAnExceptionWhenTheAttachmentBodyIsEmpty() {
         //-- Arrange
-        $this->userToTicketChecker->method('isTicketWritableToUser')->willReturn(true);
+        $this->userToTicketChecker->method('isTicketAccessibleToUser')->willReturn(true);
         $this->createAttachmentForTicketModel->attachmentContents = '';
 
         //-- Assert
@@ -98,7 +100,7 @@ class AttachmentHandlerTest extends TestCase {
 
     function testThatValidateThrowsAnExceptionWhenTheAttachmentBodyIsInvalidBase64() {
         //-- Arrange
-        $this->userToTicketChecker->method('isTicketWritableToUser')->willReturn(true);
+        $this->userToTicketChecker->method('isTicketAccessibleToUser')->willReturn(true);
         $this->createAttachmentForTicketModel->attachmentContents = 'invalid base 64';
 
         //-- Assert
@@ -111,7 +113,7 @@ class AttachmentHandlerTest extends TestCase {
 
     function testThatValidateThrowsAnExceptionWhenTheDisplayNameIsNull() {
         //-- Arrange
-        $this->userToTicketChecker->method('isTicketWritableToUser')->willReturn(true);
+        $this->userToTicketChecker->method('isTicketAccessibleToUser')->willReturn(true);
         $this->createAttachmentForTicketModel->displayName = null;
 
         //-- Assert
@@ -124,7 +126,7 @@ class AttachmentHandlerTest extends TestCase {
 
     function testThatValidateThrowsAnExceptionWhenTheDisplayNameIsEmpty() {
         //-- Arrange
-        $this->userToTicketChecker->method('isTicketWritableToUser')->willReturn(true);
+        $this->userToTicketChecker->method('isTicketAccessibleToUser')->willReturn(true);
         $this->createAttachmentForTicketModel->displayName = '';
 
         //-- Assert
@@ -137,7 +139,7 @@ class AttachmentHandlerTest extends TestCase {
 
     function testThatValidateThrowsAnExceptionWhenTheTicketIdIsNull() {
         //-- Arrange
-        $this->userToTicketChecker->method('isTicketWritableToUser')->willReturn(true);
+        $this->userToTicketChecker->method('isTicketAccessibleToUser')->willReturn(true);
         $this->createAttachmentForTicketModel->ticketId = null;
 
         //-- Assert
@@ -150,7 +152,7 @@ class AttachmentHandlerTest extends TestCase {
 
     function testThatValidateThrowsAnExceptionWhenTheTicketIdIsANonPositiveInteger() {
         //-- Arrange
-        $this->userToTicketChecker->method('isTicketWritableToUser')->willReturn(true);
+        $this->userToTicketChecker->method('isTicketAccessibleToUser')->willReturn(true);
         $this->createAttachmentForTicketModel->ticketId = 0;
 
         //-- Assert
@@ -163,7 +165,7 @@ class AttachmentHandlerTest extends TestCase {
 
     function testThatValidateThrowsAnExceptionWhenTheFileExtensionIsNotPermitted() {
         //-- Arrange
-        $this->userToTicketChecker->method('isTicketWritableToUser')->willReturn(true);
+        $this->userToTicketChecker->method('isTicketAccessibleToUser')->willReturn(true);
         $this->heskSettings['attachments']['allowed_types'] = array('.gif');
         $this->createAttachmentForTicketModel->ticketId = 0;
 
@@ -177,7 +179,7 @@ class AttachmentHandlerTest extends TestCase {
 
     function testThatValidateThrowsAnExceptionWhenTheFileSizeIsLargerThanMaxPermitted() {
         //-- Arrange
-        $this->userToTicketChecker->method('isTicketWritableToUser')->willReturn(true);
+        $this->userToTicketChecker->method('isTicketAccessibleToUser')->willReturn(true);
         $this->createAttachmentForTicketModel->attachmentContents = base64_encode("msg");
         $this->heskSettings['attachments']['max_size'] = 1;
 
@@ -191,7 +193,7 @@ class AttachmentHandlerTest extends TestCase {
 
     function testItSavesATicketWithTheProperProperties() {
         //-- Arrange
-        $this->userToTicketChecker->method('isTicketWritableToUser')->willReturn(true);
+        $this->userToTicketChecker->method('isTicketAccessibleToUser')->willReturn(true);
         $this->createAttachmentForTicketModel->ticketId = 1;
         $ticket = new Ticket();
         $ticket->trackingId = 'ABC-DEF-1234';
@@ -220,7 +222,7 @@ class AttachmentHandlerTest extends TestCase {
 
     function testItSavesTheFileToTheFileSystem() {
         //-- Arrange
-        $this->userToTicketChecker->method('isTicketWritableToUser')->willReturn(true);
+        $this->userToTicketChecker->method('isTicketAccessibleToUser')->willReturn(true);
         $this->createAttachmentForTicketModel->ticketId = 1;
         $ticket = new Ticket();
         $ticket->trackingId = 'ABC-DEF-1234';
@@ -252,8 +254,8 @@ class AttachmentHandlerTest extends TestCase {
         $ticket = new Ticket();
         $this->ticketGateway->method('getTicketById')
             ->with($ticketId, $this->heskSettings)->willReturn($ticket);
-        $this->userToTicketChecker->method('isTicketWritableToUser')
-            ->with($this->userContext, $ticket, true, $this->heskSettings)
+        $this->userToTicketChecker->method('isTicketAccessibleToUser')
+            ->with($this->userContext, $ticket, $this->heskSettings, array(UserPrivilege::CAN_EDIT_TICKETS))
             ->willReturn(false);
 
         //-- Assert
@@ -274,7 +276,7 @@ class AttachmentHandlerTest extends TestCase {
         $this->heskSettings['attach_dir'] = 'attach-dir';
         $ticket->attachments = array($attachment);
         $this->ticketGateway->method('getTicketById')->willReturn($ticket);
-        $this->userToTicketChecker->method('isTicketWritableToUser')->willReturn(true);
+        $this->userToTicketChecker->method('isTicketAccessibleToUser')->willReturn(true);
 
         //-- Assert
         $this->fileDeleter->expects($this->once())->method('deleteFile')->with('foobar.txt', 'attach-dir');
@@ -293,7 +295,28 @@ class AttachmentHandlerTest extends TestCase {
         $this->heskSettings['attach_dir'] = 'attach-dir';
         $ticket->attachments = array($attachment);
         $this->ticketGateway->method('getTicketById')->willReturn($ticket);
-        $this->userToTicketChecker->method('isTicketWritableToUser')->willReturn(true);
+        $this->userToTicketChecker->method('isTicketAccessibleToUser')->willReturn(true);
+
+        //-- Assert
+        $this->ticketGateway->expects($this->once())->method('updateAttachmentsForTicket');
+
+        //-- Act
+        $this->attachmentHandler->deleteAttachmentFromTicket($ticketId, 5, $this->userContext, $this->heskSettings);
+    }
+
+    function testDeleteHandlesReplies() {
+        //-- Arrange
+        $ticketId = 1;
+        $ticket = new Ticket();
+        $reply = new Reply();
+        $attachment = new Attachment();
+        $attachment->id = 5;
+        $attachment->savedName = 'foobar.txt';
+        $this->heskSettings['attach_dir'] = 'attach-dir';
+        $reply->attachments = array($attachment);
+        $ticket->replies = array($reply);
+        $this->ticketGateway->method('getTicketById')->willReturn($ticket);
+        $this->userToTicketChecker->method('isTicketAccessibleToUser')->willReturn(true);
 
         //-- Assert
         $this->ticketGateway->expects($this->once())->method('updateAttachmentsForTicket');
diff --git a/api/Tests/BusinessLogic/Attachments/AttachmentRetrieverTest.php b/api/Tests/BusinessLogic/Attachments/AttachmentRetrieverTest.php
index d1b62e8a..5017ea91 100644
--- a/api/Tests/BusinessLogic/Attachments/AttachmentRetrieverTest.php
+++ b/api/Tests/BusinessLogic/Attachments/AttachmentRetrieverTest.php
@@ -40,7 +40,7 @@ class AttachmentRetrieverTest extends TestCase {
         $this->attachmentRetriever = new AttachmentRetriever($this->attachmentGateway, $this->fileReader,
             $this->ticketGateway, $this->userToTicketChecker);
 
-        $this->userToTicketChecker->method('isTicketWritableToUser')->willReturn(true);
+        $this->userToTicketChecker->method('isTicketAccessibleToUser')->willReturn(true);
     }
 
     function testItGetsTheMetadataFromTheGateway() {
diff --git a/api/Tests/BusinessLogic/Security/UserToTicketCheckerTest.php b/api/Tests/BusinessLogic/Security/UserToTicketCheckerTest.php
index 9304fa7a..d3afb126 100644
--- a/api/Tests/BusinessLogic/Security/UserToTicketCheckerTest.php
+++ b/api/Tests/BusinessLogic/Security/UserToTicketCheckerTest.php
@@ -33,7 +33,7 @@ class UserToTicketCheckerTest extends TestCase {
         $ticket = new Ticket();
 
         //-- Act
-        $result = $this->userToTicketChecker->isTicketWritableToUser($user, $ticket, false, $this->heskSettings);
+        $result = $this->userToTicketChecker->isTicketAccessibleToUser($user, $ticket, $this->heskSettings);
 
         //-- Assert
         self::assertThat($result, self::isTrue());
@@ -51,7 +51,7 @@ class UserToTicketCheckerTest extends TestCase {
         $ticket->categoryId = 1;
 
         //-- Act
-        $result = $this->userToTicketChecker->isTicketWritableToUser($user, $ticket, false, $this->heskSettings);
+        $result = $this->userToTicketChecker->isTicketAccessibleToUser($user, $ticket, $this->heskSettings);
 
         //-- Assert
         self::assertThat($result, self::isTrue());
@@ -69,7 +69,7 @@ class UserToTicketCheckerTest extends TestCase {
         $ticket->categoryId = 1;
 
         //-- Act
-        $result = $this->userToTicketChecker->isTicketWritableToUser($user, $ticket, false, $this->heskSettings);
+        $result = $this->userToTicketChecker->isTicketAccessibleToUser($user, $ticket, $this->heskSettings);
 
         //-- Assert
         self::assertThat($result, self::isFalse());
@@ -87,7 +87,7 @@ class UserToTicketCheckerTest extends TestCase {
         $ticket->categoryId = 1;
 
         //-- Act
-        $result = $this->userToTicketChecker->isTicketWritableToUser($user, $ticket, true, $this->heskSettings);
+        $result = $this->userToTicketChecker->isTicketAccessibleToUser($user, $ticket, $this->heskSettings, array(UserPrivilege::CAN_EDIT_TICKETS));
 
         //-- Assert
         self::assertThat($result, self::isFalse());
@@ -106,7 +106,7 @@ class UserToTicketCheckerTest extends TestCase {
         $ticket->categoryId = 1;
 
         //-- Act
-        $result = $this->userToTicketChecker->isTicketWritableToUser($user, $ticket, true, $this->heskSettings);
+        $result = $this->userToTicketChecker->isTicketAccessibleToUser($user, $ticket, $this->heskSettings, array(UserPrivilege::CAN_EDIT_TICKETS));
 
         //-- Assert
         self::assertThat($result, self::isTrue());
diff --git a/api/Tests/BusinessLogic/Tickets/TicketDeleterTest.php b/api/Tests/BusinessLogic/Tickets/TicketDeleterTest.php
new file mode 100644
index 00000000..60b5c164
--- /dev/null
+++ b/api/Tests/BusinessLogic/Tickets/TicketDeleterTest.php
@@ -0,0 +1,93 @@
+<?php
+
+
+namespace BusinessLogic\Tickets;
+
+
+use BusinessLogic\Attachments\AttachmentHandler;
+use BusinessLogic\Security\UserContext;
+use BusinessLogic\Security\UserToTicketChecker;
+use DataAccess\Tickets\TicketGateway;
+use PHPUnit\Framework\TestCase;
+
+class TicketDeleterTest extends TestCase {
+    /* @var $ticketDeleter TicketDeleter */
+    private $ticketDeleter;
+
+    /* @var $ticketGateway \PHPUnit_Framework_MockObject_MockObject */
+    private $ticketGateway;
+
+    /* @var $attachmentHandler \PHPUnit_Framework_MockObject_MockObject */
+    private $attachmentHandler;
+
+    /* @var $userContext UserContext */
+    private $userContext;
+
+    /* @var $heskSettings array */
+    private $heskSettings;
+
+    /* @var $userToTicketChecker \PHPUnit_Framework_MockObject_MockObject */
+    private $userToTicketChecker;
+
+    protected function setUp() {
+        $this->userToTicketChecker = $this->createMock(UserToTicketChecker::class);
+        $this->ticketGateway = $this->createMock(TicketGateway::class);
+        $this->attachmentHandler = $this->createMock(AttachmentHandler::class);
+
+        $this->ticketDeleter = new TicketDeleter($this->ticketGateway, $this->userToTicketChecker, $this->attachmentHandler);
+    }
+
+    function testItThrowsAnExceptionWhenTheUserDoesNotHavePermissionToDeleteTheTicket() {
+        //-- Arrange
+        $this->userToTicketChecker->method('isTicketAccessibleToUser')->willReturn(false);
+
+        //-- Assert
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage("User does not have access to ticket 1");
+
+        //-- Act
+        $this->ticketDeleter->deleteTicket(1, $this->userContext, $this->heskSettings);
+    }
+
+    function testItDeletesAllAttachmentsForTheTicket() {
+        //-- Arrange
+        $ticket = new Ticket();
+        $attachmentOne = new Attachment();
+        $attachmentOne->id = 1;
+        $attachmentTwo = new Attachment();
+        $attachmentTwo->id = 2;
+        $attachments = array($attachmentOne, $attachmentTwo);
+        $ticket->attachments = $attachments;
+        $this->ticketGateway->method('getTicketById')->willReturn($ticket);
+        $this->userToTicketChecker->method('isTicketAccessibleToUser')->willReturn(true);
+
+        //-- Assert
+        $this->attachmentHandler->expects($this->exactly(2))->method('deleteAttachmentFromTicket');
+
+        //-- Act
+        $this->ticketDeleter->deleteTicket(1, $this->userContext, $this->heskSettings);
+    }
+
+    function testItDeletesAllRepliesForTheTicket() {
+        //-- Arrange
+        
+        //-- Act
+
+        //-- Assert
+    }
+
+    function testItDeletesTheTicket() {
+        //-- Arrange
+        $ticket = new Ticket();
+        $ticket->attachments = array();
+        $ticket->id = 1;
+        $this->ticketGateway->method('getTicketById')->willReturn($ticket);
+        $this->userToTicketChecker->method('isTicketAccessibleToUser')->willReturn(true);
+
+        //-- Assert
+        $this->ticketGateway->expects($this->once())->method('deleteTicket')->with(1, $this->heskSettings);
+
+        //-- Act
+        $this->ticketDeleter->deleteTicket(1, $this->userContext, $this->heskSettings);
+    }
+}
diff --git a/api/index.php b/api/index.php
index 1968e797..22db3b70 100644
--- a/api/index.php
+++ b/api/index.php
@@ -150,9 +150,10 @@ Link::all(array(
     '/v1/categories' => \Controllers\Categories\CategoryController::class . '::printAllCategories',
     '/v1/categories/{i}' => \Controllers\Categories\CategoryController::class,
     // Tickets
-    '/v1/tickets/{i}' => \Controllers\Tickets\TicketController::class,
-    '/v1/tickets' => \Controllers\Tickets\TicketController::class,
-
+    '/v1/tickets/{i}' => \Controllers\Tickets\CustomerTicketController::class,
+    '/v1/tickets' => \Controllers\Tickets\CustomerTicketController::class,
+    // Tickets - Staff
+    '/v1/staff/tickets/{i}' => null,
     // Attachments
     '/v1/staff/tickets/{i}/attachments' => \Controllers\Attachments\StaffTicketAttachmentsController::class,
     '/v1/staff/tickets/{i}/attachments/{i}' => \Controllers\Attachments\StaffTicketAttachmentsController::class,

From 2ff27e197bdff9f3c35e5f465457c7139946f422 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sun, 23 Apr 2017 12:00:05 -0400
Subject: [PATCH 100/192] Add ability to delete ticket

---
 .../Attachments/AttachmentHandler.php         |  1 +
 api/BusinessLogic/Tickets/TicketDeleter.php   |  6 ++-
 api/DataAccess/Tickets/TicketGateway.php      | 30 +++++++++++--
 .../Attachments/AttachmentHandlerTest.php     |  7 ++-
 .../Tickets/TicketDeleterTest.php             | 44 ++++++++++++++++++-
 5 files changed, 81 insertions(+), 7 deletions(-)

diff --git a/api/BusinessLogic/Attachments/AttachmentHandler.php b/api/BusinessLogic/Attachments/AttachmentHandler.php
index 333a5ec8..d51ce710 100644
--- a/api/BusinessLogic/Attachments/AttachmentHandler.php
+++ b/api/BusinessLogic/Attachments/AttachmentHandler.php
@@ -137,6 +137,7 @@ class AttachmentHandler {
         } else {
             $attachments = $ticket->replies[$replyId]->attachments;
             unset($attachments[$indexToRemove]);
+            $this->ticketGateway->updateAttachmentsForReply($replyId, $attachments, $heskSettings);
         }
     }
 
diff --git a/api/BusinessLogic/Tickets/TicketDeleter.php b/api/BusinessLogic/Tickets/TicketDeleter.php
index 6b181e4e..826a4731 100644
--- a/api/BusinessLogic/Tickets/TicketDeleter.php
+++ b/api/BusinessLogic/Tickets/TicketDeleter.php
@@ -36,7 +36,11 @@ class TicketDeleter {
             $this->attachmentHandler->deleteAttachmentFromTicket($ticketId, $attachment->id, $userContext, $heskSettings);
         }
 
-        //-- TODO Delete Replies
+        $this->ticketGateway->deleteReplyDraftsForTicket($ticketId, $heskSettings);
+
+        $this->ticketGateway->deleteRepliesForTicket($ticketId, $heskSettings);
+
+        $this->ticketGateway->deleteNotesForTicket($ticketId, $heskSettings);
 
         $this->ticketGateway->deleteTicket($ticketId, $heskSettings);
     }
diff --git a/api/DataAccess/Tickets/TicketGateway.php b/api/DataAccess/Tickets/TicketGateway.php
index 8ce266d8..a326a537 100644
--- a/api/DataAccess/Tickets/TicketGateway.php
+++ b/api/DataAccess/Tickets/TicketGateway.php
@@ -56,7 +56,7 @@ class TicketGateway extends CommonDao {
         while ($row = hesk_dbFetchAssoc($rs)) {
             $linkedTicketsRs =
                 hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "tickets` WHERE `parent` = " . intval($row['id']));
-            $repliesRs = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "replies` WHERE `replyto` = " . intval($id) . " ORDER BY `id` ASC");
+            $repliesRs = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "replies` WHERE `replyto` = " . intval($row['id']) . " ORDER BY `id` ASC");
 
             $tickets[] = Ticket::fromDatabaseRow($row, $linkedTicketsRs, $repliesRs, $heskSettings);
         }
@@ -74,14 +74,14 @@ class TicketGateway extends CommonDao {
     function getTicketByTrackingId($trackingId, $heskSettings) {
         $this->init();
 
-        $rs = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "tickets` WHERE `id` = " . intval($trackingId));
+        $rs = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "tickets` WHERE `trackid` = " . intval($trackingId));
         if (hesk_dbNumRows($rs) === 0) {
             return null;
         }
 
         $row = hesk_dbFetchAssoc($rs);
         $linkedTicketsRs = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "tickets` WHERE `parent` = " . intval($trackingId));
-        $repliesRs = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "replies` WHERE `replyto` = " . intval($id) . " ORDER BY `id` ASC");
+        $repliesRs = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "replies` WHERE `replyto` = " . intval($row['id']) . " ORDER BY `id` ASC");
 
         $ticket = Ticket::fromDatabaseRow($row, $linkedTicketsRs, $repliesRs, $heskSettings);
 
@@ -250,6 +250,30 @@ class TicketGateway extends CommonDao {
         $this->close();
     }
 
+    function deleteRepliesForTicket($ticketId, $heskSettings) {
+        $this->init();
+
+        hesk_dbQuery("DELETE FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "replies` WHERE `replyto` = " . intval($ticketId));
+
+        $this->close();
+    }
+
+    function deleteReplyDraftsForTicket($ticketId, $heskSettings) {
+        $this->init();
+
+        hesk_dbQuery("DELETE FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "reply_drafts` WHERE `ticket`=" . intval($ticketId));
+
+        $this->close();
+    }
+
+    function deleteNotesForTicket($ticketId, $heskSettings) {
+        $this->init();
+
+        hesk_dbQuery("DELETE FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "notes` WHERE `ticket`='" . intval($ticketId) . "'");
+
+        $this->close();
+    }
+
     /**
      * @param $ticketId int
      * @param $heskSettings array
diff --git a/api/Tests/BusinessLogic/Attachments/AttachmentHandlerTest.php b/api/Tests/BusinessLogic/Attachments/AttachmentHandlerTest.php
index fb60f537..7ee2eb84 100644
--- a/api/Tests/BusinessLogic/Attachments/AttachmentHandlerTest.php
+++ b/api/Tests/BusinessLogic/Attachments/AttachmentHandlerTest.php
@@ -275,6 +275,7 @@ class AttachmentHandlerTest extends TestCase {
         $attachment->savedName = 'foobar.txt';
         $this->heskSettings['attach_dir'] = 'attach-dir';
         $ticket->attachments = array($attachment);
+        $ticket->replies = array();
         $this->ticketGateway->method('getTicketById')->willReturn($ticket);
         $this->userToTicketChecker->method('isTicketAccessibleToUser')->willReturn(true);
 
@@ -289,6 +290,7 @@ class AttachmentHandlerTest extends TestCase {
         //-- Arrange
         $ticketId = 1;
         $ticket = new Ticket();
+        $ticket->replies = array();
         $attachment = new Attachment();
         $attachment->id = 5;
         $attachment->savedName = 'foobar.txt';
@@ -309,17 +311,18 @@ class AttachmentHandlerTest extends TestCase {
         $ticketId = 1;
         $ticket = new Ticket();
         $reply = new Reply();
+        $reply->id = 10;
         $attachment = new Attachment();
         $attachment->id = 5;
         $attachment->savedName = 'foobar.txt';
         $this->heskSettings['attach_dir'] = 'attach-dir';
         $reply->attachments = array($attachment);
-        $ticket->replies = array($reply);
+        $ticket->replies = array(10 => $reply);
         $this->ticketGateway->method('getTicketById')->willReturn($ticket);
         $this->userToTicketChecker->method('isTicketAccessibleToUser')->willReturn(true);
 
         //-- Assert
-        $this->ticketGateway->expects($this->once())->method('updateAttachmentsForTicket');
+        $this->ticketGateway->expects($this->once())->method('updateAttachmentsForReply');
 
         //-- Act
         $this->attachmentHandler->deleteAttachmentFromTicket($ticketId, 5, $this->userContext, $this->heskSettings);
diff --git a/api/Tests/BusinessLogic/Tickets/TicketDeleterTest.php b/api/Tests/BusinessLogic/Tickets/TicketDeleterTest.php
index 60b5c164..4ac994a8 100644
--- a/api/Tests/BusinessLogic/Tickets/TicketDeleterTest.php
+++ b/api/Tests/BusinessLogic/Tickets/TicketDeleterTest.php
@@ -58,6 +58,7 @@ class TicketDeleterTest extends TestCase {
         $attachmentTwo->id = 2;
         $attachments = array($attachmentOne, $attachmentTwo);
         $ticket->attachments = $attachments;
+        $ticket->replies = array();
         $this->ticketGateway->method('getTicketById')->willReturn($ticket);
         $this->userToTicketChecker->method('isTicketAccessibleToUser')->willReturn(true);
 
@@ -70,16 +71,57 @@ class TicketDeleterTest extends TestCase {
 
     function testItDeletesAllRepliesForTheTicket() {
         //-- Arrange
-        
+        $ticket = new Ticket();
+        $ticket->attachments = array();
+        $ticket->replies = array();
+        $ticket->id = 1;
+        $this->ticketGateway->method('getTicketById')->willReturn($ticket);
+        $this->userToTicketChecker->method('isTicketAccessibleToUser')->willReturn(true);
+
+        //-- Assert
+        $this->ticketGateway->expects($this->once())->method('deleteRepliesForTicket')->with(1, $this->heskSettings);
+
         //-- Act
+        $this->ticketDeleter->deleteTicket(1, $this->userContext, $this->heskSettings);
+    }
+
+    function testItDeleteAllReplyDrafts() {
+        //-- Arrange
+        $ticket = new Ticket();
+        $ticket->attachments = array();
+        $ticket->replies = array();
+        $ticket->id = 1;
+        $this->ticketGateway->method('getTicketById')->willReturn($ticket);
+        $this->userToTicketChecker->method('isTicketAccessibleToUser')->willReturn(true);
 
         //-- Assert
+        $this->ticketGateway->expects($this->once())->method('deleteReplyDraftsForTicket')->with(1, $this->heskSettings);
+
+        //-- Act
+        $this->ticketDeleter->deleteTicket(1, $this->userContext, $this->heskSettings);
+    }
+
+    function testItDeletesTheTicketNotes() {
+        //-- Arrange
+        $ticket = new Ticket();
+        $ticket->attachments = array();
+        $ticket->replies = array();
+        $ticket->id = 1;
+        $this->ticketGateway->method('getTicketById')->willReturn($ticket);
+        $this->userToTicketChecker->method('isTicketAccessibleToUser')->willReturn(true);
+
+        //-- Assert
+        $this->ticketGateway->expects($this->once())->method('deleteNotesForTicket')->with(1, $this->heskSettings);
+
+        //-- Act
+        $this->ticketDeleter->deleteTicket(1, $this->userContext, $this->heskSettings);
     }
 
     function testItDeletesTheTicket() {
         //-- Arrange
         $ticket = new Ticket();
         $ticket->attachments = array();
+        $ticket->replies = array();
         $ticket->id = 1;
         $this->ticketGateway->method('getTicketById')->willReturn($ticket);
         $this->userToTicketChecker->method('isTicketAccessibleToUser')->willReturn(true);

From b03312f73cd7bd7bbacb323147c3cb58c5c2c3d2 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sun, 23 Apr 2017 22:08:48 -0400
Subject: [PATCH 101/192] Fixed a couple issues with deleting tickets

---
 api/ApplicationContext.php                      |  9 ++++++---
 .../Attachments/AttachmentHandler.php           |  2 ++
 api/BusinessLogic/Tickets/Ticket.php            |  5 +++++
 api/BusinessLogic/Tickets/TicketDeleter.php     |  6 ++++++
 .../Tickets/StaffTicketController.php           | 17 +++++++++++++++++
 .../Attachments/AttachmentGateway.php           |  9 +++++++++
 api/DataAccess/Tickets/TicketGateway.php        |  4 ++++
 api/index.php                                   |  2 +-
 8 files changed, 50 insertions(+), 4 deletions(-)
 create mode 100644 api/Controllers/Tickets/StaffTicketController.php

diff --git a/api/ApplicationContext.php b/api/ApplicationContext.php
index 602604af..d052b8e6 100644
--- a/api/ApplicationContext.php
+++ b/api/ApplicationContext.php
@@ -14,6 +14,7 @@ use BusinessLogic\Security\UserContextBuilder;
 use BusinessLogic\Security\UserToTicketChecker;
 use BusinessLogic\Settings\ApiChecker;
 use BusinessLogic\Tickets\Autoassigner;
+use BusinessLogic\Tickets\TicketDeleter;
 use BusinessLogic\Tickets\TicketRetriever;
 use BusinessLogic\Tickets\TicketCreator;
 use BusinessLogic\Tickets\NewTicketValidator;
@@ -81,6 +82,7 @@ class ApplicationContext {
             $this->get[MailgunEmailSender::class]);
 
         // Tickets
+        $this->get[UserToTicketChecker::class] = new UserToTicketChecker($this->get[UserGateway::class]);
         $this->get[TicketGateway::class] = new TicketGateway();
         $this->get[TicketRetriever::class] = new TicketRetriever($this->get[TicketGateway::class]);
         $this->get[TicketValidators::class] = new TicketValidators($this->get[TicketGateway::class]);
@@ -98,9 +100,6 @@ class ApplicationContext {
             $this->get[EmailSenderHelper::class],
             $this->get[UserGateway::class],
             $this->get[ModsForHeskSettingsGateway::class]);
-
-        // Attachments
-        $this->get[UserToTicketChecker::class] = new UserToTicketChecker($this->get[UserGateway::class]);
         $this->get[FileWriter::class] = new FileWriter();
         $this->get[FileReader::class] = new FileReader();
         $this->get[FileDeleter::class] = new FileDeleter();
@@ -114,5 +113,9 @@ class ApplicationContext {
             $this->get[FileReader::class],
             $this->get[TicketGateway::class],
             $this->get[UserToTicketChecker::class]);
+        $this->get[TicketDeleter::class] =
+            new TicketDeleter($this->get[TicketGateway::class],
+                $this->get[UserToTicketChecker::class],
+                $this->get[AttachmentHandler::class]);
     }
 }
\ No newline at end of file
diff --git a/api/BusinessLogic/Attachments/AttachmentHandler.php b/api/BusinessLogic/Attachments/AttachmentHandler.php
index d51ce710..862549e9 100644
--- a/api/BusinessLogic/Attachments/AttachmentHandler.php
+++ b/api/BusinessLogic/Attachments/AttachmentHandler.php
@@ -111,6 +111,7 @@ class AttachmentHandler {
             if ($attachment->id === $attachmentId) {
                 $indexToRemove = $i;
                 $this->fileDeleter->deleteFile($attachment->savedName, $heskSettings['attach_dir']);
+                $this->attachmentGateway->deleteAttachment($attachment->id, $heskSettings);
             }
         }
 
@@ -122,6 +123,7 @@ class AttachmentHandler {
                     $replyId = $reply->id;
                     $attachmentType = AttachmentType::REPLY;
                     $this->fileDeleter->deleteFile($attachment->savedName, $heskSettings['attach_dir']);
+                    $this->attachmentGateway->deleteAttachment($attachment->id, $heskSettings);
                 }
             }
         }
diff --git a/api/BusinessLogic/Tickets/Ticket.php b/api/BusinessLogic/Tickets/Ticket.php
index ea50b11e..f2e7a59a 100644
--- a/api/BusinessLogic/Tickets/Ticket.php
+++ b/api/BusinessLogic/Tickets/Ticket.php
@@ -37,6 +37,7 @@ class Ticket {
         $ticket->lastReplier = $row['replierid'] === null ? null : intval($row['replierid']);
         $ticket->archived = intval($row['archive']) === 1;
         $ticket->locked = intval($row['locked']) === 1;
+        $ticket->attachments = array();
 
         if (trim($row['attachments']) !== '') {
             $attachments = explode(',', $row['attachments']);
@@ -110,6 +111,10 @@ class Ticket {
                 $attachments = explode(',', $replyRow['attachments']);
                 $attachmentArray = array();
                 foreach ($attachments as $attachment) {
+                    if (trim($attachment) === '') {
+                        continue;
+                    }
+
                     $attachmentRow = explode('#', $attachment);
                     $attachmentModel = new Attachment();
 
diff --git a/api/BusinessLogic/Tickets/TicketDeleter.php b/api/BusinessLogic/Tickets/TicketDeleter.php
index 826a4731..cc9f3f8a 100644
--- a/api/BusinessLogic/Tickets/TicketDeleter.php
+++ b/api/BusinessLogic/Tickets/TicketDeleter.php
@@ -36,6 +36,12 @@ class TicketDeleter {
             $this->attachmentHandler->deleteAttachmentFromTicket($ticketId, $attachment->id, $userContext, $heskSettings);
         }
 
+        foreach ($ticket->replies as $reply) {
+            foreach ($reply->attachments as $attachment) {
+                $this->attachmentHandler->deleteAttachmentFromTicket($ticketId, $attachment->id, $userContext, $heskSettings);
+            }
+        }
+
         $this->ticketGateway->deleteReplyDraftsForTicket($ticketId, $heskSettings);
 
         $this->ticketGateway->deleteRepliesForTicket($ticketId, $heskSettings);
diff --git a/api/Controllers/Tickets/StaffTicketController.php b/api/Controllers/Tickets/StaffTicketController.php
new file mode 100644
index 00000000..27283b54
--- /dev/null
+++ b/api/Controllers/Tickets/StaffTicketController.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Controllers\Tickets;
+
+
+use BusinessLogic\Tickets\TicketDeleter;
+
+class StaffTicketController {
+    function delete($id) {
+        global $applicationContext, $userContext, $hesk_settings;
+
+        /* @var $ticketDeleter TicketDeleter */
+        $ticketDeleter = $applicationContext->get[TicketDeleter::class];
+
+        $ticketDeleter->deleteTicket($id, $userContext, $hesk_settings);
+    }
+}
\ No newline at end of file
diff --git a/api/DataAccess/Attachments/AttachmentGateway.php b/api/DataAccess/Attachments/AttachmentGateway.php
index ac7403fe..fc9982fc 100644
--- a/api/DataAccess/Attachments/AttachmentGateway.php
+++ b/api/DataAccess/Attachments/AttachmentGateway.php
@@ -53,4 +53,13 @@ class AttachmentGateway extends CommonDao {
 
         return $attachment;
     }
+
+    function deleteAttachment($attachmentId, $heskSettings) {
+        $this->init();
+
+        hesk_dbQuery("DELETE FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "attachments` 
+            WHERE `att_id` = " . intval($attachmentId));
+
+        $this->close();
+    }
 }
\ No newline at end of file
diff --git a/api/DataAccess/Tickets/TicketGateway.php b/api/DataAccess/Tickets/TicketGateway.php
index a326a537..b6f4bd99 100644
--- a/api/DataAccess/Tickets/TicketGateway.php
+++ b/api/DataAccess/Tickets/TicketGateway.php
@@ -279,6 +279,10 @@ class TicketGateway extends CommonDao {
      * @param $heskSettings array
      */
     function deleteTicket($ticketId, $heskSettings) {
+        $this->init();
+
         hesk_dbQuery("DELETE FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "tickets` WHERE `id` = " . intval($ticketId));
+
+        $this->close();
     }
 }
\ No newline at end of file
diff --git a/api/index.php b/api/index.php
index 22db3b70..c8d333bf 100644
--- a/api/index.php
+++ b/api/index.php
@@ -153,7 +153,7 @@ Link::all(array(
     '/v1/tickets/{i}' => \Controllers\Tickets\CustomerTicketController::class,
     '/v1/tickets' => \Controllers\Tickets\CustomerTicketController::class,
     // Tickets - Staff
-    '/v1/staff/tickets/{i}' => null,
+    '/v1/staff/tickets/{i}' => \Controllers\Tickets\StaffTicketController::class,
     // Attachments
     '/v1/staff/tickets/{i}/attachments' => \Controllers\Attachments\StaffTicketAttachmentsController::class,
     '/v1/staff/tickets/{i}/attachments/{i}' => \Controllers\Attachments\StaffTicketAttachmentsController::class,

From 54cb77b136a051d80078b24e6fc50fc2842c1d60 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Mon, 24 Apr 2017 13:07:11 -0400
Subject: [PATCH 102/192] Getting started on retrieving ticket customer-side

---
 api/BusinessLogic/Tickets/Ticket.php          | 25 ++++---
 api/BusinessLogic/Tickets/TicketRetriever.php | 30 ++++++++
 .../Tickets/TicketRetrieverTest.php           | 73 +++++++++++++++++++
 3 files changed, 116 insertions(+), 12 deletions(-)
 create mode 100644 api/Tests/BusinessLogic/Tickets/TicketRetrieverTest.php

diff --git a/api/BusinessLogic/Tickets/Ticket.php b/api/BusinessLogic/Tickets/Ticket.php
index f2e7a59a..2f8b0e28 100644
--- a/api/BusinessLogic/Tickets/Ticket.php
+++ b/api/BusinessLogic/Tickets/Ticket.php
@@ -9,7 +9,10 @@ class Ticket {
         $ticket->id = intval($row['id']);
         $ticket->trackingId = $row['trackid'];
         $ticket->name = $row['name'];
-        $ticket->email = $row['email'];
+        if ($row['email'] !== null) {
+            $emails = str_replace(';', ',', $row['email']);
+            $ticket->email = explode(',', strtolower($emails));
+        }
         $ticket->categoryId = intval($row['category']);
         $ticket->priorityId = intval($row['priority']);
         $ticket->subject = $row['subject'];
@@ -37,7 +40,6 @@ class Ticket {
         $ticket->lastReplier = $row['replierid'] === null ? null : intval($row['replierid']);
         $ticket->archived = intval($row['archive']) === 1;
         $ticket->locked = intval($row['locked']) === 1;
-        $ticket->attachments = array();
 
         if (trim($row['attachments']) !== '') {
             $attachments = explode(',', $row['attachments']);
@@ -72,7 +74,6 @@ class Ticket {
             }
         }
 
-        $ticket->linkedTicketIds = array();
         while ($linkedTicketsRow = hesk_dbFetchAssoc($linkedTicketsRs)) {
             $ticket->linkedTicketIds[] = $linkedTicketsRow['id'];
         }
@@ -155,7 +156,7 @@ class Ticket {
     public $name;
 
     /**
-     * @var string|null
+     * @var array|null
      */
     public $email;
 
@@ -200,9 +201,9 @@ class Ticket {
     public $closedDate;
 
     /**
-     * @var string[]|null
+     * @var string[]
      */
-    public $suggestedArticles;
+    public $suggestedArticles = array();
 
     /**
      * @var string
@@ -275,9 +276,9 @@ class Ticket {
     public $locked;
 
     /**
-     * @var Attachment[]|null
+     * @var Attachment[]
      */
-    public $attachments;
+    public $attachments = array();
 
     function getAttachmentsForDatabase() {
         $attachmentArray = array();
@@ -292,9 +293,9 @@ class Ticket {
     }
 
     /**
-     * @var int[]|null
+     * @var int[]
      */
-    public $mergedTicketIds;
+    public $mergedTicketIds = array();
 
     /**
      * @var string
@@ -309,7 +310,7 @@ class Ticket {
     /**
      * @var int[]
      */
-    public $linkedTicketIds;
+    public $linkedTicketIds = array();
 
     /**
      * @var float[]|null
@@ -347,5 +348,5 @@ class Ticket {
     /**
      * @var Reply[]
      */
-    public $replies;
+    public $replies = array();
 }
\ No newline at end of file
diff --git a/api/BusinessLogic/Tickets/TicketRetriever.php b/api/BusinessLogic/Tickets/TicketRetriever.php
index a9f4f8ec..d19ded3b 100644
--- a/api/BusinessLogic/Tickets/TicketRetriever.php
+++ b/api/BusinessLogic/Tickets/TicketRetriever.php
@@ -3,6 +3,8 @@
 namespace BusinessLogic\Tickets;
 
 
+use BusinessLogic\Exceptions\ValidationException;
+use BusinessLogic\ValidationModel;
 use DataAccess\Tickets\TicketGateway;
 
 class TicketRetriever {
@@ -18,4 +20,32 @@ class TicketRetriever {
     function getTicketById($id, $heskSettings, $userContext) {
         return $this->ticketGateway->getTicketById($id, $heskSettings);
     }
+
+    function getTicketByTrackingIdAndEmail($trackingId, $emailAddress, $heskSettings) {
+        $this->validate($trackingId, $emailAddress, $heskSettings);
+
+        $ticket = $this->ticketGateway->getTicketByTrackingId($trackingId, $heskSettings);
+
+        if ($heskSettings['email_view_ticket'] && !in_array($emailAddress, $ticket->email)) {
+            throw new \Exception("Email '{$emailAddress}' entered in for ticket '{$trackingId}' does not match!");
+        }
+
+        return $ticket;
+    }
+
+    private function validate($trackingId, $emailAddress, $heskSettings) {
+        $validationModel = new ValidationModel();
+
+        if ($trackingId === null || trim($trackingId) === '') {
+            $validationModel->errorKeys[] = 'MISSING_TRACKING_ID';
+        }
+
+        if ($heskSettings['email_view_ticket'] && ($emailAddress === null || trim($emailAddress) === '')) {
+            $validationModel->errorKeys[] = 'EMAIL_REQUIRED_AND_MISSING';
+        }
+
+        if (count($validationModel->errorKeys) > 0) {
+            throw new ValidationException($validationModel);
+        }
+    }
 }
\ No newline at end of file
diff --git a/api/Tests/BusinessLogic/Tickets/TicketRetrieverTest.php b/api/Tests/BusinessLogic/Tickets/TicketRetrieverTest.php
new file mode 100644
index 00000000..c5f0b25b
--- /dev/null
+++ b/api/Tests/BusinessLogic/Tickets/TicketRetrieverTest.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace BusinessLogic\Tickets;
+
+
+use DataAccess\Tickets\TicketGateway;
+use PHPUnit\Framework\TestCase;
+
+class TicketRetrieverTest extends TestCase {
+    /* @var $ticketRetriever TicketRetriever */
+    private $ticketRetriever;
+
+    /* @var $ticketGateway \PHPUnit_Framework_MockObject_MockObject */
+    private $ticketGateway;
+
+    /* @var $heskSettings array */
+    private $heskSettings;
+
+    protected function setUp() {
+        $this->ticketGateway = $this->createMock(TicketGateway::class);
+        $this->heskSettings = array('email_view_ticket' => 0);
+
+        $this->ticketRetriever = new TicketRetriever($this->ticketGateway);
+    }
+
+    function testItGetsTheTicketByTrackingId() {
+        //-- Arrange
+        $ticket = new Ticket();
+        $trackingId = '12345';
+        $this->ticketGateway->method('getTicketByTrackingId')->with($trackingId, $this->heskSettings)->willReturn($ticket);
+
+        //-- Act
+        $actual = $this->ticketRetriever->getTicketByTrackingIdAndEmail($trackingId, null, $this->heskSettings);
+
+        //-- Assert
+        self::assertThat($actual, self::equalTo($ticket));
+    }
+
+    function testItChecksTheTicketsEmailIfThePageRequiresIt() {
+        //-- Arrange
+        $ticket = new Ticket();
+        $email = 'email@example.com';
+        $ticket->email = array('email2@example.com;email3@example.com,email4@example.com');
+        $trackingId = '12345';
+        $this->heskSettings['email_view_ticket'] = 1;
+        $this->ticketGateway->method('getTicketByTrackingId')->with($trackingId, $this->heskSettings)->willReturn($ticket);
+
+        //-- Assert
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage("Email 'email@example.com' entered in for ticket '12345' does not match!");
+
+        //-- Act
+        $this->ticketRetriever->getTicketByTrackingIdAndEmail($trackingId, $email, $this->heskSettings);
+    }
+
+    function testItCanHandleTicketsWithMultipleEmails() {
+        //-- Arrange
+        $ticket = new Ticket();
+        $email = 'email2@example.com';
+        $ticket->email = array('email2@example.com','email3@example.com','email4@example.com');
+        $trackingId = '12345';
+        $this->heskSettings['email_view_ticket'] = 1;
+        $this->ticketGateway->method('getTicketByTrackingId')->with($trackingId, $this->heskSettings)->willReturn($ticket);
+
+        //-- Act
+        $actual = $this->ticketRetriever->getTicketByTrackingIdAndEmail($trackingId, $email, $this->heskSettings);
+
+        //-- Assert
+        self::assertThat($actual, self::equalTo($ticket));
+    }
+
+    //-- TODO Validation tests
+}

From 215bcca0796a3ca1b211d06c7135c1867342913e Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Mon, 24 Apr 2017 22:11:28 -0400
Subject: [PATCH 103/192] Can now get ticket by ID

---
 .../Attachments/AttachmentHandler.php         |  1 -
 .../Exceptions/ValidationException.php        |  2 +-
 api/BusinessLogic/Tickets/Ticket.php          |  3 ++-
 api/BusinessLogic/Tickets/TicketCreator.php   |  1 -
 api/BusinessLogic/Tickets/TicketRetriever.php | 11 +++++++++-
 api/BusinessLogic/ValidationModel.php         |  6 -----
 .../Tickets/CustomerTicketController.php      | 22 ++++++++-----------
 api/DataAccess/Tickets/TicketGateway.php      | 20 +++++++++++++++++
 .../Tickets/NewTicketValidatorTest.php        |  3 ++-
 .../Tickets/TicketRetrieverTest.php           | 14 ++++++++++++
 10 files changed, 58 insertions(+), 25 deletions(-)

diff --git a/api/BusinessLogic/Attachments/AttachmentHandler.php b/api/BusinessLogic/Attachments/AttachmentHandler.php
index 862549e9..22399f35 100644
--- a/api/BusinessLogic/Attachments/AttachmentHandler.php
+++ b/api/BusinessLogic/Attachments/AttachmentHandler.php
@@ -188,7 +188,6 @@ class AttachmentHandler {
         if (count($errorKeys) > 0) {
             $validationModel = new ValidationModel();
             $validationModel->errorKeys = $errorKeys;
-            $validationModel->valid = false;
             throw new ValidationException($validationModel);
         }
     }
diff --git a/api/BusinessLogic/Exceptions/ValidationException.php b/api/BusinessLogic/Exceptions/ValidationException.php
index 6ed8b552..0049f232 100644
--- a/api/BusinessLogic/Exceptions/ValidationException.php
+++ b/api/BusinessLogic/Exceptions/ValidationException.php
@@ -12,7 +12,7 @@ class ValidationException extends ApiFriendlyException {
      * @throws Exception If the validationModel's errorKeys is empty
      */
     function __construct($validationModel) {
-        if (count($validationModel->errorKeys) === 0 || $validationModel->valid) {
+        if (count($validationModel->errorKeys) === 0) {
             throw new Exception('Tried to throw a ValidationException, but the validation model was valid or had 0 error keys!');
         }
 
diff --git a/api/BusinessLogic/Tickets/Ticket.php b/api/BusinessLogic/Tickets/Ticket.php
index 2f8b0e28..73ebf8b4 100644
--- a/api/BusinessLogic/Tickets/Ticket.php
+++ b/api/BusinessLogic/Tickets/Ticket.php
@@ -11,7 +11,8 @@ class Ticket {
         $ticket->name = $row['name'];
         if ($row['email'] !== null) {
             $emails = str_replace(';', ',', $row['email']);
-            $ticket->email = explode(',', strtolower($emails));
+            $emails = explode(',', strtolower($emails));
+            $ticket->email = array_filter($emails);
         }
         $ticket->categoryId = intval($row['category']);
         $ticket->priorityId = intval($row['priority']);
diff --git a/api/BusinessLogic/Tickets/TicketCreator.php b/api/BusinessLogic/Tickets/TicketCreator.php
index 7e160936..2aed0579 100644
--- a/api/BusinessLogic/Tickets/TicketCreator.php
+++ b/api/BusinessLogic/Tickets/TicketCreator.php
@@ -86,7 +86,6 @@ class TicketCreator {
 
         if (count($validationModel->errorKeys) > 0) {
             // Validation failed
-            $validationModel->valid = false;
             throw new ValidationException($validationModel);
         }
 
diff --git a/api/BusinessLogic/Tickets/TicketRetriever.php b/api/BusinessLogic/Tickets/TicketRetriever.php
index d19ded3b..438af152 100644
--- a/api/BusinessLogic/Tickets/TicketRetriever.php
+++ b/api/BusinessLogic/Tickets/TicketRetriever.php
@@ -3,6 +3,7 @@
 namespace BusinessLogic\Tickets;
 
 
+use BusinessLogic\Exceptions\ApiFriendlyException;
 use BusinessLogic\Exceptions\ValidationException;
 use BusinessLogic\ValidationModel;
 use DataAccess\Tickets\TicketGateway;
@@ -25,9 +26,17 @@ class TicketRetriever {
         $this->validate($trackingId, $emailAddress, $heskSettings);
 
         $ticket = $this->ticketGateway->getTicketByTrackingId($trackingId, $heskSettings);
+        if ($ticket === null) {
+            $ticket = $this->ticketGateway->getTicketByMergedTrackingId($trackingId, $heskSettings);
+
+            if ($ticket === null) {
+                return null;
+            }
+        }
 
         if ($heskSettings['email_view_ticket'] && !in_array($emailAddress, $ticket->email)) {
-            throw new \Exception("Email '{$emailAddress}' entered in for ticket '{$trackingId}' does not match!");
+            throw new ApiFriendlyException("Email '{$emailAddress}' entered in for ticket '{$trackingId}' does not match!",
+                "Email Does Not Match", 400);
         }
 
         return $ticket;
diff --git a/api/BusinessLogic/ValidationModel.php b/api/BusinessLogic/ValidationModel.php
index 740af78e..b3e085cd 100644
--- a/api/BusinessLogic/ValidationModel.php
+++ b/api/BusinessLogic/ValidationModel.php
@@ -8,13 +8,7 @@ class ValidationModel {
      */
     public $errorKeys;
 
-    /**
-     * @var bool
-     */
-    public $valid;
-
     function __construct() {
         $this->errorKeys = [];
-        $this->valid = true;
     }
 }
\ No newline at end of file
diff --git a/api/Controllers/Tickets/CustomerTicketController.php b/api/Controllers/Tickets/CustomerTicketController.php
index b1f83ed7..a8b05b9b 100644
--- a/api/Controllers/Tickets/CustomerTicketController.php
+++ b/api/Controllers/Tickets/CustomerTicketController.php
@@ -6,18 +6,22 @@ use BusinessLogic\Helpers;
 use BusinessLogic\Tickets\CreateTicketByCustomerModel;
 use BusinessLogic\Tickets\TicketCreator;
 use BusinessLogic\Tickets\TicketRetriever;
+use BusinessLogic\ValidationModel;
 use Controllers\JsonRetriever;
 
 
 class CustomerTicketController {
-    /*function get($id) {
-        global $applicationContext, $hesk_settings, $userContext;
+    function get() {
+        global $applicationContext, $hesk_settings;
+
+        $trackingId = isset($_GET['trackingId']) ? $_GET['trackingId'] : null;
+        $emailAddress = isset($_GET['email']) ? $_GET['email'] : null;
 
         /* @var $ticketRetriever TicketRetriever */
-        /*$ticketRetriever = $applicationContext->get[TicketRetriever::class];
+        $ticketRetriever = $applicationContext->get[TicketRetriever::class];
 
-        output($ticketRetriever->getTicketById($id, $hesk_settings, $userContext));
-    }*/
+        output($ticketRetriever->getTicketByTrackingIdAndEmail($trackingId, $emailAddress, $hesk_settings));
+    }
 
     function post() {
         global $applicationContext, $hesk_settings, $userContext;
@@ -29,17 +33,9 @@ class CustomerTicketController {
 
         $ticket = $ticketCreator->createTicketByCustomer($this->buildTicketRequestFromJson($jsonRequest), $hesk_settings, $userContext);
 
-        //if ticket is a stageTicket, email user
-        //else if assigned to owner, email new owner
-        //else email all staff
-
         return output($ticket, 201);
     }
 
-    function delete($id) {
-        global $applicationContext, $hesk_settings, $userContext;
-    }
-
     /**
      * @param $json array
      * @return CreateTicketByCustomerModel
diff --git a/api/DataAccess/Tickets/TicketGateway.php b/api/DataAccess/Tickets/TicketGateway.php
index b6f4bd99..7a940bc8 100644
--- a/api/DataAccess/Tickets/TicketGateway.php
+++ b/api/DataAccess/Tickets/TicketGateway.php
@@ -90,6 +90,26 @@ class TicketGateway extends CommonDao {
         return $ticket;
     }
 
+    /**
+     * @param $trackingId string
+     * @param $heskSettings array
+     * @return Ticket|null
+     */
+    function getTicketByMergedTrackingId($trackingId, $heskSettings) {
+        $this->init();
+
+        $rs = hesk_dbQuery("SELECT `trackid` FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "tickets` WHERE `merged` LIKE '%#" . hesk_dbEscape($trackingId) . "#%'");
+        if (hesk_dbNumRows($rs) === 0) {
+            return null;
+        }
+        $row = hesk_dbFetchAssoc($rs);
+        $actualTrackingId = $row['trackid'];
+
+        $this->close();
+
+        return $this->getTicketByTrackingId($actualTrackingId, $heskSettings);
+    }
+
     /**
      * @param $ticket Ticket
      * @param $isEmailVerified
diff --git a/api/Tests/BusinessLogic/Tickets/NewTicketValidatorTest.php b/api/Tests/BusinessLogic/Tickets/NewTicketValidatorTest.php
index f7009494..2ace5299 100644
--- a/api/Tests/BusinessLogic/Tickets/NewTicketValidatorTest.php
+++ b/api/Tests/BusinessLogic/Tickets/NewTicketValidatorTest.php
@@ -147,6 +147,7 @@ class NewTicketValidatorTest extends TestCase {
     function testItSupportsMultipleEmails() {
         //-- Arrange
         $this->ticketRequest->email = 'something@email.com;another@valid.email';
+        $this->ticketRequest->language = 'English';
         $this->heskSettings['multi_eml'] = true;
 
         //-- Act
@@ -155,7 +156,7 @@ class NewTicketValidatorTest extends TestCase {
             $this->userContext);
 
         //-- Assert
-        $this->assertThat($validationModel->valid, $this->isTrue());
+        self::assertThat(count($validationModel->errorKeys), self::equalTo(0));
     }
 
     function testItAddsTheProperValidationErrorWhenCategoryIsNotANumber() {
diff --git a/api/Tests/BusinessLogic/Tickets/TicketRetrieverTest.php b/api/Tests/BusinessLogic/Tickets/TicketRetrieverTest.php
index c5f0b25b..6fd6b168 100644
--- a/api/Tests/BusinessLogic/Tickets/TicketRetrieverTest.php
+++ b/api/Tests/BusinessLogic/Tickets/TicketRetrieverTest.php
@@ -36,6 +36,20 @@ class TicketRetrieverTest extends TestCase {
         self::assertThat($actual, self::equalTo($ticket));
     }
 
+    function testItGetsTheParentTicketIfTheUserEntersInAMergedTicketId() {
+        //-- Arrange
+        $ticket = new Ticket();
+        $trackingId = '12345';
+        $this->ticketGateway->method('getTicketByTrackingId')->willReturn(null);
+        $this->ticketGateway->method('getTicketByMergedTrackingId')->with($trackingId, $this->heskSettings)->willReturn($ticket);
+
+        //-- Act
+        $actual = $this->ticketRetriever->getTicketByTrackingIdAndEmail($trackingId, null, $this->heskSettings);
+
+        //-- Assert
+        self::assertThat($actual, self::equalTo($ticket));
+    }
+
     function testItChecksTheTicketsEmailIfThePageRequiresIt() {
         //-- Arrange
         $ticket = new Ticket();

From 7b49508b1188866202b86a7d71343a9e73de83a1 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Tue, 25 Apr 2017 22:06:10 -0400
Subject: [PATCH 104/192] Send verification email if needed, return 202 if
 ticket needs to be verified

---
 .../Tickets/CreatedTicketModel.php            | 17 ++++++
 api/BusinessLogic/Tickets/TicketCreator.php   |  8 ++-
 .../Tickets/CustomerTicketController.php      |  2 +-
 .../CreateTicketForCustomerTest.php           | 56 +++++++++----------
 4 files changed, 51 insertions(+), 32 deletions(-)
 create mode 100644 api/BusinessLogic/Tickets/CreatedTicketModel.php

diff --git a/api/BusinessLogic/Tickets/CreatedTicketModel.php b/api/BusinessLogic/Tickets/CreatedTicketModel.php
new file mode 100644
index 00000000..daeee757
--- /dev/null
+++ b/api/BusinessLogic/Tickets/CreatedTicketModel.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace BusinessLogic\Tickets;
+
+
+class CreatedTicketModel {
+    /* @var $ticket Ticket */
+    public $ticket;
+
+    /* @var $emailVerified bool */
+    public $emailVerified;
+
+    function __construct($ticket, $emailVerified) {
+        $this->ticket = $ticket;
+        $this->emailVerified = $emailVerified;
+    }
+}
\ No newline at end of file
diff --git a/api/BusinessLogic/Tickets/TicketCreator.php b/api/BusinessLogic/Tickets/TicketCreator.php
index 2aed0579..1c0c0818 100644
--- a/api/BusinessLogic/Tickets/TicketCreator.php
+++ b/api/BusinessLogic/Tickets/TicketCreator.php
@@ -75,7 +75,7 @@ class TicketCreator {
      * @param $ticketRequest CreateTicketByCustomerModel
      * @param $heskSettings array HESK settings
      * @param $userContext
-     * @return Ticket The newly created ticket
+     * @return CreatedTicketModel The newly created ticket along with if the email is verified or not
      * @throws ValidationException When a required field in $ticket_request is missing
      * @throws \Exception When the default status for new tickets is not found
      */
@@ -143,8 +143,10 @@ class TicketCreator {
         $addressees = new Addressees();
         $addressees->to = $this->getAddressees($ticket->email);
 
-        if ($ticketRequest->sendEmailToCustomer) {
+        if ($ticketRequest->sendEmailToCustomer && $emailVerified) {
             $this->emailSenderHelper->sendEmailForTicket(EmailTemplateRetriever::NEW_TICKET, $ticketRequest->language, $addressees, $ticket, $heskSettings, $modsForHeskSettings);
+        } else if ($modsForHeskSettings[''] && !$emailVerified) {
+            $this->emailSenderHelper->sendEmailForTicket(EmailTemplateRetriever::VERIFY_EMAIL, $ticketRequest->language, $addressees, $ticket, $heskSettings, $modsForHeskSettings);
         }
 
         if ($ticket->ownerId !== null) {
@@ -166,7 +168,7 @@ class TicketCreator {
             }
         }
 
-        return $ticket;
+        return new CreatedTicketModel($ticket, $emailVerified);
     }
 
     private function getAddressees($emailAddress) {
diff --git a/api/Controllers/Tickets/CustomerTicketController.php b/api/Controllers/Tickets/CustomerTicketController.php
index a8b05b9b..7b9d455e 100644
--- a/api/Controllers/Tickets/CustomerTicketController.php
+++ b/api/Controllers/Tickets/CustomerTicketController.php
@@ -33,7 +33,7 @@ class CustomerTicketController {
 
         $ticket = $ticketCreator->createTicketByCustomer($this->buildTicketRequestFromJson($jsonRequest), $hesk_settings, $userContext);
 
-        return output($ticket, 201);
+        return output($ticket->ticket, $ticket->emailVerified ? 201 : 202);
     }
 
     /**
diff --git a/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php b/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php
index 29b88a2b..a0a3ea07 100644
--- a/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php
+++ b/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php
@@ -164,7 +164,7 @@ class CreateTicketTest extends TestCase {
         $ticket = $this->ticketCreator->createTicketByCustomer($this->ticketRequest, $this->heskSettings, $this->userContext);
 
         //-- Assert
-        self::assertThat($ticket->trackingId, self::equalTo('123-456-7890'));
+        self::assertThat($ticket->ticket->trackingId, self::equalTo('123-456-7890'));
     }
 
     function testItSetsTheNextUserForAutoassign() {
@@ -183,7 +183,7 @@ class CreateTicketTest extends TestCase {
         $ticket = $this->ticketCreator->createTicketByCustomer($this->ticketRequest, $this->heskSettings, $this->userContext);
 
         //-- Assert
-        self::assertThat($ticket->ownerId, self::equalTo(1));
+        self::assertThat($ticket->ticket->ownerId, self::equalTo(1));
     }
 
     function testItDoesntCallTheAutoassignerWhenDisabledInHesk() {
@@ -194,7 +194,7 @@ class CreateTicketTest extends TestCase {
         $ticket = $this->ticketCreator->createTicketByCustomer($this->ticketRequest, $this->heskSettings, $this->userContext);
 
         //-- Assert
-        self::assertThat($ticket->ownerId, self::equalTo(null));
+        self::assertThat($ticket->ticket->ownerId, self::equalTo(null));
     }
 
     function testItTransformsTheBasicProperties() {
@@ -221,20 +221,20 @@ class CreateTicketTest extends TestCase {
         $ticket = $this->ticketCreator->createTicketByCustomer($this->ticketRequest, $this->heskSettings, $this->userContext);
 
         //-- Assert
-        self::assertThat($ticket->name, self::equalTo($this->ticketRequest->name));
-        self::assertThat($ticket->email, self::equalTo($this->ticketRequest->email));
-        self::assertThat($ticket->priorityId, self::equalTo($this->ticketRequest->priority));
-        self::assertThat($ticket->categoryId, self::equalTo($this->ticketRequest->category));
-        self::assertThat($ticket->subject, self::equalTo($this->ticketRequest->subject));
-        self::assertThat($ticket->message, self::equalTo($this->ticketRequest->message));
-        self::assertThat($ticket->usesHtml, self::equalTo($this->ticketRequest->html));
-        self::assertThat($ticket->customFields[1], self::equalTo($this->ticketRequest->customFields[1]));
-        self::assertThat($ticket->location, self::equalTo($this->ticketRequest->location));
-        self::assertThat($ticket->suggestedArticles, self::equalTo($this->ticketRequest->suggestedKnowledgebaseArticleIds));
-        self::assertThat($ticket->userAgent, self::equalTo($this->ticketRequest->userAgent));
-        self::assertThat($ticket->screenResolution, self::equalTo($this->ticketRequest->screenResolution));
-        self::assertThat($ticket->ipAddress, self::equalTo($this->ticketRequest->ipAddress));
-        self::assertThat($ticket->language, self::equalTo($this->ticketRequest->language));
+        self::assertThat($ticket->ticket->name, self::equalTo($this->ticketRequest->name));
+        self::assertThat($ticket->ticket->email, self::equalTo($this->ticketRequest->email));
+        self::assertThat($ticket->ticket->priorityId, self::equalTo($this->ticketRequest->priority));
+        self::assertThat($ticket->ticket->categoryId, self::equalTo($this->ticketRequest->category));
+        self::assertThat($ticket->ticket->subject, self::equalTo($this->ticketRequest->subject));
+        self::assertThat($ticket->ticket->message, self::equalTo($this->ticketRequest->message));
+        self::assertThat($ticket->ticket->usesHtml, self::equalTo($this->ticketRequest->html));
+        self::assertThat($ticket->ticket->customFields[1], self::equalTo($this->ticketRequest->customFields[1]));
+        self::assertThat($ticket->ticket->location, self::equalTo($this->ticketRequest->location));
+        self::assertThat($ticket->ticket->suggestedArticles, self::equalTo($this->ticketRequest->suggestedKnowledgebaseArticleIds));
+        self::assertThat($ticket->ticket->userAgent, self::equalTo($this->ticketRequest->userAgent));
+        self::assertThat($ticket->ticket->screenResolution, self::equalTo($this->ticketRequest->screenResolution));
+        self::assertThat($ticket->ticket->ipAddress, self::equalTo($this->ticketRequest->ipAddress));
+        self::assertThat($ticket->ticket->language, self::equalTo($this->ticketRequest->language));
     }
 
     function testItReturnsTheGeneratedPropertiesOnTheTicket() {
@@ -248,9 +248,9 @@ class CreateTicketTest extends TestCase {
         $ticket = $this->ticketCreator->createTicketByCustomer($this->ticketRequest, $this->heskSettings, $this->userContext);
 
         //-- Assert
-        self::assertThat($ticket->dateCreated, self::equalTo($this->ticketGatewayGeneratedFields->dateCreated));
-        self::assertThat($ticket->lastChanged, self::equalTo($this->ticketGatewayGeneratedFields->dateModified));
-        self::assertThat($ticket->id, self::equalTo($this->ticketGatewayGeneratedFields->id));
+        self::assertThat($ticket->ticket->dateCreated, self::equalTo($this->ticketGatewayGeneratedFields->dateCreated));
+        self::assertThat($ticket->ticket->lastChanged, self::equalTo($this->ticketGatewayGeneratedFields->dateModified));
+        self::assertThat($ticket->ticket->id, self::equalTo($this->ticketGatewayGeneratedFields->id));
     }
 
     function testItSetsTheDefaultStatus() {
@@ -261,7 +261,7 @@ class CreateTicketTest extends TestCase {
         $ticket = $this->ticketCreator->createTicketByCustomer($this->ticketRequest, $this->heskSettings, $this->userContext);
 
         //-- Assert
-        self::assertThat($ticket->statusId, self::equalTo(1));
+        self::assertThat($ticket->ticket->statusId, self::equalTo(1));
     }
 
     function testItSetsTheDefaultProperties() {
@@ -272,13 +272,13 @@ class CreateTicketTest extends TestCase {
         $ticket = $this->ticketCreator->createTicketByCustomer($this->ticketRequest, $this->heskSettings, $this->userContext);
 
         //-- Assert
-        self::assertThat($ticket->archived, self::isFalse());
-        self::assertThat($ticket->locked, self::isFalse());
-        self::assertThat($ticket->openedBy, self::equalTo(0));
-        self::assertThat($ticket->numberOfReplies, self::equalTo(0));
-        self::assertThat($ticket->numberOfStaffReplies, self::equalTo(0));
-        self::assertThat($ticket->timeWorked, self::equalTo('00:00:00'));
-        self::assertThat($ticket->lastReplier, self::equalTo(0));
+        self::assertThat($ticket->ticket->archived, self::isFalse());
+        self::assertThat($ticket->ticket->locked, self::isFalse());
+        self::assertThat($ticket->ticket->openedBy, self::equalTo(0));
+        self::assertThat($ticket->ticket->numberOfReplies, self::equalTo(0));
+        self::assertThat($ticket->ticket->numberOfStaffReplies, self::equalTo(0));
+        self::assertThat($ticket->ticket->timeWorked, self::equalTo('00:00:00'));
+        self::assertThat($ticket->ticket->lastReplier, self::equalTo(0));
     }
 
     function testItChecksIfTheEmailIsVerified() {

From c26db927990320baaa47caba253ff9a46098e2ef Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Thu, 27 Apr 2017 22:04:28 -0400
Subject: [PATCH 105/192] Add edit ticket endpoint

---
 api/BusinessLogic/Tickets/EditTicketModel.php |  30 ++++
 api/BusinessLogic/Tickets/TicketEditor.php    | 128 ++++++++++++++++++
 api/DataAccess/Tickets/TicketGateway.php      |  35 +++++
 3 files changed, 193 insertions(+)
 create mode 100644 api/BusinessLogic/Tickets/EditTicketModel.php
 create mode 100644 api/BusinessLogic/Tickets/TicketEditor.php

diff --git a/api/BusinessLogic/Tickets/EditTicketModel.php b/api/BusinessLogic/Tickets/EditTicketModel.php
new file mode 100644
index 00000000..d36aa1b9
--- /dev/null
+++ b/api/BusinessLogic/Tickets/EditTicketModel.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace BusinessLogic\Tickets;
+
+
+class EditTicketModel {
+    /* @var $id int */
+    public $id;
+
+    /* @var $language string */
+    public $language;
+
+    /* @var $subject string */
+    public $subject;
+
+    /* @var $name string */
+    public $name;
+
+    /* @var $emails string */
+    public $email;
+
+    /* @var $message string */
+    public $message;
+
+    /* @var $html bool */
+    public $html;
+
+    /* @var $customFields array */
+    public $customFields;
+}
\ No newline at end of file
diff --git a/api/BusinessLogic/Tickets/TicketEditor.php b/api/BusinessLogic/Tickets/TicketEditor.php
new file mode 100644
index 00000000..a5e87afb
--- /dev/null
+++ b/api/BusinessLogic/Tickets/TicketEditor.php
@@ -0,0 +1,128 @@
+<?php
+
+namespace BusinessLogic\Tickets;
+
+
+use BusinessLogic\Exceptions\ApiFriendlyException;
+use BusinessLogic\Exceptions\ValidationException;
+use BusinessLogic\Security\UserContext;
+use BusinessLogic\Security\UserPrivilege;
+use BusinessLogic\Security\UserToTicketChecker;
+use BusinessLogic\Tickets\CustomFields\CustomFieldValidator;
+use BusinessLogic\ValidationModel;
+use BusinessLogic\Validators;
+use Core\Constants\CustomField;
+use DataAccess\Tickets\TicketGateway;
+
+class TicketEditor {
+    /* @var $ticketGateway TicketGateway */
+    private $ticketGateway;
+
+    /* @var $userToTicketChecker UserToTicketChecker */
+    private $userToTicketChecker;
+
+    function __construct($ticketGateway, $userToTicketChecker) {
+        $this->ticketGateway = $ticketGateway;
+        $this->userToTicketChecker = $userToTicketChecker;
+    }
+
+
+    /**
+     * @param $editTicketModel EditTicketModel
+     * @param $userContext UserContext
+     * @param $heskSettings array
+     * @throws ApiFriendlyException When the ticket isn't found for the ID
+     * @throws \Exception When the user doesn't have access to the ticket
+     */
+    // TODO Unit Tests
+    function editTicket($editTicketModel, $userContext, $heskSettings) {
+        $ticket = $this->ticketGateway->getTicketById($editTicketModel->id, $heskSettings);
+
+        if ($ticket === null) {
+            throw new ApiFriendlyException("Ticket with ID {$editTicketModel->id} not found!", "Ticket not found", 404);
+        }
+
+        if (!$this->userToTicketChecker->isTicketAccessibleToUser($userContext, $ticket, $heskSettings, array(UserPrivilege::CAN_EDIT_TICKETS))) {
+            throw new \Exception("User does not have access to ticket {$editTicketModel->id}");
+        }
+
+        $this->validate($editTicketModel, $ticket->categoryId, $heskSettings);
+    }
+
+    /**
+     * @param $editTicketModel EditTicketModel
+     * @param $categoryId int
+     * @param $heskSettings array
+     * @throws ValidationException When validation fails
+     */
+    private function validate($editTicketModel, $categoryId, $heskSettings) {
+        $validationModel = new ValidationModel();
+
+        if ($editTicketModel->name === null || trim($editTicketModel->name) === '') {
+            $validationModel->errorKeys[] = 'NO_NAME';
+        }
+
+        if (!Validators::validateEmail($editTicketModel->email, $heskSettings['multi_eml'], false)) {
+            $validationModel->errorKeys[] = 'INVALID_OR_MISSING_EMAIL';
+        }
+
+        if ($heskSettings['require_subject'] === 1 &&
+            ($editTicketModel->subject === NULL || $editTicketModel->subject === '')) {
+            $validationModel->errorKeys[] = 'SUBJECT_REQUIRED';
+        }
+
+        if ($heskSettings['require_message'] === 1 &&
+            ($editTicketModel->message === NULL || $editTicketModel->message === '')) {
+            $validationModel->errorKeys[] = 'MESSAGE_REQUIRED';
+        }
+
+        foreach ($heskSettings['custom_fields'] as $key => $value) {
+            $customFieldNumber = intval(str_replace('custom', '', $key));
+
+            //TODO test this
+            if (!array_key_exists($customFieldNumber, $editTicketModel->customFields)) {
+                continue;
+            }
+
+            if ($value['use'] == 1 && CustomFieldValidator::isCustomFieldInCategory($customFieldNumber, intval($categoryId), false, $heskSettings)) {
+                $custom_field_value = $editTicketModel->customFields[$customFieldNumber];
+                if (empty($custom_field_value)) {
+                    $validationModel->errorKeys[] = "CUSTOM_FIELD_{$customFieldNumber}_INVALID::NO_VALUE";
+                    continue;
+                }
+                switch($value['type']) {
+                    case CustomField::DATE:
+                        if (!preg_match("/^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$/", $custom_field_value)) {
+                            $validationModel->errorKeys[] = 'CUSTOM_FIELD_' . $customFieldNumber . '_INVALID::INVALID_DATE';
+                        } else {
+                            // Actually validate based on range
+                            $date = strtotime($custom_field_value . ' t00:00:00');
+                            $dmin = strlen($value['value']['dmin']) ? strtotime($value['value']['dmin'] . ' t00:00:00') : false;
+                            $dmax = strlen($value['value']['dmax']) ? strtotime($value['value']['dmax'] . ' t00:00:00') : false;
+
+                            if ($dmin && $dmin > $date) {
+                                $validationModel->errorKeys[] = 'CUSTOM_FIELD_' . $customFieldNumber . '_INVALID::DATE_BEFORE_MIN::MIN:' . date('Y-m-d', $dmin) . '::ENTERED:' . date('Y-m-d', $date);
+                            } elseif ($dmax && $dmax < $date) {
+                                $validationModel->errorKeys[] = 'CUSTOM_FIELD_' . $customFieldNumber . '_INVALID::DATE_AFTER_MAX::MAX:' . date('Y-m-d', $dmax) . '::ENTERED:' . date('Y-m-d', $date);
+                            }
+                        }
+                        break;
+                    case CustomField::EMAIL:
+                        if (!Validators::validateEmail($custom_field_value, $value['value']['multiple'], false)) {
+                            $validationModel->errorKeys[] = "CUSTOM_FIELD_{$customFieldNumber}_INVALID::INVALID_EMAIL";
+                        }
+                        break;
+                }
+            }
+        }
+
+        if ($editTicketModel->language === null ||
+            $editTicketModel->language === '') {
+            $validationModel->errorKeys[] = 'MISSING_LANGUAGE';
+        }
+
+        if (count($validationModel->errorKeys) > 0) {
+            throw new ValidationException($validationModel);
+        }
+    }
+}
\ No newline at end of file
diff --git a/api/DataAccess/Tickets/TicketGateway.php b/api/DataAccess/Tickets/TicketGateway.php
index 7a940bc8..6556cb5a 100644
--- a/api/DataAccess/Tickets/TicketGateway.php
+++ b/api/DataAccess/Tickets/TicketGateway.php
@@ -305,4 +305,39 @@ class TicketGateway extends CommonDao {
 
         $this->close();
     }
+
+    /**
+     * @param $ticket Ticket
+     * @param $heskSettings array
+     */
+    function updateBasicTicketInfo($ticket, $heskSettings) {
+        $this->init();
+
+        // Escaped vars
+        $subject = hesk_dbEscape($ticket->subject);
+        $message = hesk_dbEscape($ticket->message);
+        $language = hesk_dbEscape($ticket->language);
+        $name = hesk_dbEscape($ticket->name);
+        $email = hesk_dbEscape($ticket->email);
+
+        // Prepare SQL for custom fields
+        $customSql = '';
+
+        for ($i=1; $i<=50; $i++)
+        {
+            $customSql .= ", `custom{$i}` = '" . (isset($ticket->customFields[$i]) ? hesk_dbEscape($ticket->customFields[$i]) : '') . "'";
+        }
+
+        hesk_dbQuery("UPDATE `" . hesk_dbEscape($heskSettings['db_pfix']) . "tickets` 
+            SET `subject` = {$subject},
+                `message` = {$message},
+                `language` = {$language},
+                `name` = {$name},
+                `email` = {$email},
+                `html` = " . ($ticket->usesHtml ? 1 : 0) . "
+                {$customSql}
+            WHERE `id` = " . intval($ticket->id));
+
+        $this->close();
+    }
 }
\ No newline at end of file

From 167d6c76ac81e752538defa59cc1e60798ef098e Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Fri, 28 Apr 2017 12:36:48 -0400
Subject: [PATCH 106/192] Basic ticket info can now be edited

---
 api/ApplicationContext.php                    |  3 ++
 api/BusinessLogic/Tickets/EditTicketModel.php |  2 +-
 api/BusinessLogic/Tickets/TicketEditor.php    |  8 ++++
 .../Tickets/StaffTicketController.php         | 39 +++++++++++++++++++
 api/DataAccess/Tickets/TicketGateway.php      | 12 +++---
 5 files changed, 57 insertions(+), 7 deletions(-)

diff --git a/api/ApplicationContext.php b/api/ApplicationContext.php
index d052b8e6..e8e66b2c 100644
--- a/api/ApplicationContext.php
+++ b/api/ApplicationContext.php
@@ -15,6 +15,7 @@ use BusinessLogic\Security\UserToTicketChecker;
 use BusinessLogic\Settings\ApiChecker;
 use BusinessLogic\Tickets\Autoassigner;
 use BusinessLogic\Tickets\TicketDeleter;
+use BusinessLogic\Tickets\TicketEditor;
 use BusinessLogic\Tickets\TicketRetriever;
 use BusinessLogic\Tickets\TicketCreator;
 use BusinessLogic\Tickets\NewTicketValidator;
@@ -117,5 +118,7 @@ class ApplicationContext {
             new TicketDeleter($this->get[TicketGateway::class],
                 $this->get[UserToTicketChecker::class],
                 $this->get[AttachmentHandler::class]);
+        $this->get[TicketEditor::class] =
+            new TicketEditor($this->get[TicketGateway::class], $this->get[UserToTicketChecker::class]);
     }
 }
\ No newline at end of file
diff --git a/api/BusinessLogic/Tickets/EditTicketModel.php b/api/BusinessLogic/Tickets/EditTicketModel.php
index d36aa1b9..21e95ef1 100644
--- a/api/BusinessLogic/Tickets/EditTicketModel.php
+++ b/api/BusinessLogic/Tickets/EditTicketModel.php
@@ -25,6 +25,6 @@ class EditTicketModel {
     /* @var $html bool */
     public $html;
 
-    /* @var $customFields array */
+    /* @var $customFields string[] */
     public $customFields;
 }
\ No newline at end of file
diff --git a/api/BusinessLogic/Tickets/TicketEditor.php b/api/BusinessLogic/Tickets/TicketEditor.php
index a5e87afb..6ad52ccd 100644
--- a/api/BusinessLogic/Tickets/TicketEditor.php
+++ b/api/BusinessLogic/Tickets/TicketEditor.php
@@ -47,6 +47,14 @@ class TicketEditor {
         }
 
         $this->validate($editTicketModel, $ticket->categoryId, $heskSettings);
+
+        $ticket->name = $editTicketModel->name;
+        $ticket->email = $editTicketModel->email;
+        $ticket->subject = $editTicketModel->subject;
+        $ticket->message = $editTicketModel->message;
+        $ticket->customFields = $editTicketModel->customFields;
+
+        $this->ticketGateway->updateBasicTicketInfo($ticket, $heskSettings);
     }
 
     /**
diff --git a/api/Controllers/Tickets/StaffTicketController.php b/api/Controllers/Tickets/StaffTicketController.php
index 27283b54..901fc617 100644
--- a/api/Controllers/Tickets/StaffTicketController.php
+++ b/api/Controllers/Tickets/StaffTicketController.php
@@ -3,7 +3,11 @@
 namespace Controllers\Tickets;
 
 
+use BusinessLogic\Helpers;
+use BusinessLogic\Tickets\EditTicketModel;
 use BusinessLogic\Tickets\TicketDeleter;
+use BusinessLogic\Tickets\TicketEditor;
+use Controllers\JsonRetriever;
 
 class StaffTicketController {
     function delete($id) {
@@ -14,4 +18,39 @@ class StaffTicketController {
 
         $ticketDeleter->deleteTicket($id, $userContext, $hesk_settings);
     }
+
+    function put($id) {
+        global $applicationContext, $userContext, $hesk_settings;
+
+        /* @var $ticketEditor TicketEditor */
+        $ticketEditor = $applicationContext->get[TicketEditor::class];
+
+        $jsonRequest = JsonRetriever::getJsonData();
+
+        $ticketEditor->editTicket($this->getEditTicketModel($id, $jsonRequest), $userContext, $hesk_settings);
+
+        http_response_code(204);
+        return;
+    }
+
+    private function getEditTicketModel($id, $jsonRequest) {
+        $editTicketModel = new EditTicketModel();
+        $editTicketModel->id = $id;
+        $editTicketModel->language = Helpers::safeArrayGet($jsonRequest, 'language');
+        $editTicketModel->name = Helpers::safeArrayGet($jsonRequest, 'name');
+        $editTicketModel->subject = Helpers::safeArrayGet($jsonRequest, 'subject');
+        $editTicketModel->message = Helpers::safeArrayGet($jsonRequest, 'message');
+        $editTicketModel->html = Helpers::safeArrayGet($jsonRequest, 'html');
+        $editTicketModel->email = Helpers::safeArrayGet($jsonRequest, 'email');
+
+        $jsonCustomFields = Helpers::safeArrayGet($jsonRequest, 'customFields');
+
+        if ($jsonCustomFields !== null && !empty($jsonCustomFields)) {
+            foreach ($jsonCustomFields as $key => $value) {
+                $editTicketModel->customFields[intval($key)] = $value;
+            }
+        }
+
+        return $editTicketModel;
+    }
 }
\ No newline at end of file
diff --git a/api/DataAccess/Tickets/TicketGateway.php b/api/DataAccess/Tickets/TicketGateway.php
index 6556cb5a..34f66e11 100644
--- a/api/DataAccess/Tickets/TicketGateway.php
+++ b/api/DataAccess/Tickets/TicketGateway.php
@@ -329,12 +329,12 @@ class TicketGateway extends CommonDao {
         }
 
         hesk_dbQuery("UPDATE `" . hesk_dbEscape($heskSettings['db_pfix']) . "tickets` 
-            SET `subject` = {$subject},
-                `message` = {$message},
-                `language` = {$language},
-                `name` = {$name},
-                `email` = {$email},
-                `html` = " . ($ticket->usesHtml ? 1 : 0) . "
+            SET `subject` = '{$subject}',
+                `message` = '{$message}',
+                `language` = '{$language}',
+                `name` = '{$name}',
+                `email` = '{$email}',
+                `html` = " . ($ticket->usesHtml ? 1 : 0) . ",
                 {$customSql}
             WHERE `id` = " . intval($ticket->id));
 

From fd41a589fe23c3637fab3544ab5195bca18cef2d Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Fri, 28 Apr 2017 13:03:25 -0400
Subject: [PATCH 107/192] Add a status controller to retrieve statuses

---
 api/ApplicationContext.php                    |  4 ++++
 api/BusinessLogic/Statuses/Status.php         |  4 ++--
 .../Statuses/StatusRetriever.php              | 20 +++++++++++++++++
 api/Controllers/Statuses/StatusController.php | 17 ++++++++++++++
 api/DataAccess/Statuses/StatusGateway.php     | 22 +++++++++++++++++++
 api/index.php                                 |  2 ++
 6 files changed, 67 insertions(+), 2 deletions(-)
 create mode 100644 api/BusinessLogic/Statuses/StatusRetriever.php
 create mode 100644 api/Controllers/Statuses/StatusController.php

diff --git a/api/ApplicationContext.php b/api/ApplicationContext.php
index e8e66b2c..1de7ca80 100644
--- a/api/ApplicationContext.php
+++ b/api/ApplicationContext.php
@@ -13,6 +13,7 @@ use BusinessLogic\Security\BanRetriever;
 use BusinessLogic\Security\UserContextBuilder;
 use BusinessLogic\Security\UserToTicketChecker;
 use BusinessLogic\Settings\ApiChecker;
+use BusinessLogic\Statuses\StatusRetriever;
 use BusinessLogic\Tickets\Autoassigner;
 use BusinessLogic\Tickets\TicketDeleter;
 use BusinessLogic\Tickets\TicketEditor;
@@ -120,5 +121,8 @@ class ApplicationContext {
                 $this->get[AttachmentHandler::class]);
         $this->get[TicketEditor::class] =
             new TicketEditor($this->get[TicketGateway::class], $this->get[UserToTicketChecker::class]);
+
+        // Statuses
+        $this->get[StatusRetriever::class] = new StatusRetriever($this->get[StatusGateway::class]);
     }
 }
\ No newline at end of file
diff --git a/api/BusinessLogic/Statuses/Status.php b/api/BusinessLogic/Statuses/Status.php
index 37561bd7..a726334f 100644
--- a/api/BusinessLogic/Statuses/Status.php
+++ b/api/BusinessLogic/Statuses/Status.php
@@ -6,7 +6,7 @@ namespace BusinessLogic\Statuses;
 class Status {
     static function fromDatabase($row, $languageRs) {
         $status = new Status();
-        $status->id = $row['ID'];
+        $status->id = intval($row['ID']);
         $status->textColor = $row['TextColor'];
         $status->defaultActions = array();
 
@@ -21,7 +21,7 @@ class Status {
             $localizedLanguages[$languageRow['language']] = new StatusLanguage($languageRow['language'], $languageRow['text']);
         }
         $status->localizedNames = $localizedLanguages;
-        $status->sort = $row['sort'];
+        $status->sort = intval($row['sort']);
 
         return $status;
     }
diff --git a/api/BusinessLogic/Statuses/StatusRetriever.php b/api/BusinessLogic/Statuses/StatusRetriever.php
new file mode 100644
index 00000000..0bcfe844
--- /dev/null
+++ b/api/BusinessLogic/Statuses/StatusRetriever.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace BusinessLogic\Statuses;
+
+
+use DataAccess\Statuses\StatusGateway;
+
+// TODO Test!
+class StatusRetriever {
+    /* @var $statusGateway StatusGateway */
+    private $statusGateway;
+
+    function __construct($statusGateway) {
+        $this->statusGateway = $statusGateway;
+    }
+
+    function getAllStatuses($heskSettings) {
+        return $this->statusGateway->getStatuses($heskSettings);
+    }
+}
\ No newline at end of file
diff --git a/api/Controllers/Statuses/StatusController.php b/api/Controllers/Statuses/StatusController.php
new file mode 100644
index 00000000..f9e2f087
--- /dev/null
+++ b/api/Controllers/Statuses/StatusController.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Controllers\Statuses;
+
+
+use BusinessLogic\Statuses\StatusRetriever;
+
+class StatusController {
+    function get() {
+        global $applicationContext, $hesk_settings;
+
+        /* @var $statusRetriever StatusRetriever */
+        $statusRetriever = $applicationContext->get[StatusRetriever::class];
+
+        output($statusRetriever->getAllStatuses($hesk_settings));
+    }
+}
\ No newline at end of file
diff --git a/api/DataAccess/Statuses/StatusGateway.php b/api/DataAccess/Statuses/StatusGateway.php
index 636852b1..c18e9b19 100644
--- a/api/DataAccess/Statuses/StatusGateway.php
+++ b/api/DataAccess/Statuses/StatusGateway.php
@@ -31,4 +31,26 @@ class StatusGateway extends CommonDao {
 
         return $status;
     }
+
+    /**
+     * @param $heskSettings array
+     * @return Status[]
+     */
+    function getStatuses($heskSettings) {
+        $this->init();
+
+        $metaRs = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "statuses`");
+
+        $statuses = array();
+        while ($row = hesk_dbFetchAssoc($metaRs)) {
+            $languageRs = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "text_to_status_xref`
+                WHERE `status_id` = " . intval($row['ID']));
+
+            $statuses[] = Status::fromDatabase($row, $languageRs);
+        }
+
+        $this->close();
+
+        return $statuses;
+    }
 }
\ No newline at end of file
diff --git a/api/index.php b/api/index.php
index c8d333bf..a4d69986 100644
--- a/api/index.php
+++ b/api/index.php
@@ -157,6 +157,8 @@ Link::all(array(
     // Attachments
     '/v1/staff/tickets/{i}/attachments' => \Controllers\Attachments\StaffTicketAttachmentsController::class,
     '/v1/staff/tickets/{i}/attachments/{i}' => \Controllers\Attachments\StaffTicketAttachmentsController::class,
+    // Statuses
+    '/v1/statuses' => \Controllers\Statuses\StatusController::class,
 
     // Any URL that doesn't match goes to the 404 handler
     '404' => 'handle404'

From 7494efb8cad68d5118120152eeee369096955784 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Fri, 28 Apr 2017 13:08:25 -0400
Subject: [PATCH 108/192] Getting started on settings retrieval

---
 .../Settings/SettingsRetriever.php            | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 api/BusinessLogic/Settings/SettingsRetriever.php

diff --git a/api/BusinessLogic/Settings/SettingsRetriever.php b/api/BusinessLogic/Settings/SettingsRetriever.php
new file mode 100644
index 00000000..9e81aa4a
--- /dev/null
+++ b/api/BusinessLogic/Settings/SettingsRetriever.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace BusinessLogic\Settings;
+
+// TODO Test!
+class SettingsRetriever {
+
+    private static $settingsToNotReturn = array(
+        'webmaster_email',
+        'noreply_email',
+        'noreply_name',
+        'db_.*',
+    );
+
+    /**
+     * @param $heskSettings array
+     * @param $modsForHeskSettings array
+     */
+    function getAllSettings($heskSettings, $modsForHeskSettings) {
+
+    }
+}
\ No newline at end of file

From ee4ba00fe98a72d7cb4a513eb988f32009735141 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Fri, 28 Apr 2017 22:15:59 -0400
Subject: [PATCH 109/192] Add endpoint for retrieving helpdesk settings

---
 api/ApplicationContext.php                    |  4 ++
 .../Settings/SettingsRetriever.php            | 68 ++++++++++++++++++-
 .../Settings/SettingsController.php           | 17 +++++
 api/index.php                                 |  2 +
 4 files changed, 89 insertions(+), 2 deletions(-)
 create mode 100644 api/Controllers/Settings/SettingsController.php

diff --git a/api/ApplicationContext.php b/api/ApplicationContext.php
index 1de7ca80..9e6cacda 100644
--- a/api/ApplicationContext.php
+++ b/api/ApplicationContext.php
@@ -13,6 +13,7 @@ use BusinessLogic\Security\BanRetriever;
 use BusinessLogic\Security\UserContextBuilder;
 use BusinessLogic\Security\UserToTicketChecker;
 use BusinessLogic\Settings\ApiChecker;
+use BusinessLogic\Settings\SettingsRetriever;
 use BusinessLogic\Statuses\StatusRetriever;
 use BusinessLogic\Tickets\Autoassigner;
 use BusinessLogic\Tickets\TicketDeleter;
@@ -124,5 +125,8 @@ class ApplicationContext {
 
         // Statuses
         $this->get[StatusRetriever::class] = new StatusRetriever($this->get[StatusGateway::class]);
+
+        // Settings
+        $this->get[SettingsRetriever::class] = new SettingsRetriever($this->get[ModsForHeskSettingsGateway::class]);
     }
 }
\ No newline at end of file
diff --git a/api/BusinessLogic/Settings/SettingsRetriever.php b/api/BusinessLogic/Settings/SettingsRetriever.php
index 9e81aa4a..e8db0e48 100644
--- a/api/BusinessLogic/Settings/SettingsRetriever.php
+++ b/api/BusinessLogic/Settings/SettingsRetriever.php
@@ -3,20 +3,84 @@
 namespace BusinessLogic\Settings;
 
 // TODO Test!
+use DataAccess\Settings\ModsForHeskSettingsGateway;
+
 class SettingsRetriever {
+    /* @var $modsForHeskSettingsGateway ModsForHeskSettingsGateway */
+    private $modsForHeskSettingsGateway;
+
+    function __construct($modsForHeskSettingsGateway) {
+        $this->modsForHeskSettingsGateway = $modsForHeskSettingsGateway;
+    }
 
     private static $settingsToNotReturn = array(
         'webmaster_email',
         'noreply_email',
         'noreply_name',
         'db_.*',
+        'admin_dir',
+        'attach_dir',
+        'cache_dir',
+        'autoclose',
+        'autologin',
+        'autoassign',
+        'secimg_.*',
+        'recaptcha_.*',
+        'question_.*',
+        'attempt_.*',
+        'reset_pass',
+        'x_frame_opt',
+        'force_ssl',
+        'imap.*',
+        'smtp.*',
+        'email_piping',
+        'pop3.*',
+        'loop.*',
+        'email_providers',
+        'notify_.*',
+        'alink',
+        'submit_notice',
+        'online',
+        'online_min',
+        'modsForHeskVersion',
+        'use_mailgun',
+        'mailgun.*',
+        'kb_attach_dir',
+        'public_api',
+        'custom_fields',
+        'hesk_version',
+        'hesk_license',
     );
 
     /**
      * @param $heskSettings array
-     * @param $modsForHeskSettings array
+     * @return array
      */
-    function getAllSettings($heskSettings, $modsForHeskSettings) {
+    function getAllSettings($heskSettings) {
+        $modsForHeskSettings = $this->modsForHeskSettingsGateway->getAllSettings($heskSettings);
+        $settingsToReturn = array();
+
+        foreach ($heskSettings as $key => $value) {
+            if ($this->isPermittedKey($key)) {
+                $settingsToReturn[$key] = $value;
+            }
+        }
+        foreach ($modsForHeskSettings as $key => $value) {
+            if ($this->isPermittedKey($key)) {
+                $settingsToReturn[$key] = $value;
+            }
+        }
+
+        return $settingsToReturn;
+    }
+
+    private function isPermittedKey($key) {
+        foreach (self::$settingsToNotReturn as $setting) {
+            if (preg_match("/{$setting}/", $key)) {
+                return false;
+            }
+        }
 
+        return true;
     }
 }
\ No newline at end of file
diff --git a/api/Controllers/Settings/SettingsController.php b/api/Controllers/Settings/SettingsController.php
new file mode 100644
index 00000000..c8e53941
--- /dev/null
+++ b/api/Controllers/Settings/SettingsController.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Controllers\Settings;
+
+
+use BusinessLogic\Settings\SettingsRetriever;
+
+class SettingsController {
+    function get() {
+        global $applicationContext, $hesk_settings, $modsForHesk_settings;
+
+        /* @var $settingsRetriever SettingsRetriever */
+        $settingsRetriever = $applicationContext->get[SettingsRetriever::class];
+
+        output($settingsRetriever->getAllSettings($hesk_settings, $modsForHesk_settings));
+    }
+}
\ No newline at end of file
diff --git a/api/index.php b/api/index.php
index a4d69986..991160c5 100644
--- a/api/index.php
+++ b/api/index.php
@@ -159,6 +159,8 @@ Link::all(array(
     '/v1/staff/tickets/{i}/attachments/{i}' => \Controllers\Attachments\StaffTicketAttachmentsController::class,
     // Statuses
     '/v1/statuses' => \Controllers\Statuses\StatusController::class,
+    // Settings
+    '/v1/settings' => \Controllers\Settings\SettingsController::class,
 
     // Any URL that doesn't match goes to the 404 handler
     '404' => 'handle404'

From 39c58868801a8b525366446ed5fd6e35bda51849 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sun, 30 Apr 2017 22:02:34 -0400
Subject: [PATCH 110/192] Some changes to improve overall UX

---
 .../Attachments/AttachmentHandler.php              | 13 +++++++++++--
 .../Attachments/AttachmentRetriever.php            | 10 ++++++++--
 .../Exceptions/AccessViolationException.php        | 10 ++++++++++
 api/BusinessLogic/Statuses/Status.php              |  2 +-
 api/BusinessLogic/Statuses/StatusLanguage.php      | 14 --------------
 api/BusinessLogic/Tickets/TicketDeleter.php        |  8 +++++++-
 api/BusinessLogic/Tickets/TicketEditor.php         |  5 +++--
 .../StaffTicketAttachmentsController.php           |  3 ++-
 api/Controllers/Categories/CategoryController.php  |  6 ++++++
 api/Controllers/Tickets/StaffTicketController.php  |  2 ++
 api/DataAccess/Logging/LoggingGateway.php          |  6 +++++-
 11 files changed, 55 insertions(+), 24 deletions(-)
 create mode 100644 api/BusinessLogic/Exceptions/AccessViolationException.php
 delete mode 100644 api/BusinessLogic/Statuses/StatusLanguage.php

diff --git a/api/BusinessLogic/Attachments/AttachmentHandler.php b/api/BusinessLogic/Attachments/AttachmentHandler.php
index 22399f35..3a874ae9 100644
--- a/api/BusinessLogic/Attachments/AttachmentHandler.php
+++ b/api/BusinessLogic/Attachments/AttachmentHandler.php
@@ -3,6 +3,7 @@
 namespace BusinessLogic\Attachments;
 
 
+use BusinessLogic\Exceptions\AccessViolationException;
 use BusinessLogic\Exceptions\ApiFriendlyException;
 use BusinessLogic\Exceptions\ValidationException;
 use BusinessLogic\Security\UserContext;
@@ -55,12 +56,16 @@ class AttachmentHandler {
 
         $ticket = $this->ticketGateway->getTicketById($createAttachmentModel->ticketId, $heskSettings);
 
+        if ($ticket === null) {
+            throw new ApiFriendlyException("Ticket {$createAttachmentModel->ticketId} not found", "Ticket Not Found", 404);
+        }
+
         $extraPermissions = $createAttachmentModel->isEditing
             ? array(UserPrivilege::CAN_EDIT_TICKETS)
             : array();
 
         if (!$this->userToTicketChecker->isTicketAccessibleToUser($userContext, $ticket, $heskSettings, $extraPermissions)) {
-            throw new \Exception("User does not have access to ticket {$ticket->id} being created / edited!");
+            throw new AccessViolationException("User does not have access to ticket {$ticket->id} being created / edited!");
         }
 
         $cleanedFileName = $this->cleanFileName($createAttachmentModel->displayName);
@@ -99,8 +104,12 @@ class AttachmentHandler {
     function deleteAttachmentFromTicket($ticketId, $attachmentId, $userContext, $heskSettings) {
         $ticket = $this->ticketGateway->getTicketById($ticketId, $heskSettings);
 
+        if ($ticket === null) {
+            throw new ApiFriendlyException("Ticket {$ticketId} not found!", "Ticket Not Found", 404);
+        }
+
         if (!$this->userToTicketChecker->isTicketAccessibleToUser($userContext, $ticket, $heskSettings, array(UserPrivilege::CAN_EDIT_TICKETS))) {
-            throw new \Exception("User does not have access to ticket {$ticketId} being created / edited!");
+            throw new AccessViolationException("User does not have access to ticket {$ticketId} being created / edited!");
         }
 
         $indexToRemove = -1;
diff --git a/api/BusinessLogic/Attachments/AttachmentRetriever.php b/api/BusinessLogic/Attachments/AttachmentRetriever.php
index cfdec67b..59fdcc54 100644
--- a/api/BusinessLogic/Attachments/AttachmentRetriever.php
+++ b/api/BusinessLogic/Attachments/AttachmentRetriever.php
@@ -3,6 +3,8 @@
 namespace BusinessLogic\Attachments;
 
 
+use BusinessLogic\Exceptions\AccessViolationException;
+use BusinessLogic\Exceptions\ApiFriendlyException;
 use BusinessLogic\Security\UserToTicketChecker;
 use DataAccess\Attachments\AttachmentGateway;
 use DataAccess\Files\FileReader;
@@ -31,8 +33,12 @@ class AttachmentRetriever {
     function getAttachmentContentsForTicket($ticketId, $attachmentId, $userContext, $heskSettings) {
         $ticket = $this->ticketGateway->getTicketById($ticketId, $heskSettings);
 
-        if (!$this->userToTicketChecker->isTicketAccessibleToUser($userContext, $ticket, $heskSettings)) {
-            throw new \Exception("User does not have access to attachment {$attachmentId}!");
+        if ($ticket === null) {
+            throw new ApiFriendlyException("Ticket {$ticketId} not found!", "Ticket Not Found", 404);
+        }
+
+        if ($this->userToTicketChecker->isTicketAccessibleToUser($userContext, $ticket, $heskSettings)) {
+            throw new AccessViolationException("User does not have access to attachment {$attachmentId}!");
         }
 
         $attachment = $this->attachmentGateway->getAttachmentById($attachmentId, $heskSettings);
diff --git a/api/BusinessLogic/Exceptions/AccessViolationException.php b/api/BusinessLogic/Exceptions/AccessViolationException.php
new file mode 100644
index 00000000..1c252646
--- /dev/null
+++ b/api/BusinessLogic/Exceptions/AccessViolationException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace BusinessLogic\Exceptions;
+
+
+class AccessViolationException extends ApiFriendlyException {
+    function __construct($message) {
+        parent::__construct($message, 'Access Exception', 403);
+    }
+}
\ No newline at end of file
diff --git a/api/BusinessLogic/Statuses/Status.php b/api/BusinessLogic/Statuses/Status.php
index a726334f..8e58345f 100644
--- a/api/BusinessLogic/Statuses/Status.php
+++ b/api/BusinessLogic/Statuses/Status.php
@@ -18,7 +18,7 @@ class Status {
 
         $localizedLanguages = array();
         while ($languageRow = hesk_dbFetchAssoc($languageRs)) {
-            $localizedLanguages[$languageRow['language']] = new StatusLanguage($languageRow['language'], $languageRow['text']);
+            $localizedLanguages[$languageRow['language']] = $languageRow['text'];
         }
         $status->localizedNames = $localizedLanguages;
         $status->sort = intval($row['sort']);
diff --git a/api/BusinessLogic/Statuses/StatusLanguage.php b/api/BusinessLogic/Statuses/StatusLanguage.php
deleted file mode 100644
index 58acc40b..00000000
--- a/api/BusinessLogic/Statuses/StatusLanguage.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace BusinessLogic\Statuses;
-
-
-class StatusLanguage {
-    public $language;
-    public $text;
-
-    function __construct($language, $text) {
-        $this->language = $language;
-        $this->text = $text;
-    }
-}
\ No newline at end of file
diff --git a/api/BusinessLogic/Tickets/TicketDeleter.php b/api/BusinessLogic/Tickets/TicketDeleter.php
index cc9f3f8a..fde51ee7 100644
--- a/api/BusinessLogic/Tickets/TicketDeleter.php
+++ b/api/BusinessLogic/Tickets/TicketDeleter.php
@@ -4,6 +4,8 @@ namespace BusinessLogic\Tickets;
 
 
 use BusinessLogic\Attachments\AttachmentHandler;
+use BusinessLogic\Exceptions\AccessViolationException;
+use BusinessLogic\Exceptions\ApiFriendlyException;
 use BusinessLogic\Security\UserPrivilege;
 use BusinessLogic\Security\UserToTicketChecker;
 use DataAccess\Tickets\TicketGateway;
@@ -27,9 +29,13 @@ class TicketDeleter {
     function deleteTicket($ticketId, $userContext, $heskSettings) {
         $ticket = $this->ticketGateway->getTicketById($ticketId, $heskSettings);
 
+        if ($ticket === null) {
+            throw new ApiFriendlyException("Ticket {$ticketId} not found!", "Ticket Not Found", 404);
+        }
+
         if (!$this->userToTicketChecker->isTicketAccessibleToUser($userContext, $ticket, $heskSettings,
             array(UserPrivilege::CAN_DELETE_TICKETS))) {
-            throw new \Exception("User does not have access to ticket {$ticketId}");
+            throw new AccessViolationException("User does not have access to ticket {$ticketId}");
         }
 
         foreach ($ticket->attachments as $attachment) {
diff --git a/api/BusinessLogic/Tickets/TicketEditor.php b/api/BusinessLogic/Tickets/TicketEditor.php
index 6ad52ccd..a5fe9774 100644
--- a/api/BusinessLogic/Tickets/TicketEditor.php
+++ b/api/BusinessLogic/Tickets/TicketEditor.php
@@ -3,6 +3,7 @@
 namespace BusinessLogic\Tickets;
 
 
+use BusinessLogic\Exceptions\AccessViolationException;
 use BusinessLogic\Exceptions\ApiFriendlyException;
 use BusinessLogic\Exceptions\ValidationException;
 use BusinessLogic\Security\UserContext;
@@ -43,7 +44,7 @@ class TicketEditor {
         }
 
         if (!$this->userToTicketChecker->isTicketAccessibleToUser($userContext, $ticket, $heskSettings, array(UserPrivilege::CAN_EDIT_TICKETS))) {
-            throw new \Exception("User does not have access to ticket {$editTicketModel->id}");
+            throw new AccessViolationException("User does not have access to ticket {$editTicketModel->id}");
         }
 
         $this->validate($editTicketModel, $ticket->categoryId, $heskSettings);
@@ -88,7 +89,7 @@ class TicketEditor {
             $customFieldNumber = intval(str_replace('custom', '', $key));
 
             //TODO test this
-            if (!array_key_exists($customFieldNumber, $editTicketModel->customFields)) {
+            if ($editTicketModel->customFields === null || !array_key_exists($customFieldNumber, $editTicketModel->customFields)) {
                 continue;
             }
 
diff --git a/api/Controllers/Attachments/StaffTicketAttachmentsController.php b/api/Controllers/Attachments/StaffTicketAttachmentsController.php
index 3ca6ca74..1d32f812 100644
--- a/api/Controllers/Attachments/StaffTicketAttachmentsController.php
+++ b/api/Controllers/Attachments/StaffTicketAttachmentsController.php
@@ -22,7 +22,7 @@ class StaffTicketAttachmentsController {
 
         $contents = $attachmentRetriever->getAttachmentContentsForTicket($ticketId, $attachmentId, $userContext, $hesk_settings);
 
-        output(array('contents' => base64_encode($contents)));
+        output(array('contents' => $contents));
     }
 
     private function verifyAttachmentsAreEnabled($heskSettings) {
@@ -51,6 +51,7 @@ class StaffTicketAttachmentsController {
         $model = new CreateAttachmentForTicketModel();
         $model->attachmentContents = Helpers::safeArrayGet($json, 'data');
         $model->displayName = Helpers::safeArrayGet($json, 'displayName');
+        $model->isEditing = Helpers::safeArrayGet($json, 'isEditing');
         $model->ticketId = $ticketId;
 
         return $model;
diff --git a/api/Controllers/Categories/CategoryController.php b/api/Controllers/Categories/CategoryController.php
index bf640a3e..e376afef 100644
--- a/api/Controllers/Categories/CategoryController.php
+++ b/api/Controllers/Categories/CategoryController.php
@@ -3,10 +3,16 @@
 namespace Controllers\Categories;
 
 use BusinessLogic\Categories\CategoryRetriever;
+use BusinessLogic\Exceptions\ApiFriendlyException;
 
 class CategoryController {
     function get($id) {
         $categories = self::getAllCategories();
+
+        if (!isset($categories[$id])) {
+            throw new ApiFriendlyException("Category {$id} not found!", "Category Not Found", 404);
+        }
+
         output($categories[$id]);
     }
 
diff --git a/api/Controllers/Tickets/StaffTicketController.php b/api/Controllers/Tickets/StaffTicketController.php
index 901fc617..7e582eb7 100644
--- a/api/Controllers/Tickets/StaffTicketController.php
+++ b/api/Controllers/Tickets/StaffTicketController.php
@@ -17,6 +17,8 @@ class StaffTicketController {
         $ticketDeleter = $applicationContext->get[TicketDeleter::class];
 
         $ticketDeleter->deleteTicket($id, $userContext, $hesk_settings);
+
+        http_response_code(204);
     }
 
     function put($id) {
diff --git a/api/DataAccess/Logging/LoggingGateway.php b/api/DataAccess/Logging/LoggingGateway.php
index 0df48939..43fdde13 100644
--- a/api/DataAccess/Logging/LoggingGateway.php
+++ b/api/DataAccess/Logging/LoggingGateway.php
@@ -36,7 +36,11 @@ class LoggingGateway extends CommonDao {
 
         hesk_dbQuery("INSERT INTO `" . hesk_dbEscape($heskSettings['db_pfix']) . "logging` (`username`, `message`, `severity`, `location`, `timestamp`, `stack_trace`)
         VALUES ('" . hesk_dbEscape($userContext->username) . "',
-        '" . hesk_dbEscape($message) . "', " . intval($severity) . ", '" . hesk_dbEscape($location) . "', NOW(), '" . hesk_dbEscape($stackTrace) . "')");
+            '" . hesk_dbEscape(addslashes($message)) . "', 
+            " . intval($severity) . ", 
+            '" . hesk_dbEscape(addslashes($location)) . "', 
+            NOW(), 
+            '" . hesk_dbEscape(addslashes($stackTrace)) . "')");
 
         $insertedId = hesk_dbInsertID();
 

From 0a2d94e05bda85e3dd36488656e67e2671c6d33d Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Mon, 1 May 2017 21:20:59 -0400
Subject: [PATCH 111/192] Add a basic endpoint to get a ticket for staff

---
 api/ApplicationContext.php                    |  3 ++-
 api/BusinessLogic/Tickets/Ticket.php          |  4 ++--
 api/BusinessLogic/Tickets/TicketRetriever.php | 21 +++++++++++++++++--
 .../Tickets/StaffTicketController.php         | 10 +++++++++
 4 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/api/ApplicationContext.php b/api/ApplicationContext.php
index 9e6cacda..95b312b8 100644
--- a/api/ApplicationContext.php
+++ b/api/ApplicationContext.php
@@ -87,7 +87,8 @@ class ApplicationContext {
         // Tickets
         $this->get[UserToTicketChecker::class] = new UserToTicketChecker($this->get[UserGateway::class]);
         $this->get[TicketGateway::class] = new TicketGateway();
-        $this->get[TicketRetriever::class] = new TicketRetriever($this->get[TicketGateway::class]);
+        $this->get[TicketRetriever::class] = new TicketRetriever($this->get[TicketGateway::class],
+            $this->get[UserToTicketChecker::class]);
         $this->get[TicketValidators::class] = new TicketValidators($this->get[TicketGateway::class]);
         $this->get[TrackingIdGenerator::class] = new TrackingIdGenerator($this->get[TicketGateway::class]);
         $this->get[Autoassigner::class] = new Autoassigner($this->get[CategoryGateway::class], $this->get[UserGateway::class]);
diff --git a/api/BusinessLogic/Tickets/Ticket.php b/api/BusinessLogic/Tickets/Ticket.php
index 73ebf8b4..029dcff4 100644
--- a/api/BusinessLogic/Tickets/Ticket.php
+++ b/api/BusinessLogic/Tickets/Ticket.php
@@ -131,8 +131,8 @@ class Ticket {
 
             $reply->staffId = $replyRow['staffid'] > 0 ? $replyRow['staffid'] : null;
             $reply->rating = $replyRow['rating'];
-            $reply->isRead = $replyRow['read'];
-            $reply->usesHtml = $replyRow['html'];
+            $reply->isRead = $replyRow['read'] === '1';
+            $reply->usesHtml = $replyRow['html'] === '1';
 
             $replies[$reply->id] = $reply;
         }
diff --git a/api/BusinessLogic/Tickets/TicketRetriever.php b/api/BusinessLogic/Tickets/TicketRetriever.php
index 438af152..b63bb8e0 100644
--- a/api/BusinessLogic/Tickets/TicketRetriever.php
+++ b/api/BusinessLogic/Tickets/TicketRetriever.php
@@ -3,8 +3,10 @@
 namespace BusinessLogic\Tickets;
 
 
+use BusinessLogic\Exceptions\AccessViolationException;
 use BusinessLogic\Exceptions\ApiFriendlyException;
 use BusinessLogic\Exceptions\ValidationException;
+use BusinessLogic\Security\UserToTicketChecker;
 use BusinessLogic\ValidationModel;
 use DataAccess\Tickets\TicketGateway;
 
@@ -14,12 +16,27 @@ class TicketRetriever {
      */
     private $ticketGateway;
 
-    function __construct($ticketGateway) {
+    /* @var $userToTicketChecker UserToTicketChecker */
+    private $userToTicketChecker;
+
+    function __construct($ticketGateway, $userToTicketChecker) {
         $this->ticketGateway = $ticketGateway;
+        $this->userToTicketChecker = $userToTicketChecker;
     }
 
+    //TODO Properly test
     function getTicketById($id, $heskSettings, $userContext) {
-        return $this->ticketGateway->getTicketById($id, $heskSettings);
+        $ticket = $this->ticketGateway->getTicketById($id, $heskSettings);
+
+        if ($ticket !== null) {
+            throw new ApiFriendlyException("Ticket {$id} not found!", "Ticket Not Found", 404);
+        }
+
+        if (!$this->userToTicketChecker->isTicketAccessibleToUser($userContext, $ticket, $heskSettings)) {
+            throw new AccessViolationException("User does not have access to ticket {$id}!");
+        }
+
+        return $ticket;
     }
 
     function getTicketByTrackingIdAndEmail($trackingId, $emailAddress, $heskSettings) {
diff --git a/api/Controllers/Tickets/StaffTicketController.php b/api/Controllers/Tickets/StaffTicketController.php
index 7e582eb7..001cd556 100644
--- a/api/Controllers/Tickets/StaffTicketController.php
+++ b/api/Controllers/Tickets/StaffTicketController.php
@@ -7,9 +7,19 @@ use BusinessLogic\Helpers;
 use BusinessLogic\Tickets\EditTicketModel;
 use BusinessLogic\Tickets\TicketDeleter;
 use BusinessLogic\Tickets\TicketEditor;
+use BusinessLogic\Tickets\TicketRetriever;
 use Controllers\JsonRetriever;
 
 class StaffTicketController {
+    function get($id) {
+        global $applicationContext, $userContext, $hesk_settings;
+
+        /* @var $ticketRetriever TicketRetriever */
+        $ticketRetriever = $applicationContext->get[TicketRetriever::class];
+
+        output($ticketRetriever->getTicketById($id, $hesk_settings, $userContext));
+    }
+
     function delete($id) {
         global $applicationContext, $userContext, $hesk_settings;
 

From ef9cbf98b07fd7206f6456921da309948396b468 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Mon, 1 May 2017 22:05:21 -0400
Subject: [PATCH 112/192] Improve POST ticket

---
 .../Emails/EmailTemplateParser.php            | 25 ++++++++++++++-----
 api/BusinessLogic/Statuses/Status.php         |  2 +-
 api/BusinessLogic/Tickets/Ticket.php          | 10 ++++++--
 api/BusinessLogic/Tickets/TicketCreator.php   |  2 +-
 api/BusinessLogic/Tickets/TicketRetriever.php |  2 +-
 .../Tickets/TrackingIdGenerator.php           |  8 +++---
 .../Tickets/CustomerTicketController.php      |  2 +-
 api/DataAccess/Tickets/TicketGateway.php      | 18 +++++++++++++
 api/index.php                                 |  1 -
 9 files changed, 53 insertions(+), 17 deletions(-)

diff --git a/api/BusinessLogic/Emails/EmailTemplateParser.php b/api/BusinessLogic/Emails/EmailTemplateParser.php
index 1bcd84a6..927a0d00 100644
--- a/api/BusinessLogic/Emails/EmailTemplateParser.php
+++ b/api/BusinessLogic/Emails/EmailTemplateParser.php
@@ -3,6 +3,7 @@
 namespace BusinessLogic\Emails;
 
 
+use BusinessLogic\Exceptions\ApiFriendlyException;
 use BusinessLogic\Exceptions\EmailTemplateNotFoundException;
 use BusinessLogic\Exceptions\InvalidEmailTemplateException;
 use BusinessLogic\Statuses\DefaultStatusForAction;
@@ -63,9 +64,21 @@ class EmailTemplateParser {
         $htmlTemplate = self::getFromFileSystem($emailTemplate->fileName, $languageCode, true);
         $subject = $hesklang[$emailTemplate->languageKey];
 
-        $subject = $this->parseSubject($subject, $ticket, $languageCode, $heskSettings);
-        $message = $this->parseMessage($template, $ticket, $languageCode, $emailTemplate->forStaff, $heskSettings, $modsForHeskSettings, false);
-        $htmlMessage = $this->parseMessage($htmlTemplate, $ticket, $languageCode, $emailTemplate->forStaff, $heskSettings, $modsForHeskSettings, true);
+        $fullLanguageName = null;
+        foreach ($heskSettings['languages'] as $key => $value) {
+            if ($value['folder'] === $languageCode) {
+                $fullLanguageName = $key;
+                break;
+            }
+        }
+
+        if ($fullLanguageName === null) {
+            throw new \Exception("Language code {$languageCode} did not return any valid HESK languages!");
+        }
+
+        $subject = $this->parseSubject($subject, $ticket, $fullLanguageName, $heskSettings);
+        $message = $this->parseMessage($template, $ticket, $fullLanguageName, $emailTemplate->forStaff, $heskSettings, $modsForHeskSettings, false);
+        $htmlMessage = $this->parseMessage($htmlTemplate, $ticket, $fullLanguageName, $emailTemplate->forStaff, $heskSettings, $modsForHeskSettings, true);
 
         return new ParsedEmailProperties($subject, $message, $htmlMessage);
     }
@@ -113,7 +126,7 @@ class EmailTemplateParser {
 
         // Status name and category name
         $defaultStatus = $this->statusGateway->getStatusForDefaultAction(DefaultStatusForAction::NEW_TICKET, $heskSettings);
-        $statusName = $defaultStatus->localizedNames[$language]->text;
+        $statusName = $defaultStatus->localizedNames[$language];
         $category = $this->categoryGateway->getAllCategories($heskSettings)[$ticket->categoryId];
 
         switch ($ticket->priorityId) {
@@ -175,7 +188,7 @@ class EmailTemplateParser {
 
         // Status name and category name
         $defaultStatus = $this->statusGateway->getStatusForDefaultAction(DefaultStatusForAction::NEW_TICKET, $heskSettings);
-        $statusName = hesk_msgToPlain($defaultStatus->localizedNames[$language]->text);
+        $statusName = hesk_msgToPlain($defaultStatus->localizedNames[$language]);
         $category = hesk_msgToPlain($this->categoryGateway->getAllCategories($heskSettings)[$ticket->categoryId]->name);
         $owner = hesk_msgToPlain($this->userGateway->getUserById($ticket->ownerId, $heskSettings)->name);
 
@@ -217,7 +230,7 @@ class EmailTemplateParser {
         for ($i=1; $i<=50; $i++) {
             $k = 'custom'.$i;
 
-            if (isset($heskSettings['custom_fields'][$k])) {
+            if (isset($heskSettings['custom_fields'][$k]) && isset($ticket->customFields[$i])) {
                 $v = $heskSettings['custom_fields'][$k];
 
                 switch ($v['type']) {
diff --git a/api/BusinessLogic/Statuses/Status.php b/api/BusinessLogic/Statuses/Status.php
index 8e58345f..c5ef3242 100644
--- a/api/BusinessLogic/Statuses/Status.php
+++ b/api/BusinessLogic/Statuses/Status.php
@@ -66,7 +66,7 @@ class Status {
     public $sort;
 
     /**
-     * @var $name StatusLanguage[]
+     * @var $name string[]
      */
     public $localizedNames;
 }
\ No newline at end of file
diff --git a/api/BusinessLogic/Tickets/Ticket.php b/api/BusinessLogic/Tickets/Ticket.php
index 029dcff4..42eda13c 100644
--- a/api/BusinessLogic/Tickets/Ticket.php
+++ b/api/BusinessLogic/Tickets/Ticket.php
@@ -24,7 +24,13 @@ class Ticket {
         $ticket->closedDate = $row['closedat'];
 
         if (trim($row['articles']) !== '') {
-            $ticket->suggestedArticles = explode(',', $row['articles']);
+            $suggestedArticles = explode(',', $row['articles']);
+
+            $articlesAsInts = array();
+            foreach ($suggestedArticles as $article) {
+                $articlesAsInts[] = intval($article);
+            }
+            $ticket->suggestedArticles = $articlesAsInts;
         }
 
         $ticket->ipAddress = $row['ip'];
@@ -202,7 +208,7 @@ class Ticket {
     public $closedDate;
 
     /**
-     * @var string[]
+     * @var int[]
      */
     public $suggestedArticles = array();
 
diff --git a/api/BusinessLogic/Tickets/TicketCreator.php b/api/BusinessLogic/Tickets/TicketCreator.php
index 1c0c0818..245da2a1 100644
--- a/api/BusinessLogic/Tickets/TicketCreator.php
+++ b/api/BusinessLogic/Tickets/TicketCreator.php
@@ -145,7 +145,7 @@ class TicketCreator {
 
         if ($ticketRequest->sendEmailToCustomer && $emailVerified) {
             $this->emailSenderHelper->sendEmailForTicket(EmailTemplateRetriever::NEW_TICKET, $ticketRequest->language, $addressees, $ticket, $heskSettings, $modsForHeskSettings);
-        } else if ($modsForHeskSettings[''] && !$emailVerified) {
+        } else if ($modsForHeskSettings['customer_email_verification_required'] && !$emailVerified) {
             $this->emailSenderHelper->sendEmailForTicket(EmailTemplateRetriever::VERIFY_EMAIL, $ticketRequest->language, $addressees, $ticket, $heskSettings, $modsForHeskSettings);
         }
 
diff --git a/api/BusinessLogic/Tickets/TicketRetriever.php b/api/BusinessLogic/Tickets/TicketRetriever.php
index b63bb8e0..5a237a98 100644
--- a/api/BusinessLogic/Tickets/TicketRetriever.php
+++ b/api/BusinessLogic/Tickets/TicketRetriever.php
@@ -28,7 +28,7 @@ class TicketRetriever {
     function getTicketById($id, $heskSettings, $userContext) {
         $ticket = $this->ticketGateway->getTicketById($id, $heskSettings);
 
-        if ($ticket !== null) {
+        if ($ticket === null) {
             throw new ApiFriendlyException("Ticket {$id} not found!", "Ticket Not Found", 404);
         }
 
diff --git a/api/BusinessLogic/Tickets/TrackingIdGenerator.php b/api/BusinessLogic/Tickets/TrackingIdGenerator.php
index 25cbe010..623ab1fe 100644
--- a/api/BusinessLogic/Tickets/TrackingIdGenerator.php
+++ b/api/BusinessLogic/Tickets/TrackingIdGenerator.php
@@ -36,9 +36,9 @@ class TrackingIdGenerator {
             $trackingId = $this->formatTrackingId($trackingId);
 
             /* Check for duplicate IDs */
-            $ticket = $this->ticketGateway->getTicketByTrackingId($trackingId, $heskSettings);
+            $goodId = !$this->ticketGateway->doesTicketExist($trackingId, $heskSettings);
 
-            if ($ticket === null) {
+            if ($goodId) {
                 return $trackingId;
             }
 
@@ -57,9 +57,9 @@ class TrackingIdGenerator {
         /* Format the ID to the correct shape and check wording */
         $trackingId = $this->formatTrackingId($trackingId);
 
-        $ticket = $this->ticketGateway->getTicketByTrackingId($trackingId, $heskSettings);
+        $goodId = !$this->ticketGateway->doesTicketExist($trackingId, $heskSettings);
 
-        if ($ticket === null) {
+        if ($goodId) {
             return $trackingId;
         }
 
diff --git a/api/Controllers/Tickets/CustomerTicketController.php b/api/Controllers/Tickets/CustomerTicketController.php
index 7b9d455e..cd8e9481 100644
--- a/api/Controllers/Tickets/CustomerTicketController.php
+++ b/api/Controllers/Tickets/CustomerTicketController.php
@@ -55,7 +55,7 @@ class CustomerTicketController {
         $ticketRequest->screenResolution = Helpers::safeArrayGet($json, 'screenResolution');
         $ticketRequest->ipAddress = Helpers::safeArrayGet($json, 'ip');
         $ticketRequest->language = Helpers::safeArrayGet($json, 'language');
-        $ticketRequest->sendEmailToCustomer = Helpers::safeArrayGet($json, 'sendEmailToCustomer');
+        $ticketRequest->sendEmailToCustomer = true;
         $ticketRequest->customFields = array();
 
         $jsonCustomFields = Helpers::safeArrayGet($json, 'customFields');
diff --git a/api/DataAccess/Tickets/TicketGateway.php b/api/DataAccess/Tickets/TicketGateway.php
index 34f66e11..1645618b 100644
--- a/api/DataAccess/Tickets/TicketGateway.php
+++ b/api/DataAccess/Tickets/TicketGateway.php
@@ -66,6 +66,24 @@ class TicketGateway extends CommonDao {
         return $tickets;
     }
 
+    /**
+     * @param $trackingId string
+     * @param $heskSettings array
+     * @return bool
+     */
+    function doesTicketExist($trackingId, $heskSettings) {
+        $this->init();
+
+        $rs = hesk_dbQuery("SELECT 1 FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "tickets` 
+            WHERE `trackid` = '" . hesk_dbEscape($trackingId) . "'");
+
+        $ticketExists = hesk_dbNumRows($rs) > 0;
+
+        $this->close();
+
+        return $ticketExists;
+    }
+
     /**
      * @param $trackingId string
      * @param $heskSettings array
diff --git a/api/index.php b/api/index.php
index 991160c5..079fd851 100644
--- a/api/index.php
+++ b/api/index.php
@@ -150,7 +150,6 @@ Link::all(array(
     '/v1/categories' => \Controllers\Categories\CategoryController::class . '::printAllCategories',
     '/v1/categories/{i}' => \Controllers\Categories\CategoryController::class,
     // Tickets
-    '/v1/tickets/{i}' => \Controllers\Tickets\CustomerTicketController::class,
     '/v1/tickets' => \Controllers\Tickets\CustomerTicketController::class,
     // Tickets - Staff
     '/v1/staff/tickets/{i}' => \Controllers\Tickets\StaffTicketController::class,

From 77089c79ec992748cb1f1689b87edad2f2e1737d Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Tue, 2 May 2017 21:41:19 -0400
Subject: [PATCH 113/192] Display warning on tab close if message contents are
 not empty

---
 admin/admin_ticket.php          |  1 +
 internal-api/js/admin-ticket.js | 26 +++++++++++++++++++++++++-
 language/en/text.php            |  1 +
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/admin/admin_ticket.php b/admin/admin_ticket.php
index c782c81f..bdd3f98f 100644
--- a/admin/admin_ticket.php
+++ b/admin/admin_ticket.php
@@ -1949,6 +1949,7 @@ function hesk_printReplyForm()
 
                             ?></textarea>
                         <div class="help-block with-errors" id="message-help-block"></div></span>
+                        <p id="lang_ticket_message_contents_exist" style="display: none"><?php echo $hesklang['ticket_message_contents_exist']; ?></p>
                 </div>
             </div>
             <?php
diff --git a/internal-api/js/admin-ticket.js b/internal-api/js/admin-ticket.js
index 5382ee5b..8cbbb287 100644
--- a/internal-api/js/admin-ticket.js
+++ b/internal-api/js/admin-ticket.js
@@ -41,5 +41,29 @@ $(document).ready(function() {
     $('#related-tickets-link').click(function() {
         $(this).hide();
         $('.related-ticket').show();
-    })
+    });
+
+    window.onbeforeunload = function (e) {
+        e = e || window.event;
+
+        var plaintextEditorHasContents = $('textarea[name="message"]').val() !== '';
+        var htmlEditorHasContents = false;
+
+        if (tinymce.get("message") !== undefined) {
+            plaintextEditorHasContents = false;
+            htmlEditorHasContents = tinymce.get("message").getContent() !== '';
+        }
+
+        if (plaintextEditorHasContents || htmlEditorHasContents) {
+            var $langText = $('#lang_ticket_message_contents_exist');
+
+            // For IE and Firefox prior to version 4
+            if (e) {
+                e.returnValue = $langText.text();
+            }
+
+            // For Safari
+            return $langText.text();
+        }
+    };
 });
\ No newline at end of file
diff --git a/language/en/text.php b/language/en/text.php
index 8bfcbb46..d8a6a7ac 100644
--- a/language/en/text.php
+++ b/language/en/text.php
@@ -47,6 +47,7 @@ $hesklang['EMAIL_HR']='------ Reply above this line ------';
 
 // ADDED OR MODIFIED IN Mods for HESK 3.1.0
 $hesklang['stack_trace_header'] = 'Stack Trace';
+$hesklang['ticket_message_contents_exist'] = 'The ticket message is not empty. Are you sure you want to leave this page?';
 
 // ADDED OR MODIFIED IN Mods for HESK 3.0.0
 $hesklang['you_have_x_messages'] = 'You have %s new %s'; // %s: Number of new messages, "message" or "messages", depending on # 

From cb9590c18968a50e93aaf2cf4bc6f686f5d93de4 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Thu, 4 May 2017 16:15:11 +0000
Subject: [PATCH 114/192] Add Ability To Resend Response

---
 .../Emails/EmailTemplateParser.php            |  7 +-
 .../Exceptions/InternalUseOnlyException.php   | 10 +++
 .../Exceptions/SessionNotActiveException.php  | 16 +++++
 api/Controllers/InternalApiController.php     | 16 +++++
 .../ResendTicketEmailToCustomerController.php | 72 +++++++++++++++++++
 api/index.php                                 | 30 +++++++-
 inc/admin_functions.inc.php                   | 29 ++++++--
 7 files changed, 168 insertions(+), 12 deletions(-)
 create mode 100644 api/BusinessLogic/Exceptions/InternalUseOnlyException.php
 create mode 100644 api/BusinessLogic/Exceptions/SessionNotActiveException.php
 create mode 100644 api/Controllers/InternalApiController.php
 create mode 100644 api/Controllers/Tickets/ResendTicketEmailToCustomerController.php

diff --git a/api/BusinessLogic/Emails/EmailTemplateParser.php b/api/BusinessLogic/Emails/EmailTemplateParser.php
index 927a0d00..4fbc3e65 100644
--- a/api/BusinessLogic/Emails/EmailTemplateParser.php
+++ b/api/BusinessLogic/Emails/EmailTemplateParser.php
@@ -179,7 +179,7 @@ class EmailTemplateParser {
         $heskSettings['site_title'] = hesk_msgToPlain($heskSettings['site_title'], 1);
 
         // Is email required to view ticket (for customers only)?
-        $heskSettings['e_param'] = $heskSettings['email_view_ticket'] ? '&e=' . rawurlencode($ticket->email) : '';
+        $heskSettings['e_param'] = $heskSettings['email_view_ticket'] ? '&e=' . rawurlencode(implode(';', $ticket->email)) : '';
 
         /* Generate the ticket URLs */
         $trackingURL = $heskSettings['hesk_url'];
@@ -221,7 +221,7 @@ class EmailTemplateParser {
         $msg = str_replace('%%PRIORITY%%', $priority, $msg);
         $msg = str_replace('%%OWNER%%', $owner, $msg);
         $msg = str_replace('%%STATUS%%', $statusName, $msg);
-        $msg = str_replace('%%EMAIL%%', $ticket->email, $msg);
+        $msg = str_replace('%%EMAIL%%', implode(';',$ticket->email), $msg);
         $msg = str_replace('%%CREATED%%', $ticket->dateCreated, $msg);
         $msg = str_replace('%%UPDATED%%', $ticket->lastChanged, $msg);
         $msg = str_replace('%%ID%%', $ticket->id, $msg);
@@ -252,7 +252,8 @@ class EmailTemplateParser {
         if (strpos($msg, '%%MESSAGE%%') !== false) {
             // Replace message
             if ($html) {
-                $htmlMessage = nl2br($ticket->message);
+                $htmlMessage = html_entity_decode($ticket->message);
+                $htmlMessage = nl2br($htmlMessage);
                 $msg = str_replace('%%MESSAGE%%', $htmlMessage, $msg);
             } else {
                 $plainTextMessage = $ticket->message;
diff --git a/api/BusinessLogic/Exceptions/InternalUseOnlyException.php b/api/BusinessLogic/Exceptions/InternalUseOnlyException.php
new file mode 100644
index 00000000..99bbee4d
--- /dev/null
+++ b/api/BusinessLogic/Exceptions/InternalUseOnlyException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace BusinessLogic\Exceptions;
+
+
+class InternalUseOnlyException extends ApiFriendlyException {
+    function __construct() {
+        parent::__construct("This endpoint can only be used internally", "Internal Use Only", 400);
+    }
+}
\ No newline at end of file
diff --git a/api/BusinessLogic/Exceptions/SessionNotActiveException.php b/api/BusinessLogic/Exceptions/SessionNotActiveException.php
new file mode 100644
index 00000000..89c2340e
--- /dev/null
+++ b/api/BusinessLogic/Exceptions/SessionNotActiveException.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: cokoch
+ * Date: 5/2/2017
+ * Time: 12:28 PM
+ */
+
+namespace BusinessLogic\Exceptions;
+
+
+class SessionNotActiveException extends ApiFriendlyException {
+    function __construct() {
+        parent::__construct("You must be logged in to call internal API methods", "Authentication Required", 401);
+    }
+}
\ No newline at end of file
diff --git a/api/Controllers/InternalApiController.php b/api/Controllers/InternalApiController.php
new file mode 100644
index 00000000..38188528
--- /dev/null
+++ b/api/Controllers/InternalApiController.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Controllers;
+
+
+use BusinessLogic\Exceptions\InternalUseOnlyException;
+use BusinessLogic\Helpers;
+
+abstract class InternalApiController {
+    function checkForInternalUseOnly() {
+        $tokenHeader = Helpers::getHeader('X-AUTH-TOKEN');
+        if ($tokenHeader === null || trim($tokenHeader) === '') {
+            throw new InternalUseOnlyException();
+        }
+    }
+}
\ No newline at end of file
diff --git a/api/Controllers/Tickets/ResendTicketEmailToCustomerController.php b/api/Controllers/Tickets/ResendTicketEmailToCustomerController.php
new file mode 100644
index 00000000..79fb5a62
--- /dev/null
+++ b/api/Controllers/Tickets/ResendTicketEmailToCustomerController.php
@@ -0,0 +1,72 @@
+<?php
+
+namespace Controllers\Tickets;
+
+
+use BusinessLogic\Emails\Addressees;
+use BusinessLogic\Emails\EmailSenderHelper;
+use BusinessLogic\Emails\EmailTemplate;
+use BusinessLogic\Emails\EmailTemplateRetriever;
+use BusinessLogic\Exceptions\ApiFriendlyException;
+use BusinessLogic\Tickets\TicketRetriever;
+use Controllers\InternalApiController;
+use DataAccess\Settings\ModsForHeskSettingsGateway;
+
+class ResendTicketEmailToCustomerController extends InternalApiController {
+    function get($ticketId) {
+        global $applicationContext, $userContext, $hesk_settings;
+
+        $this->checkForInternalUseOnly();
+
+        /* @var $ticketRetriever TicketRetriever */
+        $ticketRetriever = $applicationContext->get[TicketRetriever::class];
+        $ticket = $ticketRetriever->getTicketById($ticketId, $hesk_settings, $userContext);
+
+        /* @var $modsForHeskSettingsGateway ModsForHeskSettingsGateway */
+        $modsForHeskSettingsGateway = $applicationContext->get[ModsForHeskSettingsGateway::class];
+        $modsForHeskSettings = $modsForHeskSettingsGateway->getAllSettings($hesk_settings);
+
+        /* @var $emailSender EmailSenderHelper */
+        $emailSender = $applicationContext->get[EmailSenderHelper::class];
+
+        $language = $ticket->language;
+
+        if ($language === null) {
+            $language = $hesk_settings['language'];
+        }
+
+        if ($ticket === null) {
+            throw new ApiFriendlyException("Ticket {$ticketId} not found!", "Ticket Not Found", 404);
+        }
+
+        $reply = null;
+        $emailTemplate = EmailTemplateRetriever::NEW_TICKET;
+        if (isset($_GET['replyId'])) {
+            $replyId = $_GET['replyId'];
+            $emailTemplate = EmailTemplateRetriever::NEW_REPLY_BY_STAFF;
+
+            foreach ($ticket->replies as $ticketReply) {
+                if ($ticketReply->id === $replyId) {
+                    $reply = $ticketReply;
+                    break;
+                }
+            }
+
+            if ($reply === null) {
+                throw new ApiFriendlyException("Reply {$replyId} not found on ticket {$ticketId}!", "Reply Not Found", 404);
+            }
+
+            // Copy over reply properties onto the Ticket
+            $ticket->lastReplier = $reply->replierName;
+            $ticket->message = $reply->message;
+            $ticket->attachments = $reply->attachments;
+        }
+
+        $addressees = new Addressees();
+        $addressees->to = $ticket->email;
+
+        $emailSender->sendEmailForTicket($emailTemplate, $language, $addressees, $ticket, $hesk_settings, $modsForHeskSettings);
+
+        http_response_code(204);
+    }
+}
\ No newline at end of file
diff --git a/api/index.php b/api/index.php
index 079fd851..52a815ee 100644
--- a/api/index.php
+++ b/api/index.php
@@ -18,8 +18,14 @@ function handle404() {
 function before() {
     assertApiIsEnabled();
 
-    $token = \BusinessLogic\Helpers::getHeader('X-AUTH-TOKEN');
-    buildUserContext($token);
+    $internalUse = \BusinessLogic\Helpers::getHeader('X-INTERNAL-CALL');
+
+    if ($internalUse === 'true') {
+        buildUserContextFromSession();
+    } else {
+        $token = \BusinessLogic\Helpers::getHeader('X-AUTH-TOKEN');
+        buildUserContext($token);
+    }
 }
 
 function assertApiIsEnabled() {
@@ -36,6 +42,19 @@ function assertApiIsEnabled() {
     return;
 }
 
+function buildUserContextFromSession() {
+    global $userContext;
+
+    hesk_session_start();
+
+    if (!hesk_isLoggedIn(false)) {
+        throw new \BusinessLogic\Exceptions\SessionNotActiveException();
+    }
+
+    /* @var $userContext \BusinessLogic\Security\UserContext */
+    $userContext = \BusinessLogic\Security\UserContext::fromDataRow($_SESSION);
+}
+
 function buildUserContext($xAuthToken) {
     global $applicationContext, $userContext, $hesk_settings;
 
@@ -123,6 +142,9 @@ function getLoggingLocation($exception) {
     $trace = $exception->getTrace();
     $lastCall = $trace[0];
     $location = basename($lastCall['file'], '.php');
+    if ($location === null || trim($location) === '') {
+        $location = 'N/A';
+    }
     return "REST API: {$location}";
 }
 
@@ -161,6 +183,10 @@ Link::all(array(
     // Settings
     '/v1/settings' => \Controllers\Settings\SettingsController::class,
 
+    /* Internal use only routes */
+    // Resend email response
+    '/v1-internal/staff/tickets/{i}/resend-email' => \Controllers\Tickets\ResendTicketEmailToCustomerController::class,
+
     // Any URL that doesn't match goes to the 404 handler
     '404' => 'handle404'
 ));
\ No newline at end of file
diff --git a/inc/admin_functions.inc.php b/inc/admin_functions.inc.php
index 832c5cd4..f2edf27a 100644
--- a/inc/admin_functions.inc.php
+++ b/inc/admin_functions.inc.php
@@ -460,7 +460,7 @@ function hesk_autoLogin($noredirect = 0)
 } // END hesk_autoLogin()
 
 
-function hesk_isLoggedIn()
+function hesk_isLoggedIn($redirect_if_not_logged_in = true)
 {
     global $hesk_settings;
 
@@ -482,8 +482,13 @@ function hesk_isLoggedIn()
         }
 
         hesk_session_stop();
-        header('Location: ' . $url);
-        exit();
+
+        if ($redirect_if_not_logged_in) {
+            header('Location: ' . $url);
+            exit();
+        } else {
+            return false;
+        }
     } else {
         hesk_session_regenerate_id();
 
@@ -493,8 +498,13 @@ function hesk_isLoggedIn()
         // Exit if user not found
         if (hesk_dbNumRows($res) != 1) {
             hesk_session_stop();
-            header('Location: ' . $url);
-            exit();
+
+            if ($redirect_if_not_logged_in) {
+                header('Location: ' . $url);
+                exit();
+            } else {
+                return false;
+            }
         }
 
         // Fetch results from database
@@ -503,8 +513,13 @@ function hesk_isLoggedIn()
         // Verify this session is still valid
         if (!hesk_activeSessionValidate($me['user'], $me['pass'], $_SESSION['session_verify'])) {
             hesk_session_stop();
-            header('Location: ' . $url);
-            exit();
+
+            if ($redirect_if_not_logged_in) {
+                header('Location: ' . $url);
+                exit();
+            } else {
+                return false;
+            }
         }
 
         // Update session variables as needed

From e086322332f4add0050b383a6b801d566d4d51e4 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Thu, 4 May 2017 13:07:17 -0400
Subject: [PATCH 115/192] Working on adding the resend button to the actual
 ticket page

---
 admin/admin_ticket.php                        |  9 ++++
 .../Exceptions/InternalUseOnlyException.php   |  2 +-
 api/BusinessLogic/Security/UserContext.php    | 49 ++++++++++---------
 api/Controllers/InternalApiController.php     |  2 +-
 api/autoload.php                              |  1 +
 api/index.php                                 |  2 +-
 css/colors.css                                |  4 ++
 inc/headerAdmin.inc.php                       |  1 +
 internal-api/js/admin-ticket.js               | 21 ++++++++
 9 files changed, 64 insertions(+), 27 deletions(-)

diff --git a/admin/admin_ticket.php b/admin/admin_ticket.php
index bdd3f98f..af3c8346 100644
--- a/admin/admin_ticket.php
+++ b/admin/admin_ticket.php
@@ -1500,6 +1500,15 @@ function hesk_getAdminButtonsInTicket($reply = 0, $white = 1)
 
     $options = $reply ? '' : '<div class="pull-right">';
 
+    // Resend email notification
+    if ($reply) {
+        $options .= '
+        <button class="btn btn-default" data-action="resend-email-notification" data-reply-id="' . $reply['id'] . '" data-ticket-id="' . $ticket['id'] . '">
+            <i class="fa fa-envelope navy-blue"></i> Resend Email Notification[!]
+        </button>
+        ';
+    }
+
     /* Edit post */
     if ($can_edit) {
         $tmp = $reply ? '&amp;reply=' . $reply['id'] : '';
diff --git a/api/BusinessLogic/Exceptions/InternalUseOnlyException.php b/api/BusinessLogic/Exceptions/InternalUseOnlyException.php
index 99bbee4d..89f2d0f9 100644
--- a/api/BusinessLogic/Exceptions/InternalUseOnlyException.php
+++ b/api/BusinessLogic/Exceptions/InternalUseOnlyException.php
@@ -5,6 +5,6 @@ namespace BusinessLogic\Exceptions;
 
 class InternalUseOnlyException extends ApiFriendlyException {
     function __construct() {
-        parent::__construct("This endpoint can only be used internally", "Internal Use Only", 400);
+        parent::__construct("This endpoint can only be used internally", "Internal Use Only", 401);
     }
 }
\ No newline at end of file
diff --git a/api/BusinessLogic/Security/UserContext.php b/api/BusinessLogic/Security/UserContext.php
index 27318d14..45132395 100644
--- a/api/BusinessLogic/Security/UserContext.php
+++ b/api/BusinessLogic/Security/UserContext.php
@@ -61,44 +61,45 @@ class UserContext {
      * @return UserContext the built user context
      */
     static function fromDataRow($dataRow) {
+        var_dump($dataRow);
         $userContext = new UserContext();
-        $userContext->id = $dataRow['id'];
+        $userContext->id = intval($dataRow['id']);
         $userContext->username = $dataRow['user'];
-        $userContext->admin = $dataRow['isadmin'] === '1';
+        $userContext->admin = boolval($dataRow['isadmin']);
         $userContext->name = $dataRow['name'];
         $userContext->email = $dataRow['email'];
         $userContext->signature = $dataRow['signature'];
         $userContext->language = $dataRow['language'];
         $userContext->categories = explode(',', $dataRow['categories']);
         $userContext->permissions = explode(',', $dataRow['heskprivileges']);
-        $userContext->autoAssign = $dataRow['autoassign'];
-        $userContext->ratingNegative = $dataRow['ratingneg'];
-        $userContext->ratingPositive = $dataRow['ratingpos'];
-        $userContext->rating = $dataRow['rating'];
-        $userContext->totalNumberOfReplies = $dataRow['replies'];
-        $userContext->active = $dataRow['active'];
+        $userContext->autoAssign = boolval($dataRow['autoassign']);
+        $userContext->ratingNegative = intval($dataRow['ratingneg']);
+        $userContext->ratingPositive = intval($dataRow['ratingpos']);
+        $userContext->rating = floatval($dataRow['rating']);
+        $userContext->totalNumberOfReplies = intval($dataRow['replies']);
+        $userContext->active = boolval($dataRow['active']);
 
         $preferences = new UserContextPreferences();
-        $preferences->afterReply = $dataRow['afterreply'];
-        $preferences->autoStartTimeWorked = $dataRow['autostart'];
-        $preferences->autoreload = $dataRow['autoreload'];
-        $preferences->defaultNotifyCustomerNewTicket = $dataRow['notify_customer_new'];
-        $preferences->defaultNotifyCustomerReply = $dataRow['notify_customer_reply'];
-        $preferences->showSuggestedKnowledgebaseArticles = $dataRow['show_suggested'];
-        $preferences->defaultCalendarView = $dataRow['default_calendar_view'];
+        $preferences->afterReply = intval($dataRow['afterreply']);
+        $preferences->autoStartTimeWorked = boolval($dataRow['autostart']);
+        $preferences->autoreload = intval($dataRow['autoreload']);
+        $preferences->defaultNotifyCustomerNewTicket = boolval($dataRow['notify_customer_new']);
+        $preferences->defaultNotifyCustomerReply = boolval($dataRow['notify_customer_reply']);
+        $preferences->showSuggestedKnowledgebaseArticles = boolval($dataRow['show_suggested']);
+        $preferences->defaultCalendarView = intval($dataRow['default_calendar_view']);
         $preferences->defaultTicketView = $dataRow['default_list'];
         $userContext->preferences = $preferences;
 
         $notifications = new UserContextNotifications();
-        $notifications->newUnassigned = $dataRow['notify_new_unassigned'];
-        $notifications->newAssignedToMe = $dataRow['notify_new_my'];
-        $notifications->replyUnassigned = $dataRow['notify_reply_unassigned'];
-        $notifications->replyToMe = $dataRow['notify_reply_my'];
-        $notifications->ticketAssignedToMe = $dataRow['notify_assigned'];
-        $notifications->privateMessage = $dataRow['notify_pm'];
-        $notifications->noteOnTicketAssignedToMe = $dataRow['notify_note'];
-        $notifications->noteOnTicketNotAssignedToMe = $dataRow['notify_note_unassigned'];
-        $notifications->overdueTicketUnassigned = $dataRow['notify_overdue_unassigned'];
+        $notifications->newUnassigned = boolval($dataRow['notify_new_unassigned']);
+        $notifications->newAssignedToMe = boolval($dataRow['notify_new_my']);
+        $notifications->replyUnassigned = boolval($dataRow['notify_reply_unassigned']);
+        $notifications->replyToMe = boolval($dataRow['notify_reply_my']);
+        $notifications->ticketAssignedToMe = boolval($dataRow['notify_assigned']);
+        $notifications->privateMessage = boolval($dataRow['notify_pm']);
+        $notifications->noteOnTicketAssignedToMe = boolval($dataRow['notify_note']);
+        $notifications->noteOnTicketNotAssignedToMe = boolval($dataRow['notify_note_unassigned']);
+        $notifications->overdueTicketUnassigned = boolval($dataRow['notify_overdue_unassigned']);
         $userContext->notificationSettings = $notifications;
 
         return $userContext;
diff --git a/api/Controllers/InternalApiController.php b/api/Controllers/InternalApiController.php
index 38188528..29d82642 100644
--- a/api/Controllers/InternalApiController.php
+++ b/api/Controllers/InternalApiController.php
@@ -9,7 +9,7 @@ use BusinessLogic\Helpers;
 abstract class InternalApiController {
     function checkForInternalUseOnly() {
         $tokenHeader = Helpers::getHeader('X-AUTH-TOKEN');
-        if ($tokenHeader === null || trim($tokenHeader) === '') {
+        if ($tokenHeader !== null && trim($tokenHeader) !== '') {
             throw new InternalUseOnlyException();
         }
     }
diff --git a/api/autoload.php b/api/autoload.php
index c12b9647..b9c2292e 100644
--- a/api/autoload.php
+++ b/api/autoload.php
@@ -11,6 +11,7 @@ require_once(__DIR__ . '/../inc/common.inc.php');
 require_once(__DIR__ . '/Core/output.php');
 require_once(__DIR__ . '/../hesk_settings.inc.php');
 require_once(__DIR__ . '/http_response_code.php');
+require_once(__DIR__ . '/../inc/admin_functions.inc.php');
 
 hesk_load_api_database_functions();
 
diff --git a/api/index.php b/api/index.php
index 52a815ee..92e87d99 100644
--- a/api/index.php
+++ b/api/index.php
@@ -47,7 +47,7 @@ function buildUserContextFromSession() {
 
     hesk_session_start();
 
-    if (!hesk_isLoggedIn(false)) {
+    if (empty($_SESSION['id'])) {
         throw new \BusinessLogic\Exceptions\SessionNotActiveException();
     }
 
diff --git a/css/colors.css b/css/colors.css
index afe383f8..1062549e 100644
--- a/css/colors.css
+++ b/css/colors.css
@@ -33,6 +33,10 @@
     color: blue;
 }
 
+.navy-blue {
+    color: #3c8dbc;
+}
+
 .med-low-priority {
     background-color: #8BB467;
 }
diff --git a/inc/headerAdmin.inc.php b/inc/headerAdmin.inc.php
index 8a6bd43e..67371291 100644
--- a/inc/headerAdmin.inc.php
+++ b/inc/headerAdmin.inc.php
@@ -247,6 +247,7 @@ if (defined('MFH_PAGE_LAYOUT') && MFH_PAGE_LAYOUT == 'TOP_ONLY') {
 ?>
 <body onload="<?php echo $onload;
 unset($onload); ?>" class="<?php echo $layout_tag ?> fixed js <?php echo $modsForHesk_settings['admin_color_scheme']; ?>">
+<span style="display: none" id="heskUrl"><?php echo $hesk_settings['hesk_url']; ?></span>
 
 <?php
 include(HESK_PATH . 'header.txt');
diff --git a/internal-api/js/admin-ticket.js b/internal-api/js/admin-ticket.js
index 8cbbb287..7749ee04 100644
--- a/internal-api/js/admin-ticket.js
+++ b/internal-api/js/admin-ticket.js
@@ -43,6 +43,27 @@ $(document).ready(function() {
         $('.related-ticket').show();
     });
 
+    $('button[data-action="resend-email-notification"]').click(function() {
+        var $this = $(this);
+
+        var ticketId = $this.data('ticket-id');
+        var replyId = $this.data('reply-id');
+        var heskUrl = $('span#heskUrl').text();
+        var apiUrl = heskUrl + '/api/v1-internal/staff/tickets/' + ticketId + '/resend-email?replyId=' + replyId;
+
+        $.ajax({
+            method: 'GET',
+            url: apiUrl,
+            headers: { 'X-Internal-Call': true },
+            success: function() {
+                $.jGrowl("Email notification sent!", { theme: 'alert-success', closeTemplate: '' });
+            },
+            error: function() {
+                $.jGrowl("Error occurred when trying to send notification email", { theme: 'alert-danger', closeTemplate: '' });
+            }
+        });
+    });
+
     window.onbeforeunload = function (e) {
         e = e || window.event;
 

From 4deedc73b48705f96f55ec28e4985157e8d12409 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Thu, 4 May 2017 21:37:50 -0400
Subject: [PATCH 116/192] Resend response properly working

---
 admin/admin_ticket.php          | 13 +++++++----
 internal-api/js/admin-ticket.js | 38 ++++++++++-----------------------
 language/en/text.php            |  3 +++
 3 files changed, 23 insertions(+), 31 deletions(-)

diff --git a/admin/admin_ticket.php b/admin/admin_ticket.php
index af3c8346..c3144151 100644
--- a/admin/admin_ticket.php
+++ b/admin/admin_ticket.php
@@ -1501,13 +1501,18 @@ function hesk_getAdminButtonsInTicket($reply = 0, $white = 1)
     $options = $reply ? '' : '<div class="pull-right">';
 
     // Resend email notification
+    $replyDataAttribute = '';
     if ($reply) {
-        $options .= '
-        <button class="btn btn-default" data-action="resend-email-notification" data-reply-id="' . $reply['id'] . '" data-ticket-id="' . $ticket['id'] . '">
-            <i class="fa fa-envelope navy-blue"></i> Resend Email Notification[!]
+        $replyDataAttribute = 'data-reply-id="' . $reply['id'] . '"';
+    }
+
+    $options .= '
+        <button class="btn btn-default" data-action="resend-email-notification" ' . $replyDataAttribute . ' data-ticket-id="' . $ticket['id'] . '">
+            <i class="fa fa-envelope navy-blue"></i> ' . $hesklang['resend_email_notification'] . '
         </button>
+        <span id="lang_email_notification_sent" style="display: none">' . $hesklang['email_notification_sent'] . '</span>
+        <span id="lang_email_notification_resend_failed" style="display: none">' . $hesklang['email_notification_resend_failed'] . '</span>
         ';
-    }
 
     /* Edit post */
     if ($can_edit) {
diff --git a/internal-api/js/admin-ticket.js b/internal-api/js/admin-ticket.js
index 7749ee04..4c654f13 100644
--- a/internal-api/js/admin-ticket.js
+++ b/internal-api/js/admin-ticket.js
@@ -49,42 +49,26 @@ $(document).ready(function() {
         var ticketId = $this.data('ticket-id');
         var replyId = $this.data('reply-id');
         var heskUrl = $('span#heskUrl').text();
-        var apiUrl = heskUrl + '/api/v1-internal/staff/tickets/' + ticketId + '/resend-email?replyId=' + replyId;
+        var apiUrl = heskUrl + '/api/v1-internal/staff/tickets/' + ticketId + '/resend-email';
 
+        if (replyId !== undefined) {
+            apiUrl += '?replyId=' + replyId;
+        }
+
+        $this.attr('disabled', true);
         $.ajax({
             method: 'GET',
             url: apiUrl,
             headers: { 'X-Internal-Call': true },
             success: function() {
-                $.jGrowl("Email notification sent!", { theme: 'alert-success', closeTemplate: '' });
+                $.jGrowl($('#lang_email_notification_sent').text(), { theme: 'alert-success', closeTemplate: '' });
             },
             error: function() {
-                $.jGrowl("Error occurred when trying to send notification email", { theme: 'alert-danger', closeTemplate: '' });
+                $.jGrowl($('#lang_email_notification_resend_failed').text(), { theme: 'alert-danger', closeTemplate: '' });
+            },
+            complete: function() {
+                $this.attr('disabled', false);
             }
         });
     });
-
-    window.onbeforeunload = function (e) {
-        e = e || window.event;
-
-        var plaintextEditorHasContents = $('textarea[name="message"]').val() !== '';
-        var htmlEditorHasContents = false;
-
-        if (tinymce.get("message") !== undefined) {
-            plaintextEditorHasContents = false;
-            htmlEditorHasContents = tinymce.get("message").getContent() !== '';
-        }
-
-        if (plaintextEditorHasContents || htmlEditorHasContents) {
-            var $langText = $('#lang_ticket_message_contents_exist');
-
-            // For IE and Firefox prior to version 4
-            if (e) {
-                e.returnValue = $langText.text();
-            }
-
-            // For Safari
-            return $langText.text();
-        }
-    };
 });
\ No newline at end of file
diff --git a/language/en/text.php b/language/en/text.php
index d8a6a7ac..75a716f3 100644
--- a/language/en/text.php
+++ b/language/en/text.php
@@ -48,6 +48,9 @@ $hesklang['EMAIL_HR']='------ Reply above this line ------';
 // ADDED OR MODIFIED IN Mods for HESK 3.1.0
 $hesklang['stack_trace_header'] = 'Stack Trace';
 $hesklang['ticket_message_contents_exist'] = 'The ticket message is not empty. Are you sure you want to leave this page?';
+$hesklang['resend_email_notification'] = 'Re-send Email Notification';
+$hesklang['email_notification_sent'] = 'Email notification sent!';
+$hesklang['email_notification_resend_failed'] = 'Error occurred when trying to send notification email.';
 
 // ADDED OR MODIFIED IN Mods for HESK 3.0.0
 $hesklang['you_have_x_messages'] = 'You have %s new %s'; // %s: Number of new messages, "message" or "messages", depending on # 

From a95936a490fcb90a70319793abd412ff3371facb Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Fri, 5 May 2017 21:41:26 -0400
Subject: [PATCH 117/192] Fix some language keys

---
 admin/manage_categories.php | 8 ++++----
 admin/manage_statuses.php   | 2 +-
 language/en/text.php        | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/admin/manage_categories.php b/admin/manage_categories.php
index dccfdb4f..2d642ad7 100644
--- a/admin/manage_categories.php
+++ b/admin/manage_categories.php
@@ -351,7 +351,7 @@ while ($mycat = hesk_dbFetchAssoc($res)) {
                         ';
                         }
                     }
-                    echo '<a href="javascript:;" class="category-modal-trigger" data-category-id="' . $mycat['id'] . '"><i class="fa fa-pencil icon-link orange" data-toggle="tooltip" title="Edit"></i></a>';
+                    echo '<a href="javascript:;" class="category-modal-trigger" data-category-id="' . $mycat['id'] . '"><i class="fa fa-pencil icon-link orange" data-toggle="tooltip" title="' . $hesklang['edit'] . '"></i></a>';
                     echo $remove_code . '</td>
                 </tr>
                 ';
@@ -370,16 +370,16 @@ while ($mycat = hesk_dbFetchAssoc($res)) {
         <div class="modal-content">
             <div class="modal-header" style="cursor: move">
                 <button type="button" class="close cancel-callback" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <h4 class="modal-title" id="myModalLabel">Edit Category</h4>
+                <h4 class="modal-title" id="myModalLabel"><?php echo $hesklang['edit_category']; ?></h4>
             </div>
             <form action="manage_categories.php" class="form-horizontal" data-toggle="validator" method="post">
                 <div class="modal-body">
                     <div class="row">
                         <div class="col-md-12">
                             <div class="form-group">
-                                <label for="name" class="col-sm-3 control-label"><?php echo $hesklang['name']; ?></label>
+                                <label for="name" class="col-sm-3 control-label"><?php echo $hesklang['cat_name']; ?></label>
                                 <div class="col-sm-9">
-                                    <input type="text" name="name" class="form-control" placeholder="<?php echo $hesklang['name']; ?>"
+                                    <input type="text" name="name" class="form-control" placeholder="<?php echo $hesklang['cat_name']; ?>"
                                            data-error="<?php echo htmlspecialchars($hesklang['this_field_is_required']); ?>"
                                            required>
                                     <div class="help-block with-errors"></div>
diff --git a/admin/manage_statuses.php b/admin/manage_statuses.php
index cdede0c0..09b1b7e1 100644
--- a/admin/manage_statuses.php
+++ b/admin/manage_statuses.php
@@ -132,7 +132,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                                     <table class="table table-hover">
                                         <thead>
                                         <tr>
-                                            <th><?php echo $hesklang['name']; ?></th>
+                                            <th><?php echo $hesklang['status_name_title']; ?></th>
                                             <th><?php echo $hesklang['closable_question']; ?></th>
                                             <th><?php echo $hesklang['closedQuestionMark']; ?></th>
                                             <th><?php echo $hesklang['actions']; ?></th>
diff --git a/language/en/text.php b/language/en/text.php
index 75a716f3..18aca4be 100644
--- a/language/en/text.php
+++ b/language/en/text.php
@@ -51,6 +51,7 @@ $hesklang['ticket_message_contents_exist'] = 'The ticket message is not empty. A
 $hesklang['resend_email_notification'] = 'Re-send Email Notification';
 $hesklang['email_notification_sent'] = 'Email notification sent!';
 $hesklang['email_notification_resend_failed'] = 'Error occurred when trying to send notification email.';
+$hesklang['edit_category'] = 'Edit Category';
 
 // ADDED OR MODIFIED IN Mods for HESK 3.0.0
 $hesklang['you_have_x_messages'] = 'You have %s new %s'; // %s: Number of new messages, "message" or "messages", depending on # 

From 2845a734efdecc6a47f9389fcc8d883ea792d9c7 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Fri, 5 May 2017 22:09:02 -0400
Subject: [PATCH 118/192] Popover header now matches category color

---
 .../mods-for-hesk-calendar-admin-readonly.js  | 10 +++++-
 .../mods-for-hesk-calendar-readonly.js        | 10 +++++-
 js/calendar/mods-for-hesk-calendar.js         | 10 +++++-
 js/modsForHesk-javascript.js                  | 34 +++++++++++--------
 4 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/js/calendar/mods-for-hesk-calendar-admin-readonly.js b/js/calendar/mods-for-hesk-calendar-admin-readonly.js
index 94289cb1..ce87b063 100644
--- a/js/calendar/mods-for-hesk-calendar-admin-readonly.js
+++ b/js/calendar/mods-for-hesk-calendar-admin-readonly.js
@@ -85,7 +85,15 @@ $(document).ready(function() {
                 animation: true,
                 container: 'body',
                 placement: 'auto'
-            }).popover('show');
+            }).data('bs.popover')
+                .tip()
+                .css('padding', '0')
+                .find('.popover-title')
+                .css('background-color', event.color === '#fff' ? '#f7f7f7' : event.color)
+                .addClass('background-volatile');
+
+            $eventMarkup.popover('show');
+            refreshBackgroundVolatileItems();
         },
         eventMouseout: function() {
             $(this).popover('destroy');
diff --git a/js/calendar/mods-for-hesk-calendar-readonly.js b/js/calendar/mods-for-hesk-calendar-readonly.js
index ea5ba6c4..ff0d8b7c 100644
--- a/js/calendar/mods-for-hesk-calendar-readonly.js
+++ b/js/calendar/mods-for-hesk-calendar-readonly.js
@@ -74,7 +74,15 @@ $(document).ready(function() {
                 animation: true,
                 container: 'body',
                 placement: 'auto'
-            }).popover('show');
+            }).data('bs.popover')
+                .tip()
+                .css('padding', '0')
+                .find('.popover-title')
+                .css('background-color', event.color === '#fff' ? '#f7f7f7' : event.color)
+                .addClass('background-volatile');
+
+            $eventMarkup.popover('show');
+            refreshBackgroundVolatileItems();
         },
         eventMouseout: function(event) {
             if (event.type === 'TICKET') {
diff --git a/js/calendar/mods-for-hesk-calendar.js b/js/calendar/mods-for-hesk-calendar.js
index f708d5b8..48b3a083 100644
--- a/js/calendar/mods-for-hesk-calendar.js
+++ b/js/calendar/mods-for-hesk-calendar.js
@@ -98,7 +98,15 @@ $(document).ready(function() {
                 animation: true,
                 container: 'body',
                 placement: 'auto'
-            }).popover('show');
+            }).data('bs.popover')
+                .tip()
+                .css('padding', '0')
+                .find('.popover-title')
+                .css('background-color', event.color === '#fff' ? '#f7f7f7' : event.color)
+                .addClass('background-volatile');
+
+            $eventMarkup.popover('show');
+            refreshBackgroundVolatileItems();
         },
         eventMouseout: function() {
             $(this).popover('destroy');
diff --git a/js/modsForHesk-javascript.js b/js/modsForHesk-javascript.js
index 46395c44..9e9e3e26 100644
--- a/js/modsForHesk-javascript.js
+++ b/js/modsForHesk-javascript.js
@@ -50,21 +50,7 @@ var loadJquery = function()
     $('.clockpicker').clockpicker();
 
     // Set the proper text color for background-volatile elements
-    $('.background-volatile').each(function() {
-        $this = $(this);
-        var background = $this.css('background-color');
-
-        if (background !== 'rgba(0, 0, 0, 0)'
-            && background !== 'transparent') {
-            var grayCount = calculateGrayCount(background);
-
-            if (grayCount > 186) {
-                $this.css('color', '#000');
-            } else {
-                $this.css('color', '#fff');
-            }
-        }
-    });
+    refreshBackgroundVolatileItems();
 
     // Initialize colorpicker
     $('.colorpicker-trigger').colorpicker({
@@ -101,6 +87,24 @@ var loadJquery = function()
     })
 };
 
+function refreshBackgroundVolatileItems() {
+    $('.background-volatile').each(function() {
+        $this = $(this);
+        var background = $this.css('background-color');
+
+        if (background !== 'rgba(0, 0, 0, 0)'
+            && background !== 'transparent') {
+            var grayCount = calculateGrayCount(background);
+
+            if (grayCount > 186) {
+                $this.css('color', '#000');
+            } else {
+                $this.css('color', '#fff');
+            }
+        }
+    });
+}
+
 function calculateGrayCount(background) {
     var parts = background.match(/^rgb\((\d+),\s*(\d+),\s*(\d+)\)$/);
     var red = parts[1];

From dd68103be66e0b849924e0b9b28412c530604d15 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sat, 6 May 2017 16:27:12 -0400
Subject: [PATCH 119/192] Replace modal with lightbox for viewing images

---
 css/jquery.fancybox.min.css           |  1 +
 css/mods-for-hesk-new.css             |  2 +-
 css/mods-for-hesk.css                 |  2 +-
 inc/header.inc.php                    |  2 ++
 inc/headerAdmin.inc.php               |  2 ++
 inc/view_attachment_functions.inc.php | 34 +++++++--------------------
 js/jquery.fancybox.min.js             | 12 ++++++++++
 7 files changed, 28 insertions(+), 27 deletions(-)
 create mode 100644 css/jquery.fancybox.min.css
 create mode 100644 js/jquery.fancybox.min.js

diff --git a/css/jquery.fancybox.min.css b/css/jquery.fancybox.min.css
new file mode 100644
index 00000000..2354dec1
--- /dev/null
+++ b/css/jquery.fancybox.min.css
@@ -0,0 +1 @@
+@charset "UTF-8";.fancybox-enabled{overflow:hidden}.fancybox-enabled body{overflow:visible;height:100%}.fancybox-container{position:fixed;top:0;left:0;width:100%;height:100%;z-index:99993;-webkit-backface-visibility:hidden;backface-visibility:hidden}.fancybox-container~.fancybox-container{z-index:99992}.fancybox-bg{position:absolute;top:0;right:0;bottom:0;left:0;background:#0f0f11;opacity:0;transition-timing-function:cubic-bezier(.55,.06,.68,.19);-webkit-backface-visibility:hidden;backface-visibility:hidden}.fancybox-container--ready .fancybox-bg{opacity:.87;transition-timing-function:cubic-bezier(.22,.61,.36,1)}.fancybox-controls{position:absolute;top:0;left:0;right:0;text-align:center;opacity:0;z-index:99994;transition:opacity .2s;pointer-events:none;-webkit-backface-visibility:hidden;backface-visibility:hidden;direction:ltr}.fancybox-show-controls .fancybox-controls{opacity:1}.fancybox-infobar{display:none}.fancybox-show-infobar .fancybox-infobar{display:inline-block;pointer-events:all}.fancybox-infobar__body{display:inline-block;width:70px;line-height:44px;font-size:13px;font-family:Helvetica Neue,Helvetica,Arial,sans-serif;text-align:center;color:#ddd;background-color:rgba(30,30,30,.7);pointer-events:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-touch-callout:none;-webkit-tap-highlight-color:transparent;-webkit-font-smoothing:subpixel-antialiased}.fancybox-buttons{position:absolute;top:0;right:0;display:none;pointer-events:all}.fancybox-show-buttons .fancybox-buttons{display:block}.fancybox-slider-wrap{overflow:hidden;direction:ltr}.fancybox-slider,.fancybox-slider-wrap{position:absolute;top:0;left:0;bottom:0;right:0;padding:0;margin:0;z-index:99993;-webkit-backface-visibility:hidden;backface-visibility:hidden;-webkit-tap-highlight-color:transparent}.fancybox-slide{position:absolute;top:0;left:0;width:100%;height:100%;margin:0;padding:0;overflow:auto;outline:none;white-space:normal;box-sizing:border-box;text-align:center;z-index:99994;-webkit-overflow-scrolling:touch}.fancybox-slide:before{content:"";height:100%;width:0}.fancybox-slide:before,.fancybox-slide>*{display:inline-block;vertical-align:middle}.fancybox-slide>*{position:relative;padding:24px;margin:44px 0;border-width:0;text-align:left;background-color:#fff;overflow:auto;box-sizing:border-box}.fancybox-slide--image{overflow:hidden}.fancybox-slide--image:before{display:none}.fancybox-content{display:inline-block;position:relative;margin:44px auto;padding:0;border:0;width:80%;height:calc(100% - 88px);vertical-align:middle;line-height:normal;text-align:left;white-space:normal;outline:none;font-size:16px;font-family:Arial,sans-serif;box-sizing:border-box;-webkit-tap-highlight-color:transparent;-webkit-overflow-scrolling:touch}.fancybox-iframe{display:block;margin:0;padding:0;border:0;width:100%;height:100%;background:#fff}.fancybox-slide--video .fancybox-content,.fancybox-slide--video .fancybox-iframe{background:transparent}.fancybox-placeholder{z-index:99995;background:transparent;cursor:default;overflow:visible;-webkit-transform-origin:top left;transform-origin:top left;background-size:100% 100%;background-repeat:no-repeat;-webkit-backface-visibility:hidden;backface-visibility:hidden}.fancybox-image,.fancybox-placeholder,.fancybox-spaceball{position:absolute;top:0;left:0;margin:0;padding:0;border:0}.fancybox-image,.fancybox-spaceball{width:100%;height:100%;max-width:none;max-height:none;background:transparent;background-size:100% 100%}.fancybox-controls--canzoomOut .fancybox-placeholder{cursor:zoom-out}.fancybox-controls--canzoomIn .fancybox-placeholder{cursor:zoom-in}.fancybox-controls--canGrab .fancybox-placeholder{cursor:-webkit-grab;cursor:grab}.fancybox-controls--isGrabbing .fancybox-placeholder{cursor:-webkit-grabbing;cursor:grabbing}.fancybox-spaceball{z-index:1}.fancybox-tmp{position:absolute;top:-9999px;left:-9999px;visibility:hidden}.fancybox-error{position:absolute;margin:0;padding:40px;top:50%;left:50%;width:380px;max-width:100%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);background:#fff;cursor:default}.fancybox-error p{margin:0;padding:0;color:#444;font:16px/20px Helvetica Neue,Helvetica,Arial,sans-serif}.fancybox-close-small{position:absolute;top:0;right:0;width:44px;height:44px;padding:0;margin:0;border:0;border-radius:0;outline:none;background:transparent;z-index:10;cursor:pointer}.fancybox-close-small:after{content:"×";position:absolute;top:5px;right:5px;width:30px;height:30px;font:20px/30px Arial,Helvetica Neue,Helvetica,sans-serif;color:#888;font-weight:300;text-align:center;border-radius:50%;border-width:0;background:#fff;transition:background .2s;box-sizing:border-box;z-index:2}.fancybox-close-small:focus:after{outline:1px dotted #888}.fancybox-slide--video .fancybox-close-small{top:-36px;right:-36px;background:transparent}.fancybox-close-small:hover:after{color:#555;background:#eee}.fancybox-caption-wrap{position:absolute;bottom:0;left:0;right:0;padding:60px 30px 0;z-index:99998;-webkit-backface-visibility:hidden;backface-visibility:hidden;box-sizing:border-box;background:linear-gradient(180deg,transparent 0,rgba(0,0,0,.1) 20%,rgba(0,0,0,.2) 40%,rgba(0,0,0,.6) 80%,rgba(0,0,0,.8));opacity:0;transition:opacity .2s;pointer-events:none}.fancybox-show-caption .fancybox-caption-wrap{opacity:1}.fancybox-caption{padding:30px 0;border-top:1px solid hsla(0,0%,100%,.4);font-size:14px;font-family:Helvetica Neue,Helvetica,Arial,sans-serif;color:#fff;line-height:20px;-webkit-text-size-adjust:none}.fancybox-caption a,.fancybox-caption button{pointer-events:all}.fancybox-caption a{color:#fff;text-decoration:underline}.fancybox-button{display:inline-block;position:relative;width:44px;height:44px;line-height:44px;margin:0;padding:0;border:0;border-radius:0;cursor:pointer;background:transparent;color:#fff;box-sizing:border-box;vertical-align:top;outline:none}.fancybox-button--disabled{cursor:default;pointer-events:none}.fancybox-button,.fancybox-infobar__body{background:rgba(30,30,30,.6)}.fancybox-button:hover{background:rgba(0,0,0,.8)}.fancybox-button:after,.fancybox-button:before{content:"";pointer-events:none;position:absolute;border-color:#fff;background-color:currentColor;color:currentColor;opacity:.9;box-sizing:border-box;display:inline-block}.fancybox-button--disabled:after,.fancybox-button--disabled:before{opacity:.5}.fancybox-button--left:after{left:20px;-webkit-transform:rotate(-135deg);transform:rotate(-135deg)}.fancybox-button--left:after,.fancybox-button--right:after{top:18px;width:6px;height:6px;background:transparent;border-top:2px solid currentColor;border-right:2px solid currentColor}.fancybox-button--right:after{right:20px;-webkit-transform:rotate(45deg);transform:rotate(45deg)}.fancybox-button--left{border-bottom-left-radius:5px}.fancybox-button--right{border-bottom-right-radius:5px}.fancybox-button--close{float:right}.fancybox-button--close:after,.fancybox-button--close:before{content:"";display:inline-block;position:absolute;height:2px;width:16px;top:calc(50% - 1px);left:calc(50% - 8px)}.fancybox-button--close:before{-webkit-transform:rotate(45deg);transform:rotate(45deg)}.fancybox-button--close:after{-webkit-transform:rotate(-45deg);transform:rotate(-45deg)}.fancybox-loading{border:6px solid hsla(0,0%,39%,.4);border-top:6px solid hsla(0,0%,100%,.6);border-radius:100%;height:50px;width:50px;-webkit-animation:a .8s infinite linear;animation:a .8s infinite linear;background:transparent;position:absolute;top:50%;left:50%;margin-top:-25px;margin-left:-25px;z-index:99999}@-webkit-keyframes a{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes a{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@media (max-width:800px){.fancybox-controls{text-align:left}.fancybox-button--left,.fancybox-button--right,.fancybox-buttons button:not(.fancybox-button--close){display:none!important}.fancybox-caption{padding:20px 0;margin:0}}.fancybox-button--fullscreen:before{width:15px;height:11px;left:15px;top:16px;border:2px solid;background:none}.fancybox-button--play:before{top:16px;left:18px;width:0;height:0;border-top:6px inset transparent;border-bottom:6px inset transparent;border-left:10px solid;border-radius:1px;background:transparent}.fancybox-button--pause:before{top:16px;left:18px;width:7px;height:11px;border-style:solid;border-width:0 2px;background:transparent}.fancybox-button--thumbs span{font-size:23px}.fancybox-button--thumbs:before{top:20px;left:21px;width:3px;height:3px;box-shadow:0 -4px 0,-4px -4px 0,4px -4px 0,inset 0 0 0 32px,-4px 0 0,4px 0 0,0 4px 0,-4px 4px 0,4px 4px 0}.fancybox-container--thumbs .fancybox-caption-wrap,.fancybox-container--thumbs .fancybox-controls,.fancybox-container--thumbs .fancybox-slider-wrap{right:220px}.fancybox-thumbs{position:absolute;top:0;right:0;bottom:0;left:auto;width:220px;margin:0;padding:5px 5px 0 0;background:#fff;z-index:99993;word-break:normal;-webkit-overflow-scrolling:touch;-webkit-tap-highlight-color:transparent;box-sizing:border-box}.fancybox-thumbs>ul{list-style:none;position:absolute;position:relative;width:100%;height:100%;margin:0;padding:0;overflow-x:hidden;overflow-y:auto;font-size:0}.fancybox-thumbs>ul>li{float:left;overflow:hidden;max-width:50%;padding:0;margin:0;width:105px;height:75px;position:relative;cursor:pointer;outline:none;border:5px solid #fff;border-top-width:0;border-right-width:0;-webkit-tap-highlight-color:transparent;-webkit-backface-visibility:hidden;backface-visibility:hidden;box-sizing:border-box}li.fancybox-thumbs-loading{background:rgba(0,0,0,.1)}.fancybox-thumbs>ul>li>img{position:absolute;top:0;left:0;min-width:100%;min-height:100%;max-width:none;max-height:none;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.fancybox-thumbs>ul>li:before{content:"";position:absolute;top:0;right:0;bottom:0;left:0;border-radius:2px;border:4px solid #4ea7f9;z-index:99991;opacity:0;transition:all .2s cubic-bezier(.25,.46,.45,.94)}.fancybox-thumbs>ul>li.fancybox-thumbs-active:before{opacity:1}@media (max-width:800px){.fancybox-thumbs{display:none!important}.fancybox-container--thumbs .fancybox-caption-wrap,.fancybox-container--thumbs .fancybox-controls,.fancybox-container--thumbs .fancybox-slider-wrap{right:0}}
\ No newline at end of file
diff --git a/css/mods-for-hesk-new.css b/css/mods-for-hesk-new.css
index de7c444d..1722347f 100644
--- a/css/mods-for-hesk-new.css
+++ b/css/mods-for-hesk-new.css
@@ -121,7 +121,7 @@
     vertical-align: middle;
 }
 
-.attachment-table > tbody > tr > td > span > img {
+.attachment-table > tbody > tr > td > a > img {
     max-height: 80px;
     max-width: 80px;
     cursor: pointer;
diff --git a/css/mods-for-hesk.css b/css/mods-for-hesk.css
index 5bae2052..8a916d66 100644
--- a/css/mods-for-hesk.css
+++ b/css/mods-for-hesk.css
@@ -35,7 +35,7 @@ button.dropdown-submit {
     vertical-align: middle;
 }
 
-.attachment-table > tbody > tr > td > span > img {
+.attachment-table > tbody > tr > td > a > img {
     max-height: 80px;
     max-width: 80px;
     cursor: pointer;
diff --git a/inc/header.inc.php b/inc/header.inc.php
index b24de558..ef257049 100644
--- a/inc/header.inc.php
+++ b/inc/header.inc.php
@@ -89,6 +89,7 @@ if (is_dir(HESK_PATH . 'install')) {
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/bootstrap-clockpicker.min.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/jquery.jgrowl.min.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/bootstrap-colorpicker.min.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
+    <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/jquery.fancybox.min.css?v=<? echo MODS_FOR_HESK_BUILD ?>">
     <?php if (defined('USE_JQUERY_2')): ?>
         <script src="<?php echo HESK_PATH; ?>js/jquery-2.2.4.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
     <?php else: ?>
@@ -111,6 +112,7 @@ if (is_dir(HESK_PATH . 'install')) {
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>internal-api/js/core.php?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/jquery.jgrowl.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/bootstrap-colorpicker.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
+    <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/jquery.fancybox.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
     <style>
         .navbar-default {
             background-color: <?php echo $modsForHesk_settings['navbarBackgroundColor']; ?>;
diff --git a/inc/headerAdmin.inc.php b/inc/headerAdmin.inc.php
index 67371291..710cf922 100644
--- a/inc/headerAdmin.inc.php
+++ b/inc/headerAdmin.inc.php
@@ -64,6 +64,7 @@ $modsForHesk_settings = mfh_getSettings();
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/colors.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/positions.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/displays.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
+    <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/jquery.fancybox.min.css?v=<? echo MODS_FOR_HESK_BUILD ?>">
     <?php if (defined('USE_JQUERY_2')): ?>
         <script src="<?php echo HESK_PATH; ?>js/jquery-2.2.4.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
     <?php else: ?>
@@ -88,6 +89,7 @@ $modsForHesk_settings = mfh_getSettings();
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/jquery.jgrowl.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/bootstrap-colorpicker.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/jquery.slimscroll.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
+    <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/jquery.fancybox.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
     <?php
     if (defined('EXTRA_JS')) {
         echo EXTRA_JS;
diff --git a/inc/view_attachment_functions.inc.php b/inc/view_attachment_functions.inc.php
index 6ff6cc69..bb865e2e 100644
--- a/inc/view_attachment_functions.inc.php
+++ b/inc/view_attachment_functions.inc.php
@@ -15,6 +15,7 @@ function mfh_listAttachments($attachments = '', $reply = 0, $is_staff)
 
     /* List attachments */
     $att = explode(',', substr($attachments, 0, -1));
+    $uniq_identifier = null;
     echo '<div class="table-responsive">';
     echo '<table class="table table-striped attachment-table">';
     echo '<thead>
@@ -29,8 +30,12 @@ function mfh_listAttachments($attachments = '', $reply = 0, $is_staff)
         </thead>';
     echo '<tbody>';
     foreach ($att as $myatt) {
-
         list($att_id, $att_name) = explode('#', $myatt);
+
+        if ($uniq_identifier === null) {
+            $uniq_identifier = $att_id;
+        }
+
         $fileparts = pathinfo($att_name);
         $fontAwesomeIcon = mfh_getFontAwesomeIconForFileExtension($fileparts['extension']);
         echo '
@@ -44,30 +49,9 @@ function mfh_listAttachments($attachments = '', $reply = 0, $is_staff)
             if ($path == '') {
                 echo '<i class="fa fa-ban fa-4x" data-toggle="tooltip" title="' . $hesklang['attachment_removed'] . '"></i>';
             } else {
-                echo '<span data-toggle="tooltip" title="' . $hesklang['click_to_preview'] . '">
-                                  <img src="' . $path . '" alt="' . $hesklang['image'] . '" data-toggle="modal" data-target="#modal-attachment-' . $att_id . '">
-                              </span>';
-                $download_path = '';
-                if ($is_staff) {
-                    $download_path = '../';
-                }
-                echo '<div class="modal fade" id="modal-attachment-' . $att_id . '" tabindex="-1" role="dialog" aria-hidden="true">
-                                  <div class="modal-dialog">
-                                      <div class="modal-content">
-                                          <div class="modal-header">
-                                              <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                                              <h4 class="modal-title" id="myModalLabel">' . $att_name . '</h4>
-                                          </div>
-                                          <div class="modal-body">
-                                              <img class="img-responsive" src="' . $path . '" alt="' . $hesklang['image'] . '">
-                                          </div>
-                                          <div class="modal-footer">
-                                              <button type="button" class="btn btn-default" data-dismiss="modal">' . $hesklang['close_modal'] . '</button>
-                                              <a href="' . $download_path . 'download_attachment.php?att_id=' . $att_id . '&amp;track=' . $trackingID . $email . '" class="btn btn-success">' . $hesklang['dnl'] . '</a>
-                                          </div>
-                                      </div>
-                                  </div>
-                              </div>';
+                echo '<a href="' . $path . '" data-fancybox="' . htmlspecialchars($uniq_identifier) . '">
+                          <img src="' . $path . '" alt="' . $hesklang['image'] . '" data-toggle="tooltip" title="' . $hesklang['click_to_preview'] . '">
+                      </a>';
             }
         } else {
             //-- Display the FontAwesome icon in the panel's body
diff --git a/js/jquery.fancybox.min.js b/js/jquery.fancybox.min.js
new file mode 100644
index 00000000..15ab71a8
--- /dev/null
+++ b/js/jquery.fancybox.min.js
@@ -0,0 +1,12 @@
+// ==================================================
+// fancyBox v3.0.47
+//
+// Licensed GPLv3 for open source use
+// or fancyBox Commercial License for commercial use
+//
+// http://fancyapps.com/fancybox/
+// Copyright 2017 fancyApps
+//
+// ==================================================
+!function(t,e,n,o){"use strict";function s(t){var e=t.currentTarget,o=t.data?t.data.options:{},s=t.data?t.data.items:[],i="",a=0;t.preventDefault(),t.stopPropagation(),n(e).attr("data-fancybox")&&(i=n(e).data("fancybox")),i?(s=s.length?s.filter('[data-fancybox="'+i+'"]'):n("[data-fancybox="+i+"]"),a=s.index(e)):s=[e],n.fancybox.open(s,o,a)}if(!n)return o;var i={speed:330,loop:!0,opacity:"auto",margin:[44,0],gutter:30,infobar:!0,buttons:!0,slideShow:!0,fullScreen:!0,thumbs:!0,closeBtn:!0,smallBtn:"auto",image:{preload:"auto",protect:!1},ajax:{settings:{data:{fancybox:!0}}},iframe:{tpl:'<iframe id="fancybox-frame{rnd}" name="fancybox-frame{rnd}" class="fancybox-iframe" frameborder="0" vspace="0" hspace="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen allowtransparency="true" src=""></iframe>',preload:!0,scrolling:"no",css:{}},baseClass:"",slideClass:"",baseTpl:'<div class="fancybox-container" role="dialog" tabindex="-1"><div class="fancybox-bg"></div><div class="fancybox-controls"><div class="fancybox-infobar"><button data-fancybox-previous class="fancybox-button fancybox-button--left" title="Previous"></button><div class="fancybox-infobar__body"><span class="js-fancybox-index"></span>&nbsp;/&nbsp;<span class="js-fancybox-count"></span></div><button data-fancybox-next class="fancybox-button fancybox-button--right" title="Next"></button></div><div class="fancybox-buttons"><button data-fancybox-close class="fancybox-button fancybox-button--close" title="Close (Esc)"></button></div></div><div class="fancybox-slider-wrap"><div class="fancybox-slider"></div></div><div class="fancybox-caption-wrap"><div class="fancybox-caption"></div></div></div>',spinnerTpl:'<div class="fancybox-loading"></div>',errorTpl:'<div class="fancybox-error"><p>The requested content cannot be loaded. <br /> Please try again later.<p></div>',closeTpl:'<button data-fancybox-close class="fancybox-close-small"></button>',parentEl:"body",touch:!0,keyboard:!0,focus:!0,closeClickOutside:!0,beforeLoad:n.noop,afterLoad:n.noop,beforeMove:n.noop,afterMove:n.noop,onComplete:n.noop,onInit:n.noop,beforeClose:n.noop,afterClose:n.noop,onActivate:n.noop,onDeactivate:n.noop},a=n(t),r=n(e),c=0,l=function(t){return t&&t.hasOwnProperty&&t instanceof n},u=function(){return t.requestAnimationFrame||t.webkitRequestAnimationFrame||t.mozRequestAnimationFrame||function(e){t.setTimeout(e,1e3/60)}}(),d=function(o){var s;return"function"==typeof n&&o instanceof n&&(o=o[0]),s=o.getBoundingClientRect(),s.bottom>0&&s.right>0&&s.left<(t.innerWidth||e.documentElement.clientWidth)&&s.top<(t.innerHeight||e.documentElement.clientHeight)},p=function(t,o,s){var a=this;a.opts=n.extend(!0,{index:s},i,o||{}),a.id=a.opts.id||++c,a.group=[],a.currIndex=parseInt(a.opts.index,10)||0,a.prevIndex=null,a.prevPos=null,a.currPos=0,a.firstRun=null,a.createGroup(t),a.group.length&&(a.$lastFocus=n(e.activeElement).blur(),a.slides={},a.init(t))};n.extend(p.prototype,{init:function(){var t,e,o=this,s=!1;o.scrollTop=r.scrollTop(),o.scrollLeft=r.scrollLeft(),n.fancybox.getInstance()||(t=n("body").width(),n("html").addClass("fancybox-enabled"),n.fancybox.isTouch?(n.each(o.group,function(t,e){if("image"!==e.type&&"iframe"!==e.type)return s=!0,!1}),s&&n("body").css({position:"fixed",width:t,top:o.scrollTop*-1})):(t=n("body").width()-t,t>1&&n('<style id="fancybox-noscroll" type="text/css">').html(".compensate-for-scrollbar, .fancybox-enabled body { margin-right: "+t+"px; }").appendTo("head"))),e=n(o.opts.baseTpl).attr("id","fancybox-container-"+o.id).data("FancyBox",o).addClass(o.opts.baseClass).hide().prependTo(o.opts.parentEl),o.$refs={container:e,bg:e.find(".fancybox-bg"),controls:e.find(".fancybox-controls"),buttons:e.find(".fancybox-buttons"),slider_wrap:e.find(".fancybox-slider-wrap"),slider:e.find(".fancybox-slider"),caption:e.find(".fancybox-caption")},o.trigger("onInit"),o.activate(),o.current||o.jumpTo(o.currIndex)},createGroup:function(t){var e=this,s=n.makeArray(t);n.each(s,function(t,s){var i,a,r,c,l={},u={},d=[];n.isPlainObject(s)?(l=s,u=s.opts||{}):"object"===n.type(s)&&n(s).length?(i=n(s),d=i.data(),u="options"in d?d.options:{},u="object"===n.type(u)?u:{},l.type="type"in d?d.type:u.type,l.src="src"in d?d.src:u.src||i.attr("href"),u.width="width"in d?d.width:u.width,u.height="height"in d?d.height:u.height,u.thumb="thumb"in d?d.thumb:u.thumb,u.selector="selector"in d?d.selector:u.selector,"srcset"in d&&(u.image={srcset:d.srcset}),u.$orig=i):l={type:"html",content:s+""},l.opts=n.extend(!0,{},e.opts,u),a=l.type,r=l.src||"",a||(l.content?a="html":r.match(/(^data:image\/[a-z0-9+\/=]*,)|(\.(jp(e|g|eg)|gif|png|bmp|webp|svg|ico)((\?|#).*)?$)/i)?a="image":r.match(/\.(pdf)((\?|#).*)?$/i)?a="pdf":"#"===r.charAt(0)&&(a="inline"),l.type=a),l.index=e.group.length,l.opts.$orig&&!l.opts.$orig.length&&delete l.opts.$orig,!l.opts.$thumb&&l.opts.$orig&&(l.opts.$thumb=l.opts.$orig.find("img:first")),l.opts.$thumb&&!l.opts.$thumb.length&&delete l.opts.$thumb,"function"===n.type(l.opts.caption)?l.opts.caption=l.opts.caption.apply(s,[e,l]):"caption"in d?l.opts.caption=d.caption:u.$orig&&(l.opts.caption=i.attr("title")),l.opts.caption=l.opts.caption===o?"":l.opts.caption+"","ajax"===a&&(c=r.split(/\s+/,2),c.length>1&&(l.src=c.shift(),l.opts.selector=c.shift())),"auto"==l.opts.smallBtn&&(n.inArray(a,["html","inline","ajax"])>-1?(l.opts.buttons=!1,l.opts.smallBtn=!0):l.opts.smallBtn=!1),"pdf"===a&&(l.type="iframe",l.opts.closeBtn=!0,l.opts.smallBtn=!1,l.opts.iframe.preload=!1),l.opts.modal&&n.extend(!0,l.opts,{infobar:0,buttons:0,keyboard:0,slideShow:0,fullScreen:0,closeClickOutside:0}),e.group.push(l)})},addEvents:function(){var e=this;e.removeEvents(),e.$refs.container.on("click.fb-close","[data-fancybox-close]",function(t){t.stopPropagation(),t.preventDefault(),e.close(t)}).on("click.fb-previous","[data-fancybox-previous]",function(t){t.stopPropagation(),t.preventDefault(),e.previous()}).on("click.fb-next","[data-fancybox-next]",function(t){t.stopPropagation(),t.preventDefault(),e.next()}),n(t).on("orientationchange.fb resize.fb",function(t){u(function(){t&&t.originalEvent&&"resize"===t.originalEvent.type?e.update():(e.$refs.slider_wrap.hide(),u(function(){e.$refs.slider_wrap.show(),e.update()}))})}),r.on("focusin.fb",function(t){var o=n.fancybox?n.fancybox.getInstance():null;!o||n(t.target).hasClass("fancybox-container")||n.contains(o.$refs.container[0],t.target)||(t.stopPropagation(),o.focus(),a.scrollTop(e.scrollTop).scrollLeft(e.scrollLeft))}),r.on("keydown.fb",function(t){var o=e.current,s=t.keyCode||t.which;if(o&&o.opts.keyboard&&!n(t.target).is("input")&&!n(t.target).is("textarea")){if(8===s||27===s)return t.preventDefault(),void e.close(t);switch(s){case 37:case 38:t.preventDefault(),e.previous();break;case 39:case 40:t.preventDefault(),e.next();break;case 80:case 32:t.preventDefault(),e.SlideShow&&(t.preventDefault(),e.SlideShow.toggle());break;case 70:e.FullScreen&&(t.preventDefault(),e.FullScreen.toggle());break;case 71:e.Thumbs&&(t.preventDefault(),e.Thumbs.toggle())}}})},removeEvents:function(){a.off("scroll.fb resize.fb orientationchange.fb"),r.off("keydown.fb focusin.fb click.fb-close"),this.$refs.container.off("click.fb-close click.fb-previous click.fb-next")},previous:function(t){this.jumpTo(this.currIndex-1,t)},next:function(t){this.jumpTo(this.currIndex+1,t)},jumpTo:function(t,e){var n,s,i,a,r=this;if(n=r.firstRun=null===r.firstRun,s=i=t=parseInt(t,10),a=!!r.current&&r.current.opts.loop,!r.isAnimating&&(s!=r.currIndex||n)){if(r.group.length>1&&a)s%=r.group.length,s=s<0?r.group.length+s:s,2==r.group.length?i=t-r.currIndex+r.currPos:(i=s-r.currIndex+r.currPos,Math.abs(r.currPos-(i+r.group.length))<Math.abs(r.currPos-i)?i+=r.group.length:Math.abs(r.currPos-(i-r.group.length))<Math.abs(r.currPos-i)&&(i-=r.group.length));else if(!r.group[s])return void r.update(!1,!1,e);r.current&&(r.current.$slide.removeClass("fancybox-slide--current fancybox-slide--complete"),r.updateSlide(r.current,!0)),r.prevIndex=r.currIndex,r.prevPos=r.currPos,r.currIndex=s,r.currPos=i,r.current=r.createSlide(i),r.group.length>1&&((r.opts.loop||i-1>=0)&&r.createSlide(i-1),(r.opts.loop||i+1<r.group.length)&&r.createSlide(i+1)),r.current.isMoved=!1,r.current.isComplete=!1,e=parseInt(e===o?1.5*r.current.opts.speed:e,10),r.trigger("beforeMove"),r.updateControls(),n&&(r.current.$slide.addClass("fancybox-slide--current"),r.$refs.container.show(),u(function(){r.$refs.bg.css("transition-duration",r.current.opts.speed+"ms"),r.$refs.container.addClass("fancybox-container--ready")})),r.update(!0,!1,n?0:e,function(){r.afterMove()}),r.loadSlide(r.current),n&&r.current.$ghost||r.preload()}},createSlide:function(t){var e,o,s,i=this;if(o=t%i.group.length,o=o<0?i.group.length+o:o,!i.slides[t]&&i.group[o]){if(i.opts.loop&&i.group.length>2)for(var a in i.slides)if(i.slides[a].index===o)return s=i.slides[a],s.pos=t,i.slides[t]=s,delete i.slides[a],i.updateSlide(s),s;e=n('<div class="fancybox-slide"></div>').appendTo(i.$refs.slider),i.slides[t]=n.extend(!0,{},i.group[o],{pos:t,$slide:e,isMoved:!1,isLoaded:!1})}return i.slides[t]},zoomInOut:function(t,e,o){var s,i,a,r=this,c=r.current,l=c.$placeholder,u=c.opts.opacity,p=c.opts.$thumb,h=p?p.offset():0,f=c.$slide.offset();return!!(l&&c.isMoved&&h&&d(p))&&(!("In"===t&&!r.firstRun)&&(n.fancybox.stop(l),r.isAnimating=!0,s={top:h.top-f.top+parseFloat(p.css("border-top-width")||0),left:h.left-f.left+parseFloat(p.css("border-left-width")||0),width:p.width(),height:p.height(),scaleX:1,scaleY:1},"auto"==u&&(u=Math.abs(c.width/c.height-s.width/s.height)>.1),"In"===t?(i=s,a=r.getFitPos(c),a.scaleX=a.width/i.width,a.scaleY=a.height/i.height,u&&(i.opacity=.1,a.opacity=1)):(i=n.fancybox.getTranslate(l),a=s,c.$ghost&&(c.$ghost.show(),c.$image&&c.$image.remove()),i.scaleX=i.width/a.width,i.scaleY=i.height/a.height,i.width=a.width,i.height=a.height,u&&(a.opacity=0)),r.updateCursor(a.width,a.height),delete a.width,delete a.height,n.fancybox.setTranslate(l,i),l.show(),r.trigger("beforeZoom"+t),l.css("transition","all "+e+"ms"),n.fancybox.setTranslate(l,a),setTimeout(function(){var e;l.css("transition","none"),e=n.fancybox.getTranslate(l),e.scaleX=1,e.scaleY=1,n.fancybox.setTranslate(l,e),r.trigger("afterZoom"+t),o.apply(r),r.isAnimating=!1},e),!0))},canPan:function(){var t=this,e=t.current,n=e.$placeholder,o=!1;return n&&(o=t.getFitPos(e),o=Math.abs(n.width()-o.width)>1||Math.abs(n.height()-o.height)>1),o},isScaledDown:function(){var t=this,e=t.current,o=e.$placeholder,s=!1;return o&&(s=n.fancybox.getTranslate(o),s=s.width<e.width||s.height<e.height),s},scaleToActual:function(t,e,s){var i,a,r,c,l,u=this,d=u.current,p=d.$placeholder,h=parseInt(d.$slide.width(),10),f=parseInt(d.$slide.height(),10),g=d.width,b=d.height;p&&(u.isAnimating=!0,t=t===o?.5*h:t,e=e===o?.5*f:e,i=n.fancybox.getTranslate(p),c=g/i.width,l=b/i.height,a=.5*h-.5*g,r=.5*f-.5*b,g>h&&(a=i.left*c-(t*c-t),a>0&&(a=0),a<h-g&&(a=h-g)),b>f&&(r=i.top*l-(e*l-e),r>0&&(r=0),r<f-b&&(r=f-b)),u.updateCursor(g,b),n.fancybox.animate(p,null,{top:r,left:a,scaleX:c,scaleY:l},s||d.opts.speed,function(){u.isAnimating=!1}))},scaleToFit:function(t){var e,o=this,s=o.current,i=s.$placeholder;i&&(o.isAnimating=!0,e=o.getFitPos(s),o.updateCursor(e.width,e.height),n.fancybox.animate(i,null,{top:e.top,left:e.left,scaleX:e.width/i.width(),scaleY:e.height/i.height()},t||s.opts.speed,function(){o.isAnimating=!1}))},getFitPos:function(t){var e,o,s,i,r,c,l,u=t.$placeholder||t.$content,d=t.width,p=t.height,h=t.opts.margin;return!(!u||!u.length||!d&&!p)&&("number"===n.type(h)&&(h=[h,h]),2==h.length&&(h=[h[0],h[1],h[0],h[1]]),a.width()<800&&(h=[0,0,0,0]),e=parseInt(t.$slide.width(),10)-(h[1]+h[3]),o=parseInt(t.$slide.height(),10)-(h[0]+h[2]),s=Math.min(1,e/d,o/p),c=Math.floor(s*d),l=Math.floor(s*p),i=Math.floor(.5*(o-l))+h[0],r=Math.floor(.5*(e-c))+h[3],{top:i,left:r,width:c,height:l})},update:function(t,e,o,s){var i,a=this;a.isAnimating!==!0&&a.current&&(i=a.current.pos*Math.floor(a.current.$slide.width())*-1-a.current.pos*a.current.opts.gutter,o=parseInt(o,10)||0,n.fancybox.stop(a.$refs.slider),t===!1?a.updateSlide(a.current,e):n.each(a.slides,function(t,n){a.updateSlide(n,e)}),o?n.fancybox.animate(a.$refs.slider,null,{top:0,left:i},o,function(){a.current.isMoved=!0,"function"===n.type(s)&&s.apply(a)}):(n.fancybox.setTranslate(a.$refs.slider,{top:0,left:i}),a.current.isMoved=!0,"function"===n.type(s)&&s.apply(a)))},updateSlide:function(t,e){var o,s=this,i=t.$placeholder;t=t||s.current,t&&!s.isClosing&&(o=t.pos*Math.floor(t.$slide.width())+t.pos*t.opts.gutter,o!==t.leftPos&&(n.fancybox.setTranslate(t.$slide,{top:0,left:o}),t.leftPos=o),e!==!1&&i&&(n.fancybox.setTranslate(i,s.getFitPos(t)),t.pos===s.currPos&&s.updateCursor()),t.$slide.trigger("refresh"),s.trigger("onUpdate",t))},updateCursor:function(t,e){var n,s=this,i=s.$refs.container.removeClass("fancybox-controls--canzoomIn fancybox-controls--canzoomOut fancybox-controls--canGrab");!s.isClosing&&s.opts.touch&&(n=t!==o&&e!==o?t<s.current.width&&e<s.current.height:s.isScaledDown(),n?i.addClass("fancybox-controls--canzoomIn"):s.group.length<2?i.addClass("fancybox-controls--canzoomOut"):i.addClass("fancybox-controls--canGrab"))},loadSlide:function(t){var e,o,s,i=this;if(t&&!t.isLoaded&&!t.isLoading){switch(t.isLoading=!0,i.trigger("beforeLoad",t),e=t.type,o=t.$slide,o.off("refresh").trigger("onReset").addClass("fancybox-slide--"+(e||"unknown")).addClass(t.opts.slideClass),e){case"image":i.setImage(t);break;case"iframe":i.setIframe(t);break;case"html":i.setContent(t,t.content);break;case"inline":n(t.src).length?i.setContent(t,n(t.src)):i.setError(t);break;case"ajax":i.showLoading(t),s=n.ajax(n.extend({},t.opts.ajax.settings,{url:t.src,success:function(e,n){"success"===n&&i.setContent(t,e)},error:function(e,n){e&&"abort"!==n&&i.setError(t)}})),o.one("onReset",function(){s.abort()});break;default:i.setError(t)}return!0}},setImage:function(e){var o,s,i,a,r=this,c=e.opts.image.srcset;if(e.isLoaded&&!e.hasError)return void r.afterLoad(e);if(c){i=t.devicePixelRatio||1,a=t.innerWidth*i,s=c.split(",").map(function(t){var e={};return t.trim().split(/\s+/).forEach(function(t,n){var o=parseInt(t.substring(0,t.length-1),10);return 0===n?e.url=t:void(o&&(e.value=o,e.postfix=t[t.length-1]))}),e}),s.sort(function(t,e){return t.value-e.value});for(var l=0;l<s.length;l++){var u=s[l];if("w"===u.postfix&&u.value>=a||"x"===u.postfix&&u.value>=i){o=u;break}}!o&&s.length&&(o=s[s.length-1]),o&&(e.src=o.url,e.width&&e.height&&"w"==o.postfix&&(e.height=e.width/e.height*o.value,e.width=o.value))}e.$placeholder=n('<div class="fancybox-placeholder"></div>').hide().appendTo(e.$slide),e.opts.preload!==!1&&e.opts.width&&e.opts.height&&(e.opts.thumb||e.opts.$thumb)?(e.width=e.opts.width,e.height=e.opts.height,e.$ghost=n("<img />").one("load error",function(){r.isClosing||(n("<img/>")[0].src=e.src,r.revealImage(e,function(){r.setBigImage(e),r.firstRun&&e.index===r.currIndex&&r.preload()}))}).addClass("fancybox-image").appendTo(e.$placeholder).attr("src",e.opts.thumb||e.opts.$thumb.attr("src"))):r.setBigImage(e)},setBigImage:function(t){var e=this,o=n("<img />");t.$image=o.one("error",function(){e.setError(t)}).one("load",function(){clearTimeout(t.timouts),t.timouts=null,e.isClosing||(t.width=this.naturalWidth,t.height=this.naturalHeight,t.opts.image.srcset&&o.attr("sizes","100vw").attr("srcset",t.opts.image.srcset),e.afterLoad(t),t.$ghost&&(t.timouts=setTimeout(function(){t.$ghost.hide()},350)))}).addClass("fancybox-image").attr("src",t.src).appendTo(t.$placeholder),o[0].complete?o.trigger("load"):o[0].error?o.trigger("error"):t.timouts=setTimeout(function(){o[0].complete||t.hasError||e.showLoading(t)},150),t.opts.image.protect&&n('<div class="fancybox-spaceball"></div>').appendTo(t.$placeholder).on("contextmenu.fb",function(t){return 2==t.button&&t.preventDefault(),!0})},revealImage:function(t,e){var o=this;return e=e||n.noop,"image"!==t.type||t.hasError||t.isRevealed===!0?void e.apply(o):(t.isRevealed=!0,void(t.pos===o.currPos&&o.zoomInOut("In",t.opts.speed,e)||(t.$ghost&&!t.isLoaded&&o.updateSlide(t,!0),t.pos===o.currPos?n.fancybox.animate(t.$placeholder,{opacity:0},{opacity:1},300,e):t.$placeholder.show(),e.apply(o))))},setIframe:function(t){var e,s=this,i=t.opts.iframe,a=t.$slide;t.$content=n('<div class="fancybox-content"></div>').css(i.css).appendTo(a),e=n(i.tpl.replace(/\{rnd\}/g,(new Date).getTime())).attr("scrolling",n.fancybox.isTouch?"auto":i.scrolling).appendTo(t.$content),i.preload?(t.$content.addClass("fancybox-tmp"),s.showLoading(t),e.on("load.fb error.fb",function(e){this.isReady=1,t.$slide.trigger("refresh"),s.afterLoad(t)}),a.on("refresh.fb",function(){var n,s,a,r,c,l=t.$content;if(1===e[0].isReady){try{n=e.contents(),s=n.find("body")}catch(t){}s&&s.length&&(i.css.width===o||i.css.height===o)&&(a=e[0].contentWindow.document.documentElement.scrollWidth,r=Math.ceil(s.outerWidth(!0)+(l.width()-a)),c=Math.ceil(s.outerHeight(!0)),l.css({width:i.css.width===o?r+(l.outerWidth()-l.innerWidth()):i.css.width,height:i.css.height===o?c+(l.outerHeight()-l.innerHeight()):i.css.height})),l.removeClass("fancybox-tmp")}})):this.afterLoad(t),e.attr("src",t.src),t.opts.smallBtn&&t.$content.prepend(t.opts.closeTpl),a.one("onReset",function(){try{n(this).find("iframe").hide().attr("src","//about:blank")}catch(t){}n(this).empty(),t.isLoaded=!1})},setContent:function(t,e){var o=this;o.isClosing||(o.hideLoading(t),t.$slide.empty(),l(e)&&e.parent().length?(e.data("placeholder")&&e.parents(".fancybox-slide").trigger("onReset"),e.data({placeholder:n("<div></div>").hide().insertAfter(e)}).css("display","inline-block")):("string"===n.type(e)&&(e=n("<div>").append(e).contents(),3===e[0].nodeType&&(e=n("<div>").html(e))),t.opts.selector&&(e=n("<div>").html(e).find(t.opts.selector))),t.$slide.one("onReset",function(){var o=l(e)?e.data("placeholder"):0;o&&(e.hide().replaceAll(o),e.data("placeholder",null)),t.hasError||(n(this).empty(),t.isLoaded=!1)}),t.$content=n(e).appendTo(t.$slide),t.opts.smallBtn===!0&&t.$content.find(".fancybox-close-small").remove().end().eq(0).append(t.opts.closeTpl),this.afterLoad(t))},setError:function(t){t.hasError=!0,this.setContent(t,t.opts.errorTpl)},showLoading:function(t){var e=this;t=t||e.current,t&&!t.$spinner&&(t.$spinner=n(e.opts.spinnerTpl).appendTo(t.$slide))},hideLoading:function(t){var e=this;t=t||e.current,t&&t.$spinner&&(t.$spinner.remove(),delete t.$spinner)},afterMove:function(){var t=this,e=t.current,o={};e&&(e.$slide.siblings().trigger("onReset"),n.each(t.slides,function(e,n){n.pos>=t.currPos-1&&n.pos<=t.currPos+1?o[n.pos]=n:n&&n.$slide.remove()}),t.slides=o,t.trigger("afterMove"),e.isLoaded&&t.complete())},afterLoad:function(t){var e=this;e.isClosing||(t.isLoading=!1,t.isLoaded=!0,e.trigger("afterLoad",t),e.hideLoading(t),t.$ghost||e.updateSlide(t,!0),t.index===e.currIndex&&t.isMoved?e.complete():t.$ghost||e.revealImage(t))},complete:function(){var t=this,e=t.current;t.revealImage(e,function(){e.isComplete=!0,e.$slide.addClass("fancybox-slide--complete"),t.updateCursor(),t.trigger("onComplete"),e.opts.focus&&"image"!==e.type&&"iframe"!==e.type&&t.focus()})},preload:function(){var t,e,n=this;n.group.length<2||(t=n.slides[n.currPos+1],e=n.slides[n.currPos-1],t&&"image"===t.type&&n.loadSlide(t),e&&"image"===e.type&&n.loadSlide(e))},focus:function(){var t,e=this.current;t=e&&e.isComplete?e.$slide.find('button,:input,[tabindex],a:not(".disabled")').filter(":visible:first"):null,t&&t.length||(t=this.$refs.container),t.focus(),this.$refs.slider_wrap.scrollLeft(0),e&&e.$slide.scrollTop(0)},activate:function(){var t=this;n(".fancybox-container").each(function(){var e=n(this).data("FancyBox");e&&e.uid!==t.uid&&!e.isClosing&&e.trigger("onDeactivate")}),t.current&&(t.$refs.container.index()>0&&t.$refs.container.prependTo(e.body),t.updateControls()),t.trigger("onActivate"),t.addEvents()},close:function(t){var e=this,o=e.current,s=o.opts.speed,i=n.proxy(function(){e.cleanUp(t)},this);return!e.isAnimating&&!e.isClosing&&(e.trigger("beforeClose",t)===!1?(n.fancybox.stop(e.$refs.slider),void u(function(){e.update(!0,!0,150)})):(e.isClosing=!0,o.timouts&&clearTimeout(o.timouts),t!==!0&&n.fancybox.stop(e.$refs.slider),e.$refs.container.removeClass("fancybox-container--active").addClass("fancybox-container--closing"),o.$slide.removeClass("fancybox-slide--complete").siblings().remove(),o.isMoved||o.$slide.css("overflow","visible"),e.removeEvents(),e.hideLoading(o),e.hideControls(),e.updateCursor(),e.$refs.bg.css("transition-duration",s+"ms"),this.$refs.container.removeClass("fancybox-container--ready"),void(t===!0?setTimeout(i,s):e.zoomInOut("Out",s,i)||n.fancybox.animate(e.$refs.container,null,{opacity:0},s,"easeInSine",i))))},cleanUp:function(t){var e,o=this;o.$refs.slider.children().trigger("onReset"),o.$refs.container.empty().remove(),o.trigger("afterClose",t),o.current=null,e=n.fancybox.getInstance(),e?e.activate():(n("html").removeClass("fancybox-enabled"),n("body").removeAttr("style"),a.scrollTop(o.scrollTop).scrollLeft(o.scrollLeft),n("#fancybox-noscroll").remove()),o.$lastFocus&&o.$lastFocus.focus()},trigger:function(t,o){var s,i=Array.prototype.slice.call(arguments,1),a=this,r=o&&o.opts?o:a.current;return r?i.unshift(r):r=a,i.unshift(a),n.isFunction(r.opts[t])&&(s=r.opts[t].apply(r,i)),s===!1?s:void("afterClose"===t?n(e).trigger(t+".fb",i):a.$refs.container.trigger(t+".fb",i))},toggleControls:function(t){this.isHiddenControls?this.updateControls(t):this.hideControls()},hideControls:function(){this.isHiddenControls=!0,this.$refs.container.removeClass("fancybox-show-controls"),this.$refs.container.removeClass("fancybox-show-caption")},updateControls:function(t){var e=this,o=e.$refs.container,s=e.$refs.caption,i=e.current,a=i.index,r=i.opts,c=r.caption;this.isHiddenControls&&t!==!0||(this.isHiddenControls=!1,o.addClass("fancybox-show-controls").toggleClass("fancybox-show-infobar",!!r.infobar&&e.group.length>1).toggleClass("fancybox-show-buttons",!!r.buttons).toggleClass("fancybox-is-modal",!!r.modal),n(".fancybox-button--left",o).toggleClass("fancybox-button--disabled",!r.loop&&a<=0),n(".fancybox-button--right",o).toggleClass("fancybox-button--disabled",!r.loop&&a>=e.group.length-1),n(".fancybox-button--play",o).toggle(!!(r.slideShow&&e.group.length>1)),n(".fancybox-button--close",o).toggle(!!r.closeBtn),n(".js-fancybox-count",o).html(e.group.length),n(".js-fancybox-index",o).html(a+1),i.$slide.trigger("refresh"),s&&s.empty(),c&&c.length?(s.html(c),this.$refs.container.addClass("fancybox-show-caption "),e.$caption=s):this.$refs.container.removeClass("fancybox-show-caption"))}}),n.fancybox={version:"3.0.47",defaults:i,getInstance:function(t){var e=n('.fancybox-container:not(".fancybox-container--closing"):first').data("FancyBox"),o=Array.prototype.slice.call(arguments,1);return e instanceof p&&("string"===n.type(t)?e[t].apply(e,o):"function"===n.type(t)&&t.apply(e,o),e)},open:function(t,e,n){return new p(t,e,n)},close:function(t){var e=this.getInstance();e&&(e.close(),t===!0&&this.close())},isTouch:e.createTouch!==o&&/Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(navigator.userAgent),use3d:function(){var n=e.createElement("div");return t.getComputedStyle(n).getPropertyValue("transform")&&!(e.documentMode&&e.documentMode<=11)}(),getTranslate:function(t){var e,n;return!(!t||!t.length)&&(e=t.get(0).getBoundingClientRect(),n=t.eq(0).css("transform"),n&&n.indexOf("matrix")!==-1?(n=n.split("(")[1],n=n.split(")")[0],n=n.split(",")):n=[],n.length?(n=n.length>10?[n[13],n[12],n[0],n[5]]:[n[5],n[4],n[0],n[3]],n=n.map(parseFloat)):n=[0,0,1,1],{top:n[0],left:n[1],scaleX:n[2],scaleY:n[3],opacity:parseFloat(t.css("opacity")),width:e.width,height:e.height})},setTranslate:function(t,e){var n="",s={};if(t&&e)return e.left===o&&e.top===o||(n=(e.left===o?t.position().top:e.left)+"px, "+(e.top===o?t.position().top:e.top)+"px",n=this.use3d?"translate3d("+n+", 0px)":"translate("+n+")"),e.scaleX!==o&&e.scaleY!==o&&(n=(n.length?n+" ":"")+"scale("+e.scaleX+", "+e.scaleY+")"),n.length&&(s.transform=n),e.opacity!==o&&(s.opacity=e.opacity),e.width!==o&&(s.width=e.width),e.height!==o&&(s.height=e.height),t.css(s)},easing:{easeOutCubic:function(t,e,n,o){return n*((t=t/o-1)*t*t+1)+e},easeInCubic:function(t,e,n,o){return n*(t/=o)*t*t+e},easeOutSine:function(t,e,n,o){return n*Math.sin(t/o*(Math.PI/2))+e},easeInSine:function(t,e,n,o){return-n*Math.cos(t/o*(Math.PI/2))+n+e}},stop:function(t){t.removeData("animateID")},animate:function(t,e,s,i,a,r){var c,l,d,p=this,h=null,f=0,g=function(){s.scaleX!==o&&s.scaleY!==o&&e&&e.width!==o&&e.height!==o&&(s.width=e.width*s.scaleX,s.height=e.height*s.scaleY,s.scaleX=1,s.scaleY=1),p.setTranslate(t,s),r()},b=function(n){if(c=[],l=0,t.length&&t.data("animateID")===d){if(n=n||Date.now(),h&&(l=n-h),h=n,f+=l,f>=i)return void g();for(var r in s)s.hasOwnProperty(r)&&e[r]!==o&&(e[r]==s[r]?c[r]=s[r]:c[r]=p.easing[a](f,e[r],s[r]-e[r],i));p.setTranslate(t,c),u(b)}};p.animateID=d=p.animateID===o?1:p.animateID+1,t.data("animateID",d),r===o&&"function"==n.type(a)&&(r=a,a=o),a||(a="easeOutCubic"),r=r||n.noop,e?this.setTranslate(t,e):e=this.getTranslate(t),i?(t.show(),u(b)):g()}},n.fn.fancybox=function(t){return this.off("click.fb-start").on("click.fb-start",{items:this,options:t||{}},s),this},n(e).on("click.fb-start","[data-fancybox]",s)}(window,document,window.jQuery),function(t){"use strict";var e=function(e,n,o){if(e)return o=o||"","object"===t.type(o)&&(o=t.param(o,!0)),t.each(n,function(t,n){e=e.replace("$"+t,n||"")}),o.length&&(e+=(e.indexOf("?")>0?"&":"?")+o),e},n={youtube:{matcher:/(youtube\.com|youtu\.be|youtube\-nocookie\.com)\/(watch\?(.*&)?v=|v\/|u\/|embed\/?)?(videoseries\?list=(.*)|[\w-]{11}|\?listType=(.*)&list=(.*))(.*)/i,params:{autoplay:1,autohide:1,fs:1,rel:0,hd:1,wmode:"transparent",enablejsapi:1,html5:1},paramPlace:8,type:"iframe",url:"//www.youtube.com/embed/$4",thumb:"//img.youtube.com/vi/$4/hqdefault.jpg"},vimeo:{matcher:/^.+vimeo.com\/(.*\/)?([\d]+)(.*)?/,params:{autoplay:1,hd:1,show_title:1,show_byline:1,show_portrait:0,fullscreen:1,api:1},paramPlace:3,type:"iframe",url:"//player.vimeo.com/video/$2"},metacafe:{matcher:/metacafe.com\/watch\/(\d+)\/(.*)?/,type:"iframe",url:"//www.metacafe.com/embed/$1/?ap=1"},dailymotion:{matcher:/dailymotion.com\/video\/(.*)\/?(.*)/,params:{additionalInfos:0,autoStart:1},type:"iframe",url:"//www.dailymotion.com/embed/video/$1"},vine:{matcher:/vine.co\/v\/([a-zA-Z0-9\?\=\-]+)/,type:"iframe",url:"//vine.co/v/$1/embed/simple"},instagram:{matcher:/(instagr\.am|instagram\.com)\/p\/([a-zA-Z0-9_\-]+)\/?/i,type:"image",url:"//$1/p/$2/media/?size=l"},google_maps:{matcher:/(maps\.)?google\.([a-z]{2,3}(\.[a-z]{2})?)\/(((maps\/(place\/(.*)\/)?\@(.*),(\d+.?\d+?)z))|(\?ll=))(.*)?/i,type:"iframe",url:function(t){return"//maps.google."+t[2]+"/?ll="+(t[9]?t[9]+"&z="+Math.floor(t[10])+(t[12]?t[12].replace(/^\//,"&"):""):t[12])+"&output="+(t[12]&&t[12].indexOf("layer=c")>0?"svembed":"embed")}}};t(document).on("onInit.fb",function(o,s){t.each(s.group,function(o,s){var i,a,r,c,l,u,d=s.src||"",p=!1;s.type||(t.each(n,function(n,o){if(a=d.match(o.matcher),l={},u=n,a){if(p=o.type,o.paramPlace&&a[o.paramPlace]){c=a[o.paramPlace],"?"==c[0]&&(c=c.substring(1)),c=c.split("&");for(var h=0;h<c.length;++h){var f=c[h].split("=",2);2==f.length&&(l[f[0]]=decodeURIComponent(f[1].replace(/\+/g," ")))}}return r=t.extend(!0,{},o.params,s.opts[n],l),d="function"===t.type(o.url)?o.url.call(this,a,r,s):e(o.url,a,r),i="function"===t.type(o.thumb)?o.thumb.call(this,a,r,s):e(o.thumb,a),"vimeo"===u&&(d=d.replace("&%23","#")),!1}}),p?(s.src=d,s.type=p,s.opts.thumb||s.opts.$thumb&&s.opts.$thumb.length||(s.opts.thumb=i),"iframe"===p&&(t.extend(!0,s.opts,{iframe:{preload:!1,scrolling:"no"},smallBtn:!1,closeBtn:!0,fullScreen:!1,slideShow:!1}),s.opts.slideClass+=" fancybox-slide--video")):s.type="iframe")})})}(window.jQuery),function(t,e,n){"use strict";var o=function(){return t.requestAnimationFrame||t.webkitRequestAnimationFrame||t.mozRequestAnimationFrame||function(e){t.setTimeout(e,1e3/60)}}(),s=function(e){var n=[];e=e.originalEvent||e||t.e,e=e.touches&&e.touches.length?e.touches:e.changedTouches&&e.changedTouches.length?e.changedTouches:[e];for(var o in e)e[o].pageX?n.push({x:e[o].pageX,y:e[o].pageY}):e[o].clientX&&n.push({x:e[o].clientX,y:e[o].clientY});return n},i=function(t,e,n){return e&&t?"x"===n?t.x-e.x:"y"===n?t.y-e.y:Math.sqrt(Math.pow(t.x-e.x,2)+Math.pow(t.y-e.y,2)):0},a=function(t){return t.is("a")||t.is("button")||t.is("input")||t.is("select")||t.is("textarea")||n.isFunction(t.get(0).onclick)},r=function(e){var n=t.getComputedStyle(e)["overflow-y"],o=t.getComputedStyle(e)["overflow-x"],s=("scroll"===n||"auto"===n)&&e.scrollHeight>e.clientHeight,i=("scroll"===o||"auto"===o)&&e.scrollWidth>e.clientWidth;return s||i},c=function(t){for(var e=!1;;){if(e=r(t.get(0)))break;if(t=t.parent(),!t.length||t.hasClass("fancybox-slider")||t.is("body"))break}return e},l=function(t){var e=this;e.instance=t,e.$wrap=t.$refs.slider_wrap,e.$slider=t.$refs.slider,e.$container=t.$refs.container,e.destroy(),e.$wrap.on("touchstart.fb mousedown.fb",n.proxy(e,"ontouchstart"))};l.prototype.destroy=function(){this.$wrap.off("touchstart.fb mousedown.fb touchmove.fb mousemove.fb touchend.fb touchcancel.fb mouseup.fb mouseleave.fb")},l.prototype.ontouchstart=function(e){var o=this,r=n(e.target),l=o.instance,u=l.current,d=u.$content||u.$placeholder;return o.startPoints=s(e),o.$target=r,o.$content=d,o.canvasWidth=Math.round(u.$slide[0].clientWidth),o.canvasHeight=Math.round(u.$slide[0].clientHeight),o.startEvent=e,e.originalEvent.clientX>o.canvasWidth+u.$slide.offset().left||(a(r)||a(r.parent())||c(r)?void 0:u.opts.touch?void(e.originalEvent&&2==e.originalEvent.button||(e.stopPropagation(),e.preventDefault(),!u||o.instance.isAnimating||o.instance.isClosing||!o.startPoints||o.startPoints.length>1&&!u.isMoved||(o.$wrap.off("touchmove.fb mousemove.fb",n.proxy(o,"ontouchmove")),o.$wrap.off("touchend.fb touchcancel.fb mouseup.fb mouseleave.fb",n.proxy(o,"ontouchend")),o.$wrap.on("touchend.fb touchcancel.fb mouseup.fb mouseleave.fb",n.proxy(o,"ontouchend")),o.$wrap.on("touchmove.fb mousemove.fb",n.proxy(o,"ontouchmove")),o.startTime=(new Date).getTime(),o.distanceX=o.distanceY=o.distance=0,o.canTap=!1,o.isPanning=!1,o.isSwiping=!1,o.isZooming=!1,o.sliderStartPos=n.fancybox.getTranslate(o.$slider),o.contentStartPos=n.fancybox.getTranslate(o.$content),o.contentLastPos=null,1!==o.startPoints.length||o.isZooming||(o.canTap=u.isMoved,"image"===u.type&&(o.contentStartPos.width>o.canvasWidth+1||o.contentStartPos.height>o.canvasHeight+1)?(n.fancybox.stop(o.$content),o.isPanning=!0):(n.fancybox.stop(o.$slider),o.isSwiping=!0),o.$container.addClass("fancybox-controls--isGrabbing")),2===o.startPoints.length&&u.isMoved&&!u.hasError&&"image"===u.type&&(u.isLoaded||u.$ghost)&&(o.isZooming=!0,o.isSwiping=!1,o.isPanning=!1,n.fancybox.stop(o.$content),o.centerPointStartX=.5*(o.startPoints[0].x+o.startPoints[1].x)-n(t).scrollLeft(),o.centerPointStartY=.5*(o.startPoints[0].y+o.startPoints[1].y)-n(t).scrollTop(),o.percentageOfImageAtPinchPointX=(o.centerPointStartX-o.contentStartPos.left)/o.contentStartPos.width,o.percentageOfImageAtPinchPointY=(o.centerPointStartY-o.contentStartPos.top)/o.contentStartPos.height,o.startDistanceBetweenFingers=i(o.startPoints[0],o.startPoints[1]))))):(o.endPoints=o.startPoints,o.ontap()))},l.prototype.ontouchmove=function(t){var e=this;t.preventDefault(),e.newPoints=s(t),e.newPoints&&e.newPoints.length&&(e.distanceX=i(e.newPoints[0],e.startPoints[0],"x"),e.distanceY=i(e.newPoints[0],e.startPoints[0],"y"),e.distance=i(e.newPoints[0],e.startPoints[0]),e.distance>0&&(e.isSwiping?e.onSwipe():e.isPanning?e.onPan():e.isZooming&&e.onZoom()))},l.prototype.onSwipe=function(){var e,s=this,i=s.isSwiping,a=s.sliderStartPos.left;i===!0?Math.abs(s.distance)>10&&(s.instance.group.length<2?s.isSwiping="y":!s.instance.current.isMoved||s.instance.opts.touch.vertical===!1||"auto"===s.instance.opts.touch.vertical&&n(t).width()>800?s.isSwiping="x":(e=Math.abs(180*Math.atan2(s.distanceY,s.distanceX)/Math.PI),
+s.isSwiping=e>45&&e<135?"y":"x"),s.canTap=!1,s.instance.current.isMoved=!1,s.startPoints=s.newPoints):("x"==i&&(!s.instance.current.opts.loop&&0===s.instance.current.index&&s.distanceX>0?a+=Math.pow(s.distanceX,.8):!s.instance.current.opts.loop&&s.instance.current.index===s.instance.group.length-1&&s.distanceX<0?a-=Math.pow(-s.distanceX,.8):a+=s.distanceX),s.sliderLastPos={top:"x"==i?0:s.sliderStartPos.top+s.distanceY,left:a},o(function(){n.fancybox.setTranslate(s.$slider,s.sliderLastPos)}))},l.prototype.onPan=function(){var t,e,s,i=this;i.canTap=!1,t=i.contentStartPos.width>i.canvasWidth?i.contentStartPos.left+i.distanceX:i.contentStartPos.left,e=i.contentStartPos.top+i.distanceY,s=i.limitMovement(t,e,i.contentStartPos.width,i.contentStartPos.height),s.scaleX=i.contentStartPos.scaleX,s.scaleY=i.contentStartPos.scaleY,i.contentLastPos=s,o(function(){n.fancybox.setTranslate(i.$content,i.contentLastPos)})},l.prototype.limitMovement=function(t,e,n,o){var s,i,a,r,c=this,l=c.canvasWidth,u=c.canvasHeight,d=c.contentStartPos.left,p=c.contentStartPos.top,h=c.distanceX,f=c.distanceY;return s=Math.max(0,.5*l-.5*n),i=Math.max(0,.5*u-.5*o),a=Math.min(l-n,.5*l-.5*n),r=Math.min(u-o,.5*u-.5*o),n>l&&(h>0&&t>s&&(t=s-1+Math.pow(-s+d+h,.8)||0),h<0&&t<a&&(t=a+1-Math.pow(a-d-h,.8)||0)),o>u&&(f>0&&e>i&&(e=i-1+Math.pow(-i+p+f,.8)||0),f<0&&e<r&&(e=r+1-Math.pow(r-p-f,.8)||0)),{top:e,left:t}},l.prototype.limitPosition=function(t,e,n,o){var s=this,i=s.canvasWidth,a=s.canvasHeight;return n>i?(t=t>0?0:t,t=t<i-n?i-n:t):t=Math.max(0,i/2-n/2),o>a?(e=e>0?0:e,e=e<a-o?a-o:e):e=Math.max(0,a/2-o/2),{top:e,left:t}},l.prototype.onZoom=function(){var e=this,s=e.contentStartPos.width,a=e.contentStartPos.height,r=e.contentStartPos.left,c=e.contentStartPos.top,l=i(e.newPoints[0],e.newPoints[1]),u=l/e.startDistanceBetweenFingers,d=Math.floor(s*u),p=Math.floor(a*u),h=(s-d)*e.percentageOfImageAtPinchPointX,f=(a-p)*e.percentageOfImageAtPinchPointY,g=(e.newPoints[0].x+e.newPoints[1].x)/2-n(t).scrollLeft(),b=(e.newPoints[0].y+e.newPoints[1].y)/2-n(t).scrollTop(),m=g-e.centerPointStartX,y=b-e.centerPointStartY,v=r+(h+m),x=c+(f+y),w={top:x,left:v,scaleX:e.contentStartPos.scaleX*u,scaleY:e.contentStartPos.scaleY*u};e.canTap=!1,e.newWidth=d,e.newHeight=p,e.contentLastPos=w,o(function(){n.fancybox.setTranslate(e.$content,e.contentLastPos)})},l.prototype.ontouchend=function(t){var e=this,o=e.instance.current,i=Math.max((new Date).getTime()-e.startTime,1),a=e.isSwiping,r=e.isPanning,c=e.isZooming;return e.endPoints=s(t),e.$container.removeClass("fancybox-controls--isGrabbing"),e.$wrap.off("touchmove.fb mousemove.fb",n.proxy(this,"ontouchmove")),e.$wrap.off("touchend.fb touchcancel.fb mouseup.fb mouseleave.fb",n.proxy(this,"ontouchend")),e.isSwiping=!1,e.isPanning=!1,e.isZooming=!1,e.canTap?e.ontap():(e.velocityX=e.distanceX/i*.5,e.velocityY=e.distanceY/i*.5,e.speed=o.opts.speed||330,e.speedX=Math.max(.75*e.speed,Math.min(1.5*e.speed,1/Math.abs(e.velocityX)*e.speed)),e.speedY=Math.max(.75*e.speed,Math.min(1.5*e.speed,1/Math.abs(e.velocityY)*e.speed)),void(r?e.endPanning():c?e.endZooming():e.endSwiping(a)))},l.prototype.endSwiping=function(t){var e=this;"y"==t&&Math.abs(e.distanceY)>50?(n.fancybox.animate(e.$slider,null,{top:e.sliderStartPos.top+e.distanceY+150*e.velocityY,left:e.sliderStartPos.left,opacity:0},e.speedY),e.instance.close(!0)):"x"==t&&e.distanceX>50?e.instance.previous(e.speedX):"x"==t&&e.distanceX<-50?e.instance.next(e.speedX):e.instance.update(!1,!0,150)},l.prototype.endPanning=function(){var t,e,o,s=this;s.contentLastPos&&(t=s.contentLastPos.left+s.velocityX*s.speed*2,e=s.contentLastPos.top+s.velocityY*s.speed*2,o=s.limitPosition(t,e,s.contentStartPos.width,s.contentStartPos.height),o.width=s.contentStartPos.width,o.height=s.contentStartPos.height,n.fancybox.animate(s.$content,null,o,s.speed,"easeOutSine"))},l.prototype.endZooming=function(){var t,e,o,s,i=this,a=i.instance.current,r=i.newWidth,c=i.newHeight;i.contentLastPos&&(t=i.contentLastPos.left,e=i.contentLastPos.top,s={top:e,left:t,width:r,height:c,scaleX:1,scaleY:1},n.fancybox.setTranslate(i.$content,s),r<i.canvasWidth&&c<i.canvasHeight?i.instance.scaleToFit(150):r>a.width||c>a.height?i.instance.scaleToActual(i.centerPointStartX,i.centerPointStartY,150):(o=i.limitPosition(t,e,r,c),n.fancybox.animate(i.$content,null,o,i.speed,"easeOutSine")))},l.prototype.ontap=function(){var t=this,e=t.instance,o=e.current,s=t.endPoints[0].x,i=t.endPoints[0].y;if(s-=t.$wrap.offset().left,i-=t.$wrap.offset().top,e.SlideShow&&e.SlideShow.isActive&&e.SlideShow.stop(),!n.fancybox.isTouch)return o.opts.closeClickOutside&&t.$target.is(".fancybox-slide")?void e.close(t.startEvent):void("image"==o.type&&o.isMoved&&(e.canPan()?e.scaleToFit():e.isScaledDown()?e.scaleToActual(s,i):e.group.length<2&&e.close(t.startEvent)));if(t.tapped){if(clearTimeout(t.tapped),t.tapped=null,Math.abs(s-t.x)>50||Math.abs(i-t.y)>50||!o.isMoved)return this;"image"==o.type&&(o.isLoaded||o.$ghost)&&(e.canPan()?e.scaleToFit():e.isScaledDown()&&e.scaleToActual(s,i))}else t.x=s,t.y=i,t.tapped=setTimeout(function(){t.tapped=null,e.toggleControls(!0)},300);return this},n(e).on("onActivate.fb",function(t,e){e&&!e.Guestures&&(e.Guestures=new l(e))}),n(e).on("beforeClose.fb",function(t,e){e&&e.Guestures&&e.Guestures.destroy()})}(window,document,window.jQuery),function(t,e){"use strict";var n=function(t){this.instance=t,this.init()};e.extend(n.prototype,{timer:null,isActive:!1,$button:null,speed:3e3,init:function(){var t=this;t.$button=e('<button data-fancybox-play class="fancybox-button fancybox-button--play" title="Slideshow (P)"></button>').appendTo(t.instance.$refs.buttons),t.instance.$refs.container.on("click","[data-fancybox-play]",function(){t.toggle()})},set:function(){var t=this;t.instance&&t.instance.current&&(t.instance.current.opts.loop||t.instance.currIndex<t.instance.group.length-1)?t.timer=setTimeout(function(){t.instance.next()},t.instance.current.opts.slideShow.speed||t.speed):t.stop()},clear:function(){var t=this;clearTimeout(t.timer),t.timer=null},start:function(){var t=this;t.stop(),t.instance&&t.instance.current&&(t.instance.current.opts.loop||t.instance.currIndex<t.instance.group.length-1)&&(t.instance.$refs.container.on({"beforeLoad.fb.player":e.proxy(t,"clear"),"onComplete.fb.player":e.proxy(t,"set")}),t.isActive=!0,t.instance.current.isComplete&&t.set(),t.instance.$refs.container.trigger("onPlayStart"),t.$button.addClass("fancybox-button--pause"))},stop:function(){var t=this;t.clear(),t.instance.$refs.container.trigger("onPlayEnd").off(".player"),t.$button.removeClass("fancybox-button--pause"),t.isActive=!1},toggle:function(){var t=this;t.isActive?t.stop():t.start()}}),e(t).on("onInit.fb",function(t,e){e&&e.group.length>1&&e.opts.slideShow&&!e.SlideShow&&(e.SlideShow=new n(e))}),e(t).on("beforeClose.fb onDeactivate.fb",function(t,e){e&&e.SlideShow&&e.SlideShow.stop()})}(document,window.jQuery),function(t,e){"use strict";var n=function(){var e,n,o,s=[["requestFullscreen","exitFullscreen","fullscreenElement","fullscreenEnabled","fullscreenchange","fullscreenerror"],["webkitRequestFullscreen","webkitExitFullscreen","webkitFullscreenElement","webkitFullscreenEnabled","webkitfullscreenchange","webkitfullscreenerror"],["webkitRequestFullScreen","webkitCancelFullScreen","webkitCurrentFullScreenElement","webkitCancelFullScreen","webkitfullscreenchange","webkitfullscreenerror"],["mozRequestFullScreen","mozCancelFullScreen","mozFullScreenElement","mozFullScreenEnabled","mozfullscreenchange","mozfullscreenerror"],["msRequestFullscreen","msExitFullscreen","msFullscreenElement","msFullscreenEnabled","MSFullscreenChange","MSFullscreenError"]],i={};for(n=0;n<s.length;n++)if(e=s[n],e&&e[1]in t){for(o=0;o<e.length;o++)i[s[0][o]]=e[o];return i}return!1}();if(n){var o={request:function(e){e=e||t.documentElement,e[n.requestFullscreen](e.ALLOW_KEYBOARD_INPUT)},exit:function(){t[n.exitFullscreen]()},toggle:function(t){this.isFullscreen()?this.exit():this.request(t)},isFullscreen:function(){return Boolean(t[n.fullscreenElement])},enabled:function(){return Boolean(t[n.fullscreenEnabled])}};e(t).on({"onInit.fb":function(t,n){var s;n&&n.opts.fullScreen&&!n.FullScreen&&(s=n.$refs.container,n.$refs.button_fs=e('<button data-fancybox-fullscreen class="fancybox-button fancybox-button--fullscreen" title="Full screen (F)"></button>').appendTo(n.$refs.buttons),s.on("click.fb-fullscreen","[data-fancybox-fullscreen]",function(t){t.stopPropagation(),t.preventDefault(),o.toggle(s[0])}),n.opts.fullScreen.requestOnStart===!0&&o.request(s[0]))},"beforeMove.fb":function(t,e){e&&e.$refs.button_fs&&e.$refs.button_fs.toggle(!!e.current.opts.fullScreen)},"beforeClose.fb":function(){o.exit()}}),e(t).on(n.fullscreenchange,function(){var t=e.fancybox.getInstance(),n=t?t.current.$placeholder:null;n&&(n.css("transition","none"),t.isAnimating=!1,t.update(!0,!0,0))})}}(document,window.jQuery),function(t,e){"use strict";var n=function(t){this.instance=t,this.init()};e.extend(n.prototype,{$button:null,$grid:null,$list:null,isVisible:!1,init:function(){var t=this;t.$button=e('<button data-fancybox-thumbs class="fancybox-button fancybox-button--thumbs" title="Thumbnails (G)"></button>').appendTo(this.instance.$refs.buttons).on("touchend click",function(e){e.stopPropagation(),e.preventDefault(),t.toggle()})},create:function(){var t,n,o=this.instance;this.$grid=e('<div class="fancybox-thumbs"></div>').appendTo(o.$refs.container),t="<ul>",e.each(o.group,function(e,o){n=o.opts.thumb||(o.opts.$thumb?o.opts.$thumb.attr("src"):null),n||"image"!==o.type||(n=o.src),n&&n.length&&(t+='<li data-index="'+e+'"  tabindex="0" class="fancybox-thumbs-loading"><img data-src="'+n+'" /></li>')}),t+="</ul>",this.$list=e(t).appendTo(this.$grid).on("click touchstart","li",function(){o.jumpTo(e(this).data("index"))}),this.$list.find("img").hide().one("load",function(){var t,n,o,s,i=e(this).parent().removeClass("fancybox-thumbs-loading"),a=i.outerWidth(),r=i.outerHeight();t=this.naturalWidth||this.width,n=this.naturalHeight||this.height,o=t/a,s=n/r,o>=1&&s>=1&&(o>s?(t/=s,n=r):(t=a,n/=o)),e(this).css({width:Math.floor(t),height:Math.floor(n),"margin-top":Math.min(0,Math.floor(.3*r-.3*n)),"margin-left":Math.min(0,Math.floor(.5*a-.5*t))}).show()}).each(function(){this.src=e(this).data("src")})},focus:function(){this.instance.current&&this.$list.children().removeClass("fancybox-thumbs-active").filter('[data-index="'+this.instance.current.index+'"]').addClass("fancybox-thumbs-active").focus()},close:function(){this.$grid.hide()},update:function(){this.instance.$refs.container.toggleClass("fancybox-container--thumbs",this.isVisible),this.isVisible?(this.$grid||this.create(),this.$grid.show(),this.focus()):this.$grid&&this.$grid.hide(),this.instance.update()},hide:function(){this.isVisible=!1,this.update()},show:function(){this.isVisible=!0,this.update()},toggle:function(){this.isVisible?this.hide():this.show()}}),e(t).on("onInit.fb",function(t,e){var o=e.group[0],s=e.group[1];e.opts.thumbs&&!e.Thumbs&&e.group.length>1&&("image"==o.type||o.opts.thumb||o.opts.$thumb)&&("image"==s.type||s.opts.thumb||s.opts.$thumb)&&(e.Thumbs=new n(e))}),e(t).on("beforeMove.fb",function(t,e,n){var o=e&&e.Thumbs;o&&(n.modal?(o.$button.hide(),o.hide()):(e.opts.thumbs.showOnStart===!0&&e.firstRun&&o.show(),o.$button.show(),o.isVisible&&o.focus()))}),e(t).on("beforeClose.fb",function(t,e){e&&e.Thumbs&&(e.Thumbs.isVisible&&e.opts.thumbs.hideOnClosing!==!1&&e.Thumbs.close(),e.Thumbs=null)})}(document,window.jQuery),function(t,e,n){"use strict";function o(){var t=e.location.hash.substr(1),n=t.split("-"),o=n.length>1&&/^\+?\d+$/.test(n[n.length-1])?parseInt(n.pop(-1),10)||1:1,s=n.join("-");return o<1&&(o=1),{hash:t,index:o,gallery:s}}function s(t){var e;""!==t.gallery&&(e=n("[data-fancybox='"+n.escapeSelector(t.gallery)+"']").eq(t.index-1),e.length?e.trigger("click"):n("#"+n.escapeSelector(t.gallery)).trigger("click"))}function i(t){var e;return!!t&&(e=t.current?t.current.opts:t.opts,e.$orig?e.$orig.data("fancybox"):e.hash||"")}n.escapeSelector||(n.escapeSelector=function(t){var e=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\x80-\uFFFF\w-]/g,n=function(t,e){return e?"\0"===t?"�":t.slice(0,-1)+"\\"+t.charCodeAt(t.length-1).toString(16)+" ":"\\"+t};return(t+"").replace(e,n)});var a=null;n(function(){setTimeout(function(){n.fancybox.defaults.hash!==!1&&(n(e).on("hashchange.fb",function(){var t=o();n.fancybox.getInstance()?a&&a!==t.gallery+"-"+t.index&&(a=null,n.fancybox.close()):""!==t.gallery&&s(t)}),n(t).on({"onInit.fb":function(t,e){var n=o(),s=i(e);s&&n.gallery&&s==n.gallery&&(e.currIndex=n.index-1)},"beforeMove.fb":function(n,o,s){var r=i(o);r&&""!==r&&(e.location.hash.indexOf(r)<0&&(o.opts.origHash=e.location.hash),a=r+(o.group.length>1?"-"+(s.index+1):""),"pushState"in history?history.pushState("",t.title,e.location.pathname+e.location.search+"#"+a):e.location.hash=a)},"beforeClose.fb":function(n,o,s){var r=i(o),c=o&&o.opts.origHash?o.opts.origHash:"";r&&""!==r&&("pushState"in history?history.pushState("",t.title,e.location.pathname+e.location.search+c):e.location.hash=c),a=null}}),s(o()))},50)})}(document,window,window.jQuery);
\ No newline at end of file

From c883a7b1d4f4e95b7a501071a8409f692c5cd21c Mon Sep 17 00:00:00 2001
From: zpetr <petr.glu@hotmail.com>
Date: Sat, 6 May 2017 23:28:17 +0200
Subject: [PATCH 120/192] Unexpected [ bug fix

PHP Parse error:  syntax error, unexpected '[', expecting ')'
---
 admin/admin_ticket.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/admin_ticket.php b/admin/admin_ticket.php
index c782c81f..0ac83009 100644
--- a/admin/admin_ticket.php
+++ b/admin/admin_ticket.php
@@ -470,7 +470,7 @@ if (($can_reply || $can_edit) && isset($_POST['childTrackingId'])) {
     }
 
     //-- Check if the ticket is already a child.
-    $childRs = hesk_dbQuery('SELECT * FROM `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'tickets` WHERE `parent` = ' . intval($ticket['id']) . ' AND `trackid` = \'' . hesk_dbEscape(hesk_POST(['childTrackingId'])) . '\'');
+    $childRs = hesk_dbQuery('SELECT * FROM `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'tickets` WHERE `parent` = ' . intval($ticket['id']) . ' AND `trackid` = \'' . hesk_dbEscape(hesk_POST('childTrackingId')) . '\'');
     if (hesk_dbNumRows($childRs) > 0) {
         hesk_process_messages(sprintf($hesklang['is_already_linked'], $_POST['childTrackingId']), 'admin_ticket.php?track=' . $trackingID . '&Refresh=' . mt_rand(10000, 99999), 'NOTICE');
     }

From 8db64d903dc06be48917618772c93629bdf12a42 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sat, 6 May 2017 22:17:22 -0400
Subject: [PATCH 121/192] Getting started on custom nav elements

---
 admin/manage_custom_nav_elements.php     | 169 +++++++++++++++++++++++
 install/mods-for-hesk/sql/installSql.php |  13 ++
 2 files changed, 182 insertions(+)
 create mode 100644 admin/manage_custom_nav_elements.php

diff --git a/admin/manage_custom_nav_elements.php b/admin/manage_custom_nav_elements.php
new file mode 100644
index 00000000..4b36b55c
--- /dev/null
+++ b/admin/manage_custom_nav_elements.php
@@ -0,0 +1,169 @@
+<?php
+
+define('IN_SCRIPT', 1);
+define('HESK_PATH', '../');
+define('PAGE_TITLE', 'ADMIN_CUSTOM_NAV_ELEMENTS');
+define('MFH_PAGE_LAYOUT', 'TOP_ONLY');
+
+/* Get all the required files and functions */
+require(HESK_PATH . 'hesk_settings.inc.php');
+require(HESK_PATH . 'inc/common.inc.php');
+require(HESK_PATH . 'inc/admin_functions.inc.php');
+require(HESK_PATH . 'inc/mail_functions.inc.php');
+hesk_load_database_functions();
+
+hesk_session_start();
+hesk_dbConnect();
+hesk_isLoggedIn();
+
+//hesk_checkPermission('can_man_email_tpl');
+
+// Are we performing an action?
+$showEditPanel = false;
+if (isset($_GET['action'])) {
+    if ($_GET['action'] == 'edit') {
+        $showEditPanel = true;
+    }
+}
+
+// Are we saving?
+if (isset($_POST['action'])) {
+    if ($_POST['action'] == 'save') {
+        save();
+    }
+}
+/* Print header */
+require_once(HESK_PATH . 'inc/headerAdmin.inc.php');
+
+/* Print main manage users page */
+require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
+?>
+    <div class="content-wrapper">
+        <section class="content">
+            <div class="box">
+                <div class="box-header with-border">
+                    <h1 class="box-title">
+                        Custom Nav Menu Elements[!]
+                    </h1>
+                    <div class="box-tools pull-right">
+                        <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                            <i class="fa fa-minus"></i>
+                        </button>
+                    </div>
+                </div>
+                <div class="box-body">
+                    <?php if ($showEditPanel): ?>
+                        <div class="row">
+                            <div class="col-md-12">
+                                <div class="panel panel-default">
+                                    <div class="panel-heading">
+                                        <h4>EDIT CUSTOM NAV ELEMENT[!]</h4>
+                                    </div>
+                                    <div class="panel-body">
+                                        <form action="manage_custom_nav_elements.php" method="post">
+                                        </form>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    <?php endif; ?>
+                    <div class="row">
+                        <div class="col-md-12">
+                            <?php
+                            /* This will handle error, success and notice messages */
+                            hesk_handle_messages();
+
+                            $languages = array();
+                            foreach ($hesk_settings['languages'] as $key => $value) {
+                                $languages[$key] = $hesk_settings['languages'][$key]['folder'];
+                            }
+
+                            $customElementsRs = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "custom_nav_element`");
+                            ?>
+                            <table class="table table-default">
+                                <thead>
+                                <tr>
+                                    <th>ID</th>
+                                    <th>Text</th>
+                                    <th>Subtext</th>
+                                    <th>Image URL / Font Icon</th>
+                                    <th>Place</th>
+                                    <th>Actions</th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                <?php
+                                if (hesk_dbNumRows($customElementsRs) === 0) {
+                                    echo '<tr><td colspan="6">No custom navigation elements</td></tr>';
+                                }
+
+                                while ($row = hesk_dbFetchAssoc($customElementsRs)):
+                                    $localizedTextRs = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "custom_nav_element_to_text`
+                                        WHERE `nav_element_id` = " . intval($row['id']));
+                                    $languageText = array();
+                                    while ($textRow = hesk_dbFetchAssoc($localizedTextRs)) {
+                                        $languageText[$textRow['language']] = $textRow;
+                                    } ?>
+                                    <tr>
+                                        <td><?php echo $row['id']; ?></td>
+                                        <td>
+                                            <ul class="list-unstyled">
+                                                <?php foreach ($languageText as $key => $value): ?>
+                                                    <li>
+                                                        <b><?php echo $key; ?>: </b>
+                                                        <?php echo $value['text']; ?>
+                                                    </li>
+                                                <?php endforeach; ?>
+                                            </ul>
+                                        </td>
+                                        <td>
+                                            <ul class="list-unstyled">
+                                                <?php
+                                                if ($row['place'] == 0) {
+                                                    foreach ($languageText as $key => $value): ?>
+                                                        <li>
+                                                            <b><?php echo $key; ?>: </b>
+                                                            <?php echo $value['subtext']; ?>
+                                                        </li>
+                                                    <?php endforeach;
+                                                } else {
+                                                    echo '-';
+                                                } ?>
+                                            </ul>
+                                        </td>
+                                        <td>
+                                            <?php if ($row['image_url'] !== null) {
+                                                echo $row['image_url'];
+                                            } else {
+                                                echo '<i class="' . $row['font_icon'] . '"></i>';
+                                            } ?>
+                                        </td>
+                                        <td>
+                                            <?php if ($row['place'] == 0) {
+                                                echo 'Homepage - Block';
+                                            } elseif ($row['place'] == 1) {
+                                                echo 'Customer Navbar';
+                                            } elseif ($row['place'] == 2) {
+                                                echo 'Staff Navbar';
+                                            } else {
+                                                echo 'INVALID!!';
+                                            } ?>
+                                        </td>
+                                        <td>EDIT, DELETE</td>
+                                    </tr>
+                                <?php endwhile; ?>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </section>
+    </div>
+<?php
+require_once(HESK_PATH . 'inc/footer.inc.php');
+exit();
+
+function save()
+{
+}
\ No newline at end of file
diff --git a/install/mods-for-hesk/sql/installSql.php b/install/mods-for-hesk/sql/installSql.php
index 7a970cda..43e3e21d 100644
--- a/install/mods-for-hesk/sql/installSql.php
+++ b/install/mods-for-hesk/sql/installSql.php
@@ -993,4 +993,17 @@ function execute310Scripts() {
     hesk_dbConnect();
 
     executeQuery("ALTER TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "logging` ADD COLUMN `stack_trace` TEXT");
+    executeQuery("CREATE TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "custom_nav_element` 
+        (id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
+         image_url TEXT,
+         font_icon VARCHAR(200),
+         place INT NOT NULL)");
+    executeQuery("CREATE TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "custom_nav_element_to_text`
+        (id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
+         nav_element_id INT NOT NULL,
+         language VARCHAR(200) NOT NULL,
+         text VARCHAR(200) NOT NULL,
+         subtext VARCHAR(200))");
+
+    updateVersion('3.1.0');
 }
\ No newline at end of file

From 3df53247329ea00eac2bd81b399519431cc622fb Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Mon, 8 May 2017 21:56:30 -0400
Subject: [PATCH 122/192] Getting more work done on custom navigation

---
 admin/manage_custom_nav_elements.php          | 73 +++++++++++--------
 api/ApplicationContext.php                    |  9 +++
 .../Navigation/CustomNavElement.php           | 24 ++++++
 .../Navigation/CustomNavElementHandler.php    | 32 ++++++++
 .../Navigation/CustomNavElementPlace.php      | 10 +++
 api/BusinessLogic/Security/UserContext.php    |  1 -
 .../Navigation/CustomNavElementController.php | 17 +++++
 .../Navigation/CustomNavElementGateway.php    | 22 ++++++
 api/index.php                                 |  2 +
 language/en/text.php                          |  1 +
 10 files changed, 159 insertions(+), 32 deletions(-)
 create mode 100644 api/BusinessLogic/Navigation/CustomNavElement.php
 create mode 100644 api/BusinessLogic/Navigation/CustomNavElementHandler.php
 create mode 100644 api/BusinessLogic/Navigation/CustomNavElementPlace.php
 create mode 100644 api/Controllers/Navigation/CustomNavElementController.php
 create mode 100644 api/DataAccess/Navigation/CustomNavElementGateway.php

diff --git a/admin/manage_custom_nav_elements.php b/admin/manage_custom_nav_elements.php
index 4b36b55c..d1d78ae5 100644
--- a/admin/manage_custom_nav_elements.php
+++ b/admin/manage_custom_nav_elements.php
@@ -16,15 +16,7 @@ hesk_session_start();
 hesk_dbConnect();
 hesk_isLoggedIn();
 
-//hesk_checkPermission('can_man_email_tpl');
-
-// Are we performing an action?
-$showEditPanel = false;
-if (isset($_GET['action'])) {
-    if ($_GET['action'] == 'edit') {
-        $showEditPanel = true;
-    }
-}
+//hesk_checkPermission('can_man_custom_nav');
 
 // Are we saving?
 if (isset($_POST['action'])) {
@@ -52,21 +44,6 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                     </div>
                 </div>
                 <div class="box-body">
-                    <?php if ($showEditPanel): ?>
-                        <div class="row">
-                            <div class="col-md-12">
-                                <div class="panel panel-default">
-                                    <div class="panel-heading">
-                                        <h4>EDIT CUSTOM NAV ELEMENT[!]</h4>
-                                    </div>
-                                    <div class="panel-body">
-                                        <form action="manage_custom_nav_elements.php" method="post">
-                                        </form>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    <?php endif; ?>
                     <div class="row">
                         <div class="col-md-12">
                             <?php
@@ -149,7 +126,16 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                                                 echo 'INVALID!!';
                                             } ?>
                                         </td>
-                                        <td>EDIT, DELETE</td>
+                                        <td>
+                                            <a href="manage_custom_nav_elements.php?edit=<?php echo $row['id'];?>">
+                                                <i class="fa fa-pencil icon-link orange"
+                                                 data-toggle="tooltip" title="<?php echo $hesklang['edit']; ?>"></i>
+                                            </a>
+                                            <a href="manage_custom_nav_elements.php?delete=<?php echo $row['id']; ?>">
+                                                <i class="fa fa-times icon-link red"
+                                                 data-toggle="tooltip" title="<?php echo $hesklang['delete']; ?>"></i>
+                                            </a>
+                                        </td>
                                     </tr>
                                 <?php endwhile; ?>
                                 </tbody>
@@ -158,12 +144,37 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                     </div>
                 </div>
             </div>
+            <?php
+            if ($showEditPanel):
+                ?>
+                <div class="box">
+                    <div class="box-header with-border">
+                        <h1 class="box-title">
+                            Edit Custom Navigation Menu Element
+                        </h1>
+                        <div class="box-tools pull-right">
+                            <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                                <i class="fa fa-minus"></i>
+                            </button>
+                        </div>
+                    </div>
+                    <div class="box-body">
+                        <form action="manage_custom_nav_elements.php" method="post">
+                        </form>
+                    </div>
+                </div>
+            <?php endif; ?>
         </section>
     </div>
+<section id="table-row-template" style="display: none">
+    <tr>
+        <td data-property="id"></td>
+        <td data-property="text"></td>
+        <td data-property="subtext"></td>
+        <td data-property="icon-url"></td>
+        <td data-property="place"></td>
+        <td data-property="action"></td>
+    </tr>
+</section>
 <?php
-require_once(HESK_PATH . 'inc/footer.inc.php');
-exit();
-
-function save()
-{
-}
\ No newline at end of file
+require_once(HESK_PATH . 'inc/footer.inc.php');
\ No newline at end of file
diff --git a/api/ApplicationContext.php b/api/ApplicationContext.php
index 95b312b8..dae5a238 100644
--- a/api/ApplicationContext.php
+++ b/api/ApplicationContext.php
@@ -9,6 +9,7 @@ use BusinessLogic\Emails\EmailSenderHelper;
 use BusinessLogic\Emails\EmailTemplateParser;
 use BusinessLogic\Emails\EmailTemplateRetriever;
 use BusinessLogic\Emails\MailgunEmailSender;
+use BusinessLogic\Navigation\CustomNavElementHandler;
 use BusinessLogic\Security\BanRetriever;
 use BusinessLogic\Security\UserContextBuilder;
 use BusinessLogic\Security\UserToTicketChecker;
@@ -30,6 +31,7 @@ use DataAccess\Files\FileDeleter;
 use DataAccess\Files\FileReader;
 use DataAccess\Files\FileWriter;
 use DataAccess\Logging\LoggingGateway;
+use DataAccess\Navigation\CustomNavElementGateway;
 use DataAccess\Security\BanGateway;
 use DataAccess\Security\UserGateway;
 use DataAccess\Settings\ModsForHeskSettingsGateway;
@@ -41,6 +43,9 @@ use DataAccess\Tickets\VerifiedEmailGateway;
 class ApplicationContext {
     public $get;
 
+    /**
+     * ApplicationContext constructor.
+     */
     function __construct() {
         $this->get = array();
 
@@ -50,6 +55,10 @@ class ApplicationContext {
         // API Checker
         $this->get[ApiChecker::class] = new ApiChecker($this->get[ModsForHeskSettingsGateway::class]);
 
+        // Custom Navigation
+        $this->get[CustomNavElementGateway::class] = new CustomNavElementGateway();
+        $this->get[CustomNavElementHandler::class] = new CustomNavElementHandler($this->get[CustomNavElementGateway::class]);
+
         // Logging
         $this->get[LoggingGateway::class] = new LoggingGateway();
 
diff --git a/api/BusinessLogic/Navigation/CustomNavElement.php b/api/BusinessLogic/Navigation/CustomNavElement.php
new file mode 100644
index 00000000..d720d6b7
--- /dev/null
+++ b/api/BusinessLogic/Navigation/CustomNavElement.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace BusinessLogic\Navigation;
+
+
+class CustomNavElement {
+    /* @var $id int*/
+    public $id;
+
+    /* @var $text string[string] */
+    public $text;
+
+    /* @var $subtext string[string]|null */
+    public $subtext;
+
+    /* @var $imageUrl string|null */
+    public $imageUrl;
+
+    /* @var $fontIcon string|null */
+    public $fontIcon;
+
+    /* @var $place int */
+    public $place;
+}
\ No newline at end of file
diff --git a/api/BusinessLogic/Navigation/CustomNavElementHandler.php b/api/BusinessLogic/Navigation/CustomNavElementHandler.php
new file mode 100644
index 00000000..0a159116
--- /dev/null
+++ b/api/BusinessLogic/Navigation/CustomNavElementHandler.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace BusinessLogic\Navigation;
+
+// TODO Test!
+use DataAccess\Navigation\CustomNavElementGateway;
+
+class CustomNavElementHandler {
+    /* @var $customNavElementGateway CustomNavElementGateway */
+    private $customNavElementGateway;
+
+    function __construct($customNavElementGateway) {
+        $this->customNavElementGateway = $customNavElementGateway;
+    }
+
+
+    function getAllCustomNavElements($heskSettings) {
+        return $this->customNavElementGateway->getAllCustomNavElements($heskSettings);
+    }
+
+    function deleteCustomNavElement() {
+
+    }
+
+    function saveCustomNavElement() {
+
+    }
+
+    function createCustomNavElement() {
+
+    }
+}
\ No newline at end of file
diff --git a/api/BusinessLogic/Navigation/CustomNavElementPlace.php b/api/BusinessLogic/Navigation/CustomNavElementPlace.php
new file mode 100644
index 00000000..3114fdc7
--- /dev/null
+++ b/api/BusinessLogic/Navigation/CustomNavElementPlace.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace BusinessLogic\Navigation;
+
+
+class CustomNavElementPlace {
+    const HOMEPAGE_BLOCK = 1;
+    const CUSTOMER_NAVIGATION = 2;
+    const ADMIN_NAVIGATION = 3;
+}
\ No newline at end of file
diff --git a/api/BusinessLogic/Security/UserContext.php b/api/BusinessLogic/Security/UserContext.php
index 45132395..dd6cebd4 100644
--- a/api/BusinessLogic/Security/UserContext.php
+++ b/api/BusinessLogic/Security/UserContext.php
@@ -61,7 +61,6 @@ class UserContext {
      * @return UserContext the built user context
      */
     static function fromDataRow($dataRow) {
-        var_dump($dataRow);
         $userContext = new UserContext();
         $userContext->id = intval($dataRow['id']);
         $userContext->username = $dataRow['user'];
diff --git a/api/Controllers/Navigation/CustomNavElementController.php b/api/Controllers/Navigation/CustomNavElementController.php
new file mode 100644
index 00000000..a36bfe78
--- /dev/null
+++ b/api/Controllers/Navigation/CustomNavElementController.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Controllers\Navigation;
+
+
+use BusinessLogic\Navigation\CustomNavElementHandler;
+
+class CustomNavElementController {
+    static function getAll() {
+        global $applicationContext, $hesk_settings;
+
+        /* @var $handler CustomNavElementHandler */
+        $handler = $applicationContext->get[CustomNavElementHandler::class];
+
+        output($handler->getAllCustomNavElements($hesk_settings));
+    }
+}
\ No newline at end of file
diff --git a/api/DataAccess/Navigation/CustomNavElementGateway.php b/api/DataAccess/Navigation/CustomNavElementGateway.php
new file mode 100644
index 00000000..3e025f36
--- /dev/null
+++ b/api/DataAccess/Navigation/CustomNavElementGateway.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace DataAccess\Navigation;
+
+
+use DataAccess\CommonDao;
+
+class CustomNavElementGateway extends CommonDao {
+    function getAllCustomNavElements($heskSettings) {
+        $this->init();
+
+        $rs = hesk_dbQuery("SELECT `t2`.`id` AS `xref_id`, `t2`.*, `t1`.* FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "custom_nav_element` AS `t1`
+            INNER JOIN `" . hesk_dbEscape($heskSettings['db_pfix']) . "custom_nav_element_to_text` AS `t2`
+                ON `t1`.`id` = `t2`.`nav_element_id`");
+
+        while ($row = hesk_dbFetchAssoc($rs)) {
+            var_dump($row);
+        }
+
+        $this->close();
+    }
+}
\ No newline at end of file
diff --git a/api/index.php b/api/index.php
index 92e87d99..8c34cb35 100644
--- a/api/index.php
+++ b/api/index.php
@@ -186,6 +186,8 @@ Link::all(array(
     /* Internal use only routes */
     // Resend email response
     '/v1-internal/staff/tickets/{i}/resend-email' => \Controllers\Tickets\ResendTicketEmailToCustomerController::class,
+    // Custom Navigation
+    '/v1-internal/custom-navigation' => \Controllers\Navigation\CustomNavElementController::class . '::getAll',
 
     // Any URL that doesn't match goes to the 404 handler
     '404' => 'handle404'
diff --git a/language/en/text.php b/language/en/text.php
index 18aca4be..6a03a541 100644
--- a/language/en/text.php
+++ b/language/en/text.php
@@ -52,6 +52,7 @@ $hesklang['resend_email_notification'] = 'Re-send Email Notification';
 $hesklang['email_notification_sent'] = 'Email notification sent!';
 $hesklang['email_notification_resend_failed'] = 'Error occurred when trying to send notification email.';
 $hesklang['edit_category'] = 'Edit Category';
+$hesklang['custom_nav_element_deleted'] = 'Custom Navigation Element Deleted!';
 
 // ADDED OR MODIFIED IN Mods for HESK 3.0.0
 $hesklang['you_have_x_messages'] = 'You have %s new %s'; // %s: Number of new messages, "message" or "messages", depending on # 

From d06d1688502be8269e6d1dc3316eaa01852c640b Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Tue, 9 May 2017 22:00:01 -0400
Subject: [PATCH 123/192] Finished up retrieving custom nav elements

---
 .../Navigation/CustomNavElementGateway.php    | 33 +++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/api/DataAccess/Navigation/CustomNavElementGateway.php b/api/DataAccess/Navigation/CustomNavElementGateway.php
index 3e025f36..4beaf021 100644
--- a/api/DataAccess/Navigation/CustomNavElementGateway.php
+++ b/api/DataAccess/Navigation/CustomNavElementGateway.php
@@ -3,20 +3,49 @@
 namespace DataAccess\Navigation;
 
 
+use BusinessLogic\Navigation\CustomNavElement;
 use DataAccess\CommonDao;
 
 class CustomNavElementGateway extends CommonDao {
     function getAllCustomNavElements($heskSettings) {
         $this->init();
 
-        $rs = hesk_dbQuery("SELECT `t2`.`id` AS `xref_id`, `t2`.*, `t1`.* FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "custom_nav_element` AS `t1`
+        $columns = '`t1`.`id`, `t1`.`image_url`, `t1`.`font_icon`, `t1`.`place`, `t2`.`language`, `t2`.`text`, `t2`.`subtext`';
+
+        $rs = hesk_dbQuery("SELECT {$columns} FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "custom_nav_element` AS `t1`
             INNER JOIN `" . hesk_dbEscape($heskSettings['db_pfix']) . "custom_nav_element_to_text` AS `t2`
                 ON `t1`.`id` = `t2`.`nav_element_id`");
 
+        $elements = array();
+        $element = null;
+        $previousId = -1;
         while ($row = hesk_dbFetchAssoc($rs)) {
-            var_dump($row);
+            $id = intval($row['id']);
+            if ($previousId !== $id) {
+                if ($element !== null) {
+                    $elements[] = $element;
+                }
+                $element = new CustomNavElement();
+                $element->id = $id;
+                $element->place = intval($row['place']);
+                $element->imageUrl = $row['image_url'];
+                $element->fontIcon = $row['font_icon'];
+                $element->text = array();
+                $element->subtext = array();
+            }
+
+            $element->text[$row['language']] = $row['text'];
+            $element->subtext[$row['language']] = $row['subtext'];
+
+            $previousId = $id;
+        }
+
+        if ($element !== null) {
+            $elements[] = $element;
         }
 
         $this->close();
+
+        return $elements;
     }
 }
\ No newline at end of file

From 6e72662a1bf3e01d524e44cb92a93c7b16191682 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Thu, 11 May 2017 22:00:51 -0400
Subject: [PATCH 124/192] Wrote the custom nav element api

---
 .../Navigation/CustomNavElement.php           |   4 +-
 .../Navigation/CustomNavElementHandler.php    |  19 +++-
 .../Navigation/CustomNavElementController.php |  72 +++++++++++-
 .../Navigation/CustomNavElementGateway.php    | 103 +++++++++++++++++-
 api/index.php                                 |   4 +-
 5 files changed, 193 insertions(+), 9 deletions(-)

diff --git a/api/BusinessLogic/Navigation/CustomNavElement.php b/api/BusinessLogic/Navigation/CustomNavElement.php
index d720d6b7..2e0e7261 100644
--- a/api/BusinessLogic/Navigation/CustomNavElement.php
+++ b/api/BusinessLogic/Navigation/CustomNavElement.php
@@ -7,10 +7,10 @@ class CustomNavElement {
     /* @var $id int*/
     public $id;
 
-    /* @var $text string[string] */
+    /* @var $text string[] */
     public $text;
 
-    /* @var $subtext string[string]|null */
+    /* @var $subtext string[]|null */
     public $subtext;
 
     /* @var $imageUrl string|null */
diff --git a/api/BusinessLogic/Navigation/CustomNavElementHandler.php b/api/BusinessLogic/Navigation/CustomNavElementHandler.php
index 0a159116..4a8cad62 100644
--- a/api/BusinessLogic/Navigation/CustomNavElementHandler.php
+++ b/api/BusinessLogic/Navigation/CustomNavElementHandler.php
@@ -3,6 +3,7 @@
 namespace BusinessLogic\Navigation;
 
 // TODO Test!
+use BusinessLogic\Exceptions\ApiFriendlyException;
 use DataAccess\Navigation\CustomNavElementGateway;
 
 class CustomNavElementHandler {
@@ -18,15 +19,25 @@ class CustomNavElementHandler {
         return $this->customNavElementGateway->getAllCustomNavElements($heskSettings);
     }
 
-    function deleteCustomNavElement() {
+    function getCustomNavElement($id, $heskSettings) {
+        $elements = $this->getAllCustomNavElements($heskSettings);
 
-    }
+        if (isset($elements[$id])) {
+            return $elements[$id];
+        }
 
-    function saveCustomNavElement() {
+        throw new ApiFriendlyException("Custom nav element {$id} not found!", "Element Not Found", 404);
+    }
 
+    function deleteCustomNavElement($id, $heskSettings) {
+        $this->customNavElementGateway->deleteCustomNavElement($id, $heskSettings);
     }
 
-    function createCustomNavElement() {
+    function saveCustomNavElement($element, $heskSettings) {
+        $this->customNavElementGateway->saveCustomNavElement($element, $heskSettings);
+    }
 
+    function createCustomNavElement($element, $heskSettings) {
+        return $this->customNavElementGateway->createCustomNavElement($element, $heskSettings);
     }
 }
\ No newline at end of file
diff --git a/api/Controllers/Navigation/CustomNavElementController.php b/api/Controllers/Navigation/CustomNavElementController.php
index a36bfe78..2387e506 100644
--- a/api/Controllers/Navigation/CustomNavElementController.php
+++ b/api/Controllers/Navigation/CustomNavElementController.php
@@ -3,15 +3,85 @@
 namespace Controllers\Navigation;
 
 
+use BusinessLogic\Helpers;
+use BusinessLogic\Navigation\CustomNavElement;
 use BusinessLogic\Navigation\CustomNavElementHandler;
+use Controllers\InternalApiController;
+use Controllers\JsonRetriever;
 
-class CustomNavElementController {
+class CustomNavElementController extends InternalApiController {
     static function getAll() {
         global $applicationContext, $hesk_settings;
 
+        self::checkForInternalUseOnly();
+
         /* @var $handler CustomNavElementHandler */
         $handler = $applicationContext->get[CustomNavElementHandler::class];
 
         output($handler->getAllCustomNavElements($hesk_settings));
     }
+
+    function get($id) {
+        global $applicationContext, $hesk_settings;
+
+        $this->checkForInternalUseOnly();
+
+        /* @var $handler CustomNavElementHandler */
+        $handler = $applicationContext->get[CustomNavElementHandler::class];
+
+        output($handler->getCustomNavElement($id, $hesk_settings));
+    }
+
+    function post() {
+        global $applicationContext, $hesk_settings;
+
+        $this->checkForInternalUseOnly();
+
+        /* @var $handler CustomNavElementHandler */
+        $handler = $applicationContext->get[CustomNavElementHandler::class];
+
+        $data = JsonRetriever::getJsonData();
+        $element = $handler->createCustomNavElement($this->buildElementModel($data), $hesk_settings);
+
+        return output($element, 201);
+    }
+
+    function put($id) {
+        global $applicationContext, $hesk_settings;
+
+        $this->checkForInternalUseOnly();
+
+        /* @var $handler CustomNavElementHandler */
+        $handler = $applicationContext->get[CustomNavElementHandler::class];
+
+        $data = JsonRetriever::getJsonData();
+        $handler->saveCustomNavElement($this->buildElementModel($data, $id), $hesk_settings);
+
+        return http_response_code(204);
+    }
+
+    function delete($id) {
+        global $applicationContext, $hesk_settings;
+
+        $this->checkForInternalUseOnly();
+
+        /* @var $handler CustomNavElementHandler */
+        $handler = $applicationContext->get[CustomNavElementHandler::class];
+
+        $handler->deleteCustomNavElement($id, $hesk_settings);
+
+        return http_response_code(204);
+    }
+
+    private function buildElementModel($data, $id = null) {
+        $element = new CustomNavElement();
+        $element->id = $id;
+        $element->place = intval(Helpers::safeArrayGet($data, 'place'));
+        $element->fontIcon = Helpers::safeArrayGet($data, 'fontIcon');
+        $element->imageUrl = Helpers::safeArrayGet($data, 'imageUrl');
+        $element->text = Helpers::safeArrayGet($data, 'text');
+        $element->subtext = Helpers::safeArrayGet($data, 'subtext');
+
+        return $element;
+    }
 }
\ No newline at end of file
diff --git a/api/DataAccess/Navigation/CustomNavElementGateway.php b/api/DataAccess/Navigation/CustomNavElementGateway.php
index 4beaf021..77671891 100644
--- a/api/DataAccess/Navigation/CustomNavElementGateway.php
+++ b/api/DataAccess/Navigation/CustomNavElementGateway.php
@@ -17,13 +17,15 @@ class CustomNavElementGateway extends CommonDao {
                 ON `t1`.`id` = `t2`.`nav_element_id`");
 
         $elements = array();
+
+        /* @var $element CustomNavElement */
         $element = null;
         $previousId = -1;
         while ($row = hesk_dbFetchAssoc($rs)) {
             $id = intval($row['id']);
             if ($previousId !== $id) {
                 if ($element !== null) {
-                    $elements[] = $element;
+                    $elements[$element->id] = $element;
                 }
                 $element = new CustomNavElement();
                 $element->id = $id;
@@ -48,4 +50,103 @@ class CustomNavElementGateway extends CommonDao {
 
         return $elements;
     }
+
+    /**
+     * @param $id int
+     * @param $heskSettings array
+     */
+    function deleteCustomNavElement($id, $heskSettings) {
+        $this->init();
+
+        hesk_dbQuery("DELETE FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "custom_nav_element_to_text` 
+            WHERE `nav_element_id` = " . intval($id));
+        hesk_dbQuery("DELETE FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "custom_nav_element` 
+            WHERE `id` = " . intval($id));
+
+        $this->close();
+    }
+
+    /**
+     * @param $element CustomNavElement
+     * @param $heskSettings array
+     */
+    function saveCustomNavElement($element, $heskSettings) {
+        $this->init();
+
+        //-- Delete previous records - easier than inserting/updating
+        hesk_dbQuery("DELETE FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "custom_nav_element_to_text` 
+            WHERE `nav_element_id` = " . intval($element->id));
+
+        $languageTextAndSubtext = array();
+        foreach ($element->text as $key => $text) {
+            $languageTextAndSubtext[$key]['text'] = $text;
+        }
+        foreach ($element->subtext as $key => $subtext) {
+            $languageTextAndSubtext[$key]['subtext'] = $subtext;
+        }
+
+        foreach ($languageTextAndSubtext as $key => $values) {
+            $subtext = 'NULL';
+            if (isset($values['subtext'])) {
+                $subtext = "'" . hesk_dbEscape($values['subtext']) . "'";
+            }
+            hesk_dbQuery("INSERT INTO `" . hesk_dbEscape($heskSettings['db_pfix']) . "custom_nav_element_to_text`
+                (`nav_element_id`, `language`, `text`, `subtext`) VALUES (" . intval($element->id) . ", 
+                '" . hesk_dbEscape($key) . "',
+                '" . hesk_dbEscape($values['text']) . "', 
+                " . $subtext . ")");
+        }
+
+        $imageUrl = $element->imageUrl == null ? 'NULL' : "'" . hesk_dbEscape($element->imageUrl) . "'";
+        $fontIcon = $element->fontIcon == null ? 'NULL' : "'" . hesk_dbEscape($element->fontIcon) . "'";
+        hesk_dbQuery("UPDATE `" . hesk_dbEscape($heskSettings['db_pfix']) . "custom_nav_element`
+            SET `image_url` = {$imageUrl},
+                `font_icon` = {$fontIcon},
+                `place` = " . intval($element->place) .
+            " WHERE `id` = " . intval($element->id));
+
+        $this->close();
+    }
+
+    /**
+     * @param $element CustomNavElement
+     * @param $heskSettings array
+     * @return CustomNavElement
+     */
+    function createCustomNavElement($element, $heskSettings) {
+        $this->init();
+
+        $imageUrl = $element->imageUrl == null ? 'NULL' : "'" . hesk_dbEscape($element->imageUrl) . "'";
+        $fontIcon = $element->fontIcon == null ? 'NULL' : "'" . hesk_dbEscape($element->fontIcon) . "'";
+        hesk_dbQuery("INSERT INTO `" . hesk_dbEscape($heskSettings['db_pfix']) . "custom_nav_element`
+            (`image_url`, `font_icon`, `place`) 
+            VALUES ({$imageUrl}, {$fontIcon}, " . intval($element->place) . ")");
+
+        $element->id = hesk_dbInsertID();
+
+
+        $languageTextAndSubtext = array();
+        foreach ($element->text as $key => $text) {
+            $languageTextAndSubtext[$key]['text'] = $text;
+        }
+        foreach ($element->subtext as $key => $subtext) {
+            $languageTextAndSubtext[$key]['subtext'] = $subtext;
+        }
+
+        foreach ($languageTextAndSubtext as $key => $values) {
+            $subtext = 'NULL';
+            if (isset($values['subtext'])) {
+                $subtext = "'" . hesk_dbEscape($values['subtext']) . "'";
+            }
+            hesk_dbQuery("INSERT INTO `" . hesk_dbEscape($heskSettings['db_pfix']) . "custom_nav_element_to_text`
+                (`nav_element_id`, `language`, `text`, `subtext`) VALUES (" . intval($element->id) . ", 
+                '" . hesk_dbEscape($key) . "',
+                '" . hesk_dbEscape($values['text']) . "', 
+                " . $subtext . ")");
+        }
+
+        $this->close();
+
+        return $element;
+    }
 }
\ No newline at end of file
diff --git a/api/index.php b/api/index.php
index 8c34cb35..9404b9c2 100644
--- a/api/index.php
+++ b/api/index.php
@@ -187,7 +187,9 @@ Link::all(array(
     // Resend email response
     '/v1-internal/staff/tickets/{i}/resend-email' => \Controllers\Tickets\ResendTicketEmailToCustomerController::class,
     // Custom Navigation
-    '/v1-internal/custom-navigation' => \Controllers\Navigation\CustomNavElementController::class . '::getAll',
+    '/v1-internal/custom-navigation/all' => \Controllers\Navigation\CustomNavElementController::class . '::getAll',
+    '/v1-internal/custom-navigation' => \Controllers\Navigation\CustomNavElementController::class,
+    '/v1-internal/custom-navigation/{i}' => \Controllers\Navigation\CustomNavElementController::class,
 
     // Any URL that doesn't match goes to the 404 handler
     '404' => 'handle404'

From 6b05ee31ab76e7cc53bd99c315bb0b34cfd98a94 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Fri, 12 May 2017 13:11:28 -0400
Subject: [PATCH 125/192] Working on incorporating the API into the page

---
 admin/manage_custom_nav_elements.php          | 128 ++++--------------
 api/Controllers/InternalApiController.php     |   7 +
 .../Navigation/CustomNavElementController.php |   2 +-
 internal-api/js/manage-custom-nav-elements.js |  50 +++++++
 4 files changed, 82 insertions(+), 105 deletions(-)
 create mode 100644 internal-api/js/manage-custom-nav-elements.js

diff --git a/admin/manage_custom_nav_elements.php b/admin/manage_custom_nav_elements.php
index d1d78ae5..7d06e59c 100644
--- a/admin/manage_custom_nav_elements.php
+++ b/admin/manage_custom_nav_elements.php
@@ -4,6 +4,7 @@ define('IN_SCRIPT', 1);
 define('HESK_PATH', '../');
 define('PAGE_TITLE', 'ADMIN_CUSTOM_NAV_ELEMENTS');
 define('MFH_PAGE_LAYOUT', 'TOP_ONLY');
+define('EXTRA_JS', '<script src="'.HESK_PATH.'internal-api/js/manage-custom-nav-elements.js"></script>');
 
 /* Get all the required files and functions */
 require(HESK_PATH . 'hesk_settings.inc.php');
@@ -18,12 +19,6 @@ hesk_isLoggedIn();
 
 //hesk_checkPermission('can_man_custom_nav');
 
-// Are we saving?
-if (isset($_POST['action'])) {
-    if ($_POST['action'] == 'save') {
-        save();
-    }
-}
 /* Print header */
 require_once(HESK_PATH . 'inc/headerAdmin.inc.php');
 
@@ -68,113 +63,38 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                                     <th>Actions</th>
                                 </tr>
                                 </thead>
-                                <tbody>
-                                <?php
-                                if (hesk_dbNumRows($customElementsRs) === 0) {
-                                    echo '<tr><td colspan="6">No custom navigation elements</td></tr>';
-                                }
+                                <tbody id="table-body">
 
-                                while ($row = hesk_dbFetchAssoc($customElementsRs)):
-                                    $localizedTextRs = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "custom_nav_element_to_text`
-                                        WHERE `nav_element_id` = " . intval($row['id']));
-                                    $languageText = array();
-                                    while ($textRow = hesk_dbFetchAssoc($localizedTextRs)) {
-                                        $languageText[$textRow['language']] = $textRow;
-                                    } ?>
-                                    <tr>
-                                        <td><?php echo $row['id']; ?></td>
-                                        <td>
-                                            <ul class="list-unstyled">
-                                                <?php foreach ($languageText as $key => $value): ?>
-                                                    <li>
-                                                        <b><?php echo $key; ?>: </b>
-                                                        <?php echo $value['text']; ?>
-                                                    </li>
-                                                <?php endforeach; ?>
-                                            </ul>
-                                        </td>
-                                        <td>
-                                            <ul class="list-unstyled">
-                                                <?php
-                                                if ($row['place'] == 0) {
-                                                    foreach ($languageText as $key => $value): ?>
-                                                        <li>
-                                                            <b><?php echo $key; ?>: </b>
-                                                            <?php echo $value['subtext']; ?>
-                                                        </li>
-                                                    <?php endforeach;
-                                                } else {
-                                                    echo '-';
-                                                } ?>
-                                            </ul>
-                                        </td>
-                                        <td>
-                                            <?php if ($row['image_url'] !== null) {
-                                                echo $row['image_url'];
-                                            } else {
-                                                echo '<i class="' . $row['font_icon'] . '"></i>';
-                                            } ?>
-                                        </td>
-                                        <td>
-                                            <?php if ($row['place'] == 0) {
-                                                echo 'Homepage - Block';
-                                            } elseif ($row['place'] == 1) {
-                                                echo 'Customer Navbar';
-                                            } elseif ($row['place'] == 2) {
-                                                echo 'Staff Navbar';
-                                            } else {
-                                                echo 'INVALID!!';
-                                            } ?>
-                                        </td>
-                                        <td>
-                                            <a href="manage_custom_nav_elements.php?edit=<?php echo $row['id'];?>">
-                                                <i class="fa fa-pencil icon-link orange"
-                                                 data-toggle="tooltip" title="<?php echo $hesklang['edit']; ?>"></i>
-                                            </a>
-                                            <a href="manage_custom_nav_elements.php?delete=<?php echo $row['id']; ?>">
-                                                <i class="fa fa-times icon-link red"
-                                                 data-toggle="tooltip" title="<?php echo $hesklang['delete']; ?>"></i>
-                                            </a>
-                                        </td>
-                                    </tr>
-                                <?php endwhile; ?>
                                 </tbody>
                             </table>
                         </div>
                     </div>
                 </div>
             </div>
-            <?php
-            if ($showEditPanel):
-                ?>
-                <div class="box">
-                    <div class="box-header with-border">
-                        <h1 class="box-title">
-                            Edit Custom Navigation Menu Element
-                        </h1>
-                        <div class="box-tools pull-right">
-                            <button type="button" class="btn btn-box-tool" data-widget="collapse">
-                                <i class="fa fa-minus"></i>
-                            </button>
-                        </div>
-                    </div>
-                    <div class="box-body">
-                        <form action="manage_custom_nav_elements.php" method="post">
-                        </form>
-                    </div>
-                </div>
-            <?php endif; ?>
         </section>
     </div>
-<section id="table-row-template" style="display: none">
-    <tr>
-        <td data-property="id"></td>
-        <td data-property="text"></td>
-        <td data-property="subtext"></td>
-        <td data-property="icon-url"></td>
-        <td data-property="place"></td>
-        <td data-property="action"></td>
+<p style="display: none" id="lang_edit"><?php echo $hesklang['edit']; ?></p>
+<p style="display: none" id="lang_delete"><?php echo $hesklang['delete']; ?></p>
+<script type="text/html" id="nav-element-template">
+    <tr id="nav-element-template">
+        <td><span data-property="id"></span></td>
+        <td><span>
+                <ul data-property="text" class="list-unstyled"></ul>
+            </span></td>
+        <td><span data-property="subtext"></span></td>
+        <td><span data-property="image-or-font"></span></td>
+        <td><span data-property="place"></span></td>
+        <td>
+            <a href="#" data-action="edit">
+                <i class="fa fa-pencil icon-link orange"
+                   data-toggle="tooltip" title="<?php echo $hesklang['edit']; ?>"></i>
+            </a>
+            <a href="#" data-action="delete">
+                <i class="fa fa-times icon-link red"
+                   data-toggle="tooltip" title="<?php echo $hesklang['delete']; ?>"></i>
+            </a>
+        </td>
     </tr>
-</section>
+</script>
 <?php
 require_once(HESK_PATH . 'inc/footer.inc.php');
\ No newline at end of file
diff --git a/api/Controllers/InternalApiController.php b/api/Controllers/InternalApiController.php
index 29d82642..c629e136 100644
--- a/api/Controllers/InternalApiController.php
+++ b/api/Controllers/InternalApiController.php
@@ -7,6 +7,13 @@ use BusinessLogic\Exceptions\InternalUseOnlyException;
 use BusinessLogic\Helpers;
 
 abstract class InternalApiController {
+    static function staticCheckForInternalUseOnly() {
+        $tokenHeader = Helpers::getHeader('X-AUTH-TOKEN');
+        if ($tokenHeader !== null && trim($tokenHeader) !== '') {
+            throw new InternalUseOnlyException();
+        }
+    }
+
     function checkForInternalUseOnly() {
         $tokenHeader = Helpers::getHeader('X-AUTH-TOKEN');
         if ($tokenHeader !== null && trim($tokenHeader) !== '') {
diff --git a/api/Controllers/Navigation/CustomNavElementController.php b/api/Controllers/Navigation/CustomNavElementController.php
index 2387e506..eb6ce217 100644
--- a/api/Controllers/Navigation/CustomNavElementController.php
+++ b/api/Controllers/Navigation/CustomNavElementController.php
@@ -13,7 +13,7 @@ class CustomNavElementController extends InternalApiController {
     static function getAll() {
         global $applicationContext, $hesk_settings;
 
-        self::checkForInternalUseOnly();
+        self::staticCheckForInternalUseOnly();
 
         /* @var $handler CustomNavElementHandler */
         $handler = $applicationContext->get[CustomNavElementHandler::class];
diff --git a/internal-api/js/manage-custom-nav-elements.js b/internal-api/js/manage-custom-nav-elements.js
new file mode 100644
index 00000000..24dd57cd
--- /dev/null
+++ b/internal-api/js/manage-custom-nav-elements.js
@@ -0,0 +1,50 @@
+$(document).ready(function() {
+    var heskUrl = $('#heskUrl').text();
+
+    var places = [];
+    places[1] = 'Homepage - Block';
+    places[2] = 'Customer Navigation';
+    places[3] = 'Staff Navigation';
+
+    $.ajax({
+        method: 'GET',
+        url: heskUrl + '/api/v1-internal/custom-navigation/all',
+        headers: { 'X-Internal-Call': true },
+        success: function(data) {
+            $.each(data, function() {
+                var $template = $($('#nav-element-template').html());
+                //var $template = $(template);
+                console.log($template);
+                $template.find('span[data-property="id"]').text(this.id);
+                if (this.imageUrl === null) {
+                    $template.find('span[data-property="image-or-font"]').html('<i class="' + escape(this.fontIcon) + '"></i>');
+                } else {
+                    $template.find('span[data-property="image-or-font"]').text(this.imageUrl);
+                }
+
+                $template.find('span[data-property="place"]').text(places[this.place]);
+
+                var text = '';
+                $.each(this.text, function(key, value) {
+                    text += '<li><b>' + escape(key) + ':</b> ' + escape(value) + '</li>';
+                });
+                $template.find('ul[data-property="text"]').html(text);
+
+                $.each(this.subtext, function() {
+                    console.log(this);
+                });
+
+                $('#table-body').append($template);
+            });
+        },
+        error: function(data) {
+            console.error(data);
+        }
+    });
+});
+
+function escape(str) {
+    var div = document.createElement('div');
+    div.appendChild(document.createTextNode(str));
+    return div.innerHTML;
+}
\ No newline at end of file

From 944552aba2e86c29f065dfcbdd2d44e075324c20 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sun, 14 May 2017 22:09:05 -0400
Subject: [PATCH 126/192] Slowly working on the edit nav item modal

---
 admin/manage_custom_nav_elements.php          | 183 ++++++++++++++----
 internal-api/js/manage-custom-nav-elements.js |  44 ++++-
 2 files changed, 178 insertions(+), 49 deletions(-)

diff --git a/admin/manage_custom_nav_elements.php b/admin/manage_custom_nav_elements.php
index 7d06e59c..8f8514af 100644
--- a/admin/manage_custom_nav_elements.php
+++ b/admin/manage_custom_nav_elements.php
@@ -25,54 +25,156 @@ require_once(HESK_PATH . 'inc/headerAdmin.inc.php');
 /* Print main manage users page */
 require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 ?>
-    <div class="content-wrapper">
-        <section class="content">
-            <div class="box">
-                <div class="box-header with-border">
-                    <h1 class="box-title">
-                        Custom Nav Menu Elements[!]
-                    </h1>
-                    <div class="box-tools pull-right">
-                        <button type="button" class="btn btn-box-tool" data-widget="collapse">
-                            <i class="fa fa-minus"></i>
-                        </button>
+<div class="content-wrapper">
+    <section class="content">
+        <div class="box">
+            <div class="box-header with-border">
+                <h1 class="box-title">
+                    Custom Nav Menu Elements[!]
+                </h1>
+                <div class="box-tools pull-right">
+                    <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                        <i class="fa fa-minus"></i>
+                    </button>
+                </div>
+            </div>
+            <div class="box-body">
+                <div class="row">
+                    <div class="col-md-12">
+                        <?php
+                        /* This will handle error, success and notice messages */
+                        hesk_handle_messages();
+
+                        $languages = array();
+                        foreach ($hesk_settings['languages'] as $key => $value) {
+                            $languages[$key] = $hesk_settings['languages'][$key]['folder'];
+                        }
+
+                        $customElementsRs = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "custom_nav_element`");
+                        ?>
+                        <table class="table table-default">
+                            <thead>
+                            <tr>
+                                <th>ID</th>
+                                <th>Text</th>
+                                <th>Subtext</th>
+                                <th>Image URL / Font Icon</th>
+                                <th>Place</th>
+                                <th>Actions</th>
+                            </tr>
+                            </thead>
+                            <tbody id="table-body">
+                            <tr id="loader">
+                                <td colspan="6">
+                                    <i class="fa fa-spinner fa-spin"></i> Loading Custom Nav Elements&hellip;
+                                </td>
+                            </tr>
+                            </tbody>
+                        </table>
                     </div>
                 </div>
-                <div class="box-body">
+            </div>
+        </div>
+    </section>
+</div>
+<div class="modal fade" id="nav-element-modal" tabindex="-1" role="dialog" style="overflow: hidden">
+    <div class="modal-dialog modal-lg" role="document">
+        <div class="modal-content">
+            <div class="modal-header" style="cursor: move">
+                <button type="button" class="close cancel-callback" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                <h4 class="modal-title" id="myModalLabel">
+                    <?php echo 'Edit Custom Nav Element'; ?>
+                </h4>
+            </div>
+            <form id="create-form" class="form-horizontal" data-toggle="validator">
+                <div class="modal-body">
                     <div class="row">
                         <div class="col-md-12">
-                            <?php
-                            /* This will handle error, success and notice messages */
-                            hesk_handle_messages();
-
-                            $languages = array();
-                            foreach ($hesk_settings['languages'] as $key => $value) {
-                                $languages[$key] = $hesk_settings['languages'][$key]['folder'];
-                            }
-
-                            $customElementsRs = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "custom_nav_element`");
-                            ?>
-                            <table class="table table-default">
-                                <thead>
-                                <tr>
-                                    <th>ID</th>
-                                    <th>Text</th>
-                                    <th>Subtext</th>
-                                    <th>Image URL / Font Icon</th>
-                                    <th>Place</th>
-                                    <th>Actions</th>
-                                </tr>
-                                </thead>
-                                <tbody id="table-body">
-
-                                </tbody>
-                            </table>
+                            <div class="form-group">
+                                <label for="place" class="col-md-4 col-sm-12 control-label">Place[!]</label>
+                                <div class="col-md-8 col-sm-12">
+                                    <select name="place" id="place" class="form-control">
+                                        <option value="1">Homepage - Block</option>
+                                        <option value="2">Customer Navbar</option>
+                                        <option value="3">Staff Navbar</option>
+                                    </select>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-md-6 col-sm-12">
+                            <h4>Text[!]</h4>
+                            <?php foreach ($hesk_settings['languages'] as $language => $value): ?>
+                                <div class="form-group">
+                                    <label for="text[<?php echo $language; ?>]" class="col-md-4 col-sm-12 control-label">
+                                        <?php echo $language; ?>
+                                    </label>
+                                    <div class="col-md-8 col-sm-12">
+                                        <input type="text" name="text[<?php echo $language; ?>]" class="form-control"
+                                               data-text-language="<?php echo $language; ?>"
+                                               id="text[<?php echo $language; ?>" placeholder="<?php echo $language; ?>">
+                                    </div>
+                                </div>
+                            <?php endforeach; ?>
+                            <div id="subtext">
+                                <h4>Subtext[!]</h4>
+                                <?php foreach ($hesk_settings['languages'] as $language => $value): ?>
+                                    <div class="form-group">
+                                        <label for="subtext[<?php echo $language; ?>]" class="col-md-4 col-sm-12 control-label">
+                                            <?php echo $language; ?>
+                                        </label>
+                                        <div class="col-md-8 col-sm-12">
+                                            <input type="text" name="subtext[<?php echo $language; ?>]" class="form-control"
+                                                   data-subtext-language="<?php echo $language; ?>"
+                                                   id="subtext[<?php echo $language; ?>" placeholder="<?php echo $language; ?>">
+                                        </div>
+                                    </div>
+                                <?php endforeach; ?>
+                            </div>
+                        </div>
+                        <div class="col-md-6 col-sm-12">
+                            <h4>Image[!]</h4>
+                            <div class="form-group">
+                                <label for="image-type" class="col-md-4 col-sm-12 control-label">Image Type[!]</label>
+                                <div class="col-md-8 col-sm-12">
+                                    <select name="image-type" id="image-type" class="form-control">
+                                        <option value="image-url">Image URL</option>
+                                        <option value="font-icon">Font Icon</option>
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="form-group" id="image-url-group">
+                                <label for="image-url" class="col-md-4 col-sm-12 control-label">Image URL [!]</label>
+                                <div class="col-md-8 col-sm-12">
+                                    <input type="text" class="form-control" placeholder="Image URL[!]">
+                                </div>
+                            </div>
+                            <div class="form-group" id="font-icon-group">
+                                <label for="font-icon" class="col-md-4 col-sm-12 control-label">Font Icon [!]</label>
+                                <div class="col-md-8 col-sm-12">
+                                    <span>Iconpicker</span>
+                                </div>
+                            </div>
                         </div>
                     </div>
                 </div>
-            </div>
-        </section>
+                <div class="modal-footer">
+                    <div class="btn-group">
+                        <button type="button" class="btn btn-default cancel-callback" data-dismiss="modal">
+                            <i class="fa fa-times-circle"></i>
+                            <span><?php echo $hesklang['cancel']; ?></span>
+                        </button>
+                        <button type="button" class="btn btn-success callback-btn">
+                            <i class="fa fa-check-circle"></i>
+                            <span><?php echo $hesklang['save']; ?></span>
+                        </button>
+                    </div>
+                </div>
+            </form>
+        </div>
     </div>
+</div>
 <p style="display: none" id="lang_edit"><?php echo $hesklang['edit']; ?></p>
 <p style="display: none" id="lang_delete"><?php echo $hesklang['delete']; ?></p>
 <script type="text/html" id="nav-element-template">
@@ -83,6 +185,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
             </span></td>
         <td><span data-property="subtext"></span></td>
         <td><span data-property="image-or-font"></span></td>
+        <td style="display: none"><span data-property="place-id"></span></td>
         <td><span data-property="place"></span></td>
         <td>
             <a href="#" data-action="edit">
diff --git a/internal-api/js/manage-custom-nav-elements.js b/internal-api/js/manage-custom-nav-elements.js
index 24dd57cd..957d5a47 100644
--- a/internal-api/js/manage-custom-nav-elements.js
+++ b/internal-api/js/manage-custom-nav-elements.js
@@ -1,10 +1,22 @@
 $(document).ready(function() {
-    var heskUrl = $('#heskUrl').text();
+    loadTable();
+
+    $(document).on('click', '[data-action="edit"]', function() {
+        var $tableRow = $(this).parent().parent();
+        var $modal = $('#nav-element-modal');
 
+        $modal.find('select[name="place"]').val($tableRow.find('[data-property="place-id"]').text());
+
+        $modal.modal('show');
+    })
+});
+
+function loadTable() {
+    var heskUrl = $('#heskUrl').text();
     var places = [];
     places[1] = 'Homepage - Block';
-    places[2] = 'Customer Navigation';
-    places[3] = 'Staff Navigation';
+    places[2] = 'Customer Navbar';
+    places[3] = 'Staff Navbar';
 
     $.ajax({
         method: 'GET',
@@ -13,8 +25,7 @@ $(document).ready(function() {
         success: function(data) {
             $.each(data, function() {
                 var $template = $($('#nav-element-template').html());
-                //var $template = $(template);
-                console.log($template);
+
                 $template.find('span[data-property="id"]').text(this.id);
                 if (this.imageUrl === null) {
                     $template.find('span[data-property="image-or-font"]').html('<i class="' + escape(this.fontIcon) + '"></i>');
@@ -23,6 +34,7 @@ $(document).ready(function() {
                 }
 
                 $template.find('span[data-property="place"]').text(places[this.place]);
+                $template.find('span[data-property="place-id"]').text(this.place);
 
                 var text = '';
                 $.each(this.text, function(key, value) {
@@ -30,21 +42,35 @@ $(document).ready(function() {
                 });
                 $template.find('ul[data-property="text"]').html(text);
 
-                $.each(this.subtext, function() {
-                    console.log(this);
-                });
+                var subtext = '-';
+                if (this.place == 1) {
+                    subtext = '';
+                    $.each(this.subtext, function(key, value) {
+                        subtext += '<li><b>' + escape(key) + ':</b> ' + escape(value) + '</li>';
+                    });
+                }
+                $template.find('ul[data-property="subtext"]').html(text);
 
                 $('#table-body').append($template);
             });
         },
         error: function(data) {
             console.error(data);
+        },
+        complete: function() {
+            $('#loader').hide();
         }
     });
-});
+}
 
 function escape(str) {
     var div = document.createElement('div');
     div.appendChild(document.createTextNode(str));
     return div.innerHTML;
+}
+
+function displayModal(element) {
+    var creatingElement = element === undefined;
+
+    var $form = $('#nav-element-modal').find('form');
 }
\ No newline at end of file

From 0eab3f16223a987bde1f9c97c754032b5298975f Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Mon, 15 May 2017 12:58:34 -0400
Subject: [PATCH 127/192] Modal working

---
 admin/manage_custom_nav_elements.php          | 13 ++++---
 internal-api/js/manage-custom-nav-elements.js | 35 ++++++++++++++++---
 2 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/admin/manage_custom_nav_elements.php b/admin/manage_custom_nav_elements.php
index 8f8514af..91bd30b8 100644
--- a/admin/manage_custom_nav_elements.php
+++ b/admin/manage_custom_nav_elements.php
@@ -111,7 +111,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                                         <?php echo $language; ?>
                                     </label>
                                     <div class="col-md-8 col-sm-12">
-                                        <input type="text" name="text[<?php echo $language; ?>]" class="form-control"
+                                        <input type="text" name="text[]" class="form-control"
                                                data-text-language="<?php echo $language; ?>"
                                                id="text[<?php echo $language; ?>" placeholder="<?php echo $language; ?>">
                                     </div>
@@ -125,7 +125,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                                             <?php echo $language; ?>
                                         </label>
                                         <div class="col-md-8 col-sm-12">
-                                            <input type="text" name="subtext[<?php echo $language; ?>]" class="form-control"
+                                            <input type="text" name="subtext[]" class="form-control"
                                                    data-subtext-language="<?php echo $language; ?>"
                                                    id="subtext[<?php echo $language; ?>" placeholder="<?php echo $language; ?>">
                                         </div>
@@ -147,13 +147,14 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                             <div class="form-group" id="image-url-group">
                                 <label for="image-url" class="col-md-4 col-sm-12 control-label">Image URL [!]</label>
                                 <div class="col-md-8 col-sm-12">
-                                    <input type="text" class="form-control" placeholder="Image URL[!]">
+                                    <input type="text" name="image-url" class="form-control" placeholder="Image URL[!]">
                                 </div>
                             </div>
                             <div class="form-group" id="font-icon-group">
                                 <label for="font-icon" class="col-md-4 col-sm-12 control-label">Font Icon [!]</label>
                                 <div class="col-md-8 col-sm-12">
-                                    <span>Iconpicker</span>
+                                    <div class="btn btn-default iconpicker-container" data-toggle="iconpicker">
+                                    </div>
                                 </div>
                             </div>
                         </div>
@@ -183,7 +184,9 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
         <td><span>
                 <ul data-property="text" class="list-unstyled"></ul>
             </span></td>
-        <td><span data-property="subtext"></span></td>
+        <td><span>
+                <ul data-property="subtext" class="list-unstyled"></ul>
+            </span></td>
         <td><span data-property="image-or-font"></span></td>
         <td style="display: none"><span data-property="place-id"></span></td>
         <td><span data-property="place"></span></td>
diff --git a/internal-api/js/manage-custom-nav-elements.js b/internal-api/js/manage-custom-nav-elements.js
index 957d5a47..d8a44813 100644
--- a/internal-api/js/manage-custom-nav-elements.js
+++ b/internal-api/js/manage-custom-nav-elements.js
@@ -1,11 +1,36 @@
+var elements = [];
+
 $(document).ready(function() {
     loadTable();
 
     $(document).on('click', '[data-action="edit"]', function() {
-        var $tableRow = $(this).parent().parent();
+        var element = elements[$(this).parent().parent().find('[data-property="id"]').text()];
+        console.log(element);
         var $modal = $('#nav-element-modal');
 
-        $modal.find('select[name="place"]').val($tableRow.find('[data-property="place-id"]').text());
+        $modal.find('select[name="place"]').val(element.place).text();
+        var $textLanguages = $modal.find('[data-text-language]');
+        $.each($textLanguages, function() {
+            var language = $(this).data('text-language');
+
+            $(this).val(element.text[language]);
+        });
+
+        var $subtextLanguages = $modal.find('[data-subtext-language]');
+        $.each($subtextLanguages, function() {
+            var language = $(this).data('subtext-language');
+
+            $(this).val(element.subtext[language]);
+        });
+
+        if (element.imageUrl !== null) {
+            $modal.find('select[name="image-type"]').val('image-url');
+            $modal.find('input[name="image-url"]').val(element.imageUrl);
+        } else {
+            $modal.find('select[name="image-type"]').val('font-icon');
+            $('[data-toggle="iconpicker"]').iconpicker('setIcon', element.fontIcon);
+        }
+
 
         $modal.modal('show');
     })
@@ -43,15 +68,17 @@ function loadTable() {
                 $template.find('ul[data-property="text"]').html(text);
 
                 var subtext = '-';
-                if (this.place == 1) {
+                if (this.place === 1) {
                     subtext = '';
                     $.each(this.subtext, function(key, value) {
                         subtext += '<li><b>' + escape(key) + ':</b> ' + escape(value) + '</li>';
                     });
                 }
-                $template.find('ul[data-property="subtext"]').html(text);
+                $template.find('ul[data-property="subtext"]').html(subtext);
 
                 $('#table-body').append($template);
+
+                elements[this.id] = this;
             });
         },
         error: function(data) {

From 0418ff76ad071ed737bde67892995fbdd339affe Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Mon, 15 May 2017 22:04:32 -0400
Subject: [PATCH 128/192] Some more changes.... these are fantastic commit
 messages!

---
 internal-api/js/manage-custom-nav-elements.js | 86 ++++++++++++-------
 1 file changed, 57 insertions(+), 29 deletions(-)

diff --git a/internal-api/js/manage-custom-nav-elements.js b/internal-api/js/manage-custom-nav-elements.js
index d8a44813..8823d87d 100644
--- a/internal-api/js/manage-custom-nav-elements.js
+++ b/internal-api/js/manage-custom-nav-elements.js
@@ -2,37 +2,28 @@ var elements = [];
 
 $(document).ready(function() {
     loadTable();
+    bindEditModal();
 
-    $(document).on('click', '[data-action="edit"]', function() {
-        var element = elements[$(this).parent().parent().find('[data-property="id"]').text()];
-        console.log(element);
-        var $modal = $('#nav-element-modal');
-
-        $modal.find('select[name="place"]').val(element.place).text();
-        var $textLanguages = $modal.find('[data-text-language]');
-        $.each($textLanguages, function() {
-            var language = $(this).data('text-language');
-
-            $(this).val(element.text[language]);
-        });
-
-        var $subtextLanguages = $modal.find('[data-subtext-language]');
-        $.each($subtextLanguages, function() {
-            var language = $(this).data('subtext-language');
-
-            $(this).val(element.subtext[language]);
-        });
-
-        if (element.imageUrl !== null) {
-            $modal.find('select[name="image-type"]').val('image-url');
-            $modal.find('input[name="image-url"]').val(element.imageUrl);
+    $('select[name="place"]').change(function() {
+        var $subtextField = $('#subtext');
+        if (parseInt($(this).val()) === 1) {
+            $subtextField.show();
         } else {
-            $modal.find('select[name="image-type"]').val('font-icon');
-            $('[data-toggle="iconpicker"]').iconpicker('setIcon', element.fontIcon);
+            $subtextField.hide();
         }
+    });
 
+    $('select[name="image-type"]').change(function() {
+        var $imageUrl = $('#image-url-group');
+        var $fontIcon = $('#font-icon-group');
 
-        $modal.modal('show');
+        if ($(this).val() === 'image-url') {
+            $imageUrl.show();
+            $fontIcon.hide();
+        } else {
+            $imageUrl.hide();
+            $fontIcon.show();
+        }
     })
 });
 
@@ -96,8 +87,45 @@ function escape(str) {
     return div.innerHTML;
 }
 
-function displayModal(element) {
-    var creatingElement = element === undefined;
+function bindEditModal() {
+    $(document).on('click', '[data-action="edit"]', function() {
+        var element = elements[$(this).parent().parent().find('[data-property="id"]').text()];
+        var $modal = $('#nav-element-modal');
+
+        $modal.find('select[name="place"]').val(element.place).text();
+        var $textLanguages = $modal.find('[data-text-language]');
+        $.each($textLanguages, function() {
+            var language = $(this).data('text-language');
+
+            $(this).val(element.text[language]);
+        });
+
+        var $subtextLanguages = $modal.find('[data-subtext-language]');
+        $.each($subtextLanguages, function() {
+            var language = $(this).data('subtext-language');
+
+            $(this).val(element.subtext[language]);
+        });
+
+        if (this.place === 1) {
+            $('#subtext').show();
+        } else {
+            $('#subtext').hide();
+        }
 
-    var $form = $('#nav-element-modal').find('form');
+        if (element.imageUrl !== null) {
+            $modal.find('select[name="image-type"]').val('image-url');
+            $modal.find('input[name="image-url"]').val(element.imageUrl);
+            $modal.find('#font-icon-group').hide();
+            $modal.find('#image-url-group').show();
+        } else {
+            $modal.find('select[name="image-type"]').val('font-icon');
+            $('[data-toggle="iconpicker"]').iconpicker('setIcon', element.fontIcon);
+            $modal.find('#font-icon-group').show();
+            $modal.find('#image-url-group').hide();
+        }
+
+
+        $modal.modal('show');
+    });
 }
\ No newline at end of file

From a139c7d3513302fafd908525b1d7752d1c011691 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Tue, 16 May 2017 13:00:41 -0400
Subject: [PATCH 129/192] Working on save functionality

---
 admin/manage_custom_nav_elements.php          | 37 +++++++++----
 internal-api/js/manage-custom-nav-elements.js | 55 ++++++++++++++++++-
 2 files changed, 79 insertions(+), 13 deletions(-)

diff --git a/admin/manage_custom_nav_elements.php b/admin/manage_custom_nav_elements.php
index 91bd30b8..5449886a 100644
--- a/admin/manage_custom_nav_elements.php
+++ b/admin/manage_custom_nav_elements.php
@@ -83,17 +83,20 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
             <div class="modal-header" style="cursor: move">
                 <button type="button" class="close cancel-callback" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
                 <h4 class="modal-title" id="myModalLabel">
-                    <?php echo 'Edit Custom Nav Element'; ?>
+                    <?php echo 'Edit Custom Nav Element[!]'; ?>
                 </h4>
             </div>
-            <form id="create-form" class="form-horizontal" data-toggle="validator">
+            <form id="manage-nav-element" class="form-horizontal" data-toggle="validator">
+                <input type="hidden" name="id">
                 <div class="modal-body">
                     <div class="row">
                         <div class="col-md-12">
                             <div class="form-group">
                                 <label for="place" class="col-md-4 col-sm-12 control-label">Place[!]</label>
                                 <div class="col-md-8 col-sm-12">
-                                    <select name="place" id="place" class="form-control">
+                                    <select name="place" id="place" class="form-control"
+                                            data-error="<?php echo htmlspecialchars($hesklang['this_field_is_required']); ?>"
+                                            required>
                                         <option value="1">Homepage - Block</option>
                                         <option value="2">Customer Navbar</option>
                                         <option value="3">Staff Navbar</option>
@@ -111,9 +114,11 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                                         <?php echo $language; ?>
                                     </label>
                                     <div class="col-md-8 col-sm-12">
-                                        <input type="text" name="text[]" class="form-control"
+                                        <input type="text" name="text" class="form-control"
                                                data-text-language="<?php echo $language; ?>"
-                                               id="text[<?php echo $language; ?>" placeholder="<?php echo $language; ?>">
+                                               id="text[<?php echo $language; ?>" placeholder="<?php echo $language; ?>"
+                                               data-error="<?php echo htmlspecialchars($hesklang['this_field_is_required']); ?>"
+                                               required>
                                     </div>
                                 </div>
                             <?php endforeach; ?>
@@ -125,9 +130,11 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                                             <?php echo $language; ?>
                                         </label>
                                         <div class="col-md-8 col-sm-12">
-                                            <input type="text" name="subtext[]" class="form-control"
+                                            <input type="text" name="subtext" class="form-control"
                                                    data-subtext-language="<?php echo $language; ?>"
-                                                   id="subtext[<?php echo $language; ?>" placeholder="<?php echo $language; ?>">
+                                                   id="subtext[<?php echo $language; ?>" placeholder="<?php echo $language; ?>"
+                                                   data-error="<?php echo htmlspecialchars($hesklang['this_field_is_required']); ?>"
+                                                   required>
                                         </div>
                                     </div>
                                 <?php endforeach; ?>
@@ -138,7 +145,9 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                             <div class="form-group">
                                 <label for="image-type" class="col-md-4 col-sm-12 control-label">Image Type[!]</label>
                                 <div class="col-md-8 col-sm-12">
-                                    <select name="image-type" id="image-type" class="form-control">
+                                    <select name="image-type" id="image-type" class="form-control"
+                                            data-error="<?php echo htmlspecialchars($hesklang['this_field_is_required']); ?>"
+                                            required>
                                         <option value="image-url">Image URL</option>
                                         <option value="font-icon">Font Icon</option>
                                     </select>
@@ -151,9 +160,15 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                                 </div>
                             </div>
                             <div class="form-group" id="font-icon-group">
+                                <p style="display:none" id="no-icon"><?php echo $hesklang['sm_no_icon']; ?></p>
+
+                                <p style="display:none" id="search-icon"><?php echo $hesklang['sm_search_icon']; ?></p>
+
+                                <p style="display:none"
+                                   id="footer-icon"><?php echo $hesklang['sm_iconpicker_footer_label']; ?></p>
                                 <label for="font-icon" class="col-md-4 col-sm-12 control-label">Font Icon [!]</label>
                                 <div class="col-md-8 col-sm-12">
-                                    <div class="btn btn-default iconpicker-container" data-toggle="iconpicker">
+                                    <div class="btn btn-default iconpicker-container" data-toggle="nav-iconpicker">
                                     </div>
                                 </div>
                             </div>
@@ -162,11 +177,11 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                 </div>
                 <div class="modal-footer">
                     <div class="btn-group">
-                        <button type="button" class="btn btn-default cancel-callback" data-dismiss="modal">
+                        <button type="button" class="btn btn-default cancel-button" data-dismiss="modal">
                             <i class="fa fa-times-circle"></i>
                             <span><?php echo $hesklang['cancel']; ?></span>
                         </button>
-                        <button type="button" class="btn btn-success callback-btn">
+                        <button type="submit" class="btn btn-success save-button">
                             <i class="fa fa-check-circle"></i>
                             <span><?php echo $hesklang['save']; ?></span>
                         </button>
diff --git a/internal-api/js/manage-custom-nav-elements.js b/internal-api/js/manage-custom-nav-elements.js
index 8823d87d..ccb688f9 100644
--- a/internal-api/js/manage-custom-nav-elements.js
+++ b/internal-api/js/manage-custom-nav-elements.js
@@ -4,6 +4,16 @@ $(document).ready(function() {
     loadTable();
     bindEditModal();
 
+    $('[data-toggle="nav-iconpicker"]').iconpicker({
+        iconset: ['fontawesome', 'octicon'],
+        selectedClass: "btn-warning",
+        labelNoIcon: $('#no-icon').text(),
+        searchText: $('#search-icon').text(),
+        labelFooter: $('#footer-icon').text(),
+        resetButton: false,
+        icon: 'fa fa-adn'
+    });
+
     $('select[name="place"]').change(function() {
         var $subtextField = $('#subtext');
         if (parseInt($(this).val()) === 1) {
@@ -24,7 +34,47 @@ $(document).ready(function() {
             $imageUrl.hide();
             $fontIcon.show();
         }
-    })
+    });
+
+    $('form#manage-nav-element').submit(function(e) {
+        e.preventDefault();
+
+        var $modal = $('#nav-element-modal');
+
+        var place = parseInt($modal.find('select[name="place"]').val());
+
+        var $textLanguages = $modal.find('[data-text-language]');
+        var text = {};
+        $.each($textLanguages, function() {
+            text[$(this).data('text-language')] = $(this).val();
+        });
+
+        var subtext = {};
+        if (place === 1) {
+            var $subtextLanguages = $modal.find('[data-subtext-language]');
+            $.each($subtextLanguages, function() {
+                subtext[$(this).data('subtext-language')] = $(this).val();
+            });
+        }
+
+        var imageUrl = null;
+        var fontIcon = null;
+        if ($modal.find('select[name="image-type"]').val() === 'image-url') {
+            imageUrl = $modal.find('input[name="image-url"]').val();
+        } else {
+            fontIcon = $modal.find('.iconpicker').find('input[type="hidden"]').val();
+        }
+
+        var data = {
+            place: place,
+            text: text,
+            subtext: subtext,
+            imageUrl: imageUrl,
+            fontIcon: fontIcon
+        };
+
+        console.log(data);
+    });
 });
 
 function loadTable() {
@@ -92,7 +142,8 @@ function bindEditModal() {
         var element = elements[$(this).parent().parent().find('[data-property="id"]').text()];
         var $modal = $('#nav-element-modal');
 
-        $modal.find('select[name="place"]').val(element.place).text();
+        $modal.find('select[name="place"]').val(element.place);
+        $modal.find('input[name="id"]').val(element.id);
         var $textLanguages = $modal.find('[data-text-language]');
         $.each($textLanguages, function() {
             var language = $(this).data('text-language');

From 8682bd236eab9035d1fb644c7618f94c1740bdbc Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Wed, 17 May 2017 22:03:05 -0400
Subject: [PATCH 130/192] New elements can be created, existing elements can be
 edited

---
 admin/manage_custom_nav_elements.php          | 25 ++++---
 internal-api/js/manage-custom-nav-elements.js | 67 ++++++++++++++++++-
 2 files changed, 76 insertions(+), 16 deletions(-)

diff --git a/admin/manage_custom_nav_elements.php b/admin/manage_custom_nav_elements.php
index 5449886a..f8486317 100644
--- a/admin/manage_custom_nav_elements.php
+++ b/admin/manage_custom_nav_elements.php
@@ -40,18 +40,10 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
             </div>
             <div class="box-body">
                 <div class="row">
+                    <div class="col-md-12 text-right">
+                        <button id="create-button" class="btn btn-success">Create New Element [!]</button>
+                    </div>
                     <div class="col-md-12">
-                        <?php
-                        /* This will handle error, success and notice messages */
-                        hesk_handle_messages();
-
-                        $languages = array();
-                        foreach ($hesk_settings['languages'] as $key => $value) {
-                            $languages[$key] = $hesk_settings['languages'][$key]['folder'];
-                        }
-
-                        $customElementsRs = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "custom_nav_element`");
-                        ?>
                         <table class="table table-default">
                             <thead>
                             <tr>
@@ -101,6 +93,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                                         <option value="2">Customer Navbar</option>
                                         <option value="3">Staff Navbar</option>
                                     </select>
+                                    <div class="help-block with-errors"></div>
                                 </div>
                             </div>
                         </div>
@@ -119,6 +112,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                                                id="text[<?php echo $language; ?>" placeholder="<?php echo $language; ?>"
                                                data-error="<?php echo htmlspecialchars($hesklang['this_field_is_required']); ?>"
                                                required>
+                                        <div class="help-block with-errors"></div>
                                     </div>
                                 </div>
                             <?php endforeach; ?>
@@ -135,6 +129,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                                                    id="subtext[<?php echo $language; ?>" placeholder="<?php echo $language; ?>"
                                                    data-error="<?php echo htmlspecialchars($hesklang['this_field_is_required']); ?>"
                                                    required>
+                                            <div class="help-block with-errors"></div>
                                         </div>
                                     </div>
                                 <?php endforeach; ?>
@@ -151,12 +146,16 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                                         <option value="image-url">Image URL</option>
                                         <option value="font-icon">Font Icon</option>
                                     </select>
+                                    <div class="help-block with-errors"></div>
                                 </div>
                             </div>
                             <div class="form-group" id="image-url-group">
                                 <label for="image-url" class="col-md-4 col-sm-12 control-label">Image URL [!]</label>
                                 <div class="col-md-8 col-sm-12">
-                                    <input type="text" name="image-url" class="form-control" placeholder="Image URL[!]">
+                                    <input type="text" name="image-url" class="form-control"
+                                           data-error="<?php echo htmlspecialchars($hesklang['this_field_is_required']); ?>"
+                                           placeholder="Image URL[!]" required>
+                                    <div class="help-block with-errors"></div>
                                 </div>
                             </div>
                             <div class="form-group" id="font-icon-group">
@@ -194,7 +193,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 <p style="display: none" id="lang_edit"><?php echo $hesklang['edit']; ?></p>
 <p style="display: none" id="lang_delete"><?php echo $hesklang['delete']; ?></p>
 <script type="text/html" id="nav-element-template">
-    <tr id="nav-element-template">
+    <tr>
         <td><span data-property="id"></span></td>
         <td><span>
                 <ul data-property="text" class="list-unstyled"></ul>
diff --git a/internal-api/js/manage-custom-nav-elements.js b/internal-api/js/manage-custom-nav-elements.js
index ccb688f9..724ff804 100644
--- a/internal-api/js/manage-custom-nav-elements.js
+++ b/internal-api/js/manage-custom-nav-elements.js
@@ -3,6 +3,7 @@ var elements = [];
 $(document).ready(function() {
     loadTable();
     bindEditModal();
+    bindCreateModal();
 
     $('[data-toggle="nav-iconpicker"]').iconpicker({
         iconset: ['fontawesome', 'octicon'],
@@ -38,6 +39,7 @@ $(document).ready(function() {
 
     $('form#manage-nav-element').submit(function(e) {
         e.preventDefault();
+        var heskUrl = $('#heskUrl').text();
 
         var $modal = $('#nav-element-modal');
 
@@ -65,6 +67,8 @@ $(document).ready(function() {
             fontIcon = $modal.find('.iconpicker').find('input[type="hidden"]').val();
         }
 
+        var id = parseInt($modal.find('input[name="id"]').val());
+
         var data = {
             place: place,
             text: text,
@@ -73,11 +77,30 @@ $(document).ready(function() {
             fontIcon: fontIcon
         };
 
-        console.log(data);
+        var url = heskUrl + '/api/v1-internal/custom-navigation/';
+        var method = 'POST';
+
+        if (id !== -1) {
+            url += id;
+            method = 'PUT';
+        }
+
+        $.ajax({
+            method: method,
+            url: url,
+            headers: { 'X-Internal-Call': true },
+            data: JSON.stringify(data),
+            success: function(data) {
+                loadTable($modal);
+            },
+            error: function(data) {
+                console.error(data);
+            }
+        });
     });
 });
 
-function loadTable() {
+function loadTable(modalToClose) {
     var heskUrl = $('#heskUrl').text();
     var places = [];
     places[1] = 'Homepage - Block';
@@ -89,6 +112,9 @@ function loadTable() {
         url: heskUrl + '/api/v1-internal/custom-navigation/all',
         headers: { 'X-Internal-Call': true },
         success: function(data) {
+            $('#table-body').html('');
+            elements = [];
+
             $.each(data, function() {
                 var $template = $($('#nav-element-template').html());
 
@@ -117,10 +143,15 @@ function loadTable() {
                 }
                 $template.find('ul[data-property="subtext"]').html(subtext);
 
+                console.log($template);
                 $('#table-body').append($template);
 
                 elements[this.id] = this;
             });
+
+            if (modalToClose !== undefined) {
+                modalToClose.modal('hide');
+            }
         },
         error: function(data) {
             console.error(data);
@@ -158,7 +189,7 @@ function bindEditModal() {
             $(this).val(element.subtext[language]);
         });
 
-        if (this.place === 1) {
+        if (element.place === 1) {
             $('#subtext').show();
         } else {
             $('#subtext').hide();
@@ -177,6 +208,36 @@ function bindEditModal() {
         }
 
 
+        $modal.modal('show');
+    });
+}
+
+function bindCreateModal() {
+    $('#create-button').click(function() {
+        var $modal = $('#nav-element-modal');
+        $modal.find('select[name="place"]').val(1);
+        $modal.find('input[name="id"]').val(-1);
+        var $textLanguages = $modal.find('[data-text-language]');
+        $.each($textLanguages, function() {
+            var language = $(this).data('text-language');
+
+            $(this).val('');
+        });
+
+        var $subtextLanguages = $modal.find('[data-subtext-language]');
+        $.each($subtextLanguages, function() {
+            var language = $(this).data('subtext-language');
+
+            $(this).val('');
+        });
+
+        $('#subtext').show();
+
+        $modal.find('select[name="image-type"]').val('image-url');
+        $modal.find('input[name="image-url"]').val('');
+        $modal.find('#font-icon-group').hide();
+        $modal.find('#image-url-group').show();
+
         $modal.modal('show');
     });
 }
\ No newline at end of file

From 5cdd216cdbe9a9d6de1b773dab8dddab7ac3e0e9 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Thu, 18 May 2017 22:10:10 -0400
Subject: [PATCH 131/192] Elements can be deleted, add overlay during AJAX
 operations

---
 admin/manage_custom_nav_elements.php          |  8 +++---
 css/colors.css                                |  4 +++
 internal-api/js/manage-custom-nav-elements.js | 26 +++++++++++++++++--
 3 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/admin/manage_custom_nav_elements.php b/admin/manage_custom_nav_elements.php
index f8486317..598695ca 100644
--- a/admin/manage_custom_nav_elements.php
+++ b/admin/manage_custom_nav_elements.php
@@ -56,16 +56,14 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                             </tr>
                             </thead>
                             <tbody id="table-body">
-                            <tr id="loader">
-                                <td colspan="6">
-                                    <i class="fa fa-spinner fa-spin"></i> Loading Custom Nav Elements&hellip;
-                                </td>
-                            </tr>
                             </tbody>
                         </table>
                     </div>
                 </div>
             </div>
+            <div class="overlay" id="overlay">
+                <i class="fa fa-spinner fa-spin"></i>
+            </div>
         </div>
     </section>
 </div>
diff --git a/css/colors.css b/css/colors.css
index 1062549e..6dfae0a4 100644
--- a/css/colors.css
+++ b/css/colors.css
@@ -2,6 +2,10 @@
     color: #fff;
 }
 
+.black {
+    color: #000;
+}
+
 .red,
 .important,
 .critical-priority {
diff --git a/internal-api/js/manage-custom-nav-elements.js b/internal-api/js/manage-custom-nav-elements.js
index 724ff804..a0c92c0c 100644
--- a/internal-api/js/manage-custom-nav-elements.js
+++ b/internal-api/js/manage-custom-nav-elements.js
@@ -4,6 +4,7 @@ $(document).ready(function() {
     loadTable();
     bindEditModal();
     bindCreateModal();
+    bindDeleteButton();
 
     $('[data-toggle="nav-iconpicker"]').iconpicker({
         iconset: ['fontawesome', 'octicon'],
@@ -143,7 +144,6 @@ function loadTable(modalToClose) {
                 }
                 $template.find('ul[data-property="subtext"]').html(subtext);
 
-                console.log($template);
                 $('#table-body').append($template);
 
                 elements[this.id] = this;
@@ -157,7 +157,7 @@ function loadTable(modalToClose) {
             console.error(data);
         },
         complete: function() {
-            $('#loader').hide();
+            $('#overlay').hide();
         }
     });
 }
@@ -240,4 +240,26 @@ function bindCreateModal() {
 
         $modal.modal('show');
     });
+}
+
+function bindDeleteButton() {
+    $(document).on('click', '[data-action="delete"]', function() {
+        $('#overlay').show();
+
+        var heskUrl = $('#heskUrl').text();
+        var element = elements[$(this).parent().parent().find('[data-property="id"]').text()];
+
+        $.ajax({
+            method: 'DELETE',
+            url: heskUrl + '/api/v1-internal/custom-navigation/' + element.id,
+            headers: { 'X-Internal-Call': true },
+            success: function() {
+                console.log('DELETED!');
+                loadTable();
+            },
+            error: function(data) {
+                console.error(data);
+            }
+        });
+    });
 }
\ No newline at end of file

From 25922d99f38e9333065430bfce40b914fc932403 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Fri, 19 May 2017 12:52:47 -0400
Subject: [PATCH 132/192] Separate each type, add a sort value to reorder them

---
 admin/manage_custom_nav_elements.php          |  3 +-
 .../Navigation/CustomNavElementGateway.php    |  3 +-
 install/mods-for-hesk/sql/installSql.php      |  3 +-
 internal-api/js/manage-custom-nav-elements.js | 32 +++++++++++++++++++
 language/en/text.php                          |  1 +
 5 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/admin/manage_custom_nav_elements.php b/admin/manage_custom_nav_elements.php
index 598695ca..15e3b62d 100644
--- a/admin/manage_custom_nav_elements.php
+++ b/admin/manage_custom_nav_elements.php
@@ -44,7 +44,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                         <button id="create-button" class="btn btn-success">Create New Element [!]</button>
                     </div>
                     <div class="col-md-12">
-                        <table class="table table-default">
+                        <table class="table table-striped">
                             <thead>
                             <tr>
                                 <th>ID</th>
@@ -190,6 +190,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 </div>
 <p style="display: none" id="lang_edit"><?php echo $hesklang['edit']; ?></p>
 <p style="display: none" id="lang_delete"><?php echo $hesklang['delete']; ?></p>
+<p style="display: none" id="lang_no_custom_nav_elements_found"><?php echo $hesklang['no_custom_nav_elements_found']; ?></p>
 <script type="text/html" id="nav-element-template">
     <tr>
         <td><span data-property="id"></span></td>
diff --git a/api/DataAccess/Navigation/CustomNavElementGateway.php b/api/DataAccess/Navigation/CustomNavElementGateway.php
index 77671891..56981b89 100644
--- a/api/DataAccess/Navigation/CustomNavElementGateway.php
+++ b/api/DataAccess/Navigation/CustomNavElementGateway.php
@@ -14,7 +14,8 @@ class CustomNavElementGateway extends CommonDao {
 
         $rs = hesk_dbQuery("SELECT {$columns} FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "custom_nav_element` AS `t1`
             INNER JOIN `" . hesk_dbEscape($heskSettings['db_pfix']) . "custom_nav_element_to_text` AS `t2`
-                ON `t1`.`id` = `t2`.`nav_element_id`");
+                ON `t1`.`id` = `t2`.`nav_element_id`
+            ORDER BY `t1`.`place` ASC, `t1`.`sort` ASC");
 
         $elements = array();
 
diff --git a/install/mods-for-hesk/sql/installSql.php b/install/mods-for-hesk/sql/installSql.php
index 43e3e21d..93dee04f 100644
--- a/install/mods-for-hesk/sql/installSql.php
+++ b/install/mods-for-hesk/sql/installSql.php
@@ -997,7 +997,8 @@ function execute310Scripts() {
         (id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
          image_url TEXT,
          font_icon VARCHAR(200),
-         place INT NOT NULL)");
+         place INT NOT NULL,
+         sort INT NOT NULL)");
     executeQuery("CREATE TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "custom_nav_element_to_text`
         (id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
          nav_element_id INT NOT NULL,
diff --git a/internal-api/js/manage-custom-nav-elements.js b/internal-api/js/manage-custom-nav-elements.js
index a0c92c0c..0278f81c 100644
--- a/internal-api/js/manage-custom-nav-elements.js
+++ b/internal-api/js/manage-custom-nav-elements.js
@@ -103,6 +103,7 @@ $(document).ready(function() {
 
 function loadTable(modalToClose) {
     var heskUrl = $('#heskUrl').text();
+    var notFoundText = $('#lang_no_custom_nav_elements_found').text();
     var places = [];
     places[1] = 'Homepage - Block';
     places[2] = 'Customer Navbar';
@@ -116,7 +117,26 @@ function loadTable(modalToClose) {
             $('#table-body').html('');
             elements = [];
 
+            if (data.length === 0) {
+                $('#table-body').append('<tr><td colspan="6">' + notFoundText + '</td></tr>');
+                return;
+            }
+
+            $('#table-body').append('<tr><td colspan="6" class="bg-gray"><i><b>' + places[1] + '</b></i></td></tr>');
+            var currentPlace = 1;
+            var addedElementToPlace = false;
             $.each(data, function() {
+                if (this.place !== currentPlace) {
+                    if (!addedElementToPlace) {
+                        $('#table-body').append('<tr><td colspan="6">' + notFoundText + '</td></tr>');
+                    }
+
+                    $('#table-body').append('<tr><td colspan="6" class="bg-gray"><i><b>' + places[this.place] + '</b></i></td></tr>');
+                    currentPlace = this.place;
+                    console.log(this);
+                    addedElementToPlace = false;
+                }
+
                 var $template = $($('#nav-element-template').html());
 
                 $template.find('span[data-property="id"]').text(this.id);
@@ -147,8 +167,20 @@ function loadTable(modalToClose) {
                 $('#table-body').append($template);
 
                 elements[this.id] = this;
+
+                addedElementToPlace = true;
             });
 
+            //-- Add missing headers if no elements are in them
+            if (currentPlace === 1) {
+                $('#table-body').append('<tr><td colspan="6" class="bg-gray"><i><b>' + places[2] + '</b></i></td></tr>');
+                $('#table-body').append('<tr><td colspan="6">' + notFoundText + '</td></tr>');
+            }
+            if (currentPlace === 2) {
+                $('#table-body').append('<tr><td colspan="6" class="bg-gray"><i><b>' + places[3] + '</b></i></td></tr>');
+                $('#table-body').append('<tr><td colspan="6">' + notFoundText + '</td></tr>');
+            }
+
             if (modalToClose !== undefined) {
                 modalToClose.modal('hide');
             }
diff --git a/language/en/text.php b/language/en/text.php
index 6a03a541..77c69ffb 100644
--- a/language/en/text.php
+++ b/language/en/text.php
@@ -53,6 +53,7 @@ $hesklang['email_notification_sent'] = 'Email notification sent!';
 $hesklang['email_notification_resend_failed'] = 'Error occurred when trying to send notification email.';
 $hesklang['edit_category'] = 'Edit Category';
 $hesklang['custom_nav_element_deleted'] = 'Custom Navigation Element Deleted!';
+$hesklang['no_custom_nav_elements_found'] = 'No custom nav menu elements found';
 
 // ADDED OR MODIFIED IN Mods for HESK 3.0.0
 $hesklang['you_have_x_messages'] = 'You have %s new %s'; // %s: Number of new messages, "message" or "messages", depending on # 

From add02b208df9b268bfab20b4e3ed7f9122df1596 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Fri, 19 May 2017 22:08:50 -0400
Subject: [PATCH 133/192] Add endpoints for re-ordering elements, add arrows to
 page

---
 admin/manage_custom_nav_elements.php          | 21 ++++++++++----
 .../Navigation/CustomNavElement.php           |  6 ++++
 .../Navigation/CustomNavElementHandler.php    | 20 ++++++++++++-
 .../Navigation/CustomNavElementController.php | 13 +++++++++
 .../Navigation/CustomNavElementGateway.php    | 28 +++++++++++++++++--
 api/index.php                                 |  1 +
 install/mods-for-hesk/sql/installSql.php      |  1 +
 internal-api/js/manage-custom-nav-elements.js | 27 ++++++++++++++++--
 8 files changed, 105 insertions(+), 12 deletions(-)

diff --git a/admin/manage_custom_nav_elements.php b/admin/manage_custom_nav_elements.php
index 15e3b62d..3fd46f26 100644
--- a/admin/manage_custom_nav_elements.php
+++ b/admin/manage_custom_nav_elements.php
@@ -51,7 +51,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                                 <th>Text</th>
                                 <th>Subtext</th>
                                 <th>Image URL / Font Icon</th>
-                                <th>Place</th>
+                                <th>URL</th>
                                 <th>Actions</th>
                             </tr>
                             </thead>
@@ -193,7 +193,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 <p style="display: none" id="lang_no_custom_nav_elements_found"><?php echo $hesklang['no_custom_nav_elements_found']; ?></p>
 <script type="text/html" id="nav-element-template">
     <tr>
-        <td><span data-property="id"></span></td>
+        <td><span data-property="id" data-value="x"></span></td>
         <td><span>
                 <ul data-property="text" class="list-unstyled"></ul>
             </span></td>
@@ -201,15 +201,24 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                 <ul data-property="subtext" class="list-unstyled"></ul>
             </span></td>
         <td><span data-property="image-or-font"></span></td>
-        <td style="display: none"><span data-property="place-id"></span></td>
-        <td><span data-property="place"></span></td>
+        <td><span data-property="url"></span></td>
         <td>
             <a href="#" data-action="edit">
-                <i class="fa fa-pencil icon-link orange"
+                <i class="fa fa-fw fa-pencil icon-link orange"
                    data-toggle="tooltip" title="<?php echo $hesklang['edit']; ?>"></i>
             </a>
+            <a href="#" data-action="sort"
+               data-direction="up">
+                <i class="fa fa-fw fa-arrow-up icon-link green"
+                   data-toggle="tooltip" title="<?php echo $hesklang['move_up']; ?>"></i>
+            </a>
+            <a href="#" data-action="sort"
+               data-direction="down">
+                <i class="fa fa-fw fa-arrow-down icon-link green"
+                   data-toggle="tooltip" title="<?php echo $hesklang['move_dn'] ?>"></i>
+            </a>
             <a href="#" data-action="delete">
-                <i class="fa fa-times icon-link red"
+                <i class="fa fa-fw fa-times icon-link red"
                    data-toggle="tooltip" title="<?php echo $hesklang['delete']; ?>"></i>
             </a>
         </td>
diff --git a/api/BusinessLogic/Navigation/CustomNavElement.php b/api/BusinessLogic/Navigation/CustomNavElement.php
index 2e0e7261..74b4ca1a 100644
--- a/api/BusinessLogic/Navigation/CustomNavElement.php
+++ b/api/BusinessLogic/Navigation/CustomNavElement.php
@@ -21,4 +21,10 @@ class CustomNavElement {
 
     /* @var $place int */
     public $place;
+
+    /* @var $url string */
+    public $url;
+
+    /* @var $sort int */
+    public $sort;
 }
\ No newline at end of file
diff --git a/api/BusinessLogic/Navigation/CustomNavElementHandler.php b/api/BusinessLogic/Navigation/CustomNavElementHandler.php
index 4a8cad62..010bc4a3 100644
--- a/api/BusinessLogic/Navigation/CustomNavElementHandler.php
+++ b/api/BusinessLogic/Navigation/CustomNavElementHandler.php
@@ -31,6 +31,7 @@ class CustomNavElementHandler {
 
     function deleteCustomNavElement($id, $heskSettings) {
         $this->customNavElementGateway->deleteCustomNavElement($id, $heskSettings);
+        $this->customNavElementGateway->resortAllElements($heskSettings);
     }
 
     function saveCustomNavElement($element, $heskSettings) {
@@ -38,6 +39,23 @@ class CustomNavElementHandler {
     }
 
     function createCustomNavElement($element, $heskSettings) {
-        return $this->customNavElementGateway->createCustomNavElement($element, $heskSettings);
+        $element = $this->customNavElementGateway->createCustomNavElement($element, $heskSettings);
+        $this->customNavElementGateway->resortAllElements($heskSettings);
+
+        return $element;
+    }
+
+    function sortCustomNavElement($elementId, $direction, $heskSettings) {
+        /* @var $element CustomNavElement */
+        $element = $this->customNavElementGateway->getAllCustomNavElements($heskSettings)[$elementId];
+
+        if ($direction === 'up') {
+            $element->sort -= 15;
+        } else {
+            $element->sort += 15;
+        }
+
+        $this->customNavElementGateway->saveCustomNavElement($element, $heskSettings);
+        $this->customNavElementGateway->resortAllElements($heskSettings);
     }
 }
\ No newline at end of file
diff --git a/api/Controllers/Navigation/CustomNavElementController.php b/api/Controllers/Navigation/CustomNavElementController.php
index eb6ce217..1cb303fb 100644
--- a/api/Controllers/Navigation/CustomNavElementController.php
+++ b/api/Controllers/Navigation/CustomNavElementController.php
@@ -21,6 +21,17 @@ class CustomNavElementController extends InternalApiController {
         output($handler->getAllCustomNavElements($hesk_settings));
     }
 
+    static function sort($id, $direction) {
+        global $applicationContext, $hesk_settings;
+
+        self::staticCheckForInternalUseOnly();
+
+        /* @var $handler CustomNavElementHandler */
+        $handler = $applicationContext->get[CustomNavElementHandler::class];
+
+        $handler->sortCustomNavElement($id, $direction, $hesk_settings);
+    }
+
     function get($id) {
         global $applicationContext, $hesk_settings;
 
@@ -81,6 +92,8 @@ class CustomNavElementController extends InternalApiController {
         $element->imageUrl = Helpers::safeArrayGet($data, 'imageUrl');
         $element->text = Helpers::safeArrayGet($data, 'text');
         $element->subtext = Helpers::safeArrayGet($data, 'subtext');
+        $element->url = Helpers::safeArrayGet($data, 'url');
+        $element->sort = intval(Helpers::safeArrayGet($data, 'sort'));
 
         return $element;
     }
diff --git a/api/DataAccess/Navigation/CustomNavElementGateway.php b/api/DataAccess/Navigation/CustomNavElementGateway.php
index 56981b89..8d80dd9b 100644
--- a/api/DataAccess/Navigation/CustomNavElementGateway.php
+++ b/api/DataAccess/Navigation/CustomNavElementGateway.php
@@ -117,11 +117,16 @@ class CustomNavElementGateway extends CommonDao {
     function createCustomNavElement($element, $heskSettings) {
         $this->init();
 
+        $rs = hesk_dbQuery("SELECT MAX(`sort`) FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "custom_nav_element`
+            WHERE `place` = " . intval($element->place));
+        $maxSort = hesk_dbFetchAssoc($rs);
+        $sortValue = intval($maxSort['sort']) + 1;
+
         $imageUrl = $element->imageUrl == null ? 'NULL' : "'" . hesk_dbEscape($element->imageUrl) . "'";
         $fontIcon = $element->fontIcon == null ? 'NULL' : "'" . hesk_dbEscape($element->fontIcon) . "'";
         hesk_dbQuery("INSERT INTO `" . hesk_dbEscape($heskSettings['db_pfix']) . "custom_nav_element`
-            (`image_url`, `font_icon`, `place`) 
-            VALUES ({$imageUrl}, {$fontIcon}, " . intval($element->place) . ")");
+            (`image_url`, `font_icon`, `place`, `sort`) 
+            VALUES ({$imageUrl}, {$fontIcon}, " . intval($element->place) . ", " . $sortValue . ")");
 
         $element->id = hesk_dbInsertID();
 
@@ -150,4 +155,23 @@ class CustomNavElementGateway extends CommonDao {
 
         return $element;
     }
+
+
+    function resortAllElements($heskSettings) {
+        $this->init();
+
+        $rs = hesk_dbQuery("SELECT `id` FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "custom_nav_element`
+            ORDER BY `place` ASC, `sort` ASC");
+
+        $sortValue = 10;
+        while ($row = hesk_dbFetchAssoc($rs)) {
+            hesk_dbQuery("UPDATE `" . hesk_dbEscape($heskSettings['db_pfix']) . "custom_nav_element`
+                SET `sort` = " . intval($sortValue) . "
+                WHERE `id` = " . intval($row['id']));
+
+            $sortValue += 10;
+        }
+
+        $this->close();
+    }
 }
\ No newline at end of file
diff --git a/api/index.php b/api/index.php
index 9404b9c2..a25db5a9 100644
--- a/api/index.php
+++ b/api/index.php
@@ -190,6 +190,7 @@ Link::all(array(
     '/v1-internal/custom-navigation/all' => \Controllers\Navigation\CustomNavElementController::class . '::getAll',
     '/v1-internal/custom-navigation' => \Controllers\Navigation\CustomNavElementController::class,
     '/v1-internal/custom-navigation/{i}' => \Controllers\Navigation\CustomNavElementController::class,
+    '/v1-internal/custom-navigation/{i}/sort/{s}' => \Controllers\Navigation\CustomNavElementController::class . '::sort',
 
     // Any URL that doesn't match goes to the 404 handler
     '404' => 'handle404'
diff --git a/install/mods-for-hesk/sql/installSql.php b/install/mods-for-hesk/sql/installSql.php
index 93dee04f..c9bd0063 100644
--- a/install/mods-for-hesk/sql/installSql.php
+++ b/install/mods-for-hesk/sql/installSql.php
@@ -998,6 +998,7 @@ function execute310Scripts() {
          image_url TEXT,
          font_icon VARCHAR(200),
          place INT NOT NULL,
+         url VARCHAR(500) NOT NULL,
          sort INT NOT NULL)");
     executeQuery("CREATE TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "custom_nav_element_to_text`
         (id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
diff --git a/internal-api/js/manage-custom-nav-elements.js b/internal-api/js/manage-custom-nav-elements.js
index 0278f81c..e2cce50a 100644
--- a/internal-api/js/manage-custom-nav-elements.js
+++ b/internal-api/js/manage-custom-nav-elements.js
@@ -125,29 +125,38 @@ function loadTable(modalToClose) {
             $('#table-body').append('<tr><td colspan="6" class="bg-gray"><i><b>' + places[1] + '</b></i></td></tr>');
             var currentPlace = 1;
             var addedElementToPlace = false;
+            var first = true;
+            var lastElement = null;
             $.each(data, function() {
                 if (this.place !== currentPlace) {
                     if (!addedElementToPlace) {
                         $('#table-body').append('<tr><td colspan="6">' + notFoundText + '</td></tr>');
                     }
 
+                    if (lastElement !== null) {
+                        //-- Hide the down arrow on the last element
+                        $('[data-value="' + lastElement.id + '"]').parent().parent()
+                            .find('[data-direction="down"]').find('i').removeClass('fa-arrow-down');
+                        lastElement = null;
+                    }
+
                     $('#table-body').append('<tr><td colspan="6" class="bg-gray"><i><b>' + places[this.place] + '</b></i></td></tr>');
                     currentPlace = this.place;
                     console.log(this);
                     addedElementToPlace = false;
+                    first = true;
                 }
 
                 var $template = $($('#nav-element-template').html());
 
-                $template.find('span[data-property="id"]').text(this.id);
+                $template.find('span[data-property="id"]').text(this.id).attr('data-value', this.id);
                 if (this.imageUrl === null) {
                     $template.find('span[data-property="image-or-font"]').html('<i class="' + escape(this.fontIcon) + '"></i>');
                 } else {
                     $template.find('span[data-property="image-or-font"]').text(this.imageUrl);
                 }
 
-                $template.find('span[data-property="place"]').text(places[this.place]);
-                $template.find('span[data-property="place-id"]').text(this.place);
+                $template.find('span[data-property="url"]').text(places[this.url]);
 
                 var text = '';
                 $.each(this.text, function(key, value) {
@@ -164,11 +173,17 @@ function loadTable(modalToClose) {
                 }
                 $template.find('ul[data-property="subtext"]').html(subtext);
 
+                if (first) {
+                    $template.find('[data-direction="up"]').find('i').removeClass('fa-arrow-up');
+                    first = false;
+                }
+
                 $('#table-body').append($template);
 
                 elements[this.id] = this;
 
                 addedElementToPlace = true;
+                lastElement = this;
             });
 
             //-- Add missing headers if no elements are in them
@@ -181,6 +196,12 @@ function loadTable(modalToClose) {
                 $('#table-body').append('<tr><td colspan="6">' + notFoundText + '</td></tr>');
             }
 
+            if (lastElement) {
+                //-- Hide the down arrow on the last element
+                $('[data-value="' + lastElement.id + '"]').parent().parent()
+                    .find('[data-direction="down"]').find('i').removeClass('fa-arrow-down');
+            }
+
             if (modalToClose !== undefined) {
                 modalToClose.modal('hide');
             }

From 11f9266f1014a94ef4cb11f58f175ccfae2553cf Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sat, 20 May 2017 22:12:08 -0400
Subject: [PATCH 134/192] Properly handle saving/getting URLs

---
 admin/manage_custom_nav_elements.php             | 10 ++++++++++
 .../Navigation/CustomNavElementGateway.php       | 10 ++++++----
 internal-api/js/manage-custom-nav-elements.js    | 16 ++++++++++------
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/admin/manage_custom_nav_elements.php b/admin/manage_custom_nav_elements.php
index 3fd46f26..683bb30f 100644
--- a/admin/manage_custom_nav_elements.php
+++ b/admin/manage_custom_nav_elements.php
@@ -134,6 +134,16 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                             </div>
                         </div>
                         <div class="col-md-6 col-sm-12">
+                            <h4>URL[!]</h4>
+                            <div class="form-group">
+                                <label for="image-type" class="col-md-4 col-sm-12 control-label">URL[!]</label>
+                                <div class="col-md-8 col-sm-12">
+                                    <input type="text" name="url" class="form-control"
+                                           data-error="<?php echo htmlspecialchars($hesklang['this_field_is_required']); ?>"
+                                           placeholder="<?php echo 'URL'; ?>" required>
+                                    <div class="help-block with-errors"></div>
+                                </div>
+                            </div>
                             <h4>Image[!]</h4>
                             <div class="form-group">
                                 <label for="image-type" class="col-md-4 col-sm-12 control-label">Image Type[!]</label>
diff --git a/api/DataAccess/Navigation/CustomNavElementGateway.php b/api/DataAccess/Navigation/CustomNavElementGateway.php
index 8d80dd9b..81de0679 100644
--- a/api/DataAccess/Navigation/CustomNavElementGateway.php
+++ b/api/DataAccess/Navigation/CustomNavElementGateway.php
@@ -10,7 +10,7 @@ class CustomNavElementGateway extends CommonDao {
     function getAllCustomNavElements($heskSettings) {
         $this->init();
 
-        $columns = '`t1`.`id`, `t1`.`image_url`, `t1`.`font_icon`, `t1`.`place`, `t2`.`language`, `t2`.`text`, `t2`.`subtext`';
+        $columns = '`t1`.`id`, `t1`.`image_url`, `t1`.`font_icon`, `t1`.`place`, `t1`.`url`, `t2`.`language`, `t2`.`text`, `t2`.`subtext`';
 
         $rs = hesk_dbQuery("SELECT {$columns} FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "custom_nav_element` AS `t1`
             INNER JOIN `" . hesk_dbEscape($heskSettings['db_pfix']) . "custom_nav_element_to_text` AS `t2`
@@ -33,6 +33,7 @@ class CustomNavElementGateway extends CommonDao {
                 $element->place = intval($row['place']);
                 $element->imageUrl = $row['image_url'];
                 $element->fontIcon = $row['font_icon'];
+                $element->url = $row['url'];
                 $element->text = array();
                 $element->subtext = array();
             }
@@ -103,6 +104,7 @@ class CustomNavElementGateway extends CommonDao {
         hesk_dbQuery("UPDATE `" . hesk_dbEscape($heskSettings['db_pfix']) . "custom_nav_element`
             SET `image_url` = {$imageUrl},
                 `font_icon` = {$fontIcon},
+                `url` = '" . hesk_dbEscape($element->url) . "',
                 `place` = " . intval($element->place) .
             " WHERE `id` = " . intval($element->id));
 
@@ -117,7 +119,7 @@ class CustomNavElementGateway extends CommonDao {
     function createCustomNavElement($element, $heskSettings) {
         $this->init();
 
-        $rs = hesk_dbQuery("SELECT MAX(`sort`) FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "custom_nav_element`
+        $rs = hesk_dbQuery("SELECT MAX(`sort`) AS `sort` FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "custom_nav_element`
             WHERE `place` = " . intval($element->place));
         $maxSort = hesk_dbFetchAssoc($rs);
         $sortValue = intval($maxSort['sort']) + 1;
@@ -125,8 +127,8 @@ class CustomNavElementGateway extends CommonDao {
         $imageUrl = $element->imageUrl == null ? 'NULL' : "'" . hesk_dbEscape($element->imageUrl) . "'";
         $fontIcon = $element->fontIcon == null ? 'NULL' : "'" . hesk_dbEscape($element->fontIcon) . "'";
         hesk_dbQuery("INSERT INTO `" . hesk_dbEscape($heskSettings['db_pfix']) . "custom_nav_element`
-            (`image_url`, `font_icon`, `place`, `sort`) 
-            VALUES ({$imageUrl}, {$fontIcon}, " . intval($element->place) . ", " . $sortValue . ")");
+            (`image_url`, `font_icon`, `place`, `sort`, `url`) 
+            VALUES ({$imageUrl}, {$fontIcon}, " . intval($element->place) . ", " . $sortValue . ", '" . hesk_dbEscape($element->url) . "')");
 
         $element->id = hesk_dbInsertID();
 
diff --git a/internal-api/js/manage-custom-nav-elements.js b/internal-api/js/manage-custom-nav-elements.js
index e2cce50a..876fd2b5 100644
--- a/internal-api/js/manage-custom-nav-elements.js
+++ b/internal-api/js/manage-custom-nav-elements.js
@@ -69,13 +69,15 @@ $(document).ready(function() {
         }
 
         var id = parseInt($modal.find('input[name="id"]').val());
+        var navUrl = $modal.find('input[name="url"]').val();
 
         var data = {
             place: place,
             text: text,
             subtext: subtext,
             imageUrl: imageUrl,
-            fontIcon: fontIcon
+            fontIcon: fontIcon,
+            url: navUrl
         };
 
         var url = heskUrl + '/api/v1-internal/custom-navigation/';
@@ -136,7 +138,7 @@ function loadTable(modalToClose) {
                     if (lastElement !== null) {
                         //-- Hide the down arrow on the last element
                         $('[data-value="' + lastElement.id + '"]').parent().parent()
-                            .find('[data-direction="down"]').find('i').removeClass('fa-arrow-down');
+                            .find('[data-direction="down"]').css('visibility', 'hidden');
                         lastElement = null;
                     }
 
@@ -156,7 +158,7 @@ function loadTable(modalToClose) {
                     $template.find('span[data-property="image-or-font"]').text(this.imageUrl);
                 }
 
-                $template.find('span[data-property="url"]').text(places[this.url]);
+                $template.find('span[data-property="url"]').text(this.url);
 
                 var text = '';
                 $.each(this.text, function(key, value) {
@@ -174,7 +176,7 @@ function loadTable(modalToClose) {
                 $template.find('ul[data-property="subtext"]').html(subtext);
 
                 if (first) {
-                    $template.find('[data-direction="up"]').find('i').removeClass('fa-arrow-up');
+                    $template.find('[data-direction="up"]').css('visibility', 'hidden');
                     first = false;
                 }
 
@@ -191,7 +193,7 @@ function loadTable(modalToClose) {
                 $('#table-body').append('<tr><td colspan="6" class="bg-gray"><i><b>' + places[2] + '</b></i></td></tr>');
                 $('#table-body').append('<tr><td colspan="6">' + notFoundText + '</td></tr>');
             }
-            if (currentPlace === 2) {
+            if (currentPlace === 1 || currentPlace === 2) {
                 $('#table-body').append('<tr><td colspan="6" class="bg-gray"><i><b>' + places[3] + '</b></i></td></tr>');
                 $('#table-body').append('<tr><td colspan="6">' + notFoundText + '</td></tr>');
             }
@@ -199,7 +201,7 @@ function loadTable(modalToClose) {
             if (lastElement) {
                 //-- Hide the down arrow on the last element
                 $('[data-value="' + lastElement.id + '"]').parent().parent()
-                    .find('[data-direction="down"]').find('i').removeClass('fa-arrow-down');
+                    .find('[data-direction="down"]').css('visibility', 'hidden');
             }
 
             if (modalToClose !== undefined) {
@@ -228,6 +230,7 @@ function bindEditModal() {
 
         $modal.find('select[name="place"]').val(element.place);
         $modal.find('input[name="id"]').val(element.id);
+        $modal.find('input[name="url"]').val(element.url);
         var $textLanguages = $modal.find('[data-text-language]');
         $.each($textLanguages, function() {
             var language = $(this).data('text-language');
@@ -290,6 +293,7 @@ function bindCreateModal() {
         $modal.find('input[name="image-url"]').val('');
         $modal.find('#font-icon-group').hide();
         $modal.find('#image-url-group').show();
+        $modal.find('input[name="url"]').val('');
 
         $modal.modal('show');
     });

From ab5840babea5247f32ec929357bf5c315cb4e0af Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sun, 21 May 2017 12:03:05 -0400
Subject: [PATCH 135/192] Sorting is now possible

---
 .../Navigation/CustomNavElementHandler.php    | 23 ++++++++++++------
 api/BusinessLogic/Navigation/Direction.php    |  9 +++++++
 .../Navigation/CustomNavElementController.php |  2 +-
 .../Navigation/CustomNavElementGateway.php    |  7 ++++--
 internal-api/js/manage-custom-nav-elements.js | 24 +++++++++++++++++++
 5 files changed, 55 insertions(+), 10 deletions(-)
 create mode 100644 api/BusinessLogic/Navigation/Direction.php

diff --git a/api/BusinessLogic/Navigation/CustomNavElementHandler.php b/api/BusinessLogic/Navigation/CustomNavElementHandler.php
index 010bc4a3..fea67554 100644
--- a/api/BusinessLogic/Navigation/CustomNavElementHandler.php
+++ b/api/BusinessLogic/Navigation/CustomNavElementHandler.php
@@ -22,8 +22,10 @@ class CustomNavElementHandler {
     function getCustomNavElement($id, $heskSettings) {
         $elements = $this->getAllCustomNavElements($heskSettings);
 
-        if (isset($elements[$id])) {
-            return $elements[$id];
+        foreach ($elements as $element) {
+            if ($element->id === intval($id)) {
+                return output($element);
+            }
         }
 
         throw new ApiFriendlyException("Custom nav element {$id} not found!", "Element Not Found", 404);
@@ -47,15 +49,22 @@ class CustomNavElementHandler {
 
     function sortCustomNavElement($elementId, $direction, $heskSettings) {
         /* @var $element CustomNavElement */
-        $element = $this->customNavElementGateway->getAllCustomNavElements($heskSettings)[$elementId];
+        $elements = $this->customNavElementGateway->getAllCustomNavElements($heskSettings);
+        $elementToChange = null;
+        foreach ($elements as $element) {
+            if ($element->id === intval($elementId)) {
+                $elementToChange = $element;
+            }
+        }
+
 
-        if ($direction === 'up') {
-            $element->sort -= 15;
+        if ($direction === Direction::UP) {
+            $elementToChange->sort -= 15;
         } else {
-            $element->sort += 15;
+            $elementToChange->sort += 15;
         }
 
-        $this->customNavElementGateway->saveCustomNavElement($element, $heskSettings);
+        $this->customNavElementGateway->saveCustomNavElement($elementToChange, $heskSettings);
         $this->customNavElementGateway->resortAllElements($heskSettings);
     }
 }
\ No newline at end of file
diff --git a/api/BusinessLogic/Navigation/Direction.php b/api/BusinessLogic/Navigation/Direction.php
new file mode 100644
index 00000000..f14a00cf
--- /dev/null
+++ b/api/BusinessLogic/Navigation/Direction.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace BusinessLogic\Navigation;
+
+
+class Direction {
+    const UP = 'up';
+    const DOWN = 'down';
+}
\ No newline at end of file
diff --git a/api/Controllers/Navigation/CustomNavElementController.php b/api/Controllers/Navigation/CustomNavElementController.php
index 1cb303fb..f7b50659 100644
--- a/api/Controllers/Navigation/CustomNavElementController.php
+++ b/api/Controllers/Navigation/CustomNavElementController.php
@@ -29,7 +29,7 @@ class CustomNavElementController extends InternalApiController {
         /* @var $handler CustomNavElementHandler */
         $handler = $applicationContext->get[CustomNavElementHandler::class];
 
-        $handler->sortCustomNavElement($id, $direction, $hesk_settings);
+        $handler->sortCustomNavElement(intval($id), $direction, $hesk_settings);
     }
 
     function get($id) {
diff --git a/api/DataAccess/Navigation/CustomNavElementGateway.php b/api/DataAccess/Navigation/CustomNavElementGateway.php
index 81de0679..6ecfbe5e 100644
--- a/api/DataAccess/Navigation/CustomNavElementGateway.php
+++ b/api/DataAccess/Navigation/CustomNavElementGateway.php
@@ -10,7 +10,8 @@ class CustomNavElementGateway extends CommonDao {
     function getAllCustomNavElements($heskSettings) {
         $this->init();
 
-        $columns = '`t1`.`id`, `t1`.`image_url`, `t1`.`font_icon`, `t1`.`place`, `t1`.`url`, `t2`.`language`, `t2`.`text`, `t2`.`subtext`';
+        $columns = '`t1`.`id`, `t1`.`image_url`, `t1`.`font_icon`, `t1`.`place`, `t1`.`url`, `t1`.`sort`, 
+            `t2`.`language`, `t2`.`text`, `t2`.`subtext`';
 
         $rs = hesk_dbQuery("SELECT {$columns} FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "custom_nav_element` AS `t1`
             INNER JOIN `" . hesk_dbEscape($heskSettings['db_pfix']) . "custom_nav_element_to_text` AS `t2`
@@ -26,7 +27,7 @@ class CustomNavElementGateway extends CommonDao {
             $id = intval($row['id']);
             if ($previousId !== $id) {
                 if ($element !== null) {
-                    $elements[$element->id] = $element;
+                    $elements[] = $element;
                 }
                 $element = new CustomNavElement();
                 $element->id = $id;
@@ -34,6 +35,7 @@ class CustomNavElementGateway extends CommonDao {
                 $element->imageUrl = $row['image_url'];
                 $element->fontIcon = $row['font_icon'];
                 $element->url = $row['url'];
+                $element->sort = $row['sort'];
                 $element->text = array();
                 $element->subtext = array();
             }
@@ -105,6 +107,7 @@ class CustomNavElementGateway extends CommonDao {
             SET `image_url` = {$imageUrl},
                 `font_icon` = {$fontIcon},
                 `url` = '" . hesk_dbEscape($element->url) . "',
+                `sort` = " . intval($element->sort) . ",
                 `place` = " . intval($element->place) .
             " WHERE `id` = " . intval($element->id));
 
diff --git a/internal-api/js/manage-custom-nav-elements.js b/internal-api/js/manage-custom-nav-elements.js
index 876fd2b5..328fd9c6 100644
--- a/internal-api/js/manage-custom-nav-elements.js
+++ b/internal-api/js/manage-custom-nav-elements.js
@@ -5,6 +5,7 @@ $(document).ready(function() {
     bindEditModal();
     bindCreateModal();
     bindDeleteButton();
+    bindSortButtons();
 
     $('[data-toggle="nav-iconpicker"]').iconpicker({
         iconset: ['fontawesome', 'octicon'],
@@ -319,4 +320,27 @@ function bindDeleteButton() {
             }
         });
     });
+}
+
+function bindSortButtons() {
+    $(document).on('click', '[data-action="sort"]', function() {
+        $('#overlay').show();
+        var heskUrl = $('#heskUrl').text();
+        var direction = $(this).data('direction');
+        var element = elements[$(this).parent().parent().find('[data-property="id"]').text()];
+
+        $.ajax({
+            method: 'POST',
+            url: heskUrl + '/api/v1-internal/custom-navigation/' + element.id + '/sort/' + direction,
+            headers: { 'X-Internal-Call': true },
+            success: function() {
+                console.log('Resorted');
+                loadTable();
+            },
+            error: function(data) {
+                console.error(data);
+                $('#overlay').hide();
+            }
+        })
+    });
 }
\ No newline at end of file

From 99c229fae761dd29b3585e19cacc5cab358af564 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sun, 21 May 2017 22:26:36 -0400
Subject: [PATCH 136/192] Add toastr, fix several things regarding custom nav
 elements

---
 admin/manage_custom_nav_elements.php          | 93 ++++++++++++-------
 .../Navigation/CustomNavElementController.php |  1 +
 api/Core/json_error.php                       |  3 +-
 api/index.php                                 |  4 +-
 css/mods-for-hesk-new.css                     |  4 +
 css/toastr.min.css                            |  1 +
 inc/common.inc.php                            | 12 +++
 inc/headerAdmin.inc.php                       | 12 ++-
 internal-api/js/alerts.js                     | 31 +++++++
 internal-api/js/lang.js                       |  5 +
 internal-api/js/manage-custom-nav-elements.js | 65 ++++++-------
 js/modsForHesk-javascript.js                  |  6 +-
 js/toastr.min.js                              |  2 +
 language/en/text.php                          | 22 +++++
 14 files changed, 188 insertions(+), 73 deletions(-)
 create mode 100644 css/toastr.min.css
 create mode 100644 internal-api/js/alerts.js
 create mode 100644 internal-api/js/lang.js
 create mode 100644 js/toastr.min.js

diff --git a/admin/manage_custom_nav_elements.php b/admin/manage_custom_nav_elements.php
index 683bb30f..821b0cdf 100644
--- a/admin/manage_custom_nav_elements.php
+++ b/admin/manage_custom_nav_elements.php
@@ -30,7 +30,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
         <div class="box">
             <div class="box-header with-border">
                 <h1 class="box-title">
-                    Custom Nav Menu Elements[!]
+                    <?php echo $hesklang['custom_nav_menu_elements']; ?>
                 </h1>
                 <div class="box-tools pull-right">
                     <button type="button" class="btn btn-box-tool" data-widget="collapse">
@@ -41,18 +41,21 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
             <div class="box-body">
                 <div class="row">
                     <div class="col-md-12 text-right">
-                        <button id="create-button" class="btn btn-success">Create New Element [!]</button>
+                        <button id="create-button" class="btn btn-success">
+                            <i class="fa fa-plus-circle"></i>&nbsp;
+                            <?php echo $hesklang['create_new']; ?>
+                        </button>
                     </div>
                     <div class="col-md-12">
                         <table class="table table-striped">
                             <thead>
                             <tr>
-                                <th>ID</th>
-                                <th>Text</th>
-                                <th>Subtext</th>
-                                <th>Image URL / Font Icon</th>
-                                <th>URL</th>
-                                <th>Actions</th>
+                                <th><?php echo $hesklang['id']; ?></th>
+                                <th><?php echo $hesklang['custom_nav_text']; ?></th>
+                                <th><?php echo $hesklang['custom_nav_subtext']; ?></th>
+                                <th><?php echo $hesklang['image_url_slash_font_icon']; ?></th>
+                                <th><?php echo $hesklang['url']; ?></th>
+                                <th><?php echo $hesklang['actions']; ?></th>
                             </tr>
                             </thead>
                             <tbody id="table-body">
@@ -72,8 +75,11 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
         <div class="modal-content">
             <div class="modal-header" style="cursor: move">
                 <button type="button" class="close cancel-callback" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <h4 class="modal-title" id="myModalLabel">
-                    <?php echo 'Edit Custom Nav Element[!]'; ?>
+                <h4 class="modal-title" id="edit-label">
+                    <?php echo $hesklang['edit_custom_nav_element_title_case']; ?>
+                </h4>
+                <h4 class="modal-title" id="create-label">
+                    <?php echo $hesklang['create_custom_nav_element_title_case']; ?>
                 </h4>
             </div>
             <form id="manage-nav-element" class="form-horizontal" data-toggle="validator">
@@ -82,14 +88,14 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                     <div class="row">
                         <div class="col-md-12">
                             <div class="form-group">
-                                <label for="place" class="col-md-4 col-sm-12 control-label">Place[!]</label>
+                                <label for="place" class="col-md-4 col-sm-12 control-label"><?php echo $hesklang['place']; ?></label>
                                 <div class="col-md-8 col-sm-12">
                                     <select name="place" id="place" class="form-control"
                                             data-error="<?php echo htmlspecialchars($hesklang['this_field_is_required']); ?>"
                                             required>
-                                        <option value="1">Homepage - Block</option>
-                                        <option value="2">Customer Navbar</option>
-                                        <option value="3">Staff Navbar</option>
+                                        <option value="1"><?php echo $hesklang['homepage_block']; ?></option>
+                                        <option value="2"><?php echo $hesklang['customer_navigation']; ?></option>
+                                        <option value="3"><?php echo $hesklang['staff_navigation']; ?></option>
                                     </select>
                                     <div class="help-block with-errors"></div>
                                 </div>
@@ -98,7 +104,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                     </div>
                     <div class="row">
                         <div class="col-md-6 col-sm-12">
-                            <h4>Text[!]</h4>
+                            <h4><?php echo $hesklang['custom_nav_text']; ?></h4>
                             <?php foreach ($hesk_settings['languages'] as $language => $value): ?>
                                 <div class="form-group">
                                     <label for="text[<?php echo $language; ?>]" class="col-md-4 col-sm-12 control-label">
@@ -107,7 +113,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                                     <div class="col-md-8 col-sm-12">
                                         <input type="text" name="text" class="form-control"
                                                data-text-language="<?php echo $language; ?>"
-                                               id="text[<?php echo $language; ?>" placeholder="<?php echo $language; ?>"
+                                               id="text[<?php echo $language; ?>" placeholder="<?php echo $hesklang['custom_nav_text']; ?>"
                                                data-error="<?php echo htmlspecialchars($hesklang['this_field_is_required']); ?>"
                                                required>
                                         <div class="help-block with-errors"></div>
@@ -115,7 +121,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                                 </div>
                             <?php endforeach; ?>
                             <div id="subtext">
-                                <h4>Subtext[!]</h4>
+                                <h4><?php echo $hesklang['custom_nav_subtext']; ?></h4>
                                 <?php foreach ($hesk_settings['languages'] as $language => $value): ?>
                                     <div class="form-group">
                                         <label for="subtext[<?php echo $language; ?>]" class="col-md-4 col-sm-12 control-label">
@@ -124,7 +130,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                                         <div class="col-md-8 col-sm-12">
                                             <input type="text" name="subtext" class="form-control"
                                                    data-subtext-language="<?php echo $language; ?>"
-                                                   id="subtext[<?php echo $language; ?>" placeholder="<?php echo $language; ?>"
+                                                   id="subtext[<?php echo $language; ?>" placeholder="<?php echo $hesklang['custom_nav_subtext']; ?>"
                                                    data-error="<?php echo htmlspecialchars($hesklang['this_field_is_required']); ?>"
                                                    required>
                                             <div class="help-block with-errors"></div>
@@ -134,35 +140,35 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                             </div>
                         </div>
                         <div class="col-md-6 col-sm-12">
-                            <h4>URL[!]</h4>
+                            <h4><?php echo $hesklang['url']; ?></h4>
                             <div class="form-group">
-                                <label for="image-type" class="col-md-4 col-sm-12 control-label">URL[!]</label>
+                                <label for="image-type" class="col-md-4 col-sm-12 control-label"><?php echo $hesklang['url']; ?></label>
                                 <div class="col-md-8 col-sm-12">
                                     <input type="text" name="url" class="form-control"
                                            data-error="<?php echo htmlspecialchars($hesklang['this_field_is_required']); ?>"
-                                           placeholder="<?php echo 'URL'; ?>" required>
+                                           placeholder="<?php echo $hesklang['url']; ?>" required>
                                     <div class="help-block with-errors"></div>
                                 </div>
                             </div>
-                            <h4>Image[!]</h4>
+                            <h4><?php echo $hesklang['image']; ?></h4>
                             <div class="form-group">
-                                <label for="image-type" class="col-md-4 col-sm-12 control-label">Image Type[!]</label>
+                                <label for="image-type" class="col-md-4 col-sm-12 control-label"><?php echo $hesklang['image_type']; ?></label>
                                 <div class="col-md-8 col-sm-12">
                                     <select name="image-type" id="image-type" class="form-control"
                                             data-error="<?php echo htmlspecialchars($hesklang['this_field_is_required']); ?>"
                                             required>
-                                        <option value="image-url">Image URL</option>
-                                        <option value="font-icon">Font Icon</option>
+                                        <option value="image-url"><?php echo $hesklang['image_url']; ?></option>
+                                        <option value="font-icon"><?php echo $hesklang['font_icon']; ?></option>
                                     </select>
                                     <div class="help-block with-errors"></div>
                                 </div>
                             </div>
                             <div class="form-group" id="image-url-group">
-                                <label for="image-url" class="col-md-4 col-sm-12 control-label">Image URL [!]</label>
+                                <label for="image-url" class="col-md-4 col-sm-12 control-label"><?php echo $hesklang['image_url']; ?></label>
                                 <div class="col-md-8 col-sm-12">
                                     <input type="text" name="image-url" class="form-control"
                                            data-error="<?php echo htmlspecialchars($hesklang['this_field_is_required']); ?>"
-                                           placeholder="Image URL[!]" required>
+                                           placeholder="<?php echo $hesklang['image_url']; ?>" required>
                                     <div class="help-block with-errors"></div>
                                 </div>
                             </div>
@@ -173,7 +179,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 
                                 <p style="display:none"
                                    id="footer-icon"><?php echo $hesklang['sm_iconpicker_footer_label']; ?></p>
-                                <label for="font-icon" class="col-md-4 col-sm-12 control-label">Font Icon [!]</label>
+                                <label for="font-icon" class="col-md-4 col-sm-12 control-label"><?php echo $hesklang['font_icon']; ?></label>
                                 <div class="col-md-8 col-sm-12">
                                     <div class="btn btn-default iconpicker-container" data-toggle="nav-iconpicker">
                                     </div>
@@ -183,7 +189,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                     </div>
                 </div>
                 <div class="modal-footer">
-                    <div class="btn-group">
+                    <div class="btn-group" id="action-buttons">
                         <button type="button" class="btn btn-default cancel-button" data-dismiss="modal">
                             <i class="fa fa-times-circle"></i>
                             <span><?php echo $hesklang['cancel']; ?></span>
@@ -198,9 +204,24 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
         </div>
     </div>
 </div>
-<p style="display: none" id="lang_edit"><?php echo $hesklang['edit']; ?></p>
-<p style="display: none" id="lang_delete"><?php echo $hesklang['delete']; ?></p>
-<p style="display: none" id="lang_no_custom_nav_elements_found"><?php echo $hesklang['no_custom_nav_elements_found']; ?></p>
+<?php
+echo mfh_get_hidden_fields_for_language(
+    array(
+        'edit',
+        'delete',
+        'no_custom_nav_elements_found',
+        'failed_to_load_custom_nav_elements',
+        'custom_nav_element_deleted',
+        'error_deleting_custom_nav_element',
+        'error_sorting_custom_nav_elements',
+        'custom_nav_element_created',
+        'custom_nav_element_saved',
+        'homepage_block',
+        'customer_navigation',
+        'staff_navigation',
+    )
+);
+?>
 <script type="text/html" id="nav-element-template">
     <tr>
         <td><span data-property="id" data-value="x"></span></td>
@@ -213,10 +234,6 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
         <td><span data-property="image-or-font"></span></td>
         <td><span data-property="url"></span></td>
         <td>
-            <a href="#" data-action="edit">
-                <i class="fa fa-fw fa-pencil icon-link orange"
-                   data-toggle="tooltip" title="<?php echo $hesklang['edit']; ?>"></i>
-            </a>
             <a href="#" data-action="sort"
                data-direction="up">
                 <i class="fa fa-fw fa-arrow-up icon-link green"
@@ -227,6 +244,10 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                 <i class="fa fa-fw fa-arrow-down icon-link green"
                    data-toggle="tooltip" title="<?php echo $hesklang['move_dn'] ?>"></i>
             </a>
+            <a href="#" data-action="edit">
+                <i class="fa fa-fw fa-pencil icon-link orange"
+                   data-toggle="tooltip" title="<?php echo $hesklang['edit']; ?>"></i>
+            </a>
             <a href="#" data-action="delete">
                 <i class="fa fa-fw fa-times icon-link red"
                    data-toggle="tooltip" title="<?php echo $hesklang['delete']; ?>"></i>
diff --git a/api/Controllers/Navigation/CustomNavElementController.php b/api/Controllers/Navigation/CustomNavElementController.php
index f7b50659..d4a514e7 100644
--- a/api/Controllers/Navigation/CustomNavElementController.php
+++ b/api/Controllers/Navigation/CustomNavElementController.php
@@ -3,6 +3,7 @@
 namespace Controllers\Navigation;
 
 
+use BusinessLogic\Exceptions\ApiFriendlyException;
 use BusinessLogic\Helpers;
 use BusinessLogic\Navigation\CustomNavElement;
 use BusinessLogic\Navigation\CustomNavElementHandler;
diff --git a/api/Core/json_error.php b/api/Core/json_error.php
index 24154ae5..1ff438c0 100644
--- a/api/Core/json_error.php
+++ b/api/Core/json_error.php
@@ -1,12 +1,13 @@
 <?php
 
-function print_error($title, $message, $response_code = 500) {
+function print_error($title, $message, $logId = null, $response_code = 500) {
     require_once(__DIR__ . '/output.php');
 
     $error = array();
     $error['type'] = 'ERROR';
     $error['title'] = $title;
     $error['message'] = $message;
+    $error['logId'] = $logId;
 
     print output($error, $response_code);
     return;
diff --git a/api/index.php b/api/index.php
index a25db5a9..6ec11b83 100644
--- a/api/index.php
+++ b/api/index.php
@@ -98,14 +98,14 @@ function exceptionHandler($exception) {
                 $userContext, $hesk_settings);
 
         $logIdText = $logId === null ? "Additionally, the error could not be logged! :'(" : "Log ID: {$logId}";
-        print_error("SQL Exception", "Fought an uncaught SQL exception. Check the logs for more information. {$logIdText}");
+        print_error("SQL Exception", "Fought an uncaught SQL exception. Check the logs for more information. {$logIdText}", $logId);
     } else {
         $logId = tryToLog(getLoggingLocation($exception),
             $exception->getMessage(), $exception->getTraceAsString(),
             $userContext, $hesk_settings);
 
         $logIdText = $logId === null ? "Additionally, the error could not be logged! :'(" : "Log ID: {$logId}";
-        print_error("Exception Occurred", "Fought an uncaught exception. Check the logs for more information. {$logIdText}");
+        print_error("Exception Occurred", "Fought an uncaught exception. Check the logs for more information. {$logIdText}", $logId);
     }
 
     die();
diff --git a/css/mods-for-hesk-new.css b/css/mods-for-hesk-new.css
index 1722347f..d5a386e5 100644
--- a/css/mods-for-hesk-new.css
+++ b/css/mods-for-hesk-new.css
@@ -290,4 +290,8 @@ div.ticket-info {
 
 .black {
     color: black;
+}
+
+#toast-container > div {
+    opacity: 1;
 }
\ No newline at end of file
diff --git a/css/toastr.min.css b/css/toastr.min.css
new file mode 100644
index 00000000..064afd07
--- /dev/null
+++ b/css/toastr.min.css
@@ -0,0 +1 @@
+.toast-title{font-weight:700}.toast-message{-ms-word-wrap:break-word;word-wrap:break-word}.toast-message a,.toast-message label{color:#FFF}.toast-message a:hover{color:#CCC;text-decoration:none}.toast-close-button{position:relative;right:-.3em;top:-.3em;float:right;font-size:20px;font-weight:700;color:#FFF;-webkit-text-shadow:0 1px 0 #fff;text-shadow:0 1px 0 #fff;opacity:.8;-ms-filter:progid:DXImageTransform.Microsoft.Alpha(Opacity=80);filter:alpha(opacity=80);line-height:1}.toast-close-button:focus,.toast-close-button:hover{color:#000;text-decoration:none;cursor:pointer;opacity:.4;-ms-filter:progid:DXImageTransform.Microsoft.Alpha(Opacity=40);filter:alpha(opacity=40)}.rtl .toast-close-button{left:-.3em;float:left;right:.3em}button.toast-close-button{padding:0;cursor:pointer;background:0 0;border:0;-webkit-appearance:none}.toast-top-center{top:0;right:0;width:100%}.toast-bottom-center{bottom:0;right:0;width:100%}.toast-top-full-width{top:0;right:0;width:100%}.toast-bottom-full-width{bottom:0;right:0;width:100%}.toast-top-left{top:12px;left:12px}.toast-top-right{top:12px;right:12px}.toast-bottom-right{right:12px;bottom:12px}.toast-bottom-left{bottom:12px;left:12px}#toast-container{position:fixed;z-index:999999;pointer-events:none}#toast-container *{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}#toast-container>div{position:relative;pointer-events:auto;overflow:hidden;margin:0 0 6px;padding:15px 15px 15px 50px;width:300px;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;background-position:15px center;background-repeat:no-repeat;-moz-box-shadow:0 0 12px #999;-webkit-box-shadow:0 0 12px #999;box-shadow:0 0 12px #999;color:#FFF;opacity:.8;-ms-filter:progid:DXImageTransform.Microsoft.Alpha(Opacity=80);filter:alpha(opacity=80)}#toast-container>div.rtl{direction:rtl;padding:15px 50px 15px 15px;background-position:right 15px center}#toast-container>div:hover{-moz-box-shadow:0 0 12px #000;-webkit-box-shadow:0 0 12px #000;box-shadow:0 0 12px #000;opacity:1;-ms-filter:progid:DXImageTransform.Microsoft.Alpha(Opacity=100);filter:alpha(opacity=100);cursor:pointer}#toast-container>.toast-info{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGwSURBVEhLtZa9SgNBEMc9sUxxRcoUKSzSWIhXpFMhhYWFhaBg4yPYiWCXZxBLERsLRS3EQkEfwCKdjWJAwSKCgoKCcudv4O5YLrt7EzgXhiU3/4+b2ckmwVjJSpKkQ6wAi4gwhT+z3wRBcEz0yjSseUTrcRyfsHsXmD0AmbHOC9Ii8VImnuXBPglHpQ5wwSVM7sNnTG7Za4JwDdCjxyAiH3nyA2mtaTJufiDZ5dCaqlItILh1NHatfN5skvjx9Z38m69CgzuXmZgVrPIGE763Jx9qKsRozWYw6xOHdER+nn2KkO+Bb+UV5CBN6WC6QtBgbRVozrahAbmm6HtUsgtPC19tFdxXZYBOfkbmFJ1VaHA1VAHjd0pp70oTZzvR+EVrx2Ygfdsq6eu55BHYR8hlcki+n+kERUFG8BrA0BwjeAv2M8WLQBtcy+SD6fNsmnB3AlBLrgTtVW1c2QN4bVWLATaIS60J2Du5y1TiJgjSBvFVZgTmwCU+dAZFoPxGEEs8nyHC9Bwe2GvEJv2WXZb0vjdyFT4Cxk3e/kIqlOGoVLwwPevpYHT+00T+hWwXDf4AJAOUqWcDhbwAAAAASUVORK5CYII=)!important}#toast-container>.toast-error{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHOSURBVEhLrZa/SgNBEMZzh0WKCClSCKaIYOED+AAKeQQLG8HWztLCImBrYadgIdY+gIKNYkBFSwu7CAoqCgkkoGBI/E28PdbLZmeDLgzZzcx83/zZ2SSXC1j9fr+I1Hq93g2yxH4iwM1vkoBWAdxCmpzTxfkN2RcyZNaHFIkSo10+8kgxkXIURV5HGxTmFuc75B2RfQkpxHG8aAgaAFa0tAHqYFfQ7Iwe2yhODk8+J4C7yAoRTWI3w/4klGRgR4lO7Rpn9+gvMyWp+uxFh8+H+ARlgN1nJuJuQAYvNkEnwGFck18Er4q3egEc/oO+mhLdKgRyhdNFiacC0rlOCbhNVz4H9FnAYgDBvU3QIioZlJFLJtsoHYRDfiZoUyIxqCtRpVlANq0EU4dApjrtgezPFad5S19Wgjkc0hNVnuF4HjVA6C7QrSIbylB+oZe3aHgBsqlNqKYH48jXyJKMuAbiyVJ8KzaB3eRc0pg9VwQ4niFryI68qiOi3AbjwdsfnAtk0bCjTLJKr6mrD9g8iq/S/B81hguOMlQTnVyG40wAcjnmgsCNESDrjme7wfftP4P7SP4N3CJZdvzoNyGq2c/HWOXJGsvVg+RA/k2MC/wN6I2YA2Pt8GkAAAAASUVORK5CYII=)!important}#toast-container>.toast-success{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADsSURBVEhLY2AYBfQMgf///3P8+/evAIgvA/FsIF+BavYDDWMBGroaSMMBiE8VC7AZDrIFaMFnii3AZTjUgsUUWUDA8OdAH6iQbQEhw4HyGsPEcKBXBIC4ARhex4G4BsjmweU1soIFaGg/WtoFZRIZdEvIMhxkCCjXIVsATV6gFGACs4Rsw0EGgIIH3QJYJgHSARQZDrWAB+jawzgs+Q2UO49D7jnRSRGoEFRILcdmEMWGI0cm0JJ2QpYA1RDvcmzJEWhABhD/pqrL0S0CWuABKgnRki9lLseS7g2AlqwHWQSKH4oKLrILpRGhEQCw2LiRUIa4lwAAAABJRU5ErkJggg==)!important}#toast-container>.toast-warning{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGYSURBVEhL5ZSvTsNQFMbXZGICMYGYmJhAQIJAICYQPAACiSDB8AiICQQJT4CqQEwgJvYASAQCiZiYmJhAIBATCARJy+9rTsldd8sKu1M0+dLb057v6/lbq/2rK0mS/TRNj9cWNAKPYIJII7gIxCcQ51cvqID+GIEX8ASG4B1bK5gIZFeQfoJdEXOfgX4QAQg7kH2A65yQ87lyxb27sggkAzAuFhbbg1K2kgCkB1bVwyIR9m2L7PRPIhDUIXgGtyKw575yz3lTNs6X4JXnjV+LKM/m3MydnTbtOKIjtz6VhCBq4vSm3ncdrD2lk0VgUXSVKjVDJXJzijW1RQdsU7F77He8u68koNZTz8Oz5yGa6J3H3lZ0xYgXBK2QymlWWA+RWnYhskLBv2vmE+hBMCtbA7KX5drWyRT/2JsqZ2IvfB9Y4bWDNMFbJRFmC9E74SoS0CqulwjkC0+5bpcV1CZ8NMej4pjy0U+doDQsGyo1hzVJttIjhQ7GnBtRFN1UarUlH8F3xict+HY07rEzoUGPlWcjRFRr4/gChZgc3ZL2d8oAAAAASUVORK5CYII=)!important}#toast-container.toast-bottom-center>div,#toast-container.toast-top-center>div{width:300px;margin-left:auto;margin-right:auto}#toast-container.toast-bottom-full-width>div,#toast-container.toast-top-full-width>div{width:96%;margin-left:auto;margin-right:auto}.toast{background-color:#030303}.toast-success{background-color:#51A351}.toast-error{background-color:#BD362F}.toast-info{background-color:#2F96B4}.toast-warning{background-color:#F89406}.toast-progress{position:absolute;left:0;bottom:0;height:4px;background-color:#000;opacity:.4;-ms-filter:progid:DXImageTransform.Microsoft.Alpha(Opacity=40);filter:alpha(opacity=40)}@media all and (max-width:240px){#toast-container>div{padding:8px 8px 8px 50px;width:11em}#toast-container>div.rtl{padding:8px 50px 8px 8px}#toast-container .toast-close-button{right:-.2em;top:-.2em}#toast-container .rtl .toast-close-button{left:-.2em;right:.2em}}@media all and (min-width:241px) and (max-width:480px){#toast-container>div{padding:8px 8px 8px 50px;width:18em}#toast-container>div.rtl{padding:8px 50px 8px 8px}#toast-container .toast-close-button{right:-.2em;top:-.2em}#toast-container .rtl .toast-close-button{left:-.2em;right:.2em}}@media all and (min-width:481px) and (max-width:768px){#toast-container>div{padding:15px 15px 15px 50px;width:25em}#toast-container>div.rtl{padding:15px 50px 15px 15px}}
\ No newline at end of file
diff --git a/inc/common.inc.php b/inc/common.inc.php
index 920e0787..c4a7d237 100644
--- a/inc/common.inc.php
+++ b/inc/common.inc.php
@@ -2142,4 +2142,16 @@ function mfh_get_stars($rating) {
     }
 
     return $markup;
+}
+
+function mfh_get_hidden_fields_for_language($keys) {
+    global $hesklang;
+
+    $output = '<div class="hide">';
+    foreach ($keys as $key) {
+        $output .= sprintf('<p id="lang_%s">%s</p>', $key, $hesklang[$key]);
+    }
+    $output .= '</div>';
+
+    return $output;
 }
\ No newline at end of file
diff --git a/inc/headerAdmin.inc.php b/inc/headerAdmin.inc.php
index 710cf922..c009c3bf 100644
--- a/inc/headerAdmin.inc.php
+++ b/inc/headerAdmin.inc.php
@@ -60,11 +60,12 @@ $modsForHesk_settings = mfh_getSettings();
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/bootstrap-colorpicker.min.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/AdminLTE.min.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/skins/_all-skins.min.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
+    <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/jquery.fancybox.min.css?v=<?php echo MODS_FOR_HESK_BUILD ?>">
+    <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/toastr.min.css?v=<?php echo MODS_FOR_HESK_BUILD ?>">
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/mods-for-hesk-new.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/colors.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/positions.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/displays.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
-    <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/jquery.fancybox.min.css?v=<? echo MODS_FOR_HESK_BUILD ?>">
     <?php if (defined('USE_JQUERY_2')): ?>
         <script src="<?php echo HESK_PATH; ?>js/jquery-2.2.4.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
     <?php else: ?>
@@ -89,6 +90,9 @@ $modsForHesk_settings = mfh_getSettings();
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/jquery.jgrowl.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/bootstrap-colorpicker.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/jquery.slimscroll.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
+    <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/toastr.min.js?v=<?php echo MODS_FOR_HESK_BUILD ?>"></script>
+    <script type="text/javascript" src="<?php echo HESK_PATH; ?>internal-api/js/alerts.js?v=<?php echo MODS_FOR_HESK_BUILD ?>"></script>
+    <script type="text/javascript" src="<?php echo HESK_PATH; ?>internal-api/js/lang.js?v=<?php echo MODS_FOR_HESK_BUILD ?>"></script>
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/jquery.fancybox.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
     <?php
     if (defined('EXTRA_JS')) {
@@ -249,7 +253,11 @@ if (defined('MFH_PAGE_LAYOUT') && MFH_PAGE_LAYOUT == 'TOP_ONLY') {
 ?>
 <body onload="<?php echo $onload;
 unset($onload); ?>" class="<?php echo $layout_tag ?> fixed js <?php echo $modsForHesk_settings['admin_color_scheme']; ?>">
-<span style="display: none" id="heskUrl"><?php echo $hesk_settings['hesk_url']; ?></span>
+
+<?php // GLOBAL JAVASCRIPT IDs ?>
+<p style="display: none" id="heskUrl"><?php echo $hesk_settings['hesk_url']; ?></p>
+<p style="display: none" id="lang_alert_success"><?php echo $hesklang['alert_success']; ?></p>
+<p style="display: none" id="lang_alert_error"><?php echo $hesklang['alert_error']; ?></p>
 
 <?php
 include(HESK_PATH . 'header.txt');
diff --git a/internal-api/js/alerts.js b/internal-api/js/alerts.js
new file mode 100644
index 00000000..d4f4a8c3
--- /dev/null
+++ b/internal-api/js/alerts.js
@@ -0,0 +1,31 @@
+var mfhAlert = {
+    success: success,
+    error: error,
+    errorWithLog: errorWithLog
+};
+
+function success(message, title) {
+    if (title === undefined) {
+        title = $('#lang_alert_success').text();
+    }
+
+    toastr.success(message, title);
+}
+
+function error(message, title) {
+    if (title === undefined) {
+        title = $('#lang_alert_error').text();
+    }
+
+    toastr.error(message, title);
+}
+
+function errorWithLog(message, responseJSON, title) {
+    var displayMessage = message;
+    if (responseJSON !== undefined &&
+        responseJSON.logId !== undefined) {
+        displayMessage += ' (' + responseJSON.logId + ')';
+    }
+
+    mfhAlert.error(displayMessage, title);
+}
\ No newline at end of file
diff --git a/internal-api/js/lang.js b/internal-api/js/lang.js
new file mode 100644
index 00000000..d0f232cc
--- /dev/null
+++ b/internal-api/js/lang.js
@@ -0,0 +1,5 @@
+var mfhLang = {
+    text: function(key) {
+        return $('#lang_' + key).text();
+    }
+};
\ No newline at end of file
diff --git a/internal-api/js/manage-custom-nav-elements.js b/internal-api/js/manage-custom-nav-elements.js
index 328fd9c6..222eadc1 100644
--- a/internal-api/js/manage-custom-nav-elements.js
+++ b/internal-api/js/manage-custom-nav-elements.js
@@ -89,35 +89,51 @@ $(document).ready(function() {
             method = 'PUT';
         }
 
+        $modal.find('#action-buttons').find('.cancel-button').attr('disabled', 'disabled');
+        $modal.find('#action-buttons').find('.save-button').attr('disabled', 'disabled');
+
         $.ajax({
             method: method,
             url: url,
             headers: { 'X-Internal-Call': true },
             data: JSON.stringify(data),
             success: function(data) {
-                loadTable($modal);
+                if (id === -1) {
+                    mfhAlert.success(mfhLang.text('custom_nav_element_created'));
+                } else {
+                    mfhAlert.success(mfhLang.text('custom_nav_element_saved'));
+                }
+                $modal.modal('hide');
+                loadTable();
             },
             error: function(data) {
+                mfhAlert.error("[!]Error saving custom nav element (" + data.responseJSON.logId + ")");
                 console.error(data);
+            },
+            complete: function() {
+                $modal.find('#action-buttons').find('.cancel-button').removeAttr('disabled');
+                $modal.find('#action-buttons').find('.save-button').removeAttr('disabled');
             }
         });
     });
 });
 
-function loadTable(modalToClose) {
+function loadTable() {
+    $('#overlay').show();
     var heskUrl = $('#heskUrl').text();
-    var notFoundText = $('#lang_no_custom_nav_elements_found').text();
+    var notFoundText = mfhLang.text('no_custom_nav_elements_found');
     var places = [];
-    places[1] = 'Homepage - Block';
-    places[2] = 'Customer Navbar';
-    places[3] = 'Staff Navbar';
+    var $tableBody = $('#table-body');
+    places[1] = mfhLang.text('homepage_block');
+    places[2] = mfhLang.text('customer_navigation');
+    places[3] = mfhLang.text('staff_navigation');
 
     $.ajax({
         method: 'GET',
         url: heskUrl + '/api/v1-internal/custom-navigation/all',
         headers: { 'X-Internal-Call': true },
         success: function(data) {
-            $('#table-body').html('');
+            $tableBody.html('');
             elements = [];
 
             if (data.length === 0) {
@@ -125,17 +141,12 @@ function loadTable(modalToClose) {
                 return;
             }
 
-            $('#table-body').append('<tr><td colspan="6" class="bg-gray"><i><b>' + places[1] + '</b></i></td></tr>');
-            var currentPlace = 1;
+            var currentPlace = 0;
             var addedElementToPlace = false;
             var first = true;
             var lastElement = null;
             $.each(data, function() {
                 if (this.place !== currentPlace) {
-                    if (!addedElementToPlace) {
-                        $('#table-body').append('<tr><td colspan="6">' + notFoundText + '</td></tr>');
-                    }
-
                     if (lastElement !== null) {
                         //-- Hide the down arrow on the last element
                         $('[data-value="' + lastElement.id + '"]').parent().parent()
@@ -145,7 +156,6 @@ function loadTable(modalToClose) {
 
                     $('#table-body').append('<tr><td colspan="6" class="bg-gray"><i><b>' + places[this.place] + '</b></i></td></tr>');
                     currentPlace = this.place;
-                    console.log(this);
                     addedElementToPlace = false;
                     first = true;
                 }
@@ -181,7 +191,7 @@ function loadTable(modalToClose) {
                     first = false;
                 }
 
-                $('#table-body').append($template);
+                $tableBody.append($template);
 
                 elements[this.id] = this;
 
@@ -189,27 +199,14 @@ function loadTable(modalToClose) {
                 lastElement = this;
             });
 
-            //-- Add missing headers if no elements are in them
-            if (currentPlace === 1) {
-                $('#table-body').append('<tr><td colspan="6" class="bg-gray"><i><b>' + places[2] + '</b></i></td></tr>');
-                $('#table-body').append('<tr><td colspan="6">' + notFoundText + '</td></tr>');
-            }
-            if (currentPlace === 1 || currentPlace === 2) {
-                $('#table-body').append('<tr><td colspan="6" class="bg-gray"><i><b>' + places[3] + '</b></i></td></tr>');
-                $('#table-body').append('<tr><td colspan="6">' + notFoundText + '</td></tr>');
-            }
-
             if (lastElement) {
                 //-- Hide the down arrow on the last element
                 $('[data-value="' + lastElement.id + '"]').parent().parent()
                     .find('[data-direction="down"]').css('visibility', 'hidden');
             }
-
-            if (modalToClose !== undefined) {
-                modalToClose.modal('hide');
-            }
         },
         error: function(data) {
+            mfhAlert.errorWithLog(mfhLang.text('failed_to_load_custom_nav_elements'), data.responseJSON);
             console.error(data);
         },
         complete: function() {
@@ -229,6 +226,8 @@ function bindEditModal() {
         var element = elements[$(this).parent().parent().find('[data-property="id"]').text()];
         var $modal = $('#nav-element-modal');
 
+        $modal.find('#edit-label').show();
+        $modal.find('#crate-label').hide();
         $modal.find('select[name="place"]').val(element.place);
         $modal.find('input[name="id"]').val(element.id);
         $modal.find('input[name="url"]').val(element.url);
@@ -272,6 +271,8 @@ function bindEditModal() {
 function bindCreateModal() {
     $('#create-button').click(function() {
         var $modal = $('#nav-element-modal');
+        $modal.find('#edit-label').hide();
+        $modal.find('#crate-label').show();
         $modal.find('select[name="place"]').val(1);
         $modal.find('input[name="id"]').val(-1);
         var $textLanguages = $modal.find('[data-text-language]');
@@ -312,10 +313,12 @@ function bindDeleteButton() {
             url: heskUrl + '/api/v1-internal/custom-navigation/' + element.id,
             headers: { 'X-Internal-Call': true },
             success: function() {
-                console.log('DELETED!');
+                mfhAlert.success(mfhLang.text('custom_nav_element_deleted'));
                 loadTable();
             },
             error: function(data) {
+                $('#overlay').hide();
+                mfhAlert.errorWithLog(mfhLang.text('error_deleting_custom_nav_element'), data.responseJSON);
                 console.error(data);
             }
         });
@@ -334,10 +337,10 @@ function bindSortButtons() {
             url: heskUrl + '/api/v1-internal/custom-navigation/' + element.id + '/sort/' + direction,
             headers: { 'X-Internal-Call': true },
             success: function() {
-                console.log('Resorted');
                 loadTable();
             },
             error: function(data) {
+                mfhAlert.errorWithLog(mfhLang.text('error_sorting_custom_nav_elements'), data.responseJSON);
                 console.error(data);
                 $('#overlay').hide();
             }
diff --git a/js/modsForHesk-javascript.js b/js/modsForHesk-javascript.js
index 9e9e3e26..535ec778 100644
--- a/js/modsForHesk-javascript.js
+++ b/js/modsForHesk-javascript.js
@@ -84,7 +84,11 @@ var loadJquery = function()
     $('[data-hide]').click(function() {
         var hide = $(this).attr('data-hide');
         $('#' + hide).hide();
-    })
+    });
+
+    //-- Initialize toastr properties
+    toastr.options.progressBar = true;
+    toastr.options.closeButton = true;
 };
 
 function refreshBackgroundVolatileItems() {
diff --git a/js/toastr.min.js b/js/toastr.min.js
new file mode 100644
index 00000000..7c0c07c2
--- /dev/null
+++ b/js/toastr.min.js
@@ -0,0 +1,2 @@
+!function(e){e(["jquery"],function(e){return function(){function t(e,t,n){return g({type:O.error,iconClass:m().iconClasses.error,message:e,optionsOverride:n,title:t})}function n(t,n){return t||(t=m()),v=e("#"+t.containerId),v.length?v:(n&&(v=d(t)),v)}function o(e,t,n){return g({type:O.info,iconClass:m().iconClasses.info,message:e,optionsOverride:n,title:t})}function s(e){C=e}function i(e,t,n){return g({type:O.success,iconClass:m().iconClasses.success,message:e,optionsOverride:n,title:t})}function a(e,t,n){return g({type:O.warning,iconClass:m().iconClasses.warning,message:e,optionsOverride:n,title:t})}function r(e,t){var o=m();v||n(o),u(e,o,t)||l(o)}function c(t){var o=m();return v||n(o),t&&0===e(":focus",t).length?void h(t):void(v.children().length&&v.remove())}function l(t){for(var n=v.children(),o=n.length-1;o>=0;o--)u(e(n[o]),t)}function u(t,n,o){var s=!(!o||!o.force)&&o.force;return!(!t||!s&&0!==e(":focus",t).length)&&(t[n.hideMethod]({duration:n.hideDuration,easing:n.hideEasing,complete:function(){h(t)}}),!0)}function d(t){return v=e("<div/>").attr("id",t.containerId).addClass(t.positionClass),v.appendTo(e(t.target)),v}function p(){return{tapToDismiss:!0,toastClass:"toast",containerId:"toast-container",debug:!1,showMethod:"fadeIn",showDuration:300,showEasing:"swing",onShown:void 0,hideMethod:"fadeOut",hideDuration:1e3,hideEasing:"swing",onHidden:void 0,closeMethod:!1,closeDuration:!1,closeEasing:!1,closeOnHover:!0,extendedTimeOut:1e3,iconClasses:{error:"toast-error",info:"toast-info",success:"toast-success",warning:"toast-warning"},iconClass:"toast-info",positionClass:"toast-top-right",timeOut:5e3,titleClass:"toast-title",messageClass:"toast-message",escapeHtml:!1,target:"body",closeHtml:'<button type="button">&times;</button>',closeClass:"toast-close-button",newestOnTop:!0,preventDuplicates:!1,progressBar:!1,progressClass:"toast-progress",rtl:!1}}function f(e){C&&C(e)}function g(t){function o(e){return null==e&&(e=""),e.replace(/&/g,"&amp;").replace(/"/g,"&quot;").replace(/'/g,"&#39;").replace(/</g,"&lt;").replace(/>/g,"&gt;")}function s(){c(),u(),d(),p(),g(),C(),l(),i()}function i(){var e="";switch(t.iconClass){case"toast-success":case"toast-info":e="polite";break;default:e="assertive"}I.attr("aria-live",e)}function a(){E.closeOnHover&&I.hover(H,D),!E.onclick&&E.tapToDismiss&&I.click(b),E.closeButton&&j&&j.click(function(e){e.stopPropagation?e.stopPropagation():void 0!==e.cancelBubble&&e.cancelBubble!==!0&&(e.cancelBubble=!0),E.onCloseClick&&E.onCloseClick(e),b(!0)}),E.onclick&&I.click(function(e){E.onclick(e),b()})}function r(){I.hide(),I[E.showMethod]({duration:E.showDuration,easing:E.showEasing,complete:E.onShown}),E.timeOut>0&&(k=setTimeout(b,E.timeOut),F.maxHideTime=parseFloat(E.timeOut),F.hideEta=(new Date).getTime()+F.maxHideTime,E.progressBar&&(F.intervalId=setInterval(x,10)))}function c(){t.iconClass&&I.addClass(E.toastClass).addClass(y)}function l(){E.newestOnTop?v.prepend(I):v.append(I)}function u(){if(t.title){var e=t.title;E.escapeHtml&&(e=o(t.title)),M.append(e).addClass(E.titleClass),I.append(M)}}function d(){if(t.message){var e=t.message;E.escapeHtml&&(e=o(t.message)),B.append(e).addClass(E.messageClass),I.append(B)}}function p(){E.closeButton&&(j.addClass(E.closeClass).attr("role","button"),I.prepend(j))}function g(){E.progressBar&&(q.addClass(E.progressClass),I.prepend(q))}function C(){E.rtl&&I.addClass("rtl")}function O(e,t){if(e.preventDuplicates){if(t.message===w)return!0;w=t.message}return!1}function b(t){var n=t&&E.closeMethod!==!1?E.closeMethod:E.hideMethod,o=t&&E.closeDuration!==!1?E.closeDuration:E.hideDuration,s=t&&E.closeEasing!==!1?E.closeEasing:E.hideEasing;if(!e(":focus",I).length||t)return clearTimeout(F.intervalId),I[n]({duration:o,easing:s,complete:function(){h(I),clearTimeout(k),E.onHidden&&"hidden"!==P.state&&E.onHidden(),P.state="hidden",P.endTime=new Date,f(P)}})}function D(){(E.timeOut>0||E.extendedTimeOut>0)&&(k=setTimeout(b,E.extendedTimeOut),F.maxHideTime=parseFloat(E.extendedTimeOut),F.hideEta=(new Date).getTime()+F.maxHideTime)}function H(){clearTimeout(k),F.hideEta=0,I.stop(!0,!0)[E.showMethod]({duration:E.showDuration,easing:E.showEasing})}function x(){var e=(F.hideEta-(new Date).getTime())/F.maxHideTime*100;q.width(e+"%")}var E=m(),y=t.iconClass||E.iconClass;if("undefined"!=typeof t.optionsOverride&&(E=e.extend(E,t.optionsOverride),y=t.optionsOverride.iconClass||y),!O(E,t)){T++,v=n(E,!0);var k=null,I=e("<div/>"),M=e("<div/>"),B=e("<div/>"),q=e("<div/>"),j=e(E.closeHtml),F={intervalId:null,hideEta:null,maxHideTime:null},P={toastId:T,state:"visible",startTime:new Date,options:E,map:t};return s(),r(),a(),f(P),E.debug&&console&&console.log(P),I}}function m(){return e.extend({},p(),b.options)}function h(e){v||(v=n()),e.is(":visible")||(e.remove(),e=null,0===v.children().length&&(v.remove(),w=void 0))}var v,C,w,T=0,O={error:"error",info:"info",success:"success",warning:"warning"},b={clear:r,remove:c,error:t,getContainer:n,info:o,options:{},subscribe:s,success:i,version:"2.1.3",warning:a};return b}()})}("function"==typeof define&&define.amd?define:function(e,t){"undefined"!=typeof module&&module.exports?module.exports=t(require("jquery")):window.toastr=t(window.jQuery)});
+//# sourceMappingURL=toastr.js.map
diff --git a/language/en/text.php b/language/en/text.php
index 77c69ffb..ba6d580f 100644
--- a/language/en/text.php
+++ b/language/en/text.php
@@ -52,8 +52,30 @@ $hesklang['resend_email_notification'] = 'Re-send Email Notification';
 $hesklang['email_notification_sent'] = 'Email notification sent!';
 $hesklang['email_notification_resend_failed'] = 'Error occurred when trying to send notification email.';
 $hesklang['edit_category'] = 'Edit Category';
+$hesklang['custom_nav_menu_elements'] = 'Custom Nav Menu Elements';
+$hesklang['create_new'] = 'Create New';
 $hesklang['custom_nav_element_deleted'] = 'Custom Navigation Element Deleted!';
 $hesklang['no_custom_nav_elements_found'] = 'No custom nav menu elements found';
+$hesklang['alert_success'] = 'Success'; // Used for alert messages
+$hesklang['alert_error'] = 'Error'; // Used for alert messages
+$hesklang['failed_to_load_custom_nav_elements'] = 'Failed to load custom nav elements!';
+$hesklang['custom_nav_element_deleted'] = 'Custom nav element deleted!';
+$hesklang['error_deleting_custom_nav_element'] = 'Error deleting custom nav element!';
+$hesklang['error_sorting_custom_nav_elements'] = 'Error sorting custom nav elements!';
+$hesklang['custom_nav_element_created'] = 'Custom nav element created!';
+$hesklang['custom_nav_element_saved'] = 'Custom nav element saved!';
+$hesklang['homepage_block'] = 'Homepage - Block';
+$hesklang['customer_navigation'] = 'Customer Navigation';
+$hesklang['staff_navigation'] = 'Staff Navigation';
+$hesklang['custom_nav_text'] = 'Text';
+$hesklang['custom_nav_subtext'] = 'Subtext';
+$hesklang['image_url_slash_font_icon'] = 'Image URL / Font Icon';
+$hesklang['edit_custom_nav_element_title_case'] = 'Edit Custom Nav Element';
+$hesklang['create_custom_nav_element_title_case'] = 'Create Custom Nav Element';
+$hesklang['place'] = 'Place';
+$hesklang['image_type'] = 'Image Type';
+$hesklang['image_url'] = 'Image URL';
+$hesklang['font_icon'] = 'Font Icon';
 
 // ADDED OR MODIFIED IN Mods for HESK 3.0.0
 $hesklang['you_have_x_messages'] = 'You have %s new %s'; // %s: Number of new messages, "message" or "messages", depending on # 

From b82293d96dfa6e4b8e6ee5b3548fac4f1fed46eb Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Mon, 22 May 2017 13:10:26 -0400
Subject: [PATCH 137/192] Custom nav elements now working on proper pages

---
 admin/manage_custom_nav_elements.php          | 22 +++++++++++--
 admin/service_messages.php                    |  2 +-
 inc/header.inc.php                            | 21 +++++++++++-
 inc/show_admin_nav.inc.php                    | 21 +++++++++++-
 index.php                                     | 33 ++++++++++++++++++-
 internal-api/js/manage-custom-nav-elements.js |  9 ++---
 language/en/text.php                          |  4 +++
 7 files changed, 101 insertions(+), 11 deletions(-)

diff --git a/admin/manage_custom_nav_elements.php b/admin/manage_custom_nav_elements.php
index 821b0cdf..30fca626 100644
--- a/admin/manage_custom_nav_elements.php
+++ b/admin/manage_custom_nav_elements.php
@@ -88,7 +88,12 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                     <div class="row">
                         <div class="col-md-12">
                             <div class="form-group">
-                                <label for="place" class="col-md-4 col-sm-12 control-label"><?php echo $hesklang['place']; ?></label>
+                                <label for="place" class="col-md-4 col-sm-12 control-label">
+                                    <?php echo $hesklang['place']; ?>
+                                    <i class="fa fa-question-circle settingsquestionmark" data-toggle="htmlpopover"
+                                       title="<?php echo $hesklang['place']; ?>"
+                                       data-content="<?php echo $hesklang['place_help']; ?>"></i>
+                                </label>
                                 <div class="col-md-8 col-sm-12">
                                     <select name="place" id="place" class="form-control"
                                             data-error="<?php echo htmlspecialchars($hesklang['this_field_is_required']); ?>"
@@ -142,7 +147,12 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                         <div class="col-md-6 col-sm-12">
                             <h4><?php echo $hesklang['url']; ?></h4>
                             <div class="form-group">
-                                <label for="image-type" class="col-md-4 col-sm-12 control-label"><?php echo $hesklang['url']; ?></label>
+                                <label for="image-type" class="col-md-4 col-sm-12 control-label">
+                                    <?php echo $hesklang['url']; ?>
+                                    <i class="fa fa-question-circle settingsquestionmark" data-toggle="htmlpopover"
+                                       title="<?php echo $hesklang['url']; ?>"
+                                       data-content="<?php echo $hesklang['url_help']; ?>"></i>
+                                </label>
                                 <div class="col-md-8 col-sm-12">
                                     <input type="text" name="url" class="form-control"
                                            data-error="<?php echo htmlspecialchars($hesklang['this_field_is_required']); ?>"
@@ -164,7 +174,12 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                                 </div>
                             </div>
                             <div class="form-group" id="image-url-group">
-                                <label for="image-url" class="col-md-4 col-sm-12 control-label"><?php echo $hesklang['image_url']; ?></label>
+                                <label for="image-url" class="col-md-4 col-sm-12 control-label">
+                                    <?php echo $hesklang['image_url']; ?>
+                                    <i class="fa fa-question-circle settingsquestionmark" data-toggle="htmlpopover"
+                                       title="<?php echo $hesklang['image_url']; ?>"
+                                       data-content="<?php echo $hesklang['image_url_help']; ?>"></i>
+                                </label>
                                 <div class="col-md-8 col-sm-12">
                                     <input type="text" name="image-url" class="form-control"
                                            data-error="<?php echo htmlspecialchars($hesklang['this_field_is_required']); ?>"
@@ -219,6 +234,7 @@ echo mfh_get_hidden_fields_for_language(
         'homepage_block',
         'customer_navigation',
         'staff_navigation',
+        'error_saving_custom_nav_element',
     )
 );
 ?>
diff --git a/admin/service_messages.php b/admin/service_messages.php
index 580d0012..f34f23ed 100644
--- a/admin/service_messages.php
+++ b/admin/service_messages.php
@@ -361,7 +361,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                                                 <p style="display:none"
                                                    id="footer-icon"><?php echo $hesklang['sm_iconpicker_footer_label']; ?></p>
 
-                                                <div name="icon" class="btn btn-default iconpicker-container" data-toggle="iconpicker"
+                                                <div class="btn btn-default iconpicker-container" data-toggle="iconpicker"
                                                      data-icon="<?php echo $icon; ?>"></div>
                                             </div>
                                         </div>
diff --git a/inc/header.inc.php b/inc/header.inc.php
index ef257049..ebc825e4 100644
--- a/inc/header.inc.php
+++ b/inc/header.inc.php
@@ -325,7 +325,26 @@ if ($modsForHesk_settings['show_icons']) {
                     <a href="<?php echo HESK_PATH; ?>calendar.php"><i class="fa fa-calendar" <?php echo $iconDisplay; ?>></i>&nbsp;<?php echo $hesklang['calendar_title_case']; ?></a>
                 </li>
                 <?php endif; ?>
-                <?php include('custom/header-custom.inc.php'); ?>
+                <?php
+                $customNavRs = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "custom_nav_element` AS `t1`
+                    INNER JOIN `" . hesk_dbEscape($hesk_settings['db_pfix']) . "custom_nav_element_to_text` AS `t2`
+                        ON `t1`.`id` = `t2`.`nav_element_id`
+                        AND `t2`.`language` = '" . hesk_dbEscape($hesk_settings['language']) . "'
+                    WHERE `t1`.`place` = 2");
+
+                while ($row = hesk_dbFetchAssoc($customNavRs)):
+                ?>
+                    <li>
+                        <a href="<?php echo $row['url']; ?>">
+                            <?php if ($row['image_url'] !== null): ?>
+                                <img src="<?php echo $row['image_url']; ?>" alt="<?php echo $row['text']; ?>" <?php echo $iconDisplay; ?>>
+                            <?php else: ?>
+                                <i class="<?php echo $row['font_icon']; ?>" <?php echo $iconDisplay; ?>></i>
+                            <?php endif; ?>
+                            <?php echo $row['text']; ?>
+                        </a>
+                    </li>
+                <?php endwhile; ?>
             </ul>
             <?php if ($hesk_settings['can_sel_lang']) { ?>
                 <div class="navbar-form navbar-right" role="search" style="margin-right: 20px; min-width: 80px;">
diff --git a/inc/show_admin_nav.inc.php b/inc/show_admin_nav.inc.php
index 4860c2a2..f26f1beb 100644
--- a/inc/show_admin_nav.inc.php
+++ b/inc/show_admin_nav.inc.php
@@ -123,7 +123,26 @@ $mails = mfh_get_mail_headers_for_dropdown($_SESSION['id'], $hesk_settings, $hes
                         </li>
                         <?php
                     endif;
-                    ?>
+
+                    $customNavRs = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "custom_nav_element` AS `t1`
+                    INNER JOIN `" . hesk_dbEscape($hesk_settings['db_pfix']) . "custom_nav_element_to_text` AS `t2`
+                        ON `t1`.`id` = `t2`.`nav_element_id`
+                        AND `t2`.`language` = '" . hesk_dbEscape($hesk_settings['language']) . "'
+                    WHERE `t1`.`place` = 3");
+
+                    while ($row = hesk_dbFetchAssoc($customNavRs)):
+                        ?>
+                        <li>
+                            <a href="<?php echo $row['url']; ?>">
+                                <?php if ($row['image_url'] !== null): ?>
+                                    <img src="<?php echo $row['image_url']; ?>" alt="<?php echo $row['text']; ?>" <?php echo $iconDisplay; ?>>
+                                <?php else: ?>
+                                    <i class="<?php echo $row['font_icon']; ?>" <?php echo $iconDisplay; ?>></i>
+                                <?php endif; ?>
+                                <?php echo $row['text']; ?>
+                            </a>
+                        </li>
+                    <?php endwhile; ?>
                 </ul>
             </div>
             <!-- Navbar Right Menu -->
diff --git a/index.php b/index.php
index 41fddc81..12165ed7 100644
--- a/index.php
+++ b/index.php
@@ -1391,7 +1391,38 @@ function print_start()
                         </div>
                     </a>
                 </div>
-            <?php endif; ?>
+            <?php endif;
+
+            $customNavRs = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "custom_nav_element` AS `t1`
+                    INNER JOIN `" . hesk_dbEscape($hesk_settings['db_pfix']) . "custom_nav_element_to_text` AS `t2`
+                        ON `t1`.`id` = `t2`.`nav_element_id`
+                        AND `t2`.`language` = '" . hesk_dbEscape($hesk_settings['language']) . "'
+                    WHERE `t1`.`place` = 1");
+
+            while ($row = hesk_dbFetchAssoc($customNavRs)):
+                ?>
+                <div class="col-sm-6 col-xs-12">
+                    <a href="<?php echo $row['url']; ?>" class="button-link">
+                        <div class="panel panel-default">
+                            <div class="panel-body">
+                                <div class="row">
+                                    <div class="col-xs-1">
+                                        <?php if ($row['image_url'] !== null): ?>
+                                            <img src="<?php echo $row['image_url']; ?>" alt="<?php echo $row['text']; ?>">
+                                        <?php else: ?>
+                                            <i class="<?php echo $row['font_icon']; ?> black" style="font-size: 32px"></i>
+                                        <?php endif; ?>
+                                    </div>
+                                    <div class="col-xs-11">
+                                        <b><?php echo $row['text']; ?></b><br>
+                                        <?php echo $row['subtext']; ?>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </a>
+                </div>
+            <?php endwhile; ?>
             </div>
             <?php
             if ($hesk_settings['kb_enable'])
diff --git a/internal-api/js/manage-custom-nav-elements.js b/internal-api/js/manage-custom-nav-elements.js
index 222eadc1..7c32619b 100644
--- a/internal-api/js/manage-custom-nav-elements.js
+++ b/internal-api/js/manage-custom-nav-elements.js
@@ -14,6 +14,7 @@ $(document).ready(function() {
         searchText: $('#search-icon').text(),
         labelFooter: $('#footer-icon').text(),
         resetButton: false,
+        search: false,
         icon: 'fa fa-adn'
     });
 
@@ -107,7 +108,7 @@ $(document).ready(function() {
                 loadTable();
             },
             error: function(data) {
-                mfhAlert.error("[!]Error saving custom nav element (" + data.responseJSON.logId + ")");
+                mfhAlert.errorWithLog(mfhLang.text('error_saving_custom_nav_element'), data.responseJSON);
                 console.error(data);
             },
             complete: function() {
@@ -227,7 +228,7 @@ function bindEditModal() {
         var $modal = $('#nav-element-modal');
 
         $modal.find('#edit-label').show();
-        $modal.find('#crate-label').hide();
+        $modal.find('#create-label').hide();
         $modal.find('select[name="place"]').val(element.place);
         $modal.find('input[name="id"]').val(element.id);
         $modal.find('input[name="url"]').val(element.url);
@@ -258,7 +259,7 @@ function bindEditModal() {
             $modal.find('#image-url-group').show();
         } else {
             $modal.find('select[name="image-type"]').val('font-icon');
-            $('[data-toggle="iconpicker"]').iconpicker('setIcon', element.fontIcon);
+            $('[data-toggle="nav-iconpicker"]').iconpicker('setIcon', element.fontIcon);
             $modal.find('#font-icon-group').show();
             $modal.find('#image-url-group').hide();
         }
@@ -272,7 +273,7 @@ function bindCreateModal() {
     $('#create-button').click(function() {
         var $modal = $('#nav-element-modal');
         $modal.find('#edit-label').hide();
-        $modal.find('#crate-label').show();
+        $modal.find('#create-label').show();
         $modal.find('select[name="place"]').val(1);
         $modal.find('input[name="id"]').val(-1);
         var $textLanguages = $modal.find('[data-text-language]');
diff --git a/language/en/text.php b/language/en/text.php
index ba6d580f..16fa082b 100644
--- a/language/en/text.php
+++ b/language/en/text.php
@@ -75,7 +75,11 @@ $hesklang['create_custom_nav_element_title_case'] = 'Create Custom Nav Element';
 $hesklang['place'] = 'Place';
 $hesklang['image_type'] = 'Image Type';
 $hesklang['image_url'] = 'Image URL';
+$hesklang['image_url_help'] = 'The URL of the image you wish to use. For customer/staff navigation, recommended size is <b>16x16px</b>. For the homepage blocks, recommended size is <b>32x32px</b>.';
 $hesklang['font_icon'] = 'Font Icon';
+$hesklang['error_saving_custom_nav_element'] = 'Error saving custom nav element!';
+$hesklang['place_help'] = 'The location of the custom navigation element.';
+$hesklang['url_help'] = 'The URL where the user should be taken to. Both relative and absolute URLs are supported.';
 
 // ADDED OR MODIFIED IN Mods for HESK 3.0.0
 $hesklang['you_have_x_messages'] = 'You have %s new %s'; // %s: Number of new messages, "message" or "messages", depending on # 

From f96095ad4203cb8762c81512edff1539c13f1935 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Mon, 22 May 2017 13:13:10 -0400
Subject: [PATCH 138/192] Add back name attribute

---
 admin/service_messages.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/service_messages.php b/admin/service_messages.php
index f34f23ed..580d0012 100644
--- a/admin/service_messages.php
+++ b/admin/service_messages.php
@@ -361,7 +361,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                                                 <p style="display:none"
                                                    id="footer-icon"><?php echo $hesklang['sm_iconpicker_footer_label']; ?></p>
 
-                                                <div class="btn btn-default iconpicker-container" data-toggle="iconpicker"
+                                                <div name="icon" class="btn btn-default iconpicker-container" data-toggle="iconpicker"
                                                      data-icon="<?php echo $icon; ?>"></div>
                                             </div>
                                         </div>

From 6ec70580947a42497773e7293db9583aeb41430c Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Mon, 22 May 2017 21:43:45 -0400
Subject: [PATCH 139/192] Replace jGrowl with Toastr'

---
 css/jquery.jgrowl.min.css                     |  1 -
 inc/header.inc.php                            |  4 ++--
 inc/headerAdmin.inc.php                       |  2 --
 internal-api/js/admin-ticket.js               |  8 ++++----
 .../mods-for-hesk-calendar-admin-readonly.js  |  2 +-
 .../mods-for-hesk-calendar-readonly.js        |  2 +-
 js/calendar/mods-for-hesk-calendar.js         | 20 +++++++++----------
 js/jquery.jgrowl.min.js                       |  2 --
 8 files changed, 18 insertions(+), 23 deletions(-)
 delete mode 100755 css/jquery.jgrowl.min.css
 delete mode 100755 js/jquery.jgrowl.min.js

diff --git a/css/jquery.jgrowl.min.css b/css/jquery.jgrowl.min.css
deleted file mode 100755
index a12f907e..00000000
--- a/css/jquery.jgrowl.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.jGrowl{z-index:9999;color:#fff;font-size:12px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;position:fixed}.jGrowl.top-left{left:0;top:0}.jGrowl.top-right{right:0;top:0}.jGrowl.bottom-left{left:0;bottom:0}.jGrowl.bottom-right{right:0;bottom:0}.jGrowl.center{top:0;width:50%;left:25%}.jGrowl.center .jGrowl-closer,.jGrowl.center .jGrowl-notification{margin-left:auto;margin-right:auto}.jGrowl-notification{background-color:#000;opacity:.9;filter:progid:DXImageTransform.Microsoft.Alpha(Opacity=(0.9*100));-ms-filter:progid:DXImageTransform.Microsoft.Alpha(Opacity=(0.9*100));zoom:1;width:250px;padding:10px;margin:10px;text-align:left;display:none;border-radius:5px;min-height:40px}.jGrowl-notification .ui-state-highlight,.jGrowl-notification .ui-widget-content .ui-state-highlight,.jGrowl-notification .ui-widget-header .ui-state-highlight{border:1px solid #000;background:#000;color:#fff}.jGrowl-notification .jGrowl-header{font-weight:700;font-size:.85em}.jGrowl-notification .jGrowl-close{background-color:transparent;color:inherit;border:none;z-index:99;float:right;font-weight:700;font-size:1em;cursor:pointer}.jGrowl-closer{background-color:#000;opacity:.9;filter:progid:DXImageTransform.Microsoft.Alpha(Opacity=(0.9*100));-ms-filter:progid:DXImageTransform.Microsoft.Alpha(Opacity=(0.9*100));zoom:1;width:250px;padding:10px;margin:10px;display:none;border-radius:5px;padding-top:4px;padding-bottom:4px;cursor:pointer;font-size:.9em;font-weight:700;text-align:center}.jGrowl-closer .ui-state-highlight,.jGrowl-closer .ui-widget-content .ui-state-highlight,.jGrowl-closer .ui-widget-header .ui-state-highlight{border:1px solid #000;background:#000;color:#fff}@media print{.jGrowl{display:none}}
\ No newline at end of file
diff --git a/inc/header.inc.php b/inc/header.inc.php
index ebc825e4..0d8d4911 100644
--- a/inc/header.inc.php
+++ b/inc/header.inc.php
@@ -87,9 +87,9 @@ if (is_dir(HESK_PATH . 'install')) {
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/dropzone-basic.min.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/fullcalendar.min.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/bootstrap-clockpicker.min.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
-    <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/jquery.jgrowl.min.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/bootstrap-colorpicker.min.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/jquery.fancybox.min.css?v=<? echo MODS_FOR_HESK_BUILD ?>">
+    <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/toastr.min.css?v=<?php echo MODS_FOR_HESK_BUILD ?>">   
     <?php if (defined('USE_JQUERY_2')): ?>
         <script src="<?php echo HESK_PATH; ?>js/jquery-2.2.4.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
     <?php else: ?>
@@ -110,9 +110,9 @@ if (is_dir(HESK_PATH . 'install')) {
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/platform.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/bootstrap-validator.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>internal-api/js/core.php?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
-    <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/jquery.jgrowl.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/bootstrap-colorpicker.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/jquery.fancybox.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
+    <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/toastr.min.js?v=<?php echo MODS_FOR_HESK_BUILD ?>"></script>
     <style>
         .navbar-default {
             background-color: <?php echo $modsForHesk_settings['navbarBackgroundColor']; ?>;
diff --git a/inc/headerAdmin.inc.php b/inc/headerAdmin.inc.php
index c009c3bf..05bfd004 100644
--- a/inc/headerAdmin.inc.php
+++ b/inc/headerAdmin.inc.php
@@ -56,7 +56,6 @@ $modsForHesk_settings = mfh_getSettings();
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/dropzone-basic.min.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/fullcalendar.min.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/bootstrap-clockpicker.min.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
-    <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/jquery.jgrowl.min.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/bootstrap-colorpicker.min.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/AdminLTE.min.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/skins/_all-skins.min.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
@@ -87,7 +86,6 @@ $modsForHesk_settings = mfh_getSettings();
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/platform.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/bootstrap-validator.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>internal-api/js/core-admin.php?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
-    <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/jquery.jgrowl.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/bootstrap-colorpicker.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/jquery.slimscroll.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/toastr.min.js?v=<?php echo MODS_FOR_HESK_BUILD ?>"></script>
diff --git a/internal-api/js/admin-ticket.js b/internal-api/js/admin-ticket.js
index 4c654f13..ea7de91e 100644
--- a/internal-api/js/admin-ticket.js
+++ b/internal-api/js/admin-ticket.js
@@ -27,13 +27,13 @@ $(document).ready(function() {
                 dueDate: newDueDate
             },
             success: function() {
-                $.jGrowl($('#lang_ticket_due_date_updated').text(), { theme: 'alert-success', closeTemplate: '' });
+                mfhAlert.success(mfhLang.text('ticket_due_date_updated'));
                 $readonlyDueDateContainer.find('span#due-date').text(newDueDate == '' ? $('#lang_none').text() : newDueDate);
                 $readonlyDueDateContainer.show();
                 $editableDueDateContainer.hide();
             },
             error: function() {
-                $.jGrowl($('#lang_error_updating_ticket_due_date').text(), { theme: 'alert-danger', closeTemplate: '' });
+                mfhAlert.error(mfhLang.text('error_updating_ticket_due_date'));
             }
         });
     });
@@ -61,10 +61,10 @@ $(document).ready(function() {
             url: apiUrl,
             headers: { 'X-Internal-Call': true },
             success: function() {
-                $.jGrowl($('#lang_email_notification_sent').text(), { theme: 'alert-success', closeTemplate: '' });
+                mfhAlert.success(mfhLang.text('email_notification_sent'));
             },
             error: function() {
-                $.jGrowl($('#lang_email_notification_resend_failed').text(), { theme: 'alert-danger', closeTemplate: '' });
+                mfhAlert.error(mfhLang.text('email_notification_resend_failed'));
             },
             complete: function() {
                 $this.attr('disabled', false);
diff --git a/js/calendar/mods-for-hesk-calendar-admin-readonly.js b/js/calendar/mods-for-hesk-calendar-admin-readonly.js
index ce87b063..c06ba37d 100644
--- a/js/calendar/mods-for-hesk-calendar-admin-readonly.js
+++ b/js/calendar/mods-for-hesk-calendar-admin-readonly.js
@@ -26,7 +26,7 @@ $(document).ready(function() {
                 },
                 error: function(data) {
                     console.error(data);
-                    $.jGrowl($('#lang_error_loading_events').text(), { theme: 'alert-danger', closeTemplate: '' });
+                    mfhAlert.error(mfhLang.text('error_loading_events'));
                 }
             });
         },
diff --git a/js/calendar/mods-for-hesk-calendar-readonly.js b/js/calendar/mods-for-hesk-calendar-readonly.js
index ff0d8b7c..16be40a1 100644
--- a/js/calendar/mods-for-hesk-calendar-readonly.js
+++ b/js/calendar/mods-for-hesk-calendar-readonly.js
@@ -26,7 +26,7 @@ $(document).ready(function() {
                 },
                 error: function(data) {
                     console.error(data);
-                    $.jGrowl($('#lang_error_loading_events').text(), { theme: 'alert-danger', closeTemplate: '' });
+                    mfhAlert.error(mfhLang.text('error_loading_events'));
                 }
             });
         },
diff --git a/js/calendar/mods-for-hesk-calendar.js b/js/calendar/mods-for-hesk-calendar.js
index 48b3a083..46bca008 100644
--- a/js/calendar/mods-for-hesk-calendar.js
+++ b/js/calendar/mods-for-hesk-calendar.js
@@ -25,7 +25,7 @@ $(document).ready(function() {
                     updateCategoryVisibility();
                 },
                 error: function(data) {
-                    $.jGrowl($('#lang_error_loading_events').text(), { theme: 'alert-danger', closeTemplate: '' });
+                    mfhAlert.error(mfhLang.text('error_loading_events'));
                 }
             });
         },
@@ -161,11 +161,11 @@ $(document).ready(function() {
             data: data,
             success: function() {
                 removeFromCalendar(data.id);
-                $.jGrowl($('#lang_event_deleted').text(), { theme: 'alert-success', closeTemplate: '' });
+                mfhAlert.success(mfhLang.text('event_deleted'));
                 $('#edit-event-modal').modal('hide');
             },
             error: function() {
-                $.jGrowl($('#lang_error_deleting_event').text(), { theme: 'alert-danger', closeTemplate: '' });
+                mfhAlert.error(mfhLang.text('error_deleting_event'));
             }
         });
     });
@@ -210,7 +210,7 @@ $(document).ready(function() {
                 updateCategoryVisibility();
             },
             error: function() {
-                $.jGrowl($('#lang_error_creating_event').text(), { theme: 'alert-danger', closeTemplate: '' });
+                mfhAlert.error(mfhLang.text('error_creating_event'));
             }
         });
     });
@@ -256,7 +256,7 @@ $(document).ready(function() {
                 $('#edit-event-modal').modal('hide');
             },
             error: function() {
-                $.jGrowl($('#lang_error_updating_event').text(), { theme: 'alert-danger', closeTemplate: '' });
+                mfhAlert.error(mfhLang.text('error_updating_event'));
             }
         });
     });
@@ -267,7 +267,7 @@ $(document).ready(function() {
 function addToCalendar(id, event, successMessage) {
     var eventObject = buildEvent(id, event);
     $('#calendar').fullCalendar('renderEvent', eventObject);
-    $.jGrowl(successMessage, { theme: 'alert-success', closeTemplate: '' });
+    mfhAlert.success(successMessage);
 }
 
 function removeFromCalendar(id) {
@@ -471,10 +471,10 @@ function respondToDragAndDrop(event, delta, revertFunc) {
                     startTime: event.start
                 });
                 $('#calendar').fullCalendar('updateEvent', event);
-                $.jGrowl($('#lang_ticket_due_date_updated').text(), { theme: 'alert-success', closeTemplate: '' });
+                mfhAlert.success(mfhLang.text('ticket_due_date_updated'));
             },
             error: function() {
-                $.jGrowl($('#lang_error_updating_ticket_due_date').text(), { theme: 'alert-danger', closeTemplate: '' });
+                mfhAlert.error(mfhLang.text('error_updating_ticket_due_date'));
                 revertFunc();
             }
         });
@@ -511,10 +511,10 @@ function respondToDragAndDrop(event, delta, revertFunc) {
             url: getHelpdeskUrl() + '/internal-api/admin/calendar/',
             data: data,
             success: function() {
-                $.jGrowl($('#lang_event_updated').text(), { theme: 'alert-success', closeTemplate: '' });
+                mfhAlert.success(mfhLang.text('event_updated'));
             },
             error: function() {
-                $.jGrowl($('#lang_error_updating_event').text(), { theme: 'alert-danger', closeTemplate: '' });
+                mfhAlert.error(mfhLang.text('error_updating_event'));
                 revertFunc();
             }
         });
diff --git a/js/jquery.jgrowl.min.js b/js/jquery.jgrowl.min.js
deleted file mode 100755
index 28eb6ded..00000000
--- a/js/jquery.jgrowl.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-!function(a){a.jGrowl=function(b,c){0===a("#jGrowl").length&&a('<div id="jGrowl"></div>').addClass(c&&c.position?c.position:a.jGrowl.defaults.position).appendTo(c&&c.appendTo?c.appendTo:a.jGrowl.defaults.appendTo),a("#jGrowl").jGrowl(b,c)},a.fn.jGrowl=function(b,c){if(void 0===c&&a.isPlainObject(b)&&(c=b,b=c.message),a.isFunction(this.each)){var d=arguments;return this.each(function(){void 0===a(this).data("jGrowl.instance")&&(a(this).data("jGrowl.instance",a.extend(new a.fn.jGrowl,{notifications:[],element:null,interval:null})),a(this).data("jGrowl.instance").startup(this)),a.isFunction(a(this).data("jGrowl.instance")[b])?a(this).data("jGrowl.instance")[b].apply(a(this).data("jGrowl.instance"),a.makeArray(d).slice(1)):a(this).data("jGrowl.instance").create(b,c)})}},a.extend(a.fn.jGrowl.prototype,{defaults:{pool:0,header:"",group:"",sticky:!1,position:"top-right",appendTo:"body",glue:"after",theme:"default",themeState:"highlight",corners:"10px",check:250,life:3e3,closeDuration:"normal",openDuration:"normal",easing:"swing",closer:!0,closeTemplate:"&times;",closerTemplate:"<div>[ close all ]</div>",log:function(){},beforeOpen:function(){},afterOpen:function(){},open:function(){},beforeClose:function(){},close:function(){},click:function(){},animateOpen:{opacity:"show"},animateClose:{opacity:"hide"}},notifications:[],element:null,interval:null,create:function(b,c){var d=a.extend({},this.defaults,c);"undefined"!=typeof d.speed&&(d.openDuration=d.speed,d.closeDuration=d.speed),this.notifications.push({message:b,options:d}),d.log.apply(this.element,[this.element,b,d])},render:function(b){var c=this,d=b.message,e=b.options;e.themeState=""===e.themeState?"":"ui-state-"+e.themeState;var f=a("<div/>").addClass("jGrowl-notification alert "+e.themeState+" ui-corner-all"+(void 0!==e.group&&""!==e.group?" "+e.group:"")).append(a("<button/>").addClass("jGrowl-close").html(e.closeTemplate)).append(a("<div/>").addClass("jGrowl-header").html(e.header)).append(a("<div/>").addClass("jGrowl-message").html(d)).data("jGrowl",e).addClass(e.theme).children(".jGrowl-close").bind("click.jGrowl",function(){return a(this).parent().trigger("jGrowl.beforeClose"),!1}).parent();a(f).bind("mouseover.jGrowl",function(){a(".jGrowl-notification",c.element).data("jGrowl.pause",!0)}).bind("mouseout.jGrowl",function(){a(".jGrowl-notification",c.element).data("jGrowl.pause",!1)}).bind("jGrowl.beforeOpen",function(){e.beforeOpen.apply(f,[f,d,e,c.element])!==!1&&a(this).trigger("jGrowl.open")}).bind("jGrowl.open",function(){e.open.apply(f,[f,d,e,c.element])!==!1&&("after"==e.glue?a(".jGrowl-notification:last",c.element).after(f):a(".jGrowl-notification:first",c.element).before(f),a(this).animate(e.animateOpen,e.openDuration,e.easing,function(){a.support.opacity===!1&&this.style.removeAttribute("filter"),null!==a(this).data("jGrowl")&&"undefined"!=typeof a(this).data("jGrowl")&&(a(this).data("jGrowl").created=new Date),a(this).trigger("jGrowl.afterOpen")}))}).bind("jGrowl.afterOpen",function(){e.afterOpen.apply(f,[f,d,e,c.element])}).bind("click",function(){e.click.apply(f,[f.message,e,c.element])}).bind("jGrowl.beforeClose",function(){e.beforeClose.apply(f,[f,d,e,c.element])!==!1&&a(this).trigger("jGrowl.close")}).bind("jGrowl.close",function(){a(this).data("jGrowl.pause",!0),a(this).animate(e.animateClose,e.closeDuration,e.easing,function(){a.isFunction(e.close)?e.close.apply(f,[f,d,e,c.element])!==!1&&a(this).remove():a(this).remove()})}).trigger("jGrowl.beforeOpen"),""!==e.corners&&void 0!==a.fn.corner&&a(f).corner(e.corners),a(".jGrowl-notification:parent",c.element).length>1&&0===a(".jGrowl-closer",c.element).length&&this.defaults.closer!==!1&&a(this.defaults.closerTemplate).addClass("jGrowl-closer "+this.defaults.themeState+" ui-corner-all").addClass(this.defaults.theme).appendTo(c.element).animate(this.defaults.animateOpen,this.defaults.speed,this.defaults.easing).bind("click.jGrowl",function(){a(this).siblings().trigger("jGrowl.beforeClose"),a.isFunction(c.defaults.closer)&&c.defaults.closer.apply(a(this).parent()[0],[a(this).parent()[0]])})},update:function(){a(this.element).find(".jGrowl-notification:parent").each(function(){void 0!==a(this).data("jGrowl")&&void 0!==a(this).data("jGrowl").created&&a(this).data("jGrowl").created.getTime()+parseInt(a(this).data("jGrowl").life,10)<(new Date).getTime()&&a(this).data("jGrowl").sticky!==!0&&(void 0===a(this).data("jGrowl.pause")||a(this).data("jGrowl.pause")!==!0)&&a(this).trigger("jGrowl.beforeClose")}),this.notifications.length>0&&(0===this.defaults.pool||a(this.element).find(".jGrowl-notification:parent").length<this.defaults.pool)&&this.render(this.notifications.shift()),a(this.element).find(".jGrowl-notification:parent").length<2&&a(this.element).find(".jGrowl-closer").animate(this.defaults.animateClose,this.defaults.speed,this.defaults.easing,function(){a(this).remove()})},startup:function(b){this.element=a(b).addClass("jGrowl").append('<div class="jGrowl-notification"></div>'),this.interval=setInterval(function(){var c=a(b).data("jGrowl.instance");void 0!==c&&c.update()},parseInt(this.defaults.check,10))},shutdown:function(){a(this.element).removeClass("jGrowl").find(".jGrowl-notification").trigger("jGrowl.close").parent().empty(),clearInterval(this.interval)},close:function(){a(this.element).find(".jGrowl-notification").each(function(){a(this).trigger("jGrowl.beforeClose")})}}),a.jGrowl.defaults=a.fn.jGrowl.prototype.defaults}(jQuery);
-//# sourceMappingURL=jquery.jgrowl.map
\ No newline at end of file

From 29d72b9c0e1d5350dc17e8b7adfc4fab23250869 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Mon, 22 May 2017 21:46:15 -0400
Subject: [PATCH 140/192] Fix custom fields on manage email templates

---
 admin/manage_email_templates.php | 1 +
 inc/header.inc.php               | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/admin/manage_email_templates.php b/admin/manage_email_templates.php
index c5e22fd5..4e690d14 100644
--- a/admin/manage_email_templates.php
+++ b/admin/manage_email_templates.php
@@ -10,6 +10,7 @@ require(HESK_PATH . 'hesk_settings.inc.php');
 require(HESK_PATH . 'inc/common.inc.php');
 require(HESK_PATH . 'inc/admin_functions.inc.php');
 require(HESK_PATH . 'inc/mail_functions.inc.php');
+require(HESK_PATH . 'inc/custom_fields.inc.php');
 hesk_load_database_functions();
 
 hesk_session_start();
diff --git a/inc/header.inc.php b/inc/header.inc.php
index 0d8d4911..21de4554 100644
--- a/inc/header.inc.php
+++ b/inc/header.inc.php
@@ -89,7 +89,7 @@ if (is_dir(HESK_PATH . 'install')) {
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/bootstrap-clockpicker.min.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/bootstrap-colorpicker.min.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/jquery.fancybox.min.css?v=<? echo MODS_FOR_HESK_BUILD ?>">
-    <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/toastr.min.css?v=<?php echo MODS_FOR_HESK_BUILD ?>">   
+    <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/toastr.min.css?v=<?php echo MODS_FOR_HESK_BUILD ?>">
     <?php if (defined('USE_JQUERY_2')): ?>
         <script src="<?php echo HESK_PATH; ?>js/jquery-2.2.4.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
     <?php else: ?>

From 06b23e5459c37bdd1ed9f832074541b9fa1804b9 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Mon, 22 May 2017 21:56:43 -0400
Subject: [PATCH 141/192] Localized missing keys

---
 admin/admin_settings.php | 7 ++++---
 language/en/text.php     | 3 +++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/admin/admin_settings.php b/admin/admin_settings.php
index 88b93bcb..caff0bb8 100644
--- a/admin/admin_settings.php
+++ b/admin/admin_settings.php
@@ -115,6 +115,7 @@ if ($hesk_settings['attachments']['use'] && !defined('HESK_DEMO')) {
 
     // Check max post size
     $tmp = @ini_get('post_max_size');
+    var_dump($tmp);
     if ($tmp) {
         $last = strtoupper(substr($tmp, -1));
 
@@ -3527,7 +3528,7 @@ $modsForHesk_settings = mfh_getSettings();
                 </div>
             </div>
             <div class="box-body">
-                <h4>Common Properties</h4>
+                <h4><?php echo $hesklang['common_properties']; ?></h4>
                 <div class="row">
                     <div class="col-sm-6 col-xs-12">
                         <div class="form-group">
@@ -3548,7 +3549,7 @@ $modsForHesk_settings = mfh_getSettings();
                     </div>
                 </div>
 
-                <h4>Customer View</h4>
+                <h4><?php echo $hesklang['customer_view']; ?></h4>
                 <div class="row">
                     <div class="col-sm-6 col-xs-12">
                         <div class="form-group">
@@ -3731,7 +3732,7 @@ $modsForHesk_settings = mfh_getSettings();
                         </div>
                     </div>
                 </div>
-                <h4>Admin Panel</h4>
+                <h4><?php echo $hesklang['admin_panel']; ?></h4>
                 <div class="row">
                     <div class="col-xs-12">
                         <div class="form-group">
diff --git a/language/en/text.php b/language/en/text.php
index 16fa082b..070f10e9 100644
--- a/language/en/text.php
+++ b/language/en/text.php
@@ -80,6 +80,9 @@ $hesklang['font_icon'] = 'Font Icon';
 $hesklang['error_saving_custom_nav_element'] = 'Error saving custom nav element!';
 $hesklang['place_help'] = 'The location of the custom navigation element.';
 $hesklang['url_help'] = 'The URL where the user should be taken to. Both relative and absolute URLs are supported.';
+$hesklang['common_properties'] = 'Common Properties';
+$hesklang['customer_view'] = 'Customer View';
+$hesklang['admin_panel'] = 'Admin Panel';
 
 // ADDED OR MODIFIED IN Mods for HESK 3.0.0
 $hesklang['you_have_x_messages'] = 'You have %s new %s'; // %s: Number of new messages, "message" or "messages", depending on # 

From 2990eadd07f945e26738a0ab376c287d86115e56 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Mon, 22 May 2017 22:02:02 -0400
Subject: [PATCH 142/192] Replace old HESK headers with current ones

---
 admin/api_settings.php                    | 28 ---------------
 admin/assign_owner.php                    | 39 ++++++--------------
 admin/calendar.php                        | 30 +---------------
 admin/knowledgebase_private.php           | 39 ++++++--------------
 admin/manage_knowledgebase.php            | 39 ++++++--------------
 admin/move_category.php                   | 39 ++++++--------------
 api/Core/database.inc.php                 | 43 ++++++-----------------
 api/Core/database_mysqli.inc.php          | 43 ++++++-----------------
 calendar.php                              | 28 ---------------
 cron/core/database.inc.php                | 43 ++++++-----------------
 cron/core/database_mysqli.inc.php         | 43 ++++++-----------------
 hesk_javascript.js                        | 43 ++++++-----------------
 inc/headerAdmin.inc.php                   | 39 ++++++--------------
 install/install_functions.inc.php         | 43 ++++++-----------------
 internal-api/core/database.inc.php        | 43 ++++++-----------------
 internal-api/core/database_mysqli.inc.php | 43 ++++++-----------------
 16 files changed, 144 insertions(+), 481 deletions(-)

diff --git a/admin/api_settings.php b/admin/api_settings.php
index 0c777e40..85c654e0 100644
--- a/admin/api_settings.php
+++ b/admin/api_settings.php
@@ -1,32 +1,4 @@
 <?php
-/*******************************************************************************
- *  Title: Help Desk Software HESK
- *  Version: 2.6.5 from 28th August 2015
- *  Author: Klemen Stirn
- *  Website: https://www.hesk.com
- ********************************************************************************
- *  COPYRIGHT AND TRADEMARK NOTICE
- *  Copyright 2005-2015 Klemen Stirn. All Rights Reserved.
- *  HESK is a registered trademark of Klemen Stirn.
- *  The HESK may be used and modified free of charge by anyone
- *  AS LONG AS COPYRIGHT NOTICES AND ALL THE COMMENTS REMAIN INTACT.
- *  By using this code you agree to indemnify Klemen Stirn from any
- *  liability that might arise from it's use.
- *  Selling the code for this program, in part or full, without prior
- *  written consent is expressly forbidden.
- *  Using this code, in part or full, to create derivate work,
- *  new scripts or products is expressly forbidden. Obtain permission
- *  before redistributing this software over the Internet or in
- *  any other medium. In all cases copyright and header must remain intact.
- *  This Copyright is in full effect in any country that has International
- *  Trade Agreements with the United States of America or
- *  with the European Union.
- *  Removing any of the copyright notices without purchasing a license
- *  is expressly forbidden. To remove HESK copyright notice you must purchase
- *  a license for this script. For more information on how to obtain
- *  a license please visit the page below:
- *  https://www.hesk.com/buy.php
- *******************************************************************************/
 
 define('IN_SCRIPT', 1);
 define('HESK_PATH', '../');
diff --git a/admin/assign_owner.php b/admin/assign_owner.php
index 64a6426d..793bdfdd 100755
--- a/admin/assign_owner.php
+++ b/admin/assign_owner.php
@@ -1,32 +1,15 @@
 <?php
-/*******************************************************************************
- *  Title: Help Desk Software HESK
- *  Version: 2.6.1 from 26th February 2015
- *  Author: Klemen Stirn
- *  Website: https://www.hesk.com
- ********************************************************************************
- *  COPYRIGHT AND TRADEMARK NOTICE
- *  Copyright 2005-2015 Klemen Stirn. All Rights Reserved.
- *  HESK is a registered trademark of Klemen Stirn.
- *  The HESK may be used and modified free of charge by anyone
- *  AS LONG AS COPYRIGHT NOTICES AND ALL THE COMMENTS REMAIN INTACT.
- *  By using this code you agree to indemnify Klemen Stirn from any
- *  liability that might arise from it's use.
- *  Selling the code for this program, in part or full, without prior
- *  written consent is expressly forbidden.
- *  Using this code, in part or full, to create derivate work,
- *  new scripts or products is expressly forbidden. Obtain permission
- *  before redistributing this software over the Internet or in
- *  any other medium. In all cases copyright and header must remain intact.
- *  This Copyright is in full effect in any country that has International
- *  Trade Agreements with the United States of America or
- *  with the European Union.
- *  Removing any of the copyright notices without purchasing a license
- *  is expressly forbidden. To remove HESK copyright notice you must purchase
- *  a license for this script. For more information on how to obtain
- *  a license please visit the page below:
- *  https://www.hesk.com/buy.php
- *******************************************************************************/
+/**
+ *
+ * This file is part of HESK - PHP Help Desk Software.
+ *
+ * (c) Copyright Klemen Stirn. All rights reserved.
+ * https://www.hesk.com
+ *
+ * For the full copyright and license agreement information visit
+ * https://www.hesk.com/eula.php
+ *
+ */
 
 define('IN_SCRIPT', 1);
 define('HESK_PATH', '../');
diff --git a/admin/calendar.php b/admin/calendar.php
index b2fbef33..dfc98a01 100644
--- a/admin/calendar.php
+++ b/admin/calendar.php
@@ -1,33 +1,5 @@
 <?php
-/*******************************************************************************
- *  Title: Help Desk Software HESK
- *  Version: 2.6.5 from 28th August 2015
- *  Author: Klemen Stirn
- *  Website: https://www.hesk.com
- ********************************************************************************
- *  COPYRIGHT AND TRADEMARK NOTICE
- *  Copyright 2005-2015 Klemen Stirn. All Rights Reserved.
- *  HESK is a registered trademark of Klemen Stirn.
- *  The HESK may be used and modified free of charge by anyone
- *  AS LONG AS COPYRIGHT NOTICES AND ALL THE COMMENTS REMAIN INTACT.
- *  By using this code you agree to indemnify Klemen Stirn from any
- *  liability that might arise from it's use.
- *  Selling the code for this program, in part or full, without prior
- *  written consent is expressly forbidden.
- *  Using this code, in part or full, to create derivate work,
- *  new scripts or products is expressly forbidden. Obtain permission
- *  before redistributing this software over the Internet or in
- *  any other medium. In all cases copyright and header must remain intact.
- *  This Copyright is in full effect in any country that has International
- *  Trade Agreements with the United States of America or
- *  with the European Union.
- *  Removing any of the copyright notices without purchasing a license
- *  is expressly forbidden. To remove HESK copyright notice you must purchase
- *  a license for this script. For more information on how to obtain
- *  a license please visit the page below:
- *  https://www.hesk.com/buy.php
- *******************************************************************************/
-
+\
 define('IN_SCRIPT', 1);
 define('VALIDATOR', 1);
 define('HESK_PATH', '../');
diff --git a/admin/knowledgebase_private.php b/admin/knowledgebase_private.php
index 944aa878..041da9bd 100644
--- a/admin/knowledgebase_private.php
+++ b/admin/knowledgebase_private.php
@@ -1,32 +1,15 @@
 <?php
-/*******************************************************************************
-*  Title: Help Desk Software HESK
-*  Version: 2.6.8 from 10th August 2016
-*  Author: Klemen Stirn
-*  Website: https://www.hesk.com
-********************************************************************************
-*  COPYRIGHT AND TRADEMARK NOTICE
-*  Copyright 2005-2015 Klemen Stirn. All Rights Reserved.
-*  HESK is a registered trademark of Klemen Stirn.
- *  The HESK may be used and modified free of charge by anyone
-*  AS LONG AS COPYRIGHT NOTICES AND ALL THE COMMENTS REMAIN INTACT.
-*  By using this code you agree to indemnify Klemen Stirn from any
-*  liability that might arise from it's use.
- *  Selling the code for this program, in part or full, without prior
-*  written consent is expressly forbidden.
- *  Using this code, in part or full, to create derivate work,
-*  new scripts or products is expressly forbidden. Obtain permission
-*  before redistributing this software over the Internet or in
-*  any other medium. In all cases copyright and header must remain intact.
-*  This Copyright is in full effect in any country that has International
-*  Trade Agreements with the United States of America or
-*  with the European Union.
- *  Removing any of the copyright notices without purchasing a license
-*  is expressly forbidden. To remove HESK copyright notice you must purchase
-*  a license for this script. For more information on how to obtain
-*  a license please visit the page below:
-*  https://www.hesk.com/buy.php
-*******************************************************************************/
+/**
+ *
+ * This file is part of HESK - PHP Help Desk Software.
+ *
+ * (c) Copyright Klemen Stirn. All rights reserved.
+ * https://www.hesk.com
+ *
+ * For the full copyright and license agreement information visit
+ * https://www.hesk.com/eula.php
+ *
+ */
 
 define('IN_SCRIPT',1);
 define('HESK_PATH','../');
diff --git a/admin/manage_knowledgebase.php b/admin/manage_knowledgebase.php
index 47a1db5a..c0a9dd47 100644
--- a/admin/manage_knowledgebase.php
+++ b/admin/manage_knowledgebase.php
@@ -1,32 +1,15 @@
 <?php
-/*******************************************************************************
-*  Title: Help Desk Software HESK
-*  Version: 2.6.8 from 10th August 2016
-*  Author: Klemen Stirn
-*  Website: https://www.hesk.com
-********************************************************************************
-*  COPYRIGHT AND TRADEMARK NOTICE
-*  Copyright 2005-2015 Klemen Stirn. All Rights Reserved.
-*  HESK is a registered trademark of Klemen Stirn.
- *  The HESK may be used and modified free of charge by anyone
-*  AS LONG AS COPYRIGHT NOTICES AND ALL THE COMMENTS REMAIN INTACT.
-*  By using this code you agree to indemnify Klemen Stirn from any
-*  liability that might arise from it's use.
- *  Selling the code for this program, in part or full, without prior
-*  written consent is expressly forbidden.
- *  Using this code, in part or full, to create derivate work,
-*  new scripts or products is expressly forbidden. Obtain permission
-*  before redistributing this software over the Internet or in
-*  any other medium. In all cases copyright and header must remain intact.
-*  This Copyright is in full effect in any country that has International
-*  Trade Agreements with the United States of America or
-*  with the European Union.
- *  Removing any of the copyright notices without purchasing a license
-*  is expressly forbidden. To remove HESK copyright notice you must purchase
-*  a license for this script. For more information on how to obtain
-*  a license please visit the page below:
-*  https://www.hesk.com/buy.php
-*******************************************************************************/
+/**
+ *
+ * This file is part of HESK - PHP Help Desk Software.
+ *
+ * (c) Copyright Klemen Stirn. All rights reserved.
+ * https://www.hesk.com
+ *
+ * For the full copyright and license agreement information visit
+ * https://www.hesk.com/eula.php
+ *
+ */
 
 define('IN_SCRIPT',1);
 define('HESK_PATH','../');
diff --git a/admin/move_category.php b/admin/move_category.php
index 5e15d457..e049255e 100755
--- a/admin/move_category.php
+++ b/admin/move_category.php
@@ -1,32 +1,15 @@
 <?php
-/*******************************************************************************
- *  Title: Help Desk Software HESK
- *  Version: 2.6.1 from 26th February 2015
- *  Author: Klemen Stirn
- *  Website: https://www.hesk.com
- ********************************************************************************
- *  COPYRIGHT AND TRADEMARK NOTICE
- *  Copyright 2005-2015 Klemen Stirn. All Rights Reserved.
- *  HESK is a registered trademark of Klemen Stirn.
- *  The HESK may be used and modified free of charge by anyone
- *  AS LONG AS COPYRIGHT NOTICES AND ALL THE COMMENTS REMAIN INTACT.
- *  By using this code you agree to indemnify Klemen Stirn from any
- *  liability that might arise from it's use.
- *  Selling the code for this program, in part or full, without prior
- *  written consent is expressly forbidden.
- *  Using this code, in part or full, to create derivate work,
- *  new scripts or products is expressly forbidden. Obtain permission
- *  before redistributing this software over the Internet or in
- *  any other medium. In all cases copyright and header must remain intact.
- *  This Copyright is in full effect in any country that has International
- *  Trade Agreements with the United States of America or
- *  with the European Union.
- *  Removing any of the copyright notices without purchasing a license
- *  is expressly forbidden. To remove HESK copyright notice you must purchase
- *  a license for this script. For more information on how to obtain
- *  a license please visit the page below:
- *  https://www.hesk.com/buy.php
- *******************************************************************************/
+/**
+ *
+ * This file is part of HESK - PHP Help Desk Software.
+ *
+ * (c) Copyright Klemen Stirn. All rights reserved.
+ * https://www.hesk.com
+ *
+ * For the full copyright and license agreement information visit
+ * https://www.hesk.com/eula.php
+ *
+ */
 
 define('IN_SCRIPT', 1);
 define('HESK_PATH', '../');
diff --git a/api/Core/database.inc.php b/api/Core/database.inc.php
index fce008d2..2e41ddbe 100755
--- a/api/Core/database.inc.php
+++ b/api/Core/database.inc.php
@@ -1,36 +1,15 @@
 <?php
-/*******************************************************************************
-*  Title: Help Desk Software HESK
-*  Version: 2.6.1 from 26th February 2015
-*  Author: Klemen Stirn
-*  Website: https://www.hesk.com
-********************************************************************************
-*  COPYRIGHT AND TRADEMARK NOTICE
-*  Copyright 2005-2015 Klemen Stirn. All Rights Reserved.
-*  HESK is a registered trademark of Klemen Stirn.
-
-*  The HESK may be used and modified free of charge by anyone
-*  AS LONG AS COPYRIGHT NOTICES AND ALL THE COMMENTS REMAIN INTACT.
-*  By using this code you agree to indemnify Klemen Stirn from any
-*  liability that might arise from it's use.
-
-*  Selling the code for this program, in part or full, without prior
-*  written consent is expressly forbidden.
-
-*  Using this code, in part or full, to create derivate work,
-*  new scripts or products is expressly forbidden. Obtain permission
-*  before redistributing this software over the Internet or in
-*  any other medium. In all cases copyright and header must remain intact.
-*  This Copyright is in full effect in any country that has International
-*  Trade Agreements with the United States of America or
-*  with the European Union.
-
-*  Removing any of the copyright notices without purchasing a license
-*  is expressly forbidden. To remove HESK copyright notice you must purchase
-*  a license for this script. For more information on how to obtain
-*  a license please visit the page below:
-*  https://www.hesk.com/buy.php
-*******************************************************************************/
+/**
+ *
+ * This file is part of HESK - PHP Help Desk Software.
+ *
+ * (c) Copyright Klemen Stirn. All rights reserved.
+ * https://www.hesk.com
+ *
+ * For the full copyright and license agreement information visit
+ * https://www.hesk.com/eula.php
+ *
+ */
 
 /* Check if this is a valid include */
 if (!defined('IN_SCRIPT')) {die('Invalid attempt');}
diff --git a/api/Core/database_mysqli.inc.php b/api/Core/database_mysqli.inc.php
index d7a8e7fb..6c13cebc 100755
--- a/api/Core/database_mysqli.inc.php
+++ b/api/Core/database_mysqli.inc.php
@@ -1,36 +1,15 @@
 <?php
-/*******************************************************************************
-*  Title: Help Desk Software HESK
-*  Version: 2.6.1 from 26th February 2015
-*  Author: Klemen Stirn
-*  Website: https://www.hesk.com
-********************************************************************************
-*  COPYRIGHT AND TRADEMARK NOTICE
-*  Copyright 2005-2015 Klemen Stirn. All Rights Reserved.
-*  HESK is a registered trademark of Klemen Stirn.
-
-*  The HESK may be used and modified free of charge by anyone
-*  AS LONG AS COPYRIGHT NOTICES AND ALL THE COMMENTS REMAIN INTACT.
-*  By using this code you agree to indemnify Klemen Stirn from any
-*  liability that might arise from it's use.
-
-*  Selling the code for this program, in part or full, without prior
-*  written consent is expressly forbidden.
-
-*  Using this code, in part or full, to create derivate work,
-*  new scripts or products is expressly forbidden. Obtain permission
-*  before redistributing this software over the Internet or in
-*  any other medium. In all cases copyright and header must remain intact.
-*  This Copyright is in full effect in any country that has International
-*  Trade Agreements with the United States of America or
-*  with the European Union.
-
-*  Removing any of the copyright notices without purchasing a license
-*  is expressly forbidden. To remove HESK copyright notice you must purchase
-*  a license for this script. For more information on how to obtain
-*  a license please visit the page below:
-*  https://www.hesk.com/buy.php
-*******************************************************************************/
+/**
+ *
+ * This file is part of HESK - PHP Help Desk Software.
+ *
+ * (c) Copyright Klemen Stirn. All rights reserved.
+ * https://www.hesk.com
+ *
+ * For the full copyright and license agreement information visit
+ * https://www.hesk.com/eula.php
+ *
+ */
 
 /* Check if this is a valid include */
 if (!defined('IN_SCRIPT')) {die('Invalid attempt');}
diff --git a/calendar.php b/calendar.php
index 4067e088..ea1822f4 100644
--- a/calendar.php
+++ b/calendar.php
@@ -1,32 +1,4 @@
 <?php
-/*******************************************************************************
- *  Title: Help Desk Software HESK
- *  Version: 2.6.5 from 28th August 2015
- *  Author: Klemen Stirn
- *  Website: https://www.hesk.com
- ********************************************************************************
- *  COPYRIGHT AND TRADEMARK NOTICE
- *  Copyright 2005-2015 Klemen Stirn. All Rights Reserved.
- *  HESK is a registered trademark of Klemen Stirn.
- *  The HESK may be used and modified free of charge by anyone
- *  AS LONG AS COPYRIGHT NOTICES AND ALL THE COMMENTS REMAIN INTACT.
- *  By using this code you agree to indemnify Klemen Stirn from any
- *  liability that might arise from it's use.
- *  Selling the code for this program, in part or full, without prior
- *  written consent is expressly forbidden.
- *  Using this code, in part or full, to create derivate work,
- *  new scripts or products is expressly forbidden. Obtain permission
- *  before redistributing this software over the Internet or in
- *  any other medium. In all cases copyright and header must remain intact.
- *  This Copyright is in full effect in any country that has International
- *  Trade Agreements with the United States of America or
- *  with the European Union.
- *  Removing any of the copyright notices without purchasing a license
- *  is expressly forbidden. To remove HESK copyright notice you must purchase
- *  a license for this script. For more information on how to obtain
- *  a license please visit the page below:
- *  https://www.hesk.com/buy.php
- *******************************************************************************/
 
 define('IN_SCRIPT', 1);
 define('HESK_PATH', './');
diff --git a/cron/core/database.inc.php b/cron/core/database.inc.php
index 9e83ce46..258c4c65 100755
--- a/cron/core/database.inc.php
+++ b/cron/core/database.inc.php
@@ -1,36 +1,15 @@
 <?php
-/*******************************************************************************
-*  Title: Help Desk Software HESK
-*  Version: 2.6.1 from 26th February 2015
-*  Author: Klemen Stirn
-*  Website: https://www.hesk.com
-********************************************************************************
-*  COPYRIGHT AND TRADEMARK NOTICE
-*  Copyright 2005-2015 Klemen Stirn. All Rights Reserved.
-*  HESK is a registered trademark of Klemen Stirn.
-
-*  The HESK may be used and modified free of charge by anyone
-*  AS LONG AS COPYRIGHT NOTICES AND ALL THE COMMENTS REMAIN INTACT.
-*  By using this code you agree to indemnify Klemen Stirn from any
-*  liability that might arise from it's use.
-
-*  Selling the code for this program, in part or full, without prior
-*  written consent is expressly forbidden.
-
-*  Using this code, in part or full, to create derivate work,
-*  new scripts or products is expressly forbidden. Obtain permission
-*  before redistributing this software over the Internet or in
-*  any other medium. In all cases copyright and header must remain intact.
-*  This Copyright is in full effect in any country that has International
-*  Trade Agreements with the United States of America or
-*  with the European Union.
-
-*  Removing any of the copyright notices without purchasing a license
-*  is expressly forbidden. To remove HESK copyright notice you must purchase
-*  a license for this script. For more information on how to obtain
-*  a license please visit the page below:
-*  https://www.hesk.com/buy.php
-*******************************************************************************/
+/**
+ *
+ * This file is part of HESK - PHP Help Desk Software.
+ *
+ * (c) Copyright Klemen Stirn. All rights reserved.
+ * https://www.hesk.com
+ *
+ * For the full copyright and license agreement information visit
+ * https://www.hesk.com/eula.php
+ *
+ */
 
 /* Check if this is a valid include */
 if (!defined('IN_SCRIPT')) {die('Invalid attempt');}
diff --git a/cron/core/database_mysqli.inc.php b/cron/core/database_mysqli.inc.php
index eb3dce44..4958f565 100755
--- a/cron/core/database_mysqli.inc.php
+++ b/cron/core/database_mysqli.inc.php
@@ -1,36 +1,15 @@
 <?php
-/*******************************************************************************
-*  Title: Help Desk Software HESK
-*  Version: 2.6.1 from 26th February 2015
-*  Author: Klemen Stirn
-*  Website: https://www.hesk.com
-********************************************************************************
-*  COPYRIGHT AND TRADEMARK NOTICE
-*  Copyright 2005-2015 Klemen Stirn. All Rights Reserved.
-*  HESK is a registered trademark of Klemen Stirn.
-
-*  The HESK may be used and modified free of charge by anyone
-*  AS LONG AS COPYRIGHT NOTICES AND ALL THE COMMENTS REMAIN INTACT.
-*  By using this code you agree to indemnify Klemen Stirn from any
-*  liability that might arise from it's use.
-
-*  Selling the code for this program, in part or full, without prior
-*  written consent is expressly forbidden.
-
-*  Using this code, in part or full, to create derivate work,
-*  new scripts or products is expressly forbidden. Obtain permission
-*  before redistributing this software over the Internet or in
-*  any other medium. In all cases copyright and header must remain intact.
-*  This Copyright is in full effect in any country that has International
-*  Trade Agreements with the United States of America or
-*  with the European Union.
-
-*  Removing any of the copyright notices without purchasing a license
-*  is expressly forbidden. To remove HESK copyright notice you must purchase
-*  a license for this script. For more information on how to obtain
-*  a license please visit the page below:
-*  https://www.hesk.com/buy.php
-*******************************************************************************/
+/**
+ *
+ * This file is part of HESK - PHP Help Desk Software.
+ *
+ * (c) Copyright Klemen Stirn. All rights reserved.
+ * https://www.hesk.com
+ *
+ * For the full copyright and license agreement information visit
+ * https://www.hesk.com/eula.php
+ *
+ */
 
 /* Check if this is a valid include */
 if (!defined('IN_SCRIPT')) {die('Invalid attempt');}
diff --git a/hesk_javascript.js b/hesk_javascript.js
index dd5c0a1a..f1af5cbb 100644
--- a/hesk_javascript.js
+++ b/hesk_javascript.js
@@ -1,35 +1,14 @@
-/*******************************************************************************
- *  Title: Help Desk Software HESK
- *  Version: 2.6.8 from 10th August 2016
- *  Author: Klemen Stirn
- *  Website: https://www.hesk.com
- ********************************************************************************
- *  COPYRIGHT AND TRADEMARK NOTICE
- *  Copyright 2005-2015 Klemen Stirn. All Rights Reserved.
- *  HESK is a registered trademark of Klemen Stirn.
-
- *  The HESK may be used and modified free of charge by anyone
- *  AS LONG AS COPYRIGHT NOTICES AND ALL THE COMMENTS REMAIN INTACT.
- *  By using this code you agree to indemnify Klemen Stirn from any
- *  liability that might arise from it's use.
-
- *  Selling the code for this program, in part or full, without prior
- *  written consent is expressly forbidden.
-
- *  Using this code, in part or full, to create derivate work,
- *  new scripts or products is expressly forbidden. Obtain permission
- *  before redistributing this software over the Internet or in
- *  any other medium. In all cases copyright and header must remain intact.
- *  This Copyright is in full effect in any country that has International
- *  Trade Agreements with the United States of America or
- *  with the European Union.
-
- *  Removing any of the copyright notices without purchasing a license
- *  is expressly forbidden. To remove HESK copyright notice you must purchase
- *  a license for this script. For more information on how to obtain
- *  a license please visit the page below:
- *  https://www.hesk.com/buy.php
- *******************************************************************************/
+/**
+ *
+ * This file is part of HESK - PHP Help Desk Software.
+ *
+ * (c) Copyright Klemen Stirn. All rights reserved.
+ * https://www.hesk.com
+ *
+ * For the full copyright and license agreement information visit
+ * https://www.hesk.com/eula.php
+ *
+ */
 
 function hesk_insertTag(tag) {
     var text_to_insert = '%%' + tag + '%%';
diff --git a/inc/headerAdmin.inc.php b/inc/headerAdmin.inc.php
index 05bfd004..5a808ec7 100644
--- a/inc/headerAdmin.inc.php
+++ b/inc/headerAdmin.inc.php
@@ -1,32 +1,15 @@
 <?php
-/*******************************************************************************
- *  Title: Help Desk Software HESK
- *  Version: 2.6.8 from 10th August 2016
- *  Author: Klemen Stirn
- *  Website: https://www.hesk.com
- ********************************************************************************
- *  COPYRIGHT AND TRADEMARK NOTICE
- *  Copyright 2005-2014 Klemen Stirn. All Rights Reserved.
- *  HESK is a registered trademark of Klemen Stirn.
- *  The HESK may be used and modified free of charge by anyone
- *  AS LONG AS COPYRIGHT NOTICES AND ALL THE COMMENTS REMAIN INTACT.
- *  By using this code you agree to indemnify Klemen Stirn from any
- *  liability that might arise from it's use.
- *  Selling the code for this program, in part or full, without prior
- *  written consent is expressly forbidden.
- *  Using this code, in part or full, to create derivate work,
- *  new scripts or products is expressly forbidden. Obtain permission
- *  before redistributing this software over the Internet or in
- *  any other medium. In all cases copyright and header must remain intact.
- *  This Copyright is in full effect in any country that has International
- *  Trade Agreements with the United States of America or
- *  with the European Union.
- *  Removing any of the copyright notices without purchasing a license
- *  is expressly forbidden. To remove HESK copyright notice you must purchase
- *  a license for this script. For more information on how to obtain
- *  a license please visit the page below:
- *  https://www.hesk.com/buy.php
- *******************************************************************************/
+/**
+ *
+ * This file is part of HESK - PHP Help Desk Software.
+ *
+ * (c) Copyright Klemen Stirn. All rights reserved.
+ * https://www.hesk.com
+ *
+ * For the full copyright and license agreement information visit
+ * https://www.hesk.com/eula.php
+ *
+ */
 
 require_once(HESK_PATH . 'build.php');
 
diff --git a/install/install_functions.inc.php b/install/install_functions.inc.php
index d8c7b693..e927d649 100644
--- a/install/install_functions.inc.php
+++ b/install/install_functions.inc.php
@@ -1,36 +1,15 @@
 <?php
-/*******************************************************************************
-*  Title: Help Desk Software HESK
-*  Version: 2.6.8 from 10th August 2016
-*  Author: Klemen Stirn
-*  Website: https://www.hesk.com
-********************************************************************************
-*  COPYRIGHT AND TRADEMARK NOTICE
-*  Copyright 2005-2015 Klemen Stirn. All Rights Reserved.
-*  HESK is a registered trademark of Klemen Stirn.
-
-*  The HESK may be used and modified free of charge by anyone
-*  AS LONG AS COPYRIGHT NOTICES AND ALL THE COMMENTS REMAIN INTACT.
-*  By using this code you agree to indemnify Klemen Stirn from any
-*  liability that might arise from it's use.
-
-*  Selling the code for this program, in part or full, without prior
-*  written consent is expressly forbidden.
-
-*  Using this code, in part or full, to create derivate work,
-*  new scripts or products is expressly forbidden. Obtain permission
-*  before redistributing this software over the Internet or in
-*  any other medium. In all cases copyright and header must remain intact.
-*  This Copyright is in full effect in any country that has International
-*  Trade Agreements with the United States of America or
-*  with the European Union.
-
-*  Removing any of the copyright notices without purchasing a license
-*  is expressly forbidden. To remove HESK copyright notice you must purchase
-*  a license for this script. For more information on how to obtain
-*  a license please visit the page below:
-*  https://www.hesk.com/buy.php
-*******************************************************************************/
+/**
+ *
+ * This file is part of HESK - PHP Help Desk Software.
+ *
+ * (c) Copyright Klemen Stirn. All rights reserved.
+ * https://www.hesk.com
+ *
+ * For the full copyright and license agreement information visit
+ * https://www.hesk.com/eula.php
+ *
+ */
 
 /* Check if this is a valid include */
 if (!defined('IN_SCRIPT')) {die('Invalid attempt');}
diff --git a/internal-api/core/database.inc.php b/internal-api/core/database.inc.php
index 4b1e902f..47c0eb59 100755
--- a/internal-api/core/database.inc.php
+++ b/internal-api/core/database.inc.php
@@ -1,36 +1,15 @@
 <?php
-/*******************************************************************************
-*  Title: Help Desk Software HESK
-*  Version: 2.6.1 from 26th February 2015
-*  Author: Klemen Stirn
-*  Website: https://www.hesk.com
-********************************************************************************
-*  COPYRIGHT AND TRADEMARK NOTICE
-*  Copyright 2005-2015 Klemen Stirn. All Rights Reserved.
-*  HESK is a registered trademark of Klemen Stirn.
-
-*  The HESK may be used and modified free of charge by anyone
-*  AS LONG AS COPYRIGHT NOTICES AND ALL THE COMMENTS REMAIN INTACT.
-*  By using this code you agree to indemnify Klemen Stirn from any
-*  liability that might arise from it's use.
-
-*  Selling the code for this program, in part or full, without prior
-*  written consent is expressly forbidden.
-
-*  Using this code, in part or full, to create derivate work,
-*  new scripts or products is expressly forbidden. Obtain permission
-*  before redistributing this software over the Internet or in
-*  any other medium. In all cases copyright and header must remain intact.
-*  This Copyright is in full effect in any country that has International
-*  Trade Agreements with the United States of America or
-*  with the European Union.
-
-*  Removing any of the copyright notices without purchasing a license
-*  is expressly forbidden. To remove HESK copyright notice you must purchase
-*  a license for this script. For more information on how to obtain
-*  a license please visit the page below:
-*  https://www.hesk.com/buy.php
-*******************************************************************************/
+/**
+ *
+ * This file is part of HESK - PHP Help Desk Software.
+ *
+ * (c) Copyright Klemen Stirn. All rights reserved.
+ * https://www.hesk.com
+ *
+ * For the full copyright and license agreement information visit
+ * https://www.hesk.com/eula.php
+ *
+ */
 
 /* Check if this is a valid include */
 if (!defined('IN_SCRIPT')) {die('Invalid attempt');}
diff --git a/internal-api/core/database_mysqli.inc.php b/internal-api/core/database_mysqli.inc.php
index 5444ab39..befdded2 100755
--- a/internal-api/core/database_mysqli.inc.php
+++ b/internal-api/core/database_mysqli.inc.php
@@ -1,36 +1,15 @@
 <?php
-/*******************************************************************************
-*  Title: Help Desk Software HESK
-*  Version: 2.6.1 from 26th February 2015
-*  Author: Klemen Stirn
-*  Website: https://www.hesk.com
-********************************************************************************
-*  COPYRIGHT AND TRADEMARK NOTICE
-*  Copyright 2005-2015 Klemen Stirn. All Rights Reserved.
-*  HESK is a registered trademark of Klemen Stirn.
-
-*  The HESK may be used and modified free of charge by anyone
-*  AS LONG AS COPYRIGHT NOTICES AND ALL THE COMMENTS REMAIN INTACT.
-*  By using this code you agree to indemnify Klemen Stirn from any
-*  liability that might arise from it's use.
-
-*  Selling the code for this program, in part or full, without prior
-*  written consent is expressly forbidden.
-
-*  Using this code, in part or full, to create derivate work,
-*  new scripts or products is expressly forbidden. Obtain permission
-*  before redistributing this software over the Internet or in
-*  any other medium. In all cases copyright and header must remain intact.
-*  This Copyright is in full effect in any country that has International
-*  Trade Agreements with the United States of America or
-*  with the European Union.
-
-*  Removing any of the copyright notices without purchasing a license
-*  is expressly forbidden. To remove HESK copyright notice you must purchase
-*  a license for this script. For more information on how to obtain
-*  a license please visit the page below:
-*  https://www.hesk.com/buy.php
-*******************************************************************************/
+/**
+ *
+ * This file is part of HESK - PHP Help Desk Software.
+ *
+ * (c) Copyright Klemen Stirn. All rights reserved.
+ * https://www.hesk.com
+ *
+ * For the full copyright and license agreement information visit
+ * https://www.hesk.com/eula.php
+ *
+ */
 
 /* Check if this is a valid include */
 if (!defined('IN_SCRIPT')) {die('Invalid attempt');}

From 8d8d99e1036321eec78683b2beccbb1f0b6c353c Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Mon, 22 May 2017 22:03:39 -0400
Subject: [PATCH 143/192] Remove erronous var_dump

---
 admin/admin_settings.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/admin/admin_settings.php b/admin/admin_settings.php
index caff0bb8..511ab71b 100644
--- a/admin/admin_settings.php
+++ b/admin/admin_settings.php
@@ -115,7 +115,6 @@ if ($hesk_settings['attachments']['use'] && !defined('HESK_DEMO')) {
 
     // Check max post size
     $tmp = @ini_get('post_max_size');
-    var_dump($tmp);
     if ($tmp) {
         $last = strtoupper(substr($tmp, -1));
 

From 1a873cd377806a70aa5fee42b2181aca0a09043e Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Tue, 23 May 2017 13:55:59 +0000
Subject: [PATCH 144/192] Update calendar.php

---
 admin/calendar.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/calendar.php b/admin/calendar.php
index dfc98a01..6e582816 100644
--- a/admin/calendar.php
+++ b/admin/calendar.php
@@ -1,5 +1,5 @@
 <?php
-\
+
 define('IN_SCRIPT', 1);
 define('VALIDATOR', 1);
 define('HESK_PATH', '../');

From 8e22dd10a8038e12cffec272720e71a882096ca2 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Tue, 23 May 2017 21:43:37 -0400
Subject: [PATCH 145/192] Replace fancybox with magnific popup (licensing)

---
 css/jquery.fancybox.min.css           |   1 -
 css/magnific-popup.css                | 351 ++++++++++++++++++++++++++
 inc/header.inc.php                    |   6 +-
 inc/headerAdmin.inc.php               |  12 +-
 inc/view_attachment_functions.inc.php |   9 +-
 js/jquery.fancybox.min.js             |  12 -
 js/jquery.magnific-popup.min.js       |   4 +
 js/modsForHesk-javascript.js          |   9 +
 8 files changed, 375 insertions(+), 29 deletions(-)
 delete mode 100644 css/jquery.fancybox.min.css
 create mode 100644 css/magnific-popup.css
 delete mode 100644 js/jquery.fancybox.min.js
 create mode 100644 js/jquery.magnific-popup.min.js

diff --git a/css/jquery.fancybox.min.css b/css/jquery.fancybox.min.css
deleted file mode 100644
index 2354dec1..00000000
--- a/css/jquery.fancybox.min.css
+++ /dev/null
@@ -1 +0,0 @@
-@charset "UTF-8";.fancybox-enabled{overflow:hidden}.fancybox-enabled body{overflow:visible;height:100%}.fancybox-container{position:fixed;top:0;left:0;width:100%;height:100%;z-index:99993;-webkit-backface-visibility:hidden;backface-visibility:hidden}.fancybox-container~.fancybox-container{z-index:99992}.fancybox-bg{position:absolute;top:0;right:0;bottom:0;left:0;background:#0f0f11;opacity:0;transition-timing-function:cubic-bezier(.55,.06,.68,.19);-webkit-backface-visibility:hidden;backface-visibility:hidden}.fancybox-container--ready .fancybox-bg{opacity:.87;transition-timing-function:cubic-bezier(.22,.61,.36,1)}.fancybox-controls{position:absolute;top:0;left:0;right:0;text-align:center;opacity:0;z-index:99994;transition:opacity .2s;pointer-events:none;-webkit-backface-visibility:hidden;backface-visibility:hidden;direction:ltr}.fancybox-show-controls .fancybox-controls{opacity:1}.fancybox-infobar{display:none}.fancybox-show-infobar .fancybox-infobar{display:inline-block;pointer-events:all}.fancybox-infobar__body{display:inline-block;width:70px;line-height:44px;font-size:13px;font-family:Helvetica Neue,Helvetica,Arial,sans-serif;text-align:center;color:#ddd;background-color:rgba(30,30,30,.7);pointer-events:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-touch-callout:none;-webkit-tap-highlight-color:transparent;-webkit-font-smoothing:subpixel-antialiased}.fancybox-buttons{position:absolute;top:0;right:0;display:none;pointer-events:all}.fancybox-show-buttons .fancybox-buttons{display:block}.fancybox-slider-wrap{overflow:hidden;direction:ltr}.fancybox-slider,.fancybox-slider-wrap{position:absolute;top:0;left:0;bottom:0;right:0;padding:0;margin:0;z-index:99993;-webkit-backface-visibility:hidden;backface-visibility:hidden;-webkit-tap-highlight-color:transparent}.fancybox-slide{position:absolute;top:0;left:0;width:100%;height:100%;margin:0;padding:0;overflow:auto;outline:none;white-space:normal;box-sizing:border-box;text-align:center;z-index:99994;-webkit-overflow-scrolling:touch}.fancybox-slide:before{content:"";height:100%;width:0}.fancybox-slide:before,.fancybox-slide>*{display:inline-block;vertical-align:middle}.fancybox-slide>*{position:relative;padding:24px;margin:44px 0;border-width:0;text-align:left;background-color:#fff;overflow:auto;box-sizing:border-box}.fancybox-slide--image{overflow:hidden}.fancybox-slide--image:before{display:none}.fancybox-content{display:inline-block;position:relative;margin:44px auto;padding:0;border:0;width:80%;height:calc(100% - 88px);vertical-align:middle;line-height:normal;text-align:left;white-space:normal;outline:none;font-size:16px;font-family:Arial,sans-serif;box-sizing:border-box;-webkit-tap-highlight-color:transparent;-webkit-overflow-scrolling:touch}.fancybox-iframe{display:block;margin:0;padding:0;border:0;width:100%;height:100%;background:#fff}.fancybox-slide--video .fancybox-content,.fancybox-slide--video .fancybox-iframe{background:transparent}.fancybox-placeholder{z-index:99995;background:transparent;cursor:default;overflow:visible;-webkit-transform-origin:top left;transform-origin:top left;background-size:100% 100%;background-repeat:no-repeat;-webkit-backface-visibility:hidden;backface-visibility:hidden}.fancybox-image,.fancybox-placeholder,.fancybox-spaceball{position:absolute;top:0;left:0;margin:0;padding:0;border:0}.fancybox-image,.fancybox-spaceball{width:100%;height:100%;max-width:none;max-height:none;background:transparent;background-size:100% 100%}.fancybox-controls--canzoomOut .fancybox-placeholder{cursor:zoom-out}.fancybox-controls--canzoomIn .fancybox-placeholder{cursor:zoom-in}.fancybox-controls--canGrab .fancybox-placeholder{cursor:-webkit-grab;cursor:grab}.fancybox-controls--isGrabbing .fancybox-placeholder{cursor:-webkit-grabbing;cursor:grabbing}.fancybox-spaceball{z-index:1}.fancybox-tmp{position:absolute;top:-9999px;left:-9999px;visibility:hidden}.fancybox-error{position:absolute;margin:0;padding:40px;top:50%;left:50%;width:380px;max-width:100%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);background:#fff;cursor:default}.fancybox-error p{margin:0;padding:0;color:#444;font:16px/20px Helvetica Neue,Helvetica,Arial,sans-serif}.fancybox-close-small{position:absolute;top:0;right:0;width:44px;height:44px;padding:0;margin:0;border:0;border-radius:0;outline:none;background:transparent;z-index:10;cursor:pointer}.fancybox-close-small:after{content:"×";position:absolute;top:5px;right:5px;width:30px;height:30px;font:20px/30px Arial,Helvetica Neue,Helvetica,sans-serif;color:#888;font-weight:300;text-align:center;border-radius:50%;border-width:0;background:#fff;transition:background .2s;box-sizing:border-box;z-index:2}.fancybox-close-small:focus:after{outline:1px dotted #888}.fancybox-slide--video .fancybox-close-small{top:-36px;right:-36px;background:transparent}.fancybox-close-small:hover:after{color:#555;background:#eee}.fancybox-caption-wrap{position:absolute;bottom:0;left:0;right:0;padding:60px 30px 0;z-index:99998;-webkit-backface-visibility:hidden;backface-visibility:hidden;box-sizing:border-box;background:linear-gradient(180deg,transparent 0,rgba(0,0,0,.1) 20%,rgba(0,0,0,.2) 40%,rgba(0,0,0,.6) 80%,rgba(0,0,0,.8));opacity:0;transition:opacity .2s;pointer-events:none}.fancybox-show-caption .fancybox-caption-wrap{opacity:1}.fancybox-caption{padding:30px 0;border-top:1px solid hsla(0,0%,100%,.4);font-size:14px;font-family:Helvetica Neue,Helvetica,Arial,sans-serif;color:#fff;line-height:20px;-webkit-text-size-adjust:none}.fancybox-caption a,.fancybox-caption button{pointer-events:all}.fancybox-caption a{color:#fff;text-decoration:underline}.fancybox-button{display:inline-block;position:relative;width:44px;height:44px;line-height:44px;margin:0;padding:0;border:0;border-radius:0;cursor:pointer;background:transparent;color:#fff;box-sizing:border-box;vertical-align:top;outline:none}.fancybox-button--disabled{cursor:default;pointer-events:none}.fancybox-button,.fancybox-infobar__body{background:rgba(30,30,30,.6)}.fancybox-button:hover{background:rgba(0,0,0,.8)}.fancybox-button:after,.fancybox-button:before{content:"";pointer-events:none;position:absolute;border-color:#fff;background-color:currentColor;color:currentColor;opacity:.9;box-sizing:border-box;display:inline-block}.fancybox-button--disabled:after,.fancybox-button--disabled:before{opacity:.5}.fancybox-button--left:after{left:20px;-webkit-transform:rotate(-135deg);transform:rotate(-135deg)}.fancybox-button--left:after,.fancybox-button--right:after{top:18px;width:6px;height:6px;background:transparent;border-top:2px solid currentColor;border-right:2px solid currentColor}.fancybox-button--right:after{right:20px;-webkit-transform:rotate(45deg);transform:rotate(45deg)}.fancybox-button--left{border-bottom-left-radius:5px}.fancybox-button--right{border-bottom-right-radius:5px}.fancybox-button--close{float:right}.fancybox-button--close:after,.fancybox-button--close:before{content:"";display:inline-block;position:absolute;height:2px;width:16px;top:calc(50% - 1px);left:calc(50% - 8px)}.fancybox-button--close:before{-webkit-transform:rotate(45deg);transform:rotate(45deg)}.fancybox-button--close:after{-webkit-transform:rotate(-45deg);transform:rotate(-45deg)}.fancybox-loading{border:6px solid hsla(0,0%,39%,.4);border-top:6px solid hsla(0,0%,100%,.6);border-radius:100%;height:50px;width:50px;-webkit-animation:a .8s infinite linear;animation:a .8s infinite linear;background:transparent;position:absolute;top:50%;left:50%;margin-top:-25px;margin-left:-25px;z-index:99999}@-webkit-keyframes a{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes a{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@media (max-width:800px){.fancybox-controls{text-align:left}.fancybox-button--left,.fancybox-button--right,.fancybox-buttons button:not(.fancybox-button--close){display:none!important}.fancybox-caption{padding:20px 0;margin:0}}.fancybox-button--fullscreen:before{width:15px;height:11px;left:15px;top:16px;border:2px solid;background:none}.fancybox-button--play:before{top:16px;left:18px;width:0;height:0;border-top:6px inset transparent;border-bottom:6px inset transparent;border-left:10px solid;border-radius:1px;background:transparent}.fancybox-button--pause:before{top:16px;left:18px;width:7px;height:11px;border-style:solid;border-width:0 2px;background:transparent}.fancybox-button--thumbs span{font-size:23px}.fancybox-button--thumbs:before{top:20px;left:21px;width:3px;height:3px;box-shadow:0 -4px 0,-4px -4px 0,4px -4px 0,inset 0 0 0 32px,-4px 0 0,4px 0 0,0 4px 0,-4px 4px 0,4px 4px 0}.fancybox-container--thumbs .fancybox-caption-wrap,.fancybox-container--thumbs .fancybox-controls,.fancybox-container--thumbs .fancybox-slider-wrap{right:220px}.fancybox-thumbs{position:absolute;top:0;right:0;bottom:0;left:auto;width:220px;margin:0;padding:5px 5px 0 0;background:#fff;z-index:99993;word-break:normal;-webkit-overflow-scrolling:touch;-webkit-tap-highlight-color:transparent;box-sizing:border-box}.fancybox-thumbs>ul{list-style:none;position:absolute;position:relative;width:100%;height:100%;margin:0;padding:0;overflow-x:hidden;overflow-y:auto;font-size:0}.fancybox-thumbs>ul>li{float:left;overflow:hidden;max-width:50%;padding:0;margin:0;width:105px;height:75px;position:relative;cursor:pointer;outline:none;border:5px solid #fff;border-top-width:0;border-right-width:0;-webkit-tap-highlight-color:transparent;-webkit-backface-visibility:hidden;backface-visibility:hidden;box-sizing:border-box}li.fancybox-thumbs-loading{background:rgba(0,0,0,.1)}.fancybox-thumbs>ul>li>img{position:absolute;top:0;left:0;min-width:100%;min-height:100%;max-width:none;max-height:none;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.fancybox-thumbs>ul>li:before{content:"";position:absolute;top:0;right:0;bottom:0;left:0;border-radius:2px;border:4px solid #4ea7f9;z-index:99991;opacity:0;transition:all .2s cubic-bezier(.25,.46,.45,.94)}.fancybox-thumbs>ul>li.fancybox-thumbs-active:before{opacity:1}@media (max-width:800px){.fancybox-thumbs{display:none!important}.fancybox-container--thumbs .fancybox-caption-wrap,.fancybox-container--thumbs .fancybox-controls,.fancybox-container--thumbs .fancybox-slider-wrap{right:0}}
\ No newline at end of file
diff --git a/css/magnific-popup.css b/css/magnific-popup.css
new file mode 100644
index 00000000..8561e181
--- /dev/null
+++ b/css/magnific-popup.css
@@ -0,0 +1,351 @@
+/* Magnific Popup CSS */
+.mfp-bg {
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 1042;
+  overflow: hidden;
+  position: fixed;
+  background: #0b0b0b;
+  opacity: 0.8; }
+
+.mfp-wrap {
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 1043;
+  position: fixed;
+  outline: none !important;
+  -webkit-backface-visibility: hidden; }
+
+.mfp-container {
+  text-align: center;
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  left: 0;
+  top: 0;
+  padding: 0 8px;
+  box-sizing: border-box; }
+
+.mfp-container:before {
+  content: '';
+  display: inline-block;
+  height: 100%;
+  vertical-align: middle; }
+
+.mfp-align-top .mfp-container:before {
+  display: none; }
+
+.mfp-content {
+  position: relative;
+  display: inline-block;
+  vertical-align: middle;
+  margin: 0 auto;
+  text-align: left;
+  z-index: 1045; }
+
+.mfp-inline-holder .mfp-content,
+.mfp-ajax-holder .mfp-content {
+  width: 100%;
+  cursor: auto; }
+
+.mfp-ajax-cur {
+  cursor: progress; }
+
+.mfp-zoom-out-cur, .mfp-zoom-out-cur .mfp-image-holder .mfp-close {
+  cursor: -moz-zoom-out;
+  cursor: -webkit-zoom-out;
+  cursor: zoom-out; }
+
+.mfp-zoom {
+  cursor: pointer;
+  cursor: -webkit-zoom-in;
+  cursor: -moz-zoom-in;
+  cursor: zoom-in; }
+
+.mfp-auto-cursor .mfp-content {
+  cursor: auto; }
+
+.mfp-close,
+.mfp-arrow,
+.mfp-preloader,
+.mfp-counter {
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  user-select: none; }
+
+.mfp-loading.mfp-figure {
+  display: none; }
+
+.mfp-hide {
+  display: none !important; }
+
+.mfp-preloader {
+  color: #CCC;
+  position: absolute;
+  top: 50%;
+  width: auto;
+  text-align: center;
+  margin-top: -0.8em;
+  left: 8px;
+  right: 8px;
+  z-index: 1044; }
+  .mfp-preloader a {
+    color: #CCC; }
+    .mfp-preloader a:hover {
+      color: #FFF; }
+
+.mfp-s-ready .mfp-preloader {
+  display: none; }
+
+.mfp-s-error .mfp-content {
+  display: none; }
+
+button.mfp-close,
+button.mfp-arrow {
+  overflow: visible;
+  cursor: pointer;
+  background: transparent;
+  border: 0;
+  -webkit-appearance: none;
+  display: block;
+  outline: none;
+  padding: 0;
+  z-index: 1046;
+  box-shadow: none;
+  touch-action: manipulation; }
+
+button::-moz-focus-inner {
+  padding: 0;
+  border: 0; }
+
+.mfp-close {
+  width: 44px;
+  height: 44px;
+  line-height: 44px;
+  position: absolute;
+  right: 0;
+  top: 0;
+  text-decoration: none;
+  text-align: center;
+  opacity: 0.65;
+  padding: 0 0 18px 10px;
+  color: #FFF;
+  font-style: normal;
+  font-size: 28px;
+  font-family: Arial, Baskerville, monospace; }
+  .mfp-close:hover,
+  .mfp-close:focus {
+    opacity: 1; }
+  .mfp-close:active {
+    top: 1px; }
+
+.mfp-close-btn-in .mfp-close {
+  color: #333; }
+
+.mfp-image-holder .mfp-close,
+.mfp-iframe-holder .mfp-close {
+  color: #FFF;
+  right: -6px;
+  text-align: right;
+  padding-right: 6px;
+  width: 100%; }
+
+.mfp-counter {
+  position: absolute;
+  top: 0;
+  right: 0;
+  color: #CCC;
+  font-size: 12px;
+  line-height: 18px;
+  white-space: nowrap; }
+
+.mfp-arrow {
+  position: absolute;
+  opacity: 0.65;
+  margin: 0;
+  top: 50%;
+  margin-top: -55px;
+  padding: 0;
+  width: 90px;
+  height: 110px;
+  -webkit-tap-highlight-color: transparent; }
+  .mfp-arrow:active {
+    margin-top: -54px; }
+  .mfp-arrow:hover,
+  .mfp-arrow:focus {
+    opacity: 1; }
+  .mfp-arrow:before,
+  .mfp-arrow:after {
+    content: '';
+    display: block;
+    width: 0;
+    height: 0;
+    position: absolute;
+    left: 0;
+    top: 0;
+    margin-top: 35px;
+    margin-left: 35px;
+    border: medium inset transparent; }
+  .mfp-arrow:after {
+    border-top-width: 13px;
+    border-bottom-width: 13px;
+    top: 8px; }
+  .mfp-arrow:before {
+    border-top-width: 21px;
+    border-bottom-width: 21px;
+    opacity: 0.7; }
+
+.mfp-arrow-left {
+  left: 0; }
+  .mfp-arrow-left:after {
+    border-right: 17px solid #FFF;
+    margin-left: 31px; }
+  .mfp-arrow-left:before {
+    margin-left: 25px;
+    border-right: 27px solid #3F3F3F; }
+
+.mfp-arrow-right {
+  right: 0; }
+  .mfp-arrow-right:after {
+    border-left: 17px solid #FFF;
+    margin-left: 39px; }
+  .mfp-arrow-right:before {
+    border-left: 27px solid #3F3F3F; }
+
+.mfp-iframe-holder {
+  padding-top: 40px;
+  padding-bottom: 40px; }
+  .mfp-iframe-holder .mfp-content {
+    line-height: 0;
+    width: 100%;
+    max-width: 900px; }
+  .mfp-iframe-holder .mfp-close {
+    top: -40px; }
+
+.mfp-iframe-scaler {
+  width: 100%;
+  height: 0;
+  overflow: hidden;
+  padding-top: 56.25%; }
+  .mfp-iframe-scaler iframe {
+    position: absolute;
+    display: block;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    box-shadow: 0 0 8px rgba(0, 0, 0, 0.6);
+    background: #000; }
+
+/* Main image in popup */
+img.mfp-img {
+  width: auto;
+  max-width: 100%;
+  height: auto;
+  display: block;
+  line-height: 0;
+  box-sizing: border-box;
+  padding: 40px 0 40px;
+  margin: 0 auto; }
+
+/* The shadow behind the image */
+.mfp-figure {
+  line-height: 0; }
+  .mfp-figure:after {
+    content: '';
+    position: absolute;
+    left: 0;
+    top: 40px;
+    bottom: 40px;
+    display: block;
+    right: 0;
+    width: auto;
+    height: auto;
+    z-index: -1;
+    box-shadow: 0 0 8px rgba(0, 0, 0, 0.6);
+    background: #444; }
+  .mfp-figure small {
+    color: #BDBDBD;
+    display: block;
+    font-size: 12px;
+    line-height: 14px; }
+  .mfp-figure figure {
+    margin: 0; }
+
+.mfp-bottom-bar {
+  margin-top: -36px;
+  position: absolute;
+  top: 100%;
+  left: 0;
+  width: 100%;
+  cursor: auto; }
+
+.mfp-title {
+  text-align: left;
+  line-height: 18px;
+  color: #F3F3F3;
+  word-wrap: break-word;
+  padding-right: 36px; }
+
+.mfp-image-holder .mfp-content {
+  max-width: 100%; }
+
+.mfp-gallery .mfp-image-holder .mfp-figure {
+  cursor: pointer; }
+
+@media screen and (max-width: 800px) and (orientation: landscape), screen and (max-height: 300px) {
+  /**
+       * Remove all paddings around the image on small screen
+       */
+  .mfp-img-mobile .mfp-image-holder {
+    padding-left: 0;
+    padding-right: 0; }
+  .mfp-img-mobile img.mfp-img {
+    padding: 0; }
+  .mfp-img-mobile .mfp-figure:after {
+    top: 0;
+    bottom: 0; }
+  .mfp-img-mobile .mfp-figure small {
+    display: inline;
+    margin-left: 5px; }
+  .mfp-img-mobile .mfp-bottom-bar {
+    background: rgba(0, 0, 0, 0.6);
+    bottom: 0;
+    margin: 0;
+    top: auto;
+    padding: 3px 5px;
+    position: fixed;
+    box-sizing: border-box; }
+    .mfp-img-mobile .mfp-bottom-bar:empty {
+      padding: 0; }
+  .mfp-img-mobile .mfp-counter {
+    right: 5px;
+    top: 3px; }
+  .mfp-img-mobile .mfp-close {
+    top: 0;
+    right: 0;
+    width: 35px;
+    height: 35px;
+    line-height: 35px;
+    background: rgba(0, 0, 0, 0.6);
+    position: fixed;
+    text-align: center;
+    padding: 0; } }
+
+@media all and (max-width: 900px) {
+  .mfp-arrow {
+    -webkit-transform: scale(0.75);
+    transform: scale(0.75); }
+  .mfp-arrow-left {
+    -webkit-transform-origin: 0;
+    transform-origin: 0; }
+  .mfp-arrow-right {
+    -webkit-transform-origin: 100%;
+    transform-origin: 100%; }
+  .mfp-container {
+    padding-left: 6px;
+    padding-right: 6px; } }
diff --git a/inc/header.inc.php b/inc/header.inc.php
index 21de4554..5b5fc4da 100644
--- a/inc/header.inc.php
+++ b/inc/header.inc.php
@@ -88,8 +88,8 @@ if (is_dir(HESK_PATH . 'install')) {
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/fullcalendar.min.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/bootstrap-clockpicker.min.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/bootstrap-colorpicker.min.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
-    <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/jquery.fancybox.min.css?v=<? echo MODS_FOR_HESK_BUILD ?>">
-    <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/toastr.min.css?v=<?php echo MODS_FOR_HESK_BUILD ?>">
+    <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/toastr.min.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
+    <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/magnific-popup.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
     <?php if (defined('USE_JQUERY_2')): ?>
         <script src="<?php echo HESK_PATH; ?>js/jquery-2.2.4.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
     <?php else: ?>
@@ -111,8 +111,8 @@ if (is_dir(HESK_PATH . 'install')) {
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/bootstrap-validator.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>internal-api/js/core.php?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/bootstrap-colorpicker.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
-    <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/jquery.fancybox.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/toastr.min.js?v=<?php echo MODS_FOR_HESK_BUILD ?>"></script>
+    <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/jquery.magnific-popup.min.js?v=<?php echo MODS_FOR_HESK_BUILD ?>"></script>
     <style>
         .navbar-default {
             background-color: <?php echo $modsForHesk_settings['navbarBackgroundColor']; ?>;
diff --git a/inc/headerAdmin.inc.php b/inc/headerAdmin.inc.php
index 5a808ec7..b3583df2 100644
--- a/inc/headerAdmin.inc.php
+++ b/inc/headerAdmin.inc.php
@@ -42,8 +42,8 @@ $modsForHesk_settings = mfh_getSettings();
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/bootstrap-colorpicker.min.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/AdminLTE.min.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/skins/_all-skins.min.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
-    <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/jquery.fancybox.min.css?v=<?php echo MODS_FOR_HESK_BUILD ?>">
-    <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/toastr.min.css?v=<?php echo MODS_FOR_HESK_BUILD ?>">
+    <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/toastr.min.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
+    <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/magnific-popup.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/mods-for-hesk-new.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/colors.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/positions.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
@@ -71,10 +71,10 @@ $modsForHesk_settings = mfh_getSettings();
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>internal-api/js/core-admin.php?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/bootstrap-colorpicker.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/jquery.slimscroll.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
-    <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/toastr.min.js?v=<?php echo MODS_FOR_HESK_BUILD ?>"></script>
-    <script type="text/javascript" src="<?php echo HESK_PATH; ?>internal-api/js/alerts.js?v=<?php echo MODS_FOR_HESK_BUILD ?>"></script>
-    <script type="text/javascript" src="<?php echo HESK_PATH; ?>internal-api/js/lang.js?v=<?php echo MODS_FOR_HESK_BUILD ?>"></script>
-    <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/jquery.fancybox.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
+    <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/toastr.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
+    <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/jquery.magnific-popup.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
+    <script type="text/javascript" src="<?php echo HESK_PATH; ?>internal-api/js/alerts.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
+    <script type="text/javascript" src="<?php echo HESK_PATH; ?>internal-api/js/lang.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
     <?php
     if (defined('EXTRA_JS')) {
         echo EXTRA_JS;
diff --git a/inc/view_attachment_functions.inc.php b/inc/view_attachment_functions.inc.php
index bb865e2e..23581584 100644
--- a/inc/view_attachment_functions.inc.php
+++ b/inc/view_attachment_functions.inc.php
@@ -15,8 +15,7 @@ function mfh_listAttachments($attachments = '', $reply = 0, $is_staff)
 
     /* List attachments */
     $att = explode(',', substr($attachments, 0, -1));
-    $uniq_identifier = null;
-    echo '<div class="table-responsive">';
+    echo '<div class="table-responsive" data-toggle="lightbox">';
     echo '<table class="table table-striped attachment-table">';
     echo '<thead>
         <tr>
@@ -32,10 +31,6 @@ function mfh_listAttachments($attachments = '', $reply = 0, $is_staff)
     foreach ($att as $myatt) {
         list($att_id, $att_name) = explode('#', $myatt);
 
-        if ($uniq_identifier === null) {
-            $uniq_identifier = $att_id;
-        }
-
         $fileparts = pathinfo($att_name);
         $fontAwesomeIcon = mfh_getFontAwesomeIconForFileExtension($fileparts['extension']);
         echo '
@@ -49,7 +44,7 @@ function mfh_listAttachments($attachments = '', $reply = 0, $is_staff)
             if ($path == '') {
                 echo '<i class="fa fa-ban fa-4x" data-toggle="tooltip" title="' . $hesklang['attachment_removed'] . '"></i>';
             } else {
-                echo '<a href="' . $path . '" data-fancybox="' . htmlspecialchars($uniq_identifier) . '">
+                echo '<a href="' . $path . '" data-toggle="lightbox-item">
                           <img src="' . $path . '" alt="' . $hesklang['image'] . '" data-toggle="tooltip" title="' . $hesklang['click_to_preview'] . '">
                       </a>';
             }
diff --git a/js/jquery.fancybox.min.js b/js/jquery.fancybox.min.js
deleted file mode 100644
index 15ab71a8..00000000
--- a/js/jquery.fancybox.min.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// ==================================================
-// fancyBox v3.0.47
-//
-// Licensed GPLv3 for open source use
-// or fancyBox Commercial License for commercial use
-//
-// http://fancyapps.com/fancybox/
-// Copyright 2017 fancyApps
-//
-// ==================================================
-!function(t,e,n,o){"use strict";function s(t){var e=t.currentTarget,o=t.data?t.data.options:{},s=t.data?t.data.items:[],i="",a=0;t.preventDefault(),t.stopPropagation(),n(e).attr("data-fancybox")&&(i=n(e).data("fancybox")),i?(s=s.length?s.filter('[data-fancybox="'+i+'"]'):n("[data-fancybox="+i+"]"),a=s.index(e)):s=[e],n.fancybox.open(s,o,a)}if(!n)return o;var i={speed:330,loop:!0,opacity:"auto",margin:[44,0],gutter:30,infobar:!0,buttons:!0,slideShow:!0,fullScreen:!0,thumbs:!0,closeBtn:!0,smallBtn:"auto",image:{preload:"auto",protect:!1},ajax:{settings:{data:{fancybox:!0}}},iframe:{tpl:'<iframe id="fancybox-frame{rnd}" name="fancybox-frame{rnd}" class="fancybox-iframe" frameborder="0" vspace="0" hspace="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen allowtransparency="true" src=""></iframe>',preload:!0,scrolling:"no",css:{}},baseClass:"",slideClass:"",baseTpl:'<div class="fancybox-container" role="dialog" tabindex="-1"><div class="fancybox-bg"></div><div class="fancybox-controls"><div class="fancybox-infobar"><button data-fancybox-previous class="fancybox-button fancybox-button--left" title="Previous"></button><div class="fancybox-infobar__body"><span class="js-fancybox-index"></span>&nbsp;/&nbsp;<span class="js-fancybox-count"></span></div><button data-fancybox-next class="fancybox-button fancybox-button--right" title="Next"></button></div><div class="fancybox-buttons"><button data-fancybox-close class="fancybox-button fancybox-button--close" title="Close (Esc)"></button></div></div><div class="fancybox-slider-wrap"><div class="fancybox-slider"></div></div><div class="fancybox-caption-wrap"><div class="fancybox-caption"></div></div></div>',spinnerTpl:'<div class="fancybox-loading"></div>',errorTpl:'<div class="fancybox-error"><p>The requested content cannot be loaded. <br /> Please try again later.<p></div>',closeTpl:'<button data-fancybox-close class="fancybox-close-small"></button>',parentEl:"body",touch:!0,keyboard:!0,focus:!0,closeClickOutside:!0,beforeLoad:n.noop,afterLoad:n.noop,beforeMove:n.noop,afterMove:n.noop,onComplete:n.noop,onInit:n.noop,beforeClose:n.noop,afterClose:n.noop,onActivate:n.noop,onDeactivate:n.noop},a=n(t),r=n(e),c=0,l=function(t){return t&&t.hasOwnProperty&&t instanceof n},u=function(){return t.requestAnimationFrame||t.webkitRequestAnimationFrame||t.mozRequestAnimationFrame||function(e){t.setTimeout(e,1e3/60)}}(),d=function(o){var s;return"function"==typeof n&&o instanceof n&&(o=o[0]),s=o.getBoundingClientRect(),s.bottom>0&&s.right>0&&s.left<(t.innerWidth||e.documentElement.clientWidth)&&s.top<(t.innerHeight||e.documentElement.clientHeight)},p=function(t,o,s){var a=this;a.opts=n.extend(!0,{index:s},i,o||{}),a.id=a.opts.id||++c,a.group=[],a.currIndex=parseInt(a.opts.index,10)||0,a.prevIndex=null,a.prevPos=null,a.currPos=0,a.firstRun=null,a.createGroup(t),a.group.length&&(a.$lastFocus=n(e.activeElement).blur(),a.slides={},a.init(t))};n.extend(p.prototype,{init:function(){var t,e,o=this,s=!1;o.scrollTop=r.scrollTop(),o.scrollLeft=r.scrollLeft(),n.fancybox.getInstance()||(t=n("body").width(),n("html").addClass("fancybox-enabled"),n.fancybox.isTouch?(n.each(o.group,function(t,e){if("image"!==e.type&&"iframe"!==e.type)return s=!0,!1}),s&&n("body").css({position:"fixed",width:t,top:o.scrollTop*-1})):(t=n("body").width()-t,t>1&&n('<style id="fancybox-noscroll" type="text/css">').html(".compensate-for-scrollbar, .fancybox-enabled body { margin-right: "+t+"px; }").appendTo("head"))),e=n(o.opts.baseTpl).attr("id","fancybox-container-"+o.id).data("FancyBox",o).addClass(o.opts.baseClass).hide().prependTo(o.opts.parentEl),o.$refs={container:e,bg:e.find(".fancybox-bg"),controls:e.find(".fancybox-controls"),buttons:e.find(".fancybox-buttons"),slider_wrap:e.find(".fancybox-slider-wrap"),slider:e.find(".fancybox-slider"),caption:e.find(".fancybox-caption")},o.trigger("onInit"),o.activate(),o.current||o.jumpTo(o.currIndex)},createGroup:function(t){var e=this,s=n.makeArray(t);n.each(s,function(t,s){var i,a,r,c,l={},u={},d=[];n.isPlainObject(s)?(l=s,u=s.opts||{}):"object"===n.type(s)&&n(s).length?(i=n(s),d=i.data(),u="options"in d?d.options:{},u="object"===n.type(u)?u:{},l.type="type"in d?d.type:u.type,l.src="src"in d?d.src:u.src||i.attr("href"),u.width="width"in d?d.width:u.width,u.height="height"in d?d.height:u.height,u.thumb="thumb"in d?d.thumb:u.thumb,u.selector="selector"in d?d.selector:u.selector,"srcset"in d&&(u.image={srcset:d.srcset}),u.$orig=i):l={type:"html",content:s+""},l.opts=n.extend(!0,{},e.opts,u),a=l.type,r=l.src||"",a||(l.content?a="html":r.match(/(^data:image\/[a-z0-9+\/=]*,)|(\.(jp(e|g|eg)|gif|png|bmp|webp|svg|ico)((\?|#).*)?$)/i)?a="image":r.match(/\.(pdf)((\?|#).*)?$/i)?a="pdf":"#"===r.charAt(0)&&(a="inline"),l.type=a),l.index=e.group.length,l.opts.$orig&&!l.opts.$orig.length&&delete l.opts.$orig,!l.opts.$thumb&&l.opts.$orig&&(l.opts.$thumb=l.opts.$orig.find("img:first")),l.opts.$thumb&&!l.opts.$thumb.length&&delete l.opts.$thumb,"function"===n.type(l.opts.caption)?l.opts.caption=l.opts.caption.apply(s,[e,l]):"caption"in d?l.opts.caption=d.caption:u.$orig&&(l.opts.caption=i.attr("title")),l.opts.caption=l.opts.caption===o?"":l.opts.caption+"","ajax"===a&&(c=r.split(/\s+/,2),c.length>1&&(l.src=c.shift(),l.opts.selector=c.shift())),"auto"==l.opts.smallBtn&&(n.inArray(a,["html","inline","ajax"])>-1?(l.opts.buttons=!1,l.opts.smallBtn=!0):l.opts.smallBtn=!1),"pdf"===a&&(l.type="iframe",l.opts.closeBtn=!0,l.opts.smallBtn=!1,l.opts.iframe.preload=!1),l.opts.modal&&n.extend(!0,l.opts,{infobar:0,buttons:0,keyboard:0,slideShow:0,fullScreen:0,closeClickOutside:0}),e.group.push(l)})},addEvents:function(){var e=this;e.removeEvents(),e.$refs.container.on("click.fb-close","[data-fancybox-close]",function(t){t.stopPropagation(),t.preventDefault(),e.close(t)}).on("click.fb-previous","[data-fancybox-previous]",function(t){t.stopPropagation(),t.preventDefault(),e.previous()}).on("click.fb-next","[data-fancybox-next]",function(t){t.stopPropagation(),t.preventDefault(),e.next()}),n(t).on("orientationchange.fb resize.fb",function(t){u(function(){t&&t.originalEvent&&"resize"===t.originalEvent.type?e.update():(e.$refs.slider_wrap.hide(),u(function(){e.$refs.slider_wrap.show(),e.update()}))})}),r.on("focusin.fb",function(t){var o=n.fancybox?n.fancybox.getInstance():null;!o||n(t.target).hasClass("fancybox-container")||n.contains(o.$refs.container[0],t.target)||(t.stopPropagation(),o.focus(),a.scrollTop(e.scrollTop).scrollLeft(e.scrollLeft))}),r.on("keydown.fb",function(t){var o=e.current,s=t.keyCode||t.which;if(o&&o.opts.keyboard&&!n(t.target).is("input")&&!n(t.target).is("textarea")){if(8===s||27===s)return t.preventDefault(),void e.close(t);switch(s){case 37:case 38:t.preventDefault(),e.previous();break;case 39:case 40:t.preventDefault(),e.next();break;case 80:case 32:t.preventDefault(),e.SlideShow&&(t.preventDefault(),e.SlideShow.toggle());break;case 70:e.FullScreen&&(t.preventDefault(),e.FullScreen.toggle());break;case 71:e.Thumbs&&(t.preventDefault(),e.Thumbs.toggle())}}})},removeEvents:function(){a.off("scroll.fb resize.fb orientationchange.fb"),r.off("keydown.fb focusin.fb click.fb-close"),this.$refs.container.off("click.fb-close click.fb-previous click.fb-next")},previous:function(t){this.jumpTo(this.currIndex-1,t)},next:function(t){this.jumpTo(this.currIndex+1,t)},jumpTo:function(t,e){var n,s,i,a,r=this;if(n=r.firstRun=null===r.firstRun,s=i=t=parseInt(t,10),a=!!r.current&&r.current.opts.loop,!r.isAnimating&&(s!=r.currIndex||n)){if(r.group.length>1&&a)s%=r.group.length,s=s<0?r.group.length+s:s,2==r.group.length?i=t-r.currIndex+r.currPos:(i=s-r.currIndex+r.currPos,Math.abs(r.currPos-(i+r.group.length))<Math.abs(r.currPos-i)?i+=r.group.length:Math.abs(r.currPos-(i-r.group.length))<Math.abs(r.currPos-i)&&(i-=r.group.length));else if(!r.group[s])return void r.update(!1,!1,e);r.current&&(r.current.$slide.removeClass("fancybox-slide--current fancybox-slide--complete"),r.updateSlide(r.current,!0)),r.prevIndex=r.currIndex,r.prevPos=r.currPos,r.currIndex=s,r.currPos=i,r.current=r.createSlide(i),r.group.length>1&&((r.opts.loop||i-1>=0)&&r.createSlide(i-1),(r.opts.loop||i+1<r.group.length)&&r.createSlide(i+1)),r.current.isMoved=!1,r.current.isComplete=!1,e=parseInt(e===o?1.5*r.current.opts.speed:e,10),r.trigger("beforeMove"),r.updateControls(),n&&(r.current.$slide.addClass("fancybox-slide--current"),r.$refs.container.show(),u(function(){r.$refs.bg.css("transition-duration",r.current.opts.speed+"ms"),r.$refs.container.addClass("fancybox-container--ready")})),r.update(!0,!1,n?0:e,function(){r.afterMove()}),r.loadSlide(r.current),n&&r.current.$ghost||r.preload()}},createSlide:function(t){var e,o,s,i=this;if(o=t%i.group.length,o=o<0?i.group.length+o:o,!i.slides[t]&&i.group[o]){if(i.opts.loop&&i.group.length>2)for(var a in i.slides)if(i.slides[a].index===o)return s=i.slides[a],s.pos=t,i.slides[t]=s,delete i.slides[a],i.updateSlide(s),s;e=n('<div class="fancybox-slide"></div>').appendTo(i.$refs.slider),i.slides[t]=n.extend(!0,{},i.group[o],{pos:t,$slide:e,isMoved:!1,isLoaded:!1})}return i.slides[t]},zoomInOut:function(t,e,o){var s,i,a,r=this,c=r.current,l=c.$placeholder,u=c.opts.opacity,p=c.opts.$thumb,h=p?p.offset():0,f=c.$slide.offset();return!!(l&&c.isMoved&&h&&d(p))&&(!("In"===t&&!r.firstRun)&&(n.fancybox.stop(l),r.isAnimating=!0,s={top:h.top-f.top+parseFloat(p.css("border-top-width")||0),left:h.left-f.left+parseFloat(p.css("border-left-width")||0),width:p.width(),height:p.height(),scaleX:1,scaleY:1},"auto"==u&&(u=Math.abs(c.width/c.height-s.width/s.height)>.1),"In"===t?(i=s,a=r.getFitPos(c),a.scaleX=a.width/i.width,a.scaleY=a.height/i.height,u&&(i.opacity=.1,a.opacity=1)):(i=n.fancybox.getTranslate(l),a=s,c.$ghost&&(c.$ghost.show(),c.$image&&c.$image.remove()),i.scaleX=i.width/a.width,i.scaleY=i.height/a.height,i.width=a.width,i.height=a.height,u&&(a.opacity=0)),r.updateCursor(a.width,a.height),delete a.width,delete a.height,n.fancybox.setTranslate(l,i),l.show(),r.trigger("beforeZoom"+t),l.css("transition","all "+e+"ms"),n.fancybox.setTranslate(l,a),setTimeout(function(){var e;l.css("transition","none"),e=n.fancybox.getTranslate(l),e.scaleX=1,e.scaleY=1,n.fancybox.setTranslate(l,e),r.trigger("afterZoom"+t),o.apply(r),r.isAnimating=!1},e),!0))},canPan:function(){var t=this,e=t.current,n=e.$placeholder,o=!1;return n&&(o=t.getFitPos(e),o=Math.abs(n.width()-o.width)>1||Math.abs(n.height()-o.height)>1),o},isScaledDown:function(){var t=this,e=t.current,o=e.$placeholder,s=!1;return o&&(s=n.fancybox.getTranslate(o),s=s.width<e.width||s.height<e.height),s},scaleToActual:function(t,e,s){var i,a,r,c,l,u=this,d=u.current,p=d.$placeholder,h=parseInt(d.$slide.width(),10),f=parseInt(d.$slide.height(),10),g=d.width,b=d.height;p&&(u.isAnimating=!0,t=t===o?.5*h:t,e=e===o?.5*f:e,i=n.fancybox.getTranslate(p),c=g/i.width,l=b/i.height,a=.5*h-.5*g,r=.5*f-.5*b,g>h&&(a=i.left*c-(t*c-t),a>0&&(a=0),a<h-g&&(a=h-g)),b>f&&(r=i.top*l-(e*l-e),r>0&&(r=0),r<f-b&&(r=f-b)),u.updateCursor(g,b),n.fancybox.animate(p,null,{top:r,left:a,scaleX:c,scaleY:l},s||d.opts.speed,function(){u.isAnimating=!1}))},scaleToFit:function(t){var e,o=this,s=o.current,i=s.$placeholder;i&&(o.isAnimating=!0,e=o.getFitPos(s),o.updateCursor(e.width,e.height),n.fancybox.animate(i,null,{top:e.top,left:e.left,scaleX:e.width/i.width(),scaleY:e.height/i.height()},t||s.opts.speed,function(){o.isAnimating=!1}))},getFitPos:function(t){var e,o,s,i,r,c,l,u=t.$placeholder||t.$content,d=t.width,p=t.height,h=t.opts.margin;return!(!u||!u.length||!d&&!p)&&("number"===n.type(h)&&(h=[h,h]),2==h.length&&(h=[h[0],h[1],h[0],h[1]]),a.width()<800&&(h=[0,0,0,0]),e=parseInt(t.$slide.width(),10)-(h[1]+h[3]),o=parseInt(t.$slide.height(),10)-(h[0]+h[2]),s=Math.min(1,e/d,o/p),c=Math.floor(s*d),l=Math.floor(s*p),i=Math.floor(.5*(o-l))+h[0],r=Math.floor(.5*(e-c))+h[3],{top:i,left:r,width:c,height:l})},update:function(t,e,o,s){var i,a=this;a.isAnimating!==!0&&a.current&&(i=a.current.pos*Math.floor(a.current.$slide.width())*-1-a.current.pos*a.current.opts.gutter,o=parseInt(o,10)||0,n.fancybox.stop(a.$refs.slider),t===!1?a.updateSlide(a.current,e):n.each(a.slides,function(t,n){a.updateSlide(n,e)}),o?n.fancybox.animate(a.$refs.slider,null,{top:0,left:i},o,function(){a.current.isMoved=!0,"function"===n.type(s)&&s.apply(a)}):(n.fancybox.setTranslate(a.$refs.slider,{top:0,left:i}),a.current.isMoved=!0,"function"===n.type(s)&&s.apply(a)))},updateSlide:function(t,e){var o,s=this,i=t.$placeholder;t=t||s.current,t&&!s.isClosing&&(o=t.pos*Math.floor(t.$slide.width())+t.pos*t.opts.gutter,o!==t.leftPos&&(n.fancybox.setTranslate(t.$slide,{top:0,left:o}),t.leftPos=o),e!==!1&&i&&(n.fancybox.setTranslate(i,s.getFitPos(t)),t.pos===s.currPos&&s.updateCursor()),t.$slide.trigger("refresh"),s.trigger("onUpdate",t))},updateCursor:function(t,e){var n,s=this,i=s.$refs.container.removeClass("fancybox-controls--canzoomIn fancybox-controls--canzoomOut fancybox-controls--canGrab");!s.isClosing&&s.opts.touch&&(n=t!==o&&e!==o?t<s.current.width&&e<s.current.height:s.isScaledDown(),n?i.addClass("fancybox-controls--canzoomIn"):s.group.length<2?i.addClass("fancybox-controls--canzoomOut"):i.addClass("fancybox-controls--canGrab"))},loadSlide:function(t){var e,o,s,i=this;if(t&&!t.isLoaded&&!t.isLoading){switch(t.isLoading=!0,i.trigger("beforeLoad",t),e=t.type,o=t.$slide,o.off("refresh").trigger("onReset").addClass("fancybox-slide--"+(e||"unknown")).addClass(t.opts.slideClass),e){case"image":i.setImage(t);break;case"iframe":i.setIframe(t);break;case"html":i.setContent(t,t.content);break;case"inline":n(t.src).length?i.setContent(t,n(t.src)):i.setError(t);break;case"ajax":i.showLoading(t),s=n.ajax(n.extend({},t.opts.ajax.settings,{url:t.src,success:function(e,n){"success"===n&&i.setContent(t,e)},error:function(e,n){e&&"abort"!==n&&i.setError(t)}})),o.one("onReset",function(){s.abort()});break;default:i.setError(t)}return!0}},setImage:function(e){var o,s,i,a,r=this,c=e.opts.image.srcset;if(e.isLoaded&&!e.hasError)return void r.afterLoad(e);if(c){i=t.devicePixelRatio||1,a=t.innerWidth*i,s=c.split(",").map(function(t){var e={};return t.trim().split(/\s+/).forEach(function(t,n){var o=parseInt(t.substring(0,t.length-1),10);return 0===n?e.url=t:void(o&&(e.value=o,e.postfix=t[t.length-1]))}),e}),s.sort(function(t,e){return t.value-e.value});for(var l=0;l<s.length;l++){var u=s[l];if("w"===u.postfix&&u.value>=a||"x"===u.postfix&&u.value>=i){o=u;break}}!o&&s.length&&(o=s[s.length-1]),o&&(e.src=o.url,e.width&&e.height&&"w"==o.postfix&&(e.height=e.width/e.height*o.value,e.width=o.value))}e.$placeholder=n('<div class="fancybox-placeholder"></div>').hide().appendTo(e.$slide),e.opts.preload!==!1&&e.opts.width&&e.opts.height&&(e.opts.thumb||e.opts.$thumb)?(e.width=e.opts.width,e.height=e.opts.height,e.$ghost=n("<img />").one("load error",function(){r.isClosing||(n("<img/>")[0].src=e.src,r.revealImage(e,function(){r.setBigImage(e),r.firstRun&&e.index===r.currIndex&&r.preload()}))}).addClass("fancybox-image").appendTo(e.$placeholder).attr("src",e.opts.thumb||e.opts.$thumb.attr("src"))):r.setBigImage(e)},setBigImage:function(t){var e=this,o=n("<img />");t.$image=o.one("error",function(){e.setError(t)}).one("load",function(){clearTimeout(t.timouts),t.timouts=null,e.isClosing||(t.width=this.naturalWidth,t.height=this.naturalHeight,t.opts.image.srcset&&o.attr("sizes","100vw").attr("srcset",t.opts.image.srcset),e.afterLoad(t),t.$ghost&&(t.timouts=setTimeout(function(){t.$ghost.hide()},350)))}).addClass("fancybox-image").attr("src",t.src).appendTo(t.$placeholder),o[0].complete?o.trigger("load"):o[0].error?o.trigger("error"):t.timouts=setTimeout(function(){o[0].complete||t.hasError||e.showLoading(t)},150),t.opts.image.protect&&n('<div class="fancybox-spaceball"></div>').appendTo(t.$placeholder).on("contextmenu.fb",function(t){return 2==t.button&&t.preventDefault(),!0})},revealImage:function(t,e){var o=this;return e=e||n.noop,"image"!==t.type||t.hasError||t.isRevealed===!0?void e.apply(o):(t.isRevealed=!0,void(t.pos===o.currPos&&o.zoomInOut("In",t.opts.speed,e)||(t.$ghost&&!t.isLoaded&&o.updateSlide(t,!0),t.pos===o.currPos?n.fancybox.animate(t.$placeholder,{opacity:0},{opacity:1},300,e):t.$placeholder.show(),e.apply(o))))},setIframe:function(t){var e,s=this,i=t.opts.iframe,a=t.$slide;t.$content=n('<div class="fancybox-content"></div>').css(i.css).appendTo(a),e=n(i.tpl.replace(/\{rnd\}/g,(new Date).getTime())).attr("scrolling",n.fancybox.isTouch?"auto":i.scrolling).appendTo(t.$content),i.preload?(t.$content.addClass("fancybox-tmp"),s.showLoading(t),e.on("load.fb error.fb",function(e){this.isReady=1,t.$slide.trigger("refresh"),s.afterLoad(t)}),a.on("refresh.fb",function(){var n,s,a,r,c,l=t.$content;if(1===e[0].isReady){try{n=e.contents(),s=n.find("body")}catch(t){}s&&s.length&&(i.css.width===o||i.css.height===o)&&(a=e[0].contentWindow.document.documentElement.scrollWidth,r=Math.ceil(s.outerWidth(!0)+(l.width()-a)),c=Math.ceil(s.outerHeight(!0)),l.css({width:i.css.width===o?r+(l.outerWidth()-l.innerWidth()):i.css.width,height:i.css.height===o?c+(l.outerHeight()-l.innerHeight()):i.css.height})),l.removeClass("fancybox-tmp")}})):this.afterLoad(t),e.attr("src",t.src),t.opts.smallBtn&&t.$content.prepend(t.opts.closeTpl),a.one("onReset",function(){try{n(this).find("iframe").hide().attr("src","//about:blank")}catch(t){}n(this).empty(),t.isLoaded=!1})},setContent:function(t,e){var o=this;o.isClosing||(o.hideLoading(t),t.$slide.empty(),l(e)&&e.parent().length?(e.data("placeholder")&&e.parents(".fancybox-slide").trigger("onReset"),e.data({placeholder:n("<div></div>").hide().insertAfter(e)}).css("display","inline-block")):("string"===n.type(e)&&(e=n("<div>").append(e).contents(),3===e[0].nodeType&&(e=n("<div>").html(e))),t.opts.selector&&(e=n("<div>").html(e).find(t.opts.selector))),t.$slide.one("onReset",function(){var o=l(e)?e.data("placeholder"):0;o&&(e.hide().replaceAll(o),e.data("placeholder",null)),t.hasError||(n(this).empty(),t.isLoaded=!1)}),t.$content=n(e).appendTo(t.$slide),t.opts.smallBtn===!0&&t.$content.find(".fancybox-close-small").remove().end().eq(0).append(t.opts.closeTpl),this.afterLoad(t))},setError:function(t){t.hasError=!0,this.setContent(t,t.opts.errorTpl)},showLoading:function(t){var e=this;t=t||e.current,t&&!t.$spinner&&(t.$spinner=n(e.opts.spinnerTpl).appendTo(t.$slide))},hideLoading:function(t){var e=this;t=t||e.current,t&&t.$spinner&&(t.$spinner.remove(),delete t.$spinner)},afterMove:function(){var t=this,e=t.current,o={};e&&(e.$slide.siblings().trigger("onReset"),n.each(t.slides,function(e,n){n.pos>=t.currPos-1&&n.pos<=t.currPos+1?o[n.pos]=n:n&&n.$slide.remove()}),t.slides=o,t.trigger("afterMove"),e.isLoaded&&t.complete())},afterLoad:function(t){var e=this;e.isClosing||(t.isLoading=!1,t.isLoaded=!0,e.trigger("afterLoad",t),e.hideLoading(t),t.$ghost||e.updateSlide(t,!0),t.index===e.currIndex&&t.isMoved?e.complete():t.$ghost||e.revealImage(t))},complete:function(){var t=this,e=t.current;t.revealImage(e,function(){e.isComplete=!0,e.$slide.addClass("fancybox-slide--complete"),t.updateCursor(),t.trigger("onComplete"),e.opts.focus&&"image"!==e.type&&"iframe"!==e.type&&t.focus()})},preload:function(){var t,e,n=this;n.group.length<2||(t=n.slides[n.currPos+1],e=n.slides[n.currPos-1],t&&"image"===t.type&&n.loadSlide(t),e&&"image"===e.type&&n.loadSlide(e))},focus:function(){var t,e=this.current;t=e&&e.isComplete?e.$slide.find('button,:input,[tabindex],a:not(".disabled")').filter(":visible:first"):null,t&&t.length||(t=this.$refs.container),t.focus(),this.$refs.slider_wrap.scrollLeft(0),e&&e.$slide.scrollTop(0)},activate:function(){var t=this;n(".fancybox-container").each(function(){var e=n(this).data("FancyBox");e&&e.uid!==t.uid&&!e.isClosing&&e.trigger("onDeactivate")}),t.current&&(t.$refs.container.index()>0&&t.$refs.container.prependTo(e.body),t.updateControls()),t.trigger("onActivate"),t.addEvents()},close:function(t){var e=this,o=e.current,s=o.opts.speed,i=n.proxy(function(){e.cleanUp(t)},this);return!e.isAnimating&&!e.isClosing&&(e.trigger("beforeClose",t)===!1?(n.fancybox.stop(e.$refs.slider),void u(function(){e.update(!0,!0,150)})):(e.isClosing=!0,o.timouts&&clearTimeout(o.timouts),t!==!0&&n.fancybox.stop(e.$refs.slider),e.$refs.container.removeClass("fancybox-container--active").addClass("fancybox-container--closing"),o.$slide.removeClass("fancybox-slide--complete").siblings().remove(),o.isMoved||o.$slide.css("overflow","visible"),e.removeEvents(),e.hideLoading(o),e.hideControls(),e.updateCursor(),e.$refs.bg.css("transition-duration",s+"ms"),this.$refs.container.removeClass("fancybox-container--ready"),void(t===!0?setTimeout(i,s):e.zoomInOut("Out",s,i)||n.fancybox.animate(e.$refs.container,null,{opacity:0},s,"easeInSine",i))))},cleanUp:function(t){var e,o=this;o.$refs.slider.children().trigger("onReset"),o.$refs.container.empty().remove(),o.trigger("afterClose",t),o.current=null,e=n.fancybox.getInstance(),e?e.activate():(n("html").removeClass("fancybox-enabled"),n("body").removeAttr("style"),a.scrollTop(o.scrollTop).scrollLeft(o.scrollLeft),n("#fancybox-noscroll").remove()),o.$lastFocus&&o.$lastFocus.focus()},trigger:function(t,o){var s,i=Array.prototype.slice.call(arguments,1),a=this,r=o&&o.opts?o:a.current;return r?i.unshift(r):r=a,i.unshift(a),n.isFunction(r.opts[t])&&(s=r.opts[t].apply(r,i)),s===!1?s:void("afterClose"===t?n(e).trigger(t+".fb",i):a.$refs.container.trigger(t+".fb",i))},toggleControls:function(t){this.isHiddenControls?this.updateControls(t):this.hideControls()},hideControls:function(){this.isHiddenControls=!0,this.$refs.container.removeClass("fancybox-show-controls"),this.$refs.container.removeClass("fancybox-show-caption")},updateControls:function(t){var e=this,o=e.$refs.container,s=e.$refs.caption,i=e.current,a=i.index,r=i.opts,c=r.caption;this.isHiddenControls&&t!==!0||(this.isHiddenControls=!1,o.addClass("fancybox-show-controls").toggleClass("fancybox-show-infobar",!!r.infobar&&e.group.length>1).toggleClass("fancybox-show-buttons",!!r.buttons).toggleClass("fancybox-is-modal",!!r.modal),n(".fancybox-button--left",o).toggleClass("fancybox-button--disabled",!r.loop&&a<=0),n(".fancybox-button--right",o).toggleClass("fancybox-button--disabled",!r.loop&&a>=e.group.length-1),n(".fancybox-button--play",o).toggle(!!(r.slideShow&&e.group.length>1)),n(".fancybox-button--close",o).toggle(!!r.closeBtn),n(".js-fancybox-count",o).html(e.group.length),n(".js-fancybox-index",o).html(a+1),i.$slide.trigger("refresh"),s&&s.empty(),c&&c.length?(s.html(c),this.$refs.container.addClass("fancybox-show-caption "),e.$caption=s):this.$refs.container.removeClass("fancybox-show-caption"))}}),n.fancybox={version:"3.0.47",defaults:i,getInstance:function(t){var e=n('.fancybox-container:not(".fancybox-container--closing"):first').data("FancyBox"),o=Array.prototype.slice.call(arguments,1);return e instanceof p&&("string"===n.type(t)?e[t].apply(e,o):"function"===n.type(t)&&t.apply(e,o),e)},open:function(t,e,n){return new p(t,e,n)},close:function(t){var e=this.getInstance();e&&(e.close(),t===!0&&this.close())},isTouch:e.createTouch!==o&&/Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(navigator.userAgent),use3d:function(){var n=e.createElement("div");return t.getComputedStyle(n).getPropertyValue("transform")&&!(e.documentMode&&e.documentMode<=11)}(),getTranslate:function(t){var e,n;return!(!t||!t.length)&&(e=t.get(0).getBoundingClientRect(),n=t.eq(0).css("transform"),n&&n.indexOf("matrix")!==-1?(n=n.split("(")[1],n=n.split(")")[0],n=n.split(",")):n=[],n.length?(n=n.length>10?[n[13],n[12],n[0],n[5]]:[n[5],n[4],n[0],n[3]],n=n.map(parseFloat)):n=[0,0,1,1],{top:n[0],left:n[1],scaleX:n[2],scaleY:n[3],opacity:parseFloat(t.css("opacity")),width:e.width,height:e.height})},setTranslate:function(t,e){var n="",s={};if(t&&e)return e.left===o&&e.top===o||(n=(e.left===o?t.position().top:e.left)+"px, "+(e.top===o?t.position().top:e.top)+"px",n=this.use3d?"translate3d("+n+", 0px)":"translate("+n+")"),e.scaleX!==o&&e.scaleY!==o&&(n=(n.length?n+" ":"")+"scale("+e.scaleX+", "+e.scaleY+")"),n.length&&(s.transform=n),e.opacity!==o&&(s.opacity=e.opacity),e.width!==o&&(s.width=e.width),e.height!==o&&(s.height=e.height),t.css(s)},easing:{easeOutCubic:function(t,e,n,o){return n*((t=t/o-1)*t*t+1)+e},easeInCubic:function(t,e,n,o){return n*(t/=o)*t*t+e},easeOutSine:function(t,e,n,o){return n*Math.sin(t/o*(Math.PI/2))+e},easeInSine:function(t,e,n,o){return-n*Math.cos(t/o*(Math.PI/2))+n+e}},stop:function(t){t.removeData("animateID")},animate:function(t,e,s,i,a,r){var c,l,d,p=this,h=null,f=0,g=function(){s.scaleX!==o&&s.scaleY!==o&&e&&e.width!==o&&e.height!==o&&(s.width=e.width*s.scaleX,s.height=e.height*s.scaleY,s.scaleX=1,s.scaleY=1),p.setTranslate(t,s),r()},b=function(n){if(c=[],l=0,t.length&&t.data("animateID")===d){if(n=n||Date.now(),h&&(l=n-h),h=n,f+=l,f>=i)return void g();for(var r in s)s.hasOwnProperty(r)&&e[r]!==o&&(e[r]==s[r]?c[r]=s[r]:c[r]=p.easing[a](f,e[r],s[r]-e[r],i));p.setTranslate(t,c),u(b)}};p.animateID=d=p.animateID===o?1:p.animateID+1,t.data("animateID",d),r===o&&"function"==n.type(a)&&(r=a,a=o),a||(a="easeOutCubic"),r=r||n.noop,e?this.setTranslate(t,e):e=this.getTranslate(t),i?(t.show(),u(b)):g()}},n.fn.fancybox=function(t){return this.off("click.fb-start").on("click.fb-start",{items:this,options:t||{}},s),this},n(e).on("click.fb-start","[data-fancybox]",s)}(window,document,window.jQuery),function(t){"use strict";var e=function(e,n,o){if(e)return o=o||"","object"===t.type(o)&&(o=t.param(o,!0)),t.each(n,function(t,n){e=e.replace("$"+t,n||"")}),o.length&&(e+=(e.indexOf("?")>0?"&":"?")+o),e},n={youtube:{matcher:/(youtube\.com|youtu\.be|youtube\-nocookie\.com)\/(watch\?(.*&)?v=|v\/|u\/|embed\/?)?(videoseries\?list=(.*)|[\w-]{11}|\?listType=(.*)&list=(.*))(.*)/i,params:{autoplay:1,autohide:1,fs:1,rel:0,hd:1,wmode:"transparent",enablejsapi:1,html5:1},paramPlace:8,type:"iframe",url:"//www.youtube.com/embed/$4",thumb:"//img.youtube.com/vi/$4/hqdefault.jpg"},vimeo:{matcher:/^.+vimeo.com\/(.*\/)?([\d]+)(.*)?/,params:{autoplay:1,hd:1,show_title:1,show_byline:1,show_portrait:0,fullscreen:1,api:1},paramPlace:3,type:"iframe",url:"//player.vimeo.com/video/$2"},metacafe:{matcher:/metacafe.com\/watch\/(\d+)\/(.*)?/,type:"iframe",url:"//www.metacafe.com/embed/$1/?ap=1"},dailymotion:{matcher:/dailymotion.com\/video\/(.*)\/?(.*)/,params:{additionalInfos:0,autoStart:1},type:"iframe",url:"//www.dailymotion.com/embed/video/$1"},vine:{matcher:/vine.co\/v\/([a-zA-Z0-9\?\=\-]+)/,type:"iframe",url:"//vine.co/v/$1/embed/simple"},instagram:{matcher:/(instagr\.am|instagram\.com)\/p\/([a-zA-Z0-9_\-]+)\/?/i,type:"image",url:"//$1/p/$2/media/?size=l"},google_maps:{matcher:/(maps\.)?google\.([a-z]{2,3}(\.[a-z]{2})?)\/(((maps\/(place\/(.*)\/)?\@(.*),(\d+.?\d+?)z))|(\?ll=))(.*)?/i,type:"iframe",url:function(t){return"//maps.google."+t[2]+"/?ll="+(t[9]?t[9]+"&z="+Math.floor(t[10])+(t[12]?t[12].replace(/^\//,"&"):""):t[12])+"&output="+(t[12]&&t[12].indexOf("layer=c")>0?"svembed":"embed")}}};t(document).on("onInit.fb",function(o,s){t.each(s.group,function(o,s){var i,a,r,c,l,u,d=s.src||"",p=!1;s.type||(t.each(n,function(n,o){if(a=d.match(o.matcher),l={},u=n,a){if(p=o.type,o.paramPlace&&a[o.paramPlace]){c=a[o.paramPlace],"?"==c[0]&&(c=c.substring(1)),c=c.split("&");for(var h=0;h<c.length;++h){var f=c[h].split("=",2);2==f.length&&(l[f[0]]=decodeURIComponent(f[1].replace(/\+/g," ")))}}return r=t.extend(!0,{},o.params,s.opts[n],l),d="function"===t.type(o.url)?o.url.call(this,a,r,s):e(o.url,a,r),i="function"===t.type(o.thumb)?o.thumb.call(this,a,r,s):e(o.thumb,a),"vimeo"===u&&(d=d.replace("&%23","#")),!1}}),p?(s.src=d,s.type=p,s.opts.thumb||s.opts.$thumb&&s.opts.$thumb.length||(s.opts.thumb=i),"iframe"===p&&(t.extend(!0,s.opts,{iframe:{preload:!1,scrolling:"no"},smallBtn:!1,closeBtn:!0,fullScreen:!1,slideShow:!1}),s.opts.slideClass+=" fancybox-slide--video")):s.type="iframe")})})}(window.jQuery),function(t,e,n){"use strict";var o=function(){return t.requestAnimationFrame||t.webkitRequestAnimationFrame||t.mozRequestAnimationFrame||function(e){t.setTimeout(e,1e3/60)}}(),s=function(e){var n=[];e=e.originalEvent||e||t.e,e=e.touches&&e.touches.length?e.touches:e.changedTouches&&e.changedTouches.length?e.changedTouches:[e];for(var o in e)e[o].pageX?n.push({x:e[o].pageX,y:e[o].pageY}):e[o].clientX&&n.push({x:e[o].clientX,y:e[o].clientY});return n},i=function(t,e,n){return e&&t?"x"===n?t.x-e.x:"y"===n?t.y-e.y:Math.sqrt(Math.pow(t.x-e.x,2)+Math.pow(t.y-e.y,2)):0},a=function(t){return t.is("a")||t.is("button")||t.is("input")||t.is("select")||t.is("textarea")||n.isFunction(t.get(0).onclick)},r=function(e){var n=t.getComputedStyle(e)["overflow-y"],o=t.getComputedStyle(e)["overflow-x"],s=("scroll"===n||"auto"===n)&&e.scrollHeight>e.clientHeight,i=("scroll"===o||"auto"===o)&&e.scrollWidth>e.clientWidth;return s||i},c=function(t){for(var e=!1;;){if(e=r(t.get(0)))break;if(t=t.parent(),!t.length||t.hasClass("fancybox-slider")||t.is("body"))break}return e},l=function(t){var e=this;e.instance=t,e.$wrap=t.$refs.slider_wrap,e.$slider=t.$refs.slider,e.$container=t.$refs.container,e.destroy(),e.$wrap.on("touchstart.fb mousedown.fb",n.proxy(e,"ontouchstart"))};l.prototype.destroy=function(){this.$wrap.off("touchstart.fb mousedown.fb touchmove.fb mousemove.fb touchend.fb touchcancel.fb mouseup.fb mouseleave.fb")},l.prototype.ontouchstart=function(e){var o=this,r=n(e.target),l=o.instance,u=l.current,d=u.$content||u.$placeholder;return o.startPoints=s(e),o.$target=r,o.$content=d,o.canvasWidth=Math.round(u.$slide[0].clientWidth),o.canvasHeight=Math.round(u.$slide[0].clientHeight),o.startEvent=e,e.originalEvent.clientX>o.canvasWidth+u.$slide.offset().left||(a(r)||a(r.parent())||c(r)?void 0:u.opts.touch?void(e.originalEvent&&2==e.originalEvent.button||(e.stopPropagation(),e.preventDefault(),!u||o.instance.isAnimating||o.instance.isClosing||!o.startPoints||o.startPoints.length>1&&!u.isMoved||(o.$wrap.off("touchmove.fb mousemove.fb",n.proxy(o,"ontouchmove")),o.$wrap.off("touchend.fb touchcancel.fb mouseup.fb mouseleave.fb",n.proxy(o,"ontouchend")),o.$wrap.on("touchend.fb touchcancel.fb mouseup.fb mouseleave.fb",n.proxy(o,"ontouchend")),o.$wrap.on("touchmove.fb mousemove.fb",n.proxy(o,"ontouchmove")),o.startTime=(new Date).getTime(),o.distanceX=o.distanceY=o.distance=0,o.canTap=!1,o.isPanning=!1,o.isSwiping=!1,o.isZooming=!1,o.sliderStartPos=n.fancybox.getTranslate(o.$slider),o.contentStartPos=n.fancybox.getTranslate(o.$content),o.contentLastPos=null,1!==o.startPoints.length||o.isZooming||(o.canTap=u.isMoved,"image"===u.type&&(o.contentStartPos.width>o.canvasWidth+1||o.contentStartPos.height>o.canvasHeight+1)?(n.fancybox.stop(o.$content),o.isPanning=!0):(n.fancybox.stop(o.$slider),o.isSwiping=!0),o.$container.addClass("fancybox-controls--isGrabbing")),2===o.startPoints.length&&u.isMoved&&!u.hasError&&"image"===u.type&&(u.isLoaded||u.$ghost)&&(o.isZooming=!0,o.isSwiping=!1,o.isPanning=!1,n.fancybox.stop(o.$content),o.centerPointStartX=.5*(o.startPoints[0].x+o.startPoints[1].x)-n(t).scrollLeft(),o.centerPointStartY=.5*(o.startPoints[0].y+o.startPoints[1].y)-n(t).scrollTop(),o.percentageOfImageAtPinchPointX=(o.centerPointStartX-o.contentStartPos.left)/o.contentStartPos.width,o.percentageOfImageAtPinchPointY=(o.centerPointStartY-o.contentStartPos.top)/o.contentStartPos.height,o.startDistanceBetweenFingers=i(o.startPoints[0],o.startPoints[1]))))):(o.endPoints=o.startPoints,o.ontap()))},l.prototype.ontouchmove=function(t){var e=this;t.preventDefault(),e.newPoints=s(t),e.newPoints&&e.newPoints.length&&(e.distanceX=i(e.newPoints[0],e.startPoints[0],"x"),e.distanceY=i(e.newPoints[0],e.startPoints[0],"y"),e.distance=i(e.newPoints[0],e.startPoints[0]),e.distance>0&&(e.isSwiping?e.onSwipe():e.isPanning?e.onPan():e.isZooming&&e.onZoom()))},l.prototype.onSwipe=function(){var e,s=this,i=s.isSwiping,a=s.sliderStartPos.left;i===!0?Math.abs(s.distance)>10&&(s.instance.group.length<2?s.isSwiping="y":!s.instance.current.isMoved||s.instance.opts.touch.vertical===!1||"auto"===s.instance.opts.touch.vertical&&n(t).width()>800?s.isSwiping="x":(e=Math.abs(180*Math.atan2(s.distanceY,s.distanceX)/Math.PI),
-s.isSwiping=e>45&&e<135?"y":"x"),s.canTap=!1,s.instance.current.isMoved=!1,s.startPoints=s.newPoints):("x"==i&&(!s.instance.current.opts.loop&&0===s.instance.current.index&&s.distanceX>0?a+=Math.pow(s.distanceX,.8):!s.instance.current.opts.loop&&s.instance.current.index===s.instance.group.length-1&&s.distanceX<0?a-=Math.pow(-s.distanceX,.8):a+=s.distanceX),s.sliderLastPos={top:"x"==i?0:s.sliderStartPos.top+s.distanceY,left:a},o(function(){n.fancybox.setTranslate(s.$slider,s.sliderLastPos)}))},l.prototype.onPan=function(){var t,e,s,i=this;i.canTap=!1,t=i.contentStartPos.width>i.canvasWidth?i.contentStartPos.left+i.distanceX:i.contentStartPos.left,e=i.contentStartPos.top+i.distanceY,s=i.limitMovement(t,e,i.contentStartPos.width,i.contentStartPos.height),s.scaleX=i.contentStartPos.scaleX,s.scaleY=i.contentStartPos.scaleY,i.contentLastPos=s,o(function(){n.fancybox.setTranslate(i.$content,i.contentLastPos)})},l.prototype.limitMovement=function(t,e,n,o){var s,i,a,r,c=this,l=c.canvasWidth,u=c.canvasHeight,d=c.contentStartPos.left,p=c.contentStartPos.top,h=c.distanceX,f=c.distanceY;return s=Math.max(0,.5*l-.5*n),i=Math.max(0,.5*u-.5*o),a=Math.min(l-n,.5*l-.5*n),r=Math.min(u-o,.5*u-.5*o),n>l&&(h>0&&t>s&&(t=s-1+Math.pow(-s+d+h,.8)||0),h<0&&t<a&&(t=a+1-Math.pow(a-d-h,.8)||0)),o>u&&(f>0&&e>i&&(e=i-1+Math.pow(-i+p+f,.8)||0),f<0&&e<r&&(e=r+1-Math.pow(r-p-f,.8)||0)),{top:e,left:t}},l.prototype.limitPosition=function(t,e,n,o){var s=this,i=s.canvasWidth,a=s.canvasHeight;return n>i?(t=t>0?0:t,t=t<i-n?i-n:t):t=Math.max(0,i/2-n/2),o>a?(e=e>0?0:e,e=e<a-o?a-o:e):e=Math.max(0,a/2-o/2),{top:e,left:t}},l.prototype.onZoom=function(){var e=this,s=e.contentStartPos.width,a=e.contentStartPos.height,r=e.contentStartPos.left,c=e.contentStartPos.top,l=i(e.newPoints[0],e.newPoints[1]),u=l/e.startDistanceBetweenFingers,d=Math.floor(s*u),p=Math.floor(a*u),h=(s-d)*e.percentageOfImageAtPinchPointX,f=(a-p)*e.percentageOfImageAtPinchPointY,g=(e.newPoints[0].x+e.newPoints[1].x)/2-n(t).scrollLeft(),b=(e.newPoints[0].y+e.newPoints[1].y)/2-n(t).scrollTop(),m=g-e.centerPointStartX,y=b-e.centerPointStartY,v=r+(h+m),x=c+(f+y),w={top:x,left:v,scaleX:e.contentStartPos.scaleX*u,scaleY:e.contentStartPos.scaleY*u};e.canTap=!1,e.newWidth=d,e.newHeight=p,e.contentLastPos=w,o(function(){n.fancybox.setTranslate(e.$content,e.contentLastPos)})},l.prototype.ontouchend=function(t){var e=this,o=e.instance.current,i=Math.max((new Date).getTime()-e.startTime,1),a=e.isSwiping,r=e.isPanning,c=e.isZooming;return e.endPoints=s(t),e.$container.removeClass("fancybox-controls--isGrabbing"),e.$wrap.off("touchmove.fb mousemove.fb",n.proxy(this,"ontouchmove")),e.$wrap.off("touchend.fb touchcancel.fb mouseup.fb mouseleave.fb",n.proxy(this,"ontouchend")),e.isSwiping=!1,e.isPanning=!1,e.isZooming=!1,e.canTap?e.ontap():(e.velocityX=e.distanceX/i*.5,e.velocityY=e.distanceY/i*.5,e.speed=o.opts.speed||330,e.speedX=Math.max(.75*e.speed,Math.min(1.5*e.speed,1/Math.abs(e.velocityX)*e.speed)),e.speedY=Math.max(.75*e.speed,Math.min(1.5*e.speed,1/Math.abs(e.velocityY)*e.speed)),void(r?e.endPanning():c?e.endZooming():e.endSwiping(a)))},l.prototype.endSwiping=function(t){var e=this;"y"==t&&Math.abs(e.distanceY)>50?(n.fancybox.animate(e.$slider,null,{top:e.sliderStartPos.top+e.distanceY+150*e.velocityY,left:e.sliderStartPos.left,opacity:0},e.speedY),e.instance.close(!0)):"x"==t&&e.distanceX>50?e.instance.previous(e.speedX):"x"==t&&e.distanceX<-50?e.instance.next(e.speedX):e.instance.update(!1,!0,150)},l.prototype.endPanning=function(){var t,e,o,s=this;s.contentLastPos&&(t=s.contentLastPos.left+s.velocityX*s.speed*2,e=s.contentLastPos.top+s.velocityY*s.speed*2,o=s.limitPosition(t,e,s.contentStartPos.width,s.contentStartPos.height),o.width=s.contentStartPos.width,o.height=s.contentStartPos.height,n.fancybox.animate(s.$content,null,o,s.speed,"easeOutSine"))},l.prototype.endZooming=function(){var t,e,o,s,i=this,a=i.instance.current,r=i.newWidth,c=i.newHeight;i.contentLastPos&&(t=i.contentLastPos.left,e=i.contentLastPos.top,s={top:e,left:t,width:r,height:c,scaleX:1,scaleY:1},n.fancybox.setTranslate(i.$content,s),r<i.canvasWidth&&c<i.canvasHeight?i.instance.scaleToFit(150):r>a.width||c>a.height?i.instance.scaleToActual(i.centerPointStartX,i.centerPointStartY,150):(o=i.limitPosition(t,e,r,c),n.fancybox.animate(i.$content,null,o,i.speed,"easeOutSine")))},l.prototype.ontap=function(){var t=this,e=t.instance,o=e.current,s=t.endPoints[0].x,i=t.endPoints[0].y;if(s-=t.$wrap.offset().left,i-=t.$wrap.offset().top,e.SlideShow&&e.SlideShow.isActive&&e.SlideShow.stop(),!n.fancybox.isTouch)return o.opts.closeClickOutside&&t.$target.is(".fancybox-slide")?void e.close(t.startEvent):void("image"==o.type&&o.isMoved&&(e.canPan()?e.scaleToFit():e.isScaledDown()?e.scaleToActual(s,i):e.group.length<2&&e.close(t.startEvent)));if(t.tapped){if(clearTimeout(t.tapped),t.tapped=null,Math.abs(s-t.x)>50||Math.abs(i-t.y)>50||!o.isMoved)return this;"image"==o.type&&(o.isLoaded||o.$ghost)&&(e.canPan()?e.scaleToFit():e.isScaledDown()&&e.scaleToActual(s,i))}else t.x=s,t.y=i,t.tapped=setTimeout(function(){t.tapped=null,e.toggleControls(!0)},300);return this},n(e).on("onActivate.fb",function(t,e){e&&!e.Guestures&&(e.Guestures=new l(e))}),n(e).on("beforeClose.fb",function(t,e){e&&e.Guestures&&e.Guestures.destroy()})}(window,document,window.jQuery),function(t,e){"use strict";var n=function(t){this.instance=t,this.init()};e.extend(n.prototype,{timer:null,isActive:!1,$button:null,speed:3e3,init:function(){var t=this;t.$button=e('<button data-fancybox-play class="fancybox-button fancybox-button--play" title="Slideshow (P)"></button>').appendTo(t.instance.$refs.buttons),t.instance.$refs.container.on("click","[data-fancybox-play]",function(){t.toggle()})},set:function(){var t=this;t.instance&&t.instance.current&&(t.instance.current.opts.loop||t.instance.currIndex<t.instance.group.length-1)?t.timer=setTimeout(function(){t.instance.next()},t.instance.current.opts.slideShow.speed||t.speed):t.stop()},clear:function(){var t=this;clearTimeout(t.timer),t.timer=null},start:function(){var t=this;t.stop(),t.instance&&t.instance.current&&(t.instance.current.opts.loop||t.instance.currIndex<t.instance.group.length-1)&&(t.instance.$refs.container.on({"beforeLoad.fb.player":e.proxy(t,"clear"),"onComplete.fb.player":e.proxy(t,"set")}),t.isActive=!0,t.instance.current.isComplete&&t.set(),t.instance.$refs.container.trigger("onPlayStart"),t.$button.addClass("fancybox-button--pause"))},stop:function(){var t=this;t.clear(),t.instance.$refs.container.trigger("onPlayEnd").off(".player"),t.$button.removeClass("fancybox-button--pause"),t.isActive=!1},toggle:function(){var t=this;t.isActive?t.stop():t.start()}}),e(t).on("onInit.fb",function(t,e){e&&e.group.length>1&&e.opts.slideShow&&!e.SlideShow&&(e.SlideShow=new n(e))}),e(t).on("beforeClose.fb onDeactivate.fb",function(t,e){e&&e.SlideShow&&e.SlideShow.stop()})}(document,window.jQuery),function(t,e){"use strict";var n=function(){var e,n,o,s=[["requestFullscreen","exitFullscreen","fullscreenElement","fullscreenEnabled","fullscreenchange","fullscreenerror"],["webkitRequestFullscreen","webkitExitFullscreen","webkitFullscreenElement","webkitFullscreenEnabled","webkitfullscreenchange","webkitfullscreenerror"],["webkitRequestFullScreen","webkitCancelFullScreen","webkitCurrentFullScreenElement","webkitCancelFullScreen","webkitfullscreenchange","webkitfullscreenerror"],["mozRequestFullScreen","mozCancelFullScreen","mozFullScreenElement","mozFullScreenEnabled","mozfullscreenchange","mozfullscreenerror"],["msRequestFullscreen","msExitFullscreen","msFullscreenElement","msFullscreenEnabled","MSFullscreenChange","MSFullscreenError"]],i={};for(n=0;n<s.length;n++)if(e=s[n],e&&e[1]in t){for(o=0;o<e.length;o++)i[s[0][o]]=e[o];return i}return!1}();if(n){var o={request:function(e){e=e||t.documentElement,e[n.requestFullscreen](e.ALLOW_KEYBOARD_INPUT)},exit:function(){t[n.exitFullscreen]()},toggle:function(t){this.isFullscreen()?this.exit():this.request(t)},isFullscreen:function(){return Boolean(t[n.fullscreenElement])},enabled:function(){return Boolean(t[n.fullscreenEnabled])}};e(t).on({"onInit.fb":function(t,n){var s;n&&n.opts.fullScreen&&!n.FullScreen&&(s=n.$refs.container,n.$refs.button_fs=e('<button data-fancybox-fullscreen class="fancybox-button fancybox-button--fullscreen" title="Full screen (F)"></button>').appendTo(n.$refs.buttons),s.on("click.fb-fullscreen","[data-fancybox-fullscreen]",function(t){t.stopPropagation(),t.preventDefault(),o.toggle(s[0])}),n.opts.fullScreen.requestOnStart===!0&&o.request(s[0]))},"beforeMove.fb":function(t,e){e&&e.$refs.button_fs&&e.$refs.button_fs.toggle(!!e.current.opts.fullScreen)},"beforeClose.fb":function(){o.exit()}}),e(t).on(n.fullscreenchange,function(){var t=e.fancybox.getInstance(),n=t?t.current.$placeholder:null;n&&(n.css("transition","none"),t.isAnimating=!1,t.update(!0,!0,0))})}}(document,window.jQuery),function(t,e){"use strict";var n=function(t){this.instance=t,this.init()};e.extend(n.prototype,{$button:null,$grid:null,$list:null,isVisible:!1,init:function(){var t=this;t.$button=e('<button data-fancybox-thumbs class="fancybox-button fancybox-button--thumbs" title="Thumbnails (G)"></button>').appendTo(this.instance.$refs.buttons).on("touchend click",function(e){e.stopPropagation(),e.preventDefault(),t.toggle()})},create:function(){var t,n,o=this.instance;this.$grid=e('<div class="fancybox-thumbs"></div>').appendTo(o.$refs.container),t="<ul>",e.each(o.group,function(e,o){n=o.opts.thumb||(o.opts.$thumb?o.opts.$thumb.attr("src"):null),n||"image"!==o.type||(n=o.src),n&&n.length&&(t+='<li data-index="'+e+'"  tabindex="0" class="fancybox-thumbs-loading"><img data-src="'+n+'" /></li>')}),t+="</ul>",this.$list=e(t).appendTo(this.$grid).on("click touchstart","li",function(){o.jumpTo(e(this).data("index"))}),this.$list.find("img").hide().one("load",function(){var t,n,o,s,i=e(this).parent().removeClass("fancybox-thumbs-loading"),a=i.outerWidth(),r=i.outerHeight();t=this.naturalWidth||this.width,n=this.naturalHeight||this.height,o=t/a,s=n/r,o>=1&&s>=1&&(o>s?(t/=s,n=r):(t=a,n/=o)),e(this).css({width:Math.floor(t),height:Math.floor(n),"margin-top":Math.min(0,Math.floor(.3*r-.3*n)),"margin-left":Math.min(0,Math.floor(.5*a-.5*t))}).show()}).each(function(){this.src=e(this).data("src")})},focus:function(){this.instance.current&&this.$list.children().removeClass("fancybox-thumbs-active").filter('[data-index="'+this.instance.current.index+'"]').addClass("fancybox-thumbs-active").focus()},close:function(){this.$grid.hide()},update:function(){this.instance.$refs.container.toggleClass("fancybox-container--thumbs",this.isVisible),this.isVisible?(this.$grid||this.create(),this.$grid.show(),this.focus()):this.$grid&&this.$grid.hide(),this.instance.update()},hide:function(){this.isVisible=!1,this.update()},show:function(){this.isVisible=!0,this.update()},toggle:function(){this.isVisible?this.hide():this.show()}}),e(t).on("onInit.fb",function(t,e){var o=e.group[0],s=e.group[1];e.opts.thumbs&&!e.Thumbs&&e.group.length>1&&("image"==o.type||o.opts.thumb||o.opts.$thumb)&&("image"==s.type||s.opts.thumb||s.opts.$thumb)&&(e.Thumbs=new n(e))}),e(t).on("beforeMove.fb",function(t,e,n){var o=e&&e.Thumbs;o&&(n.modal?(o.$button.hide(),o.hide()):(e.opts.thumbs.showOnStart===!0&&e.firstRun&&o.show(),o.$button.show(),o.isVisible&&o.focus()))}),e(t).on("beforeClose.fb",function(t,e){e&&e.Thumbs&&(e.Thumbs.isVisible&&e.opts.thumbs.hideOnClosing!==!1&&e.Thumbs.close(),e.Thumbs=null)})}(document,window.jQuery),function(t,e,n){"use strict";function o(){var t=e.location.hash.substr(1),n=t.split("-"),o=n.length>1&&/^\+?\d+$/.test(n[n.length-1])?parseInt(n.pop(-1),10)||1:1,s=n.join("-");return o<1&&(o=1),{hash:t,index:o,gallery:s}}function s(t){var e;""!==t.gallery&&(e=n("[data-fancybox='"+n.escapeSelector(t.gallery)+"']").eq(t.index-1),e.length?e.trigger("click"):n("#"+n.escapeSelector(t.gallery)).trigger("click"))}function i(t){var e;return!!t&&(e=t.current?t.current.opts:t.opts,e.$orig?e.$orig.data("fancybox"):e.hash||"")}n.escapeSelector||(n.escapeSelector=function(t){var e=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\x80-\uFFFF\w-]/g,n=function(t,e){return e?"\0"===t?"�":t.slice(0,-1)+"\\"+t.charCodeAt(t.length-1).toString(16)+" ":"\\"+t};return(t+"").replace(e,n)});var a=null;n(function(){setTimeout(function(){n.fancybox.defaults.hash!==!1&&(n(e).on("hashchange.fb",function(){var t=o();n.fancybox.getInstance()?a&&a!==t.gallery+"-"+t.index&&(a=null,n.fancybox.close()):""!==t.gallery&&s(t)}),n(t).on({"onInit.fb":function(t,e){var n=o(),s=i(e);s&&n.gallery&&s==n.gallery&&(e.currIndex=n.index-1)},"beforeMove.fb":function(n,o,s){var r=i(o);r&&""!==r&&(e.location.hash.indexOf(r)<0&&(o.opts.origHash=e.location.hash),a=r+(o.group.length>1?"-"+(s.index+1):""),"pushState"in history?history.pushState("",t.title,e.location.pathname+e.location.search+"#"+a):e.location.hash=a)},"beforeClose.fb":function(n,o,s){var r=i(o),c=o&&o.opts.origHash?o.opts.origHash:"";r&&""!==r&&("pushState"in history?history.pushState("",t.title,e.location.pathname+e.location.search+c):e.location.hash=c),a=null}}),s(o()))},50)})}(document,window,window.jQuery);
\ No newline at end of file
diff --git a/js/jquery.magnific-popup.min.js b/js/jquery.magnific-popup.min.js
new file mode 100644
index 00000000..6ee3a3bd
--- /dev/null
+++ b/js/jquery.magnific-popup.min.js
@@ -0,0 +1,4 @@
+/*! Magnific Popup - v1.1.0 - 2016-02-20
+* http://dimsemenov.com/plugins/magnific-popup/
+* Copyright (c) 2016 Dmitry Semenov; */
+!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):a("object"==typeof exports?require("jquery"):window.jQuery||window.Zepto)}(function(a){var b,c,d,e,f,g,h="Close",i="BeforeClose",j="AfterClose",k="BeforeAppend",l="MarkupParse",m="Open",n="Change",o="mfp",p="."+o,q="mfp-ready",r="mfp-removing",s="mfp-prevent-close",t=function(){},u=!!window.jQuery,v=a(window),w=function(a,c){b.ev.on(o+a+p,c)},x=function(b,c,d,e){var f=document.createElement("div");return f.className="mfp-"+b,d&&(f.innerHTML=d),e?c&&c.appendChild(f):(f=a(f),c&&f.appendTo(c)),f},y=function(c,d){b.ev.triggerHandler(o+c,d),b.st.callbacks&&(c=c.charAt(0).toLowerCase()+c.slice(1),b.st.callbacks[c]&&b.st.callbacks[c].apply(b,a.isArray(d)?d:[d]))},z=function(c){return c===g&&b.currTemplate.closeBtn||(b.currTemplate.closeBtn=a(b.st.closeMarkup.replace("%title%",b.st.tClose)),g=c),b.currTemplate.closeBtn},A=function(){a.magnificPopup.instance||(b=new t,b.init(),a.magnificPopup.instance=b)},B=function(){var a=document.createElement("p").style,b=["ms","O","Moz","Webkit"];if(void 0!==a.transition)return!0;for(;b.length;)if(b.pop()+"Transition"in a)return!0;return!1};t.prototype={constructor:t,init:function(){var c=navigator.appVersion;b.isLowIE=b.isIE8=document.all&&!document.addEventListener,b.isAndroid=/android/gi.test(c),b.isIOS=/iphone|ipad|ipod/gi.test(c),b.supportsTransition=B(),b.probablyMobile=b.isAndroid||b.isIOS||/(Opera Mini)|Kindle|webOS|BlackBerry|(Opera Mobi)|(Windows Phone)|IEMobile/i.test(navigator.userAgent),d=a(document),b.popupsCache={}},open:function(c){var e;if(c.isObj===!1){b.items=c.items.toArray(),b.index=0;var g,h=c.items;for(e=0;e<h.length;e++)if(g=h[e],g.parsed&&(g=g.el[0]),g===c.el[0]){b.index=e;break}}else b.items=a.isArray(c.items)?c.items:[c.items],b.index=c.index||0;if(b.isOpen)return void b.updateItemHTML();b.types=[],f="",c.mainEl&&c.mainEl.length?b.ev=c.mainEl.eq(0):b.ev=d,c.key?(b.popupsCache[c.key]||(b.popupsCache[c.key]={}),b.currTemplate=b.popupsCache[c.key]):b.currTemplate={},b.st=a.extend(!0,{},a.magnificPopup.defaults,c),b.fixedContentPos="auto"===b.st.fixedContentPos?!b.probablyMobile:b.st.fixedContentPos,b.st.modal&&(b.st.closeOnContentClick=!1,b.st.closeOnBgClick=!1,b.st.showCloseBtn=!1,b.st.enableEscapeKey=!1),b.bgOverlay||(b.bgOverlay=x("bg").on("click"+p,function(){b.close()}),b.wrap=x("wrap").attr("tabindex",-1).on("click"+p,function(a){b._checkIfClose(a.target)&&b.close()}),b.container=x("container",b.wrap)),b.contentContainer=x("content"),b.st.preloader&&(b.preloader=x("preloader",b.container,b.st.tLoading));var i=a.magnificPopup.modules;for(e=0;e<i.length;e++){var j=i[e];j=j.charAt(0).toUpperCase()+j.slice(1),b["init"+j].call(b)}y("BeforeOpen"),b.st.showCloseBtn&&(b.st.closeBtnInside?(w(l,function(a,b,c,d){c.close_replaceWith=z(d.type)}),f+=" mfp-close-btn-in"):b.wrap.append(z())),b.st.alignTop&&(f+=" mfp-align-top"),b.fixedContentPos?b.wrap.css({overflow:b.st.overflowY,overflowX:"hidden",overflowY:b.st.overflowY}):b.wrap.css({top:v.scrollTop(),position:"absolute"}),(b.st.fixedBgPos===!1||"auto"===b.st.fixedBgPos&&!b.fixedContentPos)&&b.bgOverlay.css({height:d.height(),position:"absolute"}),b.st.enableEscapeKey&&d.on("keyup"+p,function(a){27===a.keyCode&&b.close()}),v.on("resize"+p,function(){b.updateSize()}),b.st.closeOnContentClick||(f+=" mfp-auto-cursor"),f&&b.wrap.addClass(f);var k=b.wH=v.height(),n={};if(b.fixedContentPos&&b._hasScrollBar(k)){var o=b._getScrollbarSize();o&&(n.marginRight=o)}b.fixedContentPos&&(b.isIE7?a("body, html").css("overflow","hidden"):n.overflow="hidden");var r=b.st.mainClass;return b.isIE7&&(r+=" mfp-ie7"),r&&b._addClassToMFP(r),b.updateItemHTML(),y("BuildControls"),a("html").css(n),b.bgOverlay.add(b.wrap).prependTo(b.st.prependTo||a(document.body)),b._lastFocusedEl=document.activeElement,setTimeout(function(){b.content?(b._addClassToMFP(q),b._setFocus()):b.bgOverlay.addClass(q),d.on("focusin"+p,b._onFocusIn)},16),b.isOpen=!0,b.updateSize(k),y(m),c},close:function(){b.isOpen&&(y(i),b.isOpen=!1,b.st.removalDelay&&!b.isLowIE&&b.supportsTransition?(b._addClassToMFP(r),setTimeout(function(){b._close()},b.st.removalDelay)):b._close())},_close:function(){y(h);var c=r+" "+q+" ";if(b.bgOverlay.detach(),b.wrap.detach(),b.container.empty(),b.st.mainClass&&(c+=b.st.mainClass+" "),b._removeClassFromMFP(c),b.fixedContentPos){var e={marginRight:""};b.isIE7?a("body, html").css("overflow",""):e.overflow="",a("html").css(e)}d.off("keyup"+p+" focusin"+p),b.ev.off(p),b.wrap.attr("class","mfp-wrap").removeAttr("style"),b.bgOverlay.attr("class","mfp-bg"),b.container.attr("class","mfp-container"),!b.st.showCloseBtn||b.st.closeBtnInside&&b.currTemplate[b.currItem.type]!==!0||b.currTemplate.closeBtn&&b.currTemplate.closeBtn.detach(),b.st.autoFocusLast&&b._lastFocusedEl&&a(b._lastFocusedEl).focus(),b.currItem=null,b.content=null,b.currTemplate=null,b.prevHeight=0,y(j)},updateSize:function(a){if(b.isIOS){var c=document.documentElement.clientWidth/window.innerWidth,d=window.innerHeight*c;b.wrap.css("height",d),b.wH=d}else b.wH=a||v.height();b.fixedContentPos||b.wrap.css("height",b.wH),y("Resize")},updateItemHTML:function(){var c=b.items[b.index];b.contentContainer.detach(),b.content&&b.content.detach(),c.parsed||(c=b.parseEl(b.index));var d=c.type;if(y("BeforeChange",[b.currItem?b.currItem.type:"",d]),b.currItem=c,!b.currTemplate[d]){var f=b.st[d]?b.st[d].markup:!1;y("FirstMarkupParse",f),f?b.currTemplate[d]=a(f):b.currTemplate[d]=!0}e&&e!==c.type&&b.container.removeClass("mfp-"+e+"-holder");var g=b["get"+d.charAt(0).toUpperCase()+d.slice(1)](c,b.currTemplate[d]);b.appendContent(g,d),c.preloaded=!0,y(n,c),e=c.type,b.container.prepend(b.contentContainer),y("AfterChange")},appendContent:function(a,c){b.content=a,a?b.st.showCloseBtn&&b.st.closeBtnInside&&b.currTemplate[c]===!0?b.content.find(".mfp-close").length||b.content.append(z()):b.content=a:b.content="",y(k),b.container.addClass("mfp-"+c+"-holder"),b.contentContainer.append(b.content)},parseEl:function(c){var d,e=b.items[c];if(e.tagName?e={el:a(e)}:(d=e.type,e={data:e,src:e.src}),e.el){for(var f=b.types,g=0;g<f.length;g++)if(e.el.hasClass("mfp-"+f[g])){d=f[g];break}e.src=e.el.attr("data-mfp-src"),e.src||(e.src=e.el.attr("href"))}return e.type=d||b.st.type||"inline",e.index=c,e.parsed=!0,b.items[c]=e,y("ElementParse",e),b.items[c]},addGroup:function(a,c){var d=function(d){d.mfpEl=this,b._openClick(d,a,c)};c||(c={});var e="click.magnificPopup";c.mainEl=a,c.items?(c.isObj=!0,a.off(e).on(e,d)):(c.isObj=!1,c.delegate?a.off(e).on(e,c.delegate,d):(c.items=a,a.off(e).on(e,d)))},_openClick:function(c,d,e){var f=void 0!==e.midClick?e.midClick:a.magnificPopup.defaults.midClick;if(f||!(2===c.which||c.ctrlKey||c.metaKey||c.altKey||c.shiftKey)){var g=void 0!==e.disableOn?e.disableOn:a.magnificPopup.defaults.disableOn;if(g)if(a.isFunction(g)){if(!g.call(b))return!0}else if(v.width()<g)return!0;c.type&&(c.preventDefault(),b.isOpen&&c.stopPropagation()),e.el=a(c.mfpEl),e.delegate&&(e.items=d.find(e.delegate)),b.open(e)}},updateStatus:function(a,d){if(b.preloader){c!==a&&b.container.removeClass("mfp-s-"+c),d||"loading"!==a||(d=b.st.tLoading);var e={status:a,text:d};y("UpdateStatus",e),a=e.status,d=e.text,b.preloader.html(d),b.preloader.find("a").on("click",function(a){a.stopImmediatePropagation()}),b.container.addClass("mfp-s-"+a),c=a}},_checkIfClose:function(c){if(!a(c).hasClass(s)){var d=b.st.closeOnContentClick,e=b.st.closeOnBgClick;if(d&&e)return!0;if(!b.content||a(c).hasClass("mfp-close")||b.preloader&&c===b.preloader[0])return!0;if(c===b.content[0]||a.contains(b.content[0],c)){if(d)return!0}else if(e&&a.contains(document,c))return!0;return!1}},_addClassToMFP:function(a){b.bgOverlay.addClass(a),b.wrap.addClass(a)},_removeClassFromMFP:function(a){this.bgOverlay.removeClass(a),b.wrap.removeClass(a)},_hasScrollBar:function(a){return(b.isIE7?d.height():document.body.scrollHeight)>(a||v.height())},_setFocus:function(){(b.st.focus?b.content.find(b.st.focus).eq(0):b.wrap).focus()},_onFocusIn:function(c){return c.target===b.wrap[0]||a.contains(b.wrap[0],c.target)?void 0:(b._setFocus(),!1)},_parseMarkup:function(b,c,d){var e;d.data&&(c=a.extend(d.data,c)),y(l,[b,c,d]),a.each(c,function(c,d){if(void 0===d||d===!1)return!0;if(e=c.split("_"),e.length>1){var f=b.find(p+"-"+e[0]);if(f.length>0){var g=e[1];"replaceWith"===g?f[0]!==d[0]&&f.replaceWith(d):"img"===g?f.is("img")?f.attr("src",d):f.replaceWith(a("<img>").attr("src",d).attr("class",f.attr("class"))):f.attr(e[1],d)}}else b.find(p+"-"+c).html(d)})},_getScrollbarSize:function(){if(void 0===b.scrollbarSize){var a=document.createElement("div");a.style.cssText="width: 99px; height: 99px; overflow: scroll; position: absolute; top: -9999px;",document.body.appendChild(a),b.scrollbarSize=a.offsetWidth-a.clientWidth,document.body.removeChild(a)}return b.scrollbarSize}},a.magnificPopup={instance:null,proto:t.prototype,modules:[],open:function(b,c){return A(),b=b?a.extend(!0,{},b):{},b.isObj=!0,b.index=c||0,this.instance.open(b)},close:function(){return a.magnificPopup.instance&&a.magnificPopup.instance.close()},registerModule:function(b,c){c.options&&(a.magnificPopup.defaults[b]=c.options),a.extend(this.proto,c.proto),this.modules.push(b)},defaults:{disableOn:0,key:null,midClick:!1,mainClass:"",preloader:!0,focus:"",closeOnContentClick:!1,closeOnBgClick:!0,closeBtnInside:!0,showCloseBtn:!0,enableEscapeKey:!0,modal:!1,alignTop:!1,removalDelay:0,prependTo:null,fixedContentPos:"auto",fixedBgPos:"auto",overflowY:"auto",closeMarkup:'<button title="%title%" type="button" class="mfp-close">&#215;</button>',tClose:"Close (Esc)",tLoading:"Loading...",autoFocusLast:!0}},a.fn.magnificPopup=function(c){A();var d=a(this);if("string"==typeof c)if("open"===c){var e,f=u?d.data("magnificPopup"):d[0].magnificPopup,g=parseInt(arguments[1],10)||0;f.items?e=f.items[g]:(e=d,f.delegate&&(e=e.find(f.delegate)),e=e.eq(g)),b._openClick({mfpEl:e},d,f)}else b.isOpen&&b[c].apply(b,Array.prototype.slice.call(arguments,1));else c=a.extend(!0,{},c),u?d.data("magnificPopup",c):d[0].magnificPopup=c,b.addGroup(d,c);return d};var C,D,E,F="inline",G=function(){E&&(D.after(E.addClass(C)).detach(),E=null)};a.magnificPopup.registerModule(F,{options:{hiddenClass:"hide",markup:"",tNotFound:"Content not found"},proto:{initInline:function(){b.types.push(F),w(h+"."+F,function(){G()})},getInline:function(c,d){if(G(),c.src){var e=b.st.inline,f=a(c.src);if(f.length){var g=f[0].parentNode;g&&g.tagName&&(D||(C=e.hiddenClass,D=x(C),C="mfp-"+C),E=f.after(D).detach().removeClass(C)),b.updateStatus("ready")}else b.updateStatus("error",e.tNotFound),f=a("<div>");return c.inlineElement=f,f}return b.updateStatus("ready"),b._parseMarkup(d,{},c),d}}});var H,I="ajax",J=function(){H&&a(document.body).removeClass(H)},K=function(){J(),b.req&&b.req.abort()};a.magnificPopup.registerModule(I,{options:{settings:null,cursor:"mfp-ajax-cur",tError:'<a href="%url%">The content</a> could not be loaded.'},proto:{initAjax:function(){b.types.push(I),H=b.st.ajax.cursor,w(h+"."+I,K),w("BeforeChange."+I,K)},getAjax:function(c){H&&a(document.body).addClass(H),b.updateStatus("loading");var d=a.extend({url:c.src,success:function(d,e,f){var g={data:d,xhr:f};y("ParseAjax",g),b.appendContent(a(g.data),I),c.finished=!0,J(),b._setFocus(),setTimeout(function(){b.wrap.addClass(q)},16),b.updateStatus("ready"),y("AjaxContentAdded")},error:function(){J(),c.finished=c.loadError=!0,b.updateStatus("error",b.st.ajax.tError.replace("%url%",c.src))}},b.st.ajax.settings);return b.req=a.ajax(d),""}}});var L,M=function(c){if(c.data&&void 0!==c.data.title)return c.data.title;var d=b.st.image.titleSrc;if(d){if(a.isFunction(d))return d.call(b,c);if(c.el)return c.el.attr(d)||""}return""};a.magnificPopup.registerModule("image",{options:{markup:'<div class="mfp-figure"><div class="mfp-close"></div><figure><div class="mfp-img"></div><figcaption><div class="mfp-bottom-bar"><div class="mfp-title"></div><div class="mfp-counter"></div></div></figcaption></figure></div>',cursor:"mfp-zoom-out-cur",titleSrc:"title",verticalFit:!0,tError:'<a href="%url%">The image</a> could not be loaded.'},proto:{initImage:function(){var c=b.st.image,d=".image";b.types.push("image"),w(m+d,function(){"image"===b.currItem.type&&c.cursor&&a(document.body).addClass(c.cursor)}),w(h+d,function(){c.cursor&&a(document.body).removeClass(c.cursor),v.off("resize"+p)}),w("Resize"+d,b.resizeImage),b.isLowIE&&w("AfterChange",b.resizeImage)},resizeImage:function(){var a=b.currItem;if(a&&a.img&&b.st.image.verticalFit){var c=0;b.isLowIE&&(c=parseInt(a.img.css("padding-top"),10)+parseInt(a.img.css("padding-bottom"),10)),a.img.css("max-height",b.wH-c)}},_onImageHasSize:function(a){a.img&&(a.hasSize=!0,L&&clearInterval(L),a.isCheckingImgSize=!1,y("ImageHasSize",a),a.imgHidden&&(b.content&&b.content.removeClass("mfp-loading"),a.imgHidden=!1))},findImageSize:function(a){var c=0,d=a.img[0],e=function(f){L&&clearInterval(L),L=setInterval(function(){return d.naturalWidth>0?void b._onImageHasSize(a):(c>200&&clearInterval(L),c++,void(3===c?e(10):40===c?e(50):100===c&&e(500)))},f)};e(1)},getImage:function(c,d){var e=0,f=function(){c&&(c.img[0].complete?(c.img.off(".mfploader"),c===b.currItem&&(b._onImageHasSize(c),b.updateStatus("ready")),c.hasSize=!0,c.loaded=!0,y("ImageLoadComplete")):(e++,200>e?setTimeout(f,100):g()))},g=function(){c&&(c.img.off(".mfploader"),c===b.currItem&&(b._onImageHasSize(c),b.updateStatus("error",h.tError.replace("%url%",c.src))),c.hasSize=!0,c.loaded=!0,c.loadError=!0)},h=b.st.image,i=d.find(".mfp-img");if(i.length){var j=document.createElement("img");j.className="mfp-img",c.el&&c.el.find("img").length&&(j.alt=c.el.find("img").attr("alt")),c.img=a(j).on("load.mfploader",f).on("error.mfploader",g),j.src=c.src,i.is("img")&&(c.img=c.img.clone()),j=c.img[0],j.naturalWidth>0?c.hasSize=!0:j.width||(c.hasSize=!1)}return b._parseMarkup(d,{title:M(c),img_replaceWith:c.img},c),b.resizeImage(),c.hasSize?(L&&clearInterval(L),c.loadError?(d.addClass("mfp-loading"),b.updateStatus("error",h.tError.replace("%url%",c.src))):(d.removeClass("mfp-loading"),b.updateStatus("ready")),d):(b.updateStatus("loading"),c.loading=!0,c.hasSize||(c.imgHidden=!0,d.addClass("mfp-loading"),b.findImageSize(c)),d)}}});var N,O=function(){return void 0===N&&(N=void 0!==document.createElement("p").style.MozTransform),N};a.magnificPopup.registerModule("zoom",{options:{enabled:!1,easing:"ease-in-out",duration:300,opener:function(a){return a.is("img")?a:a.find("img")}},proto:{initZoom:function(){var a,c=b.st.zoom,d=".zoom";if(c.enabled&&b.supportsTransition){var e,f,g=c.duration,j=function(a){var b=a.clone().removeAttr("style").removeAttr("class").addClass("mfp-animated-image"),d="all "+c.duration/1e3+"s "+c.easing,e={position:"fixed",zIndex:9999,left:0,top:0,"-webkit-backface-visibility":"hidden"},f="transition";return e["-webkit-"+f]=e["-moz-"+f]=e["-o-"+f]=e[f]=d,b.css(e),b},k=function(){b.content.css("visibility","visible")};w("BuildControls"+d,function(){if(b._allowZoom()){if(clearTimeout(e),b.content.css("visibility","hidden"),a=b._getItemToZoom(),!a)return void k();f=j(a),f.css(b._getOffset()),b.wrap.append(f),e=setTimeout(function(){f.css(b._getOffset(!0)),e=setTimeout(function(){k(),setTimeout(function(){f.remove(),a=f=null,y("ZoomAnimationEnded")},16)},g)},16)}}),w(i+d,function(){if(b._allowZoom()){if(clearTimeout(e),b.st.removalDelay=g,!a){if(a=b._getItemToZoom(),!a)return;f=j(a)}f.css(b._getOffset(!0)),b.wrap.append(f),b.content.css("visibility","hidden"),setTimeout(function(){f.css(b._getOffset())},16)}}),w(h+d,function(){b._allowZoom()&&(k(),f&&f.remove(),a=null)})}},_allowZoom:function(){return"image"===b.currItem.type},_getItemToZoom:function(){return b.currItem.hasSize?b.currItem.img:!1},_getOffset:function(c){var d;d=c?b.currItem.img:b.st.zoom.opener(b.currItem.el||b.currItem);var e=d.offset(),f=parseInt(d.css("padding-top"),10),g=parseInt(d.css("padding-bottom"),10);e.top-=a(window).scrollTop()-f;var h={width:d.width(),height:(u?d.innerHeight():d[0].offsetHeight)-g-f};return O()?h["-moz-transform"]=h.transform="translate("+e.left+"px,"+e.top+"px)":(h.left=e.left,h.top=e.top),h}}});var P="iframe",Q="//about:blank",R=function(a){if(b.currTemplate[P]){var c=b.currTemplate[P].find("iframe");c.length&&(a||(c[0].src=Q),b.isIE8&&c.css("display",a?"block":"none"))}};a.magnificPopup.registerModule(P,{options:{markup:'<div class="mfp-iframe-scaler"><div class="mfp-close"></div><iframe class="mfp-iframe" src="//about:blank" frameborder="0" allowfullscreen></iframe></div>',srcAction:"iframe_src",patterns:{youtube:{index:"youtube.com",id:"v=",src:"//www.youtube.com/embed/%id%?autoplay=1"},vimeo:{index:"vimeo.com/",id:"/",src:"//player.vimeo.com/video/%id%?autoplay=1"},gmaps:{index:"//maps.google.",src:"%id%&output=embed"}}},proto:{initIframe:function(){b.types.push(P),w("BeforeChange",function(a,b,c){b!==c&&(b===P?R():c===P&&R(!0))}),w(h+"."+P,function(){R()})},getIframe:function(c,d){var e=c.src,f=b.st.iframe;a.each(f.patterns,function(){return e.indexOf(this.index)>-1?(this.id&&(e="string"==typeof this.id?e.substr(e.lastIndexOf(this.id)+this.id.length,e.length):this.id.call(this,e)),e=this.src.replace("%id%",e),!1):void 0});var g={};return f.srcAction&&(g[f.srcAction]=e),b._parseMarkup(d,g,c),b.updateStatus("ready"),d}}});var S=function(a){var c=b.items.length;return a>c-1?a-c:0>a?c+a:a},T=function(a,b,c){return a.replace(/%curr%/gi,b+1).replace(/%total%/gi,c)};a.magnificPopup.registerModule("gallery",{options:{enabled:!1,arrowMarkup:'<button title="%title%" type="button" class="mfp-arrow mfp-arrow-%dir%"></button>',preload:[0,2],navigateByImgClick:!0,arrows:!0,tPrev:"Previous (Left arrow key)",tNext:"Next (Right arrow key)",tCounter:"%curr% of %total%"},proto:{initGallery:function(){var c=b.st.gallery,e=".mfp-gallery";return b.direction=!0,c&&c.enabled?(f+=" mfp-gallery",w(m+e,function(){c.navigateByImgClick&&b.wrap.on("click"+e,".mfp-img",function(){return b.items.length>1?(b.next(),!1):void 0}),d.on("keydown"+e,function(a){37===a.keyCode?b.prev():39===a.keyCode&&b.next()})}),w("UpdateStatus"+e,function(a,c){c.text&&(c.text=T(c.text,b.currItem.index,b.items.length))}),w(l+e,function(a,d,e,f){var g=b.items.length;e.counter=g>1?T(c.tCounter,f.index,g):""}),w("BuildControls"+e,function(){if(b.items.length>1&&c.arrows&&!b.arrowLeft){var d=c.arrowMarkup,e=b.arrowLeft=a(d.replace(/%title%/gi,c.tPrev).replace(/%dir%/gi,"left")).addClass(s),f=b.arrowRight=a(d.replace(/%title%/gi,c.tNext).replace(/%dir%/gi,"right")).addClass(s);e.click(function(){b.prev()}),f.click(function(){b.next()}),b.container.append(e.add(f))}}),w(n+e,function(){b._preloadTimeout&&clearTimeout(b._preloadTimeout),b._preloadTimeout=setTimeout(function(){b.preloadNearbyImages(),b._preloadTimeout=null},16)}),void w(h+e,function(){d.off(e),b.wrap.off("click"+e),b.arrowRight=b.arrowLeft=null})):!1},next:function(){b.direction=!0,b.index=S(b.index+1),b.updateItemHTML()},prev:function(){b.direction=!1,b.index=S(b.index-1),b.updateItemHTML()},goTo:function(a){b.direction=a>=b.index,b.index=a,b.updateItemHTML()},preloadNearbyImages:function(){var a,c=b.st.gallery.preload,d=Math.min(c[0],b.items.length),e=Math.min(c[1],b.items.length);for(a=1;a<=(b.direction?e:d);a++)b._preloadItem(b.index+a);for(a=1;a<=(b.direction?d:e);a++)b._preloadItem(b.index-a)},_preloadItem:function(c){if(c=S(c),!b.items[c].preloaded){var d=b.items[c];d.parsed||(d=b.parseEl(c)),y("LazyLoad",d),"image"===d.type&&(d.img=a('<img class="mfp-img" />').on("load.mfploader",function(){d.hasSize=!0}).on("error.mfploader",function(){d.hasSize=!0,d.loadError=!0,y("LazyLoadError",d)}).attr("src",d.src)),d.preloaded=!0}}}});var U="retina";a.magnificPopup.registerModule(U,{options:{replaceSrc:function(a){return a.src.replace(/\.\w+$/,function(a){return"@2x"+a})},ratio:1},proto:{initRetina:function(){if(window.devicePixelRatio>1){var a=b.st.retina,c=a.ratio;c=isNaN(c)?c():c,c>1&&(w("ImageHasSize."+U,function(a,b){b.img.css({"max-width":b.img[0].naturalWidth/c,width:"100%"})}),w("ElementParse."+U,function(b,d){d.src=a.replaceSrc(d,c)}))}}}}),A()});
\ No newline at end of file
diff --git a/js/modsForHesk-javascript.js b/js/modsForHesk-javascript.js
index 535ec778..eefd257c 100644
--- a/js/modsForHesk-javascript.js
+++ b/js/modsForHesk-javascript.js
@@ -86,6 +86,15 @@ var loadJquery = function()
         $('#' + hide).hide();
     });
 
+    $('[data-toggle="lightbox"]').magnificPopup({
+        delegate: 'a[data-toggle="lightbox-item"]',
+        type: 'image',
+        gallery: {
+            enabled: true
+        },
+        closeOnContentClick: true
+    });
+
     //-- Initialize toastr properties
     toastr.options.progressBar = true;
     toastr.options.closeButton = true;

From 3c5722c6d7545773b689144fc1cf3d409d22242c Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Tue, 23 May 2017 22:14:32 -0400
Subject: [PATCH 146/192] Getting started on inline attachment viewing

---
 inc/view_attachment_functions.inc.php | 13 ++++++++++++-
 js/modsForHesk-javascript.js          |  1 -
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/inc/view_attachment_functions.inc.php b/inc/view_attachment_functions.inc.php
index 23581584..a5259213 100644
--- a/inc/view_attachment_functions.inc.php
+++ b/inc/view_attachment_functions.inc.php
@@ -44,10 +44,21 @@ function mfh_listAttachments($attachments = '', $reply = 0, $is_staff)
             if ($path == '') {
                 echo '<i class="fa fa-ban fa-4x" data-toggle="tooltip" title="' . $hesklang['attachment_removed'] . '"></i>';
             } else {
-                echo '<a href="' . $path . '" data-toggle="lightbox-item">
+                echo '<a href="' . $path . '" data-toggle="lightbox-item" class="mfp-image">
                           <img src="' . $path . '" alt="' . $hesklang['image'] . '" data-toggle="tooltip" title="' . $hesklang['click_to_preview'] . '">
                       </a>';
             }
+        } elseif (in_array($fontAwesomeIcon, array('fa fa-file-word-o', 'fa fa-file-excel-o', 'fa fa-file-powerpoint-o'))) {
+            //-- Get the actual image location and display a thumbnail. It will be linked to a modal to view a larger size.
+            $path = mfh_getSavedNameUrlForAttachment($att_id, $is_staff);
+
+            if ($path == '') {
+                echo '<i class="fa fa-ban fa-4x" data-toggle="tooltip" title="' . $hesklang['attachment_removed'] . '"></i>';
+            } else {
+                echo '<a class="mfp-iframe" data-toggle="lightbox-item" href="https://view.officeapps.live.com/op/embed.aspx?src=' . $path . '">
+                    <i class="' . $fontAwesomeIcon . ' fa-4x"></i>
+                </a>';
+            }
         } else {
             //-- Display the FontAwesome icon in the panel's body
             echo '<i class="' . $fontAwesomeIcon . ' fa-4x"></i>';
diff --git a/js/modsForHesk-javascript.js b/js/modsForHesk-javascript.js
index eefd257c..cfac6bac 100644
--- a/js/modsForHesk-javascript.js
+++ b/js/modsForHesk-javascript.js
@@ -88,7 +88,6 @@ var loadJquery = function()
 
     $('[data-toggle="lightbox"]').magnificPopup({
         delegate: 'a[data-toggle="lightbox-item"]',
-        type: 'image',
         gallery: {
             enabled: true
         },

From 873498e20ed3b2b7e56ad473bea22a2705e9febc Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Mon, 29 May 2017 21:01:09 -0400
Subject: [PATCH 147/192] Move MFH language strings to end of file for i18n
 building

---
 language/en/text.php | 3836 +++++++++++++++++++++---------------------
 1 file changed, 1917 insertions(+), 1919 deletions(-)

diff --git a/language/en/text.php b/language/en/text.php
index 070f10e9..2ab4608c 100644
--- a/language/en/text.php
+++ b/language/en/text.php
@@ -45,1474 +45,906 @@ $hesklang['_COLLATE']='utf8_unicode_ci';
 // This is the email break line that will be used in email piping
 $hesklang['EMAIL_HR']='------ Reply above this line ------';
 
-// ADDED OR MODIFIED IN Mods for HESK 3.1.0
-$hesklang['stack_trace_header'] = 'Stack Trace';
-$hesklang['ticket_message_contents_exist'] = 'The ticket message is not empty. Are you sure you want to leave this page?';
-$hesklang['resend_email_notification'] = 'Re-send Email Notification';
-$hesklang['email_notification_sent'] = 'Email notification sent!';
-$hesklang['email_notification_resend_failed'] = 'Error occurred when trying to send notification email.';
-$hesklang['edit_category'] = 'Edit Category';
-$hesklang['custom_nav_menu_elements'] = 'Custom Nav Menu Elements';
-$hesklang['create_new'] = 'Create New';
-$hesklang['custom_nav_element_deleted'] = 'Custom Navigation Element Deleted!';
-$hesklang['no_custom_nav_elements_found'] = 'No custom nav menu elements found';
-$hesklang['alert_success'] = 'Success'; // Used for alert messages
-$hesklang['alert_error'] = 'Error'; // Used for alert messages
-$hesklang['failed_to_load_custom_nav_elements'] = 'Failed to load custom nav elements!';
-$hesklang['custom_nav_element_deleted'] = 'Custom nav element deleted!';
-$hesklang['error_deleting_custom_nav_element'] = 'Error deleting custom nav element!';
-$hesklang['error_sorting_custom_nav_elements'] = 'Error sorting custom nav elements!';
-$hesklang['custom_nav_element_created'] = 'Custom nav element created!';
-$hesklang['custom_nav_element_saved'] = 'Custom nav element saved!';
-$hesklang['homepage_block'] = 'Homepage - Block';
-$hesklang['customer_navigation'] = 'Customer Navigation';
-$hesklang['staff_navigation'] = 'Staff Navigation';
-$hesklang['custom_nav_text'] = 'Text';
-$hesklang['custom_nav_subtext'] = 'Subtext';
-$hesklang['image_url_slash_font_icon'] = 'Image URL / Font Icon';
-$hesklang['edit_custom_nav_element_title_case'] = 'Edit Custom Nav Element';
-$hesklang['create_custom_nav_element_title_case'] = 'Create Custom Nav Element';
-$hesklang['place'] = 'Place';
-$hesklang['image_type'] = 'Image Type';
-$hesklang['image_url'] = 'Image URL';
-$hesklang['image_url_help'] = 'The URL of the image you wish to use. For customer/staff navigation, recommended size is <b>16x16px</b>. For the homepage blocks, recommended size is <b>32x32px</b>.';
-$hesklang['font_icon'] = 'Font Icon';
-$hesklang['error_saving_custom_nav_element'] = 'Error saving custom nav element!';
-$hesklang['place_help'] = 'The location of the custom navigation element.';
-$hesklang['url_help'] = 'The URL where the user should be taken to. Both relative and absolute URLs are supported.';
-$hesklang['common_properties'] = 'Common Properties';
-$hesklang['customer_view'] = 'Customer View';
-$hesklang['admin_panel'] = 'Admin Panel';
-
-// ADDED OR MODIFIED IN Mods for HESK 3.0.0
-$hesklang['you_have_x_messages'] = 'You have %s new %s'; // %s: Number of new messages, "message" or "messages", depending on # 
-$hesklang['message_lower_case'] = 'message';
-$hesklang['messages_lower_case'] = 'messages';
-$hesklang['deleted_user_title_case'] = 'Deleted User';
-$hesklang['x_system_warnings'] = '%s System %s'; // %s: Number of warnings, $s: "Warning" or "Warnings", depending on #
-$hesklang['warnings_title_case'] = 'Warnings';
-$hesklang['articles_in_category_x'] = 'Articles in Category %s'; // %s: category name
-$hesklang['private_category_star'] = 'Private categories indicated by *';
-$hesklang['private_article_star'] = 'Private articles indicated by *';
-$hesklang['ticket_details'] = 'Ticket Details';
-$hesklang['more'] = 'More';
-$hesklang['click_to_edit'] = 'Click to edit';
-$hesklang['no_device_information'] = 'No device information';
-$hesklang['message_colon'] = 'Message:';
-$hesklang['original_message'] = 'Original message';
-$hesklang['reply_by_customer'] = 'Reply by customer';
-$hesklang['reply_by_staff'] = 'Reply by staff';
-$hesklang['timeline_today'] = 'Today';
-$hesklang['no_notes_for_this_ticket'] = 'No notes for this ticket';
-$hesklang['private_message_header'] = 'Private Message';
-$hesklang['date_colon'] = 'Date:';
-$hesklang['api_information'] = 'API Information';
-$hesklang['api_version'] = 'API Version';
-$hesklang['external_api'] = 'External API';
-$hesklang['external_api_help'] = 'Enable or Disable the external REST API';
-$hesklang['disabled_title_case'] = 'Disabled';
-$hesklang['enabled_title_case'] = 'Enabled';
-$hesklang['api_settings'] = 'API Settings';
-$hesklang['user_security'] = 'User Security';
-$hesklang['api_documentation'] = 'API Documentation';
-$hesklang['changes_saved'] = 'Changes saved!';
-$hesklang['save_failed_check_logs'] = 'Saving changes failed. Check the logs for more information.';
-$hesklang['number_of_tokens'] = 'Number of Tokens';
-$hesklang['generate_new_token'] = 'Generate New Token';
-$hesklang['revoke_all_tokens'] = 'Revoke All Tokens';
-$hesklang['generated_token_colon'] = 'Generated Token:';
-$hesklang['record_this_token_warning'] = 'Please record this token, as this is the only time you will be able to view it!';
-$hesklang['all_tokens_revoked'] = 'All tokens for this user have been revoked';
-$hesklang['staff_login_title'] = 'Staff Login';
-$hesklang['manage_custom_fields'] = 'Manage Custom Fields';
-$hesklang['value'] = 'Value';
-$hesklang['readonly'] = 'Readonly';
-$hesklang['copy_ticket'] = 'Copy Ticket';
-$hesklang['canned_responses_dropdown_title'] = 'Canned Responses';
-$hesklang['helpdesk_settings'] = 'Helpdesk Settings';
-$hesklang['click_to_toggle'] = 'Click to toggle';
-$hesklang['see_all_messages'] = 'See All Messages';
-$hesklang['color_scheme'] = 'Color Scheme';
-$hesklang['color_scheme_help'] = 'The color scheme for the backend to use.';
-
-// ADDED OR MODIFIED IN Mods for HESK 2.6.0
-$hesklang['search_logs'] = 'Search Logs';
-$hesklang['date_logged'] = 'Date Logged';
-$hesklang['from_date'] = 'From Date';
-$hesklang['to_date'] = 'To Date';
-$hesklang['severity'] = 'Severity';
-$hesklang['debug'] = 'Debug';
-$hesklang['warning_title_case'] = 'Warning';
-$hesklang['logs'] = 'Logs';
-$hesklang['view_message_log'] = 'View Message Log';
-$hesklang['can_view_logs'] = 'Can view message logs';
-$hesklang['attachment_viewer_message'] = "Drag files here or click the 'Add File' button below to select files to upload.";
-$hesklang['attachment_invalid_type_message'] = 'Sorry, but the file type you tried to upload is not allowed.';
-$hesklang['attachment_upload_error'] = 'An error occurred when trying to upload. Please try again later.';
-$hesklang['attachment_too_large'] = 'This attachment is larger than the max filesize permitted.';
-$hesklang['attachment_cancel'] = 'Cancel';
-$hesklang['attachment_confirm_cancel'] = 'Are you sure you want to cancel this upload?';
-$hesklang['attachment_remove'] = 'Remove attachment';
-$hesklang['due_date'] = 'Due Date';
-$hesklang['category_color'] = 'Color';
-$hesklang['category_color_help'] = 'The hex code for the color to be used on the view ticket screen and calendar. Leave blank for no color';
-$hesklang['category_updated'] = 'Changes to <i>%s</i> have been saved';
-$hesklang['new_event'] = 'New Event';
-$hesklang['create_event'] = 'Create Event';
-$hesklang['event_title'] = 'Title';
-$hesklang['event_title_tooltip'] = 'The title of the event';
-$hesklang['event_location'] = 'Location';
-$hesklang['event_location_tooltip'] = 'The location of the event';
-$hesklang['event_category_tooltip'] = 'Category for the event';
-$hesklang['event_start'] = 'Start';
-$hesklang['event_start_tooltip'] = 'The starting date (and time) of the event';
-$hesklang['event_start_date'] = 'Start Date';
-$hesklang['event_start_time'] = 'Start Time';
-$hesklang['event_all_day'] = 'All day';
-$hesklang['event_end'] = 'End';
-$hesklang['event_end_tooltip'] = 'The ending date (and time) of the event';
-$hesklang['event_end_date'] = 'End Date';
-$hesklang['event_end_time'] = 'End Time';
-$hesklang['event_reminder'] = 'Reminder';
-$hesklang['event_reminder_tooltip'] = 'Receive an e-mail reminder for this event. Only you will receive this reminder email.';
-$hesklang['event_min_before_event'] = 'minutes before event';
-$hesklang['event_hours_before_event'] = 'hours before event';
-$hesklang['event_days_before_event'] = 'days before event';
-$hesklang['event_weeks_before_event'] = 'weeks before event';
-$hesklang['event_comments'] = 'Comments';
-$hesklang['event_comments_tooltip'] = 'Additional comments about the event';
-$hesklang['event_create_ticket'] = 'Create Ticket';
-$hesklang['to_title_case'] = 'To';
-$hesklang['clear_for_no_due_date'] = 'Clear for no due date';
-$hesklang['ticket_due_date_updated'] = 'Ticket due date successfully updated';
-$hesklang['error_updating_ticket_due_date'] = 'An error occurred when trying to update the ticket due date';
-$hesklang['error_loading_events'] = 'An error occurred when trying to load events';
-$hesklang['error_deleting_event'] = 'An error occurred when trying to delete the event';
-$hesklang['event_deleted'] = 'Event successfully deleted';
-$hesklang['event_created'] = 'Event successfully created';
-$hesklang['error_creating_event'] = 'An error occurred when trying to create the event';
-$hesklang['event_updated'] = 'Event successfully updated';
-$hesklang['error_updating_event'] = 'An error occurred when trying to update the event';
-$hesklang['calendar_title_case'] = 'Calendar';
-$hesklang['calendar_categories'] = 'Categories';
-$hesklang['can_man_calendar'] = 'Can manage calendar events';
-$hesklang['calendar_reminder'] = 'Upcoming Event: %%TITLE%%';
-$hesklang['overdue_ticket'] = '[%%TRACKID%%] Ticket Overdue!';
-$hesklang['notify_overdue_unassigned'] = 'A ticket is overdue not assigned to me';
-$hesklang['calendar_settings'] = 'Calendar Settings';
-$hesklang['enable_calendar'] = 'Enable calendar';
-$hesklang['enable_calendar_help'] = 'Setting to enable / disable the calendar. The calendar can be shown to everyone, staff only, or disable the calendar entirely.';
-$hesklang['yes_enable_calendar'] = '<b>YES</b>, enable calendar';
-$hesklang['yes_enable_calendar_staff_only'] = '<b>YES</b>, enable calendar, but only for staff';
-$hesklang['no_disable_calendar'] = '<b>NO</b>, disable calendar';
-$hesklang['first_day_of_week'] = 'First day of week';
-$hesklang['first_day_of_week_help'] = 'This setting decides which day of the week to show first per week.';
-$hesklang['calendar_disabled'] = 'The calendar is disabled';
-$hesklang['default_view'] = 'Default Calendar View';
-$hesklang['default_view_help'] = 'Decide which view will be shown to customers and staff by default when viewing the calendar. Staff can change this setting via their own profile.';
-$hesklang['week'] = 'Week';
-$hesklang['calendar_day'] = 'Day';
-$hesklang['calendar_index'] = 'View upcoming events';
-$hesklang['usage'] = 'Usage';
-$hesklang['tickets_and_events'] = 'Tickets and events';
-$hesklang['tickets_only'] = 'Tickets only';
-$hesklang['events_only'] = 'Events only';
-$hesklang['events'] = 'Events';
-$hesklang['add_files'] = '<i class="fa fa-plus"></i> Add File';
-$hesklang['select_all_title_case'] = 'Select All';
-$hesklang['deselect_all_title_case'] = 'Deselect All';
-$hesklang['event'] = 'Event';
-$hesklang['overdue_ticket_legend'] = 'Overdue ticket';
-$hesklang['attachment_max_exceeded'] = 'This file will not be uploaded becuase you have already uploaded the maximum number of files allowed.';
+// EMAIL SUBJECTS
+$hesklang['new_ticket_staff']       = '[#%%TRACK_ID%%] New ticket: %%SUBJECT%%';
+$hesklang['ticket_received']        = '[#%%TRACK_ID%%] Ticket received: %%SUBJECT%%; Status: %%STATUS%%';
+$hesklang['ticket_assigned_to_you'] = '[#%%TRACK_ID%%] Ticket assigned: %%SUBJECT%%';
+$hesklang['new_reply_by_customer']  = '[#%%TRACK_ID%%] New reply to: %%SUBJECT%%';
+$hesklang['new_reply_by_staff']     = '[#%%TRACK_ID%%] New reply to: %%SUBJECT%%';
+$hesklang['category_moved']         = '[#%%TRACK_ID%%] Ticket moved: %%SUBJECT%%';
+$hesklang['new_note']               = '[#%%TRACK_ID%%] Note added to: %%SUBJECT%%';
+$hesklang['new_pm']                 = 'New private message: %%SUBJECT%%';
+$hesklang['forgot_ticket_id']       = 'List of your support tickets';
+$hesklang['ticket_closed']			= '[#%%TRACK_ID%%] Ticket closed/resolved'; // New in 2.6.0
 
-// ADDED OR MODIFIED IN Mods for HESK 2.5.2
-$hesklang['manage_statuses'] = 'Manage Statuses';
-$hesklang['manage_service_messages'] = 'Manage Service Messages';
-$hesklang['manage_banned_ips'] = 'Manage Banned IPs';
-$hesklang['manage_banned_emails'] = 'Manage Banned Emails';
-$hesklang['manage_email_templates'] = 'Manage Email Templates';
-$hesklang['linked_tickets'] = 'Linked tickets';
-$hesklang['add_ticket'] = 'Add Ticket';
-$hesklang['cannot_link_ticket_to_itself'] = 'You cannot link a ticket to itself!';
-$hesklang['linked_ticket_does_not_exist'] = '<strong>%s</strong> is not a valid Tracking ID!'; //%s: the child tracking ID
-$hesklang['is_already_linked'] = '<strong>%s</strong> is already linked to this ticket.'; //%s: the child tracking ID
-$hesklang['link_added'] = 'Successfully linked <strong>%s</strong> to this ticket.'; //%s: the child tracking ID
-$hesklang['ticket_no_longer_linked'] = 'Ticket is no longer linked.';
-$hesklang['unlink'] = 'Unlink';
+// ERROR MESSAGES
+$hesklang['cant_connect_db']='Can\'t connect to database!';
+$hesklang['invalid_action']='Invalid action';
+$hesklang['select_username']='Please select your username';
+$hesklang['enter_pass']='Please enter your password';
+$hesklang['cant_sql']='Can\'t execute SQL';
+$hesklang['contact_webmsater']='Please notify webmaster at';
+$hesklang['mysql_said']='MySQL said';
+$hesklang['wrong_pass']='Wrong password.';
+$hesklang['session_expired']='Your session has expired, please login using the form below.';
+$hesklang['attempt']='Invalid attempt!';
+$hesklang['not_authorized_tickets']='You are not authorized to view tickets inside this category!';
+$hesklang['must_be_admin']='You are not authorized to view this page! To view this page you must be logged in as an administrator.';
+$hesklang['no_session']='Can\'t start a new session!';
+$hesklang['error']='Error';
+$hesklang['int_error']='Internal script error';
+$hesklang['no_trackID']='No tracking ID';
+$hesklang['status_not_valid']='Status not valid';
+$hesklang['trackID_not_found']='Tracking ID not found';
+$hesklang['select_priority']='Please select priority';
+$hesklang['ticket_not_found']='Ticket not found! Please make sure you have entered the correct tracking ID!';
+$hesklang['no_selected']='No tickets selected, nothing to change';
+$hesklang['id_not_valid']='This is not a valid ID';
+$hesklang['enter_id']='Please enter tracking ID';
+$hesklang['enter_name']='Please enter customer name';
+$hesklang['enter_date']='Please enter the date you want to search in';
+$hesklang['date_not_valid']='This is not a valid date. Please enter date in <b>YYYY-MM-DD</b> format.';
+$hesklang['enter_subject']='Please enter ticket subject';
+$hesklang['invalid_search']='Invalid search action';
+$hesklang['choose_cat_ren']='Please choose a category to be renamed';
+$hesklang['cat_ren_name']='Please write new category name';
+$hesklang['cat_not_found']='Category not found';
+$hesklang['enter_cat_name']='Please enter category name';
+$hesklang['no_cat_id']='No category ID';
+$hesklang['cant_del_default_cat']='You cannot delete the default category, you can only rename it';
+$hesklang['no_valid_id']='No valid user ID';
+$hesklang['user_not_found']='User not found';
+$hesklang['enter_real_name']='Please enter user real name';
+$hesklang['enter_valid_email']='Please enter a valid email address';
+$hesklang['enter_username']='Please enter username (login)';
+$hesklang['asign_one_cat']='Please assign user to at least one category!';
+$hesklang['confirm_user_pass']='Please confirm password';
+$hesklang['passwords_not_same']='The two passwords entered are not the same!';
+$hesklang['cant_del_admin']='You cannot delete the default administrator!';
+$hesklang['cant_del_own']='You cannot delete the profile you are logged in as!';
+$hesklang['enter_your_name']='Please enter your name';
+$hesklang['enter_message']='Please enter your message';
+$hesklang['sel_app_cat']='Please select the appropriate category';
+$hesklang['sel_app_priority']='Please select the appropriate priority';
+$hesklang['enter_ticket_subject']='Please enter your ticket subject';
+$hesklang['user_not_found_nothing_edit']='User not found or nothing to change';
 
-// ADDED OR MODIFIED IN Mods for HESK 2.5.0
-$hesklang['ticket_message_no_attachments'] = 'Ticket/Reply message, however attachments will not be included in the email';
-$hesklang['click_for_device_information'] = 'Click for device information';
-$hesklang['device_information'] = 'Device information';
-$hesklang['operating_system'] = 'Operating System';
-$hesklang['browser'] = 'Browser';
-$hesklang['screen_resolution'] = 'Screen Resolution';
-$hesklang['display_user_agent_information'] = 'Show user agent';
-$hesklang['display_user_agent_information_help'] = 'When enabled, staff will be able to view the operating system, browser,
-    and screen resolution of the device used to create the ticket.';
-$hesklang['value_colon'] = 'Value:';
-$hesklang['hidden_custom_field'] = 'Hidden text field';
-$hesklang['hidden_custom_field_help'] = 'This input is the same as a text field; however this value cannot be changed and will not be visible to the user.';
-$hesklang['readonly_custom_field'] = 'Read-only text field';
-$hesklang['readonly_custom_field_help'] = 'This input is the same as a text field; however this value cannot be changed, but will be visible to the user.';
-$hesklang['navbar_title_url'] = 'Navbar Title URL';
-$hesklang['navbar_title_url_help'] = 'Enter the URL you wish to use when a customer (or staff) clicks on the help desk title on the top-left corner of the screen. The URL must begin with http:// or https://.';
-$hesklang['this_field_is_required'] = 'This field is required';
-$hesklang['select_at_least_one_value'] = 'Please select at least one value';
+// ADMIN PANEL
+$hesklang['administrator']='Administrator';
+$hesklang['login']='Login';
+$hesklang['user']='User';
+$hesklang['username']='Username';
+$hesklang['pass']='Password';
+$hesklang['confirm_pass']='Confirm password';
+$hesklang['logged_out']='Logged out';
+$hesklang['logout']='Logout';
+$hesklang['logout_success']='You have been successfully logged out!';
+$hesklang['click_login']='Click here to login';
+$hesklang['back']='Go back';
+$hesklang['displaying_pages']='Displaying <b>%d</b> tickets. Pages:';
+$hesklang['trackID']='Tracking ID';
+$hesklang['timestamp']='Timestamp';
+$hesklang['name']='Name';
+$hesklang['subject']='Subject';
+$hesklang['status']='Status';
+$hesklang['priority']='Priority';
+$hesklang['open_action']='Open ticket'; // Open ACTION
+$hesklang['close']='Closed'; // Closed ticket STATUS
+$hesklang['any_status']='Any status';
+$hesklang['high']='High';
+$hesklang['medium']='Medium';
+$hesklang['low']='Low';
+$hesklang['del_selected']='Delete selected tickets';
+$hesklang['manage_cat']='Manage categories';
+$hesklang['profile']='Your profile';
+$hesklang['show_tickets']='Show tickets';
+$hesklang['sort_by']='Sort by';
+$hesklang['date_posted']='Date posted';
+$hesklang['category']='Category';
+$hesklang['any_cat']='Any category';
+$hesklang['order']='Order';
+$hesklang['ascending']='ascending';
+$hesklang['descending']='descending';
+$hesklang['display']='Display';
+$hesklang['tickets_page']='tickets per page';
+$hesklang['find_ticket']='Find ticket';
+$hesklang['yyyy_mm_dd']='YYYY-MM-DD';
+$hesklang['results_page']='results per page';
+$hesklang['opened']='opened'; // The ticket has been OPENED
+$hesklang['ticket']='Ticket';
+$hesklang['tickets']='Tickets';
+$hesklang['ticket_been']='This ticket has been';
+$hesklang['view_ticket']='View ticket';
+$hesklang['open_tickets']='Open tickets';
+$hesklang['remove_statement']='Remove &quot;Powered by&quot; statement';
+$hesklang['click_info']='Click here for more info';
+$hesklang['reply_added']='Reply added';
+$hesklang['ticket_marked']='This ticket has been marked';
+$hesklang['ticket_status']='Ticket status';
+$hesklang['replies']='Replies';
+$hesklang['date']='Date';
+$hesklang['email']='Email';
+$hesklang['ip']='IP';
+$hesklang['message']='Message';
+$hesklang['add_reply']='Add reply';
+$hesklang['change_priority']='Change priority to';
+$hesklang['attach_sign']='Attach signature';
+$hesklang['profile_settings']='Profile settings';
+$hesklang['submit_reply']='Submit reply';
+$hesklang['support_panel']='Support panel';
+$hesklang['ticket_trackID']='Ticket tracking ID';
+$hesklang['c2c']='Click to continue';
+$hesklang['tickets_deleted']='Tickets deleted';
+$hesklang['num_tickets_deleted']='<b>%d</b> tickets have been deleted';
+$hesklang['found_num_tickets']='Found <b>%d</b> tickets. Pages:';
+$hesklang['confirm_del_cat']='Are you sure you want to remove this category?';
+$hesklang['cat_intro']='Here you are able to manage categories. Categories are useful
+for categorizing tickets by relevance (for example &quot;Sales&quot;,
+&quot;Hardware problems&quot;, &quot;PHP/MySQL problems&quot; etc) and for
+assigning users to categories (for example that your sales person can only view
+tickets posted to &quot;Sales&quot; category)';
+$hesklang['cat_name']='Category name';
+$hesklang['remove']='Remove';
+$hesklang['add_cat']='Add new category';
+$hesklang['max_chars']='max 40 chars';
+$hesklang['create_cat']='Create category';
+$hesklang['ren_cat']='Rename category';
+$hesklang['to']='to';
+$hesklang['cat_added']='Category added';
+$hesklang['cat_name_added']='Category %s has been successfully added';
+$hesklang['cat_renamed']='Category renamed';
+$hesklang['cat_renamed_to']='Selected category has been successfully renamed to';
+$hesklang['cat_removed']='Category removed';
+$hesklang['cat_removed_db']='Selected category has been successfully removed from the database';
+$hesklang['sure_remove_user']='Are you sure you want to remove this user?';
+$hesklang['manage_users']='Manage users';
+$hesklang['users_intro']='Here you are able to manage users who can login to the admin panel and
+answer tickets. Administrators can view/edit tickets in any category and have access
+to all functions of the admin panel (manage users, manage categories, ...) while
+other users may only view and reply to tickets within their categories.';
+$hesklang['yes']='YES';
+$hesklang['no']='NO';
+$hesklang['edit']='Edit';
+$hesklang['add_user']='Add new user';
+$hesklang['req_marked_with']='Required fields are marked with';
+$hesklang['real_name']='Real name';
+$hesklang['sign_extra']='HTML code is not allowed. Links will be clickable.';
+$hesklang['create_user']='Create user';
+$hesklang['editing_user']='Editing user';
+$hesklang['user_added']='User added';
+$hesklang['user_added_success']='New user %s with password %s has been successfully added';
+$hesklang['user_removed']='User removed';
+$hesklang['sel_user_removed']='Selected user has been successfully removed from the database';
+$hesklang['profile_for']='Profile for';
+$hesklang['new_pass']='New password';
+$hesklang['update_profile']='Update profile';
+$hesklang['notify_new_posts']='Notify me of new tickets and posts within my categories';
+$hesklang['profile_updated']='Profile updated';
+$hesklang['profile_updated_success']='This profile has been successfully updated';
+$hesklang['view_profile']='View profile';
+$hesklang['new_ticket_submitted']='New support ticket submitted';
+$hesklang['user_profile_updated_success']='This user profile has been updated successfully';
+$hesklang['printer_friendly']='Print';
+$hesklang['end_ticket']='--- End of ticket ---';
 
-// ADDED OR MODIFIED IN Mods for HESK 2.4.0
-$hesklang['sort_by_user_defined_order'] = 'Sort by user-defined order';
-$hesklang['sort_alphabetically'] = 'Sort alphabetically';
-$hesklang['category_sort'] = 'Category Sorting';
-$hesklang['category_sort_help'] = 'Determines if categories shown on the manage categories page and all dropdowns are sorted by the user-defined order (default), or
-sorted alphabetically.';
-$hesklang['quick_help_sections'] = 'Quick Help Sections';
-$hesklang['quick_help_sections_help'] = 'Check the checkbox to show the "Quick Help" sections on the left-hand side, or uncheck to not show.';
-$hesklang['create_ticket'] = 'Create ticket (customers)';
-$hesklang['view_ticket_form'] = 'View ticket form';
-$hesklang['knowledgebase'] = 'Knowledgebase section';
-$hesklang['staff_create_ticket'] = 'Create ticket (staff)';
-$hesklang['allow_rich_text_for_tickets'] = 'Allow rich text for tickets';
-$hesklang['allow_rich_text_for_tickets_help'] = 'Allow staff and customers to use rich text formatting when writing ticket messages / replies.';
-$hesklang['click_to_edit_name'] = 'Click to edit name';
-$hesklang['new_status'] = 'New Status';
-$hesklang['create_new_status_title'] = 'Create New Status';
-$hesklang['status_name_title'] = 'Status Name';
-$hesklang['status_name_title_help'] = 'The name of the status that should appear when viewing the ticket, for each language you have installed.';
-$hesklang['properties'] = 'Properties';
-$hesklang['closable'] = 'Closable'; // Same as $hesklang['closable_question'], but without punctuation
-$hesklang['new_status_created'] = 'New status successfully created';
-$hesklang['editing_status_x'] = 'Editing status <span style="color: %s; font-weight: bold">%s</span>'; // 1st %s: text color, 2nd %s: status name
-$hesklang['status_not_in_database'] = 'The status text for this language was not found in the database, so a suggested translation has been filled for you.
- Please click "Save Changes" to save this translation to the database and to remove this warning.';
-$hesklang['ticket_status_updated'] = 'Ticket status successfully updated!';
-$hesklang['ticket_status_deleted'] = 'Ticket status deleted!';
-$hesklang['confirm_delete_status_question'] = 'Delete status?';
-$hesklang['confirm_delete_status'] = 'Are you sure you want to delete this status? This cannot be undone!';
-$hesklang['status_sort_updated'] = 'Ticket status sort updated!';
-$hesklang['status_sort'] = 'Status Sorting';
-$hesklang['status_sort_help'] = 'Determines if statuses shown on the manage statuses page and all dropdowns are sorted by the user-defined order (default), or sorted alphabetically.';
-$hesklang['cannot_delete_status_tickets'] = 'This status cannot be deleted because there are tickets set to this status.';
-$hesklang['default_statuses_updated'] = 'Default statuses have been updated!';
-$hesklang['download_count'] = 'Download Count';
-$hesklang['kb_attach_dir'] = 'Knowledgebase attachments folder';
-$hesklang['kb_attach_dir_help'] = 'Name of the folder, where knowledgebase attachments will be stored.<br><br>The folder needs to exist within the main HESK folder and be writable by PHP. On most systems names are CaSe SeNSiTiVe.
-    <br><br>Allowed chars (other will be removed): a-z A-Z 0-9 _ -';
-$hesklang['ticket_attach_dir'] = 'Ticket attachments folder';
-$hesklang['cannot_edit_status_demo'] = 'You cannot edit statuses while in demo mode!';
+// CUSTOMER INTERFACE
+$hesklang['your_ticket_been']='Your ticket has been';
+$hesklang['submit_ticket']='Submit a ticket';
+$hesklang['sub_ticket']='Submit ticket';
+$hesklang['before_submit']='Before submitting please make sure of the following';
+$hesklang['all_info_in']='All necessary information has been filled out';
+$hesklang['all_error_free']='All information is correct and error-free';
+$hesklang['we_have']='We have';
+$hesklang['recorded_ip']='recorded as your IP Address';
+$hesklang['recorded_time']='recorded the time of your submission';
+$hesklang['save_changes']='Save changes';
+$hesklang['reply_submitted']='Reply submitted';
+$hesklang['reply_submitted_success']='Your reply to this ticket has been successfully submitted';
+$hesklang['view_your_ticket']='View your ticket';
+$hesklang['ticket_submitted']='Ticket submitted';
+$hesklang['ticket_submitted_success']='Your ticket has been successfully submitted! Ticket ID';
+$hesklang['your_ticket']='Your ticket';
 
-// ADDED OR MODIFIED IN Mods for HESK 2.3.0
-$hesklang['sm_icon'] = 'Icon';
-$hesklang['sm_icon_type'] = 'Icon Type';
-$hesklang['sm_no_icon'] = 'No Icon';
-$hesklang['sm_search_icon'] = 'Search Icon';
-$hesklang['sm_iconpicker_footer_label'] = '{0} - {1} of {2}'; // {0}: lower bound of page, {1}: upper bound of page, {2}: total number of icons
-$hesklang['mods_for_hesk_acronym'] = 'MFH'; // THIS SHOULD NOT BE TRANSLATED
-$hesklang['added_in_mods_for_hesk'] = 'Added in Mods for HESK';
-$hesklang['statuses_intro'] = 'Here you can add, remove, and modify ticket statuses, as well as changing the default status for particular actions.';
-$hesklang['statuses_saved'] = 'Ticket statuses have been updated!';
-$hesklang['email_template_not_saved'] = 'The email template <b>%s</b> was NOT saved due to an error. Enable debug mode to see if an error message appears, and ensure that your file has CHMOD 0666'; // %s: Template file name
-$hesklang['language_key'] = 'Language Key';
-$hesklang['language_key_description'] = 'This is the language file \'key\' that contains the text you want to display';
-$hesklang['can_man_ticket_statuses'] = 'Can manage ticket statuses';
-$hesklang['key_required'] = 'Keys are required for all statuses';
-$hesklang['x_merged'] = '(+%s merged)'; // %s number of tickets merged
-$hesklang['merged_tickets'] = 'Merged tickets: ';
-$hesklang['show_number_merged'] = 'Show number of tickets merged';
-$hesklang['show_number_merged_descr'] = 'Show number of tickets merged next to Tracking ID';
-$hesklang['show_number_merged_help'] = 'If enabled, the user will be able to see which tickets were merged into the other on the ticket search screen.';
-$hesklang['latest_top_on_home'] = 'Latest/Top articles on home page';
-$hesklang['latest_top_on_home_help'] = 'Select YES to display the top and latest knowledgebase articles on the home page.
-    Otherwise, a link to the knowledgebase will appear on the home page.';
-$hesklang['location_unavailable'] = "Location unavailable. Click for more information.";
-$hesklang['click_for_map'] = "View map of user's location";
-$hesklang['request_user_location'] = "Request Location";
-$hesklang['request_user_location_help'] = "If enabled, the help desk will ask for the customer's location, allowing staff to
- see a map of the customer's location when they created the ticket.";
-$hesklang['users_location'] = "User's Location";
-$hesklang['location_unavailable_0'] = "User's location is not available because the ticket was created before location tracking was enabled.";
-$hesklang['location_unavailable_1'] = "User's location is not available because the user refused to share it.";
-$hesklang['location_unavailable_2'] = "User's location is not available because the help desk was unable to determine the user's position.";
-$hesklang['location_unavailable_3'] = "User's location is not available because the help desk was not able to determine the user's position in
- a reasonable amount of time.";
-$hesklang['location_unavailable_4'] = "An unknown error occurred when trying to obtain the user's location.";
-$hesklang['location_unavailable_5'] = "User's location is not available because the user's browser did not meet the minimum
-requirements for tracking their location when the ticket was submitted.";
-$hesklang['save_location'] = 'Save Location';
-$hesklang['close_modal_without_saving'] = 'Close without saving';
-$hesklang['ticket_location_updated'] = 'Ticket location has been updated!';
-$hesklang['location_colon'] = 'Location:';
-$hesklang['your_current_location'] = 'Your location';
-$hesklang['requesting_location_ellipsis'] = 'Requesting location...';
-$hesklang['unable_to_determine_location'] = 'Unable to determine your location, or you declined to share it.';
-$hesklang['save_to_see_updated_address'] = 'Save the new location to see the updated address';
-$hesklang['manager'] = 'Manager';
-$hesklang['manager_updated'] = 'Category manager has been updated.';
-$hesklang['can_set_manager'] = 'Can set category managers';
-$hesklang['no_manager'] = 'No manager';
-$hesklang['manage_permission_templates'] = 'Manage Permission Templates';
-$hesklang['manage_permission_templates_help'] = 'Here you can create and edit permission templates. These templates will appear when creating/editing a user.
-Please note that if you change the permission template\'s settings, it will NOT change the permissions of any users that are set to this permission template.';
-$hesklang['number_of_users'] = 'Number of Users';
-$hesklang['actions'] = 'Actions';
-$hesklang['view_permissions_for_this_template'] = 'View/edit permissions for this template';
-$hesklang['permission'] = 'Permission';
-$hesklang['permissions_for_template'] = 'Permissions for template <code>%s</code>'; // %s template name
-$hesklang['template_has_admin_privileges'] = 'Permission template has admin privileges. Click to set as non-admin';
-$hesklang['template_has_no_admin_privileges'] = 'Permission template does not have admin privileges. Click to set as admin';
-$hesklang['staff_cannot_be_admin'] = 'Staff permission group does not have admin access, and cannot be set as an admin';
-$hesklang['admin_cannot_be_staff'] = 'Administrator permission group has admin access, and cannot be set as non-admin';
-$hesklang['template_is_admin_cannot_change'] = 'The permission group currently has admin privileges, so you cannot set specific permissions here.';
-$hesklang['permission_template_updated'] = 'Permission template has been updated!';
-$hesklang['create_new_template'] = 'Create new permission template';
-$hesklang['create_new_template_title'] = 'Create New Permission Template'; // same as create_new_template, but in Title Case
-$hesklang['template_name'] = 'Template name';
-$hesklang['template_name_required'] = 'Template name required.';
-$hesklang['you_must_select_a_category'] = 'You must select at least one category.';
-$hesklang['you_must_select_a_feature'] = 'You must select at least one feature.';
-$hesklang['permission_template_error'] = 'The permission template could not be completed due to the following error(s): %s'; // %s: error list
-$hesklang['template_created'] = 'Permission template successfully created!';
-$hesklang['cannot_delete_admin_or_staff'] = 'The <b>Administrator</b> and <b>Staff</b> permission groups cannot be deleted!';
-$hesklang['no_templates_were_deleted'] = 'No templates were deleted!';
-$hesklang['permission_template_deleted'] = 'Permission template deleted!';
-$hesklang['permission_template_now_admin'] = 'Permission template is now designed as an admin template';
-$hesklang['permission_template_no_longer_admin'] = 'Permission template is no longer designated as an admin template';
-$hesklang['cannot_change_admin_staff'] = 'You cannot change admin/non-admin status for the <b>Administrator</b> and <b>Staff</b> templates!';
-$hesklang['permission_tpl_man'] = 'Manage permission templates'; // Menu link
-$hesklang['permission_templates'] = 'Permission Templates';
-$hesklang['can_man_permission_tpl'] = 'Can manage permission templates';
-$hesklang['permission_template_colon'] = 'Permission Template';
-$hesklang['permission_template'] = 'Permission Template';
-$hesklang['custom'] = 'Custom';
-
-// ADDED OR MODIFIED IN Mods for HESK 2.2.1
-$hesklang['popart_no_colon']='Top Knowledgebase Articles'; // same as $hesklang['popart'] but without a colon (:)
-$hesklang['latart_no_colon']='Latest Knowledgebase Articles'; // same as $hesklang['latart'] but without a colon (:)
-$hesklang['ac_no_colon']='Articles in this Category'; // same as $hesklang['ac'] but without a colon (:)
-
-// ADDED OR MODIFIED IN Mods for HESK 2.2.0
-$hesklang['email_templates'] = 'Email templates';
-$hesklang['email_templates_intro'] = 'You can edit your plaintext and HTML email templates here.';
-$hesklang['edit_plain_text_template'] = 'Edit plain text template';
-$hesklang['edit_html_template'] = 'Edit HTML template';
-$hesklang['editing_plain_text_template'] = 'Editing plain text template <code>%s</code>'; // %s: The name of the template file, then language name
-$hesklang['editing_html_template'] = 'Editing HTML template <code>%s</code>'; // %s: The name of the template file, then language name
-$hesklang['show_special_tags'] = 'Show Special Tags';
-$hesklang['hide_special_tags'] = 'Hide Special Tags';
-$hesklang['special_tag'] = 'Special Tag';
-$hesklang['description'] = 'Description';
-$hesklang['customer_name'] = 'Customer name';
-$hesklang['customer_email'] = 'Customer email';
-$hesklang['ticket_subject'] = 'Ticket subject';
-$hesklang['ticket_message'] = 'Ticket/Reply message';
-$hesklang['ticket_created'] = 'Date and time of ticket submission';
-$hesklang['ticket_updated'] = 'Date and time of ticket last update';
-$hesklang['ticket_url'] = 'Ticket URL address';
-$hesklang['ticket_category'] = 'Ticket category';
-$hesklang['ticket_owner'] = 'Staff member assigned to the ticket';
-$hesklang['ticket_priority'] = 'Ticket priority';
-$hesklang['custom_field_x'] = 'Custom field %s'; // %s: Custom field #1-20
-$hesklang['email_template_saved'] = 'The email template <b>%s</b> has been saved.'; // %s: Template file name
-$hesklang['error_saving_template'] = 'An error occurred when trying to save the email template!';
-$hesklang['can_man_email_tpl'] = 'Edit email templates';
-$hesklang['email_template_directory_not_writable'] = 'The email template <b>%s</b> is not writable by HESK. Please CHMOD it to 0666.'; // %s: template file name
-$hesklang['closable_question'] = 'Closable?';
-$hesklang['closable_description'] = '<b><i>This setting is ignored if the &quot;Closed?&quot; setting is set to &quot;Yes&quot; for this status</i></b>.
-    <br><br>Determines if the customer and/or staff is able to close a ticket in this status.
-    <br><br><b>Yes:</b> Both customers and staff can close a ticket in this status.
-    <br><b>Customers only:</b> Customers can close a ticket in this status, but staff cannot.
-    <br><b>Staff only:</b> Staff can close a ticket in this status, but customers cannot.
-    <br><b>No:</b> No one is allowed to close a ticket in this status.'; // &quot; = "
-$hesklang['customers_only'] = 'Customers only';
-$hesklang['staff_only'] = 'Staff only';
-$hesklang['yes_title_case'] = 'Yes';
-$hesklang['no_title_case'] = 'No';
-$hesklang['autoclose_ticket_status'] = 'When a ticket is closed automatically, change the status to';
-$hesklang['recent_tickets'] = 'Recent tickets';
-$hesklang['current_status_colon'] = 'Current status: %s'; // %s: status name (i.e. "Resolved", "New", etc.)
-$hesklang['email_attachments'] = 'Email attachments';
-$hesklang['email_attachments_help'] = '<b>Show attachments as links:</b> Links to attachments will be appended at the end of the email.
-    <br><br><b>Attach directly to email:</b> Attachments will be embedded directly into emails.';
-$hesklang['show_attachments_as_links'] = 'Show attachments as links';
-$hesklang['attach_directly_to_email'] = 'Attach directly to email';
-
-// ADDED OR MODIFIED IN Mods for HESK 2.1.1
-$hesklang['new_article_default_type'] = 'Default Type for New Articles';
-$hesklang['new_article_default_type_help'] = 'Choose the default type for new knowledgebase articles.';
-$hesklang['kb_draft3'] = 'The article is saved but not yet published. It can only be read by staff who has permission to
- manage knowledgebase articles.'; // This is exactly the same as kb_draft2 with all HTML removed
-$hesklang['file_name'] = 'File Name';
-$hesklang['action'] = 'Action';
-$hesklang['click_to_preview'] = 'Click to preview';
-$hesklang['attachment_removed'] = 'This attachment has been removed and cannot be viewed / downloaded';
-
-// ADDED OR MODIFIED IN Mods for HESK 2.1.0
-$hesklang['e_mfh_settings'] = 'You will not be able to save your settings unless this file is writable by the script (CHMOD to 666)!';
-$hesklang['mfh_up_to_date'] = 'Mods for HESK is up to date';
-$hesklang['use_bootstrap_theme'] = 'Use Boostrap Theme CSS';
-$hesklang['use_bootstrap_theme_help'] = 'Enable this to use the <code>bootstrap-theme.css</code> file. Use this for a more 3D look and feel, or disable it for a flatter look.';
-
-// ADDED OR MODIFIED IN Mods For HESK 2.0.0
-$hesklang['saved_ticket_tpl'] = 'Saved Templates';
-$hesklang['new_ticket_tpl']='Add or Edit a Ticket Template';
-$hesklang['and_change_status_to'] = 'and change status to'; // Used in combination with $hesklang['submit_reply'] (Reads as "Submit reply and change status to")
-$hesklang['closed_title'] = 'Closed';
-$hesklang['image'] = 'Image'; // Used for alt tag
-$hesklang['close_modal'] = 'Close';
-$hesklang['email_custom_field'] = 'Email Address';
-$hesklang['email_custom_field_help'] = 'Allows the input of an email address. Similar to a text field, however the email address(es) will be added to all emails for this ticket, in the Cc or Bcc section, depending on the option selected.';
-$hesklang['email_custom_field_label'] = 'Address Type';
-$hesklang['cc'] = 'Cc:';
-$hesklang['bcc'] = 'Bcc:';
-$hesklang['mailgun'] = 'Mailgun';
-$hesklang['mailgun_help'] = 'Send mail using the Mailgun API. For more information on Mailgun, visit https://www.mailgun.com';
-$hesklang['mailgun_api_key'] = 'Mailgun API Key';
-$hesklang['mailgun_api_key_help'] = 'Your API key for Mailgun.';
-$hesklang['mailgun_domain'] = 'Mailgun Domain';
-$hesklang['mailgun_domain_help'] = 'Your registered domain for Mailgun';
-$hesklang['html_emails'] = 'HTML Emails';
-$hesklang['html_emails_help'] = 'Send HTML-supported emails to staff and customers.<br><br>To use this feature, create a new folder called <b>html</b> in your
-    language\'s <b>emails</b> folder and create templates for each email file. Both the HTML and plaintext versions will be sent (recipient\'s email program will
-    properly display either the HTML or plaintext version, depending on their mail client\'s settings).';
-$hesklang['html_emails_text'] = 'Enable HTML-formatted emails';
-$hesklang['beta_text'] = 'BETA';
 
+// ADDED IN HESK VERSION 0.94
+$hesklang['check_updates']='Make sure you always have installed the latest version of Hesk!';
+$hesklang['check4updates']='Check for updates';
+$hesklang['open']='New';
+$hesklang['wait_reply']='Waiting reply';
+$hesklang['wait_staff_reply']='Waiting reply from staff';
+$hesklang['wait_cust_reply']='Waiting reply from customer';
+$hesklang['replied']='Replied';
+$hesklang['last_replier']='Last replier';
+$hesklang['staff']='Staff';
+$hesklang['customer']='Customer';
+$hesklang['close_selected']='Mark selected tickets Resolved';
+$hesklang['execute']='Execute';
+$hesklang['saved_replies']='Canned responses';
+$hesklang['manage_saved']='Canned responses';
+$hesklang['manage_intro']='Here you can add and manage canned responses. These are commonly used replies which are more or less the same for every customer. You should use canned responses to avoid typing the same reply to different customers numerous times.';
+$hesklang['no_saved']='No canned responses';
+$hesklang['delete_saved']='Are you sure you want to delete this canned response?';
+$hesklang['new_saved']='Add or Edit a canned response';
+$hesklang['canned_add']='Create a new canned response';
+$hesklang['canned_edit']='Edit selected canned response';
+$hesklang['saved_title']='Title';
+$hesklang['save_reply']='Save response';
+$hesklang['saved']='Response saved';
+$hesklang['your_saved']='Your canned response has been saved for future use';
+$hesklang['ent_saved_title']='Please enter reply title';
+$hesklang['ent_saved_msg']='Please enter reply message';
+$hesklang['saved_removed']='Canned response removed';
+$hesklang['saved_rem_full']='Selected canned response has been removed from the database';
+$hesklang['clip_alt']='This post has attachments';
+$hesklang['attachments']='Attachments';
+$hesklang['fill_all']='Missing required field';
+$hesklang['file_too_large']='Your file %s is too large';
+$hesklang['created_on']='Created';
+$hesklang['tickets_closed']='Tickets closed';
+$hesklang['num_tickets_closed']='<b>%d</b> tickets have been closed';
+$hesklang['select_saved']='Select a canned response';
+$hesklang['select_empty']='Select / Empty';
+$hesklang['insert_special']='Insert special tag (will be replaced with customer info)';
+$hesklang['move_to_catgory']='Move ticket to';
+$hesklang['move']='Move';
+$hesklang['moved']='Ticket moved';
+$hesklang['moved_to']='This ticket has been moved to the new category';
+$hesklang['url']='URL';
+$hesklang['all_not_closed']='All but closed';
+$hesklang['chg_all']='Change all';
+$hesklang['settings']='Settings';
+$hesklang['settings_intro']='Use this tool to configure your help desk. For more information about all settings and options click the help sign or refer to the readme.html file.';
+$hesklang['all_req']='All fields (except disabled ones) are required!';
+$hesklang['wbst_title']='Website title';
+$hesklang['wbst_url']='Website URL';
+$hesklang['email_wm']='Webmaster email';
+$hesklang['max_listings']='Listings per page';
+$hesklang['print_size']='Print font size';
+$hesklang['debug_mode']='Debug mode';
+$hesklang['on']='ON';
+$hesklang['off']='OFF';
+$hesklang['use_secimg']='Use anti-SPAM image';
+$hesklang['secimg_no']='Not available';
+$hesklang['attach_use']='Use attachments';
+$hesklang['attach_num']='Number per post';
+$hesklang['attach_type']='Allowed file types';
+$hesklang['place_after']='After Message';
+$hesklang['place_before']='Before Message';
+$hesklang['custom_f']='Custom field';
+$hesklang['custom_u']='Use this field';
+$hesklang['custom_n']='Field name';
+$hesklang['custom_l']='Maximum length (chars)';
+$hesklang['db_host']='Database host';
+$hesklang['db_name']='Database name';
+$hesklang['db_user']='Database username';
+$hesklang['db_pass']='Database password';
+$hesklang['err_sname']='Please enter your website title';
+$hesklang['err_surl']='Please enter your website URL. Make sure it is a valid URL (start with http:// or https://)';
+$hesklang['err_wmmail']='Please enter a valid webmaster email';
+$hesklang['err_nomail']='Please enter a valid noreply email';
+$hesklang['err_htitle']='Please enter the title of your support desk';
+$hesklang['err_hurl']='Please enter your Hesk folder url. Make sure it is a valid URL (start with http:// or https://)';
+$hesklang['err_lang']='Please select Hesk language';
+$hesklang['err_nolang']='The language file specified doesn\'t exist in the language folder! Make sure the file is uploaded before changing the language setting.';
+$hesklang['err_max']='Please enter maximum listings displayed per page';
+$hesklang['err_psize']='Please enter the print font size';
+$hesklang['err_dbhost']='Please enter your MySQL database host';
+$hesklang['err_dbname']='Please enter your MySQL database name';
+$hesklang['err_dbuser']='Please enter your MySQL database username';
+$hesklang['err_dbpass']='Please enter your MySQL database password';
+$hesklang['err_dbsele']='Could not select MySQL database, please double-check database NAME';
+$hesklang['err_custname']='Please enter name(s) for selected optional field(s)';
+$hesklang['err_openset']='Can\'t open file <b>hesk_settings.inc.php</b> for writing. Please CHMOD this file to 666 (rw-rw-rw-)';
+$hesklang['set_saved']='Settings saved';
+$hesklang['set_were_saved']='Your settings have been successfully saved';
+$hesklang['sec_img']='Security image';
+$hesklang['sec_miss']='Please enter the security number';
+$hesklang['sec_wrng']='Wrong security number';
+$hesklang['submit_problems']='Please go back and correct the following problems';
+$hesklang['cat_order']='Category order';
+$hesklang['reply_order']='Canned response order';
+$hesklang['move_up']='Move up';
+$hesklang['move_dn']='Move down';
+$hesklang['cat_move_id']='Missing category ID';
+$hesklang['reply_move_id']='Missing canned response ID';
+$hesklang['forgot_tid']='Forgot tracking ID?';
+$hesklang['tid_send']='Send me my tracking ID';
+$hesklang['tid_not_found']='No tickets with your email address were found';
+$hesklang['tid_sent']='Tracking ID sent';
+$hesklang['tid_sent2']='An email with details about your tickets has been sent to your address';
+$hesklang['check_spambox']='Be sure to also check for the email inside your SPAM/Junk mailbox!';
+$hesklang['reply_not_found']='Canned response not found';
+$hesklang['exists']='Exists';
+$hesklang['no_exists']='Doesn\'t exist';
+$hesklang['writable']='Writable';
+$hesklang['not_writable']='Not writable';
+$hesklang['disabled']='disabled';
+$hesklang['e_settings']='You will not be able to save your settings unless this file is writable by the script. Please refer to the readme file for further instructions!';
+$hesklang['e_attdir']='You will not be able to use file attachments unless the attachments folder exists and is writable by the script.';
+$hesklang['e_save_settings']='Unable to save your settings because <b>hesk_settings.inc.php</b> file is not writable by the script.';
+$hesklang['e_attach']='Disabled because your <b>attachments</b> directory is not writable by the script.';
+$hesklang['go']='Go';
 
-// ADDED OR MODIFIED IN Mods For HESK 1.7.0
-$hesklang['date_custom_field'] = 'Date';
-$hesklang['date_custom_field_text'] = 'No options for this custom field type.';
-$hesklang['multiple_select_custom_field'] = 'Multiple Select box';
-$hesklang['multiple_select_custom_field_text'] = 'Options for this multi-select box, enter one option per line (each line will be a choice your customers can choose from). You need to enter at least two options!';
-$hesklang['date_format'] = 'Date must be in YYYY-MM-DD format.';
-$hesklang['custom_field_setting'] = 'Multilanguage support';
-$hesklang['custom_field_setting_help'] = 'Enabling this setting will use the name of the custom field as the language
-    file\'s key, rather than the direct name itself. This allows the custom field to be translated into different languages.';
-$hesklang['enable_custom_field_language'] = 'Enable multilanguage support';
-$hesklang['custom_language_key'] = 'Field language file key';
-$hesklang['ticket_reopen_assigned'] = '[#%%TRACK_ID%%] Assigned ticket reopened';
-$hesklang['verify_email'] = 'Verify Email';
-$hesklang['email_verified'] = 'The email address <b>%s</b> has been verified. Additionally, the following tickets have been created:'; //%s: email address
-$hesklang['verify_no_records'] = 'No records were found for this activation key. Has this activation key already been used?';
-$hesklang['activation_key'] = 'Activation Key';
-$hesklang['no_tickets_created'] = 'No tickets created';
-$hesklang['customer_email_verification'] = 'Customer Email Verifications';
-$hesklang['customer_email_verification_help'] = 'Require customers to verify their email address via email. Once their
-    address has been verified, it does not need to be re-verified in the future. <br><br> <b>NOTE:</b> Enabling this will disable the
-    ability for the customer to provide multiple emails, as HESK will be unable to determine which email needs to be verified.';
-$hesklang['require_customer_validate_email'] = 'Require customers to verify email';
-$hesklang['multi_eml_disabled'] = 'This feature has been disabled because this help desk has been configured to require
-    customers to verify their email address';
-$hesklang['feature_disabled'] = 'Feature Disabled';
-$hesklang['verify_your_email'] = 'Your ticket has been created; however your email needs to be verified before your ticket can be addressed. An email has been sent to the email provided for verification.';
-$hesklang['installation_information'] = 'Installation Information';
 
-// ADDED OR MODIFIED IN Mods For HESK 1.6.0
-$hesklang['notify_note_unassigned'] = 'Someone adds a note to a ticket not assigned to me';
-$hesklang['can_change_notification_settings'] = 'Can change notification settings';
-$hesklang['add_row'] = 'Add row';
-$hesklang['addnote'] = 'Add note';
-$hesklang['mods_for_hesk'] = 'Mods for HESK';
-$hesklang['err_modsForHesk_settings'] = 'Can\'t open file <b>modsForHesk_settings.inc.php</b> for writing. Please CHMOD this file to 666 (rw-rw-rw-)';
-$hesklang['mods_for_hesk_version'] = 'Mods for HESK Version';
+// ADDED OR CHANGED IN VERSION 2.0
+$hesklang['v']='HESK version';
+$hesklang['check_status']='Checking status';
+$hesklang['sub_support']='Submit a ticket';
+$hesklang['open_ticket']='Submit a new issue to a department';
+$hesklang['view_existing']='View existing ticket';
+$hesklang['vet']='View tickets you submitted in the past';
+$hesklang['enter_user']='Please enter your username';
+$hesklang['remember_user']='Remember my username';
+$hesklang['wrong_user']='Wrong username';
+$hesklang['no_permission']='You don\'t have permission to perform this task, please login with an account that has.';
+$hesklang['tickets_on_pages']='Number of tickets: %d | Number of pages: %d'; // First %d is replaced with number of tickets, second %d with number of pages
+$hesklang['jump_page']='Jump to page:';
+$hesklang['no_tickets_open']='No unresolved tickets found';
+$hesklang['no_tickets_crit']='No tickets found matching your criteria';
+$hesklang['confirm_execute']='Are you sure you want to continue?';
+$hesklang['legend']='Legend';
+$hesklang['main_page']='Home';
+$hesklang['menu_users']='Users';
+$hesklang['menu_cat']='Categories';
+$hesklang['menu_profile']='Profile';
+$hesklang['menu_kb']='Knowledgebase'; // Admin MENU item
+$hesklang['kb_text']='Knowledgebase'; // Item visible to customers
+$hesklang['viewkb']='View entire Knowledgebase';
+$hesklang['kb']='Manage Knowledgebase';
+$hesklang['kb_intro']='Knowledgebase is a collection of answers to frequently asked questions (FAQ) and articles which provide self-help resources to your customers.
+A comprehensive and well-written knowledgebase can drastically reduce the number of support tickets you receive and save a lot of your time. You can arrange articles into categories
+and sub categories.'; // Description in ADMIN panel
+$hesklang['kb_is']='The knowledgebase is a categorized collection of answers to frequently asked questions (FAQ) and articles. You can read articles in this category or select a subcategory that you are interested in.'; // Description for CUSTOMERS
+$hesklang['new_kb_art']='New knowledgebase article';
+$hesklang['kb_cat']='Category';
+$hesklang['kb_subject']='Subject';
+$hesklang['kb_content']='Contents';
+$hesklang['kb_type']='Type';
+$hesklang['kb_published']='Published';
+$hesklang['kb_published2']='The article is viewable to everyone in the knowledgebase.';
+$hesklang['kb_private']='Private';
+$hesklang['kb_private2']='Private articles can only be read by staff.';
+$hesklang['kb_draft']='Draft';
+$hesklang['kb_draft2']='The article is saved but not yet published. It can only be read by staff<br /> who has permission to manage knowledgebase articles.';
+$hesklang['kb_links']='<i><span class="notice"><b>Warning!</b></span><br />Enter valid code without &lt;head&gt; and &lt;body&gt; tags, just content!</i>';
+$hesklang['kb_ehtml']='This is HTML code (I will enter valid (X)HTML code)';
+$hesklang['kb_dhtml']='This is plain text (links will be clickable)';
+$hesklang['kb_save']='Save article';
+$hesklang['kb_e_subj']='Enter article subject!';
+$hesklang['kb_e_cont']='Write article contents!';
+$hesklang['kb_art_added']='Article added';
+$hesklang['your_kb_added']='A new knowledgebase article has been successfully added';
+$hesklang['kb_art_deleted']='Article deleted';
+$hesklang['your_kb_deleted']='Selected knowledgebase article has been successfully deleted';
+$hesklang['kb_art_mod']='Article modified';
+$hesklang['your_kb_mod']='Your changes to the selected article have been saved successfully';
+$hesklang['kb_cat_new']='New knowledgebase category';
+$hesklang['kb_cat_parent']='Parent category';
+$hesklang['kb_cat_sub']='Subcategories';
+$hesklang['kb_cat_title']='Category title';
+$hesklang['kb_cat_published']='The category is viewable to everyone in the knowledgebase.';
+$hesklang['kb_cat_private']='The category can only be read by staff.';
+$hesklang['kb_cat_add']='Add category';
+$hesklang['kb_cat_e_title']='Enter category title!';
+$hesklang['kb_cat_added']='Category added';
+$hesklang['kb_cat_added2']='A new category has been successfully added to the knowledgebase';
+$hesklang['kb_cat_man']='Manage knowledgebase category';
+$hesklang['kb_cat_edit']='Edit category details';
+$hesklang['kb_cat_inv']='Invalid category';
+$hesklang['kb_cat_art']='Articles in this category';
+$hesklang['kb_p_art']='+ Article';
+$hesklang['kb_p_art2']='add a new article to the selected category.';
+$hesklang['kb_add_art']='Add Article';
+$hesklang['kb_p_cat']='+ Category';
+$hesklang['kb_p_cat2']='create a new sub-category inside the selected category.';
+$hesklang['kb_add_cat']='Add Category';
+$hesklang['kb_p_man']='Manage';
+$hesklang['kb_p_man2']='manage selected category (edit, delete, manage articles).';
+$hesklang['kb_main']='The main knowledgebase category cannot be deleted or moved.';
+$hesklang['kb_no_art']='There are no articles in this category.';
+$hesklang['author']='Author';
+$hesklang['views']='Views';
+$hesklang['delete']='Delete';
+$hesklang['rating']='Rating';
+$hesklang['votes']='Votes';
+$hesklang['kb_rated']='Article rated %s/5.0';
+$hesklang['kb_not_rated']='Article not rated yet';
+$hesklang['del_art']='Are you sure you want to delete selected article?';
+$hesklang['kb_art_id']='Missing or invalid article ID!';
+$hesklang['kb_art_edit']='Edit article';
+$hesklang['revhist']='Revision history';
+$hesklang['kb_order']='Order';
+$hesklang['kb_delcat']='Are you sure you want to delete this category?';
+$hesklang['kb_cat_mod']='Category modified';
+$hesklang['your_cat_mod']='Your changes to the selected category have been saved successfully';
+$hesklang['kb_cat_del']='Knowledgebase category deleted';
+$hesklang['kb_cat_dlt']='The selected knowledgebase category has been deleted.';
+$hesklang['allowed_cat']='Categories';
+$hesklang['allow_feat']='Features';
+$hesklang['can_view_tickets']='View tickets';
+$hesklang['can_reply_tickets']='Reply to tickets';
+$hesklang['can_assign_tickets']='Assign tickets';
+$hesklang['can_del_tickets']='Delete tickets';
+$hesklang['can_edit_tickets']='Edit ticket replies';
+$hesklang['can_change_cat']='Change ticket category';
+$hesklang['can_man_kb']='Manage knowledgebase';
+$hesklang['can_man_users']='Manage users';
+$hesklang['can_man_cat']='Manage categories';
+$hesklang['can_man_canned']='Manage canned responses';
+$hesklang['can_del_notes']='Delete any ticket notes';
+$hesklang['dan']='users can delete their own ticket notes, select this only if you wish to allow this user to also be able to delete notes from other users';
+$hesklang['in_all_cat']='in allowed categories only';
+$hesklang['admin_can']='(access to all features and categories)';
+$hesklang['staff_can']='(you can limit features and categories)';
+$hesklang['asign_one_feat']='Please assign at least one feature to this user!';
+$hesklang['na_view_tickets']='You are not authorized to view tickets';
+$hesklang['support_notice']='Sorry, this section can only be hidden when you purchase a HESK license!';
+$hesklang['rart']='Was this article helpful?';
+$hesklang['r']='Was this reply helpful?';
+$hesklang['tyr']='Thank you for rating';
+$hesklang['cw']='Close Window';
+$hesklang['cw2']='Close window and submit ticket';
+$hesklang['rh']='Rated as <i>helpful</i>';
+$hesklang['rnh']='Rated as <i>not helpful</i>';
+$hesklang['ar']='Already rated';
+$hesklang['rated']='User rated %s/5.0 (%s votes)';
+$hesklang['not_rated']='User not rated yet';
+$hesklang['rdis']='Rating has been disabled';
+$hesklang['kbdis']='Knowledgebase is disabled';
+$hesklang['kbpart']='Sorry, you don\'t have permission to access this article';
+$hesklang['popart']='Top Knowledgebase articles:';
+$hesklang['latart']='Latest Knowledgebase articles:';
+$hesklang['m']='More topics';
+$hesklang['ac']='Articles in this category:';
+$hesklang['noa']='No articles yet';
+$hesklang['noac']='No articles yet in this category';
+$hesklang['dta']='Date added';
+$hesklang['ad']='Article details';
+$hesklang['aid']='Article ID';
+$hesklang['as']='Solution';
+$hesklang['search']='Search';
+$hesklang['sr']='Search results';
+$hesklang['nosr']='No matching articles found. Try browsing the knowledgebase or submit a new support ticket.';
+$hesklang['rv']='Reset views';
+$hesklang['rr']='Reset votes (ratings)';
+$hesklang['opt']='Options';
+$hesklang['delcat']='Delete category';
+$hesklang['move1']='Move articles to parent category';
+$hesklang['move2']='Delete articles in this category';
+$hesklang['sc']='Suggested knowledgebase articles';
+$hesklang['not']='Tickets'; // Number of all tickets in category
+$hesklang['graph']='Graph';
+$hesklang['lu']='List usernames';
+$hesklang['aclose']='Autoclose tickets';
+$hesklang['aclose2']='days after last staff reply';
+$hesklang['s_ucrt']='Reopen tickets';
+$hesklang['urate']='Reply ratings';
+$hesklang['hesk_url']='Help desk URL';
+$hesklang['hesk_title']='Help desk title';
+$hesklang['server_time']='Server time offset';
+$hesklang['t_h']='hours';
+$hesklang['cid']='Case Tracking ID';
+$hesklang['t_m']='minutes';
+$hesklang['day']='Daylight saving';
+$hesklang['tfor']='Time format';
+$hesklang['prefix']='Table prefix';
+$hesklang['s_kbs']='Enable KB search';
+$hesklang['s_kbr']='Enable KB rating';
+$hesklang['s_maxsr']='Max search results';
+$hesklang['s_suggest']='Suggest KB articles';
+$hesklang['s_spop']='Show popular articles';
+$hesklang['s_slat']='Show latest articles';
+$hesklang['s_onin']='on <a href="../" target="_blank">help desk index</a> page';
+$hesklang['s_onkb']='on <a href="../knowledgebase.php" target="_blank">Knowledgebase index</a> page';
+$hesklang['s_scol']='Categories in row';
+$hesklang['s_ptxt']='Article preview length';
+$hesklang['s_psubart']='Subcategory articles';
+$hesklang['enable']='Enable';
+$hesklang['s_type']='Type';
+$hesklang['custom_r']='Required';
+$hesklang['custom_place']='Location';
+$hesklang['custom_use']='Custom fields';
+$hesklang['stf']='Text field';
+$hesklang['stb']='Large text box';
+$hesklang['srb']='Radio button';
+$hesklang['ssb']='Select box';
+$hesklang['db']='Database';
+$hesklang['hd']='Help desk settings';
+$hesklang['gs']='General settings';
+$hesklang['cwin']='Close window';
+$hesklang['defw']='Default value';
+$hesklang['ok']='OK';
+$hesklang['ns']='These are available options for this custom field. To save changes click <b>OK</b> and <b>Save changes</b> button on the admin settings page!';
+$hesklang['rows']='Rows (height)';
+$hesklang['cols']='Columns (width)';
+$hesklang['opt2']='Options for this radio button, enter one option per line (each line will create a new radio button value to choose from). You need to enter at least two options!';
+$hesklang['opt3']='Options for this select box, enter one option per line (each line will be a choice your customers can choose from). You need to enter at least two options!';
+$hesklang['atl2']='Enter at least two options (one per line)!';
+$hesklang['notes']='Notes';
+$hesklang['noteby']='Note by';
+$hesklang['delnote']='Delete note';
+$hesklang['noteerr']='Note already deleted or wrong parameters';
+$hesklang['s']='Submit';
+$hesklang['nhid']='Notes are hidden from customers!';
+$hesklang['delt']='Delete this post';
+$hesklang['edtt']='Edit post';
+$hesklang['edt1']='Post modified';
+$hesklang['edt2']='Changes to the selected post have been saved';
+$hesklang['dele']='Delete this ticket';
+$hesklang['repd']='Post deleted';
+$hesklang['repl']='Selected post has been deleted';
+$hesklang['tickets_found']='Search results';
+$hesklang['al']='Admin link';
+$hesklang['ap']='Go to Administration Panel';
+$hesklang['dap']='Display a link to admin panel from <a href="../" target="_blank">help desk index</a>';
+$hesklang['q_miss']='Please answer the anti-SPAM question';
+$hesklang['use_q']='Use anti-SPAM question';
+$hesklang['q_q']='-&gt; Question (HTML code is <font class="success">allowed</font>)';
+$hesklang['q_a']='-&gt; Answer';
+$hesklang['err_qask'] = 'Enter an anti-SPAM question';
+$hesklang['err_qans'] = 'Enter answer to the anti-SPAM question';
+$hesklang['genq'] = 'Generate a random question';
 
-// ADDED OR MODIFIED IN Mods For HESK 1.5.0
-$hesklang['ticket_auto_refresh'] = 'Ticket Table Auto-Refresh:';
-$hesklang['display_rtl'] = 'Display site right-to-left';
-$hesklang['show_icons_navigation'] = 'Show icons on navigation bar';
-$hesklang['enable_maintenance'] = 'Enable maintenance mode';
-$hesklang['can_man_settings']='Can manage help desk settings';
-$hesklang['disable_user'] = 'User is active (click to deactivate)';
-$hesklang['enable_user'] = 'User is inactive (click to activate)';
-$hesklang['user_activated'] = 'User has been activated';
-$hesklang['user_deactivated'] = 'User has been deactivated';
-$hesklang['active_user'] = 'Is active user';
-$hesklang['self_deactivation'] = 'You cannot deactivate yourself!';
-$hesklang['inactive_user'] = 'Your account is currently inactive. Contact an administrator for more information.';
-$hesklang['cant_edit_admin'] = 'You cannot edit the God Admin (User ID = 1)';
-$hesklang['notifications_disabled_info'] = 'Changing notifications settings has been disabled by your administrator.';
 
-// ADDED OR MODIFIED IN Mods For HESK 1.4.0
-$hesklang['navbarBackgroundColor'] = 'Navbar Background Color';
-$hesklang['navbarBackgroundColorHelp'] = 'The main color of the top navigation bar. This applies to both the client and staff-side.';
-$hesklang['navbarBrandColor'] = 'Navbar Brand Color';
-$hesklang['navbarBrandColorHelp'] = 'The text color of the \'brand\' on the left (also the name of the Help Desk).';
-$hesklang['navbarBrandHoverColor'] = 'Navbar Brand Hover Color';
-$hesklang['navbarBrandHoverColorHelp'] = 'The text color of the \'brand\' on the left when the use moves their mouse over the text.';
-$hesklang['navbarItemTextColor'] = 'Navbar Item Text Color';
-$hesklang['navbarItemTextColorHelp'] = 'The text color of the navigation items on the navigation bar (by default \'Home\', \'Ticket\', and \'Knowledgebase\' are the three items on the client-side).';
-$hesklang['navbarItemTextHoverColor'] = 'Navbar Item Text Hover Color';
-$hesklang['navbarItemTextHoverColorHelp'] = 'The text color of the navigation items on the navigation bar when the user hovers over one of the items.';
-$hesklang['navbarItemTextSelectedColor'] = 'Navbar Item Text Selected Color';
-$hesklang['navbarItemTextSelectedColorHelp'] = 'The text color of the navigation items on the navigation bar when the user clicks on an item, and a dropdown menu appears (such as \'Ticket\').';
-$hesklang['navbarItemSelectedBackgroundColor'] = 'Navbar Item Selected Background Color';
-$hesklang['navbarItemSelectedBackgroundColorHelp'] = 'The background color of the navigation items on the navigation bar when the user clicks on an item, and a dropdown menu appears (such as \'Ticket\').';
-$hesklang['dropdownItemTextColor'] = 'Dropdown Item Text Color';
-$hesklang['dropdownItemTextColorHelp'] = 'The text color of a dropdown item.';
-$hesklang['dropdownItemTextHoverColor'] = 'Dropdown Item Text Hover Color';
-$hesklang['dropdownItemTextHoverColorHelp'] = 'The text color of a dropdown item when the mouse hovers over it.';
-$hesklang['questionMarkColor'] = 'Question Mark Color';
-$hesklang['questionMarkColorHelp'] = 'The text color for the question mark circle, as seen on the \'Settings\' page and on other various pages.';
-$hesklang['dropdownItemTextHoverBackgroundColor'] = 'Dropdown Item Text Hover Background Color';
-$hesklang['dropdownItemTextHoverBackgroundColorHelp'] = 'The background color of a dropdown item when the mouse hovers over it.';
-$hesklang['uiColors'] = 'UI Colors';
-$hesklang['displayRtl'] = 'Display site right-to-left';
-$hesklang['displayRtlHelp'] = 'Check this to set the text direction to right-to-left.';
-$hesklang['showIcons'] = 'Show Icons';
-$hesklang['showIconsHelp'] = 'Check this box to show icons next to navigation bar items';
-$hesklang['maintenanceMode'] = 'Maintenance Mode';
-$hesklang['maintenanceModeHelp'] = 'Check this box to put the Help Desk in maintenance mode. Staff can still log into the backend, but the front end will be inaccessible.';
-$hesklang['none'] = 'None';
-$hesklang['autorefresh'] = 'Autorefresh:';
-$hesklang['autorefresh_restrictions'] = 'Enter value in milliseconds. Value must be greater than 1000 to use this feature. No fractional values.';
-
-// ADDED OR MODIFIED IN Mods For HESK 1.2.2
-$hesklang['changeLanguage'] = 'Change language to';
-
-// ADDED OR MODIFIED IN Mods For HESK 1.2
-$hesklang['statuses'] = 'Statuses';
-$hesklang['basicProperties'] = 'Basic Properties';
-$hesklang['textColor'] = 'Text Color';
-$hesklang['textColorDescr'] = 'This is the hex color code for the status that will be used on the ticket search page and export search page';
-$hesklang['closedQuestionMark'] = 'Closed?';
-$hesklang['closedQuestionMarkDescr'] = 'If checked, tickets will be considered closed if they are set to this status.';
-$hesklang['basicProperties'] = 'Basic Properties';
-$hesklang['defaultStatusForAction'] = 'Default Status For Action';
-$hesklang['isClosedByClientMsg'] = 'When a client clicks the "Close ticket" link, change the status to';
-$hesklang['isStaffClosedOptionMsg'] = 'When a staff member clicks the "Close ticket" link, change the status to';
-$hesklang['isStaffReopenedStatusMsg'] = 'When a staff member clicks the "Open ticket" link, change the status to';
-$hesklang['isDefaultStaffReplyStatusMsg'] = 'When a staff member replies to a ticket, change the status to';
-$hesklang['lockedTicketStatusMsg'] = 'When a ticket is locked, change the status to';
-$hesklang['textColorRequired'] = 'Text Color is required.';
-$hesklang['addNew'] = 'Add New';
-$hesklang['close_action']='Close Ticket'; // Close ACTION
-$hesklang['whyCantIDeleteThisStatus'] = "Why Can't I Delete This Status?";
-$hesklang['whyCantIDeleteThisStatusReason'] = 'This status cannot be deleted because it is being used as a default status for a particular action.';
-$hesklang['isNewTicketMsg'] = 'When a new ticket is created, set its status to';
-$hesklang['isRepliedByClientMsg'] = 'When a client replies to a ticket, set its status to';
-$hesklang['close_this_ticket']='Close ticket';
-$hesklang['closed']='closed';
-$hesklang['resolved']='Resolved'; // Ticket has been RESOLVED
-$hesklang['quick_help_ticket']='Here is the information on your ticket. You can add a reply to this ticket, close it, or re-open the ticket if applicable.';
-
-
-// ADDED OR MODIFIED IN Mods For HESK pre-1.2
-$hesklang['search_the_knowledgebase'] = 'Search the Knowledgebase';
-$hesklang['view_ticket_nav']='View Ticket';
-$hesklang['quick_help']='Quick Help';
-$hesklang['quick_help_submit_ticket']='Please fill out the form on the right to submit a ticket. Required fields are marked with a <span class="important">*</span>.';
-$hesklang['quick_help_view_ticket']='Please fill out the required information on the right to view your ticket. If you forgot your Ticket tracking ID, click "Forgot tracking ID".';
-$hesklang['information']='Information';
-$hesklang['admin_sidebar_ticket_id']='TICKET ID';
-$hesklang['priorityChange']=' - - Change Priority - - ';
-$hesklang['statusChange']=' - - Change Status - - ';
-$hesklang['ownerChange']=' - - Change Owner - - ';
-$hesklang['categoryChange']=' - - Change Category - - ';
-$hesklang['navigation']='Navigation';
-$hesklang['nti']='New ticket';
-$hesklang['savedResponses']='Saved Responses';
-$hesklang['add_ticket_general_information']='General Information';
-$hesklang['add_ticket_your_message']='Your Message';
-
-// EMAIL SUBJECTS
-$hesklang['new_ticket_staff']       = '[#%%TRACK_ID%%] New ticket: %%SUBJECT%%';
-$hesklang['ticket_received']        = '[#%%TRACK_ID%%] Ticket received: %%SUBJECT%%; Status: %%STATUS%%';
-$hesklang['ticket_assigned_to_you'] = '[#%%TRACK_ID%%] Ticket assigned: %%SUBJECT%%';
-$hesklang['new_reply_by_customer']  = '[#%%TRACK_ID%%] New reply to: %%SUBJECT%%';
-$hesklang['new_reply_by_staff']     = '[#%%TRACK_ID%%] New reply to: %%SUBJECT%%';
-$hesklang['category_moved']         = '[#%%TRACK_ID%%] Ticket moved: %%SUBJECT%%';
-$hesklang['new_note']               = '[#%%TRACK_ID%%] Note added to: %%SUBJECT%%';
-$hesklang['new_pm']                 = 'New private message: %%SUBJECT%%';
-$hesklang['forgot_ticket_id']       = 'List of your support tickets';
-$hesklang['ticket_closed']			= '[#%%TRACK_ID%%] Ticket closed/resolved'; // New in 2.6.0
+// Added or modified in version 2.1
+$hesklang['amo']='Add more';
+$hesklang['delatt']='Delete selected attachment?';
+$hesklang['kb_att_rem']='Selected attachment has been removed';
+$hesklang['inv_att_id']='Invalid attachment ID!';
+$hesklang['scb']='Checkbox';
+$hesklang['opt4']='Options for this checkbox, enter one option per line. Each line will be a choice your customers can choose from, multiple choices are possible. You need to enter at least two options!';
+$hesklang['autologin']='Log me on automatically each visit';
+$hesklang['just_user']='Remember just my username';
+$hesklang['nothx']='No, thanks';
+$hesklang['pinfo']='Profile information';
+$hesklang['sig']='Signature';
+$hesklang['pref']='Preferences';
+$hesklang['aftrep']='After replying to a ticket';
+$hesklang['showtic']='Show the ticket I just replied to';
+$hesklang['gomain']='Return to main administration page';
+$hesklang['shownext']='Open next ticket that needs my reply';
+$hesklang['rssn']='Showing next ticket that needs your attention';
+$hesklang['mrep']='Replace message';
+$hesklang['madd']='Add to the bottom';
+$hesklang['priv']='Private categories and articles viewable to staff only are marked with *';
+$hesklang['inve']='Invalid email file';
+$hesklang['emfm']='Missing email file';
+$hesklang['hesk_lang']='Default Language';
+$hesklang['s_mlang']='Multiple languages';
+$hesklang['s_mlange']='Enable only if you provide support in all installed languages!';
+$hesklang['s_inl']='Test language folder';
+$hesklang['ta']='Test again';
+$hesklang['alo']='Allow automatic login';
+$hesklang['chol']='Preferred Language';
+$hesklang['mmdl']='Make this my preferred Language';
+$hesklang['warn']='WARNING';
+$hesklang['dmod']='Debug mode is enabled. Make sure you disable debug mode in settings once HESK is installed and working properly.';
+$hesklang['kb_spar']='Category can\'t be it\'s own parent category!';
+$hesklang['mysql_root']='Your MySQL password is empty, are you sure you want to login with root user? This is a significant security risk!';
+$hesklang['chg']='Change';
+$hesklang['chpri']='Priority changed';
+$hesklang['chpri2']='Ticket\'s priority has been changed to %s';
+$hesklang['selcan']='Select the canned response you would like to edit';
+$hesklang['q_wrng']='Wrong anti-SPAM answer';
+$hesklang['cndupl']='You already have a category with that name. Choose a unique name for each category.';
+$hesklang['wsel']='Select the field you want to search by';
 
-// ERROR MESSAGES
-$hesklang['cant_connect_db']='Can\'t connect to database!';
-$hesklang['invalid_action']='Invalid action';
-$hesklang['select_username']='Please select your username';
-$hesklang['enter_pass']='Please enter your password';
-$hesklang['cant_sql']='Can\'t execute SQL';
-$hesklang['contact_webmsater']='Please notify webmaster at';
-$hesklang['mysql_said']='MySQL said';
-$hesklang['wrong_pass']='Wrong password.';
-$hesklang['session_expired']='Your session has expired, please login using the form below.';
-$hesklang['attempt']='Invalid attempt!';
-$hesklang['not_authorized_tickets']='You are not authorized to view tickets inside this category!';
-$hesklang['must_be_admin']='You are not authorized to view this page! To view this page you must be logged in as an administrator.';
-$hesklang['no_session']='Can\'t start a new session!';
-$hesklang['error']='Error';
-$hesklang['int_error']='Internal script error';
-$hesklang['no_trackID']='No tracking ID';
-$hesklang['status_not_valid']='Status not valid';
-$hesklang['trackID_not_found']='Tracking ID not found';
-$hesklang['select_priority']='Please select priority';
-$hesklang['ticket_not_found']='Ticket not found! Please make sure you have entered the correct tracking ID!';
-$hesklang['no_selected']='No tickets selected, nothing to change';
-$hesklang['id_not_valid']='This is not a valid ID';
-$hesklang['enter_id']='Please enter tracking ID';
-$hesklang['enter_name']='Please enter customer name';
-$hesklang['enter_date']='Please enter the date you want to search in';
-$hesklang['date_not_valid']='This is not a valid date. Please enter date in <b>YYYY-MM-DD</b> format.';
-$hesklang['enter_subject']='Please enter ticket subject';
-$hesklang['invalid_search']='Invalid search action';
-$hesklang['choose_cat_ren']='Please choose a category to be renamed';
-$hesklang['cat_ren_name']='Please write new category name';
-$hesklang['cat_not_found']='Category not found';
-$hesklang['enter_cat_name']='Please enter category name';
-$hesklang['no_cat_id']='No category ID';
-$hesklang['cant_del_default_cat']='You cannot delete the default category, you can only rename it';
-$hesklang['no_valid_id']='No valid user ID';
-$hesklang['user_not_found']='User not found';
-$hesklang['enter_real_name']='Please enter user real name';
-$hesklang['enter_valid_email']='Please enter a valid email address';
-$hesklang['enter_username']='Please enter username (login)';
-$hesklang['asign_one_cat']='Please assign user to at least one category!';
-$hesklang['confirm_user_pass']='Please confirm password';
-$hesklang['passwords_not_same']='The two passwords entered are not the same!';
-$hesklang['cant_del_admin']='You cannot delete the default administrator!';
-$hesklang['cant_del_own']='You cannot delete the profile you are logged in as!';
-$hesklang['enter_your_name']='Please enter your name';
-$hesklang['enter_message']='Please enter your message';
-$hesklang['sel_app_cat']='Please select the appropriate category';
-$hesklang['sel_app_priority']='Please select the appropriate priority';
-$hesklang['enter_ticket_subject']='Please enter your ticket subject';
-$hesklang['user_not_found_nothing_edit']='User not found or nothing to change';
-
-// ADMIN PANEL
-$hesklang['administrator']='Administrator';
-$hesklang['login']='Login';
-$hesklang['user']='User';
-$hesklang['username']='Username';
-$hesklang['pass']='Password';
-$hesklang['confirm_pass']='Confirm password';
-$hesklang['logged_out']='Logged out';
-$hesklang['logout']='Logout';
-$hesklang['logout_success']='You have been successfully logged out!';
-$hesklang['click_login']='Click here to login';
-$hesklang['back']='Go back';
-$hesklang['displaying_pages']='Displaying <b>%d</b> tickets. Pages:';
-$hesklang['trackID']='Tracking ID';
-$hesklang['timestamp']='Timestamp';
-$hesklang['name']='Name';
-$hesklang['subject']='Subject';
-$hesklang['status']='Status';
-$hesklang['priority']='Priority';
-$hesklang['open_action']='Open ticket'; // Open ACTION
-$hesklang['close']='Closed'; // Closed ticket STATUS
-$hesklang['any_status']='Any status';
-$hesklang['high']='High';
-$hesklang['medium']='Medium';
-$hesklang['low']='Low';
-$hesklang['del_selected']='Delete selected tickets';
-$hesklang['manage_cat']='Manage categories';
-$hesklang['profile']='Your profile';
-$hesklang['show_tickets']='Show tickets';
-$hesklang['sort_by']='Sort by';
-$hesklang['date_posted']='Date posted';
-$hesklang['category']='Category';
-$hesklang['any_cat']='Any category';
-$hesklang['order']='Order';
-$hesklang['ascending']='ascending';
-$hesklang['descending']='descending';
-$hesklang['display']='Display';
-$hesklang['tickets_page']='tickets per page';
-$hesklang['find_ticket']='Find ticket';
-$hesklang['yyyy_mm_dd']='YYYY-MM-DD';
-$hesklang['results_page']='results per page';
-$hesklang['opened']='opened'; // The ticket has been OPENED
-$hesklang['ticket']='Ticket';
-$hesklang['tickets']='Tickets';
-$hesklang['ticket_been']='This ticket has been';
-$hesklang['view_ticket']='View ticket';
-$hesklang['open_tickets']='Open tickets';
-$hesklang['remove_statement']='Remove &quot;Powered by&quot; statement';
-$hesklang['click_info']='Click here for more info';
-$hesklang['reply_added']='Reply added';
-$hesklang['ticket_marked']='This ticket has been marked';
-$hesklang['ticket_status']='Ticket status';
-$hesklang['replies']='Replies';
-$hesklang['date']='Date';
-$hesklang['email']='Email';
-$hesklang['ip']='IP';
-$hesklang['message']='Message';
-$hesklang['add_reply']='Add reply';
-$hesklang['change_priority']='Change priority to';
-$hesklang['attach_sign']='Attach signature';
-$hesklang['profile_settings']='Profile settings';
-$hesklang['submit_reply']='Submit reply';
-$hesklang['support_panel']='Support panel';
-$hesklang['ticket_trackID']='Ticket tracking ID';
-$hesklang['c2c']='Click to continue';
-$hesklang['tickets_deleted']='Tickets deleted';
-$hesklang['num_tickets_deleted']='<b>%d</b> tickets have been deleted';
-$hesklang['found_num_tickets']='Found <b>%d</b> tickets. Pages:';
-$hesklang['confirm_del_cat']='Are you sure you want to remove this category?';
-$hesklang['cat_intro']='Here you are able to manage categories. Categories are useful
-for categorizing tickets by relevance (for example &quot;Sales&quot;,
-&quot;Hardware problems&quot;, &quot;PHP/MySQL problems&quot; etc) and for
-assigning users to categories (for example that your sales person can only view
-tickets posted to &quot;Sales&quot; category)';
-$hesklang['cat_name']='Category name';
-$hesklang['remove']='Remove';
-$hesklang['add_cat']='Add new category';
-$hesklang['max_chars']='max 40 chars';
-$hesklang['create_cat']='Create category';
-$hesklang['ren_cat']='Rename category';
-$hesklang['to']='to';
-$hesklang['cat_added']='Category added';
-$hesklang['cat_name_added']='Category %s has been successfully added';
-$hesklang['cat_renamed']='Category renamed';
-$hesklang['cat_renamed_to']='Selected category has been successfully renamed to';
-$hesklang['cat_removed']='Category removed';
-$hesklang['cat_removed_db']='Selected category has been successfully removed from the database';
-$hesklang['sure_remove_user']='Are you sure you want to remove this user?';
-$hesklang['manage_users']='Manage users';
-$hesklang['users_intro']='Here you are able to manage users who can login to the admin panel and
-answer tickets. Administrators can view/edit tickets in any category and have access
-to all functions of the admin panel (manage users, manage categories, ...) while
-other users may only view and reply to tickets within their categories.';
-$hesklang['yes']='YES';
-$hesklang['no']='NO';
-$hesklang['edit']='Edit';
-$hesklang['add_user']='Add new user';
-$hesklang['req_marked_with']='Required fields are marked with';
-$hesklang['real_name']='Real name';
-$hesklang['sign_extra']='HTML code is not allowed. Links will be clickable.';
-$hesklang['create_user']='Create user';
-$hesklang['editing_user']='Editing user';
-$hesklang['user_added']='User added';
-$hesklang['user_added_success']='New user %s with password %s has been successfully added';
-$hesklang['user_removed']='User removed';
-$hesklang['sel_user_removed']='Selected user has been successfully removed from the database';
-$hesklang['profile_for']='Profile for';
-$hesklang['new_pass']='New password';
-$hesklang['update_profile']='Update profile';
-$hesklang['notify_new_posts']='Notify me of new tickets and posts within my categories';
-$hesklang['profile_updated']='Profile updated';
-$hesklang['profile_updated_success']='This profile has been successfully updated';
-$hesklang['view_profile']='View profile';
-$hesklang['new_ticket_submitted']='New support ticket submitted';
-$hesklang['user_profile_updated_success']='This user profile has been updated successfully';
-$hesklang['printer_friendly']='Print';
-$hesklang['end_ticket']='--- End of ticket ---';
-
-// CUSTOMER INTERFACE
-$hesklang['your_ticket_been']='Your ticket has been';
-$hesklang['submit_ticket']='Submit a ticket';
-$hesklang['sub_ticket']='Submit ticket';
-$hesklang['before_submit']='Before submitting please make sure of the following';
-$hesklang['all_info_in']='All necessary information has been filled out';
-$hesklang['all_error_free']='All information is correct and error-free';
-$hesklang['we_have']='We have';
-$hesklang['recorded_ip']='recorded as your IP Address';
-$hesklang['recorded_time']='recorded the time of your submission';
-$hesklang['save_changes']='Save changes';
-$hesklang['reply_submitted']='Reply submitted';
-$hesklang['reply_submitted_success']='Your reply to this ticket has been successfully submitted';
-$hesklang['view_your_ticket']='View your ticket';
-$hesklang['ticket_submitted']='Ticket submitted';
-$hesklang['ticket_submitted_success']='Your ticket has been successfully submitted! Ticket ID';
-$hesklang['your_ticket']='Your ticket';
 
+// Added or modified in version 2.2
+$hesklang['eto']='Invalid request';
+$hesklang['id']='ID';
+$hesklang['geco']='Generate Direct Link';
+$hesklang['genl']='Direct Category Link';
+$hesklang['genl2']='Use this link to preselect category in the &quot;Submit a ticket&quot; form.';
+$hesklang['exa']='Examples';
+$hesklang['small']='Small Box';
+$hesklang['large']='Large Box';
+$hesklang['cpri']='Customer priority';
+$hesklang['owner']='Owner';
+$hesklang['unas']='Unassigned';
+$hesklang['assi']='Assign';
+$hesklang['asst']='Assign to';
+$hesklang['asst2']='Assign this ticket to';
+$hesklang['asss']='Assign to self';
+$hesklang['asss2']='Assign this ticket to myself';
+$hesklang['can_assign_self']='Can assign tickets to self';
+$hesklang['can_assign_others']='Can assign tickets to others';
+$hesklang['can_view_ass_others']='Can view tickets assigned to others';
+$hesklang['unoa']='Selected user doesn\'t have access to this category';
+$hesklang['tasi']='Owner Assigned';
+$hesklang['tasy']='This ticket has been assigned to you';
+$hesklang['taso']='This ticket has been assigned to the selected user';
+$hesklang['tasy2']='Assigned to me';
+$hesklang['taso2']='Assigned to other staff';
+$hesklang['nose']='Select the new Owner';
+$hesklang['onasc']='This owner doesn\'t have access to the selected category.';
+$hesklang['tunasi']='Ticket Unassigned';
+$hesklang['tunasi2']='Ticket is without an owner and ready to be assigned again';
+$hesklang['note']='Note';
+$hesklang['success']='Success';
+$hesklang['nyt']='This ticket is assigned to';
+$hesklang['noch']='No changes have been made';
+$hesklang['orch']='Display order has been modified';
+$hesklang['rfm']='Required information missing:';
+$hesklang['repl0']='Insufficient permissions to perform this task';
+$hesklang['repl1']='This post doesn\'t exist';
+$hesklang['reports']='Reports';
+$hesklang['reports_intro']='The reports section lets you run several reports and see ticket statistics in a chosen date range.';
+$hesklang['refi']='Reset form data';
+$hesklang['dich']='Discard Changes';
+$hesklang['dire']='Display Report';
+$hesklang['m1']='January';
+$hesklang['m2']='February';
+$hesklang['m3']='March';
+$hesklang['m4']='April';
+$hesklang['m5']='May';
+$hesklang['m6']='June';
+$hesklang['m7']='July';
+$hesklang['m8']='August';
+$hesklang['m9']='September';
+$hesklang['m10']='October';
+$hesklang['m11']='November';
+$hesklang['m12']='December';
+$hesklang['d1']='Monday';
+$hesklang['d2']='Tuesday';
+$hesklang['d3']='Wednesday';
+$hesklang['d4']='Thursday';
+$hesklang['d5']='Friday';
+$hesklang['d6']='Saturday';
+$hesklang['d0']='Sunday';
+$hesklang['mo']='Mo';
+$hesklang['tu']='Tu';
+$hesklang['we']='We';
+$hesklang['th']='Th';
+$hesklang['fr']='Fr';
+$hesklang['sa']='Sa';
+$hesklang['su']='Su';
+$hesklang['from']='From';
+$hesklang['cinv']='Invalid date';
+$hesklang['cinv2']='Accepted format is mm/dd/yyyy';
+$hesklang['cinm']='Invalid month value';
+$hesklang['cinm2']='Allowed range is';
+$hesklang['cind']='Invalid day of month value';
+$hesklang['cind2']='Allowed range for selected month is';
+$hesklang['month']='Month';
+$hesklang['ocal']='Open Calendar';
+$hesklang['ca01']='Previous Year';
+$hesklang['ca02']='Previous Month';
+$hesklang['ca03']='Next Month';
+$hesklang['ca04']='Next Year';
+$hesklang['ca05']='Close Calendar';
+$hesklang['cdr']='Choose date range:';
+$hesklang['crt']='Choose report type:';
+$hesklang['r1']='Today';
+$hesklang['r2']='Yesterday';
+$hesklang['r3']='This month';
+$hesklang['r4']='Last month';
+$hesklang['r5']='Last 30 days';
+$hesklang['r6']='This week (Mon-Sun)';
+$hesklang['r7']='Last week (Mon-Sun)';
+$hesklang['r8']='This business week (Mon-Fri)';
+$hesklang['r9']='Last business week (Mon-Fri)';
+$hesklang['r10']='This year';
+$hesklang['r11']='Last year';
+$hesklang['r12']='All time';
+$hesklang['datetofrom']='&quot;Date From&quot; cannot be higher than &quot;Date to&quot;. The dates have been switched.';
+$hesklang['t1']='Tickets per day';
+$hesklang['t2']='Tickets per month';
+$hesklang['t3']='Tickets per user';
+$hesklang['t4']='Tickets per category';
+$hesklang['ticass']='Assigned tickets';
+$hesklang['ticall']='Replied to tickets';
+$hesklang['totals']='Totals';
+$hesklang['all']='All';
+$hesklang['atik']='New tickets';
+$hesklang['kbca']='You already have a knowledgebase category with this name.';
+$hesklang['menu_msg']='Mail';
+$hesklang['menu_can']='Canned';
+$hesklang['m_from']='From:'; // Mail "from" address
+$hesklang['m_to']='To:'; // Mail "to" address
+$hesklang['m_sub']='Subject:'; // Mail subject
+$hesklang['m_re']='Re:'; // Mail reply subject prefix, like "Re: Original subject"
+$hesklang['m_fwd']='Fwd:'; // Mail forward subject prefix, like "Fwd: Original subject"
+$hesklang['m_h']='Private messages';
+$hesklang['m_intro']='Use private messages to send quick messages to other staff members within the HESK.';
+$hesklang['e_udel']='(User deleted)';
+$hesklang['new_mail']='New private message';
+$hesklang['m_send']='Send message';
+$hesklang['m_rec']='Select message recipient';
+$hesklang['m_inr']='Invalid message recipient';
+$hesklang['m_esu']='Enter private message subject';
+$hesklang['m_pms']='Your private message has been sent';
+$hesklang['inbox']='INBOX';
+$hesklang['outbox']='OUTBOX';
+$hesklang['m_new']='NEW MESSAGE';
+$hesklang['pg']='Show page';
+$hesklang['npm']='No private messages in this folder.';
+$hesklang['m_ena']='You don\'t have permission to read this message.';
+$hesklang['mau']='Mark as unread';
+$hesklang['mo1']='Mark selected messages as read';
+$hesklang['mo2']='Mark selected messages as unread';
+$hesklang['mo3']='Delete selected messages';
+$hesklang['delm']='Delete this message';
+$hesklang['e_tid']='Error generating a unique ticket ID, please try submitting the form again later.';
+$hesklang['smmr']='Selected messages have been marked as read';
+$hesklang['smmu']='Selected messages have been marked as unread';
+$hesklang['smdl']='Selected messages have been deleted';
+$hesklang['show']='Show';
+$hesklang['s_my']='Assigned to me';
+$hesklang['s_ot']='Assigned to others';
+$hesklang['s_un']='Unassigned tickets';
+$hesklang['s_for']='Search for';
+$hesklang['s_in']='Search in';
+$hesklang['s_incl']='Search within';
+$hesklang['find_ticket_by']='Find a ticket';
+$hesklang['e_nose']='No assignment status selected, showing all tickets.';
+$hesklang['fsq']='Enter your search query';
+$hesklang['topen']='Open'; // Not-resolved tickets
+$hesklang['nms']='No messages selected, nothing to change';
+$hesklang['tlo']='Lock ticket';
+$hesklang['tul']='Unlock ticket';
+$hesklang['loc']='Locked';
+$hesklang['isloc']='Customers cannot reply to or re-open locked tickets. When locked ticket is marked as resolved.';
+$hesklang['tlock']='Ticket has been locked';
+$hesklang['tunlock']='Ticket has been unlocked';
+$hesklang['tislock']='This ticket has been locked, the customer will not be able to post a reply.';
+$hesklang['tislock2']='This ticket has been locked, you cannot post a reply.';
+$hesklang['nsfo']='No relevant articles found.';
+$hesklang['elocked']='This ticket has been locked or deleted.';
+$hesklang['nti2']='Insert a new ticket';
+$hesklang['nti3']='Use this form to create a new ticket in a customer\'s name. Enter <i>customer</i> information in the form (customer name, customer email, ...) and NOT your name! Ticket will be created as if the customer submitted it.';
+$hesklang['addop']='Options';
+$hesklang['seno']='Send email notification to the customer';
+$hesklang['otas']='Show the ticket after submission';
+$hesklang['notn']='Notifications';
+$hesklang['nomw']='The help desk will send an email notification when:';
+$hesklang['nwts']='A new ticket is submitted with owner:';
+$hesklang['ncrt']='Client responds to a ticket with owner:';
+$hesklang['ntam']='A ticket is assigned to me';
+$hesklang['npms']='A private message is sent to me';
+$hesklang['support_remove']='A lot of time and effort went into developing HESK. Support HESK by purchasing a license that will remove the credits links <i>Powered by Help Desk Software HESK</i> from your helpdesk';
+$hesklang['ycvtao']='You are not allowed to view tickets assigned to others';
+$hesklang['password_not_valid']='Password must be at least 5 chars long';
+$hesklang['lkbs']='Loading knowledgebase suggestions...';
+$hesklang['auto']='(automatically)';
 
-// ADDED IN HESK VERSION 0.94
-$hesklang['check_updates']='Make sure you always have installed the latest version of Hesk!';
-$hesklang['check4updates']='Check for updates';
-$hesklang['open']='New';
-$hesklang['wait_reply']='Waiting reply';
-$hesklang['wait_staff_reply']='Waiting reply from staff';
-$hesklang['wait_cust_reply']='Waiting reply from customer';
-$hesklang['replied']='Replied';
-$hesklang['last_replier']='Last replier';
-$hesklang['staff']='Staff';
-$hesklang['customer']='Customer';
-$hesklang['close_selected']='Mark selected tickets Resolved';
-$hesklang['execute']='Execute';
-$hesklang['saved_replies']='Canned responses';
-$hesklang['manage_saved']='Canned responses';
-$hesklang['manage_intro']='Here you can add and manage canned responses. These are commonly used replies which are more or less the same for every customer. You should use canned responses to avoid typing the same reply to different customers numerous times.';
-$hesklang['no_saved']='No canned responses';
-$hesklang['delete_saved']='Are you sure you want to delete this canned response?';
-$hesklang['new_saved']='Add or Edit a canned response';
-$hesklang['canned_add']='Create a new canned response';
-$hesklang['canned_edit']='Edit selected canned response';
-$hesklang['saved_title']='Title';
-$hesklang['save_reply']='Save response';
-$hesklang['saved']='Response saved';
-$hesklang['your_saved']='Your canned response has been saved for future use';
-$hesklang['ent_saved_title']='Please enter reply title';
-$hesklang['ent_saved_msg']='Please enter reply message';
-$hesklang['saved_removed']='Canned response removed';
-$hesklang['saved_rem_full']='Selected canned response has been removed from the database';
-$hesklang['clip_alt']='This post has attachments';
-$hesklang['attachments']='Attachments';
-$hesklang['fill_all']='Missing required field';
-$hesklang['file_too_large']='Your file %s is too large';
-$hesklang['created_on']='Created';
-$hesklang['tickets_closed']='Tickets closed';
-$hesklang['num_tickets_closed']='<b>%d</b> tickets have been closed';
-$hesklang['select_saved']='Select a canned response';
-$hesklang['select_empty']='Select / Empty';
-$hesklang['insert_special']='Insert special tag (will be replaced with customer info)';
-$hesklang['move_to_catgory']='Move ticket to';
-$hesklang['move']='Move';
-$hesklang['moved']='Ticket moved';
-$hesklang['moved_to']='This ticket has been moved to the new category';
-$hesklang['url']='URL';
-$hesklang['all_not_closed']='All but closed';
-$hesklang['chg_all']='Change all';
-$hesklang['settings']='Settings';
-$hesklang['settings_intro']='Use this tool to configure your help desk. For more information about all settings and options click the help sign or refer to the readme.html file.';
-$hesklang['all_req']='All fields (except disabled ones) are required!';
-$hesklang['wbst_title']='Website title';
-$hesklang['wbst_url']='Website URL';
-$hesklang['email_wm']='Webmaster email';
-$hesklang['max_listings']='Listings per page';
-$hesklang['print_size']='Print font size';
-$hesklang['debug_mode']='Debug mode';
-$hesklang['on']='ON';
-$hesklang['off']='OFF';
-$hesklang['use_secimg']='Use anti-SPAM image';
-$hesklang['secimg_no']='Not available';
-$hesklang['attach_use']='Use attachments';
-$hesklang['attach_num']='Number per post';
-$hesklang['attach_type']='Allowed file types';
-$hesklang['place_after']='After Message';
-$hesklang['place_before']='Before Message';
-$hesklang['custom_f']='Custom field';
-$hesklang['custom_u']='Use this field';
-$hesklang['custom_n']='Field name';
-$hesklang['custom_l']='Maximum length (chars)';
-$hesklang['db_host']='Database host';
-$hesklang['db_name']='Database name';
-$hesklang['db_user']='Database username';
-$hesklang['db_pass']='Database password';
-$hesklang['err_sname']='Please enter your website title';
-$hesklang['err_surl']='Please enter your website URL. Make sure it is a valid URL (start with http:// or https://)';
-$hesklang['err_wmmail']='Please enter a valid webmaster email';
-$hesklang['err_nomail']='Please enter a valid noreply email';
-$hesklang['err_htitle']='Please enter the title of your support desk';
-$hesklang['err_hurl']='Please enter your Hesk folder url. Make sure it is a valid URL (start with http:// or https://)';
-$hesklang['err_lang']='Please select Hesk language';
-$hesklang['err_nolang']='The language file specified doesn\'t exist in the language folder! Make sure the file is uploaded before changing the language setting.';
-$hesklang['err_max']='Please enter maximum listings displayed per page';
-$hesklang['err_psize']='Please enter the print font size';
-$hesklang['err_dbhost']='Please enter your MySQL database host';
-$hesklang['err_dbname']='Please enter your MySQL database name';
-$hesklang['err_dbuser']='Please enter your MySQL database username';
-$hesklang['err_dbpass']='Please enter your MySQL database password';
-$hesklang['err_dbsele']='Could not select MySQL database, please double-check database NAME';
-$hesklang['err_custname']='Please enter name(s) for selected optional field(s)';
-$hesklang['err_openset']='Can\'t open file <b>hesk_settings.inc.php</b> for writing. Please CHMOD this file to 666 (rw-rw-rw-)';
-$hesklang['set_saved']='Settings saved';
-$hesklang['set_were_saved']='Your settings have been successfully saved';
-$hesklang['sec_img']='Security image';
-$hesklang['sec_miss']='Please enter the security number';
-$hesklang['sec_wrng']='Wrong security number';
-$hesklang['submit_problems']='Please go back and correct the following problems';
-$hesklang['cat_order']='Category order';
-$hesklang['reply_order']='Canned response order';
-$hesklang['move_up']='Move up';
-$hesklang['move_dn']='Move down';
-$hesklang['cat_move_id']='Missing category ID';
-$hesklang['reply_move_id']='Missing canned response ID';
-$hesklang['forgot_tid']='Forgot tracking ID?';
-$hesklang['tid_send']='Send me my tracking ID';
-$hesklang['tid_not_found']='No tickets with your email address were found';
-$hesklang['tid_sent']='Tracking ID sent';
-$hesklang['tid_sent2']='An email with details about your tickets has been sent to your address';
-$hesklang['check_spambox']='Be sure to also check for the email inside your SPAM/Junk mailbox!';
-$hesklang['reply_not_found']='Canned response not found';
-$hesklang['exists']='Exists';
-$hesklang['no_exists']='Doesn\'t exist';
-$hesklang['writable']='Writable';
-$hesklang['not_writable']='Not writable';
-$hesklang['disabled']='disabled';
-$hesklang['e_settings']='You will not be able to save your settings unless this file is writable by the script. Please refer to the readme file for further instructions!';
-$hesklang['e_attdir']='You will not be able to use file attachments unless the attachments folder exists and is writable by the script.';
-$hesklang['e_save_settings']='Unable to save your settings because <b>hesk_settings.inc.php</b> file is not writable by the script.';
-$hesklang['e_attach']='Disabled because your <b>attachments</b> directory is not writable by the script.';
-$hesklang['go']='Go';
-
-
-// ADDED OR CHANGED IN VERSION 2.0
-$hesklang['v']='HESK version';
-$hesklang['check_status']='Checking status';
-$hesklang['sub_support']='Submit a ticket';
-$hesklang['open_ticket']='Submit a new issue to a department';
-$hesklang['view_existing']='View existing ticket';
-$hesklang['vet']='View tickets you submitted in the past';
-$hesklang['enter_user']='Please enter your username';
-$hesklang['remember_user']='Remember my username';
-$hesklang['wrong_user']='Wrong username';
-$hesklang['no_permission']='You don\'t have permission to perform this task, please login with an account that has.';
-$hesklang['tickets_on_pages']='Number of tickets: %d | Number of pages: %d'; // First %d is replaced with number of tickets, second %d with number of pages
-$hesklang['jump_page']='Jump to page:';
-$hesklang['no_tickets_open']='No unresolved tickets found';
-$hesklang['no_tickets_crit']='No tickets found matching your criteria';
-$hesklang['confirm_execute']='Are you sure you want to continue?';
-$hesklang['legend']='Legend';
-$hesklang['main_page']='Home';
-$hesklang['menu_users']='Users';
-$hesklang['menu_cat']='Categories';
-$hesklang['menu_profile']='Profile';
-$hesklang['menu_kb']='Knowledgebase'; // Admin MENU item
-$hesklang['kb_text']='Knowledgebase'; // Item visible to customers
-$hesklang['viewkb']='View entire Knowledgebase';
-$hesklang['kb']='Manage Knowledgebase';
-$hesklang['kb_intro']='Knowledgebase is a collection of answers to frequently asked questions (FAQ) and articles which provide self-help resources to your customers.
-A comprehensive and well-written knowledgebase can drastically reduce the number of support tickets you receive and save a lot of your time. You can arrange articles into categories
-and sub categories.'; // Description in ADMIN panel
-$hesklang['kb_is']='The knowledgebase is a categorized collection of answers to frequently asked questions (FAQ) and articles. You can read articles in this category or select a subcategory that you are interested in.'; // Description for CUSTOMERS
-$hesklang['new_kb_art']='New knowledgebase article';
-$hesklang['kb_cat']='Category';
-$hesklang['kb_subject']='Subject';
-$hesklang['kb_content']='Contents';
-$hesklang['kb_type']='Type';
-$hesklang['kb_published']='Published';
-$hesklang['kb_published2']='The article is viewable to everyone in the knowledgebase.';
-$hesklang['kb_private']='Private';
-$hesklang['kb_private2']='Private articles can only be read by staff.';
-$hesklang['kb_draft']='Draft';
-$hesklang['kb_draft2']='The article is saved but not yet published. It can only be read by staff<br /> who has permission to manage knowledgebase articles.';
-$hesklang['kb_links']='<i><span class="notice"><b>Warning!</b></span><br />Enter valid code without &lt;head&gt; and &lt;body&gt; tags, just content!</i>';
-$hesklang['kb_ehtml']='This is HTML code (I will enter valid (X)HTML code)';
-$hesklang['kb_dhtml']='This is plain text (links will be clickable)';
-$hesklang['kb_save']='Save article';
-$hesklang['kb_e_subj']='Enter article subject!';
-$hesklang['kb_e_cont']='Write article contents!';
-$hesklang['kb_art_added']='Article added';
-$hesklang['your_kb_added']='A new knowledgebase article has been successfully added';
-$hesklang['kb_art_deleted']='Article deleted';
-$hesklang['your_kb_deleted']='Selected knowledgebase article has been successfully deleted';
-$hesklang['kb_art_mod']='Article modified';
-$hesklang['your_kb_mod']='Your changes to the selected article have been saved successfully';
-$hesklang['kb_cat_new']='New knowledgebase category';
-$hesklang['kb_cat_parent']='Parent category';
-$hesklang['kb_cat_sub']='Subcategories';
-$hesklang['kb_cat_title']='Category title';
-$hesklang['kb_cat_published']='The category is viewable to everyone in the knowledgebase.';
-$hesklang['kb_cat_private']='The category can only be read by staff.';
-$hesklang['kb_cat_add']='Add category';
-$hesklang['kb_cat_e_title']='Enter category title!';
-$hesklang['kb_cat_added']='Category added';
-$hesklang['kb_cat_added2']='A new category has been successfully added to the knowledgebase';
-$hesklang['kb_cat_man']='Manage knowledgebase category';
-$hesklang['kb_cat_edit']='Edit category details';
-$hesklang['kb_cat_inv']='Invalid category';
-$hesklang['kb_cat_art']='Articles in this category';
-$hesklang['kb_p_art']='+ Article';
-$hesklang['kb_p_art2']='add a new article to the selected category.';
-$hesklang['kb_add_art']='Add Article';
-$hesklang['kb_p_cat']='+ Category';
-$hesklang['kb_p_cat2']='create a new sub-category inside the selected category.';
-$hesklang['kb_add_cat']='Add Category';
-$hesklang['kb_p_man']='Manage';
-$hesklang['kb_p_man2']='manage selected category (edit, delete, manage articles).';
-$hesklang['kb_main']='The main knowledgebase category cannot be deleted or moved.';
-$hesklang['kb_no_art']='There are no articles in this category.';
-$hesklang['author']='Author';
-$hesklang['views']='Views';
-$hesklang['delete']='Delete';
-$hesklang['rating']='Rating';
-$hesklang['votes']='Votes';
-$hesklang['kb_rated']='Article rated %s/5.0';
-$hesklang['kb_not_rated']='Article not rated yet';
-$hesklang['del_art']='Are you sure you want to delete selected article?';
-$hesklang['kb_art_id']='Missing or invalid article ID!';
-$hesklang['kb_art_edit']='Edit article';
-$hesklang['revhist']='Revision history';
-$hesklang['kb_order']='Order';
-$hesklang['kb_delcat']='Are you sure you want to delete this category?';
-$hesklang['kb_cat_mod']='Category modified';
-$hesklang['your_cat_mod']='Your changes to the selected category have been saved successfully';
-$hesklang['kb_cat_del']='Knowledgebase category deleted';
-$hesklang['kb_cat_dlt']='The selected knowledgebase category has been deleted.';
-$hesklang['allowed_cat']='Categories';
-$hesklang['allow_feat']='Features';
-$hesklang['can_view_tickets']='View tickets';
-$hesklang['can_reply_tickets']='Reply to tickets';
-$hesklang['can_assign_tickets']='Assign tickets';
-$hesklang['can_del_tickets']='Delete tickets';
-$hesklang['can_edit_tickets']='Edit ticket replies';
-$hesklang['can_change_cat']='Change ticket category';
-$hesklang['can_man_kb']='Manage knowledgebase';
-$hesklang['can_man_users']='Manage users';
-$hesklang['can_man_cat']='Manage categories';
-$hesklang['can_man_canned']='Manage canned responses';
-$hesklang['can_del_notes']='Delete any ticket notes';
-$hesklang['dan']='users can delete their own ticket notes, select this only if you wish to allow this user to also be able to delete notes from other users';
-$hesklang['in_all_cat']='in allowed categories only';
-$hesklang['admin_can']='(access to all features and categories)';
-$hesklang['staff_can']='(you can limit features and categories)';
-$hesklang['asign_one_feat']='Please assign at least one feature to this user!';
-$hesklang['na_view_tickets']='You are not authorized to view tickets';
-$hesklang['support_notice']='Sorry, this section can only be hidden when you purchase a HESK license!';
-$hesklang['rart']='Was this article helpful?';
-$hesklang['r']='Was this reply helpful?';
-$hesklang['tyr']='Thank you for rating';
-$hesklang['cw']='Close Window';
-$hesklang['cw2']='Close window and submit ticket';
-$hesklang['rh']='Rated as <i>helpful</i>';
-$hesklang['rnh']='Rated as <i>not helpful</i>';
-$hesklang['ar']='Already rated';
-$hesklang['rated']='User rated %s/5.0 (%s votes)';
-$hesklang['not_rated']='User not rated yet';
-$hesklang['rdis']='Rating has been disabled';
-$hesklang['kbdis']='Knowledgebase is disabled';
-$hesklang['kbpart']='Sorry, you don\'t have permission to access this article';
-$hesklang['popart']='Top Knowledgebase articles:';
-$hesklang['latart']='Latest Knowledgebase articles:';
-$hesklang['m']='More topics';
-$hesklang['ac']='Articles in this category:';
-$hesklang['noa']='No articles yet';
-$hesklang['noac']='No articles yet in this category';
-$hesklang['dta']='Date added';
-$hesklang['ad']='Article details';
-$hesklang['aid']='Article ID';
-$hesklang['as']='Solution';
-$hesklang['search']='Search';
-$hesklang['sr']='Search results';
-$hesklang['nosr']='No matching articles found. Try browsing the knowledgebase or submit a new support ticket.';
-$hesklang['rv']='Reset views';
-$hesklang['rr']='Reset votes (ratings)';
-$hesklang['opt']='Options';
-$hesklang['delcat']='Delete category';
-$hesklang['move1']='Move articles to parent category';
-$hesklang['move2']='Delete articles in this category';
-$hesklang['sc']='Suggested knowledgebase articles';
-$hesklang['not']='Tickets'; // Number of all tickets in category
-$hesklang['graph']='Graph';
-$hesklang['lu']='List usernames';
-$hesklang['aclose']='Autoclose tickets';
-$hesklang['aclose2']='days after last staff reply';
-$hesklang['s_ucrt']='Reopen tickets';
-$hesklang['urate']='Reply ratings';
-$hesklang['hesk_url']='Help desk URL';
-$hesklang['hesk_title']='Help desk title';
-$hesklang['server_time']='Server time offset';
-$hesklang['t_h']='hours';
-$hesklang['cid']='Case Tracking ID';
-$hesklang['t_m']='minutes';
-$hesklang['day']='Daylight saving';
-$hesklang['tfor']='Time format';
-$hesklang['prefix']='Table prefix';
-$hesklang['s_kbs']='Enable KB search';
-$hesklang['s_kbr']='Enable KB rating';
-$hesklang['s_maxsr']='Max search results';
-$hesklang['s_suggest']='Suggest KB articles';
-$hesklang['s_spop']='Show popular articles';
-$hesklang['s_slat']='Show latest articles';
-$hesklang['s_onin']='on <a href="../" target="_blank">help desk index</a> page';
-$hesklang['s_onkb']='on <a href="../knowledgebase.php" target="_blank">Knowledgebase index</a> page';
-$hesklang['s_scol']='Categories in row';
-$hesklang['s_ptxt']='Article preview length';
-$hesklang['s_psubart']='Subcategory articles';
-$hesklang['enable']='Enable';
-$hesklang['s_type']='Type';
-$hesklang['custom_r']='Required';
-$hesklang['custom_place']='Location';
-$hesklang['custom_use']='Custom fields';
-$hesklang['stf']='Text field';
-$hesklang['stb']='Large text box';
-$hesklang['srb']='Radio button';
-$hesklang['ssb']='Select box';
-$hesklang['db']='Database';
-$hesklang['hd']='Help desk settings';
-$hesklang['gs']='General settings';
-$hesklang['cwin']='Close window';
-$hesklang['defw']='Default value';
-$hesklang['ok']='OK';
-$hesklang['ns']='These are available options for this custom field. To save changes click <b>OK</b> and <b>Save changes</b> button on the admin settings page!';
-$hesklang['rows']='Rows (height)';
-$hesklang['cols']='Columns (width)';
-$hesklang['opt2']='Options for this radio button, enter one option per line (each line will create a new radio button value to choose from). You need to enter at least two options!';
-$hesklang['opt3']='Options for this select box, enter one option per line (each line will be a choice your customers can choose from). You need to enter at least two options!';
-$hesklang['atl2']='Enter at least two options (one per line)!';
-$hesklang['notes']='Notes';
-$hesklang['noteby']='Note by';
-$hesklang['delnote']='Delete note';
-$hesklang['noteerr']='Note already deleted or wrong parameters';
-$hesklang['s']='Submit';
-$hesklang['nhid']='Notes are hidden from customers!';
-$hesklang['delt']='Delete this post';
-$hesklang['edtt']='Edit post';
-$hesklang['edt1']='Post modified';
-$hesklang['edt2']='Changes to the selected post have been saved';
-$hesklang['dele']='Delete this ticket';
-$hesklang['repd']='Post deleted';
-$hesklang['repl']='Selected post has been deleted';
-$hesklang['tickets_found']='Search results';
-$hesklang['al']='Admin link';
-$hesklang['ap']='Go to Administration Panel';
-$hesklang['dap']='Display a link to admin panel from <a href="../" target="_blank">help desk index</a>';
-$hesklang['q_miss']='Please answer the anti-SPAM question';
-$hesklang['use_q']='Use anti-SPAM question';
-$hesklang['q_q']='-&gt; Question (HTML code is <font class="success">allowed</font>)';
-$hesklang['q_a']='-&gt; Answer';
-$hesklang['err_qask'] = 'Enter an anti-SPAM question';
-$hesklang['err_qans'] = 'Enter answer to the anti-SPAM question';
-$hesklang['genq'] = 'Generate a random question';
-
-
-// Added or modified in version 2.1
-$hesklang['amo']='Add more';
-$hesklang['delatt']='Delete selected attachment?';
-$hesklang['kb_att_rem']='Selected attachment has been removed';
-$hesklang['inv_att_id']='Invalid attachment ID!';
-$hesklang['scb']='Checkbox';
-$hesklang['opt4']='Options for this checkbox, enter one option per line. Each line will be a choice your customers can choose from, multiple choices are possible. You need to enter at least two options!';
-$hesklang['autologin']='Log me on automatically each visit';
-$hesklang['just_user']='Remember just my username';
-$hesklang['nothx']='No, thanks';
-$hesklang['pinfo']='Profile information';
-$hesklang['sig']='Signature';
-$hesklang['pref']='Preferences';
-$hesklang['aftrep']='After replying to a ticket';
-$hesklang['showtic']='Show the ticket I just replied to';
-$hesklang['gomain']='Return to main administration page';
-$hesklang['shownext']='Open next ticket that needs my reply';
-$hesklang['rssn']='Showing next ticket that needs your attention';
-$hesklang['mrep']='Replace message';
-$hesklang['madd']='Add to the bottom';
-$hesklang['priv']='Private categories and articles viewable to staff only are marked with *';
-$hesklang['inve']='Invalid email file';
-$hesklang['emfm']='Missing email file';
-$hesklang['hesk_lang']='Default Language';
-$hesklang['s_mlang']='Multiple languages';
-$hesklang['s_mlange']='Enable only if you provide support in all installed languages!';
-$hesklang['s_inl']='Test language folder';
-$hesklang['ta']='Test again';
-$hesklang['alo']='Allow automatic login';
-$hesklang['chol']='Preferred Language';
-$hesklang['mmdl']='Make this my preferred Language';
-$hesklang['warn']='WARNING';
-$hesklang['dmod']='Debug mode is enabled. Make sure you disable debug mode in settings once HESK is installed and working properly.';
-$hesklang['kb_spar']='Category can\'t be it\'s own parent category!';
-$hesklang['mysql_root']='Your MySQL password is empty, are you sure you want to login with root user? This is a significant security risk!';
-$hesklang['chg']='Change';
-$hesklang['chpri']='Priority changed';
-$hesklang['chpri2']='Ticket\'s priority has been changed to %s';
-$hesklang['selcan']='Select the canned response you would like to edit';
-$hesklang['q_wrng']='Wrong anti-SPAM answer';
-$hesklang['cndupl']='You already have a category with that name. Choose a unique name for each category.';
-$hesklang['wsel']='Select the field you want to search by';
-
-
-// Added or modified in version 2.2
-$hesklang['eto']='Invalid request';
-$hesklang['id']='ID';
-$hesklang['geco']='Generate Direct Link';
-$hesklang['genl']='Direct Category Link';
-$hesklang['genl2']='Use this link to preselect category in the &quot;Submit a ticket&quot; form.';
-$hesklang['exa']='Examples';
-$hesklang['small']='Small Box';
-$hesklang['large']='Large Box';
-$hesklang['cpri']='Customer priority';
-$hesklang['owner']='Owner';
-$hesklang['unas']='Unassigned';
-$hesklang['assi']='Assign';
-$hesklang['asst']='Assign to';
-$hesklang['asst2']='Assign this ticket to';
-$hesklang['asss']='Assign to self';
-$hesklang['asss2']='Assign this ticket to myself';
-$hesklang['can_assign_self']='Can assign tickets to self';
-$hesklang['can_assign_others']='Can assign tickets to others';
-$hesklang['can_view_ass_others']='Can view tickets assigned to others';
-$hesklang['unoa']='Selected user doesn\'t have access to this category';
-$hesklang['tasi']='Owner Assigned';
-$hesklang['tasy']='This ticket has been assigned to you';
-$hesklang['taso']='This ticket has been assigned to the selected user';
-$hesklang['tasy2']='Assigned to me';
-$hesklang['taso2']='Assigned to other staff';
-$hesklang['nose']='Select the new Owner';
-$hesklang['onasc']='This owner doesn\'t have access to the selected category.';
-$hesklang['tunasi']='Ticket Unassigned';
-$hesklang['tunasi2']='Ticket is without an owner and ready to be assigned again';
-$hesklang['note']='Note';
-$hesklang['success']='Success';
-$hesklang['nyt']='This ticket is assigned to';
-$hesklang['noch']='No changes have been made';
-$hesklang['orch']='Display order has been modified';
-$hesklang['rfm']='Required information missing:';
-$hesklang['repl0']='Insufficient permissions to perform this task';
-$hesklang['repl1']='This post doesn\'t exist';
-$hesklang['reports']='Reports';
-$hesklang['reports_intro']='The reports section lets you run several reports and see ticket statistics in a chosen date range.';
-$hesklang['refi']='Reset form data';
-$hesklang['dich']='Discard Changes';
-$hesklang['dire']='Display Report';
-$hesklang['m1']='January';
-$hesklang['m2']='February';
-$hesklang['m3']='March';
-$hesklang['m4']='April';
-$hesklang['m5']='May';
-$hesklang['m6']='June';
-$hesklang['m7']='July';
-$hesklang['m8']='August';
-$hesklang['m9']='September';
-$hesklang['m10']='October';
-$hesklang['m11']='November';
-$hesklang['m12']='December';
-$hesklang['d1']='Monday';
-$hesklang['d2']='Tuesday';
-$hesklang['d3']='Wednesday';
-$hesklang['d4']='Thursday';
-$hesklang['d5']='Friday';
-$hesklang['d6']='Saturday';
-$hesklang['d0']='Sunday';
-$hesklang['mo']='Mo';
-$hesklang['tu']='Tu';
-$hesklang['we']='We';
-$hesklang['th']='Th';
-$hesklang['fr']='Fr';
-$hesklang['sa']='Sa';
-$hesklang['su']='Su';
-$hesklang['from']='From';
-$hesklang['cinv']='Invalid date';
-$hesklang['cinv2']='Accepted format is mm/dd/yyyy';
-$hesklang['cinm']='Invalid month value';
-$hesklang['cinm2']='Allowed range is';
-$hesklang['cind']='Invalid day of month value';
-$hesklang['cind2']='Allowed range for selected month is';
-$hesklang['month']='Month';
-$hesklang['ocal']='Open Calendar';
-$hesklang['ca01']='Previous Year';
-$hesklang['ca02']='Previous Month';
-$hesklang['ca03']='Next Month';
-$hesklang['ca04']='Next Year';
-$hesklang['ca05']='Close Calendar';
-$hesklang['cdr']='Choose date range:';
-$hesklang['crt']='Choose report type:';
-$hesklang['r1']='Today';
-$hesklang['r2']='Yesterday';
-$hesklang['r3']='This month';
-$hesklang['r4']='Last month';
-$hesklang['r5']='Last 30 days';
-$hesklang['r6']='This week (Mon-Sun)';
-$hesklang['r7']='Last week (Mon-Sun)';
-$hesklang['r8']='This business week (Mon-Fri)';
-$hesklang['r9']='Last business week (Mon-Fri)';
-$hesklang['r10']='This year';
-$hesklang['r11']='Last year';
-$hesklang['r12']='All time';
-$hesklang['datetofrom']='&quot;Date From&quot; cannot be higher than &quot;Date to&quot;. The dates have been switched.';
-$hesklang['t1']='Tickets per day';
-$hesklang['t2']='Tickets per month';
-$hesklang['t3']='Tickets per user';
-$hesklang['t4']='Tickets per category';
-$hesklang['ticass']='Assigned tickets';
-$hesklang['ticall']='Replied to tickets';
-$hesklang['totals']='Totals';
-$hesklang['all']='All';
-$hesklang['atik']='New tickets';
-$hesklang['kbca']='You already have a knowledgebase category with this name.';
-$hesklang['menu_msg']='Mail';
-$hesklang['menu_can']='Canned';
-$hesklang['m_from']='From:'; // Mail "from" address
-$hesklang['m_to']='To:'; // Mail "to" address
-$hesklang['m_sub']='Subject:'; // Mail subject
-$hesklang['m_re']='Re:'; // Mail reply subject prefix, like "Re: Original subject"
-$hesklang['m_fwd']='Fwd:'; // Mail forward subject prefix, like "Fwd: Original subject"
-$hesklang['m_h']='Private messages';
-$hesklang['m_intro']='Use private messages to send quick messages to other staff members within the HESK.';
-$hesklang['e_udel']='(User deleted)';
-$hesklang['new_mail']='New private message';
-$hesklang['m_send']='Send message';
-$hesklang['m_rec']='Select message recipient';
-$hesklang['m_inr']='Invalid message recipient';
-$hesklang['m_esu']='Enter private message subject';
-$hesklang['m_pms']='Your private message has been sent';
-$hesklang['inbox']='INBOX';
-$hesklang['outbox']='OUTBOX';
-$hesklang['m_new']='NEW MESSAGE';
-$hesklang['pg']='Show page';
-$hesklang['npm']='No private messages in this folder.';
-$hesklang['m_ena']='You don\'t have permission to read this message.';
-$hesklang['mau']='Mark as unread';
-$hesklang['mo1']='Mark selected messages as read';
-$hesklang['mo2']='Mark selected messages as unread';
-$hesklang['mo3']='Delete selected messages';
-$hesklang['delm']='Delete this message';
-$hesklang['e_tid']='Error generating a unique ticket ID, please try submitting the form again later.';
-$hesklang['smmr']='Selected messages have been marked as read';
-$hesklang['smmu']='Selected messages have been marked as unread';
-$hesklang['smdl']='Selected messages have been deleted';
-$hesklang['show']='Show';
-$hesklang['s_my']='Assigned to me';
-$hesklang['s_ot']='Assigned to others';
-$hesklang['s_un']='Unassigned tickets';
-$hesklang['s_for']='Search for';
-$hesklang['s_in']='Search in';
-$hesklang['s_incl']='Search within';
-$hesklang['find_ticket_by']='Find a ticket';
-$hesklang['e_nose']='No assignment status selected, showing all tickets.';
-$hesklang['fsq']='Enter your search query';
-$hesklang['topen']='Open'; // Not-resolved tickets
-$hesklang['nms']='No messages selected, nothing to change';
-$hesklang['tlo']='Lock ticket';
-$hesklang['tul']='Unlock ticket';
-$hesklang['loc']='Locked';
-$hesklang['isloc']='Customers cannot reply to or re-open locked tickets. When locked ticket is marked as resolved.';
-$hesklang['tlock']='Ticket has been locked';
-$hesklang['tunlock']='Ticket has been unlocked';
-$hesklang['tislock']='This ticket has been locked, the customer will not be able to post a reply.';
-$hesklang['tislock2']='This ticket has been locked, you cannot post a reply.';
-$hesklang['nsfo']='No relevant articles found.';
-$hesklang['elocked']='This ticket has been locked or deleted.';
-$hesklang['nti2']='Insert a new ticket';
-$hesklang['nti3']='Use this form to create a new ticket in a customer\'s name. Enter <i>customer</i> information in the form (customer name, customer email, ...) and NOT your name! Ticket will be created as if the customer submitted it.';
-$hesklang['addop']='Options';
-$hesklang['seno']='Send email notification to the customer';
-$hesklang['otas']='Show the ticket after submission';
-$hesklang['notn']='Notifications';
-$hesklang['nomw']='The help desk will send an email notification when:';
-$hesklang['nwts']='A new ticket is submitted with owner:';
-$hesklang['ncrt']='Client responds to a ticket with owner:';
-$hesklang['ntam']='A ticket is assigned to me';
-$hesklang['npms']='A private message is sent to me';
-$hesklang['support_remove']='A lot of time and effort went into developing HESK. Support HESK by purchasing a license that will remove the credits links <i>Powered by Help Desk Software HESK</i> from your helpdesk';
-$hesklang['ycvtao']='You are not allowed to view tickets assigned to others';
-$hesklang['password_not_valid']='Password must be at least 5 chars long';
-$hesklang['lkbs']='Loading knowledgebase suggestions...';
-$hesklang['auto']='(automatically)';
-
-// Added or modified in version 2.3
-$hesklang['unknown']='Unknown';
-$hesklang['pcer']='Please correct the following errors:';
-$hesklang['seqid']='Ticket number';
-$hesklang['archived']='Tagged';
-$hesklang['archived2']='Tagged Ticket';
-$hesklang['add_archive']='Tag this ticket';
-$hesklang['add_archive_quick']='Tag selected tickets';
-$hesklang['remove_archive']='Untag this ticket';
-$hesklang['remove_archive_quick']='Untag selected tickets';
-$hesklang['added_archive']='Ticket Tagged';
-$hesklang['removed_archive']='Ticket Untagged';
-$hesklang['added2archive']='Ticket has been tagged';
-$hesklang['removedfromarchive']='Ticket has been untagged';
-$hesklang['num_tickets_tag']='<b>%d</b> tickets have been tagged';
-$hesklang['num_tickets_untag']='<b>%d</b> tickets have been untagged';
-$hesklang['can_add_archive']='Can tag tickets';
-$hesklang['disp_only_archived']='Only tagged tickets';
-$hesklang['search_only_archived']='Only tagged tickets';
-$hesklang['critical']=' * Critical * ';
-// START abbreviatons used in "last updated" column
-$hesklang['abbr']['year']='y';
-$hesklang['abbr']['month']='mo';
-$hesklang['abbr']['week']='w';
-$hesklang['abbr']['day']='d';
-$hesklang['abbr']['hour']='h';
-$hesklang['abbr']['minute']='m';
-$hesklang['abbr']['second']='s';
-// END abberviations
-$hesklang['cnsm']='Cound not send the message to:';
-$hesklang['yhbb']='You have been locked out the system for %s minutes because of too many login failures.';
-$hesklang['pwdst']='Password Strength';
-$hesklang['tid_mail']='No worries! Enter your <b>Email address</b> and we will send you your tracking ID right away:';
-$hesklang['rem_email']='Remember my email address';
-$hesklang['eytid']='Enter your ticket tracking ID.';
-$hesklang['enmdb']='The email address you entered doesn\'t match the one in the database for this ticket ID.';
-$hesklang['confemail']='Confirm Email';
-$hesklang['confemail2']='Please confirm your Email address';
-$hesklang['confemaile']='The two email addresses are not identical';
-$hesklang['taso3']='Assigned to:';
-$hesklang['sec_enter']='Type the number you see in the picture below.';
-$hesklang['reload']='Reload image';
-$hesklang['verify_q']='SPAM Prevention:'; // For anti-spam question
-$hesklang['verify_i']='SPAM Prevention:'; // For anti-spam image (captcha)
-$hesklang['admin_login']='Staff login';
-$hesklang['vrfy']='Test passed';
-$hesklang['last_update']='Updated';
-$hesklang['cot']='Don\'t force Critical tickets on top';
-$hesklang['def']='Make this my default view';
-$hesklang['gbou']='These tickets are <b>Unassigned</b>:';
-$hesklang['gbom']='Tickets assigned to <b>me</b>:';
-$hesklang['gboo']='Tickets assigned to <b>%s</b>:';
-$hesklang['select']=' - - Click to Select - - ';
-$hesklang['chngstatus']='Change status to';
-$hesklang['perat']='%s of all tickets'; // will change to "23% of all tickets"
-$hesklang['viewart']='View this article';
-$hesklang['chdp']='Please change the default password on your <a href="profile.php">Profile</a> page!';
-$hesklang['chdp2']='Change your password, you are using the default one!';
-$hesklang['security']='Security';
-$hesklang['kb_i_art']='New Article';
-$hesklang['kb_i_art2']='Insert an Article';
-$hesklang['kb_i_cat']='New Category';
-$hesklang['kb_i_cat2']='Insert a Category';
-$hesklang['gopr']='View Knowledgebase';
-$hesklang['kbstruct']='Knowledgebase structure';
-$hesklang['cancel']='Cancel';
-$hesklang['sh']='Hide Message';
-$hesklang['goodkb']='How to write good knowledgebase articles?';
-$hesklang['catset']='Category Settings';
-$hesklang['inpr']='Select the new Priority';
-$hesklang['incat']='Select the new Category';
-$hesklang['instat']='Select the new Status';
-$hesklang['tsst']='Ticket status has been set to %s';
-$hesklang['aass']='Auto-assign';
-$hesklang['aaon']='Auto-assign of tickets enabled (click to disable)';
-$hesklang['aaoff']='Auto-assign of tickets disabled (click to enable)';
-$hesklang['uaaon']='Auto-assign has been enabled for selected user';
-$hesklang['uaaoff']='Auto-assign has been disabled for selected user';
-$hesklang['taasy']='This ticket has been auto-assigned to you';
-$hesklang['can_view_unassigned']='Can view unassigned tickets';
-$hesklang['ycovtay']='You can only view tickets assigned to you';
-$hesklang['in_progress']='In Progress';
-$hesklang['on_hold']='On Hold';
-$hesklang['import_kb']='Import to Knowledgebase';
-$hesklang['import']='You are importing a <i>private ticket</i> into a <i>public article</i>.<br /><br />Make sure you delete any private or sensitive information from the article subject and message!';
-$hesklang['tab_1']='General';
-$hesklang['tab_2']='Help Desk';
-$hesklang['tab_3']='Knowledgebase';
-$hesklang['tab_5']='Misc';
-$hesklang['disable']='Disable';
-$hesklang['dat']='Date &amp; Time';
-$hesklang['lgs']='Language';
-$hesklang['onc']='ON - Customers';
-$hesklang['ons']='ON - All';
-$hesklang['viewvtic']='View tickets';
-$hesklang['reqetv']='Require email to view a ticket';
-$hesklang['banlim']='Login attempts limit';
-$hesklang['banmin']='Ban time (minutes)';
-$hesklang['subnot']='Submit notice';
-$hesklang['subnot2']='Show notice to customers submitting tickets';
-$hesklang['eseqid']='Sequential IDs';
-$hesklang['sconfe']='Confirm email';
-$hesklang['saass']='Auto-assign tickets';
-$hesklang['swyse']='WYSIWYG Editor';
-$hesklang['hrts']='Rate HESK';
-$hesklang['hrts2']='Show Rate this script link in admin panel';
-$hesklang['emlpipe']='Email Piping';
-$hesklang['emlsend']='Email Sending';
-$hesklang['emlsend2']='Send emails using';
-$hesklang['phpmail']='PHP mail()';
-$hesklang['smtp']='SMTP Server';
-$hesklang['smtph']='SMTP Host';
-$hesklang['smtpp']='SMTP Port';
-$hesklang['smtpu']='SMTP Username';
-$hesklang['smtpw']='SMTP Password';
-$hesklang['smtpt']='SMTP Timeout';
-$hesklang['other']='Other';
-$hesklang['features']='Features';
-$hesklang['can_view_online']='Can view online staff members';
-$hesklang['online']='Online';
-$hesklang['offline']='Offline';
-$hesklang['onlinep']='Users Online'; // For display
-$hesklang['sonline']='Users Online'; // For settings page
-$hesklang['sonline2']='Show online users. Limit (minutes):'; // For settings page
-$hesklang['gb']='Group by';
-$hesklang['dg']='Don\'t group';
-$hesklang['err_dpi']='Database %s does not contain all HESK tables with prefix %s, no changes saved.';
-$hesklang['err_dpi2']='Tables not found:';
-$hesklang['sme']='SMTP error';
-$hesklang['scl']='SMTP connection log';
-$hesklang['dnl']='Download';
-$hesklang['dela']='Delete this attachment';
-$hesklang['pda']='Do you want to permanently delete this attachment?';
-$hesklang['mopt']='More options';
-$hesklang['lopt']='Less options';
-$hesklang['meml']='Multiple emails';
-$hesklang['meml2']='Allow customers to enter multiple contact emails';
+// Added or modified in version 2.3
+$hesklang['unknown']='Unknown';
+$hesklang['pcer']='Please correct the following errors:';
+$hesklang['seqid']='Ticket number';
+$hesklang['archived']='Tagged';
+$hesklang['archived2']='Tagged Ticket';
+$hesklang['add_archive']='Tag this ticket';
+$hesklang['add_archive_quick']='Tag selected tickets';
+$hesklang['remove_archive']='Untag this ticket';
+$hesklang['remove_archive_quick']='Untag selected tickets';
+$hesklang['added_archive']='Ticket Tagged';
+$hesklang['removed_archive']='Ticket Untagged';
+$hesklang['added2archive']='Ticket has been tagged';
+$hesklang['removedfromarchive']='Ticket has been untagged';
+$hesklang['num_tickets_tag']='<b>%d</b> tickets have been tagged';
+$hesklang['num_tickets_untag']='<b>%d</b> tickets have been untagged';
+$hesklang['can_add_archive']='Can tag tickets';
+$hesklang['disp_only_archived']='Only tagged tickets';
+$hesklang['search_only_archived']='Only tagged tickets';
+$hesklang['critical']=' * Critical * ';
+// START abbreviatons used in "last updated" column
+$hesklang['abbr']['year']='y';
+$hesklang['abbr']['month']='mo';
+$hesklang['abbr']['week']='w';
+$hesklang['abbr']['day']='d';
+$hesklang['abbr']['hour']='h';
+$hesklang['abbr']['minute']='m';
+$hesklang['abbr']['second']='s';
+// END abberviations
+$hesklang['cnsm']='Cound not send the message to:';
+$hesklang['yhbb']='You have been locked out the system for %s minutes because of too many login failures.';
+$hesklang['pwdst']='Password Strength';
+$hesklang['tid_mail']='No worries! Enter your <b>Email address</b> and we will send you your tracking ID right away:';
+$hesklang['rem_email']='Remember my email address';
+$hesklang['eytid']='Enter your ticket tracking ID.';
+$hesklang['enmdb']='The email address you entered doesn\'t match the one in the database for this ticket ID.';
+$hesklang['confemail']='Confirm Email';
+$hesklang['confemail2']='Please confirm your Email address';
+$hesklang['confemaile']='The two email addresses are not identical';
+$hesklang['taso3']='Assigned to:';
+$hesklang['sec_enter']='Type the number you see in the picture below.';
+$hesklang['reload']='Reload image';
+$hesklang['verify_q']='SPAM Prevention:'; // For anti-spam question
+$hesklang['verify_i']='SPAM Prevention:'; // For anti-spam image (captcha)
+$hesklang['admin_login']='Staff login';
+$hesklang['vrfy']='Test passed';
+$hesklang['last_update']='Updated';
+$hesklang['cot']='Don\'t force Critical tickets on top';
+$hesklang['def']='Make this my default view';
+$hesklang['gbou']='These tickets are <b>Unassigned</b>:';
+$hesklang['gbom']='Tickets assigned to <b>me</b>:';
+$hesklang['gboo']='Tickets assigned to <b>%s</b>:';
+$hesklang['select']=' - - Click to Select - - ';
+$hesklang['chngstatus']='Change status to';
+$hesklang['perat']='%s of all tickets'; // will change to "23% of all tickets"
+$hesklang['viewart']='View this article';
+$hesklang['chdp']='Please change the default password on your <a href="profile.php">Profile</a> page!';
+$hesklang['chdp2']='Change your password, you are using the default one!';
+$hesklang['security']='Security';
+$hesklang['kb_i_art']='New Article';
+$hesklang['kb_i_art2']='Insert an Article';
+$hesklang['kb_i_cat']='New Category';
+$hesklang['kb_i_cat2']='Insert a Category';
+$hesklang['gopr']='View Knowledgebase';
+$hesklang['kbstruct']='Knowledgebase structure';
+$hesklang['cancel']='Cancel';
+$hesklang['sh']='Hide Message';
+$hesklang['goodkb']='How to write good knowledgebase articles?';
+$hesklang['catset']='Category Settings';
+$hesklang['inpr']='Select the new Priority';
+$hesklang['incat']='Select the new Category';
+$hesklang['instat']='Select the new Status';
+$hesklang['tsst']='Ticket status has been set to %s';
+$hesklang['aass']='Auto-assign';
+$hesklang['aaon']='Auto-assign of tickets enabled (click to disable)';
+$hesklang['aaoff']='Auto-assign of tickets disabled (click to enable)';
+$hesklang['uaaon']='Auto-assign has been enabled for selected user';
+$hesklang['uaaoff']='Auto-assign has been disabled for selected user';
+$hesklang['taasy']='This ticket has been auto-assigned to you';
+$hesklang['can_view_unassigned']='Can view unassigned tickets';
+$hesklang['ycovtay']='You can only view tickets assigned to you';
+$hesklang['in_progress']='In Progress';
+$hesklang['on_hold']='On Hold';
+$hesklang['import_kb']='Import to Knowledgebase';
+$hesklang['import']='You are importing a <i>private ticket</i> into a <i>public article</i>.<br /><br />Make sure you delete any private or sensitive information from the article subject and message!';
+$hesklang['tab_1']='General';
+$hesklang['tab_2']='Help Desk';
+$hesklang['tab_3']='Knowledgebase';
+$hesklang['tab_5']='Misc';
+$hesklang['disable']='Disable';
+$hesklang['dat']='Date &amp; Time';
+$hesklang['lgs']='Language';
+$hesklang['onc']='ON - Customers';
+$hesklang['ons']='ON - All';
+$hesklang['viewvtic']='View tickets';
+$hesklang['reqetv']='Require email to view a ticket';
+$hesklang['banlim']='Login attempts limit';
+$hesklang['banmin']='Ban time (minutes)';
+$hesklang['subnot']='Submit notice';
+$hesklang['subnot2']='Show notice to customers submitting tickets';
+$hesklang['eseqid']='Sequential IDs';
+$hesklang['sconfe']='Confirm email';
+$hesklang['saass']='Auto-assign tickets';
+$hesklang['swyse']='WYSIWYG Editor';
+$hesklang['hrts']='Rate HESK';
+$hesklang['hrts2']='Show Rate this script link in admin panel';
+$hesklang['emlpipe']='Email Piping';
+$hesklang['emlsend']='Email Sending';
+$hesklang['emlsend2']='Send emails using';
+$hesklang['phpmail']='PHP mail()';
+$hesklang['smtp']='SMTP Server';
+$hesklang['smtph']='SMTP Host';
+$hesklang['smtpp']='SMTP Port';
+$hesklang['smtpu']='SMTP Username';
+$hesklang['smtpw']='SMTP Password';
+$hesklang['smtpt']='SMTP Timeout';
+$hesklang['other']='Other';
+$hesklang['features']='Features';
+$hesklang['can_view_online']='Can view online staff members';
+$hesklang['online']='Online';
+$hesklang['offline']='Offline';
+$hesklang['onlinep']='Users Online'; // For display
+$hesklang['sonline']='Users Online'; // For settings page
+$hesklang['sonline2']='Show online users. Limit (minutes):'; // For settings page
+$hesklang['gb']='Group by';
+$hesklang['dg']='Don\'t group';
+$hesklang['err_dpi']='Database %s does not contain all HESK tables with prefix %s, no changes saved.';
+$hesklang['err_dpi2']='Tables not found:';
+$hesklang['sme']='SMTP error';
+$hesklang['scl']='SMTP connection log';
+$hesklang['dnl']='Download';
+$hesklang['dela']='Delete this attachment';
+$hesklang['pda']='Do you want to permanently delete this attachment?';
+$hesklang['mopt']='More options';
+$hesklang['lopt']='Less options';
+$hesklang['meml']='Multiple emails';
+$hesklang['meml2']='Allow customers to enter multiple contact emails';
 
 
 // Added or modified in version 2.4
@@ -1657,476 +1089,1042 @@ $hesklang['updates']='Updates';
 $hesklang['updates2']='Automatically check for HESK updates.';
 
 
-// Added or modified in version 2.5.0
-$hesklang['emp']='Your PHP does not have MySQL support enabled (mysqli extension required)';
-$hesklang['attdel']='This file has been deleted from the server and is no longer available for download';
-$hesklang['cannot_move_tmp']='Cannot move file to the attachments folder';
-$hesklang['dsen']='Don\'t send email notification of this reply to the customer';
-$hesklang['attrem']='* Some attached files have been removed *';
-$hesklang['attnum']='Max number reached: %s'; // %s will show attachment name
-$hesklang['attsiz']='File too large: %s'; // %s will show attachment name
-$hesklang['atttyp']='Type not allowed: %s'; // %s will show attachment name
-$hesklang['adf']='Admin folder';
-$hesklang['atf']='Attachments folder';
-$hesklang['err_adf']='The selected admin folder (%s) does not exist!'; // %s will show folder name
-$hesklang['err_atf']='The selected attachments folder (%s) does not exist!'; // %s will show folder name
-$hesklang['err_atr']='The selected attachments folder (%s) is not writable!'; // %s will show folder name
-$hesklang['fatt']='Files attached to this message:';
-$hesklang['wrepo']='Please write a reply after re-opening the ticket.';
-$hesklang['ktool']='Knowledgebase tools';
-$hesklang['uac']='Verify and update category article count';
-$hesklang['acv']='Article count has been verified';
-$hesklang['xyz']='number of public, private and draft articles in category.';
-$hesklang['reports_tab']='Run reports'; // Tab title
-$hesklang['crt']='Report type';
-$hesklang['can_run_reports']='Can run reports (own)';
-$hesklang['can_run_reports_full']='Can run reports (all)';
-$hesklang['can_export']='Can export tickets';
-$hesklang['roo']='<i>(only tickets assigned to you are included in the report)</i>';
-$hesklang['shu']='Short links';
-$hesklang['export']='Export tickets'; // Tab title
-$hesklang['export_btn']='Export tickets'; // Button title
-$hesklang['export_intro']='This tool allows you to export tickets into an XML spreadsheet that can be opened in Excel.';
-$hesklang['stte']='Select tickets to export';
-$hesklang['dtrg']='Date range';
-$hesklang['sequentially']='Sequentially'; // Order tickets: Sequentially
-$hesklang['ede']='Cannot create export directory, please manually create a folder called <b>export</b> inside your attachments folder and make sure it is writable by PHP (on Linux CHMOD it to 777 - rwxrwxrwx).';
-$hesklang['eef']='Cannot create export file, no permission to write inside the export directory.';
-$hesklang['inite']='Initializing export';
-$hesklang['gXML']='Generating XML file';
-$hesklang['nrow']='Number of rows exported: %d'; // %d will show number of rows exported
-$hesklang['cZIP']='Compressing file into a Zip archive';
-$hesklang['eZIP']='Error creating Zip archive';
-$hesklang['fZIP']='Finished compressing the file';
-$hesklang['pmem']='Peak memory usage: %.2f Mb'; // %.2f will be replaced with number of Mb used
-$hesklang['ch2d']='&raquo; CLICK HERE TO DOWNLOAD THE EXPORT FILE &laquo;';
-$hesklang['n2ex']='No tickets found matching your criteria, nothing to export!';
-$hesklang['sp']='SPAM Prevention'; // For settings page
-$hesklang['sit']='-&gt; Image Type';
-$hesklang['sis']='Simple image';
-$hesklang['pop3keep']='Keep a copy';
-$hesklang['err_dbconn']='Could not connect to MySQL database using provided information!';
-$hesklang['s_inle']='Testing the language folder for valid languages. Only languages that pass all tests are properly installed.';
-$hesklang['ask']='Search help:';
-$hesklang['beta']='(TEST VERSION)';
-$hesklang['maxpost']='You probably tried to submit more data than this server accepts.<br /><br />Please try submitting the form again with smaller or no attachments.';
+// Added or modified in version 2.5.0
+$hesklang['emp']='Your PHP does not have MySQL support enabled (mysqli extension required)';
+$hesklang['attdel']='This file has been deleted from the server and is no longer available for download';
+$hesklang['cannot_move_tmp']='Cannot move file to the attachments folder';
+$hesklang['dsen']='Don\'t send email notification of this reply to the customer';
+$hesklang['attrem']='* Some attached files have been removed *';
+$hesklang['attnum']='Max number reached: %s'; // %s will show attachment name
+$hesklang['attsiz']='File too large: %s'; // %s will show attachment name
+$hesklang['atttyp']='Type not allowed: %s'; // %s will show attachment name
+$hesklang['adf']='Admin folder';
+$hesklang['atf']='Attachments folder';
+$hesklang['err_adf']='The selected admin folder (%s) does not exist!'; // %s will show folder name
+$hesklang['err_atf']='The selected attachments folder (%s) does not exist!'; // %s will show folder name
+$hesklang['err_atr']='The selected attachments folder (%s) is not writable!'; // %s will show folder name
+$hesklang['fatt']='Files attached to this message:';
+$hesklang['wrepo']='Please write a reply after re-opening the ticket.';
+$hesklang['ktool']='Knowledgebase tools';
+$hesklang['uac']='Verify and update category article count';
+$hesklang['acv']='Article count has been verified';
+$hesklang['xyz']='number of public, private and draft articles in category.';
+$hesklang['reports_tab']='Run reports'; // Tab title
+$hesklang['crt']='Report type';
+$hesklang['can_run_reports']='Can run reports (own)';
+$hesklang['can_run_reports_full']='Can run reports (all)';
+$hesklang['can_export']='Can export tickets';
+$hesklang['roo']='<i>(only tickets assigned to you are included in the report)</i>';
+$hesklang['shu']='Short links';
+$hesklang['export']='Export tickets'; // Tab title
+$hesklang['export_btn']='Export tickets'; // Button title
+$hesklang['export_intro']='This tool allows you to export tickets into an XML spreadsheet that can be opened in Excel.';
+$hesklang['stte']='Select tickets to export';
+$hesklang['dtrg']='Date range';
+$hesklang['sequentially']='Sequentially'; // Order tickets: Sequentially
+$hesklang['ede']='Cannot create export directory, please manually create a folder called <b>export</b> inside your attachments folder and make sure it is writable by PHP (on Linux CHMOD it to 777 - rwxrwxrwx).';
+$hesklang['eef']='Cannot create export file, no permission to write inside the export directory.';
+$hesklang['inite']='Initializing export';
+$hesklang['gXML']='Generating XML file';
+$hesklang['nrow']='Number of rows exported: %d'; // %d will show number of rows exported
+$hesklang['cZIP']='Compressing file into a Zip archive';
+$hesklang['eZIP']='Error creating Zip archive';
+$hesklang['fZIP']='Finished compressing the file';
+$hesklang['pmem']='Peak memory usage: %.2f Mb'; // %.2f will be replaced with number of Mb used
+$hesklang['ch2d']='&raquo; CLICK HERE TO DOWNLOAD THE EXPORT FILE &laquo;';
+$hesklang['n2ex']='No tickets found matching your criteria, nothing to export!';
+$hesklang['sp']='SPAM Prevention'; // For settings page
+$hesklang['sit']='-&gt; Image Type';
+$hesklang['sis']='Simple image';
+$hesklang['pop3keep']='Keep a copy';
+$hesklang['err_dbconn']='Could not connect to MySQL database using provided information!';
+$hesklang['s_inle']='Testing the language folder for valid languages. Only languages that pass all tests are properly installed.';
+$hesklang['ask']='Search help:';
+$hesklang['beta']='(TEST VERSION)';
+$hesklang['maxpost']='You probably tried to submit more data than this server accepts.<br /><br />Please try submitting the form again with smaller or no attachments.';
+
+
+// --> Ticket history log
+// Unless otherwise specified, first %s will be replaced with date and second with name/username
+$hesklang['thist1']='<li class="smaller">%s | moved to category %s by %s</li>'; // %s = date, new category, user making change
+$hesklang['thist2']='<li class="smaller">%s | assigned to %s by %s</li>'; // %s = date, assigned user, user making change
+$hesklang['thist3']='<li class="smaller">%s | closed by %s</li>';
+$hesklang['thist4']='<li class="smaller">%s | opened by %s</li>';
+$hesklang['thist5']='<li class="smaller">%s | locked by %s</li>';
+$hesklang['thist6']='<li class="smaller">%s | unlocked by %s</li>';
+$hesklang['thist7']='<li class="smaller">%s | ticket created by %s</li>';
+$hesklang['thist8']='<li class="smaller">%s | priority changed to %s by %s</li>'; // %s = date,new priority, user making change
+$hesklang['thist9']='<li class="smaller">%s | status changed to %s by %s</li>'; // %s = date, new status, user making change
+$hesklang['thist10']='<li class="smaller">%s | automatically assigned to %s</li>';
+$hesklang['thist11']='<li class="smaller">%s | submitted by email piping</li>';
+$hesklang['thist12']='<li class="smaller">%s | attachment %s deleted by %s</li>'; // %s = date, deleted attachment, user making change
+$hesklang['thist13']='<li class="smaller">%s | merged with ticket %s by %s</li>'; // %s = date, merged ticket ID, user making change
+$hesklang['thist14']='<li class="smaller">%s | time worked updated to %s by %s</li>'; // %s = date, new time worked, user making change
+$hesklang['thist15']='<li class="smaller">%s | submitted by %s</li>';
+$hesklang['thist16']='<li class="smaller">%s | submitted by POP3 fetching</li>';
+
+// --> Knowledgebase articles log
+// First %s will be replaced with date and second with user making changes
+$hesklang['revision1']='<li class="smaller">%s | submitted by %s</li>';
+$hesklang['revision2']='<li class="smaller">%s | modified by %s</li>';
+
+// --> Text used by ReCaptcha
+$hesklang['visual_challenge']='Get a visual challenge';
+$hesklang['audio_challenge']='Get an audio challenge';
+$hesklang['refresh_btn']='Get a new challenge';
+$hesklang['instructions_visual']='Type the two words:';
+$hesklang['instructions_context']='Type the words in the boxes:';
+$hesklang['instructions_audio']='Type what you hear:';
+$hesklang['help_btn']='Help';
+$hesklang['play_again']='Play sound again';
+$hesklang['cant_hear_this']='Download sound as MP3';
+$hesklang['incorrect_try_again']='Incorrect. Try again.';
+$hesklang['image_alt_text']='reCAPTCHA challenge image';
+$hesklang['recaptcha_error']='Incorrect SPAM Prevention answer, please try again.';
+
+// Added or modified in version 2.6.0
+$hesklang['ms01']='Jan';
+$hesklang['ms02']='Feb';
+$hesklang['ms03']='Mar';
+$hesklang['ms04']='Apr';
+$hesklang['ms05']='May';
+$hesklang['ms06']='Jun';
+$hesklang['ms07']='Jul';
+$hesklang['ms08']='Aug';
+$hesklang['ms09']='Sep';
+$hesklang['ms10']='Oct';
+$hesklang['ms11']='Nov';
+$hesklang['ms12']='Dec';
+$hesklang['sdf']='Submitted date format';
+$hesklang['lcf']='Updated date format';
+$hesklang['lcf0']='Short descriptive';
+$hesklang['lcf1']='Date and time';
+$hesklang['lcf2']='HESK style';
+$hesklang['ticket_tpl']='Ticket templates';
+$hesklang['can_man_ticket_tpl']='Manage ticket templates'; // Permission title
+$hesklang['ticket_tpl_man']='Manage ticket templates'; // Page/link title
+$hesklang['ticket_tpl_intro']='Create and edit ticket templates that you can use to quickly submit new tickets from the admin interface.';
+$hesklang['no_ticket_tpl']='No ticket templates';
+$hesklang['ticket_tpl_title']='Title';
+$hesklang['delete_tpl']='Are you sure you want to delete this template?';
+$hesklang['ticket_tpl_add']='Create a new ticket template';
+$hesklang['ticket_tpl_edit']='Edit selected ticket template';
+$hesklang['save_ticket_tpl']='Save ticket template';
+$hesklang['ticket_tpl_saved']='Your ticket template has been saved for future use';
+$hesklang['ticket_tpl_removed']='Selected ticket template has been removed from the database';
+$hesklang['ticket_tpl_not_found']='Ticket template not found';
+$hesklang['sel_ticket_tpl']='Select the ticket template you would like to edit';
+$hesklang['ent_ticket_tpl_title']='Please enter template title';
+$hesklang['ent_ticket_tpl_msg']='Please enter template message';
+$hesklang['ticket_tpl_id']='Missing ticket template ID';
+$hesklang['select_ticket_tpl']='Select a ticket template';
+$hesklang['list_tickets_cat']='List all tickets in this category';
+$hesklang['def_msg']='[No message]';
+$hesklang['emlreqmsg']='Require message';
+$hesklang['emlreqmsg2']='Ignore piped/fetched emails with no message';
+$hesklang['relart']='Related articles'; // Title of related articles box
+$hesklang['s_relart']='Related articles'; // On settings page
+$hesklang['tab_7']='Ticket list';
+$hesklang['fitl']='Fields in ticket list';
+$hesklang['submitted']='Submitted';
+$hesklang['clickemail']='View';
+$hesklang['set_pri_to']='Set priority to:'; // Action below the ticket list
+$hesklang['pri_set_to']='Priority has been set to:';
+$hesklang['cat_pri']='The category priority will be used when customers are not allowed to select priority and a ticket is submitted from the customer interface.';
+$hesklang['cat_pri_info']='Your customers are allowed to select priority, so category priority will be ignored.<br /><br />To use category priority instead, turn OFF the following feature in HESK settings:';
+$hesklang['def_pri']='Category priority';
+$hesklang['ch_cat_pri']='Set category priority';
+$hesklang['cat_pri_ch']='Category priority has been set to:';
+$hesklang['err_dbversion']='Too old MySQL version:'; // %s will be replaced with MySQL version
+$hesklang['signature_max']='Signature (max 1000 chars)';
+$hesklang['signature_long']='User signature is too long! Please limit the signature to 1000 chars';
+$hesklang['ip_whois']='IP whois';
+$hesklang['ednote']='Edit note message';
+$hesklang['ednote2']='Note message saved';
+$hesklang['perm_deny']='Permission denied';
+$hesklang['mis_note']='Missing note ID';
+$hesklang['no_note']='Note with this ID not found';
+$hesklang['sacl']='Save and continue later';
+$hesklang['reply_saved']='Your reply message has been saved for later.';
+$hesklang['submit_as']='Submit as:';
+$hesklang['sasc']='Submit as Customer reply';
+$hesklang['creb']='Customer reply entered by:';
+$hesklang['show_select']='Show &quot;Click to select&quot; as default option';
+// Settings
+$hesklang['mms']='Maintenance mode';
+$hesklang['mmd']='Enable maintenance mode';
+// Customer notice
+$hesklang['mm1']='Maintenance in progress';
+$hesklang['mm2']='In order to perform scheduled maintenance, our help desk has shut down temporarily.';
+$hesklang['mm3']='We apologize for the inconvenience and ask that you please try again later.';
+// Staff notice
+$hesklang['mma1']='Maintenance mode is active!';
+$hesklang['mma2']='Customers are not able to use the help desk.';
+$hesklang['tools']='Tools';
+$hesklang['banemail_intro']='Prevent certain email addresses from submitting tickets to your help desk.';
+$hesklang['no_banemails']='<i>No emails are being banned.</i>';
+$hesklang['eperm']='Permanent email bans:';
+$hesklang['bananemail']='Email address to ban';
+$hesklang['savebanemail']='Ban this email';
+$hesklang['enterbanemail']='Enter the email address you wish to ban.';
+$hesklang['validbanemail']='Enter a valid email address (<i>john.doe@domain.com</i>) or email domain (<i>@domain.com</i>)';
+$hesklang['email_banned']='The email address <i>%s</i> was banned and HESK will no longer accept tickets from this address.'; // %s will be replaced with email
+$hesklang['emailbanexists']='The email address <i>%s</i> is already banned.'; // %s will be replaced with email
+$hesklang['email_unbanned']='Email ban deleted';
+$hesklang['banby']='Banned by';
+$hesklang['delban']='Delete ban';
+$hesklang['delban_confirm']='Delete this ban?';
+$hesklang['baned_e']='You have been banned from submitting new support tickets.';
+$hesklang['baned_ip']='You have been banned from this help desk';
+$hesklang['can_ban_emails']='Can ban emails';
+$hesklang['can_unban_emails']='Can unban emails (enables Can ban emails)';
+$hesklang['eisban']='This email address is banned.';
+$hesklang['click_unban']='Click here to unban.';
+$hesklang['banip_intro']='Visitors from banned IP addresses will not be able to view or submit tickets and login into the help desk.';
+$hesklang['ipperm']='Permanent IP bans:';
+$hesklang['iptemp']='Login failure bans:';
+$hesklang['savebanip']='Ban this IP';
+$hesklang['no_banips']='<i>No IPs are being banned.</i>';
+$hesklang['bananip']='IP address to ban';
+$hesklang['banex']='Examples:';
+$hesklang['iprange']='IP range';
+$hesklang['savebanip']='Ban this IP';
+$hesklang['ippermban']='Ban this IP permanently';
+$hesklang['enterbanip']='Enter the IP address or range you wish to ban.';
+$hesklang['validbanip']='Enter a valid IP address or IP range';
+$hesklang['ip_banned']='The IP address <i>%s</i> was banned and HESK will no longer accept tickets from this IP address.'; // %s will be replaced with ip
+$hesklang['ip_rbanned']='The IP range <i>%s</i> was banned and HESK will no longer accept tickets from this IP range.'; // %s will be replaced with ip
+$hesklang['ipbanexists']='The IP address <i>%s</i> is already banned.'; // %s will be replaced with ip
+$hesklang['iprbanexists']='The IP range <i>%s</i> is already banned.'; // %s will be replaced with ip
+$hesklang['ip_unbanned']='IP ban deleted';
+$hesklang['ip_tempun']='Temporary IP ban deleted';
+$hesklang['can_ban_ips']='Can ban ips';
+$hesklang['can_unban_ips']='Can unban ips (enables Can ban ips)';
+$hesklang['ipisban']='This IP address is banned.';
+$hesklang['m2e']='Expires in (minutes)';
+$hesklang['info']='Info';
+$hesklang['sm_title']='Service messages';
+$hesklang['sm_intro']='Display a service message in the customer area, for example to notify them about known issues and important news.';
+$hesklang['can_service_msg']='Edit service messages';
+$hesklang['new_sm']='New service message';
+$hesklang['edit_sm']='Edit service message';
+$hesklang['ex_sm']='Existing service messages';
+$hesklang['sm_author']='Author';
+$hesklang['sm_type']='Type';
+$hesklang['sm_published']='Published';
+$hesklang['sm_draft']='Draft';
+$hesklang['sm_style']='Style';
+$hesklang['sm_none']='None';
+$hesklang['sm_success']='Success';
+$hesklang['sm_info']='Info';
+$hesklang['sm_notice']='Notice';
+$hesklang['sm_error']='Error';
+$hesklang['sm_save']='Save service message';
+$hesklang['sm_preview']='Preview service message';
+$hesklang['sm_mtitle']='Title';
+$hesklang['sm_msg']='Message';
+$hesklang['sm_e_title']='Enter service message title';
+$hesklang['sm_e_msg']='Enter service message';
+$hesklang['sm_e_id']='Missing message ID';
+$hesklang['sm_added']='A new service message has been added';
+$hesklang['sm_deleted']='Service message deleted';
+$hesklang['sm_not_found']='This service message does not exist';
+$hesklang['no_sm']='No service messages';
+$hesklang['del_sm']='Delete this service message?';
+$hesklang['sm_mdf']='Service message has been saved';
+$hesklang['sska']='Show suggested articles';
+$hesklang['taws']='These articles were suggested:';
+$hesklang['defaults']='Defaults';
+$hesklang['pncn']='Select notify customer option in the new ticket form';
+$hesklang['pncr']='Select notify customer option in the ticket reply form';
+$hesklang['pssy']='Show what knowledgebase articles were suggested to customers';
+$hesklang['ccct']='Customer resolve';
+$hesklang['custnot']='Notify customers when';
+$hesklang['notnew']='A new support ticket is submitted';
+$hesklang['notclo']='A support ticket is marked Resolved';
+$hesklang['enn']='Except for Email piping/POP3 fetching if email subject contains:';
+$hesklang['spamn']='SPAM notice';
+$hesklang['spam_inbox']='<span style="color:red"><b>No confirmation email?</b><br />We sent a confirmation message to your email address. If you do not receive it within a few minutes, please check your Junk, Bulk or Spam folders. Mark the message as <b>Not SPAM</b> to avoid problems receiving our correspondence in the future.</span>';
+$hesklang['s_ekb']='Enable Knowledgebase';
+$hesklang['ekb_n']='<b>NO</b>, disable Knowledgebase';
+$hesklang['ekb_y']='<b>YES</b>, enable Knowledgebase';
+$hesklang['ekb_o']='<b>YES</b>, use HESK as a Knowledgebase only (<i>disable help desk</i>)';
+$hesklang['kb_set']='Knowledgebase settings';
+$hesklang['kbo1']='Knowledgebase-only mode';
+$hesklang['kbo2']='Visitors cannot submit new support tickets and are taken directly to the knowledgebase.';
+$hesklang['fpass']='Forgot your password?';
+$hesklang['passr']='Password reset';
+$hesklang['passa']='Allow users to reset a forgot password over email';
+$hesklang['passe']='Enter your email address';
+$hesklang['passs']='Send me password reset link';
+$hesklang['noace']='No account with that email address was found';
+$hesklang['pemls']='We sent you an email with instructions on how to reset your password';
+$hesklang['reset_password']='Reset your help desk password'; // Email subject
+$hesklang['ehash']='Invalid or expired password reset link';
+$hesklang['ehaip']='Wrong IP address. Passwords may only be reset from the IP address that requested password reset.';
+$hesklang['resim']='<b>Setup your new password in the form below!</b>';
+$hesklang['permissions']='Permissions';
+$hesklang['atype']='Account type';
+$hesklang['astaff']='Staff';
+$hesklang['oon1']='Send me only open tickets';
+$hesklang['oon2']='Send me all my tickets';
+$hesklang['anyown']='Any owner';
+$hesklang['pfr']='Another POP3 fetching task is still in progress.';
+$hesklang['pjt']='Task timeout';
+$hesklang['pjt2']='minutes after start';
+$hesklang['nkba']='Knowledgebase search requires enough unique articles to work properly.<br /><br />Consider adding more articles to the knowledgebase to improve search and article suggestion results.';
+$hesklang['saa']='Sticky articles are displayed at the top of articles list';
+$hesklang['yhbr']='You have been locked out the system for %s minutes because of too many replies to a ticket.';
+$hesklang['sir']='ReCaptcha V1 API (old)';
+$hesklang['sir2']='ReCaptcha V2 API (recommended)';
+$hesklang['rcpb']='Site key (Public key)';
+$hesklang['rcpv']='Secret key (Private key)';
+
+// Language for Google reCaptcha API version 2
+// Supported language codes: https://developers.google.com/recaptcha/docs/language
+// If your language is NOT in the supported langauges, leave 'en'
+$hesklang['RECAPTCHA']='en';
+
+// Added or modified in version 2.7.0
+$hesklang['imap']='IMAP Fetching';
+$hesklang['imaph']='IMAP Host';
+$hesklang['imapp']='IMAP Port';
+$hesklang['enc']='Encryption';
+$hesklang['ssl']='SSL';
+$hesklang['tls']='TLS';
+$hesklang['none']='None';
+$hesklang['imapu']='IMAP Username';
+$hesklang['imapw']='IMAP Password';
+$hesklang['imaptest']='Test IMAP connection';
+$hesklang['ifd']='[HESK] IMAP FETCHING IS DISABLED IN SETTINGS';
+$hesklang['iei']='[HESK] PHP IMAP extension is not installed.';
+$hesklang['ifr']='Another IMAP fetching task is still in progress.';
+$hesklang['arp']='Auto reload page';
+$hesklang['arpp']='Automatically reload page with ticket list every:';
+$hesklang['seconds']='seconds'; // Reload page every X 'seconds'
+$hesklang['minutes']='minutes'; // Reload page every X 'minutes'
+$hesklang['atbr']='This ticket needs to be assigned before it can be replied to.';
+$hesklang['attm']='Assign this ticket to me';
+$hesklang['owneed']='Owner needed';
+$hesklang['taat']='This ticket is already assigned to <b>%s</b>.';
+$hesklang['scoy']='Are you sure you want to assign it to yourself?';
+$hesklang['scot']='Are you sure you want to assign it to %s?';
+$hesklang['ycto']='YES, change the owner';
+$hesklang['ncto']='NO, keep current owner';
+$hesklang['fass']='Require owner';
+$hesklang['req_sub']='Require subject';
+$hesklang['req_msg']='Require message';
+$hesklang['req_email']='Require email';
+$hesklang['default_subject']='Ticket from %s'; // Default ticket subject, %s will be replaced with name
+$hesklang['off-hide']='Hide in customer form';
+$hesklang['ons']='ON - Everyone'; // For admin settings page
+$hesklang['not_valid_email']='Enter a valid email address or leave this field empty';
+$hesklang['write_down']='<span style="color:red">We recommend that you write down your Ticket ID for future reference.</span>';
+$hesklang['re_confirm1']='Disabling this will also disable "Require email to view tickets" under "Security". Proceed?';
+$hesklang['re_confirm2']='Enabling this will also enable "Require email" under "Features". Proceed?';
+$hesklang['can_email_tpl']='Edit email templates'; // Staff permission
+$hesklang['et_title']='Email templates';
+$hesklang['et_intro']='Modify emails that are sent to your staff and customers';
+$hesklang['file']='File';
+$hesklang['efile']='Editing file';
+$hesklang['rdesc']='(Recipient) Description';
+$hesklang['desc_forgot_ticket_id']       = '(Customer) Forgot ticket tracking ID';
+$hesklang['desc_new_reply_by_staff']     = '(Customer) New staff reply';
+$hesklang['desc_new_ticket']             = '(Customer) Ticket received';
+$hesklang['desc_ticket_closed']          = '(Customer) Ticket closed/resolved';
+$hesklang['desc_category_moved']         = '(Staff) Ticket moved to a new category';
+$hesklang['desc_new_reply_by_customer']  = '(Staff) New customer reply';
+$hesklang['desc_new_ticket_staff']       = '(Staff) New ticket submitted';
+$hesklang['desc_ticket_assigned_to_you'] = '(Staff) A ticket was assigned to you';
+$hesklang['desc_new_pm']                 = '(Staff) New private message';
+$hesklang['desc_new_note']               = '(Staff) New note on a ticket assigned to you';
+$hesklang['desc_reset_password']         = '(Staff) Reset your password';
+$hesklang['etfm']='One or more email templates are missing.<br /><br />Make sure you upload all email template files inside your <i>/language/%s/emails</i> folder.';
+$hesklang['etfw']='Some email templates are not writable.<br /><br />
+                    Make sure PHP has permission to write to all files inside your <i>/language/%s/emails</i> folder.<br /><br />
+                    On Unix servers you might need to CHMOD email templates to 666 (rw-rw-rw-)';
+$hesklang['et_e_id']='Missing template ID';
+$hesklang['et_fm']='This email template file is missing';
+$hesklang['et_fw']='This email template file is not writable';
+$hesklang['et_save']='Save email template';
+$hesklang['updated_on']='Updated on';
+$hesklang['ticket_url']='Ticket URL';
+$hesklang['pm_url']='Private message URL';
+$hesklang['et_num']='Number of tickets';
+$hesklang['et_list']='List of support tickets';
+$hesklang['et_empty']='Email template cannot be empty';
+$hesklang['et_saved']='Email template saved';
+$hesklang['source']='Source';
+$hesklang['select_category']='Select a category';
+$hesklang['select_category_text']='What can we help you with?';
+$hesklang['select_category_staff']='Select ticket category';
+$hesklang['scat']='Category select limit';
+$hesklang['scat2']='(a select box will show if category count is higher)';
+$hesklang['new_cf']='New custom field';
+$hesklang['cf_intro']='Use this feature to add custom fields to the Submit a ticket form so you can collect additional data from customers.';
+$hesklang['cf_public']='Public';
+$hesklang['cf_private']='Staff only';
+$hesklang['cf_cust']='For customers';
+$hesklang['cf_all']='All';
+$hesklang['cf_cat']='Selected';
+$hesklang['cf_ctrl']='Tip: hold down CTRL key to select multiple categories';
+$hesklang['visibility']='Visibility';
+$hesklang['cf_save']='Save custom field';
+$hesklang['ex_cf']='Active custom fields';
+$hesklang['no_cf']='No active custom fields';
+$hesklang['del_cf']='Delete this custom field? This will also delete any saved custom field data from the database!';
+$hesklang['cf_e_id']='Invalid ID';
+$hesklang['edit_cf']='Edit custom field';
+$hesklang['cf_deleted']='Custom field deleted';
+$hesklang['cf_not_found']='This custom field does not exist';
+$hesklang['err_custname']='Enter custom field name';
+$hesklang['cf_added']='A new custom field has been added';
+$hesklang['cf_nocat']='Select at least one category for this custom field';
+$hesklang['cf_mdf']='Custom field has been saved';
+$hesklang['opt4']='Options for this checkbox, enter one option per line. Each line will be a choice your customers can choose from, multiple choices are possible.';
+$hesklang['atl1']='Enter at least one option.';
+$hesklang['sch']='Hidden';
+$hesklang['meml3']='Allow multiple emails to be entered';
+$hesklang['dmin']='Minimum accepted date';
+$hesklang['dmax']='Maximum accepted date';
+$hesklang['d_day']='day(s)';
+$hesklang['d_week']='week(s)';
+$hesklang['d_month']='month(s)';
+$hesklang['d_year']='year(s)';
+$hesklang['d_any']='Any date';
+$hesklang['d_fixed']='Fixed date';
+$hesklang['d_relative']='Relative date';
+$hesklang['d_mm']='Minimum date may not be higher than maximum date';
+$hesklang['d_emin']='Minimum date for <i>%s</i> is %s'; // Minimum date for FIELD_NAME is DATE
+$hesklang['d_emax']='Maximum date for <i>%s</i> is %s'; // Maximum date for FIELD_NAME is DATE
+$hesklang['d_format']='Date display format';
+$hesklang['d_custom']='Custom format';
+$hesklang['d_ci']='ADVANCED USERS ONLY: a valid PHP date format, see PHP manual.';
+$hesklang['cf_noe']='Enter a valid email address into <i>%s</i>';
+$hesklang['cf_noem']='Enter one or more valid email addresses into <i>%s</i>';
+$hesklang['cf_limit']='You have 50 active custom fields, no new can be created.';
+$hesklang['can_resolve']='Can resolve tickets';
+$hesklang['can_change_cat']='Change ticket category (to any)';
+$hesklang['can_change_own_cat']='Change ticket category (to allowed)';
+$hesklang['can_submit_any_cat']='Can submit tickets to any category';
+$hesklang['noauth_submit']='You are not authorized to submit tickets to this category!';
+$hesklang['noauth_move']='You are not authorized to move tickets to this category!';
+$hesklang['noauth_resolve']='You are not authorized to resolve tickets!';
+$hesklang['force_ssl']='Force SSL connections';
+$hesklang['d_ssl']='<i>disabled</i> - open this page with https:// to manage this option';
+$hesklang['enn']='Except for tickets from emails if email subject contains:';
+$hesklang['scno']='This status cannot be changed';
+$hesklang['statuses']='Statuses';
+$hesklang['statuses_intro']='Use this tool to add custom ticket statuses to your help desk';
+$hesklang['color']='Color';
+$hesklang['csscl']='CSS class or color';
+$hesklang['clr_view']='Color preview on text';
+$hesklang['cbc']='Changeable by customers';
+$hesklang['ccc']='Can customers change this status?';
+$hesklang['del_status']='Delete this status?';
+$hesklang['ex_status']='Existing statuses';
+$hesklang['status_hesk']='Built-in Statuses (cannot be modified here)';
+$hesklang['status_custom']='Custom Statuses';
+$hesklang['status_custom_none']='No custom statuses. You can add them using the form above.';
+$hesklang['status_save']='Save status';
+$hesklang['list_tkt_status']='List all tickets with this status';
+$hesklang['new_status']='New custom status';
+$hesklang['edit_status']='Edit custom status';
+$hesklang['err_status']='Enter the status name';
+$hesklang['status_added']='A new custom status has been added';
+$hesklang['status_e_id']='Invalid ID';
+$hesklang['status_mdf']='Custom status has been saved';
+$hesklang['status_deleted']='Custom status deleted';
+$hesklang['status_not_found']='This custom status does not exist';
+$hesklang['status_not_empty']='This status cannot be removed because tickets with this status exist';
+$hesklang['status_limit']='You have 100 custom statuses, no new can be created.';
+$hesklang['public_link']='Public link'; // Link to the public KB article in the private KB pages
+$hesklang['frames']='Frames';
+$hesklang['frames2']='Prevent loading HESK in frames on third party domains';
+$hesklang['numsub']='Submitted tickets'; // Will show how many tickets this user submitted
+$hesklang['hidf']='Hidden inputs are not visible to customers on the Submit a ticket form (the value will still be visible on ticket details page if they are set as public). They behave as normal text fields for staff members.';
+$hesklang['rcheck']='Do not select a default option';
+$hesklang['refresh_page']='Refresh this page';
+$hesklang['banemail']='Ban emails';
+$hesklang['banip']='Ban IPs';
+$hesklang['tab_4']='Custom fields';
+$hesklang['del_kba']='Delete this article';
+$hesklang['del_kbaa']='Permanently delete this article';
+$hesklang['hni1']='HESK not installed yet?';
+$hesklang['hni2']='It appears that this help desk has not been properly installed and configured yet.';
+$hesklang['hni3']='To install HESK, follow <a href="docs/">Instructions in the documentation</a>';
+$hesklang['cf']='Cache folder';
+$hesklang['e_cdir']='Hesk will not be able to parse emails or cache results unless the cache folder exists and is writable.';
+$hesklang['step1']='Step 1';
+$hesklang['step2']='Step 2';
+$hesklang['dffs']='When download completes, delete the file from server';
+$hesklang['fd']='Export file deleted from server';
+
+// ADDED OR MODIFIED IN Mods For HESK pre-1.2
+$hesklang['search_the_knowledgebase'] = 'Search the Knowledgebase';
+$hesklang['view_ticket_nav']='View Ticket';
+$hesklang['quick_help']='Quick Help';
+$hesklang['quick_help_submit_ticket']='Please fill out the form on the right to submit a ticket. Required fields are marked with a <span class="important">*</span>.';
+$hesklang['quick_help_view_ticket']='Please fill out the required information on the right to view your ticket. If you forgot your Ticket tracking ID, click "Forgot tracking ID".';
+$hesklang['information']='Information';
+$hesklang['admin_sidebar_ticket_id']='TICKET ID';
+$hesklang['priorityChange']=' - - Change Priority - - ';
+$hesklang['statusChange']=' - - Change Status - - ';
+$hesklang['ownerChange']=' - - Change Owner - - ';
+$hesklang['categoryChange']=' - - Change Category - - ';
+$hesklang['navigation']='Navigation';
+$hesklang['nti']='New ticket';
+$hesklang['savedResponses']='Saved Responses';
+$hesklang['add_ticket_general_information']='General Information';
+$hesklang['add_ticket_your_message']='Your Message';
+
+// ADDED OR MODIFIED IN Mods For HESK 1.2
+$hesklang['statuses'] = 'Statuses';
+$hesklang['basicProperties'] = 'Basic Properties';
+$hesklang['textColor'] = 'Text Color';
+$hesklang['textColorDescr'] = 'This is the hex color code for the status that will be used on the ticket search page and export search page';
+$hesklang['closedQuestionMark'] = 'Closed?';
+$hesklang['closedQuestionMarkDescr'] = 'If checked, tickets will be considered closed if they are set to this status.';
+$hesklang['basicProperties'] = 'Basic Properties';
+$hesklang['defaultStatusForAction'] = 'Default Status For Action';
+$hesklang['isClosedByClientMsg'] = 'When a client clicks the "Close ticket" link, change the status to';
+$hesklang['isStaffClosedOptionMsg'] = 'When a staff member clicks the "Close ticket" link, change the status to';
+$hesklang['isStaffReopenedStatusMsg'] = 'When a staff member clicks the "Open ticket" link, change the status to';
+$hesklang['isDefaultStaffReplyStatusMsg'] = 'When a staff member replies to a ticket, change the status to';
+$hesklang['lockedTicketStatusMsg'] = 'When a ticket is locked, change the status to';
+$hesklang['textColorRequired'] = 'Text Color is required.';
+$hesklang['addNew'] = 'Add New';
+$hesklang['close_action']='Close Ticket'; // Close ACTION
+$hesklang['whyCantIDeleteThisStatus'] = "Why Can't I Delete This Status?";
+$hesklang['whyCantIDeleteThisStatusReason'] = 'This status cannot be deleted because it is being used as a default status for a particular action.';
+$hesklang['isNewTicketMsg'] = 'When a new ticket is created, set its status to';
+$hesklang['isRepliedByClientMsg'] = 'When a client replies to a ticket, set its status to';
+$hesklang['close_this_ticket']='Close ticket';
+$hesklang['closed']='closed';
+$hesklang['resolved']='Resolved'; // Ticket has been RESOLVED
+$hesklang['quick_help_ticket']='Here is the information on your ticket. You can add a reply to this ticket, close it, or re-open the ticket if applicable.';
 
+// ADDED OR MODIFIED IN Mods For HESK 1.2.2
+$hesklang['changeLanguage'] = 'Change language to';
 
-// --> Ticket history log
-// Unless otherwise specified, first %s will be replaced with date and second with name/username
-$hesklang['thist1']='<li class="smaller">%s | moved to category %s by %s</li>'; // %s = date, new category, user making change
-$hesklang['thist2']='<li class="smaller">%s | assigned to %s by %s</li>'; // %s = date, assigned user, user making change
-$hesklang['thist3']='<li class="smaller">%s | closed by %s</li>';
-$hesklang['thist4']='<li class="smaller">%s | opened by %s</li>';
-$hesklang['thist5']='<li class="smaller">%s | locked by %s</li>';
-$hesklang['thist6']='<li class="smaller">%s | unlocked by %s</li>';
-$hesklang['thist7']='<li class="smaller">%s | ticket created by %s</li>';
-$hesklang['thist8']='<li class="smaller">%s | priority changed to %s by %s</li>'; // %s = date,new priority, user making change
-$hesklang['thist9']='<li class="smaller">%s | status changed to %s by %s</li>'; // %s = date, new status, user making change
-$hesklang['thist10']='<li class="smaller">%s | automatically assigned to %s</li>';
-$hesklang['thist11']='<li class="smaller">%s | submitted by email piping</li>';
-$hesklang['thist12']='<li class="smaller">%s | attachment %s deleted by %s</li>'; // %s = date, deleted attachment, user making change
-$hesklang['thist13']='<li class="smaller">%s | merged with ticket %s by %s</li>'; // %s = date, merged ticket ID, user making change
-$hesklang['thist14']='<li class="smaller">%s | time worked updated to %s by %s</li>'; // %s = date, new time worked, user making change
-$hesklang['thist15']='<li class="smaller">%s | submitted by %s</li>';
-$hesklang['thist16']='<li class="smaller">%s | submitted by POP3 fetching</li>';
+// ADDED OR MODIFIED IN Mods For HESK 1.4.0
+$hesklang['navbarBackgroundColor'] = 'Navbar Background Color';
+$hesklang['navbarBackgroundColorHelp'] = 'The main color of the top navigation bar. This applies to both the client and staff-side.';
+$hesklang['navbarBrandColor'] = 'Navbar Brand Color';
+$hesklang['navbarBrandColorHelp'] = 'The text color of the \'brand\' on the left (also the name of the Help Desk).';
+$hesklang['navbarBrandHoverColor'] = 'Navbar Brand Hover Color';
+$hesklang['navbarBrandHoverColorHelp'] = 'The text color of the \'brand\' on the left when the use moves their mouse over the text.';
+$hesklang['navbarItemTextColor'] = 'Navbar Item Text Color';
+$hesklang['navbarItemTextColorHelp'] = 'The text color of the navigation items on the navigation bar (by default \'Home\', \'Ticket\', and \'Knowledgebase\' are the three items on the client-side).';
+$hesklang['navbarItemTextHoverColor'] = 'Navbar Item Text Hover Color';
+$hesklang['navbarItemTextHoverColorHelp'] = 'The text color of the navigation items on the navigation bar when the user hovers over one of the items.';
+$hesklang['navbarItemTextSelectedColor'] = 'Navbar Item Text Selected Color';
+$hesklang['navbarItemTextSelectedColorHelp'] = 'The text color of the navigation items on the navigation bar when the user clicks on an item, and a dropdown menu appears (such as \'Ticket\').';
+$hesklang['navbarItemSelectedBackgroundColor'] = 'Navbar Item Selected Background Color';
+$hesklang['navbarItemSelectedBackgroundColorHelp'] = 'The background color of the navigation items on the navigation bar when the user clicks on an item, and a dropdown menu appears (such as \'Ticket\').';
+$hesklang['dropdownItemTextColor'] = 'Dropdown Item Text Color';
+$hesklang['dropdownItemTextColorHelp'] = 'The text color of a dropdown item.';
+$hesklang['dropdownItemTextHoverColor'] = 'Dropdown Item Text Hover Color';
+$hesklang['dropdownItemTextHoverColorHelp'] = 'The text color of a dropdown item when the mouse hovers over it.';
+$hesklang['questionMarkColor'] = 'Question Mark Color';
+$hesklang['questionMarkColorHelp'] = 'The text color for the question mark circle, as seen on the \'Settings\' page and on other various pages.';
+$hesklang['dropdownItemTextHoverBackgroundColor'] = 'Dropdown Item Text Hover Background Color';
+$hesklang['dropdownItemTextHoverBackgroundColorHelp'] = 'The background color of a dropdown item when the mouse hovers over it.';
+$hesklang['uiColors'] = 'UI Colors';
+$hesklang['displayRtl'] = 'Display site right-to-left';
+$hesklang['displayRtlHelp'] = 'Check this to set the text direction to right-to-left.';
+$hesklang['showIcons'] = 'Show Icons';
+$hesklang['showIconsHelp'] = 'Check this box to show icons next to navigation bar items';
+$hesklang['maintenanceMode'] = 'Maintenance Mode';
+$hesklang['maintenanceModeHelp'] = 'Check this box to put the Help Desk in maintenance mode. Staff can still log into the backend, but the front end will be inaccessible.';
+$hesklang['none'] = 'None';
+$hesklang['autorefresh'] = 'Autorefresh:';
+$hesklang['autorefresh_restrictions'] = 'Enter value in milliseconds. Value must be greater than 1000 to use this feature. No fractional values.';
 
-// --> Knowledgebase articles log
-// First %s will be replaced with date and second with user making changes
-$hesklang['revision1']='<li class="smaller">%s | submitted by %s</li>';
-$hesklang['revision2']='<li class="smaller">%s | modified by %s</li>';
+// ADDED OR MODIFIED IN Mods For HESK 1.5.0
+$hesklang['ticket_auto_refresh'] = 'Ticket Table Auto-Refresh:';
+$hesklang['display_rtl'] = 'Display site right-to-left';
+$hesklang['show_icons_navigation'] = 'Show icons on navigation bar';
+$hesklang['enable_maintenance'] = 'Enable maintenance mode';
+$hesklang['can_man_settings']='Can manage help desk settings';
+$hesklang['disable_user'] = 'User is active (click to deactivate)';
+$hesklang['enable_user'] = 'User is inactive (click to activate)';
+$hesklang['user_activated'] = 'User has been activated';
+$hesklang['user_deactivated'] = 'User has been deactivated';
+$hesklang['active_user'] = 'Is active user';
+$hesklang['self_deactivation'] = 'You cannot deactivate yourself!';
+$hesklang['inactive_user'] = 'Your account is currently inactive. Contact an administrator for more information.';
+$hesklang['cant_edit_admin'] = 'You cannot edit the God Admin (User ID = 1)';
+$hesklang['notifications_disabled_info'] = 'Changing notifications settings has been disabled by your administrator.';
+
+// ADDED OR MODIFIED IN Mods For HESK 1.6.0
+$hesklang['notify_note_unassigned'] = 'Someone adds a note to a ticket not assigned to me';
+$hesklang['can_change_notification_settings'] = 'Can change notification settings';
+$hesklang['add_row'] = 'Add row';
+$hesklang['addnote'] = 'Add note';
+$hesklang['mods_for_hesk'] = 'Mods for HESK';
+$hesklang['err_modsForHesk_settings'] = 'Can\'t open file <b>modsForHesk_settings.inc.php</b> for writing. Please CHMOD this file to 666 (rw-rw-rw-)';
+$hesklang['mods_for_hesk_version'] = 'Mods for HESK Version';
+
+// ADDED OR MODIFIED IN Mods For HESK 1.7.0
+$hesklang['date_custom_field'] = 'Date';
+$hesklang['date_custom_field_text'] = 'No options for this custom field type.';
+$hesklang['multiple_select_custom_field'] = 'Multiple Select box';
+$hesklang['multiple_select_custom_field_text'] = 'Options for this multi-select box, enter one option per line (each line will be a choice your customers can choose from). You need to enter at least two options!';
+$hesklang['date_format'] = 'Date must be in YYYY-MM-DD format.';
+$hesklang['custom_field_setting'] = 'Multilanguage support';
+$hesklang['custom_field_setting_help'] = 'Enabling this setting will use the name of the custom field as the language
+    file\'s key, rather than the direct name itself. This allows the custom field to be translated into different languages.';
+$hesklang['enable_custom_field_language'] = 'Enable multilanguage support';
+$hesklang['custom_language_key'] = 'Field language file key';
+$hesklang['ticket_reopen_assigned'] = '[#%%TRACK_ID%%] Assigned ticket reopened';
+$hesklang['verify_email'] = 'Verify Email';
+$hesklang['email_verified'] = 'The email address <b>%s</b> has been verified. Additionally, the following tickets have been created:'; //%s: email address
+$hesklang['verify_no_records'] = 'No records were found for this activation key. Has this activation key already been used?';
+$hesklang['activation_key'] = 'Activation Key';
+$hesklang['no_tickets_created'] = 'No tickets created';
+$hesklang['customer_email_verification'] = 'Customer Email Verifications';
+$hesklang['customer_email_verification_help'] = 'Require customers to verify their email address via email. Once their
+    address has been verified, it does not need to be re-verified in the future. <br><br> <b>NOTE:</b> Enabling this will disable the
+    ability for the customer to provide multiple emails, as HESK will be unable to determine which email needs to be verified.';
+$hesklang['require_customer_validate_email'] = 'Require customers to verify email';
+$hesklang['multi_eml_disabled'] = 'This feature has been disabled because this help desk has been configured to require
+    customers to verify their email address';
+$hesklang['feature_disabled'] = 'Feature Disabled';
+$hesklang['verify_your_email'] = 'Your ticket has been created; however your email needs to be verified before your ticket can be addressed. An email has been sent to the email provided for verification.';
+$hesklang['installation_information'] = 'Installation Information';
+
+// ADDED OR MODIFIED IN Mods For HESK 2.0.0
+$hesklang['saved_ticket_tpl'] = 'Saved Templates';
+$hesklang['new_ticket_tpl']='Add or Edit a Ticket Template';
+$hesklang['and_change_status_to'] = 'and change status to'; // Used in combination with $hesklang['submit_reply'] (Reads as "Submit reply and change status to")
+$hesklang['closed_title'] = 'Closed';
+$hesklang['image'] = 'Image'; // Used for alt tag
+$hesklang['close_modal'] = 'Close';
+$hesklang['email_custom_field'] = 'Email Address';
+$hesklang['email_custom_field_help'] = 'Allows the input of an email address. Similar to a text field, however the email address(es) will be added to all emails for this ticket, in the Cc or Bcc section, depending on the option selected.';
+$hesklang['email_custom_field_label'] = 'Address Type';
+$hesklang['cc'] = 'Cc:';
+$hesklang['bcc'] = 'Bcc:';
+$hesklang['mailgun'] = 'Mailgun';
+$hesklang['mailgun_help'] = 'Send mail using the Mailgun API. For more information on Mailgun, visit https://www.mailgun.com';
+$hesklang['mailgun_api_key'] = 'Mailgun API Key';
+$hesklang['mailgun_api_key_help'] = 'Your API key for Mailgun.';
+$hesklang['mailgun_domain'] = 'Mailgun Domain';
+$hesklang['mailgun_domain_help'] = 'Your registered domain for Mailgun';
+$hesklang['html_emails'] = 'HTML Emails';
+$hesklang['html_emails_help'] = 'Send HTML-supported emails to staff and customers.<br><br>To use this feature, create a new folder called <b>html</b> in your
+    language\'s <b>emails</b> folder and create templates for each email file. Both the HTML and plaintext versions will be sent (recipient\'s email program will
+    properly display either the HTML or plaintext version, depending on their mail client\'s settings).';
+$hesklang['html_emails_text'] = 'Enable HTML-formatted emails';
+$hesklang['beta_text'] = 'BETA';
+
+// ADDED OR MODIFIED IN Mods for HESK 2.1.0
+$hesklang['e_mfh_settings'] = 'You will not be able to save your settings unless this file is writable by the script (CHMOD to 666)!';
+$hesklang['mfh_up_to_date'] = 'Mods for HESK is up to date';
+$hesklang['use_bootstrap_theme'] = 'Use Boostrap Theme CSS';
+$hesklang['use_bootstrap_theme_help'] = 'Enable this to use the <code>bootstrap-theme.css</code> file. Use this for a more 3D look and feel, or disable it for a flatter look.';
+
+// ADDED OR MODIFIED IN Mods for HESK 2.1.1
+$hesklang['new_article_default_type'] = 'Default Type for New Articles';
+$hesklang['new_article_default_type_help'] = 'Choose the default type for new knowledgebase articles.';
+$hesklang['kb_draft3'] = 'The article is saved but not yet published. It can only be read by staff who has permission to
+ manage knowledgebase articles.'; // This is exactly the same as kb_draft2 with all HTML removed
+$hesklang['file_name'] = 'File Name';
+$hesklang['action'] = 'Action';
+$hesklang['click_to_preview'] = 'Click to preview';
+$hesklang['attachment_removed'] = 'This attachment has been removed and cannot be viewed / downloaded';
+
+// ADDED OR MODIFIED IN Mods for HESK 2.2.0
+$hesklang['email_templates'] = 'Email templates';
+$hesklang['email_templates_intro'] = 'You can edit your plaintext and HTML email templates here.';
+$hesklang['edit_plain_text_template'] = 'Edit plain text template';
+$hesklang['edit_html_template'] = 'Edit HTML template';
+$hesklang['editing_plain_text_template'] = 'Editing plain text template <code>%s</code>'; // %s: The name of the template file, then language name
+$hesklang['editing_html_template'] = 'Editing HTML template <code>%s</code>'; // %s: The name of the template file, then language name
+$hesklang['show_special_tags'] = 'Show Special Tags';
+$hesklang['hide_special_tags'] = 'Hide Special Tags';
+$hesklang['special_tag'] = 'Special Tag';
+$hesklang['description'] = 'Description';
+$hesklang['customer_name'] = 'Customer name';
+$hesklang['customer_email'] = 'Customer email';
+$hesklang['ticket_subject'] = 'Ticket subject';
+$hesklang['ticket_message'] = 'Ticket/Reply message';
+$hesklang['ticket_created'] = 'Date and time of ticket submission';
+$hesklang['ticket_updated'] = 'Date and time of ticket last update';
+$hesklang['ticket_url'] = 'Ticket URL address';
+$hesklang['ticket_category'] = 'Ticket category';
+$hesklang['ticket_owner'] = 'Staff member assigned to the ticket';
+$hesklang['ticket_priority'] = 'Ticket priority';
+$hesklang['custom_field_x'] = 'Custom field %s'; // %s: Custom field #1-20
+$hesklang['email_template_saved'] = 'The email template <b>%s</b> has been saved.'; // %s: Template file name
+$hesklang['error_saving_template'] = 'An error occurred when trying to save the email template!';
+$hesklang['can_man_email_tpl'] = 'Edit email templates';
+$hesklang['email_template_directory_not_writable'] = 'The email template <b>%s</b> is not writable by HESK. Please CHMOD it to 0666.'; // %s: template file name
+$hesklang['closable_question'] = 'Closable?';
+$hesklang['closable_description'] = '<b><i>This setting is ignored if the &quot;Closed?&quot; setting is set to &quot;Yes&quot; for this status</i></b>.
+    <br><br>Determines if the customer and/or staff is able to close a ticket in this status.
+    <br><br><b>Yes:</b> Both customers and staff can close a ticket in this status.
+    <br><b>Customers only:</b> Customers can close a ticket in this status, but staff cannot.
+    <br><b>Staff only:</b> Staff can close a ticket in this status, but customers cannot.
+    <br><b>No:</b> No one is allowed to close a ticket in this status.'; // &quot; = "
+$hesklang['customers_only'] = 'Customers only';
+$hesklang['staff_only'] = 'Staff only';
+$hesklang['yes_title_case'] = 'Yes';
+$hesklang['no_title_case'] = 'No';
+$hesklang['autoclose_ticket_status'] = 'When a ticket is closed automatically, change the status to';
+$hesklang['recent_tickets'] = 'Recent tickets';
+$hesklang['current_status_colon'] = 'Current status: %s'; // %s: status name (i.e. "Resolved", "New", etc.)
+$hesklang['email_attachments'] = 'Email attachments';
+$hesklang['email_attachments_help'] = '<b>Show attachments as links:</b> Links to attachments will be appended at the end of the email.
+    <br><br><b>Attach directly to email:</b> Attachments will be embedded directly into emails.';
+$hesklang['show_attachments_as_links'] = 'Show attachments as links';
+$hesklang['attach_directly_to_email'] = 'Attach directly to email';
 
-// --> Text used by ReCaptcha
-$hesklang['visual_challenge']='Get a visual challenge';
-$hesklang['audio_challenge']='Get an audio challenge';
-$hesklang['refresh_btn']='Get a new challenge';
-$hesklang['instructions_visual']='Type the two words:';
-$hesklang['instructions_context']='Type the words in the boxes:';
-$hesklang['instructions_audio']='Type what you hear:';
-$hesklang['help_btn']='Help';
-$hesklang['play_again']='Play sound again';
-$hesklang['cant_hear_this']='Download sound as MP3';
-$hesklang['incorrect_try_again']='Incorrect. Try again.';
-$hesklang['image_alt_text']='reCAPTCHA challenge image';
-$hesklang['recaptcha_error']='Incorrect SPAM Prevention answer, please try again.';
+// ADDED OR MODIFIED IN Mods for HESK 2.2.1
+$hesklang['popart_no_colon']='Top Knowledgebase Articles'; // same as $hesklang['popart'] but without a colon (:)
+$hesklang['latart_no_colon']='Latest Knowledgebase Articles'; // same as $hesklang['latart'] but without a colon (:)
+$hesklang['ac_no_colon']='Articles in this Category'; // same as $hesklang['ac'] but without a colon (:)
 
-// Added or modified in version 2.6.0
-$hesklang['ms01']='Jan';
-$hesklang['ms02']='Feb';
-$hesklang['ms03']='Mar';
-$hesklang['ms04']='Apr';
-$hesklang['ms05']='May';
-$hesklang['ms06']='Jun';
-$hesklang['ms07']='Jul';
-$hesklang['ms08']='Aug';
-$hesklang['ms09']='Sep';
-$hesklang['ms10']='Oct';
-$hesklang['ms11']='Nov';
-$hesklang['ms12']='Dec';
-$hesklang['sdf']='Submitted date format';
-$hesklang['lcf']='Updated date format';
-$hesklang['lcf0']='Short descriptive';
-$hesklang['lcf1']='Date and time';
-$hesklang['lcf2']='HESK style';
-$hesklang['ticket_tpl']='Ticket templates';
-$hesklang['can_man_ticket_tpl']='Manage ticket templates'; // Permission title
-$hesklang['ticket_tpl_man']='Manage ticket templates'; // Page/link title
-$hesklang['ticket_tpl_intro']='Create and edit ticket templates that you can use to quickly submit new tickets from the admin interface.';
-$hesklang['no_ticket_tpl']='No ticket templates';
-$hesklang['ticket_tpl_title']='Title';
-$hesklang['delete_tpl']='Are you sure you want to delete this template?';
-$hesklang['ticket_tpl_add']='Create a new ticket template';
-$hesklang['ticket_tpl_edit']='Edit selected ticket template';
-$hesklang['save_ticket_tpl']='Save ticket template';
-$hesklang['ticket_tpl_saved']='Your ticket template has been saved for future use';
-$hesklang['ticket_tpl_removed']='Selected ticket template has been removed from the database';
-$hesklang['ticket_tpl_not_found']='Ticket template not found';
-$hesklang['sel_ticket_tpl']='Select the ticket template you would like to edit';
-$hesklang['ent_ticket_tpl_title']='Please enter template title';
-$hesklang['ent_ticket_tpl_msg']='Please enter template message';
-$hesklang['ticket_tpl_id']='Missing ticket template ID';
-$hesklang['select_ticket_tpl']='Select a ticket template';
-$hesklang['list_tickets_cat']='List all tickets in this category';
-$hesklang['def_msg']='[No message]';
-$hesklang['emlreqmsg']='Require message';
-$hesklang['emlreqmsg2']='Ignore piped/fetched emails with no message';
-$hesklang['relart']='Related articles'; // Title of related articles box
-$hesklang['s_relart']='Related articles'; // On settings page
-$hesklang['tab_7']='Ticket list';
-$hesklang['fitl']='Fields in ticket list';
-$hesklang['submitted']='Submitted';
-$hesklang['clickemail']='View';
-$hesklang['set_pri_to']='Set priority to:'; // Action below the ticket list
-$hesklang['pri_set_to']='Priority has been set to:';
-$hesklang['cat_pri']='The category priority will be used when customers are not allowed to select priority and a ticket is submitted from the customer interface.';
-$hesklang['cat_pri_info']='Your customers are allowed to select priority, so category priority will be ignored.<br /><br />To use category priority instead, turn OFF the following feature in HESK settings:';
-$hesklang['def_pri']='Category priority';
-$hesklang['ch_cat_pri']='Set category priority';
-$hesklang['cat_pri_ch']='Category priority has been set to:';
-$hesklang['err_dbversion']='Too old MySQL version:'; // %s will be replaced with MySQL version
-$hesklang['signature_max']='Signature (max 1000 chars)';
-$hesklang['signature_long']='User signature is too long! Please limit the signature to 1000 chars';
-$hesklang['ip_whois']='IP whois';
-$hesklang['ednote']='Edit note message';
-$hesklang['ednote2']='Note message saved';
-$hesklang['perm_deny']='Permission denied';
-$hesklang['mis_note']='Missing note ID';
-$hesklang['no_note']='Note with this ID not found';
-$hesklang['sacl']='Save and continue later';
-$hesklang['reply_saved']='Your reply message has been saved for later.';
-$hesklang['submit_as']='Submit as:';
-$hesklang['sasc']='Submit as Customer reply';
-$hesklang['creb']='Customer reply entered by:';
-$hesklang['show_select']='Show &quot;Click to select&quot; as default option';
-// Settings
-$hesklang['mms']='Maintenance mode';
-$hesklang['mmd']='Enable maintenance mode';
-// Customer notice
-$hesklang['mm1']='Maintenance in progress';
-$hesklang['mm2']='In order to perform scheduled maintenance, our help desk has shut down temporarily.';
-$hesklang['mm3']='We apologize for the inconvenience and ask that you please try again later.';
-// Staff notice
-$hesklang['mma1']='Maintenance mode is active!';
-$hesklang['mma2']='Customers are not able to use the help desk.';
-$hesklang['tools']='Tools';
-$hesklang['banemail_intro']='Prevent certain email addresses from submitting tickets to your help desk.';
-$hesklang['no_banemails']='<i>No emails are being banned.</i>';
-$hesklang['eperm']='Permanent email bans:';
-$hesklang['bananemail']='Email address to ban';
-$hesklang['savebanemail']='Ban this email';
-$hesklang['enterbanemail']='Enter the email address you wish to ban.';
-$hesklang['validbanemail']='Enter a valid email address (<i>john.doe@domain.com</i>) or email domain (<i>@domain.com</i>)';
-$hesklang['email_banned']='The email address <i>%s</i> was banned and HESK will no longer accept tickets from this address.'; // %s will be replaced with email
-$hesklang['emailbanexists']='The email address <i>%s</i> is already banned.'; // %s will be replaced with email
-$hesklang['email_unbanned']='Email ban deleted';
-$hesklang['banby']='Banned by';
-$hesklang['delban']='Delete ban';
-$hesklang['delban_confirm']='Delete this ban?';
-$hesklang['baned_e']='You have been banned from submitting new support tickets.';
-$hesklang['baned_ip']='You have been banned from this help desk';
-$hesklang['can_ban_emails']='Can ban emails';
-$hesklang['can_unban_emails']='Can unban emails (enables Can ban emails)';
-$hesklang['eisban']='This email address is banned.';
-$hesklang['click_unban']='Click here to unban.';
-$hesklang['banip_intro']='Visitors from banned IP addresses will not be able to view or submit tickets and login into the help desk.';
-$hesklang['ipperm']='Permanent IP bans:';
-$hesklang['iptemp']='Login failure bans:';
-$hesklang['savebanip']='Ban this IP';
-$hesklang['no_banips']='<i>No IPs are being banned.</i>';
-$hesklang['bananip']='IP address to ban';
-$hesklang['banex']='Examples:';
-$hesklang['iprange']='IP range';
-$hesklang['savebanip']='Ban this IP';
-$hesklang['ippermban']='Ban this IP permanently';
-$hesklang['enterbanip']='Enter the IP address or range you wish to ban.';
-$hesklang['validbanip']='Enter a valid IP address or IP range';
-$hesklang['ip_banned']='The IP address <i>%s</i> was banned and HESK will no longer accept tickets from this IP address.'; // %s will be replaced with ip
-$hesklang['ip_rbanned']='The IP range <i>%s</i> was banned and HESK will no longer accept tickets from this IP range.'; // %s will be replaced with ip
-$hesklang['ipbanexists']='The IP address <i>%s</i> is already banned.'; // %s will be replaced with ip
-$hesklang['iprbanexists']='The IP range <i>%s</i> is already banned.'; // %s will be replaced with ip
-$hesklang['ip_unbanned']='IP ban deleted';
-$hesklang['ip_tempun']='Temporary IP ban deleted';
-$hesklang['can_ban_ips']='Can ban ips';
-$hesklang['can_unban_ips']='Can unban ips (enables Can ban ips)';
-$hesklang['ipisban']='This IP address is banned.';
-$hesklang['m2e']='Expires in (minutes)';
-$hesklang['info']='Info';
-$hesklang['sm_title']='Service messages';
-$hesklang['sm_intro']='Display a service message in the customer area, for example to notify them about known issues and important news.';
-$hesklang['can_service_msg']='Edit service messages';
-$hesklang['new_sm']='New service message';
-$hesklang['edit_sm']='Edit service message';
-$hesklang['ex_sm']='Existing service messages';
-$hesklang['sm_author']='Author';
-$hesklang['sm_type']='Type';
-$hesklang['sm_published']='Published';
-$hesklang['sm_draft']='Draft';
-$hesklang['sm_style']='Style';
-$hesklang['sm_none']='None';
-$hesklang['sm_success']='Success';
-$hesklang['sm_info']='Info';
-$hesklang['sm_notice']='Notice';
-$hesklang['sm_error']='Error';
-$hesklang['sm_save']='Save service message';
-$hesklang['sm_preview']='Preview service message';
-$hesklang['sm_mtitle']='Title';
-$hesklang['sm_msg']='Message';
-$hesklang['sm_e_title']='Enter service message title';
-$hesklang['sm_e_msg']='Enter service message';
-$hesklang['sm_e_id']='Missing message ID';
-$hesklang['sm_added']='A new service message has been added';
-$hesklang['sm_deleted']='Service message deleted';
-$hesklang['sm_not_found']='This service message does not exist';
-$hesklang['no_sm']='No service messages';
-$hesklang['del_sm']='Delete this service message?';
-$hesklang['sm_mdf']='Service message has been saved';
-$hesklang['sska']='Show suggested articles';
-$hesklang['taws']='These articles were suggested:';
-$hesklang['defaults']='Defaults';
-$hesklang['pncn']='Select notify customer option in the new ticket form';
-$hesklang['pncr']='Select notify customer option in the ticket reply form';
-$hesklang['pssy']='Show what knowledgebase articles were suggested to customers';
-$hesklang['ccct']='Customer resolve';
-$hesklang['custnot']='Notify customers when';
-$hesklang['notnew']='A new support ticket is submitted';
-$hesklang['notclo']='A support ticket is marked Resolved';
-$hesklang['enn']='Except for Email piping/POP3 fetching if email subject contains:';
-$hesklang['spamn']='SPAM notice';
-$hesklang['spam_inbox']='<span style="color:red"><b>No confirmation email?</b><br />We sent a confirmation message to your email address. If you do not receive it within a few minutes, please check your Junk, Bulk or Spam folders. Mark the message as <b>Not SPAM</b> to avoid problems receiving our correspondence in the future.</span>';
-$hesklang['s_ekb']='Enable Knowledgebase';
-$hesklang['ekb_n']='<b>NO</b>, disable Knowledgebase';
-$hesklang['ekb_y']='<b>YES</b>, enable Knowledgebase';
-$hesklang['ekb_o']='<b>YES</b>, use HESK as a Knowledgebase only (<i>disable help desk</i>)';
-$hesklang['kb_set']='Knowledgebase settings';
-$hesklang['kbo1']='Knowledgebase-only mode';
-$hesklang['kbo2']='Visitors cannot submit new support tickets and are taken directly to the knowledgebase.';
-$hesklang['fpass']='Forgot your password?';
-$hesklang['passr']='Password reset';
-$hesklang['passa']='Allow users to reset a forgot password over email';
-$hesklang['passe']='Enter your email address';
-$hesklang['passs']='Send me password reset link';
-$hesklang['noace']='No account with that email address was found';
-$hesklang['pemls']='We sent you an email with instructions on how to reset your password';
-$hesklang['reset_password']='Reset your help desk password'; // Email subject
-$hesklang['ehash']='Invalid or expired password reset link';
-$hesklang['ehaip']='Wrong IP address. Passwords may only be reset from the IP address that requested password reset.';
-$hesklang['resim']='<b>Setup your new password in the form below!</b>';
-$hesklang['permissions']='Permissions';
-$hesklang['atype']='Account type';
-$hesklang['astaff']='Staff';
-$hesklang['oon1']='Send me only open tickets';
-$hesklang['oon2']='Send me all my tickets';
-$hesklang['anyown']='Any owner';
-$hesklang['pfr']='Another POP3 fetching task is still in progress.';
-$hesklang['pjt']='Task timeout';
-$hesklang['pjt2']='minutes after start';
-$hesklang['nkba']='Knowledgebase search requires enough unique articles to work properly.<br /><br />Consider adding more articles to the knowledgebase to improve search and article suggestion results.';
-$hesklang['saa']='Sticky articles are displayed at the top of articles list';
-$hesklang['yhbr']='You have been locked out the system for %s minutes because of too many replies to a ticket.';
-$hesklang['sir']='ReCaptcha V1 API (old)';
-$hesklang['sir2']='ReCaptcha V2 API (recommended)';
-$hesklang['rcpb']='Site key (Public key)';
-$hesklang['rcpv']='Secret key (Private key)';
+// ADDED OR MODIFIED IN Mods for HESK 2.3.0
+$hesklang['sm_icon'] = 'Icon';
+$hesklang['sm_icon_type'] = 'Icon Type';
+$hesklang['sm_no_icon'] = 'No Icon';
+$hesklang['sm_search_icon'] = 'Search Icon';
+$hesklang['sm_iconpicker_footer_label'] = '{0} - {1} of {2}'; // {0}: lower bound of page, {1}: upper bound of page, {2}: total number of icons
+$hesklang['mods_for_hesk_acronym'] = 'MFH'; // THIS SHOULD NOT BE TRANSLATED
+$hesklang['added_in_mods_for_hesk'] = 'Added in Mods for HESK';
+$hesklang['statuses_intro'] = 'Here you can add, remove, and modify ticket statuses, as well as changing the default status for particular actions.';
+$hesklang['statuses_saved'] = 'Ticket statuses have been updated!';
+$hesklang['email_template_not_saved'] = 'The email template <b>%s</b> was NOT saved due to an error. Enable debug mode to see if an error message appears, and ensure that your file has CHMOD 0666'; // %s: Template file name
+$hesklang['language_key'] = 'Language Key';
+$hesklang['language_key_description'] = 'This is the language file \'key\' that contains the text you want to display';
+$hesklang['can_man_ticket_statuses'] = 'Can manage ticket statuses';
+$hesklang['key_required'] = 'Keys are required for all statuses';
+$hesklang['x_merged'] = '(+%s merged)'; // %s number of tickets merged
+$hesklang['merged_tickets'] = 'Merged tickets: ';
+$hesklang['show_number_merged'] = 'Show number of tickets merged';
+$hesklang['show_number_merged_descr'] = 'Show number of tickets merged next to Tracking ID';
+$hesklang['show_number_merged_help'] = 'If enabled, the user will be able to see which tickets were merged into the other on the ticket search screen.';
+$hesklang['latest_top_on_home'] = 'Latest/Top articles on home page';
+$hesklang['latest_top_on_home_help'] = 'Select YES to display the top and latest knowledgebase articles on the home page.
+    Otherwise, a link to the knowledgebase will appear on the home page.';
+$hesklang['location_unavailable'] = "Location unavailable. Click for more information.";
+$hesklang['click_for_map'] = "View map of user's location";
+$hesklang['request_user_location'] = "Request Location";
+$hesklang['request_user_location_help'] = "If enabled, the help desk will ask for the customer's location, allowing staff to
+ see a map of the customer's location when they created the ticket.";
+$hesklang['users_location'] = "User's Location";
+$hesklang['location_unavailable_0'] = "User's location is not available because the ticket was created before location tracking was enabled.";
+$hesklang['location_unavailable_1'] = "User's location is not available because the user refused to share it.";
+$hesklang['location_unavailable_2'] = "User's location is not available because the help desk was unable to determine the user's position.";
+$hesklang['location_unavailable_3'] = "User's location is not available because the help desk was not able to determine the user's position in
+ a reasonable amount of time.";
+$hesklang['location_unavailable_4'] = "An unknown error occurred when trying to obtain the user's location.";
+$hesklang['location_unavailable_5'] = "User's location is not available because the user's browser did not meet the minimum
+requirements for tracking their location when the ticket was submitted.";
+$hesklang['save_location'] = 'Save Location';
+$hesklang['close_modal_without_saving'] = 'Close without saving';
+$hesklang['ticket_location_updated'] = 'Ticket location has been updated!';
+$hesklang['location_colon'] = 'Location:';
+$hesklang['your_current_location'] = 'Your location';
+$hesklang['requesting_location_ellipsis'] = 'Requesting location...';
+$hesklang['unable_to_determine_location'] = 'Unable to determine your location, or you declined to share it.';
+$hesklang['save_to_see_updated_address'] = 'Save the new location to see the updated address';
+$hesklang['manager'] = 'Manager';
+$hesklang['manager_updated'] = 'Category manager has been updated.';
+$hesklang['can_set_manager'] = 'Can set category managers';
+$hesklang['no_manager'] = 'No manager';
+$hesklang['manage_permission_templates'] = 'Manage Permission Templates';
+$hesklang['manage_permission_templates_help'] = 'Here you can create and edit permission templates. These templates will appear when creating/editing a user.
+Please note that if you change the permission template\'s settings, it will NOT change the permissions of any users that are set to this permission template.';
+$hesklang['number_of_users'] = 'Number of Users';
+$hesklang['actions'] = 'Actions';
+$hesklang['view_permissions_for_this_template'] = 'View/edit permissions for this template';
+$hesklang['permission'] = 'Permission';
+$hesklang['permissions_for_template'] = 'Permissions for template <code>%s</code>'; // %s template name
+$hesklang['template_has_admin_privileges'] = 'Permission template has admin privileges. Click to set as non-admin';
+$hesklang['template_has_no_admin_privileges'] = 'Permission template does not have admin privileges. Click to set as admin';
+$hesklang['staff_cannot_be_admin'] = 'Staff permission group does not have admin access, and cannot be set as an admin';
+$hesklang['admin_cannot_be_staff'] = 'Administrator permission group has admin access, and cannot be set as non-admin';
+$hesklang['template_is_admin_cannot_change'] = 'The permission group currently has admin privileges, so you cannot set specific permissions here.';
+$hesklang['permission_template_updated'] = 'Permission template has been updated!';
+$hesklang['create_new_template'] = 'Create new permission template';
+$hesklang['create_new_template_title'] = 'Create New Permission Template'; // same as create_new_template, but in Title Case
+$hesklang['template_name'] = 'Template name';
+$hesklang['template_name_required'] = 'Template name required.';
+$hesklang['you_must_select_a_category'] = 'You must select at least one category.';
+$hesklang['you_must_select_a_feature'] = 'You must select at least one feature.';
+$hesklang['permission_template_error'] = 'The permission template could not be completed due to the following error(s): %s'; // %s: error list
+$hesklang['template_created'] = 'Permission template successfully created!';
+$hesklang['cannot_delete_admin_or_staff'] = 'The <b>Administrator</b> and <b>Staff</b> permission groups cannot be deleted!';
+$hesklang['no_templates_were_deleted'] = 'No templates were deleted!';
+$hesklang['permission_template_deleted'] = 'Permission template deleted!';
+$hesklang['permission_template_now_admin'] = 'Permission template is now designed as an admin template';
+$hesklang['permission_template_no_longer_admin'] = 'Permission template is no longer designated as an admin template';
+$hesklang['cannot_change_admin_staff'] = 'You cannot change admin/non-admin status for the <b>Administrator</b> and <b>Staff</b> templates!';
+$hesklang['permission_tpl_man'] = 'Manage permission templates'; // Menu link
+$hesklang['permission_templates'] = 'Permission Templates';
+$hesklang['can_man_permission_tpl'] = 'Can manage permission templates';
+$hesklang['permission_template_colon'] = 'Permission Template';
+$hesklang['permission_template'] = 'Permission Template';
+$hesklang['custom'] = 'Custom';
 
-// Language for Google reCaptcha API version 2
-// Supported language codes: https://developers.google.com/recaptcha/docs/language
-// If your language is NOT in the supported langauges, leave 'en'
-$hesklang['RECAPTCHA']='en';
+// ADDED OR MODIFIED IN Mods for HESK 2.4.0
+$hesklang['sort_by_user_defined_order'] = 'Sort by user-defined order';
+$hesklang['sort_alphabetically'] = 'Sort alphabetically';
+$hesklang['category_sort'] = 'Category Sorting';
+$hesklang['category_sort_help'] = 'Determines if categories shown on the manage categories page and all dropdowns are sorted by the user-defined order (default), or
+sorted alphabetically.';
+$hesklang['quick_help_sections'] = 'Quick Help Sections';
+$hesklang['quick_help_sections_help'] = 'Check the checkbox to show the "Quick Help" sections on the left-hand side, or uncheck to not show.';
+$hesklang['create_ticket'] = 'Create ticket (customers)';
+$hesklang['view_ticket_form'] = 'View ticket form';
+$hesklang['knowledgebase'] = 'Knowledgebase section';
+$hesklang['staff_create_ticket'] = 'Create ticket (staff)';
+$hesklang['allow_rich_text_for_tickets'] = 'Allow rich text for tickets';
+$hesklang['allow_rich_text_for_tickets_help'] = 'Allow staff and customers to use rich text formatting when writing ticket messages / replies.';
+$hesklang['click_to_edit_name'] = 'Click to edit name';
+$hesklang['new_status'] = 'New Status';
+$hesklang['create_new_status_title'] = 'Create New Status';
+$hesklang['status_name_title'] = 'Status Name';
+$hesklang['status_name_title_help'] = 'The name of the status that should appear when viewing the ticket, for each language you have installed.';
+$hesklang['properties'] = 'Properties';
+$hesklang['closable'] = 'Closable'; // Same as $hesklang['closable_question'], but without punctuation
+$hesklang['new_status_created'] = 'New status successfully created';
+$hesklang['editing_status_x'] = 'Editing status <span style="color: %s; font-weight: bold">%s</span>'; // 1st %s: text color, 2nd %s: status name
+$hesklang['status_not_in_database'] = 'The status text for this language was not found in the database, so a suggested translation has been filled for you.
+ Please click "Save Changes" to save this translation to the database and to remove this warning.';
+$hesklang['ticket_status_updated'] = 'Ticket status successfully updated!';
+$hesklang['ticket_status_deleted'] = 'Ticket status deleted!';
+$hesklang['confirm_delete_status_question'] = 'Delete status?';
+$hesklang['confirm_delete_status'] = 'Are you sure you want to delete this status? This cannot be undone!';
+$hesklang['status_sort_updated'] = 'Ticket status sort updated!';
+$hesklang['status_sort'] = 'Status Sorting';
+$hesklang['status_sort_help'] = 'Determines if statuses shown on the manage statuses page and all dropdowns are sorted by the user-defined order (default), or sorted alphabetically.';
+$hesklang['cannot_delete_status_tickets'] = 'This status cannot be deleted because there are tickets set to this status.';
+$hesklang['default_statuses_updated'] = 'Default statuses have been updated!';
+$hesklang['download_count'] = 'Download Count';
+$hesklang['kb_attach_dir'] = 'Knowledgebase attachments folder';
+$hesklang['kb_attach_dir_help'] = 'Name of the folder, where knowledgebase attachments will be stored.<br><br>The folder needs to exist within the main HESK folder and be writable by PHP. On most systems names are CaSe SeNSiTiVe.
+    <br><br>Allowed chars (other will be removed): a-z A-Z 0-9 _ -';
+$hesklang['ticket_attach_dir'] = 'Ticket attachments folder';
+$hesklang['cannot_edit_status_demo'] = 'You cannot edit statuses while in demo mode!';
+
+// ADDED OR MODIFIED IN Mods for HESK 2.5.0
+$hesklang['ticket_message_no_attachments'] = 'Ticket/Reply message, however attachments will not be included in the email';
+$hesklang['click_for_device_information'] = 'Click for device information';
+$hesklang['device_information'] = 'Device information';
+$hesklang['operating_system'] = 'Operating System';
+$hesklang['browser'] = 'Browser';
+$hesklang['screen_resolution'] = 'Screen Resolution';
+$hesklang['display_user_agent_information'] = 'Show user agent';
+$hesklang['display_user_agent_information_help'] = 'When enabled, staff will be able to view the operating system, browser,
+    and screen resolution of the device used to create the ticket.';
+$hesklang['value_colon'] = 'Value:';
+$hesklang['hidden_custom_field'] = 'Hidden text field';
+$hesklang['hidden_custom_field_help'] = 'This input is the same as a text field; however this value cannot be changed and will not be visible to the user.';
+$hesklang['readonly_custom_field'] = 'Read-only text field';
+$hesklang['readonly_custom_field_help'] = 'This input is the same as a text field; however this value cannot be changed, but will be visible to the user.';
+$hesklang['navbar_title_url'] = 'Navbar Title URL';
+$hesklang['navbar_title_url_help'] = 'Enter the URL you wish to use when a customer (or staff) clicks on the help desk title on the top-left corner of the screen. The URL must begin with http:// or https://.';
+$hesklang['this_field_is_required'] = 'This field is required';
+$hesklang['select_at_least_one_value'] = 'Please select at least one value';
+
+// ADDED OR MODIFIED IN Mods for HESK 2.5.2
+$hesklang['manage_statuses'] = 'Manage Statuses';
+$hesklang['manage_service_messages'] = 'Manage Service Messages';
+$hesklang['manage_banned_ips'] = 'Manage Banned IPs';
+$hesklang['manage_banned_emails'] = 'Manage Banned Emails';
+$hesklang['manage_email_templates'] = 'Manage Email Templates';
+$hesklang['linked_tickets'] = 'Linked tickets';
+$hesklang['add_ticket'] = 'Add Ticket';
+$hesklang['cannot_link_ticket_to_itself'] = 'You cannot link a ticket to itself!';
+$hesklang['linked_ticket_does_not_exist'] = '<strong>%s</strong> is not a valid Tracking ID!'; //%s: the child tracking ID
+$hesklang['is_already_linked'] = '<strong>%s</strong> is already linked to this ticket.'; //%s: the child tracking ID
+$hesklang['link_added'] = 'Successfully linked <strong>%s</strong> to this ticket.'; //%s: the child tracking ID
+$hesklang['ticket_no_longer_linked'] = 'Ticket is no longer linked.';
+$hesklang['unlink'] = 'Unlink';
+
+// ADDED OR MODIFIED IN Mods for HESK 2.6.0
+$hesklang['search_logs'] = 'Search Logs';
+$hesklang['date_logged'] = 'Date Logged';
+$hesklang['from_date'] = 'From Date';
+$hesklang['to_date'] = 'To Date';
+$hesklang['severity'] = 'Severity';
+$hesklang['debug'] = 'Debug';
+$hesklang['warning_title_case'] = 'Warning';
+$hesklang['logs'] = 'Logs';
+$hesklang['view_message_log'] = 'View Message Log';
+$hesklang['can_view_logs'] = 'Can view message logs';
+$hesklang['attachment_viewer_message'] = "Drag files here or click the 'Add File' button below to select files to upload.";
+$hesklang['attachment_invalid_type_message'] = 'Sorry, but the file type you tried to upload is not allowed.';
+$hesklang['attachment_upload_error'] = 'An error occurred when trying to upload. Please try again later.';
+$hesklang['attachment_too_large'] = 'This attachment is larger than the max filesize permitted.';
+$hesklang['attachment_cancel'] = 'Cancel';
+$hesklang['attachment_confirm_cancel'] = 'Are you sure you want to cancel this upload?';
+$hesklang['attachment_remove'] = 'Remove attachment';
+$hesklang['due_date'] = 'Due Date';
+$hesklang['category_color'] = 'Color';
+$hesklang['category_color_help'] = 'The hex code for the color to be used on the view ticket screen and calendar. Leave blank for no color';
+$hesklang['category_updated'] = 'Changes to <i>%s</i> have been saved';
+$hesklang['new_event'] = 'New Event';
+$hesklang['create_event'] = 'Create Event';
+$hesklang['event_title'] = 'Title';
+$hesklang['event_title_tooltip'] = 'The title of the event';
+$hesklang['event_location'] = 'Location';
+$hesklang['event_location_tooltip'] = 'The location of the event';
+$hesklang['event_category_tooltip'] = 'Category for the event';
+$hesklang['event_start'] = 'Start';
+$hesklang['event_start_tooltip'] = 'The starting date (and time) of the event';
+$hesklang['event_start_date'] = 'Start Date';
+$hesklang['event_start_time'] = 'Start Time';
+$hesklang['event_all_day'] = 'All day';
+$hesklang['event_end'] = 'End';
+$hesklang['event_end_tooltip'] = 'The ending date (and time) of the event';
+$hesklang['event_end_date'] = 'End Date';
+$hesklang['event_end_time'] = 'End Time';
+$hesklang['event_reminder'] = 'Reminder';
+$hesklang['event_reminder_tooltip'] = 'Receive an e-mail reminder for this event. Only you will receive this reminder email.';
+$hesklang['event_min_before_event'] = 'minutes before event';
+$hesklang['event_hours_before_event'] = 'hours before event';
+$hesklang['event_days_before_event'] = 'days before event';
+$hesklang['event_weeks_before_event'] = 'weeks before event';
+$hesklang['event_comments'] = 'Comments';
+$hesklang['event_comments_tooltip'] = 'Additional comments about the event';
+$hesklang['event_create_ticket'] = 'Create Ticket';
+$hesklang['to_title_case'] = 'To';
+$hesklang['clear_for_no_due_date'] = 'Clear for no due date';
+$hesklang['ticket_due_date_updated'] = 'Ticket due date successfully updated';
+$hesklang['error_updating_ticket_due_date'] = 'An error occurred when trying to update the ticket due date';
+$hesklang['error_loading_events'] = 'An error occurred when trying to load events';
+$hesklang['error_deleting_event'] = 'An error occurred when trying to delete the event';
+$hesklang['event_deleted'] = 'Event successfully deleted';
+$hesklang['event_created'] = 'Event successfully created';
+$hesklang['error_creating_event'] = 'An error occurred when trying to create the event';
+$hesklang['event_updated'] = 'Event successfully updated';
+$hesklang['error_updating_event'] = 'An error occurred when trying to update the event';
+$hesklang['calendar_title_case'] = 'Calendar';
+$hesklang['calendar_categories'] = 'Categories';
+$hesklang['can_man_calendar'] = 'Can manage calendar events';
+$hesklang['calendar_reminder'] = 'Upcoming Event: %%TITLE%%';
+$hesklang['overdue_ticket'] = '[%%TRACKID%%] Ticket Overdue!';
+$hesklang['notify_overdue_unassigned'] = 'A ticket is overdue not assigned to me';
+$hesklang['calendar_settings'] = 'Calendar Settings';
+$hesklang['enable_calendar'] = 'Enable calendar';
+$hesklang['enable_calendar_help'] = 'Setting to enable / disable the calendar. The calendar can be shown to everyone, staff only, or disable the calendar entirely.';
+$hesklang['yes_enable_calendar'] = '<b>YES</b>, enable calendar';
+$hesklang['yes_enable_calendar_staff_only'] = '<b>YES</b>, enable calendar, but only for staff';
+$hesklang['no_disable_calendar'] = '<b>NO</b>, disable calendar';
+$hesklang['first_day_of_week'] = 'First day of week';
+$hesklang['first_day_of_week_help'] = 'This setting decides which day of the week to show first per week.';
+$hesklang['calendar_disabled'] = 'The calendar is disabled';
+$hesklang['default_view'] = 'Default Calendar View';
+$hesklang['default_view_help'] = 'Decide which view will be shown to customers and staff by default when viewing the calendar. Staff can change this setting via their own profile.';
+$hesklang['week'] = 'Week';
+$hesklang['calendar_day'] = 'Day';
+$hesklang['calendar_index'] = 'View upcoming events';
+$hesklang['usage'] = 'Usage';
+$hesklang['tickets_and_events'] = 'Tickets and events';
+$hesklang['tickets_only'] = 'Tickets only';
+$hesklang['events_only'] = 'Events only';
+$hesklang['events'] = 'Events';
+$hesklang['add_files'] = '<i class="fa fa-plus"></i> Add File';
+$hesklang['select_all_title_case'] = 'Select All';
+$hesklang['deselect_all_title_case'] = 'Deselect All';
+$hesklang['event'] = 'Event';
+$hesklang['overdue_ticket_legend'] = 'Overdue ticket';
+$hesklang['attachment_max_exceeded'] = 'This file will not be uploaded becuase you have already uploaded the maximum number of files allowed.';
+
+// ADDED OR MODIFIED IN Mods for HESK 3.0.0
+$hesklang['you_have_x_messages'] = 'You have %s new %s'; // %s: Number of new messages, "message" or "messages", depending on #
+$hesklang['message_lower_case'] = 'message';
+$hesklang['messages_lower_case'] = 'messages';
+$hesklang['deleted_user_title_case'] = 'Deleted User';
+$hesklang['x_system_warnings'] = '%s System %s'; // %s: Number of warnings, $s: "Warning" or "Warnings", depending on #
+$hesklang['warnings_title_case'] = 'Warnings';
+$hesklang['articles_in_category_x'] = 'Articles in Category %s'; // %s: category name
+$hesklang['private_category_star'] = 'Private categories indicated by *';
+$hesklang['private_article_star'] = 'Private articles indicated by *';
+$hesklang['ticket_details'] = 'Ticket Details';
+$hesklang['more'] = 'More';
+$hesklang['click_to_edit'] = 'Click to edit';
+$hesklang['no_device_information'] = 'No device information';
+$hesklang['message_colon'] = 'Message:';
+$hesklang['original_message'] = 'Original message';
+$hesklang['reply_by_customer'] = 'Reply by customer';
+$hesklang['reply_by_staff'] = 'Reply by staff';
+$hesklang['timeline_today'] = 'Today';
+$hesklang['no_notes_for_this_ticket'] = 'No notes for this ticket';
+$hesklang['private_message_header'] = 'Private Message';
+$hesklang['date_colon'] = 'Date:';
+$hesklang['api_information'] = 'API Information';
+$hesklang['api_version'] = 'API Version';
+$hesklang['external_api'] = 'External API';
+$hesklang['external_api_help'] = 'Enable or Disable the external REST API';
+$hesklang['disabled_title_case'] = 'Disabled';
+$hesklang['enabled_title_case'] = 'Enabled';
+$hesklang['api_settings'] = 'API Settings';
+$hesklang['user_security'] = 'User Security';
+$hesklang['api_documentation'] = 'API Documentation';
+$hesklang['changes_saved'] = 'Changes saved!';
+$hesklang['save_failed_check_logs'] = 'Saving changes failed. Check the logs for more information.';
+$hesklang['number_of_tokens'] = 'Number of Tokens';
+$hesklang['generate_new_token'] = 'Generate New Token';
+$hesklang['revoke_all_tokens'] = 'Revoke All Tokens';
+$hesklang['generated_token_colon'] = 'Generated Token:';
+$hesklang['record_this_token_warning'] = 'Please record this token, as this is the only time you will be able to view it!';
+$hesklang['all_tokens_revoked'] = 'All tokens for this user have been revoked';
+$hesklang['staff_login_title'] = 'Staff Login';
+$hesklang['manage_custom_fields'] = 'Manage Custom Fields';
+$hesklang['value'] = 'Value';
+$hesklang['readonly'] = 'Readonly';
+$hesklang['copy_ticket'] = 'Copy Ticket';
+$hesklang['canned_responses_dropdown_title'] = 'Canned Responses';
+$hesklang['helpdesk_settings'] = 'Helpdesk Settings';
+$hesklang['click_to_toggle'] = 'Click to toggle';
+$hesklang['see_all_messages'] = 'See All Messages';
+$hesklang['color_scheme'] = 'Color Scheme';
+$hesklang['color_scheme_help'] = 'The color scheme for the backend to use.';
 
-// Added or modified in version 2.7.0
-$hesklang['imap']='IMAP Fetching';
-$hesklang['imaph']='IMAP Host';
-$hesklang['imapp']='IMAP Port';
-$hesklang['enc']='Encryption';
-$hesklang['ssl']='SSL';
-$hesklang['tls']='TLS';
-$hesklang['none']='None';
-$hesklang['imapu']='IMAP Username';
-$hesklang['imapw']='IMAP Password';
-$hesklang['imaptest']='Test IMAP connection';
-$hesklang['ifd']='[HESK] IMAP FETCHING IS DISABLED IN SETTINGS';
-$hesklang['iei']='[HESK] PHP IMAP extension is not installed.';
-$hesklang['ifr']='Another IMAP fetching task is still in progress.';
-$hesklang['arp']='Auto reload page';
-$hesklang['arpp']='Automatically reload page with ticket list every:';
-$hesklang['seconds']='seconds'; // Reload page every X 'seconds'
-$hesklang['minutes']='minutes'; // Reload page every X 'minutes'
-$hesklang['atbr']='This ticket needs to be assigned before it can be replied to.';
-$hesklang['attm']='Assign this ticket to me';
-$hesklang['owneed']='Owner needed';
-$hesklang['taat']='This ticket is already assigned to <b>%s</b>.';
-$hesklang['scoy']='Are you sure you want to assign it to yourself?';
-$hesklang['scot']='Are you sure you want to assign it to %s?';
-$hesklang['ycto']='YES, change the owner';
-$hesklang['ncto']='NO, keep current owner';
-$hesklang['fass']='Require owner';
-$hesklang['req_sub']='Require subject';
-$hesklang['req_msg']='Require message';
-$hesklang['req_email']='Require email';
-$hesklang['default_subject']='Ticket from %s'; // Default ticket subject, %s will be replaced with name
-$hesklang['off-hide']='Hide in customer form';
-$hesklang['ons']='ON - Everyone'; // For admin settings page
-$hesklang['not_valid_email']='Enter a valid email address or leave this field empty';
-$hesklang['write_down']='<span style="color:red">We recommend that you write down your Ticket ID for future reference.</span>';
-$hesklang['re_confirm1']='Disabling this will also disable "Require email to view tickets" under "Security". Proceed?';
-$hesklang['re_confirm2']='Enabling this will also enable "Require email" under "Features". Proceed?';
-$hesklang['can_email_tpl']='Edit email templates'; // Staff permission
-$hesklang['et_title']='Email templates';
-$hesklang['et_intro']='Modify emails that are sent to your staff and customers';
-$hesklang['file']='File';
-$hesklang['efile']='Editing file';
-$hesklang['rdesc']='(Recipient) Description';
-$hesklang['desc_forgot_ticket_id']       = '(Customer) Forgot ticket tracking ID';
-$hesklang['desc_new_reply_by_staff']     = '(Customer) New staff reply';
-$hesklang['desc_new_ticket']             = '(Customer) Ticket received';
-$hesklang['desc_ticket_closed']          = '(Customer) Ticket closed/resolved';
-$hesklang['desc_category_moved']         = '(Staff) Ticket moved to a new category';
-$hesklang['desc_new_reply_by_customer']  = '(Staff) New customer reply';
-$hesklang['desc_new_ticket_staff']       = '(Staff) New ticket submitted';
-$hesklang['desc_ticket_assigned_to_you'] = '(Staff) A ticket was assigned to you';
-$hesklang['desc_new_pm']                 = '(Staff) New private message';
-$hesklang['desc_new_note']               = '(Staff) New note on a ticket assigned to you';
-$hesklang['desc_reset_password']         = '(Staff) Reset your password';
-$hesklang['etfm']='One or more email templates are missing.<br /><br />Make sure you upload all email template files inside your <i>/language/%s/emails</i> folder.';
-$hesklang['etfw']='Some email templates are not writable.<br /><br />
-                    Make sure PHP has permission to write to all files inside your <i>/language/%s/emails</i> folder.<br /><br />
-                    On Unix servers you might need to CHMOD email templates to 666 (rw-rw-rw-)';
-$hesklang['et_e_id']='Missing template ID';
-$hesklang['et_fm']='This email template file is missing';
-$hesklang['et_fw']='This email template file is not writable';
-$hesklang['et_save']='Save email template';
-$hesklang['updated_on']='Updated on';
-$hesklang['ticket_url']='Ticket URL';
-$hesklang['pm_url']='Private message URL';
-$hesklang['et_num']='Number of tickets';
-$hesklang['et_list']='List of support tickets';
-$hesklang['et_empty']='Email template cannot be empty';
-$hesklang['et_saved']='Email template saved';
-$hesklang['source']='Source';
-$hesklang['select_category']='Select a category';
-$hesklang['select_category_text']='What can we help you with?';
-$hesklang['select_category_staff']='Select ticket category';
-$hesklang['scat']='Category select limit';
-$hesklang['scat2']='(a select box will show if category count is higher)';
-$hesklang['new_cf']='New custom field';
-$hesklang['cf_intro']='Use this feature to add custom fields to the Submit a ticket form so you can collect additional data from customers.';
-$hesklang['cf_public']='Public';
-$hesklang['cf_private']='Staff only';
-$hesklang['cf_cust']='For customers';
-$hesklang['cf_all']='All';
-$hesklang['cf_cat']='Selected';
-$hesklang['cf_ctrl']='Tip: hold down CTRL key to select multiple categories';
-$hesklang['visibility']='Visibility';
-$hesklang['cf_save']='Save custom field';
-$hesklang['ex_cf']='Active custom fields';
-$hesklang['no_cf']='No active custom fields';
-$hesklang['del_cf']='Delete this custom field? This will also delete any saved custom field data from the database!';
-$hesklang['cf_e_id']='Invalid ID';
-$hesklang['edit_cf']='Edit custom field';
-$hesklang['cf_deleted']='Custom field deleted';
-$hesklang['cf_not_found']='This custom field does not exist';
-$hesklang['err_custname']='Enter custom field name';
-$hesklang['cf_added']='A new custom field has been added';
-$hesklang['cf_nocat']='Select at least one category for this custom field';
-$hesklang['cf_mdf']='Custom field has been saved';
-$hesklang['opt4']='Options for this checkbox, enter one option per line. Each line will be a choice your customers can choose from, multiple choices are possible.';
-$hesklang['atl1']='Enter at least one option.';
-$hesklang['sch']='Hidden';
-$hesklang['meml3']='Allow multiple emails to be entered';
-$hesklang['dmin']='Minimum accepted date';
-$hesklang['dmax']='Maximum accepted date';
-$hesklang['d_day']='day(s)';
-$hesklang['d_week']='week(s)';
-$hesklang['d_month']='month(s)';
-$hesklang['d_year']='year(s)';
-$hesklang['d_any']='Any date';
-$hesklang['d_fixed']='Fixed date';
-$hesklang['d_relative']='Relative date';
-$hesklang['d_mm']='Minimum date may not be higher than maximum date';
-$hesklang['d_emin']='Minimum date for <i>%s</i> is %s'; // Minimum date for FIELD_NAME is DATE
-$hesklang['d_emax']='Maximum date for <i>%s</i> is %s'; // Maximum date for FIELD_NAME is DATE
-$hesklang['d_format']='Date display format';
-$hesklang['d_custom']='Custom format';
-$hesklang['d_ci']='ADVANCED USERS ONLY: a valid PHP date format, see PHP manual.';
-$hesklang['cf_noe']='Enter a valid email address into <i>%s</i>';
-$hesklang['cf_noem']='Enter one or more valid email addresses into <i>%s</i>';
-$hesklang['cf_limit']='You have 50 active custom fields, no new can be created.';
-$hesklang['can_resolve']='Can resolve tickets';
-$hesklang['can_change_cat']='Change ticket category (to any)';
-$hesklang['can_change_own_cat']='Change ticket category (to allowed)';
-$hesklang['can_submit_any_cat']='Can submit tickets to any category';
-$hesklang['noauth_submit']='You are not authorized to submit tickets to this category!';
-$hesklang['noauth_move']='You are not authorized to move tickets to this category!';
-$hesklang['noauth_resolve']='You are not authorized to resolve tickets!';
-$hesklang['force_ssl']='Force SSL connections';
-$hesklang['d_ssl']='<i>disabled</i> - open this page with https:// to manage this option';
-$hesklang['enn']='Except for tickets from emails if email subject contains:';
-$hesklang['scno']='This status cannot be changed';
-$hesklang['statuses']='Statuses';
-$hesklang['statuses_intro']='Use this tool to add custom ticket statuses to your help desk';
-$hesklang['color']='Color';
-$hesklang['csscl']='CSS class or color';
-$hesklang['clr_view']='Color preview on text';
-$hesklang['cbc']='Changeable by customers';
-$hesklang['ccc']='Can customers change this status?';
-$hesklang['del_status']='Delete this status?';
-$hesklang['ex_status']='Existing statuses';
-$hesklang['status_hesk']='Built-in Statuses (cannot be modified here)';
-$hesklang['status_custom']='Custom Statuses';
-$hesklang['status_custom_none']='No custom statuses. You can add them using the form above.';
-$hesklang['status_save']='Save status';
-$hesklang['list_tkt_status']='List all tickets with this status';
-$hesklang['new_status']='New custom status';
-$hesklang['edit_status']='Edit custom status';
-$hesklang['err_status']='Enter the status name';
-$hesklang['status_added']='A new custom status has been added';
-$hesklang['status_e_id']='Invalid ID';
-$hesklang['status_mdf']='Custom status has been saved';
-$hesklang['status_deleted']='Custom status deleted';
-$hesklang['status_not_found']='This custom status does not exist';
-$hesklang['status_not_empty']='This status cannot be removed because tickets with this status exist';
-$hesklang['status_limit']='You have 100 custom statuses, no new can be created.';
-$hesklang['public_link']='Public link'; // Link to the public KB article in the private KB pages
-$hesklang['frames']='Frames';
-$hesklang['frames2']='Prevent loading HESK in frames on third party domains';
-$hesklang['numsub']='Submitted tickets'; // Will show how many tickets this user submitted
-$hesklang['hidf']='Hidden inputs are not visible to customers on the Submit a ticket form (the value will still be visible on ticket details page if they are set as public). They behave as normal text fields for staff members.';
-$hesklang['rcheck']='Do not select a default option';
-$hesklang['refresh_page']='Refresh this page';
-$hesklang['banemail']='Ban emails';
-$hesklang['banip']='Ban IPs';
-$hesklang['tab_4']='Custom fields';
-$hesklang['del_kba']='Delete this article';
-$hesklang['del_kbaa']='Permanently delete this article';
-$hesklang['hni1']='HESK not installed yet?';
-$hesklang['hni2']='It appears that this help desk has not been properly installed and configured yet.';
-$hesklang['hni3']='To install HESK, follow <a href="docs/">Instructions in the documentation</a>';
-$hesklang['cf']='Cache folder';
-$hesklang['e_cdir']='Hesk will not be able to parse emails or cache results unless the cache folder exists and is writable.';
-$hesklang['step1']='Step 1';
-$hesklang['step2']='Step 2';
-$hesklang['dffs']='When download completes, delete the file from server';
-$hesklang['fd']='Export file deleted from server';
+// ADDED OR MODIFIED IN Mods for HESK 3.1.0
+$hesklang['stack_trace_header'] = 'Stack Trace';
+$hesklang['ticket_message_contents_exist'] = 'The ticket message is not empty. Are you sure you want to leave this page?';
+$hesklang['resend_email_notification'] = 'Re-send Email Notification';
+$hesklang['email_notification_sent'] = 'Email notification sent!';
+$hesklang['email_notification_resend_failed'] = 'Error occurred when trying to send notification email.';
+$hesklang['edit_category'] = 'Edit Category';
+$hesklang['custom_nav_menu_elements'] = 'Custom Nav Menu Elements';
+$hesklang['create_new'] = 'Create New';
+$hesklang['custom_nav_element_deleted'] = 'Custom Navigation Element Deleted!';
+$hesklang['no_custom_nav_elements_found'] = 'No custom nav menu elements found';
+$hesklang['alert_success'] = 'Success'; // Used for alert messages
+$hesklang['alert_error'] = 'Error'; // Used for alert messages
+$hesklang['failed_to_load_custom_nav_elements'] = 'Failed to load custom nav elements!';
+$hesklang['custom_nav_element_deleted'] = 'Custom nav element deleted!';
+$hesklang['error_deleting_custom_nav_element'] = 'Error deleting custom nav element!';
+$hesklang['error_sorting_custom_nav_elements'] = 'Error sorting custom nav elements!';
+$hesklang['custom_nav_element_created'] = 'Custom nav element created!';
+$hesklang['custom_nav_element_saved'] = 'Custom nav element saved!';
+$hesklang['homepage_block'] = 'Homepage - Block';
+$hesklang['customer_navigation'] = 'Customer Navigation';
+$hesklang['staff_navigation'] = 'Staff Navigation';
+$hesklang['custom_nav_text'] = 'Text';
+$hesklang['custom_nav_subtext'] = 'Subtext';
+$hesklang['image_url_slash_font_icon'] = 'Image URL / Font Icon';
+$hesklang['edit_custom_nav_element_title_case'] = 'Edit Custom Nav Element';
+$hesklang['create_custom_nav_element_title_case'] = 'Create Custom Nav Element';
+$hesklang['place'] = 'Place';
+$hesklang['image_type'] = 'Image Type';
+$hesklang['image_url'] = 'Image URL';
+$hesklang['image_url_help'] = 'The URL of the image you wish to use. For customer/staff navigation, recommended size is <b>16x16px</b>. For the homepage blocks, recommended size is <b>32x32px</b>.';
+$hesklang['font_icon'] = 'Font Icon';
+$hesklang['error_saving_custom_nav_element'] = 'Error saving custom nav element!';
+$hesklang['place_help'] = 'The location of the custom navigation element.';
+$hesklang['url_help'] = 'The URL where the user should be taken to. Both relative and absolute URLs are supported.';
+$hesklang['common_properties'] = 'Common Properties';
+$hesklang['customer_view'] = 'Customer View';
+$hesklang['admin_panel'] = 'Admin Panel';
 
 // DO NOT CHANGE BELOW
 if (!defined('IN_SCRIPT')) die('PHP syntax OK!');

From 3b0874db497260a714dd731c51377abd0ba5323b Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Mon, 29 May 2017 21:39:58 -0400
Subject: [PATCH 148/192] Add nav menu element for custom nav elements and
 security value

---
 api/BusinessLogic/Security/UserContext.php |  6 +++++-
 inc/common.inc.php                         |  1 +
 inc/show_admin_nav.inc.php                 | 15 +++++++++++++++
 language/en/text.php                       |  2 ++
 4 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/api/BusinessLogic/Security/UserContext.php b/api/BusinessLogic/Security/UserContext.php
index dd6cebd4..0beedc07 100644
--- a/api/BusinessLogic/Security/UserContext.php
+++ b/api/BusinessLogic/Security/UserContext.php
@@ -69,7 +69,11 @@ class UserContext {
         $userContext->email = $dataRow['email'];
         $userContext->signature = $dataRow['signature'];
         $userContext->language = $dataRow['language'];
-        $userContext->categories = explode(',', $dataRow['categories']);
+        if (is_array($dataRow['categories'])) {
+            $userContext->categories = $dataRow['categories'];
+        } else {
+            $userContext->categories = explode(',', $dataRow['categories']);
+        }
         $userContext->permissions = explode(',', $dataRow['heskprivileges']);
         $userContext->autoAssign = boolval($dataRow['autoassign']);
         $userContext->ratingNegative = intval($dataRow['ratingneg']);
diff --git a/inc/common.inc.php b/inc/common.inc.php
index c4a7d237..d2eadaca 100644
--- a/inc/common.inc.php
+++ b/inc/common.inc.php
@@ -2032,6 +2032,7 @@ function hesk_getFeatureArray()
         'can_change_notification_settings', /* User can change notification settings */
         'can_view_logs', /* User can view the message logs */
         'can_man_calendar', /* User can manage calendar events */
+        'can_man_custom_nav', /* User can manage custom nav elements */
     );
 }
 
diff --git a/inc/show_admin_nav.inc.php b/inc/show_admin_nav.inc.php
index f26f1beb..e4e140cc 100644
--- a/inc/show_admin_nav.inc.php
+++ b/inc/show_admin_nav.inc.php
@@ -438,6 +438,21 @@ $mails = mfh_get_mail_headers_for_dropdown($_SESSION['id'], $hesk_settings, $hes
                             </a>
                         </li>';
                     }
+                    if (hesk_checkPermission('can_man_custom_nav', 0)) {
+                        $number_of_settings++;
+                        $active = '';
+                        if (defined('PAGE_TITLE') && PAGE_TITLE == 'ADMIN_CUSTOM_NAV_ELEMENTS') {
+                            $active = 'active';
+                        }
+
+                        $markup .= '
+                        <li class="' . $active . '">
+                            <a href="manage_custom_nav_elements.php">
+                                <i class="fa fa-fw fa-navicon" ' . $iconDisplay . '></i>
+                                <span>' . $hesklang['manage_custom_nav_elements'] . '</span>
+                            </a>
+                        </li>';
+                    }
                     if ($number_of_settings > 0 &&
                         (hesk_checkPermission('can_view_logs', 0) || hesk_checkPermission('can_man_settings', 0))) {
                         $markup .= '<li class="divider"></li>';
diff --git a/language/en/text.php b/language/en/text.php
index 2ab4608c..ab5ae57e 100644
--- a/language/en/text.php
+++ b/language/en/text.php
@@ -2125,6 +2125,8 @@ $hesklang['url_help'] = 'The URL where the user should be taken to. Both relativ
 $hesklang['common_properties'] = 'Common Properties';
 $hesklang['customer_view'] = 'Customer View';
 $hesklang['admin_panel'] = 'Admin Panel';
+$hesklang['manage_custom_nav_elements'] = 'Manage Custom Nav Elements';
+$hesklang['can_man_custom_nav'] = 'Can manage custom nav elements';
 
 // DO NOT CHANGE BELOW
 if (!defined('IN_SCRIPT')) die('PHP syntax OK!');

From ad4724ed696b10fff13d32ab9febc6e32232620e Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Mon, 29 May 2017 21:58:50 -0400
Subject: [PATCH 149/192] Styling for items that can now be viewed inline

---
 css/mods-for-hesk-new.css             | 1 +
 inc/view_attachment_functions.inc.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/css/mods-for-hesk-new.css b/css/mods-for-hesk-new.css
index d5a386e5..89e011d8 100644
--- a/css/mods-for-hesk-new.css
+++ b/css/mods-for-hesk-new.css
@@ -111,6 +111,7 @@
 }
 
 
+.attachment-table > tbody > tr > td > a > i,
 .attachment-table > tbody > tr > td > i,
 .dropdown-empty > i {
     color: #ddd;
diff --git a/inc/view_attachment_functions.inc.php b/inc/view_attachment_functions.inc.php
index a5259213..2418ad0c 100644
--- a/inc/view_attachment_functions.inc.php
+++ b/inc/view_attachment_functions.inc.php
@@ -56,7 +56,7 @@ function mfh_listAttachments($attachments = '', $reply = 0, $is_staff)
                 echo '<i class="fa fa-ban fa-4x" data-toggle="tooltip" title="' . $hesklang['attachment_removed'] . '"></i>';
             } else {
                 echo '<a class="mfp-iframe" data-toggle="lightbox-item" href="https://view.officeapps.live.com/op/embed.aspx?src=' . $path . '">
-                    <i class="' . $fontAwesomeIcon . ' fa-4x"></i>
+                    <i class="' . $fontAwesomeIcon . ' fa-4x" data-toggle="tooltip"  title="' . $hesklang['click_to_preview'] . '"></i>
                 </a>';
             }
         } else {

From 21d00049ba3ca6bf7737420cd6440395d26a0606 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Mon, 29 May 2017 22:03:46 -0400
Subject: [PATCH 150/192] Fix URL

---
 inc/view_attachment_functions.inc.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/inc/view_attachment_functions.inc.php b/inc/view_attachment_functions.inc.php
index 2418ad0c..3aee6e88 100644
--- a/inc/view_attachment_functions.inc.php
+++ b/inc/view_attachment_functions.inc.php
@@ -51,11 +51,12 @@ function mfh_listAttachments($attachments = '', $reply = 0, $is_staff)
         } elseif (in_array($fontAwesomeIcon, array('fa fa-file-word-o', 'fa fa-file-excel-o', 'fa fa-file-powerpoint-o'))) {
             //-- Get the actual image location and display a thumbnail. It will be linked to a modal to view a larger size.
             $path = mfh_getSavedNameUrlForAttachment($att_id, $is_staff);
+            $apiPath = preg_replace('/https?:\/\//i', '', $hesk_settings['hesk_url'] . '/api/index.php/v1/tickets/' . $trackingID . '/attachments/' . $att_id);
 
             if ($path == '') {
                 echo '<i class="fa fa-ban fa-4x" data-toggle="tooltip" title="' . $hesklang['attachment_removed'] . '"></i>';
             } else {
-                echo '<a class="mfp-iframe" data-toggle="lightbox-item" href="https://view.officeapps.live.com/op/embed.aspx?src=' . $path . '">
+                echo '<a class="mfp-iframe" data-toggle="lightbox-item" href="https://view.officeapps.live.com/op/embed.aspx?src=' . $apiPath . '">
                     <i class="' . $fontAwesomeIcon . ' fa-4x" data-toggle="tooltip"  title="' . $hesklang['click_to_preview'] . '"></i>
                 </a>';
             }

From a043dced97b09f27f511c10a5c90d74a17891b67 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Tue, 30 May 2017 13:02:39 -0400
Subject: [PATCH 151/192] Getting started on enhanced color changes

---
 admin/manage_categories.php              | 82 +++++++++++++++---------
 install/mods-for-hesk/sql/installSql.php |  3 +
 language/en/text.php                     |  5 +-
 3 files changed, 57 insertions(+), 33 deletions(-)

diff --git a/admin/manage_categories.php b/admin/manage_categories.php
index 2d642ad7..73b5d585 100644
--- a/admin/manage_categories.php
+++ b/admin/manage_categories.php
@@ -277,11 +277,15 @@ while ($mycat = hesk_dbFetchAssoc($res)) {
                     }
 
                     $tmp = $i ? 'White' : 'Blue';
-                    $style = '';
-                    if ($mycat['color'] == null) {
-                        $style .= 'color: black; border: solid 1px #000';
-                    } else {
-                        $style .= 'background: ' . $mycat['color'];
+                    $style = 'background: ' . $mycat['background_color'];
+                    $backgroundVolatile = 'background-volatile';
+                    if ($mycat['foreground_color'] != 'AUTO') {
+                        $style .= '; color: ' . $mycat['foreground_color'];
+                        $backgroundVolatile = '';
+
+                        if ($mycat['display_border_outline']) {
+                            $style .= '; border: solid 1px ' . $mycat['foreground_color'];
+                        }
                     }
                     $i = $i ? 0 : 1;
 
@@ -319,10 +323,12 @@ while ($mycat = hesk_dbFetchAssoc($res)) {
 
                     echo '
                 <tr data-category-id="' . $mycat['id'] . '" data-name="' . htmlspecialchars($mycat['name']) . '"
-                    data-color="'. htmlspecialchars($mycat['color']) . '" data-priority="' . $mycat['priority'] . '"
+                    data-foreground-color="' . htmlspecialchars($mycat['foreground_color']) . '"
+                    data-border="' . $mycat['display_border_outline'] . '"
+                    data-background-color="'. htmlspecialchars($mycat['background_color']) . '" data-priority="' . $mycat['priority'] . '"
                     data-manager="' . $mycat['manager'] . '" data-usage="'. $mycat['usage'] .'">
                 <td style="display: none">' . $mycat['id'] . '</td>
-                <td><span class="label background-volatile category-label" style="'.$style.'">' . $mycat['name'] . '</span></td>
+                <td><span class="label ' . $backgroundVolatile . ' category-label" style="'.$style.'">' . $mycat['name'] . '</span></td>
                 <td width="1" style="white-space: nowrap;">' . $priorities[$mycat['priority']]['formatted'] . '</td>
                 <td><a href="show_tickets.php?category=' . $mycat['id'] . '&amp;s_all=1&amp;s_my=1&amp;s_ot=1&amp;s_un=1" alt="' . $hesklang['list_tickets_cat'] . '" title="' . $hesklang['list_tickets_cat'] . '">' . $all . '</a></td>
                 <td>
@@ -386,15 +392,28 @@ while ($mycat = hesk_dbFetchAssoc($res)) {
                                 </div>
                             </div>
                             <div class="form-group">
-                                <label for="color" class="col-sm-3 control-label">
-                                    <?php echo $hesklang['category_color']; ?>
+                                <label for="background-color" class="col-sm-3 control-label">
+                                    <?php echo $hesklang['category_background_color']; ?>
+                                    <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
+                                       title="<?php echo htmlspecialchars($hesklang['category_background_color']); ?>"
+                                       data-content="<?php echo htmlspecialchars($hesklang['category_color_help']); ?>"></i>
+                                </label>
+                                <div class="col-sm-9">
+                                    <input type="text" name="background-color" class="form-control category-colorpicker"
+                                           placeholder="<?php echo $hesklang['category_background_color']; ?>">
+                                    <div class="help-block with-errors"></div>
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label for="foreground-color" class="col-sm-3 control-label">
+                                    <?php echo $hesklang['category_foreground_color']; ?>
                                     <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                                       title="<?php echo htmlspecialchars($hesklang['category_color']); ?>"
+                                       title="<?php echo htmlspecialchars($hesklang['category_foreground_color']); ?>"
                                        data-content="<?php echo htmlspecialchars($hesklang['category_color_help']); ?>"></i>
                                 </label>
                                 <div class="col-sm-9">
-                                    <input type="text" name="color" class="form-control category-colorpicker"
-                                           placeholder="<?php echo $hesklang['category_color']; ?>">
+                                    <input type="text" name="foreground-color" class="form-control category-colorpicker"
+                                           placeholder="<?php echo $hesklang['category_foreground_color']; ?>">
                                     <div class="help-block with-errors"></div>
                                 </div>
                             </div>
@@ -471,7 +490,8 @@ while ($mycat = hesk_dbFetchAssoc($res)) {
             var name = tempNameElement.value;
 
             var id = $row.attr('data-category-id');
-            var color = $row.attr('data-color');
+            var backgroundColor = $row.attr('data-background-color');
+            var foregroundColor = $row.attr('data-foreground-color');
             var priority = $row.attr('data-priority');
             var manager = $row.attr('data-manager');
             var usage = $row.attr('data-usage');
@@ -482,29 +502,29 @@ while ($mycat = hesk_dbFetchAssoc($res)) {
                 .find('select[name="manager"]').val(manager).end()
                 .find('input[name="id"]').val(id).end()
                 .find('select[name="usage"]').val(usage).end()
-                .find('input[name="color"]').val(color).end();
-
-            var colorpickerOptions = null;
-            if (color == '') {
-                colorpickerOptions = {
-                    format: 'hex'
-                };
-            } else {
-                colorpickerOptions = {
-                    format: 'hex',
-                    color: color
-                };
-            }
-            $modal.find('input[name="color"]')
+                .find('input[name="background-color"]').val(backgroundColor).end()
+                .find('input[name="foreground-color"]').val(foregroundColor).end();
+
+            var colorpickerOptions = {
+                format: 'hex',
+                color: backgroundColor
+            };
+            $modal.find('input[name="background-color"]')
                 .colorpicker(colorpickerOptions).end().modal('show');
+            colorpickerOptions = {
+                format: 'hex',
+                color: foregroundColor
+            };
 
-            if (color == '') {
-                $modal.find('input[name="color"]').val('');
-            }
+            $modal.find('input[name="foreground-color"]')
+                .colorpicker(colorpickerOptions).end().modal('show');
         });
 
         $('.cancel-callback').click(function() {
-            $('#edit-category-modal').find('input[name="color"]').val('').colorpicker('destroy').end();
+            var $editCategoryModal = $('#edit-category-modal');
+
+            $editCategoryModal.find('input[name="background-color"]').val('').colorpicker('destroy').end();
+            $editCategoryModal.find('input[name="foreground-color"]').val('').colorpicker('destroy').end();
         });
     });
 </script>
diff --git a/install/mods-for-hesk/sql/installSql.php b/install/mods-for-hesk/sql/installSql.php
index c9bd0063..b2faa81a 100644
--- a/install/mods-for-hesk/sql/installSql.php
+++ b/install/mods-for-hesk/sql/installSql.php
@@ -1006,6 +1006,9 @@ function execute310Scripts() {
          language VARCHAR(200) NOT NULL,
          text VARCHAR(200) NOT NULL,
          subtext VARCHAR(200))");
+    executeQuery("ALTER TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` ADD COLUMN `foreground_color` VARCHAR(7) NOT NULL DEFAULT 'AUTO'");
+    executeQuery("ALTER TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` ADD COLUMN `display_border_outline` ENUM('0','1') NOT NULL DEFAULT '0'");
+    executeQuery("ALTER TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` CHANGE `color` `background_color` VARCHAR(7) NOT NULL DEFAULT '#FFFFFF'");
 
     updateVersion('3.1.0');
 }
\ No newline at end of file
diff --git a/language/en/text.php b/language/en/text.php
index ab5ae57e..1ed96d5c 100644
--- a/language/en/text.php
+++ b/language/en/text.php
@@ -1965,8 +1965,6 @@ $hesklang['attachment_cancel'] = 'Cancel';
 $hesklang['attachment_confirm_cancel'] = 'Are you sure you want to cancel this upload?';
 $hesklang['attachment_remove'] = 'Remove attachment';
 $hesklang['due_date'] = 'Due Date';
-$hesklang['category_color'] = 'Color';
-$hesklang['category_color_help'] = 'The hex code for the color to be used on the view ticket screen and calendar. Leave blank for no color';
 $hesklang['category_updated'] = 'Changes to <i>%s</i> have been saved';
 $hesklang['new_event'] = 'New Event';
 $hesklang['create_event'] = 'Create Event';
@@ -2127,6 +2125,9 @@ $hesklang['customer_view'] = 'Customer View';
 $hesklang['admin_panel'] = 'Admin Panel';
 $hesklang['manage_custom_nav_elements'] = 'Manage Custom Nav Elements';
 $hesklang['can_man_custom_nav'] = 'Can manage custom nav elements';
+$hesklang['category_background_color'] = 'Background Color';
+$hesklang['category_foreground_color'] = 'Foreground Color';
+$hesklang['category_color_help'] = 'The hex code for the color to be used on the view ticket screen and calendar.';
 
 // DO NOT CHANGE BELOW
 if (!defined('IN_SCRIPT')) die('PHP syntax OK!');

From 523b80fb4caa3f6b69b5b83468f17c30c6e606d4 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Tue, 30 May 2017 22:05:20 -0400
Subject: [PATCH 152/192] Update the form for the new fields

---
 admin/manage_categories.php | 43 +++++++++++++++++++++++++++++++------
 language/en/text.php        |  2 ++
 2 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/admin/manage_categories.php b/admin/manage_categories.php
index 73b5d585..1be8a45e 100644
--- a/admin/manage_categories.php
+++ b/admin/manage_categories.php
@@ -400,7 +400,8 @@ while ($mycat = hesk_dbFetchAssoc($res)) {
                                 </label>
                                 <div class="col-sm-9">
                                     <input type="text" name="background-color" class="form-control category-colorpicker"
-                                           placeholder="<?php echo $hesklang['category_background_color']; ?>">
+                                           placeholder="<?php echo $hesklang['category_background_color']; ?>"
+                                           data-error="<?php echo htmlspecialchars($hesklang['this_field_is_required']); ?>">
                                     <div class="help-block with-errors"></div>
                                 </div>
                             </div>
@@ -413,10 +414,34 @@ while ($mycat = hesk_dbFetchAssoc($res)) {
                                 </label>
                                 <div class="col-sm-9">
                                     <input type="text" name="foreground-color" class="form-control category-colorpicker"
-                                           placeholder="<?php echo $hesklang['category_foreground_color']; ?>">
+                                           placeholder="<?php echo $hesklang['category_foreground_color']; ?>"
+                                           data-error="<?php echo htmlspecialchars($hesklang['this_field_is_required']); ?>"
+                                           required>
                                     <div class="help-block with-errors"></div>
                                 </div>
                             </div>
+                            <div class="form-group">
+                                <label for="display-border" class="col-sm-3 control-label">
+                                    <?php echo $hesklang['category_display_border']; ?>
+                                    <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
+                                       title="<?php echo htmlspecialchars($hesklang['category_display_border']); ?>"
+                                       data-content="<?php echo htmlspecialchars($hesklang['category_display_border_help']); ?>"></i>
+                                </label>
+                                <div class="col-sm-9 form-inline">
+                                    <div class="radio">
+                                        <label>
+                                            <input type="radio" name="display-border" value="1">
+                                            <?php echo $hesklang['yes']; ?>
+                                        </label>
+                                    </div>&nbsp;&nbsp;&nbsp;
+                                    <div class="radio">
+                                        <label>
+                                            <input type="radio" name="display-border" value="0" checked>
+                                            <?php echo $hesklang['no']; ?>
+                                        </label>
+                                    </div>
+                                </div>
+                            </div>
                             <div class="form-group">
                                 <label for="priority" class="col-sm-3 control-label">
                                     <?php echo $hesklang['priority']; ?>
@@ -649,9 +674,9 @@ function new_cat()
     /* Category name */
     $catname = hesk_input(hesk_POST('name'), $hesklang['enter_cat_name'], 'manage_categories.php');
 
-    $color = hesk_POST('color', null);
-    $color = str_replace('#', '', $color);
-    $color = $color != null ? "'#" . hesk_dbEscape($color) . "'" : 'NULL';
+    $background_color = hesk_POST('background-color', '#ffffff');
+    $foreground_color = hesk_POST('foreground-color', '#000000');
+    $display_border = hesk_POST('display-border', 0);
 
     $usage = hesk_POST('usage', 0);
 
@@ -667,7 +692,11 @@ function new_cat()
     $row = hesk_dbFetchRow($res);
     $my_order = $row[0] + 10;
 
-    hesk_dbQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` (`name`,`cat_order`,`autoassign`,`type`, `priority`, `color`, `usage`) VALUES ('" . hesk_dbEscape($catname) . "','" . intval($my_order) . "','" . intval($_SESSION['cat_autoassign']) . "','" . intval($_SESSION['cat_type']) . "','{$_SESSION['cat_priority']}', {$color}, " . intval($usage) . ")");
+    hesk_dbQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` 
+        (`name`,`cat_order`,`autoassign`,`type`, `priority`, `background_color`, `foreground_color`, `display_border_outline`, `usage`) VALUES 
+        ('" . hesk_dbEscape($catname) . "','" . intval($my_order) . "','" . intval($_SESSION['cat_autoassign']) . "',
+        '" . intval($_SESSION['cat_type']) . "','{$_SESSION['cat_priority']}', '" . hesk_dbEscape($background_color) . "', 
+        '" . hesk_dbEscape($foreground_color) . "', '" . intval($display_border) . "', " . intval($usage) . ")");
 
     hesk_cleanSessionVars('catname');
     hesk_cleanSessionVars('cat_autoassign');
@@ -867,6 +896,8 @@ function get_manager($user_id, $user_array) {
             return $user['name'];
         }
     }
+
+    return 'Error!';
 }
 
 ?>
diff --git a/language/en/text.php b/language/en/text.php
index 1ed96d5c..c3a51c6f 100644
--- a/language/en/text.php
+++ b/language/en/text.php
@@ -2128,6 +2128,8 @@ $hesklang['can_man_custom_nav'] = 'Can manage custom nav elements';
 $hesklang['category_background_color'] = 'Background Color';
 $hesklang['category_foreground_color'] = 'Foreground Color';
 $hesklang['category_color_help'] = 'The hex code for the color to be used on the view ticket screen and calendar.';
+$hesklang['category_display_border'] = 'Display Border';
+$hesklang['category_display_border_help'] = 'Choose to decide whether or not to display a border around the category (uses foreground color)';
 
 // DO NOT CHANGE BELOW
 if (!defined('IN_SCRIPT')) die('PHP syntax OK!');

From ac0df60a3e8ce4ab736b5d6e112151c48b7bd652 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Wed, 31 May 2017 22:05:24 -0400
Subject: [PATCH 153/192] Category colors are properly saved, calendar pages
 updated

---
 admin/calendar.php                            | 18 +++++--
 admin/manage_categories.php                   | 47 +++++++++++++------
 calendar.php                                  | 14 +++++-
 css/mods-for-hesk-new.css                     | 11 +++--
 install/mods-for-hesk/database-validation.php |  4 +-
 install/mods-for-hesk/sql/uninstallSql.php    |  4 +-
 internal-api/dao/calendar_dao.php             |  4 +-
 language/en/text.php                          |  5 +-
 8 files changed, 76 insertions(+), 31 deletions(-)

diff --git a/admin/calendar.php b/admin/calendar.php
index 6e582816..e02dde94 100644
--- a/admin/calendar.php
+++ b/admin/calendar.php
@@ -33,14 +33,26 @@ if ($modsForHesk_settings['enable_calendar'] == '0') {
 
 // Get categories for the dropdown
 $order_by = $modsForHesk_settings['category_order_column'];
-$rs = hesk_dbQuery("SELECT `id`, `name`, `color` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` WHERE `usage` <> 1 ORDER BY `" . hesk_dbEscape($order_by) . "`");
+$rs = hesk_dbQuery("SELECT `id`, `name`, `background_color`, `foreground_color`, `display_border_outline` 
+  FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` 
+  WHERE `usage` <> 1 ORDER BY `" . hesk_dbEscape($order_by) . "`");
 $categories = array();
 while ($row = hesk_dbFetchAssoc($rs)) {
     if (!$_SESSION['isadmin'] && !in_array($row['id'], $_SESSION['categories'])) {
         continue;
     }
 
-    $row['css_style'] = $row['color'] == null ? 'background: white; color: black; border: solid 1px #000;' : 'border: solid 1px ' . $row['color'] . '; background: ' . $row['color'];
+    $row['css_style'] = "background: {$row['background_color']};";
+    $row['background_volatile'] = 'background-volatile';
+    if ($row['foreground_color'] != 'AUTO') {
+        $row['background_volatile'] = '';
+        $row['css_style'] .= " color: {$row['foreground_color']};";
+
+        if ($row['display_border_outline'] == '1') {
+            $row['css_style'] .= " border: solid 1px {$row['foreground_color']};";
+        }
+    }
+
     $categories[] = $row;
 }
 
@@ -57,7 +69,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
             <?php foreach ($categories as $category): ?>
                 <li>
                     <div class="ticket-info">
-                        <div class="hide-on-overflow no-wrap event-category background-volatile"
+                        <div class="hide-on-overflow no-wrap event-category <?php echo $category['background_volatile']; ?>"
                              data-select-toggle="category-toggle" data-name="category-toggle" data-category-value="<?php echo $category['id']; ?>"
                              data-checked="1"
                              data-toggle="tooltip"
diff --git a/admin/manage_categories.php b/admin/manage_categories.php
index 1be8a45e..e0525904 100644
--- a/admin/manage_categories.php
+++ b/admin/manage_categories.php
@@ -287,6 +287,11 @@ while ($mycat = hesk_dbFetchAssoc($res)) {
                             $style .= '; border: solid 1px ' . $mycat['foreground_color'];
                         }
                     }
+
+                    if ($mycat['foreground_color'] == 'AUTO') {
+                        $mycat['foreground_color'] = '';
+                    }
+
                     $i = $i ? 0 : 1;
 
                     /* Number of tickets and graph width */
@@ -325,7 +330,8 @@ while ($mycat = hesk_dbFetchAssoc($res)) {
                 <tr data-category-id="' . $mycat['id'] . '" data-name="' . htmlspecialchars($mycat['name']) . '"
                     data-foreground-color="' . htmlspecialchars($mycat['foreground_color']) . '"
                     data-border="' . $mycat['display_border_outline'] . '"
-                    data-background-color="'. htmlspecialchars($mycat['background_color']) . '" data-priority="' . $mycat['priority'] . '"
+                    data-background-color="'. htmlspecialchars($mycat['background_color']) . '"
+                    data-priority="' . $mycat['priority'] . '"
                     data-manager="' . $mycat['manager'] . '" data-usage="'. $mycat['usage'] .'">
                 <td style="display: none">' . $mycat['id'] . '</td>
                 <td><span class="label ' . $backgroundVolatile . ' category-label" style="'.$style.'">' . $mycat['name'] . '</span></td>
@@ -334,7 +340,6 @@ while ($mycat = hesk_dbFetchAssoc($res)) {
                 <td>
                     <div class="progress" style="width: 160px; margin-bottom: 0" title="' . sprintf($hesklang['perat'], $width_all . '%') . '" data-toggle="tooltip">
                         <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="40" aria-valuemin="0" aria-valuemax="100" style="width: ' . $width_all . '%">
-                            <span class="sr-only">40% Complete (success)</span>
                         </div>
                     </div>
                 </td>
@@ -396,12 +401,13 @@ while ($mycat = hesk_dbFetchAssoc($res)) {
                                     <?php echo $hesklang['category_background_color']; ?>
                                     <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
                                        title="<?php echo htmlspecialchars($hesklang['category_background_color']); ?>"
-                                       data-content="<?php echo htmlspecialchars($hesklang['category_color_help']); ?>"></i>
+                                       data-content="<?php echo htmlspecialchars($hesklang['category_background_color_help']); ?>"></i>
                                 </label>
                                 <div class="col-sm-9">
                                     <input type="text" name="background-color" class="form-control category-colorpicker"
                                            placeholder="<?php echo $hesklang['category_background_color']; ?>"
-                                           data-error="<?php echo htmlspecialchars($hesklang['this_field_is_required']); ?>">
+                                           data-error="<?php echo htmlspecialchars($hesklang['this_field_is_required']); ?>"
+                                           required>
                                     <div class="help-block with-errors"></div>
                                 </div>
                             </div>
@@ -410,20 +416,18 @@ while ($mycat = hesk_dbFetchAssoc($res)) {
                                     <?php echo $hesklang['category_foreground_color']; ?>
                                     <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
                                        title="<?php echo htmlspecialchars($hesklang['category_foreground_color']); ?>"
-                                       data-content="<?php echo htmlspecialchars($hesklang['category_color_help']); ?>"></i>
+                                       data-content="<?php echo htmlspecialchars($hesklang['category_foreground_color_help']); ?>"></i>
                                 </label>
                                 <div class="col-sm-9">
                                     <input type="text" name="foreground-color" class="form-control category-colorpicker"
-                                           placeholder="<?php echo $hesklang['category_foreground_color']; ?>"
-                                           data-error="<?php echo htmlspecialchars($hesklang['this_field_is_required']); ?>"
-                                           required>
+                                           placeholder="<?php echo $hesklang['category_foreground_color']; ?>">
                                     <div class="help-block with-errors"></div>
                                 </div>
                             </div>
                             <div class="form-group">
                                 <label for="display-border" class="col-sm-3 control-label">
                                     <?php echo $hesklang['category_display_border']; ?>
-                                    <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
+                                    <i class="fa fa-question-circle settingsquestionmark" data-toggle="htmlpopover"
                                        title="<?php echo htmlspecialchars($hesklang['category_display_border']); ?>"
                                        data-content="<?php echo htmlspecialchars($hesklang['category_display_border_help']); ?>"></i>
                                 </label>
@@ -536,10 +540,13 @@ while ($mycat = hesk_dbFetchAssoc($res)) {
             };
             $modal.find('input[name="background-color"]')
                 .colorpicker(colorpickerOptions).end().modal('show');
+
             colorpickerOptions = {
-                format: 'hex',
-                color: foregroundColor
+                format: 'hex'
             };
+            if (foregroundColor != '') {
+                colorpickerOptions.color = foregroundColor;
+            }
 
             $modal.find('input[name="foreground-color"]')
                 .colorpicker(colorpickerOptions).end().modal('show');
@@ -677,6 +684,10 @@ function new_cat()
     $background_color = hesk_POST('background-color', '#ffffff');
     $foreground_color = hesk_POST('foreground-color', '#000000');
     $display_border = hesk_POST('display-border', 0);
+    if ($foreground_color == '') {
+        $foreground_color = 'AUTO';
+        $display_border = 0;
+    }
 
     $usage = hesk_POST('usage', 0);
 
@@ -725,9 +736,13 @@ function update_category()
     $catname = hesk_input(hesk_POST('name'), $hesklang['cat_ren_name'], $_SERVER['PHP_SELF']);
     $_SESSION['catname2'] = $catname;
 
-    $color = hesk_POST('color', null);
-    $color = str_replace('#', '', $color);
-    $color = $color != null ? "'#" . hesk_dbEscape($color) . "'" : 'NULL';
+    $background_color = hesk_POST('background-color', '#ffffff');
+    $foreground_color = hesk_POST('foreground-color', '#000000');
+    $display_border = hesk_POST('display-border', 0);
+    if ($foreground_color == '') {
+        $foreground_color = 'AUTO';
+        $display_border = 0;
+    }
     $manager = hesk_POST('manager', 0);
     $priority = hesk_POST('priority', 0);
     $usage = hesk_POST('usage', 0);
@@ -736,7 +751,9 @@ function update_category()
     hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` SET `name`='" . hesk_dbEscape($catname) . "',
      `priority` = '" . hesk_dbEscape($priority) . "',
      `manager` = " . intval($manager) . ",
-     `color` = " . $color . ",
+     `background_color` = '" . hesk_dbEscape($background_color) . "',
+     `foreground_color` = '" . hesk_dbEscape($foreground_color) . "',
+     `display_border_outline` = '" . intval($display_border) . "',
      `usage` = " . intval($usage) . "
      WHERE `id`='" . intval($catid) . "'");
 
diff --git a/calendar.php b/calendar.php
index ea1822f4..bb6a9ee0 100644
--- a/calendar.php
+++ b/calendar.php
@@ -31,7 +31,16 @@ $categorySql = "SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "c
 $categoryRs = hesk_dbQuery($categorySql);
 while ($row = hesk_dbFetchAssoc($categoryRs))
 {
-    $row['css_style'] = $row['color'] == null ? 'color: black; border: solid 1px #000; padding-right: 14px' : 'background: ' . $row['color'];
+    $row['css_style'] = "background: {$row['background_color']};";
+    $row['background_volatile'] = 'background-volatile';
+    if ($row['foreground_color'] != 'AUTO') {
+        $row['background_volatile'] = '';
+        $row['css_style'] .= " color: {$row['foreground_color']};";
+
+        if ($row['display_border_outline'] == '1') {
+            $row['css_style'] .= " border: solid 1px {$row['foreground_color']};";
+        }
+    }
     $categories[] = $row;
 }
 
@@ -55,7 +64,8 @@ require_once(HESK_PATH . 'inc/header.inc.php');
                             <div class="checkbox">
                                 <input type="checkbox" data-select-target="category-toggle" name="category-toggle" value="<?php echo $category['id']; ?>" checked>
                             </div>
-                            <div class="hide-on-overflow no-wrap event-category background-volatile" style="<?php echo $category['css_style']; ?>">
+                            <div class="hide-on-overflow no-wrap event-category <?php echo $category['background_volatile']; ?>"
+                                 style="<?php echo $category['css_style']; ?>">
                                 <?php echo $category['name']; ?>
                             </div>
                         </li>
diff --git a/css/mods-for-hesk-new.css b/css/mods-for-hesk-new.css
index 89e011d8..f0385a1d 100644
--- a/css/mods-for-hesk-new.css
+++ b/css/mods-for-hesk-new.css
@@ -267,16 +267,17 @@ div.ticket-info {
     color: #444;
 }
 
-.event-category:hover {
-    border: solid 1px #fff !important;
-    cursor: pointer;
-}
-
 .event-category[data-checked="0"] {
     background: #777 !important;
+    border: none !important;
     color: #aaa !important;
 }
 
+.event-category:hover {
+    border: solid 1px #fff !important;
+    cursor: pointer;
+}
+
 .anchor {
     padding-top: 50px;
     height: 0;
diff --git a/install/mods-for-hesk/database-validation.php b/install/mods-for-hesk/database-validation.php
index 707caf73..94b1f762 100644
--- a/install/mods-for-hesk/database-validation.php
+++ b/install/mods-for-hesk/database-validation.php
@@ -160,7 +160,9 @@ hesk_dbConnect();
             $all_good = $all_good & run_column_check('calendar_event_reminder', '`email_sent`');
             $all_good = $all_good & run_column_check('tickets', '`due_date`');
             $all_good = $all_good & run_column_check('tickets', '`overdue_email_sent`');
-            $all_good = $all_good & run_column_check('categories', '`color`');
+
+            // Changed in 3.1.0
+            //$all_good = $all_good & run_column_check('categories', '`color`');
             $all_good = $all_good & run_column_check('categories', '`usage`');
             $all_good = $all_good & run_column_check('users', '`notify_overdue_unassigned`');
             $all_good = $all_good & run_column_check('users', '`default_calendar_view`');
diff --git a/install/mods-for-hesk/sql/uninstallSql.php b/install/mods-for-hesk/sql/uninstallSql.php
index 681d2043..6d12cda5 100644
--- a/install/mods-for-hesk/sql/uninstallSql.php
+++ b/install/mods-for-hesk/sql/uninstallSql.php
@@ -94,7 +94,9 @@ function removeOtherColumns()
     executeQuery("DROP TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "calendar_event_reminder`");
     executeQuery("ALTER TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "tickets` DROP COLUMN `due_date`");
     executeQuery("ALTER TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "tickets` DROP COLUMN `overdue_email_sent`");
-    executeQuery("ALTER TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` DROP COLUMN `color`");
+    executeQuery("ALTER TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` DROP COLUMN `background_color`");
+    executeQuery("ALTER TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` DROP COLUMN `foreground_color`");
+    executeQuery("ALTER TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` DROP COLUMN `display_border_outline`");
     executeQuery("ALTER TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` DROP COLUMN `usage`");
     executeQuery("ALTER TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` DROP COLUMN `notify_overdue_unassigned`");
     executeQuery("ALTER TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` DROP COLUMN `default_calendar_view`");
diff --git a/internal-api/dao/calendar_dao.php b/internal-api/dao/calendar_dao.php
index 71ed2f75..a43bf67b 100644
--- a/internal-api/dao/calendar_dao.php
+++ b/internal-api/dao/calendar_dao.php
@@ -6,7 +6,7 @@ function get_events($start, $end, $hesk_settings, $staff = true) {
     $start_time_sql = "CONVERT_TZ(FROM_UNIXTIME(" . hesk_dbEscape($start) . " / 1000), @@session.time_zone, '+00:00')";
     $end_time_sql = "CONVERT_TZ(FROM_UNIXTIME(" . hesk_dbEscape($end) . " / 1000), @@session.time_zone, '+00:00')";
 
-    $sql = "SELECT `events`.*, `categories`.`name` AS `category_name`, `categories`.`color` AS `category_color` ";
+    $sql = "SELECT `events`.*, `categories`.`name` AS `category_name`, `categories`.`background_color` AS `category_color` ";
 
     if ($staff) {
         $sql .= ",`reminders`.`amount` AS `reminder_value`, `reminders`.`unit` AS `reminder_unit` ";
@@ -63,7 +63,7 @@ function get_events($start, $end, $hesk_settings, $staff = true) {
         $current_date = hesk_date();
         $hesk_settings['timeformat'] = $old_time_setting;
 
-        $sql = "SELECT `trackid`, `subject`, `due_date`, `category`, `categories`.`name` AS `category_name`, `categories`.`color` AS `category_color`,
+        $sql = "SELECT `trackid`, `subject`, `due_date`, `category`, `categories`.`name` AS `category_name`, `categories`.`background_color` AS `category_color`,
           CASE WHEN `due_date` < '{$current_date}' THEN 1 ELSE 0 END AS `overdue`, `owner`.`name` AS `owner_name`, `tickets`.`owner` AS `owner_id`,
            `tickets`.`priority` AS `priority`
         FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "tickets` AS `tickets`
diff --git a/language/en/text.php b/language/en/text.php
index c3a51c6f..cb790216 100644
--- a/language/en/text.php
+++ b/language/en/text.php
@@ -2127,9 +2127,10 @@ $hesklang['manage_custom_nav_elements'] = 'Manage Custom Nav Elements';
 $hesklang['can_man_custom_nav'] = 'Can manage custom nav elements';
 $hesklang['category_background_color'] = 'Background Color';
 $hesklang['category_foreground_color'] = 'Foreground Color';
-$hesklang['category_color_help'] = 'The hex code for the color to be used on the view ticket screen and calendar.';
+$hesklang['category_background_color_help'] = 'The hex code for the background color to be used on the view ticket screen and calendar.';
+$hesklang['category_foreground_color_help'] = 'The hex code for the foreground color to be used on the view ticket and calendar screens. Leave blank for automatic color based on background.';
 $hesklang['category_display_border'] = 'Display Border';
-$hesklang['category_display_border_help'] = 'Choose to decide whether or not to display a border around the category (uses foreground color)';
+$hesklang['category_display_border_help'] = 'Choose to decide whether or not to display a border around the category (uses foreground color). <b>This is ignored if foreground color is set to automatic.</b>';
 
 // DO NOT CHANGE BELOW
 if (!defined('IN_SCRIPT')) die('PHP syntax OK!');

From 028be8d187a4085bff65bbc3a37b9b435aa73644 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Thu, 1 Jun 2017 12:26:54 -0400
Subject: [PATCH 154/192] Calendar pages properly use new category colors

---
 internal-api/dao/calendar_dao.php             | 14 +++++++---
 .../mods-for-hesk-calendar-admin-readonly.js  | 22 +++++++++++-----
 .../mods-for-hesk-calendar-readonly.js        | 17 +++++++++---
 js/calendar/mods-for-hesk-calendar.js         | 26 +++++++++++++------
 4 files changed, 57 insertions(+), 22 deletions(-)

diff --git a/internal-api/dao/calendar_dao.php b/internal-api/dao/calendar_dao.php
index a43bf67b..9c87e458 100644
--- a/internal-api/dao/calendar_dao.php
+++ b/internal-api/dao/calendar_dao.php
@@ -6,7 +6,8 @@ function get_events($start, $end, $hesk_settings, $staff = true) {
     $start_time_sql = "CONVERT_TZ(FROM_UNIXTIME(" . hesk_dbEscape($start) . " / 1000), @@session.time_zone, '+00:00')";
     $end_time_sql = "CONVERT_TZ(FROM_UNIXTIME(" . hesk_dbEscape($end) . " / 1000), @@session.time_zone, '+00:00')";
 
-    $sql = "SELECT `events`.*, `categories`.`name` AS `category_name`, `categories`.`background_color` AS `category_color` ";
+    $sql = "SELECT `events`.*, `categories`.`name` AS `category_name`, `categories`.`background_color` AS `background_color`, 
+        `categories`.`foreground_color` AS `foreground_color`, `categories`.`display_border_outline` AS `display_border` ";
 
     if ($staff) {
         $sql .= ",`reminders`.`amount` AS `reminder_value`, `reminders`.`unit` AS `reminder_unit` ";
@@ -47,7 +48,9 @@ function get_events($start, $end, $hesk_settings, $staff = true) {
         $event['comments'] = $row['comments'];
         $event['categoryId'] = $row['category'];
         $event['categoryName'] = $row['category_name'];
-        $event['categoryColor'] = $row['category_color'];
+        $event['backgroundColor'] = $row['background_color'];
+        $event['foregroundColor'] = $row['foreground_color'];
+        $event['displayBorder'] = $row['display_border'];
 
         if ($staff) {
             $event['reminderValue'] = $row['reminder_value'];
@@ -63,7 +66,8 @@ function get_events($start, $end, $hesk_settings, $staff = true) {
         $current_date = hesk_date();
         $hesk_settings['timeformat'] = $old_time_setting;
 
-        $sql = "SELECT `trackid`, `subject`, `due_date`, `category`, `categories`.`name` AS `category_name`, `categories`.`background_color` AS `category_color`,
+        $sql = "SELECT `trackid`, `subject`, `due_date`, `category`, `categories`.`name` AS `category_name`, `categories`.`background_color` AS `background_color`, 
+        `categories`.`foreground_color` AS `foreground_color`, `categories`.`display_border_outline` AS `display_border`,
           CASE WHEN `due_date` < '{$current_date}' THEN 1 ELSE 0 END AS `overdue`, `owner`.`name` AS `owner_name`, `tickets`.`owner` AS `owner_id`,
            `tickets`.`priority` AS `priority`
         FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "tickets` AS `tickets`
@@ -94,7 +98,9 @@ function get_events($start, $end, $hesk_settings, $staff = true) {
             $event['url'] = $hesk_settings['hesk_url'] . '/' . $hesk_settings['admin_dir'] . '/admin_ticket.php?track=' . $event['trackingId'];
             $event['categoryId'] = $row['category'];
             $event['categoryName'] = $row['category_name'];
-            $event['categoryColor'] = $row['category_color'];
+            $event['backgroundColor'] = $row['background_color'];
+            $event['foregroundColor'] = $row['foreground_color'];
+            $event['displayBorder'] = $row['display_border'];
             $event['owner'] = $row['owner_name'];
 
             $priorities = array(
diff --git a/js/calendar/mods-for-hesk-calendar-admin-readonly.js b/js/calendar/mods-for-hesk-calendar-admin-readonly.js
index c06ba37d..c3d086c8 100644
--- a/js/calendar/mods-for-hesk-calendar-admin-readonly.js
+++ b/js/calendar/mods-for-hesk-calendar-admin-readonly.js
@@ -89,9 +89,17 @@ $(document).ready(function() {
                 .tip()
                 .css('padding', '0')
                 .find('.popover-title')
-                .css('background-color', event.color === '#fff' ? '#f7f7f7' : event.color)
+                .css('background-color', event.backgroundColor)
                 .addClass('background-volatile');
 
+            if (event.textColor === 'AUTO') {
+                $eventMarkup.addClass('background-volatile');
+            } else {
+                $eventMarkup.data('bs.popover').tip().find('.popover-title')
+                    .css('color', event.textColor)
+                    .css('border', 'solid 1px ' + event.borderColor);
+            }
+
             $eventMarkup.popover('show');
             refreshBackgroundVolatileItems();
         },
@@ -120,7 +128,9 @@ function buildEvent(id, dbObject) {
             trackingId: dbObject.trackingId,
             start: moment(dbObject.startTime),
             url: dbObject.url,
-            color: dbObject.categoryColor === '' || dbObject.categoryColor === null ? '#fff' : dbObject.categoryColor,
+            backgroundColor: dbObject.backgroundColor,
+            textColor: dbObject.foregroundColor === 'AUTO' ? calculateTextColor(dbObject.backgroundColor) : dbObject.foregroundColor,
+            borderColor: parseInt(dbObject.displayBorder) === 1 ? dbObject.foregroundColor : dbObject.backgroundColor,
             allDay: true,
             type: dbObject.type,
             categoryId: dbObject.categoryId,
@@ -128,7 +138,6 @@ function buildEvent(id, dbObject) {
             className: 'category-' + dbObject.categoryId,
             owner: dbObject.owner,
             priority: dbObject.priority,
-            textColor: calculateTextColor(dbObject.categoryColor),
             fontIconMarkup: getIcon(dbObject)
         };
     }
@@ -151,8 +160,9 @@ function buildEvent(id, dbObject) {
         categoryId: dbObject.categoryId,
         categoryName: dbObject.categoryName,
         className: 'category-' + dbObject.categoryId,
-        color: dbObject.categoryColor === '' || dbObject.categoryColor === null ? '#fff' : dbObject.categoryColor,
-        textColor: calculateTextColor(dbObject.categoryColor),
+        backgroundColor: dbObject.backgroundColor,
+        textColor: dbObject.foregroundColor === 'AUTO' ? calculateTextColor(dbObject.backgroundColor) : dbObject.foregroundColor,
+        borderColor: parseInt(dbObject.displayBorder) === 1 ? dbObject.foregroundColor : dbObject.backgroundColor,
         reminderValue: dbObject.reminderValue == null ? '' : dbObject.reminderValue,
         reminderUnits: dbObject.reminderUnits,
         fontIconMarkup: '<i class="fa fa-calendar"></i>'
@@ -170,7 +180,7 @@ function getIcon(dbObject) {
 }
 
 function calculateTextColor(color) {
-    if (color === null || color === '') {
+    if (color === null || color === '' || color === undefined) {
         return 'black';
     }
 
diff --git a/js/calendar/mods-for-hesk-calendar-readonly.js b/js/calendar/mods-for-hesk-calendar-readonly.js
index 16be40a1..ebddd6cd 100644
--- a/js/calendar/mods-for-hesk-calendar-readonly.js
+++ b/js/calendar/mods-for-hesk-calendar-readonly.js
@@ -78,9 +78,17 @@ $(document).ready(function() {
                 .tip()
                 .css('padding', '0')
                 .find('.popover-title')
-                .css('background-color', event.color === '#fff' ? '#f7f7f7' : event.color)
+                .css('background-color', event.backgroundColor)
                 .addClass('background-volatile');
 
+            if (event.textColor === 'AUTO') {
+                $eventMarkup.addClass('background-volatile');
+            } else {
+                $eventMarkup.data('bs.popover').tip().find('.popover-title')
+                    .css('color', event.textColor)
+                    .css('border', 'solid 1px ' + event.borderColor);
+            }
+
             $eventMarkup.popover('show');
             refreshBackgroundVolatileItems();
         },
@@ -116,15 +124,16 @@ function buildEvent(id, dbObject) {
         categoryId: dbObject.categoryId,
         categoryName: dbObject.categoryName,
         className: 'category-' + dbObject.categoryId,
-        color: dbObject.categoryColor === '' || dbObject.categoryColor === null ? '#fff' : dbObject.categoryColor,
-        textColor: calculateTextColor(dbObject.categoryColor),
+        backgroundColor: dbObject.backgroundColor,
+        textColor: dbObject.foregroundColor === 'AUTO' ? calculateTextColor(dbObject.backgroundColor) : dbObject.foregroundColor,
+        borderColor: parseInt(dbObject.displayBorder) === 1 ? dbObject.foregroundColor : dbObject.backgroundColor,
         reminderValue: dbObject.reminderValue == null ? '' : dbObject.reminderValue,
         reminderUnits: dbObject.reminderUnits
     };
 }
 
 function calculateTextColor(color) {
-    if (color === null || color === '') {
+    if (color === null || color === '' || color === undefined) {
         return 'black';
     }
 
diff --git a/js/calendar/mods-for-hesk-calendar.js b/js/calendar/mods-for-hesk-calendar.js
index 46bca008..de39d1a0 100644
--- a/js/calendar/mods-for-hesk-calendar.js
+++ b/js/calendar/mods-for-hesk-calendar.js
@@ -102,8 +102,16 @@ $(document).ready(function() {
                 .tip()
                 .css('padding', '0')
                 .find('.popover-title')
-                .css('background-color', event.color === '#fff' ? '#f7f7f7' : event.color)
-                .addClass('background-volatile');
+                .css('background-color', event.backgroundColor);
+
+            if (event.textColor === 'AUTO') {
+                $eventMarkup.addClass('background-volatile');
+            } else {
+                $eventMarkup.data('bs.popover').tip().find('.popover-title')
+                        .css('color', event.textColor)
+                        .css('border', 'solid 1px ' + event.borderColor);
+            }
+
 
             $eventMarkup.popover('show');
             refreshBackgroundVolatileItems();
@@ -282,7 +290,9 @@ function buildEvent(id, dbObject) {
             trackingId: dbObject.trackingId,
             start: moment(dbObject.startTime),
             url: dbObject.url,
-            color: dbObject.categoryColor === '' || dbObject.categoryColor === null ? '#fff' : dbObject.categoryColor,
+            backgroundColor: dbObject.backgroundColor,
+            textColor: dbObject.foregroundColor === 'AUTO' ? calculateTextColor(dbObject.backgroundColor) : dbObject.foregroundColor,
+            borderColor: parseInt(dbObject.displayBorder) === 1 ? dbObject.foregroundColor : dbObject.backgroundColor,
             allDay: true,
             type: dbObject.type,
             categoryId: dbObject.categoryId,
@@ -290,7 +300,6 @@ function buildEvent(id, dbObject) {
             className: 'category-' + dbObject.categoryId,
             owner: dbObject.owner,
             priority: dbObject.priority,
-            textColor: calculateTextColor(dbObject.categoryColor),
             fontIconMarkup: getIcon(dbObject)
         };
     }
@@ -299,7 +308,7 @@ function buildEvent(id, dbObject) {
     if (dbObject.allDay) {
         endTime.add(1, 'days');
     }
-
+    console.log(dbObject);
     return {
         id: id,
         title: dbObject.title,
@@ -313,8 +322,9 @@ function buildEvent(id, dbObject) {
         categoryId: dbObject.categoryId,
         categoryName: dbObject.categoryName,
         className: 'category-' + dbObject.categoryId,
-        color: dbObject.categoryColor === '' || dbObject.categoryColor === null ? '#fff' : dbObject.categoryColor,
-        textColor: calculateTextColor(dbObject.categoryColor),
+        backgroundColor: dbObject.backgroundColor,
+        textColor: dbObject.foregroundColor === 'AUTO' ? calculateTextColor(dbObject.backgroundColor) : dbObject.foregroundColor,
+        borderColor: parseInt(dbObject.displayBorder) === 1 ? dbObject.foregroundColor : dbObject.backgroundColor,
         reminderValue: dbObject.reminderValue == null ? '' : dbObject.reminderValue,
         reminderUnits: dbObject.reminderUnits,
         fontIconMarkup: '<i class="fa fa-calendar"></i>'
@@ -332,7 +342,7 @@ function getIcon(dbObject) {
 }
 
 function calculateTextColor(color) {
-    if (color === null || color === '') {
+    if (color === null || color === '' || color === undefined) {
         return 'black';
     }
 

From 5960afd2377ea084d3a2a9924c5d662f520865a0 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Thu, 1 Jun 2017 12:38:03 -0400
Subject: [PATCH 155/192] Update the database validator

---
 install/mods-for-hesk/database-validation.php | 185 ++++++++++--------
 1 file changed, 100 insertions(+), 85 deletions(-)

diff --git a/install/mods-for-hesk/database-validation.php b/install/mods-for-hesk/database-validation.php
index 94b1f762..1794874b 100644
--- a/install/mods-for-hesk/database-validation.php
+++ b/install/mods-for-hesk/database-validation.php
@@ -65,21 +65,21 @@ hesk_dbConnect();
 
             output_header_row('1.0.0 - 1.3.x');
             $all_good = run_table_check('statuses');
-            $all_good = $all_good & run_column_check('statuses', '`ID`');
-            $all_good = $all_good & run_column_check('statuses', '`TextColor`');
-            $all_good = $all_good & run_column_check('statuses', '`IsNewTicketStatus`');
-            $all_good = $all_good & run_column_check('statuses', '`IsClosed`');
-            $all_good = $all_good & run_column_check('statuses', '`IsClosedByClient`');
-            $all_good = $all_good & run_column_check('statuses', '`IsCustomerReplyStatus`');
-            $all_good = $all_good & run_column_check('statuses', '`IsStaffClosedOption`');
-            $all_good = $all_good & run_column_check('statuses', '`IsStaffReopenedStatus`');
-            $all_good = $all_good & run_column_check('statuses', '`IsDefaultStaffReplyStatus`');
-            $all_good = $all_good & run_column_check('statuses', '`LockedTicketStatus`');
-            $all_good = $all_good & run_column_check('statuses', '`IsAutocloseOption`');
-            $all_good = $all_good & run_column_check('statuses', '`Closable`');
+            $all_good = $all_good & run_column_check('statuses', 'ID');
+            $all_good = $all_good & run_column_check('statuses', 'TextColor');
+            $all_good = $all_good & run_column_check('statuses', 'IsNewTicketStatus');
+            $all_good = $all_good & run_column_check('statuses', 'IsClosed');
+            $all_good = $all_good & run_column_check('statuses', 'IsClosedByClient');
+            $all_good = $all_good & run_column_check('statuses', 'IsCustomerReplyStatus');
+            $all_good = $all_good & run_column_check('statuses', 'IsStaffClosedOption');
+            $all_good = $all_good & run_column_check('statuses', 'IsStaffReopenedStatus');
+            $all_good = $all_good & run_column_check('statuses', 'IsDefaultStaffReplyStatus');
+            $all_good = $all_good & run_column_check('statuses', 'LockedTicketStatus');
+            $all_good = $all_good & run_column_check('statuses', 'IsAutocloseOption');
+            $all_good = $all_good & run_column_check('statuses', 'Closable');
             output_header_row('1.5.0');
-            $all_good = $all_good & run_column_check('users', '`active`');
-            $all_good = $all_good & run_column_check('users', '`notify_note_unassigned`');
+            $all_good = $all_good & run_column_check('users', 'active');
+            $all_good = $all_good & run_column_check('users', 'notify_note_unassigned');
             output_header_row('1.6.0');
             $all_good = $all_good & run_table_check('settings');
             output_header_row('1.7.0');
@@ -87,88 +87,103 @@ hesk_dbConnect();
             $all_good = $all_good & run_table_check('pending_verification_emails');
             $all_good = $all_good & run_table_check('stage_tickets');
             output_header_row('2.3.0');
-            $all_good = $all_good & run_column_check('service_messages', '`icon`');
-            $all_good = $all_good & run_column_check('statuses', '`Key`');
-            $all_good = $all_good & run_column_check('tickets', '`latitude`');
-            $all_good = $all_good & run_column_check('tickets', '`longitude`');
-            $all_good = $all_good & run_column_check('stage_tickets', '`latitude`');
-            $all_good = $all_good & run_column_check('stage_tickets', '`longitude`');
-            $all_good = $all_good & run_column_check('categories', '`manager`');
-            $all_good = $all_good & run_column_check('users', '`permission_template`');
+            $all_good = $all_good & run_column_check('service_messages', 'icon');
+            $all_good = $all_good & run_column_check('statuses', 'Key');
+            $all_good = $all_good & run_column_check('tickets', 'latitude');
+            $all_good = $all_good & run_column_check('tickets', 'longitude');
+            $all_good = $all_good & run_column_check('stage_tickets', 'latitude');
+            $all_good = $all_good & run_column_check('stage_tickets', 'longitude');
+            $all_good = $all_good & run_column_check('categories', 'manager');
+            $all_good = $all_good & run_column_check('users', 'permission_template');
             $all_good = $all_good & run_table_check('permission_templates');
-            $all_good = $all_good & run_column_check('permission_templates', '`id`');
-            $all_good = $all_good & run_column_check('permission_templates', '`name`');
-            $all_good = $all_good & run_column_check('permission_templates', '`heskprivileges`');
-            $all_good = $all_good & run_column_check('permission_templates', '`categories`');
+            $all_good = $all_good & run_column_check('permission_templates', 'id');
+            $all_good = $all_good & run_column_check('permission_templates', 'name');
+            $all_good = $all_good & run_column_check('permission_templates', 'heskprivileges');
+            $all_good = $all_good & run_column_check('permission_templates', 'categories');
             output_header_row('2.4.0');
             $all_good = $all_good & run_table_check('quick_help_sections');
-            $all_good = $all_good & run_column_check('quick_help_sections', '`id`');
-            $all_good = $all_good & run_column_check('quick_help_sections', '`location`');
-            $all_good = $all_good & run_column_check('quick_help_sections', '`show`');
+            $all_good = $all_good & run_column_check('quick_help_sections', 'id');
+            $all_good = $all_good & run_column_check('quick_help_sections', 'location');
+            $all_good = $all_good & run_column_check('quick_help_sections', 'show');
             $all_good = $all_good & run_table_check('text_to_status_xref');
-            $all_good = $all_good & run_column_check('text_to_status_xref', '`id`');
-            $all_good = $all_good & run_column_check('text_to_status_xref', '`language`');
-            $all_good = $all_good & run_column_check('text_to_status_xref', '`text`');
-            $all_good = $all_good & run_column_check('text_to_status_xref', '`status_id`');
-            $all_good = $all_good & run_column_check('statuses', '`sort`');
-            $all_good = $all_good & run_column_check('attachments', '`download_count`');
-            $all_good = $all_good & run_column_check('kb_attachments', '`download_count`');
-            $all_good = $all_good & run_column_check('tickets', '`html`');
-            $all_good = $all_good & run_column_check('stage_tickets', '`html`');
-            $all_good = $all_good & run_column_check('replies', '`html`');
+            $all_good = $all_good & run_column_check('text_to_status_xref', 'id');
+            $all_good = $all_good & run_column_check('text_to_status_xref', 'language');
+            $all_good = $all_good & run_column_check('text_to_status_xref', 'text');
+            $all_good = $all_good & run_column_check('text_to_status_xref', 'status_id');
+            $all_good = $all_good & run_column_check('statuses', 'sort');
+            $all_good = $all_good & run_column_check('attachments', 'download_count');
+            $all_good = $all_good & run_column_check('kb_attachments', 'download_count');
+            $all_good = $all_good & run_column_check('tickets', 'html');
+            $all_good = $all_good & run_column_check('stage_tickets', 'html');
+            $all_good = $all_good & run_column_check('replies', 'html');
             output_header_row('2.5.0');
-            $all_good = $all_good & run_column_check('tickets', '`user_agent`');
-            $all_good = $all_good & run_column_check('tickets', '`screen_resolution_width`');
-            $all_good = $all_good & run_column_check('tickets', '`screen_resolution_height`');
-            $all_good = $all_good & run_column_check('stage_tickets', '`user_agent`');
-            $all_good = $all_good & run_column_check('stage_tickets', '`screen_resolution_width`');
-            $all_good = $all_good & run_column_check('stage_tickets', '`screen_resolution_height`');
+            $all_good = $all_good & run_column_check('tickets', 'user_agent');
+            $all_good = $all_good & run_column_check('tickets', 'screen_resolution_width');
+            $all_good = $all_good & run_column_check('tickets', 'screen_resolution_height');
+            $all_good = $all_good & run_column_check('stage_tickets', 'user_agent');
+            $all_good = $all_good & run_column_check('stage_tickets', 'screen_resolution_width');
+            $all_good = $all_good & run_column_check('stage_tickets', 'screen_resolution_height');
             output_header_row('2.6.0');
             $all_good = $all_good & run_table_check('logging');
-            $all_good = $all_good & run_column_check('logging', '`id`');
-            $all_good = $all_good & run_column_check('logging', '`username`');
-            $all_good = $all_good & run_column_check('logging', '`message`');
-            $all_good = $all_good & run_column_check('logging', '`severity`');
-            $all_good = $all_good & run_column_check('logging', '`location`');
-            $all_good = $all_good & run_column_check('logging', '`timestamp`');
+            $all_good = $all_good & run_column_check('logging', 'id');
+            $all_good = $all_good & run_column_check('logging', 'username');
+            $all_good = $all_good & run_column_check('logging', 'message');
+            $all_good = $all_good & run_column_check('logging', 'severity');
+            $all_good = $all_good & run_column_check('logging', 'location');
+            $all_good = $all_good & run_column_check('logging', 'timestamp');
             $all_good = $all_good & run_table_check('user_api_tokens');
-            $all_good = $all_good & run_column_check('user_api_tokens', '`id`');
-            $all_good = $all_good & run_column_check('user_api_tokens', '`user_id`');
-            $all_good = $all_good & run_column_check('user_api_tokens', '`token`');
+            $all_good = $all_good & run_column_check('user_api_tokens', 'id');
+            $all_good = $all_good & run_column_check('user_api_tokens', 'user_id');
+            $all_good = $all_good & run_column_check('user_api_tokens', 'token');
             $all_good = $all_good & run_table_check('temp_attachment');
-            $all_good = $all_good & run_column_check('temp_attachment', '`id`');
-            $all_good = $all_good & run_column_check('temp_attachment', '`file_name`');
-            $all_good = $all_good & run_column_check('temp_attachment', '`saved_name`');
-            $all_good = $all_good & run_column_check('temp_attachment', '`size`');
-            $all_good = $all_good & run_column_check('temp_attachment', '`type`');
-            $all_good = $all_good & run_column_check('temp_attachment', '`date_uploaded`');
+            $all_good = $all_good & run_column_check('temp_attachment', 'id');
+            $all_good = $all_good & run_column_check('temp_attachment', 'file_name');
+            $all_good = $all_good & run_column_check('temp_attachment', 'saved_name');
+            $all_good = $all_good & run_column_check('temp_attachment', 'size');
+            $all_good = $all_good & run_column_check('temp_attachment', 'type');
+            $all_good = $all_good & run_column_check('temp_attachment', 'date_uploaded');
             $all_good = $all_good & run_table_check('calendar_event');
-            $all_good = $all_good & run_column_check('calendar_event', '`id`');
-            $all_good = $all_good & run_column_check('calendar_event', '`start`');
-            $all_good = $all_good & run_column_check('calendar_event', '`end`');
-            $all_good = $all_good & run_column_check('calendar_event', '`all_day`');
-            $all_good = $all_good & run_column_check('calendar_event', '`name`');
-            $all_good = $all_good & run_column_check('calendar_event', '`location`');
-            $all_good = $all_good & run_column_check('calendar_event', '`comments`');
-            $all_good = $all_good & run_column_check('calendar_event', '`category`');
+            $all_good = $all_good & run_column_check('calendar_event', 'id');
+            $all_good = $all_good & run_column_check('calendar_event', 'start');
+            $all_good = $all_good & run_column_check('calendar_event', 'end');
+            $all_good = $all_good & run_column_check('calendar_event', 'all_day');
+            $all_good = $all_good & run_column_check('calendar_event', 'name');
+            $all_good = $all_good & run_column_check('calendar_event', 'location');
+            $all_good = $all_good & run_column_check('calendar_event', 'comments');
+            $all_good = $all_good & run_column_check('calendar_event', 'category');
             $all_good = $all_good & run_table_check('calendar_event_reminder');
-            $all_good = $all_good & run_column_check('calendar_event_reminder', '`id`');
-            $all_good = $all_good & run_column_check('calendar_event_reminder', '`user_id`');
-            $all_good = $all_good & run_column_check('calendar_event_reminder', '`event_id`');
-            $all_good = $all_good & run_column_check('calendar_event_reminder', '`amount`');
-            $all_good = $all_good & run_column_check('calendar_event_reminder', '`unit`');
-            $all_good = $all_good & run_column_check('calendar_event_reminder', '`email_sent`');
-            $all_good = $all_good & run_column_check('tickets', '`due_date`');
-            $all_good = $all_good & run_column_check('tickets', '`overdue_email_sent`');
-
-            // Changed in 3.1.0
-            //$all_good = $all_good & run_column_check('categories', '`color`');
-            $all_good = $all_good & run_column_check('categories', '`usage`');
-            $all_good = $all_good & run_column_check('users', '`notify_overdue_unassigned`');
-            $all_good = $all_good & run_column_check('users', '`default_calendar_view`');
+            $all_good = $all_good & run_column_check('calendar_event_reminder', 'id');
+            $all_good = $all_good & run_column_check('calendar_event_reminder', 'user_id');
+            $all_good = $all_good & run_column_check('calendar_event_reminder', 'event_id');
+            $all_good = $all_good & run_column_check('calendar_event_reminder', 'amount');
+            $all_good = $all_good & run_column_check('calendar_event_reminder', 'unit');
+            $all_good = $all_good & run_column_check('calendar_event_reminder', 'email_sent');
+            $all_good = $all_good & run_column_check('tickets', 'due_date');
+            $all_good = $all_good & run_column_check('tickets', 'overdue_email_sent');
+            $all_good = $all_good & run_column_check('categories', 'usage');
+            $all_good = $all_good & run_column_check('users', 'notify_overdue_unassigned');
+            $all_good = $all_good & run_column_check('users', 'default_calendar_view');
             output_header_row('2.6.2');
-            $all_good = $all_good & run_column_check('stage_tickets', '`due_date`');
-            $all_good = $all_good & run_column_check('stage_tickets', '`overdue_email_sent`');
+            $all_good = $all_good & run_column_check('stage_tickets', 'due_date');
+            $all_good = $all_good & run_column_check('stage_tickets', 'overdue_email_sent');
+            output_header_row('3.1.0');
+            $all_good = $all_good & run_column_check('categories', 'background_color');
+            $all_good = $all_good & run_column_check('categories', 'foreground_color');
+            $all_good = $all_good & run_column_check('categories', 'display_border_outline');
+            $all_good = $all_good & run_column_check('logging', 'stack_trace');
+            $all_good = $all_good & run_table_check('custom_nav_element');
+            $all_good = $all_good & run_column_check('custom_nav_element', 'id');
+            $all_good = $all_good & run_column_check('custom_nav_element', 'image_url');
+            $all_good = $all_good & run_column_check('custom_nav_element', 'font_icon');
+            $all_good = $all_good & run_column_check('custom_nav_element', 'place');
+            $all_good = $all_good & run_column_check('custom_nav_element', 'url');
+            $all_good = $all_good & run_column_check('custom_nav_element', 'sort');
+            $all_good = $all_good & run_table_check('custom_nav_element_to_text');
+            $all_good = $all_good & run_column_check('custom_nav_element_to_text', 'id');
+            $all_good = $all_good & run_column_check('custom_nav_element_to_text', 'nav_element_id');
+            $all_good = $all_good & run_column_check('custom_nav_element_to_text', 'language');
+            $all_good = $all_good & run_column_check('custom_nav_element_to_text', 'text');
+            $all_good = $all_good & run_column_check('custom_nav_element_to_text', 'subtext');
 
             if ($all_good) {
                 echo "<script>$('#all-good').show()</script>";
@@ -196,7 +211,7 @@ function run_column_check($table_name, $column_name) {
         output_result('<b>Table Exists</b>: ' . $table_name,
             $all_good);
     } else {
-        $all_good = run_check('SELECT ' . $column_name . ' FROM `' . $hesk_settings['db_pfix'] . $table_name . '` LIMIT 1');
+        $all_good = run_check('SELECT `' . $column_name . '` FROM `' . $hesk_settings['db_pfix'] . $table_name . '` LIMIT 1');
         output_result('<b>Column Exists</b>: ' . $table_name . '.' . $column_name,
             $all_good);
     }

From 33ab18e8263907cb500a840e1309a1dc771073cb Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Thu, 1 Jun 2017 12:45:56 -0400
Subject: [PATCH 156/192] Update CategoryGateway

---
 api/BusinessLogic/Categories/Category.php     | 14 ++++++++++++--
 api/DataAccess/Categories/CategoryGateway.php |  4 +++-
 internal-api/js/admin-ticket.js               |  2 +-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/api/BusinessLogic/Categories/Category.php b/api/BusinessLogic/Categories/Category.php
index ab9bc1af..755188f3 100644
--- a/api/BusinessLogic/Categories/Category.php
+++ b/api/BusinessLogic/Categories/Category.php
@@ -32,9 +32,19 @@ class Category {
     public $usage;
 
     /**
-     * @var string? The color of the Categories
+     * @var string
      */
-    public $color;
+    public $backgroundColor;
+
+    /**
+     * @var string
+     */
+    public $foregroundColor;
+
+    /**
+     * @var bool
+     */
+    public $displayBorder;
 
     /**
      * @var int The default Tickets priority
diff --git a/api/DataAccess/Categories/CategoryGateway.php b/api/DataAccess/Categories/CategoryGateway.php
index abda07b9..4fd35c7b 100644
--- a/api/DataAccess/Categories/CategoryGateway.php
+++ b/api/DataAccess/Categories/CategoryGateway.php
@@ -28,7 +28,9 @@ class CategoryGateway extends CommonDao {
             $category->autoAssign = $row['autoassign'] == 1;
             $category->type = intval($row['type']);
             $category->usage = intval($row['usage']);
-            $category->color = $row['color'];
+            $category->backgroundColor = $row['background_color'];
+            $category->foregroundColor = $row['foreground_color'];
+            $category->displayBorder = $row['display_border_outline'] === '1';
             $category->priority = intval($row['priority']);
             $category->manager = intval($row['manager']) == 0 ? NULL : intval($row['manager']);
             $results[$category->id] = $category;
diff --git a/internal-api/js/admin-ticket.js b/internal-api/js/admin-ticket.js
index ea7de91e..3e8013ce 100644
--- a/internal-api/js/admin-ticket.js
+++ b/internal-api/js/admin-ticket.js
@@ -49,7 +49,7 @@ $(document).ready(function() {
         var ticketId = $this.data('ticket-id');
         var replyId = $this.data('reply-id');
         var heskUrl = $('span#heskUrl').text();
-        var apiUrl = heskUrl + '/api/v1-internal/staff/tickets/' + ticketId + '/resend-email';
+        var apiUrl = heskUrl + '/api/index.php/v1-internal/staff/tickets/' + ticketId + '/resend-email';
 
         if (replyId !== undefined) {
             apiUrl += '?replyId=' + replyId;

From 0956496b996b3cf6afbf900dded0005cd4e89177 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Thu, 1 Jun 2017 12:56:36 -0400
Subject: [PATCH 157/192] Getting started on adding login background
 customizations

---
 admin/admin_settings.php                 | 13 +++++++++++++
 admin/admin_settings_save.php            |  2 ++
 inc/headerAdmin.inc.php                  |  2 +-
 install/mods-for-hesk/sql/installSql.php |  1 +
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/admin/admin_settings.php b/admin/admin_settings.php
index 511ab71b..cafbd5da 100644
--- a/admin/admin_settings.php
+++ b/admin/admin_settings.php
@@ -3791,6 +3791,19 @@ $modsForHesk_settings = mfh_getSettings();
                         </div>
                     </div>
                 </div>
+                <div class="row">
+                    <div class="col-xs-12">
+                        <div class="form-group">
+                            <label for="login-background" class="col-sm-3 col-xs-5 control-label">
+                                LOGIN BACKGROUND [!]
+                            </label>
+                            <div class="col-sm-9 col-xs-7">
+                                <input type="text" name="login-background" class="form-control" placeholder="LOGIN BACKGROUND [!]"
+                                       value="<?php echo $modsForHesk_settings['login_background']; ?>">
+                            </div>
+                        </div>
+                    </div>
+                </div>
             </div>
         </div>
         <div class="form-group" style="margin-left: 10px">
diff --git a/admin/admin_settings_save.php b/admin/admin_settings_save.php
index 0c3df742..e62568b5 100644
--- a/admin/admin_settings_save.php
+++ b/admin/admin_settings_save.php
@@ -495,6 +495,7 @@ $set['dropdownItemTextHoverColor'] = hesk_input(hesk_POST('dropdownItemTextHover
 $set['questionMarkColor'] = hesk_input(hesk_POST('questionMarkColor'));
 $set['dropdownItemTextHoverBackgroundColor'] = hesk_input(hesk_POST('dropdownItemTextHoverBackgroundColor'));
 $set['admin_color_scheme'] = hesk_input(hesk_POST('admin-color-scheme'));
+$set['login_background'] = hesk_input(hesk_POST('login-background'));
 mfh_updateSetting('rtl', $set['rtl']);
 mfh_updateSetting('show_icons', $set['show-icons']);
 mfh_updateSetting('custom_field_setting', $set['custom-field-setting']);
@@ -532,6 +533,7 @@ mfh_updateSetting('enable_calendar', $set['enable_calendar'], false);
 mfh_updateSetting('first_day_of_week', $set['first_day_of_week'], false);
 mfh_updateSetting('default_calendar_view', $set['default_view'], true);
 mfh_updateSetting('admin_color_scheme', $set['admin_color_scheme'], true);
+mfh_updateSetting('login_background', $set['login_background'], true);
 
 // Prepare settings file and save it
 $settings_file_content = '<?php
diff --git a/inc/headerAdmin.inc.php b/inc/headerAdmin.inc.php
index b3583df2..fe745e0d 100644
--- a/inc/headerAdmin.inc.php
+++ b/inc/headerAdmin.inc.php
@@ -92,7 +92,7 @@ $modsForHesk_settings = mfh_getSettings();
 
         <?php if (defined('PAGE_TITLE') && PAGE_TITLE == 'LOGIN'): ?>
         body {
-            background: #d2d6de;
+            background: <?php echo $modsForHesk_settings['login_background']; ?>;
         }
         <?php endif; ?>
     </style>
diff --git a/install/mods-for-hesk/sql/installSql.php b/install/mods-for-hesk/sql/installSql.php
index b2faa81a..b8772650 100644
--- a/install/mods-for-hesk/sql/installSql.php
+++ b/install/mods-for-hesk/sql/installSql.php
@@ -1009,6 +1009,7 @@ function execute310Scripts() {
     executeQuery("ALTER TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` ADD COLUMN `foreground_color` VARCHAR(7) NOT NULL DEFAULT 'AUTO'");
     executeQuery("ALTER TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` ADD COLUMN `display_border_outline` ENUM('0','1') NOT NULL DEFAULT '0'");
     executeQuery("ALTER TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` CHANGE `color` `background_color` VARCHAR(7) NOT NULL DEFAULT '#FFFFFF'");
+    executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) VALUES ('login_background', '#d2d6de')");
 
     updateVersion('3.1.0');
 }
\ No newline at end of file

From fb2861ea218f1d256bfebb30272d99d858923ba3 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Mon, 5 Jun 2017 22:03:08 -0400
Subject: [PATCH 158/192] Add options for image url or background color

---
 admin/admin_settings.php | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/admin/admin_settings.php b/admin/admin_settings.php
index cafbd5da..e6859513 100644
--- a/admin/admin_settings.php
+++ b/admin/admin_settings.php
@@ -3797,9 +3797,22 @@ $modsForHesk_settings = mfh_getSettings();
                             <label for="login-background" class="col-sm-3 col-xs-5 control-label">
                                 LOGIN BACKGROUND [!]
                             </label>
-                            <div class="col-sm-9 col-xs-7">
-                                <input type="text" name="login-background" class="form-control" placeholder="LOGIN BACKGROUND [!]"
-                                       value="<?php echo $modsForHesk_settings['login_background']; ?>">
+                            <div class="col-sm-9 col-xs-7 form-inline">
+                                <div class="radio">
+                                    <label>
+                                        <input type="radio" name="login-background" value="color">
+                                        SOLID COLOR
+                                    </label>
+                                </div>&nbsp;&nbsp;&nbsp;
+                                <input title="LOGIN BACKGROUND COLOR" type="text" name="login-background-color" class="form-control colorpicker-trigger">
+                                <br>
+                                <div class="radio">
+                                    <label>
+                                        <input type="radio" name="login-background" value="image">
+                                        IMAGE URL
+                                    </label>
+                                </div>&nbsp;&nbsp;&nbsp;
+                                <input title="LOGIN BACKGROUND COLOR" type="text" name="login-background-url" class="form-control">
                             </div>
                         </div>
                     </div>

From 22789540ec1e36c30c902610e6e1218f673cc3d7 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Tue, 6 Jun 2017 13:02:53 -0400
Subject: [PATCH 159/192] Form is pretty much done for login background

---
 admin/admin_settings.php                 | 30 ++++++++++++++++++++----
 install/mods-for-hesk/sql/installSql.php |  1 +
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/admin/admin_settings.php b/admin/admin_settings.php
index e6859513..37cc07a7 100644
--- a/admin/admin_settings.php
+++ b/admin/admin_settings.php
@@ -3800,19 +3800,39 @@ $modsForHesk_settings = mfh_getSettings();
                             <div class="col-sm-9 col-xs-7 form-inline">
                                 <div class="radio">
                                     <label>
-                                        <input type="radio" name="login-background" value="color">
+                                        <input type="radio" name="login-background" value="color" <?php if ($modsForHesk_settings['login_background_type'] == 'color') { echo 'checked'; } ?>>
                                         SOLID COLOR
                                     </label>
                                 </div>&nbsp;&nbsp;&nbsp;
-                                <input title="LOGIN BACKGROUND COLOR" type="text" name="login-background-color" class="form-control colorpicker-trigger">
+                                <input title="LOGIN BACKGROUND COLOR" type="text" name="login-background-color" class="form-control" <?php if ($modsForHesk_settings['login_background_type'] == 'image') { echo 'disabled'; } ?>>
                                 <br>
                                 <div class="radio">
                                     <label>
-                                        <input type="radio" name="login-background" value="image">
+                                        <input type="radio" name="login-background" value="image" <?php if ($modsForHesk_settings['login_background_type'] == 'image') { echo 'checked'; } ?>>
                                         IMAGE URL
                                     </label>
-                                </div>&nbsp;&nbsp;&nbsp;
-                                <input title="LOGIN BACKGROUND COLOR" type="text" name="login-background-url" class="form-control">
+                                </div>
+                                <input title="LOGIN BACKGROUND COLOR" type="file" name="login-background-image" style="display: inline;vertical-align: bottom" <?php if ($modsForHesk_settings['login_background_type'] == 'color') { echo 'disabled'; } ?>>
+                                <?php if ($modsForHesk_settings['login_background_type'] == 'image'): ?>
+                                    <br>
+                                    <img src="<?php echo $modsForHesk_settings['login_background']; ?>" alt="Login Background" height="125" width="125" class="push-down-10">
+                                <?php endif; ?>
+                                <script type="text/javascript">
+                                    $('input[name="login-background-color"]').colorpicker({
+                                        format: 'hex',
+                                        color: <?php if ($modsForHesk_settings['login_background_type'] == 'color') { echo "'{$modsForHesk_settings['login_background']}'"; } else { echo 'false'; } ?>
+                                    });
+
+                                    $('input[name="login-background"]').change(function() {
+                                        if ($(this).val() == 'color') {
+                                            $('input[name="login-background-color"]').removeAttr('disabled');
+                                            $('input[name="login-background-image"]').attr('disabled', 'disabled');
+                                        } else {
+                                            $('input[name="login-background-image"]').removeAttr('disabled');
+                                            $('input[name="login-background-color"]').attr('disabled', 'disabled');
+                                        }
+                                    });
+                                </script>
                             </div>
                         </div>
                     </div>
diff --git a/install/mods-for-hesk/sql/installSql.php b/install/mods-for-hesk/sql/installSql.php
index b8772650..49fb23cd 100644
--- a/install/mods-for-hesk/sql/installSql.php
+++ b/install/mods-for-hesk/sql/installSql.php
@@ -1009,6 +1009,7 @@ function execute310Scripts() {
     executeQuery("ALTER TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` ADD COLUMN `foreground_color` VARCHAR(7) NOT NULL DEFAULT 'AUTO'");
     executeQuery("ALTER TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` ADD COLUMN `display_border_outline` ENUM('0','1') NOT NULL DEFAULT '0'");
     executeQuery("ALTER TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` CHANGE `color` `background_color` VARCHAR(7) NOT NULL DEFAULT '#FFFFFF'");
+    executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) VALUES ('login_background_type', 'color')");
     executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) VALUES ('login_background', '#d2d6de')");
 
     updateVersion('3.1.0');

From 31265e76966af139cf933a7fbdf043269842569e Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Tue, 6 Jun 2017 22:02:46 -0400
Subject: [PATCH 160/192] Working on saving the login backdrop

---
 admin/admin_settings_save.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/admin/admin_settings_save.php b/admin/admin_settings_save.php
index e62568b5..900b70ef 100644
--- a/admin/admin_settings_save.php
+++ b/admin/admin_settings_save.php
@@ -495,6 +495,25 @@ $set['dropdownItemTextHoverColor'] = hesk_input(hesk_POST('dropdownItemTextHover
 $set['questionMarkColor'] = hesk_input(hesk_POST('questionMarkColor'));
 $set['dropdownItemTextHoverBackgroundColor'] = hesk_input(hesk_POST('dropdownItemTextHoverBackgroundColor'));
 $set['admin_color_scheme'] = hesk_input(hesk_POST('admin-color-scheme'));
+
+$set['login_background_type'] = hesk_input(hesk_POST('login-background'));
+
+if ($set['login_background_type'] == 'color') {
+    unlink($hesk_settings['cache_dir'] . '/' . $set['login_background']);
+    $set['login_background'] = hesk_input(hesk_POST('login-background-color'));
+} else {
+    $file_name = $_FILES['login-attachment-image']['name'];
+
+    if (!empty($file_name)) {
+        unlink($hesk_settings['cache_dir'] . '/' . $set['login_background']);
+
+        $file_size = $_FILES['login-attachment-image']['size'];
+        if ($file_size > $hesk_settings['attachments']['max_size']) {
+            return hesk_fileError(sprintf($hesklang['file_too_large'], $file_name));
+        }
+
+    }
+}
 $set['login_background'] = hesk_input(hesk_POST('login-background'));
 mfh_updateSetting('rtl', $set['rtl']);
 mfh_updateSetting('show_icons', $set['show-icons']);

From 65c7c15c74d8063bd84d312d6c9a0f373959dfe6 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Wed, 7 Jun 2017 21:58:47 -0400
Subject: [PATCH 161/192] more work on login background

---
 admin/admin_settings_save.php | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/admin/admin_settings_save.php b/admin/admin_settings_save.php
index 900b70ef..dbec28e6 100644
--- a/admin/admin_settings_save.php
+++ b/admin/admin_settings_save.php
@@ -502,19 +502,30 @@ if ($set['login_background_type'] == 'color') {
     unlink($hesk_settings['cache_dir'] . '/' . $set['login_background']);
     $set['login_background'] = hesk_input(hesk_POST('login-background-color'));
 } else {
-    $file_name = $_FILES['login-attachment-image']['name'];
+    $file_name = hesk_cleanFileName($_FILES['login-attachment-image']['name']);
 
     if (!empty($file_name)) {
-        unlink($hesk_settings['cache_dir'] . '/' . $set['login_background']);
-
         $file_size = $_FILES['login-attachment-image']['size'];
         if ($file_size > $hesk_settings['attachments']['max_size']) {
             return hesk_fileError(sprintf($hesklang['file_too_large'], $file_name));
         }
 
+        unlink($hesk_settings['cache_dir'] . '/login-background/' . $set['login_background']);
+
+        $useChars = 'AEUYBDGHJLMNPQRSTVWXZ123456789';
+        $tmp = uniqid();
+        for ($j = 1; $j < 10; $j++) {
+            $tmp .= $useChars{mt_rand(0, 29)};
+        }
+
+        $file_to_move = $_FILES['login-attachment-image']['tmp_name'];
+        if (!move_uploaded_file($file_to_move, __DIR__ . '/../' . $hesk_settings['cache_dir'] . '/login-background/' . $file_name)) {
+            hesk_error($hesklang['cannot_move_tmp']);
+        }
+
+        $set['login_background'] = $file_name;
     }
 }
-$set['login_background'] = hesk_input(hesk_POST('login-background'));
 mfh_updateSetting('rtl', $set['rtl']);
 mfh_updateSetting('show_icons', $set['show-icons']);
 mfh_updateSetting('custom_field_setting', $set['custom-field-setting']);

From e48022b53317b412c3ef32ef7e789ea024ad94e8 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Thu, 8 Jun 2017 13:07:08 -0400
Subject: [PATCH 162/192] Login background can be uploaded

---
 admin/admin_settings.php      |  4 ++--
 admin/admin_settings_save.php | 22 +++++++++++++++++-----
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/admin/admin_settings.php b/admin/admin_settings.php
index 37cc07a7..f7fb677f 100644
--- a/admin/admin_settings.php
+++ b/admin/admin_settings.php
@@ -531,7 +531,7 @@ $modsForHesk_settings = mfh_getSettings();
            onclick="javascript:alert('<?php echo hesk_makeJsString($hesklang['settings_intro']) . '\n\n' . hesk_makeJsString($hesklang['all_req']); ?>')"><i
                 class="fa fa-question-circle settingsquestionmark"></i></a>
     </h2>
-    <form method="post" action="admin_settings_save.php" name="form1" onsubmit="return hesk_checkFields()"
+    <form method="post" enctype="multipart/form-data" action="admin_settings_save.php" name="form1" onsubmit="return hesk_checkFields()"
           class="form-horizontal" role="form">
 
         <!-- General Settings -->
@@ -3815,7 +3815,7 @@ $modsForHesk_settings = mfh_getSettings();
                                 <input title="LOGIN BACKGROUND COLOR" type="file" name="login-background-image" style="display: inline;vertical-align: bottom" <?php if ($modsForHesk_settings['login_background_type'] == 'color') { echo 'disabled'; } ?>>
                                 <?php if ($modsForHesk_settings['login_background_type'] == 'image'): ?>
                                     <br>
-                                    <img src="<?php echo $modsForHesk_settings['login_background']; ?>" alt="Login Background" height="125" width="125" class="push-down-10">
+                                    <img src="../<?php echo $hesk_settings['cache_dir']; ?>/login-background/<?php echo $modsForHesk_settings['login_background']; ?>" alt="Login Background" height="125" width="125" class="push-down-10">
                                 <?php endif; ?>
                                 <script type="text/javascript">
                                     $('input[name="login-background-color"]').colorpicker({
diff --git a/admin/admin_settings_save.php b/admin/admin_settings_save.php
index dbec28e6..d8caca25 100644
--- a/admin/admin_settings_save.php
+++ b/admin/admin_settings_save.php
@@ -501,16 +501,25 @@ $set['login_background_type'] = hesk_input(hesk_POST('login-background'));
 if ($set['login_background_type'] == 'color') {
     unlink($hesk_settings['cache_dir'] . '/' . $set['login_background']);
     $set['login_background'] = hesk_input(hesk_POST('login-background-color'));
+    if ($set['login_background'] == '') {
+        $set['login_background'] = '#d2d6de';
+    }
 } else {
-    $file_name = hesk_cleanFileName($_FILES['login-attachment-image']['name']);
+    include(HESK_PATH . 'inc/attachments.inc.php');
+    include(HESK_PATH . 'inc/posting_functions.inc.php');
+
+    $file_name = hesk_cleanFileName($_FILES['login-background-image']['name']);
+
 
     if (!empty($file_name)) {
-        $file_size = $_FILES['login-attachment-image']['size'];
+        $file_size = $_FILES['login-background-image']['size'];
         if ($file_size > $hesk_settings['attachments']['max_size']) {
             return hesk_fileError(sprintf($hesklang['file_too_large'], $file_name));
         }
 
-        unlink($hesk_settings['cache_dir'] . '/login-background/' . $set['login_background']);
+        if (file_exists($hesk_settings['cache_dir'] . '/login-background/' . $set['login_background'])) {
+            unlink($hesk_settings['cache_dir'] . '/login-background/' . $set['login_background']);
+        }
 
         $useChars = 'AEUYBDGHJLMNPQRSTVWXZ123456789';
         $tmp = uniqid();
@@ -518,8 +527,10 @@ if ($set['login_background_type'] == 'color') {
             $tmp .= $useChars{mt_rand(0, 29)};
         }
 
-        $file_to_move = $_FILES['login-attachment-image']['tmp_name'];
-        if (!move_uploaded_file($file_to_move, __DIR__ . '/../' . $hesk_settings['cache_dir'] . '/login-background/' . $file_name)) {
+        $file_to_move = $_FILES['login-background-image']['tmp_name'];
+
+
+        if (!move_uploaded_file($file_to_move, dirname(dirname(__FILE__)) . '/' . $hesk_settings['cache_dir'] . '/login-background/' . $file_name)) {
             hesk_error($hesklang['cannot_move_tmp']);
         }
 
@@ -564,6 +575,7 @@ mfh_updateSetting('first_day_of_week', $set['first_day_of_week'], false);
 mfh_updateSetting('default_calendar_view', $set['default_view'], true);
 mfh_updateSetting('admin_color_scheme', $set['admin_color_scheme'], true);
 mfh_updateSetting('login_background', $set['login_background'], true);
+mfh_updateSetting('login_background_type', $set['login_background_type'], true);
 
 // Prepare settings file and save it
 $settings_file_content = '<?php

From 3a8d69b061e75830a6538b27b5b08c8a9108970a Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Thu, 8 Jun 2017 13:10:12 -0400
Subject: [PATCH 163/192] Only update image if changed

---
 admin/admin_settings_save.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/admin/admin_settings_save.php b/admin/admin_settings_save.php
index d8caca25..a2372af9 100644
--- a/admin/admin_settings_save.php
+++ b/admin/admin_settings_save.php
@@ -498,20 +498,24 @@ $set['admin_color_scheme'] = hesk_input(hesk_POST('admin-color-scheme'));
 
 $set['login_background_type'] = hesk_input(hesk_POST('login-background'));
 
+$changedBackground = false;
 if ($set['login_background_type'] == 'color') {
     unlink($hesk_settings['cache_dir'] . '/' . $set['login_background']);
     $set['login_background'] = hesk_input(hesk_POST('login-background-color'));
     if ($set['login_background'] == '') {
         $set['login_background'] = '#d2d6de';
     }
+
+    $changedBackground = true;
 } else {
     include(HESK_PATH . 'inc/attachments.inc.php');
     include(HESK_PATH . 'inc/posting_functions.inc.php');
 
+
     $file_name = hesk_cleanFileName($_FILES['login-background-image']['name']);
 
 
-    if (!empty($file_name)) {
+    if (!empty($_FILES['login-background-image']['name'])) {
         $file_size = $_FILES['login-background-image']['size'];
         if ($file_size > $hesk_settings['attachments']['max_size']) {
             return hesk_fileError(sprintf($hesklang['file_too_large'], $file_name));
@@ -535,6 +539,7 @@ if ($set['login_background_type'] == 'color') {
         }
 
         $set['login_background'] = $file_name;
+        $changedBackground = true;
     }
 }
 mfh_updateSetting('rtl', $set['rtl']);
@@ -574,8 +579,11 @@ mfh_updateSetting('enable_calendar', $set['enable_calendar'], false);
 mfh_updateSetting('first_day_of_week', $set['first_day_of_week'], false);
 mfh_updateSetting('default_calendar_view', $set['default_view'], true);
 mfh_updateSetting('admin_color_scheme', $set['admin_color_scheme'], true);
-mfh_updateSetting('login_background', $set['login_background'], true);
-mfh_updateSetting('login_background_type', $set['login_background_type'], true);
+
+if ($changedBackground) {
+    mfh_updateSetting('login_background', $set['login_background'], true);
+    mfh_updateSetting('login_background_type', $set['login_background_type'], true);
+}
 
 // Prepare settings file and save it
 $settings_file_content = '<?php

From 57f9fdec634abec57ae120a601e05fb89edea219 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Thu, 8 Jun 2017 22:39:45 -0400
Subject: [PATCH 164/192] Saving properly works, login page updated

---
 admin/admin_settings.php      |   2 +-
 admin/admin_settings_save.php |  17 +-
 admin/index.php               | 343 +++++++++++++++++-----------------
 css/mods-for-hesk-new.css     |  28 +++
 inc/headerAdmin.inc.php       |  19 +-
 5 files changed, 226 insertions(+), 183 deletions(-)

diff --git a/admin/admin_settings.php b/admin/admin_settings.php
index f7fb677f..fb4ca274 100644
--- a/admin/admin_settings.php
+++ b/admin/admin_settings.php
@@ -3815,7 +3815,7 @@ $modsForHesk_settings = mfh_getSettings();
                                 <input title="LOGIN BACKGROUND COLOR" type="file" name="login-background-image" style="display: inline;vertical-align: bottom" <?php if ($modsForHesk_settings['login_background_type'] == 'color') { echo 'disabled'; } ?>>
                                 <?php if ($modsForHesk_settings['login_background_type'] == 'image'): ?>
                                     <br>
-                                    <img src="../<?php echo $hesk_settings['cache_dir']; ?>/login-background/<?php echo $modsForHesk_settings['login_background']; ?>" alt="Login Background" height="125" width="125" class="push-down-10">
+                                    <img src="../<?php echo $hesk_settings['cache_dir']; ?>/lb_<?php echo $modsForHesk_settings['login_background']; ?>" alt="Login Background" height="125" width="125" class="push-down-10">
                                 <?php endif; ?>
                                 <script type="text/javascript">
                                     $('input[name="login-background-color"]').colorpicker({
diff --git a/admin/admin_settings_save.php b/admin/admin_settings_save.php
index a2372af9..26c6e7e4 100644
--- a/admin/admin_settings_save.php
+++ b/admin/admin_settings_save.php
@@ -500,7 +500,7 @@ $set['login_background_type'] = hesk_input(hesk_POST('login-background'));
 
 $changedBackground = false;
 if ($set['login_background_type'] == 'color') {
-    unlink($hesk_settings['cache_dir'] . '/' . $set['login_background']);
+    unlink($hesk_settings['cache_dir'] . '/lb_' . $set['login_background']);
     $set['login_background'] = hesk_input(hesk_POST('login-background-color'));
     if ($set['login_background'] == '') {
         $set['login_background'] = '#d2d6de';
@@ -520,25 +520,22 @@ if ($set['login_background_type'] == 'color') {
         if ($file_size > $hesk_settings['attachments']['max_size']) {
             return hesk_fileError(sprintf($hesklang['file_too_large'], $file_name));
         }
+        $ext = strtolower(strrchr($file_name, "."));
 
-        if (file_exists($hesk_settings['cache_dir'] . '/login-background/' . $set['login_background'])) {
-            unlink($hesk_settings['cache_dir'] . '/login-background/' . $set['login_background']);
+        if (file_exists($hesk_settings['cache_dir'] . '/lb_' . $set['login_background'])) {
+            unlink($hesk_settings['cache_dir'] . '/lb_' . $set['login_background']);
         }
 
-        $useChars = 'AEUYBDGHJLMNPQRSTVWXZ123456789';
-        $tmp = uniqid();
-        for ($j = 1; $j < 10; $j++) {
-            $tmp .= $useChars{mt_rand(0, 29)};
-        }
+        $saved_name = 'login-background' . $ext;
 
         $file_to_move = $_FILES['login-background-image']['tmp_name'];
 
 
-        if (!move_uploaded_file($file_to_move, dirname(dirname(__FILE__)) . '/' . $hesk_settings['cache_dir'] . '/login-background/' . $file_name)) {
+        if (!move_uploaded_file($file_to_move, dirname(dirname(__FILE__)) . '/' . $hesk_settings['cache_dir'] . '/lb_' . $saved_name)) {
             hesk_error($hesklang['cannot_move_tmp']);
         }
 
-        $set['login_background'] = $file_name;
+        $set['login_background'] = $saved_name;
         $changedBackground = true;
     }
 }
diff --git a/admin/index.php b/admin/index.php
index 25f9f651..2cbc2b02 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -269,197 +269,200 @@ function print_login()
 
 	?>
 <div class="login-box">
-    <div class="login-logo">
-        <?php echo $hesk_settings['hesk_title']; ?>
-    </div>
-    <div class="login-box-body">
-        <div class="loginError">
-            <?php
-            /* This will handle error, success and notice messages */
-            hesk_handle_messages();
-            ?>
-        </div>
-        <h4 class="login-box-msg">
-            <?php echo $hesklang['staff_login_title']; ?>
-        </h4>
-        <form class="form-horizontal" role="form" action="index.php" method="post" name="form1">
-            <?php
-            $has_error = '';
-            if (in_array('pass',$_SESSION['a_iserror'])) {
-                $has_error = 'has-error';
-            }
-            ?>
-            <div class="form-group <?php echo $has_error; ?>">
-                <label for="user" class="col-sm-4 control-label">
-                    <?php echo $hesklang['username']; ?>
-                </label>
-                <div class="col-sm-8">
+    <div class="login-box-container">
+        <div class="login-box-background"></div>
+        <div class="login-box-body">
+            <div class="loginError">
+                <?php
+                /* This will handle error, success and notice messages */
+                hesk_handle_messages();
+                ?>
+            </div>
+            <div class="login-logo">
+                <?php echo $hesk_settings['hesk_title']; ?>
+            </div>
+            <h4 class="login-box-msg">
+                <?php echo $hesklang['staff_login_title']; ?>
+            </h4>
+            <form class="form-horizontal" role="form" action="index.php" method="post" name="form1">
+                <?php
+                $has_error = '';
+                if (in_array('pass',$_SESSION['a_iserror'])) {
+                    $has_error = 'has-error';
+                }
+                ?>
+                <div class="form-group <?php echo $has_error; ?>">
+                    <label for="user" class="col-sm-4 control-label">
+                        <?php echo $hesklang['username']; ?>
+                    </label>
+                    <div class="col-sm-8">
+                        <?php
+                        if (defined('HESK_USER')) {
+                            $savedUser = HESK_USER;
+                        } else {
+                            $savedUser = hesk_htmlspecialchars(hesk_COOKIE('hesk_username'));
+                        }
+
+                        $is_1 = '';
+                        $is_2 = '';
+                        $is_3 = '';
+
+                        $remember_user = hesk_POST('remember_user');
+
+                        if ($hesk_settings['autologin'] && (isset($_COOKIE['hesk_p']) || $remember_user == 'AUTOLOGIN')) {
+                            $is_1 = 'checked';
+                        } elseif (isset($_COOKIE['hesk_username']) || $remember_user == 'JUSTUSER') {
+                            $is_2 = 'checked';
+                        } else {
+                            $is_3 = 'checked';
+                        }
+
+                        if ($hesk_settings['list_users']) :
+                            $res = hesk_dbQuery("SELECT `user` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` WHERE `active` = '1' ORDER BY `user` ASC");
+                            ?>
+                            <select class="form-control" name="user">
+                                <?php
+                                while ($row = hesk_dbFetchAssoc($res)):
+                                    $sel = (strtolower($savedUser) == strtolower($row['user'])) ? 'selected' : '';
+                                    ?>
+                                    <option value="<?php echo $row['user']; ?>" <?php echo $sel; ?>>
+                                        <?php echo $row['user']; ?>
+                                    </option>
+                                <?php endwhile; ?>
+                            </select>
+                        <?php else: ?>
+                            <input class="form-control" type="text" name="user" size="35"
+                                   placeholder="<?php echo htmlspecialchars($hesklang['username']); ?>"
+                                   value="<?php echo $savedUser; ?>">
+                        <?php endif; ?>
+                    </div>
+                </div>
+                <?php
+                $has_error = '';
+                if (in_array('pass',$_SESSION['a_iserror'])) {
+                    $has_error = 'has-error';
+                }
+                ?>
+                <div class="form-group <?php echo $has_error; ?>">
+                    <label for="pass" class="col-sm-4 control-label">
+                        <?php echo $hesklang['pass']; ?>
+                    </label>
+                    <div class="col-sm-8">
+                        <input type="password" class="form-control" id="pass" name="pass" size="35" placeholder="<?php echo htmlspecialchars($hesklang['pass']); ?>">
+                    </div>
+                </div>
+                <?php
+                if ($hesk_settings['secimg_use'] == 2)
+                {
+
+                    // SPAM prevention verified for this session
+                    if (isset($_SESSION['img_a_verified']))
+                    {
+                        echo '<img src="'.HESK_PATH.'img/success.png" width="16" height="16" border="0" alt="" style="vertical-align:text-bottom" /> '.$hesklang['vrfy'];
+                    }
+                    // Not verified yet, should we use Recaptcha?
+                    elseif ($hesk_settings['recaptcha_use'] == 1)
+                    {
+                        ?>
+                        <script type="text/javascript">
+                            var RecaptchaOptions = {
+                                theme : '<?php echo ( isset($_SESSION['a_iserror']) && in_array('mysecnum',$_SESSION['a_iserror']) ) ? 'red' : 'white'; ?>',
+                                custom_translations : {
+                                    visual_challenge : "<?php echo hesk_slashJS($hesklang['visual_challenge']); ?>",
+                                    audio_challenge : "<?php echo hesk_slashJS($hesklang['audio_challenge']); ?>",
+                                    refresh_btn : "<?php echo hesk_slashJS($hesklang['refresh_btn']); ?>",
+                                    instructions_visual : "<?php echo hesk_slashJS($hesklang['instructions_visual']); ?>",
+                                    instructions_context : "<?php echo hesk_slashJS($hesklang['instructions_context']); ?>",
+                                    instructions_audio : "<?php echo hesk_slashJS($hesklang['instructions_audio']); ?>",
+                                    help_btn : "<?php echo hesk_slashJS($hesklang['help_btn']); ?>",
+                                    play_again : "<?php echo hesk_slashJS($hesklang['play_again']); ?>",
+                                    cant_hear_this : "<?php echo hesk_slashJS($hesklang['cant_hear_this']); ?>",
+                                    incorrect_try_again : "<?php echo hesk_slashJS($hesklang['incorrect_try_again']); ?>",
+                                    image_alt_text : "<?php echo hesk_slashJS($hesklang['image_alt_text']); ?>"
+                                }
+                            };
+                        </script>
                     <?php
-                    if (defined('HESK_USER')) {
-                        $savedUser = HESK_USER;
-                    } else {
-                        $savedUser = hesk_htmlspecialchars(hesk_COOKIE('hesk_username'));
+                    require_once(HESK_PATH . 'inc/recaptcha/recaptchalib.php');
+                    echo '<div class="form-group"><div class="col-md-8 col-md-offset-4">';
+                    echo recaptcha_get_html($hesk_settings['recaptcha_public_key'], null, true);
+                    echo '</div></div>';
                     }
-
-                    $is_1 = '';
-                    $is_2 = '';
-                    $is_3 = '';
-
-                    $remember_user = hesk_POST('remember_user');
-
-                    if ($hesk_settings['autologin'] && (isset($_COOKIE['hesk_p']) || $remember_user == 'AUTOLOGIN')) {
-                        $is_1 = 'checked';
-                    } elseif (isset($_COOKIE['hesk_username']) || $remember_user == 'JUSTUSER') {
-                        $is_2 = 'checked';
-                    } else {
-                        $is_3 = 'checked';
+                    // Use reCaptcha API v2?
+                    elseif ($hesk_settings['recaptcha_use'] == 2)
+                    {
+                    ?>
+                        <div class="form-group">
+                            <div class="col-md-8 col-md-offset-4">
+                                <div class="g-recaptcha" data-sitekey="<?php echo $hesk_settings['recaptcha_public_key']; ?>"></div>
+                            </div>
+                        </div>
+                        <?php
                     }
+                    // At least use some basic PHP generated image (better than nothing)
+                    else
+                    {
+                        echo '<div class="form-group"><div class="col-md-8 col-md-offset-4">';
+                        $cls = in_array('mysecnum',$_SESSION['a_iserror']) ? ' class="isError" ' : '';
 
-                    if ($hesk_settings['list_users']) :
-                        $res = hesk_dbQuery("SELECT `user` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` WHERE `active` = '1' ORDER BY `user` ASC");
-                    ?>
-                        <select class="form-control" name="user">
-                            <?php
-                            while ($row = hesk_dbFetchAssoc($res)):
-                                $sel = (strtolower($savedUser) == strtolower($row['user'])) ? 'selected' : '';
-                            ?>
-                                <option value="<?php echo $row['user']; ?>" <?php echo $sel; ?>>
-                                    <?php echo $row['user']; ?>
-                                </option>
-                            <?php endwhile; ?>
-                        </select>
-                    <?php else: ?>
-                        <input class="form-control" type="text" name="user" size="35"
-                               placeholder="<?php echo htmlspecialchars($hesklang['username']); ?>"
-                               value="<?php echo $savedUser; ?>">
-                    <?php endif; ?>
-                </div>
-            </div>
-            <?php
-            $has_error = '';
-            if (in_array('pass',$_SESSION['a_iserror'])) {
-                $has_error = 'has-error';
-            }
-            ?>
-            <div class="form-group <?php echo $has_error; ?>">
-                <label for="pass" class="col-sm-4 control-label">
-                    <?php echo $hesklang['pass']; ?>
-                </label>
-                <div class="col-sm-8">
-                    <input type="password" class="form-control" id="pass" name="pass" size="35" placeholder="<?php echo htmlspecialchars($hesklang['pass']); ?>">
-                </div>
-            </div>
-            <?php
-            if ($hesk_settings['secimg_use'] == 2)
-            {
+                        echo $hesklang['sec_enter'].'<br><br><img src="'.HESK_PATH.'print_sec_img.php?'.rand(10000,99999).'" width="150" height="40" alt="'.$hesklang['sec_img'].'" title="'.$hesklang['sec_img'].'" border="1" name="secimg" style="vertical-align:text-bottom"> '.
+                            '<a href="javascript:void(0)" onclick="javascript:document.form1.secimg.src=\''.HESK_PATH.'print_sec_img.php?\'+ ( Math.floor((90000)*Math.random()) + 10000);"><img src="'.HESK_PATH.'img/reload.png" height="24" width="24" alt="'.$hesklang['reload'].'" title="'.$hesklang['reload'].'" border="0" style="vertical-align:text-bottom"></a>'.
+                            '<br><br><input type="text" name="mysecnum" size="20" maxlength="5" '.$cls.'>';
+                        echo '</div></div>';
+                    }
+                } // End if $hesk_settings['secimg_use'] == 2
 
-                // SPAM prevention verified for this session
-                if (isset($_SESSION['img_a_verified']))
-                {
-                    echo '<img src="'.HESK_PATH.'img/success.png" width="16" height="16" border="0" alt="" style="vertical-align:text-bottom" /> '.$hesklang['vrfy'];
-                }
-                // Not verified yet, should we use Recaptcha?
-                elseif ($hesk_settings['recaptcha_use'] == 1)
+                if ($hesk_settings['autologin'])
                 {
                     ?>
-                    <script type="text/javascript">
-                        var RecaptchaOptions = {
-                            theme : '<?php echo ( isset($_SESSION['a_iserror']) && in_array('mysecnum',$_SESSION['a_iserror']) ) ? 'red' : 'white'; ?>',
-                            custom_translations : {
-                                visual_challenge : "<?php echo hesk_slashJS($hesklang['visual_challenge']); ?>",
-                                audio_challenge : "<?php echo hesk_slashJS($hesklang['audio_challenge']); ?>",
-                                refresh_btn : "<?php echo hesk_slashJS($hesklang['refresh_btn']); ?>",
-                                instructions_visual : "<?php echo hesk_slashJS($hesklang['instructions_visual']); ?>",
-                                instructions_context : "<?php echo hesk_slashJS($hesklang['instructions_context']); ?>",
-                                instructions_audio : "<?php echo hesk_slashJS($hesklang['instructions_audio']); ?>",
-                                help_btn : "<?php echo hesk_slashJS($hesklang['help_btn']); ?>",
-                                play_again : "<?php echo hesk_slashJS($hesklang['play_again']); ?>",
-                                cant_hear_this : "<?php echo hesk_slashJS($hesklang['cant_hear_this']); ?>",
-                                incorrect_try_again : "<?php echo hesk_slashJS($hesklang['incorrect_try_again']); ?>",
-                                image_alt_text : "<?php echo hesk_slashJS($hesklang['image_alt_text']); ?>"
-                            }
-                        };
-                    </script>
-                <?php
-                require_once(HESK_PATH . 'inc/recaptcha/recaptchalib.php');
-                echo '<div class="form-group"><div class="col-md-8 col-md-offset-4">';
-                echo recaptcha_get_html($hesk_settings['recaptcha_public_key'], null, true);
-                echo '</div></div>';
-                }
-                // Use reCaptcha API v2?
-                elseif ($hesk_settings['recaptcha_use'] == 2)
-                {
-                ?>
                     <div class="form-group">
-                        <div class="col-md-8 col-md-offset-4">
-                            <div class="g-recaptcha" data-sitekey="<?php echo $hesk_settings['recaptcha_public_key']; ?>"></div>
+                        <div class="col-md-offset-4 col-md-8">
+                            <div class="radio">
+                                <label><input type="radio" name="remember_user" value="AUTOLOGIN" <?php echo $is_1; ?>> <?php echo $hesklang['autologin']; ?></label>
+                            </div>
+                            <div class="radio">
+                                <label><input type="radio" name="remember_user" value="JUSTUSER" <?php echo $is_2; ?>> <?php echo $hesklang['just_user']; ?></label>
+                            </div>
+                            <div class="radio">
+                                <label><input type="radio" name="remember_user" value="NOTHANKS" <?php echo $is_3; ?>> <?php echo $hesklang['nothx']; ?></label>
+                            </div>
                         </div>
                     </div>
                     <?php
                 }
-                // At least use some basic PHP generated image (better than nothing)
                 else
                 {
-                    echo '<div class="form-group"><div class="col-md-8 col-md-offset-4">';
-                    $cls = in_array('mysecnum',$_SESSION['a_iserror']) ? ' class="isError" ' : '';
-
-                    echo $hesklang['sec_enter'].'<br><br><img src="'.HESK_PATH.'print_sec_img.php?'.rand(10000,99999).'" width="150" height="40" alt="'.$hesklang['sec_img'].'" title="'.$hesklang['sec_img'].'" border="1" name="secimg" style="vertical-align:text-bottom"> '.
-                        '<a href="javascript:void(0)" onclick="javascript:document.form1.secimg.src=\''.HESK_PATH.'print_sec_img.php?\'+ ( Math.floor((90000)*Math.random()) + 10000);"><img src="'.HESK_PATH.'img/reload.png" height="24" width="24" alt="'.$hesklang['reload'].'" title="'.$hesklang['reload'].'" border="0" style="vertical-align:text-bottom"></a>'.
-                        '<br><br><input type="text" name="mysecnum" size="20" maxlength="5" '.$cls.'>';
-                    echo '</div></div>';
-                }
-            } // End if $hesk_settings['secimg_use'] == 2
-
-            if ($hesk_settings['autologin'])
-            {
-                ?>
-                <div class="form-group">
-                    <div class="col-md-offset-4 col-md-8">
-                        <div class="radio">
-                            <label><input type="radio" name="remember_user" value="AUTOLOGIN" <?php echo $is_1; ?>> <?php echo $hesklang['autologin']; ?></label>
-                        </div>
-                        <div class="radio">
-                            <label><input type="radio" name="remember_user" value="JUSTUSER" <?php echo $is_2; ?>> <?php echo $hesklang['just_user']; ?></label>
-                        </div>
-                        <div class="radio">
-                            <label><input type="radio" name="remember_user" value="NOTHANKS" <?php echo $is_3; ?>> <?php echo $hesklang['nothx']; ?></label>
+                    ?>
+                    <div class="form-group">
+                        <div class="col-md-offset-4 col-md-8">
+                            <div class="checkbox">
+                                <label><input type="checkbox" name="remember_user" value="JUSTUSER" <?php echo $is_2; ?> /> <?php echo $hesklang['remember_user']; ?></label>
+                            </div>
                         </div>
                     </div>
-                </div>
-                <?php
-            }
-            else
-            {
+                    <?php
+                } // End if $hesk_settings['autologin']
                 ?>
                 <div class="form-group">
                     <div class="col-md-offset-4 col-md-8">
-                        <div class="checkbox">
-                            <label><input type="checkbox" name="remember_user" value="JUSTUSER" <?php echo $is_2; ?> /> <?php echo $hesklang['remember_user']; ?></label>
-                        </div>
+                        <input type="submit" value="<?php echo $hesklang['click_login']; ?>" class="btn btn-default">
+                        <input type="hidden" name="a" value="do_login">
+                        <?php
+                        if ( hesk_isREQUEST('goto') && $url=hesk_REQUEST('goto') )
+                        {
+                            echo '<input type="hidden" name="goto" value="'.$url.'">';
+                        }
+
+                        // Do we allow staff password reset?
+                        if ($hesk_settings['reset_pass'])
+                        {
+                            echo '<br><br><a href="password.php" class="smaller">'.$hesklang['fpass'].'</a>';
+                        }
+                        ?>
                     </div>
                 </div>
-                <?php
-            } // End if $hesk_settings['autologin']
-            ?>
-            <div class="form-group">
-                <div class="col-md-offset-4 col-md-8">
-                    <input type="submit" value="<?php echo $hesklang['click_login']; ?>" class="btn btn-default">
-                    <input type="hidden" name="a" value="do_login">
-                    <?php
-                    if ( hesk_isREQUEST('goto') && $url=hesk_REQUEST('goto') )
-                    {
-                        echo '<input type="hidden" name="goto" value="'.$url.'">';
-                    }
-
-                    // Do we allow staff password reset?
-                    if ($hesk_settings['reset_pass'])
-                    {
-                        echo '<br><br><a href="password.php" class="smaller">'.$hesklang['fpass'].'</a>';
-                    }
-                    ?>
-                </div>
-            </div>
-        </form>
+            </form>
+        </div>
     </div>
 </div>
 <?php
diff --git a/css/mods-for-hesk-new.css b/css/mods-for-hesk-new.css
index f0385a1d..7fcd2604 100644
--- a/css/mods-for-hesk-new.css
+++ b/css/mods-for-hesk-new.css
@@ -178,8 +178,36 @@ button.dropdown-submit {
     min-width: 350px;
 }
 
+.login-box-container {
+    position: relative;
+}
+
+.login-box-background {
+    /* Absolutely position it, but stretch it to all four corners, then put it just behind #search's z-index */
+    /* background is handled in the header logic */
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    z-index: 99;
+
+    /* Pull the background 70px higher to the same place as #bg's */
+    /*background-position: center -70px;*/
+
+    -webkit-filter: blur(10px);
+    /*filter: url('/media/blur.svg#blur');*/
+    filter: blur(10px);
+}
+
 .login-box-body {
+    position: relative;
+    box-shadow: 0 0 50px 5px rgba(0,0,0,0.3),
+                0 0 5px -1px white;
+    background: rgb(255, 255, 255);
+    background: rgba(255, 255, 255, .75);
     border-radius: 5px;
+    z-index: 100;
 }
 
 .button-link {
diff --git a/inc/headerAdmin.inc.php b/inc/headerAdmin.inc.php
index fe745e0d..19e76af1 100644
--- a/inc/headerAdmin.inc.php
+++ b/inc/headerAdmin.inc.php
@@ -90,11 +90,26 @@ $modsForHesk_settings = mfh_getSettings();
             color: <?php echo $modsForHesk_settings['questionMarkColor']; ?>;
         }
 
-        <?php if (defined('PAGE_TITLE') && PAGE_TITLE == 'LOGIN'): ?>
+        <?php
+        if (defined('PAGE_TITLE') && PAGE_TITLE == 'LOGIN'):
+            if ($modsForHesk_settings['login_background_type'] == 'color'):
+        ?>
         body {
             background: <?php echo $modsForHesk_settings['login_background']; ?>;
         }
-        <?php endif; ?>
+        <?php else: ?>
+        body {
+            background: url('<?php echo HESK_PATH . 'cache/lb_' . $modsForHesk_settings['login_background']; ?>')
+                no-repeat center center fixed;
+            background-size: cover;
+        }
+
+        .login-box-background {
+            background: url('<?php echo HESK_PATH . 'cache/lb_' . $modsForHesk_settings['login_background']; ?>')
+                no-repeat center center fixed;
+            background-size: cover;
+        }
+        <?php endif; endif; ?>
     </style>
 
     <?php

From 55a1d3d5add0155907d17d8986dc63d17856ff24 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Fri, 9 Jun 2017 22:39:00 -0400
Subject: [PATCH 165/192] Working on adding a login header image

---
 admin/admin_settings.php                 | 51 +++++++++++++-----
 admin/admin_settings_save.php            | 69 +++++++++++++++++++++---
 install/mods-for-hesk/sql/installSql.php |  2 +
 js/modsForHesk-javascript.js             | 10 ++++
 4 files changed, 112 insertions(+), 20 deletions(-)

diff --git a/admin/admin_settings.php b/admin/admin_settings.php
index fb4ca274..b34007a4 100644
--- a/admin/admin_settings.php
+++ b/admin/admin_settings.php
@@ -3791,6 +3791,7 @@ $modsForHesk_settings = mfh_getSettings();
                         </div>
                     </div>
                 </div>
+                <h4>LOGIN PAGE</h4>
                 <div class="row">
                     <div class="col-xs-12">
                         <div class="form-group">
@@ -3800,7 +3801,9 @@ $modsForHesk_settings = mfh_getSettings();
                             <div class="col-sm-9 col-xs-7 form-inline">
                                 <div class="radio">
                                     <label>
-                                        <input type="radio" name="login-background" value="color" <?php if ($modsForHesk_settings['login_background_type'] == 'color') { echo 'checked'; } ?>>
+                                        <input type="radio" name="login-background"
+                                               data-activate="input[name='login-background-color']" data-deactivate="input[name='login-background-image']"
+                                               value="color" <?php if ($modsForHesk_settings['login_background_type'] == 'color') { echo 'checked'; } ?>>
                                         SOLID COLOR
                                     </label>
                                 </div>&nbsp;&nbsp;&nbsp;
@@ -3808,35 +3811,55 @@ $modsForHesk_settings = mfh_getSettings();
                                 <br>
                                 <div class="radio">
                                     <label>
-                                        <input type="radio" name="login-background" value="image" <?php if ($modsForHesk_settings['login_background_type'] == 'image') { echo 'checked'; } ?>>
-                                        IMAGE URL
+                                        <input type="radio" name="login-background"
+                                               data-activate="input[name='login-background-image']" data-deactivate="input[name='login-background-color']"
+                                               value="image" <?php if ($modsForHesk_settings['login_background_type'] == 'image') { echo 'checked'; } ?>>
+                                        IMAGE
                                     </label>
                                 </div>
                                 <input title="LOGIN BACKGROUND COLOR" type="file" name="login-background-image" style="display: inline;vertical-align: bottom" <?php if ($modsForHesk_settings['login_background_type'] == 'color') { echo 'disabled'; } ?>>
                                 <?php if ($modsForHesk_settings['login_background_type'] == 'image'): ?>
                                     <br>
-                                    <img src="../<?php echo $hesk_settings['cache_dir']; ?>/lb_<?php echo $modsForHesk_settings['login_background']; ?>" alt="Login Background" height="125" width="125" class="push-down-10">
+                                    <img src="<?php echo HESK_PATH . $hesk_settings['cache_dir']; ?>/lb_<?php echo $modsForHesk_settings['login_background']; ?>" alt="Login Background" height="125" width="125" class="push-down-10">
                                 <?php endif; ?>
                                 <script type="text/javascript">
                                     $('input[name="login-background-color"]').colorpicker({
                                         format: 'hex',
                                         color: <?php if ($modsForHesk_settings['login_background_type'] == 'color') { echo "'{$modsForHesk_settings['login_background']}'"; } else { echo 'false'; } ?>
                                     });
-
-                                    $('input[name="login-background"]').change(function() {
-                                        if ($(this).val() == 'color') {
-                                            $('input[name="login-background-color"]').removeAttr('disabled');
-                                            $('input[name="login-background-image"]').attr('disabled', 'disabled');
-                                        } else {
-                                            $('input[name="login-background-image"]').removeAttr('disabled');
-                                            $('input[name="login-background-color"]').attr('disabled', 'disabled');
-                                        }
-                                    });
                                 </script>
                             </div>
                         </div>
                     </div>
                 </div>
+                <div class="row">
+                    <div class="col-xs-12">
+                        <div class="form-group">
+                            <label for="login-box-header" class="col-sm-3 col-xs-5 control-label">
+                                LOGIN BOX HEADER
+                            </label>
+                            <div class="col-sm-9 col-xs-7 form-inline">
+                                <div class="radio">
+                                    <label>
+                                        <input type="radio" name="login-box-header" value="helpdesk-title" data-deactivate="input[name='login-box-header-image']" <?php if ($modsForHesk_settings['login_box_header'] == 'helpdesk-title') { echo 'checked'; } ?>>
+                                        HELPDESK TITLE
+                                    </label>
+                                </div><br>
+                                <div class="radio">
+                                    <label>
+                                        <input type="radio" name="login-box-header" value="image" data-activate="input[name='login-box-header-image']" <?php if ($modsForHesk_settings['login_box_header'] == 'image') { echo 'checked'; } ?>>
+                                        IMAGE
+                                    </label>
+                                    <input title="LOGIN HEADER IMAGE" type="file" name="login-box-header-image" style="display: inline;vertical-align: bottom" <?php if ($modsForHesk_settings['login_box_header'] == 'helpdesk-title') { echo 'disabled'; } ?>>
+                                    <?php if ($modsForHesk_settings['login_box_header'] == 'image'): ?>
+                                        <br>
+                                        <img src="<?php echo HESK_PATH . $hesk_settings['cache_dir']; ?>/lbh_<?php echo $modsForHesk_settings['login_box_header_image']; ?>" alt="<?php echo $modsForHesk_settings['login_box_header_image']; ?>" height="125" width="125" class="push-down-10">
+                                    <?php endif; ?>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
             </div>
         </div>
         <div class="form-group" style="margin-left: 10px">
diff --git a/admin/admin_settings_save.php b/admin/admin_settings_save.php
index 26c6e7e4..469094b0 100644
--- a/admin/admin_settings_save.php
+++ b/admin/admin_settings_save.php
@@ -39,6 +39,8 @@ hesk_checkPermission('can_manage_settings');
 // A security check
 hesk_token_check('POST');
 
+$modsForHesk_settings = mfh_getSettings();
+
 // Demo mode
 if (defined('HESK_DEMO')) {
     hesk_process_messages($hesklang['sdemo'], 'admin_settings.php');
@@ -497,10 +499,14 @@ $set['dropdownItemTextHoverBackgroundColor'] = hesk_input(hesk_POST('dropdownIte
 $set['admin_color_scheme'] = hesk_input(hesk_POST('admin-color-scheme'));
 
 $set['login_background_type'] = hesk_input(hesk_POST('login-background'));
+$set['login_box_header'] = hesk_input(hesk_POST('login-box-header'));
 
 $changedBackground = false;
+$loadedAttachmentFuncs = false;
 if ($set['login_background_type'] == 'color') {
-    unlink($hesk_settings['cache_dir'] . '/lb_' . $set['login_background']);
+    if (file_exists($hesk_settings['cache_dir'] . '/lb_' . $set['login_background'])) {
+        unlink($hesk_settings['cache_dir'] . '/lb_' . $set['login_background']);
+    }
     $set['login_background'] = hesk_input(hesk_POST('login-background-color'));
     if ($set['login_background'] == '') {
         $set['login_background'] = '#d2d6de';
@@ -508,8 +514,11 @@ if ($set['login_background_type'] == 'color') {
 
     $changedBackground = true;
 } else {
-    include(HESK_PATH . 'inc/attachments.inc.php');
-    include(HESK_PATH . 'inc/posting_functions.inc.php');
+    if (!$loadedAttachmentFuncs) {
+        include(HESK_PATH . 'inc/attachments.inc.php');
+        include(HESK_PATH . 'inc/posting_functions.inc.php');
+        $loadedAttachmentFuncs = true;
+    }
 
 
     $file_name = hesk_cleanFileName($_FILES['login-background-image']['name']);
@@ -522,8 +531,8 @@ if ($set['login_background_type'] == 'color') {
         }
         $ext = strtolower(strrchr($file_name, "."));
 
-        if (file_exists($hesk_settings['cache_dir'] . '/lb_' . $set['login_background'])) {
-            unlink($hesk_settings['cache_dir'] . '/lb_' . $set['login_background']);
+        if (file_exists($hesk_settings['cache_dir'] . '/lb_' . $modsForHesk_settings['login_background'])) {
+            unlink($hesk_settings['cache_dir'] . '/lb_' . $modsForHesk_settings['login_background']);
         }
 
         $saved_name = 'login-background' . $ext;
@@ -539,6 +548,49 @@ if ($set['login_background_type'] == 'color') {
         $changedBackground = true;
     }
 }
+$changedLoginImage = false;
+if ($set['login_box_header'] == 'image') {
+    if (!$loadedAttachmentFuncs) {
+        include(HESK_PATH . 'inc/attachments.inc.php');
+        include(HESK_PATH . 'inc/posting_functions.inc.php');
+        $loadedAttachmentFuncs = true;
+    }
+
+
+    $file_name = hesk_cleanFileName($_FILES['login-box-header-image']['name']);
+
+    if (!empty($_FILES['login-box-header-image']['name'])) {
+        $file_size = $_FILES['login-box-header-image']['size'];
+        if ($file_size > $hesk_settings['attachments']['max_size']) {
+            return hesk_fileError(sprintf($hesklang['file_too_large'], $file_name));
+        }
+        $ext = strtolower(strrchr($file_name, "."));
+
+        if (file_exists($hesk_settings['cache_dir'] . '/lbh_' . $modsForHesk_settings['login_box_header_image'])) {
+            unlink($hesk_settings['cache_dir'] . '/lbh_' . $modsForHesk_settings['login_box_header_image']);
+        }
+
+        $saved_name = 'login-box-header-image' . $ext;
+
+        $file_to_move = $_FILES['login-box-header-image']['tmp_name'];
+
+
+        if (!move_uploaded_file($file_to_move, dirname(dirname(__FILE__)) . '/' . $hesk_settings['cache_dir'] . '/lbh_' . $saved_name)) {
+            hesk_error($hesklang['cannot_move_tmp']);
+        }
+
+        $set['login_box_header_image'] = $saved_name;
+        $changedLoginImage = true;
+    }
+} else {
+    if (file_exists($hesk_settings['cache_dir'] . '/lbh_' . $set['login_box_header_image'])) {
+        unlink($hesk_settings['cache_dir'] . '/lbh_' . $set['login_box_header_image']);
+    }
+
+    $set['login_box_header_image'] = '';
+    $changedLoginImage = true;
+}
+
 mfh_updateSetting('rtl', $set['rtl']);
 mfh_updateSetting('show_icons', $set['show-icons']);
 mfh_updateSetting('custom_field_setting', $set['custom-field-setting']);
@@ -577,9 +629,14 @@ mfh_updateSetting('first_day_of_week', $set['first_day_of_week'], false);
 mfh_updateSetting('default_calendar_view', $set['default_view'], true);
 mfh_updateSetting('admin_color_scheme', $set['admin_color_scheme'], true);
 
+mfh_updateSetting('login_background_type', $set['login_background_type'], true);
 if ($changedBackground) {
     mfh_updateSetting('login_background', $set['login_background'], true);
-    mfh_updateSetting('login_background_type', $set['login_background_type'], true);
+}
+
+mfh_updateSetting('login_box_header', $set['login_box_header'], true);
+if ($changedLoginImage) {
+    mfh_updateSetting('login_box_header_image', $set['login_box_header_image'], true);
 }
 
 // Prepare settings file and save it
diff --git a/install/mods-for-hesk/sql/installSql.php b/install/mods-for-hesk/sql/installSql.php
index 49fb23cd..d50ebc42 100644
--- a/install/mods-for-hesk/sql/installSql.php
+++ b/install/mods-for-hesk/sql/installSql.php
@@ -1011,6 +1011,8 @@ function execute310Scripts() {
     executeQuery("ALTER TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` CHANGE `color` `background_color` VARCHAR(7) NOT NULL DEFAULT '#FFFFFF'");
     executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) VALUES ('login_background_type', 'color')");
     executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) VALUES ('login_background', '#d2d6de')");
+    executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) VALUES ('login_box_header', 'helpdesk-title')");
+    executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) VALUES ('login_box_header_image', '')");
 
     updateVersion('3.1.0');
 }
\ No newline at end of file
diff --git a/js/modsForHesk-javascript.js b/js/modsForHesk-javascript.js
index cfac6bac..2dac5abe 100644
--- a/js/modsForHesk-javascript.js
+++ b/js/modsForHesk-javascript.js
@@ -94,6 +94,16 @@ var loadJquery = function()
         closeOnContentClick: true
     });
 
+    $('[data-activate]').click(function() {
+        var activate = $(this).data('activate');
+        $(activate).removeAttr('disabled');
+    });
+
+    $('[data-deactivate]').click(function() {
+        var deactivate = $(this).data('deactivate');
+        $(deactivate).attr('disabled', 'disabled');
+    });
+
     //-- Initialize toastr properties
     toastr.options.progressBar = true;
     toastr.options.closeButton = true;

From 01570e856c9cc42a434108a13f81ff7c80b0fc4e Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sat, 10 Jun 2017 12:06:14 -0400
Subject: [PATCH 166/192] Login header image is working

---
 admin/admin_settings.php | 26 ++++++++++++++------------
 admin/index.php          |  9 +++++++--
 language/en/text.php     | 12 ++++++++++--
 3 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/admin/admin_settings.php b/admin/admin_settings.php
index b34007a4..92ba9505 100644
--- a/admin/admin_settings.php
+++ b/admin/admin_settings.php
@@ -3791,12 +3791,12 @@ $modsForHesk_settings = mfh_getSettings();
                         </div>
                     </div>
                 </div>
-                <h4>LOGIN PAGE</h4>
+                <h4><?php echo $hesklang['login_page']; ?></h4>
                 <div class="row">
                     <div class="col-xs-12">
                         <div class="form-group">
                             <label for="login-background" class="col-sm-3 col-xs-5 control-label">
-                                LOGIN BACKGROUND [!]
+                                <?php echo $hesklang['login_background']; ?>
                             </label>
                             <div class="col-sm-9 col-xs-7 form-inline">
                                 <div class="radio">
@@ -3804,23 +3804,25 @@ $modsForHesk_settings = mfh_getSettings();
                                         <input type="radio" name="login-background"
                                                data-activate="input[name='login-background-color']" data-deactivate="input[name='login-background-image']"
                                                value="color" <?php if ($modsForHesk_settings['login_background_type'] == 'color') { echo 'checked'; } ?>>
-                                        SOLID COLOR
+                                        <?php echo $hesklang['solid_color']; ?>
                                     </label>
                                 </div>&nbsp;&nbsp;&nbsp;
-                                <input title="LOGIN BACKGROUND COLOR" type="text" name="login-background-color" class="form-control" <?php if ($modsForHesk_settings['login_background_type'] == 'image') { echo 'disabled'; } ?>>
+                                <input title="<?php echo $hesklang['login_background_color']; ?>" type="text"
+                                       name="login-background-color" class="form-control"
+                                    <?php if ($modsForHesk_settings['login_background_type'] == 'image') { echo 'disabled'; } ?>>
                                 <br>
                                 <div class="radio">
                                     <label>
                                         <input type="radio" name="login-background"
                                                data-activate="input[name='login-background-image']" data-deactivate="input[name='login-background-color']"
                                                value="image" <?php if ($modsForHesk_settings['login_background_type'] == 'image') { echo 'checked'; } ?>>
-                                        IMAGE
+                                        <?php echo $hesklang['image']; ?>
                                     </label>
                                 </div>
-                                <input title="LOGIN BACKGROUND COLOR" type="file" name="login-background-image" style="display: inline;vertical-align: bottom" <?php if ($modsForHesk_settings['login_background_type'] == 'color') { echo 'disabled'; } ?>>
+                                <input title="<?php echo $hesklang['login_background_image']; ?>" type="file" name="login-background-image" style="display: inline;vertical-align: bottom" <?php if ($modsForHesk_settings['login_background_type'] == 'color') { echo 'disabled'; } ?>>
                                 <?php if ($modsForHesk_settings['login_background_type'] == 'image'): ?>
                                     <br>
-                                    <img src="<?php echo HESK_PATH . $hesk_settings['cache_dir']; ?>/lb_<?php echo $modsForHesk_settings['login_background']; ?>" alt="Login Background" height="125" width="125" class="push-down-10">
+                                    <img src="<?php echo HESK_PATH . $hesk_settings['cache_dir']; ?>/lb_<?php echo $modsForHesk_settings['login_background']; ?>" alt="<?php echo $hesklang['login_background']; ?>" title="<?php echo $hesklang['login_background']; ?>" height="125" width="125" class="push-down-10">
                                 <?php endif; ?>
                                 <script type="text/javascript">
                                     $('input[name="login-background-color"]').colorpicker({
@@ -3836,24 +3838,24 @@ $modsForHesk_settings = mfh_getSettings();
                     <div class="col-xs-12">
                         <div class="form-group">
                             <label for="login-box-header" class="col-sm-3 col-xs-5 control-label">
-                                LOGIN BOX HEADER
+                                <?php echo $hesklang['login_box_header']; ?>
                             </label>
                             <div class="col-sm-9 col-xs-7 form-inline">
                                 <div class="radio">
                                     <label>
                                         <input type="radio" name="login-box-header" value="helpdesk-title" data-deactivate="input[name='login-box-header-image']" <?php if ($modsForHesk_settings['login_box_header'] == 'helpdesk-title') { echo 'checked'; } ?>>
-                                        HELPDESK TITLE
+                                        <?php echo $hesklang['hesk_title']; ?>
                                     </label>
                                 </div><br>
                                 <div class="radio">
                                     <label>
                                         <input type="radio" name="login-box-header" value="image" data-activate="input[name='login-box-header-image']" <?php if ($modsForHesk_settings['login_box_header'] == 'image') { echo 'checked'; } ?>>
-                                        IMAGE
+                                        <?php echo $hesklang['image']; ?>
                                     </label>
-                                    <input title="LOGIN HEADER IMAGE" type="file" name="login-box-header-image" style="display: inline;vertical-align: bottom" <?php if ($modsForHesk_settings['login_box_header'] == 'helpdesk-title') { echo 'disabled'; } ?>>
+                                    <input title="<?php echo $hesklang['login_header_image']; ?>" type="file" name="login-box-header-image" style="display: inline;vertical-align: bottom" <?php if ($modsForHesk_settings['login_box_header'] == 'helpdesk-title') { echo 'disabled'; } ?>>
                                     <?php if ($modsForHesk_settings['login_box_header'] == 'image'): ?>
                                         <br>
-                                        <img src="<?php echo HESK_PATH . $hesk_settings['cache_dir']; ?>/lbh_<?php echo $modsForHesk_settings['login_box_header_image']; ?>" alt="<?php echo $modsForHesk_settings['login_box_header_image']; ?>" height="125" width="125" class="push-down-10">
+                                        <img src="<?php echo HESK_PATH . $hesk_settings['cache_dir']; ?>/lbh_<?php echo $modsForHesk_settings['login_box_header_image']; ?>" title="<?php echo $modsForHesk_settings['login_box_header_image']; ?>" alt="<?php echo $modsForHesk_settings['login_box_header_image']; ?>" style="height: 75px" class="push-down-10">
                                     <?php endif; ?>
                                 </div>
                             </div>
diff --git a/admin/index.php b/admin/index.php
index 2cbc2b02..cef05749 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -246,7 +246,7 @@ function do_login()
 
 function print_login()
 {
-	global $hesk_settings, $hesklang;
+	global $hesk_settings, $hesklang, $modsForHesk_settings;
 
     // Tell header to load reCaptcha API if needed
     if ($hesk_settings['recaptcha_use'] == 2)
@@ -279,7 +279,12 @@ function print_login()
                 ?>
             </div>
             <div class="login-logo">
-                <?php echo $hesk_settings['hesk_title']; ?>
+                <?php if ($modsForHesk_settings['login_box_header'] == 'image'): ?>
+                    <img src="<?php echo HESK_PATH . $hesk_settings['cache_dir'] . '/lbh_' . $modsForHesk_settings['login_box_header_image']; ?>"
+                         style="height: 75px">
+                <?php else:
+                    echo $hesk_settings['hesk_title'];
+                endif; ?>
             </div>
             <h4 class="login-box-msg">
                 <?php echo $hesklang['staff_login_title']; ?>
diff --git a/language/en/text.php b/language/en/text.php
index cb790216..d564379c 100644
--- a/language/en/text.php
+++ b/language/en/text.php
@@ -1699,7 +1699,7 @@ $hesklang['saved_ticket_tpl'] = 'Saved Templates';
 $hesklang['new_ticket_tpl']='Add or Edit a Ticket Template';
 $hesklang['and_change_status_to'] = 'and change status to'; // Used in combination with $hesklang['submit_reply'] (Reads as "Submit reply and change status to")
 $hesklang['closed_title'] = 'Closed';
-$hesklang['image'] = 'Image'; // Used for alt tag
+$hesklang['image'] = 'Image';
 $hesklang['close_modal'] = 'Close';
 $hesklang['email_custom_field'] = 'Email Address';
 $hesklang['email_custom_field_help'] = 'Allows the input of an email address. Similar to a text field, however the email address(es) will be added to all emails for this ticket, in the Cc or Bcc section, depending on the option selected.';
@@ -2130,7 +2130,15 @@ $hesklang['category_foreground_color'] = 'Foreground Color';
 $hesklang['category_background_color_help'] = 'The hex code for the background color to be used on the view ticket screen and calendar.';
 $hesklang['category_foreground_color_help'] = 'The hex code for the foreground color to be used on the view ticket and calendar screens. Leave blank for automatic color based on background.';
 $hesklang['category_display_border'] = 'Display Border';
-$hesklang['category_display_border_help'] = 'Choose to decide whether or not to display a border around the category (uses foreground color). <b>This is ignored if foreground color is set to automatic.</b>';
+$hesklang['category_display_border_help'] = 'Choose to decide whether or not to display a border around the category (uses foreground color). <b>
+This is ignored if foreground color is set to automatic.</b>';
+$hesklang['login_page'] = 'Login Page'; // Header on admin settings page
+$hesklang['login_background'] = 'Login Background';
+$hesklang['solid_color'] = 'Solid Color';
+$hesklang['login_background_color'] = 'Login Background Color'; // Input field information for screen-readers. Does not appear on-screen
+$hesklang['login_background_image'] = 'Login Background Image'; // Input field information for screen-readers. Does not appear on-screen
+$hesklang['login_box_header'] = 'Login Box Header';
+$hesklang['login_header_image'] = 'Login Header Image'; // Input field information for screen-readers. Does not appear on-screen
 
 // DO NOT CHANGE BELOW
 if (!defined('IN_SCRIPT')) die('PHP syntax OK!');

From 858e14ee8cbf989371a00e88086f38fa5c6eac6d Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sat, 10 Jun 2017 12:09:04 -0400
Subject: [PATCH 167/192] Remove RTL support

---
 admin/admin_settings.php                 |  23 +---
 admin/admin_settings_save.php            |   2 -
 css/bootstrap-rtl.min.css                |   9 --
 css/hesk_newStyleRTL.css                 | 160 -----------------------
 inc/header.inc.php                       |  26 +---
 install/mods-for-hesk/sql/installSql.php |   1 +
 print.php                                |   2 +-
 7 files changed, 8 insertions(+), 215 deletions(-)
 delete mode 100644 css/bootstrap-rtl.min.css
 delete mode 100644 css/hesk_newStyleRTL.css

diff --git a/admin/admin_settings.php b/admin/admin_settings.php
index 92ba9505..e96b9c1a 100644
--- a/admin/admin_settings.php
+++ b/admin/admin_settings.php
@@ -3426,27 +3426,6 @@ $modsForHesk_settings = mfh_getSettings();
                                value="<?php echo $hesk_settings['online_min']; ?>"/>
                     </div>
                 </div>
-                <div class="form-group">
-                    <label for="rtl" class="col-sm-4 col-xs-12 control-label">
-                        <span class="label label-primary"
-                              data-toggle="tooltip"
-                              title="<?php echo $hesklang['added_in_mods_for_hesk'] ?>"><?php echo $hesklang['mods_for_hesk_acronym']; ?></span>
-                        <?php echo $hesklang['displayRtl']; ?>
-                        <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                           title="<?php echo $hesklang['displayRtl']; ?>"
-                           data-content="<?php echo $hesklang['displayRtlHelp']; ?>"></i>
-                    </label>
-
-                    <div class="col-sm-8 col-xs-12">
-                        <div class="checkbox">
-                            <label>
-                                <input id="rtl" name="rtl" type="checkbox" <?php if ($modsForHesk_settings['rtl']) {
-                                    echo 'checked';
-                                } ?>> <?php echo $hesklang['display_rtl']; ?>
-                            </label>
-                        </div>
-                    </div>
-                </div>
                 <div class="form-group">
                     <label for="show-icons" class="col-sm-4 col-xs-12 control-label">
                         <span class="label label-primary"
@@ -4135,7 +4114,7 @@ $modsForHesk_settings = mfh_getSettings();
                         background: #fff;
                         color: black;
                         font: 68.8%/1.5 Verdana, Geneva, Arial, Helvetica, sans-serif;
-                        text-align: <?php if ($modsForHesk_settings['rtl']) { echo 'right'; } else { echo 'left'; } ?>;
+                        text-align: left; ?>;
                     }
 
                     p {
diff --git a/admin/admin_settings_save.php b/admin/admin_settings_save.php
index 469094b0..13d35719 100644
--- a/admin/admin_settings_save.php
+++ b/admin/admin_settings_save.php
@@ -449,7 +449,6 @@ foreach ($postArray as $value) {
 }
 
 // Save the modsForHesk_settings.inc.php file
-$set['rtl'] = empty($_POST['rtl']) ? 0 : 1;
 $set['show-icons'] = empty($_POST['show-icons']) ? 0 : 1;
 $set['custom-field-setting'] = empty($_POST['custom-field-setting']) ? 0 : 1;
 $set['customer-email-verification-required'] = empty($_POST['email-verification']) ? 0 : 1;
@@ -591,7 +590,6 @@ if ($set['login_box_header'] == 'image') {
     $changedLoginImage = true;
 }
 
-mfh_updateSetting('rtl', $set['rtl']);
 mfh_updateSetting('show_icons', $set['show-icons']);
 mfh_updateSetting('custom_field_setting', $set['custom-field-setting']);
 mfh_updateSetting('customer_email_verification_required', $set['customer-email-verification-required']);
diff --git a/css/bootstrap-rtl.min.css b/css/bootstrap-rtl.min.css
deleted file mode 100644
index 8dac213e..00000000
--- a/css/bootstrap-rtl.min.css
+++ /dev/null
@@ -1,9 +0,0 @@
-/*******************************************************************************
- *              bootstrap-rtl (version 3.3.1)
- *      Author: Morteza Ansarinia (http://github.com/morteza)
- *  Created on: January 21,2015
- *     Project: bootstrap-rtl
- *   Copyright: Unlicensed Public Domain
- *******************************************************************************/
-
-html{direction:rtl}body{direction:rtl}.list-unstyled{padding-right:0;padding-left:initial}.list-inline{padding-right:0;padding-left:initial;margin-right:-5px;margin-left:0}dd{margin-right:0;margin-left:initial}@media (min-width:768px){.dl-horizontal dt{float:right;clear:right;text-align:left}.dl-horizontal dd{margin-right:180px;margin-left:0}}blockquote{border-right:5px solid #eee;border-left:0}.blockquote-reverse,blockquote.pull-left{padding-left:15px;padding-right:0;border-left:5px solid #eee;border-right:0;text-align:left}.col-xs-1,.col-sm-1,.col-md-1,.col-lg-1,.col-xs-2,.col-sm-2,.col-md-2,.col-lg-2,.col-xs-3,.col-sm-3,.col-md-3,.col-lg-3,.col-xs-4,.col-sm-4,.col-md-4,.col-lg-4,.col-xs-5,.col-sm-5,.col-md-5,.col-lg-5,.col-xs-6,.col-sm-6,.col-md-6,.col-lg-6,.col-xs-7,.col-sm-7,.col-md-7,.col-lg-7,.col-xs-8,.col-sm-8,.col-md-8,.col-lg-8,.col-xs-9,.col-sm-9,.col-md-9,.col-lg-9,.col-xs-10,.col-sm-10,.col-md-10,.col-lg-10,.col-xs-11,.col-sm-11,.col-md-11,.col-lg-11,.col-xs-12,.col-sm-12,.col-md-12,.col-lg-12{position:relative;min-height:1px;padding-left:15px;padding-right:15px}.col-xs-1,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9,.col-xs-10,.col-xs-11,.col-xs-12{float:right}.col-xs-12{width:100%}.col-xs-11{width:91.66666667%}.col-xs-10{width:83.33333333%}.col-xs-9{width:75%}.col-xs-8{width:66.66666667%}.col-xs-7{width:58.33333333%}.col-xs-6{width:50%}.col-xs-5{width:41.66666667%}.col-xs-4{width:33.33333333%}.col-xs-3{width:25%}.col-xs-2{width:16.66666667%}.col-xs-1{width:8.33333333%}.col-xs-pull-12{left:100%;right:auto}.col-xs-pull-11{left:91.66666667%;right:auto}.col-xs-pull-10{left:83.33333333%;right:auto}.col-xs-pull-9{left:75%;right:auto}.col-xs-pull-8{left:66.66666667%;right:auto}.col-xs-pull-7{left:58.33333333%;right:auto}.col-xs-pull-6{left:50%;right:auto}.col-xs-pull-5{left:41.66666667%;right:auto}.col-xs-pull-4{left:33.33333333%;right:auto}.col-xs-pull-3{left:25%;right:auto}.col-xs-pull-2{left:16.66666667%;right:auto}.col-xs-pull-1{left:8.33333333%;right:auto}.col-xs-pull-0{left:auto;right:auto}.col-xs-push-12{right:100%;left:0}.col-xs-push-11{right:91.66666667%;left:0}.col-xs-push-10{right:83.33333333%;left:0}.col-xs-push-9{right:75%;left:0}.col-xs-push-8{right:66.66666667%;left:0}.col-xs-push-7{right:58.33333333%;left:0}.col-xs-push-6{right:50%;left:0}.col-xs-push-5{right:41.66666667%;left:0}.col-xs-push-4{right:33.33333333%;left:0}.col-xs-push-3{right:25%;left:0}.col-xs-push-2{right:16.66666667%;left:0}.col-xs-push-1{right:8.33333333%;left:0}.col-xs-push-0{right:auto;left:0}.col-xs-offset-12{margin-right:100%;margin-left:0}.col-xs-offset-11{margin-right:91.66666667%;margin-left:0}.col-xs-offset-10{margin-right:83.33333333%;margin-left:0}.col-xs-offset-9{margin-right:75%;margin-left:0}.col-xs-offset-8{margin-right:66.66666667%;margin-left:0}.col-xs-offset-7{margin-right:58.33333333%;margin-left:0}.col-xs-offset-6{margin-right:50%;margin-left:0}.col-xs-offset-5{margin-right:41.66666667%;margin-left:0}.col-xs-offset-4{margin-right:33.33333333%;margin-left:0}.col-xs-offset-3{margin-right:25%;margin-left:0}.col-xs-offset-2{margin-right:16.66666667%;margin-left:0}.col-xs-offset-1{margin-right:8.33333333%;margin-left:0}.col-xs-offset-0{margin-right:0;margin-left:0}@media (min-width:768px){.col-sm-1,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-sm-10,.col-sm-11,.col-sm-12{float:right}.col-sm-12{width:100%}.col-sm-11{width:91.66666667%}.col-sm-10{width:83.33333333%}.col-sm-9{width:75%}.col-sm-8{width:66.66666667%}.col-sm-7{width:58.33333333%}.col-sm-6{width:50%}.col-sm-5{width:41.66666667%}.col-sm-4{width:33.33333333%}.col-sm-3{width:25%}.col-sm-2{width:16.66666667%}.col-sm-1{width:8.33333333%}.col-sm-pull-12{left:100%;right:auto}.col-sm-pull-11{left:91.66666667%;right:auto}.col-sm-pull-10{left:83.33333333%;right:auto}.col-sm-pull-9{left:75%;right:auto}.col-sm-pull-8{left:66.66666667%;right:auto}.col-sm-pull-7{left:58.33333333%;right:auto}.col-sm-pull-6{left:50%;right:auto}.col-sm-pull-5{left:41.66666667%;right:auto}.col-sm-pull-4{left:33.33333333%;right:auto}.col-sm-pull-3{left:25%;right:auto}.col-sm-pull-2{left:16.66666667%;right:auto}.col-sm-pull-1{left:8.33333333%;right:auto}.col-sm-pull-0{left:auto;right:auto}.col-sm-push-12{right:100%;left:0}.col-sm-push-11{right:91.66666667%;left:0}.col-sm-push-10{right:83.33333333%;left:0}.col-sm-push-9{right:75%;left:0}.col-sm-push-8{right:66.66666667%;left:0}.col-sm-push-7{right:58.33333333%;left:0}.col-sm-push-6{right:50%;left:0}.col-sm-push-5{right:41.66666667%;left:0}.col-sm-push-4{right:33.33333333%;left:0}.col-sm-push-3{right:25%;left:0}.col-sm-push-2{right:16.66666667%;left:0}.col-sm-push-1{right:8.33333333%;left:0}.col-sm-push-0{right:auto;left:0}.col-sm-offset-12{margin-right:100%;margin-left:0}.col-sm-offset-11{margin-right:91.66666667%;margin-left:0}.col-sm-offset-10{margin-right:83.33333333%;margin-left:0}.col-sm-offset-9{margin-right:75%;margin-left:0}.col-sm-offset-8{margin-right:66.66666667%;margin-left:0}.col-sm-offset-7{margin-right:58.33333333%;margin-left:0}.col-sm-offset-6{margin-right:50%;margin-left:0}.col-sm-offset-5{margin-right:41.66666667%;margin-left:0}.col-sm-offset-4{margin-right:33.33333333%;margin-left:0}.col-sm-offset-3{margin-right:25%;margin-left:0}.col-sm-offset-2{margin-right:16.66666667%;margin-left:0}.col-sm-offset-1{margin-right:8.33333333%;margin-left:0}.col-sm-offset-0{margin-right:0;margin-left:0}}@media (min-width:992px){.col-md-1,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-md-10,.col-md-11,.col-md-12{float:right}.col-md-12{width:100%}.col-md-11{width:91.66666667%}.col-md-10{width:83.33333333%}.col-md-9{width:75%}.col-md-8{width:66.66666667%}.col-md-7{width:58.33333333%}.col-md-6{width:50%}.col-md-5{width:41.66666667%}.col-md-4{width:33.33333333%}.col-md-3{width:25%}.col-md-2{width:16.66666667%}.col-md-1{width:8.33333333%}.col-md-pull-12{left:100%;right:auto}.col-md-pull-11{left:91.66666667%;right:auto}.col-md-pull-10{left:83.33333333%;right:auto}.col-md-pull-9{left:75%;right:auto}.col-md-pull-8{left:66.66666667%;right:auto}.col-md-pull-7{left:58.33333333%;right:auto}.col-md-pull-6{left:50%;right:auto}.col-md-pull-5{left:41.66666667%;right:auto}.col-md-pull-4{left:33.33333333%;right:auto}.col-md-pull-3{left:25%;right:auto}.col-md-pull-2{left:16.66666667%;right:auto}.col-md-pull-1{left:8.33333333%;right:auto}.col-md-pull-0{left:auto;right:auto}.col-md-push-12{right:100%;left:0}.col-md-push-11{right:91.66666667%;left:0}.col-md-push-10{right:83.33333333%;left:0}.col-md-push-9{right:75%;left:0}.col-md-push-8{right:66.66666667%;left:0}.col-md-push-7{right:58.33333333%;left:0}.col-md-push-6{right:50%;left:0}.col-md-push-5{right:41.66666667%;left:0}.col-md-push-4{right:33.33333333%;left:0}.col-md-push-3{right:25%;left:0}.col-md-push-2{right:16.66666667%;left:0}.col-md-push-1{right:8.33333333%;left:0}.col-md-push-0{right:auto;left:0}.col-md-offset-12{margin-right:100%;margin-left:0}.col-md-offset-11{margin-right:91.66666667%;margin-left:0}.col-md-offset-10{margin-right:83.33333333%;margin-left:0}.col-md-offset-9{margin-right:75%;margin-left:0}.col-md-offset-8{margin-right:66.66666667%;margin-left:0}.col-md-offset-7{margin-right:58.33333333%;margin-left:0}.col-md-offset-6{margin-right:50%;margin-left:0}.col-md-offset-5{margin-right:41.66666667%;margin-left:0}.col-md-offset-4{margin-right:33.33333333%;margin-left:0}.col-md-offset-3{margin-right:25%;margin-left:0}.col-md-offset-2{margin-right:16.66666667%;margin-left:0}.col-md-offset-1{margin-right:8.33333333%;margin-left:0}.col-md-offset-0{margin-right:0;margin-left:0}}@media (min-width:1200px){.col-lg-1,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-lg-10,.col-lg-11,.col-lg-12{float:right}.col-lg-12{width:100%}.col-lg-11{width:91.66666667%}.col-lg-10{width:83.33333333%}.col-lg-9{width:75%}.col-lg-8{width:66.66666667%}.col-lg-7{width:58.33333333%}.col-lg-6{width:50%}.col-lg-5{width:41.66666667%}.col-lg-4{width:33.33333333%}.col-lg-3{width:25%}.col-lg-2{width:16.66666667%}.col-lg-1{width:8.33333333%}.col-lg-pull-12{left:100%;right:auto}.col-lg-pull-11{left:91.66666667%;right:auto}.col-lg-pull-10{left:83.33333333%;right:auto}.col-lg-pull-9{left:75%;right:auto}.col-lg-pull-8{left:66.66666667%;right:auto}.col-lg-pull-7{left:58.33333333%;right:auto}.col-lg-pull-6{left:50%;right:auto}.col-lg-pull-5{left:41.66666667%;right:auto}.col-lg-pull-4{left:33.33333333%;right:auto}.col-lg-pull-3{left:25%;right:auto}.col-lg-pull-2{left:16.66666667%;right:auto}.col-lg-pull-1{left:8.33333333%;right:auto}.col-lg-pull-0{left:auto;right:auto}.col-lg-push-12{right:100%;left:0}.col-lg-push-11{right:91.66666667%;left:0}.col-lg-push-10{right:83.33333333%;left:0}.col-lg-push-9{right:75%;left:0}.col-lg-push-8{right:66.66666667%;left:0}.col-lg-push-7{right:58.33333333%;left:0}.col-lg-push-6{right:50%;left:0}.col-lg-push-5{right:41.66666667%;left:0}.col-lg-push-4{right:33.33333333%;left:0}.col-lg-push-3{right:25%;left:0}.col-lg-push-2{right:16.66666667%;left:0}.col-lg-push-1{right:8.33333333%;left:0}.col-lg-push-0{right:auto;left:0}.col-lg-offset-12{margin-right:100%;margin-left:0}.col-lg-offset-11{margin-right:91.66666667%;margin-left:0}.col-lg-offset-10{margin-right:83.33333333%;margin-left:0}.col-lg-offset-9{margin-right:75%;margin-left:0}.col-lg-offset-8{margin-right:66.66666667%;margin-left:0}.col-lg-offset-7{margin-right:58.33333333%;margin-left:0}.col-lg-offset-6{margin-right:50%;margin-left:0}.col-lg-offset-5{margin-right:41.66666667%;margin-left:0}.col-lg-offset-4{margin-right:33.33333333%;margin-left:0}.col-lg-offset-3{margin-right:25%;margin-left:0}.col-lg-offset-2{margin-right:16.66666667%;margin-left:0}.col-lg-offset-1{margin-right:8.33333333%;margin-left:0}.col-lg-offset-0{margin-right:0;margin-left:0}}caption{text-align:right}th{text-align:right}@media screen and (max-width:767px){.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>thead>tr>th:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child{border-right:0;border-left:initial}.table-responsive>.table-bordered>thead>tr>th:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child{border-left:0;border-right:initial}}.radio label,.checkbox label{padding-right:20px;padding-left:initial}.radio input[type=radio],.radio-inline input[type=radio],.checkbox input[type=checkbox],.checkbox-inline input[type=checkbox]{margin-right:-20px;margin-left:auto}.radio-inline,.checkbox-inline{padding-right:20px;padding-left:0}.radio-inline+.radio-inline,.checkbox-inline+.checkbox-inline{margin-right:10px;margin-left:0}.has-feedback .form-control{padding-left:42.5px;padding-right:12px}.form-control-feedback{left:0;right:auto}@media (min-width:768px){.form-inline label{padding-right:0;padding-left:initial}.form-inline .radio input[type=radio],.form-inline .checkbox input[type=checkbox]{margin-right:0;margin-left:auto}}@media (min-width:768px){.form-horizontal .control-label{text-align:left}}.form-horizontal .has-feedback .form-control-feedback{left:15px;right:auto}.caret{margin-right:2px;margin-left:0}.dropdown-menu{right:0;left:auto;float:left;text-align:right}.dropdown-menu.pull-right{left:0;right:auto;float:right}.dropdown-menu-right{left:auto;right:0}.dropdown-menu-left{left:0;right:auto}@media (min-width:768px){.navbar-right .dropdown-menu{left:auto;right:0}.navbar-right .dropdown-menu-left{left:0;right:auto}}.btn-group>.btn,.btn-group-vertical>.btn{float:right}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-right:-1px;margin-left:0}.btn-toolbar{margin-right:-5px;margin-left:0}.btn-toolbar .btn-group,.btn-toolbar .input-group{float:right}.btn-toolbar>.btn,.btn-toolbar>.btn-group,.btn-toolbar>.input-group{margin-right:5px;margin-left:0}.btn-group>.btn:first-child{margin-right:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-top-right-radius:4px;border-bottom-right-radius:4px;border-bottom-left-radius:0;border-top-left-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-top-left-radius:4px;border-bottom-left-radius:4px;border-bottom-right-radius:0;border-top-right-radius:0}.btn-group>.btn-group{float:right}.btn-group.btn-group-justified>.btn,.btn-group.btn-group-justified>.btn-group{float:none}.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group>.btn-group:first-child>.btn:last-child,.btn-group>.btn-group:first-child>.dropdown-toggle{border-top-right-radius:4px;border-bottom-right-radius:4px;border-bottom-left-radius:0;border-top-left-radius:0}.btn-group>.btn-group:last-child>.btn:first-child{border-top-left-radius:4px;border-bottom-left-radius:4px;border-bottom-right-radius:0;border-top-right-radius:0}.btn .caret{margin-right:0}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-right:0}.input-group .form-control{float:right}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle),.input-group-btn:last-child>.btn-group:not(:last-child)>.btn{border-bottom-right-radius:4px;border-top-right-radius:4px;border-bottom-left-radius:0;border-top-left-radius:0}.input-group-addon:first-child{border-right-width:1px;border-right-style:solid;border-left:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group>.btn,.input-group-btn:last-child>.dropdown-toggle,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:first-child>.btn-group:not(:first-child)>.btn{border-bottom-left-radius:4px;border-top-left-radius:4px;border-bottom-right-radius:0;border-top-right-radius:0}.input-group-addon:last-child{border-left-width:1px;border-left-style:solid;border-right:0}.input-group-btn>.btn+.btn{margin-right:-1px;margin-left:auto}.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group{margin-left:-1px;margin-right:auto}.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group{margin-right:-1px;margin-left:auto}.nav{padding-right:0;padding-left:initial}.nav-tabs>li{float:right}.nav-tabs>li>a{margin-left:auto;margin-right:-2px;border-radius:4px 4px 0 0}.nav-pills>li{float:right}.nav-pills>li>a{border-radius:4px}.nav-pills>li+li{margin-right:2px;margin-left:auto}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-right:0;margin-left:auto}.nav-justified>.dropdown .dropdown-menu{right:auto}.nav-tabs-justified>li>a{margin-left:0;margin-right:auto}@media (min-width:768px){.nav-tabs-justified>li>a{border-radius:4px 4px 0 0}}@media (min-width:768px){.navbar-header{float:right}}.navbar-collapse{padding-right:15px;padding-left:15px}.navbar-brand{float:right}@media (min-width:768px){.navbar>.container .navbar-brand,.navbar>.container-fluid .navbar-brand{margin-right:-15px;margin-left:auto}}.navbar-toggle{float:left;margin-left:15px;margin-right:auto}@media (max-width:767px){.navbar-nav .open .dropdown-menu>li>a,.navbar-nav .open .dropdown-menu .dropdown-header{padding:5px 25px 5px 15px}}@media (min-width:768px){.navbar-nav{float:right}.navbar-nav>li{float:right}}@media (min-width:768px){.navbar-left.flip{float:right!important}.navbar-right:last-child{margin-left:-15px;margin-right:auto}.navbar-right.flip{float:left!important;margin-left:-15px;margin-right:auto}.navbar-right .dropdown-menu{left:0;right:auto}}@media (min-width:768px){.navbar-text{float:right}.navbar-text.navbar-right:last-child{margin-left:0;margin-right:auto}}.pagination{padding-right:0}.pagination>li>a,.pagination>li>span{float:right;margin-right:-1px;margin-left:0}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-bottom-right-radius:4px;border-top-right-radius:4px;border-bottom-left-radius:0;border-top-left-radius:0}.pagination>li:last-child>a,.pagination>li:last-child>span{margin-right:-1px;border-bottom-left-radius:4px;border-top-left-radius:4px;border-bottom-right-radius:0;border-top-right-radius:0}.pager{padding-right:0;padding-left:initial}.pager .next>a,.pager .next>span{float:left}.pager .previous>a,.pager .previous>span{float:right}.nav-pills>li>a>.badge{margin-left:0;margin-right:3px}.list-group-item>.badge{float:left}.list-group-item>.badge+.badge{margin-left:5px;margin-right:auto}.alert-dismissable,.alert-dismissible{padding-left:35px;padding-right:15px}.alert-dismissable .close,.alert-dismissible .close{right:auto;left:-21px}.progress-bar{float:right}.media>.pull-left{margin-right:10px}.media>.pull-left.flip{margin-right:0;margin-left:10px}.media>.pull-right{margin-left:10px}.media>.pull-right.flip{margin-left:0;margin-right:10px}.media-right,.media>.pull-right{padding-right:10px;padding-left:initial}.media-left,.media>.pull-left{padding-left:10px;padding-right:initial}.media-list{padding-right:0;padding-left:initial;list-style:none}.list-group{padding-right:0;padding-left:initial}.panel>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:first-child{border-top-right-radius:3px;border-top-left-radius:0}.panel>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:last-child{border-top-left-radius:3px;border-top-right-radius:0}.panel>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:first-child{border-bottom-left-radius:3px;border-top-right-radius:0}.panel>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:last-child{border-bottom-right-radius:3px;border-top-left-radius:0}.panel>.table-bordered>thead>tr>th:first-child,.panel>.table-responsive>.table-bordered>thead>tr>th:first-child,.panel>.table-bordered>tbody>tr>th:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,.panel>.table-bordered>tfoot>tr>th:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,.panel>.table-bordered>thead>tr>td:first-child,.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,.panel>.table-bordered>tbody>tr>td:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,.panel>.table-bordered>tfoot>tr>td:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child{border-right:0;border-left:none}.panel>.table-bordered>thead>tr>th:last-child,.panel>.table-responsive>.table-bordered>thead>tr>th:last-child,.panel>.table-bordered>tbody>tr>th:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,.panel>.table-bordered>tfoot>tr>th:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,.panel>.table-bordered>thead>tr>td:last-child,.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,.panel>.table-bordered>tbody>tr>td:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,.panel>.table-bordered>tfoot>tr>td:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child{border-right:none;border-left:0}.embed-responsive .embed-responsive-item,.embed-responsive iframe,.embed-responsive embed,.embed-responsive object{right:0;left:auto}.close{float:left}.modal-footer{text-align:left}.modal-footer .btn+.btn{margin-left:auto;margin-right:5px}.modal-footer .btn-group .btn+.btn{margin-right:-1px;margin-left:auto}.modal-footer .btn-block+.btn-block{margin-right:0;margin-left:auto}.popover{left:auto;text-align:right}.popover.top>.arrow{right:50%;left:auto;margin-right:-11px;margin-left:auto}.popover.top>.arrow:after{margin-right:-10px;margin-left:auto}.popover.bottom>.arrow{right:50%;left:auto;margin-right:-11px;margin-left:auto}.popover.bottom>.arrow:after{margin-right:-10px;margin-left:auto}.carousel-control{right:0;bottom:0}.carousel-control.left{right:auto;left:0;background-image:-webkit-linear-gradient(left,color-stop(rgba(0,0,0,.5)0),color-stop(rgba(0,0,0,.0001)100%));background-image:-o-linear-gradient(left,rgba(0,0,0,.5)0,rgba(0,0,0,.0001)100%);background-image:linear-gradient(to right,rgba(0,0,0,.5)0,rgba(0,0,0,.0001)100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1)}.carousel-control.right{left:auto;right:0;background-image:-webkit-linear-gradient(left,color-stop(rgba(0,0,0,.0001)0),color-stop(rgba(0,0,0,.5)100%));background-image:-o-linear-gradient(left,rgba(0,0,0,.0001)0,rgba(0,0,0,.5)100%);background-image:linear-gradient(to right,rgba(0,0,0,.0001)0,rgba(0,0,0,.5)100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1)}.carousel-control .icon-prev,.carousel-control .glyphicon-chevron-left{left:50%;right:auto;margin-right:-10px}.carousel-control .icon-next,.carousel-control .glyphicon-chevron-right{right:50%;left:auto;margin-left:-10px}.carousel-indicators{right:50%;left:0;margin-right:-30%;margin-left:0;padding-left:0}@media screen and (min-width:768px){.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{margin-left:0;margin-right:-15px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{margin-left:0;margin-right:-15px}.carousel-caption{left:20%;right:20%;padding-bottom:30px}}.pull-right.flip{float:left!important}.pull-left.flip{float:right!important}
\ No newline at end of file
diff --git a/css/hesk_newStyleRTL.css b/css/hesk_newStyleRTL.css
deleted file mode 100644
index c863d984..00000000
--- a/css/hesk_newStyleRTL.css
+++ /dev/null
@@ -1,160 +0,0 @@
-.nu-rtlFloatLeft {
-    float: left;
-}
-
-.nu-floatRight {
-    float: left;
-}
-
-@media (max-width: 991px) {
-    .close-ticket {
-        text-align: right;
-    }
-}
-
-@media (min-width: 992px) {
-    .close-ticket {
-        text-align: left;
-        padding-bottom: 5px;
-    }
-}
-
-@media (max-width: 991px) {
-    .ticket-cell {
-        border-bottom: solid 1px #ddd;
-        border-left: 0;
-        padding-top: 5px;
-    }
-}
-
-@media (max-width: 991px) {
-    .ticket-cell-admin {
-        border-bottom: solid 1px #ddd;
-        border-left: 0;
-        padding-top: 5px;
-        height: 100px;
-    }
-}
-
-@media (min-width: 992px) {
-    .ticket-cell {
-        border-bottom: 0;
-        border-left: solid 1px #ddd;
-        margin-top: 1px;
-        min-height: 70px;
-        padding-top: 10px;
-    }
-}
-
-@media (min-width: 992px) {
-    .ticket-cell-admin {
-        border-bottom: 0;
-        border-left: solid 1px #ddd;
-        margin-top: 1px;
-        height: 100px;
-        padding-top: 10px;
-    }
-}
-
-.kbContent {
-    padding-top: 10px;
-    text-align: right;
-}
-
-.ticketMessageTop {
-    padding-top: 10px;
-    padding-right: 10px;
-    padding-left: 10px;
-    margin-left: -15px;
-    color: #888;
-    background-color: #fff;
-}
-
-.pushMarginLeft {
-    margin-right: -15px;
-    margin-left: -15px;
-    padding-left: 0;
-}
-
-.ticketMessageBottom {
-    padding-right: 10px;
-    padding-left: 10px;
-    margin-left: -15px;
-    word-wrap: break-word;
-    font-size: 15px;
-    background-color: #fff;
-}
-
-.ticketMessage {
-    margin-right: 238px;
-    background: #fff;
-    height: 100%;
-    position: relative;
-}
-
-div.headersm {
-    width: 100%;
-    color: #fff;
-    font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
-    font-size: 12px;
-    text-align: right;
-    background-color: #424b5c;
-    background-repeat: repeat-x;
-    padding: 12px 20px 8px;
-    margin: 0;
-    font-weight: 700;
-    padding-right: 20px;
-}
-
-.agreementBox {
-    position: relative;
-    background-color: #fff;
-    overflow: auto;
-    padding: 20px;
-    display: block;
-    height: 206px;
-    box-shadow: inset 0 0 4px #bbb, inset 0 0 20px #eee;
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    box-sizing: border-box;
-}
-
-.indent-15 {
-    margin-right: 15px;
-}
-
-.pad-down-20 {
-    padding-top: 20px;
-}
-
-.pad-right-10 {
-    padding-right: 10px;
-}
-
-.move-down-20 {
-    margin-top: 20px;
-}
-
-.move-right-40 {
-    margin-right: 40px;
-}
-
-.move-right-25 {
-    margin-right: 25px;
-}
-
-.move-right-20 {
-    margin-right: 20px;
-}
-
-.move-right-10 {
-    margin-right: 10px;
-}
-
-.move-left-20 {
-    margin-left: 20px;
-}
-
-.move-left-10 {
-    margin-left: 10px;
-}
\ No newline at end of file
diff --git a/inc/header.inc.php b/inc/header.inc.php
index 5b5fc4da..8482791b 100644
--- a/inc/header.inc.php
+++ b/inc/header.inc.php
@@ -25,7 +25,6 @@ $modsForHesk_settings = array();
 if (is_dir(HESK_PATH . 'install')) {
     define('MAINTENANCE_MODE', true);
     $modsForHesk_settings['navbar_title_url'] = 'javascript:;';
-    $modsForHesk_settings['rtl'] = 0;
     $modsForHesk_settings['use_bootstrap_theme'] = 1;
     $modsForHesk_settings['show_icons'] = 1;
     $modsForHesk_settings['navbarBackgroundColor'] = '#414a5c';
@@ -52,13 +51,7 @@ if (is_dir(HESK_PATH . 'install')) {
     <meta http-equiv="Content-Type" content="text/html;charset=<?php echo $hesklang['ENCODING']; ?>"/>
     <meta name="viewport" content="width=device-width, user-scalable=no">
     <meta name="theme-color" content="<?php echo '#414a5c'; ?>">
-    <?php if ($modsForHesk_settings['rtl']) { ?>
-        <link href="<?php echo HESK_PATH; ?>hesk_style_RTL.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>" type="text/css"
-              rel="stylesheet"/>
-    <?php } else { ?>
-        <link href="<?php echo HESK_PATH; ?>hesk_style.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>" type="text/css"
-              rel="stylesheet"/>
-    <?php } ?>
+    <link href="<?php echo HESK_PATH; ?>hesk_style.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>" type="text/css" rel="stylesheet"/>
     <link href="<?php echo HESK_PATH; ?>css/datepicker.css" type="text/css" rel="stylesheet"/>
     <link href="<?php echo HESK_PATH; ?>css/bootstrap.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>" type="text/css"
           rel="stylesheet"/>
@@ -66,19 +59,10 @@ if (is_dir(HESK_PATH . 'install')) {
           rel="stylesheet" <?php if ($modsForHesk_settings['use_bootstrap_theme'] == 0) {
         echo 'disabled';
     } ?>>
-    <?php if ($modsForHesk_settings['rtl']) { ?>
-        <link href="<?php echo HESK_PATH; ?>css/bootstrap-rtl.min.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>"
-              type="text/css" rel="stylesheet"/>
-        <link href="<?php echo HESK_PATH; ?>css/mods-for-hesk.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>" type="text/css"
-              rel="stylesheet"/>
-        <link href="<?php echo HESK_PATH; ?>css/hesk_newStyleRTL.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>"
-              type="text/css" rel="stylesheet"/>
-    <?php } else { ?>
-        <link href="<?php echo HESK_PATH; ?>css/mods-for-hesk.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>" type="text/css"
-              rel="stylesheet"/>
-        <link href="<?php echo HESK_PATH; ?>css/hesk_newStyle.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>" type="text/css"
-              rel="stylesheet"/>
-    <?php } ?>
+    <link href="<?php echo HESK_PATH; ?>css/mods-for-hesk.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>" type="text/css"
+          rel="stylesheet"/>
+    <link href="<?php echo HESK_PATH; ?>css/hesk_newStyle.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>" type="text/css"
+          rel="stylesheet"/>
     <link href="<?php echo HESK_PATH; ?>css/bootstrap-iconpicker.min.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>" rel="stylesheet">
     <link href="//netdna.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>" rel="stylesheet">
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/octicons.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>" type="text/css">
diff --git a/install/mods-for-hesk/sql/installSql.php b/install/mods-for-hesk/sql/installSql.php
index d50ebc42..6419ff5a 100644
--- a/install/mods-for-hesk/sql/installSql.php
+++ b/install/mods-for-hesk/sql/installSql.php
@@ -1013,6 +1013,7 @@ function execute310Scripts() {
     executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) VALUES ('login_background', '#d2d6de')");
     executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) VALUES ('login_box_header', 'helpdesk-title')");
     executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) VALUES ('login_box_header_image', '')");
+    executeQuery("DELETE FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` WHERE `Key` = 'rtl'");
 
     updateVersion('3.1.0');
 }
\ No newline at end of file
diff --git a/print.php b/print.php
index c673a80c..f8499a57 100644
--- a/print.php
+++ b/print.php
@@ -117,7 +117,7 @@ $modsForHesk_settings = mfh_getSettings();
             background-color: #9e9e9e;
             height: 1px;
             width: 100%;
-            text-align: <?php if ($modsForHesk_settings['rtl']) {echo 'right';} else {echo 'left';} ?>;
+            text-align: left; ?>;
         }
     </style>
 </head>

From 88de2df3c07166b1b025b0c26e600c7d9db23f19 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sat, 10 Jun 2017 12:12:15 -0400
Subject: [PATCH 168/192] Remove trailing PHP tags

---
 admin/admin_settings.php | 2 +-
 print.php                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/admin_settings.php b/admin/admin_settings.php
index e96b9c1a..92494d60 100644
--- a/admin/admin_settings.php
+++ b/admin/admin_settings.php
@@ -4114,7 +4114,7 @@ $modsForHesk_settings = mfh_getSettings();
                         background: #fff;
                         color: black;
                         font: 68.8%/1.5 Verdana, Geneva, Arial, Helvetica, sans-serif;
-                        text-align: left; ?>;
+                        text-align: left;
                     }
 
                     p {
diff --git a/print.php b/print.php
index f8499a57..2a0d0ab7 100644
--- a/print.php
+++ b/print.php
@@ -117,7 +117,7 @@ $modsForHesk_settings = mfh_getSettings();
             background-color: #9e9e9e;
             height: 1px;
             width: 100%;
-            text-align: left; ?>;
+            text-align: left;
         }
     </style>
 </head>

From 9f0fd7c657ed245ede6db007638333873bd50cc8 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sat, 10 Jun 2017 22:29:29 -0400
Subject: [PATCH 169/192] Working on custom staff panel color schemes

---
 admin/admin_settings.php                 | 300 +++++++++++++++++++++++
 install/mods-for-hesk/sql/installSql.php |  57 +++++
 language/en/text.php                     |  17 +-
 3 files changed, 372 insertions(+), 2 deletions(-)

diff --git a/admin/admin_settings.php b/admin/admin_settings.php
index 92494d60..44213e79 100644
--- a/admin/admin_settings.php
+++ b/admin/admin_settings.php
@@ -3770,6 +3770,306 @@ $modsForHesk_settings = mfh_getSettings();
                         </div>
                     </div>
                 </div>
+                <div class="row">
+                    <div class="col-sm-6 col-xs-12">
+                        <div class="col-sm-5 col-sm-offset-7 col-xs-12">
+                            <h4><?php echo $hesklang['navbar']; ?></h4>
+                        </div>
+                        <div class="form-group">
+                            <label for="admin-navbar-background-color"
+                                   class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['background_color']; ?>
+                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
+                                   data-placement="top"
+                                   title="<?php echo $hesklang['background_color']; ?>"
+                                   data-content="<?php echo $hesklang['background_color_help']; ?>"></i>
+                            </label>
+
+                            <div class="col-sm-5 col-xs-12">
+                                <input type="text" id="admin-navbar-background-color" name="admin-navbar-background-color"
+                                       class="form-control"
+                                       value="<?php echo $modsForHesk_settings['admin_navbar_background_color']; ?>">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-6 col-xs-12">
+                        <div class="col-sm-5 col-sm-offset-7 col-xs-12">
+                            <h4><?php echo $hesklang['navbar_brand']; ?></h4>
+                        </div>
+                        <div class="form-group">
+                            <label for="admin-navbar-brand-background-color"
+                                   class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['background_color']; ?>
+                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
+                                   data-placement="left"
+                                   title="<?php echo $hesklang['background_color']; ?>"
+                                   data-content="<?php echo $hesklang['background_color_help']; ?>"></i>
+                            </label>
+
+                            <div class="col-sm-5 col-xs-12">
+                                <input type="text" id="admin-navbar-brand-background-color" name="admin-navbar-brand-background-color"
+                                       class="form-control"
+                                       value="<?php echo $modsForHesk_settings['admin_navbar_brand_background_color']; ?>">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-sm-6 col-xs-12">
+                        <div class="form-group">
+                            <label for="admin-navbar-text-color"
+                                   class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['text_color']; ?>
+                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
+                                   data-placement="top"
+                                   title="<?php echo $hesklang['text_color']; ?>"
+                                   data-content="<?php echo $hesklang['text_color_help']; ?>"></i>
+                            </label>
+
+                            <div class="col-sm-5 col-xs-12">
+                                <input type="text" id="admin-navbar-text-color" name="admin-navbar-text-color"
+                                       class="form-control"
+                                       value="<?php echo $modsForHesk_settings['admin_navbar_text_color']; ?>">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-6 col-xs-12">
+                        <div class="form-group">
+                            <label for="admin-navbar-brand-text-color"
+                                   class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['text_color']; ?>
+                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
+                                   data-placement="top"
+                                   title="<?php echo $hesklang['text_color']; ?>"
+                                   data-content="<?php echo $hesklang['text_color_help']; ?>"></i>
+                            </label>
+
+                            <div class="col-sm-5 col-xs-12">
+                                <input type="text" id="admin-navbar-brand-text-color" name="admin-navbar-brand-text-color"
+                                       class="form-control"
+                                       value="<?php echo $modsForHesk_settings['admin_navbar_brand_text_color']; ?>">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-sm-6 col-xs-12">
+                        <div class="form-group">
+                            <label for="admin-navbar-hover-color"
+                                   class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['text_hover_color']; ?>
+                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
+                                   data-placement="top"
+                                   title="<?php echo $hesklang['text_hover_color']; ?>"
+                                   data-content="<?php echo $hesklang['text_hover_color_help']; ?>"></i>
+                            </label>
+
+                            <div class="col-sm-5 col-xs-12">
+                                <input type="text" id="admin-navbar-text-color" name="admin-navbar-text-color"
+                                       class="form-control"
+                                       value="<?php echo $modsForHesk_settings['admin_navbar_text_hover_color']; ?>">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-6 col-xs-12">
+                        <div class="form-group">
+                            <label for="admin-navbar-brand-text-color"
+                                   class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['text_hover_color']; ?>
+                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
+                                   data-placement="top"
+                                   title="<?php echo $hesklang['text_hover_color']; ?>"
+                                   data-content="<?php echo $hesklang['text_hover_color_help']; ?>"></i>
+                            </label>
+
+                            <div class="col-sm-5 col-xs-12">
+                                <input type="text" id="admin-navbar-brand-text-color" name="admin-navbar-brand-text-color"
+                                       class="form-control"
+                                       value="<?php echo $modsForHesk_settings['admin_navbar_brand_text_hover_color']; ?>">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-sm-6 col-xs-12">
+                        <div class="form-group">
+                            <label for="admin-navbar-background-hover-color"
+                                   class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['background_hover_color']; ?>
+                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
+                                   data-placement="top"
+                                   title="<?php echo $hesklang['background_hover_color']; ?>"
+                                   data-content="<?php echo $hesklang['background_hover_color_help']; ?>"></i>
+                            </label>
+
+                            <div class="col-sm-5 col-xs-12">
+                                <input type="text" id="admin-navbar-background-hover-color" name="admin-navbar-background-hover-color"
+                                       class="form-control"
+                                       value="<?php echo $modsForHesk_settings['admin_navbar_background_hover_color']; ?>">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-6 col-xs-12">
+                        <div class="form-group">
+                            <label for="admin-navbar-brand-background-hover-color"
+                                   class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['background_hover_color']; ?>
+                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
+                                   data-placement="top"
+                                   title="<?php echo $hesklang['background_hover_color']; ?>"
+                                   data-content="<?php echo $hesklang['background_hover_color_help']; ?>"></i>
+                            </label>
+
+                            <div class="col-sm-5 col-xs-12">
+                                <input type="text" id="admin-navbar-brand-background-hover-color" name="admin-navbar-brand-background-hover-color"
+                                       class="form-control"
+                                       value="<?php echo $modsForHesk_settings['admin_navbar_brand_background_hover_color']; ?>">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-sm-6 col-xs-12">
+                        <div class="col-sm-5 col-sm-offset-7 col-xs-12">
+                            <h4><?php echo $hesklang['sidebar']; ?></h4>
+                        </div>
+                        <div class="form-group">
+                            <label for="admin-navbar-background-color"
+                                   class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['background_color']; ?>
+                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
+                                   data-placement="top"
+                                   title="<?php echo $hesklang['background_color']; ?>"
+                                   data-content="<?php echo $hesklang['background_color_help']; ?>"></i>
+                            </label>
+
+                            <div class="col-sm-5 col-xs-12">
+                                <input type="text" id="admin-navbar-background-color" name="admin-navbar-background-color"
+                                       class="form-control"
+                                       value="<?php echo $modsForHesk_settings['admin_navbar_background_color']; ?>">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-6 col-xs-12">
+                        <div class="col-sm-5 col-sm-offset-7 col-xs-12">
+                            <h4><?php echo $hesklang['sidebar_header']; ?></h4>
+                        </div>
+                        <div class="form-group">
+                            <label for="admin-navbar-brand-background-color"
+                                   class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['background_color']; ?>
+                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
+                                   data-placement="left"
+                                   title="<?php echo $hesklang['background_color']; ?>"
+                                   data-content="<?php echo $hesklang['background_color_help']; ?>"></i>
+                            </label>
+
+                            <div class="col-sm-5 col-xs-12">
+                                <input type="text" id="admin-navbar-brand-background-color" name="admin-navbar-brand-background-color"
+                                       class="form-control"
+                                       value="<?php echo $modsForHesk_settings['admin_navbar_brand_background_color']; ?>">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-sm-6 col-xs-12">
+                        <div class="form-group">
+                            <label for="admin-navbar-text-color"
+                                   class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['text_color']; ?>
+                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
+                                   data-placement="top"
+                                   title="<?php echo $hesklang['text_color']; ?>"
+                                   data-content="<?php echo $hesklang['text_color_help']; ?>"></i>
+                            </label>
+
+                            <div class="col-sm-5 col-xs-12">
+                                <input type="text" id="admin-navbar-text-color" name="admin-navbar-text-color"
+                                       class="form-control"
+                                       value="<?php echo $modsForHesk_settings['admin_navbar_text_color']; ?>">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-6 col-xs-12">
+                        <div class="form-group">
+                            <label for="admin-navbar-brand-text-color"
+                                   class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['text_color']; ?>
+                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
+                                   data-placement="top"
+                                   title="<?php echo $hesklang['text_color']; ?>"
+                                   data-content="<?php echo $hesklang['text_color_help']; ?>"></i>
+                            </label>
+
+                            <div class="col-sm-5 col-xs-12">
+                                <input type="text" id="admin-navbar-brand-text-color" name="admin-navbar-brand-text-color"
+                                       class="form-control"
+                                       value="<?php echo $modsForHesk_settings['admin_navbar_brand_text_color']; ?>">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-sm-6 col-xs-12">
+                        <div class="form-group">
+                            <label for="admin-navbar-hover-color"
+                                   class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['text_hover_color']; ?>
+                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
+                                   data-placement="top"
+                                   title="<?php echo $hesklang['text_hover_color']; ?>"
+                                   data-content="<?php echo $hesklang['text_hover_color_help']; ?>"></i>
+                            </label>
+
+                            <div class="col-sm-5 col-xs-12">
+                                <input type="text" id="admin-navbar-text-color" name="admin-navbar-text-color"
+                                       class="form-control"
+                                       value="<?php echo $modsForHesk_settings['admin_navbar_text_hover_color']; ?>">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-6 col-xs-12">
+                        <div class="form-group">
+                            <label for="admin-navbar-brand-text-color"
+                                   class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['text_hover_color']; ?>
+                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
+                                   data-placement="top"
+                                   title="<?php echo $hesklang['text_hover_color']; ?>"
+                                   data-content="<?php echo $hesklang['text_hover_color_help']; ?>"></i>
+                            </label>
+
+                            <div class="col-sm-5 col-xs-12">
+                                <input type="text" id="admin-navbar-brand-text-color" name="admin-navbar-brand-text-color"
+                                       class="form-control"
+                                       value="<?php echo $modsForHesk_settings['admin_navbar_brand_text_hover_color']; ?>">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-sm-6 col-xs-12">
+                        <div class="form-group">
+                            <label for="admin-navbar-background-hover-color"
+                                   class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['background_hover_color']; ?>
+                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
+                                   data-placement="top"
+                                   title="<?php echo $hesklang['background_hover_color']; ?>"
+                                   data-content="<?php echo $hesklang['background_hover_color_help']; ?>"></i>
+                            </label>
+
+                            <div class="col-sm-5 col-xs-12">
+                                <input type="text" id="admin-navbar-background-hover-color" name="admin-navbar-background-hover-color"
+                                       class="form-control"
+                                       value="<?php echo $modsForHesk_settings['admin_navbar_background_hover_color']; ?>">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-6 col-xs-12">
+                        <div class="form-group">
+                            <label for="admin-navbar-brand-background-hover-color"
+                                   class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['background_hover_color']; ?>
+                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
+                                   data-placement="top"
+                                   title="<?php echo $hesklang['background_hover_color']; ?>"
+                                   data-content="<?php echo $hesklang['background_hover_color_help']; ?>"></i>
+                            </label>
+
+                            <div class="col-sm-5 col-xs-12">
+                                <input type="text" id="admin-navbar-brand-background-hover-color" name="admin-navbar-brand-background-hover-color"
+                                       class="form-control"
+                                       value="<?php echo $modsForHesk_settings['admin_navbar_brand_background_hover_color']; ?>">
+                            </div>
+                        </div>
+                    </div>
+                </div>
                 <h4><?php echo $hesklang['login_page']; ?></h4>
                 <div class="row">
                     <div class="col-xs-12">
diff --git a/install/mods-for-hesk/sql/installSql.php b/install/mods-for-hesk/sql/installSql.php
index 6419ff5a..e706ebf7 100644
--- a/install/mods-for-hesk/sql/installSql.php
+++ b/install/mods-for-hesk/sql/installSql.php
@@ -1015,5 +1015,62 @@ function execute310Scripts() {
     executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) VALUES ('login_box_header_image', '')");
     executeQuery("DELETE FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` WHERE `Key` = 'rtl'");
 
+    // Copy over color presets to the custom values
+    $theme_preset_rs = executeQuery("SELECT `Value` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` WHERE `Key` = 'admin_color_scheme'");
+    if (hesk_dbNumRows($theme_preset_rs) === 0) {
+        $theme = 'skin-blue';
+    } else {
+        $theme_preset_row = hesk_dbFetchAssoc($theme_preset_rs);
+        $theme = $theme_preset_row['Value'];
+    }
+
+    $navbar = array(
+        'background' => '',
+        'text' => '',
+        'text_hover' => '',
+        'background_hover' => ''
+    );
+    $navbar_brand = array(
+        'background' => '',
+        'text' => '',
+        'text_hover' => '',
+        'background_hover' => ''
+    );
+    $sidebar = array(
+        'background' => '',
+        'text' => '',
+        'text_hover' => '',
+        'background_hover' => ''
+    );
+    $sidebar_header = array(
+        'background' => '',
+        'text' => '',
+        'text_hover' => '',
+        'background_hover' => ''
+    );
+    if ($theme == 'skin-blue') {
+        $navbar['background'] = '';
+        $navbar['text'] = '';
+        $navbar['text_hover'] = '';
+        $navbar['background_hover'] = '';
+
+        $navbar_brand['background'] = '';
+        $navbar_brand['text'] = '';
+        $navbar_brand['text_hover'] = '';
+        $navbar_brand['background_hover'] = '';
+
+        $sidebar['background'] = '';
+        $sidebar['text'] = '';
+        $sidebar['text_hover'] = '';
+        $sidebar['background_hover'] = '';
+
+        $sidebar_header['background'] = '';
+        $sidebar_header['text'] = '';
+        $sidebar_header['text_hover'] = '';
+        $sidebar_header['background_hover'] = '';
+    } elseif ($theme = 'skin-blue-light') {
+
+    }
+
     updateVersion('3.1.0');
 }
\ No newline at end of file
diff --git a/language/en/text.php b/language/en/text.php
index d564379c..218e32dc 100644
--- a/language/en/text.php
+++ b/language/en/text.php
@@ -1609,13 +1609,13 @@ $hesklang['changeLanguage'] = 'Change language to';
 
 // ADDED OR MODIFIED IN Mods For HESK 1.4.0
 $hesklang['navbarBackgroundColor'] = 'Navbar Background Color';
-$hesklang['navbarBackgroundColorHelp'] = 'The main color of the top navigation bar. This applies to both the client and staff-side.';
+$hesklang['navbarBackgroundColorHelp'] = 'The main color of the top navigation bar. This applies only to the client-side.';
 $hesklang['navbarBrandColor'] = 'Navbar Brand Color';
 $hesklang['navbarBrandColorHelp'] = 'The text color of the \'brand\' on the left (also the name of the Help Desk).';
 $hesklang['navbarBrandHoverColor'] = 'Navbar Brand Hover Color';
 $hesklang['navbarBrandHoverColorHelp'] = 'The text color of the \'brand\' on the left when the use moves their mouse over the text.';
 $hesklang['navbarItemTextColor'] = 'Navbar Item Text Color';
-$hesklang['navbarItemTextColorHelp'] = 'The text color of the navigation items on the navigation bar (by default \'Home\', \'Ticket\', and \'Knowledgebase\' are the three items on the client-side).';
+$hesklang['navbarItemTextColorHelp'] = 'The text color of the navigation items on the navigation bar.';
 $hesklang['navbarItemTextHoverColor'] = 'Navbar Item Text Hover Color';
 $hesklang['navbarItemTextHoverColorHelp'] = 'The text color of the navigation items on the navigation bar when the user hovers over one of the items.';
 $hesklang['navbarItemTextSelectedColor'] = 'Navbar Item Text Selected Color';
@@ -2139,6 +2139,19 @@ $hesklang['login_background_color'] = 'Login Background Color'; // Input field i
 $hesklang['login_background_image'] = 'Login Background Image'; // Input field information for screen-readers. Does not appear on-screen
 $hesklang['login_box_header'] = 'Login Box Header';
 $hesklang['login_header_image'] = 'Login Header Image'; // Input field information for screen-readers. Does not appear on-screen
+$hesklang['background_color'] = 'Background Color';
+$hesklang['background_color_help'] = 'The background color.';
+$hesklang['text_color'] = 'Text Color';
+$hesklang['text_color_help'] = 'The text color';
+$hesklang['text_hover_color'] = 'Hover Color: Text';
+$hesklang['text_hover_color_help'] = 'The text color when hovering over a link';
+$hesklang['background_hover_color'] = 'Hover Color: Background';
+$hesklang['background_hover_color_help'] = 'The background color when hovering over a link';
+$hesklang['navbar'] = 'Navigation Bar';
+$hesklang['navbar_brand'] = 'Navigation Brand';
+$hesklang['sidebar'] = 'Sidebar';
+$hesklang['sidebar_header'] = 'Sidebar Header';
+
 
 // DO NOT CHANGE BELOW
 if (!defined('IN_SCRIPT')) die('PHP syntax OK!');

From daca2e6273f6bc7489d08ba919aaa554708c97fe Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sun, 11 Jun 2017 22:04:19 -0400
Subject: [PATCH 170/192] More work on admin UI colors

---
 admin/admin_settings.php                 |  27 ++----
 install/mods-for-hesk/sql/installSql.php | 117 ++++++++++++++++-------
 language/en/text.php                     |   2 +-
 3 files changed, 91 insertions(+), 55 deletions(-)

diff --git a/admin/admin_settings.php b/admin/admin_settings.php
index 44213e79..3ae5db34 100644
--- a/admin/admin_settings.php
+++ b/admin/admin_settings.php
@@ -4016,23 +4016,6 @@ $modsForHesk_settings = mfh_getSettings();
                             </div>
                         </div>
                     </div>
-                    <div class="col-sm-6 col-xs-12">
-                        <div class="form-group">
-                            <label for="admin-navbar-brand-text-color"
-                                   class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['text_hover_color']; ?>
-                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                                   data-placement="top"
-                                   title="<?php echo $hesklang['text_hover_color']; ?>"
-                                   data-content="<?php echo $hesklang['text_hover_color_help']; ?>"></i>
-                            </label>
-
-                            <div class="col-sm-5 col-xs-12">
-                                <input type="text" id="admin-navbar-brand-text-color" name="admin-navbar-brand-text-color"
-                                       class="form-control"
-                                       value="<?php echo $modsForHesk_settings['admin_navbar_brand_text_hover_color']; ?>">
-                            </div>
-                        </div>
-                    </div>
                 </div>
                 <div class="row">
                     <div class="col-sm-6 col-xs-12">
@@ -4052,10 +4035,12 @@ $modsForHesk_settings = mfh_getSettings();
                             </div>
                         </div>
                     </div>
+                </div>
+                <div class="row">
                     <div class="col-sm-6 col-xs-12">
                         <div class="form-group">
-                            <label for="admin-navbar-brand-background-hover-color"
-                                   class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['background_hover_color']; ?>
+                            <label for="admin-sidebar-font-weight"
+                                   class="col-sm-7 col-xs-12 control-label"><?php echo 'FONT WEIGHT'; ?>
                                 <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
                                    data-placement="top"
                                    title="<?php echo $hesklang['background_hover_color']; ?>"
@@ -4063,9 +4048,9 @@ $modsForHesk_settings = mfh_getSettings();
                             </label>
 
                             <div class="col-sm-5 col-xs-12">
-                                <input type="text" id="admin-navbar-brand-background-hover-color" name="admin-navbar-brand-background-hover-color"
+                                <input type="text" id="admin-navbar-background-hover-color" name="admin-navbar-background-hover-color"
                                        class="form-control"
-                                       value="<?php echo $modsForHesk_settings['admin_navbar_brand_background_hover_color']; ?>">
+                                       value="<?php echo $modsForHesk_settings['admin_navbar_background_hover_color']; ?>">
                             </div>
                         </div>
                     </div>
diff --git a/install/mods-for-hesk/sql/installSql.php b/install/mods-for-hesk/sql/installSql.php
index e706ebf7..74cdb261 100644
--- a/install/mods-for-hesk/sql/installSql.php
+++ b/install/mods-for-hesk/sql/installSql.php
@@ -1024,53 +1024,104 @@ function execute310Scripts() {
         $theme = $theme_preset_row['Value'];
     }
 
+    $light_theme = preg_match('/.*-light/g', $theme);
     $navbar = array(
         'background' => '',
-        'text' => '',
-        'text_hover' => '',
+        'text' => '#fff',
+        'text_hover' => '#fff',
         'background_hover' => ''
     );
     $navbar_brand = array(
         'background' => '',
-        'text' => '',
-        'text_hover' => '',
+        'text' => '#fff',
+        'text_hover' => '#fff',
         'background_hover' => ''
     );
     $sidebar = array(
-        'background' => '',
-        'text' => '',
-        'text_hover' => '',
-        'background_hover' => ''
+        'background' => $light_theme ? '#f9fafc' : '#222d32',
+        'text' => $light_theme ? '#444' : '#b8c7ce',
+        'text_hover' => $light_theme ? '#444' : '#b8c7ce',
+        'background_hover' => $light_theme ? '#f4f4f5' : '#1e282c',
+        'font_weight' => $light_theme ? '600' : 'normal'
     );
     $sidebar_header = array(
-        'background' => '',
-        'text' => '',
-        'text_hover' => '',
-        'background_hover' => ''
+        'background' => $light_theme ? '#f9fafc' : '#1a2226',
+        'text' => $light_theme ? '#848484' : '#4b646f',
+        'text_hover' => $light_theme ? '#848484' : '#4b646f',
+        'background_hover' => $light_theme ? '#f9fafc': '#1a2226'
     );
-    if ($theme == 'skin-blue') {
-        $navbar['background'] = '';
-        $navbar['text'] = '';
-        $navbar['text_hover'] = '';
-        $navbar['background_hover'] = '';
-
-        $navbar_brand['background'] = '';
-        $navbar_brand['text'] = '';
-        $navbar_brand['text_hover'] = '';
-        $navbar_brand['background_hover'] = '';
-
-        $sidebar['background'] = '';
-        $sidebar['text'] = '';
-        $sidebar['text_hover'] = '';
-        $sidebar['background_hover'] = '';
-
-        $sidebar_header['background'] = '';
-        $sidebar_header['text'] = '';
-        $sidebar_header['text_hover'] = '';
-        $sidebar_header['background_hover'] = '';
-    } elseif ($theme = 'skin-blue-light') {
+    if (preg_match('/skin-blue.*/g', $theme)) {
+        $navbar['background'] = '#3c8dbc';
+        $navbar['background_hover'] = '#367fa9';
+
+        $navbar_brand['background'] = $light_theme ? '#3c8dbc' : '#367fa9';
+        $navbar_brand['background_hover'] = $light_theme ? '#3b8ab8' : '#367fa9';
+    } elseif (preg_match('/skin-yellow.*/g', $theme)) {
+        $navbar['background'] = '#f39c12';
+        $navbar['background_hover'] = '#da8c10';
+
+        $navbar_brand['background'] = $light_theme ? '#f39c12' : '#e08e0b';
+        $navbar_brand['background_hover'] = $light_theme ? '#f39a0d' : '#db8b0b';
+    } elseif (preg_match('/skin-green.*/g', $theme)) {
+        $navbar['background'] = '#00a65a';
+        $navbar['background_hover'] = '#009551';
+
+        $navbar_brand['background'] = $light_theme ? '#00a65a' : '#008d4c';
+        $navbar_brand['background_hover'] = $light_theme ? '#00a157' : '#008749';
+    } elseif (preg_match('/skin-purple.*/g', $theme)) {
+        $navbar['background'] = '#605ca8';
+        $navbar['background_hover'] = '#565397';
+
+        $navbar_brand['background'] = $light_theme ? '#605ca8' : '#555299';
+        $navbar_brand['background_hover'] = $light_theme ? '#5d59a6' : '#545096';
+    } elseif (preg_match('/skin-red.*/g', $theme)) {
+        $navbar['background'] = '#dd4b39';
+        $navbar['background_hover'] = '#c64333';
+
+        $navbar_brand['background'] = $light_theme ? '#dd4b39' : '#d73925';
+        $navbar_brand['background_hover'] = $light_theme ? '#dc4735' : '#d33724';
+    } else {
+        $navbar['background'] = '#fff';
+        $navbar['background_hover'] = '#eee';
 
+        $navbar_brand['background'] = '#fff';
+        $navbar_brand['background_hover'] = '#fcfcfc';
     }
 
+    executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) 
+        VALUES ('admin_navbar_background_color', '{$navbar['background']}')");
+    executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) 
+        VALUES ('admin_navbar_background_color_hover', '{$navbar['background_hover']}')");
+    executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) 
+        VALUES ('admin_navbar_text', '{$navbar['text']}')");
+    executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) 
+        VALUES ('admin_navbar_text_hover', '{$navbar['text_hover']}')");
+    executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) 
+        VALUES ('admin_navbar_brand_background', '{$navbar_brand['background']}')");
+    executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) 
+        VALUES ('admin_navbar_brand_background_hover', '{$navbar_brand['background_hover']}')");
+    executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) 
+        VALUES ('admin_navbar_brand_text', '{$navbar_brand['text']}')");
+    executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) 
+        VALUES ('admin_navbar_brand_text_hover', '{$navbar_brand['text_hover']}')");
+    executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) 
+        VALUES ('admin_sidebar_background', '{$sidebar['background']}')");
+    executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) 
+        VALUES ('admin_sidebar_background_hover', '{$sidebar['background_hover']}')");
+    executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) 
+        VALUES ('admin_sidebar_text', '{$sidebar['text']}')");
+    executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) 
+        VALUES ('admin_sidebar_text_hover', '{$sidebar['text_hover']}')");
+    executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) 
+        VALUES ('admin_sidebar_font_weight', '{$sidebar['font_weight']}')");
+    executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) 
+        VALUES ('admin_sidebar_header_background', '{$sidebar_header['background']}')");
+    executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) 
+        VALUES ('admin_sidebar_header_background_hover', '{$sidebar_header['background_hover']}')");
+    executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) 
+        VALUES ('admin_sidebar_text', '{$sidebar_header['text']}')");
+    executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) 
+        VALUES ('admin_sidebar_text_hover', '{$sidebar_header['text_hover']}')");
+
     updateVersion('3.1.0');
 }
\ No newline at end of file
diff --git a/language/en/text.php b/language/en/text.php
index 218e32dc..0cac0aad 100644
--- a/language/en/text.php
+++ b/language/en/text.php
@@ -2134,7 +2134,7 @@ $hesklang['category_display_border_help'] = 'Choose to decide whether or not to
 This is ignored if foreground color is set to automatic.</b>';
 $hesklang['login_page'] = 'Login Page'; // Header on admin settings page
 $hesklang['login_background'] = 'Login Background';
-$hesklang['solid_color'] = 'Solid Color';
+$hesklang['solid_color'] = 'Solid color';
 $hesklang['login_background_color'] = 'Login Background Color'; // Input field information for screen-readers. Does not appear on-screen
 $hesklang['login_background_image'] = 'Login Background Image'; // Input field information for screen-readers. Does not appear on-screen
 $hesklang['login_box_header'] = 'Login Box Header';

From 7d6f3828fd73c3ef7b237faa2ec5d861155310c4 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Mon, 12 Jun 2017 08:21:28 -0400
Subject: [PATCH 171/192] Fixed some SQL and used proper settings names

---
 admin/admin_settings.php                 | 30 ++++++++++++------------
 install/mods-for-hesk/sql/installSql.php | 12 +++++-----
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/admin/admin_settings.php b/admin/admin_settings.php
index 3ae5db34..ef40ccc5 100644
--- a/admin/admin_settings.php
+++ b/admin/admin_settings.php
@@ -3787,7 +3787,7 @@ $modsForHesk_settings = mfh_getSettings();
                             <div class="col-sm-5 col-xs-12">
                                 <input type="text" id="admin-navbar-background-color" name="admin-navbar-background-color"
                                        class="form-control"
-                                       value="<?php echo $modsForHesk_settings['admin_navbar_background_color']; ?>">
+                                       value="<?php echo $modsForHesk_settings['admin_navbar_background']; ?>">
                             </div>
                         </div>
                     </div>
@@ -3807,7 +3807,7 @@ $modsForHesk_settings = mfh_getSettings();
                             <div class="col-sm-5 col-xs-12">
                                 <input type="text" id="admin-navbar-brand-background-color" name="admin-navbar-brand-background-color"
                                        class="form-control"
-                                       value="<?php echo $modsForHesk_settings['admin_navbar_brand_background_color']; ?>">
+                                       value="<?php echo $modsForHesk_settings['admin_navbar_brand_background']; ?>">
                             </div>
                         </div>
                     </div>
@@ -3826,7 +3826,7 @@ $modsForHesk_settings = mfh_getSettings();
                             <div class="col-sm-5 col-xs-12">
                                 <input type="text" id="admin-navbar-text-color" name="admin-navbar-text-color"
                                        class="form-control"
-                                       value="<?php echo $modsForHesk_settings['admin_navbar_text_color']; ?>">
+                                       value="<?php echo $modsForHesk_settings['admin_navbar_text']; ?>">
                             </div>
                         </div>
                     </div>
@@ -3843,7 +3843,7 @@ $modsForHesk_settings = mfh_getSettings();
                             <div class="col-sm-5 col-xs-12">
                                 <input type="text" id="admin-navbar-brand-text-color" name="admin-navbar-brand-text-color"
                                        class="form-control"
-                                       value="<?php echo $modsForHesk_settings['admin_navbar_brand_text_color']; ?>">
+                                       value="<?php echo $modsForHesk_settings['admin_navbar_brand_text']; ?>">
                             </div>
                         </div>
                     </div>
@@ -3862,7 +3862,7 @@ $modsForHesk_settings = mfh_getSettings();
                             <div class="col-sm-5 col-xs-12">
                                 <input type="text" id="admin-navbar-text-color" name="admin-navbar-text-color"
                                        class="form-control"
-                                       value="<?php echo $modsForHesk_settings['admin_navbar_text_hover_color']; ?>">
+                                       value="<?php echo $modsForHesk_settings['admin_navbar_text_hover']; ?>">
                             </div>
                         </div>
                     </div>
@@ -3879,7 +3879,7 @@ $modsForHesk_settings = mfh_getSettings();
                             <div class="col-sm-5 col-xs-12">
                                 <input type="text" id="admin-navbar-brand-text-color" name="admin-navbar-brand-text-color"
                                        class="form-control"
-                                       value="<?php echo $modsForHesk_settings['admin_navbar_brand_text_hover_color']; ?>">
+                                       value="<?php echo $modsForHesk_settings['admin_navbar_brand_text_hover']; ?>">
                             </div>
                         </div>
                     </div>
@@ -3898,7 +3898,7 @@ $modsForHesk_settings = mfh_getSettings();
                             <div class="col-sm-5 col-xs-12">
                                 <input type="text" id="admin-navbar-background-hover-color" name="admin-navbar-background-hover-color"
                                        class="form-control"
-                                       value="<?php echo $modsForHesk_settings['admin_navbar_background_hover_color']; ?>">
+                                       value="<?php echo $modsForHesk_settings['admin_navbar_background_hover']; ?>">
                             </div>
                         </div>
                     </div>
@@ -3915,7 +3915,7 @@ $modsForHesk_settings = mfh_getSettings();
                             <div class="col-sm-5 col-xs-12">
                                 <input type="text" id="admin-navbar-brand-background-hover-color" name="admin-navbar-brand-background-hover-color"
                                        class="form-control"
-                                       value="<?php echo $modsForHesk_settings['admin_navbar_brand_background_hover_color']; ?>">
+                                       value="<?php echo $modsForHesk_settings['admin_navbar_brand_background_hover']; ?>">
                             </div>
                         </div>
                     </div>
@@ -3937,7 +3937,7 @@ $modsForHesk_settings = mfh_getSettings();
                             <div class="col-sm-5 col-xs-12">
                                 <input type="text" id="admin-navbar-background-color" name="admin-navbar-background-color"
                                        class="form-control"
-                                       value="<?php echo $modsForHesk_settings['admin_navbar_background_color']; ?>">
+                                       value="<?php echo $modsForHesk_settings['admin_navbar_background']; ?>">
                             </div>
                         </div>
                     </div>
@@ -3957,7 +3957,7 @@ $modsForHesk_settings = mfh_getSettings();
                             <div class="col-sm-5 col-xs-12">
                                 <input type="text" id="admin-navbar-brand-background-color" name="admin-navbar-brand-background-color"
                                        class="form-control"
-                                       value="<?php echo $modsForHesk_settings['admin_navbar_brand_background_color']; ?>">
+                                       value="<?php echo $modsForHesk_settings['admin_navbar_brand_background']; ?>">
                             </div>
                         </div>
                     </div>
@@ -3976,7 +3976,7 @@ $modsForHesk_settings = mfh_getSettings();
                             <div class="col-sm-5 col-xs-12">
                                 <input type="text" id="admin-navbar-text-color" name="admin-navbar-text-color"
                                        class="form-control"
-                                       value="<?php echo $modsForHesk_settings['admin_navbar_text_color']; ?>">
+                                       value="<?php echo $modsForHesk_settings['admin_navbar_text']; ?>">
                             </div>
                         </div>
                     </div>
@@ -3993,7 +3993,7 @@ $modsForHesk_settings = mfh_getSettings();
                             <div class="col-sm-5 col-xs-12">
                                 <input type="text" id="admin-navbar-brand-text-color" name="admin-navbar-brand-text-color"
                                        class="form-control"
-                                       value="<?php echo $modsForHesk_settings['admin_navbar_brand_text_color']; ?>">
+                                       value="<?php echo $modsForHesk_settings['admin_navbar_brand_text']; ?>">
                             </div>
                         </div>
                     </div>
@@ -4012,7 +4012,7 @@ $modsForHesk_settings = mfh_getSettings();
                             <div class="col-sm-5 col-xs-12">
                                 <input type="text" id="admin-navbar-text-color" name="admin-navbar-text-color"
                                        class="form-control"
-                                       value="<?php echo $modsForHesk_settings['admin_navbar_text_hover_color']; ?>">
+                                       value="<?php echo $modsForHesk_settings['admin_navbar_text_hover']; ?>">
                             </div>
                         </div>
                     </div>
@@ -4031,7 +4031,7 @@ $modsForHesk_settings = mfh_getSettings();
                             <div class="col-sm-5 col-xs-12">
                                 <input type="text" id="admin-navbar-background-hover-color" name="admin-navbar-background-hover-color"
                                        class="form-control"
-                                       value="<?php echo $modsForHesk_settings['admin_navbar_background_hover_color']; ?>">
+                                       value="<?php echo $modsForHesk_settings['admin_navbar_background_hover']; ?>">
                             </div>
                         </div>
                     </div>
@@ -4050,7 +4050,7 @@ $modsForHesk_settings = mfh_getSettings();
                             <div class="col-sm-5 col-xs-12">
                                 <input type="text" id="admin-navbar-background-hover-color" name="admin-navbar-background-hover-color"
                                        class="form-control"
-                                       value="<?php echo $modsForHesk_settings['admin_navbar_background_hover_color']; ?>">
+                                       value="<?php echo $modsForHesk_settings['admin_navbar_background_hover']; ?>">
                             </div>
                         </div>
                     </div>
diff --git a/install/mods-for-hesk/sql/installSql.php b/install/mods-for-hesk/sql/installSql.php
index 74cdb261..1bfd29eb 100644
--- a/install/mods-for-hesk/sql/installSql.php
+++ b/install/mods-for-hesk/sql/installSql.php
@@ -1048,14 +1048,14 @@ function execute310Scripts() {
         'background' => $light_theme ? '#f9fafc' : '#1a2226',
         'text' => $light_theme ? '#848484' : '#4b646f',
         'text_hover' => $light_theme ? '#848484' : '#4b646f',
-        'background_hover' => $light_theme ? '#f9fafc': '#1a2226'
+        'background_hover' => $light_theme ? '#f9fafc': '#1e282c'
     );
     if (preg_match('/skin-blue.*/g', $theme)) {
         $navbar['background'] = '#3c8dbc';
         $navbar['background_hover'] = '#367fa9';
 
         $navbar_brand['background'] = $light_theme ? '#3c8dbc' : '#367fa9';
-        $navbar_brand['background_hover'] = $light_theme ? '#3b8ab8' : '#367fa9';
+        $navbar_brand['background_hover'] = $light_theme ? '#3b8ab8' : '#357ca5';
     } elseif (preg_match('/skin-yellow.*/g', $theme)) {
         $navbar['background'] = '#f39c12';
         $navbar['background_hover'] = '#da8c10';
@@ -1089,9 +1089,9 @@ function execute310Scripts() {
     }
 
     executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) 
-        VALUES ('admin_navbar_background_color', '{$navbar['background']}')");
+        VALUES ('admin_navbar_background', '{$navbar['background']}')");
     executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) 
-        VALUES ('admin_navbar_background_color_hover', '{$navbar['background_hover']}')");
+        VALUES ('admin_navbar_background_hover', '{$navbar['background_hover']}')");
     executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) 
         VALUES ('admin_navbar_text', '{$navbar['text']}')");
     executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) 
@@ -1119,9 +1119,9 @@ function execute310Scripts() {
     executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) 
         VALUES ('admin_sidebar_header_background_hover', '{$sidebar_header['background_hover']}')");
     executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) 
-        VALUES ('admin_sidebar_text', '{$sidebar_header['text']}')");
+        VALUES ('admin_sidebar_header_text', '{$sidebar_header['text']}')");
     executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) 
-        VALUES ('admin_sidebar_text_hover', '{$sidebar_header['text_hover']}')");
+        VALUES ('admin_sidebar_header_text_hover', '{$sidebar_header['text_hover']}')");
 
     updateVersion('3.1.0');
 }
\ No newline at end of file

From f07358cb4a15dda23cb03b6d78316c09fb14dba5 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Mon, 12 Jun 2017 21:51:11 -0400
Subject: [PATCH 172/192] Set the right form names

---
 admin/admin_settings.php                 | 53 ++++++++++++++----------
 install/mods-for-hesk/sql/installSql.php |  2 +-
 language/en/text.php                     |  4 ++
 3 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/admin/admin_settings.php b/admin/admin_settings.php
index ef40ccc5..75bc2c8c 100644
--- a/admin/admin_settings.php
+++ b/admin/admin_settings.php
@@ -3851,7 +3851,7 @@ $modsForHesk_settings = mfh_getSettings();
                 <div class="row">
                     <div class="col-sm-6 col-xs-12">
                         <div class="form-group">
-                            <label for="admin-navbar-hover-color"
+                            <label for="admin-navbar-text-hover-color"
                                    class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['text_hover_color']; ?>
                                 <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
                                    data-placement="top"
@@ -3868,7 +3868,7 @@ $modsForHesk_settings = mfh_getSettings();
                     </div>
                     <div class="col-sm-6 col-xs-12">
                         <div class="form-group">
-                            <label for="admin-navbar-brand-text-color"
+                            <label for="admin-navbar-brand-text-hover-color"
                                    class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['text_hover_color']; ?>
                                 <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
                                    data-placement="top"
@@ -3926,7 +3926,7 @@ $modsForHesk_settings = mfh_getSettings();
                             <h4><?php echo $hesklang['sidebar']; ?></h4>
                         </div>
                         <div class="form-group">
-                            <label for="admin-navbar-background-color"
+                            <label for="admin-sidebar-background-color"
                                    class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['background_color']; ?>
                                 <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
                                    data-placement="top"
@@ -3937,7 +3937,7 @@ $modsForHesk_settings = mfh_getSettings();
                             <div class="col-sm-5 col-xs-12">
                                 <input type="text" id="admin-navbar-background-color" name="admin-navbar-background-color"
                                        class="form-control"
-                                       value="<?php echo $modsForHesk_settings['admin_navbar_background']; ?>">
+                                       value="<?php echo $modsForHesk_settings['admin_sidebar_background']; ?>">
                             </div>
                         </div>
                     </div>
@@ -3946,7 +3946,7 @@ $modsForHesk_settings = mfh_getSettings();
                             <h4><?php echo $hesklang['sidebar_header']; ?></h4>
                         </div>
                         <div class="form-group">
-                            <label for="admin-navbar-brand-background-color"
+                            <label for="admin-sidebar-header-background-color"
                                    class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['background_color']; ?>
                                 <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
                                    data-placement="left"
@@ -3957,7 +3957,7 @@ $modsForHesk_settings = mfh_getSettings();
                             <div class="col-sm-5 col-xs-12">
                                 <input type="text" id="admin-navbar-brand-background-color" name="admin-navbar-brand-background-color"
                                        class="form-control"
-                                       value="<?php echo $modsForHesk_settings['admin_navbar_brand_background']; ?>">
+                                       value="<?php echo $modsForHesk_settings['admin_sidebar_header_background']; ?>">
                             </div>
                         </div>
                     </div>
@@ -3965,7 +3965,7 @@ $modsForHesk_settings = mfh_getSettings();
                 <div class="row">
                     <div class="col-sm-6 col-xs-12">
                         <div class="form-group">
-                            <label for="admin-navbar-text-color"
+                            <label for="admin-sidebar-text-color"
                                    class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['text_color']; ?>
                                 <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
                                    data-placement="top"
@@ -3976,13 +3976,13 @@ $modsForHesk_settings = mfh_getSettings();
                             <div class="col-sm-5 col-xs-12">
                                 <input type="text" id="admin-navbar-text-color" name="admin-navbar-text-color"
                                        class="form-control"
-                                       value="<?php echo $modsForHesk_settings['admin_navbar_text']; ?>">
+                                       value="<?php echo $modsForHesk_settings['admin_sidebar_text']; ?>">
                             </div>
                         </div>
                     </div>
                     <div class="col-sm-6 col-xs-12">
                         <div class="form-group">
-                            <label for="admin-navbar-brand-text-color"
+                            <label for="admin-sidebar-brand-text-color"
                                    class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['text_color']; ?>
                                 <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
                                    data-placement="top"
@@ -3993,7 +3993,7 @@ $modsForHesk_settings = mfh_getSettings();
                             <div class="col-sm-5 col-xs-12">
                                 <input type="text" id="admin-navbar-brand-text-color" name="admin-navbar-brand-text-color"
                                        class="form-control"
-                                       value="<?php echo $modsForHesk_settings['admin_navbar_brand_text']; ?>">
+                                       value="<?php echo $modsForHesk_settings['admin_sidebar_header_text']; ?>">
                             </div>
                         </div>
                     </div>
@@ -4001,7 +4001,7 @@ $modsForHesk_settings = mfh_getSettings();
                 <div class="row">
                     <div class="col-sm-6 col-xs-12">
                         <div class="form-group">
-                            <label for="admin-navbar-hover-color"
+                            <label for="admin-sidebar-text-hover-color"
                                    class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['text_hover_color']; ?>
                                 <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
                                    data-placement="top"
@@ -4012,7 +4012,7 @@ $modsForHesk_settings = mfh_getSettings();
                             <div class="col-sm-5 col-xs-12">
                                 <input type="text" id="admin-navbar-text-color" name="admin-navbar-text-color"
                                        class="form-control"
-                                       value="<?php echo $modsForHesk_settings['admin_navbar_text_hover']; ?>">
+                                       value="<?php echo $modsForHesk_settings['admin_sidebar_text_hover']; ?>">
                             </div>
                         </div>
                     </div>
@@ -4020,7 +4020,7 @@ $modsForHesk_settings = mfh_getSettings();
                 <div class="row">
                     <div class="col-sm-6 col-xs-12">
                         <div class="form-group">
-                            <label for="admin-navbar-background-hover-color"
+                            <label for="admin-sidebar-background-hover-color"
                                    class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['background_hover_color']; ?>
                                 <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
                                    data-placement="top"
@@ -4031,7 +4031,7 @@ $modsForHesk_settings = mfh_getSettings();
                             <div class="col-sm-5 col-xs-12">
                                 <input type="text" id="admin-navbar-background-hover-color" name="admin-navbar-background-hover-color"
                                        class="form-control"
-                                       value="<?php echo $modsForHesk_settings['admin_navbar_background_hover']; ?>">
+                                       value="<?php echo $modsForHesk_settings['admin_sidebar_background_hover']; ?>">
                             </div>
                         </div>
                     </div>
@@ -4040,17 +4040,28 @@ $modsForHesk_settings = mfh_getSettings();
                     <div class="col-sm-6 col-xs-12">
                         <div class="form-group">
                             <label for="admin-sidebar-font-weight"
-                                   class="col-sm-7 col-xs-12 control-label"><?php echo 'FONT WEIGHT'; ?>
+                                   class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['font_weight']; ?>
                                 <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
                                    data-placement="top"
-                                   title="<?php echo $hesklang['background_hover_color']; ?>"
-                                   data-content="<?php echo $hesklang['background_hover_color_help']; ?>"></i>
+                                   title="<?php echo $hesklang['font_weight']; ?>"
+                                   data-content="<?php echo $hesklang['font_weight_help']; ?>"></i>
                             </label>
 
-                            <div class="col-sm-5 col-xs-12">
-                                <input type="text" id="admin-navbar-background-hover-color" name="admin-navbar-background-hover-color"
-                                       class="form-control"
-                                       value="<?php echo $modsForHesk_settings['admin_navbar_background_hover']; ?>">
+                            <div class="col-sm-5 col-xs-12 form-inline">
+                                <div class="radio">
+                                    <label>
+                                        <input type="radio" name="admin-sidebar-font-weight" value="normal"
+                                            <?php echo $modsForHesk_settings['admin_sidebar_font_weight'] == 'normal' ? 'checked' : ''; ?>>
+                                        <?php echo $hesklang['normal']; ?>
+                                    </label>
+                                </div><br>
+                                <div class="radio">
+                                    <label>
+                                        <input type="radio" name="admin-sidebar-font-weight" value="bold"
+                                            <?php echo $modsForHesk_settings['admin_sidebar_font_weight'] == 'bold' ? 'checked' : ''; ?>>
+                                        <?php echo $hesklang['bold']; ?>
+                                    </label>
+                                </div>
                             </div>
                         </div>
                     </div>
diff --git a/install/mods-for-hesk/sql/installSql.php b/install/mods-for-hesk/sql/installSql.php
index 1bfd29eb..18d4adcc 100644
--- a/install/mods-for-hesk/sql/installSql.php
+++ b/install/mods-for-hesk/sql/installSql.php
@@ -1042,7 +1042,7 @@ function execute310Scripts() {
         'text' => $light_theme ? '#444' : '#b8c7ce',
         'text_hover' => $light_theme ? '#444' : '#b8c7ce',
         'background_hover' => $light_theme ? '#f4f4f5' : '#1e282c',
-        'font_weight' => $light_theme ? '600' : 'normal'
+        'font_weight' => $light_theme ? 'bold' : 'normal'
     );
     $sidebar_header = array(
         'background' => $light_theme ? '#f9fafc' : '#1a2226',
diff --git a/language/en/text.php b/language/en/text.php
index 0cac0aad..a5ac9b15 100644
--- a/language/en/text.php
+++ b/language/en/text.php
@@ -2151,6 +2151,10 @@ $hesklang['navbar'] = 'Navigation Bar';
 $hesklang['navbar_brand'] = 'Navigation Brand';
 $hesklang['sidebar'] = 'Sidebar';
 $hesklang['sidebar_header'] = 'Sidebar Header';
+$hesklang['font_weight'] = 'Font Weight';
+$hesklang['font_weight_help'] = 'The font weight for text';
+$hesklang['normal'] = 'Normal';
+$hesklang['bold'] = 'Bold';
 
 
 // DO NOT CHANGE BELOW

From 3a7db2f7ca97df4aa8b2975c568f2fc322d349e1 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Tue, 13 Jun 2017 12:59:49 -0400
Subject: [PATCH 173/192] Small change

---
 admin/admin_settings.php | 43 +++++++++++++++-------------------------
 language/en/text.php     |  7 ++++---
 2 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/admin/admin_settings.php b/admin/admin_settings.php
index 75bc2c8c..d6b52c74 100644
--- a/admin/admin_settings.php
+++ b/admin/admin_settings.php
@@ -3715,39 +3715,28 @@ $modsForHesk_settings = mfh_getSettings();
                     <div class="col-xs-12">
                         <div class="form-group">
                             <label for="admin-color-scheme"
-                                   class="col-sm-3 col-xs-5 control-label"><?php echo $hesklang['color_scheme']; ?>
+                                   class="col-sm-3 col-xs-5 control-label"><?php echo $hesklang['color_preset']; ?>
                                 <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
                                    data-placement="left"
-                                   title="<?php echo $hesklang['color_scheme']; ?>"
-                                   data-content="<?php echo $hesklang['color_scheme_help']; ?>"></i>
+                                   title="<?php echo $hesklang['color_preset']; ?>"
+                                   data-content="<?php echo $hesklang['color_preset_help']; ?>"></i>
                             </label>
 
                             <div class="col-sm-9 col-xs-7">
                                 <select name="admin-color-scheme" class="form-control">
-                                    <option value="skin-blue"
-                                        <?php if ($modsForHesk_settings['admin_color_scheme'] == 'skin-blue') { echo 'selected'; } ?>>Blue</option>
-                                    <option value="skin-blue-light"
-                                        <?php if ($modsForHesk_settings['admin_color_scheme'] == 'skin-blue-light') { echo 'selected'; } ?>>Blue (Light)</option>
-                                    <option value="skin-yellow"
-                                        <?php if ($modsForHesk_settings['admin_color_scheme'] == 'skin-yellow') { echo 'selected'; } ?>>Yellow</option>
-                                    <option value="skin-yellow-light"
-                                        <?php if ($modsForHesk_settings['admin_color_scheme'] == 'skin-yellow-light') { echo 'selected'; } ?>>Yellow (Light)</option>
-                                    <option value="skin-green"
-                                        <?php if ($modsForHesk_settings['admin_color_scheme'] == 'skin-green') { echo 'selected'; } ?>>Green</option>
-                                    <option value="skin-green-light"
-                                        <?php if ($modsForHesk_settings['admin_color_scheme'] == 'skin-green-light') { echo 'selected'; } ?>>Green (Light)</option>
-                                    <option value="skin-purple"
-                                        <?php if ($modsForHesk_settings['admin_color_scheme'] == 'skin-purple') { echo 'selected'; } ?>>Purple</option>
-                                    <option value="skin-purple-light"
-                                        <?php if ($modsForHesk_settings['admin_color_scheme'] == 'skin-purple-light') { echo 'selected'; } ?>>Purple (Light)</option>
-                                    <option value="skin-red"
-                                        <?php if ($modsForHesk_settings['admin_color_scheme'] == 'skin-red') { echo 'selected'; } ?>>Red</option>
-                                    <option value="skin-red-light"
-                                        <?php if ($modsForHesk_settings['admin_color_scheme'] == 'skin-red-light') { echo 'selected'; } ?>>Red (Light)</option>
-                                    <option value="skin-black"
-                                        <?php if ($modsForHesk_settings['admin_color_scheme'] == 'skin-black') { echo 'selected'; } ?>>Black</option>
-                                    <option value="skin-black-light"
-                                        <?php if ($modsForHesk_settings['admin_color_scheme'] == 'skin-black-light') { echo 'selected'; } ?>>Black (Light)</option>
+                                    <option value="SELECT"><?php echo $hesklang['select_a_preset']; ?></option>
+                                    <option value="skin-blue">Blue</option>
+                                    <option value="skin-blue-light">Blue (Light)</option>
+                                    <option value="skin-yellow">Yellow</option>
+                                    <option value="skin-yellow-light">Yellow (Light)</option>
+                                    <option value="skin-green">Green</option>
+                                    <option value="skin-green-light">Green (Light)</option>
+                                    <option value="skin-purple">Purple</option>
+                                    <option value="skin-purple-light">Purple (Light)</option>
+                                    <option value="skin-red">Red</option>
+                                    <option value="skin-red-light">Red (Light)</option>
+                                    <option value="skin-black">Black</option>
+                                    <option value="skin-black-light">Black (Light)</option>
                                 </select>
                             </div>
                             <script>
diff --git a/language/en/text.php b/language/en/text.php
index a5ac9b15..e1bf806a 100644
--- a/language/en/text.php
+++ b/language/en/text.php
@@ -2082,8 +2082,6 @@ $hesklang['canned_responses_dropdown_title'] = 'Canned Responses';
 $hesklang['helpdesk_settings'] = 'Helpdesk Settings';
 $hesklang['click_to_toggle'] = 'Click to toggle';
 $hesklang['see_all_messages'] = 'See All Messages';
-$hesklang['color_scheme'] = 'Color Scheme';
-$hesklang['color_scheme_help'] = 'The color scheme for the backend to use.';
 
 // ADDED OR MODIFIED IN Mods for HESK 3.1.0
 $hesklang['stack_trace_header'] = 'Stack Trace';
@@ -2155,7 +2153,10 @@ $hesklang['font_weight'] = 'Font Weight';
 $hesklang['font_weight_help'] = 'The font weight for text';
 $hesklang['normal'] = 'Normal';
 $hesklang['bold'] = 'Bold';
-
+$hesklang['color_preset'] = 'Color Preset';
+$hesklang['color_preset_help'] = 'Select a color preset for the backend, or define custom colors below.';
+$hesklang['select_a_preset'] = '-- Select a Preset --';
+;
 
 // DO NOT CHANGE BELOW
 if (!defined('IN_SCRIPT')) die('PHP syntax OK!');

From 69b78d0829a9f252b5dd06723d37c5e282602098 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Tue, 13 Jun 2017 22:14:00 -0400
Subject: [PATCH 174/192] JS updated for presets

---
 admin/admin_settings.php | 111 +++++++++++++++++++++++++++------------
 1 file changed, 78 insertions(+), 33 deletions(-)

diff --git a/admin/admin_settings.php b/admin/admin_settings.php
index d6b52c74..bd561326 100644
--- a/admin/admin_settings.php
+++ b/admin/admin_settings.php
@@ -3723,37 +3723,82 @@ $modsForHesk_settings = mfh_getSettings();
                             </label>
 
                             <div class="col-sm-9 col-xs-7">
-                                <select name="admin-color-scheme" class="form-control">
+                                <select name="admin-color-scheme" id="admin-color-scheme" class="form-control">
                                     <option value="SELECT"><?php echo $hesklang['select_a_preset']; ?></option>
-                                    <option value="skin-blue">Blue</option>
-                                    <option value="skin-blue-light">Blue (Light)</option>
-                                    <option value="skin-yellow">Yellow</option>
-                                    <option value="skin-yellow-light">Yellow (Light)</option>
-                                    <option value="skin-green">Green</option>
-                                    <option value="skin-green-light">Green (Light)</option>
-                                    <option value="skin-purple">Purple</option>
-                                    <option value="skin-purple-light">Purple (Light)</option>
-                                    <option value="skin-red">Red</option>
-                                    <option value="skin-red-light">Red (Light)</option>
-                                    <option value="skin-black">Black</option>
-                                    <option value="skin-black-light">Black (Light)</option>
+                                    <option value="blue">Blue</option>
+                                    <option value="blue-light">Blue (Light)</option>
+                                    <option value="yellow">Yellow</option>
+                                    <option value="yellow-light">Yellow (Light)</option>
+                                    <option value="green">Green</option>
+                                    <option value="green-light">Green (Light)</option>
+                                    <option value="purple">Purple</option>
+                                    <option value="purple-light">Purple (Light)</option>
+                                    <option value="red">Red</option>
+                                    <option value="red-light">Red (Light)</option>
+                                    <option value="black">Black</option>
+                                    <option value="black-light">Black (Light)</option>
                                 </select>
                             </div>
                             <script>
                                 $('select[name="admin-color-scheme"]').change(function() {
-                                    $('body').removeClass('skin-blue')
-                                        .removeClass('skin-blue-light')
-                                        .removeClass('skin-yellow')
-                                        .removeClass('skin-yellow-light')
-                                        .removeClass('skin-green')
-                                        .removeClass('skin-green-light')
-                                        .removeClass('skin-purple')
-                                        .removeClass('skin-purple-light')
-                                        .removeClass('skin-red')
-                                        .removeClass('skin-red-light')
-                                        .removeClass('skin-black')
-                                        .removeClass('skin-black-light')
-                                        .addClass($(this).val());
+                                    var val = $(this).val();
+
+                                    if (val === 'SELECT') {
+                                        return;
+                                    }
+
+                                    var lightTheme = val.match(/.+-light/i);
+
+                                    $('input[name="admin-sidebar-background-color"]').val(lightTheme ? '#f9fafc' : '#222d32');
+                                    $('input[name="admin-sidebar-header-background-color"]').val(lightTheme ? '#f9fafc' : '#1a2226');
+                                    $('input[name="admin-sidebar-text-color"]').val(lightTheme ? '#444' : '#b8c7ce');
+                                    $('input[name="admin-sidebar-header-text-color"]').val(lightTheme ? '#848484' : '#4b646f');
+                                    $('input[name="admin-sidebar-text-hover-color"]').val(lightTheme ? '#444' : '#b8c7ce');
+                                    $('input[name="admin-sidebar-background-hover-color"]').val(lightTheme ? '#f4f4f5' : '#1e282c');
+                                    $('input[name="admin-sidebar-font-weight"]').val(lightTheme ? ['bold'] : ['normal']);
+
+                                    $('input[name="admin-navbar-text-color"]').val('#fff');
+                                    $('input[name="admin-navbar-text-hover-color"]').val('#fff');
+                                    $('input[name="admin-navbar-brand-text-color"]').val('#fff');
+                                    $('input[name="admin-navbar-brand-text-hover-color"]').val('#fff');
+                                    if (val.match(/blue.*/i)) {
+                                        $('input[name="admin-navbar-background-color"]').val('#3c8dbc');
+                                        $('input[name="admin-navbar-background-hover-color"]').val('#367fa9');
+
+                                        $('input[name="admin-navbar-brand-background-color"]').val(lightTheme ? '#3c8dbc' : '#367fa9');
+                                        $('input[name="admin-navbar-brand-background-hover-color"]').val(lightTheme ? '#3b8ab8' : '#357ca5');
+                                    } else if (val.match(/yellow.*/i)) {
+                                        $('input[name="admin-navbar-background-color"]').val('#f39c12');
+                                        $('input[name="admin-navbar-background-hover-color"]').val('#da8c10');
+
+                                        $('input[name="admin-navbar-brand-background-color"]').val(lightTheme ? '#f39c12' : '#e08e0b');
+                                        $('input[name="admin-navbar-brand-background-hover-color"]').val(lightTheme ? '#f39a0d' : '#db8b0b');
+                                    } else if (val.match(/green.*/i)) {
+                                        $('input[name="admin-navbar-background-color"]').val('#00a65a');
+                                        $('input[name="admin-navbar-background-hover-color"]').val('#009551');
+
+                                        $('input[name="admin-navbar-brand-background-color"]').val(lightTheme ? '#00a65a' : '#008d4c');
+                                        $('input[name="admin-navbar-brand-background-hover-color"]').val(lightTheme ? '#00a157' : '#008749');
+                                    } else if (val.match(/purple.*/i)) {
+                                        $('input[name="admin-navbar-background-color"]').val('#605ca8');
+                                        $('input[name="admin-navbar-background-hover-color"]').val('#565397');
+
+                                        $('input[name="admin-navbar-brand-background-color"]').val(lightTheme ? '#605ca8' : '#555299');
+                                        $('input[name="admin-navbar-brand-background-hover-color"]').val(lightTheme ? '#5d59a6' : '#545096');
+                                    } else if (val.match(/red.*/i)) {
+                                        $('input[name="admin-navbar-background-color"]').val('#dd4b39');
+                                        $('input[name="admin-navbar-background-hover-color"]').val('#c64333');
+
+                                        $('input[name="admin-navbar-brand-background-color"]').val(lightTheme ? '#dd4b39' : '#d73925');
+                                        $('input[name="admin-navbar-brand-background-hover-color"]').val(lightTheme ? '#dc4735' : '#d33724');
+                                    } else {
+                                        //-- Black
+                                        $('input[name="admin-navbar-background-color"]').val('#fff');
+                                        $('input[name="admin-navbar-background-hover-color"]').val('#eee');
+
+                                        $('input[name="admin-navbar-brand-background-color"]').val('#fff');
+                                        $('input[name="admin-navbar-brand-background-hover-color"]').val('#fcfcfc');
+                                    }
                                 });
                             </script>
                         </div>
@@ -3924,7 +3969,7 @@ $modsForHesk_settings = mfh_getSettings();
                             </label>
 
                             <div class="col-sm-5 col-xs-12">
-                                <input type="text" id="admin-navbar-background-color" name="admin-navbar-background-color"
+                                <input type="text" id="admin-sidebar-background-color" name="admin-sidebar-background-color"
                                        class="form-control"
                                        value="<?php echo $modsForHesk_settings['admin_sidebar_background']; ?>">
                             </div>
@@ -3944,7 +3989,7 @@ $modsForHesk_settings = mfh_getSettings();
                             </label>
 
                             <div class="col-sm-5 col-xs-12">
-                                <input type="text" id="admin-navbar-brand-background-color" name="admin-navbar-brand-background-color"
+                                <input type="text" id="admin-sidebar-header-background-color" name="admin-sidebar-header-background-color"
                                        class="form-control"
                                        value="<?php echo $modsForHesk_settings['admin_sidebar_header_background']; ?>">
                             </div>
@@ -3963,7 +4008,7 @@ $modsForHesk_settings = mfh_getSettings();
                             </label>
 
                             <div class="col-sm-5 col-xs-12">
-                                <input type="text" id="admin-navbar-text-color" name="admin-navbar-text-color"
+                                <input type="text" id="admin-sidebar-text-color" name="admin-sidebar-text-color"
                                        class="form-control"
                                        value="<?php echo $modsForHesk_settings['admin_sidebar_text']; ?>">
                             </div>
@@ -3971,7 +4016,7 @@ $modsForHesk_settings = mfh_getSettings();
                     </div>
                     <div class="col-sm-6 col-xs-12">
                         <div class="form-group">
-                            <label for="admin-sidebar-brand-text-color"
+                            <label for="admin-sidebar-header-text-color"
                                    class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['text_color']; ?>
                                 <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
                                    data-placement="top"
@@ -3980,7 +4025,7 @@ $modsForHesk_settings = mfh_getSettings();
                             </label>
 
                             <div class="col-sm-5 col-xs-12">
-                                <input type="text" id="admin-navbar-brand-text-color" name="admin-navbar-brand-text-color"
+                                <input type="text" id="admin-sidebar-header-text-color" name="admin-sidebar-header-text-color"
                                        class="form-control"
                                        value="<?php echo $modsForHesk_settings['admin_sidebar_header_text']; ?>">
                             </div>
@@ -3999,7 +4044,7 @@ $modsForHesk_settings = mfh_getSettings();
                             </label>
 
                             <div class="col-sm-5 col-xs-12">
-                                <input type="text" id="admin-navbar-text-color" name="admin-navbar-text-color"
+                                <input type="text" id="admin-sidebar-text-hover-color" name="admin-sidebar-text-hover-color"
                                        class="form-control"
                                        value="<?php echo $modsForHesk_settings['admin_sidebar_text_hover']; ?>">
                             </div>
@@ -4018,7 +4063,7 @@ $modsForHesk_settings = mfh_getSettings();
                             </label>
 
                             <div class="col-sm-5 col-xs-12">
-                                <input type="text" id="admin-navbar-background-hover-color" name="admin-navbar-background-hover-color"
+                                <input type="text" id="admin-sidebar-background-hover-color" name="admin-sidebar-background-hover-color"
                                        class="form-control"
                                        value="<?php echo $modsForHesk_settings['admin_sidebar_background_hover']; ?>">
                             </div>

From cebcefe7e2678da76e04e45b8e5e2c362a87f71a Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Thu, 15 Jun 2017 22:06:13 -0400
Subject: [PATCH 175/192] Actually save the settings

---
 admin/admin_settings.php                 | 24 +++++++++---------
 admin/admin_settings_save.php            | 31 +++++++++++++++++++++++-
 install/mods-for-hesk/sql/installSql.php |  8 +-----
 language/en/text.php                     | 13 +++++++++-
 4 files changed, 55 insertions(+), 21 deletions(-)

diff --git a/admin/admin_settings.php b/admin/admin_settings.php
index bd561326..f0d3486b 100644
--- a/admin/admin_settings.php
+++ b/admin/admin_settings.php
@@ -3725,18 +3725,18 @@ $modsForHesk_settings = mfh_getSettings();
                             <div class="col-sm-9 col-xs-7">
                                 <select name="admin-color-scheme" id="admin-color-scheme" class="form-control">
                                     <option value="SELECT"><?php echo $hesklang['select_a_preset']; ?></option>
-                                    <option value="blue">Blue</option>
-                                    <option value="blue-light">Blue (Light)</option>
-                                    <option value="yellow">Yellow</option>
-                                    <option value="yellow-light">Yellow (Light)</option>
-                                    <option value="green">Green</option>
-                                    <option value="green-light">Green (Light)</option>
-                                    <option value="purple">Purple</option>
-                                    <option value="purple-light">Purple (Light)</option>
-                                    <option value="red">Red</option>
-                                    <option value="red-light">Red (Light)</option>
-                                    <option value="black">Black</option>
-                                    <option value="black-light">Black (Light)</option>
+                                    <option value="blue"><?php echo $hesklang['preset_blue']; ?></option>
+                                    <option value="blue-light"><?php echo $hesklang['preset_blue_light']; ?></option>
+                                    <option value="yellow"><?php echo $hesklang['preset_yellow']; ?></option>
+                                    <option value="yellow-light"><?php echo $hesklang['preset_yellow_light']; ?></option>
+                                    <option value="green"><?php echo $hesklang['preset_green']; ?></option>
+                                    <option value="green-light"><?php echo $hesklang['preset_green_light']; ?></option>
+                                    <option value="purple"><?php echo $hesklang['preset_purple']; ?></option>
+                                    <option value="purple-light"><?php echo $hesklang['preset_purple_light']; ?></option>
+                                    <option value="red"><?php echo $hesklang['preset_red']; ?></option>
+                                    <option value="red-light"><?php echo $hesklang['preset_red_light']; ?></option>
+                                    <option value="black"><?php echo $hesklang['preset_black']; ?></option>
+                                    <option value="black-light"><?php echo $hesklang['preset_black_light']; ?></option>
                                 </select>
                             </div>
                             <script>
diff --git a/admin/admin_settings_save.php b/admin/admin_settings_save.php
index 13d35719..7113cd6f 100644
--- a/admin/admin_settings_save.php
+++ b/admin/admin_settings_save.php
@@ -495,7 +495,21 @@ $set['dropdownItemTextColor'] = hesk_input(hesk_POST('dropdownItemTextColor'));
 $set['dropdownItemTextHoverColor'] = hesk_input(hesk_POST('dropdownItemTextHoverColor'));
 $set['questionMarkColor'] = hesk_input(hesk_POST('questionMarkColor'));
 $set['dropdownItemTextHoverBackgroundColor'] = hesk_input(hesk_POST('dropdownItemTextHoverBackgroundColor'));
-$set['admin_color_scheme'] = hesk_input(hesk_POST('admin-color-scheme'));
+$set['admin_navbar_background'] = hesk_input(hesk_POST('admin-navbar-background-color'));
+$set['admin_navbar_background_hover'] = hesk_input(hesk_POST('admin-navbar-background-hover-color'));
+$set['admin_navbar_brand_background'] = hesk_input(hesk_POST('admin-navbar-brand-background-color'));
+$set['admin_navbar_brand_background_hover'] = hesk_input(hesk_POST('admin-navbar-brand-background-hover-color'));
+$set['admin_navbar_brand_text'] = hesk_input(hesk_POST('admin-navbar-brand-text-color'));
+$set['admin_navbar_brand_text_hover'] = hesk_input(hesk_POST('admin-navbar-brand-text-hover-color'));
+$set['admin_navbar_text'] = hesk_input(hesk_POST('admin-navbar-text-color'));
+$set['admin_navbar_text_hover'] = hesk_input(hesk_POST('admin-navbar-text-hover-color'));
+$set['admin_sidebar_background'] = hesk_input(hesk_POST('admin-sidebar-background-color'));
+$set['admin_sidebar_background_hover'] = hesk_input(hesk_POST('admin-sidebar-header-background-color'));
+$set['admin_sidebar_font_weight'] = hesk_input(hesk_POST('admin-sidebar-font-weight'));
+$set['admin_sidebar_header_background'] = hesk_input(hesk_POST('admin-sidebar-header-background-color'));
+$set['admin_sidebar_header_text'] = hesk_input(hesk_POST('admin-sidebar-header-text-color'));
+$set['admin_sidebar_text'] = hesk_input(hesk_POST('admin-sidebar-text-color'));
+$set['admin_sidebar_text_hover'] = hesk_input(hesk_POST('admin-sidebar-text-hover-color'));
 
 $set['login_background_type'] = hesk_input(hesk_POST('login-background'));
 $set['login_box_header'] = hesk_input(hesk_POST('login-box-header'));
@@ -615,6 +629,21 @@ mfh_updateSetting('dropdownItemTextColor', $set['dropdownItemTextColor'], true);
 mfh_updateSetting('dropdownItemTextHoverColor', $set['dropdownItemTextHoverColor'], true);
 mfh_updateSetting('questionMarkColor', $set['questionMarkColor'], true);
 mfh_updateSetting('dropdownItemTextHoverBackgroundColor', $set['dropdownItemTextHoverBackgroundColor'], true);
+mfh_updateSetting('admin_navbar_background', $set['admin_navbar_background'], true);
+mfh_updateSetting('admin_navbar_background_hover', $set['admin_navbar_background_hover'], true);
+mfh_updateSetting('admin_navbar_brand_background', $set['admin_navbar_brand_background'], true);
+mfh_updateSetting('admin_navbar_brand_background_hover', $set['admin_navbar_brand_background_hover'], true);
+mfh_updateSetting('admin_navbar_brand_text', $set['admin_navbar_brand_text'], true);
+mfh_updateSetting('admin_navbar_brand_text_hover', $set['admin_navbar_brand_text_hover'], true);
+mfh_updateSetting('admin_navbar_text', $set['admin_navbar_text'], true);
+mfh_updateSetting('admin_navbar_text_hover', $set['admin_navbar_text_hover'], true);
+mfh_updateSetting('admin_sidebar_background', $set['admin_sidebar_background'], true);
+mfh_updateSetting('admin_sidebar_background_hover', $set['admin_sidebar_background_hover'], true);
+mfh_updateSetting('admin_sidebar_font_weight', $set['admin_sidebar_font_weight'], true);
+mfh_updateSetting('admin_sidebar_header_background', $set['admin_sidebar_header_background'], true);
+mfh_updateSetting('admin_sidebar_header_text', $set['admin_sidebar_header_text'], true);
+mfh_updateSetting('admin_sidebar_text', $set['admin_sidebar_text'], true);
+mfh_updateSetting('admin_sidebar_text_hover', $set['admin_sidebar_text_hover'], true);
 mfh_updateSetting('display_user_agent_information', $set['display_user_agent_information']);
 mfh_updateSetting('navbar_title_url', $set['navbar_title_url'], true);
 if ($set['use_mailgun'] == 1) {
diff --git a/install/mods-for-hesk/sql/installSql.php b/install/mods-for-hesk/sql/installSql.php
index 18d4adcc..53080c41 100644
--- a/install/mods-for-hesk/sql/installSql.php
+++ b/install/mods-for-hesk/sql/installSql.php
@@ -1013,7 +1013,7 @@ function execute310Scripts() {
     executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) VALUES ('login_background', '#d2d6de')");
     executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) VALUES ('login_box_header', 'helpdesk-title')");
     executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) VALUES ('login_box_header_image', '')");
-    executeQuery("DELETE FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` WHERE `Key` = 'rtl'");
+    executeQuery("DELETE FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` WHERE `Key` IN ('rtl', 'admin_color_scheme')");
 
     // Copy over color presets to the custom values
     $theme_preset_rs = executeQuery("SELECT `Value` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` WHERE `Key` = 'admin_color_scheme'");
@@ -1047,8 +1047,6 @@ function execute310Scripts() {
     $sidebar_header = array(
         'background' => $light_theme ? '#f9fafc' : '#1a2226',
         'text' => $light_theme ? '#848484' : '#4b646f',
-        'text_hover' => $light_theme ? '#848484' : '#4b646f',
-        'background_hover' => $light_theme ? '#f9fafc': '#1e282c'
     );
     if (preg_match('/skin-blue.*/g', $theme)) {
         $navbar['background'] = '#3c8dbc';
@@ -1116,12 +1114,8 @@ function execute310Scripts() {
         VALUES ('admin_sidebar_font_weight', '{$sidebar['font_weight']}')");
     executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) 
         VALUES ('admin_sidebar_header_background', '{$sidebar_header['background']}')");
-    executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) 
-        VALUES ('admin_sidebar_header_background_hover', '{$sidebar_header['background_hover']}')");
     executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) 
         VALUES ('admin_sidebar_header_text', '{$sidebar_header['text']}')");
-    executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) 
-        VALUES ('admin_sidebar_header_text_hover', '{$sidebar_header['text_hover']}')");
 
     updateVersion('3.1.0');
 }
\ No newline at end of file
diff --git a/language/en/text.php b/language/en/text.php
index e1bf806a..25127bd2 100644
--- a/language/en/text.php
+++ b/language/en/text.php
@@ -2156,7 +2156,18 @@ $hesklang['bold'] = 'Bold';
 $hesklang['color_preset'] = 'Color Preset';
 $hesklang['color_preset_help'] = 'Select a color preset for the backend, or define custom colors below.';
 $hesklang['select_a_preset'] = '-- Select a Preset --';
-;
+$hesklang['preset_blue'] = 'Blue';
+$hesklang['preset_blue_light'] = 'Blue (light)';
+$hesklang['preset_yellow'] = 'Yellow';
+$hesklang['preset_yellow_light'] = 'Yellow (light)';
+$hesklang['preset_green'] = 'Green';
+$hesklang['preset_green_light'] = 'Green (light)';
+$hesklang['preset_purple'] = 'Purple';
+$hesklang['preset_purple_light'] = 'Purple (light)';
+$hesklang['preset_red'] = 'Red';
+$hesklang['preset_red_light'] = 'Red (light)';
+$hesklang['preset_black'] = 'Black';
+$hesklang['preset_black_light'] = 'Black (light)';
 
 // DO NOT CHANGE BELOW
 if (!defined('IN_SCRIPT')) die('PHP syntax OK!');

From f860e980187a2fba09b8396712c6b89237e14fa3 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Fri, 16 Jun 2017 13:09:59 -0400
Subject: [PATCH 176/192] Most of the user-defined colors are properly working

---
 inc/headerAdmin.inc.php | 53 ++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 52 insertions(+), 1 deletion(-)

diff --git a/inc/headerAdmin.inc.php b/inc/headerAdmin.inc.php
index 19e76af1..5b5ed282 100644
--- a/inc/headerAdmin.inc.php
+++ b/inc/headerAdmin.inc.php
@@ -81,6 +81,57 @@ $modsForHesk_settings = mfh_getSettings();
     }
     ?>
     <style>
+        <?php // ADMIN COLOR SCHEME ?>
+        .main-header .logo {
+            background-color: <?php echo $modsForHesk_settings['admin_navbar_brand_background']; ?>;
+            color: <?php echo $modsForHesk_settings['admin_navbar_brand_text']; ?>;
+        }
+
+        .main-header .logo:hover {
+            background-color: <?php echo $modsForHesk_settings['admin_navbar_brand_background_hover']; ?>;
+            color: <?php echo $modsForHesk_settings['admin_navbar_brand_text_hover']; ?>;
+        }
+
+        .main-header .navbar {
+            background-color: <?php echo $modsForHesk_settings['admin_navbar_background']; ?>;
+
+        }
+
+        .main-header .navbar .nav > li > a,
+        .main-header .navbar .sidebar-toggle {
+            color: <?php echo $modsForHesk_settings['admin_navbar_text']; ?>;
+        }
+
+        .main-header .navbar .nav > li > a:hover,
+        .main-header .navbar .sidebar-toggle:hover {
+            background-color: <?php echo $modsForHesk_settings['admin_navbar_background_hover']; ?>;
+            color: <?php echo $modsForHesk_settings['admin_navbar_text_hover']; ?>;
+        }
+
+        .main-sidebar, .left-side {
+            background-color: <?php echo $modsForHesk_settings['admin_sidebar_background']; ?>
+        }
+
+        .sidebar-menu > li.header {
+            color: <?php echo $modsForHesk_settings['admin_sidebar_header_text']; ?>;
+            background-color: <?php echo $modsForHesk_settings['admin_sidebar_header_background']; ?>;
+        }
+
+        .sidebar a {
+            color: <?php echo $modsForHesk_settings['admin_sidebar_text']; ?>;
+        }
+
+        .sidebar-menu > li > a {
+            font-weight: <?php echo $modsForHesk_settings['admin_sidebar_font_weight'] == 'normal' ? 'normal' : 600; ?>;
+            border-left: 3px solid transparent;
+        }
+
+        .sidebar-menu > li:hover > a {
+            color: <?php echo $modsForHesk_settings['admin_sidebar_text_hover']; ?>;
+            background: <?php echo $modsForHesk_settings['admin_sidebar_background_hover']; ?>;
+            border-left-color: <?php echo $modsForHesk_settings['admin_navbar_background']; ?>;
+        }
+
         .settingsquestionmark {
             color: <?php echo $modsForHesk_settings['questionMarkColor']; ?>;
             cursor: pointer;
@@ -248,7 +299,7 @@ if (defined('MFH_PAGE_LAYOUT') && MFH_PAGE_LAYOUT == 'TOP_ONLY') {
 }
 ?>
 <body onload="<?php echo $onload;
-unset($onload); ?>" class="<?php echo $layout_tag ?> fixed js <?php echo $modsForHesk_settings['admin_color_scheme']; ?>">
+unset($onload); ?>" class="<?php echo $layout_tag ?> fixed js">
 
 <?php // GLOBAL JAVASCRIPT IDs ?>
 <p style="display: none" id="heskUrl"><?php echo $hesk_settings['hesk_url']; ?></p>

From 550d7f5d3ceecc2961778abc5b257cdebf376351 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Fri, 16 Jun 2017 21:18:22 -0400
Subject: [PATCH 177/192] Staff UI colors working

---
 admin/admin_settings.php | 6 +++---
 inc/headerAdmin.inc.php  | 8 ++++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/admin/admin_settings.php b/admin/admin_settings.php
index f0d3486b..551b1cd9 100644
--- a/admin/admin_settings.php
+++ b/admin/admin_settings.php
@@ -3753,7 +3753,7 @@ $modsForHesk_settings = mfh_getSettings();
                                     $('input[name="admin-sidebar-header-background-color"]').val(lightTheme ? '#f9fafc' : '#1a2226');
                                     $('input[name="admin-sidebar-text-color"]').val(lightTheme ? '#444' : '#b8c7ce');
                                     $('input[name="admin-sidebar-header-text-color"]').val(lightTheme ? '#848484' : '#4b646f');
-                                    $('input[name="admin-sidebar-text-hover-color"]').val(lightTheme ? '#444' : '#b8c7ce');
+                                    $('input[name="admin-sidebar-text-hover-color"]').val(lightTheme ? '#444' : '#fff');
                                     $('input[name="admin-sidebar-background-hover-color"]').val(lightTheme ? '#f4f4f5' : '#1e282c');
                                     $('input[name="admin-sidebar-font-weight"]').val(lightTheme ? ['bold'] : ['normal']);
 
@@ -3894,7 +3894,7 @@ $modsForHesk_settings = mfh_getSettings();
                             </label>
 
                             <div class="col-sm-5 col-xs-12">
-                                <input type="text" id="admin-navbar-text-color" name="admin-navbar-text-color"
+                                <input type="text" id="admin-navbar-text-hover-color" name="admin-navbar-text-hover-color"
                                        class="form-control"
                                        value="<?php echo $modsForHesk_settings['admin_navbar_text_hover']; ?>">
                             </div>
@@ -3911,7 +3911,7 @@ $modsForHesk_settings = mfh_getSettings();
                             </label>
 
                             <div class="col-sm-5 col-xs-12">
-                                <input type="text" id="admin-navbar-brand-text-color" name="admin-navbar-brand-text-color"
+                                <input type="text" id="admin-navbar-brand-text-hover-color" name="admin-navbar-brand-text-hover-color"
                                        class="form-control"
                                        value="<?php echo $modsForHesk_settings['admin_navbar_brand_text_hover']; ?>">
                             </div>
diff --git a/inc/headerAdmin.inc.php b/inc/headerAdmin.inc.php
index 5b5ed282..5dba6b02 100644
--- a/inc/headerAdmin.inc.php
+++ b/inc/headerAdmin.inc.php
@@ -103,7 +103,10 @@ $modsForHesk_settings = mfh_getSettings();
         }
 
         .main-header .navbar .nav > li > a:hover,
-        .main-header .navbar .sidebar-toggle:hover {
+        .main-header .navbar .sidebar-toggle:hover,
+        .main-header .navbar .nav > .active > a,
+        .main-header .navbar .nav .open > a,
+        .main-header .navbar .nav > li > a:focus {
             background-color: <?php echo $modsForHesk_settings['admin_navbar_background_hover']; ?>;
             color: <?php echo $modsForHesk_settings['admin_navbar_text_hover']; ?>;
         }
@@ -117,7 +120,8 @@ $modsForHesk_settings = mfh_getSettings();
             background-color: <?php echo $modsForHesk_settings['admin_sidebar_header_background']; ?>;
         }
 
-        .sidebar a {
+        .sidebar a,
+        .sidebar .ticket-info {
             color: <?php echo $modsForHesk_settings['admin_sidebar_text']; ?>;
         }
 

From 45c1291711e54bd271886994aa08953c7c59247b Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Fri, 16 Jun 2017 22:42:12 -0400
Subject: [PATCH 178/192] More color changes

---
 admin/admin_settings.php | 463 +++++++++------------------------------
 1 file changed, 103 insertions(+), 360 deletions(-)

diff --git a/admin/admin_settings.php b/admin/admin_settings.php
index 551b1cd9..581b0a37 100644
--- a/admin/admin_settings.php
+++ b/admin/admin_settings.php
@@ -3530,184 +3530,64 @@ $modsForHesk_settings = mfh_getSettings();
                 <h4><?php echo $hesklang['customer_view']; ?></h4>
                 <div class="row">
                     <div class="col-sm-6 col-xs-12">
-                        <div class="form-group">
-                            <label for="navbarBackgroundColor"
-                                   class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['navbarBackgroundColor']; ?>
-                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                                   data-placement="left"
-                                   title="<?php echo $hesklang['navbarBackgroundColor']; ?>"
-                                   data-content="<?php echo $hesklang['navbarBackgroundColorHelp']; ?>"></i>
-                            </label>
-
-                            <div class="col-sm-5 col-xs-12">
-                                <input type="text" id="navbarBackgroundColor" name="navbarBackgroundColor"
-                                       class="form-control"
-                                       value="<?php echo $modsForHesk_settings['navbarBackgroundColor']; ?>">
-                            </div>
-                        </div>
+                        <?php
+                        buildColorSchemeColorpicker('navbarBackgroundColor', 'navbarBackgroundColor', $modsForHesk_settings['navbarBackgroundColor'], 'Help');
+                        ?>
                     </div>
                     <div class="col-sm-6 col-xs-12">
-                        <div class="form-group">
-                            <label for="navbarBrandColor"
-                                   class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['navbarBrandColor']; ?>
-                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                                   data-placement="left"
-                                   title="<?php echo $hesklang['navbarBrandColor']; ?>"
-                                   data-content="<?php echo $hesklang['navbarBrandColorHelp']; ?>"></i>
-                            </label>
-
-                            <div class="col-sm-5 col-xs-12">
-                                <input type="text" id="navbarBrandColor" name="navbarBrandColor"
-                                       class="form-control"
-                                       value="<?php echo $modsForHesk_settings['navbarBrandColor']; ?>">
-                            </div>
-                        </div>
+                        <?php
+                        buildColorSchemeColorpicker('navbarBrandColor', 'navbarBrandColor', $modsForHesk_settings['navbarBrandColor'], 'Help');
+                        ?>
                     </div>
                 </div>
                 <div class="row">
                     <div class="col-sm-6 col-xs-12">
-                        <div class="form-group">
-                            <label for="navbarBrandHoverColor"
-                                   class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['navbarBrandHoverColor']; ?>
-                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                                   data-placement="left"
-                                   title="<?php echo $hesklang['navbarBrandHoverColor']; ?>"
-                                   data-content="<?php echo $hesklang['navbarBrandHoverColorHelp']; ?>"></i>
-                            </label>
-
-                            <div class="col-sm-5 col-xs-12">
-                                <input type="text" id="navbarBrandHoverColor" name="navbarBrandHoverColor"
-                                       class="form-control"
-                                       value="<?php echo $modsForHesk_settings['navbarBrandHoverColor']; ?>">
-                            </div>
-                        </div>
+                        <?php
+                        buildColorSchemeColorpicker('navbarBrandHoverColor', 'navbarBrandHoverColor', $modsForHesk_settings['navbarBrandHoverColor'], 'Help');
+                        ?>
                     </div>
                     <div class="col-sm-6 col-xs-12">
-                        <div class="form-group">
-                            <label for="navbarItemTextColor"
-                                   class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['navbarItemTextColor']; ?>
-                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                                   data-placement="left"
-                                   title="<?php echo $hesklang['navbarItemTextColor']; ?>"
-                                   data-content="<?php echo $hesklang['navbarItemTextColorHelp']; ?>"></i>
-                            </label>
-
-                            <div class="col-sm-5 col-xs-12">
-                                <input type="text" id="navbarItemTextColor" name="navbarItemTextColor"
-                                       class="form-control"
-                                       value="<?php echo $modsForHesk_settings['navbarItemTextColor']; ?>">
-                            </div>
-                        </div>
+                        <?php
+                        buildColorSchemeColorpicker('navbarItemTextColor', 'navbarItemTextColor', $modsForHesk_settings['navbarItemTextColor'], 'Help');
+                        ?>
                     </div>
                 </div>
                 <div class="row">
                     <div class="col-sm-6 col-xs-12">
-                        <div class="form-group">
-                            <label for="navbarItemTextHoverColor"
-                                   class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['navbarItemTextHoverColor']; ?>
-                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                                   data-placement="left"
-                                   title="<?php echo $hesklang['navbarItemTextHoverColor']; ?>"
-                                   data-content="<?php echo $hesklang['navbarItemTextHoverColorHelp']; ?>"></i>
-                            </label>
-
-                            <div class="col-sm-5 col-xs-12">
-                                <input type="text" id="navbarItemTextHoverColor" name="navbarItemTextHoverColor"
-                                       class="form-control"
-                                       value="<?php echo $modsForHesk_settings['navbarItemTextHoverColor']; ?>">
-                            </div>
-                        </div>
+                        <?php
+                        buildColorSchemeColorpicker('navbarItemTextHoverColor', 'navbarItemTextHoverColor', $modsForHesk_settings['navbarItemTextHoverColor'], 'Help');
+                        ?>
                     </div>
                     <div class="col-sm-6 col-xs-12">
-                        <div class="form-group">
-                            <label for="navbarItemTextSelectedColor"
-                                   class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['navbarItemTextSelectedColor']; ?>
-                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                                   data-placement="left"
-                                   title="<?php echo $hesklang['navbarItemTextSelectedColor']; ?>"
-                                   data-content="<?php echo $hesklang['navbarItemTextSelectedColorHelp']; ?>"></i>
-                            </label>
-
-                            <div class="col-sm-5 col-xs-12">
-                                <input type="text" id="navbarItemTextSelectedColor"
-                                       name="navbarItemTextSelectedColor" class="form-control"
-                                       value="<?php echo $modsForHesk_settings['navbarItemTextSelectedColor']; ?>">
-                            </div>
-                        </div>
+                        <?php
+                        buildColorSchemeColorpicker('navbarItemTextSelectedColor', 'navbarItemTextSelectedColor', $modsForHesk_settings['navbarItemTextSelectedColor'], 'Help');
+                        ?>
                     </div>
                 </div>
                 <div class="row">
                     <div class="col-sm-6 col-xs-12">
-                        <div class="form-group">
-                            <label for="navbarItemSelectedBackgroundColor"
-                                   class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['navbarItemSelectedBackgroundColor']; ?>
-                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                                   data-placement="left"
-                                   title="<?php echo $hesklang['navbarItemSelectedBackgroundColor']; ?>"
-                                   data-content="<?php echo $hesklang['navbarItemSelectedBackgroundColorHelp']; ?>"></i>
-                            </label>
-
-                            <div class="col-sm-5 col-xs-12">
-                                <input type="text" id="navbarItemSelectedBackgroundColor"
-                                       name="navbarItemSelectedBackgroundColor" class="form-control"
-                                       value="<?php echo $modsForHesk_settings['navbarItemSelectedBackgroundColor']; ?>">
-                            </div>
-                        </div>
+                        <?php
+                        buildColorSchemeColorpicker('navbarItemSelectedBackgroundColor', 'navbarItemSelectedBackgroundColor', $modsForHesk_settings['navbarItemSelectedBackgroundColor'], 'Help');
+                        ?>
                     </div>
                     <div class="col-sm-6 col-xs-12">
-                        <div class="form-group">
-                            <label for="dropdownItemTextColor"
-                                   class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['dropdownItemTextColor']; ?>
-                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                                   data-placement="left"
-                                   title="<?php echo $hesklang['dropdownItemTextColor']; ?>"
-                                   data-content="<?php echo $hesklang['dropdownItemTextColorHelp']; ?>"></i>
-                            </label>
-
-                            <div class="col-sm-5 col-xs-12">
-                                <input type="text" id="dropdownItemTextColor" name="dropdownItemTextColor"
-                                       class="form-control"
-                                       value="<?php echo $modsForHesk_settings['dropdownItemTextColor']; ?>">
-                            </div>
-                        </div>
+                        <?php
+                        buildColorSchemeColorpicker('dropdownItemTextColor', 'dropdownItemTextColor', $modsForHesk_settings['dropdownItemTextColor'], 'Help');
+                        ?>
                     </div>
                 </div>
                 <div class="row">
                     <div class="col-sm-6 col-xs-12">
-                        <div class="form-group">
-                            <label for="dropdownItemTextHoverColor"
-                                   class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['dropdownItemTextHoverColor']; ?>
-                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                                   data-placement="left"
-                                   title="<?php echo $hesklang['dropdownItemTextHoverColor']; ?>"
-                                   data-content="<?php echo $hesklang['dropdownItemTextHoverColorHelp']; ?>"></i>
-                            </label>
-
-                            <div class="col-sm-5 col-xs-12">
-                                <input type="text" id="dropdownItemTextHoverColor" name="dropdownItemTextHoverColor"
-                                       class="form-control"
-                                       value="<?php echo $modsForHesk_settings['dropdownItemTextHoverColor']; ?>">
-                            </div>
-                        </div>
+                        <?php
+                        buildColorSchemeColorpicker('dropdownItemTextHoverColor', 'dropdownItemTextHoverColor', $modsForHesk_settings['dropdownItemTextHoverColor'], 'Help');
+                        ?>
                     </div>
                 </div>
                 <div class="row">
                     <div class="col-sm-6 col-xs-12">
-                        <div class="form-group">
-                            <label for="dropdownItemTextHoverBackgroundColor"
-                                   class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['dropdownItemTextHoverBackgroundColor']; ?>
-                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                                   data-placement="left"
-                                   title="<?php echo $hesklang['dropdownItemTextHoverBackgroundColor']; ?>"
-                                   data-content="<?php echo $hesklang['dropdownItemTextHoverBackgroundColorHelp']; ?>"></i>
-                            </label>
-
-                            <div class="col-sm-5 col-xs-12">
-                                <input type="text" id="dropdownItemTextHoverBackgroundColor"
-                                       name="dropdownItemTextHoverBackgroundColor" class="form-control"
-                                       value="<?php echo $modsForHesk_settings['dropdownItemTextHoverBackgroundColor']; ?>">
-                            </div>
-                        </div>
+                        <?php
+                        buildColorSchemeColorpicker('dropdownItemTextHoverBackgroundColor', 'dropdownItemTextHoverBackgroundColor', $modsForHesk_settings['dropdownItemTextHoverBackgroundColor'], 'Help');
+                        ?>
                     </div>
                 </div>
                 <h4><?php echo $hesklang['admin_panel']; ?></h4>
@@ -3809,149 +3689,53 @@ $modsForHesk_settings = mfh_getSettings();
                         <div class="col-sm-5 col-sm-offset-7 col-xs-12">
                             <h4><?php echo $hesklang['navbar']; ?></h4>
                         </div>
-                        <div class="form-group">
-                            <label for="admin-navbar-background-color"
-                                   class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['background_color']; ?>
-                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                                   data-placement="top"
-                                   title="<?php echo $hesklang['background_color']; ?>"
-                                   data-content="<?php echo $hesklang['background_color_help']; ?>"></i>
-                            </label>
-
-                            <div class="col-sm-5 col-xs-12">
-                                <input type="text" id="admin-navbar-background-color" name="admin-navbar-background-color"
-                                       class="form-control"
-                                       value="<?php echo $modsForHesk_settings['admin_navbar_background']; ?>">
-                            </div>
-                        </div>
+                        <?php
+                        buildColorSchemeColorpicker('admin-navbar-background-color', 'background_color', $modsForHesk_settings['admin_navbar_background']);
+                        ?>
                     </div>
                     <div class="col-sm-6 col-xs-12">
                         <div class="col-sm-5 col-sm-offset-7 col-xs-12">
                             <h4><?php echo $hesklang['navbar_brand']; ?></h4>
                         </div>
-                        <div class="form-group">
-                            <label for="admin-navbar-brand-background-color"
-                                   class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['background_color']; ?>
-                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                                   data-placement="left"
-                                   title="<?php echo $hesklang['background_color']; ?>"
-                                   data-content="<?php echo $hesklang['background_color_help']; ?>"></i>
-                            </label>
-
-                            <div class="col-sm-5 col-xs-12">
-                                <input type="text" id="admin-navbar-brand-background-color" name="admin-navbar-brand-background-color"
-                                       class="form-control"
-                                       value="<?php echo $modsForHesk_settings['admin_navbar_brand_background']; ?>">
-                            </div>
-                        </div>
+                        <?php
+                        buildColorSchemeColorpicker('admin-navbar-brand-background-color', 'background_color', $modsForHesk_settings['admin_navbar_brand_background']);
+                        ?>
                     </div>
                 </div>
                 <div class="row">
                     <div class="col-sm-6 col-xs-12">
-                        <div class="form-group">
-                            <label for="admin-navbar-text-color"
-                                   class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['text_color']; ?>
-                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                                   data-placement="top"
-                                   title="<?php echo $hesklang['text_color']; ?>"
-                                   data-content="<?php echo $hesklang['text_color_help']; ?>"></i>
-                            </label>
-
-                            <div class="col-sm-5 col-xs-12">
-                                <input type="text" id="admin-navbar-text-color" name="admin-navbar-text-color"
-                                       class="form-control"
-                                       value="<?php echo $modsForHesk_settings['admin_navbar_text']; ?>">
-                            </div>
-                        </div>
+                        <?php
+                        buildColorSchemeColorpicker('admin-navbar-text-color', 'text_color', $modsForHesk_settings['admin_navbar_text']);
+                        ?>
                     </div>
                     <div class="col-sm-6 col-xs-12">
-                        <div class="form-group">
-                            <label for="admin-navbar-brand-text-color"
-                                   class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['text_color']; ?>
-                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                                   data-placement="top"
-                                   title="<?php echo $hesklang['text_color']; ?>"
-                                   data-content="<?php echo $hesklang['text_color_help']; ?>"></i>
-                            </label>
-
-                            <div class="col-sm-5 col-xs-12">
-                                <input type="text" id="admin-navbar-brand-text-color" name="admin-navbar-brand-text-color"
-                                       class="form-control"
-                                       value="<?php echo $modsForHesk_settings['admin_navbar_brand_text']; ?>">
-                            </div>
-                        </div>
+                        <?php
+                        buildColorSchemeColorpicker('admin-navbar-brand-text-color', 'text_color', $modsForHesk_settings['admin_navbar_brand_text']);
+                        ?>
                     </div>
                 </div>
                 <div class="row">
                     <div class="col-sm-6 col-xs-12">
-                        <div class="form-group">
-                            <label for="admin-navbar-text-hover-color"
-                                   class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['text_hover_color']; ?>
-                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                                   data-placement="top"
-                                   title="<?php echo $hesklang['text_hover_color']; ?>"
-                                   data-content="<?php echo $hesklang['text_hover_color_help']; ?>"></i>
-                            </label>
-
-                            <div class="col-sm-5 col-xs-12">
-                                <input type="text" id="admin-navbar-text-hover-color" name="admin-navbar-text-hover-color"
-                                       class="form-control"
-                                       value="<?php echo $modsForHesk_settings['admin_navbar_text_hover']; ?>">
-                            </div>
-                        </div>
+                        <?php
+                        buildColorSchemeColorpicker('admin-navbar-text-hover-color', 'text_hover_color', $modsForHesk_settings['admin_navbar_text_hover']);
+                        ?>
                     </div>
                     <div class="col-sm-6 col-xs-12">
-                        <div class="form-group">
-                            <label for="admin-navbar-brand-text-hover-color"
-                                   class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['text_hover_color']; ?>
-                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                                   data-placement="top"
-                                   title="<?php echo $hesklang['text_hover_color']; ?>"
-                                   data-content="<?php echo $hesklang['text_hover_color_help']; ?>"></i>
-                            </label>
-
-                            <div class="col-sm-5 col-xs-12">
-                                <input type="text" id="admin-navbar-brand-text-hover-color" name="admin-navbar-brand-text-hover-color"
-                                       class="form-control"
-                                       value="<?php echo $modsForHesk_settings['admin_navbar_brand_text_hover']; ?>">
-                            </div>
-                        </div>
+                        <?php
+                        buildColorSchemeColorpicker('admin-navbar-brand-text-hover-color', 'text_hover_color', $modsForHesk_settings['admin_navbar_brand_text_hover']);
+                        ?>
                     </div>
                 </div>
                 <div class="row">
                     <div class="col-sm-6 col-xs-12">
-                        <div class="form-group">
-                            <label for="admin-navbar-background-hover-color"
-                                   class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['background_hover_color']; ?>
-                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                                   data-placement="top"
-                                   title="<?php echo $hesklang['background_hover_color']; ?>"
-                                   data-content="<?php echo $hesklang['background_hover_color_help']; ?>"></i>
-                            </label>
-
-                            <div class="col-sm-5 col-xs-12">
-                                <input type="text" id="admin-navbar-background-hover-color" name="admin-navbar-background-hover-color"
-                                       class="form-control"
-                                       value="<?php echo $modsForHesk_settings['admin_navbar_background_hover']; ?>">
-                            </div>
-                        </div>
+                        <?php
+                        buildColorSchemeColorpicker('admin-navbar-background-hover-color', 'background_hover_color', $modsForHesk_settings['admin_navbar_background_hover']);
+                        ?>
                     </div>
                     <div class="col-sm-6 col-xs-12">
-                        <div class="form-group">
-                            <label for="admin-navbar-brand-background-hover-color"
-                                   class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['background_hover_color']; ?>
-                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                                   data-placement="top"
-                                   title="<?php echo $hesklang['background_hover_color']; ?>"
-                                   data-content="<?php echo $hesklang['background_hover_color_help']; ?>"></i>
-                            </label>
-
-                            <div class="col-sm-5 col-xs-12">
-                                <input type="text" id="admin-navbar-brand-background-hover-color" name="admin-navbar-brand-background-hover-color"
-                                       class="form-control"
-                                       value="<?php echo $modsForHesk_settings['admin_navbar_brand_background_hover']; ?>">
-                            </div>
-                        </div>
+                        <?php
+                        buildColorSchemeColorpicker('admin-navbar-brand-background-hover-color', 'background_hover_color', $modsForHesk_settings['admin_navbar_brand_background_hover']);
+                        ?>
                     </div>
                 </div>
                 <div class="row">
@@ -3959,115 +3743,43 @@ $modsForHesk_settings = mfh_getSettings();
                         <div class="col-sm-5 col-sm-offset-7 col-xs-12">
                             <h4><?php echo $hesklang['sidebar']; ?></h4>
                         </div>
-                        <div class="form-group">
-                            <label for="admin-sidebar-background-color"
-                                   class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['background_color']; ?>
-                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                                   data-placement="top"
-                                   title="<?php echo $hesklang['background_color']; ?>"
-                                   data-content="<?php echo $hesklang['background_color_help']; ?>"></i>
-                            </label>
-
-                            <div class="col-sm-5 col-xs-12">
-                                <input type="text" id="admin-sidebar-background-color" name="admin-sidebar-background-color"
-                                       class="form-control"
-                                       value="<?php echo $modsForHesk_settings['admin_sidebar_background']; ?>">
-                            </div>
-                        </div>
+                        <?php
+                        buildColorSchemeColorpicker('admin-sidebar-background-color', 'background_color', $modsForHesk_settings['admin_sidebar_background']);
+                        ?>
                     </div>
                     <div class="col-sm-6 col-xs-12">
                         <div class="col-sm-5 col-sm-offset-7 col-xs-12">
                             <h4><?php echo $hesklang['sidebar_header']; ?></h4>
                         </div>
-                        <div class="form-group">
-                            <label for="admin-sidebar-header-background-color"
-                                   class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['background_color']; ?>
-                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                                   data-placement="left"
-                                   title="<?php echo $hesklang['background_color']; ?>"
-                                   data-content="<?php echo $hesklang['background_color_help']; ?>"></i>
-                            </label>
-
-                            <div class="col-sm-5 col-xs-12">
-                                <input type="text" id="admin-sidebar-header-background-color" name="admin-sidebar-header-background-color"
-                                       class="form-control"
-                                       value="<?php echo $modsForHesk_settings['admin_sidebar_header_background']; ?>">
-                            </div>
-                        </div>
+                        <?php
+                        buildColorSchemeColorpicker('admin-sidebar-header-background-color', 'background_color', $modsForHesk_settings['admin_sidebar_header_background']);
+                        ?>
                     </div>
                 </div>
                 <div class="row">
                     <div class="col-sm-6 col-xs-12">
-                        <div class="form-group">
-                            <label for="admin-sidebar-text-color"
-                                   class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['text_color']; ?>
-                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                                   data-placement="top"
-                                   title="<?php echo $hesklang['text_color']; ?>"
-                                   data-content="<?php echo $hesklang['text_color_help']; ?>"></i>
-                            </label>
-
-                            <div class="col-sm-5 col-xs-12">
-                                <input type="text" id="admin-sidebar-text-color" name="admin-sidebar-text-color"
-                                       class="form-control"
-                                       value="<?php echo $modsForHesk_settings['admin_sidebar_text']; ?>">
-                            </div>
-                        </div>
+                        <?php
+                        buildColorSchemeColorpicker('admin-sidebar-text-color', 'text_color', $modsForHesk_settings['admin_sidebar_text']);
+                        ?>
                     </div>
                     <div class="col-sm-6 col-xs-12">
-                        <div class="form-group">
-                            <label for="admin-sidebar-header-text-color"
-                                   class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['text_color']; ?>
-                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                                   data-placement="top"
-                                   title="<?php echo $hesklang['text_color']; ?>"
-                                   data-content="<?php echo $hesklang['text_color_help']; ?>"></i>
-                            </label>
-
-                            <div class="col-sm-5 col-xs-12">
-                                <input type="text" id="admin-sidebar-header-text-color" name="admin-sidebar-header-text-color"
-                                       class="form-control"
-                                       value="<?php echo $modsForHesk_settings['admin_sidebar_header_text']; ?>">
-                            </div>
-                        </div>
+                        <?php
+                        buildColorSchemeColorpicker('admin-sidebar-header-text-color', 'text_color', $modsForHesk_settings['admin_sidebar_header_text']);
+                        ?>
                     </div>
                 </div>
                 <div class="row">
                     <div class="col-sm-6 col-xs-12">
-                        <div class="form-group">
-                            <label for="admin-sidebar-text-hover-color"
-                                   class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['text_hover_color']; ?>
-                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                                   data-placement="top"
-                                   title="<?php echo $hesklang['text_hover_color']; ?>"
-                                   data-content="<?php echo $hesklang['text_hover_color_help']; ?>"></i>
-                            </label>
-
-                            <div class="col-sm-5 col-xs-12">
-                                <input type="text" id="admin-sidebar-text-hover-color" name="admin-sidebar-text-hover-color"
-                                       class="form-control"
-                                       value="<?php echo $modsForHesk_settings['admin_sidebar_text_hover']; ?>">
-                            </div>
-                        </div>
+                        <?php
+                        buildColorSchemeColorpicker('admin-sidebar-text-hover-color', 'text_hover_color', $modsForHesk_settings['admin_sidebar_text_hover']);
+                        ?>
                     </div>
                 </div>
                 <div class="row">
                     <div class="col-sm-6 col-xs-12">
-                        <div class="form-group">
-                            <label for="admin-sidebar-background-hover-color"
-                                   class="col-sm-7 col-xs-12 control-label"><?php echo $hesklang['background_hover_color']; ?>
-                                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                                   data-placement="top"
-                                   title="<?php echo $hesklang['background_hover_color']; ?>"
-                                   data-content="<?php echo $hesklang['background_hover_color_help']; ?>"></i>
-                            </label>
-
-                            <div class="col-sm-5 col-xs-12">
-                                <input type="text" id="admin-sidebar-background-hover-color" name="admin-sidebar-background-hover-color"
-                                       class="form-control"
-                                       value="<?php echo $modsForHesk_settings['admin_sidebar_background_hover']; ?>">
-                            </div>
-                        </div>
+                        <?php
+                        buildColorSchemeColorpicker('admin-sidebar-background-hover-color', 'background_hover_color', $modsForHesk_settings['admin_sidebar_background_hover']);
+                        ?>
                     </div>
                 </div>
                 <div class="row">
@@ -4191,6 +3903,37 @@ $modsForHesk_settings = mfh_getSettings();
     require_once(HESK_PATH . 'inc/footer.inc.php');
     exit();
 
+    function buildColorSchemeColorpicker($field_name, $label_key, $color, $help_suffix = '_help') {
+        global $hesklang;
+
+        echo '
+        <div class="form-group">
+            <label for="admin-navbar-background-color"
+                   class="col-sm-7 col-xs-12 control-label">'. $hesklang[$label_key] . '
+                <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
+                   data-placement="top"
+                   title="' . htmlspecialchars($hesklang[$label_key]) . '"
+                   data-content="' . htmlspecialchars($hesklang[$label_key . $help_suffix]) . '"></i>
+            </label>
+
+            <div class="col-sm-5 col-xs-12">
+                <div id="cp' . $field_name . '" class="input-group">
+                    <input type="text" id="' . $field_name . '" name="' . $field_name . '"
+                       class="form-control"
+                       value="' . $color . '">
+                    <span class="input-group-addon"><i></i></span>
+                </div>
+            </div>
+        </div>
+        <script>
+            $("#cp' . $field_name . '").colorpicker({
+                color: "' . $color . '",
+                format: "hex"
+            });
+        </script>
+        ';
+    }
+
 
     function hesk_checkVersion()
     {

From 34358be6372e00cae3cbc93112e7c019ca86cf41 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sat, 17 Jun 2017 22:02:03 -0400
Subject: [PATCH 179/192] Add dirty forms check on add reply form

---
 admin/admin_ticket.php      | 5 +++--
 js/jquery.dirtyforms.min.js | 7 +++++++
 2 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 js/jquery.dirtyforms.min.js

diff --git a/admin/admin_ticket.php b/admin/admin_ticket.php
index f67d5c8d..54bd820b 100644
--- a/admin/admin_ticket.php
+++ b/admin/admin_ticket.php
@@ -17,7 +17,7 @@ define('WYSIWYG', 1);
 define('VALIDATOR', 1);
 define('MFH_PAGE_LAYOUT', 'TOP_AND_SIDE');
 
-define('EXTRA_JS', '<script src="'.HESK_PATH.'internal-api/js/admin-ticket.js"></script>');
+define('EXTRA_JS', '<script src="'.HESK_PATH.'internal-api/js/admin-ticket.js"></script><script src="'.HESK_PATH.'js/jquery.dirtyforms.min.js"></script>');
 
 /* Get all the required files and functions */
 require(HESK_PATH . 'hesk_settings.inc.php');
@@ -1884,7 +1884,7 @@ function hesk_printReplyForm()
             $onsubmit = 'onsubmit="force_stop();return validateRichText(\'message-help-block\', \'message-group\', \'message\', \''.htmlspecialchars($hesklang['this_field_is_required']).'\')"';
         }
         ?>
-        <form role="form" data-toggle="validator" class="form-horizontal" method="post" action="admin_reply_ticket.php"
+        <form id="reply-form" role="form" data-toggle="validator" class="form-horizontal" method="post" action="admin_reply_ticket.php"
               enctype="multipart/form-data" name="form1" <?php echo $onsubmit; ?>>
             <?php
 
@@ -2061,6 +2061,7 @@ function hesk_printReplyForm()
                 </div>
             </div>
         </form>
+        <script>$('form#reply-form').dirtyForms();</script>
     </div>
 </div>
     <!-- END REPLY FORM -->
diff --git a/js/jquery.dirtyforms.min.js b/js/jquery.dirtyforms.min.js
new file mode 100644
index 00000000..3fa4d184
--- /dev/null
+++ b/js/jquery.dirtyforms.min.js
@@ -0,0 +1,7 @@
+/*!
+Dirty Forms jQuery Plugin | v2.0.0 | github.com/snikch/jquery.dirtyforms
+(c) 2010-2015 Mal Curtis
+License MIT
+*/
+!function(e,t,i,r){e.fn.on||(e.fn.on=function(e,t,i,r){return this.delegate(t,e,i,r)}),e.fn.dirtyForms=function(t){return n[t]?n[t].apply(this,Array.prototype.slice.call(arguments,1)):"object"!=typeof t&&t?void e.error("Method "+t+" does not exist on jQuery.dirtyForms"):n.init.apply(this,arguments)};var n={init:function(r){var n={};return a.initialized||(e.extend(!0,e.DirtyForms,r),e(i).trigger("bind.dirtyforms",[u]),u.bind(t,i,n),a.initialized=!0),this.filter("form").not(":dirtylistening").each(function(){var t=e(this);t.find(e.DirtyForms.fieldSelector).each(function(){m(e(this))}),t.trigger("scan.dirtyforms"),u.bindForm(t,n)}),this},isDirty:function(t){var i=p(),r=e.DirtyForms.dirtyClass,n=!1;return this.each(function(o){var a=e(this),s=b(a,i);return a.hasClass(r)&&!s?(n=!0,!1):(a.find("."+r).each(function(){return b(e(this),i)?void 0:(n=!0,!1)}),n?!1:s||t||(e.each(e.DirtyForms.helpers,function(e,t){return t.isDirty&&t.isDirty(a,o)?(n=!0,!1):void 0}),!n)?void 0:!1)}),n},setClean:function(t,i){var r=function(){var t=e(this);m(t),C(t,!1)};return g(this,e.DirtyForms.fieldSelector,t).each(r).parents("form").trigger("setclean.dirtyforms",[t]),i?this:y(this,"setClean",t,p())},rescan:function(t,i){var r=function(){var t=e(this);v(t)||m(t),C(t,F(t))};return g(this,e.DirtyForms.fieldSelector,t).each(r).parents("form").trigger("rescan.dirtyforms",[t]),i?this:y(this,"rescan",t,p())}};e.extend(e.expr[":"],{dirty:function(t){var i=e(t);return i.hasClass(e.DirtyForms.dirtyClass)&&!i.is(":dirtyignored")},dirtylistening:function(t){return e(t).hasClass(e.DirtyForms.listeningClass)},dirtyignored:function(t){return b(e(t),!1)}}),e.DirtyForms={message:"You've made changes on this page which aren't saved. If you leave you will lose these changes.",dirtyClass:"dirty",listeningClass:"dirtylisten",ignoreClass:"dirtyignore",ignoreSelector:"",fieldSelector:"input:not([type='button'],[type='image'],[type='submit'],[type='reset'],[type='file'],[type='search']),select,textarea",helpers:[],dialog:!1};var o,a={initialized:!1,formStash:!1,dialogStash:!1,deciding:!1,decidingEvent:!1},s=function(e){return e.data.bindEscKey&&27==e.which||e.data.bindEnterKey&&13==e.which?f(e,!1):void 0},d=function(t){var r=t.staySelector,n=t.proceedSelector;""!==r&&e(r).unbind("click",f).click(f),""!==n&&e(n).unbind("click",l).click(l),(t.bindEscKey||t.bindEnterKey)&&e(i).unbind("keydown",s).keydown(t,s)},c=function(t,i){e.isFunction(e.DirtyForms.dialog.close)&&e.DirtyForms.dialog.close(t,i)},l=function(e){return f(e,!0)},f=function(t,r){if(a.deciding){if(t.preventDefault(),r===!0){var n=a.decidingEvent;e(i).trigger("proceed.dirtyforms",[n]),u.clearUnload(),c(r,!1),E(n)}else{e(i).trigger("stay.dirtyforms");var o=e.DirtyForms.dialog!==!1&&a.dialogStash!==!1&&e.isFunction(e.DirtyForms.dialog.unstash);c(r,o),o&&e.DirtyForms.dialog.unstash(a.dialogStash,t),e(i).trigger("afterstay.dirtyforms")}return a.deciding=a.decidingEvent=a.dialogStash=a.formStash=!1,!1}},u={bind:function(t,i,r){e(t).bind("beforeunload",r,u.onBeforeUnload),e(i).on("click",'a:not([target="_blank"])',r,u.onAnchorClick).on("submit","form",r,u.onSubmit)},bindForm:function(t,r){var n=e.DirtyForms,o="onpropertychange"in i.createElement("input"),a="change input"+(o?" keyup selectionchange cut paste":"");t.addClass(n.listeningClass).on("focus keydown",n.fieldSelector,r,u.onFocus).on(a,n.fieldSelector,r,u.onFieldChange).bind("reset",r,u.onReset)},onFocus:function(t){var i=e(t.target);v(i)||m(i)},onFieldChange:function(t){var i=e(t.target);"change"!==t.type?S(function(){D(i)},100):D(i)},onReset:function(t){var i=e(t.target).closest("form");setTimeout(function(){i.dirtyForms("setClean")},100)},onAnchorClick:function(e){k(e)},onSubmit:function(e){k(e)},onBeforeUnload:function(e){var t=k(e);return t&&a.doubleunloadfix!==!0&&(a.deciding=!1),a.doubleunloadfix=!0,setTimeout(function(){a.doubleunloadfix=!1},200),"string"==typeof t?(e.returnValue=t,t):void 0},onRefireClick:function(t){var i=new e.Event("click");e(t.target).trigger(i),i.isDefaultPrevented()||u.onRefireAnchorClick(t)},onRefireAnchorClick:function(i){var n=e(i.target).closest("a[href]").attr("href");n!==r&&(t.location.href=n)},clearUnload:function(){e(t).unbind("beforeunload",u.onBeforeUnload),t.onbeforeunload=null,e(i).trigger("beforeunload.dirtyforms")}},g=function(e,t,i){var r=e.filter(t).add(e.find(t));return i&&(r=r.not(":dirtyignored")),r},y=function(t,i,r,n){return t.each(function(t){var o=e(this);r&&b(o,n)||e.each(e.DirtyForms.helpers,function(e,n){n[i]&&n[i](o,t,r)})})},h=function(t){var i;return t.is("select")?(i="",t.find("option").each(function(){var t=e(this);t.is(":selected")&&(i.length>0&&(i+=","),i+=t.val())})):i=t.is(":checkbox,:radio")?t.is(":checked"):t.val(),i},m=function(e){e.data("df-orig",h(e));var t=e.data("df-orig")===r;e.data("df-empty",t)},v=function(e){return e.data("df-orig")!==r||e.data("df-empty")===!0},p=function(){var t=e.DirtyForms,i=t.ignoreSelector;return e.each(t.helpers,function(e,t){"ignoreSelector"in t&&(i.length>0&&(i+=","),i+=t.ignoreSelector)}),i},b=function(t,i){return i||(i=p()),t.is(i)||t.closest("."+e.DirtyForms.ignoreClass).length>0},F=function(e,t){return!v(e)||b(e,t)?!1:h(e)!=e.data("df-orig")},D=function(t,i){if(!b(t,i))if(t.is(":radio[name]")){var r=t.attr("name"),n=t.parents("form");n.find(":radio[name='"+r+"']").each(function(){var t=e(this);C(t,F(t,i))})}else C(t,F(t,i))},C=function(t,i){var r=e.DirtyForms.dirtyClass,n=t.parents("form");t.toggleClass(r,i);var o=i!==(n.hasClass(r)&&0===n.find(":dirty").length);o&&(n.toggleClass(r,i),i&&n.trigger("dirty.dirtyforms"),i||n.trigger("clean.dirtyforms"))},S=function(){var e=0;return function(t,i){clearTimeout(e),e=setTimeout(t,i)}}(),k=function(t){var r=e(t.target),n=t.type,s=e.DirtyForms;if(t.isDefaultPrevented())return!1;if("beforeunload"==n&&a.doubleunloadfix)return a.doubleunloadfix=!1,!1;if(r.is(":dirtyignored"))return u.clearUnload(),!1;if(a.deciding)return!1;if(!e("form:dirtylistening").dirtyForms("isDirty"))return u.clearUnload(),!1;if("submit"==n&&r.dirtyForms("isDirty"))return u.clearUnload(),!0;if(e(i).trigger("defer.dirtyforms"),"beforeunload"==n)return s.message;if(s.dialog){t.preventDefault(),t.stopImmediatePropagation(),a.deciding=!0,a.decidingEvent=t,e.isFunction(s.dialog.stash)&&(a.dialogStash=s.dialog.stash());var c=s.dialog.stashSelector;"string"==typeof c&&r.is("form")&&r.parents(c).length>0?a.formStash=r.clone(!0).hide():a.formStash=!1,o={proceed:!1,commit:function(e){return f(e,o.proceed)},bindEscKey:!0,bindEnterKey:!1,proceedSelector:"",staySelector:""},s.dialog.open(o,s.message,s.ignoreClass),d(o)}},E=function(t){if("click"===t.type)u.onRefireClick(t);else{var i;a.formStash?(i=a.formStash,e("body").append(i)):i=e(t.target).closest("form"),i.trigger(t.type)}}}(jQuery,window,document);
+//# sourceMappingURL=jquery.dirtyforms.min.js.map

From f6283a4c139a551c972928f3e7ec28c89169234f Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sun, 18 Jun 2017 21:21:26 -0400
Subject: [PATCH 180/192] Fix the API settings page, update validator, fix
 sidebar text hover

---
 admin/api_settings.php                        |  4 +--
 install/mods-for-hesk/database-validation.php | 25 +++++++++++++++++++
 install/mods-for-hesk/sql/installSql.php      |  2 +-
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/admin/api_settings.php b/admin/api_settings.php
index 85c654e0..4a1e8f4d 100644
--- a/admin/api_settings.php
+++ b/admin/api_settings.php
@@ -3,7 +3,7 @@
 define('IN_SCRIPT', 1);
 define('HESK_PATH', '../');
 define('PAGE_TITLE', 'ADMIN_SETTINGS');
-define('MFH_PAGE_LAYOUT', 'TOP_AND_SIDE');
+define('MFH_PAGE_LAYOUT', 'TOP_ONLY');
 
 // Make sure the install folder is deleted
 if (is_dir(HESK_PATH . 'install')) {
@@ -92,7 +92,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
             <ul class="nav nav-tabs">
                 <li class="active"><a href="#general" data-toggle="tab"><?php echo $hesklang['tab_1']; ?></a></li>
                 <li><a href="#user-security" data-toggle="tab"><?php echo $hesklang['user_security']; ?></a></li>
-                <li><a href="#" target="_blank"><?php echo $hesklang['api_documentation']; ?> <i class="fa fa-external-link"></i></a></li>
+                <li><a href="https://mods-for-hesk.readme.io/reference" target="_blank"><?php echo $hesklang['api_documentation']; ?> <i class="fa fa-external-link"></i></a></li>
             </ul>
             <div class="tab-content summaryList tabPadding">
                 <div class="tab-pane fade in active" id="general">
diff --git a/install/mods-for-hesk/database-validation.php b/install/mods-for-hesk/database-validation.php
index 1794874b..05f96b69 100644
--- a/install/mods-for-hesk/database-validation.php
+++ b/install/mods-for-hesk/database-validation.php
@@ -184,6 +184,21 @@ hesk_dbConnect();
             $all_good = $all_good & run_column_check('custom_nav_element_to_text', 'language');
             $all_good = $all_good & run_column_check('custom_nav_element_to_text', 'text');
             $all_good = $all_good & run_column_check('custom_nav_element_to_text', 'subtext');
+            $all_good = $all_good & run_setting_check('admin_navbar_background');
+            $all_good = $all_good & run_setting_check('admin_navbar_background_hover');
+            $all_good = $all_good & run_setting_check('admin_navbar_text');
+            $all_good = $all_good & run_setting_check('admin_navbar_text_hover');
+            $all_good = $all_good & run_setting_check('admin_navbar_brand_background');
+            $all_good = $all_good & run_setting_check('admin_navbar_brand_background_hover');
+            $all_good = $all_good & run_setting_check('admin_navbar_brand_text');
+            $all_good = $all_good & run_setting_check('admin_navbar_brand_text_hover');
+            $all_good = $all_good & run_setting_check('admin_sidebar_background');
+            $all_good = $all_good & run_setting_check('admin_sidebar_background_hover');
+            $all_good = $all_good & run_setting_check('admin_sidebar_text');
+            $all_good = $all_good & run_setting_check('admin_sidebar_text_hover');
+            $all_good = $all_good & run_setting_check('admin_sidebar_font_weight');
+            $all_good = $all_good & run_setting_check('admin_sidebar_header_background');
+            $all_good = $all_good & run_setting_check('admin_sidebar_header_text');
 
             if ($all_good) {
                 echo "<script>$('#all-good').show()</script>";
@@ -198,6 +213,16 @@ hesk_dbConnect();
 </body>
 </html>
 <?php
+function run_setting_check($setting_name) {
+    global $hesk_settings;
+
+    $all_good = run_check("SELECT 1 FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` WHERE `Key` = '{$setting_name}'");
+
+    output_result('<b>Setting Exists</b>: ' . $setting_name, $all_good);
+
+    return $all_good !== false;
+}
+
 function run_table_check($table_name) {
     return run_column_check($table_name, '1');
 }
diff --git a/install/mods-for-hesk/sql/installSql.php b/install/mods-for-hesk/sql/installSql.php
index 53080c41..e0e8bb90 100644
--- a/install/mods-for-hesk/sql/installSql.php
+++ b/install/mods-for-hesk/sql/installSql.php
@@ -1040,7 +1040,7 @@ function execute310Scripts() {
     $sidebar = array(
         'background' => $light_theme ? '#f9fafc' : '#222d32',
         'text' => $light_theme ? '#444' : '#b8c7ce',
-        'text_hover' => $light_theme ? '#444' : '#b8c7ce',
+        'text_hover' => $light_theme ? '#444' : '#fff',
         'background_hover' => $light_theme ? '#f4f4f5' : '#1e282c',
         'font_weight' => $light_theme ? 'bold' : 'normal'
     );

From c39e4462e8e162ca28c715f0342feaca4e5781d8 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sun, 18 Jun 2017 21:31:48 -0400
Subject: [PATCH 181/192] Add nav element for API settings

---
 admin/api_settings.php     |  2 +-
 inc/show_admin_nav.inc.php | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/admin/api_settings.php b/admin/api_settings.php
index 4a1e8f4d..0af4b1b6 100644
--- a/admin/api_settings.php
+++ b/admin/api_settings.php
@@ -2,7 +2,7 @@
 
 define('IN_SCRIPT', 1);
 define('HESK_PATH', '../');
-define('PAGE_TITLE', 'ADMIN_SETTINGS');
+define('PAGE_TITLE', 'ADMIN_API_SETTINGS');
 define('MFH_PAGE_LAYOUT', 'TOP_ONLY');
 
 // Make sure the install folder is deleted
diff --git a/inc/show_admin_nav.inc.php b/inc/show_admin_nav.inc.php
index e4e140cc..dce2c557 100644
--- a/inc/show_admin_nav.inc.php
+++ b/inc/show_admin_nav.inc.php
@@ -473,7 +473,7 @@ $mails = mfh_get_mail_headers_for_dropdown($_SESSION['id'], $hesk_settings, $hes
                         </li>';
                     }
                     if (hesk_checkPermission('can_man_settings', 0)) {
-                        $number_of_settings++;
+                        $number_of_settings += 2;
                         $active = '';
                         if (defined('PAGE_TITLE') && PAGE_TITLE == 'ADMIN_SETTINGS') {
                             $active = 'active';
@@ -486,6 +486,19 @@ $mails = mfh_get_mail_headers_for_dropdown($_SESSION['id'], $hesk_settings, $hes
                                 <span>' . $hesklang['helpdesk_settings'] . '</span>
                             </a>
                         </li>';
+
+                        $active = '';
+                        if (defined('PAGE_TITLE') && PAGE_TITLE == 'ADMIN_API_SETTINGS') {
+                            $active = 'active';
+                        }
+
+                        $markup .= '
+                        <li class="' . $active . '">
+                            <a href="api_settings.php">
+                                <i class="fa fa-fw fa-cog" ' . $iconDisplay . '></i>
+                                <span>' . $hesklang['api_settings'] . '</span>
+                            </a>
+                        </li>';
                     }
 
                     if ($number_of_settings == 1) :

From f5933e8bfa1c24d492e6fca83c4eeffcd32ea7f9 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Sun, 18 Jun 2017 22:03:35 -0400
Subject: [PATCH 182/192] update installer, fix colorpicker presets

---
 admin/admin_settings.php                      |  68 +-
 css/skins/_all-skins.min.css                  |   1 -
 hesk_style_RTL.css                            | 758 ------------------
 inc/headerAdmin.inc.php                       |   1 -
 install/install_functions.inc.php             |   2 +-
 .../ajax/install-database-ajax.php            |   2 +
 install/mods-for-hesk/installModsForHesk.php  |   1 +
 install/mods-for-hesk/js/version-scripts.js   |   3 +
 install/mods-for-hesk/modsForHesk.php         |   1 +
 9 files changed, 42 insertions(+), 795 deletions(-)
 delete mode 100755 css/skins/_all-skins.min.css
 delete mode 100644 hesk_style_RTL.css

diff --git a/admin/admin_settings.php b/admin/admin_settings.php
index 581b0a37..6f686d97 100644
--- a/admin/admin_settings.php
+++ b/admin/admin_settings.php
@@ -3629,55 +3629,55 @@ $modsForHesk_settings = mfh_getSettings();
 
                                     var lightTheme = val.match(/.+-light/i);
 
-                                    $('input[name="admin-sidebar-background-color"]').val(lightTheme ? '#f9fafc' : '#222d32');
-                                    $('input[name="admin-sidebar-header-background-color"]').val(lightTheme ? '#f9fafc' : '#1a2226');
-                                    $('input[name="admin-sidebar-text-color"]').val(lightTheme ? '#444' : '#b8c7ce');
-                                    $('input[name="admin-sidebar-header-text-color"]').val(lightTheme ? '#848484' : '#4b646f');
-                                    $('input[name="admin-sidebar-text-hover-color"]').val(lightTheme ? '#444' : '#fff');
-                                    $('input[name="admin-sidebar-background-hover-color"]').val(lightTheme ? '#f4f4f5' : '#1e282c');
+                                    $('#cpadmin-sidebar-background-color').colorpicker('setValue', lightTheme ? '#f9fafc' : '#222d32');
+                                    $('#cpadmin-sidebar-header-background-color').colorpicker('setValue', lightTheme ? '#f9fafc' : '#1a2226');
+                                    $('#cpadmin-sidebar-text-color').colorpicker('setValue', lightTheme ? '#444' : '#b8c7ce');
+                                    $('#cpadmin-sidebar-header-text-color').colorpicker('setValue', lightTheme ? '#848484' : '#4b646f');
+                                    $('#cpadmin-sidebar-text-hover-color').colorpicker('setValue', lightTheme ? '#444' : '#fff');
+                                    $('#cpadmin-sidebar-background-hover-color').colorpicker('setValue', lightTheme ? '#f4f4f5' : '#1e282c');
                                     $('input[name="admin-sidebar-font-weight"]').val(lightTheme ? ['bold'] : ['normal']);
 
-                                    $('input[name="admin-navbar-text-color"]').val('#fff');
-                                    $('input[name="admin-navbar-text-hover-color"]').val('#fff');
-                                    $('input[name="admin-navbar-brand-text-color"]').val('#fff');
-                                    $('input[name="admin-navbar-brand-text-hover-color"]').val('#fff');
+                                    $('#cpadmin-navbar-text-color').colorpicker('setValue', '#fff');
+                                    $('#cpadmin-navbar-text-hover-color').colorpicker('setValue', '#fff');
+                                    $('#cpadmin-navbar-brand-text-color').colorpicker('setValue', '#fff');
+                                    $('#cpadmin-navbar-brand-text-hover-color').colorpicker('setValue', '#fff');
                                     if (val.match(/blue.*/i)) {
-                                        $('input[name="admin-navbar-background-color"]').val('#3c8dbc');
-                                        $('input[name="admin-navbar-background-hover-color"]').val('#367fa9');
+                                        $('#cpadmin-navbar-background-color').colorpicker('setValue', '#3c8dbc');
+                                        $('#cpadmin-navbar-background-hover-color').colorpicker('setValue', '#367fa9');
 
-                                        $('input[name="admin-navbar-brand-background-color"]').val(lightTheme ? '#3c8dbc' : '#367fa9');
-                                        $('input[name="admin-navbar-brand-background-hover-color"]').val(lightTheme ? '#3b8ab8' : '#357ca5');
+                                        $('#cpadmin-navbar-brand-background-color').colorpicker('setValue', lightTheme ? '#3c8dbc' : '#367fa9');
+                                        $('#cpadmin-navbar-brand-background-hover-color').colorpicker('setValue', lightTheme ? '#3b8ab8' : '#357ca5');
                                     } else if (val.match(/yellow.*/i)) {
-                                        $('input[name="admin-navbar-background-color"]').val('#f39c12');
-                                        $('input[name="admin-navbar-background-hover-color"]').val('#da8c10');
+                                        $('#cpadmin-navbar-background-color').colorpicker('setValue', '#f39c12');
+                                        $('#cpadmin-navbar-background-hover-color').colorpicker('setValue', '#da8c10');
 
-                                        $('input[name="admin-navbar-brand-background-color"]').val(lightTheme ? '#f39c12' : '#e08e0b');
-                                        $('input[name="admin-navbar-brand-background-hover-color"]').val(lightTheme ? '#f39a0d' : '#db8b0b');
+                                        $('#cpadmin-navbar-brand-background-color').colorpicker('setValue', lightTheme ? '#f39c12' : '#e08e0b');
+                                        $('#cpadmin-navbar-brand-background-hover-color').colorpicker('setValue', lightTheme ? '#f39a0d' : '#db8b0b');
                                     } else if (val.match(/green.*/i)) {
-                                        $('input[name="admin-navbar-background-color"]').val('#00a65a');
-                                        $('input[name="admin-navbar-background-hover-color"]').val('#009551');
+                                        $('#cpadmin-navbar-background-color').colorpicker('setValue', '#00a65a');
+                                        $('#cpadmin-navbar-background-hover-color').colorpicker('setValue', '#009551');
 
-                                        $('input[name="admin-navbar-brand-background-color"]').val(lightTheme ? '#00a65a' : '#008d4c');
-                                        $('input[name="admin-navbar-brand-background-hover-color"]').val(lightTheme ? '#00a157' : '#008749');
+                                        $('#cpadmin-navbar-brand-background-color').colorpicker('setValue', lightTheme ? '#00a65a' : '#008d4c');
+                                        $('#cpadmin-navbar-brand-background-hover-color').colorpicker('setValue', lightTheme ? '#00a157' : '#008749');
                                     } else if (val.match(/purple.*/i)) {
-                                        $('input[name="admin-navbar-background-color"]').val('#605ca8');
-                                        $('input[name="admin-navbar-background-hover-color"]').val('#565397');
+                                        $('#cpadmin-navbar-background-color').colorpicker('setValue', '#605ca8');
+                                        $('#cpadmin-navbar-background-hover-color').colorpicker('setValue', '#565397');
 
-                                        $('input[name="admin-navbar-brand-background-color"]').val(lightTheme ? '#605ca8' : '#555299');
-                                        $('input[name="admin-navbar-brand-background-hover-color"]').val(lightTheme ? '#5d59a6' : '#545096');
+                                        $('#cpadmin-navbar-brand-background-color').colorpicker('setValue', lightTheme ? '#605ca8' : '#555299');
+                                        $('#cpadmin-navbar-brand-background-hover-color').colorpicker('setValue', lightTheme ? '#5d59a6' : '#545096');
                                     } else if (val.match(/red.*/i)) {
-                                        $('input[name="admin-navbar-background-color"]').val('#dd4b39');
-                                        $('input[name="admin-navbar-background-hover-color"]').val('#c64333');
+                                        $('#cpadmin-navbar-background-color').colorpicker('setValue', '#dd4b39');
+                                        $('#cpadmin-navbar-background-hover-color').colorpicker('setValue', '#c64333');
 
-                                        $('input[name="admin-navbar-brand-background-color"]').val(lightTheme ? '#dd4b39' : '#d73925');
-                                        $('input[name="admin-navbar-brand-background-hover-color"]').val(lightTheme ? '#dc4735' : '#d33724');
+                                        $('#cpadmin-navbar-brand-background-color').colorpicker('setValue', lightTheme ? '#dd4b39' : '#d73925');
+                                        $('#cpadmin-navbar-brand-background-hover-color').colorpicker('setValue', lightTheme ? '#dc4735' : '#d33724');
                                     } else {
                                         //-- Black
-                                        $('input[name="admin-navbar-background-color"]').val('#fff');
-                                        $('input[name="admin-navbar-background-hover-color"]').val('#eee');
+                                        $('#cpadmin-navbar-background-color').colorpicker('setValue', '#fff');
+                                        $('#cpadmin-navbar-background-hover-color').colorpicker('setValue', '#eee');
 
-                                        $('input[name="admin-navbar-brand-background-color"]').val('#fff');
-                                        $('input[name="admin-navbar-brand-background-hover-color"]').val('#fcfcfc');
+                                        $('#cpadmin-navbar-brand-background-color').colorpicker('setValue', '#fff');
+                                        $('#cpadmin-navbar-brand-background-hover-color').colorpicker('setValue', '#fcfcfc');
                                     }
                                 });
                             </script>
diff --git a/css/skins/_all-skins.min.css b/css/skins/_all-skins.min.css
deleted file mode 100755
index e1d2398f..00000000
--- a/css/skins/_all-skins.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.skin-blue .main-header .navbar{background-color:#3c8dbc}.skin-blue .main-header .navbar .nav>li>a{color:#fff}.skin-blue .main-header .navbar .nav>li>a:hover,.skin-blue .main-header .navbar .nav>li>a:active,.skin-blue .main-header .navbar .nav>li>a:focus,.skin-blue .main-header .navbar .nav .open>a,.skin-blue .main-header .navbar .nav .open>a:hover,.skin-blue .main-header .navbar .nav .open>a:focus,.skin-blue .main-header .navbar .nav>.active>a{background:rgba(0,0,0,0.1);color:#f6f6f6}.skin-blue .main-header .navbar .sidebar-toggle{color:#fff}.skin-blue .main-header .navbar .sidebar-toggle:hover{color:#f6f6f6;background:rgba(0,0,0,0.1)}.skin-blue .main-header .navbar .sidebar-toggle{color:#fff}.skin-blue .main-header .navbar .sidebar-toggle:hover{background-color:#367fa9}@media (max-width:767px){.skin-blue .main-header .navbar .dropdown-menu li.divider{background-color:rgba(255,255,255,0.1)}.skin-blue .main-header .navbar .dropdown-menu li a{color:#fff}.skin-blue .main-header .navbar .dropdown-menu li a:hover{background:#367fa9}}.skin-blue .main-header .logo{background-color:#367fa9;color:#fff;border-bottom:0 solid transparent}.skin-blue .main-header .logo:hover{background-color:#357ca5}.skin-blue .main-header li.user-header{background-color:#3c8dbc}.skin-blue .content-header{background:transparent}.skin-blue .wrapper,.skin-blue .main-sidebar,.skin-blue .left-side{background-color:#222d32}.skin-blue .user-panel>.info,.skin-blue .user-panel>.info>a{color:#fff}.skin-blue .sidebar-menu>li.header{color:#4b646f;background:#1a2226}.skin-blue .sidebar-menu>li>a{border-left:3px solid transparent}.skin-blue .sidebar-menu>li:hover>a,.skin-blue .sidebar-menu>li.active>a{color:#fff;background:#1e282c;border-left-color:#3c8dbc}.skin-blue .sidebar-menu>li>.treeview-menu{margin:0 1px;background:#2c3b41}.skin-blue .sidebar a{color:#b8c7ce}.skin-blue .sidebar a:hover{text-decoration:none}.skin-blue .treeview-menu>li>a{color:#8aa4af}.skin-blue .treeview-menu>li.active>a,.skin-blue .treeview-menu>li>a:hover{color:#fff}.skin-blue .sidebar-form{border-radius:3px;border:1px solid #374850;margin:10px 10px}.skin-blue .sidebar-form input[type="text"],.skin-blue .sidebar-form .btn{box-shadow:none;background-color:#374850;border:1px solid transparent;height:35px}.skin-blue .sidebar-form input[type="text"]{color:#666;border-top-left-radius:2px;border-top-right-radius:0;border-bottom-right-radius:0;border-bottom-left-radius:2px}.skin-blue .sidebar-form input[type="text"]:focus,.skin-blue .sidebar-form input[type="text"]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-blue .sidebar-form input[type="text"]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-blue .sidebar-form .btn{color:#999;border-top-left-radius:0;border-top-right-radius:2px;border-bottom-right-radius:2px;border-bottom-left-radius:0}.skin-blue.layout-top-nav .main-header>.logo{background-color:#3c8dbc;color:#fff;border-bottom:0 solid transparent}.skin-blue.layout-top-nav .main-header>.logo:hover{background-color:#3b8ab8}.skin-blue-light .main-header .navbar{background-color:#3c8dbc}.skin-blue-light .main-header .navbar .nav>li>a{color:#fff}.skin-blue-light .main-header .navbar .nav>li>a:hover,.skin-blue-light .main-header .navbar .nav>li>a:active,.skin-blue-light .main-header .navbar .nav>li>a:focus,.skin-blue-light .main-header .navbar .nav .open>a,.skin-blue-light .main-header .navbar .nav .open>a:hover,.skin-blue-light .main-header .navbar .nav .open>a:focus,.skin-blue-light .main-header .navbar .nav>.active>a{background:rgba(0,0,0,0.1);color:#f6f6f6}.skin-blue-light .main-header .navbar .sidebar-toggle{color:#fff}.skin-blue-light .main-header .navbar .sidebar-toggle:hover{color:#f6f6f6;background:rgba(0,0,0,0.1)}.skin-blue-light .main-header .navbar .sidebar-toggle{color:#fff}.skin-blue-light .main-header .navbar .sidebar-toggle:hover{background-color:#367fa9}@media (max-width:767px){.skin-blue-light .main-header .navbar .dropdown-menu li.divider{background-color:rgba(255,255,255,0.1)}.skin-blue-light .main-header .navbar .dropdown-menu li a{color:#fff}.skin-blue-light .main-header .navbar .dropdown-menu li a:hover{background:#367fa9}}.skin-blue-light .main-header .logo{background-color:#3c8dbc;color:#fff;border-bottom:0 solid transparent}.skin-blue-light .main-header .logo:hover{background-color:#3b8ab8}.skin-blue-light .main-header li.user-header{background-color:#3c8dbc}.skin-blue-light .content-header{background:transparent}.skin-blue-light .wrapper,.skin-blue-light .main-sidebar,.skin-blue-light .left-side{background-color:#f9fafc}.skin-blue-light .content-wrapper,.skin-blue-light .main-footer{border-left:1px solid #d2d6de}.skin-blue-light .user-panel>.info,.skin-blue-light .user-panel>.info>a{color:#444}.skin-blue-light .sidebar-menu>li{-webkit-transition:border-left-color .3s ease;-o-transition:border-left-color .3s ease;transition:border-left-color .3s ease}.skin-blue-light .sidebar-menu>li.header{color:#848484;background:#f9fafc}.skin-blue-light .sidebar-menu>li>a{border-left:3px solid transparent;font-weight:600}.skin-blue-light .sidebar-menu>li:hover>a,.skin-blue-light .sidebar-menu>li.active>a{color:#000;background:#f4f4f5}.skin-blue-light .sidebar-menu>li.active{border-left-color:#3c8dbc}.skin-blue-light .sidebar-menu>li.active>a{font-weight:600}.skin-blue-light .sidebar-menu>li>.treeview-menu{background:#f4f4f5}.skin-blue-light .sidebar a{color:#444}.skin-blue-light .sidebar a:hover{text-decoration:none}.skin-blue-light .treeview-menu>li>a{color:#777}.skin-blue-light .treeview-menu>li.active>a,.skin-blue-light .treeview-menu>li>a:hover{color:#000}.skin-blue-light .treeview-menu>li.active>a{font-weight:600}.skin-blue-light .sidebar-form{border-radius:3px;border:1px solid #d2d6de;margin:10px 10px}.skin-blue-light .sidebar-form input[type="text"],.skin-blue-light .sidebar-form .btn{box-shadow:none;background-color:#fff;border:1px solid transparent;height:35px}.skin-blue-light .sidebar-form input[type="text"]{color:#666;border-top-left-radius:2px;border-top-right-radius:0;border-bottom-right-radius:0;border-bottom-left-radius:2px}.skin-blue-light .sidebar-form input[type="text"]:focus,.skin-blue-light .sidebar-form input[type="text"]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-blue-light .sidebar-form input[type="text"]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-blue-light .sidebar-form .btn{color:#999;border-top-left-radius:0;border-top-right-radius:2px;border-bottom-right-radius:2px;border-bottom-left-radius:0}@media (min-width:768px){.skin-blue-light.sidebar-mini.sidebar-collapse .sidebar-menu>li>.treeview-menu{border-left:1px solid #d2d6de}}.skin-blue-light .main-footer{border-top-color:#d2d6de}.skin-blue.layout-top-nav .main-header>.logo{background-color:#3c8dbc;color:#fff;border-bottom:0 solid transparent}.skin-blue.layout-top-nav .main-header>.logo:hover{background-color:#3b8ab8}.skin-black .main-header{-webkit-box-shadow:0 1px 1px rgba(0,0,0,0.05);box-shadow:0 1px 1px rgba(0,0,0,0.05)}.skin-black .main-header .navbar-toggle{color:#333}.skin-black .main-header .navbar-brand{color:#333;border-right:1px solid #eee}.skin-black .main-header .navbar{background-color:#fff}.skin-black .main-header .navbar .nav>li>a{color:#333}.skin-black .main-header .navbar .nav>li>a:hover,.skin-black .main-header .navbar .nav>li>a:active,.skin-black .main-header .navbar .nav>li>a:focus,.skin-black .main-header .navbar .nav .open>a,.skin-black .main-header .navbar .nav .open>a:hover,.skin-black .main-header .navbar .nav .open>a:focus,.skin-black .main-header .navbar .nav>.active>a{background:#fff;color:#999}.skin-black .main-header .navbar .sidebar-toggle{color:#333}.skin-black .main-header .navbar .sidebar-toggle:hover{color:#999;background:#fff}.skin-black .main-header .navbar>.sidebar-toggle{color:#333;border-right:1px solid #eee}.skin-black .main-header .navbar .navbar-nav>li>a{border-right:1px solid #eee}.skin-black .main-header .navbar .navbar-custom-menu .navbar-nav>li>a,.skin-black .main-header .navbar .navbar-right>li>a{border-left:1px solid #eee;border-right-width:0}.skin-black .main-header>.logo{background-color:#fff;color:#333;border-bottom:0 solid transparent;border-right:1px solid #eee}.skin-black .main-header>.logo:hover{background-color:#fcfcfc}@media (max-width:767px){.skin-black .main-header>.logo{background-color:#222;color:#fff;border-bottom:0 solid transparent;border-right:none}.skin-black .main-header>.logo:hover{background-color:#1f1f1f}}.skin-black .main-header li.user-header{background-color:#222}.skin-black .content-header{background:transparent;box-shadow:none}.skin-black .wrapper,.skin-black .main-sidebar,.skin-black .left-side{background-color:#222d32}.skin-black .user-panel>.info,.skin-black .user-panel>.info>a{color:#fff}.skin-black .sidebar-menu>li.header{color:#4b646f;background:#1a2226}.skin-black .sidebar-menu>li>a{border-left:3px solid transparent}.skin-black .sidebar-menu>li:hover>a,.skin-black .sidebar-menu>li.active>a{color:#fff;background:#1e282c;border-left-color:#fff}.skin-black .sidebar-menu>li>.treeview-menu{margin:0 1px;background:#2c3b41}.skin-black .sidebar a{color:#b8c7ce}.skin-black .sidebar a:hover{text-decoration:none}.skin-black .treeview-menu>li>a{color:#8aa4af}.skin-black .treeview-menu>li.active>a,.skin-black .treeview-menu>li>a:hover{color:#fff}.skin-black .sidebar-form{border-radius:3px;border:1px solid #374850;margin:10px 10px}.skin-black .sidebar-form input[type="text"],.skin-black .sidebar-form .btn{box-shadow:none;background-color:#374850;border:1px solid transparent;height:35px}.skin-black .sidebar-form input[type="text"]{color:#666;border-top-left-radius:2px;border-top-right-radius:0;border-bottom-right-radius:0;border-bottom-left-radius:2px}.skin-black .sidebar-form input[type="text"]:focus,.skin-black .sidebar-form input[type="text"]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-black .sidebar-form input[type="text"]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-black .sidebar-form .btn{color:#999;border-top-left-radius:0;border-top-right-radius:2px;border-bottom-right-radius:2px;border-bottom-left-radius:0}.skin-black .pace .pace-progress{background:#222}.skin-black .pace .pace-activity{border-top-color:#222;border-left-color:#222}.skin-black-light .main-header{-webkit-box-shadow:0 1px 1px rgba(0,0,0,0.05);box-shadow:0 1px 1px rgba(0,0,0,0.05)}.skin-black-light .main-header .navbar-toggle{color:#333}.skin-black-light .main-header .navbar-brand{color:#333;border-right:1px solid #eee}.skin-black-light .main-header .navbar{background-color:#fff}.skin-black-light .main-header .navbar .nav>li>a{color:#333}.skin-black-light .main-header .navbar .nav>li>a:hover,.skin-black-light .main-header .navbar .nav>li>a:active,.skin-black-light .main-header .navbar .nav>li>a:focus,.skin-black-light .main-header .navbar .nav .open>a,.skin-black-light .main-header .navbar .nav .open>a:hover,.skin-black-light .main-header .navbar .nav .open>a:focus,.skin-black-light .main-header .navbar .nav>.active>a{background:#fff;color:#999}.skin-black-light .main-header .navbar .sidebar-toggle{color:#333}.skin-black-light .main-header .navbar .sidebar-toggle:hover{color:#999;background:#fff}.skin-black-light .main-header .navbar>.sidebar-toggle{color:#333;border-right:1px solid #eee}.skin-black-light .main-header .navbar .navbar-nav>li>a{border-right:1px solid #eee}.skin-black-light .main-header .navbar .navbar-custom-menu .navbar-nav>li>a,.skin-black-light .main-header .navbar .navbar-right>li>a{border-left:1px solid #eee;border-right-width:0}.skin-black-light .main-header>.logo{background-color:#fff;color:#333;border-bottom:0 solid transparent;border-right:1px solid #eee}.skin-black-light .main-header>.logo:hover{background-color:#fcfcfc}@media (max-width:767px){.skin-black-light .main-header>.logo{background-color:#222;color:#fff;border-bottom:0 solid transparent;border-right:none}.skin-black-light .main-header>.logo:hover{background-color:#1f1f1f}}.skin-black-light .main-header li.user-header{background-color:#222}.skin-black-light .content-header{background:transparent;box-shadow:none}.skin-black-light .wrapper,.skin-black-light .main-sidebar,.skin-black-light .left-side{background-color:#f9fafc}.skin-black-light .content-wrapper,.skin-black-light .main-footer{border-left:1px solid #d2d6de}.skin-black-light .user-panel>.info,.skin-black-light .user-panel>.info>a{color:#444}.skin-black-light .sidebar-menu>li{-webkit-transition:border-left-color .3s ease;-o-transition:border-left-color .3s ease;transition:border-left-color .3s ease}.skin-black-light .sidebar-menu>li.header{color:#848484;background:#f9fafc}.skin-black-light .sidebar-menu>li>a{border-left:3px solid transparent;font-weight:600}.skin-black-light .sidebar-menu>li:hover>a,.skin-black-light .sidebar-menu>li.active>a{color:#000;background:#f4f4f5}.skin-black-light .sidebar-menu>li.active{border-left-color:#fff}.skin-black-light .sidebar-menu>li.active>a{font-weight:600}.skin-black-light .sidebar-menu>li>.treeview-menu{background:#f4f4f5}.skin-black-light .sidebar a{color:#444}.skin-black-light .sidebar a:hover{text-decoration:none}.skin-black-light .treeview-menu>li>a{color:#777}.skin-black-light .treeview-menu>li.active>a,.skin-black-light .treeview-menu>li>a:hover{color:#000}.skin-black-light .treeview-menu>li.active>a{font-weight:600}.skin-black-light .sidebar-form{border-radius:3px;border:1px solid #d2d6de;margin:10px 10px}.skin-black-light .sidebar-form input[type="text"],.skin-black-light .sidebar-form .btn{box-shadow:none;background-color:#fff;border:1px solid transparent;height:35px}.skin-black-light .sidebar-form input[type="text"]{color:#666;border-top-left-radius:2px;border-top-right-radius:0;border-bottom-right-radius:0;border-bottom-left-radius:2px}.skin-black-light .sidebar-form input[type="text"]:focus,.skin-black-light .sidebar-form input[type="text"]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-black-light .sidebar-form input[type="text"]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-black-light .sidebar-form .btn{color:#999;border-top-left-radius:0;border-top-right-radius:2px;border-bottom-right-radius:2px;border-bottom-left-radius:0}@media (min-width:768px){.skin-black-light.sidebar-mini.sidebar-collapse .sidebar-menu>li>.treeview-menu{border-left:1px solid #d2d6de}}.skin-green .main-header .navbar{background-color:#00a65a}.skin-green .main-header .navbar .nav>li>a{color:#fff}.skin-green .main-header .navbar .nav>li>a:hover,.skin-green .main-header .navbar .nav>li>a:active,.skin-green .main-header .navbar .nav>li>a:focus,.skin-green .main-header .navbar .nav .open>a,.skin-green .main-header .navbar .nav .open>a:hover,.skin-green .main-header .navbar .nav .open>a:focus,.skin-green .main-header .navbar .nav>.active>a{background:rgba(0,0,0,0.1);color:#f6f6f6}.skin-green .main-header .navbar .sidebar-toggle{color:#fff}.skin-green .main-header .navbar .sidebar-toggle:hover{color:#f6f6f6;background:rgba(0,0,0,0.1)}.skin-green .main-header .navbar .sidebar-toggle{color:#fff}.skin-green .main-header .navbar .sidebar-toggle:hover{background-color:#008d4c}@media (max-width:767px){.skin-green .main-header .navbar .dropdown-menu li.divider{background-color:rgba(255,255,255,0.1)}.skin-green .main-header .navbar .dropdown-menu li a{color:#fff}.skin-green .main-header .navbar .dropdown-menu li a:hover{background:#008d4c}}.skin-green .main-header .logo{background-color:#008d4c;color:#fff;border-bottom:0 solid transparent}.skin-green .main-header .logo:hover{background-color:#008749}.skin-green .main-header li.user-header{background-color:#00a65a}.skin-green .content-header{background:transparent}.skin-green .wrapper,.skin-green .main-sidebar,.skin-green .left-side{background-color:#222d32}.skin-green .user-panel>.info,.skin-green .user-panel>.info>a{color:#fff}.skin-green .sidebar-menu>li.header{color:#4b646f;background:#1a2226}.skin-green .sidebar-menu>li>a{border-left:3px solid transparent}.skin-green .sidebar-menu>li:hover>a,.skin-green .sidebar-menu>li.active>a{color:#fff;background:#1e282c;border-left-color:#00a65a}.skin-green .sidebar-menu>li>.treeview-menu{margin:0 1px;background:#2c3b41}.skin-green .sidebar a{color:#b8c7ce}.skin-green .sidebar a:hover{text-decoration:none}.skin-green .treeview-menu>li>a{color:#8aa4af}.skin-green .treeview-menu>li.active>a,.skin-green .treeview-menu>li>a:hover{color:#fff}.skin-green .sidebar-form{border-radius:3px;border:1px solid #374850;margin:10px 10px}.skin-green .sidebar-form input[type="text"],.skin-green .sidebar-form .btn{box-shadow:none;background-color:#374850;border:1px solid transparent;height:35px}.skin-green .sidebar-form input[type="text"]{color:#666;border-top-left-radius:2px;border-top-right-radius:0;border-bottom-right-radius:0;border-bottom-left-radius:2px}.skin-green .sidebar-form input[type="text"]:focus,.skin-green .sidebar-form input[type="text"]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-green .sidebar-form input[type="text"]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-green .sidebar-form .btn{color:#999;border-top-left-radius:0;border-top-right-radius:2px;border-bottom-right-radius:2px;border-bottom-left-radius:0}.skin-green-light .main-header .navbar{background-color:#00a65a}.skin-green-light .main-header .navbar .nav>li>a{color:#fff}.skin-green-light .main-header .navbar .nav>li>a:hover,.skin-green-light .main-header .navbar .nav>li>a:active,.skin-green-light .main-header .navbar .nav>li>a:focus,.skin-green-light .main-header .navbar .nav .open>a,.skin-green-light .main-header .navbar .nav .open>a:hover,.skin-green-light .main-header .navbar .nav .open>a:focus,.skin-green-light .main-header .navbar .nav>.active>a{background:rgba(0,0,0,0.1);color:#f6f6f6}.skin-green-light .main-header .navbar .sidebar-toggle{color:#fff}.skin-green-light .main-header .navbar .sidebar-toggle:hover{color:#f6f6f6;background:rgba(0,0,0,0.1)}.skin-green-light .main-header .navbar .sidebar-toggle{color:#fff}.skin-green-light .main-header .navbar .sidebar-toggle:hover{background-color:#008d4c}@media (max-width:767px){.skin-green-light .main-header .navbar .dropdown-menu li.divider{background-color:rgba(255,255,255,0.1)}.skin-green-light .main-header .navbar .dropdown-menu li a{color:#fff}.skin-green-light .main-header .navbar .dropdown-menu li a:hover{background:#008d4c}}.skin-green-light .main-header .logo{background-color:#00a65a;color:#fff;border-bottom:0 solid transparent}.skin-green-light .main-header .logo:hover{background-color:#00a157}.skin-green-light .main-header li.user-header{background-color:#00a65a}.skin-green-light .content-header{background:transparent}.skin-green-light .wrapper,.skin-green-light .main-sidebar,.skin-green-light .left-side{background-color:#f9fafc}.skin-green-light .content-wrapper,.skin-green-light .main-footer{border-left:1px solid #d2d6de}.skin-green-light .user-panel>.info,.skin-green-light .user-panel>.info>a{color:#444}.skin-green-light .sidebar-menu>li{-webkit-transition:border-left-color .3s ease;-o-transition:border-left-color .3s ease;transition:border-left-color .3s ease}.skin-green-light .sidebar-menu>li.header{color:#848484;background:#f9fafc}.skin-green-light .sidebar-menu>li>a{border-left:3px solid transparent;font-weight:600}.skin-green-light .sidebar-menu>li:hover>a,.skin-green-light .sidebar-menu>li.active>a{color:#000;background:#f4f4f5}.skin-green-light .sidebar-menu>li.active{border-left-color:#00a65a}.skin-green-light .sidebar-menu>li.active>a{font-weight:600}.skin-green-light .sidebar-menu>li>.treeview-menu{background:#f4f4f5}.skin-green-light .sidebar a{color:#444}.skin-green-light .sidebar a:hover{text-decoration:none}.skin-green-light .treeview-menu>li>a{color:#777}.skin-green-light .treeview-menu>li.active>a,.skin-green-light .treeview-menu>li>a:hover{color:#000}.skin-green-light .treeview-menu>li.active>a{font-weight:600}.skin-green-light .sidebar-form{border-radius:3px;border:1px solid #d2d6de;margin:10px 10px}.skin-green-light .sidebar-form input[type="text"],.skin-green-light .sidebar-form .btn{box-shadow:none;background-color:#fff;border:1px solid transparent;height:35px}.skin-green-light .sidebar-form input[type="text"]{color:#666;border-top-left-radius:2px;border-top-right-radius:0;border-bottom-right-radius:0;border-bottom-left-radius:2px}.skin-green-light .sidebar-form input[type="text"]:focus,.skin-green-light .sidebar-form input[type="text"]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-green-light .sidebar-form input[type="text"]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-green-light .sidebar-form .btn{color:#999;border-top-left-radius:0;border-top-right-radius:2px;border-bottom-right-radius:2px;border-bottom-left-radius:0}@media (min-width:768px){.skin-green-light.sidebar-mini.sidebar-collapse .sidebar-menu>li>.treeview-menu{border-left:1px solid #d2d6de}}.skin-red .main-header .navbar{background-color:#dd4b39}.skin-red .main-header .navbar .nav>li>a{color:#fff}.skin-red .main-header .navbar .nav>li>a:hover,.skin-red .main-header .navbar .nav>li>a:active,.skin-red .main-header .navbar .nav>li>a:focus,.skin-red .main-header .navbar .nav .open>a,.skin-red .main-header .navbar .nav .open>a:hover,.skin-red .main-header .navbar .nav .open>a:focus,.skin-red .main-header .navbar .nav>.active>a{background:rgba(0,0,0,0.1);color:#f6f6f6}.skin-red .main-header .navbar .sidebar-toggle{color:#fff}.skin-red .main-header .navbar .sidebar-toggle:hover{color:#f6f6f6;background:rgba(0,0,0,0.1)}.skin-red .main-header .navbar .sidebar-toggle{color:#fff}.skin-red .main-header .navbar .sidebar-toggle:hover{background-color:#d73925}@media (max-width:767px){.skin-red .main-header .navbar .dropdown-menu li.divider{background-color:rgba(255,255,255,0.1)}.skin-red .main-header .navbar .dropdown-menu li a{color:#fff}.skin-red .main-header .navbar .dropdown-menu li a:hover{background:#d73925}}.skin-red .main-header .logo{background-color:#d73925;color:#fff;border-bottom:0 solid transparent}.skin-red .main-header .logo:hover{background-color:#d33724}.skin-red .main-header li.user-header{background-color:#dd4b39}.skin-red .content-header{background:transparent}.skin-red .wrapper,.skin-red .main-sidebar,.skin-red .left-side{background-color:#222d32}.skin-red .user-panel>.info,.skin-red .user-panel>.info>a{color:#fff}.skin-red .sidebar-menu>li.header{color:#4b646f;background:#1a2226}.skin-red .sidebar-menu>li>a{border-left:3px solid transparent}.skin-red .sidebar-menu>li:hover>a,.skin-red .sidebar-menu>li.active>a{color:#fff;background:#1e282c;border-left-color:#dd4b39}.skin-red .sidebar-menu>li>.treeview-menu{margin:0 1px;background:#2c3b41}.skin-red .sidebar a{color:#b8c7ce}.skin-red .sidebar a:hover{text-decoration:none}.skin-red .treeview-menu>li>a{color:#8aa4af}.skin-red .treeview-menu>li.active>a,.skin-red .treeview-menu>li>a:hover{color:#fff}.skin-red .sidebar-form{border-radius:3px;border:1px solid #374850;margin:10px 10px}.skin-red .sidebar-form input[type="text"],.skin-red .sidebar-form .btn{box-shadow:none;background-color:#374850;border:1px solid transparent;height:35px}.skin-red .sidebar-form input[type="text"]{color:#666;border-top-left-radius:2px;border-top-right-radius:0;border-bottom-right-radius:0;border-bottom-left-radius:2px}.skin-red .sidebar-form input[type="text"]:focus,.skin-red .sidebar-form input[type="text"]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-red .sidebar-form input[type="text"]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-red .sidebar-form .btn{color:#999;border-top-left-radius:0;border-top-right-radius:2px;border-bottom-right-radius:2px;border-bottom-left-radius:0}.skin-red-light .main-header .navbar{background-color:#dd4b39}.skin-red-light .main-header .navbar .nav>li>a{color:#fff}.skin-red-light .main-header .navbar .nav>li>a:hover,.skin-red-light .main-header .navbar .nav>li>a:active,.skin-red-light .main-header .navbar .nav>li>a:focus,.skin-red-light .main-header .navbar .nav .open>a,.skin-red-light .main-header .navbar .nav .open>a:hover,.skin-red-light .main-header .navbar .nav .open>a:focus,.skin-red-light .main-header .navbar .nav>.active>a{background:rgba(0,0,0,0.1);color:#f6f6f6}.skin-red-light .main-header .navbar .sidebar-toggle{color:#fff}.skin-red-light .main-header .navbar .sidebar-toggle:hover{color:#f6f6f6;background:rgba(0,0,0,0.1)}.skin-red-light .main-header .navbar .sidebar-toggle{color:#fff}.skin-red-light .main-header .navbar .sidebar-toggle:hover{background-color:#d73925}@media (max-width:767px){.skin-red-light .main-header .navbar .dropdown-menu li.divider{background-color:rgba(255,255,255,0.1)}.skin-red-light .main-header .navbar .dropdown-menu li a{color:#fff}.skin-red-light .main-header .navbar .dropdown-menu li a:hover{background:#d73925}}.skin-red-light .main-header .logo{background-color:#dd4b39;color:#fff;border-bottom:0 solid transparent}.skin-red-light .main-header .logo:hover{background-color:#dc4735}.skin-red-light .main-header li.user-header{background-color:#dd4b39}.skin-red-light .content-header{background:transparent}.skin-red-light .wrapper,.skin-red-light .main-sidebar,.skin-red-light .left-side{background-color:#f9fafc}.skin-red-light .content-wrapper,.skin-red-light .main-footer{border-left:1px solid #d2d6de}.skin-red-light .user-panel>.info,.skin-red-light .user-panel>.info>a{color:#444}.skin-red-light .sidebar-menu>li{-webkit-transition:border-left-color .3s ease;-o-transition:border-left-color .3s ease;transition:border-left-color .3s ease}.skin-red-light .sidebar-menu>li.header{color:#848484;background:#f9fafc}.skin-red-light .sidebar-menu>li>a{border-left:3px solid transparent;font-weight:600}.skin-red-light .sidebar-menu>li:hover>a,.skin-red-light .sidebar-menu>li.active>a{color:#000;background:#f4f4f5}.skin-red-light .sidebar-menu>li.active{border-left-color:#dd4b39}.skin-red-light .sidebar-menu>li.active>a{font-weight:600}.skin-red-light .sidebar-menu>li>.treeview-menu{background:#f4f4f5}.skin-red-light .sidebar a{color:#444}.skin-red-light .sidebar a:hover{text-decoration:none}.skin-red-light .treeview-menu>li>a{color:#777}.skin-red-light .treeview-menu>li.active>a,.skin-red-light .treeview-menu>li>a:hover{color:#000}.skin-red-light .treeview-menu>li.active>a{font-weight:600}.skin-red-light .sidebar-form{border-radius:3px;border:1px solid #d2d6de;margin:10px 10px}.skin-red-light .sidebar-form input[type="text"],.skin-red-light .sidebar-form .btn{box-shadow:none;background-color:#fff;border:1px solid transparent;height:35px}.skin-red-light .sidebar-form input[type="text"]{color:#666;border-top-left-radius:2px;border-top-right-radius:0;border-bottom-right-radius:0;border-bottom-left-radius:2px}.skin-red-light .sidebar-form input[type="text"]:focus,.skin-red-light .sidebar-form input[type="text"]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-red-light .sidebar-form input[type="text"]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-red-light .sidebar-form .btn{color:#999;border-top-left-radius:0;border-top-right-radius:2px;border-bottom-right-radius:2px;border-bottom-left-radius:0}@media (min-width:768px){.skin-red-light.sidebar-mini.sidebar-collapse .sidebar-menu>li>.treeview-menu{border-left:1px solid #d2d6de}}.skin-yellow .main-header .navbar{background-color:#f39c12}.skin-yellow .main-header .navbar .nav>li>a{color:#fff}.skin-yellow .main-header .navbar .nav>li>a:hover,.skin-yellow .main-header .navbar .nav>li>a:active,.skin-yellow .main-header .navbar .nav>li>a:focus,.skin-yellow .main-header .navbar .nav .open>a,.skin-yellow .main-header .navbar .nav .open>a:hover,.skin-yellow .main-header .navbar .nav .open>a:focus,.skin-yellow .main-header .navbar .nav>.active>a{background:rgba(0,0,0,0.1);color:#f6f6f6}.skin-yellow .main-header .navbar .sidebar-toggle{color:#fff}.skin-yellow .main-header .navbar .sidebar-toggle:hover{color:#f6f6f6;background:rgba(0,0,0,0.1)}.skin-yellow .main-header .navbar .sidebar-toggle{color:#fff}.skin-yellow .main-header .navbar .sidebar-toggle:hover{background-color:#e08e0b}@media (max-width:767px){.skin-yellow .main-header .navbar .dropdown-menu li.divider{background-color:rgba(255,255,255,0.1)}.skin-yellow .main-header .navbar .dropdown-menu li a{color:#fff}.skin-yellow .main-header .navbar .dropdown-menu li a:hover{background:#e08e0b}}.skin-yellow .main-header .logo{background-color:#e08e0b;color:#fff;border-bottom:0 solid transparent}.skin-yellow .main-header .logo:hover{background-color:#db8b0b}.skin-yellow .main-header li.user-header{background-color:#f39c12}.skin-yellow .content-header{background:transparent}.skin-yellow .wrapper,.skin-yellow .main-sidebar,.skin-yellow .left-side{background-color:#222d32}.skin-yellow .user-panel>.info,.skin-yellow .user-panel>.info>a{color:#fff}.skin-yellow .sidebar-menu>li.header{color:#4b646f;background:#1a2226}.skin-yellow .sidebar-menu>li>a{border-left:3px solid transparent}.skin-yellow .sidebar-menu>li:hover>a,.skin-yellow .sidebar-menu>li.active>a{color:#fff;background:#1e282c;border-left-color:#f39c12}.skin-yellow .sidebar-menu>li>.treeview-menu{margin:0 1px;background:#2c3b41}.skin-yellow .sidebar a{color:#b8c7ce}.skin-yellow .sidebar a:hover{text-decoration:none}.skin-yellow .treeview-menu>li>a{color:#8aa4af}.skin-yellow .treeview-menu>li.active>a,.skin-yellow .treeview-menu>li>a:hover{color:#fff}.skin-yellow .sidebar-form{border-radius:3px;border:1px solid #374850;margin:10px 10px}.skin-yellow .sidebar-form input[type="text"],.skin-yellow .sidebar-form .btn{box-shadow:none;background-color:#374850;border:1px solid transparent;height:35px}.skin-yellow .sidebar-form input[type="text"]{color:#666;border-top-left-radius:2px;border-top-right-radius:0;border-bottom-right-radius:0;border-bottom-left-radius:2px}.skin-yellow .sidebar-form input[type="text"]:focus,.skin-yellow .sidebar-form input[type="text"]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-yellow .sidebar-form input[type="text"]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-yellow .sidebar-form .btn{color:#999;border-top-left-radius:0;border-top-right-radius:2px;border-bottom-right-radius:2px;border-bottom-left-radius:0}.skin-yellow-light .main-header .navbar{background-color:#f39c12}.skin-yellow-light .main-header .navbar .nav>li>a{color:#fff}.skin-yellow-light .main-header .navbar .nav>li>a:hover,.skin-yellow-light .main-header .navbar .nav>li>a:active,.skin-yellow-light .main-header .navbar .nav>li>a:focus,.skin-yellow-light .main-header .navbar .nav .open>a,.skin-yellow-light .main-header .navbar .nav .open>a:hover,.skin-yellow-light .main-header .navbar .nav .open>a:focus,.skin-yellow-light .main-header .navbar .nav>.active>a{background:rgba(0,0,0,0.1);color:#f6f6f6}.skin-yellow-light .main-header .navbar .sidebar-toggle{color:#fff}.skin-yellow-light .main-header .navbar .sidebar-toggle:hover{color:#f6f6f6;background:rgba(0,0,0,0.1)}.skin-yellow-light .main-header .navbar .sidebar-toggle{color:#fff}.skin-yellow-light .main-header .navbar .sidebar-toggle:hover{background-color:#e08e0b}@media (max-width:767px){.skin-yellow-light .main-header .navbar .dropdown-menu li.divider{background-color:rgba(255,255,255,0.1)}.skin-yellow-light .main-header .navbar .dropdown-menu li a{color:#fff}.skin-yellow-light .main-header .navbar .dropdown-menu li a:hover{background:#e08e0b}}.skin-yellow-light .main-header .logo{background-color:#f39c12;color:#fff;border-bottom:0 solid transparent}.skin-yellow-light .main-header .logo:hover{background-color:#f39a0d}.skin-yellow-light .main-header li.user-header{background-color:#f39c12}.skin-yellow-light .content-header{background:transparent}.skin-yellow-light .wrapper,.skin-yellow-light .main-sidebar,.skin-yellow-light .left-side{background-color:#f9fafc}.skin-yellow-light .content-wrapper,.skin-yellow-light .main-footer{border-left:1px solid #d2d6de}.skin-yellow-light .user-panel>.info,.skin-yellow-light .user-panel>.info>a{color:#444}.skin-yellow-light .sidebar-menu>li{-webkit-transition:border-left-color .3s ease;-o-transition:border-left-color .3s ease;transition:border-left-color .3s ease}.skin-yellow-light .sidebar-menu>li.header{color:#848484;background:#f9fafc}.skin-yellow-light .sidebar-menu>li>a{border-left:3px solid transparent;font-weight:600}.skin-yellow-light .sidebar-menu>li:hover>a,.skin-yellow-light .sidebar-menu>li.active>a{color:#000;background:#f4f4f5}.skin-yellow-light .sidebar-menu>li.active{border-left-color:#f39c12}.skin-yellow-light .sidebar-menu>li.active>a{font-weight:600}.skin-yellow-light .sidebar-menu>li>.treeview-menu{background:#f4f4f5}.skin-yellow-light .sidebar a{color:#444}.skin-yellow-light .sidebar a:hover{text-decoration:none}.skin-yellow-light .treeview-menu>li>a{color:#777}.skin-yellow-light .treeview-menu>li.active>a,.skin-yellow-light .treeview-menu>li>a:hover{color:#000}.skin-yellow-light .treeview-menu>li.active>a{font-weight:600}.skin-yellow-light .sidebar-form{border-radius:3px;border:1px solid #d2d6de;margin:10px 10px}.skin-yellow-light .sidebar-form input[type="text"],.skin-yellow-light .sidebar-form .btn{box-shadow:none;background-color:#fff;border:1px solid transparent;height:35px}.skin-yellow-light .sidebar-form input[type="text"]{color:#666;border-top-left-radius:2px;border-top-right-radius:0;border-bottom-right-radius:0;border-bottom-left-radius:2px}.skin-yellow-light .sidebar-form input[type="text"]:focus,.skin-yellow-light .sidebar-form input[type="text"]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-yellow-light .sidebar-form input[type="text"]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-yellow-light .sidebar-form .btn{color:#999;border-top-left-radius:0;border-top-right-radius:2px;border-bottom-right-radius:2px;border-bottom-left-radius:0}@media (min-width:768px){.skin-yellow-light.sidebar-mini.sidebar-collapse .sidebar-menu>li>.treeview-menu{border-left:1px solid #d2d6de}}.skin-purple .main-header .navbar{background-color:#605ca8}.skin-purple .main-header .navbar .nav>li>a{color:#fff}.skin-purple .main-header .navbar .nav>li>a:hover,.skin-purple .main-header .navbar .nav>li>a:active,.skin-purple .main-header .navbar .nav>li>a:focus,.skin-purple .main-header .navbar .nav .open>a,.skin-purple .main-header .navbar .nav .open>a:hover,.skin-purple .main-header .navbar .nav .open>a:focus,.skin-purple .main-header .navbar .nav>.active>a{background:rgba(0,0,0,0.1);color:#f6f6f6}.skin-purple .main-header .navbar .sidebar-toggle{color:#fff}.skin-purple .main-header .navbar .sidebar-toggle:hover{color:#f6f6f6;background:rgba(0,0,0,0.1)}.skin-purple .main-header .navbar .sidebar-toggle{color:#fff}.skin-purple .main-header .navbar .sidebar-toggle:hover{background-color:#555299}@media (max-width:767px){.skin-purple .main-header .navbar .dropdown-menu li.divider{background-color:rgba(255,255,255,0.1)}.skin-purple .main-header .navbar .dropdown-menu li a{color:#fff}.skin-purple .main-header .navbar .dropdown-menu li a:hover{background:#555299}}.skin-purple .main-header .logo{background-color:#555299;color:#fff;border-bottom:0 solid transparent}.skin-purple .main-header .logo:hover{background-color:#545096}.skin-purple .main-header li.user-header{background-color:#605ca8}.skin-purple .content-header{background:transparent}.skin-purple .wrapper,.skin-purple .main-sidebar,.skin-purple .left-side{background-color:#222d32}.skin-purple .user-panel>.info,.skin-purple .user-panel>.info>a{color:#fff}.skin-purple .sidebar-menu>li.header{color:#4b646f;background:#1a2226}.skin-purple .sidebar-menu>li>a{border-left:3px solid transparent}.skin-purple .sidebar-menu>li:hover>a,.skin-purple .sidebar-menu>li.active>a{color:#fff;background:#1e282c;border-left-color:#605ca8}.skin-purple .sidebar-menu>li>.treeview-menu{margin:0 1px;background:#2c3b41}.skin-purple .sidebar a{color:#b8c7ce}.skin-purple .sidebar a:hover{text-decoration:none}.skin-purple .treeview-menu>li>a{color:#8aa4af}.skin-purple .treeview-menu>li.active>a,.skin-purple .treeview-menu>li>a:hover{color:#fff}.skin-purple .sidebar-form{border-radius:3px;border:1px solid #374850;margin:10px 10px}.skin-purple .sidebar-form input[type="text"],.skin-purple .sidebar-form .btn{box-shadow:none;background-color:#374850;border:1px solid transparent;height:35px}.skin-purple .sidebar-form input[type="text"]{color:#666;border-top-left-radius:2px;border-top-right-radius:0;border-bottom-right-radius:0;border-bottom-left-radius:2px}.skin-purple .sidebar-form input[type="text"]:focus,.skin-purple .sidebar-form input[type="text"]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-purple .sidebar-form input[type="text"]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-purple .sidebar-form .btn{color:#999;border-top-left-radius:0;border-top-right-radius:2px;border-bottom-right-radius:2px;border-bottom-left-radius:0}.skin-purple-light .main-header .navbar{background-color:#605ca8}.skin-purple-light .main-header .navbar .nav>li>a{color:#fff}.skin-purple-light .main-header .navbar .nav>li>a:hover,.skin-purple-light .main-header .navbar .nav>li>a:active,.skin-purple-light .main-header .navbar .nav>li>a:focus,.skin-purple-light .main-header .navbar .nav .open>a,.skin-purple-light .main-header .navbar .nav .open>a:hover,.skin-purple-light .main-header .navbar .nav .open>a:focus,.skin-purple-light .main-header .navbar .nav>.active>a{background:rgba(0,0,0,0.1);color:#f6f6f6}.skin-purple-light .main-header .navbar .sidebar-toggle{color:#fff}.skin-purple-light .main-header .navbar .sidebar-toggle:hover{color:#f6f6f6;background:rgba(0,0,0,0.1)}.skin-purple-light .main-header .navbar .sidebar-toggle{color:#fff}.skin-purple-light .main-header .navbar .sidebar-toggle:hover{background-color:#555299}@media (max-width:767px){.skin-purple-light .main-header .navbar .dropdown-menu li.divider{background-color:rgba(255,255,255,0.1)}.skin-purple-light .main-header .navbar .dropdown-menu li a{color:#fff}.skin-purple-light .main-header .navbar .dropdown-menu li a:hover{background:#555299}}.skin-purple-light .main-header .logo{background-color:#605ca8;color:#fff;border-bottom:0 solid transparent}.skin-purple-light .main-header .logo:hover{background-color:#5d59a6}.skin-purple-light .main-header li.user-header{background-color:#605ca8}.skin-purple-light .content-header{background:transparent}.skin-purple-light .wrapper,.skin-purple-light .main-sidebar,.skin-purple-light .left-side{background-color:#f9fafc}.skin-purple-light .content-wrapper,.skin-purple-light .main-footer{border-left:1px solid #d2d6de}.skin-purple-light .user-panel>.info,.skin-purple-light .user-panel>.info>a{color:#444}.skin-purple-light .sidebar-menu>li{-webkit-transition:border-left-color .3s ease;-o-transition:border-left-color .3s ease;transition:border-left-color .3s ease}.skin-purple-light .sidebar-menu>li.header{color:#848484;background:#f9fafc}.skin-purple-light .sidebar-menu>li>a{border-left:3px solid transparent;font-weight:600}.skin-purple-light .sidebar-menu>li:hover>a,.skin-purple-light .sidebar-menu>li.active>a{color:#000;background:#f4f4f5}.skin-purple-light .sidebar-menu>li.active{border-left-color:#605ca8}.skin-purple-light .sidebar-menu>li.active>a{font-weight:600}.skin-purple-light .sidebar-menu>li>.treeview-menu{background:#f4f4f5}.skin-purple-light .sidebar a{color:#444}.skin-purple-light .sidebar a:hover{text-decoration:none}.skin-purple-light .treeview-menu>li>a{color:#777}.skin-purple-light .treeview-menu>li.active>a,.skin-purple-light .treeview-menu>li>a:hover{color:#000}.skin-purple-light .treeview-menu>li.active>a{font-weight:600}.skin-purple-light .sidebar-form{border-radius:3px;border:1px solid #d2d6de;margin:10px 10px}.skin-purple-light .sidebar-form input[type="text"],.skin-purple-light .sidebar-form .btn{box-shadow:none;background-color:#fff;border:1px solid transparent;height:35px}.skin-purple-light .sidebar-form input[type="text"]{color:#666;border-top-left-radius:2px;border-top-right-radius:0;border-bottom-right-radius:0;border-bottom-left-radius:2px}.skin-purple-light .sidebar-form input[type="text"]:focus,.skin-purple-light .sidebar-form input[type="text"]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-purple-light .sidebar-form input[type="text"]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-purple-light .sidebar-form .btn{color:#999;border-top-left-radius:0;border-top-right-radius:2px;border-bottom-right-radius:2px;border-bottom-left-radius:0}@media (min-width:768px){.skin-purple-light.sidebar-mini.sidebar-collapse .sidebar-menu>li>.treeview-menu{border-left:1px solid #d2d6de}}
\ No newline at end of file
diff --git a/hesk_style_RTL.css b/hesk_style_RTL.css
deleted file mode 100644
index 8a390bdd..00000000
--- a/hesk_style_RTL.css
+++ /dev/null
@@ -1,758 +0,0 @@
-body {
-	background-color: #f3fef4;
-	color: black;
-	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	margin-right:0;
-	margin-left:0;
-	margin-top:0;
-	margin-bottom:0;
-}
-
-table.enclosing {
-	background-color:#FFFFFF;
-	color : #4a5571;
-	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	width: 960px;
-}
-
-
-td {
-	color : #4a5571;
-	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	text-align: right;
-}
-
-a img {
-	vertical-align: bottom;
-	border : none;
-}
-
-td.white {
-	background-color: #FFFFFF;
-	color : #4a5571;
-	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size: 12px;	
-}
-
-td.admin_white {
-	background-color: #FFFFFF;
-	color : #4a5571;
-	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	border: #d1dceb 1px solid;
-	padding: 1px;	
-}
-
-td.admin_gray {
-	background-color: #f5fffa;
-	color : #4a5571;
-	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	border: #d1dceb 1px solid;
-	padding: 1px;
-}
-
-td.notes {
-	background-color: #fffbf2;
-	color : #4a5571;
-	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	border: #ffe6b8 1px solid;
-}
-
-th.tDetailsHead {
-	background-color: #F7F7F7;
-	color : #4a5571;
-	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	font-weight: normal;
-	text-align: center;
-}
-
-td.tDetailsBody {
-	background-color: #FFFFFF;
-	color : #4a5571;
-	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	border: #F7F7F7 1px solid;
-	text-align: center;
-}
-
-.small {
-	font-size: 11px;
-}
-
-.smaller {
-	font-size: 10px;
-}
-
-a {
-	color : Blue;
-	text-decoration : underline;
-}
-
-a:hover {
-	color : Red;
-	text-decoration : none;
-}
-
-table.white {
-	background-color: #ffffff ;
-	color : #23559C;
-	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	border-collapse: collapse;
-}
-
-table.white th {
-	background-color: #ffffff;
-	color : #23559C;
-	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	border: #b2babd 1px solid;
-	border-collapse: collapse;
-	background-image: url(img/tableheader.jpg);
-	background-repeat: no-repeat;
-	background-position: right top;
-}
-
-table.white th a {
-	color : #23559C;
-	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size: 11px;
-}
-
-table.white td {
-	height: 25px;
-	padding-right: 5px;
-}
-
-.noborder {
-border: none;
-}
-
-h3 {
-	color : #74804e;
-	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size: 13px;
-	font-weight: bold;
-	margin: 0px;
-}
-
-.important {
-	color: Red;
-}
-
-.medium {
-	color: #FF9900;
-}
-
-input {
-	font-size: 12px;
-	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
-	color:#000000;
-}
-
-input.button {
-	font-size: 12px;
-	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
-	color:#000000;
-	background-color:#FFFFFF;
-}
-
-select {
-	font-size: 12px;
-	height: 20px;
-}
-
-header a img {border: none; text-decoration: none !important;} 
-
-.open {color : #FF0000;}
-.waitingreply {color : #FF9933;}
-.replied {color : #0000FF;}
-.resolved {color : #008000;}
-.allbutresolved {color : #000000;}
-
-.success {color : #008000;}
-.error {color : #FF0000;}
-.notice {color : #FF9900}
-
-#ok {
-	border: 1px solid #679800;
-}
-
-#error {
-	border: 1px solid #ba3225;
-}
-
-.rate {
-	color: #666666;
-	text-align: left;
-	font-style: italic; 
-}
-
-a.article {
-	color : Black;
-	text-decoration: none;
-	font-size: 11px;
-}
-
-a.article:hover {
-	color : Red;
-	text-decoration : none;
-}
-
-.article_list {
-	font-size: 11px;	
-}
-
-fieldset {
-	margin-bottom: 6px; 
-	border: 1px SOLID #267DDC;
-	padding: 4px;
-	background-color:white;
-	position:relative;
-	display:block;
-	padding: 15px 10px 10px 10px;
-	margin:20px 0px 20px 0px;
-}
-
-legend {
-	background-image: url(img/bluebtn.png);
-	background-repeat: no-repeat;
-	color: #172901;
-	border: 1px solid #267DDC;
-	height: 10px;
-	font-size: 10px;
-	font-weight:bold;
-	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	background-position: right top;
-	display:block;
-	width: auto;
-	padding:5px 5px;
-	position:relative;
-	width:130px;	
-}
-
-/*newly introduced styles (version 2.0)*/
-
-.header {
-	width: 100%;
-	background-color: #74a62b;
-	color : #ffffff;
-	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	text-align: center;
-	background-image: url(img/header.png);
-	background-repeat: repeat-x;
-	height: 57px;
-	padding: 0px;
-	margin: 0px;
-}
-
-.header td {
-text-align: center;
-vertical-align: middle;
-color:#FFFFFF;
-}
-.header a, .header a:link, .header a:active, .header a:visited {
-	color : #ffffff;
-	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	text-align: center;
-}
-.header a:hover {}
-
-.headersm {
-	width: 100%;
-	background-color: #669933;
-	color : #ffffff;
-	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	text-align: right;
-	background-image: url(img/headerbgsm.jpg);
-	background-repeat: repeat-x;
-	height: 25px;
-	padding: 0px;
-	margin: 0px;
-	font-weight:bold;
-	padding-right: 20px;
-}
-
-hr {
-	border: none;
-	border-bottom: 1px dotted #adbac3;
-	width: 100%;
-	padding-top: 10px;
-	margin-bottom: 10px;
-	height: 1px;
-}
-
-.greenbutton {
-	background-image: url(img/greenbtn.jpg);
-	background-repeat: no-repeat;
-	text-align: center;
-	color: #FFFFFF;
-	border: 1px solid #527234;
-	font-size: 10px;
-	font-weight:bold;
-	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	background-position: right top;
-	height: 19px;
-	padding-right: 6px;
-	padding-left: 6px;
-	margin-right: 2px;
-	margin-left: 2px
-}
-
-.greenbuttonover {
-	background-image: url(img/greenbtnover.gif);
-	background-repeat: no-repeat;
-	text-align: center;
-	color: #FFFFFF;
-	border: 1px solid #527234;
-	font-size: 10px;
-	font-weight:bold;
-	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	background-position: right top;
-	height: 19px;
-	padding-right: 6px;
-	padding-left: 6px;
-	margin-right: 2px;
-	margin-left: 2px
-}
-
-.orangebutton {
-	background-image: url(img/orangebtn.jpg);
-	background-repeat: no-repeat;
-	text-align: center;
-	color: #660000;
-	border: 1px solid #bf6628;
-	height: 20px;
-	font-size: 10px;
-	font-weight:bold;
-	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	background-position: right top;
-	padding-right: 6px;
-	padding-left: 6px;
-	margin-right: 2px;
-	margin-left: 2px;
-	text-decoration: none;
-	margin-top: 0px;	
-}
-
-.orangebuttonover {
-	background-image: url(img/orangebtnover.gif);
-	background-repeat: no-repeat;
-	text-align: center;
-	color: #660000;
-	border: 1px solid #bf6628;
-	height: 20px;
-	font-size: 10px;
-	font-weight:bold;
-	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	background-position: right top;
-	padding-right: 6px;
-	padding-left: 6px;
-	margin-right: 2px;
-	margin-left: 2px;
-	text-decoration: none;
-	margin-top: 0px;		
-}
-
-.bluebutton {
-	background-image: url(img/bluebtn.png);
-	background-repeat: no-repeat;
-	text-align: center;
-	color: #660000;
-	border: 1px solid #5b79a3;
-	height: 20px;
-	font-size: 10px;
-	font-weight:bold;
-	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	background-position: right top;
-	padding-right: 6px;
-	padding-left: 6px;
-	margin-right: 2px;
-	text-decoration: none;
-	margin-left: 2px;
-	padding-top: 2px;
-}
-
-
-/*styles for roundcorners tables*/
-
-.roundcornersleft {
-	width: 7px;
-	background-image: url(img/roundcornerslm.jpg);
-	background-repeat: repeat-y;
-	background-position: right;
-}
-.roundcornersright {
-	width: 7px;
-	background-image: url(img/roundcornersrm.jpg);
-	background-repeat: repeat-y;
-	background-position: left;
-}
-.roundcornerstop {
-	height: 7px;
-	background-image: url(img/roundcornerst.jpg);
-	background-repeat: repeat-x;
-	background-position: top;
-}
-.roundcornersbottom {
-	height: 7px;
-	background-image: url(img/roundcornersb.jpg);
-	background-repeat: repeat-x;
-	background-position: bottom;
-}
-.ticketrow {
-	background-color: #f5fffa;
-	color : #4a5571;
-	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	border: #748aaf 1px dotted;
-	padding: 6px;
-}
-.ticketalt {
-	background-color: #ffffff;
-	color : #4a5571;
-	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	padding: 6px;
-}
-
-.tickettd {
-	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size: 12px;	
-}
-
-.subheaderrow {
-	background-color: #ffffff;
-	color : #23559C;
-	border: #23559C solid 1px;
-	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	border-collapse: collapse;
-	background-image: url(img/tableheader.jpg);
-	background-repeat: no-repeat;
-	background-position: right top;
-	height: 25px;
-	padding-right: 20px;
-	padding-left: 20px;
-	padding-top: 5px;
-	}
-	
-.homepageh3, .section {
-	color: #74804e;
-	font-weight: bold;
-}
-
-/*newly introduced styles (version 2.2)*/	
-
-.large {
-	font-size:14px;
-}
-
-.largebold {
-	font-size:14px;
-	font-weight:bold;
-}
-
-.assignedyou {
-	color: red;
-}
-
-.assignedother {
-	color: green;
-}
-
-div.error {
-	border: 1px solid #cd0a0a; 
-	background: #fef1ec; 
-	color: #cd0a0a;
-	padding: 10px;
-}
-
-div.success {
-	border: 1px solid #18760f; 
-	background: #e9ffdb; 
-	color: #363636;
-	padding: 10px;
-}
-
-div.notice {
-	border: 1px solid #fcefa1; 
-	background: #fff9de;
-	color: #363636;
-	padding: 10px;
-	vertical-align: middle;
-}
-
-.admin_green {
-	background-color: #e3ffd0;
-	font-weight: bold;
-}
-
-.admin_red {
-	background-color: #fef1ec;
-	font-weight: bold;
-}
-
-.borderBottom {
-	border-bottom: silver 1px dashed;
-}
-
-.borderTop {
-	border-top: silver 1px dashed;
-}
-
-.alignTop {
-	vertical-align: top;
-}
-
-.alignMiddle {
-	vertical-align: middle;
-}
-
-.alignBottom {
-	vertical-align: bottom;
-}
-
-hr.dashed  {
-	border: none 0; 
-	border-top: 1px dashed silver;
-	height: 1px;
-}
-
-/* newly introduced styles (version 2.3) */	
-
-h1 {
-	color : #74804e;
-	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size: 13px;
-	font-weight: bold;
-	margin: 0px;
-}
-
-.critical {
-	color: #9400d3;
-	font-weight: bold;
-} 
-
-td.admin_critical {
-	background-color: #fff0ff;
-	color : #000000;
-	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	border: 1px solid #ff66ff;
-	padding: 1px;
-}
-
-.isError {
-	color: black;
-	background-color: #fff9f7;
-	border: 1px solid red;
-}
-
-.isNotice {
-	color: black;
-	border: 1px solid orange; 
-	background: #fbf9ee;
-}
-	
-.optionWhiteON{
-	padding:2px;
-	border:1px dotted silver;
-	background-color: #b0e0e6;	
-}
-
-.optionWhiteOFF {
-	padding:2px;
-	border:1px dotted silver;
-	background-color: white;
-}
-
-.optionBlueON {
-	padding:2px;
-	border:1px dotted gray;
-	background-color: #b0e0e6;	
-}
-
-.optionBlueOFF {
-	padding:2px;
-	border:1px dotted gray;
-	background-color: #f5fffa;
-}
-
-.optionWhiteNbON{
-	border: none; 
-	background-color: #b0e0e6;
-	vertical-align: text-bottom;
-}
-
-.optionWhiteNbOFF {
-	border: none;
-	background-color: white;
-	vertical-align: text-bottom;
-}
-
-.kbCatListON {
-	background-color: #fcefa1;
-}
-
-.kbCatListOFF {
-	background-color: white;	
-}
-
-div.progress-container {
-	border: 1px solid #ccc;
-	width: 100px;
-	margin: 2px 0 2px 5px;
-	padding: 1px;
-	float: right;
-	background: white;
-}
-
-div.progress-container > div {
-	background-color: #ACE97C;
-	height: 12px
-}
-
-.black {color: black;}
-.inprogress {color : #006400;}
-.onhold {color : #000000;}
-
-div.online {
-	border: 1px solid #e5e8ff; 
-	background: #ffffff; 
-	color: #000000;
-	padding: 0px;
-	vertical-align: middle;
-}
-
-span.online {
-	font-size: 10px;
-	white-space:nowrap;
-}
-
-/* newly introduced styles (version 2.4) */	
-
-.orangebuttonsec {
-	background-image: url(img/orangebtnsec.jpg);
-	background-repeat: no-repeat;
-	text-align: center;
-	color: #660000;
-	border: 1px solid #bf6628;
-	height: 20px;
-	font-size: 10px;
-	font-weight:normal;
-	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	background-position: right top;
-	padding-right: 6px;
-	padding-left: 6px;
-	margin-right: 2px;
-	margin-left: 2px;
-	text-decoration: none;
-	margin-top: 0px;	
-}
-
-.orangebuttonsecover {
-	background-image: url(img/orangebtnover.gif);
-	background-repeat: no-repeat;
-	text-align: center;
-	color: #660000;
-	border: 1px solid #bf6628;
-	height: 20px;
-	font-size: 10px;
-	font-weight:normal;
-	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	background-position: right top;
-	padding-right: 6px;
-	padding-left: 6px;
-	margin-right: 2px;
-	margin-left: 2px;
-	text-decoration: none;
-	margin-top: 0px;		
-}
-
-td.admin_yellow {
-	background-color: #ffffe0;
-	color : #4a5571;
-	font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	border: #d1dceb 1px solid;
-	padding: 1px;	
-}
-
-/* New styles in HESK version 2.6 */
-
-div.info {
-	border: 1px solid #9acfea; 
-	background: #d9edf7; 
-	color: #363636;
-	padding: 10px;
-	vertical-align: middle;
-}
-
-div.none {
-	color: #363636;
-	padding: 10px;
-	vertical-align: middle;
-}
-
-/* New styles in HESK version 2.5 */
-
-.kb_published {
-	color: #009900;
-}
-
-.kb_private {
-	color: #4a5571;
-}
-
-.kb_draft {
-	color: #cc9933;
-}
-
-.searchbutton {
-	cursor:pointer;
-	width:70px;
-	height:27px;
-	text-indent:-999px;
-	text-transform: capitalize;
-	color: transparent;
-	background: url(img/ico-search.png) no-repeat #4d90fe center;
-	border: 1px solid #3079ED;
-	-moz-border-radius: 2px;
-	-webkit-border-radius: 2px;	
-}
-
-.searchbutton:hover {
-	background: url(img/ico-search.png) no-repeat center #357AE8;
-	border: 1px solid #2F5BB7;
-}
-
-.searchfield {
-	width:400px;
-	height:21px;
-	font-size:14px;
-	text-indent:2px; 
-	vertical-align: bottom;
-}
-
-.sbsmall {
-	width:50px; 
-	height:22px; 
-	margin-top:2px;
-}
-
-.sfsmall {
-	width:200px; 
-	height:16px; 
-	font-size:12px; 
-	margin-top:2px;
-}
\ No newline at end of file
diff --git a/inc/headerAdmin.inc.php b/inc/headerAdmin.inc.php
index 5dba6b02..55941c3d 100644
--- a/inc/headerAdmin.inc.php
+++ b/inc/headerAdmin.inc.php
@@ -41,7 +41,6 @@ $modsForHesk_settings = mfh_getSettings();
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/bootstrap-clockpicker.min.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/bootstrap-colorpicker.min.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/AdminLTE.min.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
-    <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/skins/_all-skins.min.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/toastr.min.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/magnific-popup.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/mods-for-hesk-new.css?v=<?php echo MODS_FOR_HESK_BUILD; ?>">
diff --git a/install/install_functions.inc.php b/install/install_functions.inc.php
index e927d649..864e6dc8 100644
--- a/install/install_functions.inc.php
+++ b/install/install_functions.inc.php
@@ -16,7 +16,7 @@ if (!defined('IN_SCRIPT')) {die('Invalid attempt');}
 
 // We will be installing this HESK version:
 define('HESK_NEW_VERSION','2.7.3');
-define('MODS_FOR_HESK_NEW_VERSION','3.0.7');
+define('MODS_FOR_HESK_NEW_VERSION','3.1.0');
 define('REQUIRE_PHP_VERSION','5.3.0');
 define('REQUIRE_MYSQL_VERSION','5.0.7');
 
diff --git a/install/mods-for-hesk/ajax/install-database-ajax.php b/install/mods-for-hesk/ajax/install-database-ajax.php
index e0d13e82..e28169ec 100644
--- a/install/mods-for-hesk/ajax/install-database-ajax.php
+++ b/install/mods-for-hesk/ajax/install-database-ajax.php
@@ -88,6 +88,8 @@ if ($version == 2) {
     execute306Scripts();
 } elseif ($version == 41) {
     execute307Scripts();
+} elseif ($version == 42) {
+    execute310Scripts();
 } else {
     $response = 'The version "' . $version . '" was not recognized. Check the value submitted and try again.';
     print $response;
diff --git a/install/mods-for-hesk/installModsForHesk.php b/install/mods-for-hesk/installModsForHesk.php
index d5c3a827..cc89aaf4 100644
--- a/install/mods-for-hesk/installModsForHesk.php
+++ b/install/mods-for-hesk/installModsForHesk.php
@@ -50,6 +50,7 @@ $buildToVersionMap = array(
     39 => '3.0.5',
     40 => '3.0.6',
     41 => '3.0.7',
+    42 => '3.1.0',
 );
 
 function echoInitialVersionRows($version, $build_to_version_map)
diff --git a/install/mods-for-hesk/js/version-scripts.js b/install/mods-for-hesk/js/version-scripts.js
index 5efbc3f0..68a83e12 100644
--- a/install/mods-for-hesk/js/version-scripts.js
+++ b/install/mods-for-hesk/js/version-scripts.js
@@ -119,6 +119,9 @@ function processUpdates(startingVersion) {
     } else if (startingVersion < 41) {
         startVersionUpgrade('307');
         executeUpdate(41, '307', '3.0.7');
+    } else if (startingVersion < 42) {
+        startVersionUpgrade('310');
+        executeUpdate(42, '310', '3.1.0');
     } else {
         installationFinished();
     }
diff --git a/install/mods-for-hesk/modsForHesk.php b/install/mods-for-hesk/modsForHesk.php
index 0b6756f5..386a53ff 100644
--- a/install/mods-for-hesk/modsForHesk.php
+++ b/install/mods-for-hesk/modsForHesk.php
@@ -118,6 +118,7 @@ hesk_dbConnect();
                                         <select name="current-version" class="form-control">
                                             <option disabled>Select One, or "No Previous Installation" Below</option>
                                             <optgroup label="Mods for HESK 3">
+                                                <option value="41">3.0.7</option>
                                                 <option value="40">3.0.6</option>
                                                 <option value="39">3.0.5</option>
                                                 <option value="38">3.0.4</option>

From f9b09fbde6d57cbbeaa1a6dd91d7a6a1f7c0a179 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Mon, 19 Jun 2017 20:47:00 -0400
Subject: [PATCH 183/192] Only get custom nav elements if not in maint mode and
 the table exists

---
 inc/header.inc.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/inc/header.inc.php b/inc/header.inc.php
index 8482791b..0ffe88ef 100644
--- a/inc/header.inc.php
+++ b/inc/header.inc.php
@@ -310,6 +310,9 @@ if ($modsForHesk_settings['show_icons']) {
                 </li>
                 <?php endif; ?>
                 <?php
+                $table_exists_rs = hesk_dbQuery("SHOW TABLES LIKE '" . hesk_dbEscape($hesk_settings['db_pfix']) . "custom_nav_element'");
+
+                if (!defined('MAINTENANCE_MODE') && hesk_dbNumRows($table_exists_rs)) {
                 $customNavRs = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "custom_nav_element` AS `t1`
                     INNER JOIN `" . hesk_dbEscape($hesk_settings['db_pfix']) . "custom_nav_element_to_text` AS `t2`
                         ON `t1`.`id` = `t2`.`nav_element_id`
@@ -317,7 +320,7 @@ if ($modsForHesk_settings['show_icons']) {
                     WHERE `t1`.`place` = 2");
 
                 while ($row = hesk_dbFetchAssoc($customNavRs)):
-                ?>
+                    ?>
                     <li>
                         <a href="<?php echo $row['url']; ?>">
                             <?php if ($row['image_url'] !== null): ?>
@@ -328,7 +331,8 @@ if ($modsForHesk_settings['show_icons']) {
                             <?php echo $row['text']; ?>
                         </a>
                     </li>
-                <?php endwhile; ?>
+                <?php endwhile;
+                } ?>
             </ul>
             <?php if ($hesk_settings['can_sel_lang']) { ?>
                 <div class="navbar-form navbar-right" role="search" style="margin-right: 20px; min-width: 80px;">

From 13d7b70ac564ccc11944c785093378b07cb76de1 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Mon, 19 Jun 2017 22:13:34 -0400
Subject: [PATCH 184/192] Fix regex, query order, and black preset text colors

---
 install/mods-for-hesk/sql/installSql.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/install/mods-for-hesk/sql/installSql.php b/install/mods-for-hesk/sql/installSql.php
index e0e8bb90..70b9301f 100644
--- a/install/mods-for-hesk/sql/installSql.php
+++ b/install/mods-for-hesk/sql/installSql.php
@@ -1013,7 +1013,6 @@ function execute310Scripts() {
     executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) VALUES ('login_background', '#d2d6de')");
     executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) VALUES ('login_box_header', 'helpdesk-title')");
     executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) VALUES ('login_box_header_image', '')");
-    executeQuery("DELETE FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` WHERE `Key` IN ('rtl', 'admin_color_scheme')");
 
     // Copy over color presets to the custom values
     $theme_preset_rs = executeQuery("SELECT `Value` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` WHERE `Key` = 'admin_color_scheme'");
@@ -1048,31 +1047,31 @@ function execute310Scripts() {
         'background' => $light_theme ? '#f9fafc' : '#1a2226',
         'text' => $light_theme ? '#848484' : '#4b646f',
     );
-    if (preg_match('/skin-blue.*/g', $theme)) {
+    if (preg_match('/skin-blue.*/', $theme)) {
         $navbar['background'] = '#3c8dbc';
         $navbar['background_hover'] = '#367fa9';
 
         $navbar_brand['background'] = $light_theme ? '#3c8dbc' : '#367fa9';
         $navbar_brand['background_hover'] = $light_theme ? '#3b8ab8' : '#357ca5';
-    } elseif (preg_match('/skin-yellow.*/g', $theme)) {
+    } elseif (preg_match('/skin-yellow.*/', $theme)) {
         $navbar['background'] = '#f39c12';
         $navbar['background_hover'] = '#da8c10';
 
         $navbar_brand['background'] = $light_theme ? '#f39c12' : '#e08e0b';
         $navbar_brand['background_hover'] = $light_theme ? '#f39a0d' : '#db8b0b';
-    } elseif (preg_match('/skin-green.*/g', $theme)) {
+    } elseif (preg_match('/skin-green.*/', $theme)) {
         $navbar['background'] = '#00a65a';
         $navbar['background_hover'] = '#009551';
 
         $navbar_brand['background'] = $light_theme ? '#00a65a' : '#008d4c';
         $navbar_brand['background_hover'] = $light_theme ? '#00a157' : '#008749';
-    } elseif (preg_match('/skin-purple.*/g', $theme)) {
+    } elseif (preg_match('/skin-purple.*/', $theme)) {
         $navbar['background'] = '#605ca8';
         $navbar['background_hover'] = '#565397';
 
         $navbar_brand['background'] = $light_theme ? '#605ca8' : '#555299';
         $navbar_brand['background_hover'] = $light_theme ? '#5d59a6' : '#545096';
-    } elseif (preg_match('/skin-red.*/g', $theme)) {
+    } elseif (preg_match('/skin-red.*/', $theme)) {
         $navbar['background'] = '#dd4b39';
         $navbar['background_hover'] = '#c64333';
 
@@ -1081,9 +1080,13 @@ function execute310Scripts() {
     } else {
         $navbar['background'] = '#fff';
         $navbar['background_hover'] = '#eee';
+        $navbar['text_color'] = '#333';
+        $navbar['text_hover'] = '#333';
 
         $navbar_brand['background'] = '#fff';
         $navbar_brand['background_hover'] = '#fcfcfc';
+        $navbar_brand['text'] = '#333';
+        $navbar_brand['text_hover'] = '#333';
     }
 
     executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) 
@@ -1116,6 +1119,7 @@ function execute310Scripts() {
         VALUES ('admin_sidebar_header_background', '{$sidebar_header['background']}')");
     executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) 
         VALUES ('admin_sidebar_header_text', '{$sidebar_header['text']}')");
+    executeQuery("DELETE FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` WHERE `Key` IN ('rtl', 'admin_color_scheme')");
 
     updateVersion('3.1.0');
 }
\ No newline at end of file

From 4a49c8c5100d28cc46414fe7a97dd875c731c994 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Tue, 20 Jun 2017 08:04:07 -0400
Subject: [PATCH 185/192] Make all AJAX calls relative

---
 admin/admin_ticket.php                        |  4 +++-
 inc/header.inc.php                            |  5 +++--
 inc/headerAdmin.inc.php                       |  4 ++--
 internal-api/js/admin-ticket.js               |  7 ++++---
 internal-api/js/api-settings.js               | 12 +++++------
 internal-api/js/core-admin.php                | 15 -------------
 internal-api/js/core.php                      | 11 ----------
 internal-api/js/view-message-log.js           |  4 ++--
 .../mods-for-hesk-calendar-admin-readonly.js  |  4 +++-
 .../mods-for-hesk-calendar-readonly.js        |  4 +++-
 js/calendar/mods-for-hesk-calendar.js         | 21 ++++++++++++-------
 js/modsForHesk-javascript.js                  |  3 ++-
 12 files changed, 41 insertions(+), 53 deletions(-)
 delete mode 100644 internal-api/js/core-admin.php
 delete mode 100644 internal-api/js/core.php

diff --git a/admin/admin_ticket.php b/admin/admin_ticket.php
index 54bd820b..37ef843a 100644
--- a/admin/admin_ticket.php
+++ b/admin/admin_ticket.php
@@ -1506,13 +1506,15 @@ function hesk_getAdminButtonsInTicket($reply = 0, $white = 1)
         $replyDataAttribute = 'data-reply-id="' . $reply['id'] . '"';
     }
 
-    $options .= '
+    if ($ticket['email'] !== '') {
+        $options .= '
         <button class="btn btn-default" data-action="resend-email-notification" ' . $replyDataAttribute . ' data-ticket-id="' . $ticket['id'] . '">
             <i class="fa fa-envelope navy-blue"></i> ' . $hesklang['resend_email_notification'] . '
         </button>
         <span id="lang_email_notification_sent" style="display: none">' . $hesklang['email_notification_sent'] . '</span>
         <span id="lang_email_notification_resend_failed" style="display: none">' . $hesklang['email_notification_resend_failed'] . '</span>
         ';
+    }
 
     /* Edit post */
     if ($can_edit) {
diff --git a/inc/header.inc.php b/inc/header.inc.php
index 0ffe88ef..192e1580 100644
--- a/inc/header.inc.php
+++ b/inc/header.inc.php
@@ -93,7 +93,6 @@ if (is_dir(HESK_PATH . 'install')) {
     <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.3/leaflet.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/platform.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/bootstrap-validator.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
-    <script type="text/javascript" src="<?php echo HESK_PATH; ?>internal-api/js/core.php?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/bootstrap-colorpicker.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/toastr.min.js?v=<?php echo MODS_FOR_HESK_BUILD ?>"></script>
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/jquery.magnific-popup.min.js?v=<?php echo MODS_FOR_HESK_BUILD ?>"></script>
@@ -348,4 +347,6 @@ if ($modsForHesk_settings['show_icons']) {
                 </div>
             <?php } ?>
         </div>
-    </nav>
\ No newline at end of file
+    </nav>
+    <?php // GLOBAL JAVASCRIPT IDs ?>
+    <p style="display: none" id="hesk-path"><?php echo HESK_PATH; ?></p>
diff --git a/inc/headerAdmin.inc.php b/inc/headerAdmin.inc.php
index 55941c3d..ce2f0f1d 100644
--- a/inc/headerAdmin.inc.php
+++ b/inc/headerAdmin.inc.php
@@ -67,7 +67,6 @@ $modsForHesk_settings = mfh_getSettings();
     <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.3/leaflet.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/platform.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/bootstrap-validator.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
-    <script type="text/javascript" src="<?php echo HESK_PATH; ?>internal-api/js/core-admin.php?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/bootstrap-colorpicker.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/jquery.slimscroll.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
     <script type="text/javascript" src="<?php echo HESK_PATH; ?>js/toastr.min.js?v=<?php echo MODS_FOR_HESK_BUILD; ?>"></script>
@@ -305,7 +304,8 @@ if (defined('MFH_PAGE_LAYOUT') && MFH_PAGE_LAYOUT == 'TOP_ONLY') {
 unset($onload); ?>" class="<?php echo $layout_tag ?> fixed js">
 
 <?php // GLOBAL JAVASCRIPT IDs ?>
-<p style="display: none" id="heskUrl"><?php echo $hesk_settings['hesk_url']; ?></p>
+<p style="display: none" id="hesk-path"><?php echo HESK_PATH; ?></p>
+<p style="display: none" id="admin-dir"><?php echo $hesk_settings['admin_dir']; ?></p>
 <p style="display: none" id="lang_alert_success"><?php echo $hesklang['alert_success']; ?></p>
 <p style="display: none" id="lang_alert_error"><?php echo $hesklang['alert_error']; ?></p>
 
diff --git a/internal-api/js/admin-ticket.js b/internal-api/js/admin-ticket.js
index 3e8013ce..1364337c 100644
--- a/internal-api/js/admin-ticket.js
+++ b/internal-api/js/admin-ticket.js
@@ -1,4 +1,6 @@
 $(document).ready(function() {
+    var heskPath = $('p#hesk-path').text();
+
     var $readonlyDueDateContainer = $('#readonly-due-date');
     var $changeButton = $readonlyDueDateContainer.find('#change-button');
     var $editableDueDateContainer = $('#editable-due-date');
@@ -20,7 +22,7 @@ $(document).ready(function() {
         var newDueDate = $editableDueDateContainer.find('input[type="text"][name="due-date"]').val();
         $.ajax({
             method: 'POST',
-            url: getHelpdeskUrl() + '/internal-api/admin/calendar/',
+            url: heskPath + 'internal-api/admin/calendar/',
             data: {
                 trackingId: $('input[type="hidden"][name="track"]').val(),
                 action: 'update-ticket',
@@ -48,8 +50,7 @@ $(document).ready(function() {
 
         var ticketId = $this.data('ticket-id');
         var replyId = $this.data('reply-id');
-        var heskUrl = $('span#heskUrl').text();
-        var apiUrl = heskUrl + '/api/index.php/v1-internal/staff/tickets/' + ticketId + '/resend-email';
+        var apiUrl = heskPath + 'api/index.php/v1-internal/staff/tickets/' + ticketId + '/resend-email';
 
         if (replyId !== undefined) {
             apiUrl += '?replyId=' + replyId;
diff --git a/internal-api/js/api-settings.js b/internal-api/js/api-settings.js
index f224a954..abfab1f1 100644
--- a/internal-api/js/api-settings.js
+++ b/internal-api/js/api-settings.js
@@ -8,8 +8,8 @@ $(document).ready(function() {
 });
 
 function updatePublicApi(enable) {
-    var endpoint = getHelpdeskUrl();
-    endpoint += '/internal-api/admin/api-settings/';
+    var heskPath = $('p#hesk-path').text();
+    var endpoint = heskPath + 'internal-api/admin/api-settings/';
     var data = {
         key: 'public_api',
         value: enable
@@ -66,8 +66,8 @@ function markFailure(id) {
 }
 
 function generateToken(userId) {
-    var endpoint = getHelpdeskUrl();
-    endpoint += '/internal-api/admin/api-authentication/';
+    var heskPath = $('p#hesk-path').text();
+    var endpoint = heskPath + 'internal-api/admin/api-authentication/';
     markSaving('token-' + userId);
     $('#token-' + userId + '-reset').addClass('hide');
     $('#token-' + userId + '-created').addClass('hide');
@@ -94,8 +94,8 @@ function generateToken(userId) {
 }
 
 function clearTokens(userId) {
-    var endpoint = getHelpdeskUrl();
-    endpoint += '/internal-api/admin/api-authentication/';
+    var heskPath = $('p#hesk-path').text();
+    var endpoint = heskPath + 'internal-api/admin/api-authentication/';
     markSaving('token-' + userId);
     $('#token-' + userId + '-reset').addClass('hide');
     $('#token-' + userId + '-created').addClass('hide');
diff --git a/internal-api/js/core-admin.php b/internal-api/js/core-admin.php
deleted file mode 100644
index ab596ec1..00000000
--- a/internal-api/js/core-admin.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-define('IN_SCRIPT', 1);
-require_once('../../hesk_settings.inc.php');
-header('Content-Type: application/javascript');
-echo "
-var g_isInAdmin = true;
-
-function getHelpdeskUrl() {
-    return '".$hesk_settings['hesk_url']."';
-}
-
-function getAdminDirectory() {
-    return '".$hesk_settings['admin_dir']."';
-}
-";
\ No newline at end of file
diff --git a/internal-api/js/core.php b/internal-api/js/core.php
deleted file mode 100644
index b34f0233..00000000
--- a/internal-api/js/core.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-define('IN_SCRIPT', 1);
-require_once('../../hesk_settings.inc.php');
-header('Content-Type: application/javascript');
-echo "
-var g_isInAdmin = false;
-
-function getHelpdeskUrl() {
-    return '".$hesk_settings['hesk_url']."';
-}
-";
\ No newline at end of file
diff --git a/internal-api/js/view-message-log.js b/internal-api/js/view-message-log.js
index 6acbc741..712b92ae 100644
--- a/internal-api/js/view-message-log.js
+++ b/internal-api/js/view-message-log.js
@@ -20,8 +20,8 @@ function getNullableField(value) {
 }
 
 function searchLogs(location, fromDate, toDate, severity) {
-    var endpoint = getHelpdeskUrl();
-    endpoint += '/internal-api/admin/message-log/';
+    var heskPath = $('p#hesk-path').text();
+    var endpoint = heskPath + 'internal-api/admin/message-log/';
 
     $.ajax({
         url: endpoint,
diff --git a/js/calendar/mods-for-hesk-calendar-admin-readonly.js b/js/calendar/mods-for-hesk-calendar-admin-readonly.js
index c3d086c8..574806f4 100644
--- a/js/calendar/mods-for-hesk-calendar-admin-readonly.js
+++ b/js/calendar/mods-for-hesk-calendar-admin-readonly.js
@@ -1,4 +1,6 @@
 $(document).ready(function() {
+    var heskPath = $('p#hesk-path').text();
+
     $('#calendar').fullCalendar({
         header: {
             left: 'prevYear,prev,next,nextYear today',
@@ -13,7 +15,7 @@ $(document).ready(function() {
         defaultView: $('#setting_default_view').text().trim(),
         events: function(start, end, timezone, callback) {
             $.ajax({
-                url: getHelpdeskUrl() + '/internal-api/admin/calendar/?start=' + start + '&end=' + end,
+                url: heskPath + 'internal-api/admin/calendar/?start=' + start + '&end=' + end,
                 method: 'GET',
                 dataType: 'json',
                 success: function(data) {
diff --git a/js/calendar/mods-for-hesk-calendar-readonly.js b/js/calendar/mods-for-hesk-calendar-readonly.js
index ebddd6cd..2a2dc03f 100644
--- a/js/calendar/mods-for-hesk-calendar-readonly.js
+++ b/js/calendar/mods-for-hesk-calendar-readonly.js
@@ -1,4 +1,6 @@
 $(document).ready(function() {
+    var heskPath = $('p#hesk-path').text();
+
     $('#calendar').fullCalendar({
         header: {
             left: 'prevYear,prev,next,nextYear today',
@@ -13,7 +15,7 @@ $(document).ready(function() {
         defaultView: $('#setting_default_view').text().trim(),
         events: function(start, end, timezone, callback) {
             $.ajax({
-                url: getHelpdeskUrl() + '/internal-api/calendar/?start=' + start + '&end=' + end,
+                url: heskPath + 'internal-api/calendar/?start=' + start + '&end=' + end,
                 method: 'GET',
                 dataType: 'json',
                 success: function(data) {
diff --git a/js/calendar/mods-for-hesk-calendar.js b/js/calendar/mods-for-hesk-calendar.js
index de39d1a0..0e13b44e 100644
--- a/js/calendar/mods-for-hesk-calendar.js
+++ b/js/calendar/mods-for-hesk-calendar.js
@@ -1,4 +1,6 @@
 $(document).ready(function() {
+    var heskPath = $('p#hesk-path').text();
+
     $('#calendar').fullCalendar({
         header: {
             left: 'prevYear,prev,next,nextYear today',
@@ -13,7 +15,7 @@ $(document).ready(function() {
         defaultView: $('#setting_default_view').text().trim(),
         events: function(start, end, timezone, callback) {
             $.ajax({
-                url: getHelpdeskUrl() + '/internal-api/admin/calendar/?start=' + start + '&end=' + end,
+                url: heskPath + 'internal-api/admin/calendar/?start=' + start + '&end=' + end,
                 method: 'GET',
                 dataType: 'json',
                 success: function(data) {
@@ -165,7 +167,7 @@ $(document).ready(function() {
 
         $.ajax({
             method: 'POST',
-            url: getHelpdeskUrl() + '/internal-api/admin/calendar/',
+            url: heskPath + 'internal-api/admin/calendar/',
             data: data,
             success: function() {
                 removeFromCalendar(data.id);
@@ -210,7 +212,7 @@ $(document).ready(function() {
 
         $.ajax({
             method: 'POST',
-            url: getHelpdeskUrl() + '/internal-api/admin/calendar/',
+            url: heskPath + 'internal-api/admin/calendar/',
             data: data,
             success: function(id) {
                 addToCalendar(id, data, $('#lang_event_created').text());
@@ -256,7 +258,7 @@ $(document).ready(function() {
 
         $.ajax({
             method: 'POST',
-            url: getHelpdeskUrl() + '/internal-api/admin/calendar/',
+            url: heskPath + 'internal-api/admin/calendar/',
             data: data,
             success: function() {
                 removeFromCalendar(data.id);
@@ -308,7 +310,7 @@ function buildEvent(id, dbObject) {
     if (dbObject.allDay) {
         endTime.add(1, 'days');
     }
-    console.log(dbObject);
+
     return {
         id: id,
         title: dbObject.title,
@@ -432,7 +434,9 @@ function displayEditModal(date) {
     }
 
 
-    var createTicketLink = getHelpdeskUrl() + '/' + getAdminDirectory() + '/new_ticket.php?subject=';
+    var heskPath = $('p#hesk-path').text();
+    var adminDir = $('p#admin-dir').text();
+    var createTicketLink = heskPath + adminDir + '/new_ticket.php?subject=';
     createTicketLink += encodeURI('[' + date.start.format('YYYY-MM-DD') + '] ' + date.title);
     if (date.location != '') {
         createTicketLink += encodeURI(' @ ' + date.location);
@@ -467,10 +471,11 @@ function updateCategoryVisibility() {
 }
 
 function respondToDragAndDrop(event, delta, revertFunc) {
+    var heskPath = $('p#hesk-path').text();
     if (event.type === 'TICKET') {
         $.ajax({
             method: 'POST',
-            url: getHelpdeskUrl() + '/internal-api/admin/calendar/',
+            url: heskPath + 'internal-api/admin/calendar/',
             data: {
                 trackingId: event.trackingId,
                 action: 'update-ticket',
@@ -518,7 +523,7 @@ function respondToDragAndDrop(event, delta, revertFunc) {
         };
         $.ajax({
             method: 'POST',
-            url: getHelpdeskUrl() + '/internal-api/admin/calendar/',
+            url: heskPath + 'internal-api/admin/calendar/',
             data: data,
             success: function() {
                 mfhAlert.success(mfhLang.text('event_updated'));
diff --git a/js/modsForHesk-javascript.js b/js/modsForHesk-javascript.js
index 2dac5abe..af22aabf 100644
--- a/js/modsForHesk-javascript.js
+++ b/js/modsForHesk-javascript.js
@@ -300,9 +300,10 @@ function outputAttachmentIdHolder(value, id) {
 }
 
 function removeAttachment(id) {
+    var heskPath = $('p#hesk-path').text();
     $('input[name="attachment-ids[]"][value="' + id + '"]').remove();
     $.ajax({
-        url: getHelpdeskUrl() + '/internal-api/ticket/delete-attachment.php?id=' + id,
+        url: heskPath + 'internal-api/ticket/delete-attachment.php?id=' + id,
         method: 'GET'
     });
 }

From 9a5738eb1c0ee494191311abc916f310d4a871ef Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Tue, 20 Jun 2017 22:00:54 -0400
Subject: [PATCH 186/192] Use relative URLs for attachment handling

---
 admin/admin_ticket.php         | 5 ++---
 admin/edit_post.php            | 2 +-
 admin/manage_knowledgebase.php | 4 ++--
 admin/new_ticket.php           | 2 +-
 index.php                      | 2 +-
 ticket.php                     | 2 +-
 6 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/admin/admin_ticket.php b/admin/admin_ticket.php
index 37ef843a..899d37e6 100644
--- a/admin/admin_ticket.php
+++ b/admin/admin_ticket.php
@@ -1167,7 +1167,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                             <?php build_dropzone_markup(true, 'notesFiledrop'); ?>
                         </div>
                     </div>
-                    <?php display_dropzone_field($hesk_settings['hesk_url'] . '/internal-api/ticket/upload-attachment.php', 'notesFiledrop'); ?>
+                    <?php display_dropzone_field(HESK_PATH . 'internal-api/ticket/upload-attachment.php', 'notesFiledrop'); ?>
                     <div class="text-right">
                         <i><?php echo $hesklang['nhid']; ?></i>&nbsp;
                         <div class="btn-group">
@@ -1965,7 +1965,6 @@ function hesk_printReplyForm()
 
                             ?></textarea>
                         <div class="help-block with-errors" id="message-help-block"></div></span>
-                        <p id="lang_ticket_message_contents_exist" style="display: none"><?php echo $hesklang['ticket_message_contents_exist']; ?></p>
                 </div>
             </div>
             <?php
@@ -1980,7 +1979,7 @@ function hesk_printReplyForm()
                     </div>
                 </div>
                 <?php
-                display_dropzone_field($hesk_settings['hesk_url'] . '/internal-api/ticket/upload-attachment.php');
+                display_dropzone_field(HESK_PATH . 'internal-api/ticket/upload-attachment.php');
             }
             ?>
             <div class="form-group">
diff --git a/admin/edit_post.php b/admin/edit_post.php
index 289faf83..ee3a9e19 100644
--- a/admin/edit_post.php
+++ b/admin/edit_post.php
@@ -608,7 +608,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                             </div>
                         </div>
                         <?php
-                        display_dropzone_field($hesk_settings['hesk_url'] . '/internal-api/ticket/upload-attachment.php',
+                        display_dropzone_field(HESK_PATH . 'internal-api/ticket/upload-attachment.php',
                             'filedrop',
                             $hesk_settings['attachments']['max_number'] - $number_of_attachments);
                     endif; ?>
diff --git a/admin/manage_knowledgebase.php b/admin/manage_knowledgebase.php
index c0a9dd47..0652220f 100644
--- a/admin/manage_knowledgebase.php
+++ b/admin/manage_knowledgebase.php
@@ -459,7 +459,7 @@ if (!isset($_SESSION['hide']['new_article']))
                                     <?php build_dropzone_markup(true); ?>
                                 </div>
                                 <?php
-                                display_dropzone_field($hesk_settings['hesk_url'] . '/internal-api/admin/knowledgebase/upload-attachment.php');
+                                display_dropzone_field(HESK_PATH . 'internal-api/admin/knowledgebase/upload-attachment.php');
                             endif; // End attachments
 
                             ?>
@@ -1517,7 +1517,7 @@ function edit_article()
 
                             <?php
                             build_dropzone_markup(true);
-                            display_dropzone_field($hesk_settings['hesk_url'] . '/internal-api/admin/knowledgebase/upload-attachment.php');
+                            display_dropzone_field(HESK_PATH . 'internal-api/admin/knowledgebase/upload-attachment.php');
                             ?>
                         </div>
                         <?php endif; //End attachments ?>
diff --git a/admin/new_ticket.php b/admin/new_ticket.php
index 456799bb..9233b35b 100644
--- a/admin/new_ticket.php
+++ b/admin/new_ticket.php
@@ -879,7 +879,7 @@ $show_quick_help = $show['show'];
                         </div>
                     </div>
                     <?php
-                    display_dropzone_field($hesk_settings['hesk_url'] . '/internal-api/ticket/upload-attachment.php');
+                    display_dropzone_field(HESK_PATH . 'internal-api/ticket/upload-attachment.php');
                 }
 
                 if (!isset($_SESSION['as_notify'])) {
diff --git a/index.php b/index.php
index 12165ed7..61eba1f7 100644
--- a/index.php
+++ b/index.php
@@ -983,7 +983,7 @@ function print_add_ticket()
                         </div>
                     </div>
                     <?php
-                    display_dropzone_field($hesk_settings['hesk_url'] . '/internal-api/ticket/upload-attachment.php');
+                    display_dropzone_field(HESK_PATH . 'internal-api/ticket/upload-attachment.php');
                 }
 
                 if ($hesk_settings['question_use'] || $hesk_settings['secimg_use'])
diff --git a/ticket.php b/ticket.php
index fd413808..86088a15 100644
--- a/ticket.php
+++ b/ticket.php
@@ -656,7 +656,7 @@ function hesk_printCustomerReplyForm($reopen = 0)
                 </div>
             </div>
             <?php
-            display_dropzone_field($hesk_settings['hesk_url'] . '/internal-api/ticket/upload-attachment.php');
+            display_dropzone_field(HESK_PATH . 'internal-api/ticket/upload-attachment.php');
         }
         ?>
         <input type="hidden" name="token" value="<?php hesk_token_echo(); ?>"/>

From a2198831179799d4872936c5a7421abad3d713fc Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Wed, 21 Jun 2017 21:56:02 -0400
Subject: [PATCH 187/192] Fix colors on new category panel

---
 admin/manage_categories.php | 63 +++++++++++++++++++++++++++++--------
 1 file changed, 50 insertions(+), 13 deletions(-)

diff --git a/admin/manage_categories.php b/admin/manage_categories.php
index e0525904..c90aebc8 100644
--- a/admin/manage_categories.php
+++ b/admin/manage_categories.php
@@ -107,8 +107,7 @@ while ($mycat = hesk_dbFetchAssoc($res)) {
         <div class="box-body">
             <form action="manage_categories.php" method="post" role="form" class="form-horizontal" data-toggle="validator">
                 <div class="form-group">
-                    <p class="col-sm-4 control-label" style="font-size: .87em">
-                        <b><?php echo $hesklang['cat_name']; ?></b> (<?php echo $hesklang['max_chars']; ?>)</p>
+                    <label for="name" class="col-sm-4 control-label"><?php echo $hesklang['cat_name']; ?></label>
 
                     <div class="col-sm-8">
                         <input class="form-control"
@@ -121,12 +120,12 @@ while ($mycat = hesk_dbFetchAssoc($res)) {
                             ?>
                                data-error="<?php echo htmlspecialchars($hesklang['enter_cat_name']); ?>"
                                required>
+                        <div class="help-block"><?php echo $hesklang['max_chars']; ?></div>
                         <div class="help-block with-errors"></div>
                     </div>
                 </div>
                 <div class="form-group">
-                    <label for="priority" class="col-sm-4 control-label"
-                           style="font-size: .87em"><?php echo $hesklang['def_pri']; ?> <a href="#"
+                    <label for="priority" class="col-sm-4 control-label"><?php echo $hesklang['def_pri']; ?> <a href="#"
                                                                                            onclick="alert('<?php echo hesk_makeJsString($hesklang['cat_pri']); ?>')"><i
                                 class="fa fa-question-circle settingsquestionmark"></i> </a> </label>
 
@@ -149,15 +148,51 @@ while ($mycat = hesk_dbFetchAssoc($res)) {
                 </div>
                 <div class="form-group">
                     <label for="color" class="col-sm-4 control-label">
-                        <?php echo $hesklang['category_color']; ?>
+                        <?php echo $hesklang['category_background_color']; ?>
                         <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
-                           title="<?php echo htmlspecialchars($hesklang['category_color']); ?>"
-                           data-content="<?php echo htmlspecialchars($hesklang['category_color_help']); ?>"></i>
+                           title="<?php echo htmlspecialchars($hesklang['category_background_color']); ?>"
+                           data-content="<?php echo htmlspecialchars($hesklang['category_background_color_help']); ?>"></i>
                     </label>
                     <div class="col-sm-8">
                         <input class="form-control colorpicker-trigger"
-                               placeholder="<?php echo htmlspecialchars($hesklang['category_color']); ?>" type="text"
-                               name="color" maxlength="7">
+                               placeholder="<?php echo htmlspecialchars($hesklang['category_background_color']); ?>" type="text"
+                               name="background-color" maxlength="7" required>
+                        <div class="help-block with-errors"></div>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="color" class="col-sm-4 control-label">
+                        <?php echo $hesklang['category_foreground_color']; ?>
+                        <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
+                           title="<?php echo htmlspecialchars($hesklang['category_foreground_color']); ?>"
+                           data-content="<?php echo htmlspecialchars($hesklang['category_foreground_color_help']); ?>"></i>
+                    </label>
+                    <div class="col-sm-8">
+                        <input class="form-control colorpicker-trigger"
+                               placeholder="<?php echo htmlspecialchars($hesklang['category_foreground_color']); ?>" type="text"
+                               name="foreground-color" maxlength="7">
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label for="display-border" class="col-sm-4 control-label">
+                        <?php echo $hesklang['category_display_border']; ?>
+                        <i class="fa fa-question-circle settingsquestionmark" data-toggle="htmlpopover"
+                           title="<?php echo htmlspecialchars($hesklang['category_display_border']); ?>"
+                           data-content="<?php echo htmlspecialchars($hesklang['category_display_border_help']); ?>"></i>
+                    </label>
+                    <div class="col-sm-8 form-inline">
+                        <div class="radio">
+                            <label>
+                                <input type="radio" name="display-border" value="1">
+                                <?php echo $hesklang['yes']; ?>
+                            </label>
+                        </div>&nbsp;&nbsp;&nbsp;
+                        <div class="radio">
+                            <label>
+                                <input type="radio" name="display-border" value="0" checked>
+                                <?php echo $hesklang['no']; ?>
+                            </label>
+                        </div>
                     </div>
                 </div>
                 <div class="form-group">
@@ -194,10 +229,12 @@ while ($mycat = hesk_dbFetchAssoc($res)) {
                         </div>
                     </div>
                 </div>
-                <div class="form-group text-center">
-                    <input type="hidden" name="a" value="new"/>
-                    <input type="hidden" name="token" value="<?php hesk_token_echo(); ?>"/>
-                    <input type="submit" value="<?php echo $hesklang['create_cat']; ?>" class="btn btn-default"/>
+                <div class="form-group">
+                    <div class="col-sm-9 col-sm-offset-4">
+                        <input type="hidden" name="a" value="new"/>
+                        <input type="hidden" name="token" value="<?php hesk_token_echo(); ?>"/>
+                        <input type="submit" value="<?php echo $hesklang['create_cat']; ?>" class="btn btn-default"/>
+                    </div>
                 </div>
             </form>
         </div>

From 0caf4e740ed0fd5ae54bf708c067b7137583a5dc Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Wed, 21 Jun 2017 22:07:21 -0400
Subject: [PATCH 188/192] Fix color issues on calendar page

---
 admin/calendar.php                    | 8 ++++++--
 js/calendar/mods-for-hesk-calendar.js | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/admin/calendar.php b/admin/calendar.php
index e02dde94..a3256299 100644
--- a/admin/calendar.php
+++ b/admin/calendar.php
@@ -207,7 +207,9 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                                             echo '<option value="">'.$hesklang['select'].'</option>';
                                         }
                                         foreach ($categories as $category): ?>
-                                            <option value="<?php echo $category['id']; ?>" data-color="<?php echo htmlspecialchars($category['color']); ?>">
+                                            <option value="<?php echo $category['id']; ?>" data-background-color="<?php echo htmlspecialchars($category['background_color']); ?>"
+                                                data-foreground-color="<?php echo htmlspecialchars($category['foreground_color']); ?>"
+                                                data-display-border="<?php echo htmlspecialchars($category['display_border_outline']); ?>">
                                                 <?php echo $category['name']; ?>
                                             </option>
                                         <?php endforeach; ?>
@@ -377,7 +379,9 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                                             echo '<option value="">'.$hesklang['select'].'</option>';
                                         }
                                         foreach ($categories as $category): ?>
-                                            <option value="<?php echo $category['id']; ?>" data-color="<?php echo $category['color']; ?>">
+                                            <option value="<?php echo $category['id']; ?>" data-background-color="<?php echo htmlspecialchars($category['background_color']); ?>"
+                                                    data-foreground-color="<?php echo htmlspecialchars($category['foreground_color']); ?>"
+                                                    data-display-border="<?php echo htmlspecialchars($category['display_border_outline']); ?>">
                                                 <?php echo $category['name']; ?>
                                             </option>
                                         <?php endforeach; ?>
diff --git a/js/calendar/mods-for-hesk-calendar.js b/js/calendar/mods-for-hesk-calendar.js
index 0e13b44e..e4bbb699 100644
--- a/js/calendar/mods-for-hesk-calendar.js
+++ b/js/calendar/mods-for-hesk-calendar.js
@@ -204,7 +204,9 @@ $(document).ready(function() {
             categoryId: $createForm.find('select[name="category"]').val(),
             action: 'create',
             type: 'CALENDAR',
-            categoryColor: $createForm.find('select[name="category"] :selected').attr('data-color'),
+            backgroundColor: $createForm.find('select[name="category"] :selected').attr('data-background-color'),
+            foregroundColor: $createForm.find('select[name="category"] :selected').attr('data-foreground-color'),
+            displayBorder: $createForm.find('select[name="category"] :selected').attr('data-display-border'),
             categoryName: $createForm.find('select[name="category"] :selected').text().trim(),
             reminderValue: $createForm.find('input[name="reminder-value"]').val(),
             reminderUnits: $createForm.find('select[name="reminder-unit"]').val()
@@ -249,7 +251,9 @@ $(document).ready(function() {
             allDay: allDay,
             comments: $form.find('textarea[name="comments"]').val(),
             categoryId: $form.find('select[name="category"]').val(),
-            categoryColor: $form.find('select[name="category"] :selected').attr('data-color'),
+            backgroundColor: $form.find('select[name="category"] :selected').attr('data-background-color'),
+            foregroundColor: $form.find('select[name="category"] :selected').attr('data-foreground-color'),
+            displayBorder: $form.find('select[name="category"] :selected').attr('data-display-border'),
             categoryName: $form.find('select[name="category"] :selected').text().trim(),
             action: 'update',
             reminderValue: $form.find('input[name="reminder-value"]').val(),

From 1234f858e5986521380b963643e37341fc657f6e Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Thu, 22 Jun 2017 12:04:12 +0000
Subject: [PATCH 189/192] Update build.php

---
 build.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.php b/build.php
index 6f978f4b..799c27fb 100644
--- a/build.php
+++ b/build.php
@@ -1,4 +1,4 @@
 <?php
 
 // Define the current build
-define('MODS_FOR_HESK_BUILD', 41);
\ No newline at end of file
+define('MODS_FOR_HESK_BUILD', 42);
\ No newline at end of file

From 65110bd1b42ce9039cdd9d5fc9a4acb62efa8b1b Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Thu, 22 Jun 2017 12:04:29 +0000
Subject: [PATCH 190/192] Update database-validation.php

---
 install/mods-for-hesk/database-validation.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/install/mods-for-hesk/database-validation.php b/install/mods-for-hesk/database-validation.php
index 05f96b69..22c34c98 100644
--- a/install/mods-for-hesk/database-validation.php
+++ b/install/mods-for-hesk/database-validation.php
@@ -216,7 +216,8 @@ hesk_dbConnect();
 function run_setting_check($setting_name) {
     global $hesk_settings;
 
-    $all_good = run_check("SELECT 1 FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` WHERE `Key` = '{$setting_name}'");
+    $res = run_check("SELECT 1 FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` WHERE `Key` = '{$setting_name}'");
+	$all_good = hesk_dbNumRows($res) > 0;
 
     output_result('<b>Setting Exists</b>: ' . $setting_name, $all_good);
 

From 77c5c3d8727fd15ad9d9cb990ca5fe5c9c3c3ed9 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Thu, 22 Jun 2017 12:52:04 -0400
Subject: [PATCH 191/192] Fix nav element API path

---
 internal-api/js/manage-custom-nav-elements.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/internal-api/js/manage-custom-nav-elements.js b/internal-api/js/manage-custom-nav-elements.js
index 7c32619b..9495b1c6 100644
--- a/internal-api/js/manage-custom-nav-elements.js
+++ b/internal-api/js/manage-custom-nav-elements.js
@@ -121,7 +121,7 @@ $(document).ready(function() {
 
 function loadTable() {
     $('#overlay').show();
-    var heskUrl = $('#heskUrl').text();
+    var heskUrl = $('p#hesk-path').text();
     var notFoundText = mfhLang.text('no_custom_nav_elements_found');
     var places = [];
     var $tableBody = $('#table-body');
@@ -131,7 +131,7 @@ function loadTable() {
 
     $.ajax({
         method: 'GET',
-        url: heskUrl + '/api/v1-internal/custom-navigation/all',
+        url: heskUrl + 'api/v1-internal/custom-navigation/all',
         headers: { 'X-Internal-Call': true },
         success: function(data) {
             $tableBody.html('');

From ef481b3192f7125403c54863c68a9791562f0bf8 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Thu, 22 Jun 2017 21:21:38 -0400
Subject: [PATCH 192/192] Fixed some JS files

---
 internal-api/js/manage-custom-nav-elements.js | 8 ++++----
 internal-api/js/view-message-log.js           | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/internal-api/js/manage-custom-nav-elements.js b/internal-api/js/manage-custom-nav-elements.js
index 9495b1c6..528b6340 100644
--- a/internal-api/js/manage-custom-nav-elements.js
+++ b/internal-api/js/manage-custom-nav-elements.js
@@ -82,7 +82,7 @@ $(document).ready(function() {
             url: navUrl
         };
 
-        var url = heskUrl + '/api/v1-internal/custom-navigation/';
+        var url = heskUrl + 'api/index.php/v1-internal/custom-navigation/';
         var method = 'POST';
 
         if (id !== -1) {
@@ -131,7 +131,7 @@ function loadTable() {
 
     $.ajax({
         method: 'GET',
-        url: heskUrl + 'api/v1-internal/custom-navigation/all',
+        url: heskUrl + 'api/index.php/v1-internal/custom-navigation/all',
         headers: { 'X-Internal-Call': true },
         success: function(data) {
             $tableBody.html('');
@@ -311,7 +311,7 @@ function bindDeleteButton() {
 
         $.ajax({
             method: 'DELETE',
-            url: heskUrl + '/api/v1-internal/custom-navigation/' + element.id,
+            url: heskUrl + 'api/index.php/v1-internal/custom-navigation/' + element.id,
             headers: { 'X-Internal-Call': true },
             success: function() {
                 mfhAlert.success(mfhLang.text('custom_nav_element_deleted'));
@@ -335,7 +335,7 @@ function bindSortButtons() {
 
         $.ajax({
             method: 'POST',
-            url: heskUrl + '/api/v1-internal/custom-navigation/' + element.id + '/sort/' + direction,
+            url: heskUrl + 'api/index.php/v1-internal/custom-navigation/' + element.id + '/sort/' + direction,
             headers: { 'X-Internal-Call': true },
             success: function() {
                 loadTable();
diff --git a/internal-api/js/view-message-log.js b/internal-api/js/view-message-log.js
index 712b92ae..b0d9265e 100644
--- a/internal-api/js/view-message-log.js
+++ b/internal-api/js/view-message-log.js
@@ -45,7 +45,7 @@ function displayResults(data) {
     table.empty();
 
     if (data.length === 0) {
-        table.append('<tr><td colspan="4">No results found</td></tr>');
+        table.append('<tr><td colspan="5">No results found</td></tr>');
     } else {
         for (var index in data) {
             var result = data[index];