From ef734384ae940903ccf17ad6ccba904ab034f879 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 30 May 2023 04:15:42 +0200 Subject: [PATCH] continue with getter/setter removal --- Controller/ApiController.php | 22 +++++++++++----------- Controller/BackendController.php | 12 ++++++------ 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Controller/ApiController.php b/Controller/ApiController.php index d5550c7..dfce17b 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -117,7 +117,7 @@ final class ApiController extends Controller $response, NotificationLevel::OK, '', - $this->app->l11nManager->getText($response->getLanguage(), '0', '0', 'SucessfulCreate'), + $this->app->l11nManager->getText($response->header->l11n->language, '0', '0', 'SucessfulCreate'), $task ); } @@ -386,7 +386,7 @@ final class ApiController extends Controller $response, NotificationLevel::OK, '', - $this->app->l11nManager->getText($response->getLanguage(), '0', '0', 'SucessfulUpdate'), + $this->app->l11nManager->getText($response->header->l11n->language, '0', '0', 'SucessfulUpdate'), $new ); } @@ -491,7 +491,7 @@ final class ApiController extends Controller $response, NotificationLevel::OK, '', - $this->app->l11nManager->getText($response->getLanguage(), '0', '0', 'SucessfulCreate'), + $this->app->l11nManager->getText($response->header->l11n->language, '0', '0', 'SucessfulCreate'), $element ); } @@ -726,7 +726,7 @@ final class ApiController extends Controller $response, NotificationLevel::OK, '', - $this->app->l11nManager->getText($response->getLanguage(), '0', '0', 'SucessfulUpdate'), + $this->app->l11nManager->getText($response->header->l11n->language, '0', '0', 'SucessfulUpdate'), $new ); } @@ -798,7 +798,7 @@ final class ApiController extends Controller $response, NotificationLevel::OK, '', - $this->app->l11nManager->getText($response->getLanguage(), '0', '0', 'SucessfulCreate'), + $this->app->l11nManager->getText($response->header->l11n->language, '0', '0', 'SucessfulCreate'), $attribute ); } @@ -884,7 +884,7 @@ final class ApiController extends Controller $response, NotificationLevel::OK, '', - $this->app->l11nManager->getText($response->getLanguage(), '0', '0', 'SucessfulCreate'), + $this->app->l11nManager->getText($response->header->l11n->language, '0', '0', 'SucessfulCreate'), $attrL11n ); } @@ -903,7 +903,7 @@ final class ApiController extends Controller $attrL11n = new BaseStringL11n(); $attrL11n->ref = $request->getDataInt('type') ?? 0; $attrL11n->setLanguage( - $request->getDataString('language') ?? $request->getLanguage() + $request->getDataString('language') ?? $request->header->l11n->language ); $attrL11n->content = $request->getDataString('title') ?? ''; @@ -961,7 +961,7 @@ final class ApiController extends Controller $response, NotificationLevel::OK, '', - $this->app->l11nManager->getText($response->getLanguage(), '0', '0', 'SucessfulCreate'), + $this->app->l11nManager->getText($response->header->l11n->language, '0', '0', 'SucessfulCreate'), $attrType ); } @@ -1047,7 +1047,7 @@ final class ApiController extends Controller $response, NotificationLevel::OK, '', - $this->app->l11nManager->getText($response->getLanguage(), '0', '0', 'SucessfulCreate'), + $this->app->l11nManager->getText($response->header->l11n->language, '0', '0', 'SucessfulCreate'), $attrValue ); } @@ -1130,7 +1130,7 @@ final class ApiController extends Controller $response, NotificationLevel::OK, '', - $this->app->l11nManager->getText($response->getLanguage(), '0', '0', 'SucessfulCreate'), + $this->app->l11nManager->getText($response->header->l11n->language, '0', '0', 'SucessfulCreate'), $attrL11n ); } @@ -1149,7 +1149,7 @@ final class ApiController extends Controller $attrL11n = new BaseStringL11n(); $attrL11n->ref = $request->getDataInt('value') ?? 0; $attrL11n->setLanguage( - $request->getDataString('language') ?? $request->getLanguage() + $request->getDataString('language') ?? $request->header->l11n->language ); $attrL11n->content = $request->getDataString('title') ?? ''; diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 300cf30..3c5030b 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -72,7 +72,7 @@ final class BackendController extends Controller implements DashboardElementInte ->with('tags') ->with('tags/title') ->where('status', TaskStatus::OPEN, '!=') - ->where('tags/title/language', $response->getLanguage()) + ->where('tags/title/language', $response->header->l11n->language) ->sort('createdAt', OrderType::DESC) ->limit(25); @@ -108,7 +108,7 @@ final class BackendController extends Controller implements DashboardElementInte ->with('createdBy') ->with('tags') ->with('tags/title') - ->where('tags/title/language', $response->getLanguage()) + ->where('tags/title/language', $response->header->l11n->language) ->where('status', TaskStatus::OPEN) ->sort('createdAt', OrderType::DESC) ->query($openQuery) @@ -140,7 +140,7 @@ final class BackendController extends Controller implements DashboardElementInte ->sort('taskElements/createdAt', OrderType::DESC) ->limit(5) ->where('id', 0, '>') - ->where('tags/title/language', $response->getLanguage()) + ->where('tags/title/language', $response->header->l11n->language) ->execute(); $view->addData('tasks', $tasks); @@ -176,8 +176,8 @@ final class BackendController extends Controller implements DashboardElementInte $view->setTemplate('/Web/Backend/Error/403'); $this->app->loadLanguageFromPath( - $response->getLanguage(), - __DIR__ . '/../../../Web/Backend/Error/lang/' . $response->getLanguage() . '.lang.php' + $response->header->l11n->language, + __DIR__ . '/../../../Web/Backend/Error/lang/' . $response->header->l11n->language . '.lang.php' ); return $view; @@ -199,7 +199,7 @@ final class BackendController extends Controller implements DashboardElementInte ->with('taskElements/accRelation') ->with('taskElements/accRelation/relation') ->where('id', (int) $request->getData('id')) - ->where('tags/title/language', $request->getLanguage()) + ->where('tags/title/language', $request->header->l11n->language) ->execute(); $accountId = $request->header->account;