From a66f729e8280cb741b91dbb3e45e78a3edc0d9de Mon Sep 17 00:00:00 2001
From: nuxsmin <nuxsmin@syspass.org>
Date: Thu, 12 Jul 2018 02:03:01 +0200
Subject: [PATCH] * [ADD] Custom events can be set on logging and mail handlers

---
 .../Controllers/ConfigManagerController.php   |  4 ++--
 .../views/config/general-events.inc           |  2 +-
 .../material-blue/views/config/mail.inc       |  2 +-
 lib/SP/Config/ConfigUtil.php                  | 12 +++++------
 public/js/app-triggers.js                     |  7 ++++++-
 public/js/app-triggers.min.js                 | 20 +++++++++----------
 6 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/app/modules/web/Controllers/ConfigManagerController.php b/app/modules/web/Controllers/ConfigManagerController.php
index 1f2d7aec..a1a6fc10 100644
--- a/app/modules/web/Controllers/ConfigManagerController.php
+++ b/app/modules/web/Controllers/ConfigManagerController.php
@@ -146,7 +146,7 @@ class ConfigManagerController extends ControllerBase
         $template->assign('userGroups', SelectItemAdapter::factory(UserGroupService::getItemsBasic())->getItemsFromModel());
         $template->assign('userProfiles', SelectItemAdapter::factory(UserProfileService::getItemsBasic())->getItemsFromModel());
 
