From c241338fbef4c14cb18d81f20fac2fbc883dbeba Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Sun, 5 Nov 2017 12:00:41 -0500 Subject: [PATCH 01/74] Couple small QoL changes --- admin/calendar.php | 20 +++++++++++--------- calendar.php | 6 +++++- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/admin/calendar.php b/admin/calendar.php index a3256299..679bfd21 100644 --- a/admin/calendar.php +++ b/admin/calendar.php @@ -551,16 +551,18 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); +
-

-

-

-

-

-

-

-

-

+
-

\ No newline at end of file From c985f80452f62b485af56556acf9bc953364b767 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Thu, 9 Nov 2017 13:04:10 -0500 Subject: [PATCH 02/74] Working on moving service messages to an API endpoint --- admin/service_messages.php | 14 ------ .../ServiceMessages/ServiceMessage.php | 33 ++++++++++++++ .../ServiceMessages/ServiceMessageHandler.php | 22 ++++++++++ .../ServiceMessages/ServiceMessageStyle.php | 44 +++++++++++++++++++ .../ServiceMessagesController.php | 38 ++++++++++++++++ .../ServiceMessagesGateway.php | 43 ++++++++++++++++++ 6 files changed, 180 insertions(+), 14 deletions(-) create mode 100644 api/BusinessLogic/ServiceMessages/ServiceMessage.php create mode 100644 api/BusinessLogic/ServiceMessages/ServiceMessageHandler.php create mode 100644 api/BusinessLogic/ServiceMessages/ServiceMessageStyle.php create mode 100644 api/Controllers/ServiceMessages/ServiceMessagesController.php create mode 100644 api/DataAccess/ServiceMessages/ServiceMessagesGateway.php diff --git a/admin/service_messages.php b/admin/service_messages.php index 580d0012..9ba0b9a9 100644 --- a/admin/service_messages.php +++ b/admin/service_messages.php @@ -687,21 +687,7 @@ function new_sm() exit; } - // Get the latest service message order - $res = hesk_dbQuery("SELECT `order` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "service_messages` ORDER BY `order` DESC LIMIT 1"); - $row = hesk_dbFetchRow($res); - $my_order = intval($row[0]) + 10; - // Insert service message into database - hesk_dbQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "service_messages` (`author`,`title`,`message`,`style`,`type`,`order`, `icon`) VALUES ( - '" . intval($_SESSION['id']) . "', - '" . hesk_dbEscape($title) . "', - '" . hesk_dbEscape($message) . "', - '{$style}', - '{$type}', - '{$my_order}', - '{$icon}' - )"); $_SESSION['smord'] = hesk_dbInsertID(); hesk_process_messages($hesklang['sm_added'], 'service_messages.php', 'SUCCESS'); diff --git a/api/BusinessLogic/ServiceMessages/ServiceMessage.php b/api/BusinessLogic/ServiceMessages/ServiceMessage.php new file mode 100644 index 00000000..1951b672 --- /dev/null +++ b/api/BusinessLogic/ServiceMessages/ServiceMessage.php @@ -0,0 +1,33 @@ +serviceMessageGateway = $serviceMessagesGateway; + } + + function createServiceMessage($serviceMessage, $heskSettings) { + // TODO Validate + + return $this->serviceMessageGateway->createServiceMessage($serviceMessage, $heskSettings); + } +} \ No newline at end of file diff --git a/api/BusinessLogic/ServiceMessages/ServiceMessageStyle.php b/api/BusinessLogic/ServiceMessages/ServiceMessageStyle.php new file mode 100644 index 00000000..4dc3e388 --- /dev/null +++ b/api/BusinessLogic/ServiceMessages/ServiceMessageStyle.php @@ -0,0 +1,44 @@ + self::NONE, + 1 => self::SUCCESS, + 2 => self::INFO, + 3 => self::NOTICE, + 4 => self::ERROR + ); + + if (!isset($styles[$id])) { + throw new \Exception("Style {$id} is not a valid service message style."); + } + + return $styles[$id]; + } + + static function getIdForStyle($style) { + $styles = array( + self::NONE => 0, + self::SUCCESS => 1, + self::INFO => 2, + self::NOTICE => 3, + self::ERROR => 4 + ); + + if (!isset($styles[$style])) { + throw new \Exception("Style {$style} is not a valid service message style."); + } + + return $styles[$style]; + } +} \ No newline at end of file diff --git a/api/Controllers/ServiceMessages/ServiceMessagesController.php b/api/Controllers/ServiceMessages/ServiceMessagesController.php new file mode 100644 index 00000000..2e9e83c8 --- /dev/null +++ b/api/Controllers/ServiceMessages/ServiceMessagesController.php @@ -0,0 +1,38 @@ +get(ServiceMessageHandler::clazz()); + + $data = JsonRetriever::getJsonData(); + $element = $handler->createServiceMessage($this->buildElementModel($data, $userContext), $hesk_settings); + + return output($element, 201); + } + + /** + * @param $data array + * @param $userContext UserContext + * @return ServiceMessage + */ + private function buildElementModel($data, $userContext) { + $serviceMessage = new ServiceMessage(); + $serviceMessage->createdBy = $userContext->id; + $serviceMessage->icon = $data['icon']; + $serviceMessage->message = $data['message']; + $serviceMessage->published = $data['published']; + $serviceMessage->style = $data['style']; + + return $serviceMessage; + } +} \ No newline at end of file diff --git a/api/DataAccess/ServiceMessages/ServiceMessagesGateway.php b/api/DataAccess/ServiceMessages/ServiceMessagesGateway.php new file mode 100644 index 00000000..9e6adc39 --- /dev/null +++ b/api/DataAccess/ServiceMessages/ServiceMessagesGateway.php @@ -0,0 +1,43 @@ +init(); + + // Get the latest service message order + $res = hesk_dbQuery("SELECT `order` FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "service_messages` ORDER BY `order` DESC LIMIT 1"); + $row = hesk_dbFetchRow($res); + $myOrder = intval($row[0]) + 10; + + $style = ServiceMessageStyle::getIdForStyle($serviceMessage->style); + $type = $serviceMessage->published ? 0 : 1; + + // Insert service message into database + hesk_dbQuery("INSERT INTO `" . hesk_dbEscape($heskSettings['db_pfix']) . "service_messages` (`author`,`title`,`message`,`style`,`type`,`order`, `icon`) VALUES ( + '" . intval($serviceMessage->createdBy) . "', + '" . hesk_dbEscape($serviceMessage->title) . "', + '" . hesk_dbEscape($serviceMessage->message) . "', + '" . hesk_dbEscape($style) . "', + '{$type}', + '{$myOrder}', + '" . hesk_dbEscape($serviceMessage->icon) . "' + )"); + + $serviceMessage->id = hesk_dbInsertID(); + + $this->close(); + + return $serviceMessage; + } +} \ No newline at end of file From d305ccf9b3a162210ac68ab09a7108acf334ad87 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Thu, 9 Nov 2017 22:02:26 -0500 Subject: [PATCH 03/74] Add POST endpoint for creating service messages --- .../ServiceMessages/ServiceMessageHandler.php | 37 ++++++++++++++++++- api/index.php | 2 + 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/api/BusinessLogic/ServiceMessages/ServiceMessageHandler.php b/api/BusinessLogic/ServiceMessages/ServiceMessageHandler.php index 474beb51..a1563807 100644 --- a/api/BusinessLogic/ServiceMessages/ServiceMessageHandler.php +++ b/api/BusinessLogic/ServiceMessages/ServiceMessageHandler.php @@ -4,6 +4,8 @@ namespace BusinessLogic\ServiceMessages; // TODO Test +use BusinessLogic\Exceptions\ValidationException; +use BusinessLogic\ValidationModel; use DataAccess\ServiceMessages\ServiceMessagesGateway; class ServiceMessageHandler extends \BaseClass { @@ -15,8 +17,41 @@ class ServiceMessageHandler extends \BaseClass { } function createServiceMessage($serviceMessage, $heskSettings) { - // TODO Validate + $this->validate($serviceMessage); return $this->serviceMessageGateway->createServiceMessage($serviceMessage, $heskSettings); } + + /** + * @param $serviceMessage ServiceMessage + * @throws ValidationException + */ + private function validate($serviceMessage) { + $validationModel = new ValidationModel(); + if ($serviceMessage->createdBy < 1) { + $validationModel->errorKeys[] = 'MISSING_CREATOR'; + } + if ($serviceMessage->icon === null || trim($serviceMessage->icon) === '') { + $validationModel->errorKeys[] = 'MISSING_ICON'; + } + if ($serviceMessage->message === null || trim($serviceMessage->message) === '') { + $validationModel->errorKeys[] = 'MISSING_MESSAGE'; + } + if ($serviceMessage->title === null || trim($serviceMessage->title) === '') { + $validationModel->errorKeys[] = 'MISSING_TITLE'; + } + if ($serviceMessage->style === null || trim($serviceMessage->style) === '') { + $validationModel->errorKeys[] = 'MISSING_STYLE'; + } + try { + ServiceMessageStyle::getIdForStyle($serviceMessage->style); + } catch (\Exception $e) { + $validationModel->errorKeys[] = 'INVALID_STYLE'; + } + + if (count($validationModel->errorKeys) > 0) { + // Validation failed + throw new ValidationException($validationModel); + } + } } \ No newline at end of file diff --git a/api/index.php b/api/index.php index 4766701c..6700fa56 100644 --- a/api/index.php +++ b/api/index.php @@ -202,6 +202,8 @@ Link::all(array( '/v1/statuses' => action(\Controllers\Statuses\StatusController::clazz(), RequestMethod::all()), // Settings '/v1/settings' => action(\Controllers\Settings\SettingsController::clazz(), RequestMethod::all()), + // Service Messages + '/v1/service-messages' => action(\Controllers\ServiceMessages\ServiceMessagesController::clazz(), array(RequestMethod::POST)), /* Internal use only routes */ // Resend email response From 311a48487d1081a5b20eb7c14bddca043882dbfa Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Sat, 11 Nov 2017 16:33:43 -0500 Subject: [PATCH 04/74] Add POST service-messages endpoint --- .../ServiceMessages/ServiceMessageHandler.php | 23 ++++++++++++++++--- .../ServiceMessagesController.php | 1 + .../ServiceMessagesGateway.php | 8 +++++++ inc/common.inc.php | 3 ++- 4 files changed, 31 insertions(+), 4 deletions(-) diff --git a/api/BusinessLogic/ServiceMessages/ServiceMessageHandler.php b/api/BusinessLogic/ServiceMessages/ServiceMessageHandler.php index a1563807..88bcd978 100644 --- a/api/BusinessLogic/ServiceMessages/ServiceMessageHandler.php +++ b/api/BusinessLogic/ServiceMessages/ServiceMessageHandler.php @@ -19,6 +19,26 @@ class ServiceMessageHandler extends \BaseClass { function createServiceMessage($serviceMessage, $heskSettings) { $this->validate($serviceMessage); + if ($serviceMessage->icon === null) { + switch ($serviceMessage->style) { + case ServiceMessageStyle::NONE: + $serviceMessage->icon = ''; + break; + case ServiceMessageStyle::INFO: + $serviceMessage->icon = 'fa fa-comment'; + break; + case ServiceMessageStyle::NOTICE: + $serviceMessage->icon = 'fa fa-exclamation-triangle'; + break; + case ServiceMessageStyle::ERROR: + $serviceMessage->icon = 'fa fa-times-circle'; + break; + case ServiceMessageStyle::SUCCESS: + $serviceMessage->icon = 'fa fa-check-circle'; + break; + } + } + return $this->serviceMessageGateway->createServiceMessage($serviceMessage, $heskSettings); } @@ -31,9 +51,6 @@ class ServiceMessageHandler extends \BaseClass { if ($serviceMessage->createdBy < 1) { $validationModel->errorKeys[] = 'MISSING_CREATOR'; } - if ($serviceMessage->icon === null || trim($serviceMessage->icon) === '') { - $validationModel->errorKeys[] = 'MISSING_ICON'; - } if ($serviceMessage->message === null || trim($serviceMessage->message) === '') { $validationModel->errorKeys[] = 'MISSING_MESSAGE'; } diff --git a/api/Controllers/ServiceMessages/ServiceMessagesController.php b/api/Controllers/ServiceMessages/ServiceMessagesController.php index 2e9e83c8..d6960764 100644 --- a/api/Controllers/ServiceMessages/ServiceMessagesController.php +++ b/api/Controllers/ServiceMessages/ServiceMessagesController.php @@ -28,6 +28,7 @@ class ServiceMessagesController extends \BaseClass { private function buildElementModel($data, $userContext) { $serviceMessage = new ServiceMessage(); $serviceMessage->createdBy = $userContext->id; + $serviceMessage->title = $data['title']; $serviceMessage->icon = $data['icon']; $serviceMessage->message = $data['message']; $serviceMessage->published = $data['published']; diff --git a/api/DataAccess/ServiceMessages/ServiceMessagesGateway.php b/api/DataAccess/ServiceMessages/ServiceMessagesGateway.php index 9e6adc39..82d9e6b8 100644 --- a/api/DataAccess/ServiceMessages/ServiceMessagesGateway.php +++ b/api/DataAccess/ServiceMessages/ServiceMessagesGateway.php @@ -3,6 +3,7 @@ namespace DataAccess\ServiceMessages; +use BusinessLogic\DateTimeHelpers; use BusinessLogic\ServiceMessages\ServiceMessage; use BusinessLogic\ServiceMessages\ServiceMessageStyle; use DataAccess\CommonDao; @@ -36,6 +37,13 @@ class ServiceMessagesGateway extends CommonDao { $serviceMessage->id = hesk_dbInsertID(); + // Get the autogenerated fields + $rs = hesk_dbQuery("SELECT `dt`, `order` FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "service_messages` + WHERE `id` = " . intval($serviceMessage->id)); + $row = hesk_dbFetchAssoc($rs); + $serviceMessage->dateCreated = $row['dt']; + $serviceMessage->order = $row['order']; + $this->close(); return $serviceMessage; diff --git a/inc/common.inc.php b/inc/common.inc.php index be8f07eb..802e44da 100644 --- a/inc/common.inc.php +++ b/inc/common.inc.php @@ -185,7 +185,8 @@ function hesk_service_message($sm) ?>
'; ?> - +
+

Date: Sat, 11 Nov 2017 22:16:25 -0500 Subject: [PATCH 05/74] Add more endpoints for service messages --- .../ServiceMessages/ServiceMessageHandler.php | 35 +++++++++++- .../ServiceMessagesController.php | 34 +++++++++++- .../ServiceMessagesGateway.php | 54 ++++++++++++++++++- api/index.php | 2 +- 4 files changed, 119 insertions(+), 6 deletions(-) diff --git a/api/BusinessLogic/ServiceMessages/ServiceMessageHandler.php b/api/BusinessLogic/ServiceMessages/ServiceMessageHandler.php index 88bcd978..d70f142f 100644 --- a/api/BusinessLogic/ServiceMessages/ServiceMessageHandler.php +++ b/api/BusinessLogic/ServiceMessages/ServiceMessageHandler.php @@ -42,13 +42,44 @@ class ServiceMessageHandler extends \BaseClass { return $this->serviceMessageGateway->createServiceMessage($serviceMessage, $heskSettings); } + function getServiceMessages($heskSettings) { + return $this->serviceMessageGateway->getServiceMessages($heskSettings); + } + + function editServiceMessage($serviceMessage, $heskSettings) { + $this->validate($serviceMessage, false); + + if ($serviceMessage->icon === null) { + switch ($serviceMessage->style) { + case ServiceMessageStyle::NONE: + $serviceMessage->icon = ''; + break; + case ServiceMessageStyle::INFO: + $serviceMessage->icon = 'fa fa-comment'; + break; + case ServiceMessageStyle::NOTICE: + $serviceMessage->icon = 'fa fa-exclamation-triangle'; + break; + case ServiceMessageStyle::ERROR: + $serviceMessage->icon = 'fa fa-times-circle'; + break; + case ServiceMessageStyle::SUCCESS: + $serviceMessage->icon = 'fa fa-check-circle'; + break; + } + } + + return $this->serviceMessageGateway->updateServiceMessage($serviceMessage, $heskSettings); + } + /** * @param $serviceMessage ServiceMessage + * @param bool $isNew * @throws ValidationException */ - private function validate($serviceMessage) { + private function validate($serviceMessage, $isNew = true) { $validationModel = new ValidationModel(); - if ($serviceMessage->createdBy < 1) { + if ($isNew && $serviceMessage->createdBy < 1) { $validationModel->errorKeys[] = 'MISSING_CREATOR'; } if ($serviceMessage->message === null || trim($serviceMessage->message) === '') { diff --git a/api/Controllers/ServiceMessages/ServiceMessagesController.php b/api/Controllers/ServiceMessages/ServiceMessagesController.php index d6960764..f17d6e14 100644 --- a/api/Controllers/ServiceMessages/ServiceMessagesController.php +++ b/api/Controllers/ServiceMessages/ServiceMessagesController.php @@ -8,6 +8,15 @@ use BusinessLogic\ServiceMessages\ServiceMessageHandler; use Controllers\JsonRetriever; class ServiceMessagesController extends \BaseClass { + function get() { + global $applicationContext, $hesk_settings; + + /* @var $handler ServiceMessageHandler */ + $handler = $applicationContext->get(ServiceMessageHandler::clazz()); + + return output($handler->getServiceMessages($hesk_settings)); + } + function post() { global $applicationContext, $userContext, $hesk_settings; @@ -20,14 +29,35 @@ class ServiceMessagesController extends \BaseClass { return output($element, 201); } + function put() { + global $applicationContext, $hesk_settings; + + /* @var $handler ServiceMessageHandler */ + $handler = $applicationContext->get(ServiceMessageHandler::clazz()); + + $data = JsonRetriever::getJsonData(); + $element = $handler->editServiceMessage($this->buildElementModel($data, null, false), $hesk_settings); + + return output($element); + } + /** * @param $data array * @param $userContext UserContext * @return ServiceMessage */ - private function buildElementModel($data, $userContext) { + private function buildElementModel($data, $userContext, $creating = true) { $serviceMessage = new ServiceMessage(); - $serviceMessage->createdBy = $userContext->id; + + if (!$creating) { + $serviceMessage->id = $data['id']; + $serviceMessage->order = $data['order']; + } + + if ($creating) { + $serviceMessage->createdBy = $userContext->id; + } + $serviceMessage->title = $data['title']; $serviceMessage->icon = $data['icon']; $serviceMessage->message = $data['message']; diff --git a/api/DataAccess/ServiceMessages/ServiceMessagesGateway.php b/api/DataAccess/ServiceMessages/ServiceMessagesGateway.php index 82d9e6b8..9dfb1796 100644 --- a/api/DataAccess/ServiceMessages/ServiceMessagesGateway.php +++ b/api/DataAccess/ServiceMessages/ServiceMessagesGateway.php @@ -42,7 +42,59 @@ class ServiceMessagesGateway extends CommonDao { WHERE `id` = " . intval($serviceMessage->id)); $row = hesk_dbFetchAssoc($rs); $serviceMessage->dateCreated = $row['dt']; - $serviceMessage->order = $row['order']; + $serviceMessage->order = intval($row['order']); + + $this->close(); + + return $serviceMessage; + } + + function getServiceMessages($heskSettings) { + $this->init(); + + $serviceMessages = array(); + + $rs = hesk_dbQuery("SELECT * FROM `". hesk_dbEscape($heskSettings['db_pfix']) . "service_messages` ORDER BY `id`"); + while ($row = hesk_dbFetchAssoc($rs)) { + $serviceMessage = new ServiceMessage(); + $serviceMessage->id = $row['id']; + $serviceMessage->published = intval($row['type']) !== 1; + $serviceMessage->createdBy = intval($row['author']); + $serviceMessage->order = intval($row['order']); + $serviceMessage->dateCreated = $row['dt']; + $serviceMessage->title = $row['title']; + $serviceMessage->message = $row['message']; + $serviceMessage->style = ServiceMessageStyle::getStyleById($row['style']); + $serviceMessage->icon = $row['icon']; + $serviceMessages[] = $serviceMessage; + } + + $this->close(); + + return $serviceMessages; + } + + function updateServiceMessage($serviceMessage, $heskSettings) { + $this->init(); + + $style = ServiceMessageStyle::getIdForStyle($serviceMessage->style); + $type = $serviceMessage->published ? 0 : 1; + + hesk_dbQuery("UPDATE `" . hesk_dbEscape($heskSettings['db_pfix']) . "service_messages` + SET `title` = '" . hesk_dbEscape($serviceMessage->title) . "', + `message` = '" . hesk_dbEscape($serviceMessage->message) . "', + `style` = '" . intval($style) . "', + `type` = " . intval($type) . ", + `icon` = '" . hesk_dbEscape($serviceMessage->icon) . "' + WHERE `id` = " . intval($serviceMessage->id)); + + $otherFieldsRs = hesk_dbQuery("SELECT `dt`, `author`, `order` FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "service_messages` + WHERE `id` = " . intval($serviceMessage->id)); + $otherFields = hesk_dbFetchAssoc($otherFieldsRs); + + $serviceMessage->order = intval($otherFields['order']); + $serviceMessage->createdBy = intval($otherFields['author']); + $serviceMessage->dateCreated = $otherFields['dt']; $this->close(); diff --git a/api/index.php b/api/index.php index 6700fa56..afa70f70 100644 --- a/api/index.php +++ b/api/index.php @@ -203,7 +203,7 @@ Link::all(array( // Settings '/v1/settings' => action(\Controllers\Settings\SettingsController::clazz(), RequestMethod::all()), // Service Messages - '/v1/service-messages' => action(\Controllers\ServiceMessages\ServiceMessagesController::clazz(), array(RequestMethod::POST)), + '/v1/service-messages' => action(\Controllers\ServiceMessages\ServiceMessagesController::clazz(), array(RequestMethod::GET, RequestMethod::POST, RequestMethod::PUT)), /* Internal use only routes */ // Resend email response From c00d5641e426b37145135bbe60e5121018917297 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Sun, 12 Nov 2017 22:22:28 -0500 Subject: [PATCH 06/74] Service messages page can now retrieve service messages via AJAX --- admin/service_messages.php | 872 +++++------------- .../ServiceMessages/ServiceMessageHandler.php | 40 +- .../ServiceMessagesController.php | 12 + .../ServiceMessagesGateway.php | 32 +- api/autoload.php | 1 + api/index.php | 10 +- internal-api/js/service-messages.js | 362 ++++++++ 7 files changed, 707 insertions(+), 622 deletions(-) create mode 100644 internal-api/js/service-messages.js diff --git a/admin/service_messages.php b/admin/service_messages.php index 9ba0b9a9..b83d9378 100644 --- a/admin/service_messages.php +++ b/admin/service_messages.php @@ -15,6 +15,7 @@ define('IN_SCRIPT', 1); define('HESK_PATH', '../'); define('PAGE_TITLE', 'ADMIN_SERVICE_MESSAGES'); define('MFH_PAGE_LAYOUT', 'TOP_ONLY'); +define('EXTRA_JS', ''); /* Get all the required files and functions */ require(HESK_PATH . 'hesk_settings.inc.php'); @@ -31,26 +32,8 @@ hesk_isLoggedIn(); hesk_checkPermission('can_service_msg'); // Define required constants -define('LOAD_TABS', 1); define('WYSIWYG', 1); -// What should we do? -if ($action = hesk_REQUEST('a')) { - if ($action == 'edit_sm') { - edit_sm(); - } elseif (defined('HESK_DEMO')) { - hesk_process_messages($hesklang['ddemo'], 'service_messages.php', 'NOTICE'); - } elseif ($action == 'new_sm') { - new_sm(); - } elseif ($action == 'save_sm') { - save_sm(); - } elseif ($action == 'order_sm') { - order_sm(); - } elseif ($action == 'remove_sm') { - remove_sm(); - } -} - /* Print header */ require_once(HESK_PATH . 'inc/headerAdmin.inc.php'); @@ -60,638 +43,293 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
+
+

+ +

+
+ +
+
-
-
    +
    +
    - ' . $hesklang['banemail'] . ' - '; - } - if (hesk_checkPermission('can_ban_ips', 0)) { - echo ' -
  • - ' . $hesklang['banip'] . ' -
    • '; + + if ($hesk_settings['kb_wysiwyg']) { + ?> + + - - - ' . $hesklang['email_templates'] . ' - - '; - } - if (hesk_checkPermission('can_man_ticket_statuses', 0)) { - echo ' -
  • - ' . $hesklang['statuses'] . ' -
    • - '; - } - // Show a link to custom_fields.php if user has permission to do so - if ( hesk_checkPermission('can_man_settings',0) ) { - echo ' -
  • - ' . $hesklang['tab_4'] . ' -
    • - '; - } - ?> -
-
-
-
- + + + + + + + + + + + +
+
+

+
+
+
+
+ - if (isset($_SESSION['new_sm']) && !isset($_SESSION['edit_sm'])) { - $_SESSION['new_sm'] = hesk_stripArray($_SESSION['new_sm']); - } - - if (isset($_SESSION['preview_sm'])) { - hesk_service_message($_SESSION['new_sm']); - } - - if ($hesk_settings['kb_wysiwyg']) { - ?> - - -
-
-

+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
-
+
+ ' . $hesklang['no_sm'] . '

'; - } else { - // List of staff - if (!isset($admins)) { - $admins = array(); - $res2 = hesk_dbQuery("SELECT `id`,`name` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users`"); - while ($row = hesk_dbFetchAssoc($res2)) { - $admins[$row['id']] = $row['name']; - } - } - - ?> - - - - - - - - - - - - - - - - - - - -
  
-
- - -
- 		- 1) { - if ($k == 1) { - ?> - - - - - - - - - - - - - - - - -   -
- +
+ + + + + + +
+
-
+
+ -
-
-

+
+
+ +
+
+
+
+ +
+
-
- -
- +
+ -
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- - -
- +
+ data-error="" required> +
+
+
+
+ - - - - -
-
-
-
- - -
-
- -
-
-
-
- -
-
-
-
- - -
- data-error="" required> -
-
-
-
- - -
+
-
-
-
- ' : ''; ?> - - -
-
- - -
-
-
- +
-
+
+ ' : ''; ?> + + +
+
+ + +
+
+
+
+
+ +
+var users = [];'; +$usersRs = hesk_dbQuery("SELECT `id`, `name` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` WHERE `active` = '1'"); +$users = array(); +while ($row = hesk_dbFetchAssoc($usersRs)) { + $users[] = $row; + echo "users[" . $row['id'] . "] = { + id: ".$row['id'].", + name: '".$row['name']."' + }\n"; +} +echo ''; +?> + + + 4 || $style < 0) { - $style = 0; - } - - $type = empty($_POST['type']) ? 0 : 1; - $icon = hesk_POST('icon'); - $title = hesk_input(hesk_POST('title')) or $hesk_error_buffer[] = $hesklang['sm_e_title']; - $message = hesk_getHTML(hesk_POST('message')); - - // Clean the HTML code - require(HESK_PATH . 'inc/htmlpurifier/HeskHTMLPurifier.php'); - $purifier = new HeskHTMLPurifier($hesk_settings['cache_dir']); - $message = $purifier->heskPurify($message); - - // Any errors? - if (count($hesk_error_buffer)) { - $_SESSION['edit_sm'] = true; - - $_SESSION['new_sm'] = array( - 'id' => $id, - 'style' => $style, - 'type' => $type, - 'title' => $title, - 'icon' => $icon, - 'message' => hesk_input(hesk_POST('message')), - ); - - $tmp = ''; - foreach ($hesk_error_buffer as $error) { - $tmp .= "
  • $error
    • \n"; - } - $hesk_error_buffer = $tmp; - - $hesk_error_buffer = $hesklang['rfm'] . '

      ' . $hesk_error_buffer . '
    '; - hesk_process_messages($hesk_error_buffer, 'service_messages.php'); - } - - // Just preview the message? - if (isset($_POST['sm_preview'])) { - $_SESSION['preview_sm'] = true; - $_SESSION['edit_sm'] = true; - - $_SESSION['new_sm'] = array( - 'id' => $id, - 'style' => $style, - 'type' => $type, - 'title' => $title, - 'message' => $message, - 'icon' => $icon, - ); - - header('Location: service_messages.php'); - exit; - } - - // Update the service message in the database - hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "service_messages` SET - `author` = '" . intval($_SESSION['id']) . "', - `title` = '" . hesk_dbEscape($title) . "', - `message` = '" . hesk_dbEscape($message) . "', - `style` = '{$style}', - `type` = '{$type}', - `icon` = '{$icon}' - WHERE `id`={$id}"); - - $_SESSION['smord'] = $id; - hesk_process_messages($hesklang['sm_mdf'], 'service_messages.php', 'SUCCESS'); - -} // End save_sm() - - -function edit_sm() -{ - global $hesk_settings, $hesklang; - - // Get service messageID - $id = intval(hesk_GET('id')) or hesk_error($hesklang['sm_e_id']); - - // Get details from the database - $res = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "service_messages` WHERE `id`={$id} LIMIT 1"); - if (hesk_dbNumRows($res) != 1) { - hesk_error($hesklang['sm_not_found']); - } - $sm = hesk_dbFetchAssoc($res); - - $_SESSION['new_sm'] = $sm; - $_SESSION['edit_sm'] = true; - -} // End edit_sm() - - -function order_sm() -{ - global $hesk_settings, $hesklang; - - // A security check - hesk_token_check(); - - // Get ID and move parameters - $id = intval(hesk_GET('id')) or hesk_error($hesklang['sm_e_id']); - $move = intval(hesk_GET('move')); - $_SESSION['smord'] = $id; - - // Update article details - hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "service_messages` SET `order`=`order`+" . intval($move) . " WHERE `id`={$id}"); - - // Update order of all service messages - update_sm_order(); - - // Finish - header('Location: service_messages.php'); - exit(); - -} // End order_sm() - - -function update_sm_order() -{ - global $hesk_settings, $hesklang; - - // Get list of current service messages - $res = hesk_dbQuery("SELECT `id` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "service_messages` ORDER BY `order` ASC"); - - // Update database - $i = 10; - while ($sm = hesk_dbFetchAssoc($res)) { - hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "service_messages` SET `order`=" . intval($i) . " WHERE `id`='" . intval($sm['id']) . "'"); - $i += 10; - } - - return true; - -} // END update_sm_order() - - -function remove_sm() -{ - global $hesk_settings, $hesklang; - - // A security check - hesk_token_check(); - - // Get ID - $id = intval(hesk_GET('id')) or hesk_error($hesklang['sm_e_id']); - - // Delete the service message - hesk_dbQuery("DELETE FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "service_messages` WHERE `id`={$id}"); - - // Were we successful? - if (hesk_dbAffectedRows() == 1) { - hesk_process_messages($hesklang['sm_deleted'], './service_messages.php', 'SUCCESS'); - } else { - hesk_process_messages($hesklang['sm_not_found'], './service_messages.php'); - } - -} // End remove_sm() - - -function new_sm() -{ - global $hesk_settings, $hesklang, $listBox; - global $hesk_error_buffer; - - // A security check - # hesk_token_check('POST'); - - $hesk_error_buffer = array(); - - $style = intval(hesk_POST('style', 0)); - if ($style > 4 || $style < 0) { - $style = 0; - } - - $type = empty($_POST['type']) ? 0 : 1; - $icon = hesk_POST('icon'); - $title = hesk_input(hesk_POST('title')) or $hesk_error_buffer[] = $hesklang['sm_e_title']; - $message = hesk_getHTML(hesk_POST('message')); - - // Clean the HTML code - require(HESK_PATH . 'inc/htmlpurifier/HeskHTMLPurifier.php'); - $purifier = new HeskHTMLPurifier($hesk_settings['cache_dir']); - $message = $purifier->heskPurify($message); - - // Any errors? - if (count($hesk_error_buffer)) { - $_SESSION['new_sm'] = array( - 'style' => $style, - 'type' => $type, - 'title' => $title, - 'icon' => $icon, - 'message' => hesk_input(hesk_POST('message')), - ); - - $tmp = ''; - foreach ($hesk_error_buffer as $error) { - $tmp .= "
  • $error
    • \n"; - } - $hesk_error_buffer = $tmp; - - $hesk_error_buffer = $hesklang['rfm'] . '

      ' . $hesk_error_buffer . '
    '; - hesk_process_messages($hesk_error_buffer, 'service_messages.php'); - } - - // Just preview the message? - if (isset($_POST['sm_preview'])) { - $_SESSION['preview_sm'] = true; - - $_SESSION['new_sm'] = array( - 'style' => $style, - 'type' => $type, - 'title' => $title, - 'icon' => $icon, - 'message' => $message, - ); - - header('Location: service_messages.php'); - exit; - } - - - - $_SESSION['smord'] = hesk_dbInsertID(); - hesk_process_messages($hesklang['sm_added'], 'service_messages.php', 'SUCCESS'); - -} // End new_sm() - ?> diff --git a/api/BusinessLogic/ServiceMessages/ServiceMessageHandler.php b/api/BusinessLogic/ServiceMessages/ServiceMessageHandler.php index d70f142f..9e70ceda 100644 --- a/api/BusinessLogic/ServiceMessages/ServiceMessageHandler.php +++ b/api/BusinessLogic/ServiceMessages/ServiceMessageHandler.php @@ -5,6 +5,7 @@ namespace BusinessLogic\ServiceMessages; // TODO Test use BusinessLogic\Exceptions\ValidationException; +use BusinessLogic\Navigation\Direction; use BusinessLogic\ValidationModel; use DataAccess\ServiceMessages\ServiceMessagesGateway; @@ -17,7 +18,7 @@ class ServiceMessageHandler extends \BaseClass { } function createServiceMessage($serviceMessage, $heskSettings) { - $this->validate($serviceMessage); + $this->validate($serviceMessage, $heskSettings); if ($serviceMessage->icon === null) { switch ($serviceMessage->style) { @@ -47,7 +48,7 @@ class ServiceMessageHandler extends \BaseClass { } function editServiceMessage($serviceMessage, $heskSettings) { - $this->validate($serviceMessage, false); + $this->validate($serviceMessage, $heskSettings, false); if ($serviceMessage->icon === null) { switch ($serviceMessage->style) { @@ -72,19 +73,52 @@ class ServiceMessageHandler extends \BaseClass { return $this->serviceMessageGateway->updateServiceMessage($serviceMessage, $heskSettings); } + function deleteServiceMessage($id, $heskSettings) { + $this->serviceMessageGateway->deleteServiceMessage($id, $heskSettings); + } + + function sortServiceMessage($id, $direction, $heskSettings) { + $serviceMessages = $this->serviceMessageGateway->getServiceMessages($heskSettings); + $serviceMessage = null; + foreach ($serviceMessages as $innerServiceMessage) { + if ($innerServiceMessage->id === intval($id)) { + $serviceMessage = $innerServiceMessage; + break; + } + } + + if ($serviceMessage === null) { + throw new \BaseException("Could not find category with ID {$id}!"); + } + + if ($direction === Direction::UP) { + $serviceMessage->order -= 15; + } else { + $serviceMessage->order += 15; + } + + $this->serviceMessageGateway->updateServiceMessage($serviceMessage, $heskSettings); + $this->serviceMessageGateway->resortAllServiceMessages($heskSettings); + } + /** * @param $serviceMessage ServiceMessage * @param bool $isNew * @throws ValidationException */ - private function validate($serviceMessage, $isNew = true) { + private function validate($serviceMessage, $heskSettings, $isNew = true) { $validationModel = new ValidationModel(); if ($isNew && $serviceMessage->createdBy < 1) { $validationModel->errorKeys[] = 'MISSING_CREATOR'; } + if ($serviceMessage->message === null || trim($serviceMessage->message) === '') { $validationModel->errorKeys[] = 'MISSING_MESSAGE'; + } else { + $htmlPurifier = new \HeskHTMLPurifier($heskSettings['cache_dir']); + $serviceMessage->message = $htmlPurifier->heskPurify($serviceMessage->message); } + if ($serviceMessage->title === null || trim($serviceMessage->title) === '') { $validationModel->errorKeys[] = 'MISSING_TITLE'; } diff --git a/api/Controllers/ServiceMessages/ServiceMessagesController.php b/api/Controllers/ServiceMessages/ServiceMessagesController.php index f17d6e14..94ff9776 100644 --- a/api/Controllers/ServiceMessages/ServiceMessagesController.php +++ b/api/Controllers/ServiceMessages/ServiceMessagesController.php @@ -6,6 +6,7 @@ use BusinessLogic\Security\UserContext; use BusinessLogic\ServiceMessages\ServiceMessage; use BusinessLogic\ServiceMessages\ServiceMessageHandler; use Controllers\JsonRetriever; +use Symfony\Component\EventDispatcher\Tests\Service; class ServiceMessagesController extends \BaseClass { function get() { @@ -41,6 +42,17 @@ class ServiceMessagesController extends \BaseClass { return output($element); } + function delete($id) { + global $applicationContext, $hesk_settings; + + /* @var $handler ServiceMessageHandler */ + $handler = $applicationContext->get(ServiceMessageHandler::clazz()); + + $handler->deleteServiceMessage($id, $hesk_settings); + + return http_response_code(204); + } + /** * @param $data array * @param $userContext UserContext diff --git a/api/DataAccess/ServiceMessages/ServiceMessagesGateway.php b/api/DataAccess/ServiceMessages/ServiceMessagesGateway.php index 9dfb1796..b2539d12 100644 --- a/api/DataAccess/ServiceMessages/ServiceMessagesGateway.php +++ b/api/DataAccess/ServiceMessages/ServiceMessagesGateway.php @@ -3,7 +3,6 @@ namespace DataAccess\ServiceMessages; -use BusinessLogic\DateTimeHelpers; use BusinessLogic\ServiceMessages\ServiceMessage; use BusinessLogic\ServiceMessages\ServiceMessageStyle; use DataAccess\CommonDao; @@ -49,6 +48,10 @@ class ServiceMessagesGateway extends CommonDao { return $serviceMessage; } + /** + * @param $heskSettings + * @return ServiceMessage[] + */ function getServiceMessages($heskSettings) { $this->init(); @@ -100,4 +103,31 @@ class ServiceMessagesGateway extends CommonDao { return $serviceMessage; } + + function deleteServiceMessage($id, $heskSettings) { + $this->init(); + + hesk_dbQuery("DELETE FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "service_messages` + WHERE `id` = " . intval($id)); + + $this->close(); + } + + function resortAllServiceMessages($heskSettings) { + $this->init(); + + $rs = hesk_dbQuery("SELECT `id` FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "service_messages` + ORDER BY `order` ASC"); + + $sortValue = 10; + while ($row = hesk_dbFetchAssoc($rs)) { + hesk_dbQuery("UPDATE `" . hesk_dbEscape($heskSettings['db_pfix']) . "service_messages` + SET `order` = " . intval($sortValue) . " + WHERE `id` = " . intval($row['id'])); + + $sortValue += 10; + } + + $this->close(); + } } \ No newline at end of file diff --git a/api/autoload.php b/api/autoload.php index 0f14ff20..cf548485 100644 --- a/api/autoload.php +++ b/api/autoload.php @@ -12,6 +12,7 @@ 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'); +require_once(__DIR__ . '/../inc/htmlpurifier/HeskHTMLPurifier.php'); hesk_load_api_database_functions(); diff --git a/api/index.php b/api/index.php index afa70f70..9c4b3e35 100644 --- a/api/index.php +++ b/api/index.php @@ -203,7 +203,15 @@ Link::all(array( // Settings '/v1/settings' => action(\Controllers\Settings\SettingsController::clazz(), RequestMethod::all()), // Service Messages - '/v1/service-messages' => action(\Controllers\ServiceMessages\ServiceMessagesController::clazz(), array(RequestMethod::GET, RequestMethod::POST, RequestMethod::PUT)), + '/v1/service-messages' => action(\Controllers\ServiceMessages\ServiceMessagesController::clazz(), + array(RequestMethod::GET, RequestMethod::POST, RequestMethod::PUT), + SecurityHandler::INTERNAL_OR_AUTH_TOKEN), + '/v1/service-messages/{i}' => action(\Controllers\ServiceMessages\ServiceMessagesController::clazz(), + array(RequestMethod::DELETE), + SecurityHandler::INTERNAL_OR_AUTH_TOKEN), + '/v1/service-messages/{i}/sort/{s}' => action(\Controllers\ServiceMessages\ServiceMessagesController::clazz() . '::sort', + array(RequestMethod::POST), + SecurityHandler::INTERNAL), /* Internal use only routes */ // Resend email response diff --git a/internal-api/js/service-messages.js b/internal-api/js/service-messages.js new file mode 100644 index 00000000..a2c3f950 --- /dev/null +++ b/internal-api/js/service-messages.js @@ -0,0 +1,362 @@ +var serviceMessages = []; + +$(document).ready(function() { + loadTable(); + bindEditModal(); + bindModalCancelCallback(); + bindFormSubmit(); + bindDeleteButton(); + bindCreateModal(); + bindSortButtons(); +}); + + +function loadTable() { + $('#overlay').show(); + var heskUrl = $('p#hesk-path').text(); + var $tableBody = $('#table-body'); + + $.ajax({ + method: 'GET', + url: heskUrl + 'api/index.php/v1/service-messages', + headers: { 'X-Internal-Call': true }, + success: function(data) { + $tableBody.html(''); + + if (data.length === 0) { + // TODO "No Service Messages Found" + $('#overlay').hide(); + return; + } + + var first = true; + var lastElement = null; + $.each(data, function() { + var $template = $($('#service-message-template').html()); + + $template.find('span[data-property="id"]').attr('data-value', this.id); + $template.find('span[data-property="title"]').html( + getFormattedTitle(this.icon, this.title, this.style)); + $template.find('span[data-property="author"]').text(users[this.createdBy].name); + if (this.published) { + $template.find('span[data-property="type"]').text(mfhLang.text('sm_published')); + } else { + $template.find('span[data-property="type"]').text(mfhLang.text('sm_draft')); + } + + $tableBody.append($template); + + serviceMessages[this.id] = this; + + lastElement = this; + + if (first) { + $template.find('[data-direction="up"]').css('visibility', 'hidden'); + first = false; + } + }); + + if (lastElement) { + //-- Hide the down arrow on the last element + $('[data-value="' + lastElement.id + '"]').parent().parent() + .find('[data-direction="down"]').css('visibility', 'hidden'); + } + }, + error: function(data) { + mfhAlert.errorWithLog(mfhLang.text('error_retrieving_categories'), data.responseJSON); + console.error(data); + }, + complete: function() { + refreshBackgroundVolatileItems(); + $('[data-toggle="popover"]').popover({ + trigger: 'hover', + container: 'body' + }); + $('#overlay').hide(); + } + }); +} + +function getFormattedTitle(icon, title, style) { + var $template = $($('#service-message-title-template').html()); + + var alertClass = 'none'; + switch (style) { + case 'ERROR': + alertClass = 'alert alert-danger'; + break; + case 'NOTICE': + alertClass = 'alert alert-warning'; + break; + case 'INFO': + alertClass = 'alert alert-info'; + break; + case 'SUCCESS': + alertClass = 'alert alert-success'; + break; + } + $template.addClass(alertClass) + .find('[data-property="icon"]').addClass(icon).end() + .find('[data-property="title"]').text(title); + + return $template; +} + +function getServiceMessagePreview(icon, title, message, style) { + var $template = $('#service-message-preview-template').html(); + + var alertClass = 'none'; + switch (style) { + case 'ERROR': + alertClass = 'alert alert-danger'; + break; + case 'NOTICE': + alertClass = 'alert alert-warning'; + break; + case 'INFO': + alertClass = 'alert alert-info'; + break; + case 'SUCCESS': + alertClass = 'alert alert-success'; + break; + } + $template = $template.replace('none', alertClass) + .replace('{{TITLE}}', title) + .replace('{{MESSAGE}}', message); + $template = $($template); + if (icon !== '') { + $template.find('i.fa').removeClass('fa').addClass(icon); + } + + return $template; +} + +function bindEditModal() { + $(document).on('click', '[data-action="edit"]', function() { + var element = categories[$(this).parent().parent().find('[data-property="id"]').text()]; + var $modal = $('#category-modal'); + + $modal.find('#edit-label').show(); + $modal.find('#create-label').hide(); + + $modal.find('input[name="name"]').val(element.name).end() + .find('select[name="priority"]').val(element.priority).end() + .find('select[name="manager"]').val(element.manager === null ? 0 : element.manager).end() + .find('input[name="id"]').val(element.id).end() + .find('select[name="usage"]').val(element.usage).end() + .find('input[name="display-border"][value="' + (element.displayBorder ? 1 : 0) + '"]') + .prop('checked', 'checked').end(); + + var backgroundColor = element.backgroundColor; + var foregroundColor = element.foregroundColor; + var colorpickerOptions = { + format: 'hex', + color: backgroundColor + }; + $modal.find('input[name="background-color"]') + .colorpicker(colorpickerOptions).end().modal('show'); + + colorpickerOptions = { + format: 'hex' + }; + if (foregroundColor != '' && foregroundColor !== 'AUTO') { + colorpickerOptions.color = foregroundColor; + } + + $modal.find('input[name="foreground-color"]') + .colorpicker(colorpickerOptions).end().modal('show'); + + if (foregroundColor === '' || foregroundColor === 'AUTO') { + $modal.find('input[name="foreground-color"]').colorpicker('setValue', '#fff'); + $modal.find('input[name="foreground-color"]').val(''); + } + + $modal.find('input[name="cat-order"]').val(element.catOrder); + $modal.find('input[name="autoassign"][value="' + (element.autoAssign ? 1 : 0) + '"]') + .prop('checked', 'checked'); + $modal.find('input[name="type"][value="' + (element.type ? 1 : 0) + '"]') + .prop('checked', 'checked'); + $modal.find('textarea[name="description"]').val(element.description === null ? '' : element.description); + + $modal.modal('show'); + }); +} + +function bindCreateModal() { + $('#create-button').click(function() { + var $modal = $('#category-modal'); + $modal.find('#edit-label').hide(); + $modal.find('#create-label').show(); + + $modal.find('input[name="name"]').val(''); + $modal.find('select[name="priority"]').val(3); // Low priority + $modal.find('select[name="usage"]').val(0); // Tickets and events + $modal.find('input[name="id"]').val(-1); + $modal.find('textarea[name="description"]').val(''); + $modal.find('input[name="cat-order"]').val(''); + $modal.find('input[name="type"][value="0"]').prop('checked', 'checked'); + $modal.find('input[name="autoassign"][value="0"]').prop('checked', 'checked'); + $modal.find('input[name="display-border"][value="0"]') + .prop('checked', 'checked'); + + var colorpickerOptions = { + format: 'hex', + color: '#fff' + }; + $modal.find('input[name="background-color"]') + .colorpicker(colorpickerOptions).end().modal('show'); + $modal.find('input[name="background-color"]').val(''); + $modal.find('input[name="foreground-color"]') + .colorpicker(colorpickerOptions).end().modal('show'); + $modal.find('input[name="foreground-color"]').val(''); + + $modal.modal('show'); + }); +} + +function bindModalCancelCallback() { + $('.cancel-callback').click(function() { + var $editCategoryModal = $('#category-modal'); + + $editCategoryModal.find('input[name="background-color"]').val('').colorpicker('destroy').end(); + $editCategoryModal.find('input[name="foreground-color"]').val('').colorpicker('destroy').end(); + $editCategoryModal.find('input[name="display-border"][value="1"]').prop('checked'); + $editCategoryModal.find('input[name="display-border"][value="0"]').prop('checked'); + $editCategoryModal.find('input[name="autoassign"][value="1"]').prop('checked'); + $editCategoryModal.find('input[name="autoassign"][value="0"]').prop('checked'); + }); +} + +function bindFormSubmit() { + $('form#manage-category').submit(function(e) { + e.preventDefault(); + var heskUrl = $('p#hesk-path').text(); + + var $modal = $('#category-modal'); + + var foregroundColor = $modal.find('input[name="foreground-color"]').val(); + var manager = parseInt($modal.find('select[name="manager"]').val()); + var data = { + autoassign: $modal.find('input[name="autoassign"]').val() === 'true', + backgroundColor: $modal.find('input[name="background-color"]').val(), + description: $modal.find('textarea[name="description"]').val(), + displayBorder: $modal.find('input[name="display-border"]:checked').val() === '1', + foregroundColor: foregroundColor === '' ? 'AUTO' : foregroundColor, + name: $modal.find('input[name="name"]').val(), + priority: parseInt($modal.find('select[name="priority"]').val()), + manager: manager === 0 ? null : manager, + type: parseInt($modal.find('input[name="type"]:checked').val()), + usage: parseInt($modal.find('select[name="usage"]').val()), + catOrder: parseInt($modal.find('input[name="cat-order"]').val()) + }; + + var url = heskUrl + 'api/index.php/v1/categories/'; + var method = 'POST'; + + var categoryId = parseInt($modal.find('input[name="id"]').val()); + if (categoryId !== -1) { + url += categoryId; + method = 'PUT'; + } + + $modal.find('#action-buttons').find('.cancel-button').attr('disabled', 'disabled'); + $modal.find('#action-buttons').find('.save-button').attr('disabled', 'disabled'); + + $.ajax({ + method: 'POST', + url: url, + headers: { + 'X-Internal-Call': true, + 'X-HTTP-Method-Override': method + }, + data: JSON.stringify(data), + success: function(data) { + var format = undefined; + if (categoryId === -1) { + format = mfhLang.html('cat_name_added'); + mfhAlert.success(format.replace('%s', data.name)); + } else { + format = mfhLang.html('category_updated'); + mfhAlert.success(format.replace('%s', data.name)); + } + $modal.modal('hide'); + loadTable(); + }, + error: function(data) { + mfhAlert.errorWithLog(mfhLang.text('error_saving_updating_category'), data.responseJSON); + console.error(data); + }, + complete: function(data) { + $modal.find('#action-buttons').find('.cancel-button').removeAttr('disabled'); + $modal.find('#action-buttons').find('.save-button').removeAttr('disabled'); + } + }); + }); +} + +function bindDeleteButton() { + $(document).on('click', '[data-action="delete"]', function() { + $('#overlay').show(); + + var heskUrl = $('p#hesk-path').text(); + var element = categories[$(this).parent().parent().find('[data-property="id"]').text()]; + + $.ajax({ + method: 'POST', + url: heskUrl + 'api/index.php/v1/categories/' + element.id, + headers: { + 'X-Internal-Call': true, + 'X-HTTP-Method-Override': 'DELETE' + }, + success: function() { + mfhAlert.success(mfhLang.text('cat_removed')); + loadTable(); + }, + error: function(data) { + $('#overlay').hide(); + mfhAlert.errorWithLog(mfhLang.text('error_deleting_category'), data.responseJSON); + console.error(data); + } + }); + }); +} + +function bindGenerateLinkModal() { + var $modal = $('#generate-link-modal'); + + $modal.find('.input-group-addon').click(function() { + clipboard.copy($modal.find('input[type="text"]').val()); + mfhAlert.success(mfhLang.text('copied_to_clipboard')); + }); + + $(document).on('click', '[data-property="generate-link"] i.fa-code', function () { + var heskUrl = $('p#hesk-url').text(); + + var url = heskUrl + '/index.php?a=add&catid=' + $(this).parent().data('category-id'); + + $modal.find('input[type="text"]').val(url).end().modal('show'); + }); +} + +function bindSortButtons() { + $(document).on('click', '[data-action="sort"]', function() { + $('#overlay').show(); + var heskUrl = $('p#hesk-path').text(); + var direction = $(this).data('direction'); + var element = categories[$(this).parent().parent().parent().find('[data-property="id"]').text()]; + + $.ajax({ + method: 'POST', + url: heskUrl + 'api/index.php/v1-internal/categories/' + element.id + '/sort/' + direction, + headers: { 'X-Internal-Call': true }, + success: function() { + loadTable(); + }, + error: function(data) { + mfhAlert.errorWithLog(mfhLang.text('error_sorting_categories'), data.responseJSON); + console.error(data); + $('#overlay').hide(); + } + }) + }); +} \ No newline at end of file From a8abfcd4a11216a3af59e205c3398a7b7e69338d Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Mon, 13 Nov 2017 13:07:19 -0500 Subject: [PATCH 07/74] More progress on service messages --- admin/service_messages.php | 309 +++++++++--------- .../ServiceMessagesController.php | 1 - internal-api/js/service-messages.js | 56 +--- language/en/text.php | 3 + 4 files changed, 165 insertions(+), 204 deletions(-) diff --git a/admin/service_messages.php b/admin/service_messages.php index b83d9378..6368b572 100644 --- a/admin/service_messages.php +++ b/admin/service_messages.php @@ -57,6 +57,12 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
    +
    + +
    -
    -
    -

    -
    -
    -
    -
    - - -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - - -
    - - - - - - -
    -
    -
    -
    - - -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - - -
    - data-error="" required> -
    -
    -
    -
    - - -
    - -
    -
    -
    - ' : ''; ?> - - -
    -
    - - -
    -
    -
    -
    -
    -
    @@ -262,10 +111,156 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); + var users = [];'; diff --git a/api/Controllers/ServiceMessages/ServiceMessagesController.php b/api/Controllers/ServiceMessages/ServiceMessagesController.php index 94ff9776..faf9f568 100644 --- a/api/Controllers/ServiceMessages/ServiceMessagesController.php +++ b/api/Controllers/ServiceMessages/ServiceMessagesController.php @@ -6,7 +6,6 @@ use BusinessLogic\Security\UserContext; use BusinessLogic\ServiceMessages\ServiceMessage; use BusinessLogic\ServiceMessages\ServiceMessageHandler; use Controllers\JsonRetriever; -use Symfony\Component\EventDispatcher\Tests\Service; class ServiceMessagesController extends \BaseClass { function get() { diff --git a/internal-api/js/service-messages.js b/internal-api/js/service-messages.js index a2c3f950..fc3754af 100644 --- a/internal-api/js/service-messages.js +++ b/internal-api/js/service-messages.js @@ -3,7 +3,6 @@ var serviceMessages = []; $(document).ready(function() { loadTable(); bindEditModal(); - bindModalCancelCallback(); bindFormSubmit(); bindDeleteButton(); bindCreateModal(); @@ -24,7 +23,7 @@ function loadTable() { $tableBody.html(''); if (data.length === 0) { - // TODO "No Service Messages Found" + $tableBody.append('' + mfhLang.text('no_sm') + ''); $('#overlay').hide(); return; } @@ -63,15 +62,10 @@ function loadTable() { } }, error: function(data) { - mfhAlert.errorWithLog(mfhLang.text('error_retrieving_categories'), data.responseJSON); + mfhAlert.errorWithLog(mfhLang.text('error_retrieving_sm'), data.responseJSON); console.error(data); }, complete: function() { - refreshBackgroundVolatileItems(); - $('[data-toggle="popover"]').popover({ - trigger: 'hover', - container: 'body' - }); $('#overlay').hide(); } }); @@ -184,49 +178,19 @@ function bindEditModal() { function bindCreateModal() { $('#create-button').click(function() { - var $modal = $('#category-modal'); - $modal.find('#edit-label').hide(); - $modal.find('#create-label').show(); - - $modal.find('input[name="name"]').val(''); - $modal.find('select[name="priority"]').val(3); // Low priority - $modal.find('select[name="usage"]').val(0); // Tickets and events - $modal.find('input[name="id"]').val(-1); - $modal.find('textarea[name="description"]').val(''); - $modal.find('input[name="cat-order"]').val(''); - $modal.find('input[name="type"][value="0"]').prop('checked', 'checked'); - $modal.find('input[name="autoassign"][value="0"]').prop('checked', 'checked'); - $modal.find('input[name="display-border"][value="0"]') - .prop('checked', 'checked'); - - var colorpickerOptions = { - format: 'hex', - color: '#fff' - }; - $modal.find('input[name="background-color"]') - .colorpicker(colorpickerOptions).end().modal('show'); - $modal.find('input[name="background-color"]').val(''); - $modal.find('input[name="foreground-color"]') - .colorpicker(colorpickerOptions).end().modal('show'); - $modal.find('input[name="foreground-color"]').val(''); + var $modal = $('#service-message-modal'); + $modal.find('#edit-label').hide().end() + .find('#create-label').show().end() + .find('input[name="style"][value="0"]').prop('checked', 'checked').end() // "None" style + .find('input[name="type"][value="0"]').prop('checked', 'checked').end() // Published + .find('input[name="title"]').val('').end(); + setIcon(''); + tinyMCE.get('content').setContent(''); $modal.modal('show'); }); } -function bindModalCancelCallback() { - $('.cancel-callback').click(function() { - var $editCategoryModal = $('#category-modal'); - - $editCategoryModal.find('input[name="background-color"]').val('').colorpicker('destroy').end(); - $editCategoryModal.find('input[name="foreground-color"]').val('').colorpicker('destroy').end(); - $editCategoryModal.find('input[name="display-border"][value="1"]').prop('checked'); - $editCategoryModal.find('input[name="display-border"][value="0"]').prop('checked'); - $editCategoryModal.find('input[name="autoassign"][value="1"]').prop('checked'); - $editCategoryModal.find('input[name="autoassign"][value="0"]').prop('checked'); - }); -} - function bindFormSubmit() { $('form#manage-category').submit(function(e) { e.preventDefault(); diff --git a/language/en/text.php b/language/en/text.php index d543ccd3..833551f5 100644 --- a/language/en/text.php +++ b/language/en/text.php @@ -2215,5 +2215,8 @@ $hesklang['audit_due_date_changed'] = '%s changed due date to %s'; $hesklang['audit_linked_ticket'] = '%s linked ticket %s to this ticket'; $hesklang['audit_unlinked_ticket'] = '%s unlinked ticket %s'; +// Added or modified in Mods for HESK 3.3.0 +$hesklang['error_retrieving_sm'] = 'An error occurred retrieving service messages!'; + // DO NOT CHANGE BELOW if (!defined('IN_SCRIPT')) die('PHP syntax OK!'); From d897fa2a4bacb07d310d73c4a709f4af0826ebbd Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Mon, 13 Nov 2017 22:13:55 -0500 Subject: [PATCH 08/74] More progress' --- admin/service_messages.php | 10 +-- internal-api/js/service-messages.js | 100 +++++++++++----------------- 2 files changed, 46 insertions(+), 64 deletions(-) diff --git a/admin/service_messages.php b/admin/service_messages.php index 6368b572..8602f3ee 100644 --- a/admin/service_messages.php +++ b/admin/service_messages.php @@ -93,6 +93,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); + @@ -121,7 +122,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); - +
    @@ -224,7 +225,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
    + class="form-control" name="message" id="content">
    @@ -240,7 +241,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
    - +
    \n
    \n " + + +// Loading animation +"
    \n
    \n
    \n
    \n
    \n
    \n
    " + + +// End of modal +"
    "; + +exports.default = injectedHTML; + +},{}],7:[function(require,module,exports){ +'use strict'; + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol ? "symbol" : typeof obj; }; + +var _utils = require('./utils'); + +var _handleSwalDom = require('./handle-swal-dom'); + +var _handleDom = require('./handle-dom'); + +var alertTypes = ['error', 'warning', 'info', 'success', 'input', 'prompt']; + +/* + * Set type, text and actions on modal + */ +var setParameters = function setParameters(params) { + var modal = (0, _handleSwalDom.getModal)(); + + var $title = modal.querySelector('h2'); + var $text = modal.querySelector('p'); + var $cancelBtn = modal.querySelector('button.cancel'); + var $confirmBtn = modal.querySelector('button.confirm'); + + /* + * Title + */ + $title.innerHTML = params.html ? params.title : (0, _handleDom.escapeHtml)(params.title).split('\n').join('
    '); + + /* + * Text + */ + $text.innerHTML = params.html ? params.text : (0, _handleDom.escapeHtml)(params.text || '').split('\n').join('
    '); + if (params.text) (0, _handleDom.show)($text); + + /* + * Custom class + */ + if (params.customClass) { + (0, _handleDom.addClass)(modal, params.customClass); + modal.setAttribute('data-custom-class', params.customClass); + } else { + // Find previously set classes and remove them + var customClass = modal.getAttribute('data-custom-class'); + (0, _handleDom.removeClass)(modal, customClass); + modal.setAttribute('data-custom-class', ''); + } + + /* + * Icon + */ + (0, _handleDom.hide)(modal.querySelectorAll('.sa-icon')); + + if (params.type && !(0, _utils.isIE8)()) { + var _ret = function () { + + var validType = false; + + for (var i = 0; i < alertTypes.length; i++) { + if (params.type === alertTypes[i]) { + validType = true; + break; + } + } + + if (!validType) { + logStr('Unknown alert type: ' + params.type); + return { + v: false + }; + } + + var typesWithIcons = ['success', 'error', 'warning', 'info']; + var $icon = void 0; + + if (typesWithIcons.indexOf(params.type) !== -1) { + $icon = modal.querySelector('.sa-icon.' + 'sa-' + params.type); + (0, _handleDom.show)($icon); + } + + var $input = (0, _handleSwalDom.getInput)(); + + // Animate icon + switch (params.type) { + + case 'success': + (0, _handleDom.addClass)($icon, 'animate'); + (0, _handleDom.addClass)($icon.querySelector('.sa-tip'), 'animateSuccessTip'); + (0, _handleDom.addClass)($icon.querySelector('.sa-long'), 'animateSuccessLong'); + break; + + case 'error': + (0, _handleDom.addClass)($icon, 'animateErrorIcon'); + (0, _handleDom.addClass)($icon.querySelector('.sa-x-mark'), 'animateXMark'); + break; + + case 'warning': + (0, _handleDom.addClass)($icon, 'pulseWarning'); + (0, _handleDom.addClass)($icon.querySelector('.sa-body'), 'pulseWarningIns'); + (0, _handleDom.addClass)($icon.querySelector('.sa-dot'), 'pulseWarningIns'); + break; + + case 'input': + case 'prompt': + $input.setAttribute('type', params.inputType); + $input.value = params.inputValue; + $input.setAttribute('placeholder', params.inputPlaceholder); + (0, _handleDom.addClass)(modal, 'show-input'); + setTimeout(function () { + $input.focus(); + $input.addEventListener('keyup', swal.resetInputError); + }, 400); + break; + } + }(); + + if ((typeof _ret === 'undefined' ? 'undefined' : _typeof(_ret)) === "object") return _ret.v; + } + + /* + * Custom image + */ + if (params.imageUrl) { + var $customIcon = modal.querySelector('.sa-icon.sa-custom'); + + $customIcon.style.backgroundImage = 'url(' + params.imageUrl + ')'; + (0, _handleDom.show)($customIcon); + + var _imgWidth = 80; + var _imgHeight = 80; + + if (params.imageSize) { + var dimensions = params.imageSize.toString().split('x'); + var imgWidth = dimensions[0]; + var imgHeight = dimensions[1]; + + if (!imgWidth || !imgHeight) { + logStr('Parameter imageSize expects value with format WIDTHxHEIGHT, got ' + params.imageSize); + } else { + _imgWidth = imgWidth; + _imgHeight = imgHeight; + } + } + + $customIcon.setAttribute('style', $customIcon.getAttribute('style') + 'width:' + _imgWidth + 'px; height:' + _imgHeight + 'px'); + } + + /* + * Show cancel button? + */ + modal.setAttribute('data-has-cancel-button', params.showCancelButton); + if (params.showCancelButton) { + $cancelBtn.style.display = 'inline-block'; + } else { + (0, _handleDom.hide)($cancelBtn); + } + + /* + * Show confirm button? + */ + modal.setAttribute('data-has-confirm-button', params.showConfirmButton); + if (params.showConfirmButton) { + $confirmBtn.style.display = 'inline-block'; + } else { + (0, _handleDom.hide)($confirmBtn); + } + + /* + * Custom text on cancel/confirm buttons + */ + if (params.cancelButtonText) { + $cancelBtn.innerHTML = (0, _handleDom.escapeHtml)(params.cancelButtonText); + } + if (params.confirmButtonText) { + $confirmBtn.innerHTML = (0, _handleDom.escapeHtml)(params.confirmButtonText); + } + + /* + * Reset confirm buttons to default class (Ugly fix) + */ + $confirmBtn.className = 'confirm btn btn-lg'; + + /* + * Attach selected class to the sweet alert modal + */ + (0, _handleDom.addClass)(modal, params.containerClass); + + /* + * Set confirm button to selected class + */ + (0, _handleDom.addClass)($confirmBtn, params.confirmButtonClass); + + /* + * Set cancel button to selected class + */ + (0, _handleDom.addClass)($cancelBtn, params.cancelButtonClass); + + /* + * Set title to selected class + */ + (0, _handleDom.addClass)($title, params.titleClass); + + /* + * Set text to selected class + */ + (0, _handleDom.addClass)($text, params.textClass); + + /* + * Allow outside click + */ + modal.setAttribute('data-allow-outside-click', params.allowOutsideClick); + + /* + * Callback function + */ + var hasDoneFunction = params.doneFunction ? true : false; + modal.setAttribute('data-has-done-function', hasDoneFunction); + + /* + * Animation + */ + if (!params.animation) { + modal.setAttribute('data-animation', 'none'); + } else if (typeof params.animation === 'string') { + modal.setAttribute('data-animation', params.animation); // Custom animation + } else { + modal.setAttribute('data-animation', 'pop'); + } + + /* + * Timer + */ + modal.setAttribute('data-timer', params.timer); +}; + +exports.default = setParameters; + +},{"./handle-dom":3,"./handle-swal-dom":5,"./utils":8}],8:[function(require,module,exports){ +'use strict'; + +Object.defineProperty(exports, "__esModule", { + value: true +}); +/* + * Allow user to pass their own params + */ +var extend = function extend(a, b) { + for (var key in b) { + if (b.hasOwnProperty(key)) { + a[key] = b[key]; + } + } + return a; +}; + +/* + * Check if the user is using Internet Explorer 8 (for fallbacks) + */ +var isIE8 = function isIE8() { + return window.attachEvent && !window.addEventListener; +}; + +/* + * IE compatible logging for developers + */ +var logStr = function logStr(string) { + if (window.console) { + // IE... + window.console.log('SweetAlert: ' + string); + } +}; + +exports.extend = extend; +exports.isIE8 = isIE8; +exports.logStr = logStr; + +},{}],9:[function(require,module,exports){ +'use strict'; + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol ? "symbol" : typeof obj; }; // SweetAlert +// 2014-2015 (c) - Tristan Edwards +// github.com/t4t5/sweetalert + +/* + * jQuery-like functions for manipulating the DOM + */ + + +/* + * Handy utilities + */ + + +/* + * Handle sweetAlert's DOM elements + */ + + +// Handle button events and keyboard events + + +// Default values + + +var _handleDom = require('./modules/handle-dom'); + +var _utils = require('./modules/utils'); + +var _handleSwalDom = require('./modules/handle-swal-dom'); + +var _handleClick = require('./modules/handle-click'); + +var _handleKey = require('./modules/handle-key'); + +var _handleKey2 = _interopRequireDefault(_handleKey); + +var _defaultParams = require('./modules/default-params'); + +var _defaultParams2 = _interopRequireDefault(_defaultParams); + +var _setParams = require('./modules/set-params'); + +var _setParams2 = _interopRequireDefault(_setParams); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +/* + * Remember state in cases where opening and handling a modal will fiddle with it. + * (We also use window.previousActiveElement as a global variable) + */ +var previousWindowKeyDown; +var lastFocusedButton; + +/* + * Global sweetAlert function + * (this is what the user calls) + */ +var sweetAlert, _swal; + +exports.default = sweetAlert = _swal = function swal() { + var customizations = arguments[0]; + + (0, _handleDom.addClass)(document.body, 'stop-scrolling'); + (0, _handleSwalDom.resetInput)(); + + /* + * Use argument if defined or default value from params object otherwise. + * Supports the case where a default value is boolean true and should be + * overridden by a corresponding explicit argument which is boolean false. + */ + function argumentOrDefault(key) { + var args = customizations; + return args[key] === undefined ? _defaultParams2.default[key] : args[key]; + } + + if (customizations === undefined) { + (0, _utils.logStr)('SweetAlert expects at least 1 attribute!'); + return false; + } + + var params = (0, _utils.extend)({}, _defaultParams2.default); + + switch (typeof customizations === 'undefined' ? 'undefined' : _typeof(customizations)) { + + // Ex: swal("Hello", "Just testing", "info"); + case 'string': + params.title = customizations; + params.text = arguments[1] || ''; + params.type = arguments[2] || ''; + break; + + // Ex: swal({ title:"Hello", text: "Just testing", type: "info" }); + case 'object': + if (customizations.title === undefined) { + (0, _utils.logStr)('Missing "title" argument!'); + return false; + } + + params.title = customizations.title; + + for (var customName in _defaultParams2.default) { + params[customName] = argumentOrDefault(customName); + } + + // Show "Confirm" instead of "OK" if cancel button is visible + params.confirmButtonText = params.showCancelButton ? 'Confirm' : _defaultParams2.default.confirmButtonText; + params.confirmButtonText = argumentOrDefault('confirmButtonText'); + + // Callback function when clicking on "OK"/"Cancel" + params.doneFunction = arguments[1] || null; + + break; + + default: + (0, _utils.logStr)('Unexpected type of argument! Expected "string" or "object", got ' + (typeof customizations === 'undefined' ? 'undefined' : _typeof(customizations))); + return false; + + } + + (0, _setParams2.default)(params); + (0, _handleSwalDom.fixVerticalPosition)(); + (0, _handleSwalDom.openModal)(arguments[1]); + + // Modal interactions + var modal = (0, _handleSwalDom.getModal)(); + + /* + * Make sure all modal buttons respond to all events + */ + var $buttons = modal.querySelectorAll('button'); + var buttonEvents = ['onclick']; + var onButtonEvent = function onButtonEvent(e) { + return (0, _handleClick.handleButton)(e, params, modal); + }; + + for (var btnIndex = 0; btnIndex < $buttons.length; btnIndex++) { + for (var evtIndex = 0; evtIndex < buttonEvents.length; evtIndex++) { + var btnEvt = buttonEvents[evtIndex]; + $buttons[btnIndex][btnEvt] = onButtonEvent; + } + } + + // Clicking outside the modal dismisses it (if allowed by user) + (0, _handleSwalDom.getOverlay)().onclick = onButtonEvent; + + previousWindowKeyDown = window.onkeydown; + + var onKeyEvent = function onKeyEvent(e) { + return (0, _handleKey2.default)(e, params, modal); + }; + window.onkeydown = onKeyEvent; + + window.onfocus = function () { + // When the user has focused away and focused back from the whole window. + setTimeout(function () { + // Put in a timeout to jump out of the event sequence. + // Calling focus() in the event sequence confuses things. + if (lastFocusedButton !== undefined) { + lastFocusedButton.focus(); + lastFocusedButton = undefined; + } + }, 0); + }; + + // Show alert with enabled buttons always + _swal.enableButtons(); +}; + +/* + * Set default params for each popup + * @param {Object} userParams + */ + + +sweetAlert.setDefaults = _swal.setDefaults = function (userParams) { + if (!userParams) { + throw new Error('userParams is required'); + } + if ((typeof userParams === 'undefined' ? 'undefined' : _typeof(userParams)) !== 'object') { + throw new Error('userParams has to be a object'); + } + + (0, _utils.extend)(_defaultParams2.default, userParams); +}; + +/* + * Animation when closing modal + */ +sweetAlert.close = _swal.close = function () { + var modal = (0, _handleSwalDom.getModal)(); + + (0, _handleDom.fadeOut)((0, _handleSwalDom.getOverlay)(), 5); + (0, _handleDom.fadeOut)(modal, 5); + (0, _handleDom.removeClass)(modal, 'showSweetAlert'); + (0, _handleDom.addClass)(modal, 'hideSweetAlert'); + (0, _handleDom.removeClass)(modal, 'visible'); + + /* + * Reset icon animations + */ + var $successIcon = modal.querySelector('.sa-icon.sa-success'); + (0, _handleDom.removeClass)($successIcon, 'animate'); + (0, _handleDom.removeClass)($successIcon.querySelector('.sa-tip'), 'animateSuccessTip'); + (0, _handleDom.removeClass)($successIcon.querySelector('.sa-long'), 'animateSuccessLong'); + + var $errorIcon = modal.querySelector('.sa-icon.sa-error'); + (0, _handleDom.removeClass)($errorIcon, 'animateErrorIcon'); + (0, _handleDom.removeClass)($errorIcon.querySelector('.sa-x-mark'), 'animateXMark'); + + var $warningIcon = modal.querySelector('.sa-icon.sa-warning'); + (0, _handleDom.removeClass)($warningIcon, 'pulseWarning'); + (0, _handleDom.removeClass)($warningIcon.querySelector('.sa-body'), 'pulseWarningIns'); + (0, _handleDom.removeClass)($warningIcon.querySelector('.sa-dot'), 'pulseWarningIns'); + + // Reset custom class (delay so that UI changes aren't visible) + setTimeout(function () { + var customClass = modal.getAttribute('data-custom-class'); + (0, _handleDom.removeClass)(modal, customClass); + }, 300); + + // Make page scrollable again + (0, _handleDom.removeClass)(document.body, 'stop-scrolling'); + + // Reset the page to its previous state + window.onkeydown = previousWindowKeyDown; + if (window.previousActiveElement) { + window.previousActiveElement.focus(); + } + lastFocusedButton = undefined; + clearTimeout(modal.timeout); + + return true; +}; + +/* + * Validation of the input field is done by user + * If something is wrong => call showInputError with errorMessage + */ +sweetAlert.showInputError = _swal.showInputError = function (errorMessage) { + var modal = (0, _handleSwalDom.getModal)(); + + var $errorIcon = modal.querySelector('.sa-input-error'); + (0, _handleDom.addClass)($errorIcon, 'show'); + + var $errorContainer = modal.querySelector('.form-group'); + (0, _handleDom.addClass)($errorContainer, 'has-error'); + + $errorContainer.querySelector('.sa-help-text').innerHTML = errorMessage; + + setTimeout(function () { + sweetAlert.enableButtons(); + }, 1); + + modal.querySelector('input').focus(); +}; + +/* + * Reset input error DOM elements + */ +sweetAlert.resetInputError = _swal.resetInputError = function (event) { + // If press enter => ignore + if (event && event.keyCode === 13) { + return false; + } + + var $modal = (0, _handleSwalDom.getModal)(); + + var $errorIcon = $modal.querySelector('.sa-input-error'); + (0, _handleDom.removeClass)($errorIcon, 'show'); + + var $errorContainer = $modal.querySelector('.form-group'); + (0, _handleDom.removeClass)($errorContainer, 'has-error'); +}; + +/* + * Disable confirm and cancel buttons + */ +sweetAlert.disableButtons = _swal.disableButtons = function (event) { + var modal = (0, _handleSwalDom.getModal)(); + var $confirmButton = modal.querySelector('button.confirm'); + var $cancelButton = modal.querySelector('button.cancel'); + $confirmButton.disabled = true; + $cancelButton.disabled = true; +}; + +/* + * Enable confirm and cancel buttons + */ +sweetAlert.enableButtons = _swal.enableButtons = function (event) { + var modal = (0, _handleSwalDom.getModal)(); + var $confirmButton = modal.querySelector('button.confirm'); + var $cancelButton = modal.querySelector('button.cancel'); + $confirmButton.disabled = false; + $cancelButton.disabled = false; +}; + +if (typeof window !== 'undefined') { + // The 'handle-click' module requires + // that 'sweetAlert' was set as global. + window.sweetAlert = window.swal = sweetAlert; +} else { + (0, _utils.logStr)('SweetAlert is a frontend module!'); +} + +},{"./modules/default-params":1,"./modules/handle-click":2,"./modules/handle-dom":3,"./modules/handle-key":4,"./modules/handle-swal-dom":5,"./modules/set-params":7,"./modules/utils":8}]},{},[9]); + +/* + * Use SweetAlert with RequireJS + */ + +if (typeof define === 'function' && define.amd) { + define(function () { + return sweetAlert; + }); +} else if (typeof module !== 'undefined' && module.exports) { + module.exports = sweetAlert; +} + +})(window, document); \ No newline at end of file From f5ff322c33e38291321fc486e78cbb371ea178b5 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Wed, 15 Nov 2017 21:27:45 -0500 Subject: [PATCH 12/74] Remove sweetalert, use a tooltip instead --- admin/service_messages.php | 12 +- css/sweetalert.css | 686 --------------- inc/headerAdmin.inc.php | 2 - internal-api/js/service-messages.js | 27 +- js/sweetalert.js | 1196 --------------------------- 5 files changed, 32 insertions(+), 1891 deletions(-) delete mode 100644 css/sweetalert.css delete mode 100644 js/sweetalert.js diff --git a/admin/service_messages.php b/admin/service_messages.php index b445e70f..c60d7b58 100644 --- a/admin/service_messages.php +++ b/admin/service_messages.php @@ -45,9 +45,10 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');

    - + +

    \n
    \n " + - -// Loading animation -"
    \n
    \n
    \n
    \n
    \n
    \n
    " + - -// End of modal -"
    "; - -exports.default = injectedHTML; - -},{}],7:[function(require,module,exports){ -'use strict'; - -Object.defineProperty(exports, "__esModule", { - value: true -}); - -var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol ? "symbol" : typeof obj; }; - -var _utils = require('./utils'); - -var _handleSwalDom = require('./handle-swal-dom'); - -var _handleDom = require('./handle-dom'); - -var alertTypes = ['error', 'warning', 'info', 'success', 'input', 'prompt']; - -/* - * Set type, text and actions on modal - */ -var setParameters = function setParameters(params) { - var modal = (0, _handleSwalDom.getModal)(); - - var $title = modal.querySelector('h2'); - var $text = modal.querySelector('p'); - var $cancelBtn = modal.querySelector('button.cancel'); - var $confirmBtn = modal.querySelector('button.confirm'); - - /* - * Title - */ - $title.innerHTML = params.html ? params.title : (0, _handleDom.escapeHtml)(params.title).split('\n').join('
    '); - - /* - * Text - */ - $text.innerHTML = params.html ? params.text : (0, _handleDom.escapeHtml)(params.text || '').split('\n').join('
    '); - if (params.text) (0, _handleDom.show)($text); - - /* - * Custom class - */ - if (params.customClass) { - (0, _handleDom.addClass)(modal, params.customClass); - modal.setAttribute('data-custom-class', params.customClass); - } else { - // Find previously set classes and remove them - var customClass = modal.getAttribute('data-custom-class'); - (0, _handleDom.removeClass)(modal, customClass); - modal.setAttribute('data-custom-class', ''); - } - - /* - * Icon - */ - (0, _handleDom.hide)(modal.querySelectorAll('.sa-icon')); - - if (params.type && !(0, _utils.isIE8)()) { - var _ret = function () { - - var validType = false; - - for (var i = 0; i < alertTypes.length; i++) { - if (params.type === alertTypes[i]) { - validType = true; - break; - } - } - - if (!validType) { - logStr('Unknown alert type: ' + params.type); - return { - v: false - }; - } - - var typesWithIcons = ['success', 'error', 'warning', 'info']; - var $icon = void 0; - - if (typesWithIcons.indexOf(params.type) !== -1) { - $icon = modal.querySelector('.sa-icon.' + 'sa-' + params.type); - (0, _handleDom.show)($icon); - } - - var $input = (0, _handleSwalDom.getInput)(); - - // Animate icon - switch (params.type) { - - case 'success': - (0, _handleDom.addClass)($icon, 'animate'); - (0, _handleDom.addClass)($icon.querySelector('.sa-tip'), 'animateSuccessTip'); - (0, _handleDom.addClass)($icon.querySelector('.sa-long'), 'animateSuccessLong'); - break; - - case 'error': - (0, _handleDom.addClass)($icon, 'animateErrorIcon'); - (0, _handleDom.addClass)($icon.querySelector('.sa-x-mark'), 'animateXMark'); - break; - - case 'warning': - (0, _handleDom.addClass)($icon, 'pulseWarning'); - (0, _handleDom.addClass)($icon.querySelector('.sa-body'), 'pulseWarningIns'); - (0, _handleDom.addClass)($icon.querySelector('.sa-dot'), 'pulseWarningIns'); - break; - - case 'input': - case 'prompt': - $input.setAttribute('type', params.inputType); - $input.value = params.inputValue; - $input.setAttribute('placeholder', params.inputPlaceholder); - (0, _handleDom.addClass)(modal, 'show-input'); - setTimeout(function () { - $input.focus(); - $input.addEventListener('keyup', swal.resetInputError); - }, 400); - break; - } - }(); - - if ((typeof _ret === 'undefined' ? 'undefined' : _typeof(_ret)) === "object") return _ret.v; - } - - /* - * Custom image - */ - if (params.imageUrl) { - var $customIcon = modal.querySelector('.sa-icon.sa-custom'); - - $customIcon.style.backgroundImage = 'url(' + params.imageUrl + ')'; - (0, _handleDom.show)($customIcon); - - var _imgWidth = 80; - var _imgHeight = 80; - - if (params.imageSize) { - var dimensions = params.imageSize.toString().split('x'); - var imgWidth = dimensions[0]; - var imgHeight = dimensions[1]; - - if (!imgWidth || !imgHeight) { - logStr('Parameter imageSize expects value with format WIDTHxHEIGHT, got ' + params.imageSize); - } else { - _imgWidth = imgWidth; - _imgHeight = imgHeight; - } - } - - $customIcon.setAttribute('style', $customIcon.getAttribute('style') + 'width:' + _imgWidth + 'px; height:' + _imgHeight + 'px'); - } - - /* - * Show cancel button? - */ - modal.setAttribute('data-has-cancel-button', params.showCancelButton); - if (params.showCancelButton) { - $cancelBtn.style.display = 'inline-block'; - } else { - (0, _handleDom.hide)($cancelBtn); - } - - /* - * Show confirm button? - */ - modal.setAttribute('data-has-confirm-button', params.showConfirmButton); - if (params.showConfirmButton) { - $confirmBtn.style.display = 'inline-block'; - } else { - (0, _handleDom.hide)($confirmBtn); - } - - /* - * Custom text on cancel/confirm buttons - */ - if (params.cancelButtonText) { - $cancelBtn.innerHTML = (0, _handleDom.escapeHtml)(params.cancelButtonText); - } - if (params.confirmButtonText) { - $confirmBtn.innerHTML = (0, _handleDom.escapeHtml)(params.confirmButtonText); - } - - /* - * Reset confirm buttons to default class (Ugly fix) - */ - $confirmBtn.className = 'confirm btn btn-lg'; - - /* - * Attach selected class to the sweet alert modal - */ - (0, _handleDom.addClass)(modal, params.containerClass); - - /* - * Set confirm button to selected class - */ - (0, _handleDom.addClass)($confirmBtn, params.confirmButtonClass); - - /* - * Set cancel button to selected class - */ - (0, _handleDom.addClass)($cancelBtn, params.cancelButtonClass); - - /* - * Set title to selected class - */ - (0, _handleDom.addClass)($title, params.titleClass); - - /* - * Set text to selected class - */ - (0, _handleDom.addClass)($text, params.textClass); - - /* - * Allow outside click - */ - modal.setAttribute('data-allow-outside-click', params.allowOutsideClick); - - /* - * Callback function - */ - var hasDoneFunction = params.doneFunction ? true : false; - modal.setAttribute('data-has-done-function', hasDoneFunction); - - /* - * Animation - */ - if (!params.animation) { - modal.setAttribute('data-animation', 'none'); - } else if (typeof params.animation === 'string') { - modal.setAttribute('data-animation', params.animation); // Custom animation - } else { - modal.setAttribute('data-animation', 'pop'); - } - - /* - * Timer - */ - modal.setAttribute('data-timer', params.timer); -}; - -exports.default = setParameters; - -},{"./handle-dom":3,"./handle-swal-dom":5,"./utils":8}],8:[function(require,module,exports){ -'use strict'; - -Object.defineProperty(exports, "__esModule", { - value: true -}); -/* - * Allow user to pass their own params - */ -var extend = function extend(a, b) { - for (var key in b) { - if (b.hasOwnProperty(key)) { - a[key] = b[key]; - } - } - return a; -}; - -/* - * Check if the user is using Internet Explorer 8 (for fallbacks) - */ -var isIE8 = function isIE8() { - return window.attachEvent && !window.addEventListener; -}; - -/* - * IE compatible logging for developers - */ -var logStr = function logStr(string) { - if (window.console) { - // IE... - window.console.log('SweetAlert: ' + string); - } -}; - -exports.extend = extend; -exports.isIE8 = isIE8; -exports.logStr = logStr; - -},{}],9:[function(require,module,exports){ -'use strict'; - -Object.defineProperty(exports, "__esModule", { - value: true -}); - -var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol ? "symbol" : typeof obj; }; // SweetAlert -// 2014-2015 (c) - Tristan Edwards -// github.com/t4t5/sweetalert - -/* - * jQuery-like functions for manipulating the DOM - */ - - -/* - * Handy utilities - */ - - -/* - * Handle sweetAlert's DOM elements - */ - - -// Handle button events and keyboard events - - -// Default values - - -var _handleDom = require('./modules/handle-dom'); - -var _utils = require('./modules/utils'); - -var _handleSwalDom = require('./modules/handle-swal-dom'); - -var _handleClick = require('./modules/handle-click'); - -var _handleKey = require('./modules/handle-key'); - -var _handleKey2 = _interopRequireDefault(_handleKey); - -var _defaultParams = require('./modules/default-params'); - -var _defaultParams2 = _interopRequireDefault(_defaultParams); - -var _setParams = require('./modules/set-params'); - -var _setParams2 = _interopRequireDefault(_setParams); - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } - -/* - * Remember state in cases where opening and handling a modal will fiddle with it. - * (We also use window.previousActiveElement as a global variable) - */ -var previousWindowKeyDown; -var lastFocusedButton; - -/* - * Global sweetAlert function - * (this is what the user calls) - */ -var sweetAlert, _swal; - -exports.default = sweetAlert = _swal = function swal() { - var customizations = arguments[0]; - - (0, _handleDom.addClass)(document.body, 'stop-scrolling'); - (0, _handleSwalDom.resetInput)(); - - /* - * Use argument if defined or default value from params object otherwise. - * Supports the case where a default value is boolean true and should be - * overridden by a corresponding explicit argument which is boolean false. - */ - function argumentOrDefault(key) { - var args = customizations; - return args[key] === undefined ? _defaultParams2.default[key] : args[key]; - } - - if (customizations === undefined) { - (0, _utils.logStr)('SweetAlert expects at least 1 attribute!'); - return false; - } - - var params = (0, _utils.extend)({}, _defaultParams2.default); - - switch (typeof customizations === 'undefined' ? 'undefined' : _typeof(customizations)) { - - // Ex: swal("Hello", "Just testing", "info"); - case 'string': - params.title = customizations; - params.text = arguments[1] || ''; - params.type = arguments[2] || ''; - break; - - // Ex: swal({ title:"Hello", text: "Just testing", type: "info" }); - case 'object': - if (customizations.title === undefined) { - (0, _utils.logStr)('Missing "title" argument!'); - return false; - } - - params.title = customizations.title; - - for (var customName in _defaultParams2.default) { - params[customName] = argumentOrDefault(customName); - } - - // Show "Confirm" instead of "OK" if cancel button is visible - params.confirmButtonText = params.showCancelButton ? 'Confirm' : _defaultParams2.default.confirmButtonText; - params.confirmButtonText = argumentOrDefault('confirmButtonText'); - - // Callback function when clicking on "OK"/"Cancel" - params.doneFunction = arguments[1] || null; - - break; - - default: - (0, _utils.logStr)('Unexpected type of argument! Expected "string" or "object", got ' + (typeof customizations === 'undefined' ? 'undefined' : _typeof(customizations))); - return false; - - } - - (0, _setParams2.default)(params); - (0, _handleSwalDom.fixVerticalPosition)(); - (0, _handleSwalDom.openModal)(arguments[1]); - - // Modal interactions - var modal = (0, _handleSwalDom.getModal)(); - - /* - * Make sure all modal buttons respond to all events - */ - var $buttons = modal.querySelectorAll('button'); - var buttonEvents = ['onclick']; - var onButtonEvent = function onButtonEvent(e) { - return (0, _handleClick.handleButton)(e, params, modal); - }; - - for (var btnIndex = 0; btnIndex < $buttons.length; btnIndex++) { - for (var evtIndex = 0; evtIndex < buttonEvents.length; evtIndex++) { - var btnEvt = buttonEvents[evtIndex]; - $buttons[btnIndex][btnEvt] = onButtonEvent; - } - } - - // Clicking outside the modal dismisses it (if allowed by user) - (0, _handleSwalDom.getOverlay)().onclick = onButtonEvent; - - previousWindowKeyDown = window.onkeydown; - - var onKeyEvent = function onKeyEvent(e) { - return (0, _handleKey2.default)(e, params, modal); - }; - window.onkeydown = onKeyEvent; - - window.onfocus = function () { - // When the user has focused away and focused back from the whole window. - setTimeout(function () { - // Put in a timeout to jump out of the event sequence. - // Calling focus() in the event sequence confuses things. - if (lastFocusedButton !== undefined) { - lastFocusedButton.focus(); - lastFocusedButton = undefined; - } - }, 0); - }; - - // Show alert with enabled buttons always - _swal.enableButtons(); -}; - -/* - * Set default params for each popup - * @param {Object} userParams - */ - - -sweetAlert.setDefaults = _swal.setDefaults = function (userParams) { - if (!userParams) { - throw new Error('userParams is required'); - } - if ((typeof userParams === 'undefined' ? 'undefined' : _typeof(userParams)) !== 'object') { - throw new Error('userParams has to be a object'); - } - - (0, _utils.extend)(_defaultParams2.default, userParams); -}; - -/* - * Animation when closing modal - */ -sweetAlert.close = _swal.close = function () { - var modal = (0, _handleSwalDom.getModal)(); - - (0, _handleDom.fadeOut)((0, _handleSwalDom.getOverlay)(), 5); - (0, _handleDom.fadeOut)(modal, 5); - (0, _handleDom.removeClass)(modal, 'showSweetAlert'); - (0, _handleDom.addClass)(modal, 'hideSweetAlert'); - (0, _handleDom.removeClass)(modal, 'visible'); - - /* - * Reset icon animations - */ - var $successIcon = modal.querySelector('.sa-icon.sa-success'); - (0, _handleDom.removeClass)($successIcon, 'animate'); - (0, _handleDom.removeClass)($successIcon.querySelector('.sa-tip'), 'animateSuccessTip'); - (0, _handleDom.removeClass)($successIcon.querySelector('.sa-long'), 'animateSuccessLong'); - - var $errorIcon = modal.querySelector('.sa-icon.sa-error'); - (0, _handleDom.removeClass)($errorIcon, 'animateErrorIcon'); - (0, _handleDom.removeClass)($errorIcon.querySelector('.sa-x-mark'), 'animateXMark'); - - var $warningIcon = modal.querySelector('.sa-icon.sa-warning'); - (0, _handleDom.removeClass)($warningIcon, 'pulseWarning'); - (0, _handleDom.removeClass)($warningIcon.querySelector('.sa-body'), 'pulseWarningIns'); - (0, _handleDom.removeClass)($warningIcon.querySelector('.sa-dot'), 'pulseWarningIns'); - - // Reset custom class (delay so that UI changes aren't visible) - setTimeout(function () { - var customClass = modal.getAttribute('data-custom-class'); - (0, _handleDom.removeClass)(modal, customClass); - }, 300); - - // Make page scrollable again - (0, _handleDom.removeClass)(document.body, 'stop-scrolling'); - - // Reset the page to its previous state - window.onkeydown = previousWindowKeyDown; - if (window.previousActiveElement) { - window.previousActiveElement.focus(); - } - lastFocusedButton = undefined; - clearTimeout(modal.timeout); - - return true; -}; - -/* - * Validation of the input field is done by user - * If something is wrong => call showInputError with errorMessage - */ -sweetAlert.showInputError = _swal.showInputError = function (errorMessage) { - var modal = (0, _handleSwalDom.getModal)(); - - var $errorIcon = modal.querySelector('.sa-input-error'); - (0, _handleDom.addClass)($errorIcon, 'show'); - - var $errorContainer = modal.querySelector('.form-group'); - (0, _handleDom.addClass)($errorContainer, 'has-error'); - - $errorContainer.querySelector('.sa-help-text').innerHTML = errorMessage; - - setTimeout(function () { - sweetAlert.enableButtons(); - }, 1); - - modal.querySelector('input').focus(); -}; - -/* - * Reset input error DOM elements - */ -sweetAlert.resetInputError = _swal.resetInputError = function (event) { - // If press enter => ignore - if (event && event.keyCode === 13) { - return false; - } - - var $modal = (0, _handleSwalDom.getModal)(); - - var $errorIcon = $modal.querySelector('.sa-input-error'); - (0, _handleDom.removeClass)($errorIcon, 'show'); - - var $errorContainer = $modal.querySelector('.form-group'); - (0, _handleDom.removeClass)($errorContainer, 'has-error'); -}; - -/* - * Disable confirm and cancel buttons - */ -sweetAlert.disableButtons = _swal.disableButtons = function (event) { - var modal = (0, _handleSwalDom.getModal)(); - var $confirmButton = modal.querySelector('button.confirm'); - var $cancelButton = modal.querySelector('button.cancel'); - $confirmButton.disabled = true; - $cancelButton.disabled = true; -}; - -/* - * Enable confirm and cancel buttons - */ -sweetAlert.enableButtons = _swal.enableButtons = function (event) { - var modal = (0, _handleSwalDom.getModal)(); - var $confirmButton = modal.querySelector('button.confirm'); - var $cancelButton = modal.querySelector('button.cancel'); - $confirmButton.disabled = false; - $cancelButton.disabled = false; -}; - -if (typeof window !== 'undefined') { - // The 'handle-click' module requires - // that 'sweetAlert' was set as global. - window.sweetAlert = window.swal = sweetAlert; -} else { - (0, _utils.logStr)('SweetAlert is a frontend module!'); -} - -},{"./modules/default-params":1,"./modules/handle-click":2,"./modules/handle-dom":3,"./modules/handle-key":4,"./modules/handle-swal-dom":5,"./modules/set-params":7,"./modules/utils":8}]},{},[9]); - -/* - * Use SweetAlert with RequireJS - */ - -if (typeof define === 'function' && define.amd) { - define(function () { - return sweetAlert; - }); -} else if (typeof module !== 'undefined' && module.exports) { - module.exports = sweetAlert; -} - -})(window, document); \ No newline at end of file From d04b40c925627f0e81c43fd0ad95dc9434510af5 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Wed, 15 Nov 2017 22:02:55 -0500 Subject: [PATCH 13/74] Start working on adding locations to service messages --- .../ServiceMessages/ServiceMessage.php | 3 ++ .../ServiceMessages/ServiceMessageHandler.php | 11 ++++++ .../ServiceMessageLocation.php | 34 +++++++++++++++++++ .../ServiceMessagesController.php | 19 ++++++++--- .../ServiceMessagesGateway.php | 23 +++++++++++++ install/migrations/core.php | 2 ++ .../CreateServiceMessageToLocationTable.php | 16 +++++++++ 7 files changed, 103 insertions(+), 5 deletions(-) create mode 100644 api/BusinessLogic/ServiceMessages/ServiceMessageLocation.php create mode 100644 install/migrations/v330/CreateServiceMessageToLocationTable.php diff --git a/api/BusinessLogic/ServiceMessages/ServiceMessage.php b/api/BusinessLogic/ServiceMessages/ServiceMessage.php index 1951b672..9a5aff94 100644 --- a/api/BusinessLogic/ServiceMessages/ServiceMessage.php +++ b/api/BusinessLogic/ServiceMessages/ServiceMessage.php @@ -30,4 +30,7 @@ class ServiceMessage extends \BaseClass { /* @var $icon string */ public $icon; + + /* @var $locations string[] */ + public $locations; } \ No newline at end of file diff --git a/api/BusinessLogic/ServiceMessages/ServiceMessageHandler.php b/api/BusinessLogic/ServiceMessages/ServiceMessageHandler.php index 7d7ffd59..e852f4cf 100644 --- a/api/BusinessLogic/ServiceMessages/ServiceMessageHandler.php +++ b/api/BusinessLogic/ServiceMessages/ServiceMessageHandler.php @@ -130,6 +130,17 @@ class ServiceMessageHandler extends \BaseClass { } catch (\Exception $e) { $validationModel->errorKeys[] = 'INVALID_STYLE'; } + if ($serviceMessage->locations === null || count($serviceMessage->locations) === 0) { + $validationModel->errorKeys[] = 'MISSING_LOCATIONS'; + } else { + $locations = ServiceMessageLocation::getAll(); + foreach ($serviceMessage->locations as $location) { + if (!in_array($location, $locations)) { + $validationModel->errorKeys[] = 'INVALID_LOCATION'; + break; + } + } + } if (count($validationModel->errorKeys) > 0) { // Validation failed diff --git a/api/BusinessLogic/ServiceMessages/ServiceMessageLocation.php b/api/BusinessLogic/ServiceMessages/ServiceMessageLocation.php new file mode 100644 index 00000000..7f918bc7 --- /dev/null +++ b/api/BusinessLogic/ServiceMessages/ServiceMessageLocation.php @@ -0,0 +1,34 @@ +createdBy = $userContext->id; } - $serviceMessage->title = $data['title']; - $serviceMessage->icon = $data['icon']; - $serviceMessage->message = $data['message']; - $serviceMessage->published = $data['published']; - $serviceMessage->style = $data['style']; + $serviceMessage->title = Helpers::safeArrayGet($data, 'title'); + $serviceMessage->icon = Helpers::safeArrayGet($data, 'icon'); + $serviceMessage->message = Helpers::safeArrayGet($data, 'message'); + $serviceMessage->published = Helpers::safeArrayGet($data, 'published'); + $serviceMessage->style = Helpers::safeArrayGet($data, 'style'); + + $jsonLocations = Helpers::safeArrayGet($data, 'locations'); + + if ($jsonLocations !== null && !empty($jsonLocations)) { + foreach ($jsonLocations as $key => $value) { + $serviceMessage->locations[] = $value; + } + } return $serviceMessage; } diff --git a/api/DataAccess/ServiceMessages/ServiceMessagesGateway.php b/api/DataAccess/ServiceMessages/ServiceMessagesGateway.php index 0f15c333..6a58b070 100644 --- a/api/DataAccess/ServiceMessages/ServiceMessagesGateway.php +++ b/api/DataAccess/ServiceMessages/ServiceMessagesGateway.php @@ -36,6 +36,11 @@ class ServiceMessagesGateway extends CommonDao { $serviceMessage->id = hesk_dbInsertID(); + foreach ($serviceMessage->locations as $location) { + hesk_dbQuery("INSERT INTO `" . hesk_dbEscape($heskSettings['db_pfix']) . "mfh_service_message_to_location` + (`service_message_id`, `location`) VALUES (" . intval($serviceMessage->id) . ", '" . hesk_dbEscape($location) . "')"); + } + // Get the autogenerated fields $rs = hesk_dbQuery("SELECT `dt`, `order` FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "service_messages` WHERE `id` = " . intval($serviceMessage->id)); @@ -69,6 +74,14 @@ class ServiceMessagesGateway extends CommonDao { $serviceMessage->message = $row['message']; $serviceMessage->style = ServiceMessageStyle::getStyleById($row['style']); $serviceMessage->icon = $row['icon']; + $serviceMessage->locations = array(); + + $locationsRs = hesk_dbQuery("SELECT `location` FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "mfh_service_message_to_location` + WHERE `service_message_id` = " . intval($serviceMessage->id)); + while ($innerRow = hesk_dbFetchAssoc($locationsRs)) { + $serviceMessage->locations[] = $innerRow['location']; + } + $serviceMessages[] = $serviceMessage; } @@ -92,6 +105,13 @@ class ServiceMessagesGateway extends CommonDao { `order` = " . intval($serviceMessage->order) . " WHERE `id` = " . intval($serviceMessage->id)); + hesk_dbQuery("DELETE FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "mfh_service_message_to_location` + WHERE `service_message_id` = " . intval($serviceMessage->id)); + foreach ($serviceMessage->locations as $location) { + hesk_dbQuery("INSERT INTO `" . hesk_dbEscape($heskSettings['db_pfix']) . "mfh_service_message_to_location` + (`service_message_id`, `location`) VALUES (" . intval($serviceMessage->id) . ", '" . hesk_dbEscape($location) . "')"); + } + $otherFieldsRs = hesk_dbQuery("SELECT `dt`, `author`, `order` FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "service_messages` WHERE `id` = " . intval($serviceMessage->id)); $otherFields = hesk_dbFetchAssoc($otherFieldsRs); @@ -107,6 +127,9 @@ class ServiceMessagesGateway extends CommonDao { function deleteServiceMessage($id, $heskSettings) { $this->init(); + hesk_dbQuery("DELETE FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "mfh_service_message_to_location` + WHERE `service_message_id` = " . intval($id)); + hesk_dbQuery("DELETE FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "service_messages` WHERE `id` = " . intval($id)); diff --git a/install/migrations/core.php b/install/migrations/core.php index 6526344d..db30e5ac 100644 --- a/install/migrations/core.php +++ b/install/migrations/core.php @@ -216,5 +216,7 @@ function getAllMigrations() { //3.2.1 - 3.2.2 160 => new UpdateMigration('3.2.1', '3.2.0', 160), 161 => new UpdateMigration('3.2.2', '3.2.1', 161), + // 3.3.0 + 162 => new \v330\CreateServiceMessageToLocationTable(162), ); } \ No newline at end of file diff --git a/install/migrations/v330/CreateServiceMessageToLocationTable.php b/install/migrations/v330/CreateServiceMessageToLocationTable.php new file mode 100644 index 00000000..066ab39c --- /dev/null +++ b/install/migrations/v330/CreateServiceMessageToLocationTable.php @@ -0,0 +1,16 @@ +executeQuery("CREATE TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "mfh_service_message_to_location` + (`service_message_id` INT NOT NULL, `location` VARCHAR(100) NOT NULL)"); + } + + function innerDown($hesk_settings) { + $this->executeQuery("DROP TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "mfh_service_message_to_location`"); + } +} \ No newline at end of file From 6a763593eef21e4e8039cdc36a550e5d5b2220e0 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Fri, 17 Nov 2017 22:27:55 -0500 Subject: [PATCH 14/74] Locations can be added to service messages --- admin/service_messages.php | 42 +++++++++++++++++++ ...UpdateExistingServiceMessagesLocations.php | 19 +++++++++ internal-api/js/service-messages.js | 20 +++++++-- 3 files changed, 78 insertions(+), 3 deletions(-) create mode 100644 install/migrations/v330/UpdateExistingServiceMessagesLocations.php diff --git a/admin/service_messages.php b/admin/service_messages.php index c60d7b58..93ad7a5c 100644 --- a/admin/service_messages.php +++ b/admin/service_messages.php @@ -214,6 +214,48 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
    +
    + +
    +
    Customer Pages
    +
    + Homepage +
    +
    + Knowledgebase Home +
    +
    + View Knowledgebase Article +
    +
    + Submit Ticket +
    +
    + View Ticket +
    +
    +
    +
    Staff Pages
    +
    + Login Page +
    +
    + Homepage +
    +
    + Knowledgebase Home +
    +
    + View Knowledgebase Article +
    +
    + Submit Ticket +
    +
    + View Ticket +
    +
    +
    diff --git a/install/migrations/v330/UpdateExistingServiceMessagesLocations.php b/install/migrations/v330/UpdateExistingServiceMessagesLocations.php new file mode 100644 index 00000000..899909dc --- /dev/null +++ b/install/migrations/v330/UpdateExistingServiceMessagesLocations.php @@ -0,0 +1,19 @@ +executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "mfh_service_message_to_location` (`service_message_id`, `location`) + SELECT `id`, '" . hesk_dbEscape(ServiceMessageLocation::CUSTOMER_HOME) . "' FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "service_messages`"); + } + + function innerDown($hesk_settings) { + $this->executeQuery("DELETE FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "mfh_service_message_to_location` + WHERE `service_message_id` IN (SELECT `id` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "service_messages`)"); + } +} \ No newline at end of file diff --git a/internal-api/js/service-messages.js b/internal-api/js/service-messages.js index 050c864a..ebe79766 100644 --- a/internal-api/js/service-messages.js +++ b/internal-api/js/service-messages.js @@ -137,7 +137,8 @@ function bindEditModal() { $(document).on('click', '[data-action="edit"]', function() { var element = serviceMessages[$(this).parent().parent().find('[data-property="id"]').data('value')]; var $modal = $('#service-message-modal'); - $modal.find('#preview-pane').html(''); + $modal.find('#preview-pane').html('').end() + .find('input[name="location[]"]').prop('checked', false); $modal.find('#edit-label').show(); $modal.find('#create-label').hide(); @@ -150,6 +151,10 @@ function bindEditModal() { .find('input[name="order"]').val(element.order).end(); setIcon(element.icon); + $.each(element.locations, function() { + $modal.find('input[name="location[]"][value="' + this + '"]').prop('checked', 'checked'); + }); + if ($('input[name="kb_wysiwyg"]').val() === "1") { tinyMCE.get('content').setContent(element.message); } else { @@ -171,7 +176,8 @@ function bindCreateModal() { .find('input[name="title"]').val('').end() .find('input[name="id"]').val(-1).end() .find('input[name="order"]').val('').end() - .find('#preview-pane').html('').end(); + .find('#preview-pane').html('').end() + .find('input[name="location[]"]').prop('checked', false); setIcon(''); if ($('input[name="kb_wysiwyg"]').val() === "1") { @@ -198,13 +204,21 @@ function bindFormSubmit() { styles[3] = "NOTICE"; styles[4] = "ERROR"; + var domLocations = $modal.find('input[name="location[]"]:checked'); + + var locations = []; + $.each(domLocations, function() { + locations.push($(this).val()); + }); + var data = { icon: $modal.find('input[name="icon"]').val(), title: $modal.find('input[name="title"]').val(), message: getMessage(), published: $modal.find('input[name="type"]:checked').val() === "0", style: styles[$modal.find('input[name="style"]:checked').val()], - order: $modal.find('input[name="order"]').val() + order: $modal.find('input[name="order"]').val(), + locations: locations }; var url = heskUrl + 'api/index.php/v1/service-messages/'; From 3e82065fa4010c92098bbee2967f97c9a9ec8f0f Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Sat, 18 Nov 2017 22:05:11 -0500 Subject: [PATCH 15/74] Working on adding a language option to service messages --- admin/service_messages.php | 330 ++++++++++-------- install/migrations/core.php | 4 +- .../AddLanguageColumnToServiceMessages.php | 17 + .../CreateServiceMessageToLocationTable.php | 2 +- ...UpdateExistingServiceMessagesLocations.php | 2 +- 5 files changed, 213 insertions(+), 142 deletions(-) create mode 100644 install/migrations/v330/ServiceMessagesImprovements/AddLanguageColumnToServiceMessages.php rename install/migrations/v330/{ => ServiceMessagesImprovements}/CreateServiceMessageToLocationTable.php (91%) rename install/migrations/v330/{ => ServiceMessagesImprovements}/UpdateExistingServiceMessagesLocations.php (94%) diff --git a/admin/service_messages.php b/admin/service_messages.php index 93ad7a5c..8d13ea0a 100644 --- a/admin/service_messages.php +++ b/admin/service_messages.php @@ -130,150 +130,202 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
    -
    -
    - - -
    -
    - +
    +
    +
    +
    + +
    + +
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    -
    - -
    - +
    + - - - - -
    -
    -
    -
    - - -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    Customer Pages
    -
    - Homepage -
    -
    - Knowledgebase Home -
    -
    - View Knowledgebase Article -
    -
    - Submit Ticket -
    -
    - View Ticket -
    -
    -
    -
    Staff Pages
    -
    - Login Page -
    -
    - Homepage -
    -
    - Knowledgebase Home -
    -
    - View Knowledgebase Article -
    -
    - Submit Ticket -
    -
    - View Ticket -
    -
    -
    -
    - -
    - -
    -
    -
    -
    - - -
    +
    +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    + + +
    +
    + +
    +
    +
    +
    + +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    + +
    +
    +
    +
    +
    + +
    + + + + + + +
    +
    +
    +
    + + +
    +
    + +
    +
    +
    +
    + +
    +
    +
    +
    + +
    +
    Customer Pages
    +
    +
    + Select All +
    +
    + Deselect All +
    +
    +
    + Homepage +
    +
    + Knowledgebase Home +
    +
    + View Knowledgebase Article +
    +
    + Submit Ticket +
    +
    + View Ticket +
    +
    +
    +
    Staff Pages
    +
    +
    + Select All +
    +
    + Deselect All +
    +
    +
    + Login Page +
    +
    + Homepage +
    +
    + Knowledgebase Home +
    +
    + View Knowledgebase Article +
    +
    + Submit Ticket +
    +
    + View Ticket +
    +
    +
    diff --git a/install/migrations/core.php b/install/migrations/core.php index db30e5ac..405144a1 100644 --- a/install/migrations/core.php +++ b/install/migrations/core.php @@ -217,6 +217,8 @@ function getAllMigrations() { 160 => new UpdateMigration('3.2.1', '3.2.0', 160), 161 => new UpdateMigration('3.2.2', '3.2.1', 161), // 3.3.0 - 162 => new \v330\CreateServiceMessageToLocationTable(162), + 162 => new \v330\ServiceMessagesImprovements\CreateServiceMessageToLocationTable(162), + 163 => new \v330\ServiceMessagesImprovements\UpdateExistingServiceMessagesLocations(163), + 164 => new \v330\ServiceMessagesImprovements\AddLanguageColumnToServiceMessages(164), ); } \ No newline at end of file diff --git a/install/migrations/v330/ServiceMessagesImprovements/AddLanguageColumnToServiceMessages.php b/install/migrations/v330/ServiceMessagesImprovements/AddLanguageColumnToServiceMessages.php new file mode 100644 index 00000000..21481b99 --- /dev/null +++ b/install/migrations/v330/ServiceMessagesImprovements/AddLanguageColumnToServiceMessages.php @@ -0,0 +1,17 @@ +executeQuery("ALTER TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "service_messages` + ADD COLUMN `mfh_language` VARCHAR(255) NOT NULL DEFAULT 'ALL'"); + } + + function innerDown($hesk_settings) { + $this->executeQuery("ALTER TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "service_messages` + DROP COLUMN `mfh_language`"); + } +} \ No newline at end of file diff --git a/install/migrations/v330/CreateServiceMessageToLocationTable.php b/install/migrations/v330/ServiceMessagesImprovements/CreateServiceMessageToLocationTable.php similarity index 91% rename from install/migrations/v330/CreateServiceMessageToLocationTable.php rename to install/migrations/v330/ServiceMessagesImprovements/CreateServiceMessageToLocationTable.php index 066ab39c..0fe7d1ec 100644 --- a/install/migrations/v330/CreateServiceMessageToLocationTable.php +++ b/install/migrations/v330/ServiceMessagesImprovements/CreateServiceMessageToLocationTable.php @@ -1,6 +1,6 @@ Date: Sun, 19 Nov 2017 22:16:45 -0500 Subject: [PATCH 16/74] Add language property to service messages --- admin/service_messages.php | 12 +++++++++-- .../ServiceMessages/ServiceMessage.php | 3 +++ .../ServiceMessages/ServiceMessageHandler.php | 14 +++++++++++++ .../ServiceMessagesController.php | 1 + .../ServiceMessagesGateway.php | 9 ++++++--- internal-api/js/service-messages.js | 20 +++++++++++++++++-- 6 files changed, 52 insertions(+), 7 deletions(-) diff --git a/admin/service_messages.php b/admin/service_messages.php index 8d13ea0a..935a09c1 100644 --- a/admin/service_messages.php +++ b/admin/service_messages.php @@ -102,6 +102,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
    + @@ -131,11 +132,11 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');

    -
    +
    @@ -364,6 +365,7 @@ echo mfh_get_hidden_fields_for_language(array( 'error_deleting_sm', 'error_sorting_categories', 'error_retrieving_sm', + 'all', )); echo ''; ?> ';
    + ', $change_title, $css_color, $text); From 22ecc4804efe51bd3f188d5384579603bbc3a4e6 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Sun, 4 Feb 2018 21:16:18 -0500 Subject: [PATCH 56/74] Improve the validator --- install/database-validation.php | 158 +++++++++++++++++++++----------- install/index.php | 2 +- 2 files changed, 105 insertions(+), 55 deletions(-) diff --git a/install/database-validation.php b/install/database-validation.php index 8f47a9c9..d90aa816 100644 --- a/install/database-validation.php +++ b/install/database-validation.php @@ -21,7 +21,7 @@ if (hesk_dbNumRows($tableSql) > 0) { // They have installed at LEAST to version 1.6.0. Just pull the version number OR migration number $migrationNumberSql = hesk_dbQuery("SELECT `Value` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` WHERE `Key` = 'migrationNumber'"); if ($migrationRow = hesk_dbFetchAssoc($migrationNumberSql)) { - $startingValidationNumber = intval($migrationRow['Value']) + 1; + $startingValidationNumber = intval($migrationRow['Value']); } else { $versionSql = hesk_dbQuery("SELECT `Value` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` WHERE `Key` = 'modsForHeskVersion'"); $versionRow = hesk_dbFetchAssoc($versionSql); @@ -79,12 +79,11 @@ if (hesk_dbNumRows($tableSql) > 0) {

    Mods for HESK Database Validation

    -

    The database validation tool will check your database setup to ensure that everything is set up correctly. - As of this time, the database validator assumes you are running the latest version of Mods for HESK ()

    +

    The database validation tool will check your database setup to ensure that everything is set up correctly.

    +

    Results

    @@ -219,56 +226,87 @@ if (hesk_dbNumRows($tableSql) > 0) { $validations[] = run_column_check('categories', 'usage', 112); $validations[] = run_column_check('users', 'notify_overdue_unassigned', 113); $validations[] = run_column_check('users', 'default_calendar_view', 114); + $validations[] = run_setting_check('enable_calendar', 115); + $validations[] = run_setting_check('first_day_of_week', 116); + $validations[] = run_setting_check('default_calendar_view', 117); output_header_row('2.6.2'); - $validations[] = run_column_check('stage_tickets', 'due_date'); - $validations[] = run_column_check('stage_tickets', 'overdue_email_sent'); + $validations[] = run_column_check('stage_tickets', 'due_date', 122); + $validations[] = run_column_check('stage_tickets', 'overdue_email_sent', 123); output_header_row('3.1.0'); - $validations[] = run_column_check('categories', 'background_color'); - $validations[] = run_column_check('categories', 'foreground_color'); - $validations[] = run_column_check('categories', 'display_border_outline'); - $validations[] = run_column_check('logging', 'stack_trace'); - $validations[] = run_table_check('custom_nav_element'); - $validations[] = run_column_check('custom_nav_element', 'id'); - $validations[] = run_column_check('custom_nav_element', 'image_url'); - $validations[] = run_column_check('custom_nav_element', 'font_icon'); - $validations[] = run_column_check('custom_nav_element', 'place'); - $validations[] = run_column_check('custom_nav_element', 'url'); - $validations[] = run_column_check('custom_nav_element', 'sort'); - $validations[] = run_table_check('custom_nav_element_to_text'); - $validations[] = run_column_check('custom_nav_element_to_text', 'id'); - $validations[] = run_column_check('custom_nav_element_to_text', 'nav_element_id'); - $validations[] = run_column_check('custom_nav_element_to_text', 'language'); - $validations[] = run_column_check('custom_nav_element_to_text', 'text'); - $validations[] = run_column_check('custom_nav_element_to_text', 'subtext'); - $validations[] = run_setting_check('admin_navbar_background'); - $validations[] = run_setting_check('admin_navbar_background_hover'); - $validations[] = run_setting_check('admin_navbar_text'); - $validations[] = run_setting_check('admin_navbar_text_hover'); - $validations[] = run_setting_check('admin_navbar_brand_background'); - $validations[] = run_setting_check('admin_navbar_brand_background_hover'); - $validations[] = run_setting_check('admin_navbar_brand_text'); - $validations[] = run_setting_check('admin_navbar_brand_text_hover'); - $validations[] = run_setting_check('admin_sidebar_background'); - $validations[] = run_setting_check('admin_sidebar_background_hover'); - $validations[] = run_setting_check('admin_sidebar_text'); - $validations[] = run_setting_check('admin_sidebar_text_hover'); - $validations[] = run_setting_check('admin_sidebar_font_weight'); - $validations[] = run_setting_check('admin_sidebar_header_background'); - $validations[] = run_setting_check('admin_sidebar_header_text'); + $validations[] = run_column_check('logging', 'stack_trace', 140); + $validations[] = run_column_check('categories', 'background_color', 145); + $validations[] = run_column_check('categories', 'foreground_color', 143); + $validations[] = run_column_check('categories', 'display_border_outline', 144); + $validations[] = run_table_check('custom_nav_element', 141); + $validations[] = run_column_check('custom_nav_element', 'id', 141); + $validations[] = run_column_check('custom_nav_element', 'image_url', 141); + $validations[] = run_column_check('custom_nav_element', 'font_icon', 141); + $validations[] = run_column_check('custom_nav_element', 'place', 141); + $validations[] = run_column_check('custom_nav_element', 'url', 141); + $validations[] = run_column_check('custom_nav_element', 'sort', 141); + $validations[] = run_table_check('custom_nav_element_to_text', 142); + $validations[] = run_column_check('custom_nav_element_to_text', 'id', 142); + $validations[] = run_column_check('custom_nav_element_to_text', 'nav_element_id', 142); + $validations[] = run_column_check('custom_nav_element_to_text', 'language', 142); + $validations[] = run_column_check('custom_nav_element_to_text', 'text', 142); + $validations[] = run_column_check('custom_nav_element_to_text', 'subtext', 142); + $validations[] = run_setting_check('admin_navbar_background', 151); + $validations[] = run_setting_check('admin_navbar_background_hover', 151); + $validations[] = run_setting_check('admin_navbar_text', 151); + $validations[] = run_setting_check('admin_navbar_text_hover', 151); + $validations[] = run_setting_check('admin_navbar_brand_background', 151); + $validations[] = run_setting_check('admin_navbar_brand_background_hover', 151); + $validations[] = run_setting_check('admin_navbar_brand_text', 151); + $validations[] = run_setting_check('admin_navbar_brand_text_hover', 151); + $validations[] = run_setting_check('admin_sidebar_background', 151); + $validations[] = run_setting_check('admin_sidebar_background_hover', 151); + $validations[] = run_setting_check('admin_sidebar_text', 151); + $validations[] = run_setting_check('admin_sidebar_text_hover', 151); + $validations[] = run_setting_check('admin_sidebar_font_weight', 151); + $validations[] = run_setting_check('admin_sidebar_header_background', 151); + $validations[] = run_setting_check('admin_sidebar_header_text', 151); + $validations[] = run_setting_check('login_background_type', 146); + $validations[] = run_setting_check('login_background', 147); + $validations[] = run_setting_check('login_box_header', 148); + $validations[] = run_setting_check('login_box_header_image', 149); + $validations[] = run_setting_check('api_url_rewrite', 150); output_header_row('3.2.0'); - $validations[] = run_table_check('audit_trail'); - $validations[] = run_table_check('audit_trail_to_replacement_values'); - $validations[] = run_column_check('categories', 'mfh_description'); - $validations[] = run_column_check('custom_fields', 'mfh_description'); - $validations[] = run_setting_check('migrationNumber'); + $validations[] = run_table_check('audit_trail', 156); + $validations[] = run_table_check('audit_trail_to_replacement_values', 157); + $validations[] = run_column_check('categories', 'mfh_description', 154); + $validations[] = run_column_check('custom_fields', 'mfh_description', 155); + $validations[] = run_setting_check('migrationNumber', 158); output_header_row('3.3.0'); - $validations[] = run_table_check('mfh_calendar_business_hours'); + $validations[] = run_table_check('mfh_service_message_to_location', 164); + $validations[] = run_column_check('mfh_service_message_to_location', 'service_message_id', 164); + $validations[] = run_column_check('mfh_service_message_to_location', 'location', 164); + $validations[] = run_column_check('service_messages', 'mfh_language', 166); + $validations[] = run_table_check('mfh_calendar_business_hours', 167); + $validations[] = run_setting_check('calendar_show_start_time', 169); + $validations[] = run_setting_check('calendar_show_start_time', 999); - if ($checks) { + $passed = false; + $failed = false; + $skipped = false; + foreach ($validations as $validation) { + if ($validation === 'SKIPPED') { + $skipped = true; + } elseif ($validation === 'FAIL') { + $failed = true; + } else if ($validation === 'PASS') { + $passed = true; + } + } + + if ($passed && !$failed) { echo ""; - } else { + } elseif ($failed) { echo ""; } + + if ($skipped) { + echo ""; + } ?>
    diff --git a/api/BusinessLogic/ServiceMessages/ServiceMessage.php b/api/BusinessLogic/ServiceMessages/ServiceMessage.php index 9a5aff94..f40e9b9c 100644 --- a/api/BusinessLogic/ServiceMessages/ServiceMessage.php +++ b/api/BusinessLogic/ServiceMessages/ServiceMessage.php @@ -33,4 +33,7 @@ class ServiceMessage extends \BaseClass { /* @var $locations string[] */ public $locations; + + /* @var $language string */ + public $language; } \ No newline at end of file diff --git a/api/BusinessLogic/ServiceMessages/ServiceMessageHandler.php b/api/BusinessLogic/ServiceMessages/ServiceMessageHandler.php index e852f4cf..2cf31892 100644 --- a/api/BusinessLogic/ServiceMessages/ServiceMessageHandler.php +++ b/api/BusinessLogic/ServiceMessages/ServiceMessageHandler.php @@ -118,6 +118,20 @@ class ServiceMessageHandler extends \BaseClass { $htmlPurifier = new \HeskHTMLPurifier($heskSettings['cache_dir']); $serviceMessage->message = $htmlPurifier->heskPurify($serviceMessage->message); } + if ($serviceMessage->language === null || trim($serviceMessage->language) === '') { + $validationModel->errorKeys[] = 'MISSING_LANGUAGE'; + } + + $languageFound = false; + foreach ($heskSettings['languages'] as $key => $value) { + if ($value['folder'] === $serviceMessage->language || $serviceMessage->language === 'ALL') { + $languageFound = true; + break; + } + } + if (!$languageFound) { + $validationModel->errorKeys[] = 'LANGUAGE_NOT_INSTALLED'; + } if ($serviceMessage->title === null || trim($serviceMessage->title) === '') { $validationModel->errorKeys[] = 'MISSING_TITLE'; diff --git a/api/Controllers/ServiceMessages/ServiceMessagesController.php b/api/Controllers/ServiceMessages/ServiceMessagesController.php index 481c10a6..bf6c26de 100644 --- a/api/Controllers/ServiceMessages/ServiceMessagesController.php +++ b/api/Controllers/ServiceMessages/ServiceMessagesController.php @@ -76,6 +76,7 @@ class ServiceMessagesController extends \BaseClass { $serviceMessage->message = Helpers::safeArrayGet($data, 'message'); $serviceMessage->published = Helpers::safeArrayGet($data, 'published'); $serviceMessage->style = Helpers::safeArrayGet($data, 'style'); + $serviceMessage->language = Helpers::safeArrayGet($data, 'language'); $jsonLocations = Helpers::safeArrayGet($data, 'locations'); diff --git a/api/DataAccess/ServiceMessages/ServiceMessagesGateway.php b/api/DataAccess/ServiceMessages/ServiceMessagesGateway.php index 6a58b070..371089a9 100644 --- a/api/DataAccess/ServiceMessages/ServiceMessagesGateway.php +++ b/api/DataAccess/ServiceMessages/ServiceMessagesGateway.php @@ -24,14 +24,15 @@ class ServiceMessagesGateway extends CommonDao { $type = $serviceMessage->published ? 0 : 1; // Insert service message into database - hesk_dbQuery("INSERT INTO `" . hesk_dbEscape($heskSettings['db_pfix']) . "service_messages` (`author`,`title`,`message`,`style`,`type`,`order`, `icon`) VALUES ( + hesk_dbQuery("INSERT INTO `" . hesk_dbEscape($heskSettings['db_pfix']) . "service_messages` (`author`,`title`,`message`,`style`,`type`,`order`, `icon`, `mfh_language`) VALUES ( '" . intval($serviceMessage->createdBy) . "', '" . hesk_dbEscape($serviceMessage->title) . "', '" . hesk_dbEscape($serviceMessage->message) . "', '" . hesk_dbEscape($style) . "', '{$type}', '{$myOrder}', - '" . hesk_dbEscape($serviceMessage->icon) . "' + '" . hesk_dbEscape($serviceMessage->icon) . "', + '" . hesk_dbEscape($serviceMessage->language) . "', )"); $serviceMessage->id = hesk_dbInsertID(); @@ -74,6 +75,7 @@ class ServiceMessagesGateway extends CommonDao { $serviceMessage->message = $row['message']; $serviceMessage->style = ServiceMessageStyle::getStyleById($row['style']); $serviceMessage->icon = $row['icon']; + $serviceMessage->language = $row['mfh_language']; $serviceMessage->locations = array(); $locationsRs = hesk_dbQuery("SELECT `location` FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "mfh_service_message_to_location` @@ -102,7 +104,8 @@ class ServiceMessagesGateway extends CommonDao { `style` = '" . intval($style) . "', `type` = " . intval($type) . ", `icon` = '" . hesk_dbEscape($serviceMessage->icon) . "', - `order` = " . intval($serviceMessage->order) . " + `order` = " . intval($serviceMessage->order) . ", + `mfh_language` = '" . hesk_dbEscape($serviceMessage->language) . "' WHERE `id` = " . intval($serviceMessage->id)); hesk_dbQuery("DELETE FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "mfh_service_message_to_location` diff --git a/internal-api/js/service-messages.js b/internal-api/js/service-messages.js index ebe79766..e75719eb 100644 --- a/internal-api/js/service-messages.js +++ b/internal-api/js/service-messages.js @@ -50,6 +50,9 @@ function loadTable() { } else { $template.find('span[data-property="type"]').text(mfhLang.text('sm_draft')); } + $template.find('[data-property="language"]').text(this.language === 'ALL' ? + mfhLang.text('all') : + languages[this.language]); $tableBody.append($template); @@ -148,7 +151,8 @@ function bindEditModal() { .prop('checked', 'checked').end() .find('input[name="title"]').val(element.title).end() .find('input[name="id"]').val(element.id).end() - .find('input[name="order"]').val(element.order).end(); + .find('input[name="order"]').val(element.order).end() + .find('select[name="language"]').val(element.language).end(); setIcon(element.icon); $.each(element.locations, function() { @@ -161,6 +165,11 @@ function bindEditModal() { $('textarea[name="message"]').val(element.message); } + $('.tab-pane#sm-contents').addClass('active'); + $('.tab-pane#properties').removeClass('active'); + $('.nav-tabs > li').removeClass('active'); + $('.nav-tabs > li:first').addClass('active'); + $modal.modal('show'); }); @@ -177,7 +186,8 @@ function bindCreateModal() { .find('input[name="id"]').val(-1).end() .find('input[name="order"]').val('').end() .find('#preview-pane').html('').end() - .find('input[name="location[]"]').prop('checked', false); + .find('input[name="location[]"]').prop('checked', false) + .find('select[name="language"]').val('ALL'); setIcon(''); if ($('input[name="kb_wysiwyg"]').val() === "1") { @@ -186,6 +196,11 @@ function bindCreateModal() { $('textarea[name="message"]').val(''); } + $('.tab-pane#sm-contents').addClass('active'); + $('.tab-pane#properties').removeClass('active'); + $('.nav-tabs > li').removeClass('active'); + $('.nav-tabs > li:first').addClass('active'); + $modal.modal('show'); }); } @@ -218,6 +233,7 @@ function bindFormSubmit() { published: $modal.find('input[name="type"]:checked').val() === "0", style: styles[$modal.find('input[name="style"]:checked').val()], order: $modal.find('input[name="order"]').val(), + language: $modal.find('select[name="language"]').val(), locations: locations }; From 3bff7fd30b3efbd10fcc3a6ab23979670b524f7b Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Mon, 27 Nov 2017 12:22:41 -0500 Subject: [PATCH 17/74] Contentified some strings --- admin/service_messages.php | 36 ++++++++++++++++++------------------ language/en/text.php | 9 +++++++++ 2 files changed, 27 insertions(+), 18 deletions(-) diff --git a/admin/service_messages.php b/admin/service_messages.php index 935a09c1..cb08371a 100644 --- a/admin/service_messages.php +++ b/admin/service_messages.php @@ -259,71 +259,71 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
    - +
    -
    Customer Pages
    +
    - Select All +
    - Deselect All +
    Homepage + name="location[]" value="CUSTOMER_HOME">
    Knowledgebase Home + name="location[]" value="CUSTOMER_KB_HOME">
    View Knowledgebase Article + name="location[]" value="CUSTOMER_VIEW_KB_ARTICLE">
    Submit Ticket + name="location[]" value="CUSTOMER_SUBMIT_TICKET">
    View Ticket + name="location[]" value="CUSTOMER_VIEW_TICKET">
    -
    Staff Pages
    +
    - Select All +
    - Deselect All +
    Login Page + name="location[]" value="STAFF_LOGIN">
    Homepage + name="location[]" value="STAFF_HOME">
    Knowledgebase Home + name="location[]" value="STAFF_KB_HOME">
    View Knowledgebase Article + name="location[]" value="STAFF_VIEW_KB_ARTICLE">
    Submit Ticket + name="location[]" value="STAFF_SUBMIT_TICKET">
    View Ticket + name="location[]" value="STAFF_VIEW_TICKET">
    diff --git a/language/en/text.php b/language/en/text.php index a360ef74..7d62e3f3 100644 --- a/language/en/text.php +++ b/language/en/text.php @@ -2219,6 +2219,15 @@ $hesklang['error_retrieving_sm'] = 'An error occurred retrieving service message $hesklang['error_saving_updating_sm'] = 'An error occurred creating / saving the service message!'; $hesklang['error_deleting_sm'] = 'An error occurred when trying to delete the service message.'; $hesklang['error_sorting_sm'] = 'An error occurred sorting service messages!'; +$hesklang['sm_location'] = 'Location'; // Location for service messages +$hesklang['sm_customer_pages'] = 'Customer Pages'; +$hesklang['sm_staff_pages'] = 'Staff Pages'; +$hesklang['sm_homepage'] = 'Homepage'; +$hesklang['sm_kb_home'] = 'Knowledgebase Home'; +$hesklang['sm_view_kb_article'] = 'View Knowledgebase Article'; +$hesklang['sm_submit_ticket'] = 'Submit Ticket'; +$hesklang['sm_view_ticket'] = 'View Ticket'; +$hesklang['sm_login_page'] = 'Login Page'; // DO NOT CHANGE BELOW if (!defined('IN_SCRIPT')) die('PHP syntax OK!'); From 902f3edcf6c2ab3e5febffd41299cf80a2dc3045 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Mon, 27 Nov 2017 12:51:34 -0500 Subject: [PATCH 18/74] Only show locations that are active --- admin/service_messages.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/admin/service_messages.php b/admin/service_messages.php index cb08371a..052e0eb4 100644 --- a/admin/service_messages.php +++ b/admin/service_messages.php @@ -50,11 +50,6 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); title="" data-placement="bottom"> -
    - -
    @@ -274,6 +269,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
    + 0): ?>
    @@ -282,6 +278,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
    +
    @@ -290,6 +287,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
    +
    @@ -309,6 +307,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
    + 0): ?>
    @@ -317,6 +316,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
    +
    @@ -325,6 +325,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
    + From 2faac6be1a44e84425ca65e291b153ce9579c707 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Mon, 27 Nov 2017 13:00:35 -0500 Subject: [PATCH 19/74] Fixed type not being stored, working on display locations --- api/DataAccess/ServiceMessages/ServiceMessagesGateway.php | 4 ++-- index.php | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/api/DataAccess/ServiceMessages/ServiceMessagesGateway.php b/api/DataAccess/ServiceMessages/ServiceMessagesGateway.php index 371089a9..d9d8985a 100644 --- a/api/DataAccess/ServiceMessages/ServiceMessagesGateway.php +++ b/api/DataAccess/ServiceMessages/ServiceMessagesGateway.php @@ -32,7 +32,7 @@ class ServiceMessagesGateway extends CommonDao { '{$type}', '{$myOrder}', '" . hesk_dbEscape($serviceMessage->icon) . "', - '" . hesk_dbEscape($serviceMessage->language) . "', + '" . hesk_dbEscape($serviceMessage->language) . "' )"); $serviceMessage->id = hesk_dbInsertID(); @@ -102,7 +102,7 @@ class ServiceMessagesGateway extends CommonDao { SET `title` = '" . hesk_dbEscape($serviceMessage->title) . "', `message` = '" . hesk_dbEscape($serviceMessage->message) . "', `style` = '" . intval($style) . "', - `type` = " . intval($type) . ", + `type` = '{$type}', `icon` = '" . hesk_dbEscape($serviceMessage->icon) . "', `order` = " . intval($serviceMessage->order) . ", `mfh_language` = '" . hesk_dbEscape($serviceMessage->language) . "' diff --git a/index.php b/index.php index e9082980..ad824f67 100644 --- a/index.php +++ b/index.php @@ -1315,7 +1315,12 @@ function print_start() 0) { ?> From 3e8085110ff464b269fe96d9ab0e4efd4c15c98b Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Tue, 28 Nov 2017 13:03:06 -0500 Subject: [PATCH 20/74] Service messages now appear in their proper locations --- admin/admin_main.php | 10 +++++++++- admin/admin_ticket.php | 5 +++++ admin/index.php | 6 ++++++ admin/knowledgebase_private.php | 19 ++++++++++++++++++- admin/manage_knowledgebase.php | 6 ++++++ admin/new_ticket.php | 5 +++++ inc/common.inc.php | 21 +++++++++++++++++++++ index.php | 21 ++++++++++----------- knowledgebase.php | 15 +++++++++++---- ticket.php | 13 +++++++++++++ 10 files changed, 104 insertions(+), 17 deletions(-) diff --git a/admin/admin_main.php b/admin/admin_main.php index 0d6dcefc..59898d18 100644 --- a/admin/admin_main.php +++ b/admin/admin_main.php @@ -54,7 +54,15 @@ else { ?>
    - +

    diff --git a/admin/admin_ticket.php b/admin/admin_ticket.php index 150b54e6..36804051 100644 --- a/admin/admin_ticket.php +++ b/admin/admin_ticket.php @@ -939,6 +939,11 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); /* This will handle error, success and notice messages */ hesk_handle_messages(); + $service_messages = mfh_get_service_messages('STAFF_VIEW_TICKET'); + foreach ($service_messages as $sm) { + hesk_service_message($sm); + } + // Prepare special custom fields foreach ($hesk_settings['custom_fields'] as $k=>$v) { if ($v['use'] && hesk_is_custom_field_in_category($k, $ticket['category']) ) { diff --git a/admin/index.php b/admin/index.php index aec1e374..f623d4a0 100644 --- a/admin/index.php +++ b/admin/index.php @@ -278,6 +278,12 @@ function print_login()

    '; } // END hesk_kb_header() @@ -214,7 +216,15 @@ function hesk_show_kb_article($artid) ?>
    - + '; + $service_messages = mfh_get_service_messages('STAFF_VIEW_KB_ARTICLE'); + foreach ($service_messages as $sm) { + hesk_service_message($sm); + } + echo '
    '; + ?>
    @@ -397,6 +407,13 @@ function hesk_show_kb_category($catid, $is_search = 0) { { /* Print header */ hesk_kb_header($hesk_settings['kb_link'], $catid); + + echo '
    '; + $service_messages = mfh_get_service_messages('STAFF_KB_HOME'); + foreach ($service_messages as $sm) { + hesk_service_message($sm); + } + echo '
    '; } ?>
    diff --git a/admin/manage_knowledgebase.php b/admin/manage_knowledgebase.php index b126a326..03e4ba6f 100644 --- a/admin/manage_knowledgebase.php +++ b/admin/manage_knowledgebase.php @@ -270,6 +270,12 @@ if (!isset($_SESSION['hide']['treemenu']))
    diff --git a/inc/common.inc.php b/inc/common.inc.php index b510e92b..b6ce26f9 100644 --- a/inc/common.inc.php +++ b/inc/common.inc.php @@ -192,6 +192,27 @@ function hesk_service_message($sm)
    -

    @@ -322,6 +321,13 @@ function print_add_ticket()

    +
    @@ -1315,20 +1321,13 @@ function print_start() 0) - { + $service_messages = mfh_get_service_messages('CUSTOMER_HOME'); + if (count($service_messages) > 0) { ?>
    diff --git a/knowledgebase.php b/knowledgebase.php index fdb2a3a4..22e86586 100644 --- a/knowledgebase.php +++ b/knowledgebase.php @@ -254,6 +254,13 @@ if (!$show['show']) { require_once(HESK_PATH . 'inc/header.inc.php'); hesk_kb_header($hesk_settings['kb_link']); + + // Service messages + $service_messages = mfh_get_service_messages('CUSTOMER_VIEW_KB_ARTICLE'); + foreach ($service_messages as $sm) { + hesk_service_message($sm); + } + // Update views by 1 - exclude known bots and reloads because of ratings if (!isset($_GET['rated']) && !hesk_detect_bots()) { hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "kb_articles` SET `views`=`views`+1 WHERE `id`={$artid}"); @@ -406,11 +413,11 @@ if (!$show['show']) { hesk_kb_header($hesk_settings['kb_link']); } - // If we are in "Knowledgebase only" mode show system messages - if ($catid == 1 && hesk_check_kb_only(false)) { + // Display service messages on the default category + if ($catid == 1) { // Service messages - $res = hesk_dbQuery('SELECT `title`, `message`, `style` FROM `' . hesk_dbEscape($hesk_settings['db_pfix']) . "service_messages` WHERE `type`='0' ORDER BY `order` ASC"); - while ($sm = hesk_dbFetchAssoc($res)) { + $service_messages = mfh_get_service_messages('CUSTOMER_KB_HOME'); + foreach ($service_messages as $sm) { hesk_service_message($sm); } } diff --git a/ticket.php b/ticket.php index cb7ef11b..316dac96 100644 --- a/ticket.php +++ b/ticket.php @@ -215,6 +215,13 @@ if (!$show['show']) {
    From f70c3635a9d30b3440414c59b9c1c9854b443b04 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Wed, 29 Nov 2017 21:58:30 -0500 Subject: [PATCH 21/74] Working on moving the calendar API --- api/BusinessLogic/Calendar/AbstractEvent.php | 20 +++ api/BusinessLogic/Calendar/CalendarEvent.php | 21 +++ api/BusinessLogic/Calendar/TicketEvent.php | 18 +++ api/DataAccess/Calendar/CalendarGateway.php | 129 +++++++++++++++++++ 4 files changed, 188 insertions(+) create mode 100644 api/BusinessLogic/Calendar/AbstractEvent.php create mode 100644 api/BusinessLogic/Calendar/CalendarEvent.php create mode 100644 api/BusinessLogic/Calendar/TicketEvent.php create mode 100644 api/DataAccess/Calendar/CalendarGateway.php diff --git a/api/BusinessLogic/Calendar/AbstractEvent.php b/api/BusinessLogic/Calendar/AbstractEvent.php new file mode 100644 index 00000000..5413ef48 --- /dev/null +++ b/api/BusinessLogic/Calendar/AbstractEvent.php @@ -0,0 +1,20 @@ +init(); + + $startTimeSql = "CONVERT_TZ(FROM_UNIXTIME(" . hesk_dbEscape($startTime) . " / 1000), @@session.time_zone, '+00:00')"; + $endTimeSql = "CONVERT_TZ(FROM_UNIXTIME(" . hesk_dbEscape($endTime) . " / 1000), @@session.time_zone, '+00:00')"; + + $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` "; + } + + $sql .= "FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "calendar_event` AS `events` + INNER JOIN `" . hesk_dbEscape($heskSettings['db_pfix']) . "categories` AS `categories` + ON `events`.`category` = `categories`.`id` "; + + if ($staff) { + $sql .= "LEFT JOIN `" . hesk_dbEscape($heskSettings['db_pfix']) . "calendar_event_reminder` AS `reminders` ON + `reminders`.`user_id` = " . intval($_SESSION['id']) . " AND `reminders`.`event_id` = `events`.`id`"; + } + $sql .= "WHERE NOT (`end` < {$startTimeSql} OR `start` > {$endTimeSql}) AND `categories`.`usage` <> 1"; + + if (!$staff) { + $sql .= " AND `categories`.`type` = '0'"; + } + + $rs = hesk_dbQuery($sql); + + $events = array(); + while ($row = hesk_dbFetchAssoc($rs)) { + // Skip the event if the user does not have access to it + // TODO This should be business logic + if ($staff && !$_SESSION['isadmin'] && !in_array($row['category'], $_SESSION['categories'])) { + continue; + } + + $event['type'] = 'CALENDAR'; + $event['id'] = intval($row['id']); + $event['startTime'] = $row['start']; + $event['endTime'] = $row['end']; + $event['allDay'] = $row['all_day'] ? true : false; + $event['title'] = $row['name']; + $event['location'] = $row['location']; + $event['comments'] = $row['comments']; + $event['categoryId'] = $row['category']; + $event['categoryName'] = $row['category_name']; + $event['backgroundColor'] = $row['background_color']; + $event['foregroundColor'] = $row['foreground_color']; + $event['displayBorder'] = $row['display_border']; + + if ($staff) { + $event['reminderValue'] = $row['reminder_value']; + $event['reminderUnits'] = $row['reminder_unit']; + } + + $events[] = $event; + } + + if ($staff) { + $oldTimeSetting = $heskSettings['timeformat']; + $heskSettings['timeformat'] = 'Y-m-d'; + $currentDate = hesk_date(); + $heskSettings['timeformat'] = $oldTimeSetting; + + $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` < '{$currentDate}' THEN 1 ELSE 0 END AS `overdue`, `owner`.`name` AS `owner_name`, `tickets`.`owner` AS `owner_id`, + `tickets`.`priority` AS `priority` + FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "tickets` AS `tickets` + INNER JOIN `" . hesk_dbEscape($heskSettings['db_pfix']) . "categories` AS `categories` + ON `categories`.`id` = `tickets`.`category` + AND `categories`.`usage` <> 2 + LEFT JOIN `" . hesk_dbEscape($heskSettings['db_pfix']) . "users` AS `owner` + ON `tickets`.`owner` = `owner`.`id` + WHERE `due_date` >= CONVERT_TZ(FROM_UNIXTIME(" . hesk_dbEscape($startTime) + . " / 1000), @@session.time_zone, '+00:00') + AND `due_date` <= CONVERT_TZ(FROM_UNIXTIME(" . hesk_dbEscape($endTime) . " / 1000), @@session.time_zone, '+00:00') + AND `status` IN (SELECT `id` FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "statuses` WHERE `IsClosed` = 0) "; + + $rs = hesk_dbQuery($sql); + while ($row = hesk_dbFetchAssoc($rs)) { + // Skip the ticket if the user does not have access to it + if (!hesk_checkPermission('can_view_tickets', 0) + || ($row['owner_id'] && $row['owner_id'] != $_SESSION['id'] && !hesk_checkPermission('can_view_ass_others', 0)) + || (!$row['owner_id'] && !hesk_checkPermission('can_view_unassigned', 0))) { + continue; + } + + $event['type'] = 'TICKET'; + $event['trackingId'] = $row['trackid']; + $event['subject'] = $row['subject']; + $event['title'] = $row['subject']; + $event['startTime'] = $row['due_date']; + $event['url'] = $heskSettings['hesk_url'] . '/' . $heskSettings['admin_dir'] . '/admin_ticket.php?track=' . $event['trackingId']; + $event['categoryId'] = $row['category']; + $event['categoryName'] = $row['category_name']; + $event['backgroundColor'] = $row['background_color']; + $event['foregroundColor'] = $row['foreground_color']; + $event['displayBorder'] = $row['display_border']; + $event['owner'] = $row['owner_name']; + $event['priority'] = $row['priority']; + + $events[] = $event; + } + } + + $this->close(); + + return $events; + } +} \ No newline at end of file From 0a2e37320aef3a7cd9c4f8670772ba051c249a00 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Fri, 1 Dec 2017 12:56:23 -0500 Subject: [PATCH 22/74] Working on adding controller security --- api/BusinessLogic/Security/UserPrivilege.php | 1 + .../ServiceMessagesController.php | 17 ++++++++++++++++- api/Core/json_error.php | 6 +++++- api/index.php | 2 +- 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/api/BusinessLogic/Security/UserPrivilege.php b/api/BusinessLogic/Security/UserPrivilege.php index 353e8e43..8cd1eee4 100644 --- a/api/BusinessLogic/Security/UserPrivilege.php +++ b/api/BusinessLogic/Security/UserPrivilege.php @@ -15,4 +15,5 @@ class UserPrivilege extends \BaseClass { const CAN_EDIT_TICKETS = 'can_edit_tickets'; const CAN_DELETE_TICKETS = 'can_del_tickets'; const CAN_MANAGE_CATEGORIES = 'can_man_cat'; + const CAN_MANAGE_SERVICE_MESSAGES = 'can_service_msg'; } \ No newline at end of file diff --git a/api/Controllers/ServiceMessages/ServiceMessagesController.php b/api/Controllers/ServiceMessages/ServiceMessagesController.php index bf6c26de..b147f123 100644 --- a/api/Controllers/ServiceMessages/ServiceMessagesController.php +++ b/api/Controllers/ServiceMessages/ServiceMessagesController.php @@ -2,15 +2,30 @@ namespace Controllers\ServiceMessages; +use BusinessLogic\Exceptions\ApiFriendlyException; use BusinessLogic\Helpers; use BusinessLogic\Security\UserContext; +use BusinessLogic\Security\UserPrivilege; use BusinessLogic\ServiceMessages\ServiceMessage; use BusinessLogic\ServiceMessages\ServiceMessageHandler; +use Controllers\ControllerWithSecurity; use Controllers\JsonRetriever; class ServiceMessagesController extends \BaseClass { + /** + * @param $userContext UserContext + * @throws ApiFriendlyException + */ + function checkSecurity($userContext) { + if (!in_array(UserPrivilege::CAN_MANAGE_SERVICE_MESSAGES, $userContext->permissions)) { + throw new ApiFriendlyException("User does not have permission to access the following URI: " . $_SERVER['REQUEST_URI'], "Access Forbidden", 403); + } + } + function get() { - global $applicationContext, $hesk_settings; + global $applicationContext, $hesk_settings, $userContext; + + $this->checkSecurity($userContext); /* @var $handler ServiceMessageHandler */ $handler = $applicationContext->get(ServiceMessageHandler::clazz()); diff --git a/api/Core/json_error.php b/api/Core/json_error.php index 1ff438c0..c9ea1b61 100644 --- a/api/Core/json_error.php +++ b/api/Core/json_error.php @@ -7,7 +7,11 @@ function print_error($title, $message, $logId = null, $response_code = 500) { $error['type'] = 'ERROR'; $error['title'] = $title; $error['message'] = $message; - $error['logId'] = $logId; + + if ($logId !== null) { + $error['logId'] = $logId; + } + print output($error, $response_code); return; diff --git a/api/index.php b/api/index.php index d7fa3656..8502e108 100644 --- a/api/index.php +++ b/api/index.php @@ -105,7 +105,7 @@ function exceptionHandler($exception) { /* @var $castedException \BusinessLogic\Exceptions\ApiFriendlyException */ $castedException = $exception; - print_error($castedException->title, $castedException->getMessage(), $castedException->httpResponseCode); + print_error($castedException->title, $castedException->getMessage(), null, $castedException->httpResponseCode); } elseif (exceptionIsOfType($exception, \Core\Exceptions\SQLException::clazz())) { /* @var $castedException \Core\Exceptions\SQLException */ $castedException = $exception; From 39e61b85c46643aa1ae508e568513391701de1ee Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Mon, 4 Dec 2017 12:56:09 -0500 Subject: [PATCH 23/74] Fixed some issues with the service messages endpoints: --- .../MissingAuthenticationTokenException.php | 4 +- api/BusinessLogic/Security/UserContext.php | 4 ++ .../GetServiceMessagesFilter.php | 12 ++++++ .../ServiceMessages/ServiceMessageHandler.php | 8 ++-- .../ServiceMessagesController.php | 38 +++++++++++++++---- .../ServiceMessagesGateway.php | 31 +++++++++++++-- api/index.php | 13 +++++-- 7 files changed, 90 insertions(+), 20 deletions(-) create mode 100644 api/BusinessLogic/ServiceMessages/GetServiceMessagesFilter.php diff --git a/api/BusinessLogic/Exceptions/MissingAuthenticationTokenException.php b/api/BusinessLogic/Exceptions/MissingAuthenticationTokenException.php index 596839ff..267a82c0 100644 --- a/api/BusinessLogic/Exceptions/MissingAuthenticationTokenException.php +++ b/api/BusinessLogic/Exceptions/MissingAuthenticationTokenException.php @@ -4,8 +4,8 @@ namespace BusinessLogic\Exceptions; 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 this request", 'Security Exception', - 400); + 401); } } \ No newline at end of file diff --git a/api/BusinessLogic/Security/UserContext.php b/api/BusinessLogic/Security/UserContext.php index 3055b4ff..6ce0fba0 100644 --- a/api/BusinessLogic/Security/UserContext.php +++ b/api/BusinessLogic/Security/UserContext.php @@ -57,6 +57,10 @@ class UserContext extends \BaseClass { /* @var $active bool */ public $active; + function isAnonymousUser() { + return $this->id === -1; + } + static function buildAnonymousUser() { $userContext = new UserContext(); $userContext->id = -1; diff --git a/api/BusinessLogic/ServiceMessages/GetServiceMessagesFilter.php b/api/BusinessLogic/ServiceMessages/GetServiceMessagesFilter.php new file mode 100644 index 00000000..a8f381d6 --- /dev/null +++ b/api/BusinessLogic/ServiceMessages/GetServiceMessagesFilter.php @@ -0,0 +1,12 @@ +serviceMessageGateway->createServiceMessage($serviceMessage, $heskSettings); } - function getServiceMessages($heskSettings) { - return $this->serviceMessageGateway->getServiceMessages($heskSettings); + function getServiceMessages($heskSettings, $searchFilter) { + return $this->serviceMessageGateway->getServiceMessages($heskSettings, $searchFilter); } function editServiceMessage($serviceMessage, $heskSettings) { @@ -78,7 +78,7 @@ class ServiceMessageHandler extends \BaseClass { } function sortServiceMessage($id, $direction, $heskSettings) { - $serviceMessages = $this->serviceMessageGateway->getServiceMessages($heskSettings); + $serviceMessages = $this->serviceMessageGateway->getServiceMessages($heskSettings, new GetServiceMessagesFilter()); $serviceMessage = null; foreach ($serviceMessages as $innerServiceMessage) { if (intval($innerServiceMessage->id) === intval($id)) { @@ -129,7 +129,7 @@ class ServiceMessageHandler extends \BaseClass { break; } } - if (!$languageFound) { + if (!$languageFound && !in_array('MISSING_LANGUAGE', $validationModel->errorKeys)) { $validationModel->errorKeys[] = 'LANGUAGE_NOT_INSTALLED'; } diff --git a/api/Controllers/ServiceMessages/ServiceMessagesController.php b/api/Controllers/ServiceMessages/ServiceMessagesController.php index b147f123..48da1a7d 100644 --- a/api/Controllers/ServiceMessages/ServiceMessagesController.php +++ b/api/Controllers/ServiceMessages/ServiceMessagesController.php @@ -6,6 +6,7 @@ use BusinessLogic\Exceptions\ApiFriendlyException; use BusinessLogic\Helpers; use BusinessLogic\Security\UserContext; use BusinessLogic\Security\UserPrivilege; +use BusinessLogic\ServiceMessages\GetServiceMessagesFilter; use BusinessLogic\ServiceMessages\ServiceMessage; use BusinessLogic\ServiceMessages\ServiceMessageHandler; use Controllers\ControllerWithSecurity; @@ -17,25 +18,41 @@ class ServiceMessagesController extends \BaseClass { * @throws ApiFriendlyException */ function checkSecurity($userContext) { - if (!in_array(UserPrivilege::CAN_MANAGE_SERVICE_MESSAGES, $userContext->permissions)) { + if (!$userContext->admin && !in_array(UserPrivilege::CAN_MANAGE_SERVICE_MESSAGES, $userContext->permissions)) { + throw new ApiFriendlyException("User does not have permission to access the following URI: " . $_SERVER['REQUEST_URI'], "Access Forbidden", 403); + } + } + + static function staticCheckSecurity($userContext) { + if (!$userContext->admin && !in_array(UserPrivilege::CAN_MANAGE_SERVICE_MESSAGES, $userContext->permissions)) { throw new ApiFriendlyException("User does not have permission to access the following URI: " . $_SERVER['REQUEST_URI'], "Access Forbidden", 403); } } function get() { + /* @var $userContext UserContext */ + /* @var $hesk_settings array */ global $applicationContext, $hesk_settings, $userContext; - $this->checkSecurity($userContext); + $searchFilter = new GetServiceMessagesFilter(); + if ($userContext->isAnonymousUser()) { + $searchFilter->includeDrafts = false; + $searchFilter->includeStaffServiceMessages = false; + } elseif (!$userContext->admin && !in_array(UserPrivilege::CAN_MANAGE_SERVICE_MESSAGES, $userContext->permissions)) { + $searchFilter->includeDrafts = false; + } /* @var $handler ServiceMessageHandler */ $handler = $applicationContext->get(ServiceMessageHandler::clazz()); - return output($handler->getServiceMessages($hesk_settings)); + return output($handler->getServiceMessages($hesk_settings, $searchFilter)); } function post() { global $applicationContext, $userContext, $hesk_settings; + $this->checkSecurity($userContext); + /* @var $handler ServiceMessageHandler */ $handler = $applicationContext->get(ServiceMessageHandler::clazz()); @@ -46,7 +63,9 @@ class ServiceMessagesController extends \BaseClass { } function put($id) { - global $applicationContext, $hesk_settings; + global $applicationContext, $hesk_settings, $userContext; + + $this->checkSecurity($userContext); /* @var $handler ServiceMessageHandler */ $handler = $applicationContext->get(ServiceMessageHandler::clazz()); @@ -60,7 +79,9 @@ class ServiceMessagesController extends \BaseClass { } function delete($id) { - global $applicationContext, $hesk_settings; + global $applicationContext, $hesk_settings, $userContext; + + $this->checkSecurity($userContext); /* @var $handler ServiceMessageHandler */ $handler = $applicationContext->get(ServiceMessageHandler::clazz()); @@ -79,7 +100,7 @@ class ServiceMessagesController extends \BaseClass { $serviceMessage = new ServiceMessage(); if (!$creating) { - $serviceMessage->order = $data['order']; + $serviceMessage->order = Helpers::safeArrayGet($data, 'order'); } if ($creating) { @@ -105,7 +126,10 @@ class ServiceMessagesController extends \BaseClass { } static function sort($id, $direction) { - global $applicationContext, $hesk_settings; + /* @var $userContext UserContext */ + global $applicationContext, $hesk_settings, $userContext; + + self::staticCheckSecurity($userContext); /* @var $handler ServiceMessageHandler */ $handler = $applicationContext->get(ServiceMessageHandler::clazz()); diff --git a/api/DataAccess/ServiceMessages/ServiceMessagesGateway.php b/api/DataAccess/ServiceMessages/ServiceMessagesGateway.php index d9d8985a..e15a593e 100644 --- a/api/DataAccess/ServiceMessages/ServiceMessagesGateway.php +++ b/api/DataAccess/ServiceMessages/ServiceMessagesGateway.php @@ -3,7 +3,9 @@ namespace DataAccess\ServiceMessages; +use BusinessLogic\ServiceMessages\GetServiceMessagesFilter; use BusinessLogic\ServiceMessages\ServiceMessage; +use BusinessLogic\ServiceMessages\ServiceMessageLocation; use BusinessLogic\ServiceMessages\ServiceMessageStyle; use DataAccess\CommonDao; @@ -56,14 +58,29 @@ class ServiceMessagesGateway extends CommonDao { /** * @param $heskSettings + * @param $searchFilter GetServiceMessagesFilter * @return ServiceMessage[] */ - function getServiceMessages($heskSettings) { + function getServiceMessages($heskSettings, $searchFilter) { $this->init(); $serviceMessages = array(); - $rs = hesk_dbQuery("SELECT * FROM `". hesk_dbEscape($heskSettings['db_pfix']) . "service_messages` ORDER BY `order`"); + $sql = "SELECT DISTINCT `service_messages`.* FROM `". hesk_dbEscape($heskSettings['db_pfix']) . "service_messages` AS `service_messages` "; + + if (!$searchFilter->includeStaffServiceMessages) { + $sql .= "INNER JOIN `" . hesk_dbEscape($heskSettings['db_pfix']) . "mfh_service_message_to_location` AS `location` + ON `location`.`service_message_id` = `service_messages`.`id` AND `location`.`location` LIKE 'CUSTOMER%' "; + } + + if (!$searchFilter->includeDrafts) { + $sql .= "WHERE `type` = '0' "; + } + + $sql .= "ORDER BY `order`"; + + + $rs = hesk_dbQuery($sql); while ($row = hesk_dbFetchAssoc($rs)) { $serviceMessage = new ServiceMessage(); $serviceMessage->id = $row['id']; @@ -78,8 +95,14 @@ class ServiceMessagesGateway extends CommonDao { $serviceMessage->language = $row['mfh_language']; $serviceMessage->locations = array(); - $locationsRs = hesk_dbQuery("SELECT `location` FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "mfh_service_message_to_location` - WHERE `service_message_id` = " . intval($serviceMessage->id)); + $locationSql = "SELECT `location` FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "mfh_service_message_to_location` + WHERE `service_message_id` = " . intval($serviceMessage->id); + + if (!$searchFilter->includeStaffServiceMessages) { + $locationSql .= " AND `location` LIKE 'CUSTOMER%'"; + } + + $locationsRs = hesk_dbQuery($locationSql); while ($innerRow = hesk_dbFetchAssoc($locationsRs)) { $serviceMessage->locations[] = $innerRow['location']; } diff --git a/api/index.php b/api/index.php index 8502e108..3a67c362 100644 --- a/api/index.php +++ b/api/index.php @@ -45,8 +45,15 @@ function internalOrAuthHandler() { function publicHandler() { global $userContext; - //-- Create an "anonymous" UserContext - $userContext = \BusinessLogic\Security\UserContext::buildAnonymousUser(); + // Check if we passed in a X-Auth-Token or X-Internal-Call header. Those take priority + if (\BusinessLogic\Helpers::getHeader('X-INTERNAL-CALL') === 'true') { + internalHandler(); + } elseif (\BusinessLogic\Helpers::getHeader('X-AUTH-TOKEN') !== null) { + authTokenHandler(); + } else { + //-- Create an "anonymous" UserContext + $userContext = \BusinessLogic\Security\UserContext::buildAnonymousUser(); + } } function assertApiIsEnabled() { @@ -205,7 +212,7 @@ Link::all(array( // Service Messages '/v1/service-messages' => action(\Controllers\ServiceMessages\ServiceMessagesController::clazz(), array(RequestMethod::GET, RequestMethod::POST), - SecurityHandler::INTERNAL_OR_AUTH_TOKEN), + SecurityHandler::OPEN), '/v1/service-messages/{i}' => action(\Controllers\ServiceMessages\ServiceMessagesController::clazz(), array(RequestMethod::PUT, RequestMethod::DELETE), SecurityHandler::INTERNAL_OR_AUTH_TOKEN), From 5ee4ed5864d9147e3e923d0959c6884f930fb668 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Wed, 6 Dec 2017 21:37:42 -0500 Subject: [PATCH 24/74] revert meeee --- api/BusinessLogic/Calendar/CalendarEvent.php | 2 + .../Calendar/SearchEventsFilter.php | 21 ++ api/BusinessLogic/Security/UserContext.php | 4 + api/BusinessLogic/Security/UserPrivilege.php | 2 + api/DataAccess/Calendar/CalendarGateway.php | 213 ++++++++++++------ 5 files changed, 173 insertions(+), 69 deletions(-) create mode 100644 api/BusinessLogic/Calendar/SearchEventsFilter.php diff --git a/api/BusinessLogic/Calendar/CalendarEvent.php b/api/BusinessLogic/Calendar/CalendarEvent.php index 91a45761..893cbccb 100644 --- a/api/BusinessLogic/Calendar/CalendarEvent.php +++ b/api/BusinessLogic/Calendar/CalendarEvent.php @@ -4,6 +4,8 @@ namespace BusinessLogic\Calendar; class CalendarEvent extends AbstractEvent { + public $id; + public $type = 'CALENDAR'; public $endTime; diff --git a/api/BusinessLogic/Calendar/SearchEventsFilter.php b/api/BusinessLogic/Calendar/SearchEventsFilter.php new file mode 100644 index 00000000..1a509f9f --- /dev/null +++ b/api/BusinessLogic/Calendar/SearchEventsFilter.php @@ -0,0 +1,21 @@ +username === "API - ANONYMOUS USER"; + } + static function buildAnonymousUser() { $userContext = new UserContext(); $userContext->id = -1; diff --git a/api/BusinessLogic/Security/UserPrivilege.php b/api/BusinessLogic/Security/UserPrivilege.php index 353e8e43..0d68418f 100644 --- a/api/BusinessLogic/Security/UserPrivilege.php +++ b/api/BusinessLogic/Security/UserPrivilege.php @@ -15,4 +15,6 @@ class UserPrivilege extends \BaseClass { const CAN_EDIT_TICKETS = 'can_edit_tickets'; const CAN_DELETE_TICKETS = 'can_del_tickets'; const CAN_MANAGE_CATEGORIES = 'can_man_cat'; + const CAN_VIEW_ASSIGNED_TO_OTHER = 'can_view_ass_others'; + const CAN_VIEW_UNASSIGNED = 'can_view_unassigned'; } \ No newline at end of file diff --git a/api/DataAccess/Calendar/CalendarGateway.php b/api/DataAccess/Calendar/CalendarGateway.php index 8327808b..5fea19a3 100644 --- a/api/DataAccess/Calendar/CalendarGateway.php +++ b/api/DataAccess/Calendar/CalendarGateway.php @@ -3,10 +3,97 @@ namespace DataAccess\Calendar; +use BusinessLogic\Calendar\CalendarEvent; +use BusinessLogic\Calendar\SearchEventsFilter; +use BusinessLogic\Calendar\TicketEvent; use BusinessLogic\Security\UserContext; +use BusinessLogic\Security\UserPrivilege; use DataAccess\CommonDao; class CalendarGateway extends CommonDao { + /** + * @param $startTime int + * @param $endTime int + * @param $searchEventsFilter SearchEventsFilter + * @param $heskSettings array + */ + public function getEventsForStaff($startTime, $endTime, $searchEventsFilter, $heskSettings) { + $this->init(); + + $startTimeSql = "CONVERT_TZ(FROM_UNIXTIME(" . hesk_dbEscape($startTime) . " / 1000), @@session.time_zone, '+00:00')"; + $endTimeSql = "CONVERT_TZ(FROM_UNIXTIME(" . hesk_dbEscape($endTime) . " / 1000), @@session.time_zone, '+00:00')"; + + // EVENTS + $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`, + `reminders`.`amount` AS `reminder_value`, `reminder`.`unit` AS `reminder_unit` + FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "calendar_event` AS `events` + INNER JOIN `" . hesk_dbEscape($heskSettings['db_pfix']) . "categories` AS `categories` + ON `events`.`category` = `categories`.`id` + LEFT JOIN `" . hesk_dbEscape($heskSettings['db_pfix']) . "calendar_event_reminder` AS `reminders` + ON `reminders`.`user_id` = " . intval($searchEventsFilter->reminderUserId) . " + AND `reminders`.`event_id` = `events`.`id` + WHERE NOT (`end` < {$startTimeSql} OR `start` > {$endTimeSql}) + AND `categories`.`usage` <> 1 + AND `categories`.`type` = '0'"; + + if (!empty($searchEventsFilter->categories)) { + $categoriesAsString = implode(',', $searchEventsFilter->categories); + $sql .= " AND `events`.`category` IN (" . $categoriesAsString . ")"; + } + + $rs = hesk_dbQuery($sql); + while ($row = hesk_dbFetchAssoc($rs)) { + $event = new CalendarEvent(); + $event->id = intval($row['id']); + $event->startTime = $row['start']; + $event->endTime = $row['end']; + $event->allDay = $row['all_day'] ? true : false; + $event->title = $row['name']; + $event->location = $row['location']; + $event->comments = $row['comments']; + $event->categoryId = $row['category']; + $event->categoryName = $row['category_name']; + $event->backgroundColor = $row['background_color']; + $event->foregroundColor = $row['foreground_color']; + $event->displayBorder = $row['display_border']; + $event->reminderValue = $row['reminder_value']; + $event->reminderUnits = $row['reminder_unit']; + + $events[] = $event; + } + + // TICKETS + if ($searchEventsFilter->includeTickets) { + $oldTimeSetting = $heskSettings['timeformat']; + $heskSettings['timeformat'] = 'Y-m-d'; + $currentDate = hesk_date(); + $heskSettings['timeformat'] = $oldTimeSetting; + + $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` < '{$currentDate}' THEN 1 ELSE 0 END AS `overdue`, `owner`.`name` AS `owner_name`, `tickets`.`owner` AS `owner_id`, + `tickets`.`priority` AS `priority` + FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "tickets` AS `tickets` + INNER JOIN `" . hesk_dbEscape($heskSettings['db_pfix']) . "categories` AS `categories` + ON `categories`.`id` = `tickets`.`category` + AND `categories`.`usage` <> 2 + LEFT JOIN `" . hesk_dbEscape($heskSettings['db_pfix']) . "users` AS `owner` + ON `tickets`.`owner` = `owner`.`id` + WHERE `due_date` >= {$startTimeSql}) + AND `due_date` <= {$endTimeSql}) + AND `status` IN (SELECT `id` FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "statuses` WHERE `IsClosed` = 0) + AND (`owner` = " . $searchEventsFilter->reminderUserId; + + if ($searchEventsFilter->includeUnassignedTickets) { + $sql .= ""; + } + + $sql .= ")"; + } + + $this->close(); + } /** * @param $startTime int @@ -15,32 +102,24 @@ class CalendarGateway extends CommonDao { * @param $heskSettings array * @return array */ - public function getEventsForStaff($startTime, $endTime, $userContext, $heskSettings) { + public function getXXEventsForStaff($startTime, $endTime, $userContext, $heskSettings) { $this->init(); $startTimeSql = "CONVERT_TZ(FROM_UNIXTIME(" . hesk_dbEscape($startTime) . " / 1000), @@session.time_zone, '+00:00')"; $endTimeSql = "CONVERT_TZ(FROM_UNIXTIME(" . hesk_dbEscape($endTime) . " / 1000), @@session.time_zone, '+00:00')"; $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` "; - } - - $sql .= "FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "calendar_event` AS `events` - INNER JOIN `" . hesk_dbEscape($heskSettings['db_pfix']) . "categories` AS `categories` - ON `events`.`category` = `categories`.`id` "; - - if ($staff) { - $sql .= "LEFT JOIN `" . hesk_dbEscape($heskSettings['db_pfix']) . "calendar_event_reminder` AS `reminders` ON - `reminders`.`user_id` = " . intval($_SESSION['id']) . " AND `reminders`.`event_id` = `events`.`id`"; - } - $sql .= "WHERE NOT (`end` < {$startTimeSql} OR `start` > {$endTimeSql}) AND `categories`.`usage` <> 1"; - - if (!$staff) { - $sql .= " AND `categories`.`type` = '0'"; - } + `categories`.`foreground_color` AS `foreground_color`, `categories`.`display_border_outline` AS `display_border`, + `reminders`.`amount` AS `reminder_value`, `reminders`.`unit` AS `reminder_unit` + FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "calendar_event` AS `events` + INNER JOIN `" . hesk_dbEscape($heskSettings['db_pfix']) . "categories` AS `categories` + ON `events`.`category` = `categories`.`id` + LEFT JOIN `" . hesk_dbEscape($heskSettings['db_pfix']) . "calendar_event_reminder` AS `reminders` + ON `reminders`.`user_id` = " . intval($userContext->id) . " + AND `reminders`.`event_id` = `events`.`id` + WHERE NOT (`end` < {$startTimeSql} OR `start` > {$endTimeSql}) + AND `categories`.`usage` <> 1 + AND `categories`.`type` = '0'"; $rs = hesk_dbQuery($sql); @@ -48,39 +127,35 @@ class CalendarGateway extends CommonDao { while ($row = hesk_dbFetchAssoc($rs)) { // Skip the event if the user does not have access to it // TODO This should be business logic - if ($staff && !$_SESSION['isadmin'] && !in_array($row['category'], $_SESSION['categories'])) { + if (!$userContext->admin && in_array($row['category'], $userContext->categories)) { continue; } - $event['type'] = 'CALENDAR'; - $event['id'] = intval($row['id']); - $event['startTime'] = $row['start']; - $event['endTime'] = $row['end']; - $event['allDay'] = $row['all_day'] ? true : false; - $event['title'] = $row['name']; - $event['location'] = $row['location']; - $event['comments'] = $row['comments']; - $event['categoryId'] = $row['category']; - $event['categoryName'] = $row['category_name']; - $event['backgroundColor'] = $row['background_color']; - $event['foregroundColor'] = $row['foreground_color']; - $event['displayBorder'] = $row['display_border']; - - if ($staff) { - $event['reminderValue'] = $row['reminder_value']; - $event['reminderUnits'] = $row['reminder_unit']; - } + $event = new CalendarEvent(); + $event->id = intval($row['id']); + $event->startTime = $row['start']; + $event->endTime = $row['end']; + $event->allDay = $row['all_day'] ? true : false; + $event->title = $row['name']; + $event->location = $row['location']; + $event->comments = $row['comments']; + $event->categoryId = $row['category']; + $event->categoryName = $row['category_name']; + $event->backgroundColor = $row['background_color']; + $event->foregroundColor = $row['foreground_color']; + $event->displayBorder = $row['display_border']; + $event->reminderValue = $row['reminder_value']; + $event->reminderUnits = $row['reminder_unit']; $events[] = $event; } - if ($staff) { - $oldTimeSetting = $heskSettings['timeformat']; - $heskSettings['timeformat'] = 'Y-m-d'; - $currentDate = hesk_date(); - $heskSettings['timeformat'] = $oldTimeSetting; + $oldTimeSetting = $heskSettings['timeformat']; + $heskSettings['timeformat'] = 'Y-m-d'; + $currentDate = hesk_date(); + $heskSettings['timeformat'] = $oldTimeSetting; - $sql = "SELECT `trackid`, `subject`, `due_date`, `category`, `categories`.`name` AS `category_name`, `categories`.`background_color` AS `background_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` < '{$currentDate}' THEN 1 ELSE 0 END AS `overdue`, `owner`.`name` AS `owner_name`, `tickets`.`owner` AS `owner_id`, `tickets`.`priority` AS `priority` @@ -95,31 +170,31 @@ class CalendarGateway extends CommonDao { AND `due_date` <= CONVERT_TZ(FROM_UNIXTIME(" . hesk_dbEscape($endTime) . " / 1000), @@session.time_zone, '+00:00') AND `status` IN (SELECT `id` FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "statuses` WHERE `IsClosed` = 0) "; - $rs = hesk_dbQuery($sql); - while ($row = hesk_dbFetchAssoc($rs)) { - // Skip the ticket if the user does not have access to it - if (!hesk_checkPermission('can_view_tickets', 0) - || ($row['owner_id'] && $row['owner_id'] != $_SESSION['id'] && !hesk_checkPermission('can_view_ass_others', 0)) - || (!$row['owner_id'] && !hesk_checkPermission('can_view_unassigned', 0))) { - continue; - } - - $event['type'] = 'TICKET'; - $event['trackingId'] = $row['trackid']; - $event['subject'] = $row['subject']; - $event['title'] = $row['subject']; - $event['startTime'] = $row['due_date']; - $event['url'] = $heskSettings['hesk_url'] . '/' . $heskSettings['admin_dir'] . '/admin_ticket.php?track=' . $event['trackingId']; - $event['categoryId'] = $row['category']; - $event['categoryName'] = $row['category_name']; - $event['backgroundColor'] = $row['background_color']; - $event['foregroundColor'] = $row['foreground_color']; - $event['displayBorder'] = $row['display_border']; - $event['owner'] = $row['owner_name']; - $event['priority'] = $row['priority']; - - $events[] = $event; + $rs = hesk_dbQuery($sql); + while ($row = hesk_dbFetchAssoc($rs)) { + // Skip the ticket if the user does not have access to it + // TODO Move to Business logic + if (!in_array(UserPrivilege::CAN_VIEW_TICKETS, $userContext->permissions) + || ($row['owner_id'] && $row['owner_id'] != $userContext->id && !in_array(UserPrivilege::CAN_VIEW_ASSIGNED_TO_OTHER, $userContext->permissions)) + || (!$row['owner_id']) && !in_array(UserPrivilege::CAN_VIEW_UNASSIGNED, $userContext->permissions)) { + continue; } + + $event = new TicketEvent(); + $event->trackingId = $row['trackid']; + $event->subject = $row['subject']; + $event->title = $row['subject']; + $event->startTime = $row['due_date']; + $event->url = $heskSettings['hesk_url'] . '/' . $heskSettings['admin_dir'] . '/admin_ticket.php?track=' . $event['trackingId']; + $event->categoryId = $row['category']; + $event->categoryName = $row['category_name']; + $event->backgroundColor = $row['background_color']; + $event->foregroundColor = $row['foreground_color']; + $event->displayBorder = $row['display_border']; + $event->owner = $row['owner_name']; + $event->priority = $row['priority']; + + $events[] = $event; } $this->close(); From 13161696ae30f3b207d190a3c323add9a44aca10 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Sun, 10 Dec 2017 22:01:18 -0500 Subject: [PATCH 25/74] Working on refactoring the calendar API --- .../Calendar/CalendarHandler.php | 18 +++++++++++ .../Calendar/CalendarController.php | 23 ++++++++++++++ api/DataAccess/Calendar/CalendarGateway.php | 30 ++++++++++++++++++- 3 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 api/BusinessLogic/Calendar/CalendarHandler.php create mode 100644 api/Controllers/Calendar/CalendarController.php diff --git a/api/BusinessLogic/Calendar/CalendarHandler.php b/api/BusinessLogic/Calendar/CalendarHandler.php new file mode 100644 index 00000000..f3374279 --- /dev/null +++ b/api/BusinessLogic/Calendar/CalendarHandler.php @@ -0,0 +1,18 @@ +calendarGateway = $calendarGateway; + } + + public function getEventsForStaff($startTime, $endTime, $searchEventsFilter, $heskSettings) { + return $this->calendarGateway->getEventsForStaff($startTime, $endTime, $searchEventsFilter, $heskSettings); + } +} \ No newline at end of file diff --git a/api/Controllers/Calendar/CalendarController.php b/api/Controllers/Calendar/CalendarController.php new file mode 100644 index 00000000..60a57b79 --- /dev/null +++ b/api/Controllers/Calendar/CalendarController.php @@ -0,0 +1,23 @@ +get(CalendarHandler::clazz()); + + $events = $calendarHandler->getEventsForStaff($startTime, $endTime, new SearchEventsFilter(), $hesk_settings); + + return output($events); + } +} \ No newline at end of file diff --git a/api/DataAccess/Calendar/CalendarGateway.php b/api/DataAccess/Calendar/CalendarGateway.php index 5fea19a3..b3ae4b92 100644 --- a/api/DataAccess/Calendar/CalendarGateway.php +++ b/api/DataAccess/Calendar/CalendarGateway.php @@ -86,10 +86,38 @@ class CalendarGateway extends CommonDao { AND (`owner` = " . $searchEventsFilter->reminderUserId; if ($searchEventsFilter->includeUnassignedTickets) { - $sql .= ""; + $sql .= " OR `owner` = 0 "; + } + + if ($searchEventsFilter->includeTicketsAssignedToOthers) { + $sql .= " OR `owner` NOT IN (0, " . $searchEventsFilter->reminderUserId . ") "; } $sql .= ")"; + + if (!empty($searchEventsFilter->categories)) { + $categoriesAsString = implode(',', $searchEventsFilter->categories); + $sql .= " AND `events`.`category` IN (" . $categoriesAsString . ")"; + } + + $rs = hesk_dbQuery($sql); + while ($row = hesk_dbFetchAssoc($rs)) { + $event = new TicketEvent(); + $event->trackingId = $row['trackid']; + $event->subject = $row['subject']; + $event->title = $row['subject']; + $event->startTime = $row['due_date']; + $event->url = $heskSettings['hesk_url'] . '/' . $heskSettings['admin_dir'] . '/admin_ticket.php?track=' . $event['trackingId']; + $event->categoryId = $row['category']; + $event->categoryName = $row['category_name']; + $event->backgroundColor = $row['background_color']; + $event->foregroundColor = $row['foreground_color']; + $event->displayBorder = $row['display_border']; + $event->owner = $row['owner_name']; + $event->priority = $row['priority']; + + $events[] = $event; + } } $this->close(); From 814523ba6e21999ca8f2978dde9907228696fe95 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Sun, 17 Dec 2017 22:05:32 -0500 Subject: [PATCH 26/74] getEventsForStaff endpoint appears to be working --- api/BusinessLogic/Calendar/ReminderUnit.php | 26 +++++++++++++++++ .../Calendar/CalendarController.php | 26 ++++++++++++++--- api/Core/Constants/Priority.php | 15 ++++++++++ api/DataAccess/Calendar/CalendarGateway.php | 28 +++++++++++-------- api/index.php | 2 ++ 5 files changed, 82 insertions(+), 15 deletions(-) create mode 100644 api/BusinessLogic/Calendar/ReminderUnit.php diff --git a/api/BusinessLogic/Calendar/ReminderUnit.php b/api/BusinessLogic/Calendar/ReminderUnit.php new file mode 100644 index 00000000..866ad8e9 --- /dev/null +++ b/api/BusinessLogic/Calendar/ReminderUnit.php @@ -0,0 +1,26 @@ +errorKeys = array('START_AND_END_TIMES_REQUIRED'); + throw new ValidationException($validationModel); + } + + $startTime = $_GET['start']; + $endTime = $_GET['end']; /* @var $calendarHandler CalendarHandler */ $calendarHandler = $applicationContext->get(CalendarHandler::clazz()); - $events = $calendarHandler->getEventsForStaff($startTime, $endTime, new SearchEventsFilter(), $hesk_settings); + $searchEventsFilter = new SearchEventsFilter(); + $searchEventsFilter->reminderUserId = $userContext->id; + $searchEventsFilter->includeTicketsAssignedToOthers = in_array(UserPrivilege::CAN_VIEW_ASSIGNED_TO_OTHER, $userContext->permissions); + $searchEventsFilter->includeUnassignedTickets = in_array(UserPrivilege::CAN_VIEW_UNASSIGNED, $userContext->permissions); + $searchEventsFilter->includeTickets = true; + $searchEventsFilter->categories = $userContext->admin ? null : $userContext->categories; + + $events = $calendarHandler->getEventsForStaff($startTime, $endTime, $searchEventsFilter, $hesk_settings); return output($events); } diff --git a/api/Core/Constants/Priority.php b/api/Core/Constants/Priority.php index 39b86313..de361ab3 100644 --- a/api/Core/Constants/Priority.php +++ b/api/Core/Constants/Priority.php @@ -8,4 +8,19 @@ class Priority extends \BaseClass { const HIGH = 1; const MEDIUM = 2; const LOW = 3; + + static function getByValue($value) { + switch ($value) { + case self::CRITICAL: + return 'CRITICAL'; + case self::HIGH: + return 'HIGH'; + case self::MEDIUM: + return 'MEDIUM'; + case self::LOW: + return 'LOW'; + default: + return 'UNKNOWN'; + } + } } \ No newline at end of file diff --git a/api/DataAccess/Calendar/CalendarGateway.php b/api/DataAccess/Calendar/CalendarGateway.php index b3ae4b92..dc724a73 100644 --- a/api/DataAccess/Calendar/CalendarGateway.php +++ b/api/DataAccess/Calendar/CalendarGateway.php @@ -4,10 +4,12 @@ namespace DataAccess\Calendar; use BusinessLogic\Calendar\CalendarEvent; +use BusinessLogic\Calendar\ReminderUnit; use BusinessLogic\Calendar\SearchEventsFilter; use BusinessLogic\Calendar\TicketEvent; use BusinessLogic\Security\UserContext; use BusinessLogic\Security\UserPrivilege; +use Core\Constants\Priority; use DataAccess\CommonDao; class CalendarGateway extends CommonDao { @@ -20,13 +22,15 @@ class CalendarGateway extends CommonDao { public function getEventsForStaff($startTime, $endTime, $searchEventsFilter, $heskSettings) { $this->init(); + $events = array(); + $startTimeSql = "CONVERT_TZ(FROM_UNIXTIME(" . hesk_dbEscape($startTime) . " / 1000), @@session.time_zone, '+00:00')"; $endTimeSql = "CONVERT_TZ(FROM_UNIXTIME(" . hesk_dbEscape($endTime) . " / 1000), @@session.time_zone, '+00:00')"; // EVENTS $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`, - `reminders`.`amount` AS `reminder_value`, `reminder`.`unit` AS `reminder_unit` + `reminders`.`amount` AS `reminder_value`, `reminders`.`unit` AS `reminder_unit` FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "calendar_event` AS `events` INNER JOIN `" . hesk_dbEscape($heskSettings['db_pfix']) . "categories` AS `categories` ON `events`.`category` = `categories`.`id` @@ -52,13 +56,13 @@ class CalendarGateway extends CommonDao { $event->title = $row['name']; $event->location = $row['location']; $event->comments = $row['comments']; - $event->categoryId = $row['category']; + $event->categoryId = intval($row['category']); $event->categoryName = $row['category_name']; $event->backgroundColor = $row['background_color']; $event->foregroundColor = $row['foreground_color']; - $event->displayBorder = $row['display_border']; - $event->reminderValue = $row['reminder_value']; - $event->reminderUnits = $row['reminder_unit']; + $event->displayBorder = $row['display_border'] === '1'; + $event->reminderValue = $row['reminder_value'] === null ? null : floatval($row['reminder_value']); + $event->reminderUnits = $row['reminder_unit'] === null ? null : ReminderUnit::getByValue($row['reminder_unit']); $events[] = $event; } @@ -80,8 +84,8 @@ class CalendarGateway extends CommonDao { AND `categories`.`usage` <> 2 LEFT JOIN `" . hesk_dbEscape($heskSettings['db_pfix']) . "users` AS `owner` ON `tickets`.`owner` = `owner`.`id` - WHERE `due_date` >= {$startTimeSql}) - AND `due_date` <= {$endTimeSql}) + WHERE `due_date` >= {$startTimeSql} + AND `due_date` <= {$endTimeSql} AND `status` IN (SELECT `id` FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "statuses` WHERE `IsClosed` = 0) AND (`owner` = " . $searchEventsFilter->reminderUserId; @@ -107,20 +111,22 @@ class CalendarGateway extends CommonDao { $event->subject = $row['subject']; $event->title = $row['subject']; $event->startTime = $row['due_date']; - $event->url = $heskSettings['hesk_url'] . '/' . $heskSettings['admin_dir'] . '/admin_ticket.php?track=' . $event['trackingId']; - $event->categoryId = $row['category']; + $event->url = $heskSettings['hesk_url'] . '/' . $heskSettings['admin_dir'] . '/admin_ticket.php?track=' . $event->trackingId; + $event->categoryId = intval($row['category']); $event->categoryName = $row['category_name']; $event->backgroundColor = $row['background_color']; $event->foregroundColor = $row['foreground_color']; - $event->displayBorder = $row['display_border']; + $event->displayBorder = $row['display_border'] === '0'; $event->owner = $row['owner_name']; - $event->priority = $row['priority']; + $event->priority = Priority::getByValue($row['priority']); $events[] = $event; } } $this->close(); + + return $events; } /** diff --git a/api/index.php b/api/index.php index 4766701c..9e617185 100644 --- a/api/index.php +++ b/api/index.php @@ -202,6 +202,8 @@ Link::all(array( '/v1/statuses' => action(\Controllers\Statuses\StatusController::clazz(), RequestMethod::all()), // Settings '/v1/settings' => action(\Controllers\Settings\SettingsController::clazz(), RequestMethod::all()), + // Calendar + '/v1/calendar/events/staff' => action(\Controllers\Calendar\CalendarController::clazz(), array(RequestMethod::GET), SecurityHandler::INTERNAL_OR_AUTH_TOKEN), /* Internal use only routes */ // Resend email response From 9eab1525ef9202fddb6d899ec9aa1fb82fb25831 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Thu, 21 Dec 2017 22:10:45 -0500 Subject: [PATCH 27/74] Getting started on moving the update event endpoint --- api/DataAccess/Calendar/CalendarGateway.php | 113 +------------------- api/index.php | 1 + js/calendar/mods-for-hesk-calendar.js | 5 +- 3 files changed, 7 insertions(+), 112 deletions(-) diff --git a/api/DataAccess/Calendar/CalendarGateway.php b/api/DataAccess/Calendar/CalendarGateway.php index dc724a73..558e4113 100644 --- a/api/DataAccess/Calendar/CalendarGateway.php +++ b/api/DataAccess/Calendar/CalendarGateway.php @@ -3,12 +3,11 @@ namespace DataAccess\Calendar; +use BusinessLogic\Calendar\AbstractEvent; use BusinessLogic\Calendar\CalendarEvent; use BusinessLogic\Calendar\ReminderUnit; use BusinessLogic\Calendar\SearchEventsFilter; use BusinessLogic\Calendar\TicketEvent; -use BusinessLogic\Security\UserContext; -use BusinessLogic\Security\UserPrivilege; use Core\Constants\Priority; use DataAccess\CommonDao; @@ -18,6 +17,7 @@ class CalendarGateway extends CommonDao { * @param $endTime int * @param $searchEventsFilter SearchEventsFilter * @param $heskSettings array + * @return AbstractEvent[] */ public function getEventsForStaff($startTime, $endTime, $searchEventsFilter, $heskSettings) { $this->init(); @@ -101,7 +101,7 @@ class CalendarGateway extends CommonDao { if (!empty($searchEventsFilter->categories)) { $categoriesAsString = implode(',', $searchEventsFilter->categories); - $sql .= " AND `events`.`category` IN (" . $categoriesAsString . ")"; + $sql .= " AND `tickets`.`category` IN (" . $categoriesAsString . ")"; } $rs = hesk_dbQuery($sql); @@ -128,111 +128,4 @@ class CalendarGateway extends CommonDao { return $events; } - - /** - * @param $startTime int - * @param $endTime int - * @param $userContext UserContext - * @param $heskSettings array - * @return array - */ - public function getXXEventsForStaff($startTime, $endTime, $userContext, $heskSettings) { - $this->init(); - - $startTimeSql = "CONVERT_TZ(FROM_UNIXTIME(" . hesk_dbEscape($startTime) . " / 1000), @@session.time_zone, '+00:00')"; - $endTimeSql = "CONVERT_TZ(FROM_UNIXTIME(" . hesk_dbEscape($endTime) . " / 1000), @@session.time_zone, '+00:00')"; - - $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`, - `reminders`.`amount` AS `reminder_value`, `reminders`.`unit` AS `reminder_unit` - FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "calendar_event` AS `events` - INNER JOIN `" . hesk_dbEscape($heskSettings['db_pfix']) . "categories` AS `categories` - ON `events`.`category` = `categories`.`id` - LEFT JOIN `" . hesk_dbEscape($heskSettings['db_pfix']) . "calendar_event_reminder` AS `reminders` - ON `reminders`.`user_id` = " . intval($userContext->id) . " - AND `reminders`.`event_id` = `events`.`id` - WHERE NOT (`end` < {$startTimeSql} OR `start` > {$endTimeSql}) - AND `categories`.`usage` <> 1 - AND `categories`.`type` = '0'"; - - $rs = hesk_dbQuery($sql); - - $events = array(); - while ($row = hesk_dbFetchAssoc($rs)) { - // Skip the event if the user does not have access to it - // TODO This should be business logic - if (!$userContext->admin && in_array($row['category'], $userContext->categories)) { - continue; - } - - $event = new CalendarEvent(); - $event->id = intval($row['id']); - $event->startTime = $row['start']; - $event->endTime = $row['end']; - $event->allDay = $row['all_day'] ? true : false; - $event->title = $row['name']; - $event->location = $row['location']; - $event->comments = $row['comments']; - $event->categoryId = $row['category']; - $event->categoryName = $row['category_name']; - $event->backgroundColor = $row['background_color']; - $event->foregroundColor = $row['foreground_color']; - $event->displayBorder = $row['display_border']; - $event->reminderValue = $row['reminder_value']; - $event->reminderUnits = $row['reminder_unit']; - - $events[] = $event; - } - - $oldTimeSetting = $heskSettings['timeformat']; - $heskSettings['timeformat'] = 'Y-m-d'; - $currentDate = hesk_date(); - $heskSettings['timeformat'] = $oldTimeSetting; - - $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` < '{$currentDate}' THEN 1 ELSE 0 END AS `overdue`, `owner`.`name` AS `owner_name`, `tickets`.`owner` AS `owner_id`, - `tickets`.`priority` AS `priority` - FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "tickets` AS `tickets` - INNER JOIN `" . hesk_dbEscape($heskSettings['db_pfix']) . "categories` AS `categories` - ON `categories`.`id` = `tickets`.`category` - AND `categories`.`usage` <> 2 - LEFT JOIN `" . hesk_dbEscape($heskSettings['db_pfix']) . "users` AS `owner` - ON `tickets`.`owner` = `owner`.`id` - WHERE `due_date` >= CONVERT_TZ(FROM_UNIXTIME(" . hesk_dbEscape($startTime) - . " / 1000), @@session.time_zone, '+00:00') - AND `due_date` <= CONVERT_TZ(FROM_UNIXTIME(" . hesk_dbEscape($endTime) . " / 1000), @@session.time_zone, '+00:00') - AND `status` IN (SELECT `id` FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "statuses` WHERE `IsClosed` = 0) "; - - $rs = hesk_dbQuery($sql); - while ($row = hesk_dbFetchAssoc($rs)) { - // Skip the ticket if the user does not have access to it - // TODO Move to Business logic - if (!in_array(UserPrivilege::CAN_VIEW_TICKETS, $userContext->permissions) - || ($row['owner_id'] && $row['owner_id'] != $userContext->id && !in_array(UserPrivilege::CAN_VIEW_ASSIGNED_TO_OTHER, $userContext->permissions)) - || (!$row['owner_id']) && !in_array(UserPrivilege::CAN_VIEW_UNASSIGNED, $userContext->permissions)) { - continue; - } - - $event = new TicketEvent(); - $event->trackingId = $row['trackid']; - $event->subject = $row['subject']; - $event->title = $row['subject']; - $event->startTime = $row['due_date']; - $event->url = $heskSettings['hesk_url'] . '/' . $heskSettings['admin_dir'] . '/admin_ticket.php?track=' . $event['trackingId']; - $event->categoryId = $row['category']; - $event->categoryName = $row['category_name']; - $event->backgroundColor = $row['background_color']; - $event->foregroundColor = $row['foreground_color']; - $event->displayBorder = $row['display_border']; - $event->owner = $row['owner_name']; - $event->priority = $row['priority']; - - $events[] = $event; - } - - $this->close(); - - return $events; - } } \ No newline at end of file diff --git a/api/index.php b/api/index.php index 9e617185..d833c236 100644 --- a/api/index.php +++ b/api/index.php @@ -204,6 +204,7 @@ Link::all(array( '/v1/settings' => action(\Controllers\Settings\SettingsController::clazz(), RequestMethod::all()), // Calendar '/v1/calendar/events/staff' => action(\Controllers\Calendar\CalendarController::clazz(), array(RequestMethod::GET), SecurityHandler::INTERNAL_OR_AUTH_TOKEN), + '/v1/calendar/events/staff/{i}' => action(\Controllers\Calendar\CalendarController::clazz(), array(RequestMethod::PUT), SecurityHandler::INTERNAL_OR_AUTH_TOKEN), /* Internal use only routes */ // Resend email response diff --git a/js/calendar/mods-for-hesk-calendar.js b/js/calendar/mods-for-hesk-calendar.js index 97c4fc7b..88197f4f 100644 --- a/js/calendar/mods-for-hesk-calendar.js +++ b/js/calendar/mods-for-hesk-calendar.js @@ -16,9 +16,10 @@ $(document).ready(function() { defaultView: $('#setting_default_view').text().trim(), events: function(start, end, timezone, callback) { $.ajax({ - url: heskPath + 'internal-api/admin/calendar/?start=' + start + '&end=' + end, + url: heskPath + 'api/v1/calendar/events/staff?start=' + start + '&end=' + end, method: 'GET', dataType: 'json', + headers: { 'X-Internal-Call': true }, success: function(data) { var events = []; $(data).each(function() { @@ -90,7 +91,7 @@ $(document).ready(function() { var $eventMarkup = $(this); var eventTitle = event.title; - if (event.fontIconMarkup != undefined) { + if (event.fontIconMarkup !== undefined) { eventTitle = event.fontIconMarkup + ' ' + eventTitle; } From c805fd8eab2ffc13eea3cbc8138d666bf0d0f964 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Sat, 23 Dec 2017 22:04:52 -0500 Subject: [PATCH 28/74] Working on new update event endpoint --- .../Calendar/CalendarHandler.php | 4 +++ api/BusinessLogic/Calendar/ReminderUnit.php | 15 ++++++++ .../Calendar/CalendarController.php | 36 +++++++++++++++++++ api/DataAccess/Calendar/CalendarGateway.php | 29 +++++++++++++++ internal-api/dao/calendar_dao.php | 23 ------------ 5 files changed, 84 insertions(+), 23 deletions(-) diff --git a/api/BusinessLogic/Calendar/CalendarHandler.php b/api/BusinessLogic/Calendar/CalendarHandler.php index f3374279..7f327997 100644 --- a/api/BusinessLogic/Calendar/CalendarHandler.php +++ b/api/BusinessLogic/Calendar/CalendarHandler.php @@ -15,4 +15,8 @@ class CalendarHandler extends \BaseClass { public function getEventsForStaff($startTime, $endTime, $searchEventsFilter, $heskSettings) { return $this->calendarGateway->getEventsForStaff($startTime, $endTime, $searchEventsFilter, $heskSettings); } + + public function updateEvent($calendarEvent, $userContext, $heskSettings) { + $this->calendarGateway->updateEvent($calendarEvent, $userContext, $heskSettings); + } } \ No newline at end of file diff --git a/api/BusinessLogic/Calendar/ReminderUnit.php b/api/BusinessLogic/Calendar/ReminderUnit.php index 866ad8e9..e45b2169 100644 --- a/api/BusinessLogic/Calendar/ReminderUnit.php +++ b/api/BusinessLogic/Calendar/ReminderUnit.php @@ -23,4 +23,19 @@ class ReminderUnit { return 'UNKNOWN'; } } + + static function getByName($name) { + switch ($name) { + case 'MINUTE': + return self::MINUTE; + case 'HOUR': + return self::HOUR; + case 'DAY': + return self::DAY; + case 'WEEK': + return self::WEEK; + default: + return null; + } + } } \ No newline at end of file diff --git a/api/Controllers/Calendar/CalendarController.php b/api/Controllers/Calendar/CalendarController.php index 6a9a6861..1a180fc1 100644 --- a/api/Controllers/Calendar/CalendarController.php +++ b/api/Controllers/Calendar/CalendarController.php @@ -3,12 +3,16 @@ namespace Controllers\Calendar; +use BusinessLogic\Calendar\CalendarEvent; use BusinessLogic\Calendar\CalendarHandler; +use BusinessLogic\Calendar\ReminderUnit; use BusinessLogic\Calendar\SearchEventsFilter; use BusinessLogic\Exceptions\ValidationException; +use BusinessLogic\Helpers; use BusinessLogic\Security\UserContext; use BusinessLogic\Security\UserPrivilege; use BusinessLogic\ValidationModel; +use Controllers\JsonRetriever; class CalendarController extends \BaseClass { function get() { @@ -38,4 +42,36 @@ class CalendarController extends \BaseClass { return output($events); } + + function put($id) { + /* @var $userContext UserContext */ + global $applicationContext, $hesk_settings, $userContext; + + $json = JsonRetriever::getJsonData(); + + $event = $this->transformJson($json); + + /* @var $calendarHandler CalendarHandler */ + $calendarHandler = $applicationContext->get(CalendarHandler::clazz()); + + return output($calendarHandler->updateEvent($event, $userContext, $hesk_settings)); + } + + private function transformJson($json, $creating = false) { + $event = new CalendarEvent(); + + if ($creating) { + $event->id = Helpers::safeArrayGet($json, 'id'); + } + + $event->startTime = date('Y-m-d H:i:s', Helpers::safeArrayGet($json, 'startTime')); + $event->endTime = date('Y-m-d H:i:s', Helpers::safeArrayGet($json, 'endTime')); + $event->allDay = Helpers::safeArrayGet($json, 'allDay') === 'true'; + $event->title = Helpers::safeArrayGet($json, 'title'); + $event->location = Helpers::safeArrayGet($json, 'location'); + $event->comments = Helpers::safeArrayGet($json, 'comments'); + $event->categoryId = Helpers::safeArrayGet($json, 'categoryId'); + $event->reminderValue = Helpers::safeArrayGet($json, 'reminderValue'); + $event->reminderUnits = ReminderUnit::getByName(Helpers::safeArrayGet($json, 'reminderUnits')); + } } \ No newline at end of file diff --git a/api/DataAccess/Calendar/CalendarGateway.php b/api/DataAccess/Calendar/CalendarGateway.php index 558e4113..9367dbb7 100644 --- a/api/DataAccess/Calendar/CalendarGateway.php +++ b/api/DataAccess/Calendar/CalendarGateway.php @@ -8,6 +8,7 @@ use BusinessLogic\Calendar\CalendarEvent; use BusinessLogic\Calendar\ReminderUnit; use BusinessLogic\Calendar\SearchEventsFilter; use BusinessLogic\Calendar\TicketEvent; +use BusinessLogic\Security\UserContext; use Core\Constants\Priority; use DataAccess\CommonDao; @@ -128,4 +129,32 @@ class CalendarGateway extends CommonDao { return $events; } + + /** + * @param $event CalendarEvent + * @param $userContext UserContext + * @param $heskSettings array + */ + public function updateEvent($event, $userContext, $heskSettings) { + $this->init(); + + $sql = "UPDATE `" . hesk_dbEscape($heskSettings['db_pfix']) . "calendar_event` SET `start` = '" . hesk_dbEscape($event->startTime) + . "', `end` = '" . hesk_dbEscape($event->endTime) . "', `all_day` = '" . ($event->allDay ? 1 : 0) . "', `name` = '" + . hesk_dbEscape(addslashes($event->title)) . "', `location` = '" . hesk_dbEscape(addslashes($event->location)) . "', `comments` = '" + . hesk_dbEscape(addslashes($event->comments)) . "', `category` = " . intval($event->categoryId) . " WHERE `id` = " . intval($event->id); + + if ($event->reminderValue != null) { + $delete_sql = "DELETE FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "calendar_event_reminder` WHERE `event_id` = " . intval($event->id) + . " AND `user_id` = " . intval($userContext->id); + hesk_dbQuery($delete_sql); + $insert_sql = "INSERT INTO `" . hesk_dbEscape($heskSettings['db_pfix']) . "calendar_event_reminder` (`user_id`, `event_id`, + `amount`, `unit`) VALUES (" . intval($userContext->id) . ", " . intval($event->id) . ", " . intval($event->reminderValue) . ", + " . intval($event->reminderUnits) . ")"; + hesk_dbQuery($insert_sql); + } + + hesk_dbQuery($sql); + + $this->close(); + } } \ No newline at end of file diff --git a/internal-api/dao/calendar_dao.php b/internal-api/dao/calendar_dao.php index a3f15d98..3ad28dbf 100644 --- a/internal-api/dao/calendar_dao.php +++ b/internal-api/dao/calendar_dao.php @@ -154,30 +154,7 @@ function update_event($event, $hesk_settings) { print_error('Access Denied', 'You cannot edit an event in this category'); } - $event['start'] = date('Y-m-d H:i:s', strtotime($event['start'])); - $event['end'] = date('Y-m-d H:i:s', strtotime($event['end'])); - if ($event['create_ticket_date'] != null) { - $event['create_ticket_date'] = date('Y-m-d H:i:s', strtotime($event['create_ticket_date'])); - } - $event['all_day'] = $event['all_day'] ? 1 : 0; - $event['assign_to'] = $event['assign_to'] != null ? intval($event['assign_to']) : 'NULL'; - $sql = "UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "calendar_event` SET `start` = '" . hesk_dbEscape($event['start']) - . "', `end` = '" . hesk_dbEscape($event['end']) . "', `all_day` = '" . hesk_dbEscape($event['all_day']) . "', `name` = '" - . hesk_dbEscape(addslashes($event['title'])) . "', `location` = '" . hesk_dbEscape(addslashes($event['location'])) . "', `comments` = '" - . hesk_dbEscape(addslashes($event['comments'])) . "', `category` = " . intval($event['category']) . " WHERE `id` = " . intval($event['id']); - - if ($event['reminder_amount'] != null) { - $delete_sql = "DELETE FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "calendar_event_reminder` WHERE `event_id` = " . intval($event['id']) - . " AND `user_id` = " . intval($event['reminder_user']); - hesk_dbQuery($delete_sql); - $insert_sql = "INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "calendar_event_reminder` (`user_id`, `event_id`, - `amount`, `unit`) VALUES (" . intval($event['reminder_user']) . ", " . intval($event['id']) . ", " . intval($event['reminder_amount']) . ", - " . intval($event['reminder_units']) . ")"; - hesk_dbQuery($insert_sql); - } - - hesk_dbQuery($sql); } function delete_event($id, $hesk_settings) { From 86f1fb3ca23232259e92eea6fa998027868ec114 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Wed, 27 Dec 2017 22:00:30 -0500 Subject: [PATCH 29/74] Slowly working on moving more API endpoints --- admin/calendar.php | 16 +++--- .../Calendar/CalendarHandler.php | 31 ++++++++++- .../Calendar/SearchEventsFilter.php | 9 ++++ api/BusinessLogic/Tickets/TicketEditor.php | 21 ++++++++ .../Calendar/CalendarController.php | 33 ++++++++---- .../Tickets/StaffTicketController.php | 11 ++++ api/DataAccess/Calendar/CalendarGateway.php | 51 ++++++++++++++++--- api/index.php | 2 +- js/calendar/mods-for-hesk-calendar.js | 20 +++++--- 9 files changed, 157 insertions(+), 37 deletions(-) diff --git a/admin/calendar.php b/admin/calendar.php index 679bfd21..905cc81d 100644 --- a/admin/calendar.php +++ b/admin/calendar.php @@ -282,10 +282,10 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
    @@ -453,10 +453,10 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
    diff --git a/api/BusinessLogic/Calendar/CalendarHandler.php b/api/BusinessLogic/Calendar/CalendarHandler.php index 7f327997..5347eaf1 100644 --- a/api/BusinessLogic/Calendar/CalendarHandler.php +++ b/api/BusinessLogic/Calendar/CalendarHandler.php @@ -3,7 +3,10 @@ namespace BusinessLogic\Calendar; +use BusinessLogic\Exceptions\ApiFriendlyException; +use BusinessLogic\Security\UserContext; use DataAccess\Calendar\CalendarGateway; +use PHPUnit\Runner\Exception; class CalendarHandler extends \BaseClass { private $calendarGateway; @@ -12,11 +15,35 @@ class CalendarHandler extends \BaseClass { $this->calendarGateway = $calendarGateway; } - public function getEventsForStaff($startTime, $endTime, $searchEventsFilter, $heskSettings) { - return $this->calendarGateway->getEventsForStaff($startTime, $endTime, $searchEventsFilter, $heskSettings); + public function getEventsForStaff($searchEventsFilter, $heskSettings) { + return $this->calendarGateway->getEventsForStaff($searchEventsFilter, $heskSettings); } + /** + * @param $calendarEvent CalendarEvent + * @param $userContext UserContext + * @param $heskSettings array + * @return CalendarEvent + * @throws \Exception If more than one event is returned for the given ID + */ public function updateEvent($calendarEvent, $userContext, $heskSettings) { $this->calendarGateway->updateEvent($calendarEvent, $userContext, $heskSettings); + + $eventFilter = new SearchEventsFilter(); + $eventFilter->eventId = $calendarEvent->id; + $eventFilter->reminderUserId = $userContext->id; + + $events = $this->calendarGateway->getEventsForStaff($eventFilter, $heskSettings); + + if (count($events) !== 1) { + throw new \Exception("Expected exactly 1 event, found: " . count($events)); + } + + return $events[0]; + } + + + public function createEvent($calendarEvent, $userContext, $heskSettings) { + return $this->calendarGateway->createEvent($calendarEvent, $userContext, $heskSettings); } } \ No newline at end of file diff --git a/api/BusinessLogic/Calendar/SearchEventsFilter.php b/api/BusinessLogic/Calendar/SearchEventsFilter.php index 1a509f9f..72e31b3d 100644 --- a/api/BusinessLogic/Calendar/SearchEventsFilter.php +++ b/api/BusinessLogic/Calendar/SearchEventsFilter.php @@ -4,6 +4,15 @@ namespace BusinessLogic\Calendar; class SearchEventsFilter { + /* @var $startTime int|null */ + public $startTime; + + /* @var $endTime int|null */ + public $endTime; + + /* @var $id int|null */ + public $eventId; + /* @var $categories int[]|null */ public $categories; diff --git a/api/BusinessLogic/Tickets/TicketEditor.php b/api/BusinessLogic/Tickets/TicketEditor.php index e15b33d9..5b6e2f7d 100644 --- a/api/BusinessLogic/Tickets/TicketEditor.php +++ b/api/BusinessLogic/Tickets/TicketEditor.php @@ -135,4 +135,25 @@ class TicketEditor extends \BaseClass { throw new ValidationException($validationModel); } } + + /** + * @param $id int + * @param $dueDate string + * @param $userContext UserContext + * @param $heskSettings array + * @throws ApiFriendlyException If ticket does not exist or if the user cannot edit the ticket + */ + function updateDueDate($id, $dueDate, $userContext, $heskSettings) { + $ticket = $this->ticketGateway->getTicketById($id, $heskSettings); + + if ($ticket === null) { + throw new ApiFriendlyException("Please enter a valid ticket ID.", "Ticket Not Found!", 400); + } + + if (!$this->userToTicketChecker->isTicketAccessibleToUser($userContext, $ticket, $heskSettings, array(UserPrivilege::CAN_EDIT_TICKETS))) { + throw new ApiFriendlyException("User " . $userContext->id . " does not have permission to edit ticket " . $id, "Access Denied", 403); + } + + // TODO Do it + } } \ No newline at end of file diff --git a/api/Controllers/Calendar/CalendarController.php b/api/Controllers/Calendar/CalendarController.php index 1a180fc1..2e30c0b1 100644 --- a/api/Controllers/Calendar/CalendarController.php +++ b/api/Controllers/Calendar/CalendarController.php @@ -32,18 +32,20 @@ class CalendarController extends \BaseClass { $calendarHandler = $applicationContext->get(CalendarHandler::clazz()); $searchEventsFilter = new SearchEventsFilter(); + $searchEventsFilter->startTime = $startTime; + $searchEventsFilter->endTime = $endTime; $searchEventsFilter->reminderUserId = $userContext->id; $searchEventsFilter->includeTicketsAssignedToOthers = in_array(UserPrivilege::CAN_VIEW_ASSIGNED_TO_OTHER, $userContext->permissions); $searchEventsFilter->includeUnassignedTickets = in_array(UserPrivilege::CAN_VIEW_UNASSIGNED, $userContext->permissions); $searchEventsFilter->includeTickets = true; $searchEventsFilter->categories = $userContext->admin ? null : $userContext->categories; - $events = $calendarHandler->getEventsForStaff($startTime, $endTime, $searchEventsFilter, $hesk_settings); + $events = $calendarHandler->getEventsForStaff($searchEventsFilter, $hesk_settings); return output($events); } - function put($id) { + function post() { /* @var $userContext UserContext */ global $applicationContext, $hesk_settings, $userContext; @@ -53,25 +55,36 @@ class CalendarController extends \BaseClass { /* @var $calendarHandler CalendarHandler */ $calendarHandler = $applicationContext->get(CalendarHandler::clazz()); + } + + function put($id) { + /* @var $userContext UserContext */ + global $applicationContext, $hesk_settings, $userContext; + + $json = JsonRetriever::getJsonData(); + + $event = $this->transformJson($json, $id); + + /* @var $calendarHandler CalendarHandler */ + $calendarHandler = $applicationContext->get(CalendarHandler::clazz()); return output($calendarHandler->updateEvent($event, $userContext, $hesk_settings)); } - private function transformJson($json, $creating = false) { + private function transformJson($json, $id = null) { $event = new CalendarEvent(); - if ($creating) { - $event->id = Helpers::safeArrayGet($json, 'id'); - } - - $event->startTime = date('Y-m-d H:i:s', Helpers::safeArrayGet($json, 'startTime')); - $event->endTime = date('Y-m-d H:i:s', Helpers::safeArrayGet($json, 'endTime')); - $event->allDay = Helpers::safeArrayGet($json, 'allDay') === 'true'; + $event->id = $id; + $event->startTime = date('Y-m-d H:i:s', strtotime(Helpers::safeArrayGet($json, 'startTime'))); + $event->endTime = date('Y-m-d H:i:s', strtotime(Helpers::safeArrayGet($json, 'endTime'))); + $event->allDay = Helpers::safeArrayGet($json, 'allDay'); $event->title = Helpers::safeArrayGet($json, 'title'); $event->location = Helpers::safeArrayGet($json, 'location'); $event->comments = Helpers::safeArrayGet($json, 'comments'); $event->categoryId = Helpers::safeArrayGet($json, 'categoryId'); $event->reminderValue = Helpers::safeArrayGet($json, 'reminderValue'); $event->reminderUnits = ReminderUnit::getByName(Helpers::safeArrayGet($json, 'reminderUnits')); + + return $event; } } \ No newline at end of file diff --git a/api/Controllers/Tickets/StaffTicketController.php b/api/Controllers/Tickets/StaffTicketController.php index 023f5352..ea4761a1 100644 --- a/api/Controllers/Tickets/StaffTicketController.php +++ b/api/Controllers/Tickets/StaffTicketController.php @@ -4,6 +4,7 @@ namespace Controllers\Tickets; use BusinessLogic\Helpers; +use BusinessLogic\Security\UserContext; use BusinessLogic\Tickets\EditTicketModel; use BusinessLogic\Tickets\TicketDeleter; use BusinessLogic\Tickets\TicketEditor; @@ -45,6 +46,16 @@ class StaffTicketController extends \BaseClass { return; } + static function updateDueDate($id) { + /* @var $userContext UserContext */ + global $applicationContext, $userContext, $hesk_settings; + + /* @var $ticketEditor TicketEditor */ + $ticketEditor = $applicationContext->get(TicketEditor::clazz()); + + + } + private function getEditTicketModel($id, $jsonRequest) { $editTicketModel = new EditTicketModel(); $editTicketModel->id = $id; diff --git a/api/DataAccess/Calendar/CalendarGateway.php b/api/DataAccess/Calendar/CalendarGateway.php index 9367dbb7..a644370d 100644 --- a/api/DataAccess/Calendar/CalendarGateway.php +++ b/api/DataAccess/Calendar/CalendarGateway.php @@ -11,23 +11,19 @@ use BusinessLogic\Calendar\TicketEvent; use BusinessLogic\Security\UserContext; use Core\Constants\Priority; use DataAccess\CommonDao; +use DataAccess\Logging\LoggingGateway; class CalendarGateway extends CommonDao { /** - * @param $startTime int - * @param $endTime int * @param $searchEventsFilter SearchEventsFilter * @param $heskSettings array * @return AbstractEvent[] */ - public function getEventsForStaff($startTime, $endTime, $searchEventsFilter, $heskSettings) { + public function getEventsForStaff($searchEventsFilter, $heskSettings) { $this->init(); $events = array(); - $startTimeSql = "CONVERT_TZ(FROM_UNIXTIME(" . hesk_dbEscape($startTime) . " / 1000), @@session.time_zone, '+00:00')"; - $endTimeSql = "CONVERT_TZ(FROM_UNIXTIME(" . hesk_dbEscape($endTime) . " / 1000), @@session.time_zone, '+00:00')"; - // EVENTS $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`, @@ -38,9 +34,21 @@ class CalendarGateway extends CommonDao { LEFT JOIN `" . hesk_dbEscape($heskSettings['db_pfix']) . "calendar_event_reminder` AS `reminders` ON `reminders`.`user_id` = " . intval($searchEventsFilter->reminderUserId) . " AND `reminders`.`event_id` = `events`.`id` - WHERE NOT (`end` < {$startTimeSql} OR `start` > {$endTimeSql}) + WHERE 1=1"; + + if ($searchEventsFilter->startTime !== null && $searchEventsFilter->endTime !== null) { + $startTimeSql = "CONVERT_TZ(FROM_UNIXTIME(" . hesk_dbEscape($searchEventsFilter->startTime) . " / 1000), @@session.time_zone, '+00:00')"; + $endTimeSql = "CONVERT_TZ(FROM_UNIXTIME(" . hesk_dbEscape($searchEventsFilter->endTime) . " / 1000), @@session.time_zone, '+00:00')"; + + + $sql .= " AND NOT (`end` < {$startTimeSql} OR `start` > {$endTimeSql}) AND `categories`.`usage` <> 1 AND `categories`.`type` = '0'"; + } + + if ($searchEventsFilter->eventId !== null) { + $sql .= " AND `events`.`id` = " . intval($searchEventsFilter->eventId); + } if (!empty($searchEventsFilter->categories)) { $categoriesAsString = implode(',', $searchEventsFilter->categories); @@ -130,6 +138,33 @@ class CalendarGateway extends CommonDao { return $events; } + /** + * @param $event CalendarEvent + * @param $userContext UserContext + * @param $heskSettings array + * @return CalendarEvent + */ + public function createEvent($event, $userContext, $heskSettings) { + $this->init(); + + hesk_dbQuery("INSERT INTO `" . hesk_dbEscape($heskSettings['db_pfix']) . "calendar_event` (`start`, `end`, `all_day`, `name`, + `location`, `comments`, `category`) VALUES ('" . hesk_dbEscape($event->startTime) . "', '" . hesk_dbEscape($event->endTime) . "', + '" . ($event->allDay ? 1 : 0) . "', '" . hesk_dbEscape(addslashes($event->title)) . "', + '" . hesk_dbEscape(addslashes($event->location)) . "', '". hesk_dbEscape(addslashes($event->comments)) . "', " . intval($event->categoryId) . ")"); + + $event->id = hesk_dbInsertID(); + + if ($event->reminderValue !== null) { + hesk_dbQuery("INSERT INTO `" . hesk_dbEscape($heskSettings['db_pfix']) . "calendar_event_reminder` (`user_id`, `event_id`, + `amount`, `unit`) VALUES (" . intval($userContext->id) . ", " . intval($event->id) . ", " . intval($event->reminderValue) . ", + " . intval($event->reminderUnits) . ")"); + } + + $this->close(); + + return $event; + } + /** * @param $event CalendarEvent * @param $userContext UserContext @@ -143,7 +178,7 @@ class CalendarGateway extends CommonDao { . hesk_dbEscape(addslashes($event->title)) . "', `location` = '" . hesk_dbEscape(addslashes($event->location)) . "', `comments` = '" . hesk_dbEscape(addslashes($event->comments)) . "', `category` = " . intval($event->categoryId) . " WHERE `id` = " . intval($event->id); - if ($event->reminderValue != null) { + if ($event->reminderValue !== null) { $delete_sql = "DELETE FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "calendar_event_reminder` WHERE `event_id` = " . intval($event->id) . " AND `user_id` = " . intval($userContext->id); hesk_dbQuery($delete_sql); diff --git a/api/index.php b/api/index.php index d833c236..00bd9af3 100644 --- a/api/index.php +++ b/api/index.php @@ -203,7 +203,7 @@ Link::all(array( // Settings '/v1/settings' => action(\Controllers\Settings\SettingsController::clazz(), RequestMethod::all()), // Calendar - '/v1/calendar/events/staff' => action(\Controllers\Calendar\CalendarController::clazz(), array(RequestMethod::GET), SecurityHandler::INTERNAL_OR_AUTH_TOKEN), + '/v1/calendar/events/staff' => action(\Controllers\Calendar\CalendarController::clazz(), array(RequestMethod::GET, RequestMethod::POST), SecurityHandler::INTERNAL_OR_AUTH_TOKEN), '/v1/calendar/events/staff/{i}' => action(\Controllers\Calendar\CalendarController::clazz(), array(RequestMethod::PUT), SecurityHandler::INTERNAL_OR_AUTH_TOKEN), /* Internal use only routes */ diff --git a/js/calendar/mods-for-hesk-calendar.js b/js/calendar/mods-for-hesk-calendar.js index 88197f4f..1ccfe7eb 100644 --- a/js/calendar/mods-for-hesk-calendar.js +++ b/js/calendar/mods-for-hesk-calendar.js @@ -204,7 +204,6 @@ $(document).ready(function() { allDay: allDay, comments: $createForm.find('textarea[name="comments"]').val(), categoryId: $createForm.find('select[name="category"]').val(), - action: 'create', type: 'CALENDAR', backgroundColor: $createForm.find('select[name="category"] :selected').attr('data-background-color'), foregroundColor: $createForm.find('select[name="category"] :selected').attr('data-foreground-color'), @@ -216,8 +215,10 @@ $(document).ready(function() { $.ajax({ method: 'POST', - url: heskPath + 'internal-api/admin/calendar/', - data: data, + url: heskPath + 'api/v1/calendar/events/staff', + data: JSON.stringify(data), + contentType: 'json', + headers: { 'X-Internal-Call': true }, success: function(id) { addToCalendar(id, data, $('#lang_event_created').text()); $('#create-event-modal').modal('hide'); @@ -245,7 +246,6 @@ $(document).ready(function() { } var data = { - id: $form.find('input[name="id"]').val(), title: $form.find('input[name="name"]').val(), location: $form.find('input[name="location"]').val(), startTime: moment(start).format(dateFormat), @@ -257,15 +257,19 @@ $(document).ready(function() { 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(), reminderUnits: $form.find('select[name="reminder-unit"]').val() }; $.ajax({ method: 'POST', - url: heskPath + 'internal-api/admin/calendar/', - data: data, + url: heskPath + 'api/v1/calendar/events/staff/' + $form.find('input[name="id"]').val(), + data: JSON.stringify(data), + contentType: 'json', + headers: { + 'X-Internal-Call': true, + 'X-HTTP-Method-Override': 'PUT' + }, success: function() { removeFromCalendar(data.id); addToCalendar(data.id, data, $('#lang_event_updated').text()); @@ -291,7 +295,7 @@ function removeFromCalendar(id) { } function buildEvent(id, dbObject) { - if (dbObject.type == 'TICKET') { + if (dbObject.type === 'TICKET') { return { title: dbObject.title, subject: dbObject.subject, From bd5b3e1322ff03f6cd097f90d64ff3e078c32dc9 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Mon, 1 Jan 2018 21:39:01 -0500 Subject: [PATCH 30/74] Working on moving the update ticket due date endpoint --- api/BusinessLogic/Tickets/AuditTrailEvent.php | 9 +++ api/BusinessLogic/Tickets/TicketEditor.php | 59 +++++++++++++++++-- api/DataAccess/Tickets/TicketGateway.php | 14 +++++ 3 files changed, 77 insertions(+), 5 deletions(-) create mode 100644 api/BusinessLogic/Tickets/AuditTrailEvent.php diff --git a/api/BusinessLogic/Tickets/AuditTrailEvent.php b/api/BusinessLogic/Tickets/AuditTrailEvent.php new file mode 100644 index 00000000..d3063e73 --- /dev/null +++ b/api/BusinessLogic/Tickets/AuditTrailEvent.php @@ -0,0 +1,9 @@ +ticketGateway = $ticketGateway; $this->userToTicketChecker = $userToTicketChecker; + $this->auditTrailGateway = $auditTrailGateway; } @@ -141,19 +148,61 @@ class TicketEditor extends \BaseClass { * @param $dueDate string * @param $userContext UserContext * @param $heskSettings array - * @throws ApiFriendlyException If ticket does not exist or if the user cannot edit the ticket + * @return Ticket The updated ticket */ function updateDueDate($id, $dueDate, $userContext, $heskSettings) { $ticket = $this->ticketGateway->getTicketById($id, $heskSettings); + $this->validateDueDate($ticket, $dueDate, $userContext, $heskSettings); + + $this->ticketGateway->updateTicketDueDate($ticket->id, $dueDate, $heskSettings); + + $event = AuditTrailEvent::DUE_DATE_REMOVED; + $replacementValues = array(0 => $userContext->name . ' (' . $userContext->username . ')'); + if ($dueDate !== null) { + $event = AuditTrailEvent::DUE_DATE_CHANGED; + $replacementValues = array( + 0 => $userContext->name . ' (' . $userContext->username . ')', + 1 => date('Y-m-d H:i:s', strtotime($dueDate)) + ); + } + + $this->auditTrailGateway->insertAuditTrailRecord($ticket->id, + AuditTrailEntityType::TICKET, + $event, + DateTimeHelpers::heskDate($heskSettings), + $replacementValues, + $heskSettings); + + $ticket->dueDate = $dueDate; + + return $ticket; + } + + /** + * @param $ticket Ticket + * @param $dueDate string + * @param $userContext UserContext + * @param $heskSettings array + * @throws ValidationException When validation fails + */ + private function validateDueDate($ticket, $dueDate, $userContext, $heskSettings) { + $validationModel = new ValidationModel(); + if ($ticket === null) { - throw new ApiFriendlyException("Please enter a valid ticket ID.", "Ticket Not Found!", 400); + $validationModel->errorKeys[] = 'TICKET_MUST_EXIST_FOR_ID'; } if (!$this->userToTicketChecker->isTicketAccessibleToUser($userContext, $ticket, $heskSettings, array(UserPrivilege::CAN_EDIT_TICKETS))) { - throw new ApiFriendlyException("User " . $userContext->id . " does not have permission to edit ticket " . $id, "Access Denied", 403); + $validationModel->errorKeys[] = 'TICKET_MUST_BE_ACCESSIBLE_TO_USER'; } - // TODO Do it + if ($dueDate === false) { + $validationModel->errorKeys[] = 'DUE_DATE_MUST_BE_IN_VALID_FORMAT'; + } + + 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 4c72a9f2..2ea5a84d 100644 --- a/api/DataAccess/Tickets/TicketGateway.php +++ b/api/DataAccess/Tickets/TicketGateway.php @@ -440,4 +440,18 @@ class TicketGateway extends CommonDao { $this->close(); } + + function updateTicketDueDate($id, $dueDate, $heskSettings) { + $this->init(); + + $sqlDueDate = 'NULL'; + if ($dueDate != NULL) { + $sqlDueDate = "'" . date('Y-m-d H:i:s', strtotime($dueDate)) . "'"; + } + + hesk_dbQuery("UPDATE `" . hesk_dbEscape($heskSettings['db_pfix']) . "tickets` SET `due_date` = {$sqlDueDate} + WHERE `id` = " . intval($id)); + + $this->close(); + } } \ No newline at end of file From 0514965040d3199a843bdfd676198319d3359b35 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Tue, 2 Jan 2018 13:05:10 -0500 Subject: [PATCH 31/74] Update due date mostly done... just need to fix the buildEvent function --- api/BusinessLogic/Calendar/AbstractEvent.php | 2 ++ api/BusinessLogic/Calendar/CalendarEvent.php | 2 -- api/BusinessLogic/Helpers.php | 4 ++++ .../Tickets/StaffTicketController.php | 4 ++++ api/DataAccess/Calendar/CalendarGateway.php | 14 ++++++----- api/index.php | 1 + js/calendar/mods-for-hesk-calendar.js | 23 ++++++++++++------- 7 files changed, 34 insertions(+), 16 deletions(-) diff --git a/api/BusinessLogic/Calendar/AbstractEvent.php b/api/BusinessLogic/Calendar/AbstractEvent.php index 5413ef48..27f2a184 100644 --- a/api/BusinessLogic/Calendar/AbstractEvent.php +++ b/api/BusinessLogic/Calendar/AbstractEvent.php @@ -4,6 +4,8 @@ namespace BusinessLogic\Calendar; class AbstractEvent { + public $id; + public $startTime; public $title; diff --git a/api/BusinessLogic/Calendar/CalendarEvent.php b/api/BusinessLogic/Calendar/CalendarEvent.php index 893cbccb..91a45761 100644 --- a/api/BusinessLogic/Calendar/CalendarEvent.php +++ b/api/BusinessLogic/Calendar/CalendarEvent.php @@ -4,8 +4,6 @@ namespace BusinessLogic\Calendar; class CalendarEvent extends AbstractEvent { - public $id; - public $type = 'CALENDAR'; public $endTime; diff --git a/api/BusinessLogic/Helpers.php b/api/BusinessLogic/Helpers.php index f2a49c6d..b841fd27 100644 --- a/api/BusinessLogic/Helpers.php +++ b/api/BusinessLogic/Helpers.php @@ -30,4 +30,8 @@ class Helpers extends \BaseClass { static function boolval($val) { return $val == true; } + + static function heskHtmlSpecialCharsDecode($in) { + return str_replace(array('&', '<', '>', '"'), array('&', '<', '>', '"'), $in); + } } \ No newline at end of file diff --git a/api/Controllers/Tickets/StaffTicketController.php b/api/Controllers/Tickets/StaffTicketController.php index ea4761a1..e049bca5 100644 --- a/api/Controllers/Tickets/StaffTicketController.php +++ b/api/Controllers/Tickets/StaffTicketController.php @@ -53,7 +53,11 @@ class StaffTicketController extends \BaseClass { /* @var $ticketEditor TicketEditor */ $ticketEditor = $applicationContext->get(TicketEditor::clazz()); + $json = JsonRetriever::getJsonData(); + $dueDate = date('Y-m-d H:i:s', strtotime(Helpers::safeArrayGet($json, 'dueDate'))); + + $ticketEditor->updateDueDate($id, $dueDate, $userContext, $hesk_settings); } private function getEditTicketModel($id, $jsonRequest) { diff --git a/api/DataAccess/Calendar/CalendarGateway.php b/api/DataAccess/Calendar/CalendarGateway.php index a644370d..f101f1bd 100644 --- a/api/DataAccess/Calendar/CalendarGateway.php +++ b/api/DataAccess/Calendar/CalendarGateway.php @@ -8,6 +8,7 @@ use BusinessLogic\Calendar\CalendarEvent; use BusinessLogic\Calendar\ReminderUnit; use BusinessLogic\Calendar\SearchEventsFilter; use BusinessLogic\Calendar\TicketEvent; +use BusinessLogic\Helpers; use BusinessLogic\Security\UserContext; use Core\Constants\Priority; use DataAccess\CommonDao; @@ -61,15 +62,15 @@ class CalendarGateway extends CommonDao { $event->id = intval($row['id']); $event->startTime = $row['start']; $event->endTime = $row['end']; - $event->allDay = $row['all_day'] ? true : false; + $event->allDay = Helpers::boolval($row['all_day']); $event->title = $row['name']; $event->location = $row['location']; $event->comments = $row['comments']; $event->categoryId = intval($row['category']); - $event->categoryName = $row['category_name']; + $event->categoryName = Helpers::heskHtmlSpecialCharsDecode($row['category_name']); $event->backgroundColor = $row['background_color']; $event->foregroundColor = $row['foreground_color']; - $event->displayBorder = $row['display_border'] === '1'; + $event->displayBorder = Helpers::boolval($row['display_border']); $event->reminderValue = $row['reminder_value'] === null ? null : floatval($row['reminder_value']); $event->reminderUnits = $row['reminder_unit'] === null ? null : ReminderUnit::getByValue($row['reminder_unit']); @@ -83,7 +84,7 @@ class CalendarGateway extends CommonDao { $currentDate = hesk_date(); $heskSettings['timeformat'] = $oldTimeSetting; - $sql = "SELECT `trackid`, `subject`, `due_date`, `category`, `categories`.`name` AS `category_name`, `categories`.`background_color` AS `background_color`, + $sql = "SELECT `tickets`.`id` AS `id`, `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` < '{$currentDate}' THEN 1 ELSE 0 END AS `overdue`, `owner`.`name` AS `owner_name`, `tickets`.`owner` AS `owner_id`, `tickets`.`priority` AS `priority` @@ -116,16 +117,17 @@ class CalendarGateway extends CommonDao { $rs = hesk_dbQuery($sql); while ($row = hesk_dbFetchAssoc($rs)) { $event = new TicketEvent(); + $event->id = intval($row['id']); $event->trackingId = $row['trackid']; $event->subject = $row['subject']; $event->title = $row['subject']; $event->startTime = $row['due_date']; $event->url = $heskSettings['hesk_url'] . '/' . $heskSettings['admin_dir'] . '/admin_ticket.php?track=' . $event->trackingId; $event->categoryId = intval($row['category']); - $event->categoryName = $row['category_name']; + $event->categoryName = Helpers::heskHtmlSpecialCharsDecode($row['category_name']); $event->backgroundColor = $row['background_color']; $event->foregroundColor = $row['foreground_color']; - $event->displayBorder = $row['display_border'] === '0'; + $event->displayBorder = Helpers::boolval($row['display_border']); $event->owner = $row['owner_name']; $event->priority = Priority::getByValue($row['priority']); diff --git a/api/index.php b/api/index.php index 00bd9af3..3888685c 100644 --- a/api/index.php +++ b/api/index.php @@ -194,6 +194,7 @@ Link::all(array( '/v1/tickets' => action(\Controllers\Tickets\CustomerTicketController::clazz(), RequestMethod::all(), SecurityHandler::OPEN), // Tickets - Staff '/v1/staff/tickets/{i}' => action(\Controllers\Tickets\StaffTicketController::clazz(), RequestMethod::all()), + '/v1/staff/tickets/{i}/due-date' => action(\Controllers\Tickets\StaffTicketController::clazz() . '::updateDueDate', array(RequestMethod::PATCH), SecurityHandler::INTERNAL_OR_AUTH_TOKEN), // Attachments '/v1/tickets/{a}/attachments/{i}' => action(\Controllers\Attachments\PublicAttachmentController::clazz() . '::getRaw', RequestMethod::all()), '/v1/staff/tickets/{i}/attachments' => action(\Controllers\Attachments\StaffTicketAttachmentsController::clazz(), RequestMethod::all()), diff --git a/js/calendar/mods-for-hesk-calendar.js b/js/calendar/mods-for-hesk-calendar.js index 1ccfe7eb..1d6729f4 100644 --- a/js/calendar/mods-for-hesk-calendar.js +++ b/js/calendar/mods-for-hesk-calendar.js @@ -482,15 +482,19 @@ function updateCategoryVisibility() { function respondToDragAndDrop(event, delta, revertFunc) { var heskPath = $('p#hesk-path').text(); + if (event.type === 'TICKET') { + var uri = 'api/v1/staff/tickets/' + event.id + '/due-date'; $.ajax({ method: 'POST', - url: heskPath + 'internal-api/admin/calendar/', - data: { - trackingId: event.trackingId, - action: 'update-ticket', - dueDate: event.start.format('YYYY-MM-DD') + url: heskPath + uri, + headers: { + 'X-Internal-Call': true, + 'X-HTTP-Method-Override': 'PATCH' }, + data: JSON.stringify({ + dueDate: event.start.format('YYYY-MM-DD') + }), success: function() { event.fontIconMarkup = getIcon({ startTime: event.start @@ -519,7 +523,6 @@ function respondToDragAndDrop(event, delta, revertFunc) { end += ' ' + event.end.format('HH:mm:ss'); } var data = { - id: event.id, title: event.title, location: event.location, startTime: start, @@ -533,8 +536,12 @@ function respondToDragAndDrop(event, delta, revertFunc) { }; $.ajax({ method: 'POST', - url: heskPath + 'internal-api/admin/calendar/', - data: data, + url: heskPath + 'api/v1/calendar/events/staff/' + event.id, + data: JSON.stringify(data), + headers: { + 'X-Internal-Call': true, + 'X-HTTP-Method-Override': 'PUT' + }, success: function() { mfhAlert.success(mfhLang.text('event_updated')); }, From c4b79a722c1f7aae466e5aad8c611a0f8099319f Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Wed, 3 Jan 2018 13:04:23 -0500 Subject: [PATCH 32/74] More calendar tweaks --- .../Calendar/CalendarHandler.php | 14 +++++- .../Calendar/CalendarController.php | 2 + api/DataAccess/Calendar/CalendarGateway.php | 2 - js/calendar/mods-for-hesk-calendar.js | 44 +++++++++++-------- 4 files changed, 41 insertions(+), 21 deletions(-) diff --git a/api/BusinessLogic/Calendar/CalendarHandler.php b/api/BusinessLogic/Calendar/CalendarHandler.php index 5347eaf1..766ea537 100644 --- a/api/BusinessLogic/Calendar/CalendarHandler.php +++ b/api/BusinessLogic/Calendar/CalendarHandler.php @@ -44,6 +44,18 @@ class CalendarHandler extends \BaseClass { public function createEvent($calendarEvent, $userContext, $heskSettings) { - return $this->calendarGateway->createEvent($calendarEvent, $userContext, $heskSettings); + $this->calendarGateway->createEvent($calendarEvent, $userContext, $heskSettings); + + $eventFilter = new SearchEventsFilter(); + $eventFilter->eventId = $calendarEvent->id; + $eventFilter->reminderUserId = $userContext->id; + + $events = $this->calendarGateway->getEventsForStaff($eventFilter, $heskSettings); + + if (count($events) !== 1) { + throw new \Exception("Expected exactly 1 event, found: " . count($events)); + } + + return $events[0]; } } \ No newline at end of file diff --git a/api/Controllers/Calendar/CalendarController.php b/api/Controllers/Calendar/CalendarController.php index 2e30c0b1..f7be1d0e 100644 --- a/api/Controllers/Calendar/CalendarController.php +++ b/api/Controllers/Calendar/CalendarController.php @@ -55,6 +55,8 @@ class CalendarController extends \BaseClass { /* @var $calendarHandler CalendarHandler */ $calendarHandler = $applicationContext->get(CalendarHandler::clazz()); + + return output($calendarHandler->createEvent($event, $userContext, $hesk_settings)); } function put($id) { diff --git a/api/DataAccess/Calendar/CalendarGateway.php b/api/DataAccess/Calendar/CalendarGateway.php index f101f1bd..416e7f1e 100644 --- a/api/DataAccess/Calendar/CalendarGateway.php +++ b/api/DataAccess/Calendar/CalendarGateway.php @@ -163,8 +163,6 @@ class CalendarGateway extends CommonDao { } $this->close(); - - return $event; } /** diff --git a/js/calendar/mods-for-hesk-calendar.js b/js/calendar/mods-for-hesk-calendar.js index 1d6729f4..677a5db1 100644 --- a/js/calendar/mods-for-hesk-calendar.js +++ b/js/calendar/mods-for-hesk-calendar.js @@ -52,16 +52,7 @@ $(document).ready(function() { var $contents = $(contents); var format = 'dddd, MMMM Do YYYY'; - var endDate = event.end == null ? event.start : event.end; - - if (event.allDay) { - endDate = event.end.clone(); - endDate.add(-1, 'days'); - } - - if (!event.allDay && event.type !== 'TICKET') { - format += ', HH:mm'; - } + var endDate = event.end === null ? event.start : event.end; if (event.type === 'TICKET') { contents = $('.ticket-popover-template').html(); @@ -77,6 +68,13 @@ $(document).ready(function() { .find('.popover-category span').text(event.categoryName).end() .find('.popover-priority span').text(event.priority); } else { + if (event.allDay) { + endDate = event.end.clone(); + endDate.add(-1, 'days'); + } else { + format += ', HH:mm'; + } + if (event.location === '') { $contents.find('.popover-location').hide(); } @@ -196,6 +194,9 @@ $(document).ready(function() { dateFormat = 'YYYY-MM-DD HH:mm:ss'; } + var reminderValue = $createForm.find('input[name="reminder-value"]').val(); + var reminderUnits = $createForm.find('select[name="reminder-unit"]').val(); + var data = { title: $createForm.find('input[name="name"]').val(), location: $createForm.find('input[name="location"]').val(), @@ -209,8 +210,8 @@ $(document).ready(function() { 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() + reminderValue: reminderValue === "" ? null : reminderValue, + reminderUnits: reminderValue === "" ? null : reminderUnits }; $.ajax({ @@ -245,25 +246,29 @@ $(document).ready(function() { dateFormat = 'YYYY-MM-DD HH:mm:ss'; } + var reminderValue = $createForm.find('input[name="reminder-value"]').val(); + var reminderUnits = $createForm.find('select[name="reminder-unit"]').val(); + var data = { + id: $form.find('input[name="id"]').val(), title: $form.find('input[name="name"]').val(), location: $form.find('input[name="location"]').val(), startTime: moment(start).format(dateFormat), endTime: moment(end).format(dateFormat), allDay: allDay, comments: $form.find('textarea[name="comments"]').val(), - categoryId: $form.find('select[name="category"]').val(), + categoryId: parseInt($form.find('select[name="category"]').val()), 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(), - reminderValue: $form.find('input[name="reminder-value"]').val(), - reminderUnits: $form.find('select[name="reminder-unit"]').val() + reminderValue: reminderValue === "" ? null : reminderValue, + reminderUnits: reminderValue === "" ? null : reminderUnits }; $.ajax({ method: 'POST', - url: heskPath + 'api/v1/calendar/events/staff/' + $form.find('input[name="id"]').val(), + url: heskPath + 'api/v1/calendar/events/staff/' + data.id, data: JSON.stringify(data), contentType: 'json', headers: { @@ -297,6 +302,7 @@ function removeFromCalendar(id) { function buildEvent(id, dbObject) { if (dbObject.type === 'TICKET') { return { + id: id, title: dbObject.title, subject: dbObject.subject, trackingId: dbObject.trackingId, @@ -384,7 +390,7 @@ function displayCreateModal(date, viewName) { .find('input[name="location"]').val('').end() .find('textarea[name="comments"]').val('').end() .find('select[name="category"]').val($form.find('select[name="category"] option:first-child').val()).end() - .find('select[name="reminder-unit"]').val(0).end() + .find('select[name="reminder-unit"]').val("MINUTE").end() .find('input[name="reminder-value"]').val('').end(); var $modal = $('#create-event-modal'); @@ -534,9 +540,11 @@ function respondToDragAndDrop(event, delta, revertFunc) { reminderValue: event.reminderValue, reminderUnits: event.reminderUnits }; + + var url = heskPath + 'api/v1/calendar/events/staff/' + event.id; $.ajax({ method: 'POST', - url: heskPath + 'api/v1/calendar/events/staff/' + event.id, + url: url, data: JSON.stringify(data), headers: { 'X-Internal-Call': true, From 3d73b9a4b25c55481c09efeea982ae4e79484690 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Sun, 7 Jan 2018 22:02:43 -0500 Subject: [PATCH 33/74] All main staff calendar endpoints moved --- .../Calendar/CalendarHandler.php | 6 +++-- .../Calendar/CalendarController.php | 12 ++++++++++ api/DataAccess/Calendar/CalendarGateway.php | 16 +++++++++++++ api/index.php | 2 +- js/calendar/mods-for-hesk-calendar.js | 24 +++++++++---------- 5 files changed, 44 insertions(+), 16 deletions(-) diff --git a/api/BusinessLogic/Calendar/CalendarHandler.php b/api/BusinessLogic/Calendar/CalendarHandler.php index 766ea537..ad5a1775 100644 --- a/api/BusinessLogic/Calendar/CalendarHandler.php +++ b/api/BusinessLogic/Calendar/CalendarHandler.php @@ -3,10 +3,8 @@ namespace BusinessLogic\Calendar; -use BusinessLogic\Exceptions\ApiFriendlyException; use BusinessLogic\Security\UserContext; use DataAccess\Calendar\CalendarGateway; -use PHPUnit\Runner\Exception; class CalendarHandler extends \BaseClass { private $calendarGateway; @@ -58,4 +56,8 @@ class CalendarHandler extends \BaseClass { return $events[0]; } + + public function deleteEvent($id, $userContext, $heskSettings) { + $this->calendarGateway->deleteEvent($id, $userContext, $heskSettings); + } } \ No newline at end of file diff --git a/api/Controllers/Calendar/CalendarController.php b/api/Controllers/Calendar/CalendarController.php index f7be1d0e..d586b310 100644 --- a/api/Controllers/Calendar/CalendarController.php +++ b/api/Controllers/Calendar/CalendarController.php @@ -73,6 +73,18 @@ class CalendarController extends \BaseClass { return output($calendarHandler->updateEvent($event, $userContext, $hesk_settings)); } + function delete($id) { + /* @var $userContext UserContext */ + global $applicationContext, $hesk_settings, $userContext; + + /* @var $calendarHandler CalendarHandler */ + $calendarHandler = $applicationContext->get(CalendarHandler::clazz()); + + $calendarHandler->deleteEvent($id, $userContext, $hesk_settings); + + return http_response_code(204); + } + private function transformJson($json, $id = null) { $event = new CalendarEvent(); diff --git a/api/DataAccess/Calendar/CalendarGateway.php b/api/DataAccess/Calendar/CalendarGateway.php index 416e7f1e..81b7026f 100644 --- a/api/DataAccess/Calendar/CalendarGateway.php +++ b/api/DataAccess/Calendar/CalendarGateway.php @@ -192,4 +192,20 @@ class CalendarGateway extends CommonDao { $this->close(); } + + /** + * @param $id int + * @param $userContext UserContext + * @param $heskSettings array + */ + public function deleteEvent($id, $userContext, $heskSettings) { + $this->init(); + + hesk_dbQuery("DELETE FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "calendar_event_reminder` + WHERE `event_id` = " . intval($id) . " AND `user_id` = " . intval($userContext->id)); + hesk_dbQuery("DELETE FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "calendar_event` + WHERE `id` = " . intval($id)); + + $this->close(); + } } \ No newline at end of file diff --git a/api/index.php b/api/index.php index 3888685c..2277d647 100644 --- a/api/index.php +++ b/api/index.php @@ -205,7 +205,7 @@ Link::all(array( '/v1/settings' => action(\Controllers\Settings\SettingsController::clazz(), RequestMethod::all()), // Calendar '/v1/calendar/events/staff' => action(\Controllers\Calendar\CalendarController::clazz(), array(RequestMethod::GET, RequestMethod::POST), SecurityHandler::INTERNAL_OR_AUTH_TOKEN), - '/v1/calendar/events/staff/{i}' => action(\Controllers\Calendar\CalendarController::clazz(), array(RequestMethod::PUT), SecurityHandler::INTERNAL_OR_AUTH_TOKEN), + '/v1/calendar/events/staff/{i}' => action(\Controllers\Calendar\CalendarController::clazz(), array(RequestMethod::PUT, RequestMethod::DELETE), SecurityHandler::INTERNAL_OR_AUTH_TOKEN), /* Internal use only routes */ // Resend email response diff --git a/js/calendar/mods-for-hesk-calendar.js b/js/calendar/mods-for-hesk-calendar.js index 677a5db1..2561381b 100644 --- a/js/calendar/mods-for-hesk-calendar.js +++ b/js/calendar/mods-for-hesk-calendar.js @@ -16,7 +16,7 @@ $(document).ready(function() { defaultView: $('#setting_default_view').text().trim(), events: function(start, end, timezone, callback) { $.ajax({ - url: heskPath + 'api/v1/calendar/events/staff?start=' + start + '&end=' + end, + url: heskPath + 'api/index.php/v1/calendar/events/staff?start=' + start + '&end=' + end, method: 'GET', dataType: 'json', headers: { 'X-Internal-Call': true }, @@ -160,17 +160,15 @@ $(document).ready(function() { $editForm.find('#delete-button').click(function() { var id = $editForm.find('input[name="id"]').val(); - var data = { - id: id, - action: 'delete' - }; - $.ajax({ method: 'POST', - url: heskPath + 'internal-api/admin/calendar/', - data: data, + url: heskPath + 'api/index.php/v1/calendar/events/staff/' + id, + headers: { + 'X-Internal-Call': true, + 'X-HTTP-Method-Override': 'DELETE' + }, success: function() { - removeFromCalendar(data.id); + removeFromCalendar(id); mfhAlert.success(mfhLang.text('event_deleted')); $('#edit-event-modal').modal('hide'); }, @@ -216,7 +214,7 @@ $(document).ready(function() { $.ajax({ method: 'POST', - url: heskPath + 'api/v1/calendar/events/staff', + url: heskPath + 'api/index.php/v1/calendar/events/staff', data: JSON.stringify(data), contentType: 'json', headers: { 'X-Internal-Call': true }, @@ -268,7 +266,7 @@ $(document).ready(function() { $.ajax({ method: 'POST', - url: heskPath + 'api/v1/calendar/events/staff/' + data.id, + url: heskPath + 'api/index.php/v1/calendar/events/staff/' + data.id, data: JSON.stringify(data), contentType: 'json', headers: { @@ -490,7 +488,7 @@ function respondToDragAndDrop(event, delta, revertFunc) { var heskPath = $('p#hesk-path').text(); if (event.type === 'TICKET') { - var uri = 'api/v1/staff/tickets/' + event.id + '/due-date'; + var uri = 'api/index.php/v1/staff/tickets/' + event.id + '/due-date'; $.ajax({ method: 'POST', url: heskPath + uri, @@ -541,7 +539,7 @@ function respondToDragAndDrop(event, delta, revertFunc) { reminderUnits: event.reminderUnits }; - var url = heskPath + 'api/v1/calendar/events/staff/' + event.id; + var url = heskPath + 'api/index.php/v1/calendar/events/staff/' + event.id; $.ajax({ method: 'POST', url: url, From 4c2432a35bec4dacc697dc003dae03bf4d1d8b97 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Tue, 9 Jan 2018 12:37:29 -0500 Subject: [PATCH 34/74] Moved all calendar API logic to the api folder --- api/BusinessLogic/Categories/Category.php | 2 +- .../Categories/CategoryHandler.php | 13 ++ .../Calendar/CalendarController.php | 27 ++- api/DataAccess/Calendar/CalendarGateway.php | 3 +- api/index.php | 1 + internal-api/calendar/index.php | 29 --- internal-api/dao/calendar_dao.php | 195 ------------------ .../mods-for-hesk-calendar-admin-readonly.js | 3 +- .../mods-for-hesk-calendar-readonly.js | 2 +- js/calendar/mods-for-hesk-calendar.js | 4 +- 10 files changed, 44 insertions(+), 235 deletions(-) delete mode 100644 internal-api/calendar/index.php delete mode 100644 internal-api/dao/calendar_dao.php diff --git a/api/BusinessLogic/Categories/Category.php b/api/BusinessLogic/Categories/Category.php index 597c3410..f7ea363e 100644 --- a/api/BusinessLogic/Categories/Category.php +++ b/api/BusinessLogic/Categories/Category.php @@ -22,7 +22,7 @@ class Category extends \BaseClass { public $autoAssign; /** - * @var int The type of Categories (1 = Private, 2 = Public) + * @var int The type of Categories (1 = Private, 0 = Public) */ public $type; diff --git a/api/BusinessLogic/Categories/CategoryHandler.php b/api/BusinessLogic/Categories/CategoryHandler.php index 98e5b6d4..49d0b189 100644 --- a/api/BusinessLogic/Categories/CategoryHandler.php +++ b/api/BusinessLogic/Categories/CategoryHandler.php @@ -187,4 +187,17 @@ class CategoryHandler extends \BaseClass { $this->categoryGateway->updateCategory($category, $heskSettings); $this->categoryGateway->resortAllCategories($heskSettings); } + + function getPublicCategories($heskSettings) { + $allCategories = $this->categoryGateway->getAllCategories($heskSettings, $this->modsForHeskSettingsGateway->getAllSettings($heskSettings)); + + $publicCategories = array(); + foreach ($allCategories as $category) { + if ($category->type === 0) { + $publicCategories[] = $category; + } + } + + return $publicCategories; + } } \ No newline at end of file diff --git a/api/Controllers/Calendar/CalendarController.php b/api/Controllers/Calendar/CalendarController.php index d586b310..0953b585 100644 --- a/api/Controllers/Calendar/CalendarController.php +++ b/api/Controllers/Calendar/CalendarController.php @@ -7,12 +7,14 @@ use BusinessLogic\Calendar\CalendarEvent; use BusinessLogic\Calendar\CalendarHandler; use BusinessLogic\Calendar\ReminderUnit; use BusinessLogic\Calendar\SearchEventsFilter; +use BusinessLogic\Categories\CategoryHandler; use BusinessLogic\Exceptions\ValidationException; use BusinessLogic\Helpers; use BusinessLogic\Security\UserContext; use BusinessLogic\Security\UserPrivilege; use BusinessLogic\ValidationModel; use Controllers\JsonRetriever; +use DataAccess\Settings\ModsForHeskSettingsGateway; class CalendarController extends \BaseClass { function get() { @@ -35,10 +37,27 @@ class CalendarController extends \BaseClass { $searchEventsFilter->startTime = $startTime; $searchEventsFilter->endTime = $endTime; $searchEventsFilter->reminderUserId = $userContext->id; - $searchEventsFilter->includeTicketsAssignedToOthers = in_array(UserPrivilege::CAN_VIEW_ASSIGNED_TO_OTHER, $userContext->permissions); - $searchEventsFilter->includeUnassignedTickets = in_array(UserPrivilege::CAN_VIEW_UNASSIGNED, $userContext->permissions); - $searchEventsFilter->includeTickets = true; - $searchEventsFilter->categories = $userContext->admin ? null : $userContext->categories; + + if ($userContext->isAnonymousUser()) { + $searchEventsFilter->includeTicketsAssignedToOthers = false; + $searchEventsFilter->includeUnassignedTickets = false; + $searchEventsFilter->includeTickets = false; + + /* @var $categoryHandler CategoryHandler */ + $categoryHandler = $applicationContext->get(CategoryHandler::clazz()); + + $publicCategories = $categoryHandler->getPublicCategories($hesk_settings); + $ids = array(); + foreach ($publicCategories as $category) { + $ids[] = $category->id; + } + $searchEventsFilter->categories = $ids; + } else { + $searchEventsFilter->includeTicketsAssignedToOthers = in_array(UserPrivilege::CAN_VIEW_ASSIGNED_TO_OTHER, $userContext->permissions); + $searchEventsFilter->includeUnassignedTickets = in_array(UserPrivilege::CAN_VIEW_UNASSIGNED, $userContext->permissions); + $searchEventsFilter->includeTickets = true; + $searchEventsFilter->categories = $userContext->admin ? null : $userContext->categories; + } $events = $calendarHandler->getEventsForStaff($searchEventsFilter, $hesk_settings); diff --git a/api/DataAccess/Calendar/CalendarGateway.php b/api/DataAccess/Calendar/CalendarGateway.php index 81b7026f..ddb263e6 100644 --- a/api/DataAccess/Calendar/CalendarGateway.php +++ b/api/DataAccess/Calendar/CalendarGateway.php @@ -43,8 +43,7 @@ class CalendarGateway extends CommonDao { $sql .= " AND NOT (`end` < {$startTimeSql} OR `start` > {$endTimeSql}) - AND `categories`.`usage` <> 1 - AND `categories`.`type` = '0'"; + AND `categories`.`usage` <> 1"; } if ($searchEventsFilter->eventId !== null) { diff --git a/api/index.php b/api/index.php index 2277d647..7c0574b2 100644 --- a/api/index.php +++ b/api/index.php @@ -204,6 +204,7 @@ Link::all(array( // Settings '/v1/settings' => action(\Controllers\Settings\SettingsController::clazz(), RequestMethod::all()), // Calendar + '/v1/calendar/events' => action(\Controllers\Calendar\CalendarController::clazz(), array(RequestMethod::GET), SecurityHandler::OPEN), '/v1/calendar/events/staff' => action(\Controllers\Calendar\CalendarController::clazz(), array(RequestMethod::GET, RequestMethod::POST), SecurityHandler::INTERNAL_OR_AUTH_TOKEN), '/v1/calendar/events/staff/{i}' => action(\Controllers\Calendar\CalendarController::clazz(), array(RequestMethod::PUT, RequestMethod::DELETE), SecurityHandler::INTERNAL_OR_AUTH_TOKEN), diff --git a/internal-api/calendar/index.php b/internal-api/calendar/index.php deleted file mode 100644 index 1ccc6011..00000000 --- a/internal-api/calendar/index.php +++ /dev/null @@ -1,29 +0,0 @@ - {$end_time_sql}) AND `categories`.`usage` <> 1"; - - if (!$staff) { - $sql .= " AND `categories`.`type` = '0'"; - } - - $rs = hesk_dbQuery($sql); - - $events = array(); - while ($row = hesk_dbFetchAssoc($rs)) { - // Skip the event if the user does not have access to it - if ($staff && !$_SESSION['isadmin'] && !in_array($row['category'], $_SESSION['categories'])) { - continue; - } - - mfh_log_debug('Calendar', "Creating event with id: {$row['id']}", ''); - - $event['type'] = 'CALENDAR'; - $event['id'] = intval($row['id']); - $event['startTime'] = $row['start']; - $event['endTime'] = $row['end']; - $event['allDay'] = $row['all_day'] ? true : false; - $event['title'] = $row['name']; - $event['location'] = $row['location']; - $event['comments'] = $row['comments']; - $event['categoryId'] = $row['category']; - $event['categoryName'] = $row['category_name']; - $event['backgroundColor'] = $row['background_color']; - $event['foregroundColor'] = $row['foreground_color']; - $event['displayBorder'] = $row['display_border']; - - if ($staff) { - $event['reminderValue'] = $row['reminder_value']; - $event['reminderUnits'] = $row['reminder_unit']; - } - - $events[] = $event; - } - - if ($staff) { - $old_time_setting = $hesk_settings['timeformat']; - $hesk_settings['timeformat'] = 'Y-m-d'; - $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 `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` - INNER JOIN `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` AS `categories` - ON `categories`.`id` = `tickets`.`category` - AND `categories`.`usage` <> 2 - LEFT JOIN `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` AS `owner` - ON `tickets`.`owner` = `owner`.`id` - WHERE `due_date` >= CONVERT_TZ(FROM_UNIXTIME(" . hesk_dbEscape($start) - . " / 1000), @@session.time_zone, '+00:00') - AND `due_date` <= CONVERT_TZ(FROM_UNIXTIME(" . hesk_dbEscape($end) . " / 1000), @@session.time_zone, '+00:00') - AND `status` IN (SELECT `id` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "statuses` WHERE `IsClosed` = 0) "; - - $rs = hesk_dbQuery($sql); - while ($row = hesk_dbFetchAssoc($rs)) { - // Skip the ticket if the user does not have access to it - if (!hesk_checkPermission('can_view_tickets', 0) - || ($row['owner_id'] && $row['owner_id'] != $_SESSION['id'] && !hesk_checkPermission('can_view_ass_others', 0)) - || (!$row['owner_id'] && !hesk_checkPermission('can_view_unassigned', 0))) { - continue; - } - - $event['type'] = 'TICKET'; - $event['trackingId'] = $row['trackid']; - $event['subject'] = $row['subject']; - $event['title'] = $row['subject']; - $event['startTime'] = $row['due_date']; - $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['backgroundColor'] = $row['background_color']; - $event['foregroundColor'] = $row['foreground_color']; - $event['displayBorder'] = $row['display_border']; - $event['owner'] = $row['owner_name']; - - $priorities = array( - 0 => $hesklang['critical'], - 1 => $hesklang['high'], - 2 => $hesklang['medium'], - 3 => $hesklang['low'] - ); - $event['priority'] = $priorities[$row['priority']]; - - $events[] = $event; - } - } - - return $events; -} - -function create_event($event, $hesk_settings) { - // Make sure the user can create events in this category - if (!$_SESSION['isadmin'] && !in_array($event['category'], $_SESSION['categories'])) { - print_error('Access Denied', 'You cannot create an event in this category'); - } - - $event['start'] = date('Y-m-d H:i:s', strtotime($event['start'])); - $event['end'] = date('Y-m-d H:i:s', strtotime($event['end'])); - $event['all_day'] = $event['all_day'] ? 1 : 0; - - $sql = "INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "calendar_event` (`start`, `end`, `all_day`, - `name`, `location`, `comments`, `category`) VALUES ( - '" . hesk_dbEscape($event['start']) . "', '" . hesk_dbEscape($event['end']) . "', '" . hesk_dbEscape($event['all_day']) . "', - '" . hesk_dbEscape(addslashes($event['title'])) . "', '" . hesk_dbEscape(addslashes($event['location'])) . "', '" . hesk_dbEscape(addslashes($event['comments'])) . "', - " . intval($event['category']) . ")"; - - hesk_dbQuery($sql); - $event_id = hesk_dbInsertID(); - - if ($event['reminder_amount'] != null) { - $sql = "INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "calendar_event_reminder` (`user_id`, `event_id`, - `amount`, `unit`) VALUES (" . intval($event['reminder_user']) . ", " . intval($event_id) . ", " . intval($event['reminder_amount']) . ", - " . intval($event['reminder_units']) . ")"; - - hesk_dbQuery($sql); - } - - return $event_id; -} - -function update_event($event, $hesk_settings) { - // Make sure the user can edit events in this category - if (!$_SESSION['isadmin'] && !in_array($event['category'], $_SESSION['categories'])) { - print_error('Access Denied', 'You cannot edit an event in this category'); - } - - -} - -function delete_event($id, $hesk_settings) { - // Make sure the user can delete events in this category - $categoryRs = hesk_dbQuery('SELECT `category` FROM `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'calendar_event` WHERE `id` = ' . intval($id)); - $category = hesk_dbFetchAssoc($categoryRs); - if (!$_SESSION['isadmin'] && !in_array($category['category'], $_SESSION['categories'])) { - print_error('Access Denied', 'You cannot delete events in this category'); - } - - $sql = "DELETE FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "calendar_event` WHERE `id` = " . intval($id); - - hesk_dbQuery($sql); -} - -function update_ticket_due_date($ticket, $hesk_settings) { - $ticket_id_rs = hesk_dbQuery("SELECT `id` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "tickets` WHERE `trackid` = '" . hesk_dbEscape($ticket['trackid']) . "'"); - $ticket_id = hesk_dbFetchAssoc($ticket_id_rs); - - $due_date = 'NULL'; - $language_key = 'audit_due_date_removed'; - $audit_array = array(0 => $_SESSION['name'] . ' (' . $_SESSION['user'] . ')'); - if ($ticket['due_date'] != NULL) { - $audit_array = array( - 0 => $_SESSION['name'] . ' (' . $_SESSION['user'] . ')', - 1 => date('Y-m-d H:i:s', strtotime($ticket['due_date'])) - ); - $due_date = "'" . date('Y-m-d H:i:s', strtotime($ticket['due_date'])) . "'"; - $language_key = 'audit_due_date_changed'; - } - $sql = "UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "tickets` SET `due_date` = {$due_date}, `overdue_email_sent` = '0' - WHERE `trackid` = '" . hesk_dbEscape($ticket['trackid']) . "'"; - - mfh_insert_audit_trail_record($ticket_id['id'], 'TICKET', $language_key, hesk_date(), - $audit_array); - - hesk_dbQuery($sql); -} \ No newline at end of file diff --git a/js/calendar/mods-for-hesk-calendar-admin-readonly.js b/js/calendar/mods-for-hesk-calendar-admin-readonly.js index 619e5d23..7290189e 100644 --- a/js/calendar/mods-for-hesk-calendar-admin-readonly.js +++ b/js/calendar/mods-for-hesk-calendar-admin-readonly.js @@ -16,9 +16,10 @@ $(document).ready(function() { defaultView: $('#setting_default_view').text().trim(), events: function(start, end, timezone, callback) { $.ajax({ - url: heskPath + 'internal-api/admin/calendar/?start=' + start + '&end=' + end, + url: heskPath + 'api/index.php/v1/calendar/events/staff?start=' + start + '&end=' + end, method: 'GET', dataType: 'json', + headers: { 'X-Internal-Call': true }, success: function(data) { var events = []; $(data).each(function() { diff --git a/js/calendar/mods-for-hesk-calendar-readonly.js b/js/calendar/mods-for-hesk-calendar-readonly.js index eff85039..a282c155 100644 --- a/js/calendar/mods-for-hesk-calendar-readonly.js +++ b/js/calendar/mods-for-hesk-calendar-readonly.js @@ -16,7 +16,7 @@ $(document).ready(function() { defaultView: $('#setting_default_view').text().trim(), events: function(start, end, timezone, callback) { $.ajax({ - url: heskPath + 'internal-api/calendar/?start=' + start + '&end=' + end, + url: heskPath + 'api/index.php/v1/calendar/events/?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 2561381b..48fac68f 100644 --- a/js/calendar/mods-for-hesk-calendar.js +++ b/js/calendar/mods-for-hesk-calendar.js @@ -218,8 +218,8 @@ $(document).ready(function() { data: JSON.stringify(data), contentType: 'json', headers: { 'X-Internal-Call': true }, - success: function(id) { - addToCalendar(id, data, $('#lang_event_created').text()); + success: function(createdEvent) { + addToCalendar(createdEvent.id, data, $('#lang_event_created').text()); $('#create-event-modal').modal('hide'); updateCategoryVisibility(); }, From 4959ccb815dd6d530c5f027624e10f07d9f4657b Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Thu, 18 Jan 2018 22:02:48 -0500 Subject: [PATCH 35/74] Add php-rrule for recurring event parsing --- api/composer.json | 3 +- api/composer.lock | 151 ++++++++++++++++++++++++++++++---------------- 2 files changed, 102 insertions(+), 52 deletions(-) diff --git a/api/composer.json b/api/composer.json index b91d34b5..c7215460 100644 --- a/api/composer.json +++ b/api/composer.json @@ -17,6 +17,7 @@ "phpmailer/phpmailer": "^5.2", "mailgun/mailgun-php": "1.7.2", "mike-koch/php-di": "4.4.11", - "doctrine/annotations": "1.2" + "doctrine/annotations": "1.2", + "rlanvin/php-rrule": "1.6.0" } } diff --git a/api/composer.lock b/api/composer.lock index 1668fba8..14ef8855 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": "cba4f6a9b461d9050bd4095da7c79aea", + "content-hash": "271633d6be53dff4f327e318b49a049f", "packages": [ { "name": "container-interop/container-interop", @@ -691,17 +691,61 @@ "time": "2017-02-14T16:28:37+00:00" }, { - "name": "symfony/event-dispatcher", - "version": "v2.8.28", + "name": "rlanvin/php-rrule", + "version": "v1.6.0", "source": { "type": "git", - "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "7fe089232554357efb8d4af65ce209fc6e5a2186" + "url": "https://github.com/rlanvin/php-rrule.git", + "reference": "c543bda87d2f8b6c490210f1a6e2bf0d79162a4a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/7fe089232554357efb8d4af65ce209fc6e5a2186", - "reference": "7fe089232554357efb8d4af65ce209fc6e5a2186", + "url": "https://api.github.com/repos/rlanvin/php-rrule/zipball/c543bda87d2f8b6c490210f1a6e2bf0d79162a4a", + "reference": "c543bda87d2f8b6c490210f1a6e2bf0d79162a4a", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "require-dev": { + "phpunit/phpunit": "<6" + }, + "suggest": { + "ext-intl": "Intl extension is needed for humanReadable()" + }, + "type": "library", + "autoload": { + "psr-4": { + "RRule\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Lightweight and fast recurrence rules for PHP (RFC 5545)", + "homepage": "https://github.com/rlanvin/php-rrule", + "keywords": [ + "date", + "ical", + "recurrence", + "recurring", + "rrule" + ], + "time": "2017-10-11T12:23:40+00:00" + }, + { + "name": "symfony/event-dispatcher", + "version": "v2.8.33", + "source": { + "type": "git", + "url": "https://github.com/symfony/event-dispatcher.git", + "reference": "d64be24fc1eba62f9daace8a8918f797fc8e87cc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d64be24fc1eba62f9daace8a8918f797fc8e87cc", + "reference": "d64be24fc1eba62f9daace8a8918f797fc8e87cc", "shasum": "" }, "require": { @@ -748,7 +792,7 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2017-10-01T21:00:16+00:00" + "time": "2018-01-03T07:36:31+00:00" }, { "name": "zendframework/zend-code", @@ -1334,29 +1378,35 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "4.1.1", + "version": "4.2.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "2d3d238c433cf69caeb4842e97a3223a116f94b2" + "reference": "66465776cfc249844bde6d117abff1d22e06c2da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/2d3d238c433cf69caeb4842e97a3223a116f94b2", - "reference": "2d3d238c433cf69caeb4842e97a3223a116f94b2", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/66465776cfc249844bde6d117abff1d22e06c2da", + "reference": "66465776cfc249844bde6d117abff1d22e06c2da", "shasum": "" }, "require": { "php": "^7.0", - "phpdocumentor/reflection-common": "^1.0@dev", + "phpdocumentor/reflection-common": "^1.0.0", "phpdocumentor/type-resolver": "^0.4.0", "webmozart/assert": "^1.0" }, "require-dev": { - "mockery/mockery": "^0.9.4", - "phpunit/phpunit": "^4.4" + "doctrine/instantiator": "~1.0.5", + "mockery/mockery": "^1.0", + "phpunit/phpunit": "^6.4" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.x-dev" + } + }, "autoload": { "psr-4": { "phpDocumentor\\Reflection\\": [ @@ -1375,7 +1425,7 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2017-08-30T18:51:59+00:00" + "time": "2017-11-27T17:38:31+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -1426,16 +1476,16 @@ }, { "name": "phpspec/prophecy", - "version": "v1.7.2", + "version": "1.7.3", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6" + "reference": "e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6", - "reference": "c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf", + "reference": "e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf", "shasum": "" }, "require": { @@ -1447,7 +1497,7 @@ }, "require-dev": { "phpspec/phpspec": "^2.5|^3.2", - "phpunit/phpunit": "^4.8 || ^5.6.5" + "phpunit/phpunit": "^4.8.35 || ^5.7" }, "type": "library", "extra": { @@ -1485,20 +1535,20 @@ "spy", "stub" ], - "time": "2017-09-04T11:05:03+00:00" + "time": "2017-11-24T13:59:53+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "5.2.3", + "version": "5.3.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "8e1d2397d8adf59a3f12b2878a3aaa66d1ab189d" + "reference": "661f34d0bd3f1a7225ef491a70a020ad23a057a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/8e1d2397d8adf59a3f12b2878a3aaa66d1ab189d", - "reference": "8e1d2397d8adf59a3f12b2878a3aaa66d1ab189d", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/661f34d0bd3f1a7225ef491a70a020ad23a057a1", + "reference": "661f34d0bd3f1a7225ef491a70a020ad23a057a1", "shasum": "" }, "require": { @@ -1507,14 +1557,13 @@ "php": "^7.0", "phpunit/php-file-iterator": "^1.4.2", "phpunit/php-text-template": "^1.2.1", - "phpunit/php-token-stream": "^2.0", + "phpunit/php-token-stream": "^2.0.1", "sebastian/code-unit-reverse-lookup": "^1.0.1", "sebastian/environment": "^3.0", "sebastian/version": "^2.0.1", "theseer/tokenizer": "^1.1" }, "require-dev": { - "ext-xdebug": "^2.5", "phpunit/phpunit": "^6.0" }, "suggest": { @@ -1523,7 +1572,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "5.2.x-dev" + "dev-master": "5.3.x-dev" } }, "autoload": { @@ -1538,7 +1587,7 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", + "email": "sebastian@phpunit.de", "role": "lead" } ], @@ -1549,20 +1598,20 @@ "testing", "xunit" ], - "time": "2017-11-03T13:47:33+00:00" + "time": "2017-12-06T09:29:45+00:00" }, { "name": "phpunit/php-file-iterator", - "version": "1.4.2", + "version": "1.4.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5" + "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/3cc8f69b3028d0f96a9078e6295d86e9bf019be5", - "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/730b01bc3e867237eaac355e06a36b85dd93a8b4", + "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4", "shasum": "" }, "require": { @@ -1596,7 +1645,7 @@ "filesystem", "iterator" ], - "time": "2016-10-03T07:40:28+00:00" + "time": "2017-11-27T13:52:08+00:00" }, { "name": "phpunit/php-text-template", @@ -1690,16 +1739,16 @@ }, { "name": "phpunit/php-token-stream", - "version": "2.0.1", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "9a02332089ac48e704c70f6cefed30c224e3c0b0" + "reference": "791198a2c6254db10131eecfe8c06670700904db" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/9a02332089ac48e704c70f6cefed30c224e3c0b0", - "reference": "9a02332089ac48e704c70f6cefed30c224e3c0b0", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/791198a2c6254db10131eecfe8c06670700904db", + "reference": "791198a2c6254db10131eecfe8c06670700904db", "shasum": "" }, "require": { @@ -1735,7 +1784,7 @@ "keywords": [ "tokenizer" ], - "time": "2017-08-20T05:47:52+00:00" + "time": "2017-11-27T05:48:46+00:00" }, { "name": "phpunit/phpunit", @@ -1974,16 +2023,16 @@ }, { "name": "sebastian/comparator", - "version": "2.1.0", + "version": "2.1.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "1174d9018191e93cb9d719edec01257fc05f8158" + "reference": "11c07feade1d65453e06df3b3b90171d6d982087" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1174d9018191e93cb9d719edec01257fc05f8158", - "reference": "1174d9018191e93cb9d719edec01257fc05f8158", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/11c07feade1d65453e06df3b3b90171d6d982087", + "reference": "11c07feade1d65453e06df3b3b90171d6d982087", "shasum": "" }, "require": { @@ -2034,7 +2083,7 @@ "compare", "equality" ], - "time": "2017-11-03T07:16:52+00:00" + "time": "2018-01-12T06:34:42+00:00" }, { "name": "sebastian/diff", @@ -2488,16 +2537,16 @@ }, { "name": "symfony/console", - "version": "v2.8.28", + "version": "v2.8.33", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "f81549d2c5fdee8d711c9ab3c7e7362353ea5853" + "reference": "a4bd0f02ea156cf7b5138774a7ba0ab44d8da4fe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/f81549d2c5fdee8d711c9ab3c7e7362353ea5853", - "reference": "f81549d2c5fdee8d711c9ab3c7e7362353ea5853", + "url": "https://api.github.com/repos/symfony/console/zipball/a4bd0f02ea156cf7b5138774a7ba0ab44d8da4fe", + "reference": "a4bd0f02ea156cf7b5138774a7ba0ab44d8da4fe", "shasum": "" }, "require": { @@ -2545,7 +2594,7 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2017-10-01T21:00:16+00:00" + "time": "2018-01-03T07:36:31+00:00" }, { "name": "symfony/debug", From 78cb2de9b6767bd005a00b466a948df3802c78aa Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Fri, 19 Jan 2018 22:17:15 -0500 Subject: [PATCH 36/74] Going to use rrule.js instead --- api/BusinessLogic/Calendar/CalendarEvent.php | 2 + .../Calendar/CalendarController.php | 2 + api/composer.json | 3 +- api/composer.lock | 46 +------------------ 4 files changed, 6 insertions(+), 47 deletions(-) diff --git a/api/BusinessLogic/Calendar/CalendarEvent.php b/api/BusinessLogic/Calendar/CalendarEvent.php index 91a45761..9e974b01 100644 --- a/api/BusinessLogic/Calendar/CalendarEvent.php +++ b/api/BusinessLogic/Calendar/CalendarEvent.php @@ -18,4 +18,6 @@ class CalendarEvent extends AbstractEvent { public $reminderValue; public $reminderUnits; + + public $recurringRule; } \ No newline at end of file diff --git a/api/Controllers/Calendar/CalendarController.php b/api/Controllers/Calendar/CalendarController.php index 0953b585..2c84270a 100644 --- a/api/Controllers/Calendar/CalendarController.php +++ b/api/Controllers/Calendar/CalendarController.php @@ -15,6 +15,7 @@ use BusinessLogic\Security\UserPrivilege; use BusinessLogic\ValidationModel; use Controllers\JsonRetriever; use DataAccess\Settings\ModsForHeskSettingsGateway; +use RRule\RRule; class CalendarController extends \BaseClass { function get() { @@ -117,6 +118,7 @@ class CalendarController extends \BaseClass { $event->categoryId = Helpers::safeArrayGet($json, 'categoryId'); $event->reminderValue = Helpers::safeArrayGet($json, 'reminderValue'); $event->reminderUnits = ReminderUnit::getByName(Helpers::safeArrayGet($json, 'reminderUnits')); + $event->recurringRule = Helpers::safeArrayGet($json, 'recurringRule'); return $event; } diff --git a/api/composer.json b/api/composer.json index c7215460..b91d34b5 100644 --- a/api/composer.json +++ b/api/composer.json @@ -17,7 +17,6 @@ "phpmailer/phpmailer": "^5.2", "mailgun/mailgun-php": "1.7.2", "mike-koch/php-di": "4.4.11", - "doctrine/annotations": "1.2", - "rlanvin/php-rrule": "1.6.0" + "doctrine/annotations": "1.2" } } diff --git a/api/composer.lock b/api/composer.lock index 14ef8855..f882508e 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": "271633d6be53dff4f327e318b49a049f", + "content-hash": "cba4f6a9b461d9050bd4095da7c79aea", "packages": [ { "name": "container-interop/container-interop", @@ -690,50 +690,6 @@ ], "time": "2017-02-14T16:28:37+00:00" }, - { - "name": "rlanvin/php-rrule", - "version": "v1.6.0", - "source": { - "type": "git", - "url": "https://github.com/rlanvin/php-rrule.git", - "reference": "c543bda87d2f8b6c490210f1a6e2bf0d79162a4a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/rlanvin/php-rrule/zipball/c543bda87d2f8b6c490210f1a6e2bf0d79162a4a", - "reference": "c543bda87d2f8b6c490210f1a6e2bf0d79162a4a", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "require-dev": { - "phpunit/phpunit": "<6" - }, - "suggest": { - "ext-intl": "Intl extension is needed for humanReadable()" - }, - "type": "library", - "autoload": { - "psr-4": { - "RRule\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "Lightweight and fast recurrence rules for PHP (RFC 5545)", - "homepage": "https://github.com/rlanvin/php-rrule", - "keywords": [ - "date", - "ical", - "recurrence", - "recurring", - "rrule" - ], - "time": "2017-10-11T12:23:40+00:00" - }, { "name": "symfony/event-dispatcher", "version": "v2.8.33", From 770a01a970a2c44ff7be6cec3105b35e13c63c39 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Sun, 21 Jan 2018 22:03:54 -0500 Subject: [PATCH 37/74] Add status to ticket popover on calendar --- admin/calendar.php | 10 +++++++++- api/BusinessLogic/Calendar/CalendarEvent.php | 2 -- api/BusinessLogic/Calendar/TicketEvent.php | 2 ++ api/Controllers/Calendar/CalendarController.php | 3 ++- api/DataAccess/Calendar/CalendarGateway.php | 6 +++++- .../mods-for-hesk-calendar-admin-readonly.js | 16 ++++++++++++---- js/calendar/mods-for-hesk-calendar.js | 15 ++++++++++++--- 7 files changed, 42 insertions(+), 12 deletions(-) diff --git a/admin/calendar.php b/admin/calendar.php index 905cc81d..4fc81a57 100644 --- a/admin/calendar.php +++ b/admin/calendar.php @@ -545,6 +545,10 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
    +
    + + +
    @@ -560,7 +564,11 @@ echo mfh_get_hidden_fields_for_language(array('error_loading_events', 'event_updated', 'error_updating_event', 'ticket_due_date_updated', - 'error_updating_ticket_due_date')); + 'error_updating_ticket_due_date', + 'critical', + 'high', + 'medium', + 'low')); ?>

    diff --git a/api/BusinessLogic/Calendar/CalendarEvent.php b/api/BusinessLogic/Calendar/CalendarEvent.php index 9e974b01..91a45761 100644 --- a/api/BusinessLogic/Calendar/CalendarEvent.php +++ b/api/BusinessLogic/Calendar/CalendarEvent.php @@ -18,6 +18,4 @@ class CalendarEvent extends AbstractEvent { public $reminderValue; public $reminderUnits; - - public $recurringRule; } \ No newline at end of file diff --git a/api/BusinessLogic/Calendar/TicketEvent.php b/api/BusinessLogic/Calendar/TicketEvent.php index e2e7102f..95bf621d 100644 --- a/api/BusinessLogic/Calendar/TicketEvent.php +++ b/api/BusinessLogic/Calendar/TicketEvent.php @@ -15,4 +15,6 @@ class TicketEvent extends AbstractEvent { public $owner; public $priority; + + public $status; } \ No newline at end of file diff --git a/api/Controllers/Calendar/CalendarController.php b/api/Controllers/Calendar/CalendarController.php index 2c84270a..4b7ab9cd 100644 --- a/api/Controllers/Calendar/CalendarController.php +++ b/api/Controllers/Calendar/CalendarController.php @@ -5,6 +5,7 @@ namespace Controllers\Calendar; use BusinessLogic\Calendar\CalendarEvent; use BusinessLogic\Calendar\CalendarHandler; +use BusinessLogic\Calendar\RecurringRule; use BusinessLogic\Calendar\ReminderUnit; use BusinessLogic\Calendar\SearchEventsFilter; use BusinessLogic\Categories\CategoryHandler; @@ -16,6 +17,7 @@ use BusinessLogic\ValidationModel; use Controllers\JsonRetriever; use DataAccess\Settings\ModsForHeskSettingsGateway; use RRule\RRule; +use RRule\RSet; class CalendarController extends \BaseClass { function get() { @@ -118,7 +120,6 @@ class CalendarController extends \BaseClass { $event->categoryId = Helpers::safeArrayGet($json, 'categoryId'); $event->reminderValue = Helpers::safeArrayGet($json, 'reminderValue'); $event->reminderUnits = ReminderUnit::getByName(Helpers::safeArrayGet($json, 'reminderUnits')); - $event->recurringRule = Helpers::safeArrayGet($json, 'recurringRule'); return $event; } diff --git a/api/DataAccess/Calendar/CalendarGateway.php b/api/DataAccess/Calendar/CalendarGateway.php index ddb263e6..1693e23d 100644 --- a/api/DataAccess/Calendar/CalendarGateway.php +++ b/api/DataAccess/Calendar/CalendarGateway.php @@ -86,13 +86,16 @@ class CalendarGateway extends CommonDao { $sql = "SELECT `tickets`.`id` AS `id`, `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` < '{$currentDate}' THEN 1 ELSE 0 END AS `overdue`, `owner`.`name` AS `owner_name`, `tickets`.`owner` AS `owner_id`, - `tickets`.`priority` AS `priority` + `tickets`.`priority` AS `priority`, `text_to_status_xref`.`text` AS `status_name` FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "tickets` AS `tickets` INNER JOIN `" . hesk_dbEscape($heskSettings['db_pfix']) . "categories` AS `categories` ON `categories`.`id` = `tickets`.`category` AND `categories`.`usage` <> 2 LEFT JOIN `" . hesk_dbEscape($heskSettings['db_pfix']) . "users` AS `owner` ON `tickets`.`owner` = `owner`.`id` + LEFT JOIN `" . hesk_dbEscape($heskSettings['db_pfix']) . "text_to_status_xref` AS `text_to_status_xref` + ON `tickets`.`status` = `text_to_status_xref`.`status_id` + AND `text_to_status_xref`.`language` = '" . hesk_dbEscape($heskSettings['language']) . "' WHERE `due_date` >= {$startTimeSql} AND `due_date` <= {$endTimeSql} AND `status` IN (SELECT `id` FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "statuses` WHERE `IsClosed` = 0) @@ -129,6 +132,7 @@ class CalendarGateway extends CommonDao { $event->displayBorder = Helpers::boolval($row['display_border']); $event->owner = $row['owner_name']; $event->priority = Priority::getByValue($row['priority']); + $event->status = $row['status_name']; $events[] = $event; } diff --git a/js/calendar/mods-for-hesk-calendar-admin-readonly.js b/js/calendar/mods-for-hesk-calendar-admin-readonly.js index 7290189e..51f2b763 100644 --- a/js/calendar/mods-for-hesk-calendar-admin-readonly.js +++ b/js/calendar/mods-for-hesk-calendar-admin-readonly.js @@ -62,7 +62,8 @@ $(document).ready(function() { .find('.popover-owner span').text(event.owner).end() .find('.popover-subject span').text(event.subject).end() .find('.popover-category span').text(event.categoryName).end() - .find('.popover-priority span').text(event.priority); + .find('.popover-priority span').text(event.priority) + .find('.popover-status span').text(event.status).end(); } else { if (event.location === '') { $contents.find('.popover-location').hide(); @@ -125,7 +126,13 @@ $(document).ready(function() { }); function buildEvent(id, dbObject) { - if (dbObject.type == 'TICKET') { + var priorities = []; + priorities['CRITICAL'] = mfhLang.text('critical'); + priorities['HIGH'] = mfhLang.text('high'); + priorities['MEDIUM'] = mfhLang.text('medium'); + priorities['LOW'] = mfhLang.text('low'); + + if (dbObject.type === 'TICKET') { return { title: dbObject.title, subject: dbObject.subject, @@ -141,8 +148,9 @@ function buildEvent(id, dbObject) { categoryName: dbObject.categoryName, className: 'category-' + dbObject.categoryId, owner: dbObject.owner, - priority: dbObject.priority, - fontIconMarkup: getIcon(dbObject) + priority: priorities[dbObject.priority], + fontIconMarkup: getIcon(dbObject), + status: dbObject.status }; } diff --git a/js/calendar/mods-for-hesk-calendar.js b/js/calendar/mods-for-hesk-calendar.js index 48fac68f..7551e2d7 100644 --- a/js/calendar/mods-for-hesk-calendar.js +++ b/js/calendar/mods-for-hesk-calendar.js @@ -66,7 +66,8 @@ $(document).ready(function() { .find('.popover-owner span').text(event.owner).end() .find('.popover-subject span').text(event.subject).end() .find('.popover-category span').text(event.categoryName).end() - .find('.popover-priority span').text(event.priority); + .find('.popover-priority span').text(event.priority).end() + .find('.popover-status span').text(event.status).end(); } else { if (event.allDay) { endDate = event.end.clone(); @@ -298,6 +299,13 @@ function removeFromCalendar(id) { } function buildEvent(id, dbObject) { + var priorities = []; + priorities['CRITICAL'] = mfhLang.text('critical'); + priorities['HIGH'] = mfhLang.text('high'); + priorities['MEDIUM'] = mfhLang.text('medium'); + priorities['LOW'] = mfhLang.text('low'); + + if (dbObject.type === 'TICKET') { return { id: id, @@ -315,8 +323,9 @@ function buildEvent(id, dbObject) { categoryName: dbObject.categoryName, className: 'category-' + dbObject.categoryId, owner: dbObject.owner, - priority: dbObject.priority, - fontIconMarkup: getIcon(dbObject) + priority: priorities[dbObject.priority], + fontIconMarkup: getIcon(dbObject), + status: dbObject.status }; } From 1a66485d48478f1b228d83920adef0ae107368ab Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Tue, 23 Jan 2018 22:14:25 -0500 Subject: [PATCH 38/74] Working on adding audit trail to events --- .../Calendar/CalendarHandler.php | 35 +++++++++++++++++-- .../Tickets/AuditTrailEntityType.php | 1 + .../Calendar/CalendarController.php | 3 +- api/DataAccess/Calendar/CalendarGateway.php | 32 +++++++++++++++++ language/en/text.php | 4 +++ 5 files changed, 71 insertions(+), 4 deletions(-) diff --git a/api/BusinessLogic/Calendar/CalendarHandler.php b/api/BusinessLogic/Calendar/CalendarHandler.php index ad5a1775..2c4967d1 100644 --- a/api/BusinessLogic/Calendar/CalendarHandler.php +++ b/api/BusinessLogic/Calendar/CalendarHandler.php @@ -3,14 +3,20 @@ namespace BusinessLogic\Calendar; +use BusinessLogic\DateTimeHelpers; use BusinessLogic\Security\UserContext; +use BusinessLogic\Tickets\AuditTrailEntityType; +use DataAccess\AuditTrail\AuditTrailGateway; use DataAccess\Calendar\CalendarGateway; class CalendarHandler extends \BaseClass { private $calendarGateway; + private $auditTrailGateway; - public function __construct(CalendarGateway $calendarGateway) { + public function __construct(CalendarGateway $calendarGateway, + AuditTrailGateway $auditTrailGateway) { $this->calendarGateway = $calendarGateway; + $this->auditTrailGateway = $auditTrailGateway; } public function getEventsForStaff($searchEventsFilter, $heskSettings) { @@ -37,10 +43,25 @@ class CalendarHandler extends \BaseClass { throw new \Exception("Expected exactly 1 event, found: " . count($events)); } - return $events[0]; + $event = $events[0]; + + $this->auditTrailGateway->insertAuditTrailRecord($event->id, + AuditTrailEntityType::CALENDAR_EVENT, + 'audit_event_updated', + DateTimeHelpers::heskDate($heskSettings), + array(0 => $userContext->name . ' (' . $userContext->username . ')'), $heskSettings); + + return $event; } + /** + * @param $calendarEvent CalendarEvent + * @param $userContext UserContext + * @param $heskSettings array + * @return AbstractEvent + * @throws \Exception + */ public function createEvent($calendarEvent, $userContext, $heskSettings) { $this->calendarGateway->createEvent($calendarEvent, $userContext, $heskSettings); @@ -54,7 +75,15 @@ class CalendarHandler extends \BaseClass { throw new \Exception("Expected exactly 1 event, found: " . count($events)); } - return $events[0]; + $event = $events[0]; + + $this->auditTrailGateway->insertAuditTrailRecord($event->id, + AuditTrailEntityType::CALENDAR_EVENT, + 'audit_event_created', + DateTimeHelpers::heskDate($heskSettings), + array(0 => $userContext->name . ' (' . $userContext->username . ')'), $heskSettings); + + return $event; } public function deleteEvent($id, $userContext, $heskSettings) { diff --git a/api/BusinessLogic/Tickets/AuditTrailEntityType.php b/api/BusinessLogic/Tickets/AuditTrailEntityType.php index feea16f6..dafcad42 100644 --- a/api/BusinessLogic/Tickets/AuditTrailEntityType.php +++ b/api/BusinessLogic/Tickets/AuditTrailEntityType.php @@ -5,4 +5,5 @@ namespace BusinessLogic\Tickets; class AuditTrailEntityType extends \BaseClass { const TICKET = 'TICKET'; + const CALENDAR_EVENT = 'CALENDAR_EVENT'; } \ No newline at end of file diff --git a/api/Controllers/Calendar/CalendarController.php b/api/Controllers/Calendar/CalendarController.php index 4b7ab9cd..0440f54a 100644 --- a/api/Controllers/Calendar/CalendarController.php +++ b/api/Controllers/Calendar/CalendarController.php @@ -69,6 +69,7 @@ class CalendarController extends \BaseClass { function post() { /* @var $userContext UserContext */ + /* @var $hesk_settings array */ global $applicationContext, $hesk_settings, $userContext; $json = JsonRetriever::getJsonData(); @@ -78,7 +79,7 @@ class CalendarController extends \BaseClass { /* @var $calendarHandler CalendarHandler */ $calendarHandler = $applicationContext->get(CalendarHandler::clazz()); - return output($calendarHandler->createEvent($event, $userContext, $hesk_settings)); + return output($calendarHandler->createEvent($event, $userContext, $hesk_settings), 201); } function put($id) { diff --git a/api/DataAccess/Calendar/CalendarGateway.php b/api/DataAccess/Calendar/CalendarGateway.php index 1693e23d..705651d0 100644 --- a/api/DataAccess/Calendar/CalendarGateway.php +++ b/api/DataAccess/Calendar/CalendarGateway.php @@ -10,6 +10,8 @@ use BusinessLogic\Calendar\SearchEventsFilter; use BusinessLogic\Calendar\TicketEvent; use BusinessLogic\Helpers; use BusinessLogic\Security\UserContext; +use BusinessLogic\Tickets\AuditTrail; +use BusinessLogic\Tickets\AuditTrailEntityType; use Core\Constants\Priority; use DataAccess\CommonDao; use DataAccess\Logging\LoggingGateway; @@ -73,6 +75,36 @@ class CalendarGateway extends CommonDao { $event->reminderValue = $row['reminder_value'] === null ? null : floatval($row['reminder_value']); $event->reminderUnits = $row['reminder_unit'] === null ? null : ReminderUnit::getByValue($row['reminder_unit']); + $auditTrailSql = "SELECT `at`.`id` AS `id`, `at`.`entity_id`, `at`.`language_key`, `at`.`date`, + `values`.`replacement_index`, `values`.`replacement_values` + FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "audit_trail` AS `at` + INNER JOIN `" . hesk_dbEscape($heskSettings['db_pfix']) . "audit_trail_to_replacement_values` AS `values` + ON `at`.`id` = `values`.`audit_trail_id` + WHERE `entity_id` = " . intval($event->id) . " + AND `entity_type` = '" . AuditTrailEntityType::CALENDAR_EVENT . "'"; + $auditTrailRs = hesk_dbFetchAssoc($auditTrailSql); + $auditTrailEntry = null; + while ($row = hesk_dbFetchAssoc($rs)) { + if ($auditTrailEntry == null || intval($auditTrailEntry['id']) !== intval($row['id'])) { + if ($auditTrailEntry !== null) { + //$audit_records[] = $auditTrailEntry; + } + + $auditTrailEntry = new AuditTrail(); + $auditTrailEntry->id = $row['id']; + $auditTrailEntry->entityId = $row['entity_id']; + $auditTrailEntry->entityType = AuditTrailEntityType::CALENDAR_EVENT; + $auditTrailEntry->languageKey = $row['language_key']; + $auditTrailEntry->date = $row['date']; + $auditTrailEntry->replacementValues = array(); + } + $auditTrailEntry->replacementValues[intval($row['replacement_index'])] = $row['replacement_value']; + } + + if ($auditTrailEntry !== null) { + //$event->auditTrail[] = $audiTrailEntry; + } + $events[] = $event; } diff --git a/language/en/text.php b/language/en/text.php index e55cd0e4..6f5e9838 100644 --- a/language/en/text.php +++ b/language/en/text.php @@ -2214,5 +2214,9 @@ $hesklang['audit_due_date_changed'] = '%s changed due date to %s'; $hesklang['audit_linked_ticket'] = '%s linked ticket %s to this ticket'; $hesklang['audit_unlinked_ticket'] = '%s unlinked ticket %s'; +// Added or modified in Mods for HESK 3.3.0 +$hesklang['audit_event_created'] = '%s created event'; +$hesklang['audit_event_updated'] = '%s updated event'; + // DO NOT CHANGE BELOW if (!defined('IN_SCRIPT')) die('PHP syntax OK!'); From ad63bcac0298a35c182cb87e168ba7f7e6a963b5 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Wed, 24 Jan 2018 13:01:23 -0500 Subject: [PATCH 39/74] Fixed a couple issues with the audit trail changes --- api/BusinessLogic/Calendar/CalendarEvent.php | 5 +++++ api/DataAccess/Calendar/CalendarGateway.php | 17 +++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/api/BusinessLogic/Calendar/CalendarEvent.php b/api/BusinessLogic/Calendar/CalendarEvent.php index 91a45761..967ae3ea 100644 --- a/api/BusinessLogic/Calendar/CalendarEvent.php +++ b/api/BusinessLogic/Calendar/CalendarEvent.php @@ -3,6 +3,8 @@ namespace BusinessLogic\Calendar; +use BusinessLogic\Tickets\AuditTrail; + class CalendarEvent extends AbstractEvent { public $type = 'CALENDAR'; @@ -18,4 +20,7 @@ class CalendarEvent extends AbstractEvent { public $reminderValue; public $reminderUnits; + + /* @var $auditTrail AuditTrail[] */ + public $auditTrail = array(); } \ No newline at end of file diff --git a/api/DataAccess/Calendar/CalendarGateway.php b/api/DataAccess/Calendar/CalendarGateway.php index 705651d0..3561631c 100644 --- a/api/DataAccess/Calendar/CalendarGateway.php +++ b/api/DataAccess/Calendar/CalendarGateway.php @@ -76,23 +76,24 @@ class CalendarGateway extends CommonDao { $event->reminderUnits = $row['reminder_unit'] === null ? null : ReminderUnit::getByValue($row['reminder_unit']); $auditTrailSql = "SELECT `at`.`id` AS `id`, `at`.`entity_id`, `at`.`language_key`, `at`.`date`, - `values`.`replacement_index`, `values`.`replacement_values` + `values`.`replacement_index`, `values`.`replacement_value` FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "audit_trail` AS `at` INNER JOIN `" . hesk_dbEscape($heskSettings['db_pfix']) . "audit_trail_to_replacement_values` AS `values` ON `at`.`id` = `values`.`audit_trail_id` WHERE `entity_id` = " . intval($event->id) . " AND `entity_type` = '" . AuditTrailEntityType::CALENDAR_EVENT . "'"; - $auditTrailRs = hesk_dbFetchAssoc($auditTrailSql); + $auditTrailRs = hesk_dbQuery($auditTrailSql); + /* @var $auditTrailEntry AuditTrail */ $auditTrailEntry = null; - while ($row = hesk_dbFetchAssoc($rs)) { - if ($auditTrailEntry == null || intval($auditTrailEntry['id']) !== intval($row['id'])) { + while ($row = hesk_dbFetchAssoc($auditTrailRs)) { + if ($auditTrailEntry == null || intval($auditTrailEntry->id) !== intval($row['id'])) { if ($auditTrailEntry !== null) { - //$audit_records[] = $auditTrailEntry; + $event->auditTrail[] = $auditTrailEntry; } $auditTrailEntry = new AuditTrail(); - $auditTrailEntry->id = $row['id']; - $auditTrailEntry->entityId = $row['entity_id']; + $auditTrailEntry->id = intval($row['id']); + $auditTrailEntry->entityId = intval($row['entity_id']); $auditTrailEntry->entityType = AuditTrailEntityType::CALENDAR_EVENT; $auditTrailEntry->languageKey = $row['language_key']; $auditTrailEntry->date = $row['date']; @@ -102,7 +103,7 @@ class CalendarGateway extends CommonDao { } if ($auditTrailEntry !== null) { - //$event->auditTrail[] = $audiTrailEntry; + $event->auditTrail[] = $auditTrailEntry; } $events[] = $event; From 401e335e5f976045a2c82e97977d48aad79ae8fe Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Wed, 24 Jan 2018 22:00:10 -0500 Subject: [PATCH 40/74] Adding history to modal --- admin/calendar.php | 299 ++++++++++++++++++++++++--------------------- 1 file changed, 163 insertions(+), 136 deletions(-) diff --git a/admin/calendar.php b/admin/calendar.php index 4fc81a57..b9be4bab 100644 --- a/admin/calendar.php +++ b/admin/calendar.php @@ -334,147 +334,174 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
    -
    -
    -
    - -
    - -
    -
    -
    -
    - -
    - -
    -
    -
    -
    - -
    - -
    -
    -
    -
    -
    -
    -
    -
    - -
    - - -
    - -
    -
    -
      - -
    • History [!]
      • + -
      +

      @@ -490,18 +490,12 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); - - + + - - - - - - +
      Date[!]Description[!]
      2018-01-24Description
      -

      Fill this in

      @@ -595,7 +589,9 @@ echo mfh_get_hidden_fields_for_language(array('error_loading_events', 'critical', 'high', 'medium', - 'low')); + 'low', + 'audit_event_created', + 'audit_event_updated')); ?>

      @@ -610,6 +606,12 @@ echo mfh_get_hidden_fields_for_language(array('error_loading_events', ?>

      + calendarGateway->updateEvent($calendarEvent, $userContext, $heskSettings); + $this->auditTrailGateway->insertAuditTrailRecord($calendarEvent->id, + AuditTrailEntityType::CALENDAR_EVENT, + 'audit_event_updated', + DateTimeHelpers::heskDate($heskSettings), + array(0 => $userContext->name . ' (' . $userContext->username . ')'), $heskSettings); + $eventFilter = new SearchEventsFilter(); $eventFilter->eventId = $calendarEvent->id; $eventFilter->reminderUserId = $userContext->id; @@ -45,12 +51,6 @@ class CalendarHandler extends \BaseClass { $event = $events[0]; - $this->auditTrailGateway->insertAuditTrailRecord($event->id, - AuditTrailEntityType::CALENDAR_EVENT, - 'audit_event_updated', - DateTimeHelpers::heskDate($heskSettings), - array(0 => $userContext->name . ' (' . $userContext->username . ')'), $heskSettings); - return $event; } diff --git a/api/DataAccess/Calendar/CalendarGateway.php b/api/DataAccess/Calendar/CalendarGateway.php index 3561631c..39c73c44 100644 --- a/api/DataAccess/Calendar/CalendarGateway.php +++ b/api/DataAccess/Calendar/CalendarGateway.php @@ -14,7 +14,6 @@ use BusinessLogic\Tickets\AuditTrail; use BusinessLogic\Tickets\AuditTrailEntityType; use Core\Constants\Priority; use DataAccess\CommonDao; -use DataAccess\Logging\LoggingGateway; class CalendarGateway extends CommonDao { /** diff --git a/inc/headerAdmin.inc.php b/inc/headerAdmin.inc.php index 3f7df57d..37976b7b 100644 --- a/inc/headerAdmin.inc.php +++ b/inc/headerAdmin.inc.php @@ -78,6 +78,7 @@ header('X-UA-Compatible: IE=edge'); + ' + fontIconMarkup: '', + auditTrail: dbObject.auditTrail }; } @@ -472,6 +474,24 @@ function displayEditModal(date) { $form.find('select[name="category"] option[value="' + date.categoryId + '"]').prop('selected', true); + var $auditTrail = $('#edit-history'); + if (date.auditTrail.length === 0) { + $('.nav-tabs[role="tablist"]').hide(); + } else { + $('.nav-tabs[role="tablist"]').show(); + + var $historyTable = $('#history-table'); + $historyTable.html(''); + $.each(date.auditTrail, function() { + var $template = $($('#audit-trail-template').html()); + $template.find('[data-property="date"]').text(this.date).end() + .find('[data-property="description"]').text(vsprintf(mfhLang.text(this.languageKey), this.replacementValues)); + + $historyTable.append($template); + }); + } + $('#edit-modal-tabs').find('a:first').tab('show'); + $('#edit-event-modal').modal('show'); } @@ -536,6 +556,7 @@ function respondToDragAndDrop(event, delta, revertFunc) { end += ' ' + event.end.format('HH:mm:ss'); } var data = { + id: event.id, title: event.title, location: event.location, startTime: start, @@ -557,8 +578,9 @@ function respondToDragAndDrop(event, delta, revertFunc) { 'X-Internal-Call': true, 'X-HTTP-Method-Override': 'PUT' }, - success: function() { - mfhAlert.success(mfhLang.text('event_updated')); + success: function(updatedEvent) { + removeFromCalendar(updatedEvent.id); + addToCalendar(updatedEvent.id, updatedEvent, $('#lang_event_updated').text()); }, error: function() { mfhAlert.error(mfhLang.text('error_updating_event')); diff --git a/js/sprintf.min.js b/js/sprintf.min.js new file mode 100644 index 00000000..11ea3642 --- /dev/null +++ b/js/sprintf.min.js @@ -0,0 +1,3 @@ +/*! sprintf-js v1.1.0 | Copyright (c) 2007-present, Alexandru Marasteanu | BSD-3-Clause */ +!function(e){"use strict";function t(){var e=arguments[0],r=t.cache;return r[e]||(r[e]=t.parse(e)),t.format.call(null,r[e],arguments)}function r(e){return"number"==typeof e?"number":"string"==typeof e?"string":Object.prototype.toString.call(e).slice(8,-1).toLowerCase()}function n(e,t){return t>=0&&t<=7&&i[e]?i[e][t]:Array(t+1).join(e)}var s={not_string:/[^s]/,not_bool:/[^t]/,not_type:/[^T]/,not_primitive:/[^v]/,number:/[diefg]/,numeric_arg:/[bcdiefguxX]/,json:/[j]/,not_json:/[^j]/,text:/^[^\x25]+/,modulo:/^\x25{2}/,placeholder:/^\x25(?:([1-9]\d*)\$|\(([^\)]+)\))?(\+)?(0|'[^$])?(-)?(\d+)?(?:\.(\d+))?([b-gijostTuvxX])/,key:/^([a-z_][a-z_\d]*)/i,key_access:/^\.([a-z_][a-z_\d]*)/i,index_access:/^\[(\d+)\]/,sign:/^[\+\-]/};t.format=function(e,a){var i,o,l,c,p,f,u,g=1,_=e.length,d="",b=[],h=!0,x="";for(o=0;o<_;o++)if("string"===(d=r(e[o])))b[b.length]=e[o];else if("array"===d){if(c=e[o],c[2])for(i=a[g],l=0;l=0),c[8]){case"b":i=parseInt(i,10).toString(2);break;case"c":i=String.fromCharCode(parseInt(i,10));break;case"d":case"i":i=parseInt(i,10);break;case"j":i=JSON.stringify(i,null,c[6]?parseInt(c[6]):0);break;case"e":i=c[7]?parseFloat(i).toExponential(c[7]):parseFloat(i).toExponential();break;case"f":i=c[7]?parseFloat(i).toFixed(c[7]):parseFloat(i);break;case"g":i=c[7]?parseFloat(i).toPrecision(c[7]):parseFloat(i);break;case"o":i=i.toString(8);break;case"s":i=String(i),i=c[7]?i.substring(0,c[7]):i;break;case"t":i=String(!!i),i=c[7]?i.substring(0,c[7]):i;break;case"T":i=r(i),i=c[7]?i.substring(0,c[7]):i;break;case"u":i=parseInt(i,10)>>>0;break;case"v":i=i.valueOf(),i=c[7]?i.substring(0,c[7]):i;break;case"x":i=parseInt(i,10).toString(16);break;case"X":i=parseInt(i,10).toString(16).toUpperCase()}s.json.test(c[8])?b[b.length]=i:(!s.number.test(c[8])||h&&!c[3]?x="":(x=h?"+":"-",i=i.toString().replace(s.sign,"")),f=c[4]?"0"===c[4]?"0":c[4].charAt(1):" ",u=c[6]-(x+i).length,p=c[6]&&u>0?n(f,u):"",b[b.length]=c[5]?x+i+p:"0"===f?x+p+i:p+x+i)}return b.join("")},t.cache=Object.create(null),t.parse=function(e){for(var t=e,r=[],n=[],a=0;t;){if(null!==(r=s.text.exec(t)))n[n.length]=r[0];else if(null!==(r=s.modulo.exec(t)))n[n.length]="%";else{if(null===(r=s.placeholder.exec(t)))throw new SyntaxError("[sprintf] unexpected placeholder");if(r[2]){a|=1;var i=[],o=r[2],l=[];if(null===(l=s.key.exec(o)))throw new SyntaxError("[sprintf] failed to parse named argument key");for(i[i.length]=l[1];""!==(o=o.substring(l[0].length));)if(null!==(l=s.key_access.exec(o)))i[i.length]=l[1];else{if(null===(l=s.index_access.exec(o)))throw new SyntaxError("[sprintf] failed to parse named argument key");i[i.length]=l[1]}r[2]=i}else a|=2;if(3===a)throw new Error("[sprintf] mixing positional and named placeholders is not (yet) supported");n[n.length]=r}t=t.substring(r[0].length)}return n};var a=function(e,r,n){return n=(r||[]).slice(0),n.splice(0,0,e),t.apply(null,n)},i={0:["","0","00","000","0000","00000","000000","0000000"]," ":[""," "," "," "," "," "," "," "],_:["","_","__","___","____","_____","______","_______"]};"undefined"!=typeof exports&&(exports.sprintf=t,exports.vsprintf=a),void 0!==e&&(e.sprintf=t,e.vsprintf=a,"function"==typeof define&&define.amd&&define(function(){return{sprintf:t,vsprintf:a}}))}("undefined"==typeof window?this:window); +//# sourceMappingURL=sprintf.min.js.map From 7c884582a24a879d70dc2a587e2894e1742eda3b Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Sun, 28 Jan 2018 22:05:09 -0500 Subject: [PATCH 42/74] Working on adding business hours to the calendar --- admin/admin_settings.php | 81 +++++++++++++++++++ install/database-validation.php | 2 + .../AddBusinessHoursTable.php | 16 ++++ 3 files changed, 99 insertions(+) create mode 100644 install/migrations/v330/CalendarImprovements/AddBusinessHoursTable.php diff --git a/admin/admin_settings.php b/admin/admin_settings.php index 8f9a5115..af7c7493 100644 --- a/admin/admin_settings.php +++ b/admin/admin_settings.php @@ -2220,6 +2220,87 @@ $modsForHesk_settings = mfh_getSettings();
    +
    + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
     SundayMondayTuesdayWednesdayThursdayFridaySaturday
    + From + + + + + + + + + + + + + + +
    + To + + + + + + + + + + + + + + +
    +
    +
    +
    diff --git a/install/database-validation.php b/install/database-validation.php index 4b2b14ef..cce19ef6 100644 --- a/install/database-validation.php +++ b/install/database-validation.php @@ -206,6 +206,8 @@ hesk_dbConnect(); $all_good &= run_column_check('categories', 'mfh_description'); $all_good &= run_column_check('custom_fields', 'mfh_description'); $all_good &= run_setting_check('migrationNumber'); + output_header_row('3.3.0'); + $all_good &= run_table_check('mfh_calendar_business_hours'); if ($all_good) { echo ""; diff --git a/install/migrations/v330/CalendarImprovements/AddBusinessHoursTable.php b/install/migrations/v330/CalendarImprovements/AddBusinessHoursTable.php new file mode 100644 index 00000000..90f881c5 --- /dev/null +++ b/install/migrations/v330/CalendarImprovements/AddBusinessHoursTable.php @@ -0,0 +1,16 @@ +executeQuery("CREATE TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "mfh_calendar_business_hours` + (`day_of_week` INT NOT NULL, `all_day` INT NOT NULL, + `start_time` VARCHAR(5) NOT NULL, `end_time` VARCHAR(5) NOT NULL)"); + } + + function innerDown($hesk_settings) { + $this->executeQuery("DROP TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "mfh_calendar_business_hours`"); + } +} \ No newline at end of file From 09b371036a6ea8a6a7b3ea5e0239698be2461298 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Mon, 29 Jan 2018 22:12:00 -0500 Subject: [PATCH 43/74] Business hours can be added to the calendar --- admin/admin_settings.php | 157 +++++++++--------- admin/admin_settings_save.php | 30 ++++ admin/calendar.php | 7 + calendar.php | 9 +- .../mods-for-hesk-calendar-admin-readonly.js | 37 +++++ .../mods-for-hesk-calendar-readonly.js | 37 +++++ js/calendar/mods-for-hesk-calendar.js | 37 +++++ language/en/text.php | 3 + 8 files changed, 239 insertions(+), 78 deletions(-) diff --git a/admin/admin_settings.php b/admin/admin_settings.php index af7c7493..1f055ddc 100644 --- a/admin/admin_settings.php +++ b/admin/admin_settings.php @@ -2220,85 +2220,88 @@ $modsForHesk_settings = mfh_getSettings();
    -
    -
    "; } else { echo ""; @@ -222,36 +277,50 @@ hesk_dbConnect(); 0; - - output_result('Setting Exists: ' . $setting_name, $all_good); - - return $all_good !== false; -} - -function run_table_check($table_name) { - return run_column_check($table_name, '1'); -} - -function run_column_check($table_name, $column_name) { - global $hesk_settings; - - if ($column_name == '1') { - $all_good = run_check('SELECT ' . $column_name . ' FROM `' . $hesk_settings['db_pfix'] . $table_name . '` LIMIT 1'); - - output_result('Table Exists: ' . $table_name, - $all_good); + if ($startingValidationNumber < $minimumValidationNumber) { + $checks = 'SKIPPED'; } else { - $all_good = run_check('SELECT `' . $column_name . '` FROM `' . $hesk_settings['db_pfix'] . $table_name . '` LIMIT 1'); - output_result('Column Exists: ' . $table_name . '.' . $column_name, - $all_good); + $res = run_check("SELECT 1 FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` WHERE `Key` = '{$setting_name}'"); + $checks = hesk_dbNumRows($res) > 0; } - return $all_good !== false; + output_result('Setting Exists: ' . $setting_name, $checks); + + return $checks !== false; +} + +function run_table_check($table_name, $minimumValidationNumber) { + + return run_column_check($table_name, '1', $minimumValidationNumber); +} + +function run_column_check($table_name, $column_name, $minimumValidationNumber) { + global $hesk_settings, $startingValidationNumber; + + if ($column_name == '1') { + if ($startingValidationNumber < $minimumValidationNumber) { + $checks = 'SKIPPED'; + } else { + $checks = run_check('SELECT ' . $column_name . ' FROM `' . $hesk_settings['db_pfix'] . $table_name . '` LIMIT 1'); + } + + output_result('Table Exists: ' . $table_name, + $checks); + } else { + if ($startingValidationNumber < $minimumValidationNumber) { + $checks = 'SKIPPED'; + } else { + $checks = run_check('SELECT `' . $column_name . '` FROM `' . $hesk_settings['db_pfix'] . $table_name . '` LIMIT 1'); + } + + output_result('Column Exists: ' . $table_name . '.' . $column_name, + $checks); + } + + return $checks !== false; } function run_check($sql) { @@ -263,23 +332,31 @@ function run_check($sql) { } $hesk_last_query = $sql; - return @mysqli_query($hesk_db_link, $sql); + return @mysqli_query($hesk_db_link, $sql) ? 'PASS' : 'FAIL'; } else { if (!$hesk_db_link && !hesk_dbConnect()) { return false; } $hesk_last_query = $sql; - return $res = @mysql_query($sql, $hesk_db_link); + return $res = @mysql_query($sql, $hesk_db_link) ? 'PASS' : 'FAIL'; } } -function output_result($change_title, $success) { - $css_color = 'success'; - $text = ' Success'; - if (!$success) { - $css_color = 'danger'; - $text = ' Failure'; +function output_result($change_title, $status) { + switch ($status) { + case 'PASS': + $css_color = 'success'; + $text = ' Success'; + break; + case 'FAIL': + $css_color = 'danger'; + $text = ' Failure'; + break; + case 'SKIPPED': + $css_color = 'default'; + $text = ' Skipped'; + break; } $formatted_text = sprintf('
    %s%s
    @@ -283,13 +321,13 @@ function run_setting_check($setting_name, $minimumValidationNumber) { if ($startingValidationNumber < $minimumValidationNumber) { $checks = 'SKIPPED'; } else { - $res = run_check("SELECT 1 FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` WHERE `Key` = '{$setting_name}'"); - $checks = hesk_dbNumRows($res) > 0; + $res = run_check("SELECT 1 FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` WHERE `Key` = '{$setting_name}'", false); + $checks = hesk_dbNumRows($res) > 0 ? 'PASS' : 'FAIL'; } output_result('Setting Exists: ' . $setting_name, $checks); - return $checks !== false; + return $checks; } function run_table_check($table_name, $minimumValidationNumber) { @@ -320,10 +358,10 @@ function run_column_check($table_name, $column_name, $minimumValidationNumber) { $checks); } - return $checks !== false; + return $checks; } -function run_check($sql) { +function run_check($sql, $returnString = true) { global $hesk_last_query; global $hesk_db_link; if (function_exists('mysqli_connect')) { @@ -332,14 +370,23 @@ function run_check($sql) { } $hesk_last_query = $sql; - return @mysqli_query($hesk_db_link, $sql) ? 'PASS' : 'FAIL'; + if ($returnString) { + return @mysqli_query($hesk_db_link, $sql) ? 'PASS' : 'FAIL'; + } else { + return @mysqli_query($hesk_db_link, $sql); + } + } else { if (!$hesk_db_link && !hesk_dbConnect()) { return false; } $hesk_last_query = $sql; - return $res = @mysql_query($sql, $hesk_db_link) ? 'PASS' : 'FAIL'; + if ($returnString) { + return $res = @mysql_query($sql, $hesk_db_link) ? 'PASS' : 'FAIL'; + } else { + return $res = @mysql_query($sql, $hesk_db_link); + } } } @@ -355,8 +402,11 @@ function output_result($change_title, $status) { break; case 'SKIPPED': $css_color = 'default'; - $text = ' Skipped'; + $text = ' Skipped'; break; + default: + $css_color = 'danger'; + $text = 'WTF?! ' . $status; } $formatted_text = sprintf('%s%s', $change_title, $css_color, $text); diff --git a/install/index.php b/install/index.php index a669070e..699e5c9b 100644 --- a/install/index.php +++ b/install/index.php @@ -100,7 +100,7 @@ if (HESK_NEW_VERSION != $hesk_settings['hesk_version']) {
    -

    You need to be running HESK 2.7.3 to install Mods for HESK. You currently have HESK .

    +

    You need to be running HESK to install Mods for HESK. You currently have HESK .

    @@ -201,19 +213,33 @@ function createEditModal($template, $features, $categories)
    - + + '; + elseif (strpos($_SESSION['heskprivileges'], $feature) !== false): ?>
    -
    - +
    From 4bd4eec53d2b02eb37b06fa9383d3ea8a9b31ae0 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Tue, 6 Feb 2018 22:04:16 -0500 Subject: [PATCH 58/74] Starting on fixing permission group creation/edit abilities --- admin/manage_permission_groups.php | 77 ++++++++++++++++-------------- language/en/text.php | 1 + 2 files changed, 42 insertions(+), 36 deletions(-) diff --git a/admin/manage_permission_groups.php b/admin/manage_permission_groups.php index 1e397e29..4220ea3d 100644 --- a/admin/manage_permission_groups.php +++ b/admin/manage_permission_groups.php @@ -137,11 +137,9 @@ function createEditModal($template, $features, $categories) { global $hesklang; - $disabled = 'checked="checked" disabled'; $enabledFeatures = array(); $enabledCategories = array(); - if ($template['heskprivileges'] != 'ALL') { - $disabled = ''; + if ($template['heskprivileges'] !== 'ALL') { $enabledFeatures = explode(',', $template['heskprivileges']); $enabledCategories = explode(',', $template['categories']); } @@ -157,6 +155,12 @@ function createEditModal($template, $features, $categories)

    + +
    + + +
    +
    @@ -179,32 +183,32 @@ function createEditModal($template, $features, $categories)
    - + + + +
    - +
    @@ -214,22 +218,20 @@ function createEditModal($template, $features, $categories)
    '; - elseif (strpos($_SESSION['heskprivileges'], $feature) !== false): ?> + if (strpos($_SESSION['heskprivileges'], $feature) !== false || $checked): ?>
    + endforeach; ?>
    @@ -296,7 +297,9 @@ function buildCreateModal($features, $categories)
    - +
    - +
    @@ -315,7 +318,9 @@ function buildCreateModal($features, $categories)
    - +
    - +
    diff --git a/language/en/text.php b/language/en/text.php index 0de8b91c..a994fc6c 100644 --- a/language/en/text.php +++ b/language/en/text.php @@ -2238,6 +2238,7 @@ $hesklang['show_event_start_time_help'] = 'Always show the start time on event t $hesklang['highlight_ticket_rows_based_on_priority'] = 'Highlight ticket rows based on priority'; $hesklang['highlight_ticket_rows_based_on_priority_help'] = 'If enabled, each ticket on the tickets page will be highlighted based on priority. If disabled, only * Critical * and High priority tickets will be highlighted.'; $hesklang['highlight_ticket_rows_based_on_priority_descr'] = 'Highlight all ticket rows based on priority'; +$hesklang['protected_group'] = 'This is a protected group; you cannot change accessible categories / features.'; // DO NOT CHANGE BELOW if (!defined('IN_SCRIPT')) die('PHP syntax OK!'); From 48b28fc3cdfdcb7d27ce39c2599a3947d66a5397 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Wed, 7 Feb 2018 22:03:55 -0500 Subject: [PATCH 59/74] Only modify permissions the user has access to --- admin/manage_permission_groups.php | 36 +++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/admin/manage_permission_groups.php b/admin/manage_permission_groups.php index 4220ea3d..9eb410a0 100644 --- a/admin/manage_permission_groups.php +++ b/admin/manage_permission_groups.php @@ -365,7 +365,6 @@ function save() WHERE `id` = " . intval($templateId)); $row = hesk_dbFetchAssoc($res); - // Add 'can ban emails' if 'can unban emails' is set (but not added). Same with 'can ban ips' $catArray = hesk_POST_array('categories'); $featArray = hesk_POST_array('features'); @@ -380,6 +379,41 @@ function save() $features = implode(',', $featArray); $name = hesk_POST('name'); + // Only allow users to add what they are allowed to add + // Admins can handle anything + if (!$_SESSION['isadmin']) { + // Update categories based on user visibility + $originalCategories = explode(',', $row['categories']); + $newCategories = array(); + foreach ($originalCategories as $innerCategory) { + if (in_array($innerCategory, $catArray) && in_array($innerCategory, $_SESSION['categories'])) { + $newCategories[] = $innerCategory; + } elseif (!in_array($innerCategory, $catArray) && !in_array($innerCategory, $_SESSION['categories'])) { + // The user can't modify this, so keep it in + $newCategories[] = $innerCategory; + } + // If neither, the user removed it. + } + + // Update features based on user visibility + $originalFeatures = explode(',', $row['features']); + $newFeatures = array(); + foreach ($originalFeatures as $innerFeature) { + if (in_array($innerFeature, $featArray) && strpos($_SESSION['heskprivileges'], $innerFeature) !== false) { + $newFeatures[] = $innerFeature; + } elseif (!in_array($innerFeature, $featArray) && strpos($_SESSION['heskprivileges'], $innerFeature) === false) { + // The user can't modify this, so keep it in + $newFeatures[] = $innerFeature; + } + // If neither, the user removed it. + } + + $categories = implode(',', $newCategories); + $features = implode(',', $newFeatures); + } + + + hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "permission_templates` SET `categories` = '" . hesk_dbEscape($categories) . "', `heskprivileges` = '" . hesk_dbEscape($features) . "', `name` = '" . hesk_dbEscape($name) . "' From 35ed664dfdef0ea48600b134a8030c08196a35d4 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Sun, 11 Feb 2018 22:00:44 -0500 Subject: [PATCH 60/74] Only allow users to modify permissions that they have access to --- admin/manage_permission_groups.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/admin/manage_permission_groups.php b/admin/manage_permission_groups.php index 9eb410a0..9b9449ac 100644 --- a/admin/manage_permission_groups.php +++ b/admin/manage_permission_groups.php @@ -198,7 +198,7 @@ function createEditModal($template, $features, $categories) $disabled = ' disabled'; }?> - +