From 7a938b677bbbc261d399df0a606a840f553b2968 Mon Sep 17 00:00:00 2001
From: nuxsmin <nuxsmin@syspass.org>
Date: Tue, 28 Aug 2018 13:03:15 +0200
Subject: [PATCH] * [MOD] Sort displaying of events in select

---
 .../web/Controllers/ConfigManagerController.php     | 13 +++++++++++--
 lib/SP/Providers/Log/DatabaseLogHandler.php         |  4 +++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/modules/web/Controllers/ConfigManagerController.php b/app/modules/web/Controllers/ConfigManagerController.php
index 99103334..42b98f31 100644
--- a/app/modules/web/Controllers/ConfigManagerController.php
+++ b/app/modules/web/Controllers/ConfigManagerController.php
@@ -146,7 +146,11 @@ final class ConfigManagerController extends ControllerBase
 
         $template->assign('curlIsAvailable', $this->extensionChecker->checkCurlAvailable());
 
-        $template->assign('logEvents', SelectItemAdapter::factory(array_merge(DatabaseLogHandler::EVENTS, $this->configData->getLogEvents()))
+        $events = array_merge(DatabaseLogHandler::EVENTS, $this->configData->getLogEvents());
+
+        sort($events, SORT_STRING);
+
+        $template->assign('logEvents', SelectItemAdapter::factory($events)
             ->getItemsFromArraySelected($this->configData->getLogEvents(), true)
         );
 
@@ -215,7 +219,12 @@ final class ConfigManagerController extends ControllerBase
         $template->assign('mailSecurity', ['SSL', 'TLS']);
         $template->assign('userGroups', SelectItemAdapter::factory(UserGroupService::getItemsBasic())->getItemsFromModel());
         $template->assign('userProfiles', SelectItemAdapter::factory(UserProfileService::getItemsBasic())->getItemsFromModel());
-        $template->assign('mailEvents', SelectItemAdapter::factory(array_merge(MailHandler::EVENTS, $this->configData->getMailEvents()))
+
+        $events = array_merge(MailHandler::EVENTS, $this->configData->getMailEvents());
+
+        sort($events, SORT_STRING);
+
+        $template->assign('mailEvents', SelectItemAdapter::factory($events)
             ->getItemsFromArraySelected($this->configData->getMailEvents(), true)
         );
 
diff --git a/lib/SP/Providers/Log/DatabaseLogHandler.php b/lib/SP/Providers/Log/DatabaseLogHandler.php
index 4e6a3a8b..e6854924 100644
--- a/lib/SP/Providers/Log/DatabaseLogHandler.php
+++ b/lib/SP/Providers/Log/DatabaseLogHandler.php
@@ -44,6 +44,7 @@ final class DatabaseLogHandler extends Provider implements EventReceiver
     use EventsTrait;
 
     const EVENTS = [
+        'show.',
         'create.',
         'delete.',
         'edit.',
@@ -64,7 +65,8 @@ final class DatabaseLogHandler extends Provider implements EventReceiver
         'import.ldap.',
         'run.',
         'send.mail',
-        'show.authToken'
+        'show.authToken',
+        'clear.eventlog'
     ];
 
     /**