-        $template->assign('logEvents', SelectItemAdapter::factory(DatabaseLogHandler::EVENTS)
+        $template->assign('logEvents', SelectItemAdapter::factory(array_merge(DatabaseLogHandler::EVENTS, $this->configData->getLogEvents()))
             ->getItemsFromArraySelected($this->configData->getLogEvents(), true)
         );
 
@@ -209,7 +209,7 @@ 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(MailHandler::EVENTS)
+        $template->assign('mailEvents', SelectItemAdapter::factory(array_merge(MailHandler::EVENTS, $this->configData->getMailEvents()))
             ->getItemsFromArraySelected($this->configData->getMailEvents(), true)
         );
 
diff --git a/app/modules/web/themes/material-blue/views/config/general-events.inc b/app/modules/web/themes/material-blue/views/config/general-events.inc
index 96dbd938..98f7f879 100644
--- a/app/modules/web/themes/material-blue/views/config/general-events.inc
+++ b/app/modules/web/themes/material-blue/views/config/general-events.inc
@@ -98,7 +98,7 @@
         <td class="valField">
             <div class="lowres-title"><?php echo __('Eventos'); ?></div>
 
-            <select id="log_events" name="log_events[]" multiple="multiple" class="select-box">
+            <select id="log_events" name="log_events[]" multiple="multiple" class="select-box" data-create="true">
                 <?php /** @var \SP\Mvc\View\Components\SelectItem[] $logEvents */
                 foreach ($logEvents as $logEvent): ?>
                     <option
diff --git a/app/modules/web/themes/material-blue/views/config/mail.inc b/app/modules/web/themes/material-blue/views/config/mail.inc
index d8d68621..91ef4f3c 100644
--- a/app/modules/web/themes/material-blue/views/config/mail.inc
+++ b/app/modules/web/themes/material-blue/views/config/mail.inc
@@ -173,7 +173,7 @@
             <td class="valField">
                 <div class="lowres-title"><?php echo __('Eventos'); ?></div>
 
-                <select id="mail_events" name="mail_events[]" multiple="multiple" class="select-box">
+                <select id="mail_events" name="mail_events[]" multiple="multiple" class="select-box" data-create="true">
                     <?php /** @var \SP\Mvc\View\Components\SelectItem[] $mailEvents */
                     foreach ($mailEvents as $mailEvent): ?>
                         <option
diff --git a/lib/SP/Config/ConfigUtil.php b/lib/SP/Config/ConfigUtil.php
index e64a7ecc..9c8ddeab 100644
--- a/lib/SP/Config/ConfigUtil.php
+++ b/lib/SP/Config/ConfigUtil.php
@@ -59,9 +59,9 @@ class ConfigUtil
      */
     public static function mailAddressesAdapter($mailAddresses)
     {
-        return array_map(function ($value) {
-            return filter_var($value, FILTER_VALIDATE_EMAIL) ? $value : null;
-        }, explode(',', $mailAddresses));
+        return array_filter(explode(',', $mailAddresses), function ($value) {
+            return filter_var($value, FILTER_VALIDATE_EMAIL);
+        });
     }
 
     /**
@@ -72,9 +72,9 @@ class ConfigUtil
      */
     public static function eventsAdapter(array $events)
     {
-        return array_map(function ($value) {
-            return preg_match('/^(?:[a-z]+(?:\.)?)+$/i', $value) ? $value : null;
-        }, $events);
+        return array_filter($events, function ($value) {
+            return preg_match('/^[a-z][a-z\.]+$/i', $value);
+        });
     }
 
     /**
diff --git a/public/js/app-triggers.js b/public/js/app-triggers.js
index 9b657dda..11d5d038 100644
--- a/public/js/app-triggers.js
+++ b/public/js/app-triggers.js
@@ -39,6 +39,11 @@ sysPass.Triggers = function (Common) {
 
         $container.find(".select-box").each(function (e) {
             const $this = $(this);
+            const self_options = {};
+
+            if ($this.data("create") === true) {
+                self_options.create = true;
+            }
 
             options.plugins = $this.hasClass("select-box-deselect") ? {"clear_selection": {title: Common.config().LANG[51]}} : {};
 
@@ -56,7 +61,7 @@ sysPass.Triggers = function (Common) {
                 };
             }
 
-            $this.selectize(options);
+            $this.selectize($.extend(self_options, options));
         });
 
         $container.find("#allowed_exts").selectize({
diff --git a/public/js/app-triggers.min.js b/public/js/app-triggers.min.js
index ede74636..2ca683a5 100644
--- a/public/js/app-triggers.min.js
+++ b/public/js/app-triggers.min.js
@@ -1,16 +1,16 @@
 var $jscomp={scope:{},findInternal:function(b,d,f){b instanceof String&&(b=String(b));for(var g=b.length,a=0;a<g;a++){var c=b[a];if(d.call(f,c,a,b))return{i:a,v:c}}return{i:-1,v:void 0}}};$jscomp.defineProperty="function"==typeof Object.defineProperties?Object.defineProperty:function(b,d,f){if(f.get||f.set)throw new TypeError("ES3 does not support getters and setters.");b!=Array.prototype&&b!=Object.prototype&&(b[d]=f.value)};
 $jscomp.getGlobal=function(b){return"undefined"!=typeof window&&window===b?b:"undefined"!=typeof global?global:b};$jscomp.global=$jscomp.getGlobal(this);$jscomp.polyfill=function(b,d,f,g){if(d){f=$jscomp.global;b=b.split(".");for(g=0;g<b.length-1;g++){var a=b[g];a in f||(f[a]={});f=f[a]}b=b[b.length-1];g=f[b];d=d(g);d!=g&&null!=d&&$jscomp.defineProperty(f,b,{configurable:!0,writable:!0,value:d})}};
 $jscomp.polyfill("Array.prototype.find",function(b){return b?b:function(b,f){return $jscomp.findInternal(this,b,f).v}},"es6-impl","es3");
-sysPass.Triggers=function(b){var d=b.log,f=function(a){var c={valueField:"id",labelField:"name",searchField:["name"]};a.find(".select-box").each(function(a){var d=$(this);c.plugins=d.hasClass("select-box-deselect")?{clear_selection:{title:b.config().LANG[51]}}:{};if(d.data("onchange")){var e=d.data("onchange").split("/");c.onChange=function(a){if(0<a)if(2===e.length)sysPassApp.actions()[e[0]][e[1]](d);else sysPassApp.actions()[e[0]](d)}}d.selectize(c)});a.find("#allowed_exts").selectize({create:function(a){return{value:a.toUpperCase(),
-text:a.toUpperCase()}},createFilter:/^[a-z0-9]{1,4}$/i,plugins:["remove_button"]});a.find("#wikifilter").selectize({create:!0,createFilter:/^[a-z0-9:._-]+$/i,plugins:["remove_button"]});a.find(".select-items-tag").selectize({create:function(a){return{value:a.toLowerCase(),text:a.toLowerCase()}},createFilter:/^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$/,plugins:["remove_button"]})},g={main:function(a){d.info("views:main");
-clipboard.isSupported()||b.msg.info(b.config().LANG[65]);$(".btn-menu").click(function(){var a=$(this);"1"===a.attr("data-history-reset")&&b.appRequests().history.reset();b.appActions().doAction({r:a.data("route")},a.data("view"))});if(0===a.data("upgraded"))b.appActions().doAction({r:"account/index"},"search");else{a=$("#content");var c=a.data("page");g.common(a);if(""!==c&&"function"===typeof g[c])g[c]()}!0===b.config().CHECK_UPDATES&&b.appActions().main.getUpdates();!0===b.config().CHECK_NOTICES&&
-b.appActions().main.getNotices();"function"===typeof b.appTheme().viewsTriggers.main&&b.appTheme().viewsTriggers.main()},search:function(){d.info("views:search");var a=$("#frmSearch");0!==a.length&&(a.find("input[name='search']").on("keyup",function(b){b.preventDefault();13!==b.which&&13!==b.keyCode||a.submit()}),a.find("select, #rpp").on("change",function(){a.submit()}),a.find("button.btn-clear").on("click",function(b){b.preventDefault();a.find('input[name="searchfav"]').val(0);a[0].reset()}),a.find("input:text:visible:first").focus(),
-$("#globalSearch").click(function(){var b=1==$(this).prop("checked")?1:0;a.find("input[name='gsearch']").val(b);a.submit()}),"function"===typeof b.appTheme().viewsTriggers.search&&b.appTheme().viewsTriggers.search())},login:function(){d.info("views:login");var a=$("#frmLogin");b.config().AUTHBASIC_AUTOLOGIN&&"0"===a.find("input[name='loggedOut']").val()&&(d.info("views:login:autologin"),b.msg.info(b.config().LANG[66]),b.appActions().main.login(a))},userpassreset:function(){d.info("views:userpassreset");
-var a=$("#frmUserPassReset");b.appTheme().passwordDetect(a)},footer:function(){d.info("views:footer")},common:function(a){d.info("views:common");f(a);var c=a.find(":input [name='sk']");0<c.length&&b.sk.set(c.val());"function"===typeof b.appTheme().viewsTriggers.common&&b.appTheme().viewsTriggers.common(a);b.appTriggers().updateFormHash(a)},datatabs:function(){d.info("views:datatabs");$(".datagrid-action-search>form").each(function(){var a=$(this);a.find("button.btn-clear").on("click",function(b){b.preventDefault();
-a.trigger("reset")})})},config:function(){d.info("views:config");var a=$("#drop-import-files");if(0<a.length){var c=b.fileUpload(a);c.url=b.appActions().ajaxUrl.entrypoint+"?r="+a.data("action-route");c.allowedExts=b.config().IMPORT_ALLOWED_EXTS;c.beforeSendAction=function(){c.setRequestData({sk:b.sk.get(),csvDelimiter:$("#csvDelimiter").val(),importPwd:$("#importPwd").val(),importMasterPwd:$("#importMasterPwd").val(),import_defaultuser:$("#import_defaultuser").val(),import_defaultgroup:$("#import_defaultgroup").val()})}}},
-account:function(){d.info("views:account");var a=$("#list-account-files");0<a.length&&b.appActions().account.listFiles(a);var c=$("#drop-account-files");if(0<c.length){var e=b.fileUpload(c);e.url=b.appActions().ajaxUrl.entrypoint+"?r="+c.data("action-route")+"/"+c.data("item-id");e.allowedExts=b.config().FILES_ALLOWED_EXTS;e.requestDoneAction=function(){b.appActions().account.listFiles(a)}}c=$("#parent_account_id");0<c.length&&(c.on("change",function(){var a=$(this),b=$("#accountpass,#accountpassR");
-0<a[0].value?b.each(function(){$(this).prop("disabled","true");$(this).prop("required","false")}):b.each(function(){$(this).prop("disabled","");$(this).prop("required","true")})}),b.appActions().items.get(c));$(".select-box-tags").selectize({persist:!1,valueField:"id",labelField:"name",searchField:["name"],plugins:["remove_button"],onInitialize:function(){var a=this.$input[0],b=document.createAttribute("data-hash");b.value=SparkMD5.hash(this.getValue().join(),!1);a.setAttributeNode(b);"undefined"!==
-typeof a.dataset.currentItemId&&this.removeOption(a.dataset.currentItemId,!0)},onChange:function(){var a=this.$input[0],b=document.createAttribute("data-updated");b.value=SparkMD5.hash(this.getValue().join(),!1)!==a.dataset.hash&&"true";a.setAttributeNode(b)}});$("input:text:visible:first").focus()},install:function(){d.info("views:install");var a=$("#frmInstall");b.appTheme().passwordDetect(a);f(a)}};return{views:g,selectDetect:f,updateSk:function(){$("#content").find("[data-sk]").each(function(){d.info("updateSk");
+sysPass.Triggers=function(b){var d=b.log,f=function(a){var c={valueField:"id",labelField:"name",searchField:["name"]};a.find(".select-box").each(function(a){var d=$(this);a={};!0===d.data("create")&&(a.create=!0);c.plugins=d.hasClass("select-box-deselect")?{clear_selection:{title:b.config().LANG[51]}}:{};if(d.data("onchange")){var e=d.data("onchange").split("/");c.onChange=function(a){if(0<a)if(2===e.length)sysPassApp.actions()[e[0]][e[1]](d);else sysPassApp.actions()[e[0]](d)}}d.selectize($.extend(a,
+c))});a.find("#allowed_exts").selectize({create:function(a){return{value:a.toUpperCase(),text:a.toUpperCase()}},createFilter:/^[a-z0-9]{1,4}$/i,plugins:["remove_button"]});a.find("#wikifilter").selectize({create:!0,createFilter:/^[a-z0-9:._-]+$/i,plugins:["remove_button"]});a.find(".select-items-tag").selectize({create:function(a){return{value:a.toLowerCase(),text:a.toLowerCase()}},createFilter:/^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$/,
+plugins:["remove_button"]})},g={main:function(a){d.info("views:main");clipboard.isSupported()||b.msg.info(b.config().LANG[65]);$(".btn-menu").click(function(){var a=$(this);"1"===a.attr("data-history-reset")&&b.appRequests().history.reset();b.appActions().doAction({r:a.data("route")},a.data("view"))});if(0===a.data("upgraded"))b.appActions().doAction({r:"account/index"},"search");else{a=$("#content");var c=a.data("page");g.common(a);if(""!==c&&"function"===typeof g[c])g[c]()}!0===b.config().CHECK_UPDATES&&
+b.appActions().main.getUpdates();!0===b.config().CHECK_NOTICES&&b.appActions().main.getNotices();"function"===typeof b.appTheme().viewsTriggers.main&&b.appTheme().viewsTriggers.main()},search:function(){d.info("views:search");var a=$("#frmSearch");0!==a.length&&(a.find("input[name='search']").on("keyup",function(b){b.preventDefault();13!==b.which&&13!==b.keyCode||a.submit()}),a.find("select, #rpp").on("change",function(){a.submit()}),a.find("button.btn-clear").on("click",function(b){b.preventDefault();
+a.find('input[name="searchfav"]').val(0);a[0].reset()}),a.find("input:text:visible:first").focus(),$("#globalSearch").click(function(){var b=1==$(this).prop("checked")?1:0;a.find("input[name='gsearch']").val(b);a.submit()}),"function"===typeof b.appTheme().viewsTriggers.search&&b.appTheme().viewsTriggers.search())},login:function(){d.info("views:login");var a=$("#frmLogin");b.config().AUTHBASIC_AUTOLOGIN&&"0"===a.find("input[name='loggedOut']").val()&&(d.info("views:login:autologin"),b.msg.info(b.config().LANG[66]),
+b.appActions().main.login(a))},userpassreset:function(){d.info("views:userpassreset");var a=$("#frmUserPassReset");b.appTheme().passwordDetect(a)},footer:function(){d.info("views:footer")},common:function(a){d.info("views:common");f(a);var c=a.find(":input [name='sk']");0<c.length&&b.sk.set(c.val());"function"===typeof b.appTheme().viewsTriggers.common&&b.appTheme().viewsTriggers.common(a);b.appTriggers().updateFormHash(a)},datatabs:function(){d.info("views:datatabs");$(".datagrid-action-search>form").each(function(){var a=
+$(this);a.find("button.btn-clear").on("click",function(b){b.preventDefault();a.trigger("reset")})})},config:function(){d.info("views:config");var a=$("#drop-import-files");if(0<a.length){var c=b.fileUpload(a);c.url=b.appActions().ajaxUrl.entrypoint+"?r="+a.data("action-route");c.allowedExts=b.config().IMPORT_ALLOWED_EXTS;c.beforeSendAction=function(){c.setRequestData({sk:b.sk.get(),csvDelimiter:$("#csvDelimiter").val(),importPwd:$("#importPwd").val(),importMasterPwd:$("#importMasterPwd").val(),import_defaultuser:$("#import_defaultuser").val(),
+import_defaultgroup:$("#import_defaultgroup").val()})}}},account:function(){d.info("views:account");var a=$("#list-account-files");0<a.length&&b.appActions().account.listFiles(a);var c=$("#drop-account-files");if(0<c.length){var e=b.fileUpload(c);e.url=b.appActions().ajaxUrl.entrypoint+"?r="+c.data("action-route")+"/"+c.data("item-id");e.allowedExts=b.config().FILES_ALLOWED_EXTS;e.requestDoneAction=function(){b.appActions().account.listFiles(a)}}c=$("#parent_account_id");0<c.length&&(c.on("change",
+function(){var a=$(this),b=$("#accountpass,#accountpassR");0<a[0].value?b.each(function(){$(this).prop("disabled","true");$(this).prop("required","false")}):b.each(function(){$(this).prop("disabled","");$(this).prop("required","true")})}),b.appActions().items.get(c));$(".select-box-tags").selectize({persist:!1,valueField:"id",labelField:"name",searchField:["name"],plugins:["remove_button"],onInitialize:function(){var a=this.$input[0],b=document.createAttribute("data-hash");b.value=SparkMD5.hash(this.getValue().join(),
+!1);a.setAttributeNode(b);"undefined"!==typeof a.dataset.currentItemId&&this.removeOption(a.dataset.currentItemId,!0)},onChange:function(){var a=this.$input[0],b=document.createAttribute("data-updated");b.value=SparkMD5.hash(this.getValue().join(),!1)!==a.dataset.hash&&"true";a.setAttributeNode(b)}});$("input:text:visible:first").focus()},install:function(){d.info("views:install");var a=$("#frmInstall");b.appTheme().passwordDetect(a);f(a)}};return{views:g,selectDetect:f,updateSk:function(){$("#content").find("[data-sk]").each(function(){d.info("updateSk");
 $(this).data("sk",b.sk.get())})},updateFormHash:function(a){d.info("updateFormHash");a=void 0!==a?a.find(".form-action[data-hash]"):$(".form-action[data-hash]");0<a.length&&a.each(function(){var a=$(this);a.attr("data-hash",SparkMD5.hash(a.serialize(),!1))})},bodyHooks:function(){d.info("bodyHooks");$("body").on("click","button.btn-action[data-onclick][type='button'],li.btn-action[data-onclick],span.btn-action[data-onclick],i.btn-action[data-onclick],a.btn-action[data-onclick],.btn-action-pager[data-onclick]",
 function(){var a=$(this);d.info("handleActionButton: "+a.attr("id"));var c=a.data("onclick").split("/"),e;e=a.data("plugin");e=void 0!==e&&void 0!==b.appPlugins()[e]?b.appPlugins()[e]:b.appActions();if(2===c.length)e[c[0]][c[1]](a);else e[c[0]](a)}).on("click",".btn-back",function(){var a=b.appRequests();if(0<a.history.length()){d.info("back");var c=a.history.del();a.getActionCall(c,c.callback)}}).on("submit",".form-action",function(a){a.preventDefault();a=$(this);d.info("formAction");var c=a.attr("data-hash"),
 e=SparkMD5.hash(a.serialize(),!1);if(c===e)b.msg.ok(b.config().LANG[55]);else if(c=a.data("plugin"),c=void 0!==c&&void 0!==b.appPlugins()[c]?b.appPlugins()[c]:b.appActions(),e=a.data("onsubmit").split("/"),a.find("input[name='sk']").val(b.sk.get()),2===e.length)c[e[0]][e[1]](a);else c[e[0]](a)}).on("click",".btn-help[data-help]",function(){var a=$(this),a=$.find("div[for='"+a.data("help")+"']");if(0<a.length){var c=b.config().LANG[54]+" - "+a[0].getAttribute("title")||b.config().LANG[54];mdlDialog().show({title:c,