diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 1d325c8..1021291 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -127,7 +127,7 @@ final class ApiController extends Controller public function apiNewsUpdate(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void { /** @var \Modules\News\Models\NewsArticle $old */ - $old = NewsArticleMapper::get()->where('id', (int) $request->getData('id'))->execute(); + $old = NewsArticleMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute(); $new = $this->updateNewsFromRequest($request, clone $old); $this->updateModel($request->header->account, $old, $new, NewsArticleMapper::class, 'news', $request->getOrigin()); @@ -310,7 +310,7 @@ final class ApiController extends Controller */ public function apiNewsGet(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void { - $news = NewsArticleMapper::get()->where('id', (int) $request->getData('id'))->execute(); + $news = NewsArticleMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute(); $this->createStandardReturnResponse($request, $response, $news); } @@ -329,7 +329,7 @@ final class ApiController extends Controller */ public function apiNewsDelete(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void { - $news = NewsArticleMapper::get()->with('files')->with('tags')->where('id', (int) $request->getData('id'))->execute(); + $news = NewsArticleMapper::get()->with('files')->with('tags')->where('id', $request->getDataInt('id') ?? 0)->execute(); $this->deleteModel($request->header->account, $news, NewsArticleMapper::class, 'news', $request->getOrigin()); $this->createStandardDeleteResponse($request, $response, $news); } diff --git a/Controller/BackendController.php b/Controller/BackendController.php index e2fa979..fde4a71 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -157,7 +157,7 @@ final class BackendController extends Controller implements DashboardElementInte ->where('status', NewsStatus::VISIBLE) ->where('publish', new \DateTime('now'), '<=') ->where('tags/title/language', $response->header->l11n->language) - ->where('id', (int) $request->getData('id')) + ->where('id', $request->getDataInt('id') ?? 0) ->execute(); $accountId = $request->header->account; @@ -181,14 +181,14 @@ final class BackendController extends Controller implements DashboardElementInte /** @var \Modules\News\Models\NewsSeen $seen */ $seen = NewsSeenMapper::get() - ->where('news', (int) $request->getData('id')) + ->where('news', $request->getDataInt('id') ?? 0) ->where('seenBy', $request->header->account) ->execute(); if ($seen->id === 0) { $seen = new NewsSeen(); $seen->seenBy = (int) $request->header->account; - $seen->news = (int) $request->getData('id'); + $seen->news = $request->getDataInt('id') ?? 0; $seen->seenAt = new \DateTime('now'); NewsSeenMapper::create()->execute($seen); diff --git a/Theme/Backend/news-create.tpl.php b/Theme/Backend/news-create.tpl.php index 3c887dd..13720f9 100755 --- a/Theme/Backend/news-create.tpl.php +++ b/Theme/Backend/news-create.tpl.php @@ -19,7 +19,7 @@ use Modules\News\Models\NullNewsArticle; use phpOMS\Uri\UriFactory; /** @var \Modules\News\Models\NewsArticle $news */ -$news = $this->getData('news') ?? new NullNewsArticle(); +$news = $this->data['news'] ?? new NullNewsArticle(); $isNewArticle = $news->id === 0; $languages = \phpOMS\Localization\ISO639Enum::getConstants(); @@ -43,7 +43,7 @@ echo $this->data['nav']->render(); ?>
- data['editor']->getData('text')->render('iNews', 'plain', 'docForm', $news->plain, $news->content); ?> + data['editor']->data['text']->render('iNews', 'plain', 'docForm', $news->plain, $news->content); ?>
@@ -129,7 +129,7 @@ echo $this->data['nav']->render(); ?> @todo Implement Tags for news
getHtml('Tags', 'Tag'); ?> - getData('tagSelector')->render('iTag', 'tag', 'fEditor', false); ?> + data['tagSelector']->render('iTag', 'tag', 'fEditor', false); ?>
--> @@ -143,7 +143,7 @@ echo $this->data['nav']->render(); ?> @todo add form this belongs to @todo make auto save on change for already created news article @todo add default values (some can be removed/overwritten and some not?) - getData('accGrpSelector')->render('iReceiver', 'receiver', false); ?> + data['accGrpSelector']->render('iReceiver', 'receiver', false); ?> diff --git a/Theme/Backend/news-view.tpl.php b/Theme/Backend/news-view.tpl.php index 644ceec..589aa06 100644 --- a/Theme/Backend/news-view.tpl.php +++ b/Theme/Backend/news-view.tpl.php @@ -68,11 +68,11 @@ echo $this->data['nav']->render(); ?> comments; if ($this->data['commentPermissions']['write'] && $commentList?->status === CommentListStatus::ACTIVE) : - echo $this->getData('commentCreate')->render(1); + echo $this->data['commentCreate']->render(1); endif; if ($this->data['commentPermissions']['list_modify'] || ($this->data['commentPermissions']['list_read'] && $commentList->status !== CommentListStatus::INACTIVE) ) : - echo $this->getData('commentList')->render($commentList); + echo $this->data['commentList']->render($commentList); endif;