diff options
Diffstat (limited to 'app/Module/FrequentlyAskedQuestionsModule.php')
| -rw-r--r-- | app/Module/FrequentlyAskedQuestionsModule.php | 40 |
1 files changed, 21 insertions, 19 deletions
diff --git a/app/Module/FrequentlyAskedQuestionsModule.php b/app/Module/FrequentlyAskedQuestionsModule.php index 0141ebd91d..c424fc6930 100644 --- a/app/Module/FrequentlyAskedQuestionsModule.php +++ b/app/Module/FrequentlyAskedQuestionsModule.php @@ -135,7 +135,7 @@ class FrequentlyAskedQuestionsModule extends AbstractModule implements ModuleCon $faqs = $this->faqsForTree($tree); - $min_block_order = DB::table('block') + $min_block_order = (int) DB::table('block') ->where('module_name', '=', $this->name()) ->where(static function (Builder $query) use ($tree): void { $query @@ -144,7 +144,7 @@ class FrequentlyAskedQuestionsModule extends AbstractModule implements ModuleCon }) ->min('block_order'); - $max_block_order = DB::table('block') + $max_block_order = (int) DB::table('block') ->where('module_name', '=', $this->name()) ->where(static function (Builder $query) use ($tree): void { $query @@ -174,12 +174,10 @@ class FrequentlyAskedQuestionsModule extends AbstractModule implements ModuleCon */ public function postAdminAction(ServerRequestInterface $request): ResponseInterface { - $params = (array) $request->getParsedBody(); - return redirect(route('module', [ 'module' => $this->name(), 'action' => 'Admin', - 'tree' => $params['tree'] ?? '', + 'tree' => Validator::parsedBody($request)->string('tree'), ])); } @@ -190,7 +188,7 @@ class FrequentlyAskedQuestionsModule extends AbstractModule implements ModuleCon */ public function postAdminDeleteAction(ServerRequestInterface $request): ResponseInterface { - $block_id = (int) $request->getQueryParams()['block_id']; + $block_id = Validator::queryParams($request)->integer('block_id'); DB::table('block_setting')->where('block_id', '=', $block_id)->delete(); @@ -211,7 +209,7 @@ class FrequentlyAskedQuestionsModule extends AbstractModule implements ModuleCon */ public function postAdminMoveDownAction(ServerRequestInterface $request): ResponseInterface { - $block_id = (int) $request->getQueryParams()['block_id']; + $block_id = Validator::queryParams($request)->integer('block_id'); $block_order = DB::table('block') ->where('block_id', '=', $block_id) @@ -247,7 +245,7 @@ class FrequentlyAskedQuestionsModule extends AbstractModule implements ModuleCon */ public function postAdminMoveUpAction(ServerRequestInterface $request): ResponseInterface { - $block_id = (int) $request->getQueryParams()['block_id']; + $block_id = Validator::queryParams($request)->integer('block_id'); $block_order = DB::table('block') ->where('block_id', '=', $block_id) @@ -285,7 +283,7 @@ class FrequentlyAskedQuestionsModule extends AbstractModule implements ModuleCon { $this->layout = 'layouts/administration'; - $block_id = (int) ($request->getQueryParams()['block_id'] ?? 0); + $block_id = Validator::queryParams($request)->integer('block_id', 0); if ($block_id === 0) { // Creating a new faq @@ -336,15 +334,12 @@ class FrequentlyAskedQuestionsModule extends AbstractModule implements ModuleCon */ public function postAdminEditAction(ServerRequestInterface $request): ResponseInterface { - $block_id = (int) ($request->getQueryParams()['block_id'] ?? 0); - - $params = (array) $request->getParsedBody(); - - $body = $params['body']; - $header = $params['header']; - $languages = $params['languages'] ?? []; - $gedcom_id = $params['gedcom_id']; - $block_order = (int) $params['block_order']; + $block_id = Validator::queryParams($request)->integer('block_id', 0); + $body = Validator::parsedBody($request)->string('body'); + $header = Validator::parsedBody($request)->string('header'); + $languages = Validator::parsedBody($request)->array('languages'); + $gedcom_id = Validator::parsedBody($request)->string('gedcom_id'); + $block_order = Validator::parsedBody($request)->integer('block_order'); if ($gedcom_id === '') { $gedcom_id = null; @@ -426,7 +421,14 @@ class FrequentlyAskedQuestionsModule extends AbstractModule implements ModuleCon }) ->orderBy('block_order') ->select(['block.block_id', 'block_order', 'gedcom_id', 'bs1.setting_value AS header', 'bs2.setting_value AS faqbody', 'bs3.setting_value AS languages']) - ->get(); + ->get() + ->map(static function (object $row): object { + $row->block_id = (int) $row->block_id; + $row->block_order = (int) $row->block_order; + $row->gedcom_id = (int) $row->gedcom_id; + + return $row; + }); } /** |