From 18043d4d4cc19f71b96aef1030f463408b31d509 Mon Sep 17 00:00:00 2001 From: veronikaplenta Date: Fri, 6 Sep 2024 13:47:49 +0200 Subject: [PATCH] #150 --- .../Contao/Model/PlentaJobsBasicOfferModel.php | 7 +++---- .../PlentaJobsBasicJobOfferDetailsController.php | 5 +---- .../Contao/FrontendModule/JobOfferListController.php | 6 +++--- .../Contao/FrontendModule/JobOfferReaderController.php | 7 ++----- .../Contao/Hooks/ChangelanguageNavigationListener.php | 6 ++---- .../EventListener/Contao/InsertTagListener.php | 6 +----- 6 files changed, 12 insertions(+), 25 deletions(-) diff --git a/src/Plenta/ContaoJobsBasic/Contao/Model/PlentaJobsBasicOfferModel.php b/src/Plenta/ContaoJobsBasic/Contao/Model/PlentaJobsBasicOfferModel.php index cdeded0..324a08f 100644 --- a/src/Plenta/ContaoJobsBasic/Contao/Model/PlentaJobsBasicOfferModel.php +++ b/src/Plenta/ContaoJobsBasic/Contao/Model/PlentaJobsBasicOfferModel.php @@ -13,7 +13,6 @@ namespace Plenta\ContaoJobsBasic\Contao\Model; use Composer\InstalledVersions; -use Contao\Config; use Contao\Model; use Contao\ModuleModel; use Contao\PageModel; @@ -210,7 +209,7 @@ public function getAbsoluteUrl($language) } $params = $this->getParams($language); - return ampersand($objPage->getAbsoluteUrl($params)); + return StringUtil::ampersand($objPage->getAbsoluteUrl($params)); } public function getFrontendUrl($language) @@ -221,7 +220,7 @@ public function getFrontendUrl($language) } $params = $this->getParams($language); - return ampersand($objPage->getAbsoluteUrl($params)); + return StringUtil::ampersand($objPage->getAbsoluteUrl($params)); } protected function getParams($language) @@ -231,6 +230,6 @@ protected function getParams($language) $alias = $translation['alias']; } - return (Config::get('useAutoItem') ? '/' : '/items/').($alias ?: $this->id); + return '/'.($alias ?: $this->id); } } diff --git a/src/Plenta/ContaoJobsBasic/Controller/Contao/ContentElement/PlentaJobsBasicJobOfferDetailsController.php b/src/Plenta/ContaoJobsBasic/Controller/Contao/ContentElement/PlentaJobsBasicJobOfferDetailsController.php index 11aa17a..a7b72f2 100644 --- a/src/Plenta/ContaoJobsBasic/Controller/Contao/ContentElement/PlentaJobsBasicJobOfferDetailsController.php +++ b/src/Plenta/ContaoJobsBasic/Controller/Contao/ContentElement/PlentaJobsBasicJobOfferDetailsController.php @@ -58,10 +58,7 @@ public function getJobOffer($language = null): ?PlentaJobsBasicOfferModel return $this->jobOffer; } - if (!isset($_GET['items']) && isset($_GET['auto_item']) && Config::get('useAutoItem')) { - Input::setGet('items', Input::get('auto_item')); - } - $alias = Input::get('items'); + $alias = Input::get('auto_item'); if (null === $alias) { return null; diff --git a/src/Plenta/ContaoJobsBasic/Controller/Contao/FrontendModule/JobOfferListController.php b/src/Plenta/ContaoJobsBasic/Controller/Contao/FrontendModule/JobOfferListController.php index 8968343..741b79d 100644 --- a/src/Plenta/ContaoJobsBasic/Controller/Contao/FrontendModule/JobOfferListController.php +++ b/src/Plenta/ContaoJobsBasic/Controller/Contao/FrontendModule/JobOfferListController.php @@ -68,11 +68,11 @@ public function generateJobOfferUrl(PlentaJobsBasicOfferModel $jobOffer, ModuleM $objPage = $model->getRelated('jumpTo'); if (!$objPage instanceof PageModel) { - $url = ampersand(Environment::get('request')); + $url = StringUtil::ampersand(Environment::get('request')); } else { - $params = (Config::get('useAutoItem') ? '/' : '/items/').($this->metaFieldsHelper->getMetaFields($jobOffer)['alias'] ?: $jobOffer->id); + $params = '/'.($this->metaFieldsHelper->getMetaFields($jobOffer)['alias'] ?: $jobOffer->id); - $url = ampersand($objPage->getFrontendUrl($params)); + $url = StringUtil::ampersand($objPage->getFrontendUrl($params)); } return $url; diff --git a/src/Plenta/ContaoJobsBasic/Controller/Contao/FrontendModule/JobOfferReaderController.php b/src/Plenta/ContaoJobsBasic/Controller/Contao/FrontendModule/JobOfferReaderController.php index f327f59..9b6f4c5 100644 --- a/src/Plenta/ContaoJobsBasic/Controller/Contao/FrontendModule/JobOfferReaderController.php +++ b/src/Plenta/ContaoJobsBasic/Controller/Contao/FrontendModule/JobOfferReaderController.php @@ -88,10 +88,7 @@ protected function getResponse(Template $template, ModuleModel $model, Request $ $template->back = $GLOBALS['TL_LANG']['MSC']['goBack']; } - if (!isset($_GET['items']) && isset($_GET['auto_item']) && Config::get('useAutoItem')) { - Input::setGet('items', Input::get('auto_item')); - } - $alias = Input::get('items'); + $alias = Input::get('auto_item'); $jobOffer = PlentaJobsBasicOfferModel::findPublishedByIdOrAlias($alias); @@ -359,7 +356,7 @@ private function setMetaDescription( ): void { if ($jobOffer->pageDescription || (null !== $translation)) { - $htmlHeadBag->setMetaDescription($htmlDecoder->inputEncodedToPlainText($jobOffer->pageDescription)); + $htmlHeadBag->setMetaDescription($htmlDecoder->inputEncodedToPlainText((string) $jobOffer->pageDescription)); if (null !== $translation) { $htmlHeadBag->setMetaDescription($htmlDecoder->inputEncodedToPlainText($translation['description'])); diff --git a/src/Plenta/ContaoJobsBasic/EventListener/Contao/Hooks/ChangelanguageNavigationListener.php b/src/Plenta/ContaoJobsBasic/EventListener/Contao/Hooks/ChangelanguageNavigationListener.php index 166937c..f436353 100644 --- a/src/Plenta/ContaoJobsBasic/EventListener/Contao/Hooks/ChangelanguageNavigationListener.php +++ b/src/Plenta/ContaoJobsBasic/EventListener/Contao/Hooks/ChangelanguageNavigationListener.php @@ -31,10 +31,8 @@ public function onChangelanguageNavigation(ChangelanguageNavigationEvent $event) { $targetRoot = $event->getNavigationItem()->getRootPage(); $language = $targetRoot->language; - if (!isset($_GET['items']) && isset($_GET['auto_item']) && Config::get('useAutoItem')) { - Input::setGet('items', Input::get('auto_item', false, true)); - } - $alias = Input::get('items'); + + $alias = Input::get('auto_item', false, true); if ($alias) { $jobOffer = PlentaJobsBasicOfferModel::findPublishedByIdOrAlias($alias); diff --git a/src/Plenta/ContaoJobsBasic/EventListener/Contao/InsertTagListener.php b/src/Plenta/ContaoJobsBasic/EventListener/Contao/InsertTagListener.php index 2732849..de18351 100644 --- a/src/Plenta/ContaoJobsBasic/EventListener/Contao/InsertTagListener.php +++ b/src/Plenta/ContaoJobsBasic/EventListener/Contao/InsertTagListener.php @@ -80,11 +80,7 @@ public function __invoke(string $tag) public function handleAutoItem(): void { if (null === $this->autoItem) { - if (!isset($_GET['items']) && isset($_GET['auto_item']) && Config::get('useAutoItem')) { - Input::setGet('items', Input::get('auto_item', false, true)); - } - - $this->autoItem = Input::get('items'); + $this->autoItem = Input::get('auto_item', false, true); } } }