From b1a291e97cb429adaaba7abfc339cf12399aa34f Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Fri, 24 Mar 2023 16:20:23 +0100 Subject: [PATCH] registration fixes --- Admin/Install/Navigation.install.json | 14 +- Admin/Install/Navigation.php | 4 +- Admin/Install/Workflow.php | 4 +- Admin/Install/db.json | 252 ++++++++++++++++++++++ Admin/Installer.php | 117 +++++++++- Admin/Routes/Web/Backend.php | 2 +- Admin/Status.php | 4 +- Admin/Uninstaller.php | 4 +- Admin/Updater.php | 4 +- Controller/ApiController.php | 145 +++++++++++++ Controller/BackendController.php | 4 +- Controller/Controller.php | 4 +- Models/Channel.php | 0 Models/ChannelMapper.php | 0 Models/Email.php | 82 +++++++ Models/EmailMapper.php | 113 ++++++++++ Models/NullEmail.php | 47 ++++ Models/PermissionCategory.php | 4 +- Models/Server.php | 0 Models/ServerMapper.php | 0 Theme/Backend/Lang/Navigation.ar.lang.php | 2 +- Theme/Backend/Lang/Navigation.cs.lang.php | 2 +- Theme/Backend/Lang/Navigation.da.lang.php | 2 +- Theme/Backend/Lang/Navigation.de.lang.php | 2 +- Theme/Backend/Lang/Navigation.el.lang.php | 2 +- Theme/Backend/Lang/Navigation.en.lang.php | 2 +- Theme/Backend/Lang/Navigation.es.lang.php | 2 +- Theme/Backend/Lang/Navigation.fi.lang.php | 2 +- Theme/Backend/Lang/Navigation.fr.lang.php | 2 +- Theme/Backend/Lang/Navigation.hu.lang.php | 2 +- Theme/Backend/Lang/Navigation.it.lang.php | 2 +- Theme/Backend/Lang/Navigation.ja.lang.php | 2 +- Theme/Backend/Lang/Navigation.ko.lang.php | 2 +- Theme/Backend/Lang/Navigation.no.lang.php | 2 +- Theme/Backend/Lang/Navigation.pl.lang.php | 2 +- Theme/Backend/Lang/Navigation.pt.lang.php | 2 +- Theme/Backend/Lang/Navigation.ru.lang.php | 2 +- Theme/Backend/Lang/Navigation.sv.lang.php | 2 +- Theme/Backend/Lang/Navigation.th.lang.php | 2 +- Theme/Backend/Lang/Navigation.tr.lang.php | 2 +- Theme/Backend/Lang/Navigation.uk.lang.php | 2 +- Theme/Backend/Lang/Navigation.zh.lang.php | 2 +- Theme/Backend/Lang/ar.lang.php | 2 +- Theme/Backend/Lang/cs.lang.php | 2 +- Theme/Backend/Lang/da.lang.php | 2 +- Theme/Backend/Lang/de.lang.php | 2 +- Theme/Backend/Lang/el.lang.php | 2 +- Theme/Backend/Lang/en.lang.php | 2 +- Theme/Backend/Lang/es.lang.php | 2 +- Theme/Backend/Lang/fi.lang.php | 2 +- Theme/Backend/Lang/fr.lang.php | 2 +- Theme/Backend/Lang/hu.lang.php | 2 +- Theme/Backend/Lang/it.lang.php | 2 +- Theme/Backend/Lang/ja.lang.php | 2 +- Theme/Backend/Lang/ko.lang.php | 2 +- Theme/Backend/Lang/no.lang.php | 2 +- Theme/Backend/Lang/pl.lang.php | 2 +- Theme/Backend/Lang/pt.lang.php | 2 +- Theme/Backend/Lang/ru.lang.php | 2 +- Theme/Backend/Lang/sv.lang.php | 2 +- Theme/Backend/Lang/th.lang.php | 2 +- Theme/Backend/Lang/tr.lang.php | 2 +- Theme/Backend/Lang/uk.lang.php | 2 +- Theme/Backend/Lang/zh.lang.php | 2 +- Theme/Backend/mail-create.tpl.php | 2 +- Theme/Backend/mail-dashboard.tpl.php | 6 +- Theme/Backend/mail-out-view.tpl.php | 2 +- Theme/Backend/mail-spam-view.tpl.php | 2 +- Theme/Backend/mail-trash-view.tpl.php | 2 +- Theme/Backend/mail-view.tpl.php | 2 +- Theme/Backend/message-settings.tpl.php | 2 +- tests/Admin/AdminTest.php | 2 +- tests/Autoloader.php | 4 +- 73 files changed, 834 insertions(+), 82 deletions(-) create mode 100644 Admin/Install/db.json create mode 100644 Controller/ApiController.php create mode 100644 Models/Channel.php create mode 100644 Models/ChannelMapper.php create mode 100644 Models/Email.php create mode 100644 Models/EmailMapper.php create mode 100644 Models/NullEmail.php create mode 100644 Models/Server.php create mode 100644 Models/ServerMapper.php diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json index a672e8a..c850cfc 100755 --- a/Admin/Install/Navigation.install.json +++ b/Admin/Install/Navigation.install.json @@ -5,7 +5,7 @@ "type": 1, "subtype": 1, "name": "Messages", - "uri": "{/lang}/{/app}/messages/dashboard?{?}", + "uri": "{/base}/messages/dashboard?{?}", "target": "self", "icon": "fa fa-envelope", "order": 10, @@ -19,7 +19,7 @@ "type": 3, "subtype": 1, "name": "Inbox", - "uri": "{/lang}/{/app}/messages/dashboard?{?}", + "uri": "{/base}/messages/dashboard?{?}", "target": "self", "icon": null, "order": 1, @@ -34,7 +34,7 @@ "type": 3, "subtype": 1, "name": "Outbox", - "uri": "{/lang}/{/app}/messages/outbox?{?}", + "uri": "{/base}/messages/outbox?{?}", "target": "self", "icon": null, "order": 5, @@ -49,7 +49,7 @@ "type": 3, "subtype": 1, "name": "Trash", - "uri": "{/lang}/{/app}/messages/trash?{?}", + "uri": "{/base}/messages/trash?{?}", "target": "self", "icon": null, "order": 10, @@ -64,7 +64,7 @@ "type": 3, "subtype": 1, "name": "Spam", - "uri": "{/lang}/{/app}/messages/spam?{?}", + "uri": "{/base}/messages/spam?{?}", "target": "self", "icon": null, "order": 15, @@ -79,7 +79,7 @@ "type": 3, "subtype": 1, "name": "Draft", - "uri": "{/lang}/{/app}/messages/draft?{?}", + "uri": "{/base}/messages/draft?{?}", "target": "self", "icon": null, "order": 20, @@ -94,7 +94,7 @@ "type": 3, "subtype": 1, "name": "Settings", - "uri": "{/lang}/{/app}/messages/settings?{?}", + "uri": "{/base}/messages/settings?{?}", "target": "self", "icon": null, "order": 50, diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php index bdd9666..0ee083a 100755 --- a/Admin/Install/Navigation.php +++ b/Admin/Install/Navigation.php @@ -6,7 +6,7 @@ * * @package Modules\Messages\Admin\Install * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Application\ApplicationAbstract; * Navigation class. * * @package Modules\Messages\Admin\Install - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Admin/Install/Workflow.php b/Admin/Install/Workflow.php index 72a3632..05ea931 100644 --- a/Admin/Install/Workflow.php +++ b/Admin/Install/Workflow.php @@ -6,7 +6,7 @@ * * @package Modules\Messages\Admin\Install * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Application\ApplicationAbstract; * Workflow class. * * @package Modules\Messages\Admin\Install - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Admin/Install/db.json b/Admin/Install/db.json new file mode 100644 index 0000000..d7e537b --- /dev/null +++ b/Admin/Install/db.json @@ -0,0 +1,252 @@ +{ + "messages_mail": { + "name": "messages_mail", + "fields": { + "messages_mail_id": { + "name": "messages_mail_id", + "type": "INT", + "null": false, + "primary": true, + "autoincrement": true + }, + "messages_mail_msgid": { + "name": "messages_mail_msgid", + "type": "VARCHAR(255)", + "null": false + }, + "messages_mail_status": { + "name": "messages_mail_status", + "type": "TINYINT", + "null": false + }, + "messages_mail_to": { + "name": "messages_mail_to", + "type": "TEXT", + "null": false + }, + "messages_mail_from": { + "name": "messages_mail_from", + "type": "VARCHAR(255)", + "null": false + }, + "messages_mail_from_account": { + "name": "messages_mail_from_account", + "type": "INT", + "null": true, + "default": null, + "foreignTable": "account", + "foreignKey": "account_id" + }, + "messages_mail_cc": { + "name": "messages_mail_cc", + "type": "TEXT", + "null": false + }, + "messages_mail_bcc": { + "name": "messages_mail_bcc", + "type": "TEXT", + "null": false + }, + "messages_mail_replyto": { + "name": "messages_mail_replyto", + "type": "TEXT", + "null": false + }, + "messages_mail_confimation": { + "name": "messages_mail_confimation", + "type": "VARCHAR(255)", + "null": false + }, + "messages_mail_subject": { + "name": "messages_mail_subject", + "type": "TEXT", + "null": false + }, + "messages_mail_body": { + "name": "messages_mail_body", + "type": "TEXT", + "null": false + }, + "messages_mail_bodyalt": { + "name": "messages_mail_bodyalt", + "type": "TEXT", + "null": false + }, + "messages_mail_bodymime": { + "name": "messages_mail_bodymime", + "type": "TEXT", + "null": false + }, + "messages_mail_ical": { + "name": "messages_mail_ical", + "type": "TEXT", + "null": false + }, + "messages_mail_created_at": { + "name": "messages_mail_created_at", + "type": "DATETIME", + "null": false + }, + "messages_mail_sent": { + "name": "messages_mail_sent", + "type": "DATETIME", + "null": true, + "default": null + }, + "messages_mail_received": { + "name": "messages_mail_received", + "type": "DATETIME", + "null": true, + "default": null + }, + "messages_mail_priority": { + "name": "messages_mail_priority", + "type": "TINYINT(1)", + "null": false + }, + "messages_mail_encoding": { + "name": "messages_mail_encoding", + "type": "VARCHAR(255)", + "null": false + }, + "messages_mail_contenttype": { + "name": "messages_mail_contenttype", + "type": "VARCHAR(255)", + "null": false + }, + "messages_mail_charset": { + "name": "messages_mail_charset", + "type": "VARCHAR(255)", + "null": false + } + } + }, + "messages_mail_media": { + "name": "messages_mail_media", + "fields": { + "messages_mail_media_id": { + "name": "messages_mail_media_id", + "type": "INT", + "null": false, + "primary": true, + "autoincrement": true + }, + "messages_mail_media_src": { + "name": "messages_mail_media_src", + "type": "INT", + "null": false, + "foreignTable": "messages_mail", + "foreignKey": "messages_mail_id" + }, + "messages_mail_media_dst": { + "name": "messages_mail_media_dst", + "type": "INT", + "null": false, + "foreignTable": "media", + "foreignKey": "media_id" + } + } + }, + "messages_channel": { + "description": "Only for internal purposes, can be a server or group chat or 1v1 chat", + "name": "messages_channel", + "fields": { + "messages_channel_id": { + "name": "messages_channel_id", + "type": "INT", + "null": false, + "primary": true, + "autoincrement": true + }, + "messages_channel_status": { + "name": "messages_channel_status", + "type": "TINYINT", + "null": false + }, + "messages_mail_created_at": { + "name": "messages_mail_created_at", + "type": "DATETIME", + "null": false + }, + "messages_mail_created_by": { + "name": "messages_mail_created_by", + "type": "INT", + "null": false, + "foreignTable": "account", + "foreignKey": "account_id" + } + } + }, + "messages_channel_rel": { + "name": "messages_channel_rel", + "fields": { + "messages_channel_rel_id": { + "name": "messages_channel_rel_id", + "type": "INT", + "null": false, + "primary": true, + "autoincrement": true + }, + "messages_channel_rel_channel": { + "name": "messages_channel_rel_channel", + "type": "INT", + "null": false, + "foreignTable": "messages_channel", + "foreignKey": "messages_channel_id" + }, + "messages_channel_rel_account": { + "name": "messages_channel_rel_account", + "type": "INT", + "null": false, + "foreignTable": "account", + "foreignKey": "account_id" + } + } + }, + "messages_msg": { + "name": "messages_msg", + "fields": { + "messages_msg_id": { + "name": "messages_msg_id", + "type": "INT", + "null": false, + "primary": true, + "autoincrement": true + }, + "messages_msg_status": { + "name": "messages_msg_status", + "type": "TINYINT", + "null": false + }, + "messages_msg_body": { + "name": "messages_msg_body", + "type": "TEXT", + "null": false + }, + "messages_msg_bodyalt": { + "name": "messages_msg_bodyalt", + "type": "TEXT", + "null": false + }, + "messages_mail_created_at": { + "name": "messages_mail_created_at", + "type": "DATETIME", + "null": false + }, + "messages_mail_created_by": { + "name": "messages_mail_created_by", + "type": "INT", + "null": false, + "foreignTable": "account", + "foreignKey": "account_id" + }, + "messages_mail_channel": { + "name": "messages_mail_channel", + "type": "INT", + "null": false, + "foreignTable": "messages_channel", + "foreignKey": "messages_channel_id" + } + } + } +} \ No newline at end of file diff --git a/Admin/Installer.php b/Admin/Installer.php index 9dbf125..493e1d7 100755 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -6,7 +6,7 @@ * * @package Modules\Messages\Admin * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -14,13 +14,19 @@ declare(strict_types=1); namespace Modules\Messages\Admin; +use phpOMS\Application\ApplicationAbstract; +use phpOMS\Message\Http\HttpRequest; +use phpOMS\Message\Http\HttpResponse; use phpOMS\Module\InstallerAbstract; +use phpOMS\Module\ModuleInfo; +use phpOMS\System\File\PathException; +use phpOMS\Uri\HttpUri; /** * Installer class. * * @package Modules\Messages\Admin - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ @@ -33,4 +39,111 @@ final class Installer extends InstallerAbstract * @since 1.0.0 */ public const PATH = __DIR__; + + /** + * Install data from providing modules. + * + * The data can be either directories which should be created or files which should be "uploaded" + * + * @param ApplicationAbstract $app Application + * @param array $data Additional data + * + * @return array + * + * @throws PathException + * @throws \Exception + * + * @since 1.0.0 + */ + public static function installExternal(ApplicationAbstract $app, array $data) : array + { + try { + $app->dbPool->get()->con->query('select 1 from `editor_doc`'); + } catch (\Exception $e) { + return []; // @codeCoverageIgnore + } + + if (!\is_file($data['path'] ?? '')) { + throw new PathException($data['path'] ?? ''); + } + + $messageFile = \file_get_contents($data['path'] ?? ''); + if ($messageFile === false) { + throw new PathException($data['path'] ?? ''); // @codeCoverageIgnore + } + + $messageData = \json_decode($messageFile, true) ?? []; + if ($messageData === false) { + throw new \Exception(); // @codeCoverageIgnore + } + + $result = [ + 'email_template' => [], + ]; + + $apiApp = new class() extends ApplicationAbstract + { + protected string $appName = 'Api'; + }; + + $apiApp->dbPool = $app->dbPool; + $apiApp->unitId = $app->unitId; + $apiApp->accountManager = $app->accountManager; + $apiApp->appSettings = $app->appSettings; + $apiApp->moduleManager = $app->moduleManager; + $apiApp->eventManager = $app->eventManager; + + /** @var array{type:array} $messageData */ + foreach ($messageData as $message) { + switch ($message['type']) { + case 'email_template': + $result['email_template'][] = self::createMessageTemplate($apiApp, $message); + break; + default: + } + } + + return $result; + } + + /** + * Create message template. + * + * @param ApplicationAbstract $app Application + * @param array $data Type info + * + * @return array + * + * @since 1.0.0 + */ + private static function createMessageTemplate(ApplicationAbstract $app, array $data) : array + { + /** @var \Modules\Messages\Controller\ApiController $module */ + $module = $app->moduleManager->get('Messages'); + + $response = new HttpResponse(); + $request = new HttpRequest(new HttpUri('')); + + $request->header->account = 1; + $request->setData('from', $data['from'] ?? ''); + $request->setData('to', $data['to'] ?? null); + $request->setData('cc', $data['cc'] ?? null); + $request->setData('bcc', $data['bcc'] ?? null); + $request->setData('subject', $data['subject'] ?? ''); + $request->setData('ishtml', $data['ishtml'] ?? false); + $request->setData('body', $data['body'] ?? ''); + $request->setData('bodyalt', $data['bodyalt'] ?? ''); + $request->setData('send', $data['send'] ?? false); + + $module->apiEmailCreate($request, $response); + + $responseData = $response->get(''); + if (!\is_array($responseData)) { + return []; + } + + return !\is_array($responseData['response']) + ? $responseData['response']->toArray() + : $responseData['response']; + } } diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index 106834c..f596f39 100755 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -6,7 +6,7 @@ * * @package Modules * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Admin/Status.php b/Admin/Status.php index fcb6558..1c2b731 100755 --- a/Admin/Status.php +++ b/Admin/Status.php @@ -6,7 +6,7 @@ * * @package Modules\Messages\Admin * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Module\StatusAbstract; * Status class. * * @package Modules\Messages\Admin - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Admin/Uninstaller.php b/Admin/Uninstaller.php index e48ceab..1d5fcb9 100755 --- a/Admin/Uninstaller.php +++ b/Admin/Uninstaller.php @@ -6,7 +6,7 @@ * * @package Modules\Messages\Admin * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Module\UninstallerAbstract; * Uninstaller class. * * @package Modules\Messages\Admin - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Admin/Updater.php b/Admin/Updater.php index dee56c1..80ef17a 100755 --- a/Admin/Updater.php +++ b/Admin/Updater.php @@ -6,7 +6,7 @@ * * @package Modules\Messages\Admin * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Module\UpdaterAbstract; * Updater class. * * @package Modules\Messages\Admin - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Controller/ApiController.php b/Controller/ApiController.php new file mode 100644 index 0000000..5a312d9 --- /dev/null +++ b/Controller/ApiController.php @@ -0,0 +1,145 @@ +validateEmailCreate($request))) { + $response->set('email_create', new FormValidation($val)); + $response->header->status = RequestStatusCode::R_400; + + return; + } + + $email = $this->createEmailFromRequest($request); + $this->createModel($request->header->account, $email, EmailMapper::class, 'email', $request->getOrigin()); + + $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Email', 'Email successfully created', $email); + } + + /** + * Validate email create request + * + * @param RequestAbstract $request Request + * + * @return array + * + * @since 1.0.0 + */ + private function validateEmailCreate(RequestAbstract $request) : array + { + $val = []; + if (($val['subject'] = empty($request->getData('subject'))) + || ($val['body'] = empty($request->getData('body'))) + ) { + return $val; + } + + return []; + } + + /** + * Method to create email from request. + * + * @param RequestAbstract $request Request + * + * @return Email + * + * @since 1.0.0 + */ + private function createEmailFromRequest(RequestAbstract $request) : Email + { + $email = new Email(); + + if ($request->hasData('from')) { + $from = $request->getDataJson('from'); + $email->setFrom($from['address'] ?? '', $from['name'] ?? ''); + } + + if ($request->hasData('to')) { + $tos = $request->getDataJson('to'); + + foreach ($tos as $to) { + $email->addTo($to['address'] ?? '', $to['name'] ?? ''); + } + } + + if ($request->hasData('cc')) { + $ccs = $request->getDataJson('cc'); + + foreach ($ccs as $cc) { + $email->addCC($cc['address'] ?? '', $cc['name'] ?? ''); + } + } + + if ($request->hasData('bcc')) { + $bccs = $request->getDataJson('bcc'); + + foreach ($bccs as $bcc) { + $email->addBCC($bcc['address'] ?? '', $bcc['name'] ?? ''); + } + } + + $email->account = new NullAccount($request->getDataInt('account') ?? $request->header->account); + + $email->setHtml($request->getDataBool('ishtml') ?? false); + + $email->subject = $request->getDataString('subject') ?? ''; + + if ($request->getDataBool('ishtml') ?? false) { + $email->msgHTML($request->getDataString('body') ?? ''); + } else { + $email->body = $request->getDataString('body') ?? ''; + } + + $email->bodyAlt = $request->getDataString('bodyalt') ?? ''; + + return $email; + } +} diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 27da014..df402a1 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -6,7 +6,7 @@ * * @package Modules\Messages * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -23,7 +23,7 @@ use phpOMS\Views\View; * Messages controller class. * * @package Modules\Messages - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 * @codeCoverageIgnore diff --git a/Controller/Controller.php b/Controller/Controller.php index 5db9e03..4a65a73 100755 --- a/Controller/Controller.php +++ b/Controller/Controller.php @@ -6,7 +6,7 @@ * * @package Modules\Messages * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Module\ModuleAbstract; * Messages controller class. * * @package Modules\Messages - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/Channel.php b/Models/Channel.php new file mode 100644 index 0000000..e69de29 diff --git a/Models/ChannelMapper.php b/Models/ChannelMapper.php new file mode 100644 index 0000000..e69de29 diff --git a/Models/Email.php b/Models/Email.php new file mode 100644 index 0000000..0e0fa8c --- /dev/null +++ b/Models/Email.php @@ -0,0 +1,82 @@ +account = new NullAccount(); + $this->createdAt = new \DateTimeImmutable('now'); + } + + /** + * Get id + * + * @return int + * + * @since 1.0.0 + */ + public function getId() : int + { + return $this->id; + } + + /** + * {@inheritdoc} + */ + public function toArray() : array + { + return [ + 'id' => $this->id, + ]; + } + + /** + * {@inheritdoc} + */ + public function jsonSerialize() : mixed + { + return $this->toArray(); + } +} diff --git a/Models/EmailMapper.php b/Models/EmailMapper.php new file mode 100644 index 0000000..8574b21 --- /dev/null +++ b/Models/EmailMapper.php @@ -0,0 +1,113 @@ + + * @since 1.0.0 + */ + public const COLUMNS = [ + 'messages_mail_id' => ['name' => 'messages_mail_id', 'type' => 'int', 'internal' => 'id'], + 'messages_mail_msgid' => ['name' => 'messages_mail_msgid', 'type' => 'string', 'internal' => 'messageId'], + 'messages_mail_status' => ['name' => 'messages_mail_status', 'type' => 'int', 'internal' => 'status'], + 'messages_mail_to' => ['name' => 'messages_mail_to', 'type' => 'Json', 'internal' => 'to'], + 'messages_mail_from' => ['name' => 'messages_mail_from', 'type' => 'Json', 'internal' => 'from'], + 'messages_mail_from_account' => ['name' => 'messages_mail_from_account', 'type' => 'int', 'internal' => 'account'], + 'messages_mail_cc' => ['name' => 'messages_mail_cc', 'type' => 'Json', 'internal' => 'cc'], + 'messages_mail_bcc' => ['name' => 'messages_mail_bcc', 'type' => 'Json', 'internal' => 'bcc'], + 'messages_mail_replyto' => ['name' => 'messages_mail_replyto', 'type' => 'Json', 'internal' => 'replyTo'], + 'messages_mail_confimation' => ['name' => 'messages_mail_confimation', 'type' => 'string', 'internal' => 'confirmationAddress'], + 'messages_mail_subject' => ['name' => 'messages_mail_subject', 'type' => 'string', 'internal' => 'subject'], + 'messages_mail_body' => ['name' => 'messages_mail_body', 'type' => 'string', 'internal' => 'body'], + 'messages_mail_bodyalt' => ['name' => 'messages_mail_bodyalt', 'type' => 'string', 'internal' => 'bodyAlt'], + 'messages_mail_bodymime' => ['name' => 'messages_mail_bodymime', 'type' => 'string', 'internal' => 'bodyMime'], + 'messages_mail_ical' => ['name' => 'messages_mail_ical', 'type' => 'string', 'internal' => 'ical'], + 'messages_mail_created_at' => ['name' => 'messages_mail_created_at', 'type' => 'DateTimeImmutable', 'internal' => 'createdAt'], + 'messages_mail_sent' => ['name' => 'messages_mail_sent', 'type' => 'DateTimeImmutable', 'internal' => 'createdAt'], + 'messages_mail_received' => ['name' => 'messages_mail_received', 'type' => 'DateTimeImmutable', 'internal' => 'createdAt'], + 'messages_mail_priority' => ['name' => 'messages_mail_priority', 'type' => 'int', 'internal' => 'priority'], + 'messages_mail_encoding' => ['name' => 'messages_mail_encoding', 'type' => 'string', 'internal' => 'encoding'], + 'messages_mail_contenttype' => ['name' => 'messages_mail_contenttype', 'type' => 'string', 'internal' => 'contentType'], + 'messages_mail_charset' => ['name' => 'messages_mail_charset', 'type' => 'string', 'internal' => 'charset'], + ]; + + /** + * Has many relation. + * + * @var array + * @since 1.0.0 + */ + public const HAS_MANY = [ + 'media' => [ + 'mapper' => MediaMapper::class, + 'table' => 'messages_mail_media', + 'external' => 'messages_mail_media_dst', + 'self' => 'messages_mail_media_src', + ], + ]; + + /** + * Belongs to. + * + * @var array + * @since 1.0.0 + */ + public const BELONGS_TO = [ + 'account' => [ + 'mapper' => AccountMapper::class, + 'external' => 'messages_mail_from_account', + ], + ]; + + /** + * Primary table. + * + * @var string + * @since 1.0.0 + */ + public const TABLE = 'messages_mail'; + + /** + * Created at. + * + * @var string + * @since 1.0.0 + */ + public const CREATED_AT = 'messages_mail_created_at'; + + /** + * Primary field name. + * + * @var string + * @since 1.0.0 + */ + public const PRIMARYFIELD = 'messages_mail_id'; +} diff --git a/Models/NullEmail.php b/Models/NullEmail.php new file mode 100644 index 0000000..21f2eae --- /dev/null +++ b/Models/NullEmail.php @@ -0,0 +1,47 @@ +id = $id; + parent::__construct(); + } + + /** + * {@inheritdoc} + */ + public function jsonSerialize() : mixed + { + return ['id' => $this->id]; + } +} diff --git a/Models/PermissionCategory.php b/Models/PermissionCategory.php index 1a77b18..90ba491 100755 --- a/Models/PermissionCategory.php +++ b/Models/PermissionCategory.php @@ -6,7 +6,7 @@ * * @package Modules\Messages\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum; * Permision state enum. * * @package Modules\Messages\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/Server.php b/Models/Server.php new file mode 100644 index 0000000..e69de29 diff --git a/Models/ServerMapper.php b/Models/ServerMapper.php new file mode 100644 index 0000000..e69de29 diff --git a/Theme/Backend/Lang/Navigation.ar.lang.php b/Theme/Backend/Lang/Navigation.ar.lang.php index 5b5898f..b6bf287 100755 --- a/Theme/Backend/Lang/Navigation.ar.lang.php +++ b/Theme/Backend/Lang/Navigation.ar.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.cs.lang.php b/Theme/Backend/Lang/Navigation.cs.lang.php index d9d6623..21faf46 100755 --- a/Theme/Backend/Lang/Navigation.cs.lang.php +++ b/Theme/Backend/Lang/Navigation.cs.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.da.lang.php b/Theme/Backend/Lang/Navigation.da.lang.php index 888e154..907b874 100755 --- a/Theme/Backend/Lang/Navigation.da.lang.php +++ b/Theme/Backend/Lang/Navigation.da.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.de.lang.php b/Theme/Backend/Lang/Navigation.de.lang.php index 83d2e49..4adf3f4 100755 --- a/Theme/Backend/Lang/Navigation.de.lang.php +++ b/Theme/Backend/Lang/Navigation.de.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.el.lang.php b/Theme/Backend/Lang/Navigation.el.lang.php index 187754e..1cfa97c 100755 --- a/Theme/Backend/Lang/Navigation.el.lang.php +++ b/Theme/Backend/Lang/Navigation.el.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php index 3eafb9e..9c922b5 100755 --- a/Theme/Backend/Lang/Navigation.en.lang.php +++ b/Theme/Backend/Lang/Navigation.en.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.es.lang.php b/Theme/Backend/Lang/Navigation.es.lang.php index 722017e..b33d1e4 100755 --- a/Theme/Backend/Lang/Navigation.es.lang.php +++ b/Theme/Backend/Lang/Navigation.es.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.fi.lang.php b/Theme/Backend/Lang/Navigation.fi.lang.php index 6a284aa..ff49a36 100755 --- a/Theme/Backend/Lang/Navigation.fi.lang.php +++ b/Theme/Backend/Lang/Navigation.fi.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.fr.lang.php b/Theme/Backend/Lang/Navigation.fr.lang.php index 01e1ac4..bcfb46c 100755 --- a/Theme/Backend/Lang/Navigation.fr.lang.php +++ b/Theme/Backend/Lang/Navigation.fr.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.hu.lang.php b/Theme/Backend/Lang/Navigation.hu.lang.php index d1a18dc..ee99135 100755 --- a/Theme/Backend/Lang/Navigation.hu.lang.php +++ b/Theme/Backend/Lang/Navigation.hu.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.it.lang.php b/Theme/Backend/Lang/Navigation.it.lang.php index 3b868e5..65918d4 100755 --- a/Theme/Backend/Lang/Navigation.it.lang.php +++ b/Theme/Backend/Lang/Navigation.it.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.ja.lang.php b/Theme/Backend/Lang/Navigation.ja.lang.php index b022feb..020272f 100755 --- a/Theme/Backend/Lang/Navigation.ja.lang.php +++ b/Theme/Backend/Lang/Navigation.ja.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.ko.lang.php b/Theme/Backend/Lang/Navigation.ko.lang.php index 192bc1d..fdb809b 100755 --- a/Theme/Backend/Lang/Navigation.ko.lang.php +++ b/Theme/Backend/Lang/Navigation.ko.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.no.lang.php b/Theme/Backend/Lang/Navigation.no.lang.php index 3567478..472bc46 100755 --- a/Theme/Backend/Lang/Navigation.no.lang.php +++ b/Theme/Backend/Lang/Navigation.no.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.pl.lang.php b/Theme/Backend/Lang/Navigation.pl.lang.php index fdc40dd..6a93774 100755 --- a/Theme/Backend/Lang/Navigation.pl.lang.php +++ b/Theme/Backend/Lang/Navigation.pl.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.pt.lang.php b/Theme/Backend/Lang/Navigation.pt.lang.php index 64add18..1975124 100755 --- a/Theme/Backend/Lang/Navigation.pt.lang.php +++ b/Theme/Backend/Lang/Navigation.pt.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.ru.lang.php b/Theme/Backend/Lang/Navigation.ru.lang.php index 9456438..a44f2b4 100755 --- a/Theme/Backend/Lang/Navigation.ru.lang.php +++ b/Theme/Backend/Lang/Navigation.ru.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.sv.lang.php b/Theme/Backend/Lang/Navigation.sv.lang.php index 8ae34dd..f165ab0 100755 --- a/Theme/Backend/Lang/Navigation.sv.lang.php +++ b/Theme/Backend/Lang/Navigation.sv.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.th.lang.php b/Theme/Backend/Lang/Navigation.th.lang.php index 0fa4e83..e1cbc8c 100755 --- a/Theme/Backend/Lang/Navigation.th.lang.php +++ b/Theme/Backend/Lang/Navigation.th.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.tr.lang.php b/Theme/Backend/Lang/Navigation.tr.lang.php index bdfc6b6..3d50cbf 100755 --- a/Theme/Backend/Lang/Navigation.tr.lang.php +++ b/Theme/Backend/Lang/Navigation.tr.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.uk.lang.php b/Theme/Backend/Lang/Navigation.uk.lang.php index 17b6efa..4e85fe1 100755 --- a/Theme/Backend/Lang/Navigation.uk.lang.php +++ b/Theme/Backend/Lang/Navigation.uk.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/Navigation.zh.lang.php b/Theme/Backend/Lang/Navigation.zh.lang.php index 2748b61..40f5bd9 100755 --- a/Theme/Backend/Lang/Navigation.zh.lang.php +++ b/Theme/Backend/Lang/Navigation.zh.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/ar.lang.php b/Theme/Backend/Lang/ar.lang.php index a97fa0c..512d727 100755 --- a/Theme/Backend/Lang/ar.lang.php +++ b/Theme/Backend/Lang/ar.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/cs.lang.php b/Theme/Backend/Lang/cs.lang.php index c93f83e..ac3941e 100755 --- a/Theme/Backend/Lang/cs.lang.php +++ b/Theme/Backend/Lang/cs.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/da.lang.php b/Theme/Backend/Lang/da.lang.php index a7e7b9b..58f58aa 100755 --- a/Theme/Backend/Lang/da.lang.php +++ b/Theme/Backend/Lang/da.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php index cf59971..37ea10e 100755 --- a/Theme/Backend/Lang/de.lang.php +++ b/Theme/Backend/Lang/de.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/el.lang.php b/Theme/Backend/Lang/el.lang.php index 2f97f69..a4b6034 100755 --- a/Theme/Backend/Lang/el.lang.php +++ b/Theme/Backend/Lang/el.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php index 3298c69..23f09a8 100755 --- a/Theme/Backend/Lang/en.lang.php +++ b/Theme/Backend/Lang/en.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/es.lang.php b/Theme/Backend/Lang/es.lang.php index 087c9ff..59c0565 100755 --- a/Theme/Backend/Lang/es.lang.php +++ b/Theme/Backend/Lang/es.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/fi.lang.php b/Theme/Backend/Lang/fi.lang.php index 2ce5496..a25ce0b 100755 --- a/Theme/Backend/Lang/fi.lang.php +++ b/Theme/Backend/Lang/fi.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/fr.lang.php b/Theme/Backend/Lang/fr.lang.php index 856d303..142b0b0 100755 --- a/Theme/Backend/Lang/fr.lang.php +++ b/Theme/Backend/Lang/fr.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/hu.lang.php b/Theme/Backend/Lang/hu.lang.php index 47655b8..ce7ce72 100755 --- a/Theme/Backend/Lang/hu.lang.php +++ b/Theme/Backend/Lang/hu.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/it.lang.php b/Theme/Backend/Lang/it.lang.php index ec1a817..8806ad1 100755 --- a/Theme/Backend/Lang/it.lang.php +++ b/Theme/Backend/Lang/it.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/ja.lang.php b/Theme/Backend/Lang/ja.lang.php index 54099c8..a5da7a5 100755 --- a/Theme/Backend/Lang/ja.lang.php +++ b/Theme/Backend/Lang/ja.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/ko.lang.php b/Theme/Backend/Lang/ko.lang.php index 618cf35..e5aecc1 100755 --- a/Theme/Backend/Lang/ko.lang.php +++ b/Theme/Backend/Lang/ko.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/no.lang.php b/Theme/Backend/Lang/no.lang.php index dd2e021..f77fc8c 100755 --- a/Theme/Backend/Lang/no.lang.php +++ b/Theme/Backend/Lang/no.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/pl.lang.php b/Theme/Backend/Lang/pl.lang.php index 98ac6e2..756b928 100755 --- a/Theme/Backend/Lang/pl.lang.php +++ b/Theme/Backend/Lang/pl.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/pt.lang.php b/Theme/Backend/Lang/pt.lang.php index 4235791..02194e5 100755 --- a/Theme/Backend/Lang/pt.lang.php +++ b/Theme/Backend/Lang/pt.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/ru.lang.php b/Theme/Backend/Lang/ru.lang.php index 45378db..c0e0ea5 100755 --- a/Theme/Backend/Lang/ru.lang.php +++ b/Theme/Backend/Lang/ru.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/sv.lang.php b/Theme/Backend/Lang/sv.lang.php index b543df6..cc52a89 100755 --- a/Theme/Backend/Lang/sv.lang.php +++ b/Theme/Backend/Lang/sv.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/th.lang.php b/Theme/Backend/Lang/th.lang.php index 0757d86..336bc92 100755 --- a/Theme/Backend/Lang/th.lang.php +++ b/Theme/Backend/Lang/th.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/tr.lang.php b/Theme/Backend/Lang/tr.lang.php index 657499d..5b9104e 100755 --- a/Theme/Backend/Lang/tr.lang.php +++ b/Theme/Backend/Lang/tr.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/uk.lang.php b/Theme/Backend/Lang/uk.lang.php index 093d8c5..7ad6b58 100755 --- a/Theme/Backend/Lang/uk.lang.php +++ b/Theme/Backend/Lang/uk.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/Lang/zh.lang.php b/Theme/Backend/Lang/zh.lang.php index a597d5f..598d34d 100755 --- a/Theme/Backend/Lang/zh.lang.php +++ b/Theme/Backend/Lang/zh.lang.php @@ -6,7 +6,7 @@ * * @package Modules\Localization * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/mail-create.tpl.php b/Theme/Backend/mail-create.tpl.php index e899ece..350c1a7 100755 --- a/Theme/Backend/mail-create.tpl.php +++ b/Theme/Backend/mail-create.tpl.php @@ -6,7 +6,7 @@ * * @package Modules\Messages * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/mail-dashboard.tpl.php b/Theme/Backend/mail-dashboard.tpl.php index e26a968..1c0b86c 100755 --- a/Theme/Backend/mail-dashboard.tpl.php +++ b/Theme/Backend/mail-dashboard.tpl.php @@ -6,7 +6,7 @@ * * @package Modules\Messages * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -44,7 +44,7 @@ echo $this->getData('nav')->render(); ?> $value) : ++$count; - $url = UriFactory::build('{/lang}/{/app}/messages/mail/single?{?}&id=' . $value->uid); ?> + $url = UriFactory::build('{/base}/messages/mail/single?{?}&id=' . $value->uid); ?> printHtml($value->seen == 0 ? ' class="unseen"' : ''); ?>> @@ -66,7 +66,7 @@ echo $this->getData('nav')->render(); ?>
- getHtml('Create', '0', '0'); ?> + getHtml('Create', '0', '0'); ?>
diff --git a/Theme/Backend/mail-out-view.tpl.php b/Theme/Backend/mail-out-view.tpl.php index 357e583..ecc85ae 100755 --- a/Theme/Backend/mail-out-view.tpl.php +++ b/Theme/Backend/mail-out-view.tpl.php @@ -6,7 +6,7 @@ * * @package Modules\Messages * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/mail-spam-view.tpl.php b/Theme/Backend/mail-spam-view.tpl.php index 357e583..ecc85ae 100755 --- a/Theme/Backend/mail-spam-view.tpl.php +++ b/Theme/Backend/mail-spam-view.tpl.php @@ -6,7 +6,7 @@ * * @package Modules\Messages * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/mail-trash-view.tpl.php b/Theme/Backend/mail-trash-view.tpl.php index 357e583..ecc85ae 100755 --- a/Theme/Backend/mail-trash-view.tpl.php +++ b/Theme/Backend/mail-trash-view.tpl.php @@ -6,7 +6,7 @@ * * @package Modules\Messages * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/mail-view.tpl.php b/Theme/Backend/mail-view.tpl.php index adabe01..2574035 100755 --- a/Theme/Backend/mail-view.tpl.php +++ b/Theme/Backend/mail-view.tpl.php @@ -6,7 +6,7 @@ * * @package Modules\Messages * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/Theme/Backend/message-settings.tpl.php b/Theme/Backend/message-settings.tpl.php index f2cc5db..2829ae8 100755 --- a/Theme/Backend/message-settings.tpl.php +++ b/Theme/Backend/message-settings.tpl.php @@ -6,7 +6,7 @@ * * @package Modules\Messages * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Admin/AdminTest.php b/tests/Admin/AdminTest.php index ea36c8e..8388408 100755 --- a/tests/Admin/AdminTest.php +++ b/tests/Admin/AdminTest.php @@ -6,7 +6,7 @@ * * @package tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ diff --git a/tests/Autoloader.php b/tests/Autoloader.php index d032623..d08f1b7 100755 --- a/tests/Autoloader.php +++ b/tests/Autoloader.php @@ -6,7 +6,7 @@ * * @package Modules/tests * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -20,7 +20,7 @@ namespace tests; * Autoloader class. * * @package tests - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */