From d5a9d225f219b013cdfc512072f2ab57a2d5a74b Mon Sep 17 00:00:00 2001 From: Skylar Ittner Date: Sun, 30 Jul 2017 01:15:27 +0000 Subject: [PATCH 001/248] Fix bootstrap-theme not disabling on Firefox --- inc/header.inc.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/inc/header.inc.php b/inc/header.inc.php index 192e1580..f459df6c 100644 --- a/inc/header.inc.php +++ b/inc/header.inc.php @@ -55,10 +55,10 @@ if (is_dir(HESK_PATH . 'install')) { + > + rel="stylesheet" /> + Date: Sun, 30 Jul 2017 01:21:26 +0000 Subject: [PATCH 002/248] Swap == for != --- inc/header.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/header.inc.php b/inc/header.inc.php index f459df6c..ca27118b 100644 --- a/inc/header.inc.php +++ b/inc/header.inc.php @@ -55,7 +55,7 @@ if (is_dir(HESK_PATH . 'install')) { - + From 68308b02a5dc20de4bfa390f68197fead7aa8328 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Sat, 29 Jul 2017 21:57:29 -0400 Subject: [PATCH 003/248] Some sort of progress on category endpoint --- .../Categories/CategoryHandler.php | 28 ++++++++++++++ .../Categories/CategoryController.php | 15 ++++++++ api/DataAccess/Categories/CategoryGateway.php | 19 ++++++++++ .../Categories/CategoryHandlerTest.php | 37 +++++++++++++++++++ 4 files changed, 99 insertions(+) create mode 100644 api/BusinessLogic/Categories/CategoryHandler.php create mode 100644 api/Tests/BusinessLogic/Categories/CategoryHandlerTest.php diff --git a/api/BusinessLogic/Categories/CategoryHandler.php b/api/BusinessLogic/Categories/CategoryHandler.php new file mode 100644 index 00000000..ca315998 --- /dev/null +++ b/api/BusinessLogic/Categories/CategoryHandler.php @@ -0,0 +1,28 @@ +categoryGateway = $categoryGateway; + } + + /** + * @param $category Category + * @param $heskSettings array + */ + function createCategory($category, $heskSettings) { + $this->categoryGateway->createCategory($category, $heskSettings); + } + + function editCategory($category, $heskSettings) { + + + } +} \ No newline at end of file diff --git a/api/Controllers/Categories/CategoryController.php b/api/Controllers/Categories/CategoryController.php index e376afef..bb729ca7 100644 --- a/api/Controllers/Categories/CategoryController.php +++ b/api/Controllers/Categories/CategoryController.php @@ -4,6 +4,7 @@ namespace Controllers\Categories; use BusinessLogic\Categories\CategoryRetriever; use BusinessLogic\Exceptions\ApiFriendlyException; +use Controllers\JsonRetriever; class CategoryController { function get($id) { @@ -28,4 +29,18 @@ class CategoryController { return $categoryRetriever->getAllCategories($hesk_settings, $userContext); } + + function post() { + //-- TODO: Create Category + $data = JsonRetriever::getJsonData(); + + } + + function put($id) { + //-- TODO: Edit category + } + + function delete($id) { + //-- TODO: Delete category + } } \ No newline at end of file diff --git a/api/DataAccess/Categories/CategoryGateway.php b/api/DataAccess/Categories/CategoryGateway.php index 4fd35c7b..fde6f824 100644 --- a/api/DataAccess/Categories/CategoryGateway.php +++ b/api/DataAccess/Categories/CategoryGateway.php @@ -40,4 +40,23 @@ class CategoryGateway extends CommonDao { return $results; } + + /** + * @param $category Category + * @param $heskSettings array + */ + function createCategory($category, $heskSettings) { + $this->init(); + + $sql = "INSERT INTO `" . hesk_dbEscape($heskSettings['db_pfix']) . "categories` () + VALUES ()"; + + $this->close(); + } + + function updateCategory($category, $heskSettings) { + $this->init(); + + $this->close(); + } } \ No newline at end of file diff --git a/api/Tests/BusinessLogic/Categories/CategoryHandlerTest.php b/api/Tests/BusinessLogic/Categories/CategoryHandlerTest.php new file mode 100644 index 00000000..32b5f99c --- /dev/null +++ b/api/Tests/BusinessLogic/Categories/CategoryHandlerTest.php @@ -0,0 +1,37 @@ +categoryGateway = $this->createMock(CategoryGateway::class); + + $this->categoryHandler = new CategoryHandler($this->categoryGateway); + $this->heskSettings = array(); + } + + function testCreateCallsTheGatewayWithTheCategory() { + //-- Arrange + $category = new Category(); + + //-- Assert + $this->categoryGateway->expects($this->once())->method('createCategory')->with($category, $this->heskSettings); + + //-- Act + $this->categoryHandler->createCategory($category, $this->heskSettings); + } +} From 4db151de66b88cd523148e7c11614c56133797b9 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Sun, 30 Jul 2017 14:52:03 -0400 Subject: [PATCH 004/248] Disable AutoTLS for PHPMailer --- api/BusinessLogic/Emails/BasicEmailSender.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/api/BusinessLogic/Emails/BasicEmailSender.php b/api/BusinessLogic/Emails/BasicEmailSender.php index 058ef937..fd6cecfe 100644 --- a/api/BusinessLogic/Emails/BasicEmailSender.php +++ b/api/BusinessLogic/Emails/BasicEmailSender.php @@ -15,6 +15,10 @@ class BasicEmailSender implements EmailSender { if ($heskSettings['smtp']) { $mailer->isSMTP(); $mailer->SMTPAuth = true; + + //-- We'll set this explicitly below if the user has it enabled. + $mailer->SMTPAutoTLS = false; + if ($heskSettings['smtp_ssl']) { $mailer->SMTPSecure = "ssl"; } elseif ($heskSettings['smtp_tls']) { From 84f491bd40e9fc2bd04ee1c18578924a6eb91c54 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Sun, 30 Jul 2017 15:05:53 -0400 Subject: [PATCH 005/248] Don't fail resending email when there is no owner --- api/BusinessLogic/Emails/EmailTemplateParser.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/api/BusinessLogic/Emails/EmailTemplateParser.php b/api/BusinessLogic/Emails/EmailTemplateParser.php index 4fbc3e65..e53a03b2 100644 --- a/api/BusinessLogic/Emails/EmailTemplateParser.php +++ b/api/BusinessLogic/Emails/EmailTemplateParser.php @@ -190,7 +190,9 @@ class EmailTemplateParser { $defaultStatus = $this->statusGateway->getStatusForDefaultAction(DefaultStatusForAction::NEW_TICKET, $heskSettings); $statusName = hesk_msgToPlain($defaultStatus->localizedNames[$language]); $category = hesk_msgToPlain($this->categoryGateway->getAllCategories($heskSettings)[$ticket->categoryId]->name); - $owner = hesk_msgToPlain($this->userGateway->getUserById($ticket->ownerId, $heskSettings)->name); + $owner = $this->userGateway->getUserById($ticket->ownerId, $heskSettings); + + $ownerName = $owner === null ? $hesklang['unas'] : hesk_msgToPlain($owner->name); switch ($ticket->priorityId) { case Priority::CRITICAL: @@ -219,7 +221,7 @@ class EmailTemplateParser { $msg = str_replace('%%SITE_URL%%', $heskSettings['site_url'], $msg); $msg = str_replace('%%CATEGORY%%', $category, $msg); $msg = str_replace('%%PRIORITY%%', $priority, $msg); - $msg = str_replace('%%OWNER%%', $owner, $msg); + $msg = str_replace('%%OWNER%%', $ownerName, $msg); $msg = str_replace('%%STATUS%%', $statusName, $msg); $msg = str_replace('%%EMAIL%%', implode(';',$ticket->email), $msg); $msg = str_replace('%%CREATED%%', $ticket->dateCreated, $msg); From 73b3a01bc0470bf38ef80a552ca13d8f8e202bc6 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Thu, 10 Aug 2017 21:51:59 -0400 Subject: [PATCH 006/248] Version checks are now asynchronous --- admin/admin_settings.php | 299 ++++++------------ .../System/HeskVersionController.php | 56 ++++ api/index.php | 82 +++-- 3 files changed, 218 insertions(+), 219 deletions(-) create mode 100644 api/Controllers/System/HeskVersionController.php diff --git a/admin/admin_settings.php b/admin/admin_settings.php index 6f686d97..fcf24ec4 100644 --- a/admin/admin_settings.php +++ b/admin/admin_settings.php @@ -355,86 +355,121 @@ $modsForHesk_settings = mfh_getSettings(); : - - + - ' . $hesklang['hud'] . ' '; - } elseif ($latest != -1) { - // Is this a beta/dev version? - if (strpos($hesk_settings['hesk_version'], 'beta') || strpos($hesk_settings['hesk_version'], 'dev') || strpos($hesk_settings['hesk_version'], 'RC')) { - echo ' ' . $hesklang['beta'] . ' '; ?> ' . $hesklang['hnw'] . ' '; ?> - - + - + + + + + + + + + - + target="_blank"> + : - - + - ' . $hesklang['beta'] . ' '; ?> ' . $hesklang['mfh_up_to_date'] . ''; - } else { - ?> - - - + - + + + + + + + + - - + + @@ -3935,130 +3970,6 @@ $modsForHesk_settings = mfh_getSettings(); } - function hesk_checkVersion() - { - global $hesk_settings; - - if ($latest = hesk_getLatestVersion()) { - if (strlen($latest) > 12) { - return -1; - } elseif ($latest == $hesk_settings['hesk_version']) { - return true; - } else { - return $latest; - } - } else { - return -1; - } - - } // END hesk_checkVersion() - - - function hesk_getLatestVersion() - { - global $hesk_settings; - - // Do we have a cached version file? - if (file_exists(HESK_PATH . $hesk_settings['cache_dir'] . '/__latest.txt')) { - if (preg_match('/^(\d+)\|([\d.]+)+$/', @file_get_contents(HESK_PATH . $hesk_settings['cache_dir'] . '/__latest.txt'), $matches) && (time() - intval($matches[1])) < 3600) { - return $matches[2]; - } - } - - // No cached file or older than 3600 seconds, try to get an update - $hesk_version_url = 'https://hesk.com/version'; - - // Try using cURL - if (function_exists('curl_init')) { - $ch = curl_init(); - curl_setopt($ch, CURLOPT_URL, $hesk_version_url); - curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); - curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 6); - $latest = curl_exec($ch); - curl_close($ch); - return hesk_cacheLatestVersion($latest); - } - - // Try using a simple PHP function instead - if ($latest = @file_get_contents($hesk_version_url)) { - return hesk_cacheLatestVersion($latest); - } - - // Can't check automatically, will need a manual check - return false; - - } // END hesk_getLatestVersion() - - function hesk_cacheLatestVersion($latest) - { - global $hesk_settings; - - @file_put_contents(HESK_PATH . $hesk_settings['cache_dir'] . '/__latest.txt', time() . '|' . $latest); - - return $latest; - - } // END hesk_cacheLatestVersion() - - function hesk_checkMfhVersion($currentVersion) - { - if ($latest = hesk_getMfhLatestVersion()) { - if (strlen($latest) > 12) { - return -1; - } elseif ($latest == $currentVersion) { - return true; - } else { - return $latest; - } - } else { - return -1; - } - } - - function hesk_getMfhLatestVersion() - { - global $hesk_settings; - - // Do we have a cached version file? - if (file_exists(HESK_PATH . $hesk_settings['cache_dir'] . '/__latest-mfh.txt')) { - if (preg_match('/^(\d+)\|([\d.]+)+$/', @file_get_contents(HESK_PATH . $hesk_settings['cache_dir'] . '/__latest-mfh.txt'), $matches) && (time() - intval($matches[1])) < 3600) { - return $matches[2]; - } - } - - // No cached file or older than 3600 seconds, try to get an update - $hesk_version_url = 'http://mods-for-hesk.mkochcs.com/latestversion.php'; - - // Try using cURL - if (function_exists('curl_init')) { - $ch = curl_init(); - curl_setopt($ch, CURLOPT_URL, $hesk_version_url); - curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); - curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 6); - $latest = curl_exec($ch); - curl_close($ch); - return hesk_cacheMfhLatestVersion($latest); - } - - // Try using a simple PHP function instead - if ($latest = file_get_contents($hesk_version_url)) { - return hesk_cacheMfhLatestVersion($latest); - } - - // Can't check automatically, will need a manual check - return false; - } - - function hesk_cacheMfhLatestVersion($latest) - { - global $hesk_settings; - - @file_put_contents(HESK_PATH . $hesk_settings['cache_dir'] . '/__latest-mfh.txt', time() . '|' . $latest); - - return $latest; - - } - - function hesk_testLanguage($return_options = 0) { global $hesk_settings, $hesklang, $modsForHesk_settings; diff --git a/api/Controllers/System/HeskVersionController.php b/api/Controllers/System/HeskVersionController.php new file mode 100644 index 00000000..c07122ed --- /dev/null +++ b/api/Controllers/System/HeskVersionController.php @@ -0,0 +1,56 @@ + $matches[2])); + } + + // Try using cURL + if (function_exists('curl_init')) { + $ch = curl_init(); + curl_setopt($ch, CURLOPT_URL, $url); + curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); + curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 6); + $latest = curl_exec($ch); + curl_close($ch); + + self::cacheLatestVersion($latest, $fileName, $hesk_settings); + + return output(array('version' => $latest)); + } + + // Try using a simple PHP function instead + if ($latest = @file_get_contents($url)) { + self::cacheLatestVersion($latest, $fileName, $hesk_settings); + + return output(array('version' => $latest)); + } + + // Can't check automatically, will need a manual check + return http_response_code(408); + } + + private static function cacheLatestVersion($latest, $fileName, $hesk_settings) { + @file_put_contents(__DIR__ . '/../../../' . $hesk_settings['cache_dir'] . '/' . $fileName, + time() . '|' . $latest); + } +} \ No newline at end of file diff --git a/api/index.php b/api/index.php index 672bbf8b..63879505 100644 --- a/api/index.php +++ b/api/index.php @@ -15,26 +15,37 @@ function handle404() { ), 404); } -function before() { - if (defined('HESK_DEMO') && $_SERVER['REQUEST_METHOD'] !== 'GET') { +function globalBefore() { + if (defined('HESK_DEMO') && $_SERVER['REQUEST_METHOD'] === 'GET') { print_error('Demo Mode', 'Only read-only commands are available in demo mode!', null, 401); die(); } +} +function internalHandler() { + buildUserContextFromSession(); +} + +function authTokenHandler() { + assertApiIsEnabled(); + $token = \BusinessLogic\Helpers::getHeader('X-AUTH-TOKEN'); + buildUserContext($token); +} + +function internalOrAuthHandler() { $internalUse = \BusinessLogic\Helpers::getHeader('X-INTERNAL-CALL'); if ($internalUse === 'true') { - buildUserContextFromSession(); - } elseif (preg_match('/\/v1\/tickets\/.+\/attachments\/\d+/', $_SERVER['PATH_INFO'])) { - //-- TODO Clean this up - return; + internalHandler(); } else { - assertApiIsEnabled(); - $token = \BusinessLogic\Helpers::getHeader('X-AUTH-TOKEN'); - buildUserContext($token); + authTokenHandler(); } } +function publicHandler() { + //-- No-op +} + function assertApiIsEnabled() { global $applicationContext, $hesk_settings; @@ -172,34 +183,55 @@ function fatalErrorShutdownHandler() { } } -Link::before('before'); +Link::before('globalBefore'); Link::all(array( // Categories - '/v1/categories' => [\Controllers\Categories\CategoryController::class . '::printAllCategories'], - '/v1/categories/{i}' => \Controllers\Categories\CategoryController::class, + '/v1/categories' => action(\Controllers\Categories\CategoryController::class . '::printAllCategories'), + '/v1/categories/{i}' => action(\Controllers\Categories\CategoryController::class), // Tickets - '/v1/tickets' => \Controllers\Tickets\CustomerTicketController::class, + '/v1/tickets' => action(\Controllers\Tickets\CustomerTicketController::class), // Tickets - Staff - '/v1/staff/tickets/{i}' => \Controllers\Tickets\StaffTicketController::class, + '/v1/staff/tickets/{i}' => action(\Controllers\Tickets\StaffTicketController::class), // Attachments - '/v1/tickets/{a}/attachments/{i}' => \Controllers\Attachments\PublicAttachmentController::class . '::getRaw', - '/v1/staff/tickets/{i}/attachments' => \Controllers\Attachments\StaffTicketAttachmentsController::class, - '/v1/staff/tickets/{i}/attachments/{i}' => \Controllers\Attachments\StaffTicketAttachmentsController::class, + '/v1/tickets/{a}/attachments/{i}' => action(\Controllers\Attachments\PublicAttachmentController::class . '::getRaw'), + '/v1/staff/tickets/{i}/attachments' => action(\Controllers\Attachments\StaffTicketAttachmentsController::class), + '/v1/staff/tickets/{i}/attachments/{i}' => action(\Controllers\Attachments\StaffTicketAttachmentsController::class), // Statuses - '/v1/statuses' => \Controllers\Statuses\StatusController::class, + '/v1/statuses' => action(\Controllers\Statuses\StatusController::class), // Settings - '/v1/settings' => \Controllers\Settings\SettingsController::class, + '/v1/settings' => action(\Controllers\Settings\SettingsController::class), /* Internal use only routes */ // Resend email response - '/v1-internal/staff/tickets/{i}/resend-email' => \Controllers\Tickets\ResendTicketEmailToCustomerController::class, + '/v1-internal/staff/tickets/{i}/resend-email' => + action(\Controllers\Tickets\ResendTicketEmailToCustomerController::class, SecurityHandler::INTERNAL), // Custom Navigation - '/v1-internal/custom-navigation/all' => \Controllers\Navigation\CustomNavElementController::class . '::getAll', - '/v1-internal/custom-navigation' => \Controllers\Navigation\CustomNavElementController::class, - '/v1-internal/custom-navigation/{i}' => \Controllers\Navigation\CustomNavElementController::class, - '/v1-internal/custom-navigation/{i}/sort/{s}' => \Controllers\Navigation\CustomNavElementController::class . '::sort', + '/v1-internal/custom-navigation/all' => + action(\Controllers\Navigation\CustomNavElementController::class . '::getAll', SecurityHandler::INTERNAL), + '/v1-internal/custom-navigation' => + action(\Controllers\Navigation\CustomNavElementController::class, SecurityHandler::INTERNAL), + '/v1-internal/custom-navigation/{i}' => + action(\Controllers\Navigation\CustomNavElementController::class, SecurityHandler::INTERNAL), + '/v1-internal/custom-navigation/{i}/sort/{s}' => + action(\Controllers\Navigation\CustomNavElementController::class . '::sort', SecurityHandler::INTERNAL), + + '/v1-public/hesk-version' => + action(\Controllers\System\HeskVersionController::class . '::getHeskVersion', SecurityHandler::OPEN), + '/v1-public/mods-for-hesk-version' => + action(\Controllers\System\HeskVersionController::class . '::getModsForHeskVersion', SecurityHandler::OPEN), // Any URL that doesn't match goes to the 404 handler '404' => 'handle404' -)); \ No newline at end of file +)); + +function action($class, $securityHandler = SecurityHandler::AUTH_TOKEN) { + return [$class, $class, $securityHandler]; +} + +class SecurityHandler { + const OPEN = 'publicHandler'; + const INTERNAL = 'internalHandler'; + const AUTH_TOKEN = 'authTokenHandler'; + const INTERNAL_OR_AUTH_TOKEN = 'internalOrAuthHandler'; +} \ No newline at end of file From 65576d5c4333464102d272c70798f850a8846b50 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Sat, 12 Aug 2017 21:41:41 -0400 Subject: [PATCH 007/248] Fix document type on IE intranet pages --- inc/header.inc.php | 1 + inc/headerAdmin.inc.php | 2 ++ 2 files changed, 3 insertions(+) diff --git a/inc/header.inc.php b/inc/header.inc.php index ca27118b..f35f50fa 100644 --- a/inc/header.inc.php +++ b/inc/header.inc.php @@ -43,6 +43,7 @@ if (is_dir(HESK_PATH . 'install')) { $modsForHesk_settings = mfh_getSettings(); } +header('X-UA-Compatible: IE=edge'); ?> diff --git a/inc/headerAdmin.inc.php b/inc/headerAdmin.inc.php index ce2f0f1d..20501baa 100644 --- a/inc/headerAdmin.inc.php +++ b/inc/headerAdmin.inc.php @@ -21,6 +21,8 @@ if (!defined('IN_SCRIPT')) { define('ADMIN_PAGE', true); $modsForHesk_settings = mfh_getSettings(); + +header('X-UA-Compatible: IE=edge'); ?> From c60d2ed8662b9224fd6ee77935afafc7dc3ed289 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Sat, 12 Aug 2017 21:57:41 -0400 Subject: [PATCH 008/248] Update installer --- install/install_functions.inc.php | 2 +- install/mods-for-hesk/ajax/install-database-ajax.php | 2 ++ install/mods-for-hesk/installModsForHesk.php | 1 + install/mods-for-hesk/js/version-scripts.js | 3 +++ install/mods-for-hesk/modsForHesk.php | 1 + install/mods-for-hesk/sql/installSql.php | 7 +++++++ 6 files changed, 15 insertions(+), 1 deletion(-) diff --git a/install/install_functions.inc.php b/install/install_functions.inc.php index 864e6dc8..a498ab67 100644 --- a/install/install_functions.inc.php +++ b/install/install_functions.inc.php @@ -16,7 +16,7 @@ if (!defined('IN_SCRIPT')) {die('Invalid attempt');} // We will be installing this HESK version: define('HESK_NEW_VERSION','2.7.3'); -define('MODS_FOR_HESK_NEW_VERSION','3.1.0'); +define('MODS_FOR_HESK_NEW_VERSION','3.1.1'); define('REQUIRE_PHP_VERSION','5.3.0'); define('REQUIRE_MYSQL_VERSION','5.0.7'); diff --git a/install/mods-for-hesk/ajax/install-database-ajax.php b/install/mods-for-hesk/ajax/install-database-ajax.php index e28169ec..77aed493 100644 --- a/install/mods-for-hesk/ajax/install-database-ajax.php +++ b/install/mods-for-hesk/ajax/install-database-ajax.php @@ -90,6 +90,8 @@ if ($version == 2) { execute307Scripts(); } elseif ($version == 42) { execute310Scripts(); +} elseif ($version == 43) { + execute311Scripts(); } else { $response = 'The version "' . $version . '" was not recognized. Check the value submitted and try again.'; print $response; diff --git a/install/mods-for-hesk/installModsForHesk.php b/install/mods-for-hesk/installModsForHesk.php index cc89aaf4..cae36a82 100644 --- a/install/mods-for-hesk/installModsForHesk.php +++ b/install/mods-for-hesk/installModsForHesk.php @@ -51,6 +51,7 @@ $buildToVersionMap = array( 40 => '3.0.6', 41 => '3.0.7', 42 => '3.1.0', + 43 => '3.1.1', ); function echoInitialVersionRows($version, $build_to_version_map) diff --git a/install/mods-for-hesk/js/version-scripts.js b/install/mods-for-hesk/js/version-scripts.js index 68a83e12..a7a9d1fc 100644 --- a/install/mods-for-hesk/js/version-scripts.js +++ b/install/mods-for-hesk/js/version-scripts.js @@ -122,6 +122,9 @@ function processUpdates(startingVersion) { } else if (startingVersion < 42) { startVersionUpgrade('310'); executeUpdate(42, '310', '3.1.0'); + } else if (startingVersion < 43) { + startVersionUpgrade('311'); + executeUpdate(43, '311', '3.1.1'); } else { installationFinished(); } diff --git a/install/mods-for-hesk/modsForHesk.php b/install/mods-for-hesk/modsForHesk.php index 386a53ff..4496bc49 100644 --- a/install/mods-for-hesk/modsForHesk.php +++ b/install/mods-for-hesk/modsForHesk.php @@ -118,6 +118,7 @@ hesk_dbConnect(); buildCategoryFromJson($data); - $category->id = $id; + $category->id = intval($id); /* @var $categoryHandler CategoryHandler */ $categoryHandler = $applicationContext->get[CategoryHandler::class]; diff --git a/api/index.php b/api/index.php index 25b77ee3..ffaf590d 100644 --- a/api/index.php +++ b/api/index.php @@ -188,8 +188,8 @@ Link::before('globalBefore'); Link::all(array( // Categories '/v1/categories/all' => action(\Controllers\Categories\CategoryController::class . '::printAllCategories', [RequestMethod::GET], SecurityHandler::INTERNAL_OR_AUTH_TOKEN), - '/v1/categories' => action(\Controllers\Categories\CategoryController::class, [RequestMethod::POST]), - '/v1/categories/{i}' => action(\Controllers\Categories\CategoryController::class, [RequestMethod::GET, RequestMethod::PUT, RequestMethod::DELETE]), + '/v1/categories' => action(\Controllers\Categories\CategoryController::class, [RequestMethod::POST], SecurityHandler::INTERNAL_OR_AUTH_TOKEN), + '/v1/categories/{i}' => action(\Controllers\Categories\CategoryController::class, [RequestMethod::GET, RequestMethod::PUT, RequestMethod::DELETE], SecurityHandler::INTERNAL_OR_AUTH_TOKEN), // Tickets '/v1/tickets' => action(\Controllers\Tickets\CustomerTicketController::class), // Tickets - Staff diff --git a/internal-api/js/manage-categories.js b/internal-api/js/manage-categories.js index a7716ad7..077eb423 100644 --- a/internal-api/js/manage-categories.js +++ b/internal-api/js/manage-categories.js @@ -62,9 +62,10 @@ function loadTable() { // Low $priority.text(mfhLang.text('low')).addClass('normal'); } + var linkPattern = $('input[name="show-tickets-path"]').val(); $template.find('a[data-property="number-of-tickets"]') .text(this.numberOfTickets) - .attr('href', '#' + this.numberOfTickets); + .attr('href', linkPattern.replace('{0}', this.id)); var percentText = mfhLang.text('perat'); var percentage = Math.round(this.numberOfTickets / totalNumberOfTickets * 100); $template.find('div.progress').attr('title', percentText.replace('%s', percentage + '%')); @@ -165,6 +166,9 @@ function bindEditModal() { $modal.find('input[name="foreground-color"]') .colorpicker(colorpickerOptions).end().modal('show'); $modal.find('input[name="cat-order"]').val(element.catOrder); + $modal.find('input[name="autoassign"]').val(element.autoAssign); + $modal.find('input[name="type"]').val(element.type); + $modal.find('textarea[name="description"]').val(element.description === null ? '' : element.description); $modal.modal('show'); }); @@ -189,16 +193,16 @@ function bindFormSubmit() { var $modal = $('#category-modal'); var data = { - autoassign: $modal.find('input[name="autoassign"]').val(), + 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(), - foregroundColor: $modal.find('input[name="foreground-color"]').val() === '' ? 'AUTO' : $modal.find('input[name="foreground-color"]'), + displayBorder: $modal.find('input[name="display-border"]:checked').val() === '1', + foregroundColor: $modal.find('input[name="foreground-color"]').val() === '' ? 'AUTO' : $modal.find('input[name="foreground-color"]').val(), name: $modal.find('input[name="name"]').val(), - priority: $modal.find('select[name="priority"]').val(), - type: $modal.find('input[name="type"]').val(), - usage: $modal.find('select[name="usage"]').val(), - catOrder: $modal.find('input[name="cat-order"]').val() + priority: parseInt($modal.find('select[name="priority"]').val()), + type: parseInt($modal.find('input[name="type"]').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/'; @@ -206,16 +210,14 @@ function bindFormSubmit() { var categoryId = $modal.find('input[name="id"]').val(); if (categoryId !== -1) { - url += id; + url += categoryId; method = 'PUT'; } $modal.find('#action-buttons').find('.cancel-button').attr('disabled', 'disabled'); $modal.find('#action-buttons').find('.save-button').attr('disabled', 'disabled'); - console.log('') - - /*$.ajax({ + $.ajax({ method: 'POST', url: url, headers: { @@ -224,7 +226,7 @@ function bindFormSubmit() { }, data: JSON.stringify(data), success: function(data) { - if (id === -1) { + if (categoryId === -1) { mfhAlert.success('CREATED'); } else { mfhAlert.success('SAVED'); @@ -240,6 +242,6 @@ function bindFormSubmit() { $modal.find('#action-buttons').find('.cancel-button').removeAttr('disabled'); $modal.find('#action-buttons').find('.save-button').removeAttr('disabled'); } - });*/ + }); }); } \ No newline at end of file From 24cdb08449d60f5d7076b8aa336f474ca1b4083b Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Wed, 30 Aug 2017 22:03:51 -0400 Subject: [PATCH 029/248] Categories can be created, modify modal --- admin/manage_categories.php | 89 ++++++++++++++++++++-------- internal-api/js/manage-categories.js | 74 ++++++++++++++++++++++- language/en/text.php | 3 + 3 files changed, 140 insertions(+), 26 deletions(-) diff --git a/admin/manage_categories.php b/admin/manage_categories.php index b90caebb..ad504c95 100644 --- a/admin/manage_categories.php +++ b/admin/manage_categories.php @@ -297,17 +297,18 @@ $res = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix'])
-
+
+

- -
+ +
@@ -315,13 +316,24 @@ $res = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix'])
-
+
+
+

+
+ -
+
-
+
+
+

PROPERTIES [!]

+
+
-
+
-
@@ -408,11 +451,7 @@ $res = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix'])
- - - -
+ + " class=" fixed js"> + diff --git a/internal-api/js/manage-categories.js b/internal-api/js/manage-categories.js index 53e0c5a5..6157e3f4 100644 --- a/internal-api/js/manage-categories.js +++ b/internal-api/js/manage-categories.js @@ -7,6 +7,7 @@ $(document).ready(function() { bindFormSubmit(); bindDeleteButton(); bindCreateModal(); + bindGenerateLinkModal(); }); @@ -73,7 +74,9 @@ function loadTable() { $template.find('div.progress').attr('title', percentText.replace('%s', percentage + '%')); $template.find('div.progress-bar').attr('aria-value-now', percentage).css('width', percentage + '%'); - $template.find('[data-property="generate-link"]').find('i').attr('title', mfhLang.text('geco')); + $template.find('[data-property="generate-link"]') + .attr('data-category-id', this.id) + .find('i').attr('title', mfhLang.text('geco')); if (this.usage === 1) { // Tickets only @@ -318,4 +321,22 @@ function bindDeleteButton() { } }); }); +} + +function bindGenerateLinkModal() { + $(document).on('click', '[data-property="generate-link"] i.fa-code', function () { + + var $modal = $('#generate-link-modal'); + + 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() + .find('.input-group-addon').click(function() { + clipboard.copy($modal.find('input[type="text"]').val()); + mfhAlert.success('Copied to clipboard', 'Success'); + }).end() + .modal('show'); + }); } \ No newline at end of file diff --git a/js/clipboard.min.js b/js/clipboard.min.js new file mode 100644 index 00000000..0f4ca9a5 --- /dev/null +++ b/js/clipboard.min.js @@ -0,0 +1,9 @@ +(function(e,c){"undefined"!==typeof module?module.exports=c():"function"===typeof define&&"object"===typeof define.amd?define(c):this[e]=c()})("clipboard",function(){if("undefined"===typeof document||!document.addEventListener)return null;var e={};e.copy=function(){function c(){d=!1;b=null;g&&window.getSelection().removeAllRanges();g=!1}var d=!1,b=null,g=!1;document.addEventListener("copy",function(c){if(d){for(var g in b)c.clipboardData.setData(g,b[g]);c.preventDefault()}});return function(f){return new Promise(function(m, +e){function k(b){try{if(document.execCommand("copy"))c(),m();else{if(b)throw c(),Error("Unable to copy. Perhaps it's not available in your browser?");var d=document.getSelection();if(!document.queryCommandEnabled("copy")&&d.isCollapsed){var f=document.createRange();f.selectNodeContents(document.body);d.removeAllRanges();d.addRange(f);g=!0}k(!0)}}catch(a){c(),e(a)}}d=!0;"string"===typeof f?b={"text/plain":f}:f instanceof Node?b={"text/html":(new XMLSerializer).serializeToString(f)}:f instanceof Object? +b=f:e("Invalid data type. Must be string, DOM node, or an object mapping MIME types to strings.");k(!1)})}}();e.paste=function(){var c=!1,d,b;document.addEventListener("paste",function(g){if(c){c=!1;g.preventDefault();var f=d;d=null;f(g.clipboardData.getData(b))}});return function(g){return new Promise(function(f,e){c=!0;d=f;b=g||"text/plain";try{document.execCommand("paste")||(c=!1,e(Error("Unable to paste. Pasting only works in Internet Explorer at the moment.")))}catch(h){c=!1,e(Error(h))}})}}(); +"undefined"===typeof ClipboardEvent&&"undefined"!==typeof window.clipboardData&&"undefined"!==typeof window.clipboardData.setData&&(function(c){function d(a,b){return function(){a.apply(b,arguments)}}function b(a){if("object"!=typeof this)throw new TypeError("Promises must be constructed via new");if("function"!=typeof a)throw new TypeError("not a function");this._value=this._state=null;this._deferreds=[];l(a,d(f,this),d(e,this))}function g(a){var b=this;return null===this._state?void this._deferreds.push(a): +void n(function(){var c=b._state?a.onFulfilled:a.onRejected;if(null===c)return void(b._state?a.resolve:a.reject)(b._value);var d;try{d=c(b._value)}catch(e){return void a.reject(e)}a.resolve(d)})}function f(a){try{if(a===this)throw new TypeError("A promise cannot be resolved with itself.");if(a&&("object"==typeof a||"function"==typeof a)){var b=a.then;if("function"==typeof b)return void l(d(b,a),d(f,this),d(e,this))}this._state=!0;this._value=a;h.call(this)}catch(c){e.call(this,c)}}function e(a){this._state= +!1;this._value=a;h.call(this)}function h(){for(var a=0,b=this._deferreds.length;b>a;a++)g.call(this,this._deferreds[a]);this._deferreds=null}function k(a,b,c,d){this.onFulfilled="function"==typeof a?a:null;this.onRejected="function"==typeof b?b:null;this.resolve=c;this.reject=d}function l(a,b,c){var d=!1;try{a(function(a){d||(d=!0,b(a))},function(a){d||(d=!0,c(a))})}catch(e){d||(d=!0,c(e))}}var n=b.immediateFn||"function"==typeof setImmediate&&setImmediate||function(a){setTimeout(a,1)},p=Array.isArray|| +function(a){return"[object Array]"===Object.prototype.toString.call(a)};b.prototype["catch"]=function(a){return this.then(null,a)};b.prototype.then=function(a,c){var d=this;return new b(function(b,e){g.call(d,new k(a,c,b,e))})};b.all=function(){var a=Array.prototype.slice.call(1===arguments.length&&p(arguments[0])?arguments[0]:arguments);return new b(function(b,c){function d(f,g){try{if(g&&("object"==typeof g||"function"==typeof g)){var h=g.then;if("function"==typeof h)return void h.call(g,function(a){d(f, +a)},c)}a[f]=g;0===--e&&b(a)}catch(k){c(k)}}if(0===a.length)return b([]);for(var e=a.length,f=0;fd;d++)a[d].then(b,c)})};"undefined"!=typeof module&&module.exports?module.exports=b:c.Promise||(c.Promise=b)}(this),e.copy=function(c){return new Promise(function(d, +b){if("string"!==typeof c&&!("text/plain"in c))throw Error("You must provide a text/plain type.");window.clipboardData.setData("Text","string"===typeof c?c:c["text/plain"])?d():b(Error("Copying was rejected."))})},e.paste=function(){return new Promise(function(c,d){var b=window.clipboardData.getData("Text");b?c(b):d(Error("Pasting was rejected."))})});return e}); From 29f1eb35033266957e66558f82285589028c66e9 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Fri, 1 Sep 2017 22:08:40 -0400 Subject: [PATCH 033/248] Fixed up editing/creating --- admin/manage_categories.php | 22 +++++++++++++++------- internal-api/js/manage-categories.js | 28 ++++++++++++++-------------- language/en/text.php | 1 + 3 files changed, 30 insertions(+), 21 deletions(-) diff --git a/admin/manage_categories.php b/admin/manage_categories.php index f2fe07d6..a0757cf7 100644 --- a/admin/manage_categories.php +++ b/admin/manage_categories.php @@ -307,7 +307,7 @@ $res = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix'])
-

+

@@ -382,7 +382,7 @@ $res = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix'])
-

PROPERTIES [!]

+

@@ -441,11 +441,19 @@ $res = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) -
- +
+
+ +

+
+ +
diff --git a/internal-api/js/manage-categories.js b/internal-api/js/manage-categories.js index 6157e3f4..285dfec0 100644 --- a/internal-api/js/manage-categories.js +++ b/internal-api/js/manage-categories.js @@ -146,8 +146,8 @@ function bindEditModal() { var element = categories[$(this).parent().parent().find('[data-property="id"]').text()]; var $modal = $('#category-modal'); - $modal.find('#title-edit-category').show(); - $modal.find('#title-add-category').hide(); + $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() @@ -183,7 +183,8 @@ function bindEditModal() { $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) + '"]'); + $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'); @@ -250,7 +251,7 @@ function bindFormSubmit() { foregroundColor: $modal.find('input[name="foreground-color"]').val() === '' ? 'AUTO' : $modal.find('input[name="foreground-color"]').val(), name: $modal.find('input[name="name"]').val(), priority: parseInt($modal.find('select[name="priority"]').val()), - type: parseInt($modal.find('input[name="type"]').val()), + 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()) }; @@ -258,7 +259,7 @@ function bindFormSubmit() { var url = heskUrl + 'api/index.php/v1/categories/'; var method = 'POST'; - var categoryId = $modal.find('input[name="id"]').val(); + var categoryId = parseInt($modal.find('input[name="id"]').val()); if (categoryId !== -1) { url += categoryId; method = 'PUT'; @@ -324,19 +325,18 @@ function bindDeleteButton() { } function bindGenerateLinkModal() { + var $modal = $('#generate-link-modal'); + + $modal.find('.input-group-addon').click(function() { + clipboard.copy($modal.find('input[type="text"]').val()); + mfhAlert.success('Copied to clipboard', 'Success'); + }); + $(document).on('click', '[data-property="generate-link"] i.fa-code', function () { - - var $modal = $('#generate-link-modal'); - 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() - .find('.input-group-addon').click(function() { - clipboard.copy($modal.find('input[type="text"]').val()); - mfhAlert.success('Copied to clipboard', 'Success'); - }).end() - .modal('show'); + $modal.find('input[type="text"]').val(url).end().modal('show'); }); } \ No newline at end of file diff --git a/language/en/text.php b/language/en/text.php index eeb34013..fab88193 100644 --- a/language/en/text.php +++ b/language/en/text.php @@ -2176,6 +2176,7 @@ $hesklang['an_error_occurred'] = 'An error occurred. Check the logs for more inf $hesklang['error_deleting_category'] = 'An error occurred when trying to delete the category.'; $hesklang['cat_private'] = 'Private'; $hesklang['cat_public'] = 'Public'; +$hesklang['cat_name_description'] = 'Name / Description'; // DO NOT CHANGE BELOW if (!defined('IN_SCRIPT')) die('PHP syntax OK!'); From 25fde2aa6576f43d139cd8a0880aeaa8f228bda5 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Fri, 1 Sep 2017 22:20:12 -0400 Subject: [PATCH 034/248] Add description --- admin/manage_categories.php | 149 +-------------------------- internal-api/js/manage-categories.js | 10 ++ 2 files changed, 11 insertions(+), 148 deletions(-) diff --git a/admin/manage_categories.php b/admin/manage_categories.php index a0757cf7..30b89afa 100644 --- a/admin/manage_categories.php +++ b/admin/manage_categories.php @@ -88,154 +88,6 @@ $res = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) ?>
- - -

@@ -520,6 +372,7 @@ $res = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) + diff --git a/internal-api/js/manage-categories.js b/internal-api/js/manage-categories.js index 285dfec0..7b426270 100644 --- a/internal-api/js/manage-categories.js +++ b/internal-api/js/manage-categories.js @@ -51,6 +51,12 @@ function loadTable() { $nameField.css('border', 'solid 1px ' + this.foregroundColor); } $nameField.html(this.name); + + if (this.description === '' || this.description === null) { + $template.find('.fa-info-circle').hide(); + } else { + $template.find('.fa-info-circle').attr('data-content', this.description); + } var $priority = $template.find('span[data-property="priority"]'); if (this.priority === 0) { // Critical @@ -136,6 +142,10 @@ function loadTable() { }, complete: function() { refreshBackgroundVolatileItems(); + $('[data-toggle="popover"]').popover({ + trigger: 'hover', + container: 'body' + }); $('#overlay').hide(); } }); From 45726bd388fdf1a69db575f23f9e78dd8390c027 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Tue, 5 Sep 2017 13:06:56 -0400 Subject: [PATCH 035/248] Categories can be sorted --- admin/manage_categories.php | 233 ------------------ .../Categories/CategoryHandler.php | 27 ++ .../Categories/CategoryController.php | 9 + api/index.php | 1 + internal-api/js/manage-categories.js | 24 ++ language/en/text.php | 1 + 6 files changed, 62 insertions(+), 233 deletions(-) diff --git a/admin/manage_categories.php b/admin/manage_categories.php index 30b89afa..0acb4d09 100644 --- a/admin/manage_categories.php +++ b/admin/manage_categories.php @@ -445,237 +445,4 @@ echo mfh_get_hidden_fields_for_language(array( require_once(HESK_PATH . 'inc/footer.inc.php'); exit(); - -function new_cat() -{ - global $hesk_settings, $hesklang; - - /* A security check */ - hesk_token_check('POST'); - - /* Options */ - $_SESSION['cat_autoassign'] = hesk_POST('autoassign') == 'Y' ? 1 : 0; - $_SESSION['cat_type'] = hesk_POST('type') == 'Y' ? 1 : 0; - - // Default priority - $_SESSION['cat_priority'] = intval(hesk_POST('priority', 3)); - if ($_SESSION['cat_priority'] < 0 || $_SESSION['cat_priority'] > 3) { - $_SESSION['cat_priority'] = 3; - } - - /* Category name */ - $catname = hesk_input(hesk_POST('name'), $hesklang['enter_cat_name'], 'manage_categories.php'); - - $background_color = hesk_POST('background-color', '#ffffff'); - $foreground_color = hesk_POST('foreground-color', '#000000'); - $display_border = hesk_POST('display-border', 0); - if ($foreground_color == '') { - $foreground_color = 'AUTO'; - $display_border = 0; - } - - $usage = hesk_POST('usage', 0); - - /* Do we already have a category with this name? */ - $res = hesk_dbQuery("SELECT `id` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` WHERE `name` LIKE '" . hesk_dbEscape(hesk_dbLike($catname)) . "' LIMIT 1"); - if (hesk_dbNumRows($res) != 0) { - $_SESSION['catname'] = $catname; - hesk_process_messages($hesklang['cndupl'], 'manage_categories.php'); - } - - /* Get the latest cat_order */ - $res = hesk_dbQuery("SELECT `cat_order` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` ORDER BY `cat_order` DESC LIMIT 1"); - $row = hesk_dbFetchRow($res); - $my_order = $row[0] + 10; - - hesk_dbQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` - (`name`,`cat_order`,`autoassign`,`type`, `priority`, `background_color`, `foreground_color`, `display_border_outline`, `usage`) VALUES - ('" . hesk_dbEscape($catname) . "','" . intval($my_order) . "','" . intval($_SESSION['cat_autoassign']) . "', - '" . intval($_SESSION['cat_type']) . "','{$_SESSION['cat_priority']}', '" . hesk_dbEscape($background_color) . "', - '" . hesk_dbEscape($foreground_color) . "', '" . intval($display_border) . "', " . intval($usage) . ")"); - - hesk_cleanSessionVars('catname'); - hesk_cleanSessionVars('cat_autoassign'); - hesk_cleanSessionVars('cat_type'); - hesk_cleanSessionVars('cat_priority'); - - $_SESSION['selcat2'] = hesk_dbInsertID(); - - hesk_process_messages(sprintf($hesklang['cat_name_added'], '' . stripslashes($catname) . ''), 'manage_categories.php', 'SUCCESS'); -} // End new_cat() - - -function update_category() -{ - global $hesk_settings, $hesklang; - - /* A security check */ - hesk_token_check('POST'); - - $_SERVER['PHP_SELF'] = 'manage_categories.php?catid=' . intval(hesk_POST('catid')); - - $catid = hesk_isNumber(hesk_POST('id'), $hesklang['choose_cat_ren'], $_SERVER['PHP_SELF']); - $_SESSION['selcat'] = $catid; - $_SESSION['selcat2'] = $catid; - - $catname = hesk_input(hesk_POST('name'), $hesklang['cat_ren_name'], $_SERVER['PHP_SELF']); - $_SESSION['catname2'] = $catname; - - $background_color = hesk_POST('background-color', '#ffffff'); - $foreground_color = hesk_POST('foreground-color', '#000000'); - $display_border = hesk_POST('display-border', 0); - if ($foreground_color == '') { - $foreground_color = 'AUTO'; - $display_border = 0; - } - $manager = hesk_POST('manager', 0); - $priority = hesk_POST('priority', 0); - $usage = hesk_POST('usage', 0); - - - hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` SET `name`='" . hesk_dbEscape($catname) . "', - `priority` = '" . hesk_dbEscape($priority) . "', - `manager` = " . intval($manager) . ", - `background_color` = '" . hesk_dbEscape($background_color) . "', - `foreground_color` = '" . hesk_dbEscape($foreground_color) . "', - `display_border_outline` = '" . intval($display_border) . "', - `usage` = " . intval($usage) . " - WHERE `id`='" . intval($catid) . "'"); - - unset($_SESSION['selcat']); - unset($_SESSION['catname2']); - - hesk_process_messages(sprintf($hesklang['category_updated'], stripslashes($catname)), $_SERVER['PHP_SELF'], 'SUCCESS'); -} // End rename_cat() - - -function remove() -{ - global $hesk_settings, $hesklang; - - /* A security check */ - hesk_token_check(); - - $_SERVER['PHP_SELF'] = 'manage_categories.php'; - - $mycat = intval(hesk_GET('catid')) or hesk_error($hesklang['no_cat_id']); - if ($mycat == 1) { - hesk_process_messages($hesklang['cant_del_default_cat'], $_SERVER['PHP_SELF']); - } - - hesk_dbQuery("DELETE FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` WHERE `id`='" . intval($mycat) . "'"); - if (hesk_dbAffectedRows() != 1) { - hesk_error("$hesklang[int_error]: $hesklang[cat_not_found]."); - } - - hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "tickets` SET `category`=1 WHERE `category`='" . intval($mycat) . "'"); - - hesk_process_messages($hesklang['cat_removed_db'], $_SERVER['PHP_SELF'], 'SUCCESS'); -} // End remove() - - -function order_cat() -{ - global $hesk_settings, $hesklang; - - /* A security check */ - hesk_token_check(); - - $catid = intval(hesk_GET('catid')) or hesk_error($hesklang['cat_move_id']); - $_SESSION['selcat2'] = $catid; - - $cat_move = intval(hesk_GET('move')); - - hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` SET `cat_order`=`cat_order`+" . intval($cat_move) . " WHERE `id`='" . intval($catid) . "'"); - if (hesk_dbAffectedRows() != 1) { - hesk_error("$hesklang[int_error]: $hesklang[cat_not_found]."); - } - - /* Update all category fields with new order */ - $res = hesk_dbQuery("SELECT `id` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` ORDER BY `cat_order` ASC"); - - $i = 10; - while ($mycat = hesk_dbFetchAssoc($res)) { - hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` SET `cat_order`=" . intval($i) . " WHERE `id`='" . intval($mycat['id']) . "'"); - $i += 10; - } - - header('Location: manage_categories.php'); - exit(); -} // End order_cat() - - -function toggle_autoassign() -{ - global $hesk_settings, $hesklang; - - /* A security check */ - hesk_token_check(); - - $catid = intval(hesk_GET('catid')) or hesk_error($hesklang['cat_move_id']); - $_SESSION['selcat2'] = $catid; - - if (intval(hesk_GET('s'))) { - $autoassign = 1; - $tmp = $hesklang['caaon']; - } else { - $autoassign = 0; - $tmp = $hesklang['caaoff']; - } - - /* Update auto-assign settings */ - $res = hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` SET `autoassign`='" . intval($autoassign) . "' WHERE `id`='" . intval($catid) . "'"); - if (hesk_dbAffectedRows() != 1) { - hesk_process_messages($hesklang['int_error'] . ': ' . $hesklang['cat_not_found'], './manage_categories.php'); - } - - hesk_process_messages($tmp, './manage_categories.php', 'SUCCESS'); - -} // End toggle_autoassign() - - -function toggle_type() -{ - global $hesk_settings, $hesklang; - - /* A security check */ - hesk_token_check(); - - $catid = intval(hesk_GET('catid')) or hesk_error($hesklang['cat_move_id']); - $_SESSION['selcat2'] = $catid; - - if (intval(hesk_GET('s'))) { - $type = 1; - $tmp = $hesklang['cpriv']; - } else { - $type = 0; - $tmp = $hesklang['cpub']; - } - - /* Update auto-assign settings */ - hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` SET `type`='{$type}' WHERE `id`='" . intval($catid) . "'"); - if (hesk_dbAffectedRows() != 1) { - hesk_process_messages($hesklang['int_error'] . ': ' . $hesklang['cat_not_found'], './manage_categories.php'); - } - - hesk_process_messages($tmp, './manage_categories.php', 'SUCCESS'); - -} // End toggle_type() - -function get_manager($user_id, $user_array) { - global $hesklang; - - if ($user_id == 0) { - return $hesklang['no_manager']; - } - - foreach ($user_array as $user) { - if ($user['id'] == $user_id) { - return $user['name']; - } - } - - return 'Error!'; -} - ?> diff --git a/api/BusinessLogic/Categories/CategoryHandler.php b/api/BusinessLogic/Categories/CategoryHandler.php index 87020fe1..2df16882 100644 --- a/api/BusinessLogic/Categories/CategoryHandler.php +++ b/api/BusinessLogic/Categories/CategoryHandler.php @@ -5,6 +5,7 @@ namespace BusinessLogic\Categories; use BusinessLogic\Exceptions\AccessViolationException; use BusinessLogic\Exceptions\ValidationException; +use BusinessLogic\Navigation\Direction; use BusinessLogic\Security\PermissionChecker; use BusinessLogic\Security\UserPrivilege; use BusinessLogic\ValidationModel; @@ -151,4 +152,30 @@ class CategoryHandler { $this->categoryGateway->deleteCategory($id, $heskSettings); $this->categoryGateway->resortAllCategories($heskSettings); } + + function sortCategory($id, $direction, $heskSettings) { + $modsForHeskSettings = $this->modsForHeskSettingsGateway->getAllSettings($heskSettings); + + $categories = $this->categoryGateway->getAllCategories($heskSettings, $modsForHeskSettings); + $category = null; + foreach ($categories as $innerCategory) { + if ($innerCategory->id === intval($id)) { + $category = $innerCategory; + break; + } + } + + if ($category === null) { + throw new \Exception("Could not find category with ID {$id}!"); + } + + if ($direction === Direction::UP) { + $category->catOrder -= 15; + } else { + $category->catOrder += 15; + } + + $this->categoryGateway->updateCategory($category, $heskSettings); + $this->categoryGateway->resortAllCategories($heskSettings); + } } \ No newline at end of file diff --git a/api/Controllers/Categories/CategoryController.php b/api/Controllers/Categories/CategoryController.php index 902f7250..8daa326f 100644 --- a/api/Controllers/Categories/CategoryController.php +++ b/api/Controllers/Categories/CategoryController.php @@ -98,4 +98,13 @@ class CategoryController { return http_response_code(204); } + + static function sort($id, $direction) { + global $applicationContext, $hesk_settings; + + /* @var $handler CategoryHandler */ + $handler = $applicationContext->get[CategoryHandler::class]; + + $handler->sortCategory(intval($id), $direction, $hesk_settings); + } } \ No newline at end of file diff --git a/api/index.php b/api/index.php index ffaf590d..05dba913 100644 --- a/api/index.php +++ b/api/index.php @@ -190,6 +190,7 @@ Link::all(array( '/v1/categories/all' => action(\Controllers\Categories\CategoryController::class . '::printAllCategories', [RequestMethod::GET], SecurityHandler::INTERNAL_OR_AUTH_TOKEN), '/v1/categories' => action(\Controllers\Categories\CategoryController::class, [RequestMethod::POST], SecurityHandler::INTERNAL_OR_AUTH_TOKEN), '/v1/categories/{i}' => action(\Controllers\Categories\CategoryController::class, [RequestMethod::GET, RequestMethod::PUT, RequestMethod::DELETE], SecurityHandler::INTERNAL_OR_AUTH_TOKEN), + '/v1-internal/categories/{i}/sort/{s}' => action(\Controllers\Categories\CategoryController::class . '::sort', [RequestMethod::POST], SecurityHandler::INTERNAL), // Tickets '/v1/tickets' => action(\Controllers\Tickets\CustomerTicketController::class), // Tickets - Staff diff --git a/internal-api/js/manage-categories.js b/internal-api/js/manage-categories.js index 7b426270..767be236 100644 --- a/internal-api/js/manage-categories.js +++ b/internal-api/js/manage-categories.js @@ -8,6 +8,7 @@ $(document).ready(function() { bindDeleteButton(); bindCreateModal(); bindGenerateLinkModal(); + bindSortButtons(); }); @@ -349,4 +350,27 @@ function bindGenerateLinkModal() { $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 diff --git a/language/en/text.php b/language/en/text.php index fab88193..a58ba6fe 100644 --- a/language/en/text.php +++ b/language/en/text.php @@ -2177,6 +2177,7 @@ $hesklang['error_deleting_category'] = 'An error occurred when trying to delete $hesklang['cat_private'] = 'Private'; $hesklang['cat_public'] = 'Public'; $hesklang['cat_name_description'] = 'Name / Description'; +$hesklang['error_sorting_categories'] = 'An error occurred sorting categories!'; // DO NOT CHANGE BELOW if (!defined('IN_SCRIPT')) die('PHP syntax OK!'); From 02d965e2d91da2161851a6f52f086bae335cb20d Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Tue, 5 Sep 2017 22:20:57 -0400 Subject: [PATCH 036/248] Localized some stuff, add descriptions to create ticket pages --- admin/manage_categories.php | 9 ++++- admin/new_ticket.php | 50 +++++++++++++++++++----- index.php | 47 ++++++++++++++++++---- install/mods-for-hesk/sql/installSql.php | 10 +++++ internal-api/js/lang.js | 3 ++ internal-api/js/manage-categories.js | 15 ++++--- language/en/text.php | 4 ++ 7 files changed, 112 insertions(+), 26 deletions(-) diff --git a/admin/manage_categories.php b/admin/manage_categories.php index 0acb4d09..6ddce2d4 100644 --- a/admin/manage_categories.php +++ b/admin/manage_categories.php @@ -375,8 +375,8 @@ $res = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) - - + + @@ -437,6 +437,11 @@ echo mfh_get_hidden_fields_for_language(array( 'cat_public', 'cat_removed', 'error_deleting_category', + 'error_retrieving_categories', + 'error_saving_updating_category', + 'copied_to_clipboard', + 'category_updated', + 'cat_name_added', 'enabled_title_case', 'disabled_title_case', 'geco', diff --git a/admin/new_ticket.php b/admin/new_ticket.php index 9233b35b..e831ec15 100644 --- a/admin/new_ticket.php +++ b/admin/new_ticket.php @@ -113,13 +113,13 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); $hesk_settings['categories'] = array(); if (hesk_checkPermission('can_submit_any_cat', 0)) { - $res = hesk_dbQuery("SELECT `id`, `name` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."categories` ORDER BY `cat_order` ASC"); + $res = hesk_dbQuery("SELECT `id`, `name`, `mfh_description` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."categories` ORDER BY `cat_order` ASC"); } else { - $res = hesk_dbQuery("SELECT `id`, `name` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."categories` WHERE ".hesk_myCategories('id')." ORDER BY `cat_order` ASC"); + $res = hesk_dbQuery("SELECT `id`, `name`, `mfh_description` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."categories` WHERE ".hesk_myCategories('id')." ORDER BY `cat_order` ASC"); } while ($row = hesk_dbFetchAssoc($res)) { - $hesk_settings['categories'][$row['id']] = $row['name']; + $hesk_settings['categories'][$row['id']] = $row; } $number_of_categories = count($hesk_settings['categories']); @@ -147,7 +147,7 @@ $show_quick_help = $show['show'];
    • 1): ?>
    • -
    • +
    • @@ -1038,9 +1038,10 @@ function print_select_category($number_of_categories) { // Print a select box if number of categories is large if ($number_of_categories > $hesk_settings['cat_show_select']) { + $firstDescription = null; ?> - $v) { - echo ''; + if ($firstDescription === null) { + $firstDescription = $v['mfh_description']; + } + echo ''; } ?> + - + if (!$hesk_settings['select_cat'] && $firstDescription !== null && trim($firstDescription) !== '') { + $display = ''; + } + ?> + > + + + +
    + » '.$v.''; $new_row = 1; foreach ($hesk_settings['categories'] as $k=>$v): @@ -1079,7 +1102,14 @@ function print_select_category($number_of_categories) {
    - + '; + } + ?>
    diff --git a/index.php b/index.php index 61eba1f7..8ab81bd9 100644 --- a/index.php +++ b/index.php @@ -87,9 +87,10 @@ function print_select_category($number_of_categories) // Print a select box if number of categories is large if ($number_of_categories > $hesk_settings['cat_show_select']) { + $firstDescription = null; ?>
    - $v) { - echo ''; + if ($firstDescription === null) { + $firstDescription = $v['mfh_description']; + } + echo ''; } ?> + - + if (!$hesk_settings['select_cat'] && $firstDescription !== null && trim($firstDescription) !== '') { + $display = ''; + } + ?> + > + + + +
    +
    - + '; + } + ?>

    @@ -220,9 +251,9 @@ function print_add_ticket() // Get categories $hesk_settings['categories'] = array(); - $res = hesk_dbQuery("SELECT `id`, `name` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."categories` WHERE `type`='0' ORDER BY `cat_order` ASC"); + $res = hesk_dbQuery("SELECT `id`, `name`, `mfh_description` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."categories` WHERE `type`='0' ORDER BY `cat_order` ASC"); while ($row=hesk_dbFetchAssoc($res)) { - $hesk_settings['categories'][$row['id']] = $row['name']; + $hesk_settings['categories'][$row['id']] = $row; } $number_of_categories = count($hesk_settings['categories']); @@ -254,7 +285,7 @@ function print_add_ticket() -
    • +
    • diff --git a/install/mods-for-hesk/sql/installSql.php b/install/mods-for-hesk/sql/installSql.php index 2970c923..c8922f46 100644 --- a/install/mods-for-hesk/sql/installSql.php +++ b/install/mods-for-hesk/sql/installSql.php @@ -1130,4 +1130,14 @@ function execute311Scripts() { hesk_dbConnect(); updateVersion('3.1.1'); +} + +function execute320Scripts() { + global $hesk_settings; + hesk_dbConnect(); + + executeQuery("ALTER TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` + ADD COLUMN `mfh_description` VARCHAR(255)"); + + updateVersion('3.2.0'); } \ No newline at end of file diff --git a/internal-api/js/lang.js b/internal-api/js/lang.js index d0f232cc..c87c5184 100644 --- a/internal-api/js/lang.js +++ b/internal-api/js/lang.js @@ -1,5 +1,8 @@ var mfhLang = { text: function(key) { return $('#lang_' + key).text(); + }, + html: function(key) { + return $('#lang_' + key).html() } }; \ No newline at end of file diff --git a/internal-api/js/manage-categories.js b/internal-api/js/manage-categories.js index 767be236..521198d8 100644 --- a/internal-api/js/manage-categories.js +++ b/internal-api/js/manage-categories.js @@ -25,7 +25,7 @@ function loadTable() { $tableBody.html(''); if (data.length === 0) { - mfhAlert.error("I couldn't find any categories :(", "No categories found"); + mfhAlert.error("No categories were found. This shouldn't happen.", "No categories found"); $('#overlay').hide(); return; } @@ -138,7 +138,7 @@ function loadTable() { } }, error: function(data) { - mfhAlert.errorWithLog(mfhLang.text('Something bad happened...'), data.responseJSON); + mfhAlert.errorWithLog(mfhLang.text('error_retrieving_categories'), data.responseJSON); console.error(data); }, complete: function() { @@ -288,16 +288,19 @@ function bindFormSubmit() { }, data: JSON.stringify(data), success: function(data) { + var format = undefined; if (categoryId === -1) { - mfhAlert.success('CREATED'); + format = mfhLang.html('cat_name_added'); + mfhAlert.success(format.replace('%s', data.name)); } else { - mfhAlert.success('SAVED'); + format = mfhLang.html('category_updated'); + mfhAlert.success(format.replace('%s', data.name)); } $modal.modal('hide'); loadTable(); }, error: function(data) { - mfhAlert.errorWithLog('ERROR SAVING/CREATING', data.responseJSON); + mfhAlert.errorWithLog(mfhLang.text('error_saving_updating_category'), data.responseJSON); console.error(data); }, complete: function(data) { @@ -340,7 +343,7 @@ function bindGenerateLinkModal() { $modal.find('.input-group-addon').click(function() { clipboard.copy($modal.find('input[type="text"]').val()); - mfhAlert.success('Copied to clipboard', 'Success'); + mfhAlert.success(mfhLang.text('copied_to_clipboard')); }); $(document).on('click', '[data-property="generate-link"] i.fa-code', function () { diff --git a/language/en/text.php b/language/en/text.php index a58ba6fe..743ed201 100644 --- a/language/en/text.php +++ b/language/en/text.php @@ -2178,6 +2178,10 @@ $hesklang['cat_private'] = 'Private'; $hesklang['cat_public'] = 'Public'; $hesklang['cat_name_description'] = 'Name / Description'; $hesklang['error_sorting_categories'] = 'An error occurred sorting categories!'; +$hesklang['error_retrieving_categories'] = 'An error occurred retrieving categories!'; +$hesklang['error_saving_updating_category'] = 'An error occurred creating / saving the category!'; +$hesklang['description_colon'] = 'Description:'; // Same as 'description', but with a colon (:) afterwards +$hesklang['copied_to_clipboard'] = 'Copied to clipboard'; // DO NOT CHANGE BELOW if (!defined('IN_SCRIPT')) die('PHP syntax OK!'); From 5caac8452e9630e273cc4f1df5a99f3a700a25aa Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Wed, 6 Sep 2017 07:54:33 -0400 Subject: [PATCH 037/248] Don't allow category 1 to be deleted --- api/ApplicationContext.php | 71 ++++++------------- .../Categories/CategoryHandler.php | 12 +++- api/DataAccess/Tickets/TicketGateway.php | 10 +++ internal-api/js/manage-categories.js | 4 ++ 4 files changed, 48 insertions(+), 49 deletions(-) diff --git a/api/ApplicationContext.php b/api/ApplicationContext.php index 40f8d002..8dbb6079 100644 --- a/api/ApplicationContext.php +++ b/api/ApplicationContext.php @@ -51,66 +51,51 @@ class ApplicationContext { function __construct() { $this->get = array(); - // Permissions $this->get[PermissionChecker::class] = new PermissionChecker(); - - // Settings $this->get[ModsForHeskSettingsGateway::class] = new ModsForHeskSettingsGateway(); - - // API Checker - $this->get[ApiChecker::class] = new ApiChecker($this->get[ModsForHeskSettingsGateway::class]); - - // Custom Navigation $this->get[CustomNavElementGateway::class] = new CustomNavElementGateway(); - $this->get[CustomNavElementHandler::class] = new CustomNavElementHandler($this->get[CustomNavElementGateway::class]); - - // Logging $this->get[LoggingGateway::class] = new LoggingGateway(); - - // Verified Email Checker $this->get[VerifiedEmailGateway::class] = new VerifiedEmailGateway(); - $this->get[VerifiedEmailChecker::class] = new VerifiedEmailChecker($this->get[VerifiedEmailGateway::class]); - - // Users $this->get[UserGateway::class] = new UserGateway(); - $this->get[UserContextBuilder::class] = new UserContextBuilder($this->get[UserGateway::class]); - - // Categories $this->get[CategoryGateway::class] = new CategoryGateway(); + $this->get[BanGateway::class] = new BanGateway(); + $this->get[StatusGateway::class] = new StatusGateway(); + $this->get[BasicEmailSender::class] = new BasicEmailSender(); + $this->get[MailgunEmailSender::class] = new MailgunEmailSender(); + $this->get[EmailTemplateRetriever::class] = new EmailTemplateRetriever(); + $this->get[TicketGateway::class] = new TicketGateway(); + $this->get[FileWriter::class] = new FileWriter(); + $this->get[FileReader::class] = new FileReader(); + $this->get[FileDeleter::class] = new FileDeleter(); + $this->get[AttachmentGateway::class] = new AttachmentGateway(); + + $this->get[ApiChecker::class] = new ApiChecker($this->get[ModsForHeskSettingsGateway::class]); + $this->get[CustomNavElementHandler::class] = new CustomNavElementHandler($this->get[CustomNavElementGateway::class]); + $this->get[VerifiedEmailChecker::class] = new VerifiedEmailChecker($this->get[VerifiedEmailGateway::class]); + $this->get[UserContextBuilder::class] = new UserContextBuilder($this->get[UserGateway::class]); + $this->get[BanRetriever::class] = new BanRetriever($this->get[BanGateway::class]); + $this->get[UserToTicketChecker::class] = new UserToTicketChecker($this->get[UserGateway::class]); + $this->get[StatusRetriever::class] = new StatusRetriever($this->get[StatusGateway::class]); + $this->get[SettingsRetriever::class] = new SettingsRetriever($this->get[ModsForHeskSettingsGateway::class]); + $this->get[TicketValidators::class] = new TicketValidators($this->get[TicketGateway::class]); + $this->get[TrackingIdGenerator::class] = new TrackingIdGenerator($this->get[TicketGateway::class]); + $this->get[Autoassigner::class] = new Autoassigner($this->get[CategoryGateway::class], $this->get[UserGateway::class]); $this->get[CategoryRetriever::class] = new CategoryRetriever($this->get[CategoryGateway::class], $this->get[ModsForHeskSettingsGateway::class]); $this->get[CategoryHandler::class] = new CategoryHandler( $this->get[CategoryGateway::class], + $this->get[TicketGateway::class], $this->get[PermissionChecker::class], $this->get[ModsForHeskSettingsGateway::class]); - - // Bans - $this->get[BanGateway::class] = new BanGateway(); - $this->get[BanRetriever::class] = new BanRetriever($this->get[BanGateway::class]); - - // Statuses - $this->get[StatusGateway::class] = new StatusGateway(); - - // Email Sender - $this->get[EmailTemplateRetriever::class] = new EmailTemplateRetriever(); $this->get[EmailTemplateParser::class] = new EmailTemplateParser($this->get[StatusGateway::class], $this->get[CategoryGateway::class], $this->get[UserGateway::class], $this->get[EmailTemplateRetriever::class]); - $this->get[BasicEmailSender::class] = new BasicEmailSender(); - $this->get[MailgunEmailSender::class] = new MailgunEmailSender(); $this->get[EmailSenderHelper::class] = new EmailSenderHelper($this->get[EmailTemplateParser::class], $this->get[BasicEmailSender::class], $this->get[MailgunEmailSender::class]); - - // Tickets - $this->get[UserToTicketChecker::class] = new UserToTicketChecker($this->get[UserGateway::class]); - $this->get[TicketGateway::class] = new TicketGateway(); $this->get[TicketRetriever::class] = new TicketRetriever($this->get[TicketGateway::class], $this->get[UserToTicketChecker::class]); - $this->get[TicketValidators::class] = new TicketValidators($this->get[TicketGateway::class]); - $this->get[TrackingIdGenerator::class] = new TrackingIdGenerator($this->get[TicketGateway::class]); - $this->get[Autoassigner::class] = new Autoassigner($this->get[CategoryGateway::class], $this->get[UserGateway::class]); $this->get[NewTicketValidator::class] = new NewTicketValidator($this->get[CategoryRetriever::class], $this->get[BanRetriever::class], $this->get[TicketValidators::class]); @@ -123,10 +108,6 @@ class ApplicationContext { $this->get[EmailSenderHelper::class], $this->get[UserGateway::class], $this->get[ModsForHeskSettingsGateway::class]); - $this->get[FileWriter::class] = new FileWriter(); - $this->get[FileReader::class] = new FileReader(); - $this->get[FileDeleter::class] = new FileDeleter(); - $this->get[AttachmentGateway::class] = new AttachmentGateway(); $this->get[AttachmentHandler::class] = new AttachmentHandler($this->get[TicketGateway::class], $this->get[AttachmentGateway::class], $this->get[FileWriter::class], @@ -142,11 +123,5 @@ class ApplicationContext { $this->get[AttachmentHandler::class]); $this->get[TicketEditor::class] = new TicketEditor($this->get[TicketGateway::class], $this->get[UserToTicketChecker::class]); - - // Statuses - $this->get[StatusRetriever::class] = new StatusRetriever($this->get[StatusGateway::class]); - - // Settings - $this->get[SettingsRetriever::class] = new SettingsRetriever($this->get[ModsForHeskSettingsGateway::class]); } } \ No newline at end of file diff --git a/api/BusinessLogic/Categories/CategoryHandler.php b/api/BusinessLogic/Categories/CategoryHandler.php index 2df16882..8c6c42ca 100644 --- a/api/BusinessLogic/Categories/CategoryHandler.php +++ b/api/BusinessLogic/Categories/CategoryHandler.php @@ -11,19 +11,24 @@ use BusinessLogic\Security\UserPrivilege; use BusinessLogic\ValidationModel; use DataAccess\Categories\CategoryGateway; use DataAccess\Settings\ModsForHeskSettingsGateway; +use DataAccess\Tickets\TicketGateway; class CategoryHandler { /* @var $categoryGateway CategoryGateway */ private $categoryGateway; + /* @var $ticketGateway TicketGateway */ + private $ticketGateway; + /* @var $permissionChecker PermissionChecker */ private $permissionChecker; /* @var $modsForHeskSettingsGateway ModsForHeskSettingsGateway */ private $modsForHeskSettingsGateway; - function __construct($categoryGateway, $permissionChecker, $modsForHeskSettingsGateway) { + function __construct($categoryGateway, $ticketGateway, $permissionChecker, $modsForHeskSettingsGateway) { $this->categoryGateway = $categoryGateway; + $this->ticketGateway = $ticketGateway; $this->permissionChecker = $permissionChecker; $this->modsForHeskSettingsGateway = $modsForHeskSettingsGateway; } @@ -149,6 +154,11 @@ class CategoryHandler { throw new AccessViolationException('User cannot manage categories!'); } + if ($id === 1) { + throw new \Exception("Category 1 cannot be deleted!"); + } + + $this->ticketGateway->moveTicketsToDefaultCategory($id, $heskSettings); $this->categoryGateway->deleteCategory($id, $heskSettings); $this->categoryGateway->resortAllCategories($heskSettings); } diff --git a/api/DataAccess/Tickets/TicketGateway.php b/api/DataAccess/Tickets/TicketGateway.php index 1645618b..a14d623e 100644 --- a/api/DataAccess/Tickets/TicketGateway.php +++ b/api/DataAccess/Tickets/TicketGateway.php @@ -358,4 +358,14 @@ class TicketGateway extends CommonDao { $this->close(); } + + function moveTicketsToDefaultCategory($oldCategoryId, $heskSettings) { + $this->init(); + + hesk_dbQuery("UPDATE `" . hesk_dbEscape($heskSettings['db_pfix']) . "tickets` + SET `category` = 1 + WHERE `category` = " . intval($oldCategoryId)); + + $this->close(); + } } \ No newline at end of file diff --git a/internal-api/js/manage-categories.js b/internal-api/js/manage-categories.js index 521198d8..853e06e1 100644 --- a/internal-api/js/manage-categories.js +++ b/internal-api/js/manage-categories.js @@ -119,6 +119,10 @@ function loadTable() { .attr('title', mfhLang.text('geco')); } + if (this.id === 1) { + $template.find('[data-action="delete"]').hide(); + } + $tableBody.append($template); categories[this.id] = this; From f700addda5e760b2256bc88c5ed0a22ddf4061f1 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Wed, 6 Sep 2017 12:56:44 -0400 Subject: [PATCH 038/248] Update composer for php-di --- api/composer.json | 5 +- api/composer.lock | 2233 +++++++++++++++++++++++---------------------- 2 files changed, 1161 insertions(+), 1077 deletions(-) diff --git a/api/composer.json b/api/composer.json index f23ca66a..ba08aee6 100644 --- a/api/composer.json +++ b/api/composer.json @@ -10,7 +10,7 @@ } ], "require-dev": { - "phpunit/phpunit": "5.7.9" + "phpunit/phpunit": "6.3.0" }, "require": { "phpmailer/phpmailer": "^5.2", @@ -18,6 +18,7 @@ "php-http/guzzle6-adapter": "^1.1", "php-http/message": "^1.5", "php-http/curl-client": "^1.7", - "guzzlehttp/psr7": "^1.3" + "guzzlehttp/psr7": "^1.3", + "php-di/php-di": "4.4.10" } } diff --git a/api/composer.lock b/api/composer.lock index 7ac81d56..ec939825 100644 --- a/api/composer.lock +++ b/api/composer.lock @@ -4,25 +4,28 @@ "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": "266b9167ab52abc3c4a2514bf29491ed", + "content-hash": "d7d3d7ef4a481f28ec59f1218cbc9a1a", "packages": [ { "name": "clue/stream-filter", - "version": "v1.3.0", + "version": "v1.4.0", "source": { "type": "git", "url": "https://github.com/clue/php-stream-filter.git", - "reference": "e3bf9415da163d9ad6701dccb407ed501ae69785" + "reference": "d80fdee9b3a7e0d16fc330a22f41f3ad0eeb09d0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/clue/php-stream-filter/zipball/e3bf9415da163d9ad6701dccb407ed501ae69785", - "reference": "e3bf9415da163d9ad6701dccb407ed501ae69785", + "url": "https://api.github.com/repos/clue/php-stream-filter/zipball/d80fdee9b3a7e0d16fc330a22f41f3ad0eeb09d0", + "reference": "d80fdee9b3a7e0d16fc330a22f41f3ad0eeb09d0", "shasum": "" }, "require": { "php": ">=5.3" }, + "require-dev": { + "phpunit/phpunit": "^5.0 || ^4.8" + }, "type": "library", "autoload": { "psr-4": { @@ -53,7 +56,38 @@ "stream_filter_append", "stream_filter_register" ], - "time": "2015-11-08T23:41:30+00:00" + "time": "2017-08-18T09:54:01+00:00" + }, + { + "name": "container-interop/container-interop", + "version": "1.2.0", + "source": { + "type": "git", + "url": "https://github.com/container-interop/container-interop.git", + "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/container-interop/container-interop/zipball/79cbf1341c22ec75643d841642dd5d6acd83bdb8", + "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8", + "shasum": "" + }, + "require": { + "psr/container": "^1.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Interop\\Container\\": "src/Interop/Container/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Promoting the interoperability of container objects (DIC, SL, etc.)", + "homepage": "https://github.com/container-interop/container-interop", + "time": "2017-02-14T19:40:03+00:00" }, { "name": "doctrine/annotations", @@ -61,17 +95,17 @@ "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "54cacc9b81758b14e3ce750f205a393d52339e97" + "reference": "2497b1f9db56278d3ad2248f9e4bdbbbaa271c3e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/54cacc9b81758b14e3ce750f205a393d52339e97", - "reference": "54cacc9b81758b14e3ce750f205a393d52339e97", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/2497b1f9db56278d3ad2248f9e4bdbbbaa271c3e", + "reference": "2497b1f9db56278d3ad2248f9e4bdbbbaa271c3e", "shasum": "" }, "require": { "doctrine/lexer": "1.*", - "php": "^5.6 || ^7.0" + "php": "^7.1" }, "require-dev": { "doctrine/cache": "1.*", @@ -80,7 +114,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4.x-dev" + "dev-master": "1.6.x-dev" } }, "autoload": { @@ -121,7 +155,7 @@ "docblock", "parser" ], - "time": "2017-02-24 16:22:25" + "time": "2017-07-22 11:08:38" }, { "name": "doctrine/cache", @@ -129,28 +163,35 @@ "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "0da649fce4838f7a6121c501c9a86d4b8921b648" + "reference": "beb0fa35b61e9073f8612d9ffd34920bdaec406a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/0da649fce4838f7a6121c501c9a86d4b8921b648", - "reference": "0da649fce4838f7a6121c501c9a86d4b8921b648", + "url": "https://api.github.com/repos/doctrine/cache/zipball/beb0fa35b61e9073f8612d9ffd34920bdaec406a", + "reference": "beb0fa35b61e9073f8612d9ffd34920bdaec406a", "shasum": "" }, "require": { - "php": "~5.6|~7.0" + "php": "~7.1" }, "conflict": { "doctrine/common": ">2.2,<2.4" }, "require-dev": { - "phpunit/phpunit": "^5.7", - "predis/predis": "~1.0" + "alcaeus/mongo-php-adapter": "^1.1", + "doctrine/coding-standard": "^1.0", + "mongodb/mongodb": "^1.1", + "phpunit/phpunit": "^6.3", + "predis/predis": "~1.0", + "squizlabs/php_codesniffer": "^3.0" + }, + "suggest": { + "alcaeus/mongo-php-adapter": "Required to use legacy MongoDB driver" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.7.x-dev" + "dev-master": "1.8.x-dev" } }, "autoload": { @@ -190,340 +231,7 @@ "cache", "caching" ], - "time": "2017-03-06 14:38:51" - }, - { - "name": "doctrine/collections", - "version": "v1.4.0", - "source": { - "type": "git", - "url": "https://github.com/doctrine/collections.git", - "reference": "1a4fb7e902202c33cce8c55989b945612943c2ba" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/collections/zipball/1a4fb7e902202c33cce8c55989b945612943c2ba", - "reference": "1a4fb7e902202c33cce8c55989b945612943c2ba", - "shasum": "" - }, - "require": { - "php": "^5.6 || ^7.0" - }, - "require-dev": { - "doctrine/coding-standard": "~0.1@dev", - "phpunit/phpunit": "^5.7" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.3.x-dev" - } - }, - "autoload": { - "psr-0": { - "Doctrine\\Common\\Collections\\": "lib/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Roman Borschel", - "email": "roman@code-factory.org" - }, - { - "name": "Benjamin Eberlei", - "email": "kontakt@beberlei.de" - }, - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" - }, - { - "name": "Jonathan Wage", - "email": "jonwage@gmail.com" - }, - { - "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com" - } - ], - "description": "Collections Abstraction library", - "homepage": "http://www.doctrine-project.org", - "keywords": [ - "array", - "collections", - "iterator" - ], - "time": "2017-01-03T10:49:41+00:00" - }, - { - "name": "doctrine/common", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/doctrine/common.git", - "reference": "4b434dbf8d204198dac708f2e938f7c805864dd6" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/common/zipball/4b434dbf8d204198dac708f2e938f7c805864dd6", - "reference": "4b434dbf8d204198dac708f2e938f7c805864dd6", - "shasum": "" - }, - "require": { - "doctrine/annotations": "1.*", - "doctrine/cache": "1.*", - "doctrine/collections": "1.*", - "doctrine/inflector": "1.*", - "doctrine/lexer": "1.*", - "php": "~5.6|~7.0" - }, - "require-dev": { - "phpunit/phpunit": "^5.7" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.8.x-dev" - } - }, - "autoload": { - "psr-4": { - "Doctrine\\Common\\": "lib/Doctrine/Common" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Roman Borschel", - "email": "roman@code-factory.org" - }, - { - "name": "Benjamin Eberlei", - "email": "kontakt@beberlei.de" - }, - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" - }, - { - "name": "Jonathan Wage", - "email": "jonwage@gmail.com" - }, - { - "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com" - } - ], - "description": "Common Library for Doctrine projects", - "homepage": "http://www.doctrine-project.org", - "keywords": [ - "annotations", - "collections", - "eventmanager", - "persistence", - "spl" - ], - "time": "2017-03-06 07:30:42" - }, - { - "name": "doctrine/dbal", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/doctrine/dbal.git", - "reference": "50bf623418be0feb3282bb50d07a4aea977fb33a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/50bf623418be0feb3282bb50d07a4aea977fb33a", - "reference": "50bf623418be0feb3282bb50d07a4aea977fb33a", - "shasum": "" - }, - "require": { - "doctrine/common": "^2.7.1", - "php": "^7.0" - }, - "require-dev": { - "phpunit/phpunit": "^5.4.6", - "phpunit/phpunit-mock-objects": "!=3.2.4,!=3.2.5", - "symfony/console": "2.*||^3.0" - }, - "suggest": { - "symfony/console": "For helpful console commands such as SQL execution and import of files." - }, - "bin": [ - "bin/doctrine-dbal" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.6.x-dev" - } - }, - "autoload": { - "psr-0": { - "Doctrine\\DBAL\\": "lib/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Roman Borschel", - "email": "roman@code-factory.org" - }, - { - "name": "Benjamin Eberlei", - "email": "kontakt@beberlei.de" - }, - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" - }, - { - "name": "Jonathan Wage", - "email": "jonwage@gmail.com" - } - ], - "description": "Database Abstraction Layer", - "homepage": "http://www.doctrine-project.org", - "keywords": [ - "database", - "dbal", - "persistence", - "queryobject" - ], - "time": "2017-02-25 22:09:19" - }, - { - "name": "doctrine/inflector", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/doctrine/inflector.git", - "reference": "803a2ed9fea02f9ca47cd45395089fe78769a392" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/inflector/zipball/803a2ed9fea02f9ca47cd45395089fe78769a392", - "reference": "803a2ed9fea02f9ca47cd45395089fe78769a392", - "shasum": "" - }, - "require": { - "php": ">=5.3.2" - }, - "require-dev": { - "phpunit/phpunit": "4.*" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1.x-dev" - } - }, - "autoload": { - "psr-0": { - "Doctrine\\Common\\Inflector\\": "lib/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Roman Borschel", - "email": "roman@code-factory.org" - }, - { - "name": "Benjamin Eberlei", - "email": "kontakt@beberlei.de" - }, - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" - }, - { - "name": "Jonathan Wage", - "email": "jonwage@gmail.com" - }, - { - "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com" - } - ], - "description": "Common String Manipulations with regard to casing and singular/plural rules.", - "homepage": "http://www.doctrine-project.org", - "keywords": [ - "inflection", - "pluralize", - "singularize", - "string" - ], - "time": "2016-05-12 17:23:41" - }, - { - "name": "doctrine/instantiator", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/doctrine/instantiator.git", - "reference": "68099b02b60bbf3b088ff5cb67bf506770ef9cac" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/68099b02b60bbf3b088ff5cb67bf506770ef9cac", - "reference": "68099b02b60bbf3b088ff5cb67bf506770ef9cac", - "shasum": "" - }, - "require": { - "php": ">=5.3,<8.0-DEV" - }, - "require-dev": { - "athletic/athletic": "~0.1.8", - "ext-pdo": "*", - "ext-phar": "*", - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "~2.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Marco Pivetta", - "email": "ocramius@gmail.com", - "homepage": "http://ocramius.github.com/" - } - ], - "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", - "homepage": "https://github.com/doctrine/instantiator", - "keywords": [ - "constructor", - "instantiate" - ], - "time": "2017-01-23 09:23:06" + "time": "2017-08-25 06:51:37" }, { "name": "doctrine/lexer", @@ -531,12 +239,12 @@ "source": { "type": "git", "url": "https://github.com/doctrine/lexer.git", - "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c" + "reference": "cc709ba91eee09540091ad5a5f2616727662e41b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/lexer/zipball/83893c552fd2045dd78aef794c31e694c37c0b8c", - "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c", + "url": "https://api.github.com/repos/doctrine/lexer/zipball/cc709ba91eee09540091ad5a5f2616727662e41b", + "reference": "cc709ba91eee09540091ad5a5f2616727662e41b", "shasum": "" }, "require": { @@ -549,8 +257,8 @@ } }, "autoload": { - "psr-0": { - "Doctrine\\Common\\Lexer\\": "lib/" + "psr-4": { + "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer" } }, "notification-url": "https://packagist.org/downloads/", @@ -577,126 +285,30 @@ "lexer", "parser" ], - "time": "2014-09-09 13:34:57" - }, - { - "name": "guzzle/guzzle", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/guzzle/guzzle3.git", - "reference": "f7778ed85e3db90009d79725afd6c3a82dab32fe" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle3/zipball/f7778ed85e3db90009d79725afd6c3a82dab32fe", - "reference": "f7778ed85e3db90009d79725afd6c3a82dab32fe", - "shasum": "" - }, - "require": { - "ext-curl": "*", - "php": ">=5.3.3", - "symfony/event-dispatcher": "~2.1" - }, - "replace": { - "guzzle/batch": "self.version", - "guzzle/cache": "self.version", - "guzzle/common": "self.version", - "guzzle/http": "self.version", - "guzzle/inflection": "self.version", - "guzzle/iterator": "self.version", - "guzzle/log": "self.version", - "guzzle/parser": "self.version", - "guzzle/plugin": "self.version", - "guzzle/plugin-async": "self.version", - "guzzle/plugin-backoff": "self.version", - "guzzle/plugin-cache": "self.version", - "guzzle/plugin-cookie": "self.version", - "guzzle/plugin-curlauth": "self.version", - "guzzle/plugin-error-response": "self.version", - "guzzle/plugin-history": "self.version", - "guzzle/plugin-log": "self.version", - "guzzle/plugin-md5": "self.version", - "guzzle/plugin-mock": "self.version", - "guzzle/plugin-oauth": "self.version", - "guzzle/service": "self.version", - "guzzle/stream": "self.version" - }, - "require-dev": { - "doctrine/cache": "~1.3", - "monolog/monolog": "~1.0", - "phpunit/phpunit": "3.7.*", - "psr/log": "~1.0", - "symfony/class-loader": "~2.1", - "zendframework/zend-cache": "2.*,<2.3", - "zendframework/zend-log": "2.*,<2.3" - }, - "suggest": { - "guzzlehttp/guzzle": "Guzzle 5 has moved to a new package name. The package you have installed, Guzzle 3, is deprecated." - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.9-dev" - } - }, - "autoload": { - "psr-0": { - "Guzzle": "src/", - "Guzzle\\Tests": "tests/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - }, - { - "name": "Guzzle Community", - "homepage": "https://github.com/guzzle/guzzle/contributors" - } - ], - "description": "PHP HTTP client. This library is deprecated in favor of https://packagist.org/packages/guzzlehttp/guzzle", - "homepage": "http://guzzlephp.org/", - "keywords": [ - "client", - "curl", - "framework", - "http", - "http client", - "rest", - "web service" - ], - "abandoned": "guzzlehttp/guzzle", - "time": "2016-10-26 18:22:07" + "time": "2017-07-24 09:37:08" }, { "name": "guzzlehttp/guzzle", - "version": "dev-master", + "version": "6.3.0", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "6a99df94a22f01b4b9c32ed8789cf30d05bdba92" + "reference": "f4db5a78a5ea468d4831de7f0bf9d9415e348699" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/6a99df94a22f01b4b9c32ed8789cf30d05bdba92", - "reference": "6a99df94a22f01b4b9c32ed8789cf30d05bdba92", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/f4db5a78a5ea468d4831de7f0bf9d9415e348699", + "reference": "f4db5a78a5ea468d4831de7f0bf9d9415e348699", "shasum": "" }, "require": { "guzzlehttp/promises": "^1.0", - "guzzlehttp/psr7": "^1.3.1", + "guzzlehttp/psr7": "^1.4", "php": ">=5.5" }, "require-dev": { "ext-curl": "*", - "phpunit/phpunit": "^4.0", + "phpunit/phpunit": "^4.0 || ^5.0", "psr/log": "^1.0" }, "suggest": { @@ -738,7 +350,7 @@ "rest", "web service" ], - "time": "2017-02-19 15:59:27" + "time": "2017-06-22T18:50:49+00:00" }, { "name": "guzzlehttp/promises", @@ -746,12 +358,12 @@ "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646" + "reference": "09e549f5534380c68761260a71f847644d8f65aa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/a59da6cf61d80060647ff4d3eb2c03a2bc694646", - "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646", + "url": "https://api.github.com/repos/guzzle/promises/zipball/09e549f5534380c68761260a71f847644d8f65aa", + "reference": "09e549f5534380c68761260a71f847644d8f65aa", "shasum": "" }, "require": { @@ -789,7 +401,7 @@ "keywords": [ "promise" ], - "time": "2016-12-20 10:07:11" + "time": "2017-05-20 23:14:18" }, { "name": "guzzlehttp/psr7", @@ -797,12 +409,12 @@ "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "41972f428b31bc3ebff0707f63dd2165d3ac4cf6" + "reference": "811b676fbab9c99e359885032e5ebc70e442f5b8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/41972f428b31bc3ebff0707f63dd2165d3ac4cf6", - "reference": "41972f428b31bc3ebff0707f63dd2165d3ac4cf6", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/811b676fbab9c99e359885032e5ebc70e442f5b8", + "reference": "811b676fbab9c99e359885032e5ebc70e442f5b8", "shasum": "" }, "require": { @@ -854,32 +466,35 @@ "uri", "url" ], - "time": "2017-02-18 11:43:27" + "time": "2017-07-17 09:11:21" }, { "name": "mailgun/mailgun-php", - "version": "v2.1.2", + "version": "2.3.4", "source": { "type": "git", "url": "https://github.com/mailgun/mailgun-php.git", - "reference": "54b7f851b8e0241d593897dc2d50906bf4a43995" + "reference": "f58c5914aefa16fa6ed2b5cf9ee84d40cbda1b3a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mailgun/mailgun-php/zipball/54b7f851b8e0241d593897dc2d50906bf4a43995", - "reference": "54b7f851b8e0241d593897dc2d50906bf4a43995", + "url": "https://api.github.com/repos/mailgun/mailgun-php/zipball/f58c5914aefa16fa6ed2b5cf9ee84d40cbda1b3a", + "reference": "f58c5914aefa16fa6ed2b5cf9ee84d40cbda1b3a", "shasum": "" }, "require": { "php": "^5.5|^7.0", + "php-http/client-common": "^1.1", "php-http/discovery": "^1.0", "php-http/httplug": "^1.0", "php-http/message": "^1.0", - "php-http/multipart-stream-builder": "^0.1" + "php-http/multipart-stream-builder": "^1.0", + "webmozart/assert": "^1.2" }, "require-dev": { + "guzzlehttp/psr7": "^1.4", "php-http/guzzle6-adapter": "^1.0", - "phpunit/phpunit": "~4.6" + "phpunit/phpunit": "~4.8" }, "type": "library", "autoload": { @@ -898,49 +513,259 @@ } ], "description": "The Mailgun SDK provides methods for all API functions.", - "time": "2016-08-10T16:58:18+00:00" + "time": "2017-06-20T19:56:09+00:00" }, { - "name": "myclabs/deep-copy", - "version": "1.6.0", + "name": "myclabs/php-enum", + "version": "1.5.2", "source": { "type": "git", - "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "5a5a9fc8025a08d8919be87d6884d5a92520cefe" + "url": "https://github.com/myclabs/php-enum.git", + "reference": "3ed7088cfd0a0e06534b7f8b0eee82acea574fac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/5a5a9fc8025a08d8919be87d6884d5a92520cefe", - "reference": "5a5a9fc8025a08d8919be87d6884d5a92520cefe", + "url": "https://api.github.com/repos/myclabs/php-enum/zipball/3ed7088cfd0a0e06534b7f8b0eee82acea574fac", + "reference": "3ed7088cfd0a0e06534b7f8b0eee82acea574fac", "shasum": "" }, "require": { - "php": ">=5.4.0" + "php": ">=5.3" }, "require-dev": { - "doctrine/collections": "1.*", - "phpunit/phpunit": "~4.1" + "phpunit/phpunit": "^4.8.35|^5.7|^6.0", + "squizlabs/php_codesniffer": "1.*" }, "type": "library", "autoload": { "psr-4": { - "DeepCopy\\": "src/DeepCopy/" + "MyCLabs\\Enum\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], - "description": "Create deep copies (clones) of your objects", - "homepage": "https://github.com/myclabs/DeepCopy", - "keywords": [ - "clone", - "copy", - "duplicate", - "object", - "object graph" + "authors": [ + { + "name": "PHP Enum contributors", + "homepage": "https://github.com/myclabs/php-enum/graphs/contributors" + } ], - "time": "2017-01-26T22:05:40+00:00" + "description": "PHP Enum implementation", + "homepage": "http://github.com/myclabs/php-enum", + "keywords": [ + "enum" + ], + "time": "2017-06-28T16:24:08+00:00" + }, + { + "name": "ocramius/proxy-manager", + "version": "0.5.2", + "source": { + "type": "git", + "url": "https://github.com/Ocramius/ProxyManager.git", + "reference": "0ac0eb3e8e04c7fa75caaf1a43c5405623abf8f5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Ocramius/ProxyManager/zipball/0ac0eb3e8e04c7fa75caaf1a43c5405623abf8f5", + "reference": "0ac0eb3e8e04c7fa75caaf1a43c5405623abf8f5", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "zendframework/zend-code": ">2.2.5,<3.0" + }, + "require-dev": { + "ext-phar": "*", + "phpunit/phpunit": "~4.0", + "squizlabs/php_codesniffer": "1.5.*" + }, + "suggest": { + "ocramius/generated-hydrator": "To have very fast object to array to object conversion for ghost objects", + "zendframework/zend-json": "To have the JsonRpc adapter (Remote Object feature)", + "zendframework/zend-soap": "To have the Soap adapter (Remote Object feature)", + "zendframework/zend-stdlib": "To use the hydrator proxy", + "zendframework/zend-xmlrpc": "To have the XmlRpc adapter (Remote Object feature)" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "0.6.x-dev" + } + }, + "autoload": { + "psr-0": { + "ProxyManager\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com", + "homepage": "http://ocramius.github.com/" + } + ], + "description": "A library providing utilities to generate, instantiate and generally operate with Object Proxies", + "homepage": "https://github.com/Ocramius/ProxyManager", + "keywords": [ + "aop", + "lazy loading", + "proxy", + "proxy pattern", + "service proxies" + ], + "time": "2014-09-28T14:18:11+00:00" + }, + { + "name": "php-di/php-di", + "version": "4.4.10", + "source": { + "type": "git", + "url": "https://github.com/PHP-DI/PHP-DI.git", + "reference": "cc10862b66267b6e6f793eda2867b0aef5b693be" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHP-DI/PHP-DI/zipball/cc10862b66267b6e6f793eda2867b0aef5b693be", + "reference": "cc10862b66267b6e6f793eda2867b0aef5b693be", + "shasum": "" + }, + "require": { + "container-interop/container-interop": "~1.0", + "doctrine/annotations": "~1.2", + "doctrine/cache": "~1.0", + "myclabs/php-enum": "~1.1", + "ocramius/proxy-manager": "~0.5", + "php": ">=5.3.3", + "php-di/phpdoc-reader": "~1.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "DI\\": "src/DI/" + }, + "files": [ + "src/DI/functions.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "PHP-DI is a Container that makes Dependency Injection as practical as possible in PHP", + "homepage": "http://mnapoli.github.com/PHP-DI/", + "keywords": [ + "container", + "dependency injection", + "di" + ], + "time": "2015-07-24T09:21:24+00:00" + }, + { + "name": "php-di/phpdoc-reader", + "version": "1.3.0", + "source": { + "type": "git", + "url": "https://github.com/PHP-DI/PhpDocReader.git", + "reference": "8a6e123fd1ce54f7fcbd71747b3bf04e465da229" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHP-DI/PhpDocReader/zipball/8a6e123fd1ce54f7fcbd71747b3bf04e465da229", + "reference": "8a6e123fd1ce54f7fcbd71747b3bf04e465da229", + "shasum": "" + }, + "require": { + "doctrine/annotations": "1.*", + "php": ">=5.3.0" + }, + "type": "library", + "autoload": { + "psr-0": { + "PhpDocReader": "src/", + "UnitTest": "tests/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "keywords": [ + "phpdoc", + "reflection" + ], + "time": "2014-08-21T08:20:45+00:00" + }, + { + "name": "php-http/client-common", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/php-http/client-common.git", + "reference": "600ea9a5d867a7bbe1c4e03722b8dc2ebc9bd3c8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-http/client-common/zipball/600ea9a5d867a7bbe1c4e03722b8dc2ebc9bd3c8", + "reference": "600ea9a5d867a7bbe1c4e03722b8dc2ebc9bd3c8", + "shasum": "" + }, + "require": { + "php": ">=5.4", + "php-http/httplug": "^1.1", + "php-http/message": "^1.2", + "php-http/message-factory": "^1.0", + "symfony/options-resolver": "^2.6 || ^3.0" + }, + "require-dev": { + "guzzlehttp/psr7": "^1.4", + "henrikbjorn/phpspec-code-coverage": "^1.0", + "phpspec/phpspec": "^2.4" + }, + "suggest": { + "php-http/cache-plugin": "PSR-6 Cache plugin", + "php-http/logger-plugin": "PSR-3 Logger plugin", + "php-http/stopwatch-plugin": "Symfony Stopwatch plugin" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.6-dev" + } + }, + "autoload": { + "psr-4": { + "Http\\Client\\Common\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com" + } + ], + "description": "Common HTTP Client implementations and tools for HTTPlug", + "homepage": "http://httplug.io", + "keywords": [ + "client", + "common", + "http", + "httplug" + ], + "time": "2017-08-05 15:50:10" }, { "name": "php-http/curl-client", @@ -1004,12 +829,12 @@ "source": { "type": "git", "url": "https://github.com/php-http/discovery.git", - "reference": "cc5669d9cb51170ad0278a3b984cd3c7894d6ff9" + "reference": "7b50ab4d6c9fdaa1ed53ae310c955900af6e3372" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/discovery/zipball/cc5669d9cb51170ad0278a3b984cd3c7894d6ff9", - "reference": "cc5669d9cb51170ad0278a3b984cd3c7894d6ff9", + "url": "https://api.github.com/repos/php-http/discovery/zipball/7b50ab4d6c9fdaa1ed53ae310c955900af6e3372", + "reference": "7b50ab4d6c9fdaa1ed53ae310c955900af6e3372", "shasum": "" }, "require": { @@ -1058,7 +883,7 @@ "message", "psr7" ], - "time": "2017-02-12 08:49:24" + "time": "2017-08-03 10:12:53" }, { "name": "php-http/guzzle6-adapter", @@ -1066,12 +891,12 @@ "source": { "type": "git", "url": "https://github.com/php-http/guzzle6-adapter.git", - "reference": "c0168c6e5fa286c3837310d591114d2683b9b9a5" + "reference": "54181ff8455a4c2e1706a53e0d98060b93030321" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/guzzle6-adapter/zipball/c0168c6e5fa286c3837310d591114d2683b9b9a5", - "reference": "c0168c6e5fa286c3837310d591114d2683b9b9a5", + "url": "https://api.github.com/repos/php-http/guzzle6-adapter/zipball/54181ff8455a4c2e1706a53e0d98060b93030321", + "reference": "54181ff8455a4c2e1706a53e0d98060b93030321", "shasum": "" }, "require": { @@ -1085,7 +910,7 @@ }, "require-dev": { "ext-curl": "*", - "php-http/client-integration-tests": "^0.5.1" + "php-http/client-integration-tests": "^0.6" }, "type": "library", "extra": { @@ -1118,7 +943,7 @@ "Guzzle", "http" ], - "time": "2016-08-02 09:03:17" + "time": "2017-05-29 15:06:15" }, { "name": "php-http/httplug", @@ -1126,12 +951,12 @@ "source": { "type": "git", "url": "https://github.com/php-http/httplug.git", - "reference": "f32fefee51cb96e99edb0c4bb1d11b5026ad5069" + "reference": "036f86f0cb1f37c13dd9b5e75b71866e7ab3f60b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/httplug/zipball/f32fefee51cb96e99edb0c4bb1d11b5026ad5069", - "reference": "f32fefee51cb96e99edb0c4bb1d11b5026ad5069", + "url": "https://api.github.com/repos/php-http/httplug/zipball/036f86f0cb1f37c13dd9b5e75b71866e7ab3f60b", + "reference": "036f86f0cb1f37c13dd9b5e75b71866e7ab3f60b", "shasum": "" }, "require": { @@ -1174,7 +999,7 @@ "client", "http" ], - "time": "2017-01-02 06:37:42" + "time": "2017-08-18 18:51:51" }, { "name": "php-http/message", @@ -1182,12 +1007,12 @@ "source": { "type": "git", "url": "https://github.com/php-http/message.git", - "reference": "13df8c48f40ca7925303aa336f19be4b80984f01" + "reference": "2edd63bae5f52f79363c5f18904b05ce3a4b7253" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/message/zipball/13df8c48f40ca7925303aa336f19be4b80984f01", - "reference": "13df8c48f40ca7925303aa336f19be4b80984f01", + "url": "https://api.github.com/repos/php-http/message/zipball/2edd63bae5f52f79363c5f18904b05ce3a4b7253", + "reference": "2edd63bae5f52f79363c5f18904b05ce3a4b7253", "shasum": "" }, "require": { @@ -1196,6 +1021,9 @@ "php-http/message-factory": "^1.0.2", "psr/http-message": "^1.0" }, + "provide": { + "php-http/message-factory-implementation": "1.0" + }, "require-dev": { "akeneo/phpspec-skip-example-extension": "^1.0", "coduo/phpspec-data-provider-extension": "^1.0", @@ -1243,7 +1071,7 @@ "message", "psr-7" ], - "time": "2017-02-14 08:58:37" + "time": "2017-07-05 06:40:53" }, { "name": "php-http/message-factory", @@ -1297,16 +1125,16 @@ }, { "name": "php-http/multipart-stream-builder", - "version": "0.1.6", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/php-http/multipart-stream-builder.git", - "reference": "74d5ac517778ae87a065c6f4076316c35b58a777" + "reference": "0f66890b095841c1606be107d68be250fe8ed768" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/multipart-stream-builder/zipball/74d5ac517778ae87a065c6f4076316c35b58a777", - "reference": "74d5ac517778ae87a065c6f4076316c35b58a777", + "url": "https://api.github.com/repos/php-http/multipart-stream-builder/zipball/0f66890b095841c1606be107d68be250fe8ed768", + "reference": "0f66890b095841c1606be107d68be250fe8ed768", "shasum": "" }, "require": { @@ -1323,7 +1151,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "0.2-dev" + "dev-master": "1.1-dev" } }, "autoload": { @@ -1350,7 +1178,7 @@ "multipart stream", "stream" ], - "time": "2017-02-16T08:52:59+00:00" + "time": "2017-05-21 18:01:57" }, { "name": "php-http/promise", @@ -1402,18 +1230,604 @@ ], "time": "2016-01-28 07:54:12" }, + { + "name": "phpmailer/phpmailer", + "version": "v5.2.25", + "source": { + "type": "git", + "url": "https://github.com/PHPMailer/PHPMailer.git", + "reference": "2baf20b01690fba8cf720c1ebcf9b988eda50915" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/2baf20b01690fba8cf720c1ebcf9b988eda50915", + "reference": "2baf20b01690fba8cf720c1ebcf9b988eda50915", + "shasum": "" + }, + "require": { + "ext-ctype": "*", + "php": ">=5.0.0" + }, + "require-dev": { + "doctrine/annotations": "1.2.*", + "jms/serializer": "0.16.*", + "phpdocumentor/phpdocumentor": "2.*", + "phpunit/phpunit": "4.8.*", + "symfony/debug": "2.8.*", + "symfony/filesystem": "2.8.*", + "symfony/translation": "2.8.*", + "symfony/yaml": "2.8.*", + "zendframework/zend-cache": "2.5.1", + "zendframework/zend-config": "2.5.1", + "zendframework/zend-eventmanager": "2.5.1", + "zendframework/zend-filter": "2.5.1", + "zendframework/zend-i18n": "2.5.1", + "zendframework/zend-json": "2.5.1", + "zendframework/zend-math": "2.5.1", + "zendframework/zend-serializer": "2.5.*", + "zendframework/zend-servicemanager": "2.5.*", + "zendframework/zend-stdlib": "2.5.1" + }, + "suggest": { + "league/oauth2-google": "Needed for Google XOAUTH2 authentication" + }, + "type": "library", + "autoload": { + "classmap": [ + "class.phpmailer.php", + "class.phpmaileroauth.php", + "class.phpmaileroauthgoogle.php", + "class.smtp.php", + "class.pop3.php", + "extras/EasyPeasyICS.php", + "extras/ntlm_sasl_client.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "LGPL-2.1" + ], + "authors": [ + { + "name": "Jim Jagielski", + "email": "jimjag@gmail.com" + }, + { + "name": "Marcus Bointon", + "email": "phpmailer@synchromedia.co.uk" + }, + { + "name": "Andy Prevost", + "email": "codeworxtech@users.sourceforge.net" + }, + { + "name": "Brent R. Matzelle" + } + ], + "description": "PHPMailer is a full-featured email creation and transfer class for PHP", + "time": "2017-08-28T11:12:07+00:00" + }, + { + "name": "psr/container", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/php-fig/container.git", + "reference": "2cc4a01788191489dc7459446ba832fa79a216a7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/container/zipball/2cc4a01788191489dc7459446ba832fa79a216a7", + "reference": "2cc4a01788191489dc7459446ba832fa79a216a7", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Container\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common Container Interface (PHP FIG PSR-11)", + "homepage": "https://github.com/php-fig/container", + "keywords": [ + "PSR-11", + "container", + "container-interface", + "container-interop", + "psr" + ], + "time": "2017-06-28 15:35:32" + }, + { + "name": "psr/http-message", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/php-fig/http-message.git", + "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363", + "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Http\\Message\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interface for HTTP messages", + "homepage": "https://github.com/php-fig/http-message", + "keywords": [ + "http", + "http-message", + "psr", + "psr-7", + "request", + "response" + ], + "time": "2016-08-06 14:39:51" + }, + { + "name": "symfony/options-resolver", + "version": "3.4.x-dev", + "source": { + "type": "git", + "url": "https://github.com/symfony/options-resolver.git", + "reference": "9e2ed813a4683bfa310a45d416b922fd7ede638c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/9e2ed813a4683bfa310a45d416b922fd7ede638c", + "reference": "9e2ed813a4683bfa310a45d416b922fd7ede638c", + "shasum": "" + }, + "require": { + "php": "^5.5.9|>=7.0.8" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.4-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\OptionsResolver\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony OptionsResolver Component", + "homepage": "https://symfony.com", + "keywords": [ + "config", + "configuration", + "options" + ], + "time": "2017-08-03 09:34:20" + }, + { + "name": "webmozart/assert", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/webmozart/assert.git", + "reference": "4a8bf11547e139e77b651365113fc12850c43d9a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/webmozart/assert/zipball/4a8bf11547e139e77b651365113fc12850c43d9a", + "reference": "4a8bf11547e139e77b651365113fc12850c43d9a", + "shasum": "" + }, + "require": { + "php": "^5.3.3 || ^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.6", + "sebastian/version": "^1.0.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.3-dev" + } + }, + "autoload": { + "psr-4": { + "Webmozart\\Assert\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Bernhard Schussek", + "email": "bschussek@gmail.com" + } + ], + "description": "Assertions to validate method input/output with nice error messages.", + "keywords": [ + "assert", + "check", + "validate" + ], + "time": "2016-11-23 20:04:41" + }, + { + "name": "zendframework/zend-code", + "version": "2.6.3", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-code.git", + "reference": "95033f061b083e16cdee60530ec260d7d628b887" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-code/zipball/95033f061b083e16cdee60530ec260d7d628b887", + "reference": "95033f061b083e16cdee60530ec260d7d628b887", + "shasum": "" + }, + "require": { + "php": "^5.5 || 7.0.0 - 7.0.4 || ^7.0.6", + "zendframework/zend-eventmanager": "^2.6 || ^3.0" + }, + "require-dev": { + "doctrine/annotations": "~1.0", + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "^4.8.21", + "zendframework/zend-stdlib": "^2.7 || ^3.0" + }, + "suggest": { + "doctrine/annotations": "Doctrine\\Common\\Annotations >=1.0 for annotation features", + "zendframework/zend-stdlib": "Zend\\Stdlib component" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.6-dev", + "dev-develop": "2.7-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\Code\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "provides facilities to generate arbitrary code using an object oriented interface", + "homepage": "https://github.com/zendframework/zend-code", + "keywords": [ + "code", + "zf2" + ], + "time": "2016-04-20T17:26:42+00:00" + }, + { + "name": "zendframework/zend-eventmanager", + "version": "dev-develop", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-eventmanager.git", + "reference": "071016ade1deee5b8346ec9d8d48935437746c37" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-eventmanager/zipball/071016ade1deee5b8346ec9d8d48935437746c37", + "reference": "071016ade1deee5b8346ec9d8d48935437746c37", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0" + }, + "require-dev": { + "athletic/athletic": "^0.1", + "container-interop/container-interop": "^1.1.0", + "phpunit/phpunit": "^6.0.7 || ^5.7.14", + "zendframework/zend-coding-standard": "~1.0.0", + "zendframework/zend-stdlib": "^2.7.3 || ^3.0" + }, + "suggest": { + "container-interop/container-interop": "^1.1.0, to use the lazy listeners feature", + "zendframework/zend-stdlib": "^2.7.3 || ^3.0, to use the FilterChain feature" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.2-dev", + "dev-develop": "3.3-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\EventManager\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "Trigger and listen to events within a PHP application", + "homepage": "https://github.com/zendframework/zend-eventmanager", + "keywords": [ + "event", + "eventmanager", + "events", + "zf2" + ], + "time": "2017-07-11 19:19:12" + } + ], + "packages-dev": [ + { + "name": "doctrine/instantiator", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/doctrine/instantiator.git", + "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda", + "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda", + "shasum": "" + }, + "require": { + "php": "^7.1" + }, + "require-dev": { + "athletic/athletic": "~0.1.8", + "ext-pdo": "*", + "ext-phar": "*", + "phpunit/phpunit": "^6.2.3", + "squizlabs/php_codesniffer": "^3.0.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.2.x-dev" + } + }, + "autoload": { + "psr-4": { + "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com", + "homepage": "http://ocramius.github.com/" + } + ], + "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", + "homepage": "https://github.com/doctrine/instantiator", + "keywords": [ + "constructor", + "instantiate" + ], + "time": "2017-07-22 11:58:36" + }, + { + "name": "myclabs/deep-copy", + "version": "1.x-dev", + "source": { + "type": "git", + "url": "https://github.com/myclabs/DeepCopy.git", + "reference": "8e6e04167378abf1ddb4d3522d8755c5fd90d102" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/8e6e04167378abf1ddb4d3522d8755c5fd90d102", + "reference": "8e6e04167378abf1ddb4d3522d8755c5fd90d102", + "shasum": "" + }, + "require": { + "php": ">=5.4.0" + }, + "require-dev": { + "doctrine/collections": "1.*", + "phpunit/phpunit": "~4.1" + }, + "type": "library", + "autoload": { + "psr-4": { + "DeepCopy\\": "src/DeepCopy/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Create deep copies (clones) of your objects", + "homepage": "https://github.com/myclabs/DeepCopy", + "keywords": [ + "clone", + "copy", + "duplicate", + "object", + "object graph" + ], + "time": "2017-04-12 18:52:22" + }, + { + "name": "phar-io/manifest", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/phar-io/manifest.git", + "reference": "014feadb268809af7c8e2f7ccd396b8494901f58" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phar-io/manifest/zipball/014feadb268809af7c8e2f7ccd396b8494901f58", + "reference": "014feadb268809af7c8e2f7ccd396b8494901f58", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-phar": "*", + "phar-io/version": "^1.0.1", + "php": "^5.6 || ^7.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + }, + { + "name": "Sebastian Heuer", + "email": "sebastian@phpeople.de", + "role": "Developer" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "Developer" + } + ], + "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", + "time": "2017-04-07T07:07:10+00:00" + }, + { + "name": "phar-io/version", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/phar-io/version.git", + "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phar-io/version/zipball/a70c0ced4be299a63d32fa96d9281d03e94041df", + "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + }, + { + "name": "Sebastian Heuer", + "email": "sebastian@phpeople.de", + "role": "Developer" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "Developer" + } + ], + "description": "Library for handling version information and constraints", + "time": "2017-03-05T17:38:23+00:00" + }, { "name": "phpdocumentor/reflection-common", "version": "dev-master", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionCommon.git", - "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c" + "reference": "a046af61c36e9162372f205de091a1cab7340f1c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c", - "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/a046af61c36e9162372f205de091a1cab7340f1c", + "reference": "a046af61c36e9162372f205de091a1cab7340f1c", "shasum": "" }, "require": { @@ -1454,26 +1868,26 @@ "reflection", "static analysis" ], - "time": "2015-12-27 11:43:31" + "time": "2017-04-30 11:58:12" }, { "name": "phpdocumentor/reflection-docblock", - "version": "3.1.1", + "version": "4.1.1", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e" + "reference": "2d3d238c433cf69caeb4842e97a3223a116f94b2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/8331b5efe816ae05461b7ca1e721c01b46bafb3e", - "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/2d3d238c433cf69caeb4842e97a3223a116f94b2", + "reference": "2d3d238c433cf69caeb4842e97a3223a116f94b2", "shasum": "" }, "require": { - "php": ">=5.5", + "php": "^7.0", "phpdocumentor/reflection-common": "^1.0@dev", - "phpdocumentor/type-resolver": "^0.2.0", + "phpdocumentor/type-resolver": "^0.4.0", "webmozart/assert": "^1.0" }, "require-dev": { @@ -1499,24 +1913,24 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2016-09-30T07:12:33+00:00" + "time": "2017-08-30T18:51:59+00:00" }, { "name": "phpdocumentor/type-resolver", - "version": "0.2.1", + "version": "0.4.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb" + "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb", - "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7", + "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7", "shasum": "" }, "require": { - "php": ">=5.5", + "php": "^5.5 || ^7.0", "phpdocumentor/reflection-common": "^1.0" }, "require-dev": { @@ -1546,67 +1960,7 @@ "email": "me@mikevanriel.com" } ], - "time": "2016-11-25T06:54:22+00:00" - }, - { - "name": "phpmailer/phpmailer", - "version": "v5.2.22", - "source": { - "type": "git", - "url": "https://github.com/PHPMailer/PHPMailer.git", - "reference": "b18cb98131bd83103ccb26a888fdfe3177b8a663" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/b18cb98131bd83103ccb26a888fdfe3177b8a663", - "reference": "b18cb98131bd83103ccb26a888fdfe3177b8a663", - "shasum": "" - }, - "require": { - "php": ">=5.0.0" - }, - "require-dev": { - "phpdocumentor/phpdocumentor": "*", - "phpunit/phpunit": "4.7.*" - }, - "suggest": { - "league/oauth2-google": "Needed for Google XOAUTH2 authentication" - }, - "type": "library", - "autoload": { - "classmap": [ - "class.phpmailer.php", - "class.phpmaileroauth.php", - "class.phpmaileroauthgoogle.php", - "class.smtp.php", - "class.pop3.php", - "extras/EasyPeasyICS.php", - "extras/ntlm_sasl_client.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "LGPL-2.1" - ], - "authors": [ - { - "name": "Jim Jagielski", - "email": "jimjag@gmail.com" - }, - { - "name": "Marcus Bointon", - "email": "phpmailer@synchromedia.co.uk" - }, - { - "name": "Andy Prevost", - "email": "codeworxtech@users.sourceforge.net" - }, - { - "name": "Brent R. Matzelle" - } - ], - "description": "PHPMailer is a full-featured email creation and transfer class for PHP", - "time": "2017-01-09T09:33:47+00:00" + "time": "2017-07-14T14:27:02+00:00" }, { "name": "phpspec/prophecy", @@ -1614,29 +1968,29 @@ "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "6c52c2722f8460122f96f86346600e1077ce22cb" + "reference": "c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/6c52c2722f8460122f96f86346600e1077ce22cb", - "reference": "6c52c2722f8460122f96f86346600e1077ce22cb", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6", + "reference": "c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6", "shasum": "" }, "require": { "doctrine/instantiator": "^1.0.2", "php": "^5.3|^7.0", - "phpdocumentor/reflection-docblock": "^2.0|^3.0.2", - "sebastian/comparator": "^1.1", - "sebastian/recursion-context": "^1.0|^2.0" + "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0", + "sebastian/comparator": "^1.1|^2.0", + "sebastian/recursion-context": "^1.0|^2.0|^3.0" }, "require-dev": { - "phpspec/phpspec": "^2.0", + "phpspec/phpspec": "^2.5|^3.2", "phpunit/phpunit": "^4.8 || ^5.6.5" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.6.x-dev" + "dev-master": "1.7.x-dev" } }, "autoload": { @@ -1669,44 +2023,45 @@ "spy", "stub" ], - "time": "2016-11-21 14:58:47" + "time": "2017-09-04 11:05:03" }, { "name": "phpunit/php-code-coverage", - "version": "4.0.x-dev", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "7a2bfe73aa381a76cb6d13599ae37bf74a12a02f" + "reference": "77a1ba8076365f943e2a3d75573b6c9822840ac6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/7a2bfe73aa381a76cb6d13599ae37bf74a12a02f", - "reference": "7a2bfe73aa381a76cb6d13599ae37bf74a12a02f", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/77a1ba8076365f943e2a3d75573b6c9822840ac6", + "reference": "77a1ba8076365f943e2a3d75573b6c9822840ac6", "shasum": "" }, "require": { - "php": "^5.6 || ^7.0", - "phpunit/php-file-iterator": "~1.3", - "phpunit/php-text-template": "~1.2", - "phpunit/php-token-stream": "^1.4.2", - "sebastian/code-unit-reverse-lookup": "~1.0", - "sebastian/environment": "^1.3.2 || ^2.0", - "sebastian/version": "~1.0|~2.0" + "ext-dom": "*", + "ext-xmlwriter": "*", + "php": "^7.0", + "phpunit/php-file-iterator": "^1.4.2", + "phpunit/php-text-template": "^1.2.1", + "phpunit/php-token-stream": "^2.0", + "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.1.4", - "phpunit/phpunit": "^5.4" + "ext-xdebug": "^2.5", + "phpunit/phpunit": "^6.0" }, "suggest": { - "ext-dom": "*", - "ext-xdebug": ">=2.4.0", - "ext-xmlwriter": "*" + "ext-xdebug": "^2.5.5" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0.x-dev" + "dev-master": "5.2.x-dev" } }, "autoload": { @@ -1732,7 +2087,7 @@ "testing", "xunit" ], - "time": "2017-01-24 16:35:00" + "time": "2017-08-25T06:32:04+00:00" }, { "name": "phpunit/php-file-iterator", @@ -1824,25 +2179,30 @@ }, { "name": "phpunit/php-timer", - "version": "1.0.8", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260" + "reference": "d107f347d368dd8a384601398280c7c608390ab7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/38e9124049cf1a164f1e4537caf19c99bf1eb260", - "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/d107f347d368dd8a384601398280c7c608390ab7", + "reference": "d107f347d368dd8a384601398280c7c608390ab7", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": "^5.3.3 || ^7.0" }, "require-dev": { - "phpunit/phpunit": "~4|~5" + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, "autoload": { "classmap": [ "src/" @@ -1864,7 +2224,7 @@ "keywords": [ "timer" ], - "time": "2016-05-12T18:03:57+00:00" + "time": "2017-03-07 15:42:04" }, { "name": "phpunit/php-token-stream", @@ -1872,25 +2232,25 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "3b402f65a4cc90abf6e1104e388b896ce209631b" + "reference": "9a02332089ac48e704c70f6cefed30c224e3c0b0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3b402f65a4cc90abf6e1104e388b896ce209631b", - "reference": "3b402f65a4cc90abf6e1104e388b896ce209631b", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/9a02332089ac48e704c70f6cefed30c224e3c0b0", + "reference": "9a02332089ac48e704c70f6cefed30c224e3c0b0", "shasum": "" }, "require": { "ext-tokenizer": "*", - "php": ">=5.3.3" + "php": "^7.0" }, "require-dev": { - "phpunit/phpunit": "~4.2" + "phpunit/phpunit": "^6.2.4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "2.0-dev" } }, "autoload": { @@ -1913,20 +2273,20 @@ "keywords": [ "tokenizer" ], - "time": "2016-11-15 14:06:22" + "time": "2017-08-20 05:47:52" }, { "name": "phpunit/phpunit", - "version": "5.7.9", + "version": "6.3.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "69f832b87c731d5cacad7f91948778fe98335fdd" + "reference": "9501bab711403a1ab5b8378a8adb4ec3db3debdb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/69f832b87c731d5cacad7f91948778fe98335fdd", - "reference": "69f832b87c731d5cacad7f91948778fe98335fdd", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9501bab711403a1ab5b8378a8adb4ec3db3debdb", + "reference": "9501bab711403a1ab5b8378a8adb4ec3db3debdb", "shasum": "" }, "require": { @@ -1935,33 +2295,35 @@ "ext-libxml": "*", "ext-mbstring": "*", "ext-xml": "*", - "myclabs/deep-copy": "~1.3", - "php": "^5.6 || ^7.0", - "phpspec/prophecy": "^1.6.2", - "phpunit/php-code-coverage": "^4.0.4", - "phpunit/php-file-iterator": "~1.4", - "phpunit/php-text-template": "~1.2", - "phpunit/php-timer": "^1.0.6", - "phpunit/phpunit-mock-objects": "^3.2", - "sebastian/comparator": "~1.2.2", - "sebastian/diff": "~1.2", - "sebastian/environment": "^1.3.4 || ^2.0", - "sebastian/exporter": "~2.0", - "sebastian/global-state": "^1.0 || ^2.0", - "sebastian/object-enumerator": "~2.0", - "sebastian/resource-operations": "~1.0", - "sebastian/version": "~1.0|~2.0", - "symfony/yaml": "~2.1|~3.0" + "myclabs/deep-copy": "^1.6.1", + "phar-io/manifest": "^1.0.1", + "phar-io/version": "^1.0", + "php": "^7.0", + "phpspec/prophecy": "^1.7", + "phpunit/php-code-coverage": "^5.2.2", + "phpunit/php-file-iterator": "^1.4.2", + "phpunit/php-text-template": "^1.2.1", + "phpunit/php-timer": "^1.0.9", + "phpunit/phpunit-mock-objects": "^4.0.3", + "sebastian/comparator": "^2.0.2", + "sebastian/diff": "^2.0", + "sebastian/environment": "^3.1", + "sebastian/exporter": "^3.1", + "sebastian/global-state": "^2.0", + "sebastian/object-enumerator": "^3.0.3", + "sebastian/resource-operations": "^1.0", + "sebastian/version": "^2.0.1" }, "conflict": { - "phpdocumentor/reflection-docblock": "3.0.2" + "phpdocumentor/reflection-docblock": "3.0.2", + "phpunit/dbunit": "<3.0" }, "require-dev": { "ext-pdo": "*" }, "suggest": { "ext-xdebug": "*", - "phpunit/php-invoker": "~1.1" + "phpunit/php-invoker": "^1.1" }, "bin": [ "phpunit" @@ -1969,7 +2331,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "5.7.x-dev" + "dev-master": "6.3.x-dev" } }, "autoload": { @@ -1995,33 +2357,33 @@ "testing", "xunit" ], - "time": "2017-01-28T06:14:33+00:00" + "time": "2017-08-04T05:20:39+00:00" }, { "name": "phpunit/phpunit-mock-objects", - "version": "3.4.x-dev", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", - "reference": "3ab72b65b39b491e0c011e2e09bb2206c2aa8e24" + "reference": "2f789b59ab89669015ad984afa350c4ec577ade0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/3ab72b65b39b491e0c011e2e09bb2206c2aa8e24", - "reference": "3ab72b65b39b491e0c011e2e09bb2206c2aa8e24", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/2f789b59ab89669015ad984afa350c4ec577ade0", + "reference": "2f789b59ab89669015ad984afa350c4ec577ade0", "shasum": "" }, "require": { - "doctrine/instantiator": "^1.0.2", - "php": "^5.6 || ^7.0", - "phpunit/php-text-template": "^1.2", - "sebastian/exporter": "^1.2 || ^2.0" + "doctrine/instantiator": "^1.0.5", + "php": "^7.0", + "phpunit/php-text-template": "^1.2.1", + "sebastian/exporter": "^3.0" }, "conflict": { - "phpunit/phpunit": "<5.4.0" + "phpunit/phpunit": "<6.0" }, "require-dev": { - "phpunit/phpunit": "^5.4" + "phpunit/phpunit": "^6.0" }, "suggest": { "ext-soap": "*" @@ -2029,7 +2391,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2.x-dev" + "dev-master": "4.0.x-dev" } }, "autoload": { @@ -2054,108 +2416,7 @@ "mock", "xunit" ], - "time": "2016-12-08 20:27:08" - }, - { - "name": "psr/http-message", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/php-fig/http-message.git", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Psr\\Http\\Message\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" - } - ], - "description": "Common interface for HTTP messages", - "homepage": "https://github.com/php-fig/http-message", - "keywords": [ - "http", - "http-message", - "psr", - "psr-7", - "request", - "response" - ], - "time": "2016-08-06 14:39:51" - }, - { - "name": "sabre/event", - "version": "2.0.x-dev", - "source": { - "type": "git", - "url": "https://github.com/fruux/sabre-event.git", - "reference": "337b6f5e10ea6e0b21e22c7e5788dd3883ae73ff" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/fruux/sabre-event/zipball/337b6f5e10ea6e0b21e22c7e5788dd3883ae73ff", - "reference": "337b6f5e10ea6e0b21e22c7e5788dd3883ae73ff", - "shasum": "" - }, - "require": { - "php": ">=5.4.1" - }, - "require-dev": { - "phpunit/phpunit": "*", - "sabre/cs": "~0.0.1" - }, - "type": "library", - "autoload": { - "psr-4": { - "Sabre\\Event\\": "lib/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Evert Pot", - "email": "me@evertpot.com", - "homepage": "http://evertpot.com/", - "role": "Developer" - } - ], - "description": "sabre/event is a library for lightweight event-based programming", - "homepage": "http://sabre.io/event/", - "keywords": [ - "EventEmitter", - "events", - "hooks", - "plugin", - "promise", - "signal" - ], - "time": "2015-05-19 10:24:22" + "time": "2017-08-03T14:08:16+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -2163,19 +2424,19 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", - "reference": "11606652af09e847cdbbbc3ca17df26b1173a454" + "reference": "3488be0a7b346cd6e5361510ed07e88f9bea2e88" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/11606652af09e847cdbbbc3ca17df26b1173a454", - "reference": "11606652af09e847cdbbbc3ca17df26b1173a454", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/3488be0a7b346cd6e5361510ed07e88f9bea2e88", + "reference": "3488be0a7b346cd6e5361510ed07e88f9bea2e88", "shasum": "" }, "require": { - "php": ">=5.6" + "php": "^5.6 || ^7.0" }, "require-dev": { - "phpunit/phpunit": "~5" + "phpunit/phpunit": "^5.7 || ^6.0" }, "type": "library", "extra": { @@ -2200,34 +2461,34 @@ ], "description": "Looks up which function or method a line of code belongs to", "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", - "time": "2016-12-06 20:05:00" + "time": "2017-03-04 10:23:55" }, { "name": "sebastian/comparator", - "version": "1.2.x-dev", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be" + "reference": "fb3213355da37bf91569ca7a944af19bc57b80e9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2b7424b55f5047b47ac6e5ccb20b2aea4011d9be", - "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/fb3213355da37bf91569ca7a944af19bc57b80e9", + "reference": "fb3213355da37bf91569ca7a944af19bc57b80e9", "shasum": "" }, "require": { - "php": ">=5.3.3", - "sebastian/diff": "~1.2", - "sebastian/exporter": "~1.2 || ~2.0" + "php": "^7.0", + "sebastian/diff": "^2.0", + "sebastian/exporter": "^3.0" }, "require-dev": { - "phpunit/phpunit": "~4.4" + "phpunit/phpunit": "^6.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2.x-dev" + "dev-master": "2.1.x-dev" } }, "autoload": { @@ -2258,13 +2519,13 @@ } ], "description": "Provides the functionality to compare PHP values for equality", - "homepage": "http://www.github.com/sebastianbergmann/comparator", + "homepage": "https://github.com/sebastianbergmann/comparator", "keywords": [ "comparator", "compare", "equality" ], - "time": "2017-01-29 09:50:25" + "time": "2017-08-20T14:03:32+00:00" }, { "name": "sebastian/diff", @@ -2272,24 +2533,24 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "d0814318784b7756fb932116acd19ee3b0cbe67a" + "reference": "347c1d8b49c5c3ee30c7040ea6fc446790e6bddd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/d0814318784b7756fb932116acd19ee3b0cbe67a", - "reference": "d0814318784b7756fb932116acd19ee3b0cbe67a", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/347c1d8b49c5c3ee30c7040ea6fc446790e6bddd", + "reference": "347c1d8b49c5c3ee30c7040ea6fc446790e6bddd", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": "^7.0" }, "require-dev": { - "phpunit/phpunit": "~4.8" + "phpunit/phpunit": "^6.2" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "2.0-dev" } }, "autoload": { @@ -2316,7 +2577,7 @@ "keywords": [ "diff" ], - "time": "2016-10-03 07:45:03" + "time": "2017-08-03 08:09:46" }, { "name": "sebastian/environment", @@ -2324,24 +2585,24 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac" + "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/5795ffe5dc5b02460c3e34222fee8cbe245d8fac", - "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/cd0871b3975fb7fc44d11314fd1ee20925fce4f5", + "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5", "shasum": "" }, "require": { - "php": "^5.6 || ^7.0" + "php": "^7.0" }, "require-dev": { - "phpunit/phpunit": "^5.0" + "phpunit/phpunit": "^6.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "3.1.x-dev" } }, "autoload": { @@ -2366,7 +2627,7 @@ "environment", "hhvm" ], - "time": "2016-11-26 07:53:53" + "time": "2017-07-01T08:51:00+00:00" }, { "name": "sebastian/exporter", @@ -2374,26 +2635,26 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4" + "reference": "234199f4528de6d12aaa58b612e98f7d36adb937" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4", - "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/234199f4528de6d12aaa58b612e98f7d36adb937", + "reference": "234199f4528de6d12aaa58b612e98f7d36adb937", "shasum": "" }, "require": { - "php": ">=5.3.3", - "sebastian/recursion-context": "~2.0" + "php": "^7.0", + "sebastian/recursion-context": "^3.0" }, "require-dev": { "ext-mbstring": "*", - "phpunit/phpunit": "~4.4" + "phpunit/phpunit": "^6.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "3.1.x-dev" } }, "autoload": { @@ -2433,7 +2694,7 @@ "export", "exporter" ], - "time": "2016-11-19 08:54:04" + "time": "2017-04-03T13:19:02+00:00" }, { "name": "sebastian/global-state", @@ -2441,19 +2702,19 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "ab3e5ce501d9d45288b53f885a54c87e0cdc7164" + "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/ab3e5ce501d9d45288b53f885a54c87e0cdc7164", - "reference": "ab3e5ce501d9d45288b53f885a54c87e0cdc7164", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4", + "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4", "shasum": "" }, "require": { "php": "^7.0" }, "require-dev": { - "phpunit/phpunit": "^5.7 || ^6.0" + "phpunit/phpunit": "^6.0" }, "suggest": { "ext-uopz": "*" @@ -2484,7 +2745,7 @@ "keywords": [ "global state" ], - "time": "2016-12-12 08:07:45" + "time": "2017-04-27 15:39:26" }, { "name": "sebastian/object-enumerator", @@ -2492,25 +2753,26 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/object-enumerator.git", - "reference": "96f8a3f257b69e8128ad74d3a7fd464bcbaa3b35" + "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/96f8a3f257b69e8128ad74d3a7fd464bcbaa3b35", - "reference": "96f8a3f257b69e8128ad74d3a7fd464bcbaa3b35", + "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/7cfd9e65d11ffb5af41198476395774d4c8a84c5", + "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5", "shasum": "" }, "require": { - "php": ">=5.6", - "sebastian/recursion-context": "~2.0" + "php": "^7.0", + "sebastian/object-reflector": "^1.1.1", + "sebastian/recursion-context": "^3.0" }, "require-dev": { - "phpunit/phpunit": "~5" + "phpunit/phpunit": "^6.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "3.0.x-dev" } }, "autoload": { @@ -2530,7 +2792,52 @@ ], "description": "Traverses array structures and object graphs to enumerate all referenced objects", "homepage": "https://github.com/sebastianbergmann/object-enumerator/", - "time": "2016-11-19 07:35:10" + "time": "2017-08-03T12:35:26+00:00" + }, + { + "name": "sebastian/object-reflector", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/object-reflector.git", + "reference": "773f97c67f28de00d397be301821b06708fca0be" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/773f97c67f28de00d397be301821b06708fca0be", + "reference": "773f97c67f28de00d397be301821b06708fca0be", + "shasum": "" + }, + "require": { + "php": "^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Allows reflection of object attributes, including inherited and non-public ones", + "homepage": "https://github.com/sebastianbergmann/object-reflector/", + "time": "2017-03-29T09:07:27+00:00" }, { "name": "sebastian/recursion-context", @@ -2538,24 +2845,24 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a" + "reference": "a0e54bc9bf04e2c5b302236984cebc277631f0f1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/2c3ba150cbec723aa057506e73a8d33bdb286c9a", - "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/a0e54bc9bf04e2c5b302236984cebc277631f0f1", + "reference": "a0e54bc9bf04e2c5b302236984cebc277631f0f1", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": "^7.0" }, "require-dev": { - "phpunit/phpunit": "~4.4" + "phpunit/phpunit": "^6.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "3.0.x-dev" } }, "autoload": { @@ -2583,7 +2890,7 @@ ], "description": "Provides functionality to recursively process PHP variables", "homepage": "http://www.github.com/sebastianbergmann/recursion-context", - "time": "2016-11-19 07:33:16" + "time": "2017-03-07 15:09:59" }, { "name": "sebastian/resource-operations", @@ -2671,270 +2978,46 @@ "time": "2016-10-03 07:35:21" }, { - "name": "symfony/event-dispatcher", - "version": "2.8.x-dev", + "name": "theseer/tokenizer", + "version": "1.1.0", "source": { "type": "git", - "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "3178c0e247b81da8a0265b460ac23bec6d2e6627" + "url": "https://github.com/theseer/tokenizer.git", + "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/3178c0e247b81da8a0265b460ac23bec6d2e6627", - "reference": "3178c0e247b81da8a0265b460ac23bec6d2e6627", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/cb2f008f3f05af2893a87208fe6a6c4985483f8b", + "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b", "shasum": "" }, "require": { - "php": ">=5.3.9" - }, - "require-dev": { - "psr/log": "~1.0", - "symfony/config": "^2.0.5|~3.0.0", - "symfony/dependency-injection": "~2.6|~3.0.0", - "symfony/expression-language": "~2.6|~3.0.0", - "symfony/stopwatch": "~2.3|~3.0.0" - }, - "suggest": { - "symfony/dependency-injection": "", - "symfony/http-kernel": "" + "ext-dom": "*", + "ext-tokenizer": "*", + "ext-xmlwriter": "*", + "php": "^7.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.8-dev" - } - }, "autoload": { - "psr-4": { - "Symfony\\Component\\EventDispatcher\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" + "classmap": [ + "src/" ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony EventDispatcher Component", - "homepage": "https://symfony.com", - "time": "2017-02-18 19:13:35" - }, - { - "name": "symfony/yaml", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/symfony/yaml.git", - "reference": "7928849b226f065dae93ec0e8be3b829f73ba67b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/7928849b226f065dae93ec0e8be3b829f73ba67b", - "reference": "7928849b226f065dae93ec0e8be3b829f73ba67b", - "shasum": "" - }, - "require": { - "php": ">=5.5.9" - }, - "require-dev": { - "symfony/console": "~2.8|~3.0" - }, - "suggest": { - "symfony/console": "For validating YAML files using the lint command" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.3-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Yaml\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Yaml Component", - "homepage": "https://symfony.com", - "time": "2017-01-21 17:10:26" - }, - { - "name": "vlucas/spot2", - "version": "2.0.4", - "source": { - "type": "git", - "url": "https://github.com/vlucas/spot2.git", - "reference": "f30e5439c1c8d969490d773bc3f87937e675083a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/vlucas/spot2/zipball/f30e5439c1c8d969490d773bc3f87937e675083a", - "reference": "f30e5439c1c8d969490d773bc3f87937e675083a", - "shasum": "" - }, - "require": { - "doctrine/dbal": "~2.4", - "php": ">=5.4", - "sabre/event": "~2.0", - "vlucas/valitron": "1.x" - }, - "type": "library", - "autoload": { - "psr-0": { - "Spot": "lib/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD" - ], - "authors": [ - { - "name": "Vance Lucas", - "email": "vance@vancelucas.com", - "homepage": "http://www.vancelucas.com", + "name": "Arne Blankerts", + "email": "arne@blankerts.de", "role": "Developer" } ], - "description": "Simple DataMapper built on top of Doctrine DBAL", - "homepage": "https://github.com/vlucas/spot2", - "keywords": [ - "database", - "datamapper", - "dbal", - "doctrine", - "entity", - "mapper", - "model", - "orm" - ], - "time": "2014-07-03T14:29:08+00:00" - }, - { - "name": "vlucas/valitron", - "version": "v1.4.0", - "source": { - "type": "git", - "url": "https://github.com/vlucas/valitron.git", - "reference": "b33c79116260637337187b7125f955ae26d306cc" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/vlucas/valitron/zipball/b33c79116260637337187b7125f955ae26d306cc", - "reference": "b33c79116260637337187b7125f955ae26d306cc", - "shasum": "" - }, - "require": { - "php": ">=5.3.2" - }, - "require-dev": { - "phpunit/phpunit": "~4.0" - }, - "type": "library", - "autoload": { - "psr-0": { - "Valitron": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD" - ], - "authors": [ - { - "name": "Vance Lucas", - "email": "vance@vancelucas.com", - "homepage": "http://www.vancelucas.com" - } - ], - "description": "Simple, elegant, stand-alone validation library with NO dependencies", - "homepage": "http://github.com/vlucas/valitron", - "keywords": [ - "valid", - "validation", - "validator" - ], - "time": "2017-02-23T08:31:59+00:00" - }, - { - "name": "webmozart/assert", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/webmozart/assert.git", - "reference": "4a8bf11547e139e77b651365113fc12850c43d9a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/webmozart/assert/zipball/4a8bf11547e139e77b651365113fc12850c43d9a", - "reference": "4a8bf11547e139e77b651365113fc12850c43d9a", - "shasum": "" - }, - "require": { - "php": "^5.3.3 || ^7.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.6", - "sebastian/version": "^1.0.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.3-dev" - } - }, - "autoload": { - "psr-4": { - "Webmozart\\Assert\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Bernhard Schussek", - "email": "bschussek@gmail.com" - } - ], - "description": "Assertions to validate method input/output with nice error messages.", - "keywords": [ - "assert", - "check", - "validate" - ], - "time": "2016-11-23 20:04:41" + "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", + "time": "2017-04-07T12:08:54+00:00" } ], - "packages-dev": [], "aliases": [], "minimum-stability": "dev", "stability-flags": [], From 7ca00fecbe88aa90ff48bc208985784ea57fcaa7 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Thu, 7 Sep 2017 20:31:57 -0400 Subject: [PATCH 039/248] Add strongly typed constructor args on BusinessLogic layer --- api/BusinessLogic/Attachments/AttachmentHandler.php | 6 +++++- api/BusinessLogic/Categories/CategoryHandler.php | 5 ++++- api/BusinessLogic/Categories/CategoryRetriever.php | 3 ++- api/BusinessLogic/Emails/EmailSenderHelper.php | 4 +++- api/BusinessLogic/Emails/EmailTemplateParser.php | 6 +++++- api/BusinessLogic/Emails/ParsedEmailProperties.php | 6 ------ .../Navigation/CustomNavElementHandler.php | 2 +- api/BusinessLogic/Security/BanRetriever.php | 2 +- api/BusinessLogic/Security/UserContextBuilder.php | 2 +- api/BusinessLogic/Security/UserToTicketChecker.php | 2 +- api/BusinessLogic/Settings/ApiChecker.php | 2 +- api/BusinessLogic/Settings/SettingsRetriever.php | 2 +- api/BusinessLogic/Statuses/StatusRetriever.php | 2 +- api/BusinessLogic/Tickets/Autoassigner.php | 3 ++- api/BusinessLogic/Tickets/NewTicketValidator.php | 4 +++- api/BusinessLogic/Tickets/TicketCreator.php | 11 +++++++++-- api/BusinessLogic/Tickets/TicketDeleter.php | 4 +++- api/BusinessLogic/Tickets/TicketEditor.php | 3 ++- api/BusinessLogic/Tickets/TicketRetriever.php | 3 ++- api/BusinessLogic/Tickets/TicketValidators.php | 2 +- api/BusinessLogic/Tickets/TrackingIdGenerator.php | 2 +- api/BusinessLogic/Tickets/VerifiedEmailChecker.php | 2 +- 22 files changed, 50 insertions(+), 28 deletions(-) diff --git a/api/BusinessLogic/Attachments/AttachmentHandler.php b/api/BusinessLogic/Attachments/AttachmentHandler.php index 3a874ae9..08c3d39a 100644 --- a/api/BusinessLogic/Attachments/AttachmentHandler.php +++ b/api/BusinessLogic/Attachments/AttachmentHandler.php @@ -33,7 +33,11 @@ class AttachmentHandler { /* @var $userToTicketChecker UserToTicketChecker */ private $userToTicketChecker; - function __construct($ticketGateway, $attachmentGateway, $fileWriter, $userToTicketChecker, $fileDeleter) { + function __construct(TicketGateway $ticketGateway, + AttachmentGateway $attachmentGateway, + FileWriter $fileWriter, + UserToTicketChecker $userToTicketChecker, + FileDeleter $fileDeleter) { $this->ticketGateway = $ticketGateway; $this->attachmentGateway = $attachmentGateway; $this->fileWriter = $fileWriter; diff --git a/api/BusinessLogic/Categories/CategoryHandler.php b/api/BusinessLogic/Categories/CategoryHandler.php index 8c6c42ca..5a40255a 100644 --- a/api/BusinessLogic/Categories/CategoryHandler.php +++ b/api/BusinessLogic/Categories/CategoryHandler.php @@ -26,7 +26,10 @@ class CategoryHandler { /* @var $modsForHeskSettingsGateway ModsForHeskSettingsGateway */ private $modsForHeskSettingsGateway; - function __construct($categoryGateway, $ticketGateway, $permissionChecker, $modsForHeskSettingsGateway) { + function __construct(CategoryGateway $categoryGateway, + TicketGateway $ticketGateway, + PermissionChecker $permissionChecker, + ModsForHeskSettingsGateway $modsForHeskSettingsGateway) { $this->categoryGateway = $categoryGateway; $this->ticketGateway = $ticketGateway; $this->permissionChecker = $permissionChecker; diff --git a/api/BusinessLogic/Categories/CategoryRetriever.php b/api/BusinessLogic/Categories/CategoryRetriever.php index 88fa413c..526d9f88 100644 --- a/api/BusinessLogic/Categories/CategoryRetriever.php +++ b/api/BusinessLogic/Categories/CategoryRetriever.php @@ -17,7 +17,8 @@ class CategoryRetriever { */ private $modsForHeskSettingsGateway; - function __construct($categoryGateway, $modsForHeskSettingsGateway) { + function __construct(CategoryGateway $categoryGateway, + ModsForHeskSettingsGateway $modsForHeskSettingsGateway) { $this->categoryGateway = $categoryGateway; $this->modsForHeskSettingsGateway = $modsForHeskSettingsGateway; } diff --git a/api/BusinessLogic/Emails/EmailSenderHelper.php b/api/BusinessLogic/Emails/EmailSenderHelper.php index b02453ab..5c6b23cb 100644 --- a/api/BusinessLogic/Emails/EmailSenderHelper.php +++ b/api/BusinessLogic/Emails/EmailSenderHelper.php @@ -21,7 +21,9 @@ class EmailSenderHelper { */ private $mailgunEmailSender; - function __construct($emailTemplateParser, $basicEmailSender, $mailgunEmailSender) { + function __construct(EmailTemplateParser $emailTemplateParser, + BasicEmailSender $basicEmailSender, + MailgunEmailSender $mailgunEmailSender) { $this->emailTemplateParser = $emailTemplateParser; $this->basicEmailSender = $basicEmailSender; $this->mailgunEmailSender = $mailgunEmailSender; diff --git a/api/BusinessLogic/Emails/EmailTemplateParser.php b/api/BusinessLogic/Emails/EmailTemplateParser.php index e53a03b2..e96db960 100644 --- a/api/BusinessLogic/Emails/EmailTemplateParser.php +++ b/api/BusinessLogic/Emails/EmailTemplateParser.php @@ -35,7 +35,10 @@ class EmailTemplateParser { */ private $emailTemplateRetriever; - function __construct($statusGateway, $categoryGateway, $userGateway, $emailTemplateRetriever) { + function __construct(StatusGateway $statusGateway, + CategoryGateway $categoryGateway, + UserGateway $userGateway, + EmailTemplateRetriever $emailTemplateRetriever) { $this->statusGateway = $statusGateway; $this->categoryGateway = $categoryGateway; $this->userGateway = $userGateway; @@ -50,6 +53,7 @@ class EmailTemplateParser { * @param $modsForHeskSettings array * @return ParsedEmailProperties * @throws InvalidEmailTemplateException + * @throws \Exception */ function getFormattedEmailForLanguage($templateId, $languageCode, $ticket, $heskSettings, $modsForHeskSettings) { global $hesklang; diff --git a/api/BusinessLogic/Emails/ParsedEmailProperties.php b/api/BusinessLogic/Emails/ParsedEmailProperties.php index 5cbe594f..a0421bca 100644 --- a/api/BusinessLogic/Emails/ParsedEmailProperties.php +++ b/api/BusinessLogic/Emails/ParsedEmailProperties.php @@ -1,10 +1,4 @@ customNavElementGateway = $customNavElementGateway; } diff --git a/api/BusinessLogic/Security/BanRetriever.php b/api/BusinessLogic/Security/BanRetriever.php index e44fa344..66213cf5 100644 --- a/api/BusinessLogic/Security/BanRetriever.php +++ b/api/BusinessLogic/Security/BanRetriever.php @@ -11,7 +11,7 @@ class BanRetriever { */ private $banGateway; - function __construct($banGateway) { + function __construct(BanGateway $banGateway) { $this->banGateway = $banGateway; } diff --git a/api/BusinessLogic/Security/UserContextBuilder.php b/api/BusinessLogic/Security/UserContextBuilder.php index 65c4972e..7bb975ee 100644 --- a/api/BusinessLogic/Security/UserContextBuilder.php +++ b/api/BusinessLogic/Security/UserContextBuilder.php @@ -14,7 +14,7 @@ class UserContextBuilder { */ private $userGateway; - function __construct($userGateway) { + function __construct(UserGateway $userGateway) { $this->userGateway = $userGateway; } diff --git a/api/BusinessLogic/Security/UserToTicketChecker.php b/api/BusinessLogic/Security/UserToTicketChecker.php index 3da75192..9a2f9c90 100644 --- a/api/BusinessLogic/Security/UserToTicketChecker.php +++ b/api/BusinessLogic/Security/UserToTicketChecker.php @@ -10,7 +10,7 @@ class UserToTicketChecker { /* @var $userGateway UserGateway */ private $userGateway; - function __construct($userGateway) { + function __construct(UserGateway $userGateway) { $this->userGateway = $userGateway; } diff --git a/api/BusinessLogic/Settings/ApiChecker.php b/api/BusinessLogic/Settings/ApiChecker.php index 863a6e06..8645dd5c 100644 --- a/api/BusinessLogic/Settings/ApiChecker.php +++ b/api/BusinessLogic/Settings/ApiChecker.php @@ -9,7 +9,7 @@ class ApiChecker { /* @var $modsForHeskSettingsGateway ModsForHeskSettingsGateway */ private $modsForHeskSettingsGateway; - function __construct($modsForHeskSettingsGateway) { + function __construct(ModsForHeskSettingsGateway $modsForHeskSettingsGateway) { $this->modsForHeskSettingsGateway = $modsForHeskSettingsGateway; } diff --git a/api/BusinessLogic/Settings/SettingsRetriever.php b/api/BusinessLogic/Settings/SettingsRetriever.php index e8db0e48..21eeb13a 100644 --- a/api/BusinessLogic/Settings/SettingsRetriever.php +++ b/api/BusinessLogic/Settings/SettingsRetriever.php @@ -9,7 +9,7 @@ class SettingsRetriever { /* @var $modsForHeskSettingsGateway ModsForHeskSettingsGateway */ private $modsForHeskSettingsGateway; - function __construct($modsForHeskSettingsGateway) { + function __construct(ModsForHeskSettingsGateway $modsForHeskSettingsGateway) { $this->modsForHeskSettingsGateway = $modsForHeskSettingsGateway; } diff --git a/api/BusinessLogic/Statuses/StatusRetriever.php b/api/BusinessLogic/Statuses/StatusRetriever.php index 0bcfe844..181ceae1 100644 --- a/api/BusinessLogic/Statuses/StatusRetriever.php +++ b/api/BusinessLogic/Statuses/StatusRetriever.php @@ -10,7 +10,7 @@ class StatusRetriever { /* @var $statusGateway StatusGateway */ private $statusGateway; - function __construct($statusGateway) { + function __construct(StatusGateway $statusGateway) { $this->statusGateway = $statusGateway; } diff --git a/api/BusinessLogic/Tickets/Autoassigner.php b/api/BusinessLogic/Tickets/Autoassigner.php index 49723095..e4095815 100644 --- a/api/BusinessLogic/Tickets/Autoassigner.php +++ b/api/BusinessLogic/Tickets/Autoassigner.php @@ -15,7 +15,8 @@ class Autoassigner { /* @var $userGateway UserGateway */ private $userGateway; - function __construct($categoryGateway, $userGateway) { + function __construct(CategoryGateway $categoryGateway, + UserGateway $userGateway) { $this->categoryGateway = $categoryGateway; $this->userGateway = $userGateway; } diff --git a/api/BusinessLogic/Tickets/NewTicketValidator.php b/api/BusinessLogic/Tickets/NewTicketValidator.php index bb80a1f8..7697f860 100644 --- a/api/BusinessLogic/Tickets/NewTicketValidator.php +++ b/api/BusinessLogic/Tickets/NewTicketValidator.php @@ -24,7 +24,9 @@ class NewTicketValidator { */ private $ticketValidators; - function __construct($categoryRetriever, $banRetriever, $ticketValidators) { + function __construct(CategoryRetriever $categoryRetriever, + BanRetriever $banRetriever, + TicketValidators $ticketValidators) { $this->categoryRetriever = $categoryRetriever; $this->banRetriever = $banRetriever; $this->ticketValidators = $ticketValidators; diff --git a/api/BusinessLogic/Tickets/TicketCreator.php b/api/BusinessLogic/Tickets/TicketCreator.php index 245da2a1..d9e8c346 100644 --- a/api/BusinessLogic/Tickets/TicketCreator.php +++ b/api/BusinessLogic/Tickets/TicketCreator.php @@ -56,8 +56,15 @@ class TicketCreator { /* @var $modsForHeskSettingsGateway ModsForHeskSettingsGateway */ private $modsForHeskSettingsGateway; - function __construct($newTicketValidator, $trackingIdGenerator, $autoassigner, $statusGateway, $ticketGateway, - $verifiedEmailChecker, $emailSenderHelper, $userGateway, $modsForHeskSettingsGateway) { + function __construct(NewTicketValidator $newTicketValidator, + TrackingIdGenerator $trackingIdGenerator, + Autoassigner $autoassigner, + StatusGateway $statusGateway, + TicketGateway $ticketGateway, + VerifiedEmailChecker $verifiedEmailChecker, + EmailSenderHelper $emailSenderHelper, + UserGateway $userGateway, + ModsForHeskSettingsGateway $modsForHeskSettingsGateway) { $this->newTicketValidator = $newTicketValidator; $this->trackingIdGenerator = $trackingIdGenerator; $this->autoassigner = $autoassigner; diff --git a/api/BusinessLogic/Tickets/TicketDeleter.php b/api/BusinessLogic/Tickets/TicketDeleter.php index fde51ee7..7d1fa4d9 100644 --- a/api/BusinessLogic/Tickets/TicketDeleter.php +++ b/api/BusinessLogic/Tickets/TicketDeleter.php @@ -20,7 +20,9 @@ class TicketDeleter { /* @var $attachmentHandler AttachmentHandler */ private $attachmentHandler; - function __construct($ticketGateway, $userToTicketChecker, $attachmentHandler) { + function __construct(TicketGateway $ticketGateway, + UserToTicketChecker $userToTicketChecker, + AttachmentHandler $attachmentHandler) { $this->ticketGateway = $ticketGateway; $this->userToTicketChecker = $userToTicketChecker; $this->attachmentHandler = $attachmentHandler; diff --git a/api/BusinessLogic/Tickets/TicketEditor.php b/api/BusinessLogic/Tickets/TicketEditor.php index a5fe9774..ac0bca61 100644 --- a/api/BusinessLogic/Tickets/TicketEditor.php +++ b/api/BusinessLogic/Tickets/TicketEditor.php @@ -22,7 +22,8 @@ class TicketEditor { /* @var $userToTicketChecker UserToTicketChecker */ private $userToTicketChecker; - function __construct($ticketGateway, $userToTicketChecker) { + function __construct(TicketGateway $ticketGateway, + UserToTicketChecker $userToTicketChecker) { $this->ticketGateway = $ticketGateway; $this->userToTicketChecker = $userToTicketChecker; } diff --git a/api/BusinessLogic/Tickets/TicketRetriever.php b/api/BusinessLogic/Tickets/TicketRetriever.php index 5a237a98..569210ef 100644 --- a/api/BusinessLogic/Tickets/TicketRetriever.php +++ b/api/BusinessLogic/Tickets/TicketRetriever.php @@ -19,7 +19,8 @@ class TicketRetriever { /* @var $userToTicketChecker UserToTicketChecker */ private $userToTicketChecker; - function __construct($ticketGateway, $userToTicketChecker) { + function __construct(TicketGateway $ticketGateway, + UserToTicketChecker $userToTicketChecker) { $this->ticketGateway = $ticketGateway; $this->userToTicketChecker = $userToTicketChecker; } diff --git a/api/BusinessLogic/Tickets/TicketValidators.php b/api/BusinessLogic/Tickets/TicketValidators.php index 15a53bb3..ff310757 100644 --- a/api/BusinessLogic/Tickets/TicketValidators.php +++ b/api/BusinessLogic/Tickets/TicketValidators.php @@ -10,7 +10,7 @@ class TicketValidators { */ private $ticketGateway; - function __construct($ticketGateway) { + function __construct(TicketGateway $ticketGateway) { $this->ticketGateway = $ticketGateway; } diff --git a/api/BusinessLogic/Tickets/TrackingIdGenerator.php b/api/BusinessLogic/Tickets/TrackingIdGenerator.php index 623ab1fe..892953e5 100644 --- a/api/BusinessLogic/Tickets/TrackingIdGenerator.php +++ b/api/BusinessLogic/Tickets/TrackingIdGenerator.php @@ -12,7 +12,7 @@ class TrackingIdGenerator { */ private $ticketGateway; - function __construct($ticketGateway) { + function __construct(TicketGateway $ticketGateway) { $this->ticketGateway = $ticketGateway; } diff --git a/api/BusinessLogic/Tickets/VerifiedEmailChecker.php b/api/BusinessLogic/Tickets/VerifiedEmailChecker.php index fccb32fc..3846fbc3 100644 --- a/api/BusinessLogic/Tickets/VerifiedEmailChecker.php +++ b/api/BusinessLogic/Tickets/VerifiedEmailChecker.php @@ -17,7 +17,7 @@ class VerifiedEmailChecker { */ private $verifiedEmailGateway; - function __construct($verifiedEmailGateway) { + function __construct(VerifiedEmailGateway $verifiedEmailGateway) { $this->verifiedEmailGateway = $verifiedEmailGateway; } From be42fe04fbd06457a5f0ab9a9d77621360a5ae1e Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Sat, 9 Sep 2017 21:24:05 -0400 Subject: [PATCH 040/248] Use a proper DI system --- api/ApplicationContext.php | 127 ------------------ .../PublicAttachmentController.php | 2 +- .../StaffTicketAttachmentsController.php | 6 +- .../Categories/CategoryController.php | 10 +- .../Navigation/CustomNavElementController.php | 13 +- .../Settings/SettingsController.php | 6 +- api/Controllers/Statuses/StatusController.php | 2 +- .../Tickets/CustomerTicketController.php | 4 +- .../ResendTicketEmailToCustomerController.php | 6 +- .../Tickets/StaffTicketController.php | 6 +- api/autoload.php | 5 +- api/composer.json | 8 +- api/composer.lock | 44 +++--- api/index.php | 12 +- 14 files changed, 69 insertions(+), 182 deletions(-) delete mode 100644 api/ApplicationContext.php diff --git a/api/ApplicationContext.php b/api/ApplicationContext.php deleted file mode 100644 index 8dbb6079..00000000 --- a/api/ApplicationContext.php +++ /dev/null @@ -1,127 +0,0 @@ -get = array(); - - $this->get[PermissionChecker::class] = new PermissionChecker(); - $this->get[ModsForHeskSettingsGateway::class] = new ModsForHeskSettingsGateway(); - $this->get[CustomNavElementGateway::class] = new CustomNavElementGateway(); - $this->get[LoggingGateway::class] = new LoggingGateway(); - $this->get[VerifiedEmailGateway::class] = new VerifiedEmailGateway(); - $this->get[UserGateway::class] = new UserGateway(); - $this->get[CategoryGateway::class] = new CategoryGateway(); - $this->get[BanGateway::class] = new BanGateway(); - $this->get[StatusGateway::class] = new StatusGateway(); - $this->get[BasicEmailSender::class] = new BasicEmailSender(); - $this->get[MailgunEmailSender::class] = new MailgunEmailSender(); - $this->get[EmailTemplateRetriever::class] = new EmailTemplateRetriever(); - $this->get[TicketGateway::class] = new TicketGateway(); - $this->get[FileWriter::class] = new FileWriter(); - $this->get[FileReader::class] = new FileReader(); - $this->get[FileDeleter::class] = new FileDeleter(); - $this->get[AttachmentGateway::class] = new AttachmentGateway(); - - $this->get[ApiChecker::class] = new ApiChecker($this->get[ModsForHeskSettingsGateway::class]); - $this->get[CustomNavElementHandler::class] = new CustomNavElementHandler($this->get[CustomNavElementGateway::class]); - $this->get[VerifiedEmailChecker::class] = new VerifiedEmailChecker($this->get[VerifiedEmailGateway::class]); - $this->get[UserContextBuilder::class] = new UserContextBuilder($this->get[UserGateway::class]); - $this->get[BanRetriever::class] = new BanRetriever($this->get[BanGateway::class]); - $this->get[UserToTicketChecker::class] = new UserToTicketChecker($this->get[UserGateway::class]); - $this->get[StatusRetriever::class] = new StatusRetriever($this->get[StatusGateway::class]); - $this->get[SettingsRetriever::class] = new SettingsRetriever($this->get[ModsForHeskSettingsGateway::class]); - $this->get[TicketValidators::class] = new TicketValidators($this->get[TicketGateway::class]); - $this->get[TrackingIdGenerator::class] = new TrackingIdGenerator($this->get[TicketGateway::class]); - $this->get[Autoassigner::class] = new Autoassigner($this->get[CategoryGateway::class], $this->get[UserGateway::class]); - $this->get[CategoryRetriever::class] = new CategoryRetriever($this->get[CategoryGateway::class], - $this->get[ModsForHeskSettingsGateway::class]); - $this->get[CategoryHandler::class] = new CategoryHandler( - $this->get[CategoryGateway::class], - $this->get[TicketGateway::class], - $this->get[PermissionChecker::class], - $this->get[ModsForHeskSettingsGateway::class]); - $this->get[EmailTemplateParser::class] = new EmailTemplateParser($this->get[StatusGateway::class], - $this->get[CategoryGateway::class], - $this->get[UserGateway::class], - $this->get[EmailTemplateRetriever::class]); - $this->get[EmailSenderHelper::class] = new EmailSenderHelper($this->get[EmailTemplateParser::class], - $this->get[BasicEmailSender::class], - $this->get[MailgunEmailSender::class]); - $this->get[TicketRetriever::class] = new TicketRetriever($this->get[TicketGateway::class], - $this->get[UserToTicketChecker::class]); - $this->get[NewTicketValidator::class] = new NewTicketValidator($this->get[CategoryRetriever::class], - $this->get[BanRetriever::class], - $this->get[TicketValidators::class]); - $this->get[TicketCreator::class] = new TicketCreator($this->get[NewTicketValidator::class], - $this->get[TrackingIdGenerator::class], - $this->get[Autoassigner::class], - $this->get[StatusGateway::class], - $this->get[TicketGateway::class], - $this->get[VerifiedEmailChecker::class], - $this->get[EmailSenderHelper::class], - $this->get[UserGateway::class], - $this->get[ModsForHeskSettingsGateway::class]); - $this->get[AttachmentHandler::class] = new AttachmentHandler($this->get[TicketGateway::class], - $this->get[AttachmentGateway::class], - $this->get[FileWriter::class], - $this->get[UserToTicketChecker::class], - $this->get[FileDeleter::class]); - $this->get[AttachmentRetriever::class] = new AttachmentRetriever($this->get[AttachmentGateway::class], - $this->get[FileReader::class], - $this->get[TicketGateway::class], - $this->get[UserToTicketChecker::class]); - $this->get[TicketDeleter::class] = - new TicketDeleter($this->get[TicketGateway::class], - $this->get[UserToTicketChecker::class], - $this->get[AttachmentHandler::class]); - $this->get[TicketEditor::class] = - new TicketEditor($this->get[TicketGateway::class], $this->get[UserToTicketChecker::class]); - } -} \ No newline at end of file diff --git a/api/Controllers/Attachments/PublicAttachmentController.php b/api/Controllers/Attachments/PublicAttachmentController.php index c5e9077c..c12325a5 100644 --- a/api/Controllers/Attachments/PublicAttachmentController.php +++ b/api/Controllers/Attachments/PublicAttachmentController.php @@ -14,7 +14,7 @@ class PublicAttachmentController { self::verifyAttachmentsAreEnabled($hesk_settings); /* @var $attachmentRetriever AttachmentRetriever */ - $attachmentRetriever = $applicationContext->get[AttachmentRetriever::class]; + $attachmentRetriever = $applicationContext->get(AttachmentRetriever::class); $attachment = $attachmentRetriever->getAttachmentContentsForTrackingId($trackingId, $attachmentId, $userContext, $hesk_settings); diff --git a/api/Controllers/Attachments/StaffTicketAttachmentsController.php b/api/Controllers/Attachments/StaffTicketAttachmentsController.php index 1d32f812..7f6a09c0 100644 --- a/api/Controllers/Attachments/StaffTicketAttachmentsController.php +++ b/api/Controllers/Attachments/StaffTicketAttachmentsController.php @@ -18,7 +18,7 @@ class StaffTicketAttachmentsController { $this->verifyAttachmentsAreEnabled($hesk_settings); /* @var $attachmentRetriever AttachmentRetriever */ - $attachmentRetriever = $applicationContext->get[AttachmentRetriever::class]; + $attachmentRetriever = $applicationContext->get(AttachmentRetriever::class); $contents = $attachmentRetriever->getAttachmentContentsForTicket($ticketId, $attachmentId, $userContext, $hesk_settings); @@ -37,7 +37,7 @@ class StaffTicketAttachmentsController { $this->verifyAttachmentsAreEnabled($hesk_settings); /* @var $attachmentHandler AttachmentHandler */ - $attachmentHandler = $applicationContext->get[AttachmentHandler::class]; + $attachmentHandler = $applicationContext->get(AttachmentHandler::class); $createAttachmentForTicketModel = $this->createModel(JsonRetriever::getJsonData(), $ticketId); @@ -61,7 +61,7 @@ class StaffTicketAttachmentsController { global $applicationContext, $hesk_settings, $userContext; /* @var $attachmentHandler AttachmentHandler */ - $attachmentHandler = $applicationContext->get[AttachmentHandler::class]; + $attachmentHandler = $applicationContext->get(AttachmentHandler::class); $attachmentHandler->deleteAttachmentFromTicket($ticketId, $attachmentId, $userContext, $hesk_settings); diff --git a/api/Controllers/Categories/CategoryController.php b/api/Controllers/Categories/CategoryController.php index 8daa326f..e72f680b 100644 --- a/api/Controllers/Categories/CategoryController.php +++ b/api/Controllers/Categories/CategoryController.php @@ -30,7 +30,7 @@ class CategoryController { global $hesk_settings, $applicationContext, $userContext; /* @var $categoryRetriever CategoryRetriever */ - $categoryRetriever = $applicationContext->get[CategoryRetriever::class]; + $categoryRetriever = $applicationContext->get(CategoryRetriever::class); return $categoryRetriever->getAllCategories($hesk_settings, $userContext); } @@ -43,7 +43,7 @@ class CategoryController { $category = $this->buildCategoryFromJson($data); /* @var $categoryHandler CategoryHandler */ - $categoryHandler = $applicationContext->get[CategoryHandler::class]; + $categoryHandler = $applicationContext->get(CategoryHandler::class); $category = $categoryHandler->createCategory($category, $userContext, $hesk_settings); @@ -81,7 +81,7 @@ class CategoryController { $category->id = intval($id); /* @var $categoryHandler CategoryHandler */ - $categoryHandler = $applicationContext->get[CategoryHandler::class]; + $categoryHandler = $applicationContext->get(CategoryHandler::class); $category = $categoryHandler->editCategory($category, $userContext, $hesk_settings); @@ -92,7 +92,7 @@ class CategoryController { global $hesk_settings, $userContext, $applicationContext; /* @var $categoryHandler CategoryHandler */ - $categoryHandler = $applicationContext->get[CategoryHandler::class]; + $categoryHandler = $applicationContext->get(CategoryHandler::class); $categoryHandler->deleteCategory($id, $userContext, $hesk_settings); @@ -103,7 +103,7 @@ class CategoryController { global $applicationContext, $hesk_settings; /* @var $handler CategoryHandler */ - $handler = $applicationContext->get[CategoryHandler::class]; + $handler = $applicationContext->get(CategoryHandler::class); $handler->sortCategory(intval($id), $direction, $hesk_settings); } diff --git a/api/Controllers/Navigation/CustomNavElementController.php b/api/Controllers/Navigation/CustomNavElementController.php index d4a514e7..8196eb16 100644 --- a/api/Controllers/Navigation/CustomNavElementController.php +++ b/api/Controllers/Navigation/CustomNavElementController.php @@ -3,7 +3,6 @@ namespace Controllers\Navigation; -use BusinessLogic\Exceptions\ApiFriendlyException; use BusinessLogic\Helpers; use BusinessLogic\Navigation\CustomNavElement; use BusinessLogic\Navigation\CustomNavElementHandler; @@ -17,7 +16,7 @@ class CustomNavElementController extends InternalApiController { self::staticCheckForInternalUseOnly(); /* @var $handler CustomNavElementHandler */ - $handler = $applicationContext->get[CustomNavElementHandler::class]; + $handler = $applicationContext->get(CustomNavElementHandler::class); output($handler->getAllCustomNavElements($hesk_settings)); } @@ -28,7 +27,7 @@ class CustomNavElementController extends InternalApiController { self::staticCheckForInternalUseOnly(); /* @var $handler CustomNavElementHandler */ - $handler = $applicationContext->get[CustomNavElementHandler::class]; + $handler = $applicationContext->get(CustomNavElementHandler::class); $handler->sortCustomNavElement(intval($id), $direction, $hesk_settings); } @@ -39,7 +38,7 @@ class CustomNavElementController extends InternalApiController { $this->checkForInternalUseOnly(); /* @var $handler CustomNavElementHandler */ - $handler = $applicationContext->get[CustomNavElementHandler::class]; + $handler = $applicationContext->get(CustomNavElementHandler::class); output($handler->getCustomNavElement($id, $hesk_settings)); } @@ -50,7 +49,7 @@ class CustomNavElementController extends InternalApiController { $this->checkForInternalUseOnly(); /* @var $handler CustomNavElementHandler */ - $handler = $applicationContext->get[CustomNavElementHandler::class]; + $handler = $applicationContext->get(CustomNavElementHandler::class); $data = JsonRetriever::getJsonData(); $element = $handler->createCustomNavElement($this->buildElementModel($data), $hesk_settings); @@ -64,7 +63,7 @@ class CustomNavElementController extends InternalApiController { $this->checkForInternalUseOnly(); /* @var $handler CustomNavElementHandler */ - $handler = $applicationContext->get[CustomNavElementHandler::class]; + $handler = $applicationContext->get(CustomNavElementHandler::class); $data = JsonRetriever::getJsonData(); $handler->saveCustomNavElement($this->buildElementModel($data, $id), $hesk_settings); @@ -78,7 +77,7 @@ class CustomNavElementController extends InternalApiController { $this->checkForInternalUseOnly(); /* @var $handler CustomNavElementHandler */ - $handler = $applicationContext->get[CustomNavElementHandler::class]; + $handler = $applicationContext->get(CustomNavElementHandler::class); $handler->deleteCustomNavElement($id, $hesk_settings); diff --git a/api/Controllers/Settings/SettingsController.php b/api/Controllers/Settings/SettingsController.php index c8e53941..4e66016a 100644 --- a/api/Controllers/Settings/SettingsController.php +++ b/api/Controllers/Settings/SettingsController.php @@ -7,11 +7,11 @@ use BusinessLogic\Settings\SettingsRetriever; class SettingsController { function get() { - global $applicationContext, $hesk_settings, $modsForHesk_settings; + global $applicationContext, $hesk_settings; /* @var $settingsRetriever SettingsRetriever */ - $settingsRetriever = $applicationContext->get[SettingsRetriever::class]; + $settingsRetriever = $applicationContext->get(SettingsRetriever::class); - output($settingsRetriever->getAllSettings($hesk_settings, $modsForHesk_settings)); + output($settingsRetriever->getAllSettings($hesk_settings)); } } \ No newline at end of file diff --git a/api/Controllers/Statuses/StatusController.php b/api/Controllers/Statuses/StatusController.php index f9e2f087..536c6b60 100644 --- a/api/Controllers/Statuses/StatusController.php +++ b/api/Controllers/Statuses/StatusController.php @@ -10,7 +10,7 @@ class StatusController { global $applicationContext, $hesk_settings; /* @var $statusRetriever StatusRetriever */ - $statusRetriever = $applicationContext->get[StatusRetriever::class]; + $statusRetriever = $applicationContext->get(StatusRetriever::class); output($statusRetriever->getAllStatuses($hesk_settings)); } diff --git a/api/Controllers/Tickets/CustomerTicketController.php b/api/Controllers/Tickets/CustomerTicketController.php index cd8e9481..2b1b2614 100644 --- a/api/Controllers/Tickets/CustomerTicketController.php +++ b/api/Controllers/Tickets/CustomerTicketController.php @@ -18,7 +18,7 @@ class CustomerTicketController { $emailAddress = isset($_GET['email']) ? $_GET['email'] : null; /* @var $ticketRetriever TicketRetriever */ - $ticketRetriever = $applicationContext->get[TicketRetriever::class]; + $ticketRetriever = $applicationContext->get(TicketRetriever::class); output($ticketRetriever->getTicketByTrackingIdAndEmail($trackingId, $emailAddress, $hesk_settings)); } @@ -27,7 +27,7 @@ class CustomerTicketController { global $applicationContext, $hesk_settings, $userContext; /* @var $ticketCreator TicketCreator */ - $ticketCreator = $applicationContext->get[TicketCreator::class]; + $ticketCreator = $applicationContext->get(TicketCreator::class); $jsonRequest = JsonRetriever::getJsonData(); diff --git a/api/Controllers/Tickets/ResendTicketEmailToCustomerController.php b/api/Controllers/Tickets/ResendTicketEmailToCustomerController.php index 79fb5a62..fe2aa7be 100644 --- a/api/Controllers/Tickets/ResendTicketEmailToCustomerController.php +++ b/api/Controllers/Tickets/ResendTicketEmailToCustomerController.php @@ -19,15 +19,15 @@ class ResendTicketEmailToCustomerController extends InternalApiController { $this->checkForInternalUseOnly(); /* @var $ticketRetriever TicketRetriever */ - $ticketRetriever = $applicationContext->get[TicketRetriever::class]; + $ticketRetriever = $applicationContext->get(TicketRetriever::class); $ticket = $ticketRetriever->getTicketById($ticketId, $hesk_settings, $userContext); /* @var $modsForHeskSettingsGateway ModsForHeskSettingsGateway */ - $modsForHeskSettingsGateway = $applicationContext->get[ModsForHeskSettingsGateway::class]; + $modsForHeskSettingsGateway = $applicationContext->get(ModsForHeskSettingsGateway::class); $modsForHeskSettings = $modsForHeskSettingsGateway->getAllSettings($hesk_settings); /* @var $emailSender EmailSenderHelper */ - $emailSender = $applicationContext->get[EmailSenderHelper::class]; + $emailSender = $applicationContext->get(EmailSenderHelper::class); $language = $ticket->language; diff --git a/api/Controllers/Tickets/StaffTicketController.php b/api/Controllers/Tickets/StaffTicketController.php index 001cd556..a4860f07 100644 --- a/api/Controllers/Tickets/StaffTicketController.php +++ b/api/Controllers/Tickets/StaffTicketController.php @@ -15,7 +15,7 @@ class StaffTicketController { global $applicationContext, $userContext, $hesk_settings; /* @var $ticketRetriever TicketRetriever */ - $ticketRetriever = $applicationContext->get[TicketRetriever::class]; + $ticketRetriever = $applicationContext->get(TicketRetriever::class); output($ticketRetriever->getTicketById($id, $hesk_settings, $userContext)); } @@ -24,7 +24,7 @@ class StaffTicketController { global $applicationContext, $userContext, $hesk_settings; /* @var $ticketDeleter TicketDeleter */ - $ticketDeleter = $applicationContext->get[TicketDeleter::class]; + $ticketDeleter = $applicationContext->get(TicketDeleter::class); $ticketDeleter->deleteTicket($id, $userContext, $hesk_settings); @@ -35,7 +35,7 @@ class StaffTicketController { global $applicationContext, $userContext, $hesk_settings; /* @var $ticketEditor TicketEditor */ - $ticketEditor = $applicationContext->get[TicketEditor::class]; + $ticketEditor = $applicationContext->get(TicketEditor::class); $jsonRequest = JsonRetriever::getJsonData(); diff --git a/api/autoload.php b/api/autoload.php index b9c2292e..0712c2e1 100644 --- a/api/autoload.php +++ b/api/autoload.php @@ -21,4 +21,7 @@ global $hesk_settings; require_once(__DIR__ . '/../inc/custom_fields.inc.php'); // Load the ApplicationContext -$applicationContext = new \ApplicationContext(); \ No newline at end of file +$builder = new \DI\ContainerBuilder(); +$builder->setDefinitionCache(new \Doctrine\Common\Cache\ArrayCache()); + +$applicationContext = $builder->build(); \ No newline at end of file diff --git a/api/composer.json b/api/composer.json index ba08aee6..d5194dea 100644 --- a/api/composer.json +++ b/api/composer.json @@ -12,6 +12,12 @@ "require-dev": { "phpunit/phpunit": "6.3.0" }, + "repositories": [ + { + "type": "vcs", + "url": "https://github.com/mike-koch/PHP-DI" + } + ], "require": { "phpmailer/phpmailer": "^5.2", "mailgun/mailgun-php": "^2.1", @@ -19,6 +25,6 @@ "php-http/message": "^1.5", "php-http/curl-client": "^1.7", "guzzlehttp/psr7": "^1.3", - "php-di/php-di": "4.4.10" + "php-di/php-di": "dev-master" } } diff --git a/api/composer.lock b/api/composer.lock index ec939825..c9d00a68 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": "d7d3d7ef4a481f28ec59f1218cbc9a1a", + "content-hash": "c94a62f4b72739c52334647f4b759251", "packages": [ { "name": "clue/stream-filter", @@ -624,16 +624,16 @@ }, { "name": "php-di/php-di", - "version": "4.4.10", + "version": "dev-master", "source": { "type": "git", - "url": "https://github.com/PHP-DI/PHP-DI.git", - "reference": "cc10862b66267b6e6f793eda2867b0aef5b693be" + "url": "https://github.com/mike-koch/PHP-DI.git", + "reference": "02ae2f2f79f3c09f711f8936e2c69cc65a530f1b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-DI/PHP-DI/zipball/cc10862b66267b6e6f793eda2867b0aef5b693be", - "reference": "cc10862b66267b6e6f793eda2867b0aef5b693be", + "url": "https://api.github.com/repos/mike-koch/PHP-DI/zipball/02ae2f2f79f3c09f711f8936e2c69cc65a530f1b", + "reference": "02ae2f2f79f3c09f711f8936e2c69cc65a530f1b", "shasum": "" }, "require": { @@ -657,7 +657,12 @@ "src/DI/functions.php" ] }, - "notification-url": "https://packagist.org/downloads/", + "autoload-dev": { + "psr-4": { + "DI\\Test\\IntegrationTest\\": "tests/IntegrationTest/", + "DI\\Test\\UnitTest\\": "tests/UnitTest/" + } + }, "license": [ "MIT" ], @@ -668,7 +673,10 @@ "dependency injection", "di" ], - "time": "2015-07-24T09:21:24+00:00" + "support": { + "source": "https://github.com/mike-koch/PHP-DI/tree/master" + }, + "time": "2017-09-08 02:07:52" }, { "name": "php-di/phpdoc-reader", @@ -1767,7 +1775,7 @@ } ], "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", - "time": "2017-04-07T07:07:10+00:00" + "time": "2017-04-07 07:07:10" }, { "name": "phar-io/version", @@ -2087,7 +2095,7 @@ "testing", "xunit" ], - "time": "2017-08-25T06:32:04+00:00" + "time": "2017-08-25 06:32:04" }, { "name": "phpunit/php-file-iterator", @@ -2416,7 +2424,7 @@ "mock", "xunit" ], - "time": "2017-08-03T14:08:16+00:00" + "time": "2017-08-03 14:08:16" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -2525,7 +2533,7 @@ "compare", "equality" ], - "time": "2017-08-20T14:03:32+00:00" + "time": "2017-08-20 14:03:32" }, { "name": "sebastian/diff", @@ -2627,7 +2635,7 @@ "environment", "hhvm" ], - "time": "2017-07-01T08:51:00+00:00" + "time": "2017-07-01 08:51:00" }, { "name": "sebastian/exporter", @@ -2694,7 +2702,7 @@ "export", "exporter" ], - "time": "2017-04-03T13:19:02+00:00" + "time": "2017-04-03 13:19:02" }, { "name": "sebastian/global-state", @@ -2792,7 +2800,7 @@ ], "description": "Traverses array structures and object graphs to enumerate all referenced objects", "homepage": "https://github.com/sebastianbergmann/object-enumerator/", - "time": "2017-08-03T12:35:26+00:00" + "time": "2017-08-03 12:35:26" }, { "name": "sebastian/object-reflector", @@ -2837,7 +2845,7 @@ ], "description": "Allows reflection of object attributes, including inherited and non-public ones", "homepage": "https://github.com/sebastianbergmann/object-reflector/", - "time": "2017-03-29T09:07:27+00:00" + "time": "2017-03-29 09:07:27" }, { "name": "sebastian/recursion-context", @@ -3020,7 +3028,9 @@ ], "aliases": [], "minimum-stability": "dev", - "stability-flags": [], + "stability-flags": { + "php-di/php-di": 20 + }, "prefer-stable": false, "prefer-lowest": false, "platform": [], diff --git a/api/index.php b/api/index.php index 05dba913..b4c3b490 100644 --- a/api/index.php +++ b/api/index.php @@ -50,7 +50,7 @@ function assertApiIsEnabled() { global $applicationContext, $hesk_settings; /* @var $apiChecker \BusinessLogic\Settings\ApiChecker */ - $apiChecker = $applicationContext->get[\BusinessLogic\Settings\ApiChecker::class]; + $apiChecker = $applicationContext->get(\BusinessLogic\Settings\ApiChecker::class); if (!$apiChecker->isApiEnabled($hesk_settings)) { print output(array('message' => 'API Disabled'), 404); @@ -77,7 +77,7 @@ function buildUserContext($xAuthToken) { global $applicationContext, $userContext, $hesk_settings; /* @var $userContextBuilder \BusinessLogic\Security\UserContextBuilder */ - $userContextBuilder = $applicationContext->get[\BusinessLogic\Security\UserContextBuilder::class]; + $userContextBuilder = $applicationContext->get(\BusinessLogic\Security\UserContextBuilder::class); $userContext = $userContextBuilder->buildUserContext($xAuthToken, $hesk_settings); } @@ -90,17 +90,13 @@ function errorHandler($errorNumber, $errorMessage, $errorFile, $errorLine) { * @param $exception Exception */ function exceptionHandler($exception) { - global $applicationContext, $userContext, $hesk_settings; + global $userContext, $hesk_settings; if (strpos($exception->getTraceAsString(), 'LoggingGateway') !== false) { //-- Suppress these for now, as it would cause issues to output two JSONs at one time. return; } - - /* @var $loggingGateway \DataAccess\Logging\LoggingGateway */ - $loggingGateway = $applicationContext->get[\DataAccess\Logging\LoggingGateway::class]; - // We don't cast API Friendly Exceptions as they're user-generated errors if (exceptionIsOfType($exception, \BusinessLogic\Exceptions\ApiFriendlyException::class)) { /* @var $castedException \BusinessLogic\Exceptions\ApiFriendlyException */ @@ -142,7 +138,7 @@ function tryToLog($location, $message, $stackTrace, $userContext, $heskSettings) global $applicationContext; /* @var $loggingGateway \DataAccess\Logging\LoggingGateway */ - $loggingGateway = $applicationContext->get[\DataAccess\Logging\LoggingGateway::class]; + $loggingGateway = $applicationContext->get(\DataAccess\Logging\LoggingGateway::class); try { return $loggingGateway->logError($location, $message, $stackTrace, $userContext, $heskSettings); From c8e2128c4cbff747f4d4ef3ceb525e55518b6d3f Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Sat, 9 Sep 2017 21:29:40 -0400 Subject: [PATCH 041/248] Switch to mike-koch/PHP-DI --- api/composer.json | 8 +--- api/composer.lock | 110 +++++++++++++++++++++------------------------- 2 files changed, 51 insertions(+), 67 deletions(-) diff --git a/api/composer.json b/api/composer.json index d5194dea..e4c083d0 100644 --- a/api/composer.json +++ b/api/composer.json @@ -12,12 +12,6 @@ "require-dev": { "phpunit/phpunit": "6.3.0" }, - "repositories": [ - { - "type": "vcs", - "url": "https://github.com/mike-koch/PHP-DI" - } - ], "require": { "phpmailer/phpmailer": "^5.2", "mailgun/mailgun-php": "^2.1", @@ -25,6 +19,6 @@ "php-http/message": "^1.5", "php-http/curl-client": "^1.7", "guzzlehttp/psr7": "^1.3", - "php-di/php-di": "dev-master" + "mike-koch/php-di": "4.4.11" } } diff --git a/api/composer.lock b/api/composer.lock index c9d00a68..c5a1a92d 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": "c94a62f4b72739c52334647f4b759251", + "content-hash": "f84b1b3e118e669dc5110809cbc86e4c", "packages": [ { "name": "clue/stream-filter", @@ -515,6 +515,54 @@ "description": "The Mailgun SDK provides methods for all API functions.", "time": "2017-06-20T19:56:09+00:00" }, + { + "name": "mike-koch/php-di", + "version": "4.4.11", + "source": { + "type": "git", + "url": "https://github.com/mike-koch/PHP-DI.git", + "reference": "c1a18d55666983901e542fc2626a51b831f30f0e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/mike-koch/PHP-DI/zipball/c1a18d55666983901e542fc2626a51b831f30f0e", + "reference": "c1a18d55666983901e542fc2626a51b831f30f0e", + "shasum": "" + }, + "require": { + "container-interop/container-interop": "~1.0", + "doctrine/annotations": "~1.2", + "doctrine/cache": "~1.0", + "myclabs/php-enum": "~1.1", + "ocramius/proxy-manager": "~0.5", + "php": ">=5.3.3", + "php-di/phpdoc-reader": "~1.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "DI\\": "src/DI/" + }, + "files": [ + "src/DI/functions.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "PHP-DI is a Container that makes Dependency Injection as practical as possible in PHP. This fork fixes an issue in 4.x that prevented it from working in PHP 7.1.", + "homepage": "https://github.com/mike-koch/PHP-DI/", + "keywords": [ + "container", + "dependency injection", + "di" + ], + "time": "2017-09-08T02:23:09+00:00" + }, { "name": "myclabs/php-enum", "version": "1.5.2", @@ -622,62 +670,6 @@ ], "time": "2014-09-28T14:18:11+00:00" }, - { - "name": "php-di/php-di", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/mike-koch/PHP-DI.git", - "reference": "02ae2f2f79f3c09f711f8936e2c69cc65a530f1b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/mike-koch/PHP-DI/zipball/02ae2f2f79f3c09f711f8936e2c69cc65a530f1b", - "reference": "02ae2f2f79f3c09f711f8936e2c69cc65a530f1b", - "shasum": "" - }, - "require": { - "container-interop/container-interop": "~1.0", - "doctrine/annotations": "~1.2", - "doctrine/cache": "~1.0", - "myclabs/php-enum": "~1.1", - "ocramius/proxy-manager": "~0.5", - "php": ">=5.3.3", - "php-di/phpdoc-reader": "~1.3" - }, - "require-dev": { - "phpunit/phpunit": "~4.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "DI\\": "src/DI/" - }, - "files": [ - "src/DI/functions.php" - ] - }, - "autoload-dev": { - "psr-4": { - "DI\\Test\\IntegrationTest\\": "tests/IntegrationTest/", - "DI\\Test\\UnitTest\\": "tests/UnitTest/" - } - }, - "license": [ - "MIT" - ], - "description": "PHP-DI is a Container that makes Dependency Injection as practical as possible in PHP", - "homepage": "http://mnapoli.github.com/PHP-DI/", - "keywords": [ - "container", - "dependency injection", - "di" - ], - "support": { - "source": "https://github.com/mike-koch/PHP-DI/tree/master" - }, - "time": "2017-09-08 02:07:52" - }, { "name": "php-di/phpdoc-reader", "version": "1.3.0", @@ -3028,9 +3020,7 @@ ], "aliases": [], "minimum-stability": "dev", - "stability-flags": { - "php-di/php-di": 20 - }, + "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, "platform": [], From 5b7c2f7ec7afbf553005f74c13616c9e1f92ae56 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Sat, 9 Sep 2017 22:03:42 -0400 Subject: [PATCH 042/248] Remove all manager usages --- README.md | 1 - admin/admin_reply_ticket.php | 6 +-- admin/admin_ticket.php | 51 ++++--------------- admin/change_status.php | 6 +-- admin/edit_post.php | 13 ++--- admin/manage_users.php | 36 ------------- api/BusinessLogic/Categories/Category.php | 5 -- .../Security/UserToTicketChecker.php | 6 --- .../Categories/CategoryController.php | 1 - api/DataAccess/Categories/CategoryGateway.php | 6 +-- api/DataAccess/Security/UserGateway.php | 21 -------- .../Security/UserToTicketCheckerTest.php | 19 ------- inc/common.inc.php | 1 - install/mods-for-hesk/database-validation.php | 1 - language/en/text.php | 4 -- 15 files changed, 19 insertions(+), 158 deletions(-) diff --git a/README.md b/README.md index a53bd5d5..ea4cdd5d 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,6 @@ Mods for HESK is a set of modifications for [HESK](https://www.hesk.com) v2.7.x,
  • Custom service message icons
  • Permission templates
  • Request users location in tickets
    • -
  • Category managers
  • Show number of merged tickets in ticket search view
  • Enable / disable staff members
  • More-restricted settings page access
    • diff --git a/admin/admin_reply_ticket.php b/admin/admin_reply_ticket.php index 96ab9f9f..aa373e96 100644 --- a/admin/admin_reply_ticket.php +++ b/admin/admin_reply_ticket.php @@ -39,9 +39,7 @@ hesk_dbConnect(); hesk_isLoggedIn(); /* Check permissions for this feature */ -if (!isset($_REQUEST['isManager']) || !$_REQUEST['isManager']) { - hesk_checkPermission('can_reply_tickets'); -} +hesk_checkPermission('can_reply_tickets'); /* A security check */ # hesk_token_check('POST'); @@ -281,7 +279,7 @@ if ($time_worked == '00:00:00') { $sql .= ",`time_worked` = ADDTIME(`time_worked`,'" . hesk_dbEscape($time_worked) . "') "; } -if (!empty($_POST['assign_self']) && (hesk_checkPermission('can_assign_self', 0) || (isset($_REQUEST['isManager']) && $_REQUEST['isManager']))) { +if (!empty($_POST['assign_self']) && (hesk_checkPermission('can_assign_self', 0))) { $revision = sprintf($hesklang['thist2'], hesk_date(), $_SESSION['name'] . ' (' . $_SESSION['user'] . ')', $_SESSION['name'] . ' (' . $_SESSION['user'] . ')'); $sql .= " , `owner`=" . intval($_SESSION['id']) . ", `history`=CONCAT(`history`,'" . hesk_dbEscape($revision) . "') "; } diff --git a/admin/admin_ticket.php b/admin/admin_ticket.php index 899d37e6..3f7dfbf5 100644 --- a/admin/admin_ticket.php +++ b/admin/admin_ticket.php @@ -107,33 +107,14 @@ if ($ticket['lastreplier']) { } /* Get category name and ID */ -$result = hesk_dbQuery("SELECT `id`, `name`, `manager` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` WHERE `id`='" . intval($ticket['category']) . "' LIMIT 1"); +$result = hesk_dbQuery("SELECT `id`, `name` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` WHERE `id`='" . intval($ticket['category']) . "' LIMIT 1"); /* If this category has been deleted use the default category with ID 1 */ if (hesk_dbNumRows($result) != 1) { - $result = hesk_dbQuery("SELECT `id`, `name`, `manager` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` WHERE `id`='1' LIMIT 1"); + $result = hesk_dbQuery("SELECT `id`, `name` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` WHERE `id`='1' LIMIT 1"); } $category = hesk_dbFetchAssoc($result); -$managerRS = hesk_dbQuery('SELECT * FROM `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'users` WHERE `id` = ' . intval($_SESSION['id'])); -$managerRow = hesk_dbFetchAssoc($managerRS); -$isManager = $managerRow['id'] == $category['manager']; -if ($isManager) { - $can_del_notes = - $can_reply = - $can_delete = - $can_edit = - $can_archive = - $can_assign_self = - $can_view_unassigned = - $can_change_own_cat = - $can_change_cat = - $can_ban_emails = - $can_unban_emails = - $can_ban_ips = - $can_unban_ips = - $can_resolve = true; -} /* Is this user allowed to view tickets inside this category? */ hesk_okCategory($category['id']); @@ -973,9 +954,6 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); '; - if ($isManager) { - echo ''; - } echo ' @@ -999,15 +977,12 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); '; - if ($isManager) { - echo ''; - } echo '
    '; echo '

    ' . $hesklang['owner'] . '

    '; - if (hesk_checkPermission('can_assign_others', 0) || $isManager) { + if (hesk_checkPermission('can_assign_others', 0)) { echo '
    @@ -1250,15 +1225,14 @@ require_once(HESK_PATH . 'inc/footer.inc.php'); function hesk_getAdminButtons($category_id) { - global $hesk_settings, $hesklang, $modsForHesk_settings, $ticket, $reply, $trackingID, $can_edit, $can_archive, $can_delete, $can_resolve, $isManager; + global $hesk_settings, $hesklang, $modsForHesk_settings, $ticket, $reply, $trackingID, $can_edit, $can_archive, $can_delete, $can_resolve; $options = ''; /* Edit post */ if ($can_edit) { $tmp = $reply ? '&reply=' . $reply['id'] : ''; - $mgr = $isManager ? '&isManager=true' : ''; - $options .= ' ' . $hesklang['edit'] . ' '; + $options .= ' ' . $hesklang['edit'] . ' '; } @@ -1304,13 +1278,12 @@ function hesk_getAdminButtons($category_id) $isTicketClosed = $isTicketClosedRow['IsClosed']; $isClosable = $isTicketClosedRow['Closable'] == 'yes' || $isTicketClosedRow['Closable'] == 'sonly'; - $mgr = $isManager ? '&isManager=1' : ''; if ($isTicketClosed == 0 && $isClosable && $can_resolve) // Ticket is still open { - $options .= ' + $options .= ' ' . $hesklang['close_action'] . ' '; } elseif ($isTicketClosed == 1) { - $options .= ' + $options .= ' ' . $hesklang['open_action'] . ' '; } @@ -1496,7 +1469,7 @@ function hesk_getAdminButtons($category_id) function hesk_getAdminButtonsInTicket($reply = 0, $white = 1) { - global $hesk_settings, $hesklang, $ticket, $reply, $trackingID, $can_edit, $can_archive, $can_delete, $isManager; + global $hesk_settings, $hesklang, $ticket, $reply, $trackingID, $can_edit, $can_archive, $can_delete; $options = $reply ? '' : '
    '; @@ -1519,8 +1492,7 @@ function hesk_getAdminButtonsInTicket($reply = 0, $white = 1) /* Edit post */ if ($can_edit) { $tmp = $reply ? '&reply=' . $reply['id'] : ''; - $mgr = $isManager ? '&isManager=true' : ''; - $options .= ' ' . $hesklang['edtt'] . ' '; + $options .= ' ' . $hesklang['edtt'] . ' '; } @@ -1834,7 +1806,7 @@ function hesk_printTicketReplies() function hesk_printReplyForm() { - global $hesklang, $hesk_settings, $ticket, $admins, $can_options, $can_resolve, $options, $can_assign_self, $isManager, $modsForHesk_settings; + global $hesklang, $hesk_settings, $ticket, $admins, $can_options, $can_resolve, $options, $can_assign_self, $modsForHesk_settings; // Force assigning a ticket before allowing to reply? if ($hesk_settings['require_owner'] && ! $ticket['owner']) @@ -2056,9 +2028,6 @@ function hesk_printReplyForm()
    - - -
    diff --git a/admin/change_status.php b/admin/change_status.php index 42d002f1..d1d6551a 100644 --- a/admin/change_status.php +++ b/admin/change_status.php @@ -26,10 +26,8 @@ hesk_isLoggedIn(); $modsForHesk_settings = mfh_getSettings(); /* Check permissions for this feature */ -if (!isset($_REQUEST['isManager']) || !$_REQUEST['isManager']) { - hesk_checkPermission('can_view_tickets'); - hesk_checkPermission('can_reply_tickets'); -} +hesk_checkPermission('can_view_tickets'); +hesk_checkPermission('can_reply_tickets'); /* A security check */ hesk_token_check(); diff --git a/admin/edit_post.php b/admin/edit_post.php index ee3a9e19..7dcdda44 100644 --- a/admin/edit_post.php +++ b/admin/edit_post.php @@ -32,10 +32,8 @@ hesk_dbConnect(); hesk_isLoggedIn(); /* Check permissions for this feature */ -if (!isset($_REQUEST['isManager']) || !$_REQUEST['isManager']) { - hesk_checkPermission('can_view_tickets'); - hesk_checkPermission('can_edit_tickets'); -} +hesk_checkPermission('can_view_tickets'); +hesk_checkPermission('can_edit_tickets'); $modsForHesk_settings = mfh_getSettings(); /* Ticket ID */ @@ -61,9 +59,7 @@ if (defined('HESK_DEMO')) { } /* Is this user allowed to view tickets inside this category? */ -if (!isset($_REQUEST['isManager']) || !$_REQUEST['isManager']) { - hesk_okCategory($ticket['category']); -} +hesk_okCategory($ticket['category']); if (hesk_isREQUEST('reply')) { $tmpvar['id'] = intval(hesk_REQUEST('reply')) or die($hesklang['id_not_valid']); @@ -630,9 +626,6 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); ?> - - -
    diff --git a/admin/manage_users.php b/admin/manage_users.php index 2ed5999a..4159d638 100644 --- a/admin/manage_users.php +++ b/admin/manage_users.php @@ -621,31 +621,6 @@ function update_user() hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "tickets` SET `owner`=0 WHERE `owner`='" . intval($myuser['id']) . "' AND `category` NOT IN (" . $myuser['categories'] . ")"); } - // Find the list of categories they are manager of. If they no longer have access to the category, revoke their manager permission. - if ($myuser['isadmin']) { - // Admins can't be managers - hesk_dbQuery('UPDATE `' . hesk_dbEscape($hesk_settings['db_pfix']) . 'categories` SET `manager` = 0 WHERE `manager` = ' . intval($myuser['id'])); - } else { - $currentCatRs = hesk_dbQuery("SELECT `categories` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` WHERE `id` = '" . intval($myuser['id']) . "' LIMIT 1"); - $rowOfCategories = hesk_dbFetchAssoc($currentCatRs); - $cats = $rowOfCategories['categories']; - $currentCategories = explode(',', $cats); - $newCategories = explode(',', $myuser['categories']); - - // If any any elements are in current but not in new, add them to the revoke array - $revokeCats = array(); - foreach ($currentCategories as $currentCategory) { - if (!in_array($currentCategory, $newCategories) && $currentCategory != '') { - array_push($revokeCats, $currentCategory); - } - } - - if (count($revokeCats) > 0) { - hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` SET `manager` = 0 WHERE `id` IN (" . implode(',', $revokeCats) . ")"); - } - } - - hesk_dbQuery( "UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` SET `user`='" . hesk_dbEscape($myuser['user']) . "', @@ -676,11 +651,6 @@ function update_user() `default_calendar_view`=" . intval($myuser['default_calendar_view']) . " WHERE `id`='" . intval($myuser['id']) . "'"); - // If they are now inactive, remove any manager rights - if (!$myuser['active']) { - hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` SET `manager` = 0 WHERE `manager` = " . intval($myuser['id'])); - } - unset($_SESSION['save_userdata']); unset($_SESSION['userdata']); @@ -844,9 +814,6 @@ function remove() hesk_process_messages($hesklang['cant_del_own'], './manage_users.php'); } - // Revoke manager rights - hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` SET `manager` = 0 WHERE `manager` = " . intval($myuser)); - /* Un-assign all tickets for this user */ $res = hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "tickets` SET `owner`=0 WHERE `owner`='" . intval($myuser) . "'"); @@ -910,9 +877,6 @@ function toggle_active() $active = 0; $tmp = $hesklang['user_deactivated']; - // Revoke any manager rights - hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` SET `manager` = 0 WHERE `manager` = " . intval($myuser)); - $notificationSql = ", `autoassign` = '0', `notify_new_unassigned` = '0', `notify_new_my` = '0', `notify_reply_unassigned` = '0', `notify_reply_my` = '0', `notify_assigned` = '0', `notify_pm` = '0', `notify_note` = '0', `notify_note_unassigned` = '0', `notify_overdue_unassigned` = '0'"; } diff --git a/api/BusinessLogic/Categories/Category.php b/api/BusinessLogic/Categories/Category.php index e2c3db9b..bf17c56e 100644 --- a/api/BusinessLogic/Categories/Category.php +++ b/api/BusinessLogic/Categories/Category.php @@ -51,11 +51,6 @@ class Category { */ public $priority; - /** - * @var int|null The manager for the Categories, if applicable - */ - public $manager; - /** * @var bool Indication if the user has access to the Categories */ diff --git a/api/BusinessLogic/Security/UserToTicketChecker.php b/api/BusinessLogic/Security/UserToTicketChecker.php index 9a2f9c90..0f21d785 100644 --- a/api/BusinessLogic/Security/UserToTicketChecker.php +++ b/api/BusinessLogic/Security/UserToTicketChecker.php @@ -31,12 +31,6 @@ class UserToTicketChecker { return false; } - $categoryManagerId = $this->userGateway->getManagerForCategory($ticket->categoryId, $heskSettings); - - if ($user->id === $categoryManagerId) { - return true; - } - $extraPermissions[] = UserPrivilege::CAN_VIEW_TICKETS; foreach ($extraPermissions as $permission) { diff --git a/api/Controllers/Categories/CategoryController.php b/api/Controllers/Categories/CategoryController.php index e72f680b..0ef2bf75 100644 --- a/api/Controllers/Categories/CategoryController.php +++ b/api/Controllers/Categories/CategoryController.php @@ -63,7 +63,6 @@ class CategoryController { $category->description = Helpers::safeArrayGet($json, 'description'); $category->displayBorder = Helpers::safeArrayGet($json, 'displayBorder'); $category->foregroundColor = Helpers::safeArrayGet($json, 'foregroundColor'); - $category->manager = Helpers::safeArrayGet($json, 'manager'); $category->name = Helpers::safeArrayGet($json, 'name'); $category->priority = Helpers::safeArrayGet($json, 'priority'); $category->type = Helpers::safeArrayGet($json, 'type'); diff --git a/api/DataAccess/Categories/CategoryGateway.php b/api/DataAccess/Categories/CategoryGateway.php index 2191373d..1a4c0d1c 100644 --- a/api/DataAccess/Categories/CategoryGateway.php +++ b/api/DataAccess/Categories/CategoryGateway.php @@ -41,7 +41,6 @@ class CategoryGateway extends CommonDao { $category->foregroundColor = $row['foreground_color']; $category->displayBorder = $row['display_border_outline'] === '1'; $category->priority = intval($row['priority']); - $category->manager = intval($row['manager']) == 0 ? NULL : intval($row['manager']); $category->description = $row['mfh_description']; $category->numberOfTickets = intval($row['number_of_tickets']); $results[] = $category; @@ -64,11 +63,11 @@ class CategoryGateway extends CommonDao { $newOrder = hesk_dbFetchAssoc($newOrderRs); $sql = "INSERT INTO `" . hesk_dbEscape($heskSettings['db_pfix']) . "categories` - (`name`, `cat_order`, `autoassign`, `type`, `priority`, `manager`, `background_color`, `usage`, + (`name`, `cat_order`, `autoassign`, `type`, `priority`, `background_color`, `usage`, `foreground_color`, `display_border_outline`, `mfh_description`) VALUES ('" . hesk_dbEscape($category->name) . "', " . intval($newOrder['cat_order']) . ", '" . ($category->autoAssign ? 1 : 0) . "', '" . intval($category->type) . "', - '" . intval($category->priority) . "', " . ($category->manager === null ? 0 : intval($category->manager)) . ", + '" . intval($category->priority) . "', '" . hesk_dbEscape($category->backgroundColor) . "', " . intval($category->usage) . ", '" . hesk_dbEscape($category->foregroundColor) . "', '" . ($category->displayBorder ? 1 : 0) . "', '" . hesk_dbEscape($category->description) . "')"; @@ -95,7 +94,6 @@ class CategoryGateway extends CommonDao { `autoassign` = '" . ($category->autoAssign ? 1 : 0) . "', `type` = '" . intval($category->type) . "', `priority` = '" . intval($category->priority) . "', - `manager` = " . ($category->manager === null ? 0 : intval($category->manager)) . ", `background_color` = '" . hesk_dbEscape($category->backgroundColor) . "', `usage` = " . intval($category->usage) . ", `foreground_color` = '" . hesk_dbEscape($category->foregroundColor) . "', diff --git a/api/DataAccess/Security/UserGateway.php b/api/DataAccess/Security/UserGateway.php index e836f18a..3ed4191b 100644 --- a/api/DataAccess/Security/UserGateway.php +++ b/api/DataAccess/Security/UserGateway.php @@ -99,25 +99,4 @@ class UserGateway extends CommonDao { return $users; } - - function getManagerForCategory($categoryId, $heskSettings) { - $this->init(); - - $rs = hesk_dbQuery("SELECT * FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "users` - WHERE `id` = ( - SELECT `manager` - FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "categories` - WHERE `id` = " . intval($categoryId) . ")"); - - if (hesk_dbNumRows($rs) === 0) { - $this->close(); - return null; - } - - $user = UserContext::fromDataRow(hesk_dbFetchAssoc($rs)); - - $this->close(); - - return $user; - } } \ No newline at end of file diff --git a/api/Tests/BusinessLogic/Security/UserToTicketCheckerTest.php b/api/Tests/BusinessLogic/Security/UserToTicketCheckerTest.php index d3afb126..07318d66 100644 --- a/api/Tests/BusinessLogic/Security/UserToTicketCheckerTest.php +++ b/api/Tests/BusinessLogic/Security/UserToTicketCheckerTest.php @@ -92,23 +92,4 @@ class UserToTicketCheckerTest extends TestCase { //-- Assert self::assertThat($result, self::isFalse()); } - - function testItReturnsTrueWhenTheUserDoesNotHaveEditPermissionsButIsTheCategoryManager() { - //-- Arrange - $user = new UserContext(); - $user->admin = false; - $user->categories = array(1); - $user->permissions = array(UserPrivilege::CAN_VIEW_TICKETS, 'something else'); - $user->id = 1; - $this->userGateway->method('getManagerForCategory')->willReturn(1); - - $ticket = new Ticket(); - $ticket->categoryId = 1; - - //-- Act - $result = $this->userToTicketChecker->isTicketAccessibleToUser($user, $ticket, $this->heskSettings, array(UserPrivilege::CAN_EDIT_TICKETS)); - - //-- Assert - self::assertThat($result, self::isTrue()); - } } diff --git a/inc/common.inc.php b/inc/common.inc.php index 94f487dc..ec0ed464 100644 --- a/inc/common.inc.php +++ b/inc/common.inc.php @@ -2026,7 +2026,6 @@ function hesk_getFeatureArray() 'can_service_msg', /* User can manage service messages shown in customer interface */ 'can_email_tpl', /* User can manage email templates */ 'can_man_ticket_statuses', /* User can manage ticket statuses */ - 'can_set_manager', /* User can set category managers */ 'can_man_permission_tpl', /* User can manage permission templates */ 'can_man_settings', /* User can manage helpdesk settings */ 'can_change_notification_settings', /* User can change notification settings */ diff --git a/install/mods-for-hesk/database-validation.php b/install/mods-for-hesk/database-validation.php index 22c34c98..7f1534e8 100644 --- a/install/mods-for-hesk/database-validation.php +++ b/install/mods-for-hesk/database-validation.php @@ -93,7 +93,6 @@ hesk_dbConnect(); $all_good = $all_good & run_column_check('tickets', 'longitude'); $all_good = $all_good & run_column_check('stage_tickets', 'latitude'); $all_good = $all_good & run_column_check('stage_tickets', 'longitude'); - $all_good = $all_good & run_column_check('categories', 'manager'); $all_good = $all_good & run_column_check('users', 'permission_template'); $all_good = $all_good & run_table_check('permission_templates'); $all_good = $all_good & run_column_check('permission_templates', 'id'); diff --git a/language/en/text.php b/language/en/text.php index 743ed201..c7f35f4c 100644 --- a/language/en/text.php +++ b/language/en/text.php @@ -1831,10 +1831,6 @@ $hesklang['your_current_location'] = 'Your location'; $hesklang['requesting_location_ellipsis'] = 'Requesting location...'; $hesklang['unable_to_determine_location'] = 'Unable to determine your location, or you declined to share it.'; $hesklang['save_to_see_updated_address'] = 'Save the new location to see the updated address'; -$hesklang['manager'] = 'Manager'; -$hesklang['manager_updated'] = 'Category manager has been updated.'; -$hesklang['can_set_manager'] = 'Can set category managers'; -$hesklang['no_manager'] = 'No manager'; $hesklang['manage_permission_templates'] = 'Manage Permission Templates'; $hesklang['manage_permission_templates_help'] = 'Here you can create and edit permission templates. These templates will appear when creating/editing a user. Please note that if you change the permission template\'s settings, it will NOT change the permissions of any users that are set to this permission template.'; From dd699b7165fb8dea0a06c4b143a779dc21e1744f Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Sat, 9 Sep 2017 22:06:47 -0400 Subject: [PATCH 043/248] Try fixing .gitlabci.yml --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 05e2a432..22ba8e8b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,8 +5,6 @@ stages: - deploy before_script: - - apt-get update - - apt-get install zip unzip - cd api - php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" - php composer-setup.php @@ -24,9 +22,11 @@ deploy: when: manual stage: deploy script: + - apt-get update + - apt-get install zip unzip - composer install --no-dev - cd ../ci - bash build_zip.sh artifacts: paths: - - release.zip \ No newline at end of file + - release.zip From 3ed01ba92f3c1fbd5d82de0ec265963a7e6d3917 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Sun, 10 Sep 2017 21:44:49 -0400 Subject: [PATCH 044/248] Fix tests --- .../Categories/CategoryHandler.php | 4 -- .../Categories/CategoryHandlerTest.php | 45 +++++++++++++++++-- 2 files changed, 41 insertions(+), 8 deletions(-) diff --git a/api/BusinessLogic/Categories/CategoryHandler.php b/api/BusinessLogic/Categories/CategoryHandler.php index 5a40255a..4c3451ac 100644 --- a/api/BusinessLogic/Categories/CategoryHandler.php +++ b/api/BusinessLogic/Categories/CategoryHandler.php @@ -114,10 +114,6 @@ class CategoryHandler { $validationModel->errorKeys[] = 'INVALID_TYPE'; } - if ($category->type === null || intval($category->type) < 0 || intval($category->type) > 2) { - $validationModel->errorKeys[] = 'INVALID_TYPE'; - } - return $validationModel; } diff --git a/api/Tests/BusinessLogic/Categories/CategoryHandlerTest.php b/api/Tests/BusinessLogic/Categories/CategoryHandlerTest.php index 32b5f99c..9cb886c9 100644 --- a/api/Tests/BusinessLogic/Categories/CategoryHandlerTest.php +++ b/api/Tests/BusinessLogic/Categories/CategoryHandlerTest.php @@ -4,34 +4,71 @@ namespace BusinessLogic\Categories; +use BusinessLogic\Security\PermissionChecker; +use BusinessLogic\Security\UserContext; +use Core\Constants\Priority; use DataAccess\Categories\CategoryGateway; +use DataAccess\Settings\ModsForHeskSettingsGateway; +use DataAccess\Tickets\TicketGateway; use PHPUnit\Framework\TestCase; class CategoryHandlerTest extends TestCase { - /* @var $categoryGateway \PHPUnit_Framework_MockObject_MockObject */ + /* @var $categoryGateway CategoryGateway|\PHPUnit_Framework_MockObject_MockObject */ private $categoryGateway; /* @var $categoryHandler CategoryHandler */ private $categoryHandler; + /* @var $ticketGateway TicketGateway|\PHPUnit_Framework_MockObject_MockObject */ + private $ticketGateway; + + /* @var $permissionChecker PermissionChecker|\PHPUnit_Framework_MockObject_MockObject */ + private $permissionChecker; + + /* @var $modsForHeskSettingsGateway ModsForHeskSettingsGateway|\PHPUnit_Framework_MockObject_MockObject */ + private $modsForHeskSettingsGateway; + /* @var $heskSettings array */ private $heskSettings; protected function setUp() { $this->categoryGateway = $this->createMock(CategoryGateway::class); + $this->ticketGateway = $this->createMock(TicketGateway::class); + $this->permissionChecker = $this->createMock(PermissionChecker::class); + $this->modsForHeskSettingsGateway = $this->createMock(ModsForHeskSettingsGateway::class); - $this->categoryHandler = new CategoryHandler($this->categoryGateway); + $this->categoryHandler = new CategoryHandler($this->categoryGateway, + $this->ticketGateway, + $this->permissionChecker, + $this->modsForHeskSettingsGateway); $this->heskSettings = array(); + + //TODO write proper tests! + $this->permissionChecker->method('doesUserHavePermission')->willReturn(true); } function testCreateCallsTheGatewayWithTheCategory() { //-- Arrange $category = new Category(); + $category->autoAssign = true; + $category->backgroundColor = 'a'; + $category->foregroundColor = 'a'; + $category->catOrder = 1000; + $category->description = 'd'; + $category->displayBorder = false; + $category->name = 'n'; + $category->priority = Priority::LOW; + $category->usage = 0; + $category->type = 0; + $category->id = 1; + $this->categoryGateway->method('getAllCategories')->willReturn([$category]); //-- Assert - $this->categoryGateway->expects($this->once())->method('createCategory')->with($category, $this->heskSettings); + $this->categoryGateway->expects($this->once())->method('createCategory') + ->willReturn(1) + ->with($category, $this->heskSettings); //-- Act - $this->categoryHandler->createCategory($category, $this->heskSettings); + $this->categoryHandler->createCategory($category, new UserContext(), $this->heskSettings); } } From 560197eebeeb25af7c34cad12516a217426b26f7 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Mon, 11 Sep 2017 12:34:58 -0400 Subject: [PATCH 045/248] Testing some gitlab ci changes --- .gitlab-ci.yml | 21 ++++++++++++++++++--- ci/php_lint.sh | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 ci/php_lint.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 22ba8e8b..1fd7b24a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,24 +1,39 @@ -image: tetraweb/php - stages: - test - deploy before_script: + - bash ci/docker_install.sh > /dev/null - cd api - php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" - php composer-setup.php - php -r "unlink('composer-setup.php');" - php composer.phar update -test: +test:7.1: + image: php:7.1 stage: test script: - composer install - cd Tests - phpunit + - cd ../../ + - bash ci/php_lint.sh ./ + +test:7.0: + image: php:7.0 + stage: test + script: + - bash ci/php_lint.sh ./ + +test:5.5: + image: php:5.5 + stage: test + script: + - bash ci/php_lint.sh ./ deploy: + image: tetraweb/php when: manual stage: deploy script: diff --git a/ci/php_lint.sh b/ci/php_lint.sh new file mode 100644 index 00000000..1e0c3ad1 --- /dev/null +++ b/ci/php_lint.sh @@ -0,0 +1,33 @@ +#!/bin/bash +error=false + +while test $# -gt 0; do + current=$1 + shift + + if [ ! -d $current ] && [ ! -f $current ] ; then + echo "Invalid directory or file: $current" + error=true + + continue + fi + + for file in `find $current -type f -not -path "*vendor/*" -name "*.php"` ; do + RESULTS=`php -l $file` + echo $RESULTS + + if [ "$RESULTS" != "No syntax errors detected in $file" ] ; then + echo $RESULTS + error=true + fi + done +done + + +if [ "$error" = true ] ; then + exit 1 +else + exit 0 +fi + + From 3b0c8ad3a6c192ccf26f31c194f1c7d6c27a5b31 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Mon, 11 Sep 2017 12:43:11 -0400 Subject: [PATCH 046/248] More CI changes --- .gitlab-ci.yml | 56 +++++++++++++++++++++++++++++++++++++------------- ci/php_lint.sh | 2 +- 2 files changed, 43 insertions(+), 15 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1fd7b24a..c6cc1486 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,7 @@ stages: + - validate - test - - deploy + - package before_script: - bash ci/docker_install.sh > /dev/null @@ -8,34 +9,61 @@ before_script: - php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" - php composer-setup.php - php -r "unlink('composer-setup.php');" - - php composer.phar update + +validate:7.1: + image: php:7.1 + stage: validate + script: + - php composer.phar update --no-dev + - php composer.phar install --no-dev + - bash ci/php_lint.sh ./ + +validate:7.0: + image: php:7.0 + stage: validate + script: + - php composer.phar update --no-dev + - php composer.phar install --no-dev + - bash ci/php_lint.sh ./ + +validate:5.6: + image: php:5.6 + stage: validate + script: + - php composer.phar update --no-dev + - php composer.phar install --no-dev + - bash ci/php_lint.sh ./ + +validate:5.5: + image: php:5.5 + stage: validate + script: + - php composer.phar update --no-dev + - php composer.phar install --no-dev + - bash ci/php_lint.sh ./ test:7.1: image: php:7.1 stage: test script: - - composer install + - php composer.phar update + - php composer.phar install - cd Tests - phpunit - - cd ../../ - - bash ci/php_lint.sh ./ test:7.0: image: php:7.0 stage: test script: - - bash ci/php_lint.sh ./ + - php composer.phar update + - php composer.phar install + - cd Tests + - phpunit -test:5.5: - image: php:5.5 - stage: test - script: - - bash ci/php_lint.sh ./ - -deploy: +package: image: tetraweb/php when: manual - stage: deploy + stage: package script: - apt-get update - apt-get install zip unzip diff --git a/ci/php_lint.sh b/ci/php_lint.sh index 1e0c3ad1..8c58e1aa 100644 --- a/ci/php_lint.sh +++ b/ci/php_lint.sh @@ -12,7 +12,7 @@ while test $# -gt 0; do continue fi - for file in `find $current -type f -not -path "*vendor/*" -name "*.php"` ; do + for file in `find $current -type f -not -path "*vendor/*" -not -path "*api/*" -name "*.php"` ; do RESULTS=`php -l $file` echo $RESULTS From 02ccb65b27f211e0da5c39f630b1e2212f60bf31 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Mon, 11 Sep 2017 12:46:26 -0400 Subject: [PATCH 047/248] More changes --- .gitlab-ci.yml | 8 -------- ci/php_lint.sh | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c6cc1486..b7b12e73 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,32 +14,24 @@ validate:7.1: image: php:7.1 stage: validate script: - - php composer.phar update --no-dev - - php composer.phar install --no-dev - bash ci/php_lint.sh ./ validate:7.0: image: php:7.0 stage: validate script: - - php composer.phar update --no-dev - - php composer.phar install --no-dev - bash ci/php_lint.sh ./ validate:5.6: image: php:5.6 stage: validate script: - - php composer.phar update --no-dev - - php composer.phar install --no-dev - bash ci/php_lint.sh ./ validate:5.5: image: php:5.5 stage: validate script: - - php composer.phar update --no-dev - - php composer.phar install --no-dev - bash ci/php_lint.sh ./ test:7.1: diff --git a/ci/php_lint.sh b/ci/php_lint.sh index 8c58e1aa..1e0c3ad1 100644 --- a/ci/php_lint.sh +++ b/ci/php_lint.sh @@ -12,7 +12,7 @@ while test $# -gt 0; do continue fi - for file in `find $current -type f -not -path "*vendor/*" -not -path "*api/*" -name "*.php"` ; do + for file in `find $current -type f -not -path "*vendor/*" -name "*.php"` ; do RESULTS=`php -l $file` echo $RESULTS From 0f902f683c6486c214ddcc9a7c15ac543fc09770 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Mon, 11 Sep 2017 12:48:34 -0400 Subject: [PATCH 048/248] More CI fixes --- .gitlab-ci.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b7b12e73..dfe1eb8e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,10 +5,6 @@ stages: before_script: - bash ci/docker_install.sh > /dev/null - - cd api - - php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" - - php composer-setup.php - - php -r "unlink('composer-setup.php');" validate:7.1: image: php:7.1 @@ -38,6 +34,10 @@ test:7.1: image: php:7.1 stage: test script: + - cd api + - php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" + - php composer-setup.php + - php -r "unlink('composer-setup.php');" - php composer.phar update - php composer.phar install - cd Tests @@ -47,6 +47,10 @@ test:7.0: image: php:7.0 stage: test script: + - cd api + - php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" + - php composer-setup.php + - php -r "unlink('composer-setup.php');" - php composer.phar update - php composer.phar install - cd Tests From 37d730dfdcb1884b4a4689deffbb5c112badaf87 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Mon, 11 Sep 2017 12:55:56 -0400 Subject: [PATCH 049/248] Fix a syntax error in PHP 5.5 --- api/RequestMethod.php | 5 ++++- api/index.php | 30 +++++++++++++++--------------- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/api/RequestMethod.php b/api/RequestMethod.php index e692c03d..d6423708 100644 --- a/api/RequestMethod.php +++ b/api/RequestMethod.php @@ -6,5 +6,8 @@ class RequestMethod { const PUT = 'PUT'; const DELETE = 'DELETE'; const PATCH = 'PATCH'; - const ALL = [self::GET, self::POST, self::PUT, self::DELETE, self::PATCH]; + + static function all() { + return array(self::GET, self::POST, self::PUT, self::DELETE, self::PATCH); + } } \ No newline at end of file diff --git a/api/index.php b/api/index.php index b4c3b490..c8115d2c 100644 --- a/api/index.php +++ b/api/index.php @@ -188,36 +188,36 @@ Link::all(array( '/v1/categories/{i}' => action(\Controllers\Categories\CategoryController::class, [RequestMethod::GET, RequestMethod::PUT, RequestMethod::DELETE], SecurityHandler::INTERNAL_OR_AUTH_TOKEN), '/v1-internal/categories/{i}/sort/{s}' => action(\Controllers\Categories\CategoryController::class . '::sort', [RequestMethod::POST], SecurityHandler::INTERNAL), // Tickets - '/v1/tickets' => action(\Controllers\Tickets\CustomerTicketController::class), + '/v1/tickets' => action(\Controllers\Tickets\CustomerTicketController::class, RequestMethod::all()), // Tickets - Staff - '/v1/staff/tickets/{i}' => action(\Controllers\Tickets\StaffTicketController::class), + '/v1/staff/tickets/{i}' => action(\Controllers\Tickets\StaffTicketController::class, RequestMethod::all()), // Attachments - '/v1/tickets/{a}/attachments/{i}' => action(\Controllers\Attachments\PublicAttachmentController::class . '::getRaw'), - '/v1/staff/tickets/{i}/attachments' => action(\Controllers\Attachments\StaffTicketAttachmentsController::class), - '/v1/staff/tickets/{i}/attachments/{i}' => action(\Controllers\Attachments\StaffTicketAttachmentsController::class), + '/v1/tickets/{a}/attachments/{i}' => action(\Controllers\Attachments\PublicAttachmentController::class . '::getRaw', RequestMethod::all()), + '/v1/staff/tickets/{i}/attachments' => action(\Controllers\Attachments\StaffTicketAttachmentsController::class, RequestMethod::all()), + '/v1/staff/tickets/{i}/attachments/{i}' => action(\Controllers\Attachments\StaffTicketAttachmentsController::class, RequestMethod::all()), // Statuses - '/v1/statuses' => action(\Controllers\Statuses\StatusController::class), + '/v1/statuses' => action(\Controllers\Statuses\StatusController::class, RequestMethod::all()), // Settings - '/v1/settings' => action(\Controllers\Settings\SettingsController::class), + '/v1/settings' => action(\Controllers\Settings\SettingsController::class, RequestMethod::all()), /* Internal use only routes */ // Resend email response '/v1-internal/staff/tickets/{i}/resend-email' => - action(\Controllers\Tickets\ResendTicketEmailToCustomerController::class, RequestMethod::ALL, SecurityHandler::INTERNAL), + action(\Controllers\Tickets\ResendTicketEmailToCustomerController::class, RequestMethod::all(), SecurityHandler::INTERNAL), // Custom Navigation '/v1-internal/custom-navigation/all' => - action(\Controllers\Navigation\CustomNavElementController::class . '::getAll', RequestMethod::ALL, SecurityHandler::INTERNAL), + action(\Controllers\Navigation\CustomNavElementController::class . '::getAll', RequestMethod::all(), SecurityHandler::INTERNAL), '/v1-internal/custom-navigation' => - action(\Controllers\Navigation\CustomNavElementController::class, RequestMethod::ALL, SecurityHandler::INTERNAL), + action(\Controllers\Navigation\CustomNavElementController::class, RequestMethod::all(), SecurityHandler::INTERNAL), '/v1-internal/custom-navigation/{i}' => - action(\Controllers\Navigation\CustomNavElementController::class, RequestMethod::ALL, SecurityHandler::INTERNAL), + action(\Controllers\Navigation\CustomNavElementController::class, RequestMethod::all(), SecurityHandler::INTERNAL), '/v1-internal/custom-navigation/{i}/sort/{s}' => - action(\Controllers\Navigation\CustomNavElementController::class . '::sort', RequestMethod::ALL, SecurityHandler::INTERNAL), + action(\Controllers\Navigation\CustomNavElementController::class . '::sort', RequestMethod::all(), SecurityHandler::INTERNAL), '/v1-public/hesk-version' => - action(\Controllers\System\HeskVersionController::class . '::getHeskVersion', RequestMethod::ALL, SecurityHandler::OPEN), + action(\Controllers\System\HeskVersionController::class . '::getHeskVersion', RequestMethod::all(), SecurityHandler::OPEN), '/v1-public/mods-for-hesk-version' => - action(\Controllers\System\HeskVersionController::class . '::getModsForHeskVersion', RequestMethod::ALL, SecurityHandler::OPEN), + action(\Controllers\System\HeskVersionController::class . '::getModsForHeskVersion', RequestMethod::all(), SecurityHandler::OPEN), // Any URL that doesn't match goes to the 404 handler '404' => 'handle404' @@ -229,7 +229,7 @@ Link::all(array( * @param $securityHandler string The proper security handler * @return array The configured path */ -function action($class, $requestMethods = RequestMethod::ALL, $securityHandler = SecurityHandler::AUTH_TOKEN) { +function action($class, $requestMethods, $securityHandler = SecurityHandler::AUTH_TOKEN) { return [$class, $class, $securityHandler, $requestMethods]; } From 3c4018ace3f409f6abf96bb8e4d050d16cb6c0bb Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Mon, 11 Sep 2017 12:56:18 -0400 Subject: [PATCH 050/248] Add validation steps for PHP 5.4 and 5.3 --- .gitlab-ci.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dfe1eb8e..f9779aa5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,6 +30,18 @@ validate:5.5: script: - bash ci/php_lint.sh ./ +validate:5.4: + image: php:5.4 + stage: validate + script: + - bash ci/php_lint.sh ./ + +validate:5.3: + image: php:5.3 + stage: validate + script: + - bash ci/php_lint.sh ./ + test:7.1: image: php:7.1 stage: test From 016a50878df484f5666b21d4573a67dc3aa4105b Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Mon, 11 Sep 2017 21:03:03 -0400 Subject: [PATCH 051/248] Add a BaseClass/BaseException for 5.4 compatibility --- api/BaseClass.php | 7 +++ api/BaseException.php | 7 +++ api/BusinessLogic/Attachments/Attachment.php | 2 +- .../Attachments/AttachmentHandler.php | 2 +- .../Attachments/AttachmentRetriever.php | 2 +- .../Attachments/AttachmentType.php | 2 +- .../Attachments/CreateAttachmentModel.php | 2 +- api/BusinessLogic/Categories/Category.php | 2 +- .../Categories/CategoryHandler.php | 2 +- .../Categories/CategoryRetriever.php | 2 +- api/BusinessLogic/Emails/Addressees.php | 2 +- api/BusinessLogic/Emails/BasicEmailSender.php | 2 +- api/BusinessLogic/Emails/EmailBuilder.php | 2 +- .../Emails/EmailSenderHelper.php | 2 +- api/BusinessLogic/Emails/EmailTemplate.php | 2 +- .../Emails/EmailTemplateParser.php | 2 +- .../Emails/EmailTemplateRetriever.php | 2 +- .../Emails/MailgunEmailSender.php | 2 +- .../Emails/ParsedEmailProperties.php | 2 +- .../Exceptions/ApiFriendlyException.php | 2 +- api/BusinessLogic/Helpers.php | 2 +- .../Navigation/CustomNavElement.php | 2 +- .../Navigation/CustomNavElementHandler.php | 2 +- .../Navigation/CustomNavElementPlace.php | 2 +- api/BusinessLogic/Navigation/Direction.php | 2 +- api/BusinessLogic/Security/BanRetriever.php | 2 +- api/BusinessLogic/Security/BannedEmail.php | 2 +- api/BusinessLogic/Security/BannedIp.php | 2 +- .../Security/PermissionChecker.php | 2 +- api/BusinessLogic/Security/UserContext.php | 2 +- .../Security/UserContextBuilder.php | 2 +- .../Security/UserContextNotifications.php | 2 +- .../Security/UserContextPreferences.php | 2 +- api/BusinessLogic/Security/UserPrivilege.php | 2 +- .../Security/UserToTicketChecker.php | 2 +- api/BusinessLogic/Settings/ApiChecker.php | 2 +- .../Settings/SettingsRetriever.php | 2 +- api/BusinessLogic/Statuses/Closable.php | 2 +- .../Statuses/DefaultStatusForAction.php | 2 +- api/BusinessLogic/Statuses/Status.php | 2 +- .../Statuses/StatusRetriever.php | 2 +- api/BusinessLogic/Tickets/Attachment.php | 2 +- api/BusinessLogic/Tickets/Autoassigner.php | 2 +- .../Tickets/CreateTicketByCustomerModel.php | 2 +- .../Tickets/CreatedTicketModel.php | 2 +- .../CustomFields/CustomFieldValidator.php | 2 +- api/BusinessLogic/Tickets/EditTicketModel.php | 2 +- .../UnableToGenerateTrackingIdException.php | 4 +- .../Tickets/NewTicketValidator.php | 2 +- api/BusinessLogic/Tickets/Reply.php | 2 +- api/BusinessLogic/Tickets/Ticket.php | 2 +- api/BusinessLogic/Tickets/TicketCreator.php | 2 +- api/BusinessLogic/Tickets/TicketDeleter.php | 2 +- api/BusinessLogic/Tickets/TicketEditor.php | 2 +- .../Tickets/TicketGatewayGeneratedFields.php | 2 +- api/BusinessLogic/Tickets/TicketRetriever.php | 2 +- .../Tickets/TicketValidators.php | 2 +- .../Tickets/TrackingIdGenerator.php | 2 +- .../Tickets/VerifiedEmailChecker.php | 2 +- api/BusinessLogic/ValidationModel.php | 2 +- api/BusinessLogic/Validators.php | 2 +- .../PublicAttachmentController.php | 2 +- .../StaffTicketAttachmentsController.php | 2 +- .../Categories/CategoryController.php | 2 +- api/Controllers/InternalApiController.php | 2 +- api/Controllers/JsonRetriever.php | 2 +- .../Settings/SettingsController.php | 2 +- api/Controllers/Statuses/StatusController.php | 2 +- .../System/HeskVersionController.php | 2 +- .../Tickets/CustomerTicketController.php | 2 +- .../Tickets/StaffTicketController.php | 2 +- api/Core/Constants/CustomField.php | 2 +- api/Core/Constants/Priority.php | 2 +- api/Core/Exceptions/SQLException.php | 4 +- api/DataAccess/CommonDao.php | 2 +- api/DataAccess/Files/FileDeleter.php | 4 +- api/DataAccess/Files/FileReader.php | 2 +- api/DataAccess/Files/FileWriter.php | 2 +- api/DataAccess/Logging/Severity.php | 2 +- api/Link.php | 2 +- api/index.php | 46 +++++++++---------- 81 files changed, 115 insertions(+), 107 deletions(-) create mode 100644 api/BaseClass.php create mode 100644 api/BaseException.php diff --git a/api/BaseClass.php b/api/BaseClass.php new file mode 100644 index 00000000..51ca30ae --- /dev/null +++ b/api/BaseClass.php @@ -0,0 +1,7 @@ +subject = $subject; $this->message = $message; diff --git a/api/BusinessLogic/Exceptions/ApiFriendlyException.php b/api/BusinessLogic/Exceptions/ApiFriendlyException.php index f9fac53b..b9db70e8 100644 --- a/api/BusinessLogic/Exceptions/ApiFriendlyException.php +++ b/api/BusinessLogic/Exceptions/ApiFriendlyException.php @@ -5,7 +5,7 @@ namespace BusinessLogic\Exceptions; use Exception; -class ApiFriendlyException extends Exception { +class ApiFriendlyException extends \BaseException { public $title; public $httpResponseCode; diff --git a/api/BusinessLogic/Helpers.php b/api/BusinessLogic/Helpers.php index 61f6af2d..5a36c723 100644 --- a/api/BusinessLogic/Helpers.php +++ b/api/BusinessLogic/Helpers.php @@ -3,7 +3,7 @@ namespace BusinessLogic; -class Helpers { +class Helpers extends \BaseClass { static function getHeader($key) { $headers = getallheaders(); diff --git a/api/BusinessLogic/Navigation/CustomNavElement.php b/api/BusinessLogic/Navigation/CustomNavElement.php index 74b4ca1a..dfaf43f2 100644 --- a/api/BusinessLogic/Navigation/CustomNavElement.php +++ b/api/BusinessLogic/Navigation/CustomNavElement.php @@ -3,7 +3,7 @@ namespace BusinessLogic\Navigation; -class CustomNavElement { +class CustomNavElement extends \BaseClass { /* @var $id int*/ public $id; diff --git a/api/BusinessLogic/Navigation/CustomNavElementHandler.php b/api/BusinessLogic/Navigation/CustomNavElementHandler.php index 8f5ac644..85fba023 100644 --- a/api/BusinessLogic/Navigation/CustomNavElementHandler.php +++ b/api/BusinessLogic/Navigation/CustomNavElementHandler.php @@ -6,7 +6,7 @@ namespace BusinessLogic\Navigation; use BusinessLogic\Exceptions\ApiFriendlyException; use DataAccess\Navigation\CustomNavElementGateway; -class CustomNavElementHandler { +class CustomNavElementHandler extends \BaseClass { /* @var $customNavElementGateway CustomNavElementGateway */ private $customNavElementGateway; diff --git a/api/BusinessLogic/Navigation/CustomNavElementPlace.php b/api/BusinessLogic/Navigation/CustomNavElementPlace.php index 3114fdc7..2a2984b9 100644 --- a/api/BusinessLogic/Navigation/CustomNavElementPlace.php +++ b/api/BusinessLogic/Navigation/CustomNavElementPlace.php @@ -3,7 +3,7 @@ namespace BusinessLogic\Navigation; -class CustomNavElementPlace { +class CustomNavElementPlace extends \BaseClass { const HOMEPAGE_BLOCK = 1; const CUSTOMER_NAVIGATION = 2; const ADMIN_NAVIGATION = 3; diff --git a/api/BusinessLogic/Navigation/Direction.php b/api/BusinessLogic/Navigation/Direction.php index f14a00cf..390b9915 100644 --- a/api/BusinessLogic/Navigation/Direction.php +++ b/api/BusinessLogic/Navigation/Direction.php @@ -3,7 +3,7 @@ namespace BusinessLogic\Navigation; -class Direction { +class Direction extends \BaseClass { const UP = 'up'; const DOWN = 'down'; } \ No newline at end of file diff --git a/api/BusinessLogic/Security/BanRetriever.php b/api/BusinessLogic/Security/BanRetriever.php index 66213cf5..4d1676fe 100644 --- a/api/BusinessLogic/Security/BanRetriever.php +++ b/api/BusinessLogic/Security/BanRetriever.php @@ -5,7 +5,7 @@ namespace BusinessLogic\Security; use DataAccess\Security\BanGateway; -class BanRetriever { +class BanRetriever extends \BaseClass { /** * @var BanGateway */ diff --git a/api/BusinessLogic/Security/BannedEmail.php b/api/BusinessLogic/Security/BannedEmail.php index 691a6604..9cd4a408 100644 --- a/api/BusinessLogic/Security/BannedEmail.php +++ b/api/BusinessLogic/Security/BannedEmail.php @@ -3,7 +3,7 @@ namespace BusinessLogic\Security; -class BannedEmail { +class BannedEmail extends \BaseClass { /** * @var int */ diff --git a/api/BusinessLogic/Security/BannedIp.php b/api/BusinessLogic/Security/BannedIp.php index e34b2516..f2c8572b 100644 --- a/api/BusinessLogic/Security/BannedIp.php +++ b/api/BusinessLogic/Security/BannedIp.php @@ -3,7 +3,7 @@ namespace BusinessLogic\Security; -class BannedIp { +class BannedIp extends \BaseClass { /** * @var int */ diff --git a/api/BusinessLogic/Security/PermissionChecker.php b/api/BusinessLogic/Security/PermissionChecker.php index cf2b1a43..de47465f 100644 --- a/api/BusinessLogic/Security/PermissionChecker.php +++ b/api/BusinessLogic/Security/PermissionChecker.php @@ -3,7 +3,7 @@ namespace BusinessLogic\Security; -class PermissionChecker { +class PermissionChecker extends \BaseClass { /** * @param $userContext UserContext * @param $permission string diff --git a/api/BusinessLogic/Security/UserContext.php b/api/BusinessLogic/Security/UserContext.php index 0beedc07..ee1522a9 100644 --- a/api/BusinessLogic/Security/UserContext.php +++ b/api/BusinessLogic/Security/UserContext.php @@ -3,7 +3,7 @@ namespace BusinessLogic\Security; -class UserContext { +class UserContext extends \BaseClass { /* @var $id int */ public $id; diff --git a/api/BusinessLogic/Security/UserContextBuilder.php b/api/BusinessLogic/Security/UserContextBuilder.php index 7bb975ee..a236f4be 100644 --- a/api/BusinessLogic/Security/UserContextBuilder.php +++ b/api/BusinessLogic/Security/UserContextBuilder.php @@ -8,7 +8,7 @@ use BusinessLogic\Exceptions\MissingAuthenticationTokenException; use BusinessLogic\Helpers; use DataAccess\Security\UserGateway; -class UserContextBuilder { +class UserContextBuilder extends \BaseClass { /** * @var UserGateway */ diff --git a/api/BusinessLogic/Security/UserContextNotifications.php b/api/BusinessLogic/Security/UserContextNotifications.php index 9c32547c..c75742f4 100644 --- a/api/BusinessLogic/Security/UserContextNotifications.php +++ b/api/BusinessLogic/Security/UserContextNotifications.php @@ -3,7 +3,7 @@ namespace BusinessLogic\Security; -class UserContextNotifications { +class UserContextNotifications extends \BaseClass { public $newUnassigned; public $newAssignedToMe; public $replyUnassigned; diff --git a/api/BusinessLogic/Security/UserContextPreferences.php b/api/BusinessLogic/Security/UserContextPreferences.php index f860d3ec..b342070c 100644 --- a/api/BusinessLogic/Security/UserContextPreferences.php +++ b/api/BusinessLogic/Security/UserContextPreferences.php @@ -3,7 +3,7 @@ namespace BusinessLogic\Security; -class UserContextPreferences { +class UserContextPreferences extends \BaseClass { public $afterReply; public $autoStartTimeWorked; public $autoreload; diff --git a/api/BusinessLogic/Security/UserPrivilege.php b/api/BusinessLogic/Security/UserPrivilege.php index 1e90ff70..353e8e43 100644 --- a/api/BusinessLogic/Security/UserPrivilege.php +++ b/api/BusinessLogic/Security/UserPrivilege.php @@ -9,7 +9,7 @@ namespace BusinessLogic\Security; -class UserPrivilege { +class UserPrivilege extends \BaseClass { const CAN_VIEW_TICKETS = 'can_view_tickets'; const CAN_REPLY_TO_TICKETS = 'can_reply_tickets'; const CAN_EDIT_TICKETS = 'can_edit_tickets'; diff --git a/api/BusinessLogic/Security/UserToTicketChecker.php b/api/BusinessLogic/Security/UserToTicketChecker.php index 0f21d785..13d88226 100644 --- a/api/BusinessLogic/Security/UserToTicketChecker.php +++ b/api/BusinessLogic/Security/UserToTicketChecker.php @@ -6,7 +6,7 @@ namespace BusinessLogic\Security; use BusinessLogic\Tickets\Ticket; use DataAccess\Security\UserGateway; -class UserToTicketChecker { +class UserToTicketChecker extends \BaseClass { /* @var $userGateway UserGateway */ private $userGateway; diff --git a/api/BusinessLogic/Settings/ApiChecker.php b/api/BusinessLogic/Settings/ApiChecker.php index 8645dd5c..da1a3d11 100644 --- a/api/BusinessLogic/Settings/ApiChecker.php +++ b/api/BusinessLogic/Settings/ApiChecker.php @@ -5,7 +5,7 @@ namespace BusinessLogic\Settings; use DataAccess\Settings\ModsForHeskSettingsGateway; -class ApiChecker { +class ApiChecker extends \BaseClass { /* @var $modsForHeskSettingsGateway ModsForHeskSettingsGateway */ private $modsForHeskSettingsGateway; diff --git a/api/BusinessLogic/Settings/SettingsRetriever.php b/api/BusinessLogic/Settings/SettingsRetriever.php index 21eeb13a..a18ce15a 100644 --- a/api/BusinessLogic/Settings/SettingsRetriever.php +++ b/api/BusinessLogic/Settings/SettingsRetriever.php @@ -5,7 +5,7 @@ namespace BusinessLogic\Settings; // TODO Test! use DataAccess\Settings\ModsForHeskSettingsGateway; -class SettingsRetriever { +class SettingsRetriever extends \BaseClass { /* @var $modsForHeskSettingsGateway ModsForHeskSettingsGateway */ private $modsForHeskSettingsGateway; diff --git a/api/BusinessLogic/Statuses/Closable.php b/api/BusinessLogic/Statuses/Closable.php index 9d87efca..2dd68c03 100644 --- a/api/BusinessLogic/Statuses/Closable.php +++ b/api/BusinessLogic/Statuses/Closable.php @@ -3,7 +3,7 @@ namespace BusinessLogic\Statuses; -class Closable { +class Closable extends \BaseClass { const YES = "yes"; const STAFF_ONLY = "sonly"; const CUSTOMERS_ONLY = "conly"; diff --git a/api/BusinessLogic/Statuses/DefaultStatusForAction.php b/api/BusinessLogic/Statuses/DefaultStatusForAction.php index bfafff7c..a6ce7ac6 100644 --- a/api/BusinessLogic/Statuses/DefaultStatusForAction.php +++ b/api/BusinessLogic/Statuses/DefaultStatusForAction.php @@ -3,7 +3,7 @@ namespace BusinessLogic\Statuses; -class DefaultStatusForAction { +class DefaultStatusForAction extends \BaseClass { const NEW_TICKET = "IsNewTicketStatus"; const CLOSED_STATUS = "IsClosed"; const CLOSED_BY_CLIENT = "IsClosedByClient"; diff --git a/api/BusinessLogic/Statuses/Status.php b/api/BusinessLogic/Statuses/Status.php index c5ef3242..fc5babd4 100644 --- a/api/BusinessLogic/Statuses/Status.php +++ b/api/BusinessLogic/Statuses/Status.php @@ -3,7 +3,7 @@ namespace BusinessLogic\Statuses; -class Status { +class Status extends \BaseClass { static function fromDatabase($row, $languageRs) { $status = new Status(); $status->id = intval($row['ID']); diff --git a/api/BusinessLogic/Statuses/StatusRetriever.php b/api/BusinessLogic/Statuses/StatusRetriever.php index 181ceae1..a16d0ca7 100644 --- a/api/BusinessLogic/Statuses/StatusRetriever.php +++ b/api/BusinessLogic/Statuses/StatusRetriever.php @@ -6,7 +6,7 @@ namespace BusinessLogic\Statuses; use DataAccess\Statuses\StatusGateway; // TODO Test! -class StatusRetriever { +class StatusRetriever extends \BaseClass { /* @var $statusGateway StatusGateway */ private $statusGateway; diff --git a/api/BusinessLogic/Tickets/Attachment.php b/api/BusinessLogic/Tickets/Attachment.php index 295864bc..e665f69b 100644 --- a/api/BusinessLogic/Tickets/Attachment.php +++ b/api/BusinessLogic/Tickets/Attachment.php @@ -3,7 +3,7 @@ namespace BusinessLogic\Tickets; -class Attachment { +class Attachment extends \BaseClass { /** * @var int */ diff --git a/api/BusinessLogic/Tickets/Autoassigner.php b/api/BusinessLogic/Tickets/Autoassigner.php index e4095815..fd9797b9 100644 --- a/api/BusinessLogic/Tickets/Autoassigner.php +++ b/api/BusinessLogic/Tickets/Autoassigner.php @@ -8,7 +8,7 @@ use BusinessLogic\Security\UserPrivilege; use DataAccess\Categories\CategoryGateway; use DataAccess\Security\UserGateway; -class Autoassigner { +class Autoassigner extends \BaseClass { /* @var $categoryGateway CategoryGateway */ private $categoryGateway; diff --git a/api/BusinessLogic/Tickets/CreateTicketByCustomerModel.php b/api/BusinessLogic/Tickets/CreateTicketByCustomerModel.php index 7163e6b8..d5fa6126 100644 --- a/api/BusinessLogic/Tickets/CreateTicketByCustomerModel.php +++ b/api/BusinessLogic/Tickets/CreateTicketByCustomerModel.php @@ -2,7 +2,7 @@ namespace BusinessLogic\Tickets; -class CreateTicketByCustomerModel { +class CreateTicketByCustomerModel extends \BaseClass { /** * @var string */ diff --git a/api/BusinessLogic/Tickets/CreatedTicketModel.php b/api/BusinessLogic/Tickets/CreatedTicketModel.php index daeee757..a45385e9 100644 --- a/api/BusinessLogic/Tickets/CreatedTicketModel.php +++ b/api/BusinessLogic/Tickets/CreatedTicketModel.php @@ -3,7 +3,7 @@ namespace BusinessLogic\Tickets; -class CreatedTicketModel { +class CreatedTicketModel extends \BaseClass { /* @var $ticket Ticket */ public $ticket; diff --git a/api/BusinessLogic/Tickets/CustomFields/CustomFieldValidator.php b/api/BusinessLogic/Tickets/CustomFields/CustomFieldValidator.php index 12e1ccc7..dee499b9 100644 --- a/api/BusinessLogic/Tickets/CustomFields/CustomFieldValidator.php +++ b/api/BusinessLogic/Tickets/CustomFields/CustomFieldValidator.php @@ -3,7 +3,7 @@ namespace BusinessLogic\Tickets\CustomFields; -class CustomFieldValidator { +class CustomFieldValidator extends \BaseClass { static function isCustomFieldInCategory($customFieldId, $categoryId, $staff, $heskSettings) { $customField = $heskSettings['custom_fields']["custom{$customFieldId}"]; diff --git a/api/BusinessLogic/Tickets/EditTicketModel.php b/api/BusinessLogic/Tickets/EditTicketModel.php index 21e95ef1..b1b0fdd2 100644 --- a/api/BusinessLogic/Tickets/EditTicketModel.php +++ b/api/BusinessLogic/Tickets/EditTicketModel.php @@ -3,7 +3,7 @@ namespace BusinessLogic\Tickets; -class EditTicketModel { +class EditTicketModel extends \BaseClass { /* @var $id int */ public $id; diff --git a/api/BusinessLogic/Tickets/Exceptions/UnableToGenerateTrackingIdException.php b/api/BusinessLogic/Tickets/Exceptions/UnableToGenerateTrackingIdException.php index 0d2718a8..65e041d2 100644 --- a/api/BusinessLogic/Tickets/Exceptions/UnableToGenerateTrackingIdException.php +++ b/api/BusinessLogic/Tickets/Exceptions/UnableToGenerateTrackingIdException.php @@ -3,9 +3,7 @@ namespace BusinessLogic\Tickets\Exceptions; -use Exception; - -class UnableToGenerateTrackingIdException extends Exception { +class UnableToGenerateTrackingIdException extends \BaseException { public function __construct() { parent::__construct("Error generating a unique ticket ID."); } diff --git a/api/BusinessLogic/Tickets/NewTicketValidator.php b/api/BusinessLogic/Tickets/NewTicketValidator.php index 7697f860..8f1c10d6 100644 --- a/api/BusinessLogic/Tickets/NewTicketValidator.php +++ b/api/BusinessLogic/Tickets/NewTicketValidator.php @@ -10,7 +10,7 @@ use BusinessLogic\ValidationModel; use BusinessLogic\Validators; use Core\Constants\CustomField; -class NewTicketValidator { +class NewTicketValidator extends \BaseClass { /** * @var $categoryRetriever CategoryRetriever */ diff --git a/api/BusinessLogic/Tickets/Reply.php b/api/BusinessLogic/Tickets/Reply.php index 77c1d4b9..3c623f2c 100644 --- a/api/BusinessLogic/Tickets/Reply.php +++ b/api/BusinessLogic/Tickets/Reply.php @@ -9,7 +9,7 @@ namespace BusinessLogic\Tickets; -class Reply { +class Reply extends \BaseClass { /** * @var $id int */ diff --git a/api/BusinessLogic/Tickets/Ticket.php b/api/BusinessLogic/Tickets/Ticket.php index 42eda13c..0b7c56cf 100644 --- a/api/BusinessLogic/Tickets/Ticket.php +++ b/api/BusinessLogic/Tickets/Ticket.php @@ -3,7 +3,7 @@ namespace BusinessLogic\Tickets; -class Ticket { +class Ticket extends \BaseClass { static function fromDatabaseRow($row, $linkedTicketsRs, $repliesRs, $heskSettings) { $ticket = new Ticket(); $ticket->id = intval($row['id']); diff --git a/api/BusinessLogic/Tickets/TicketCreator.php b/api/BusinessLogic/Tickets/TicketCreator.php index d9e8c346..7f677c50 100644 --- a/api/BusinessLogic/Tickets/TicketCreator.php +++ b/api/BusinessLogic/Tickets/TicketCreator.php @@ -12,7 +12,7 @@ use DataAccess\Settings\ModsForHeskSettingsGateway; use DataAccess\Statuses\StatusGateway; use DataAccess\Tickets\TicketGateway; -class TicketCreator { +class TicketCreator extends \BaseClass { /** * @var $newTicketValidator NewTicketValidator */ diff --git a/api/BusinessLogic/Tickets/TicketDeleter.php b/api/BusinessLogic/Tickets/TicketDeleter.php index 7d1fa4d9..bbc22c2a 100644 --- a/api/BusinessLogic/Tickets/TicketDeleter.php +++ b/api/BusinessLogic/Tickets/TicketDeleter.php @@ -10,7 +10,7 @@ use BusinessLogic\Security\UserPrivilege; use BusinessLogic\Security\UserToTicketChecker; use DataAccess\Tickets\TicketGateway; -class TicketDeleter { +class TicketDeleter extends \BaseClass { /* @var $ticketGateway TicketGateway */ private $ticketGateway; diff --git a/api/BusinessLogic/Tickets/TicketEditor.php b/api/BusinessLogic/Tickets/TicketEditor.php index ac0bca61..e15b33d9 100644 --- a/api/BusinessLogic/Tickets/TicketEditor.php +++ b/api/BusinessLogic/Tickets/TicketEditor.php @@ -15,7 +15,7 @@ use BusinessLogic\Validators; use Core\Constants\CustomField; use DataAccess\Tickets\TicketGateway; -class TicketEditor { +class TicketEditor extends \BaseClass { /* @var $ticketGateway TicketGateway */ private $ticketGateway; diff --git a/api/BusinessLogic/Tickets/TicketGatewayGeneratedFields.php b/api/BusinessLogic/Tickets/TicketGatewayGeneratedFields.php index 56c2a8b3..602321f8 100644 --- a/api/BusinessLogic/Tickets/TicketGatewayGeneratedFields.php +++ b/api/BusinessLogic/Tickets/TicketGatewayGeneratedFields.php @@ -3,7 +3,7 @@ namespace BusinessLogic\Tickets; -class TicketGatewayGeneratedFields { +class TicketGatewayGeneratedFields extends \BaseClass { public $id; public $dateCreated; public $dateModified; diff --git a/api/BusinessLogic/Tickets/TicketRetriever.php b/api/BusinessLogic/Tickets/TicketRetriever.php index 569210ef..ec71329d 100644 --- a/api/BusinessLogic/Tickets/TicketRetriever.php +++ b/api/BusinessLogic/Tickets/TicketRetriever.php @@ -10,7 +10,7 @@ use BusinessLogic\Security\UserToTicketChecker; use BusinessLogic\ValidationModel; use DataAccess\Tickets\TicketGateway; -class TicketRetriever { +class TicketRetriever extends \BaseClass { /** * @var $ticketGateway TicketGateway */ diff --git a/api/BusinessLogic/Tickets/TicketValidators.php b/api/BusinessLogic/Tickets/TicketValidators.php index ff310757..ce9d9582 100644 --- a/api/BusinessLogic/Tickets/TicketValidators.php +++ b/api/BusinessLogic/Tickets/TicketValidators.php @@ -4,7 +4,7 @@ namespace BusinessLogic\Tickets; use DataAccess\Tickets\TicketGateway; -class TicketValidators { +class TicketValidators extends \BaseClass { /** * @var $ticketGateway TicketGateway */ diff --git a/api/BusinessLogic/Tickets/TrackingIdGenerator.php b/api/BusinessLogic/Tickets/TrackingIdGenerator.php index 892953e5..c397c7c2 100644 --- a/api/BusinessLogic/Tickets/TrackingIdGenerator.php +++ b/api/BusinessLogic/Tickets/TrackingIdGenerator.php @@ -6,7 +6,7 @@ namespace BusinessLogic\Tickets; use BusinessLogic\Tickets\Exceptions\UnableToGenerateTrackingIdException; use DataAccess\Tickets\TicketGateway; -class TrackingIdGenerator { +class TrackingIdGenerator extends \BaseClass { /** * @var $ticketGateway TicketGateway */ diff --git a/api/BusinessLogic/Tickets/VerifiedEmailChecker.php b/api/BusinessLogic/Tickets/VerifiedEmailChecker.php index 3846fbc3..5770b9c1 100644 --- a/api/BusinessLogic/Tickets/VerifiedEmailChecker.php +++ b/api/BusinessLogic/Tickets/VerifiedEmailChecker.php @@ -11,7 +11,7 @@ namespace BusinessLogic\Tickets; use DataAccess\Tickets\VerifiedEmailGateway; -class VerifiedEmailChecker { +class VerifiedEmailChecker extends \BaseClass { /** * @var $verifiedEmailGateway VerifiedEmailGateway */ diff --git a/api/BusinessLogic/ValidationModel.php b/api/BusinessLogic/ValidationModel.php index b3e085cd..0ca28eaf 100644 --- a/api/BusinessLogic/ValidationModel.php +++ b/api/BusinessLogic/ValidationModel.php @@ -2,7 +2,7 @@ namespace BusinessLogic; -class ValidationModel { +class ValidationModel extends \BaseClass { /** * @var array */ diff --git a/api/BusinessLogic/Validators.php b/api/BusinessLogic/Validators.php index a718dfd4..e0303434 100644 --- a/api/BusinessLogic/Validators.php +++ b/api/BusinessLogic/Validators.php @@ -3,7 +3,7 @@ namespace BusinessLogic; -class Validators { +class Validators extends \BaseClass { /** * @param string $address - the email address * @param array $multiple_emails - true if HESK (or custom field) supports multiple emails diff --git a/api/Controllers/Attachments/PublicAttachmentController.php b/api/Controllers/Attachments/PublicAttachmentController.php index c12325a5..da489d42 100644 --- a/api/Controllers/Attachments/PublicAttachmentController.php +++ b/api/Controllers/Attachments/PublicAttachmentController.php @@ -7,7 +7,7 @@ use BusinessLogic\Attachments\Attachment; use BusinessLogic\Attachments\AttachmentRetriever; use BusinessLogic\Exceptions\ApiFriendlyException; -class PublicAttachmentController { +class PublicAttachmentController extends \BaseClass { static function getRaw($trackingId, $attachmentId) { global $hesk_settings, $applicationContext, $userContext; diff --git a/api/Controllers/Attachments/StaffTicketAttachmentsController.php b/api/Controllers/Attachments/StaffTicketAttachmentsController.php index 7f6a09c0..c97b0d1f 100644 --- a/api/Controllers/Attachments/StaffTicketAttachmentsController.php +++ b/api/Controllers/Attachments/StaffTicketAttachmentsController.php @@ -11,7 +11,7 @@ use BusinessLogic\Helpers; use BusinessLogic\Security\UserToTicketChecker; use Controllers\JsonRetriever; -class StaffTicketAttachmentsController { +class StaffTicketAttachmentsController extends \BaseClass { function get($ticketId, $attachmentId) { global $hesk_settings, $applicationContext, $userContext; diff --git a/api/Controllers/Categories/CategoryController.php b/api/Controllers/Categories/CategoryController.php index 0ef2bf75..a9943bcd 100644 --- a/api/Controllers/Categories/CategoryController.php +++ b/api/Controllers/Categories/CategoryController.php @@ -9,7 +9,7 @@ use BusinessLogic\Exceptions\ApiFriendlyException; use BusinessLogic\Helpers; use Controllers\JsonRetriever; -class CategoryController { +class CategoryController extends \BaseClass { function get($id) { $categories = self::getAllCategories(); diff --git a/api/Controllers/InternalApiController.php b/api/Controllers/InternalApiController.php index c629e136..dd7286fe 100644 --- a/api/Controllers/InternalApiController.php +++ b/api/Controllers/InternalApiController.php @@ -6,7 +6,7 @@ namespace Controllers; use BusinessLogic\Exceptions\InternalUseOnlyException; use BusinessLogic\Helpers; -abstract class InternalApiController { +abstract class InternalApiController extends \BaseClass { static function staticCheckForInternalUseOnly() { $tokenHeader = Helpers::getHeader('X-AUTH-TOKEN'); if ($tokenHeader !== null && trim($tokenHeader) !== '') { diff --git a/api/Controllers/JsonRetriever.php b/api/Controllers/JsonRetriever.php index 6b0810d3..fef06694 100644 --- a/api/Controllers/JsonRetriever.php +++ b/api/Controllers/JsonRetriever.php @@ -3,7 +3,7 @@ namespace Controllers; -class JsonRetriever { +class JsonRetriever extends \BaseClass { /** * Support POST, PUT, and PATCH request (and possibly more) * diff --git a/api/Controllers/Settings/SettingsController.php b/api/Controllers/Settings/SettingsController.php index 4e66016a..6737052f 100644 --- a/api/Controllers/Settings/SettingsController.php +++ b/api/Controllers/Settings/SettingsController.php @@ -5,7 +5,7 @@ namespace Controllers\Settings; use BusinessLogic\Settings\SettingsRetriever; -class SettingsController { +class SettingsController extends \BaseClass { function get() { global $applicationContext, $hesk_settings; diff --git a/api/Controllers/Statuses/StatusController.php b/api/Controllers/Statuses/StatusController.php index 536c6b60..16473ae3 100644 --- a/api/Controllers/Statuses/StatusController.php +++ b/api/Controllers/Statuses/StatusController.php @@ -5,7 +5,7 @@ namespace Controllers\Statuses; use BusinessLogic\Statuses\StatusRetriever; -class StatusController { +class StatusController extends \BaseClass { function get() { global $applicationContext, $hesk_settings; diff --git a/api/Controllers/System/HeskVersionController.php b/api/Controllers/System/HeskVersionController.php index c07122ed..0b578595 100644 --- a/api/Controllers/System/HeskVersionController.php +++ b/api/Controllers/System/HeskVersionController.php @@ -3,7 +3,7 @@ namespace Controllers\System; -class HeskVersionController { +class HeskVersionController extends \BaseClass { static function getHeskVersion() { global $hesk_settings; diff --git a/api/Controllers/Tickets/CustomerTicketController.php b/api/Controllers/Tickets/CustomerTicketController.php index 2b1b2614..8b8b65fc 100644 --- a/api/Controllers/Tickets/CustomerTicketController.php +++ b/api/Controllers/Tickets/CustomerTicketController.php @@ -10,7 +10,7 @@ use BusinessLogic\ValidationModel; use Controllers\JsonRetriever; -class CustomerTicketController { +class CustomerTicketController extends \BaseClass { function get() { global $applicationContext, $hesk_settings; diff --git a/api/Controllers/Tickets/StaffTicketController.php b/api/Controllers/Tickets/StaffTicketController.php index a4860f07..658d7e7f 100644 --- a/api/Controllers/Tickets/StaffTicketController.php +++ b/api/Controllers/Tickets/StaffTicketController.php @@ -10,7 +10,7 @@ use BusinessLogic\Tickets\TicketEditor; use BusinessLogic\Tickets\TicketRetriever; use Controllers\JsonRetriever; -class StaffTicketController { +class StaffTicketController extends \BaseClass { function get($id) { global $applicationContext, $userContext, $hesk_settings; diff --git a/api/Core/Constants/CustomField.php b/api/Core/Constants/CustomField.php index 6d92cfe8..3bb6ad95 100644 --- a/api/Core/Constants/CustomField.php +++ b/api/Core/Constants/CustomField.php @@ -3,7 +3,7 @@ namespace Core\Constants; -class CustomField { +class CustomField extends \BaseClass { const RADIO = 'radio'; const SELECT = 'select'; const CHECKBOX = 'checkbox'; diff --git a/api/Core/Constants/Priority.php b/api/Core/Constants/Priority.php index 88f98cc3..39b86313 100644 --- a/api/Core/Constants/Priority.php +++ b/api/Core/Constants/Priority.php @@ -3,7 +3,7 @@ namespace Core\Constants; -class Priority { +class Priority extends \BaseClass { const CRITICAL = 0; const HIGH = 1; const MEDIUM = 2; diff --git a/api/Core/Exceptions/SQLException.php b/api/Core/Exceptions/SQLException.php index e9530a5b..2dbfccbe 100644 --- a/api/Core/Exceptions/SQLException.php +++ b/api/Core/Exceptions/SQLException.php @@ -2,9 +2,7 @@ namespace Core\Exceptions; -use Exception; - -class SQLException extends Exception { +class SQLException extends \BaseException { /** * @var $failingQuery string */ diff --git a/api/DataAccess/CommonDao.php b/api/DataAccess/CommonDao.php index f98056fb..cb3f5b3e 100644 --- a/api/DataAccess/CommonDao.php +++ b/api/DataAccess/CommonDao.php @@ -5,7 +5,7 @@ namespace DataAccess; use Exception; -class CommonDao { +class CommonDao extends \BaseClass { /** * @throws Exception if the database isn't properly configured */ diff --git a/api/DataAccess/Files/FileDeleter.php b/api/DataAccess/Files/FileDeleter.php index a625d764..eca69406 100644 --- a/api/DataAccess/Files/FileDeleter.php +++ b/api/DataAccess/Files/FileDeleter.php @@ -3,9 +3,7 @@ namespace DataAccess\Files; -use BusinessLogic\Exceptions\ApiFriendlyException; - -class FileDeleter { +class FileDeleter extends \BaseClass { function deleteFile($name, $folder) { $path = __DIR__ . "/../../../{$folder}/{$name}"; if (!file_exists($path)) { diff --git a/api/DataAccess/Files/FileReader.php b/api/DataAccess/Files/FileReader.php index c4ef2eb0..dd2a8ce7 100644 --- a/api/DataAccess/Files/FileReader.php +++ b/api/DataAccess/Files/FileReader.php @@ -5,7 +5,7 @@ namespace DataAccess\Files; use BusinessLogic\Exceptions\ApiFriendlyException; -class FileReader { +class FileReader extends \BaseClass { /** * @param $name string - The file name (including extension) * @param $folder - The folder name (relative to the ROOT of the helpdesk) diff --git a/api/DataAccess/Files/FileWriter.php b/api/DataAccess/Files/FileWriter.php index 8ca47891..368a4f3b 100644 --- a/api/DataAccess/Files/FileWriter.php +++ b/api/DataAccess/Files/FileWriter.php @@ -3,7 +3,7 @@ namespace DataAccess\Files; -class FileWriter { +class FileWriter extends \BaseClass { /** * @param $name string - The file name (including extension) * @param $folder - The folder name (relative to the ROOT of the helpdesk) diff --git a/api/DataAccess/Logging/Severity.php b/api/DataAccess/Logging/Severity.php index 46124c35..6cdd94ec 100644 --- a/api/DataAccess/Logging/Severity.php +++ b/api/DataAccess/Logging/Severity.php @@ -3,7 +3,7 @@ namespace DataAccess\Logging; -class Severity { +class Severity extends \BaseClass { const DEBUG = 0; const INFO = 1; const WARNING = 2; diff --git a/api/Link.php b/api/Link.php index 0e745ee3..10e5758d 100644 --- a/api/Link.php +++ b/api/Link.php @@ -42,7 +42,7 @@ class Link self::$routes = $routes; $method = self::getRequestMethod(); - $acceptedMethods = RequestMethod::ALL; + $acceptedMethods = RequestMethod::all(); $path = '/'; $handler = null; $matched = array(); diff --git a/api/index.php b/api/index.php index c8115d2c..8de69fc5 100644 --- a/api/index.php +++ b/api/index.php @@ -50,7 +50,7 @@ function assertApiIsEnabled() { global $applicationContext, $hesk_settings; /* @var $apiChecker \BusinessLogic\Settings\ApiChecker */ - $apiChecker = $applicationContext->get(\BusinessLogic\Settings\ApiChecker::class); + $apiChecker = $applicationContext->get(\BusinessLogic\Settings\ApiChecker::clazz()); if (!$apiChecker->isApiEnabled($hesk_settings)) { print output(array('message' => 'API Disabled'), 404); @@ -77,7 +77,7 @@ function buildUserContext($xAuthToken) { global $applicationContext, $userContext, $hesk_settings; /* @var $userContextBuilder \BusinessLogic\Security\UserContextBuilder */ - $userContextBuilder = $applicationContext->get(\BusinessLogic\Security\UserContextBuilder::class); + $userContextBuilder = $applicationContext->get(\BusinessLogic\Security\UserContextBuilder::clazz()); $userContext = $userContextBuilder->buildUserContext($xAuthToken, $hesk_settings); } @@ -98,12 +98,12 @@ function exceptionHandler($exception) { } // We don't cast API Friendly Exceptions as they're user-generated errors - if (exceptionIsOfType($exception, \BusinessLogic\Exceptions\ApiFriendlyException::class)) { + if (exceptionIsOfType($exception, \BusinessLogic\Exceptions\ApiFriendlyException::clazz())) { /* @var $castedException \BusinessLogic\Exceptions\ApiFriendlyException */ $castedException = $exception; print_error($castedException->title, $castedException->getMessage(), $castedException->httpResponseCode); - } elseif (exceptionIsOfType($exception, \Core\Exceptions\SQLException::class)) { + } elseif (exceptionIsOfType($exception, \Core\Exceptions\SQLException::clazz())) { /* @var $castedException \Core\Exceptions\SQLException */ $castedException = $exception; @@ -138,7 +138,7 @@ function tryToLog($location, $message, $stackTrace, $userContext, $heskSettings) global $applicationContext; /* @var $loggingGateway \DataAccess\Logging\LoggingGateway */ - $loggingGateway = $applicationContext->get(\DataAccess\Logging\LoggingGateway::class); + $loggingGateway = $applicationContext->get(\DataAccess\Logging\LoggingGateway::clazz()); try { return $loggingGateway->logError($location, $message, $stackTrace, $userContext, $heskSettings); @@ -183,41 +183,41 @@ Link::before('globalBefore'); Link::all(array( // Categories - '/v1/categories/all' => action(\Controllers\Categories\CategoryController::class . '::printAllCategories', [RequestMethod::GET], SecurityHandler::INTERNAL_OR_AUTH_TOKEN), - '/v1/categories' => action(\Controllers\Categories\CategoryController::class, [RequestMethod::POST], SecurityHandler::INTERNAL_OR_AUTH_TOKEN), - '/v1/categories/{i}' => action(\Controllers\Categories\CategoryController::class, [RequestMethod::GET, RequestMethod::PUT, RequestMethod::DELETE], SecurityHandler::INTERNAL_OR_AUTH_TOKEN), - '/v1-internal/categories/{i}/sort/{s}' => action(\Controllers\Categories\CategoryController::class . '::sort', [RequestMethod::POST], SecurityHandler::INTERNAL), + '/v1/categories/all' => action(\Controllers\Categories\CategoryController::clazz() . '::printAllCategories', [RequestMethod::GET], SecurityHandler::INTERNAL_OR_AUTH_TOKEN), + '/v1/categories' => action(\Controllers\Categories\CategoryController::clazz(), [RequestMethod::POST], SecurityHandler::INTERNAL_OR_AUTH_TOKEN), + '/v1/categories/{i}' => action(\Controllers\Categories\CategoryController::clazz(), [RequestMethod::GET, RequestMethod::PUT, RequestMethod::DELETE], SecurityHandler::INTERNAL_OR_AUTH_TOKEN), + '/v1-internal/categories/{i}/sort/{s}' => action(\Controllers\Categories\CategoryController::clazz() . '::sort', [RequestMethod::POST], SecurityHandler::INTERNAL), // Tickets - '/v1/tickets' => action(\Controllers\Tickets\CustomerTicketController::class, RequestMethod::all()), + '/v1/tickets' => action(\Controllers\Tickets\CustomerTicketController::clazz(), RequestMethod::all()), // Tickets - Staff - '/v1/staff/tickets/{i}' => action(\Controllers\Tickets\StaffTicketController::class, RequestMethod::all()), + '/v1/staff/tickets/{i}' => action(\Controllers\Tickets\StaffTicketController::clazz(), RequestMethod::all()), // Attachments - '/v1/tickets/{a}/attachments/{i}' => action(\Controllers\Attachments\PublicAttachmentController::class . '::getRaw', RequestMethod::all()), - '/v1/staff/tickets/{i}/attachments' => action(\Controllers\Attachments\StaffTicketAttachmentsController::class, RequestMethod::all()), - '/v1/staff/tickets/{i}/attachments/{i}' => action(\Controllers\Attachments\StaffTicketAttachmentsController::class, RequestMethod::all()), + '/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()), + '/v1/staff/tickets/{i}/attachments/{i}' => action(\Controllers\Attachments\StaffTicketAttachmentsController::clazz(), RequestMethod::all()), // Statuses - '/v1/statuses' => action(\Controllers\Statuses\StatusController::class, RequestMethod::all()), + '/v1/statuses' => action(\Controllers\Statuses\StatusController::clazz(), RequestMethod::all()), // Settings - '/v1/settings' => action(\Controllers\Settings\SettingsController::class, RequestMethod::all()), + '/v1/settings' => action(\Controllers\Settings\SettingsController::clazz(), RequestMethod::all()), /* Internal use only routes */ // Resend email response '/v1-internal/staff/tickets/{i}/resend-email' => - action(\Controllers\Tickets\ResendTicketEmailToCustomerController::class, RequestMethod::all(), SecurityHandler::INTERNAL), + action(\Controllers\Tickets\ResendTicketEmailToCustomerController::clazz(), RequestMethod::all(), SecurityHandler::INTERNAL), // Custom Navigation '/v1-internal/custom-navigation/all' => - action(\Controllers\Navigation\CustomNavElementController::class . '::getAll', RequestMethod::all(), SecurityHandler::INTERNAL), + action(\Controllers\Navigation\CustomNavElementController::clazz() . '::getAll', RequestMethod::all(), SecurityHandler::INTERNAL), '/v1-internal/custom-navigation' => - action(\Controllers\Navigation\CustomNavElementController::class, RequestMethod::all(), SecurityHandler::INTERNAL), + action(\Controllers\Navigation\CustomNavElementController::clazz(), RequestMethod::all(), SecurityHandler::INTERNAL), '/v1-internal/custom-navigation/{i}' => - action(\Controllers\Navigation\CustomNavElementController::class, RequestMethod::all(), SecurityHandler::INTERNAL), + action(\Controllers\Navigation\CustomNavElementController::clazz(), RequestMethod::all(), SecurityHandler::INTERNAL), '/v1-internal/custom-navigation/{i}/sort/{s}' => - action(\Controllers\Navigation\CustomNavElementController::class . '::sort', RequestMethod::all(), SecurityHandler::INTERNAL), + action(\Controllers\Navigation\CustomNavElementController::clazz() . '::sort', RequestMethod::all(), SecurityHandler::INTERNAL), '/v1-public/hesk-version' => - action(\Controllers\System\HeskVersionController::class . '::getHeskVersion', RequestMethod::all(), SecurityHandler::OPEN), + action(\Controllers\System\HeskVersionController::clazz() . '::getHeskVersion', RequestMethod::all(), SecurityHandler::OPEN), '/v1-public/mods-for-hesk-version' => - action(\Controllers\System\HeskVersionController::class . '::getModsForHeskVersion', RequestMethod::all(), SecurityHandler::OPEN), + action(\Controllers\System\HeskVersionController::clazz() . '::getModsForHeskVersion', RequestMethod::all(), SecurityHandler::OPEN), // Any URL that doesn't match goes to the 404 handler '404' => 'handle404' From 41cbdadb72b7321dbd6dc2484ad16c9915708006 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Mon, 11 Sep 2017 21:17:34 -0400 Subject: [PATCH 052/248] More PHP 5.4/5.3 fixes --- .../Categories/CategoryHandler.php | 8 ++--- .../Emails/EmailTemplateParser.php | 32 ++++++++++++++----- api/BusinessLogic/Tickets/TicketCreator.php | 2 +- api/BusinessLogic/ValidationModel.php | 2 +- .../PublicAttachmentController.php | 2 +- .../StaffTicketAttachmentsController.php | 6 ++-- .../Categories/CategoryController.php | 10 +++--- .../Navigation/CustomNavElementController.php | 12 +++---- .../Settings/SettingsController.php | 2 +- api/Controllers/Statuses/StatusController.php | 2 +- .../Tickets/CustomerTicketController.php | 4 +-- .../ResendTicketEmailToCustomerController.php | 6 ++-- .../Tickets/StaffTicketController.php | 6 ++-- api/DataAccess/Files/FileReader.php | 2 +- api/DataAccess/Files/FileWriter.php | 2 +- api/Link.php | 4 +-- .../Attachments/AttachmentHandlerTest.php | 30 ++++++++--------- .../Attachments/AttachmentRetrieverTest.php | 8 ++--- .../Categories/CategoryHandlerTest.php | 8 ++--- .../Emails/EmailSenderHelperTest.php | 6 ++-- .../Security/BanRetrieverTest.php | 2 +- .../Security/UserToTicketCheckerTest.php | 2 +- .../Tickets/AutoassignerTest.php | 4 +-- .../Tickets/NewTicketValidatorTest.php | 6 ++-- .../CreateTicketForCustomerTest.php | 18 +++++------ .../Tickets/TicketDeleterTest.php | 8 ++--- .../Tickets/TicketRetrieverTest.php | 6 ++-- .../Tickets/TicketValidatorsTest.php | 2 +- .../Tickets/TrackingIdGeneratorTest.php | 2 +- .../Tickets/VerifiedEmailCheckerTest.php | 2 +- api/index.php | 10 +++--- ci/php_lint.sh | 2 +- .../admin/api-authentication/index.php | 2 +- 33 files changed, 118 insertions(+), 102 deletions(-) diff --git a/api/BusinessLogic/Categories/CategoryHandler.php b/api/BusinessLogic/Categories/CategoryHandler.php index 3b542127..98e5b6d4 100644 --- a/api/BusinessLogic/Categories/CategoryHandler.php +++ b/api/BusinessLogic/Categories/CategoryHandler.php @@ -64,7 +64,7 @@ class CategoryHandler extends \BaseClass { } } - throw new \Exception("Newly created category {$id} lost! :O"); + throw new \BaseException("Newly created category {$id} lost! :O"); } /** @@ -145,7 +145,7 @@ class CategoryHandler extends \BaseClass { } } - throw new \Exception("Category {$category->id} vanished! :O"); + throw new \BaseException("Category {$category->id} vanished! :O"); } function deleteCategory($id, $userContext, $heskSettings) { @@ -154,7 +154,7 @@ class CategoryHandler extends \BaseClass { } if ($id === 1) { - throw new \Exception("Category 1 cannot be deleted!"); + throw new \BaseException("Category 1 cannot be deleted!"); } $this->ticketGateway->moveTicketsToDefaultCategory($id, $heskSettings); @@ -175,7 +175,7 @@ class CategoryHandler extends \BaseClass { } if ($category === null) { - throw new \Exception("Could not find category with ID {$id}!"); + throw new \BaseException("Could not find category with ID {$id}!"); } if ($direction === Direction::UP) { diff --git a/api/BusinessLogic/Emails/EmailTemplateParser.php b/api/BusinessLogic/Emails/EmailTemplateParser.php index 2518c1b6..13fd3091 100644 --- a/api/BusinessLogic/Emails/EmailTemplateParser.php +++ b/api/BusinessLogic/Emails/EmailTemplateParser.php @@ -3,7 +3,6 @@ namespace BusinessLogic\Emails; -use BusinessLogic\Exceptions\ApiFriendlyException; use BusinessLogic\Exceptions\EmailTemplateNotFoundException; use BusinessLogic\Exceptions\InvalidEmailTemplateException; use BusinessLogic\Statuses\DefaultStatusForAction; @@ -77,10 +76,10 @@ class EmailTemplateParser extends \BaseClass { } if ($fullLanguageName === null) { - throw new \Exception("Language code {$languageCode} did not return any valid HESK languages!"); + throw new \BaseException("Language code {$languageCode} did not return any valid HESK languages!"); } - $subject = $this->parseSubject($subject, $ticket, $fullLanguageName, $heskSettings); + $subject = $this->parseSubject($subject, $ticket, $fullLanguageName, $heskSettings, $modsForHeskSettings); $message = $this->parseMessage($template, $ticket, $fullLanguageName, $emailTemplate->forStaff, $heskSettings, $modsForHeskSettings, false); $htmlMessage = $this->parseMessage($htmlTemplate, $ticket, $fullLanguageName, $emailTemplate->forStaff, $heskSettings, $modsForHeskSettings, true); @@ -117,11 +116,11 @@ class EmailTemplateParser extends \BaseClass { * @return string * @throws \Exception if common.inc.php isn't loaded */ - private function parseSubject($subjectTemplate, $ticket, $language, $heskSettings) { + private function parseSubject($subjectTemplate, $ticket, $language, $heskSettings, $modsForHeskSettings) { global $hesklang; if (!function_exists('hesk_msgToPlain')) { - throw new \Exception("common.inc.php not loaded!"); + throw new \BaseException("common.inc.php not loaded!"); } if ($ticket === null) { @@ -131,7 +130,14 @@ class EmailTemplateParser extends \BaseClass { // Status name and category name $defaultStatus = $this->statusGateway->getStatusForDefaultAction(DefaultStatusForAction::NEW_TICKET, $heskSettings); $statusName = $defaultStatus->localizedNames[$language]; - $category = $this->categoryGateway->getAllCategories($heskSettings)[$ticket->categoryId]; + $categories = $this->categoryGateway->getAllCategories($heskSettings, $modsForHeskSettings); + $category = null; + foreach ($categories as $innerCategory) { + if ($innerCategory->id === $ticket->categoryId) { + $category = $innerCategory; + break; + } + } switch ($ticket->priorityId) { case Priority::CRITICAL: @@ -173,7 +179,7 @@ class EmailTemplateParser extends \BaseClass { global $hesklang; if (!function_exists('hesk_msgToPlain')) { - throw new \Exception("common.inc.php not loaded!"); + throw new \BaseException("common.inc.php not loaded!"); } if ($ticket === null) { @@ -193,7 +199,17 @@ class EmailTemplateParser extends \BaseClass { // Status name and category name $defaultStatus = $this->statusGateway->getStatusForDefaultAction(DefaultStatusForAction::NEW_TICKET, $heskSettings); $statusName = hesk_msgToPlain($defaultStatus->localizedNames[$language]); - $category = hesk_msgToPlain($this->categoryGateway->getAllCategories($heskSettings)[$ticket->categoryId]->name); + + $categories = $this->categoryGateway->getAllCategories($heskSettings, $modsForHeskSettings); + $category = null; + foreach ($categories as $innerCategory) { + if ($innerCategory->id === $ticket->categoryId) { + $category = $innerCategory; + break; + } + } + + $category = hesk_msgToPlain($category->name); $owner = $this->userGateway->getUserById($ticket->ownerId, $heskSettings); $ownerName = $owner === null ? $hesklang['unas'] : hesk_msgToPlain($owner->name); diff --git a/api/BusinessLogic/Tickets/TicketCreator.php b/api/BusinessLogic/Tickets/TicketCreator.php index 7f677c50..5956de9b 100644 --- a/api/BusinessLogic/Tickets/TicketCreator.php +++ b/api/BusinessLogic/Tickets/TicketCreator.php @@ -130,7 +130,7 @@ class TicketCreator extends \BaseClass { $status = $this->statusGateway->getStatusForDefaultAction(DefaultStatusForAction::NEW_TICKET, $heskSettings); if ($status === null) { - throw new \Exception("Could not find the default status for a new ticket!"); + throw new \BaseException("Could not find the default status for a new ticket!"); } $ticket->statusId = $status->id; diff --git a/api/BusinessLogic/ValidationModel.php b/api/BusinessLogic/ValidationModel.php index 0ca28eaf..3878a0be 100644 --- a/api/BusinessLogic/ValidationModel.php +++ b/api/BusinessLogic/ValidationModel.php @@ -9,6 +9,6 @@ class ValidationModel extends \BaseClass { public $errorKeys; function __construct() { - $this->errorKeys = []; + $this->errorKeys = array(); } } \ No newline at end of file diff --git a/api/Controllers/Attachments/PublicAttachmentController.php b/api/Controllers/Attachments/PublicAttachmentController.php index da489d42..8b1dc555 100644 --- a/api/Controllers/Attachments/PublicAttachmentController.php +++ b/api/Controllers/Attachments/PublicAttachmentController.php @@ -14,7 +14,7 @@ class PublicAttachmentController extends \BaseClass { self::verifyAttachmentsAreEnabled($hesk_settings); /* @var $attachmentRetriever AttachmentRetriever */ - $attachmentRetriever = $applicationContext->get(AttachmentRetriever::class); + $attachmentRetriever = $applicationContext->get(AttachmentRetriever::clazz()); $attachment = $attachmentRetriever->getAttachmentContentsForTrackingId($trackingId, $attachmentId, $userContext, $hesk_settings); diff --git a/api/Controllers/Attachments/StaffTicketAttachmentsController.php b/api/Controllers/Attachments/StaffTicketAttachmentsController.php index c97b0d1f..d7bb3cba 100644 --- a/api/Controllers/Attachments/StaffTicketAttachmentsController.php +++ b/api/Controllers/Attachments/StaffTicketAttachmentsController.php @@ -18,7 +18,7 @@ class StaffTicketAttachmentsController extends \BaseClass { $this->verifyAttachmentsAreEnabled($hesk_settings); /* @var $attachmentRetriever AttachmentRetriever */ - $attachmentRetriever = $applicationContext->get(AttachmentRetriever::class); + $attachmentRetriever = $applicationContext->get(AttachmentRetriever::clazz()); $contents = $attachmentRetriever->getAttachmentContentsForTicket($ticketId, $attachmentId, $userContext, $hesk_settings); @@ -37,7 +37,7 @@ class StaffTicketAttachmentsController extends \BaseClass { $this->verifyAttachmentsAreEnabled($hesk_settings); /* @var $attachmentHandler AttachmentHandler */ - $attachmentHandler = $applicationContext->get(AttachmentHandler::class); + $attachmentHandler = $applicationContext->get(AttachmentHandler::clazz()); $createAttachmentForTicketModel = $this->createModel(JsonRetriever::getJsonData(), $ticketId); @@ -61,7 +61,7 @@ class StaffTicketAttachmentsController extends \BaseClass { global $applicationContext, $hesk_settings, $userContext; /* @var $attachmentHandler AttachmentHandler */ - $attachmentHandler = $applicationContext->get(AttachmentHandler::class); + $attachmentHandler = $applicationContext->get(AttachmentHandler::clazz()); $attachmentHandler->deleteAttachmentFromTicket($ticketId, $attachmentId, $userContext, $hesk_settings); diff --git a/api/Controllers/Categories/CategoryController.php b/api/Controllers/Categories/CategoryController.php index a9943bcd..c89d1a1a 100644 --- a/api/Controllers/Categories/CategoryController.php +++ b/api/Controllers/Categories/CategoryController.php @@ -30,7 +30,7 @@ class CategoryController extends \BaseClass { global $hesk_settings, $applicationContext, $userContext; /* @var $categoryRetriever CategoryRetriever */ - $categoryRetriever = $applicationContext->get(CategoryRetriever::class); + $categoryRetriever = $applicationContext->get(CategoryRetriever::clazz()); return $categoryRetriever->getAllCategories($hesk_settings, $userContext); } @@ -43,7 +43,7 @@ class CategoryController extends \BaseClass { $category = $this->buildCategoryFromJson($data); /* @var $categoryHandler CategoryHandler */ - $categoryHandler = $applicationContext->get(CategoryHandler::class); + $categoryHandler = $applicationContext->get(CategoryHandler::clazz()); $category = $categoryHandler->createCategory($category, $userContext, $hesk_settings); @@ -80,7 +80,7 @@ class CategoryController extends \BaseClass { $category->id = intval($id); /* @var $categoryHandler CategoryHandler */ - $categoryHandler = $applicationContext->get(CategoryHandler::class); + $categoryHandler = $applicationContext->get(CategoryHandler::clazz()); $category = $categoryHandler->editCategory($category, $userContext, $hesk_settings); @@ -91,7 +91,7 @@ class CategoryController extends \BaseClass { global $hesk_settings, $userContext, $applicationContext; /* @var $categoryHandler CategoryHandler */ - $categoryHandler = $applicationContext->get(CategoryHandler::class); + $categoryHandler = $applicationContext->get(CategoryHandler::clazz()); $categoryHandler->deleteCategory($id, $userContext, $hesk_settings); @@ -102,7 +102,7 @@ class CategoryController extends \BaseClass { global $applicationContext, $hesk_settings; /* @var $handler CategoryHandler */ - $handler = $applicationContext->get(CategoryHandler::class); + $handler = $applicationContext->get(CategoryHandler::clazz()); $handler->sortCategory(intval($id), $direction, $hesk_settings); } diff --git a/api/Controllers/Navigation/CustomNavElementController.php b/api/Controllers/Navigation/CustomNavElementController.php index 8196eb16..9ae6d741 100644 --- a/api/Controllers/Navigation/CustomNavElementController.php +++ b/api/Controllers/Navigation/CustomNavElementController.php @@ -16,7 +16,7 @@ class CustomNavElementController extends InternalApiController { self::staticCheckForInternalUseOnly(); /* @var $handler CustomNavElementHandler */ - $handler = $applicationContext->get(CustomNavElementHandler::class); + $handler = $applicationContext->get(CustomNavElementHandler::clazz()); output($handler->getAllCustomNavElements($hesk_settings)); } @@ -27,7 +27,7 @@ class CustomNavElementController extends InternalApiController { self::staticCheckForInternalUseOnly(); /* @var $handler CustomNavElementHandler */ - $handler = $applicationContext->get(CustomNavElementHandler::class); + $handler = $applicationContext->get(CustomNavElementHandler::clazz()); $handler->sortCustomNavElement(intval($id), $direction, $hesk_settings); } @@ -38,7 +38,7 @@ class CustomNavElementController extends InternalApiController { $this->checkForInternalUseOnly(); /* @var $handler CustomNavElementHandler */ - $handler = $applicationContext->get(CustomNavElementHandler::class); + $handler = $applicationContext->get(CustomNavElementHandler::clazz()); output($handler->getCustomNavElement($id, $hesk_settings)); } @@ -49,7 +49,7 @@ class CustomNavElementController extends InternalApiController { $this->checkForInternalUseOnly(); /* @var $handler CustomNavElementHandler */ - $handler = $applicationContext->get(CustomNavElementHandler::class); + $handler = $applicationContext->get(CustomNavElementHandler::clazz()); $data = JsonRetriever::getJsonData(); $element = $handler->createCustomNavElement($this->buildElementModel($data), $hesk_settings); @@ -63,7 +63,7 @@ class CustomNavElementController extends InternalApiController { $this->checkForInternalUseOnly(); /* @var $handler CustomNavElementHandler */ - $handler = $applicationContext->get(CustomNavElementHandler::class); + $handler = $applicationContext->get(CustomNavElementHandler::clazz()); $data = JsonRetriever::getJsonData(); $handler->saveCustomNavElement($this->buildElementModel($data, $id), $hesk_settings); @@ -77,7 +77,7 @@ class CustomNavElementController extends InternalApiController { $this->checkForInternalUseOnly(); /* @var $handler CustomNavElementHandler */ - $handler = $applicationContext->get(CustomNavElementHandler::class); + $handler = $applicationContext->get(CustomNavElementHandler::clazz()); $handler->deleteCustomNavElement($id, $hesk_settings); diff --git a/api/Controllers/Settings/SettingsController.php b/api/Controllers/Settings/SettingsController.php index 6737052f..d96adeaf 100644 --- a/api/Controllers/Settings/SettingsController.php +++ b/api/Controllers/Settings/SettingsController.php @@ -10,7 +10,7 @@ class SettingsController extends \BaseClass { global $applicationContext, $hesk_settings; /* @var $settingsRetriever SettingsRetriever */ - $settingsRetriever = $applicationContext->get(SettingsRetriever::class); + $settingsRetriever = $applicationContext->get(SettingsRetriever::clazz()); output($settingsRetriever->getAllSettings($hesk_settings)); } diff --git a/api/Controllers/Statuses/StatusController.php b/api/Controllers/Statuses/StatusController.php index 16473ae3..648768b4 100644 --- a/api/Controllers/Statuses/StatusController.php +++ b/api/Controllers/Statuses/StatusController.php @@ -10,7 +10,7 @@ class StatusController extends \BaseClass { global $applicationContext, $hesk_settings; /* @var $statusRetriever StatusRetriever */ - $statusRetriever = $applicationContext->get(StatusRetriever::class); + $statusRetriever = $applicationContext->get(StatusRetriever::clazz()); output($statusRetriever->getAllStatuses($hesk_settings)); } diff --git a/api/Controllers/Tickets/CustomerTicketController.php b/api/Controllers/Tickets/CustomerTicketController.php index 8b8b65fc..1daeff9f 100644 --- a/api/Controllers/Tickets/CustomerTicketController.php +++ b/api/Controllers/Tickets/CustomerTicketController.php @@ -18,7 +18,7 @@ class CustomerTicketController extends \BaseClass { $emailAddress = isset($_GET['email']) ? $_GET['email'] : null; /* @var $ticketRetriever TicketRetriever */ - $ticketRetriever = $applicationContext->get(TicketRetriever::class); + $ticketRetriever = $applicationContext->get(TicketRetriever::clazz()); output($ticketRetriever->getTicketByTrackingIdAndEmail($trackingId, $emailAddress, $hesk_settings)); } @@ -27,7 +27,7 @@ class CustomerTicketController extends \BaseClass { global $applicationContext, $hesk_settings, $userContext; /* @var $ticketCreator TicketCreator */ - $ticketCreator = $applicationContext->get(TicketCreator::class); + $ticketCreator = $applicationContext->get(TicketCreator::clazz()); $jsonRequest = JsonRetriever::getJsonData(); diff --git a/api/Controllers/Tickets/ResendTicketEmailToCustomerController.php b/api/Controllers/Tickets/ResendTicketEmailToCustomerController.php index fe2aa7be..ddab20cc 100644 --- a/api/Controllers/Tickets/ResendTicketEmailToCustomerController.php +++ b/api/Controllers/Tickets/ResendTicketEmailToCustomerController.php @@ -19,15 +19,15 @@ class ResendTicketEmailToCustomerController extends InternalApiController { $this->checkForInternalUseOnly(); /* @var $ticketRetriever TicketRetriever */ - $ticketRetriever = $applicationContext->get(TicketRetriever::class); + $ticketRetriever = $applicationContext->get(TicketRetriever::clazz()); $ticket = $ticketRetriever->getTicketById($ticketId, $hesk_settings, $userContext); /* @var $modsForHeskSettingsGateway ModsForHeskSettingsGateway */ - $modsForHeskSettingsGateway = $applicationContext->get(ModsForHeskSettingsGateway::class); + $modsForHeskSettingsGateway = $applicationContext->get(ModsForHeskSettingsGateway::clazz()); $modsForHeskSettings = $modsForHeskSettingsGateway->getAllSettings($hesk_settings); /* @var $emailSender EmailSenderHelper */ - $emailSender = $applicationContext->get(EmailSenderHelper::class); + $emailSender = $applicationContext->get(EmailSenderHelper::clazz()); $language = $ticket->language; diff --git a/api/Controllers/Tickets/StaffTicketController.php b/api/Controllers/Tickets/StaffTicketController.php index 658d7e7f..023f5352 100644 --- a/api/Controllers/Tickets/StaffTicketController.php +++ b/api/Controllers/Tickets/StaffTicketController.php @@ -15,7 +15,7 @@ class StaffTicketController extends \BaseClass { global $applicationContext, $userContext, $hesk_settings; /* @var $ticketRetriever TicketRetriever */ - $ticketRetriever = $applicationContext->get(TicketRetriever::class); + $ticketRetriever = $applicationContext->get(TicketRetriever::clazz()); output($ticketRetriever->getTicketById($id, $hesk_settings, $userContext)); } @@ -24,7 +24,7 @@ class StaffTicketController extends \BaseClass { global $applicationContext, $userContext, $hesk_settings; /* @var $ticketDeleter TicketDeleter */ - $ticketDeleter = $applicationContext->get(TicketDeleter::class); + $ticketDeleter = $applicationContext->get(TicketDeleter::clazz()); $ticketDeleter->deleteTicket($id, $userContext, $hesk_settings); @@ -35,7 +35,7 @@ class StaffTicketController extends \BaseClass { global $applicationContext, $userContext, $hesk_settings; /* @var $ticketEditor TicketEditor */ - $ticketEditor = $applicationContext->get(TicketEditor::class); + $ticketEditor = $applicationContext->get(TicketEditor::clazz()); $jsonRequest = JsonRetriever::getJsonData(); diff --git a/api/DataAccess/Files/FileReader.php b/api/DataAccess/Files/FileReader.php index dd2a8ce7..39a327a7 100644 --- a/api/DataAccess/Files/FileReader.php +++ b/api/DataAccess/Files/FileReader.php @@ -23,7 +23,7 @@ class FileReader extends \BaseClass { $fileContents = file_get_contents($location); if ($fileContents === false) { - throw new \Exception("Failed to read the file!"); + throw new \BaseException("Failed to read the file!"); } return $fileContents; diff --git a/api/DataAccess/Files/FileWriter.php b/api/DataAccess/Files/FileWriter.php index 368a4f3b..d35b302a 100644 --- a/api/DataAccess/Files/FileWriter.php +++ b/api/DataAccess/Files/FileWriter.php @@ -17,7 +17,7 @@ class FileWriter extends \BaseClass { $fileSize = file_put_contents($location, $contents); if ($fileSize === false) { - throw new \Exception("Failed to save the file!"); + throw new \BaseException("Failed to save the file!"); } return $fileSize; diff --git a/api/Link.php b/api/Link.php index 10e5758d..dff9c7cf 100644 --- a/api/Link.php +++ b/api/Link.php @@ -224,7 +224,7 @@ class Link */ public static function before( $funcName, $params = null ) { - array_push( self::$beforeFuncs, [ $funcName, $params ]); + array_push( self::$beforeFuncs, array($funcName, $params)); } /** @@ -236,6 +236,6 @@ class Link */ public static function after( $funcName, $params = null ) { - array_push( self::$afterFuncs, [ $funcName, $params ]); + array_push( self::$afterFuncs, array($funcName, $params)); } } \ No newline at end of file diff --git a/api/Tests/BusinessLogic/Attachments/AttachmentHandlerTest.php b/api/Tests/BusinessLogic/Attachments/AttachmentHandlerTest.php index 74e6a9dd..767bc780 100644 --- a/api/Tests/BusinessLogic/Attachments/AttachmentHandlerTest.php +++ b/api/Tests/BusinessLogic/Attachments/AttachmentHandlerTest.php @@ -46,11 +46,11 @@ class AttachmentHandlerTest extends TestCase { private $heskSettings; protected function setUp() { - $this->ticketGateway = $this->createMock(TicketGateway::class); - $this->attachmentGateway = $this->createMock(AttachmentGateway::class); - $this->fileWriter = $this->createMock(FileWriter::class); - $this->fileDeleter = $this->createMock(FileDeleter::class); - $this->userToTicketChecker = $this->createMock(UserToTicketChecker::class); + $this->ticketGateway = $this->createMock(TicketGateway::clazz()); + $this->attachmentGateway = $this->createMock(AttachmentGateway::clazz()); + $this->fileWriter = $this->createMock(FileWriter::clazz()); + $this->fileDeleter = $this->createMock(FileDeleter::clazz()); + $this->userToTicketChecker = $this->createMock(UserToTicketChecker::clazz()); $this->heskSettings = array( 'attach_dir' => 'attachments', 'attachments' => array( @@ -78,7 +78,7 @@ class AttachmentHandlerTest extends TestCase { $this->createAttachmentForTicketModel->attachmentContents = null; //-- Assert - $this->expectException(ValidationException::class); + $this->expectException(ValidationException::clazz()); $this->expectExceptionMessageRegExp('/CONTENTS_EMPTY/'); //-- Act @@ -91,7 +91,7 @@ class AttachmentHandlerTest extends TestCase { $this->createAttachmentForTicketModel->attachmentContents = ''; //-- Assert - $this->expectException(ValidationException::class); + $this->expectException(ValidationException::clazz()); $this->expectExceptionMessageRegExp('/CONTENTS_EMPTY/'); //-- Act @@ -106,7 +106,7 @@ class AttachmentHandlerTest extends TestCase { $this->createAttachmentForTicketModel->attachmentContents = 'invalid base 64'; //-- Assert - $this->expectException(ValidationException::class); + $this->expectException(ValidationException::clazz()); $this->expectExceptionMessageRegExp('/CONTENTS_NOT_BASE_64/'); //-- Act @@ -119,7 +119,7 @@ class AttachmentHandlerTest extends TestCase { $this->createAttachmentForTicketModel->displayName = null; //-- Assert - $this->expectException(ValidationException::class); + $this->expectException(ValidationException::clazz()); $this->expectExceptionMessageRegExp('/DISPLAY_NAME_EMPTY/'); //-- Act @@ -132,7 +132,7 @@ class AttachmentHandlerTest extends TestCase { $this->createAttachmentForTicketModel->displayName = ''; //-- Assert - $this->expectException(ValidationException::class); + $this->expectException(ValidationException::clazz()); $this->expectExceptionMessageRegExp('/DISPLAY_NAME_EMPTY/'); //-- Act @@ -145,7 +145,7 @@ class AttachmentHandlerTest extends TestCase { $this->createAttachmentForTicketModel->ticketId = null; //-- Assert - $this->expectException(ValidationException::class); + $this->expectException(ValidationException::clazz()); $this->expectExceptionMessageRegExp('/TICKET_ID_MISSING/'); //-- Act @@ -158,7 +158,7 @@ class AttachmentHandlerTest extends TestCase { $this->createAttachmentForTicketModel->ticketId = 0; //-- Assert - $this->expectException(ValidationException::class); + $this->expectException(ValidationException::clazz()); $this->expectExceptionMessageRegExp('/TICKET_ID_MISSING/'); //-- Act @@ -172,7 +172,7 @@ class AttachmentHandlerTest extends TestCase { $this->createAttachmentForTicketModel->ticketId = 0; //-- Assert - $this->expectException(ValidationException::class); + $this->expectException(ValidationException::clazz()); $this->expectExceptionMessageRegExp('/EXTENSION_NOT_PERMITTED/'); //-- Act @@ -186,7 +186,7 @@ class AttachmentHandlerTest extends TestCase { $this->heskSettings['attachments']['max_size'] = 1; //-- Assert - $this->expectException(ValidationException::class); + $this->expectException(ValidationException::clazz()); $this->expectExceptionMessageRegExp('/FILE_SIZE_TOO_LARGE/'); //-- Act @@ -261,7 +261,7 @@ class AttachmentHandlerTest extends TestCase { ->willReturn(false); //-- Assert - $this->expectException(\Exception::class); + $this->expectException(\BaseException::clazz()); $this->expectExceptionMessage("User does not have access to ticket {$ticketId} being created / edited!"); //-- Act diff --git a/api/Tests/BusinessLogic/Attachments/AttachmentRetrieverTest.php b/api/Tests/BusinessLogic/Attachments/AttachmentRetrieverTest.php index 776fe1eb..426d585c 100644 --- a/api/Tests/BusinessLogic/Attachments/AttachmentRetrieverTest.php +++ b/api/Tests/BusinessLogic/Attachments/AttachmentRetrieverTest.php @@ -32,10 +32,10 @@ class AttachmentRetrieverTest extends TestCase { private $heskSettings; protected function setUp() { - $this->attachmentGateway = $this->createMock(AttachmentGateway::class); - $this->fileReader = $this->createMock(FileReader::class); - $this->ticketGateway = $this->createMock(TicketGateway::class); - $this->userToTicketChecker = $this->createMock(UserToTicketChecker::class); + $this->attachmentGateway = $this->createMock(AttachmentGateway::clazz()); + $this->fileReader = $this->createMock(FileReader::clazz()); + $this->ticketGateway = $this->createMock(TicketGateway::clazz()); + $this->userToTicketChecker = $this->createMock(UserToTicketChecker::clazz()); $this->heskSettings = array('attach_dir' => 'attachments'); $this->attachmentRetriever = new AttachmentRetriever($this->attachmentGateway, $this->fileReader, diff --git a/api/Tests/BusinessLogic/Categories/CategoryHandlerTest.php b/api/Tests/BusinessLogic/Categories/CategoryHandlerTest.php index 9cb886c9..6b316669 100644 --- a/api/Tests/BusinessLogic/Categories/CategoryHandlerTest.php +++ b/api/Tests/BusinessLogic/Categories/CategoryHandlerTest.php @@ -32,10 +32,10 @@ class CategoryHandlerTest extends TestCase { private $heskSettings; protected function setUp() { - $this->categoryGateway = $this->createMock(CategoryGateway::class); - $this->ticketGateway = $this->createMock(TicketGateway::class); - $this->permissionChecker = $this->createMock(PermissionChecker::class); - $this->modsForHeskSettingsGateway = $this->createMock(ModsForHeskSettingsGateway::class); + $this->categoryGateway = $this->createMock(CategoryGateway::clazz()); + $this->ticketGateway = $this->createMock(TicketGateway::clazz()); + $this->permissionChecker = $this->createMock(PermissionChecker::clazz()); + $this->modsForHeskSettingsGateway = $this->createMock(ModsForHeskSettingsGateway::clazz()); $this->categoryHandler = new CategoryHandler($this->categoryGateway, $this->ticketGateway, diff --git a/api/Tests/BusinessLogic/Emails/EmailSenderHelperTest.php b/api/Tests/BusinessLogic/Emails/EmailSenderHelperTest.php index c9d5c0cb..1c34786a 100644 --- a/api/Tests/BusinessLogic/Emails/EmailSenderHelperTest.php +++ b/api/Tests/BusinessLogic/Emails/EmailSenderHelperTest.php @@ -38,9 +38,9 @@ class EmailSenderHelperTest extends TestCase { private $modsForHeskSettings; protected function setUp() { - $this->emailTemplateParser = $this->createMock(EmailTemplateParser::class); - $this->basicEmailSender = $this->createMock(BasicEmailSender::class); - $this->mailgunEmailSender = $this->createMock(MailgunEmailSender::class); + $this->emailTemplateParser = $this->createMock(EmailTemplateParser::clazz()); + $this->basicEmailSender = $this->createMock(BasicEmailSender::clazz()); + $this->mailgunEmailSender = $this->createMock(MailgunEmailSender::clazz()); $this->heskSettings = array( 'languages' => array( 'English' => array('folder' => 'en') diff --git a/api/Tests/BusinessLogic/Security/BanRetrieverTest.php b/api/Tests/BusinessLogic/Security/BanRetrieverTest.php index 304bffa0..6cfaaf3b 100644 --- a/api/Tests/BusinessLogic/Security/BanRetrieverTest.php +++ b/api/Tests/BusinessLogic/Security/BanRetrieverTest.php @@ -22,7 +22,7 @@ class BanRetrieverTests extends TestCase { private $banRetriever; protected function setUp() { - $this->banGateway = $this->createMock(BanGateway::class); + $this->banGateway = $this->createMock(BanGateway::clazz()); $this->banRetriever = new BanRetriever($this->banGateway); } diff --git a/api/Tests/BusinessLogic/Security/UserToTicketCheckerTest.php b/api/Tests/BusinessLogic/Security/UserToTicketCheckerTest.php index 07318d66..cf6d1719 100644 --- a/api/Tests/BusinessLogic/Security/UserToTicketCheckerTest.php +++ b/api/Tests/BusinessLogic/Security/UserToTicketCheckerTest.php @@ -20,7 +20,7 @@ class UserToTicketCheckerTest extends TestCase { private $heskSettings; protected function setUp() { - $this->userGateway = $this->createMock(UserGateway::class); + $this->userGateway = $this->createMock(UserGateway::clazz()); $this->userToTicketChecker = new UserToTicketChecker($this->userGateway); } diff --git a/api/Tests/BusinessLogic/Tickets/AutoassignerTest.php b/api/Tests/BusinessLogic/Tickets/AutoassignerTest.php index 8e9836ac..e7192b9a 100644 --- a/api/Tests/BusinessLogic/Tickets/AutoassignerTest.php +++ b/api/Tests/BusinessLogic/Tickets/AutoassignerTest.php @@ -28,8 +28,8 @@ class AutoassignerTest extends TestCase { private $heskSettings; protected function setUp() { - $this->categoryGateway = $this->createMock(CategoryGateway::class); - $this->userGateway = $this->createMock(UserGateway::class); + $this->categoryGateway = $this->createMock(CategoryGateway::clazz()); + $this->userGateway = $this->createMock(UserGateway::clazz()); $this->autoassigner = new Autoassigner($this->categoryGateway, $this->userGateway); $this->heskSettings = array( 'autoassign' => 1 diff --git a/api/Tests/BusinessLogic/Tickets/NewTicketValidatorTest.php b/api/Tests/BusinessLogic/Tickets/NewTicketValidatorTest.php index 2ace5299..108859cd 100644 --- a/api/Tests/BusinessLogic/Tickets/NewTicketValidatorTest.php +++ b/api/Tests/BusinessLogic/Tickets/NewTicketValidatorTest.php @@ -48,9 +48,9 @@ class NewTicketValidatorTest extends TestCase { private $heskSettings = array(); function setUp() { - $this->banRetriever = $this->createMock(BanRetriever::class); - $this->categoryRetriever = $this->createMock(CategoryRetriever::class); - $this->ticketValidators = $this->createMock(TicketValidators::class); + $this->banRetriever = $this->createMock(BanRetriever::clazz()); + $this->categoryRetriever = $this->createMock(CategoryRetriever::clazz()); + $this->ticketValidators = $this->createMock(TicketValidators::clazz()); $this->newTicketValidator = new NewTicketValidator($this->categoryRetriever, $this->banRetriever, $this->ticketValidators); $this->userContext = new UserContext(); diff --git a/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php b/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php index a0a3ea07..c2577ab0 100644 --- a/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php +++ b/api/Tests/BusinessLogic/Tickets/TicketCreatorTests/CreateTicketForCustomerTest.php @@ -98,15 +98,15 @@ class CreateTicketTest extends TestCase { private $modsForHeskSettings; protected function setUp() { - $this->ticketGateway = $this->createMock(TicketGateway::class); - $this->newTicketValidator = $this->createMock(NewTicketValidator::class); - $this->trackingIdGenerator = $this->createMock(TrackingIdGenerator::class); - $this->autoassigner = $this->createMock(Autoassigner::class); - $this->statusGateway = $this->createMock(StatusGateway::class); - $this->verifiedEmailChecker = $this->createMock(VerifiedEmailChecker::class); - $this->emailSenderHelper = $this->createMock(EmailSenderHelper::class); - $this->userGateway = $this->createMock(UserGateway::class); - $this->modsForHeskSettingsGateway = $this->createMock(ModsForHeskSettingsGateway::class); + $this->ticketGateway = $this->createMock(TicketGateway::clazz()); + $this->newTicketValidator = $this->createMock(NewTicketValidator::clazz()); + $this->trackingIdGenerator = $this->createMock(TrackingIdGenerator::clazz()); + $this->autoassigner = $this->createMock(Autoassigner::clazz()); + $this->statusGateway = $this->createMock(StatusGateway::clazz()); + $this->verifiedEmailChecker = $this->createMock(VerifiedEmailChecker::clazz()); + $this->emailSenderHelper = $this->createMock(EmailSenderHelper::clazz()); + $this->userGateway = $this->createMock(UserGateway::clazz()); + $this->modsForHeskSettingsGateway = $this->createMock(ModsForHeskSettingsGateway::clazz()); $this->ticketCreator = new TicketCreator($this->newTicketValidator, $this->trackingIdGenerator, $this->autoassigner, $this->statusGateway, $this->ticketGateway, $this->verifiedEmailChecker, diff --git a/api/Tests/BusinessLogic/Tickets/TicketDeleterTest.php b/api/Tests/BusinessLogic/Tickets/TicketDeleterTest.php index bce86231..b55194fd 100644 --- a/api/Tests/BusinessLogic/Tickets/TicketDeleterTest.php +++ b/api/Tests/BusinessLogic/Tickets/TicketDeleterTest.php @@ -30,9 +30,9 @@ class TicketDeleterTest extends TestCase { private $userToTicketChecker; protected function setUp() { - $this->userToTicketChecker = $this->createMock(UserToTicketChecker::class); - $this->ticketGateway = $this->createMock(TicketGateway::class); - $this->attachmentHandler = $this->createMock(AttachmentHandler::class); + $this->userToTicketChecker = $this->createMock(UserToTicketChecker::clazz()); + $this->ticketGateway = $this->createMock(TicketGateway::clazz()); + $this->attachmentHandler = $this->createMock(AttachmentHandler::clazz()); $this->ticketDeleter = new TicketDeleter($this->ticketGateway, $this->userToTicketChecker, $this->attachmentHandler); } @@ -43,7 +43,7 @@ class TicketDeleterTest extends TestCase { $this->userToTicketChecker->method('isTicketAccessibleToUser')->willReturn(false); //-- Assert - $this->expectException(\Exception::class); + $this->expectException(\BaseException::clazz()); $this->expectExceptionMessage("User does not have access to ticket 1"); //-- Act diff --git a/api/Tests/BusinessLogic/Tickets/TicketRetrieverTest.php b/api/Tests/BusinessLogic/Tickets/TicketRetrieverTest.php index 8065c5a7..90ec9280 100644 --- a/api/Tests/BusinessLogic/Tickets/TicketRetrieverTest.php +++ b/api/Tests/BusinessLogic/Tickets/TicketRetrieverTest.php @@ -21,8 +21,8 @@ class TicketRetrieverTest extends TestCase { private $heskSettings; protected function setUp() { - $this->ticketGateway = $this->createMock(TicketGateway::class); - $this->userToTicketChecker = $this->createMock(UserToTicketChecker::class); + $this->ticketGateway = $this->createMock(TicketGateway::clazz()); + $this->userToTicketChecker = $this->createMock(UserToTicketChecker::clazz()); $this->heskSettings = array('email_view_ticket' => 0); $this->ticketRetriever = new TicketRetriever($this->ticketGateway, $this->userToTicketChecker); @@ -65,7 +65,7 @@ class TicketRetrieverTest extends TestCase { $this->ticketGateway->method('getTicketByTrackingId')->with($trackingId, $this->heskSettings)->willReturn($ticket); //-- Assert - $this->expectException(\Exception::class); + $this->expectException(\BaseException::clazz()); $this->expectExceptionMessage("Email 'email@example.com' entered in for ticket '12345' does not match!"); //-- Act diff --git a/api/Tests/BusinessLogic/Tickets/TicketValidatorsTest.php b/api/Tests/BusinessLogic/Tickets/TicketValidatorsTest.php index 6fceb76e..fcd05d17 100644 --- a/api/Tests/BusinessLogic/Tickets/TicketValidatorsTest.php +++ b/api/Tests/BusinessLogic/Tickets/TicketValidatorsTest.php @@ -18,7 +18,7 @@ class TicketValidatorsTest extends TestCase { private $ticketValidator; protected function setUp() { - $this->ticketGateway = $this->createMock(TicketGateway::class); + $this->ticketGateway = $this->createMock(TicketGateway::clazz()); $this->ticketValidator = new TicketValidators($this->ticketGateway); } diff --git a/api/Tests/BusinessLogic/Tickets/TrackingIdGeneratorTest.php b/api/Tests/BusinessLogic/Tickets/TrackingIdGeneratorTest.php index f879e579..f72957ec 100644 --- a/api/Tests/BusinessLogic/Tickets/TrackingIdGeneratorTest.php +++ b/api/Tests/BusinessLogic/Tickets/TrackingIdGeneratorTest.php @@ -19,7 +19,7 @@ class TrackingIdGeneratorTest extends TestCase { private $trackingIdGenerator; function setUp() { - $this->ticketGateway = $this->createMock(TicketGateway::class); + $this->ticketGateway = $this->createMock(TicketGateway::clazz()); $this->trackingIdGenerator = new TrackingIdGenerator($this->ticketGateway); } diff --git a/api/Tests/BusinessLogic/Tickets/VerifiedEmailCheckerTest.php b/api/Tests/BusinessLogic/Tickets/VerifiedEmailCheckerTest.php index 2cf838c5..328d898b 100644 --- a/api/Tests/BusinessLogic/Tickets/VerifiedEmailCheckerTest.php +++ b/api/Tests/BusinessLogic/Tickets/VerifiedEmailCheckerTest.php @@ -23,7 +23,7 @@ class VerifiedEmailCheckerTest extends TestCase { private $heskSettings; protected function setUp() { - $this->verifiedEmailGateway = $this->createMock(VerifiedEmailGateway::class); + $this->verifiedEmailGateway = $this->createMock(VerifiedEmailGateway::clazz()); $this->heskSettings = array(); $this->verifiedEmailChecker = new VerifiedEmailChecker($this->verifiedEmailGateway); } diff --git a/api/index.php b/api/index.php index 8de69fc5..393455a4 100644 --- a/api/index.php +++ b/api/index.php @@ -183,10 +183,10 @@ Link::before('globalBefore'); Link::all(array( // Categories - '/v1/categories/all' => action(\Controllers\Categories\CategoryController::clazz() . '::printAllCategories', [RequestMethod::GET], SecurityHandler::INTERNAL_OR_AUTH_TOKEN), - '/v1/categories' => action(\Controllers\Categories\CategoryController::clazz(), [RequestMethod::POST], SecurityHandler::INTERNAL_OR_AUTH_TOKEN), - '/v1/categories/{i}' => action(\Controllers\Categories\CategoryController::clazz(), [RequestMethod::GET, RequestMethod::PUT, RequestMethod::DELETE], SecurityHandler::INTERNAL_OR_AUTH_TOKEN), - '/v1-internal/categories/{i}/sort/{s}' => action(\Controllers\Categories\CategoryController::clazz() . '::sort', [RequestMethod::POST], SecurityHandler::INTERNAL), + '/v1/categories/all' => action(\Controllers\Categories\CategoryController::clazz() . '::printAllCategories', array(RequestMethod::GET), SecurityHandler::INTERNAL_OR_AUTH_TOKEN), + '/v1/categories' => action(\Controllers\Categories\CategoryController::clazz(), array(RequestMethod::POST), SecurityHandler::INTERNAL_OR_AUTH_TOKEN), + '/v1/categories/{i}' => action(\Controllers\Categories\CategoryController::clazz(), array(RequestMethod::GET, RequestMethod::PUT, RequestMethod::DELETE), SecurityHandler::INTERNAL_OR_AUTH_TOKEN), + '/v1-internal/categories/{i}/sort/{s}' => action(\Controllers\Categories\CategoryController::clazz() . '::sort', array(RequestMethod::POST), SecurityHandler::INTERNAL), // Tickets '/v1/tickets' => action(\Controllers\Tickets\CustomerTicketController::clazz(), RequestMethod::all()), // Tickets - Staff @@ -230,7 +230,7 @@ Link::all(array( * @return array The configured path */ function action($class, $requestMethods, $securityHandler = SecurityHandler::AUTH_TOKEN) { - return [$class, $class, $securityHandler, $requestMethods]; + return array($class, $class, $securityHandler, $requestMethods); } class SecurityHandler { diff --git a/ci/php_lint.sh b/ci/php_lint.sh index 1e0c3ad1..0cef4eb2 100644 --- a/ci/php_lint.sh +++ b/ci/php_lint.sh @@ -12,7 +12,7 @@ while test $# -gt 0; do continue fi - for file in `find $current -type f -not -path "*vendor/*" -name "*.php"` ; do + for file in `find $current -type f -not -path "*vendor/*" -not -path "api/Tests/*" -name "*.php"` ; do RESULTS=`php -l $file` echo $RESULTS diff --git a/internal-api/admin/api-authentication/index.php b/internal-api/admin/api-authentication/index.php index 4908246a..a297d1eb 100644 --- a/internal-api/admin/api-authentication/index.php +++ b/internal-api/admin/api-authentication/index.php @@ -31,7 +31,7 @@ if ($request_method == 'POST') { if ($action == 'generate') { $token = ''; - $letter_array = ['0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f']; + $letter_array = array('0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f'); // Pick 32 random characters. That will be the hash for ($i = 0; $i < 32; $i++) { $letter = $letter_array[rand(0, 15)]; From ea0a612e4faefac9a1612e9d207b1c12d642cefd Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Mon, 11 Sep 2017 21:34:16 -0400 Subject: [PATCH 053/248] Trying to fix the PHP linter --- ci/php_lint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/php_lint.sh b/ci/php_lint.sh index 0cef4eb2..4a1a3f0e 100644 --- a/ci/php_lint.sh +++ b/ci/php_lint.sh @@ -12,7 +12,7 @@ while test $# -gt 0; do continue fi - for file in `find $current -type f -not -path "*vendor/*" -not -path "api/Tests/*" -name "*.php"` ; do + for file in `find $current -type f -not -path "*vendor/*" -not -path "*/api/Tests/*" -name "*.php"` ; do RESULTS=`php -l $file` echo $RESULTS From 9ae189430d80299f0b370ec828bf9b5147e1fc47 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Tue, 12 Sep 2017 12:32:30 -0400 Subject: [PATCH 054/248] Localize calendar pages --- inc/header.inc.php | 5 ++++- inc/headerAdmin.inc.php | 5 +++-- js/calendar/locale-all.js | 5 +++++ js/calendar/mods-for-hesk-calendar-admin-readonly.js | 1 + js/calendar/mods-for-hesk-calendar-readonly.js | 1 + js/calendar/mods-for-hesk-calendar.js | 1 + language/en/text.php | 7 +++++++ 7 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 js/calendar/locale-all.js diff --git a/inc/header.inc.php b/inc/header.inc.php index f35f50fa..5100cb7c 100644 --- a/inc/header.inc.php +++ b/inc/header.inc.php @@ -97,6 +97,8 @@ header('X-UA-Compatible: IE=edge'); + + + + + + + + + diff --git a/install/install_functions.inc.php b/install/install_functions.inc.php index a498ab67..9606199e 100644 --- a/install/install_functions.inc.php +++ b/install/install_functions.inc.php @@ -16,7 +16,7 @@ if (!defined('IN_SCRIPT')) {die('Invalid attempt');} // We will be installing this HESK version: define('HESK_NEW_VERSION','2.7.3'); -define('MODS_FOR_HESK_NEW_VERSION','3.1.1'); +define('MODS_FOR_HESK_NEW_VERSION','3.2.0'); define('REQUIRE_PHP_VERSION','5.3.0'); define('REQUIRE_MYSQL_VERSION','5.0.7'); From 23fc8ef6d5b08943b5b805a1f2fa852771ea4d32 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Wed, 27 Sep 2017 13:00:20 -0400 Subject: [PATCH 089/248] Landing page looks good, moved database-validation --- .../database-validation.php | 6 +++--- install/index.php | 18 ++++++++++++++++-- install/logo.png | Bin 0 -> 28524 bytes 3 files changed, 19 insertions(+), 5 deletions(-) rename install/{mods-for-hesk => }/database-validation.php (98%) create mode 100644 install/logo.png diff --git a/install/mods-for-hesk/database-validation.php b/install/database-validation.php similarity index 98% rename from install/mods-for-hesk/database-validation.php rename to install/database-validation.php index 22c34c98..7e3d462f 100644 --- a/install/mods-for-hesk/database-validation.php +++ b/install/database-validation.php @@ -1,6 +1,6 @@ Mods For HESK Database Validation - + - + @@ -40,11 +41,24 @@ hesk_dbConnect();
    @@ -61,7 +75,7 @@ hesk_dbConnect();

    Are you sure you want to uninstall Mods for HESK?

    - Yes + Yes
    diff --git a/install/logo.png b/install/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..5406b9ae535ba4855fe3a061c45bded9c736d93b GIT binary patch literal 28524 zcmXtf19W5G*LLboZQHgxwL8_+n%cH)E44Az)V8Km+qP}%&F{ayFImAlS;@WkoPG9# zy%VXVAcY8r2L}KE5M`vrl>q=ST+sVYSZL6*T=VKD=mpYTL|y~{sEdbxH-rKJ;P@=X z#FUgQ>|N}gE$kggWW>Zs9GvXUENx5y0O`n_RCiU?C9LqNE_bhj2^I`mv8ygbk}mG@ zS#iU3Tmu>iBzBHE(n4@l32{hFksvbYm@u+BvZ&AigFd1JlKg)L7(ah{ve&D-92|6| zrEL+L`&#F9Jqeg!`7X8t5;{NHI$bp30yuI5h<6WU<71*qjNiZzt^p9^0E2oqc5qRF z{s3t~BD;IJMD%Ae*Z^+#fAj$E*v{Z%m+LQ?%#=Rth*`+U<)DcXlgL)3f8{Gd2z9=a z|K^`DSo>*M?<8O_>N?ZWu~)7erpWlCGjaxvqcwdF5!~=}#s$bWGb#5YaBi?2e`2Kp z8FzKa7UeKY93|e>39<$a&A`}zVgLweZ|LK`qM)(~0-u%b zPH@|N?2M8Es>f!FvQ}2vjyJQv(BH1JmGpcXNb(Nb2gemklqP zH7_no9uAu6W1jZdeac6AcSzR+2|XbcKKRysr09DI0AjR$+PeAF4O~Ix8?ys$pL&)# zkiki4Pj%jUHJ%D0k0@nGhHKebMvZH5Yq1)ZEE*N)?)Y0vy z3i_Afa$Y0P64_5YK`^UI)&#tK@ckvhfI<{7G-u&Ph>sa=e;*!{o=(_>$bq&mhU2Y< zzoxsCz^rH9Nk)p8NwnJrtfzldX!&4Z(%^JT06JlaV{mcItzdS+Fb0q@!AAzronUt; zkcOme;(-_>YSQp*0pq05`>>wEpGvS8Py-^7D9C7{FVj?IkaXdH3i!&ty%O<3{R*fS z4W1UTz{m{p3*YRAl?y7bWvfKY>P1+FdJOL0PH`aX#G4F;-??zW)I}x^UfY4cc75jh z4lWdKjv9c1idPthLyGVZ@tb&IB4kK>rC3y=>~A7Vk@f_=eJZvfIr1wd91JK4Dcpkd zpPOX|G+0)gR)l{r)MEL9tfU_D?FuD-vX?1ZuxWp@4QLj7%O{_SJhpK`ZAaUPuoKf4 z-I9zi+A?6l!IOkB4!#)_H%wx+W+_hpNLL^C949eDV2>U!!mNeXgs~w>jl?vFuJx`P zsy(U|TXsCxAwVsSVjuF{Ep+^@3s#Nhj^U2Q9g@{Mu~&Sp?ZNLuk{dfUkhX(={p%U* zoyRYiM1Go-2jws9NJwl5ohbYc+79UsW}>tz^(tC$r0y=X5#|lg4V+{0a~y@(EOlF= zk+kTn+pOWN=d8diJzGYlyc?Ai5NiKopXyfP*7#QETU1D0NIayDQI~kEc*nnlfABJ$ zzf*rl@6(NZACVmaCP5_4DSOb`(sI+5%=4Awm8&TCD>uwyShAl8pKzQgpA^k%6jPhl zvaPZavDsvZW{9z2n-0>zN(App8vf+^iAR%0v!{xn7Je!wUy`cSQ}n1}ZenV}XxeY; zY+`LPH5@mMlF2m@o+?XUl#{YTVYYzwqb#81is>XThDOeHd>+Nbm|e(42P zZxnN&lPrtOndq?IIWHaz#sZ zEs2#Myked;w-N`In3+)xvh}i|qgpAnYEgfR=ro!{AF@x`+Zi@Ob7gA^pQg>{ljl1Z zLabb^KCJFe`A)|c;OBJ~h%He#aPYq2Vd8Dzv1k6t1j~HMoXC7?y4FUhqNozk?$UN% zMj%$#f+;O>)g~(KuT?+nnt`X1!Owe>~fm4u7b+2i{xX!yp(y zSVL6z`2~xJH5OEnPStKYEJv8^8zr00+i+OPu|IM%v0SqF85UZi+1AhfUfKtir&#{6 z3_gKi$7R=V0B>Mw*qV5l&^qKiY+)G2%EdZkaBezmYQ zo@lYF%dMYjjBHpjXCKdJ3&JUmp>MX((O7$EF16iS(OUa|Asg5}o^_evCB@ySk*>XNhZx zmz%$($?j+a)t&jt=*bTmH~xTVfhb;JK>%GKOTfIdvUAZR=SkB0&GYJ>=<(;H;S0yh z`19&>^~1#t`Ag`l+MB@5($mqKJ5(=NH&_Qa5!0OZpw1#HEVwVYJCq>Y>^E(~dt(+V z9-3CFXUhmJX+LRu8cGhXdyC^NmZjSIT9`4{H25_4@E>7AA>5%;60K6nQZeG0;?=R8 zM8!A*v8OSElHpR^l2g^!nswd-9x-ZiKgV-Y_~@P0^?nt%(zz~VXpU%_osaOi=!&n; zv?7lSn+Z5`ZBqN`zaxyrHibWAUyN59C^{1G9ArmAhKJmSjEIN-`xU7oqac$aGpEaK z$N6Mh@9t!Kt1D|Tx|19_A2Gkkp{uRCN}G$o9J&OoPRa!erW+>wOlGZLwR^Z+VD}O7 zGp0&zV{1?m#{7_b_~sg#63+X3Aa)>Oi; z&**Rbd90n*RF;+=e%X!PQv!U?qbWV&i1NVao~K{nzDp4g_2lSt9YrK^{wPIEA-;q+S^#= z7}9y~`SwL?!<^+&qSMK3=WX3Du#Q#wW6S}}8uy{gZf#2~t&Z?osaEsfqdk9|YYsOF zy@gb%)wZe~t1LH48|~M++dj@e#9*?K8|UekQs=vch6OxYCM&AD^g6n4Q4W(I z2neu={2zVSpWGFmbB+Z^cvfzM7m?pqX>12Bl)UZUTA{88jKAzpZ)UYF`h1;hug5_@n89; ztTg+V^>#n+m5V<9v8#2$I9#H(v2K1(=7-I(H?5~5VjGVLKh1aP)1L>%#X}E5XCLc) zMgmS|^S+H&GRHs|fiDGb8me7+K)9( z^q;z>eQ)~hCwm?y#3y5V_Iq@nyY5r|R`k~}>bp-tPYC(}AId#-7E(`h2$8rU+N)lsfWqAO=iwXb;2mt_IK|=w@ z0DvnC0B~vm0Pv*)0N4)M?LWVRK7cm*Ates@`tP3KRSE=+d~=Z2as~jH$p3qQc@zt| zfd*k*WaK4acD~`G5TZqM+sT0r0+10GQT13o|K;wYy0EnIB(F%-^#pek7&0w}C>k&w z4X23$Pe&(#0VT3e4ITw`9<_`rf+8Z4dB2$?>~+AQ`KDhx!o}TX;pd1AOgA@>Iu_}fvz{dGUXPr$4{{R3m1P}ls z`08x`VLq%jp;IdmoFAXxG{(lt`vdv_<0jLIb*d^$5`#`6l8zt>Di$NcmZMo znueI)a$^Gg0i=-0PF!!uIV+zdVZwJGDdQZ?>5q%3w1@|^xsJ30jB^9z_fx9w$^A$Hly|CXQj7NKC||Mm2@%M{(j0Z zk?*tKN?$MxJzql_bwW&l&R}{SdJT&J>d$`B$J(mt=i6v6tT|D_8#;1{oQjwoirp|@9HYtN*h$Ivx5`TqqDV);#3)X zqJ0BN7GxX6HZ+gpZu%Lq)Ks^=t}>~kt6PwI1r#Y{2#Tf-t;6=T3<3dLeN9)_uT~i@ zUN97QgDWV`g%ld*8XUf(7tE<+SFh#O)qsN-8Hz52_~kMOn=Mb_`6{We?#W4opMZ8i zEjp4~pb6x=tJnyB=0ld?>$|tUzdm!>ycNs%f(Dfl4kXm`?n6@^ZEDZss{szXJQyJP zIA04>6!!6A!}#eVo_|SKR$c=d21dAw3#}$2M4QvfB_3`dQKj6jUn(Ysb7cTKKvz=@ zd<3=?8aG3WdCJ@J00jodI{<}c|LYEV%+aB?C0LYdXj2UPT`C4=bEC1~`!rZ^FR|Y( zFQ9jb`FZ0>=&L)tC!V`eo3NS_o)nT{OoT3xtfv;T;HQ8$9Yz!ipa7t2P)UzQk|0+K zGcq!A(PlExUaAElwXU1pThEO|UB-zQ;({pb$X;uE?AtdZ)>1cD=xG&3%>jF6Z_@$;R=~kW<(gkg<@rXNdp->DrQn#%6Bg4 z;q|5{bajIak0@E8{ZUHLii!Y@1=mJEhiJ`CRv_ejIzK`uDoq{}xQ&Dg>E_fZB`K+X zKD)H!@A~NTN6o{6g#+(GXjOtLt)RJ@2ywzHyzj%<^=L|;1tu_SdW8Nrlwt{Rw>OY{ zP)NFR%kwRmx#<19Ghf~M(~%t4+JXiH4mU|<&R}mJf38M9PgB-X1NhzINo4zJ(>s2C zk#qYx(z)W1==&uB>LSzx;~)PROtRH!qyNJoO|fs#pcE{>oD+Gf?wxUvNtdR@Ko_7zqWQp z#z*zo?nVaaX{1OshV5=jXn{6r<4#QQP{w~-o8=UxS&GWmvI=X5hOxBRm-Fw7uAiQIqsW@scM`) z&pSt3$Wf6<;o4Q7OL>%u()lwMj=YRZuLYKSj`z!TctGyCo&Q2W5`cGlmUPIh{o&;6 zOHM#=VJC*PP68*wOOvu#R`y5Imi-$sx0@XD+{i_on=*fqaybB?QX-f0GQh2K$ z*ra!G6>pH_(tk|FVqRNZ(q({HYLa#+CTkgAn1+-BMRW^SgvnJkIVC01>q$}b>9ceT z>1>q}mT`iPW!zu?>~Ny2u~|~YF~c?9&M<6$|Hs3H1d-AxZ`IfH8u4Q1TZa3U9&1as zVaLmnG7CbWc2Q`JeSSkjuxL(7iW*Elmgq&y_J|9Gl9kIFJslnK$NO0x5nA-Xv}F@X zVKcv+R%&Q)7a|?~+4jjA=iuBNJHj9di~T|13X?Z7LC)Ju*j2~F$qHd*-}RBdJ^by$ z8KQ%$|Z`SXQKK97&EwHdn?4ZfwNQXQ2V%Gbd%sOKF-P^x`Nl;8;dt8Sun!j+m zy>}62+kvFTsMG9|A88WwOoRM+{<);Y?X}0fmby$=MT+_(f2qON&O1)IwXJPC7*U9C z-0M8j5AYZ48LSq|1Srf#2p;>u$#f?4c^Yib^<{)UCjjo%bub^TN*1b6(|;wE1YtJi zSI8XGr@(xDEP2}-2q6L+Skg4}lqJvKBjEFnU~^$(V1P)1wS1erw+(`quD*a-IyKEL zLEl1o@jd7r@M2-M3*4rrCO|-Rxz?25%f%y6@UFLL#X_KV?V)N7Hwj%QeH@VxJoQs= z>-Kg&4eM!V7;ST})sf33v>- zzq6LNoXkHS1%GE5(uvFExm!MM5hBJVT7^~R-*zm5LojfAFwUHYYpd}q()1Pc1%D({fAGz}ULWqvW(zBcEhj`vRM zuhXy+s^w)(Emc81_|${#lfx*naK*nhKU8aa0bexeGdyBt|NZWUCtEw!z~Y7Xrtiap zE0TZ_xyVUQSIw{^!S{_{H~o(SyO=dK-QhS{IvcK@!nCf^Q%vj4mSgr&!a~F<=zsY4 zbWy=AT(n)Tu;QMCHhz0NCsOYouxUYtbb~^ukvjttKs{+L_(=8 z=}r-6>R4Gf9Gct?70lI!U!rLvtrzXn&-V?GGvrpy9#~r7a}DV5J3SuR*344g%X{bw;4tFk{hIU!}-BFGapqKfV4ZjjimNZg3(d^0eg#hY* z>9C~3rXa~TyRN1)(^9(#XDNq?p;JHn=b$e~*#isJsscqx#l+|lGgu6L6lE>bWr(D& z{)Ls?7t(MtUY$*Kzt7O~^di$eY*6Yo*f}{hiaDKP&U2A_$<3A#Q5B+EnL{S+Fi+~s z;nrOi*%Lk9x`ZlQx(?OLe6@~<^g3d2Ey}*%u93!Maa85W;H}rqzTP^;7dIR+o*kWC zfRT~4Y;X@5IVsx<*AUGt-;U|Y=+=OBCCi#Z#$e8Z5|A)k=dB(9(8S5v*YoanT{M2~ z6Il_BK5xZnpPPsx%wV>CwimZ>Wz*>Cdw?HoIL`IbAJoK-`0&u0l$&vX9{r_bU~3A6 zZ7zj#|K0`!g)O{4KaYWtyuL6#B2=JOB_eLY!bD*{ z3XMcKGu2oyZc8h(W^WYscuI65xs^L3e}KuUM6=)75S?L>okLi+vqm_IsBa_9A|vDP zvOSUw3Ve3OFl9I?>a?Wpu69N@XIIe**^e3>D{VaODkKp9A7=b>lPPHHg$y7KL9xea zptJ2Rcz*}!n$P18p|oT*;Trb!2jS&7x|$9q-D?cXx!d((l`&TtfSag-`o zM21-pdsYkt+#U8T8U} zQ{WRL@~nY-n$NEuyTMc3Bg7upiGC$2Yr5J~ngJGnB;#?Ok84RkerjwD|F8#Lca=hX z>oQHY{G=N(D_c2r04xsuZ^qq&ZxrO)&5p14mMEe~)jp=5Lv~CG((|7mr}!SUloNHhVJP#eOQiWfTx^5` z{CQ$DSanGu1EG?3AiSO~ZFOr^??!{?s3@@0RC`BdC!@VGzFGmLd>zTsauP)<2K0&`RM-gIVF_ zt!;7dd>*WaB9^5@D^soNLO=zwOn9U%k=x z)WSkTfaW{Aq!h!gnQM52KH%Rd=V7klH%FGm2+c~j!Ho^qgHcm>Cd|}i5sE`|6wOj@ z5}ICY%M8yDQyXJ&2nZ1N^=DlMfiwt!R9wi?XZLo9xVwh*!HEiX=cv4D;RJ;UFJ!8F za})uGuP`21Wc<5$Kd{`hwb|Te*_iwaw~U^VF3*xs)G0?~L2cQ))1 z0I1aOx%?Ypcth;K07bf8Y_rQViBmLVLE7RJ83np=6~Bi5Z+06!Y4@E5+Iiy@h4L3I z3~Y;^6^k?&p@RDW*x1w2z4=T1Ag;1yw<439(cw_m)TG8!{g{LLm?X^hoV-S%um8 z!x}_rW-NAgE`x0Ozm%B#Z9_fHfCKwrq`&V|u+4ig*BA)~28ug7&Y%DxhQhQk=G0O? z&o5X*N4Z(p_P4kHFEZjcJ$K%t?}$F?8!LmjxLdB-VG(*qN8w^8CV29+=UoS5EV~R4 z+_dG0me=@w>fR4{-(0)|VEeC?6`Tk{)57VkPVtmh^5J76A|e1&|J&r>>K=phEL>Ed zGne!;^s`elhQ>%({!=#M5+Mdh_HU>t1PgN;6Sw5Qer2DVDH3oOHrLnV!G#93VE^bB z3w9vo)#3FT4-sThm%ejiqb4R0hbtOkb@!xSVsd~bkerf(T+Aud@f{C=VO=*T zF-5~jAm5&$&EZp*5oAsv0$gluv8AMjUO6kaEM8ovb`oPEP%=~p*8rYk#^{xmwmC*c z9c4hE%D9^)xB-fK+xEyc8JDrKwY$UX{O>7oGHA5OkkZ?L;0QydUnX3`>!1T z>kB(y2PdDozRsUMb%8~O{~Mm?W6x+j4DhLXGoIPv2i9L1sUk{_F;bV9+m#hVcb}fTYaIZQXl(-S< ztt_4xIeAeb35cs1vH6IXbser3O)=qgf9_p%3asb!IVNj>t{8uGVgagj>X)dANl4M3 z@{;QI_I6ZZLI7q=TH6{1TKWET1nQHVpxR@sn z&p(?mgxLeM0ak#}w=8Y0_9yEaBZI@BF|xdfqa&1kSB82l z-pAYE&T+ZPns-?IDI&?ZspQiIh?A%ycw)eVDT5Tgo`wJY5YOKpYbE;q>ieJwxtI#ig=15LFyJ=qR}|86Wm zg~#WGrR12~^mKO>IX+SShi*iMEXTV&EAMN~pgrz~CG3tv4d1*%Yr4tvO>CE&DwZHK zDI*1ie2<~Pk9`Fi%kSGhCK zyK8v|{b)mvz_EkF4Eg39-@I?E8Cf~X?N|dXI*--9`+>NqeTFjye6A|iTAppIXmt?> zV`(k#b@t{H1;*yo$!QvqHa3->o-HyASb@g8**sZ==|V@SE1w^46$X{4mLX98VM-H! z%a>C3)pjH+of`db<<9|C+F}D7=tVeQ4zJ10{sr}vtSoDg`Co{>GzptKE^owI%4`<5 ze7`rf=Z%aT`>Thz1)sy^83nKtl3?&7TRBF$-t}eIyoIBw5#+U9*YBp7@;<+|7IjyH z;l8L9fY@!3oMQwCam<*n{OL7pvmLjV#hRKB6MnpCsEES`s#gTZR-s|5uxFr>4?T4Z zj-Aa<3_&HmgiAE+9p%|D7n^mtQ!>IR#62nv7nj){iiRN*6G_n`hKEwYH*+macpl!s z$ihd-lBSJ4ujoruNvMiz5D4X1ahfa-3sNQ3Y3ht}R%o0I#Sz@fdT6E%){k1zRARhW z(i&;;@UI%*#X-1Tb-%^E7?lh0IsQi+K}K?KZOf*1PaikUGz?t|9#gf#a@!Gd3<0}o zKuwKeW3j?jU@-L3(#eWR(>70dbQ_!G85RXy8|Rhz8u#_oj5+F$)Ql8l*}jg- zsJbj6cyE54_wFZ}*Fog7ttM-SMj0}mJ~k19`_q+=g9By(pf@ci1VaB3NiC6p5m~L} z7!ws=v%kGLHTB(iiNcDHE=dM{-t6R=(2L#3%RWb9d<%7>wlM>6k7w9a*`t+r?@8>) z_mUOKB%UK@ldaKqsdZ6`D7)UuM;SaVBV}spldj~xBRrgb(YJZzbY>{`)H(^quU6>- zf%LavxBWP%n-4aW0(V-gToQ=vEYr#siWs7m1I$8o5nsz_QL&DG&H8x^hThA!Pv?X zD2vr_SSae^qZ=C9It)s)Rwxq2zqaP{lVhK4uV&O1I9(HDDg9TL5sb&lJiI#$p8|o+ z(RzApu!Ao%wyTQ&*X0{$ zV&B^VDtaM(#p4Hm{Z*2bk?Hlqzlp$;U)bY${0Yi<(D38CxI7l=Uc&*cp(0>{6UC+} zo#R{?=3Kn|{M)*+-A9EI%t$PpE02M7jHX#)md0t_W&`l{{5-1#-F2u4JEhr;%GzQz zOU7r_#(sB)g5DS7R2jl-IVh&42k`<=v-mfGeu5~G;$Jv6rijok-{5*b#i$KTuU6Q3 zc*^i&R#LcZ`z?}SsPocYx9m+1FsDzSGt~+}M)FYT{#dQ!byQSb92-m^qq?@ev2lal z$qz++kRu+X`EM#i9=eOD;1`4=D`gI<4zIhjyL)sL`rQjK3%<>ZEtHpMbapOU zC&TcGhq(?=>wi+@Ic-5e*x1?@I&i)%mQ;s%nyG9N{X~u@5^ODQ>_n@_AJ!2RE}bJM zqkxrCpz4Srj$lI++P0DiGg*6 zcre@!1T@0A2yJX_hz(f?hTzMvFZ070el%7}RNAk58qUE=f^%EPcb81XD?#5P`OTaa zB3r?Rlm2+YPBuQrY3%&?OZ!Hiq|sAm1%4Dr(Q#ZyNXyar()zi2-={ zXW@Pwrb~0lP6k?!so~M6qW_c0i^~sdBH!PK&qES&JnRP-N`|3fZNBQ$)%Cav$7E^pcSwagMy?}06S^+l zpTd}kb?@LLDxTYp$~iYj2zHR9c7X0TNW{#Hl_t}*ymwv!ZF|mxThi8SJJv!_0s!6J zdYTWHk`+r^n(Q$ER2DPT)$eN8te(QK9emv5GsW;@$HE?_PBTRRF&i$O!%~?bMtpB$5uS#I<$4{I8D3he zs{^?>xbEstQC+33(0Qmvd9k`5^$Z_*wS){;r=~VTK_6=}AisGAV0X zu$`RXBaxzxLEf7+b7~Z1(n)~FbDP>v`>u|ipBmWIgOlpt7JEOfGxBGwPzjEsg9_Oq z{g;kG<($cx)C73|3IRs#>&8O#9ecgAr?pNFNOz{wytmqNqc6Ez=$o5^k}j3^58JZY zznxOlvG_lg)qg^TicXG^)JhgfXj-65>JHb+hV?V95x#PcK7uz04QfM2W2w)r%?_s?Yj409l4U8 z7GfC6rfD_}Cz`#92llyu$DphD?s0DGYO3<)EUoV?5HSnQl#O;C&o&Fw8C5dm_Lj~B zYd%zn_wAc=VlMS++4HDeh*Rk8zx011XSe{Pa*X6~5rb4y5MC?ksmcE>+BGtiGuJWs zU9rOC>os7L`*tsO#7vBwYzd&oITHUa;hN$!$s74?paKdA0= zZsKuj;ui|?o-eaM$SsHjxqDd#6gn+m&G$fNF5ZV@BCtttd|;9A)3JliX7iNcdr0|* z!TIl{Lw9wM4vE5^$Z8s#=_4ATJOJrHYGhadeJHqBFc?2_Hll~qBYKy7efdOZhxJco zWpL5qnY2TJ_SLa|MD3j1ybUN`ET>R#zA7Zlrp#-*nT_%ApWzibCoUAupQ27RH9cF7 zHKpP76h^F?skV1lEI0_Y%}K$A;w&g7An+TTw9u#c9(fQ9ab|t^-;181YPWc);1KUc1_iTT_V)GwVaeANwI>C<6kQb^nBv)}vAmK>hT#EHDuvxwYswbhKFlxmhA*%t*)+s zPM|}>1oi*-0^HR1rPQ70g{qf^19gPum+XIyuBJ=z{2}w~MyNZg)C)l%AzlVV;(NHtW8Zfday#w@{o`vltNNg)PBN+9` zeobPD9{Klw)B~)mDTx3`aa|+kPm%)0t&=BEh)LJK>1S@%R!n!$@6=_A z4`Jo8n?rrHC?&}#d8Ioj#rOBH{Mu1b2btE4XyI);WH9-2r_;qhNR*k)e~6Orz0#zN zMl`3&PcTl9gv>MeJl3f>3KSv^6k{gbvck&2ny`Jdu}yh)=vSPC#}>3_s%imk7g<_y zw2Gv+(wJOgBCMFOL9^T>1enB#z|t&sryo|}Mn=XH8(93}7jofLxObMhDf+pMmSffb z61D-+CP2IThWwe+?VX*VIqZh@!zuk~V&O7MGih|u=ALesO$~w}krV^Nu%Cd>F%k8sJX z9n!~yC~K+nJk5lcnjK-Mijp3gTXty|iL{g{5eRyYnC%}s`WhgBXB~)S)qnw7{bgsP zTGNkT|0bc)V7^-$kFr35&b%OD?`UI4cd_f~(m>aCbhFypoUc>&Pvy_9r^#@AUg&4f zzWk-FrtQ2<17SH;94@~WOo3MfqV0o&l`2M4;LDRN0q-BmZujxAz|Tz^Ut{v$oeWi_ z`2?Zjbb+a(qUdO7?R!?1T@q$oT3Ymq4Epcq&}u*EwY7B^@$SEv-5f!7uB022tX1R8 z$J+y^KCgoqKN7h6@uRb^Gd)-7));L9(IEXsWwt{NGJcC3B9DPSxBQzMR_( zc&AOwGOqxxEN|LFo^KDugDmvk&Lv!qg8NclBF)kR+BojK4pdIUmLTI{N|Y)BG`IHY}* zPjAx3NDGTBOvFT!g~=T2?I}9`$}S0rg&WC`Fz(;`89YR^(e!5Uv`yk~;h{?2=g9DV zUANYCNbsh9NgavXwi2b$@S)Jl}Pyb`)RF6 zFm$Flm)7sbT;(W`B=WKuA0{Q{Ea&JXOfQ`|AyJ`8$WReSlTth{O&AlaNnA7vG`Xy= zuzYpjukns&sIj*Q(PY?F`xk=(9%i_Gx*O55=zG!X^>A8H0vzqBQgC1|Smj@?@$p#w zXPlDKq@;c4Vg{6q9-gk|ao&ll{0a!k1+=4xGW@T`R_;u@zJEi$7)O8w^5t?7Gvr43 zJ3t1Ob}SZ>Tl2Hs7|}tN^%gFiaWgI8qV~ljoD5fGRQYx&5vcEXv!EWCSMww^snDLq zR2SYsKaa;a`5Pl-gWV>*O?qmKBJ1;xjLnw7?K+@UA`omd)>DGA#0LE;4*K{3T5|+* zc)aE@i}!9vZz*|^o}ocOyp29}{MXUmMQFR1UtBvSWNm{=;h%OanD}DI$#g$|f>ldU ziU9r?7@%w*_PhguG=1R3g{|gn6-y1N; zJf73k^{0N&B_$|c14+}PwPSnurXk{jx2&d|u~_2A*~P`hrgoE0UnGc-MBw;M+RUCI zM!;P~^;1tqcD?s|^Yimd^=k6(1-K7w)2I|!t^pE zKR>>zYKsR21p+)PBax?0H@0Ym;c@;abLac}Imk`b&0P%=u9zbwW5BVm-lFk;P8@>K z)}mc~&s}<`U!B|7*}0MF&y*dd_u$O{Di@_;&r+gLPZhVt;<7U#3FDCdBg32pA6frf zSYBnX?E-2dBDQCCZ)|M5U5sXpg6y4K#6m=rzjkS<5Ogr`=ZYz}K?GDY+KR!JciZ2V zy?}}e!p;qF3}Zc1YXrq0nOdtx=Xl~&;NN1mK`vKEhm2!S(eg50qLIolLYS9aJ8EE1 zFmnt74*C*V*uc&F@Yq>6(*w0*w8gG)knhtfqtITM0~weRC(IIpGQYGC_p%>7(ZDm8 zz$`c#WSzINDjPUYj|+>8IGZEn`YbIb){hBj17tFwlm?ZC4;|t@#eT>vtiti@;D0`7 z1lGN@wxscc+CQSg;|Z1&$r3|!$&pvzL+w5t;kjKLzL-lD3A5a2DPvn!sH)WAiS3bn zKKg6w)vP!1qTIL|$~S;9mgsH14SyZ;pzM9|~fOq?Zfs4%sOw zf3rOsmSgvU)bSJeLWjBU^|x@KZkEpbuqJKBpx}20F5Wpmi@y;>R7p4Cq3!T)UP-KZ zqO@rZTRjdZQNWHYcGW5?Js58ZGH8M^k?I7|an4dIYHEFokl$c5V)&cC+9SVD$KZ4B z2hyTT;nMw)W6$zvF5rp#YhZwig%$!lVtbd2B{HriXH(p_apuv+#RHFF^X@W5q=2i@LU@wC3U$6swt`HZA4O$@D3j-+!#RV?+qUrOmCCyyOWTQqidYI%cN zm!Kwpb;gXy1Y7&9zkfIaG-!&k(q#M-VPc-whrOXIQz8aXq9wk^OaMU6gZiSA$stBU zt}o03IEox>o#w^(JWQ@=e7fBhvku3Rhom|a4HU9D7Z_g`m`I@D^X=M2VMe?luXuT5 z+`olw9`Xb^d^;>z%jLht71*X`2mLdBxl2R{0O@~5zjYOcx>S-Z22-3%>FDTG049Jk zD2E}=&F9}cSMfMpBm(Rm0Iu)JFoSM6{{isz#i77xywK-9k&4Zr(ZtX<(kk?!SdYts z6QG5*B$8rqFJyAjF&;($h|BJ>ct5K68gyPAK;%B=Sh`b)(LxogwtJpcr}ex!rpZ4Y zv(#1wE=}1G7*+&<{JYMa-{o6=Zy&TO3?=Uh!@qkxOOmh;C%xvTme5~b2EN-aeWR(u zEUTy)DvxdxQ7M&+>X0OoW~^(5B^^-|614RU$iu$(5@6m_2kDhZq-F~XD^j{Hj?t+p zW`e=YLaw~=725wu)*Utwy?dq8STdl78z&5G?1tM^o;FmJNz76UGi-2ZzUtT8;!hw9 z5IG;$y-p|s#NYPr6xUo&5g7`}+Kq;)KjaLg<(L(b-9e5d7jqT2Hxs8C zroCbY%dL%s8X|~?f+XDU1uN9;z0e|RW^JLHe<~jiu4d?0nei?BNuE0|N6Bf*4V!H~ zl=w(UZqp|&olIz;yf{2cFRm(%{n0iT9?!+e`HL%2Zek-r#-9|Ae?Uc1h_9%wvmVdr z+ZUWP$PPzjFft~0JoczR6Cjry$k-1Yc%8hz+UhyzjwIK=y>+mqttkrVmluo>U<~-nwfxmYZs9Spwo>L+O{wc<9}ok3-iKmUe@iy0?9H5y{;1hI<2n{ssm8nibq@D=1v6 zk|3v|0xan6t{$G*Y?h@<2`IwwVLC5P79~R?r|!W~oXVVk9!-+)rX4WFsX@hMc!eW-ipbl#2*@1qH_xuD2 z5-WB#XU`QRZ~)Cvfx9lq1$(7lqkU4il82290O=89GCZ<`aYiySvLHUbHV#PWSE0}M zb*&Rh$^#`Dlg=1&C0Wu$>7VLav5|Y1eS^$`yuTMt+2q*DkpMMh3n9{{dA_FwDG;wu z^GDdp!gL2mUHtTI1j#5qJs0^?@bK7393v3Xt~2D~>a14(dXILE$fxIj?-tA7Gr)rc z0(~2JO4I6fu7J1X+UlxXuw!aUiZEMC;GaKqcf@T8Bt5)4q$2IBtCG^i?`K=&SkVPD z7QOY*(q(in_vI?s-$)NTWbnELuKEOEL||8%oL+*S4xDH?@Cb#tlluZ9Y7Gd4Jdxmv ze8vSKZE zG?~MXGw4?B6ln5E*$(ZMo$j~QdeP(j+4Hoim4*x!5 z<#40{~I>{(4$mMu`#E~;j8t*GhdL)^3VBP3qb>7c;Xf#II;1p*i2 za5-CfA7rV-$v#`3LQwWGla0=YAvx4BvqvVzdO|8B+&h_$algB0o^3x9)jYp>omrpZ zd#GtoIbz_&BK=8K|Ni!`3v*2GS2OV-zdlw^QbDb9uHMJ#di(<)#OWEnC+CL<1)5mt zTv2s3k|EgTN;nc>r;?_o2beG`0JK0~GR(jR`ZPw5t+g>id3pJ530ep!8mRSk-D!bw za^H7OOlLw;I^Q zEU4~O0bc8Y(Z!cUL^V}v7r9eJb0U~mqv664OC?c+&(5ofxoWi#ve6%0_X%!>MN?IL|aZ3 zYHG$@fjd8WHw8g)_crkWWw>&=utjx5f^!=S$4n-nG)~ zaNldxA3SMKB^3&+=tO;`pp|%q{_c&nxcwvS%$h&fh0qnhfHAnfFzZF|NY}rx@b-tS z8bPh_NgX9=pkQ>mjoQB2GX$NeQ%QICCmgZ`l1;ByurIVam>0BSk+*JSN`?B39G}-T= z7K+WONf>5AQ+$lO3eQ4RJU)xJ0TJjf`e{{}TJZ-!N3Wwa?`f z#$lXVye}u4`1PVg8qr9+v5&4JnVVrGFZzVDUrR#s=1vM8EN zY2?&3fG%&hqKAdhqd$NCsL&Q$Qq^R*kAxzzRt2CWwR^qXRp@SHD`{+b90jG!FW0n` zON7plLmR&}U&S>wHkS0^BgBFyagkH_-}+05J|iPzezJk8sLkV1o;^=kg@&3( zhVC(oa~c~{p1<$qISljC{9Rz5-yrfiE zSN-`wDZR53{8c&+>yjS^Mv8&(7S6@wg^nU%I6v8J2gwv@cPcL}ahHS!vxJ$FEXLHs z?vw?$=6B>iZZ|5eL}{!;J1Rhww3j%p~5Zt#0ZcL4py!S zu1M`Un!#>9K1V=jSn#)FZ2&!9FrDA^?=Uw_ujPCuzfa zuHI=fOKS^DOYToy=u&Mox8a8CEV4Bu-J1eNtNxDV>^l;YB>gsG$6!`9cKU_dVN86%lHpg=y8WL0a{rl&% z$pSNfGr^oiQ#n<}{5Z_ZvZeH(I7eD)&-*x^2DbS;Cr9(kkuw2IhFn}>A=^58t<>C~ zlp12T0r+v|Y&Y?wx;ockopy^!zBb*s+fl0sMifY_NO240^6it$sHC7qcF??)Q(e^t zF|(a`F~_6azP*Y>Qef|_V0wIn#H;(v%so}K_lXv?u3o1mkg^w{T6 zxkJLk-)2Ld%}YQ%a!r=9YXlw@_7=iv)t@#ZcBdntO{F>qUvo;sc5*eX>0);ge#OwG zs;g_3IHyg9MNVA`2!4~&AY6XxXj?1;e6LAYkZ*h5ZT%fmS(xMm>bY6HH!81_gV?5l z;kRb;ohy;2c5FJX{^cI{F40d|~)%%VwKReh1f(INh?zS}vE zeH3=OE9*tsX19~$lSBKCsZ@JN zNL_Et(u#tmnLLlV2X0)lz7nR0CiTt06Q?!=P|F(*7fba{Rt;C?+``2l=!*U%IhXXU zz7cdZe_G~>5OD@OU@S>u#Q(MSm0fXk!PbpS2p%Lr(BQ${Jvc#vy9bv+f(HmXNN@>m z!GpV#0fM``y9bBc&-?y^yY5=^VLo-AKI?QxE{h(BSB(~r7u2mY0i4>enToL=BJpMY+t9 z3(1u(fFG>#+{j^ne>hVv8c{l*@BTUH{mCzq?j_9J*4B-3*W?OjTWjk;36_UhrX(|d zF7DE`W1GafFPn~_ZskkDg!@hRqP1kAQ<=$K@g$*t|0ru9s5QU{@lU?}F=)|0#2~er zxeP(^Uva9zZHYa6|+;i_JPZo|leLSTr?0OEM;|{42JF63WKLC55Bqg_iiOw)N;klI?nKrv7dsG!(fF8)re< zNNd$;ah|qH8yfNV?bQJe5>wT^guML0_kX`4KYT0s8)s!H%+^$$n|n}i8^;$dK|}Sc zq~y7b2GL$}{GlCJRwNs;4xpcF^$lc8!5S{~k4Cm3!1gx$MTIhE;uERG63}rhqulzUH>LPlw^E@Wt4cBtMdL zY?w4}A_{(h6my77UXTXkw~D&^jU36)(R9Yb#SF!Jl0~Ps4bx1$CWxVqyF=H9cvecp z?;sA!;3JxTuTvEBPShDrEB@8-jIE`>cwu9s*Il3o=sL)m-g9UsHdkYi|I4_3vNOaz zgP+0lfvJVZ*E#^GF-RxR`nqZ>7ar8q+HKnJz>yn539g{~&lDF8=Kkl0!;xbvW2kdo zDNjLzadL==v#QF!L$aU{SfO5Q3@Io{R4c|<|K@NdH}MnZkg*b2S$ zEakllm*mrJ4er;^Gn#IU(BvzDHpP3v`6+FqmV>T`K5&mpgA*nEdIW`-2Xmwg0<*FR zyWuk?MPE$wnxxuWsX<_KT)kanaMXr}r-el}*B~OyL@sYzN`f1uPb)2M!l0i)N|8HE zcyV#5rs&>e7Bzts_oZie?1RA795pBHi=n?q97t&&;C2Y}Vug~rLv zN-{Py-;R_duc-FF|5aStVd5cPCleY`VgrJjscN^w8L}3b?F}jq~+ixbJm!@JP~sP|?q3Ug~WZRq>n~BL9o+JUl#1njQ6L65^_8{oFTg^dQgM zOHa?()y;?XC#*`VHX5HIt-_4bhyi`QzG0E`=jhV-UW)4bU^#l*sSPc_l+`0Y+0 zvy|0xyz%=0Ht1yh!5%I-o%oqMHg$uO>IZ6_TNEl5TK7I4N_28!q7jc0*&a4Wu{x-h z2c`I|I&4;!x;64h#Tw`m0fF5dy^xsTqMEJ8f%u{kar)*5Ua5HA!!Cx=kJ2GxMZ76w z#Q6og8&O)BwqL!E)AE=H3%ax+vnCIx`mB=*3g{J3BA&ILLYO5HhD?iW0gNYax%)8^ z>z$C(I~cPbrGU1}xBVd!sCNWXRa`^&yN(_2!MPfXVuNhQ$X3L=8QSgFy*xYh= zbGw7U67r4y{$&I!z3*T{d`a{@T6+89*+&Bd-|FyI+wpJUBloOP_F%-r-dA{A-}fHX z4hhZCm;Xphih7`pn#$J~@@vh>=@K%m?|Dxsz&&sU-FJc9C$Nid6DDPs6k?j;qSUuP z&7=hZ)kvvVtI8)hXir-1k(lKwqeDSKZDje@a`QF2H*JIA+}uNDjU?yRgTj>rh3 zCU@1w=va`)rZXPwZ%!>MQ+dI2UVA)1^3XYSSH7}ha^G}GctjICgffN~fD7O-U!AII z>o?6T%*3;Jntb_cZr-a4sKednBCI}ly!k2OeU9RBN`L?SKu(9Cjckk$%#Qf&d1%kB zTurPl-d-mSIykW0AP}K?|1l3YDCHE>pxBjBEq(aKOT z*K}#M<6`4t?&S1)o`r0|mSC&%vtXFg%Wql(W_>bi!NoMkd>7gl^m^{N@_82K;5nnB zB_eo4RBQ^d008d)?9T}eNCrQ>yc~``&1TtSt@ddxUYutvAGw}RwbTSJGhe&D(B7_t zqXPc_T!5>aje4GluQbR78i-~uYI?v7a!^jGW~pnpk}fObR<#Y#lrTX6fbG(YL(vDv z_R&`X)CE&=SKXT z)MNVT(_kf9b_#a&HgXmd+!~tMrdyT#^g;}_Y2(hR^vsNAGTfB9ye%9)j>Pk7Kb8cl zb`n|fxOI>7p=-*o#6&7Q7(3N>f2+&%E@R_uueKAo=sfw!W^*YjRrY}Lms(||Q6b&D z@sPBvRO|_6-0=DV^NIUIyNZA+)y6jPJ`cJNOT9b%!LdfqCgm-v^1>SBy&wYX=0c5Onh7*lb0t^In zsfSRu472%xK9#IPLqo$&T{X=w(+edb%Kn!>I6w)f%XiY}m6MWeu~iBAeK^1fSAs?V za^sl>S$m}_XPRa;rgy?<5n*IccC+a=iTyfP{(e5f$NZ)$4kf|^pw z%*!%#sBB4v*YV*4%($_xZiEd36w~g#-J4`{>5Xkmn0Or=+cwL3Z=1P@)rpr}X%20R z{Yjv!V?bwPW7EElY@&lnjk_`4;iwN6fM+kpmRGC0+-h_~x(BKVOed$7Tog#uOD9cc zpaa2XpZg5_MO^I~P@&|mD(nGm32G9kISCU3!^0n3 z!9GBY;d_hE5&zX2UNWE}jm~mqP)*)9Mh6 z&{fcO5#u8fSZ%XRn- z&DU~CR26Ma5|5I9d*{tPxv(=Pv$wZ!h6iWw^P!Tcim%6Y+(5zvad52CEFM(>L_(sE$!OLA|ydUZ6 z^t!9JWIAoy$hXC9E_&HNz(QvUogq?+DyCueg=0UJuJDGG-?ZOJBJ6G}{r2IRn$P{> z(f$VpVE5wIv3t*(4B{na>R`JELPVjVA^zX`;`2X+$F1RgdD2FX7do@3VPKG_c>>{z}rG~(&_qsRu*n!ju6d;A}Nw;3D9%!Mw#m3^v_hu(!BXjsKd1IyIWZB@X<=IdP~;?@sV{EYZnzP-rMgdE4$ZEue~#Ct zFIeOAT9)DTA`2$!h{QGqCA~QcpE?B-CNL!W#pR3jEFE%!x;hOHe=N^g6#_l_Ph@=2 zxy|)BljH`SM++D8jPm<_60+Ca={{TYmjjL!K8JZMZr8)u;VCaSHN3c1EF;lQ?zN+^ zj-T|N!xF?k7gyg|cRC(JG$@l_I!+6+U+4|_|K=#fVkyR!oE7Sc6}2CzX4X#n;~{$D5{Y_x|E7Rzgl5+3r${nJ)$M_rIsZw>sD)pQ zrR;lLp|&;d`DShfk)nh`90?AGJ{hkJk>{g7OrY=?3Gno8230`I=*2f8zAW3LRs`YF zXXoy$aAVfGS@Br!1gf6D7dUp$$b9wY+2sp%KM#_nX*PX!1RZsgnD0c+cS`EAnh&l* zI?CGgaBc+J-km>fZ~@A2p64$M4$8lOG1JXA*b=~5^$RB>V{;Nf$bb_fv; z4$}VomRaIHQju0QS~hUgnR?kcsKAl_WGovf`8MUJtGThusA5q`^J!@DNilJ1aPz|p z+wLn-uac6(Oz#ob(XS&-4K>Q!l50o}hCSVZCR`ET`i-4L=}VCNAqCmxIuk|r^?Vng8!3ej3acbn{V==}X2hci9v}w=t5Mq_-@9X?UI*P>j2onXG z`;K7%4Rm_BBeXIP_Wxz*OszR)BbL4?(Nmud$fI*9l#vbrbI-B0<7t?qox}Ie%afZ- zkM&v+5>td*L@w?OaYGY+&rH{k;b05f$ggJ6!&JT-9r$DRdr{|Ov?W+!yeQR$oqh83 z@;V|~7a6Uu|Cdt8SjLfDbhmoW?36w^}pO8OUVz=z(_$PAMw zGIIs{_s#ZN_^-pFQHv4Ax`-~}ey_I}Jk0t&U$dNUOvvv+1Z3l&*!G+*jx{!miz|mWR)WZ6W>@=c3$q>th~&U zS-h#EpaQRRCCA{o@uQ`qL6B6(IIMobuGG-qJ8~9F)Uv4q>?MIiTz;Uep#UGsk1PGM z&JjGP+1|^^xJckEzwbLmHIoq-_(K*{B&?X!NN+AZrT^(PoG5q-95~0~DQ&b?3>%R? zBCzonn-FAGKv7ZdUOZ`=3cEQZF9TI0|LxVpND24_a-ddcTx+}cpiiMbMoYKv6lurpSzkvL!5O0mm|47;_G_gTprit+;EV!f)kg`F z2(~bUbX~ngr*ni3fAQH#GdB`b*| z5*Jp_0aJ`9^SRn0H+prjU)MxUq*8;{;eY1Ntj~r5ts-~EeBl3hRZb|~^9st|0jfMy z3d8?h3y^j9NVvf1&reRa+9f*w!s3LY_fk^&jZsygR`4fd=G(3d5NT}0kL3Mx$r_($TO`NkCnqQ(LVRUZ^|_#&r$UKZt!4XH^WPW<%qm!A zpD)r+cmC0v69nN&iVD8PRpns`|z~G3?*P% zQbXyTG1Rx|bZwle+9jgXl@$LwC653u;0Iv)Gqz9+y*Xuy2<$&I_Vn~RqRgcW8M`aM zTK2uXQ4xJ96f~`e+;s0Jn8K`UYGN|_gDB1z({OXCCCY%b>4-7xa1PvySA#yXNHRt0 z-HA*D13)wf3=*X@9OL_BkBle%1EAnwCK?s3X%}W2d*PrG;DCAPKQ>^AMt`wC45Tfi%TjFN5kKv#ZS@#oh-wgXktix&aY~}+8p%uIsgU0yMbX=7ysnW%SO9>c%U&k z>>_mF^&uG0Q@ioc);ftKrL@_kREI2~(qzJ!QJID$P#f#4SZsvoy%rpev#Yj_Hs|pk zmG(07A#t1^6EibaC!sw$?Gd?+eJxHainsT-bIO*x27}H^!+BFRpjY8VN6K@r#w^UP zVxevqKsX$oi;v&HCcxF0A0Pi}RF%o zLS8)7_4z$%fry)Xi?4*-*C;^)Fhu>p$x)6hczC0eL?(GCLzt+iUE+Ek5yx!ibx(uV z$qpR4Tag}7zx$lZZjTF#F59h__gYi(O2o)q7Fy=6 z9JVLKUB{_snyJd>F1J3vx3LazFA4saQtB!C%3Oo`!q!2AWXfXyo17b$qoazVqVnA9 zZ1G4h<)Yf(xg|4Cad3VsXP1{%*gvE%wOtK-&7d@c2oq^n1H~DP#s*%u{R|$Mr`y}% zzsIuU0mhG?#16WK;#-->HSv++C*zud1fUTdPi8JgL-2+eGn3FgDjU9yd9YLE!2=Z# zXknh!n4ZEyRp?lKpmskMjpHkn+xQCdd%iK!!J#6&$gxd3Pvu5&NudIM9OSkR&Hfw# z13jPXGJS46v^~#}D1j1vf#dzE!iGAJt3wAhTt(W=7^y8H@zdFNe}`P~>fxS6&Mw$y z@qQfJDcE{}`62+lUz%{}6L3UsslWcg{+MEet3bywEVtblgE2}lQGM;y#gGupkbeaY zNk>1t>oPN`5k!{S{8G%ofwRp9dv3Nk)WYT#8XZ|isj~9lIT~kKsIgLn1>G#UDB{2N zXJjbVcc_BcS|h-%`gjD?p9-XK71GxhfsEi8j0xajtWI#bS1k2z=Zgl-H!%|t0;qui zj7UgP#?I$iHD5)^JAU`hD*Tr#jmyofa&qCj(ZB3At{N&>oIXCSk#$j8(5k)o`MbU2 zx-N4L300yAT3Ye7yGj({(WNm@frURA^yre-vH(VI4gs*RAP~4H(7Yy3A~Zw`&IBMs zStF8%gR)RMnSlY1SY8f!Q8}5PLj|Y#Z)dhpq+@3RqOQ9#ztUsaeV%@%BV=7 z2n`?h%1S0NlpUPRHDqgVJBuwAeA{SEhx7UMWkkorF5RLr+Z77Z_zx4**J#fW493^2 zj4U^k@QIPV@6@xRaw+&J(G3m3m9qOPDH;6ErAH_UjpJ&@?HCMy^6_0e-mW7Q6O)`w zJsV*e4EUR_{#MV3)=W&o4*$w)SrtZq5Rg*%9rSBgH2=W5e;yM@qhg zOEE$>$927k#9;X&9|r}~q#b~cV$eWUnLT&h4@i1yqk3ivmVM>`)ZLWK0ws|U<>G!D zpD+V+Jw)k0s!n4^3Lr2da68tww^KzW=n6b6J}dn!OSKD?l+d?>u;N@ZMsPI!uEniD zhgQZAf_9*2gikV`j*h^J4E<>wrzaonT$8(8&rm}RECJaI+ws|u;|KVRCED8Bu<`f& ztua&;wH^GN%XlI*@R2Y>@rb%U!9V(%@Q}FbzqUB&V;W>C>2hr)DcjgI1&kkLw`?5z zC=m@hQt$4)sQKv6!1?iQc}#V6Z3 zE@?@O@3b2N@C^|~4h%5i*YU0Go5*O(jyVGpY@=5W*4Amub3QY|In`8V&(byN8nOF^ zkaN6V*%H#Q_CjKUib_Ix{Xa ztV2}ZJ!3M-?jR2gf=6kXX8piW?o=cMzHO+OSGE+nJ2>^;`qejLI{|U_5{mhFVj^aC zmS&U0d>I@N0dafcGjU(vNtf>oQ7n#h*rdvI@`Fs@mx)8K`H>2K9)5KX#Vbu3*0LN) zxrfoe-CJt+`DZtHG%`{FCrmSIP=_J@4X%e36}qmi$)dc2|80|xdpi>Vj1W+*?d^FR zAvyHuaU0ZCb_0L%qD4G2dyqIMV-T!2!!QjREZ--wri%VmV)5mqjX)N03fB-$%+V%8F9hFYv?fg{A&%ycap z>q%j9a#l}oZ!!`a$Cxy9=H;e`PUhsvztw?rdu+XZeLp{uoR4t8sHV|zNalq);besq zGhS@;ytVZG@zR6;yxN&U=qLH0VtHI=I5y{L*~$2nKCR&Vr=;Kp?l<(eeio>Bn+f>S z+8Q_kr(~S}Y?7kE&{|V-SUt4)q+}}7+=J!?e z6KAiq_u)u|qM~8;qZrS=t?k)w%rC4MH@HwzhJK@es|*DEnIJ18%j>+HYj@2$%|#*< z9whQ6_a)g8(4f0Oip5x4F!1(oFo>NSPon0A_1olGADc>5 zmC-nh3QSnh#x8ivml_r5Ogx zU|;W*3G|7~SD0(sX6hqA1*cf6TYhM`aHYHih;;4u9_{bfNlpD?tEUoduogq9q&UM4 z{=rnOnNG&Unh}F?(!`C@`9^ArBSb^)i{ok9_{@xosfuhgSmM)-)S*EDD>Dy`?X5R0 zf-`wk64|q8EN8PfSK256rkd`QqbYGxy~m{A$(#TeeQ9i%c5oV1G(IvzNydkzL}#b# ztksA9*KBb#)V?!_UtJb@{c%;3|4g(M)|UM(rz=vI(AURcQHW>(@xVr@*2>b+{POav z05GJ%2v^O;Opbn_oa*%1@jS>-9o)xgCQqSpCTq?9(U}&BZRau<0FKCN|0?lkCQ{qv zA&nc0K_KQLK&a)lq_l;-kHORavzm)O7hm+^A0o+*AB&U~)NpWI(B&KJ8Y+$2T;{ti zzTn0GTv;)cU#&CHH*qdLsj+W)4Q?n1A!U)k;*nL%IN$|EibjVy3GIV@#)-#gb0osi z3=2*E?5+W}L@f>CmBouHhN5gJDQ1!PQfbnM{KmOoH{rh$*a?g@^!;j^>qmy1mwu~a zd<+KNj?ae~4_9rPB>DlvL_q_;`X*zR5dacc_lbww4YSa)Pd)iq6ta|5@Pf=MwxAv5 z^)Qm(Dj{KKBS|Waj_xN04gZ=4D`Uc=;~)ax7$PLxu9bWY#j8#Z$sXJmURQxBRLiI; zI9%p@6&M>|N!3taM8&EzOJ_%xOY+CP#QEre8O)B{rrgOnD$>i6DfqBT+9#ZQEI>A# zLL--E1kM@>okSDIrWlMU?Qx%#wOHHPNlIykS$d393JD=v#ydB74a^76$u|9}joS_D zbPoP|;MM$)V^yhN1?d7Uc*fMR{RwdiV=y8GBy25Jop>Ex&0?p=vwuCVq@dX(cxaQq zd8ek_Aubh;!gTKJ_K8O;pN{EoTgEQ4uGKHvKLruookCg4GTLET~of*eW}M4~o39fKm!E zV*`JY&oM4bOKefN>c5AEN?-^3GNM`xrE*(rM=yuUR^lxkef8ZWZoNMFh^&+JT5&R_ z>$26`8@{+yGdl~b!l(upIp|pqrfuwCXi{6&kMK8mcDXv!T>AWeAVqx56B9Y;U2EDY z7@YHit;^c{u310}VyM^ti_hffqWLw;5^<8`v4}P>wW_ekTiV{8;PFz zL1Y$!S9BqnHd^0J9}x>q3>^B2PIZ6aLx4+F%>ff>fpmSh#UvjT_a6;`f^?41Q@5Us zwCa*C8)@IS-LHFG=9SEYVW?Q$2scYJ=xYYBx!kq~EUdkHrLf5E*Ry3u8(}2C5qI6| zkQkBWlXZwZ1r^8^^o;iDt@E8&P?eA~T98bn61U_x7dmuimdF(|oXF3!xroc@{0Zo1 z8e7E@5iv|X@GmV=R^DH#cg-R%BGyusd!L+cBtR9uU|Y9dna*^zdol4!Vx%SToRAAUr=K4OJ0Ylq)YM<9+mdGKeQOV+#A_&WtlWDxX}&^I%#h zt?y<>(d@YTDH`?(sbx4*ZPk-t0lARBX2L+2QCG+HN~*pE{yi!@l|)d^BwF8ehyU%I zq(?b#}>{4yHWo2rUmw6Nnlmx)BK-PDu#E-KpPTSo}-5f8`EUzGeYqW3bgeijt zTa=5ys@rM1M8RqDb;lPmBdgyT>^#C9*$|+=7ba!8{>UGbQ(0VYG^)IxR(2HFcZoiD zFDsT87Uk%$)9~y&8GjJ%@t{2+3MB8oNoefqHpj(z`?fcX-aq&wvp{AdXSO6ChmaK2 z2Ktm$mU+a*XZxppw^QFUN7@LgALz{?ln}15WV;k$P6N#wf`Y8Stl#Fjcpg;ok-!)= zL04eBtYqsIhr8)8ogbj!dKrP7&;u$^On6dj9~VJTC(UZ-d0WT(Ty4>HKhvD%}ub$7( z3F(>3-SdQtD3J_ayuPM6-(4VSS9`uQ&7*Ee9WJCZ_$b2$3oNxwSJZ4F<3dNz`u2?h z1LW9Y322Rn(IgBaJol1$s;xEU|hzVyezM3Cx4knlATRv+ZOxH9$whs5Qdh^?S~h@fb@k=_-=bJ!55Cx+_$bkNF{8X6Xmf3(RW<$3PENJ4M8VHn zssHzl04BkD-^;ey6JOEX!e;vQU2;m<~&58D4if zP|P(s&f@jQ(9uMe5|ONKtA-M*(*^Re#IqB)Txe7@L~;^;Xk=rP3PIYePp^QrMp}~b zy#4brOjd8ksP1JA=O*_R00-ATcId{h+bkj6@Z~t9@ARc-t2SZL(CgUoM5Iy}B|5vj zjr#gn$^Q{kY{L3D&JVM{w$4My|3YKM%W%!!I3O!4hJ}IhL^n@$sW_FUqOR`veG!cT z*7X)5atPqxLDgp10T~Nk`C0XHX5^V!0~cUel-C>F*Z{)J%t_pVgE|F32%spg+OMTQ zgCAsNK1U4L%D;8U1g9%(z7NlxLpDYU=)hBrnsF-AT->O>C>hmTT-YABmZ+R$P{lE+ z4+~=>319|Bu~k!fq|KnjX=!OMnz~^Bnaf*op+kPj`v zADrS{T%2Lk=F_ZzR;q?56H-$J1wA=szZ|;JOAJ70*piZx@}C39yT^ny#T*_StR%TH zdPLjy0Ut>V^ObIs8)9aCD;V>4ewT>Om(_EZACsBNefi!e+lsCZLi)$=wNqOPaOU6| zk69{z$xk0C6Gg|Hu#f-H95?<1kMN`bXGfKr5p*2N{x4nF+yC}c5gw_c@5@|D|4@I} zZxa0?sm#sHWEG3u)%kggAL72oV3NTnBr(7vBymH-se3-4=po`nkez1RC6m%{j*egV zydvw7OGCFlToZqjtog~sbV+ge@+W})QJ^}OogjN9KHE>Dps+MUa#?V%wmD!N+0iEa zW=OU*tR#7SFB#5S({1*WbGL`PFnn*7uMfb-Q$1xpw=3@{+5Q@@OJ)Wz0;oY~J6$NA z#aT+^`9a<5|H#>4mKZij*5nHPBB=C5wsvKGZ&YJ8<}{84>20`Wi8me~Kp ziGt{%!11bIc~9ZXyqT?xU^Nt&H{Q3Rr*RrDJCtZP;mp>yg i3;qA)Pdf1hp%@*xtnTYuLh!33fSk0lRE30b;Qs(!18FD# literal 0 HcmV?d00001 From 43264318c43baaac2bceb84a735617f7769ada8f Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Wed, 27 Sep 2017 22:01:34 -0400 Subject: [PATCH 090/248] Some progress --- install/index.php | 85 ++++++++++++++++++++++++++---------- install/js/install-script.js | 49 +++++++++++++++++++++ 2 files changed, 111 insertions(+), 23 deletions(-) create mode 100644 install/js/install-script.js diff --git a/install/index.php b/install/index.php index 6af0ef16..82784cb6 100644 --- a/install/index.php +++ b/install/index.php @@ -5,51 +5,90 @@ require(HESK_PATH . 'install/install_functions.inc.php'); require(HESK_PATH . 'hesk_settings.inc.php'); hesk_dbConnect(); + +/* +We have four possible installation scenarios: + +1. Fresh install - the user has never installed Mods for HESK before. Simply start at migration #0. +2. Installed a really old version - we don't have a previous version to start from. +3. Installed a recent version, but before migrations began - just pull the version # and use the dictionary below. +4. Migration number present in the settings table. Take that number and run with it. + */ ?> - Mods For HESK <?php echo MODS_FOR_HESK_NEW_VERSION; ?> Install / Upgrade - + Mods for HESK <?php echo MODS_FOR_HESK_NEW_VERSION; ?> Install / Upgrade + - - - - - + - - + - + \ No newline at end of file diff --git a/install/js/install-script.js b/install/js/install-script.js new file mode 100644 index 00000000..293fff3c --- /dev/null +++ b/install/js/install-script.js @@ -0,0 +1,49 @@ +var steps = [ + { + name: 'intro', + text: 'Thanks for choosing Mods for HESK', + callback: undefined + }, + { + name: 'db-confirm', + text: 'Confirm the information below', + callback: confirmDatabaseInformation + } +]; + +$(document).ready(function() { + var currentStep = 0; + + $('#next-button').click(function() { + goToStep(++currentStep); + }); + + $('#back-button').click(function() { + goToStep(--currentStep); + }); +}); + +function goToStep(step) { + $('[data-step]').hide(); + $('[data-step="' + steps[step].name + '"]').show(); + + if (step === 0) { + $('#tools-button').show(); + $('#back-button').hide(); + } else { + $('#tools-button').hide(); + $('#back-button').show(); + } + + if (step === steps.length - 1) { + $('#next-button').hide(); + } else { + $('#next-button').show(); + } + + $('#header-text').text(steps[step].text); +} + +function confirmDatabaseInformation() { + +} \ No newline at end of file From 8aac741b6fae9af88af207750859c431908c4ff9 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Thu, 28 Sep 2017 08:17:45 -0400 Subject: [PATCH 091/248] Added logic to get the starting migration number --- install/index.php | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/install/index.php b/install/index.php index 82784cb6..e12bbe28 100644 --- a/install/index.php +++ b/install/index.php @@ -14,6 +14,42 @@ We have four possible installation scenarios: 3. Installed a recent version, but before migrations began - just pull the version # and use the dictionary below. 4. Migration number present in the settings table. Take that number and run with it. */ + +$tableSql = hesk_dbQuery("SHOW TABLES LIKE '" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings'"); +$startingMigrationNumber = 0; +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` = 'lastMigration'"); + if ($migrationRow = hesk_dbFetchAssoc($migrationNumberSql)) { + $startingMigrationNumber = $migrationRow['Value']; + } else { + $versionSql = hesk_dbQuery("SELECT `Value` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` WHERE `Key` = 'modsForHeskVersion'"); + $versionRow = hesk_dbFetchAssoc($versionSql); + + //TODO Actually map this + $startingMigrationNumber = $versionRow['Value']; + } +} else { + // migration # => sql for checking + $versionChecks = array( + // 1.5.0 -> users.active + 1 => "SHOW COLUMNS FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` LIKE 'active'", + // 1.4.1 -> denied_emails + 2 => "SHOW TABLES LIKE '" . hesk_dbEscape($hesk_settings['db_pfix']) . "denied_emails'", + // 1.4.0 -> denied ips + 3 => "SHOW TABLES LIKE '" . hesk_dbEscape($hesk_settings['db_pfix']) . "denied_ips'", + // Pre-1.4.0 but still something -> statuses + 4 => "SHOW TABLES LIKE '" . hesk_dbEscape($hesk_settings['db_pfix']) . "statuses'" + ); + + foreach ($versionChecks as $migrationNumber => $sql) { + $rs = hesk_dbQuery($sql); + if (hesk_dbNumRows($rs) > 0) { + $startingMigrationNumber = $migrationNumber; + break; + } + } +} ?> @@ -85,6 +121,9 @@ We have four possible installation scenarios:
    +
    +

    Here we'd actually be doing some things

    +
    From 8b0fe2cdaf143e8467ce50cc37a3fe2a79d29292 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Thu, 28 Sep 2017 08:18:42 -0400 Subject: [PATCH 092/248] Start at -1 as the last installed migration # for new installs --- install/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/index.php b/install/index.php index e12bbe28..c527f8e1 100644 --- a/install/index.php +++ b/install/index.php @@ -16,7 +16,7 @@ We have four possible installation scenarios: */ $tableSql = hesk_dbQuery("SHOW TABLES LIKE '" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings'"); -$startingMigrationNumber = 0; +$startingMigrationNumber = -1; 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` = 'lastMigration'"); From 5aeb90852bcdd9e12fe95516df87ef703e0788e9 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Thu, 28 Sep 2017 13:04:22 -0400 Subject: [PATCH 093/248] Add progress bar for installer...still need to write the actual migrations --- install/index.php | 8 +++++++- install/js/install-script.js | 11 ++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/install/index.php b/install/index.php index c527f8e1..7e80de85 100644 --- a/install/index.php +++ b/install/index.php @@ -122,7 +122,13 @@ if (hesk_dbNumRows($tableSql) > 0) {
    -

    Here we'd actually be doing some things

    +
    +
    + 100% Complete + 100% +
    +
    diff --git a/install/js/install-script.js b/install/js/install-script.js index 293fff3c..13688100 100644 --- a/install/js/install-script.js +++ b/install/js/install-script.js @@ -7,7 +7,12 @@ var steps = [ { name: 'db-confirm', text: 'Confirm the information below', - callback: confirmDatabaseInformation + callback: undefined + }, + { + name: 'install-or-update', + text: 'Updating to the latest version...', + callback: undefined } ]; @@ -42,8 +47,4 @@ function goToStep(step) { } $('#header-text').text(steps[step].text); -} - -function confirmDatabaseInformation() { - } \ No newline at end of file From dbf9baca753ac335bb4ea389e952c064bb480b02 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Fri, 29 Sep 2017 08:13:24 -0400 Subject: [PATCH 094/248] Getting started on the AJAX portion --- install/ajax/get-migration-ajax.php | 12 +++++++ install/index.php | 9 +++-- install/js/install-script.js | 54 ++++++++++++++++++++++++++++- install/migrations/core.php | 7 ++++ 4 files changed, 78 insertions(+), 4 deletions(-) create mode 100644 install/ajax/get-migration-ajax.php create mode 100644 install/migrations/core.php diff --git a/install/ajax/get-migration-ajax.php b/install/ajax/get-migration-ajax.php new file mode 100644 index 00000000..5e49928c --- /dev/null +++ b/install/ajax/get-migration-ajax.php @@ -0,0 +1,12 @@ + key($allMigrations))); \ No newline at end of file diff --git a/install/index.php b/install/index.php index 7e80de85..47589f69 100644 --- a/install/index.php +++ b/install/index.php @@ -83,7 +83,7 @@ if (hesk_dbNumRows($tableSql) > 0) {
    - + \ No newline at end of file diff --git a/install/js/install-script.js b/install/js/install-script.js index f80af6c6..2c93141b 100644 --- a/install/js/install-script.js +++ b/install/js/install-script.js @@ -113,9 +113,15 @@ function executeMigration(startingMigrationNumber, migrationNumber, latestMigrat executeMigration(startingMigrationNumber, newMigrationNumber, latestMigrationNumber, direction); } }, - error: function(data) { + error: function(response) { + try { + message = JSON.parse(response); + } catch (e) { + message = response.responseText; + } + $('#error-block').html("An error occurred! (Error Code: " + migrationNumber + ")
    " + message).show(); updateProgressBar(migrationNumber, latestMigrationNumber, true, true); - console.error(data); + console.error(message); } }) } @@ -125,13 +131,14 @@ function updateProgressBar(migrationNumber, latestMigrationNumber, isError, isFi if (isError === true) { $progressBar.find('.progress-bar').removeClass('progress-bar-success') + .removeClass('active') .addClass('progress-bar-danger'); } else { var percentage = Math.round(migrationNumber / latestMigrationNumber * 100); $progressBar.find('.progress-bar').css('width', percentage + '%'); } - if (isFinished) { + if (isFinished && !isError) { goToStep(steps.length - 1); } } \ No newline at end of file From 78559de051f9697b8c9134b363dabd2a8a2511bd Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Sun, 15 Oct 2017 21:23:56 -0400 Subject: [PATCH 112/248] Trying to get downgrades working properly --- install/js/install-script.js | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/install/js/install-script.js b/install/js/install-script.js index 2c93141b..ef4e54c9 100644 --- a/install/js/install-script.js +++ b/install/js/install-script.js @@ -85,12 +85,12 @@ function installOrUpdate() { $('[data-step="install-or-update"] > .progress').show(); // Recursive call that will increment by 1 each time - executeMigration(startingMigrationNumber, startingMigrationNumber, data.lastMigrationNumber, 'up'); + executeMigration(startingMigrationNumber, data.lastMigrationNumber, 'up'); } }) } -function executeMigration(startingMigrationNumber, migrationNumber, latestMigrationNumber, direction) { +function executeMigration(migrationNumber, latestMigrationNumber, direction) { var heskPath = $('p#hesk-path').text(); $.ajax({ @@ -103,14 +103,14 @@ function executeMigration(startingMigrationNumber, migrationNumber, latestMigrat success: function(data) { console.log('migrationNumber: ' + migrationNumber); console.log('latestMigrationNumber: ' + latestMigrationNumber); - console.log(migrationNumber === latestMigrationNumber); - if (migrationNumber === latestMigrationNumber) { - updateProgressBar(migrationNumber, latestMigrationNumber, false, true); + console.info('---'); + if (migrationNumber === latestMigrationNumber || (migrationNumber === 1 && direction === 'down')) { + updateProgressBar(migrationNumber, latestMigrationNumber, direction === 'down', true); console.log('DONE'); } else { updateProgressBar(migrationNumber, latestMigrationNumber, false, false); var newMigrationNumber = direction === 'up' ? migrationNumber + 1 : migrationNumber - 1; - executeMigration(startingMigrationNumber, newMigrationNumber, latestMigrationNumber, direction); + executeMigration(newMigrationNumber, latestMigrationNumber, direction); } }, error: function(response) { @@ -131,8 +131,14 @@ function updateProgressBar(migrationNumber, latestMigrationNumber, isError, isFi if (isError === true) { $progressBar.find('.progress-bar').removeClass('progress-bar-success') - .removeClass('active') .addClass('progress-bar-danger'); + + if (isFinished) { + var $errorBlock = $('#error-block'); + $errorBlock.html($errorBlock.html() + '

    Successfully reverted database to before the installation/update.'); + } else { + executeMigration(migrationNumber - 1, latestMigrationNumber, 'down', true); + } } else { var percentage = Math.round(migrationNumber / latestMigrationNumber * 100); $progressBar.find('.progress-bar').css('width', percentage + '%'); From f5907bf476041d9db90bd4697992f8db384a1e08 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Mon, 16 Oct 2017 13:08:53 -0400 Subject: [PATCH 113/248] Some changes --- install/js/install-script.js | 14 ++++++++++---- install/js/migration-handler.js | 14 ++++++++++++++ 2 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 install/js/migration-handler.js diff --git a/install/js/install-script.js b/install/js/install-script.js index ef4e54c9..b6515cb0 100644 --- a/install/js/install-script.js +++ b/install/js/install-script.js @@ -106,7 +106,7 @@ function executeMigration(migrationNumber, latestMigrationNumber, direction) { console.info('---'); if (migrationNumber === latestMigrationNumber || (migrationNumber === 1 && direction === 'down')) { updateProgressBar(migrationNumber, latestMigrationNumber, direction === 'down', true); - console.log('DONE'); + console.log('%c Success! ', 'color: white; background-color: green; font-size: 2em'); } else { updateProgressBar(migrationNumber, latestMigrationNumber, false, false); var newMigrationNumber = direction === 'up' ? migrationNumber + 1 : migrationNumber - 1; @@ -120,7 +120,15 @@ function executeMigration(migrationNumber, latestMigrationNumber, direction) { message = response.responseText; } $('#error-block').html("An error occurred! (Error Code: " + migrationNumber + ")
    " + message).show(); - updateProgressBar(migrationNumber, latestMigrationNumber, true, true); + + updateProgressBar(migrationNumber, latestMigrationNumber, true, false); + + if (direction === 'up') { + // Revert! + executeMigration(migrationNumber - 1, 1, 'down'); + } else { + console.error("I even failed to roll back. Yikes! :'("); + } console.error(message); } }) @@ -136,8 +144,6 @@ function updateProgressBar(migrationNumber, latestMigrationNumber, isError, isFi if (isFinished) { var $errorBlock = $('#error-block'); $errorBlock.html($errorBlock.html() + '

    Successfully reverted database to before the installation/update.'); - } else { - executeMigration(migrationNumber - 1, latestMigrationNumber, 'down', true); } } else { var percentage = Math.round(migrationNumber / latestMigrationNumber * 100); diff --git a/install/js/migration-handler.js b/install/js/migration-handler.js new file mode 100644 index 00000000..ba3793c6 --- /dev/null +++ b/install/js/migration-handler.js @@ -0,0 +1,14 @@ +function executeMigration(migrationNumber, direction, success, error) { + var heskPath = $('p#hesk-path').text(); + + $.ajax({ + url: heskPath + 'install/ajax/process-migration.php', + method: 'POST', + data: JSON.stringify({ + migrationNumber: migrationNumber, + direction: direction + }), + success: success(data), + error: error(data) + }) +} \ No newline at end of file From cae76032d137c81ccf706305416748909783a168 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Mon, 16 Oct 2017 20:39:16 -0400 Subject: [PATCH 114/248] I *think* the rollback feature is working? --- install/js/install-script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/js/install-script.js b/install/js/install-script.js index b6515cb0..ae58bc7a 100644 --- a/install/js/install-script.js +++ b/install/js/install-script.js @@ -125,7 +125,7 @@ function executeMigration(migrationNumber, latestMigrationNumber, direction) { if (direction === 'up') { // Revert! - executeMigration(migrationNumber - 1, 1, 'down'); + executeMigration(migrationNumber - 1, latestMigrationNumber, 'down'); } else { console.error("I even failed to roll back. Yikes! :'("); } From d35cf4d35800845bbd91490ae6d3de69949092a1 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Mon, 16 Oct 2017 22:02:04 -0400 Subject: [PATCH 115/248] Fix some migrations --- install/index.php | 2 +- install/js/install-script.js | 2 +- install/migrations/v200/MigrateIpAndEmailBans.php | 4 ++-- .../migrations/v230/MovePermissionsToHeskPrivilegesColumn.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/install/index.php b/install/index.php index 599dc49a..5be220f7 100644 --- a/install/index.php +++ b/install/index.php @@ -139,7 +139,7 @@ if (hesk_dbNumRows($tableSql) > 0) {

    -
    +
    diff --git a/install/js/install-script.js b/install/js/install-script.js index ae58bc7a..8bf51617 100644 --- a/install/js/install-script.js +++ b/install/js/install-script.js @@ -119,7 +119,7 @@ function executeMigration(migrationNumber, latestMigrationNumber, direction) { } catch (e) { message = response.responseText; } - $('#error-block').html("An error occurred! (Error Code: " + migrationNumber + ")
    " + message).show(); + $('#error-block').html("

    An error occurred! (Error Code: " + migrationNumber + ")
    " + message).show(); updateProgressBar(migrationNumber, latestMigrationNumber, true, false); diff --git a/install/migrations/v200/MigrateIpAndEmailBans.php b/install/migrations/v200/MigrateIpAndEmailBans.php index 5d2f1534..604b370a 100644 --- a/install/migrations/v200/MigrateIpAndEmailBans.php +++ b/install/migrations/v200/MigrateIpAndEmailBans.php @@ -7,14 +7,14 @@ class MigrateIpAndEmailBans extends \AbstractMigration { function up($hesk_settings) { // Insert the email bans - $emailBanRS = executeQuery("SELECT `Email` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "denied_emails`"); + $emailBanRS = $this->executeQuery("SELECT `Email` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "denied_emails`"); while ($row = hesk_dbFetchAssoc($emailBanRS)) { $this->executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "banned_emails` (`email`, `banned_by`, `dt`) VALUES ('" . hesk_dbEscape($row['Email']) . "', 1, NOW())"); } // Insert the IP bans - $ipBanRS = executeQuery("SELECT `RangeStart`, `RangeEnd` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "denied_ips`"); + $ipBanRS = $this->executeQuery("SELECT `RangeStart`, `RangeEnd` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "denied_ips`"); while ($row = hesk_dbFetchAssoc($ipBanRS)) { $ipFrom = long2ip($row['RangeStart']); $ipTo = long2ip($row['RangeEnd']); diff --git a/install/migrations/v230/MovePermissionsToHeskPrivilegesColumn.php b/install/migrations/v230/MovePermissionsToHeskPrivilegesColumn.php index 9ace4515..f4a5a5b4 100644 --- a/install/migrations/v230/MovePermissionsToHeskPrivilegesColumn.php +++ b/install/migrations/v230/MovePermissionsToHeskPrivilegesColumn.php @@ -44,7 +44,7 @@ class MovePermissionsToHeskPrivilegesColumn extends \AbstractMigration { $this->executeQuery("ALTER TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` ADD COLUMN `can_manage_settings` ENUM ('0', '1') NOT NULL DEFAULT '1'"); $this->executeQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` - SET `can_change_settings` = '0' + SET `can_manage_settings` = '0' WHERE `heskprivileges` NOT LIKE '%can_man_settings%'"); $this->executeQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` SET `can_change_notification_settings` = '0' From 8b7f0ace3ac4e0f792644edc0e06821cb4fe4282 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Tue, 17 Oct 2017 21:48:58 -0400 Subject: [PATCH 116/248] Fixed error logger --- install/js/install-script.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/install/js/install-script.js b/install/js/install-script.js index 8bf51617..097fc242 100644 --- a/install/js/install-script.js +++ b/install/js/install-script.js @@ -119,7 +119,8 @@ function executeMigration(migrationNumber, latestMigrationNumber, direction) { } catch (e) { message = response.responseText; } - $('#error-block').html("

    An error occurred! (Error Code: " + migrationNumber + ")
    " + message).show(); + $errorBlock = $('#error-block'); + $errorBlock.html($errorBlock.html() + "

    An error occurred! (Error Code: " + migrationNumber + ")
    " + message).show(); updateProgressBar(migrationNumber, latestMigrationNumber, true, false); From 0df87dde57700eac62b8971e113abee3d90bdd9c Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Wed, 18 Oct 2017 13:02:48 -0400 Subject: [PATCH 117/248] Fix some migrations, add new ones to keep track of migration number --- install/database-validation.php | 5 + .../migrations/AbstractUpdatableMigration.php | 27 ++++ install/migrations/LegacyUpdateMigration.php | 19 +++ install/migrations/UpdateMigration.php | 10 +- install/migrations/core.php | 125 +++++++++--------- .../migrations/v200/MigrateIpAndEmailBans.php | 3 - .../v230/CreatePermissionTemplates.php | 3 +- .../v310/ConvertPresetToIndividualColors.php | 2 +- .../migrations/v320/AddMigrationSetting.php | 16 +++ 9 files changed, 140 insertions(+), 70 deletions(-) create mode 100644 install/migrations/AbstractUpdatableMigration.php create mode 100644 install/migrations/LegacyUpdateMigration.php create mode 100644 install/migrations/v320/AddMigrationSetting.php diff --git a/install/database-validation.php b/install/database-validation.php index 7e3d462f..e26c45cf 100644 --- a/install/database-validation.php +++ b/install/database-validation.php @@ -199,6 +199,11 @@ hesk_dbConnect(); $all_good = $all_good & run_setting_check('admin_sidebar_font_weight'); $all_good = $all_good & run_setting_check('admin_sidebar_header_background'); $all_good = $all_good & run_setting_check('admin_sidebar_header_text'); + output_header_row('3.2.0'); + $all_good &= run_table_check('audit_trail'); + $all_good &= run_table_check('audit_trail_to_replacement_values'); + $all_good &= run_column_check('categories', 'mfh_description'); + $all_good &= run_column_check('custom_fields', 'mfh_description'); if ($all_good) { echo ""; diff --git a/install/migrations/AbstractUpdatableMigration.php b/install/migrations/AbstractUpdatableMigration.php new file mode 100644 index 00000000..98311b79 --- /dev/null +++ b/install/migrations/AbstractUpdatableMigration.php @@ -0,0 +1,27 @@ +migrationNumber = $migrationNumber; + } + + function up($hesk_settings) { + $this->innerUp($hesk_settings); + + $this->executeQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` SET `Value` = " . intval($this->migrationNumber) . " + WHERE `Key` = 'migrationNumber'"); + } + + abstract function innerUp($hesk_settings); + + function down($hesk_settings) { + $this->innerDown($hesk_settings); + + $this->executeQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` SET `Value` = " . (intval($this->migrationNumber) - 1) . " + WHERE `Key` = 'migrationNumber'"); + } + + abstract function innerDown($hesk_settings); +} \ No newline at end of file diff --git a/install/migrations/LegacyUpdateMigration.php b/install/migrations/LegacyUpdateMigration.php new file mode 100644 index 00000000..ffbc9afb --- /dev/null +++ b/install/migrations/LegacyUpdateMigration.php @@ -0,0 +1,19 @@ +upVersion = $upVersion; + $this->downVersion = $downVersion; + } + + function up($hesk_settings) { + $this->updateVersion($this->upVersion, $hesk_settings); + } + + function down($hesk_settings) { + $this->updateVersion($this->downVersion, $hesk_settings); + } +} \ No newline at end of file diff --git a/install/migrations/UpdateMigration.php b/install/migrations/UpdateMigration.php index 89fc3a86..2a585e69 100644 --- a/install/migrations/UpdateMigration.php +++ b/install/migrations/UpdateMigration.php @@ -1,19 +1,21 @@ upVersion = $upVersion; $this->downVersion = $downVersion; } - function up($hesk_settings) { + function innerUp($hesk_settings) { $this->updateVersion($this->upVersion, $hesk_settings); } - function down($hesk_settings) { + function innerDown($hesk_settings) { $this->updateVersion($this->downVersion, $hesk_settings); } } \ No newline at end of file diff --git a/install/migrations/core.php b/install/migrations/core.php index 732d9726..8f9fa300 100644 --- a/install/migrations/core.php +++ b/install/migrations/core.php @@ -38,113 +38,116 @@ function getAllMigrations() { 14 => new \v160\CreateSettingsTable(), 15 => new \v160\InsertVersionRecord(), //1.6.1 - 16 => new UpdateMigration('1.6.1', '1.6.0'), + 16 => new LegacyUpdateMigration('1.6.1', '1.6.0'), //1.7.0 17 => new \v170\CreateVerifiedEmailsTable(), 18 => new \v170\CreatePendingVerificationEmailsTable(), 19 => new \v170\CreateStageTicketsTable(), - 20 => new UpdateMigration('1.7.0', '1.6.1'), + 20 => new LegacyUpdateMigration('1.7.0', '1.6.1'), //2.0.0 21 => new \v200\RemoveNoteIdFromAttachments(), 22 => new \v200\RemoveEditInfoFromNotes(), 23 => new \v200\RemoveDefaultNotifyCustomerEmailPreference(), 24 => new \v200\AddMissingKeyToTickets(), 25 => new \v200\MigrateIpAndEmailBans(), - 26 => new UpdateMigration('2.0.0', '1.7.0'), + 26 => new LegacyUpdateMigration('2.0.0', '1.7.0'), //2.0.1 - 27 => new UpdateMigration('2.0.1', '2.0.0'), + 27 => new LegacyUpdateMigration('2.0.1', '2.0.0'), //2.1.0 - 28 => new UpdateMigration('2.1.0', '2.0.1'), + 28 => new LegacyUpdateMigration('2.1.0', '2.0.1'), //2.1.1 29 => new \v211\FixStageTicketsTable(), - 30 => new UpdateMigration('2.1.1', '2.1.0'), + 30 => new LegacyUpdateMigration('2.1.1', '2.1.0'), //2.2.0 31 => new \v220\AddIsAutocloseOptionToStatuses(), 32 => new \v220\AddClosableColumnToStatuses(), - 33 => new UpdateMigration('2.2.0', '2.1.1'), + 33 => new LegacyUpdateMigration('2.2.0', '2.1.1'), //2.2.1 - 34 => new UpdateMigration('2.2.1', '2.2.0'), + 34 => new LegacyUpdateMigration('2.2.1', '2.2.0'), //2.3.0 35 => new \v230\AddIconToServiceMessages(), 36 => new \v230\ConsolidateStatusColumns(), 37 => new \v230\AddCoordinatesToTickets(), 38 => new \v230\AddCategoryManager(), 39 => new \v230\MovePermissionsToHeskPrivilegesColumn(), - 40 => new UpdateMigration('2.3.0', '2.2.1'), + 40 => new \v230\CreatePermissionTemplates(), + 41 => new LegacyUpdateMigration('2.3.0', '2.2.1'), //2.3.1 - 41 => new UpdateMigration('2.3.1', '2.3.0'), + 42 => new LegacyUpdateMigration('2.3.1', '2.3.0'), //2.3.2 - 42 => new UpdateMigration('2.3.2', '2.3.1'), + 43 => new LegacyUpdateMigration('2.3.2', '2.3.1'), //2.4.0 - 43 => new \v240\CreateQuickHelpSectionsTable(), - 44 => new \v240\CreateNewStatusNameTable(), - 45 => new \v240\AddDownloadCountToAttachments(), - 46 => new \v240\AddHtmlColumnToTickets(), - 47 => new UpdateMigration('2.4.0', '2.3.2'), + 44 => new \v240\CreateQuickHelpSectionsTable(), + 45 => new \v240\CreateNewStatusNameTable(), + 46 => new \v240\AddDownloadCountToAttachments(), + 47 => new \v240\AddHtmlColumnToTickets(), + 48 => new LegacyUpdateMigration('2.4.0', '2.3.2'), //2.4.1 - 48 => new UpdateMigration('2.4.1', '2.4.0'), + 49 => new LegacyUpdateMigration('2.4.1', '2.4.0'), //2.4.2 - 49 => new UpdateMigration('2.4.2', '2.4.1'), + 50 => new LegacyUpdateMigration('2.4.2', '2.4.1'), //2.5.0 - 50 => new \v250\MigrateSettingsToDatabase(), - 51 => new \v250\AddUserAgentAndScreenResToTickets(), - 52 => new \v250\AddNavbarTitleUrl(), - 53 => new UpdateMigration('2.5.0', '2.4.2'), + 51 => new \v250\MigrateSettingsToDatabase(), + 52 => new \v250\AddUserAgentAndScreenResToTickets(), + 53 => new \v250\AddNavbarTitleUrl(), + 54 => new LegacyUpdateMigration('2.5.0', '2.4.2'), //2.5.1 - 54 => new UpdateMigration('2.5.1', '2.5.0'), + 55 => new LegacyUpdateMigration('2.5.1', '2.5.0'), //2.5.2 - 55 => new UpdateMigration('2.5.2', '2.5.1'), + 56 => new LegacyUpdateMigration('2.5.2', '2.5.1'), //2.5.3 - 56 => new UpdateMigration('2.5.3', '2.5.2'), + 57 => new LegacyUpdateMigration('2.5.3', '2.5.2'), //2.5.4 - 57 => new UpdateMigration('2.5.4', '2.5.3'), + 58 => new LegacyUpdateMigration('2.5.4', '2.5.3'), //2.5.5 - 58 => new UpdateMigration('2.5.5', '2.5.4'), + 59 => new LegacyUpdateMigration('2.5.5', '2.5.4'), //2.6.0 - 59 => new \v260\AddApiTables(), - 60 => new \v260\AddLoggingTable(), - 61 => new \v260\AddTempAttachmentTable(), - 62 => new \v260\AddCalendarModule(), - 63 => new \v260\AddPrimaryKeyToSettings(), - 64 => new \v260\ConvertStatusPropertiesToInts(), - 65 => new UpdateMigration('2.6.0', '2.5.5'), + 60 => new \v260\AddApiTables(), + 61 => new \v260\AddLoggingTable(), + 62 => new \v260\AddTempAttachmentTable(), + 63 => new \v260\AddCalendarModule(), + 64 => new \v260\AddPrimaryKeyToSettings(), + 65 => new \v260\ConvertStatusPropertiesToInts(), + 66 => new LegacyUpdateMigration('2.6.0', '2.5.5'), //2.6.1 - 66 => new UpdateMigration('2.6.1', '2.6.0'), + 67 => new LegacyUpdateMigration('2.6.1', '2.6.0'), //2.6.2 - 67 => new \v262\AddMissingColumnsToStageTickets(), - 68 => new UpdateMigration('2.6.2', '2.6.1'), + 68 => new \v262\AddMissingColumnsToStageTickets(), + 69 => new LegacyUpdateMigration('2.6.2', '2.6.1'), //2.6.3 - 69 => new UpdateMigration('2.6.3', '2.6.2'), + 70 => new LegacyUpdateMigration('2.6.3', '2.6.2'), //2.6.4 - 70 => new UpdateMigration('2.6.4', '2.6.3'), + 71 => new LegacyUpdateMigration('2.6.4', '2.6.3'), //3.0.0 - 71 => new \v300\MigrateHeskCustomStatuses(), - 72 => new \v300\MigrateAutorefreshOption(), - 73 => new \v300\AddColorSchemeSetting(), - 74 => new UpdateMigration('3.0.0', '2.6.4'), + 72 => new \v300\MigrateHeskCustomStatuses(), + 73 => new \v300\MigrateAutorefreshOption(), + 74 => new \v300\AddColorSchemeSetting(), + 75 => new LegacyUpdateMigration('3.0.0', '2.6.4'), //3.0.1 - 75 => new UpdateMigration('3.0.1', '3.0.0'), + 76 => new LegacyUpdateMigration('3.0.1', '3.0.0'), //3.0.2 - 76 => new \v302\AddMissingCustomFields(), - 77 => new UpdateMigration('3.0.2', '3.0.1'), + 77 => new \v302\AddMissingCustomFields(), + 78 => new LegacyUpdateMigration('3.0.2', '3.0.1'), //3.0.3 - 3.0.7 - 78 => new UpdateMigration('3.0.3', '3.0.2'), - 79 => new UpdateMigration('3.0.4', '3.0.3'), - 80 => new UpdateMigration('3.0.5', '3.0.4'), - 81 => new UpdateMigration('3.0.6', '3.0.5'), - 82 => new UpdateMigration('3.0.7', '3.0.6'), + 79 => new LegacyUpdateMigration('3.0.3', '3.0.2'), + 80 => new LegacyUpdateMigration('3.0.4', '3.0.3'), + 81 => new LegacyUpdateMigration('3.0.5', '3.0.4'), + 82 => new LegacyUpdateMigration('3.0.6', '3.0.5'), + 83 => new LegacyUpdateMigration('3.0.7', '3.0.6'), //3.1.0 - 83 => new \v310\AddStackTraceToLogs(), - 84 => new \v310\AddCustomNavElements(), - 85 => new \v310\AddMoreColorOptionsToCategories(), - 86 => new \v310\AddNewLoginSettings(), - 87 => new \v310\AddApiUrlRewriteSetting(), - 88 => new \v310\ConvertPresetToIndividualColors(), - 89 => new UpdateMigration('3.1.0', '3.0.7'), + 84 => new \v310\AddStackTraceToLogs(), + 85 => new \v310\AddCustomNavElements(), + 86 => new \v310\AddMoreColorOptionsToCategories(), + 87 => new \v310\AddNewLoginSettings(), + 88 => new \v310\AddApiUrlRewriteSetting(), + 89 => new \v310\ConvertPresetToIndividualColors(), + 90 => new LegacyUpdateMigration('3.1.0', '3.0.7'), //3.1.1 - 90 => new UpdateMigration('3.1.1', '3.1.0'), + 91 => new LegacyUpdateMigration('3.1.1', '3.1.0'), //3.2.0 - 91 => new \v320\AddDescriptionToCategoriesAndCustomFields(), - 92 => new \v320\AddAuditTrail(), + 92 => new \v320\AddDescriptionToCategoriesAndCustomFields(), + 93 => new \v320\AddAuditTrail(), + 94 => new \v320\AddMigrationSetting(), + 95 => new UpdateMigration('3.2.0', '3.1.1', 95), ); } \ No newline at end of file diff --git a/install/migrations/v200/MigrateIpAndEmailBans.php b/install/migrations/v200/MigrateIpAndEmailBans.php index 604b370a..3174fe83 100644 --- a/install/migrations/v200/MigrateIpAndEmailBans.php +++ b/install/migrations/v200/MigrateIpAndEmailBans.php @@ -46,8 +46,5 @@ class MigrateIpAndEmailBans extends \AbstractMigration { while ($row = hesk_dbFetchAssoc($ips)) { $this->executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "denied_ips` (`RangeStart`, `RangeEnd`) VALUES (" . $row['ip_from'] . ", " . $row['ip_to'] . ")"); } - - $this->executeQuery("DROP TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "banned_ips`"); - $this->executeQuery("DROP TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "banned_emails`"); } } \ No newline at end of file diff --git a/install/migrations/v230/CreatePermissionTemplates.php b/install/migrations/v230/CreatePermissionTemplates.php index bd7365ca..fad3cff9 100644 --- a/install/migrations/v230/CreatePermissionTemplates.php +++ b/install/migrations/v230/CreatePermissionTemplates.php @@ -19,6 +19,7 @@ class CreatePermissionTemplates extends \AbstractMigration { } function down($hesk_settings) { - // TODO: Implement down() method. + $this->executeQuery("ALTER TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` DROP COLUMN `permission_template`"); + $this->executeQuery("DROP TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "permission_templates`"); } } \ No newline at end of file diff --git a/install/migrations/v310/ConvertPresetToIndividualColors.php b/install/migrations/v310/ConvertPresetToIndividualColors.php index b3c0127b..c0d8461d 100644 --- a/install/migrations/v310/ConvertPresetToIndividualColors.php +++ b/install/migrations/v310/ConvertPresetToIndividualColors.php @@ -14,7 +14,7 @@ class ConvertPresetToIndividualColors extends \AbstractMigration { $theme = $theme_preset_row['Value']; } - $light_theme = preg_match('/.*-light/g', $theme); + $light_theme = preg_match_all('/.*-light/', $theme); $navbar = array( 'background' => '', 'text' => '#fff', diff --git a/install/migrations/v320/AddMigrationSetting.php b/install/migrations/v320/AddMigrationSetting.php new file mode 100644 index 00000000..72c9c0b3 --- /dev/null +++ b/install/migrations/v320/AddMigrationSetting.php @@ -0,0 +1,16 @@ +executeQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` (`Key`, `Value`) + VALUES ('migrationNumber', '94')"); + } + + function down($hesk_settings) { + $this->executeQuery("DELETE FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` WHERE `Key` = 'migrationNumber'"); + } +} \ No newline at end of file From 60ac53fe94f96ed2ad1b2a200bdd3ddd6a2dc174 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Wed, 18 Oct 2017 13:03:11 -0400 Subject: [PATCH 118/248] Change key --- install/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/index.php b/install/index.php index 5be220f7..e8bf76a0 100644 --- a/install/index.php +++ b/install/index.php @@ -19,7 +19,7 @@ $tableSql = hesk_dbQuery("SHOW TABLES LIKE '" . hesk_dbEscape($hesk_settings['db $startingMigrationNumber = 1; 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` = 'lastMigration'"); + $migrationNumberSql = hesk_dbQuery("SELECT `Value` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` WHERE `Key` = 'migrationNumber'"); if ($migrationRow = hesk_dbFetchAssoc($migrationNumberSql)) { $startingMigrationNumber = intval($migrationRow['Value']) + 1; } else { From 7aa7526a17ea20c56b13c678bb274b29ef044af0 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Wed, 18 Oct 2017 22:00:00 -0400 Subject: [PATCH 119/248] Working on the uninstaller --- install/database-validation.php | 256 +++++++++--------- install/js/uninstall-script.js | 157 +++++++++++ install/mods-for-hesk/js/uninstall-scripts.js | 102 ------- .../mods-for-hesk/uninstallModsForHesk.php | 86 ------ install/uninstall.php | 177 ++++++++++++ 5 files changed, 463 insertions(+), 315 deletions(-) create mode 100644 install/js/uninstall-script.js delete mode 100644 install/mods-for-hesk/js/uninstall-scripts.js delete mode 100644 install/mods-for-hesk/uninstallModsForHesk.php create mode 100644 install/uninstall.php diff --git a/install/database-validation.php b/install/database-validation.php index e26c45cf..4eaf4c8a 100644 --- a/install/database-validation.php +++ b/install/database-validation.php @@ -31,7 +31,7 @@ hesk_dbConnect();
    - - \ No newline at end of file diff --git a/install/js/uninstall-script.js b/install/js/uninstall-script.js index 5e088c8d..edb0b833 100644 --- a/install/js/uninstall-script.js +++ b/install/js/uninstall-script.js @@ -81,8 +81,8 @@ function uninstall() { success: function(data) { data = JSON.parse(data); - $('[data-step="install-or-update"] > #spinner').hide(); - $('[data-step="install-or-update"] > .progress').show(); + $('[data-step="uninstall"] > #spinner').hide(); + $('[data-step="uninstall"] > .progress').show(); // Recursive call that will increment by 1 each time executeMigration(startingMigrationNumber, 1, 'down'); @@ -104,8 +104,8 @@ function executeMigration(migrationNumber, latestMigrationNumber, direction) { console.log('migrationNumber: ' + migrationNumber); console.log('latestMigrationNumber: ' + latestMigrationNumber); console.info('---'); - if (migrationNumber === latestMigrationNumber || (migrationNumber === 1 && direction === 'down')) { - updateProgressBar(migrationNumber, latestMigrationNumber, direction === 'down', true); + if (migrationNumber === latestMigrationNumber) { + updateProgressBar(migrationNumber, latestMigrationNumber, false, true); console.log('%c Success! ', 'color: white; background-color: green; font-size: 2em'); } else { updateProgressBar(migrationNumber, latestMigrationNumber, false, false); @@ -124,12 +124,6 @@ function executeMigration(migrationNumber, latestMigrationNumber, direction) { updateProgressBar(migrationNumber, latestMigrationNumber, true, false); - if (direction === 'up') { - // Revert! - executeMigration(migrationNumber - 1, latestMigrationNumber, 'down'); - } else { - console.error("I even failed to roll back. Yikes! :'("); - } console.error(message); } }) diff --git a/install/uninstall.php b/install/uninstall.php index 7fd08339..0ba8272b 100644 --- a/install/uninstall.php +++ b/install/uninstall.php @@ -146,32 +146,15 @@ if (hesk_dbNumRows($tableSql) > 0) {
    + +    Back to installer +
    Next   
    - - \ No newline at end of file From 109a4fa25feb962e18d48aeb98ae1b2990582702 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Fri, 20 Oct 2017 13:07:01 -0400 Subject: [PATCH 121/248] Uninstaller works --- install/database-validation.php | 4 ++-- install/js/install-script.js | 10 +++++----- install/js/uninstall-script.js | 16 ++++++++-------- install/uninstall.php | 4 ++-- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/install/database-validation.php b/install/database-validation.php index 4eaf4c8a..e7ae6853 100644 --- a/install/database-validation.php +++ b/install/database-validation.php @@ -31,7 +31,7 @@ hesk_dbConnect(); + 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 162/248] 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 166/248] 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 167/248] 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 168/248] 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 169/248] 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 170/248] 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 227/248] 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 eeb5ada6108f3551f761268065d399e4811eb0aa Mon Sep 17 00:00:00 2001 From: Jozef Date: Mon, 20 Nov 2017 11:00:25 +0000 Subject: [PATCH 171/248] Fix usage of CC and BCC fields in mail header. --- inc/email_functions.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inc/email_functions.inc.php b/inc/email_functions.inc.php index f4e7d3aa..13db7b8c 100644 --- a/inc/email_functions.inc.php +++ b/inc/email_functions.inc.php @@ -512,10 +512,10 @@ function hesk_mail($to, $subject, $message, $htmlMessage, $modsForHesk_settings, $headers .= "MIME-Version: 1.0\n"; $headers .= "From: $hesk_settings[from_header]\n"; if (count($cc) > 0) { - $headers .= "Cc: " . implode(',', $cc); + $headers .= "Cc: " . implode(',', $cc) . "\n"; } if (count($bcc) > 0) { - $headers .= "Bcc: " . implode(',', $bcc); + $headers .= "Bcc: " . implode(',', $bcc) . "\n"; } $headers .= "Reply-To: $hesk_settings[from_header]\n"; $headers .= "Return-Path: $hesk_settings[webmaster_mail]\n"; From eac23907e7f88a9e4300b963d83825b1760237c4 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Mon, 20 Nov 2017 07:46:07 -0500 Subject: [PATCH 172/248] Fix edit/delete reply buttons --- admin/admin_ticket.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/admin_ticket.php b/admin/admin_ticket.php index d17ee27b..0210de9d 100644 --- a/admin/admin_ticket.php +++ b/admin/admin_ticket.php @@ -1561,7 +1561,7 @@ function hesk_getAdminButtons($category_id) function hesk_getAdminButtonsInTicket($reply = 0, $white = 1) { - global $hesk_settings, $hesklang, $ticket, $reply, $trackingID, $can_edit, $can_archive, $can_delete, $isManager; + global $hesk_settings, $hesklang, $ticket, $trackingID, $can_edit, $can_archive, $can_delete, $isManager; $options = $reply ? '' : '
    '; @@ -1934,7 +1934,7 @@ function mfh_print_reply($reply) { ?>
    - +
    From 70435cee6265caf9eb069ff6450b9c1383c133f8 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Mon, 20 Nov 2017 12:36:04 -0500 Subject: [PATCH 173/248] Fix storing dates when format is not MySQL-friendly --- inc/common.inc.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/inc/common.inc.php b/inc/common.inc.php index be8f07eb..29f35fc0 100644 --- a/inc/common.inc.php +++ b/inc/common.inc.php @@ -2160,6 +2160,10 @@ function mfh_get_hidden_fields_for_language($keys) { function mfh_insert_audit_trail_record($entity_id, $entity_type, $language_key, $date, $replacement_values = array()) { global $hesk_settings; + $oldTimeFormat = $hesk_settings['timeformat']; + $hesk_settings['timeformat'] = 'Y-m-d H:i:s'; + $date = hesk_date(); + hesk_dbQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "audit_trail` (`entity_id`, `entity_type`, `language_key`, `date`) VALUES (" . intval($entity_id) . ", '" . hesk_dbEscape($entity_type) . "', '" . hesk_dbEscape($language_key) . "', '" . hesk_dbEscape($date) . "')"); @@ -2172,6 +2176,8 @@ function mfh_insert_audit_trail_record($entity_id, $entity_type, $language_key, " . intval($replacement_index) . ", '" . hesk_dbEscape($replacement_value) . "')"); } + $hesk_settings['timeformat'] = $oldTimeFormat; + return $audit_id; } From f8ab89946d97bf4da91faa497c6b6a38b5d8746e Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Mon, 20 Nov 2017 12:37:48 -0500 Subject: [PATCH 174/248] Update version --- install/migrations/core.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/install/migrations/core.php b/install/migrations/core.php index 6526344d..5157c658 100644 --- a/install/migrations/core.php +++ b/install/migrations/core.php @@ -213,8 +213,9 @@ function getAllMigrations() { 157 => new \v320\AddAuditTrail\CreateAuditTrailToReplacementValuesTable(), 158 => new \v320\AddMigrationSetting(), 159 => new UpdateMigration('3.2.0', '3.1.1', 159), - //3.2.1 - 3.2.2 + //3.2.1 - 3.2.3 160 => new UpdateMigration('3.2.1', '3.2.0', 160), 161 => new UpdateMigration('3.2.2', '3.2.1', 161), + 162 => new UpdateMigration('3.2.3', '3.2.2', 162), ); } \ No newline at end of file From a7742614df5c5e4ccd056d25ab01134c19ff2826 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Mon, 20 Nov 2017 22:16:46 -0500 Subject: [PATCH 175/248] Update pages for HESK 2.7.4 --- admin/admin_reply_ticket.php | 13 ++++++- admin/admin_settings_save.php | 1 + admin/admin_ticket.php | 3 +- admin/assign_owner.php | 3 +- admin/export.php | 2 +- admin/find_tickets.php | 13 ++++--- admin/index.php | 4 +- admin/manage_email_templates.php | 2 + admin/manage_knowledgebase.php | 8 +++- admin/move_category.php | 6 +-- admin/new_ticket.php | 4 +- admin/profile.php | 2 +- admin/reports.php | 2 +- api/BusinessLogic/Emails/BasicEmailSender.php | 4 ++ .../Emails/EmailTemplateParser.php | 16 ++++++++ api/Core/database.inc.php | 2 +- api/Core/database_mysqli.inc.php | 2 +- cron/core/database.inc.php | 2 +- cron/core/database_mysqli.inc.php | 2 +- inc/admin_functions.inc.php | 6 +-- inc/common.inc.php | 38 ++++++++++++++++++- inc/email_functions.inc.php | 36 +++++++++++++++--- inc/pipe_functions.inc.php | 2 +- inc/posting_functions.inc.php | 5 ++- index.php | 4 +- install/install_functions.inc.php | 2 +- internal-api/core/database.inc.php | 2 +- internal-api/core/database_mysqli.inc.php | 2 +- knowledgebase.php | 4 +- .../en/emails/html/new_reply_by_customer.txt | 2 +- .../en/emails/html/new_reply_by_staff.txt | 5 ++- language/en/emails/html/ticket_closed.txt | 2 +- language/en/emails/ticket_closed.txt | 3 +- language/en/text.php | 3 +- reply_ticket.php | 3 +- submit_ticket.php | 2 +- ticket.php | 4 +- 37 files changed, 161 insertions(+), 55 deletions(-) diff --git a/admin/admin_reply_ticket.php b/admin/admin_reply_ticket.php index 29a0d5c8..834ceb6c 100644 --- a/admin/admin_reply_ticket.php +++ b/admin/admin_reply_ticket.php @@ -294,6 +294,15 @@ $sql .= $submit_as_customer ? "`lastreplier`='0', `replierid`='0' " : "`lastrepl if ($time_worked == '00:00:00') { $sql .= ", `lastchange` = NOW() "; } else { + $parts = explode(':', $ticket['time_worked']); + $seconds = ($parts[0] * 3600) + ($parts[1] * 60) + $parts[2]; + + $parts = explode(':', $time_worked); + $seconds += ($parts[0] * 3600) + ($parts[1] * 60) + $parts[2]; + + require(HESK_PATH . 'inc/reporting_functions.inc.php'); + $ticket['time_worked'] = hesk_SecondsToHHMMSS($seconds); + $sql .= ",`time_worked` = ADDTIME(`time_worked`,'" . hesk_dbEscape($time_worked) . "') "; } @@ -363,7 +372,9 @@ $info = array( 'dt' => hesk_date($ticket['dt'], true), 'lastchange' => hesk_date($ticket['lastchange'], true), 'id' => $ticket['id'], - 'language' => $ticket['language'] + 'language' => $ticket['language'], + 'time_worked' => $ticket['time_worked'], + 'last_reply_by' => ($submit_as_customer ? $ticket['name'] : $_SESSION['name']), ); // 2. Add custom fields to the array diff --git a/admin/admin_settings_save.php b/admin/admin_settings_save.php index 7113cd6f..ee1d8181 100644 --- a/admin/admin_settings_save.php +++ b/admin/admin_settings_save.php @@ -62,6 +62,7 @@ $set['noreply_mail'] = hesk_validateEmail(hesk_POST('s_noreply_mail'), $hesklang $set['noreply_name'] = hesk_input(hesk_POST('s_noreply_name')); $set['noreply_name'] = str_replace(array('\\"', '<', '>'), '', $set['noreply_name']); $set['noreply_name'] = trim(preg_replace('/\s{2,}/', ' ', $set['noreply_name'])); +$set['noreply_name'] = preg_replace("/\n|\r|\t|%0A|%0D|%08|%09/", '', $set['noreply_name']); /* --> Language settings */ $set['can_sel_lang'] = empty($_POST['s_can_sel_lang']) ? 0 : 1; diff --git a/admin/admin_ticket.php b/admin/admin_ticket.php index 0210de9d..978f8112 100644 --- a/admin/admin_ticket.php +++ b/admin/admin_ticket.php @@ -423,13 +423,14 @@ if (isset($_POST['notemsg']) && hesk_token_check('POST')) { 'trackid' => $ticket['trackid'], 'status' => $ticket['status'], 'name' => $_SESSION['name'], - 'lastreplier' => $ticket['lastreplier'], 'subject' => $ticket['subject'], 'message' => stripslashes($msg), 'dt' => hesk_date($ticket['dt'], true), 'lastchange' => hesk_date($ticket['lastchange'], true), 'attachments' => $myattachments, 'id' => $ticket['id'], + 'time_worked' => $ticket['time_worked'], + 'last_reply_by' => $ticket['repliername'], ); // 2. Add custom fields to the array diff --git a/admin/assign_owner.php b/admin/assign_owner.php index e875b2a5..e103e8aa 100755 --- a/admin/assign_owner.php +++ b/admin/assign_owner.php @@ -129,13 +129,14 @@ $info = array( 'trackid' => $ticket['trackid'], 'status' => $ticket['status'], 'name' => $ticket['name'], - 'lastreplier' => $ticket['lastreplier'], 'subject' => $ticket['subject'], 'message' => $ticket['message'], 'attachments' => $ticket['attachments'], 'dt' => hesk_date($ticket['dt'], true), 'lastchange' => hesk_date($ticket['lastchange'], true), 'id' => $ticket['id'], + 'time_worked' => $ticket['time_worked'], + 'last_reply_by' => hesk_getReplierName($ticket), ); // 2. Add custom fields to the array diff --git a/admin/export.php b/admin/export.php index 1e4e543e..c0a366e6 100644 --- a/admin/export.php +++ b/admin/export.php @@ -697,7 +697,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); () diff --git a/admin/find_tickets.php b/admin/find_tickets.php index c9bcd812..350bb27b 100644 --- a/admin/find_tickets.php +++ b/admin/find_tickets.php @@ -145,21 +145,21 @@ LEFT(`message`, 400) AS `message`, $sql .= " ( `trackid` = '" . hesk_dbEscape($q) . "' OR `merged` LIKE '%#" . hesk_dbEscape($q) . "#%' ) "; break; case 'name': - $sql .= "`name` LIKE '%" . hesk_dbEscape($q) . "%' COLLATE '" . hesk_dbCollate() . "' "; + $sql .= "`name` LIKE '%".hesk_dbEscape( hesk_dbLike($q) )."%' COLLATE '" . hesk_dbCollate() . "' "; break; case 'email': $sql .= "`email` LIKE '%" . hesk_dbEscape($q) . "%' "; break; case 'subject': - $sql .= "`subject` LIKE '%" . hesk_dbEscape($q) . "%' COLLATE '" . hesk_dbCollate() . "' "; + $sql .= "`subject` LIKE '%".hesk_dbEscape( hesk_dbLike($q) )."%' COLLATE '" . hesk_dbCollate() . "' "; break; case 'message': - $sql .= " ( `message` LIKE '%" . hesk_dbEscape($q) . "%' COLLATE '" . hesk_dbCollate() . "' + $sql .= " ( `message` LIKE '%".hesk_dbEscape( hesk_dbLike($q) )."%' COLLATE '" . hesk_dbCollate() . "' OR `id` IN ( SELECT DISTINCT `replyto` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "replies` - WHERE `message` LIKE '%" . hesk_dbEscape($q) . "%' COLLATE '" . hesk_dbCollate() . "' ) + WHERE `message` LIKE '%".hesk_dbEscape( hesk_dbLike($q) )."%' COLLATE '" . hesk_dbCollate() . "' ) ) "; break; @@ -170,7 +170,7 @@ LEFT(`message`, 400) AS `message`, $sql .= "`id` IN ( SELECT DISTINCT `ticket` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "notes` - WHERE `message` LIKE '%" . hesk_dbEscape($q) . "%' COLLATE '" . hesk_dbCollate() . "' ) + WHERE `message` LIKE '%".hesk_dbEscape( hesk_dbLike($q) )."%' COLLATE '" . hesk_dbCollate() . "' ) "; break; default: @@ -220,6 +220,9 @@ LEFT(`message`, 400) AS `message`, $sql_count .= $sql; $sql = $sql_final . $sql; + // Strip extra slashes + $q = stripslashes($q); + /* Prepare variables used in search and forms */ require_once(HESK_PATH . 'inc/prepare_ticket_search.inc.php'); ?> diff --git a/admin/index.php b/admin/index.php index ba7c4b00..aec1e374 100644 --- a/admin/index.php +++ b/admin/index.php @@ -158,7 +158,7 @@ function do_login() exit(); } - $pass_enc = hesk_Pass2Hash($_SESSION['pass'] . strtolower($user) . $_SESSION['pass']); + $pass_enc = hesk_Pass2Hash($_SESSION['pass'].hesk_mb_strtolower($user).$_SESSION['pass']); /* Check if default password */ if ($_SESSION['pass'] == '499d74967b28a841c98bb4baaabaad699ff3c079') { @@ -330,7 +330,7 @@ function print_login() - '; - $_SESSION['new']['email'] = hesk_validateEmail(hesk_POST('email'), 'ERR', 0) or $hesk_error_buffer = '
  • ' . $hesklang['enter_valid_email'] . '
    • '; + $_SESSION['new']['email'] = hesk_validateEmail( hesk_POST('email'), 'ERR', 0) or $hesk_error_buffer .= '
  • ' . $hesklang['enter_valid_email'] . '
    • '; $_SESSION['new']['signature'] = hesk_input(hesk_POST('signature')); /* Signature */ diff --git a/admin/reports.php b/admin/reports.php index 64d3ba00..e9f341a2 100644 --- a/admin/reports.php +++ b/admin/reports.php @@ -249,7 +249,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); ()
    -  
    ' . $hesklang['rart'] . ' - ' . strtolower($hesklang['yes']) . ' / - ' . strtolower($hesklang['no']) . ' + ' . hesk_mb_strtolower($hesklang['yes']) . ' / + ' . hesk_mb_strtolower($hesklang['no']) . '
    '; } diff --git a/language/en/emails/html/new_reply_by_customer.txt b/language/en/emails/html/new_reply_by_customer.txt index f0eb563d..79cc0a86 100644 --- a/language/en/emails/html/new_reply_by_customer.txt +++ b/language/en/emails/html/new_reply_by_customer.txt @@ -1,6 +1,6 @@

    Hello,

    A customer has just replied to ticket "%%SUBJECT%%".

    -

    You can manage this ticket here: +

    You can read the reply message and manage this ticket here: %%TRACK_URL%%

    Regards,

    %%SITE_TITLE%%
    diff --git a/language/en/emails/html/new_reply_by_staff.txt b/language/en/emails/html/new_reply_by_staff.txt index 1287b2b8..fcf1093a 100644 --- a/language/en/emails/html/new_reply_by_staff.txt +++ b/language/en/emails/html/new_reply_by_staff.txt @@ -1,8 +1,9 @@

    Dear %%NAME%%,

    -

    Our staff has just replied to your ticket "%%SUBJECT%%".

    -

    You can view the ticket here:

    +

    We have just replied to your ticket "%%SUBJECT%%".

    +

    To read the message, submit a reply and view details, please visit:

    %%TRACK_URL%%

    +

    If the above link is not clickable, try copying and pasting it into the address bar of your web browser.

    Sincerely,

    %%SITE_TITLE%%
    diff --git a/language/en/emails/html/ticket_closed.txt b/language/en/emails/html/ticket_closed.txt index f547ba76..10220a1a 100644 --- a/language/en/emails/html/ticket_closed.txt +++ b/language/en/emails/html/ticket_closed.txt @@ -1,8 +1,8 @@

    Dear %%NAME%%,

    Your support ticket "%%SUBJECT%%" has been updated to a closed/resolved status.

    -

    Ticket tracking ID: %%TRACK_ID%%

    You can view the status of your ticket here: %%TRACK_URL%%

    +

    If the above link is not clickable, try copying and pasting it into the address bar of your web browser.

    Sincerely,

    %%SITE_TITLE%%
    %%SITE_URL%% \ No newline at end of file diff --git a/language/en/emails/ticket_closed.txt b/language/en/emails/ticket_closed.txt index 51cfb97c..33a94afd 100644 --- a/language/en/emails/ticket_closed.txt +++ b/language/en/emails/ticket_closed.txt @@ -2,11 +2,10 @@ Dear %%NAME%%, Your support ticket "%%SUBJECT%%" has been updated to a closed/resolved status. -Ticket tracking ID: %%TRACK_ID%% - You can view the status of your ticket here: %%TRACK_URL%% +If the above link is not clickable, try copying and pasting it into the address bar of your web browser. Sincerely, diff --git a/language/en/text.php b/language/en/text.php index d543ccd3..042a2130 100644 --- a/language/en/text.php +++ b/language/en/text.php @@ -1239,7 +1239,7 @@ $hesklang['cat_pri_ch']='Category priority has been set to:'; $hesklang['err_dbversion']='Too old MySQL version:'; // %s will be replaced with MySQL version $hesklang['signature_max']='Signature (max 1000 chars)'; $hesklang['signature_long']='User signature is too long! Please limit the signature to 1000 chars'; -$hesklang['ip_whois']='IP whois'; +$hesklang['ip_whois']='IP WHOIS'; $hesklang['ednote']='Edit note message'; $hesklang['ednote2']='Note message saved'; $hesklang['perm_deny']='Permission denied'; @@ -1284,7 +1284,6 @@ $hesklang['click_unban']='Click here to unban.'; $hesklang['banip_intro']='Visitors from banned IP addresses will not be able to view or submit tickets and login into the help desk.'; $hesklang['ipperm']='Permanent IP bans:'; $hesklang['iptemp']='Login failure bans:'; -$hesklang['savebanip']='Ban this IP'; $hesklang['no_banips']='No IPs are being banned.'; $hesklang['bananip']='IP address to ban'; $hesklang['banex']='Examples:'; diff --git a/reply_ticket.php b/reply_ticket.php index 499f3d1f..0760ac06 100644 --- a/reply_ticket.php +++ b/reply_ticket.php @@ -206,13 +206,14 @@ $info = array( 'trackid' => $ticket['trackid'], 'status' => $ticket['status'], 'name' => $ticket['name'], - 'lastreplier' => $ticket['name'], 'subject' => $ticket['subject'], 'message' => stripslashes($message), 'attachments' => $myattachments, 'dt' => hesk_date($ticket['dt'], true), 'lastchange' => hesk_date($ticket['lastchange'], true), 'id' => $ticket['id'], + 'time_worked' => $ticket['time_worked'], + 'last_reply_by' => $ticket['name'], ); // 2. Add custom fields to the array diff --git a/submit_ticket.php b/submit_ticket.php index 06090ef6..d11f5225 100644 --- a/submit_ticket.php +++ b/submit_ticket.php @@ -73,7 +73,7 @@ if ($hesk_settings['question_use']) { if (strlen($question) == 0) { $hesk_error_buffer['question'] = $hesklang['q_miss']; - } elseif (strtolower($question) != strtolower($hesk_settings['question_ans'])) { + } elseif (hesk_mb_strtolower($question) != hesk_mb_strtolower($hesk_settings['question_ans'])) { $hesk_error_buffer['question'] = $hesklang['q_wrng']; } else { $_SESSION['c_question'] = $question; diff --git a/ticket.php b/ticket.php index 2d7197b4..cb7ef11b 100644 --- a/ticket.php +++ b/ticket.php @@ -722,8 +722,8 @@ function hesk_printCustomerTicketReplies() echo ' '; } From 3203eed8aa85c1f8466f3c420c7656870ca337df Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Tue, 21 Nov 2017 12:29:54 -0500 Subject: [PATCH 176/248] Use NOW() for reply dates --- admin/admin_reply_ticket.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/admin_reply_ticket.php b/admin/admin_reply_ticket.php index 29a0d5c8..216f0394 100644 --- a/admin/admin_reply_ticket.php +++ b/admin/admin_reply_ticket.php @@ -189,9 +189,9 @@ if ($hesk_settings['attachments']['use'] && !empty($attachments)) { // Add reply $html = $modsForHesk_settings['rich_text_for_tickets']; if ($submit_as_customer) { - hesk_dbQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "replies` (`replyto`,`name`,`message`,`dt`,`attachments`,`html`) VALUES ('" . intval($replyto) . "','" . hesk_dbEscape(addslashes($ticket['name'])) . "','" . hesk_dbEscape($message . "

    {$hesklang['creb']} {$_SESSION['name']}") . "','" . hesk_dbEscape(hesk_date()) . "','" . hesk_dbEscape($myattachments) . "', '" . $html . "')"); + hesk_dbQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "replies` (`replyto`,`name`,`message`,`dt`,`attachments`,`html`) VALUES ('" . intval($replyto) . "','" . hesk_dbEscape(addslashes($ticket['name'])) . "','" . hesk_dbEscape($message . "

    {$hesklang['creb']} {$_SESSION['name']}") . "', NOW(),'" . hesk_dbEscape($myattachments) . "', '" . $html . "')"); } else { - hesk_dbQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "replies` (`replyto`,`name`,`message`,`dt`,`attachments`,`staffid`,`html`) VALUES ('" . intval($replyto) . "','" . hesk_dbEscape(addslashes($_SESSION['name'])) . "','" . hesk_dbEscape($message) . "','" . hesk_dbEscape(hesk_date()) . "','" . hesk_dbEscape($myattachments) . "','" . intval($_SESSION['id']) . "', '" . $html . "')"); + hesk_dbQuery("INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "replies` (`replyto`,`name`,`message`,`dt`,`attachments`,`staffid`,`html`) VALUES ('" . intval($replyto) . "','" . hesk_dbEscape(addslashes($_SESSION['name'])) . "','" . hesk_dbEscape($message) . "', NOW(),'" . hesk_dbEscape($myattachments) . "','" . intval($_SESSION['id']) . "', '" . $html . "')"); } /* Track ticket status changes for history */ From 8b263f66a32fef6a3dc7fd2d4bed341edbb52f16 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Tue, 21 Nov 2017 12:58:04 -0500 Subject: [PATCH 177/248] Fix some email sending, updat edit_post maxlengths --- admin/edit_post.php | 4 ++-- api/BusinessLogic/Emails/EmailTemplateParser.php | 7 +------ .../Tickets/ResendTicketEmailToCustomerController.php | 4 ++++ 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/admin/edit_post.php b/admin/edit_post.php index a0bc7c55..8e14c90a 100644 --- a/admin/edit_post.php +++ b/admin/edit_post.php @@ -368,7 +368,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
    -
    @@ -380,7 +380,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
    - lastReplier)) { - if (!empty($ticket->lastReplier)) { - $lastReplyBy = $hesklang['staff']; - } else { - $lastReplyUser = $this->userGateway->getUserById($ticket->lastReplier, $heskSettings); - $lastReplyBy = $lastReplyUser !== null ? $lastReplyUser->name : $hesklang['unas']; - } + $lastReplyBy = $ticket->lastReplier; } else { $lastReplyBy = $ticket->name; } diff --git a/api/Controllers/Tickets/ResendTicketEmailToCustomerController.php b/api/Controllers/Tickets/ResendTicketEmailToCustomerController.php index ddab20cc..42ac4c08 100644 --- a/api/Controllers/Tickets/ResendTicketEmailToCustomerController.php +++ b/api/Controllers/Tickets/ResendTicketEmailToCustomerController.php @@ -41,6 +41,10 @@ class ResendTicketEmailToCustomerController extends InternalApiController { $reply = null; $emailTemplate = EmailTemplateRetriever::NEW_TICKET; + + // Use 0 for new tickets + $ticket->lastReplier = 0; + if (isset($_GET['replyId'])) { $replyId = $_GET['replyId']; $emailTemplate = EmailTemplateRetriever::NEW_REPLY_BY_STAFF; From 2390af6393ac55f2316640c4897fc96d977e96bd Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Sat, 25 Nov 2017 21:14:15 -0500 Subject: [PATCH 178/248] Update HESK verison to 2.7.5 --- install/install_functions.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/install_functions.inc.php b/install/install_functions.inc.php index e94f1e85..8dcae5c0 100644 --- a/install/install_functions.inc.php +++ b/install/install_functions.inc.php @@ -15,8 +15,8 @@ if (!defined('IN_SCRIPT')) {die('Invalid attempt');} // We will be installing this HESK version: -define('HESK_NEW_VERSION','2.7.4'); -define('MODS_FOR_HESK_NEW_VERSION','3.2.2'); +define('HESK_NEW_VERSION','2.7.5'); +define('MODS_FOR_HESK_NEW_VERSION','3.2.4'); define('REQUIRE_PHP_VERSION','5.3.0'); define('REQUIRE_MYSQL_VERSION','5.0.7'); From d092a49babb8ca76935b5fd1c5bc19cf6c082bc1 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Sat, 25 Nov 2017 21:40:27 -0500 Subject: [PATCH 179/248] Fix sorting of ticket events --- admin/admin_ticket.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/admin/admin_ticket.php b/admin/admin_ticket.php index 0210de9d..c98979a2 100644 --- a/admin/admin_ticket.php +++ b/admin/admin_ticket.php @@ -1828,7 +1828,7 @@ function hesk_printTicketReplies() } // Re-sort them so they're in order by date - usort($combined_records, function ($a, $b) { + usort($combined_records, function ($a, $b) use (&$hesk_settings) { $a_date = null; $b_date = null; if ($a['SORT_TYPE'] == 'REPLY') { @@ -1844,12 +1844,14 @@ function hesk_printTicketReplies() } if ($a_date === $b_date && $a['SORT_TYPE'] != $b['SORT_TYPE']) { - if ($a['SORT_TYPE'] != $b['SORT_TYPE']) { - return $a['SORT_TYPE'] == 'REPLY' ? -1 : 1; + if ($hesk_settings['new_top']) { + return $a['SORT_TYPE'] == 'REPLY' ? 1 : -1; } + + return $a['SORT_TYPE'] == 'REPLY' ? -1 : 1; } - return $a_date - $b_date; + return $hesk_settings['new_top'] ? $b_date - $a_date : $a_date - $b_date; }); From 03e7f626843f277ed0bb039b0685a2bf28836c5b Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Sat, 25 Nov 2017 21:42:23 -0500 Subject: [PATCH 180/248] Change verbiage --- language/en/text.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/language/en/text.php b/language/en/text.php index d543ccd3..59e4b7b7 100644 --- a/language/en/text.php +++ b/language/en/text.php @@ -2192,7 +2192,7 @@ $hesklang['changing_permissions_will_reset_permission_group'] = 'Changing a user // --> Ticket audit trail $hesklang['audit_moved_category']='%s moved ticket to category %s'; // %s = new category, user making change, thist1 $hesklang['audit_assigned']='%s assigned ticket to %s'; // %s = assigned user, user making change -$hesklang['audit_assigned_self'] = '%s assigned ticket to themself'; +$hesklang['audit_assigned_self'] = '%s self-assigned ticket'; $hesklang['audit_unassigned'] = '%s unassigned ticket'; $hesklang['audit_closed']='%s closed ticket'; // thist3 $hesklang['audit_automatically_closed'] ='Ticket automatically closed'; From dd99ebdb0e10e43ee0d73bae7723e1008d32f5b3 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Sat, 25 Nov 2017 21:46:19 -0500 Subject: [PATCH 181/248] Fix input-group-addon CSS issue --- admin/manage_categories.php | 2 +- css/mods-for-hesk-new.css | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/admin/manage_categories.php b/admin/manage_categories.php index 5b6cf082..0b123369 100644 --- a/admin/manage_categories.php +++ b/admin/manage_categories.php @@ -374,7 +374,7 @@ echo '';
    -
    - +
    -
    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 184/248] 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 185/248] 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 186/248] 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 187/248] 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 188/248] 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 189/248] 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 8ee6e1a55f91589c81a9eec4076cc425d7d52efd Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Wed, 6 Dec 2017 12:18:17 -0500 Subject: [PATCH 190/248] Can't concatenate an array to a string --- api/BusinessLogic/Emails/BasicEmailSender.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/api/BusinessLogic/Emails/BasicEmailSender.php b/api/BusinessLogic/Emails/BasicEmailSender.php index 8ab1c37d..d29f34af 100644 --- a/api/BusinessLogic/Emails/BasicEmailSender.php +++ b/api/BusinessLogic/Emails/BasicEmailSender.php @@ -10,7 +10,8 @@ use PHPMailer; class BasicEmailSender extends \BaseClass implements EmailSender { function sendEmail($emailBuilder, $heskSettings, $modsForHeskSettings, $sendAsHtml) { - if (preg_match("/\n|\r|\t|%0A|%0D|%08|%09/", $emailBuilder->to . $emailBuilder->subject)) { + $toEmails = implode(',', $emailBuilder->to); + if (preg_match("/\n|\r|\t|%0A|%0D|%08|%09/", $toEmails . $emailBuilder->subject)) { return false; } From 878b2aa09662a468bad1c9441f9fa17a4400c4e9 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Wed, 6 Dec 2017 12:45:44 -0500 Subject: [PATCH 191/248] Fix headers --- api/autoload.php | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/api/autoload.php b/api/autoload.php index 0f14ff20..33ac8300 100644 --- a/api/autoload.php +++ b/api/autoload.php @@ -23,4 +23,17 @@ require_once(__DIR__ . '/../inc/custom_fields.inc.php'); // Load the ApplicationContext $builder = new \DI\ContainerBuilder(); -$applicationContext = $builder->build(); \ No newline at end of file +$applicationContext = $builder->build(); + +// Fix for getallheaders() on PHP-FPM and nginx +if (!function_exists('getallheaders')) { + function getallheaders() { + $headers = []; + foreach ($_SERVER as $name => $value) { + if (substr($name, 0, 5) == 'HTTP_') { + $headers[str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($name, 5)))))] = $value; + } + } + return $headers; + } +} \ No newline at end of file From 95342815e2b3a1c8481303eea64c7767260e8c33 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Wed, 6 Dec 2017 12:52:02 -0500 Subject: [PATCH 192/248] Update installer --- install/index.php | 2 +- install/migrations/core.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/install/index.php b/install/index.php index 6ee2fc35..e6199ac3 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 .

    @@ -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 201/248] 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 202/248] 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 203/248] 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 204/248] 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 205/248] 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 206/248] 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 207/248] 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 208/248] 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 209/248] 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 210/248] 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 211/248] 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 213/248] 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 214/248] 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 229/248] 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 230/248] 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 231/248] 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'; }?> - +