fix: corrected JSON and PDF download, closes #3139

thorsten · Aug 11, 2024 · bcec7ad · bcec7ad
1 parent f8bf0df
commit bcec7ad
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/phpmyfaq/src/phpMyFAQ/Controller/Administration/ExportController.php b/phpmyfaq/src/phpMyFAQ/Controller/Administration/ExportController.php
@@ -17,6 +17,7 @@
 
 namespace phpMyFAQ\Controller\Administration;
 
+use League\CommonMark\Exception\CommonMarkException;
 use phpMyFAQ\Administration\HttpStreamer;
 use phpMyFAQ\Administration\Report;
 use phpMyFAQ\Category;
@@ -31,7 +32,6 @@
 use phpMyFAQ\Session\Token;
 use phpMyFAQ\Translation;
 use Symfony\Component\HttpFoundation\HeaderUtils;
-use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
@@ -68,7 +68,7 @@ public function exportFile(Request $request): void
             } else {
                 $httpStreamer->send(HeaderUtils::DISPOSITION_ATTACHMENT);
             }
-        } catch (Exception | \JsonException $e) {
+        } catch (Exception | \JsonException | CommonMarkException $e) {
             echo $e->getMessage();
         }
     }

diff --git a/phpmyfaq/src/phpMyFAQ/Export/Json.php b/phpmyfaq/src/phpMyFAQ/Export/Json.php
@@ -62,7 +62,7 @@ public function generate(int $categoryId = 0, bool $downwards = true, string $la
         // Initialize categories
         $this->category->transform($categoryId);
 
-        $faqData = $this->faq->get(FAQ_QUERY_TYPE_EXPORT_XML, $categoryId, $downwards, $language);
+        $faqData = $this->faq->get('faq_export_json', $categoryId, $downwards, $language);
 
         foreach ($faqData as $data) {
             $generated[] = [

diff --git a/phpmyfaq/src/phpMyFAQ/Export/Pdf.php b/phpmyfaq/src/phpMyFAQ/Export/Pdf.php
@@ -18,6 +18,7 @@
 namespace phpMyFAQ\Export;
 
 use League\CommonMark\CommonMarkConverter;
+use League\CommonMark\Exception\CommonMarkException;
 use phpMyFAQ\Category;
 use phpMyFAQ\Configuration;
 use phpMyFAQ\Date;
@@ -78,8 +79,9 @@ public function __construct(Faq $faq, Category $category, Configuration $configu
      * Generates the export.
      *
      * @param int    $categoryId CategoryHelper Id
-     * @param bool   $downwards  If true, downwards, otherwise upward ordering
-     * @param string $language   Language
+     * @param bool   $downwards If true, downwards, otherwise upward ordering
+     * @param string $language Language
+     * @throws CommonMarkException
      */
     public function generate(int $categoryId = 0, bool $downwards = true, string $language = ''): string
     {
@@ -95,7 +97,7 @@ public function generate(int $categoryId = 0, bool $downwards = true, string $la
         $this->pdf->setCategories($this->category->categoryName);
         $this->pdf->SetCreator($this->config->getTitle() . ' - ' . System::getPoweredByString());
 
-        $faqData = $this->faq->get(FAQ_QUERY_TYPE_EXPORT_XML, $categoryId, $downwards, $language);
+        $faqData = $this->faq->get('faq_export_pdf', $categoryId, $downwards, $language);
 
         $currentCategory = 0;