Added ability to escape role "External Auth ID" commas

[bookstack] / app / Http / Controllers / ChapterExportController.php

diff --git a/app/Http/Controllers/ChapterExportController.php b/app/Http/Controllers/ChapterExportController.php
index c0fa9fad94fad64fb85df88416cc24750be2dafd..480280c99ef6dc83a169ba1762d5e4fc0edd4d36 100644 (file)
--- a/app/Http/Controllers/ChapterExportController.php
+++ b/app/Http/Controllers/ChapterExportController.php
@@ -1,70 +1,79 @@
-<?php namespace BookStack\Http\Controllers;
+<?php
+
+namespace BookStack\Http\Controllers;

 
 

-use BookStack\Entities\ExportService;

 use BookStack\Entities\Repos\ChapterRepo;
 use BookStack\Entities\Repos\ChapterRepo;

+use BookStack\Entities\Tools\ExportFormatter;

 use BookStack\Exceptions\NotFoundException;
 use Throwable;
 
 class ChapterExportController extends Controller
 {
 use BookStack\Exceptions\NotFoundException;
 use Throwable;
 
 class ChapterExportController extends Controller
 {

-

     protected $chapterRepo;
     protected $chapterRepo;

-    protected $exportService;
+    protected $exportFormatter;

 
     /**
      * ChapterExportController constructor.
      */
 
     /**
      * ChapterExportController constructor.
      */

-    public function __construct(ChapterRepo $chapterRepo, ExportService $exportService)
+    public function __construct(ChapterRepo $chapterRepo, ExportFormatter $exportFormatter)

     {
         $this->chapterRepo = $chapterRepo;
     {
         $this->chapterRepo = $chapterRepo;

-        $this->exportService = $exportService;
-        parent::__construct();
+        $this->exportFormatter = $exportFormatter;
+        $this->middleware('can:content-export');

     }
 
     /**
      * Exports a chapter to pdf.
     }
 
     /**
      * Exports a chapter to pdf.

+     *

      * @throws NotFoundException
      * @throws Throwable
      */
     public function pdf(string $bookSlug, string $chapterSlug)
     {
         $chapter = $this->chapterRepo->getBySlug($bookSlug, $chapterSlug);
      * @throws NotFoundException
      * @throws Throwable
      */
     public function pdf(string $bookSlug, string $chapterSlug)
     {
         $chapter = $this->chapterRepo->getBySlug($bookSlug, $chapterSlug);

-        $pdfContent = $this->exportService->chapterToPdf($chapter);
+        $pdfContent = $this->exportFormatter->chapterToPdf($chapter);
+

         return $this->downloadResponse($pdfContent, $chapterSlug . '.pdf');
     }
 
     /**
      * Export a chapter to a self-contained HTML file.
         return $this->downloadResponse($pdfContent, $chapterSlug . '.pdf');
     }
 
     /**
      * Export a chapter to a self-contained HTML file.

+     *

      * @throws NotFoundException
      * @throws Throwable
      */
     public function html(string $bookSlug, string $chapterSlug)
     {
         $chapter = $this->chapterRepo->getBySlug($bookSlug, $chapterSlug);
      * @throws NotFoundException
      * @throws Throwable
      */
     public function html(string $bookSlug, string $chapterSlug)
     {
         $chapter = $this->chapterRepo->getBySlug($bookSlug, $chapterSlug);

-        $containedHtml = $this->exportService->chapterToContainedHtml($chapter);
+        $containedHtml = $this->exportFormatter->chapterToContainedHtml($chapter);
+

         return $this->downloadResponse($containedHtml, $chapterSlug . '.html');
     }
 
     /**
      * Export a chapter to a simple plaintext .txt file.
         return $this->downloadResponse($containedHtml, $chapterSlug . '.html');
     }
 
     /**
      * Export a chapter to a simple plaintext .txt file.

+     *

      * @throws NotFoundException
      */
     public function plainText(string $bookSlug, string $chapterSlug)
     {
         $chapter = $this->chapterRepo->getBySlug($bookSlug, $chapterSlug);
      * @throws NotFoundException
      */
     public function plainText(string $bookSlug, string $chapterSlug)
     {
         $chapter = $this->chapterRepo->getBySlug($bookSlug, $chapterSlug);

-        $chapterText = $this->exportService->chapterToPlainText($chapter);
+        $chapterText = $this->exportFormatter->chapterToPlainText($chapter);
+

         return $this->downloadResponse($chapterText, $chapterSlug . '.txt');
     }
 
     /**
      * Export a chapter to a simple markdown file.
         return $this->downloadResponse($chapterText, $chapterSlug . '.txt');
     }
 
     /**
      * Export a chapter to a simple markdown file.

+     *

      * @throws NotFoundException
      */
     public function markdown(string $bookSlug, string $chapterSlug)
     {
         // TODO: This should probably export to a zip file.
         $chapter = $this->chapterRepo->getBySlug($bookSlug, $chapterSlug);
      * @throws NotFoundException
      */
     public function markdown(string $bookSlug, string $chapterSlug)
     {
         // TODO: This should probably export to a zip file.
         $chapter = $this->chapterRepo->getBySlug($bookSlug, $chapterSlug);

-        $chapterText = $this->exportService->chapterToMarkdown($chapter);
+        $chapterText = $this->exportFormatter->chapterToMarkdown($chapter);
+

         return $this->downloadResponse($chapterText, $chapterSlug . '.md');
     }
 }
         return $this->downloadResponse($chapterText, $chapterSlug . '.md');
     }
 }