From 87e10e86c3aa8093d8168a1c66a690d97f7990b8 Mon Sep 17 00:00:00 2001 From: Pavel Piligrimov <p.piligrimov@agimagroup.ru> Date: Fri, 2 Sep 2022 20:13:25 +0500 Subject: [PATCH] fix class loader --- include.php | 4 +-- install/index.php | 35 +++++++++++++++++++ install/version.php | 4 +-- lib/mjml/{Process => process}/process.php | 0 .../{Renderer => renderer}/binaryrenderer.php | 0 .../rendererinterface.php | 0 .../componentrenderer.php | 0 .../mjmlextension.php | 0 8 files changed, 38 insertions(+), 5 deletions(-) rename lib/mjml/{Process => process}/process.php (100%) rename lib/mjml/{Renderer => renderer}/binaryrenderer.php (100%) rename lib/mjml/{Renderer => renderer}/rendererinterface.php (100%) rename lib/mjml/{RendererTemplate => renderertemplate}/componentrenderer.php (100%) rename lib/mjml/{TwigExtension => twigextension}/mjmlextension.php (100%) diff --git a/include.php b/include.php index de8836a..e0f4c83 100644 --- a/include.php +++ b/include.php @@ -6,6 +6,4 @@ if (!defined('B_PROLOG_INCLUDED') || B_PROLOG_INCLUDED !== true) { die(); } -include_once 'lib/mjml/RendererTemplate/componentrenderer.php'; - -Events::bindEvents(); \ No newline at end of file +include_once 'lib/mjml/renderertemplate/componentrenderer.php'; diff --git a/install/index.php b/install/index.php index 41cada7..2afd3cf 100644 --- a/install/index.php +++ b/install/index.php @@ -1,8 +1,10 @@ <?php use Bitrix\Main\Application; +use Bitrix\Main\EventManager; use Bitrix\Main\IO\Directory; use Bitrix\Main\Localization\Loc; +use Mail\Mjml\Events; if (!defined('B_PROLOG_INCLUDED') || B_PROLOG_INCLUDED !== true) { die(); @@ -49,6 +51,7 @@ class mail_mjml extends CModule { RegisterModule($this->MODULE_ID); $this->installFiles(); + $this->registerEvents(); } /** @@ -69,6 +72,22 @@ class mail_mjml extends CModule } + /** + * РегиÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ Ñобытий + * + * @return void + */ + function registerEvents() + { + EventManager::getInstance()->registerEventHandler( + 'main', + 'OnProlog', + $this->MODULE_ID, + Events::class, + 'bindEvents' + ); + } + /** * Удаление файлов * @@ -98,4 +117,20 @@ class mail_mjml extends CModule UnRegisterModule($this->MODULE_ID); $this->UnInstallFiles(); } + + /** + * Удаление Ñобытий + * + * @return void + */ + function unRegisterEvents() + { + EventManager::getInstance()->unRegisterEventHandler( + 'main', + 'OnProlog', + $this->MODULE_ID, + Events::class, + 'bindEvents' + ); + } } \ No newline at end of file diff --git a/install/version.php b/install/version.php index f0c689e..200ba13 100644 --- a/install/version.php +++ b/install/version.php @@ -1,6 +1,6 @@ <?php $arModuleVersion = [ - 'VERSION' => '0.0.1', - 'VERSION_DATE' => '2022-07-03 13:00:00', + 'VERSION' => '0.0.2', + 'VERSION_DATE' => '2022-09-01 20:00:00', ]; \ No newline at end of file diff --git a/lib/mjml/Process/process.php b/lib/mjml/process/process.php similarity index 100% rename from lib/mjml/Process/process.php rename to lib/mjml/process/process.php diff --git a/lib/mjml/Renderer/binaryrenderer.php b/lib/mjml/renderer/binaryrenderer.php similarity index 100% rename from lib/mjml/Renderer/binaryrenderer.php rename to lib/mjml/renderer/binaryrenderer.php diff --git a/lib/mjml/Renderer/rendererinterface.php b/lib/mjml/renderer/rendererinterface.php similarity index 100% rename from lib/mjml/Renderer/rendererinterface.php rename to lib/mjml/renderer/rendererinterface.php diff --git a/lib/mjml/RendererTemplate/componentrenderer.php b/lib/mjml/renderertemplate/componentrenderer.php similarity index 100% rename from lib/mjml/RendererTemplate/componentrenderer.php rename to lib/mjml/renderertemplate/componentrenderer.php diff --git a/lib/mjml/TwigExtension/mjmlextension.php b/lib/mjml/twigextension/mjmlextension.php similarity index 100% rename from lib/mjml/TwigExtension/mjmlextension.php rename to lib/mjml/twigextension/mjmlextension.php -- GitLab