valinor

HanashiDev · Oct 14, 2023 · ec47f1e · ec47f1e
1 parent b493c29
commit ec47f1e
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 6 deletions.
diff --git a/files/lib/acp/form/FaqQuestionEditForm.class.php b/files/lib/acp/form/FaqQuestionEditForm.class.php
@@ -2,8 +2,10 @@
 
 namespace wcf\acp\form;
 
+use CuyZ\Valinor\Mapper\MappingError;
 use wcf\data\faq\Question;
 use wcf\data\language\item\LanguageItemList;
+use wcf\http\Helper;
 use wcf\system\exception\IllegalLinkException;
 
 class FaqQuestionEditForm extends FaqQuestionAddForm
@@ -25,8 +27,17 @@ public function readParameters()
     {
         parent::readParameters();
 
-        if (isset($_REQUEST['id'])) {
-            $this->formObject = new Question((int)$_REQUEST['id']);
+        try {
+            $queryParameters = Helper::mapQueryParameters(
+                $_GET,
+                <<<'EOT'
+                    array {
+                        id: positive-int
+                    }
+                    EOT
+            );
+
+            $this->formObject = new Question($queryParameters['id']);
             if (!$this->formObject->questionID) {
                 throw new IllegalLinkException();
             }
@@ -40,7 +51,7 @@ public function readParameters()
                     $this->multiLingualAnswers[$languageItem->languageID] = $languageItem->languageItemValue;
                 }
             }
-        } else {
+        } catch (MappingError) {
             throw new IllegalLinkException();
         }
     }

diff --git a/files/lib/page/FaqQuestionPage.class.php b/files/lib/page/FaqQuestionPage.class.php
@@ -2,7 +2,9 @@
 
 namespace wcf\page;
 
+use CuyZ\Valinor\Mapper\MappingError;
 use wcf\data\faq\Question;
+use wcf\http\Helper;
 use wcf\system\exception\IllegalLinkException;
 use wcf\system\message\embedded\object\MessageEmbeddedObjectManager;
 use wcf\system\WCF;
@@ -23,8 +25,17 @@ public function readParameters()
     {
         parent::readParameters();
 
-        if (isset($_REQUEST['id'])) {
-            $this->question = new Question((int)$_REQUEST['id']);
+        try {
+            $queryParameters = Helper::mapQueryParameters(
+                $_GET,
+                <<<'EOT'
+                    array {
+                        id: positive-int
+                    }
+                    EOT
+            );
+
+            $this->question = new Question($queryParameters['id']);
             if (!$this->question->questionID || !$this->question->isAccessible()) {
                 throw new IllegalLinkException();
             }
@@ -33,7 +44,7 @@ public function readParameters()
                 'dev.tkirch.wsc.faq.question',
                 [$this->question->questionID]
             );
-        } else {
+        } catch (MappingError) {
             throw new IllegalLinkException();
         }
     }