Merge branch 'develop' of https://github.com/Karaka-Management/oms-Messages into develop

2026-02-04 19:48:42 +00:00 · 2023-05-30 13:58:32 +00:00 · 2023-05-30 13:58:32 +00:00 · 77486c9c13
commit 77486c9c13
parent 9c9d5708b1 5d4695a85f
12 changed files with 25 additions and 47 deletions
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@ -51,7 +51,7 @@ final class ApiController extends Controller
    public function apiEmailCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
    {
        if (!empty($val = $this->validateEmailCreate($request))) {
-            $response->set('email_create', new FormValidation($val));
+            $response->data['email_create'] = new FormValidation($val);
            $response->header->status = RequestStatusCode::R_400;

            return;
@ -161,7 +161,7 @@ final class ApiController extends Controller
    public function apiEmailL11nCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
    {
        if (!empty($val = $this->validateEmailL11nCreate($request))) {
-            $response->set('email_l11n_create', new FormValidation($val));
+            $response->data['email_l11n_create'] = new FormValidation($val);
            $response->header->status = RequestStatusCode::R_400;

            return;
@ -186,7 +186,7 @@ final class ApiController extends Controller
        $itemL11n        = new EmailL11n();
        $itemL11n->email = $request->getDataInt('email') ?? 0;
        $itemL11n->setLanguage(
-            $request->getDataString('language') ?? $request->getLanguage()
+            $request->getDataString('language') ?? $request->header->l11n->language
        );
        $itemL11n->subject = $request->getDataString('subject') ?? '';
        $itemL11n->body    = $request->getDataString('body') ?? '';
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@ -47,7 +47,7 @@ final class BackendController extends Controller
    {
        $view = new View($this->app->l11nManager, $request, $response);
        $view->setTemplate('/Modules/Messages/Theme/Backend/mail-dashboard');
-        $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001201001, $request, $response));
+        $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001201001, $request, $response);

        return $view;
    }
@ -68,16 +68,16 @@ final class BackendController extends Controller
    {
        $view = new View($this->app->l11nManager, $request, $response);
        $view->setTemplate('/Modules/Messages/Theme/Backend/mail-templates');
-        $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001201001, $request, $response));
+        $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001201001, $request, $response);

        $templates = EmailMapper::getAll()
            ->with('l11n')
            ->where('isTemplate', true)
            ->where('account', $request->header->account)
-            ->where('l11n/language', $response->getLanguage())
+            ->where('l11n/language', $response->header->l11n->language)
            ->execute();

-        $view->setData('templates', $templates);
+        $view->data['templates'] = $templates;

        return $view;
    }
@ -98,7 +98,7 @@ final class BackendController extends Controller
    {
        $view = new View($this->app->l11nManager, $request, $response);
        $view->setTemplate('/Modules/Messages/Theme/Backend/mail-out-view');
-        $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001201001, $request, $response));
+        $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001201001, $request, $response);

        return $view;
    }
@ -119,7 +119,7 @@ final class BackendController extends Controller
    {
        $view = new View($this->app->l11nManager, $request, $response);
        $view->setTemplate('/Modules/Messages/Theme/Backend/mail-trash-view');
-        $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001201001, $request, $response));
+        $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001201001, $request, $response);

        return $view;
    }
@ -140,7 +140,7 @@ final class BackendController extends Controller
    {
        $view = new View($this->app->l11nManager, $request, $response);
        $view->setTemplate('/Modules/Messages/Theme/Backend/mail-spam-view');
-        $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001201001, $request, $response));
+        $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001201001, $request, $response);

        return $view;
    }
@ -161,8 +161,8 @@ final class BackendController extends Controller
    {
        $view = new View($this->app->l11nManager, $request, $response);
        $view->setTemplate('/Modules/Messages/Theme/Backend/mail-view');
-        $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001201001, $request, $response));
-        $view->addData('id', (int) $request->getData('id'));
+        $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001201001, $request, $response);
+        $view->data['id'] = (int) $request->getData('id');

        return $view;
    }
@ -183,7 +183,7 @@ final class BackendController extends Controller
    {
        $view = new View($this->app->l11nManager, $request, $response);
        $view->setTemplate('/Modules/Messages/Theme/Backend/mail-create');
-        $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001201001, $request, $response));
+        $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001201001, $request, $response);

        return $view;
    }
@ -204,7 +204,7 @@ final class BackendController extends Controller
    {
        $view = new View($this->app->l11nManager, $request, $response);
        $view->setTemplate('/Modules/Messages/Theme/Backend/message-settings');
-        $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001201001, $request, $response));
+        $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1001201001, $request, $response);

        return $view;
    }
--- a/Models/Email.php
+++ b/Models/Email.php
@ -59,17 +59,6 @@ class Email extends MailEmail implements \JsonSerializable
        $this->createdAt = new \DateTimeImmutable('now');
    }

