add source folder to attachment sources in html tags

artemeon · Oct 27, 2023 · 75063a0 · 75063a0
1 parent 430c1ac
commit 75063a0
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 3 deletions.
diff --git a/src/Endpoint/Auth.php b/src/Endpoint/Auth.php
diff --git a/src/Endpoint/Download.php b/src/Endpoint/Download.php
@@ -32,6 +32,12 @@ private function checkDownloadFolder(): bool
 
     public function downloadPageContent(ConfluencePage $confluencePage, string $fileName)
     {
+        if (!$this->checkDownloadFolder()) {
+            echo 'Error: The download folder does not exist or could not be created.';
+
+            return;
+        }
+
         $htmlFile = $this->downloadFolder . '/' . $fileName;
         file_put_contents($htmlFile, $confluencePage->getContent());
     }

diff --git a/src/Endpoint/Dto/ConfluenceAttachment.php b/src/Endpoint/Dto/ConfluenceAttachment.php
diff --git a/src/Endpoint/Dto/ConfluenceLabel.php b/src/Endpoint/Dto/ConfluenceLabel.php
diff --git a/src/MacroReplacer/ImageAndVideoMacroReplacer.php b/src/MacroReplacer/ImageAndVideoMacroReplacer.php
@@ -9,6 +9,17 @@
  */
 class ImageAndVideoMacroReplacer implements MacroReplacerInterface
 {
+    private string $sourceFolder;
+
+    public function __construct(string $sourceFolder = '')
+    {
+        if (!str_ends_with($sourceFolder, '/')) {
+            $sourceFolder .= '/';
+        }
+
+        $this->sourceFolder = $sourceFolder;
+    }
+
     public function replace(string $haystack): string
     {
         return preg_replace_callback(
@@ -19,12 +30,12 @@ function ($match) {
 
                 //Distinguish between images and videos
                 if (in_array($fileExtension, ['jpg', 'jpeg', 'png', 'gif'])) {
-                    return '<img src="' . $attachmentFileName . '">';
+                    return '<img src="' . $this->sourceFolder . $attachmentFileName . '">';
                 } elseif (in_array($fileExtension, ['mp4', 'avi', 'mkv', 'mov'])) {
-                    return '<video controls><source src="' . $attachmentFileName . '" type="video/' . $fileExtension . '">Your browser does not support the video tag.</video>';
+                    return '<video controls><source src="' . $this->sourceFolder . $attachmentFileName . '" type="video/' . $fileExtension . '">Your browser does not support the video tag.</video>';
                 } else {
                     // By default, a link to the attachment is created
-                    return '<a href="' . $attachmentFileName . '">' . $attachmentFileName . '</a>';
+                    return '<a href="' . $this->sourceFolder . $attachmentFileName . '">' . $this->sourceFolder . $attachmentFileName . '</a>';
                 }
             },
             $haystack