From dad0683e2e543443f5278aea18a07015df15b937 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 30 May 2023 02:37:03 +0200 Subject: [PATCH 1/4] remove getId() --- Models/Email.php | 11 ----------- Models/EmailL11n.php | 11 ----------- 2 files changed, 22 deletions(-) diff --git a/Models/Email.php b/Models/Email.php index 217f977..f4d7e55 100755 --- 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 { diff --git a/Models/EmailL11n.php b/Models/EmailL11n.php index 4acf605..4267257 100644 --- 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 From 5f2b7d72a7b042bb5124253cb4d867795eb4619c Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 30 May 2023 03:42:48 +0200 Subject: [PATCH 2/4] use direct data access for response data --- Controller/ApiController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Controller/ApiController.php b/Controller/ApiController.php index cdfafe0..813958d 100755 --- 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; From 91dacab047a9da2438996965f3ac8218cd720c5a Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 30 May 2023 04:15:38 +0200 Subject: [PATCH 3/4] continue with getter/setter removal --- Controller/ApiController.php | 2 +- Controller/BackendController.php | 2 +- Theme/Backend/mail-templates.tpl.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 813958d..36bdf79 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -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') ?? ''; diff --git a/Controller/BackendController.php b/Controller/BackendController.php index d42a4e4..9dbc7a9 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -74,7 +74,7 @@ final class BackendController extends Controller ->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); diff --git a/Theme/Backend/mail-templates.tpl.php b/Theme/Backend/mail-templates.tpl.php index 6b86452..644511b 100755 --- a/Theme/Backend/mail-templates.tpl.php +++ b/Theme/Backend/mail-templates.tpl.php @@ -45,7 +45,7 @@ echo $this->getData('nav')->render(); ?> $url = UriFactory::build('{/base}/messages/template/single?{?}&id=' . $value->id); ?> - printHtml(empty($value->subject) ? $value->getL11nByLanguage($this->response->getLanguage())->subject : $value->subject); ?> + printHtml(empty($value->subject) ? $value->getL11nByLanguage($this->response->header->l11n->language)->subject : $value->subject); ?> printHtml($value->createdAt->format('Y-m-d')); ?> From 5d4695a85f651d2e981d2fb151f8a554d56e4b50 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 30 May 2023 15:44:21 +0200 Subject: [PATCH 4/4] Continue with getter/setter cleanup --- Controller/BackendController.php | 20 ++++++++++---------- Theme/Backend/mail-create.tpl.php | 2 +- Theme/Backend/mail-dashboard.tpl.php | 4 ++-- Theme/Backend/mail-out-view.tpl.php | 2 +- Theme/Backend/mail-spam-view.tpl.php | 2 +- Theme/Backend/mail-templates.tpl.php | 4 ++-- Theme/Backend/mail-trash-view.tpl.php | 2 +- Theme/Backend/mail-view.tpl.php | 2 +- Theme/Backend/message-settings.tpl.php | 2 +- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 9dbc7a9..5b0045e 100755 --- 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,7 +68,7 @@ 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') @@ -77,7 +77,7 @@ final class BackendController extends Controller ->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; } diff --git a/Theme/Backend/mail-create.tpl.php b/Theme/Backend/mail-create.tpl.php index 350c1a7..4eb2f81 100755 --- 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(); ?>
diff --git a/Theme/Backend/mail-dashboard.tpl.php b/Theme/Backend/mail-dashboard.tpl.php index 865d1d2..acdce41 100755 --- 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(); ?>
diff --git a/Theme/Backend/mail-out-view.tpl.php b/Theme/Backend/mail-out-view.tpl.php index ecc85ae..f8c0dc3 100755 --- 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(); ?>
    diff --git a/Theme/Backend/mail-spam-view.tpl.php b/Theme/Backend/mail-spam-view.tpl.php index ecc85ae..f8c0dc3 100755 --- 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(); ?>
      diff --git a/Theme/Backend/mail-templates.tpl.php b/Theme/Backend/mail-templates.tpl.php index 644511b..3131f24 100755 --- 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(); ?>
      diff --git a/Theme/Backend/mail-trash-view.tpl.php b/Theme/Backend/mail-trash-view.tpl.php index ecc85ae..f8c0dc3 100755 --- 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(); ?>
        diff --git a/Theme/Backend/mail-view.tpl.php b/Theme/Backend/mail-view.tpl.php index 2574035..ea2ed84 100755 --- 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(); ?>

        printHtml(\str_replace('_',' ', \mb_decode_mimeheader($mails['overview'][0]->subject))); ?>

        diff --git a/Theme/Backend/message-settings.tpl.php b/Theme/Backend/message-settings.tpl.php index 2829ae8..d80c514 100755 --- 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(); ?>

        getHtml('Mailboxes'); ?>