-    /**
-     * Get id
-     *
-     * @return int
-     *
-     * @since 1.0.0
-     */
-    public function getId() : int
-    {
-        return $this->id;
-    }

    public function getL11nByLanguage(string $language) : EmailL11n
    {
--- a/Models/EmailL11n.php
+++ b/Models/EmailL11n.php
@ -74,17 +74,6 @@ class EmailL11n implements \JsonSerializable
     */
    public string $bodyAlt = '';

-    /**
-     * Get id
-     *
-     * @return int
-     *
-     * @since 1.0.0
-     */
-    public function getId() : int
-    {
-        return $this->id;
-    }

    /**
     * Get language
--- a/Theme/Backend/mail-create.tpl.php
+++ b/Theme/Backend/mail-create.tpl.php
@ -12,7 +12,7 @@
 */
 declare(strict_types=1);

-echo $this->getData('nav')->render(); ?>
+echo $this->data['nav']->render(); ?>

 <section class="box w-100">
    <div class="inner">
--- a/Theme/Backend/mail-dashboard.tpl.php
+++ b/Theme/Backend/mail-dashboard.tpl.php
@ -22,12 +22,12 @@ $seen = $mail->getInboxSeen();
 $quota = $mail->getQuota();
 */

-$messages = $this->getData('messages') ?? [];
+$messages = $this->data['messages'] ?? [];

 $previous = empty($messages) ? 'messages/dashboard' : 'messages/dashboard?{?}&id=' . \reset($messages)->id . '&ptype=p';
 $next     = empty($messages) ? 'messages/dashboard' : 'messages/dashboard?{?}&id=' . \end($messages)->id . '&ptype=n';

-echo $this->getData('nav')->render(); ?>
+echo $this->data['nav']->render(); ?>

 <div class="row">
    <div class="col-xs-12 col-md-9">
--- a/Theme/Backend/mail-out-view.tpl.php
+++ b/Theme/Backend/mail-out-view.tpl.php
@ -17,7 +17,7 @@ $mail->connect('{imap.gmail.com:993/imap/ssl}[Gmail]/Gesendet', 'dev.orange.mana
 $sent  = $mail->getInboxAll();
 $quota = $mail->getQuota();

-echo $this->getData('nav')->render(); ?>
+echo $this->data['nav']->render(); ?>

 <section class="box w-100">
    <ul class="btns floatLeft">
--- a/Theme/Backend/mail-spam-view.tpl.php
+++ b/Theme/Backend/mail-spam-view.tpl.php
@ -17,7 +17,7 @@ $mail->connect('{imap.gmail.com:993/imap/ssl}[Gmail]/Gesendet', 'dev.orange.mana
 $sent  = $mail->getInboxAll();
 $quota = $mail->getQuota();

-echo $this->getData('nav')->render(); ?>
+echo $this->data['nav']->render(); ?>

 <section class="box w-100">
    <ul class="btns floatLeft">
--- a/Theme/Backend/mail-templates.tpl.php
+++ b/Theme/Backend/mail-templates.tpl.php
@ -22,12 +22,12 @@ $seen = $mail->getInboxSeen();
 $quota = $mail->getQuota();
 */

-$messages = $this->getData('templates') ?? [];
+$messages = $this->data['templates'] ?? [];

 $previous = empty($messages) ? 'messages/dashboard' : 'messages/dashboard?{?}&id=' . \reset($messages)->id . '&ptype=p';
 $next     = empty($messages) ? 'messages/dashboard' : 'messages/dashboard?{?}&id=' . \end($messages)->id . '&ptype=n';

-echo $this->getData('nav')->render(); ?>
+echo $this->data['nav']->render(); ?>

 <div class="row">
    <div class="col-xs-12 col-md-9">
@ -45,7 +45,7 @@ echo $this->getData('nav')->render(); ?>
                $url = UriFactory::build('{/base}/messages/template/single?{?}&id=' . $value->id); ?>
                <tr>
                    <td><span class="check"><input type="checkbox" name=""></span>
-                    <td><a href="<?= $url; ?>"><?= $this->printHtml(empty($value->subject) ? $value->getL11nByLanguage($this->response->getLanguage())->subject : $value->subject); ?></a>
+                    <td><a href="<?= $url; ?>"><?= $this->printHtml(empty($value->subject) ? $value->getL11nByLanguage($this->response->header->l11n->language)->subject : $value->subject); ?></a>
                    <td><a href="<?= $url; ?>"><?= $this->printHtml($value->createdAt->format('Y-m-d')); ?></a>
            <?php endforeach; ?>
            <?php if ($count === 0) : ?>
--- a/Theme/Backend/mail-trash-view.tpl.php
+++ b/Theme/Backend/mail-trash-view.tpl.php
@ -17,7 +17,7 @@ $mail->connect('{imap.gmail.com:993/imap/ssl}[Gmail]/Gesendet', 'dev.orange.mana
 $sent  = $mail->getInboxAll();
 $quota = $mail->getQuota();

-echo $this->getData('nav')->render(); ?>
+echo $this->data['nav']->render(); ?>

 <section class="box w-100">
    <ul class="btns floatLeft">
--- a/Theme/Backend/mail-view.tpl.php
+++ b/Theme/Backend/mail-view.tpl.php
@ -16,7 +16,7 @@ $mail = new \phpOMS\Message\Mail\Imap();
 $mail->connect('{imap.gmail.com:993/imap/ssl}INBOX', 'dev.orange.management@gmail.com', 'DEV_PASSWORD');
 $mails = $mail->getEmail($this->getData('id'));

-echo $this->getData('nav')->render(); ?>
+echo $this->data['nav']->render(); ?>

 <section class="box w-100">
    <header><h1><?= $this->printHtml(\str_replace('_',' ', \mb_decode_mimeheader($mails['overview'][0]->subject))); ?></h1></header>
--- a/Theme/Backend/message-settings.tpl.php
+++ b/Theme/Backend/message-settings.tpl.php
@ -16,7 +16,7 @@ $mail = new \phpOMS\Message\Mail\Imap();
 $mail->connect('{imap.gmail.com:993/imap/ssl}', 'dev.orange.management@gmail.com', 'DEV_PASSWORD');
 $boxes = $mail->getBoxes();

-echo $this->getData('nav')->render(); ?>
+echo $this->data['nav']->render(); ?>

 <section class="box w-33">
    <header><h1><?= $this->getHtml('Mailboxes'); ?></h1></header>