diff --git a/phpmyfaq/admin/assets/src/content/news.js b/phpmyfaq/admin/assets/src/content/news.js index ab5c753d7a..c3c71e816e 100644 --- a/phpmyfaq/admin/assets/src/content/news.js +++ b/phpmyfaq/admin/assets/src/content/news.js @@ -32,8 +32,6 @@ export const handleAddNews = () => { }); const data = { - dateStart: document.getElementById('dateStart').value, - dateEnd: document.getElementById('dateEnd').value, news: tinymce.get('editor').getContent(), newsHeader: document.getElementById('newsheader').value, authorName: document.getElementById('authorName').value, @@ -91,8 +89,6 @@ export const handleEditNews = () => { const data = { id: document.getElementById('id').value, csrfToken: document.getElementById('pmf-csrf-token').value, - dateStart: document.getElementById('dateStart').value, - dateEnd: document.getElementById('dateEnd').value, news: tinymce.get('editor').getContent(), newsHeader: document.getElementById('newsheader').value, authorName: document.getElementById('authorName').value, diff --git a/phpmyfaq/src/phpMyFAQ/Controller/Administration/NewsController.php b/phpmyfaq/src/phpMyFAQ/Controller/Administration/NewsController.php index 7db18f0da7..2e901627f5 100644 --- a/phpmyfaq/src/phpMyFAQ/Controller/Administration/NewsController.php +++ b/phpmyfaq/src/phpMyFAQ/Controller/Administration/NewsController.php @@ -30,6 +30,7 @@ use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; +use Symfony\Component\Routing\Annotation\Route; class NewsController extends AbstractController { @@ -49,8 +50,6 @@ public function create(Request $request): JsonResponse return $this->json(['error' => Translation::get('err_NotAuth')], Response::HTTP_UNAUTHORIZED); } - $dateStart = Filter::filterVar($data->dateStart, FILTER_SANITIZE_SPECIAL_CHARS); - $dateEnd = Filter::filterVar($data->dateEnd, FILTER_SANITIZE_SPECIAL_CHARS); $header = Filter::filterVar($data->newsHeader, FILTER_SANITIZE_SPECIAL_CHARS); $content = Filter::filterVar($data->news, FILTER_SANITIZE_SPECIAL_CHARS); $author = Filter::filterVar($data->authorName, FILTER_SANITIZE_SPECIAL_CHARS); @@ -71,8 +70,6 @@ public function create(Request $request): JsonResponse ->setEmail($email) ->setActive($active) ->setComment($comment) - ->setDateStart(new DateTime($dateStart)) - ->setDateEnd(new DateTime($dateEnd)) ->setLink($link ?? '') ->setLinkTitle($linkTitle ?? '') ->setLinkTarget($target ?? '') @@ -80,9 +77,9 @@ public function create(Request $request): JsonResponse if ($news->create($newsMessage)) { return $this->json(['success' => Translation::get('ad_news_updatesuc')], Response::HTTP_OK); - } else { - return $this->json(['error' => Translation::get('ad_news_insertfail')], Response::HTTP_BAD_GATEWAY); } + + return $this->json(['error' => Translation::get('ad_news_insertfail')], Response::HTTP_BAD_GATEWAY); } /** @@ -105,9 +102,9 @@ public function delete(Request $request): JsonResponse if ($news->delete((int)$deleteId)) { return $this->json(['success' => Translation::get('ad_news_delsuc')], Response::HTTP_OK); - } else { - return $this->json(['error' => Translation::get('ad_news_updatefail')], Response::HTTP_BAD_GATEWAY); } + + return $this->json(['error' => Translation::get('ad_news_updatefail')], Response::HTTP_BAD_GATEWAY); } /** @@ -127,8 +124,6 @@ public function update(Request $request): JsonResponse } $newsId = Filter::filterVar($data->id, FILTER_VALIDATE_INT); - $dateStart = Filter::filterVar($data->dateStart, FILTER_SANITIZE_SPECIAL_CHARS); - $dateEnd = Filter::filterVar($data->dateEnd, FILTER_SANITIZE_SPECIAL_CHARS); $header = Filter::filterVar($data->newsHeader, FILTER_SANITIZE_SPECIAL_CHARS); $content = Filter::filterVar($data->news, FILTER_SANITIZE_SPECIAL_CHARS); $author = Filter::filterVar($data->authorName, FILTER_SANITIZE_SPECIAL_CHARS); @@ -150,8 +145,6 @@ public function update(Request $request): JsonResponse ->setEmail($email) ->setActive($active) ->setComment($comment) - ->setDateStart(new DateTime($dateStart)) - ->setDateEnd(new DateTime($dateEnd)) ->setLink($link ?? '') ->setLinkTitle($linkTitle ?? '') ->setLinkTarget($target ?? '') @@ -159,11 +152,14 @@ public function update(Request $request): JsonResponse if ($news->update($newsMessage)) { return $this->json(['success' => Translation::get('ad_news_updatesuc')], Response::HTTP_OK); - } else { - return $this->json(['error' => Translation::get('ad_news_updatefail')], Response::HTTP_BAD_GATEWAY); } + + return $this->json(['error' => Translation::get('ad_news_updatefail')], Response::HTTP_BAD_GATEWAY); } + /** + * @throws Exception + */ #[Route('admin/api/news/activate')] public function activate(Request $request): JsonResponse { @@ -176,13 +172,13 @@ public function activate(Request $request): JsonResponse return $this->json(['error' => Translation::get('err_NotAuth')], Response::HTTP_UNAUTHORIZED); } - $id = Filter::filterVar($data->id, FILTER_VALIDATE_INT); + $newsId = Filter::filterVar($data->id, FILTER_VALIDATE_INT); $status = Filter::filterVar($data->status, FILTER_SANITIZE_SPECIAL_CHARS); - if ($news->activate($id, $status)) { + if ($news->activate($newsId, $status)) { return $this->json(['success' => Translation::get('ad_news_updatesuc')], Response::HTTP_OK); - } else { - return $this->json(['error' => Translation::get('ad_news_updatefail')], Response::HTTP_BAD_GATEWAY); } + + return $this->json(['error' => Translation::get('ad_news_updatefail')], Response::HTTP_BAD_GATEWAY); } }