From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Fri, 20 Mar 2026 13:00:11 +0000 (+0100)
Subject: wait #8079 @2
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=d93d20ae98b89dd1e75800848df9adf24689d282;p=fluidbook_tools.git

wait #8079 @2
---

diff --git a/src/Links/ActionLink.php b/src/Links/ActionLink.php
index 71c54f0..aaf1953 100644
--- a/src/Links/ActionLink.php
+++ b/src/Links/ActionLink.php
@@ -20,9 +20,9 @@ class ActionLink extends InternalLink
         }
     }
 
-    public function getAdditionnalContent()
+    public function getAdditionnalContent($content=false)
     {
-        $res = parent::getAdditionnalContent();
+        $res = parent::getAdditionnalContent($content);
         if (is_object($this->extra) || is_array($this->extra)) {
             $extra = json_encode($this->extra);
         } else {
diff --git a/src/Links/AltTextImageLink.php b/src/Links/AltTextImageLink.php
index e5509dd..2a3a4e7 100644
--- a/src/Links/AltTextImageLink.php
+++ b/src/Links/AltTextImageLink.php
@@ -5,8 +5,8 @@ namespace Fluidbook\Tools\Links;
 class AltTextImageLink extends Link {
     protected $role = '';
 
-    public function getAdditionnalContent() : string {
-        $res = parent::getAdditionnalContent();
+    public function getAdditionnalContent($content = false) : string {
+        $res = parent::getAdditionnalContent($content);
 
         $res .= ' data-text="' . htmlspecialchars($this->to, ENT_QUOTES) . '" ';
         $res .= ' data-icon-x="' . $this->icon_x . '" data-icon-y="' . $this->icon_y . '"';
@@ -28,6 +28,6 @@ class AltTextImageLink extends Link {
             $attrs .= ' class="' . implode(' ', $class) . '"';
         }
 
-        return '<a href="#" data-type="' . $this->type . '"' . $attrs . $this->getAdditionnalContent() . '>' . $this->getInnerContent() . '</a>';
+        return '<a href="#" data-type="' . $this->type . '"' . $attrs . $this->getAdditionnalContent(true) . '>' . $this->getInnerContent() . '</a>';
     }
 }
diff --git a/src/Links/AudioPopupLink.php b/src/Links/AudioPopupLink.php
index 1f4c218..fa389da 100644
--- a/src/Links/AudioPopupLink.php
+++ b/src/Links/AudioPopupLink.php
@@ -16,7 +16,7 @@ class AudioPopupLink extends NormalLink
         return '#/audio/' . $basename;
     }
 
-    public function getAdditionnalContent()
+    public function getAdditionnalContent($content=false)
     {
         return ' data-audio="' . rawurlencode(AudioLink::makeAudioTag($this, null, null, $this->compiler, $this->compiler->getSetting('audioPlayerThemePopup', 'native'))) . '" ';
     }
diff --git a/src/Links/CartLink.php b/src/Links/CartLink.php
index 378ab51..a1d8c82 100644
--- a/src/Links/CartLink.php
+++ b/src/Links/CartLink.php
@@ -18,9 +18,9 @@ class CartLink extends NormalLink
         return 'add to cart';
     }
 
-    public function getAdditionnalContent()
+    public function getAdditionnalContent($content = false)
     {
-        $res = parent::getAdditionnalContent();
+        $res = parent::getAdditionnalContent($content);
         $e = explode("|", $this->to);
         $ref = $e[0];
         $qty = isset($e[1]) ? $e[1] : '1';
diff --git a/src/Links/ColorLink.php b/src/Links/ColorLink.php
index 0b9bec9..2cc7b37 100644
--- a/src/Links/ColorLink.php
+++ b/src/Links/ColorLink.php
@@ -25,9 +25,9 @@ class ColorLink extends ContentLink
         return $res;
     }
 
-    public function getAdditionnalContent()
+    public function getAdditionnalContent($content=false)
     {
-        $res = parent::getAdditionnalContent();
+        $res = parent::getAdditionnalContent($content);
         $res .= ' data-color="' . Color::colorToCSS($this->to) . '"';
         return $res;
     }
diff --git a/src/Links/ContentLink.php b/src/Links/ContentLink.php
index 0f1be6b..747abf1 100644
--- a/src/Links/ContentLink.php
+++ b/src/Links/ContentLink.php
@@ -21,9 +21,9 @@ class ContentLink extends Link
         return $res;
     }
 
-    public function getAdditionnalContent()
+    public function getAdditionnalContent($content = false)
     {
-        $res = parent::getAdditionnalContent();
+        $res = parent::getAdditionnalContent($content);
         if ($this->rollover === 'fadein') {
             $res .= ' data-rollover-hide ';
         }
diff --git a/src/Links/CopyToClipboardLink.php b/src/Links/CopyToClipboardLink.php
index 5db6acf..8318391 100644
--- a/src/Links/CopyToClipboardLink.php
+++ b/src/Links/CopyToClipboardLink.php
@@ -14,13 +14,15 @@ class CopyToClipboardLink extends NormalLink
         return 'copy to clipboard';
     }
 
-    public function getAdditionnalContent() {
-        $res = parent::getAdditionnalContent();
+    public function getAdditionnalContent($content = false)
+    {
+        $res = parent::getAdditionnalContent($content);
         $res .= ' data-clipboard-text="' . htmlspecialchars($this->to, ENT_QUOTES) . '" ';
         return $res;
     }
 
-    public function getURL() {
+    public function getURL()
+    {
         return '#';
     }
 }
diff --git a/src/Links/DownloadPortionLink.php b/src/Links/DownloadPortionLink.php
index 40678a4..dd70252 100644
--- a/src/Links/DownloadPortionLink.php
+++ b/src/Links/DownloadPortionLink.php
@@ -2,11 +2,13 @@
 
 namespace Fluidbook\Tools\Links;
 
-class DownloadPortionLink extends FileLink {
+class DownloadPortionLink extends FileLink
+{
     /**
      * @throws \Exception
      */
-    public function getURL() {
+    public function getURL()
+    {
         $attributes = $this->getZoomAttributes();
         if (!$this->rightClone) {
             ZoomLink::generateImage($attributes, $this->compiler, 'downloadportion', 'downloadportion', true);
@@ -14,7 +16,8 @@ class DownloadPortionLink extends FileLink {
         return 'data/links/downloadportion_' . $attributes['id'] . '.jpg';
     }
 
-    public function getZoomAttributes() {
+    public function getZoomAttributes()
+    {
         $pdf = $this->compiler->getSetting('downloadPortionPDF', '');
         if ($pdf !== '') {
             $pdf = $this->compiler->getWorkingDir() . '/' . $pdf;
@@ -73,7 +76,8 @@ class DownloadPortionLink extends FileLink {
         return $res;
     }
 
-    public function getAdditionnalContent() {
+    public function getAdditionnalContent($content = false)
+    {
         $file = $this->to;
         if (!$file) {
             $file = 'p' . $this->page;
@@ -83,10 +87,11 @@ class DownloadPortionLink extends FileLink {
         }
         $file = htmlspecialchars($file);
 
-        return parent::getAdditionnalContent() . ' download="' . $file . '" ';
+        return parent::getAdditionnalContent($content) . ' download="' . $file . '" ';
     }
 
-    public function getDefaultTooltip() {
+    public function getDefaultTooltip()
+    {
         return 'click to download the image';
     }
 }
diff --git a/src/Links/FlipcardLink.php b/src/Links/FlipcardLink.php
index de4bd7c..eac6f7d 100644
--- a/src/Links/FlipcardLink.php
+++ b/src/Links/FlipcardLink.php
@@ -28,9 +28,9 @@ class FlipcardLink extends ImageLink
         return 'click to flip';
     }
 
-    public function getAdditionnalContent()
+    public function getAdditionnalContent($content = false)
     {
-        $res = parent::getAdditionnalContent();
+        $res = parent::getAdditionnalContent($content);
         $res .= ' data-flipcard="' . ($this->width > $this->height ? 'axis-x' : 'axis-y') . '" ';
         return $res;
     }
diff --git a/src/Links/HTMLMultimediaImage.php b/src/Links/HTMLMultimediaImage.php
index 46d2d49..25fca4e 100644
--- a/src/Links/HTMLMultimediaImage.php
+++ b/src/Links/HTMLMultimediaImage.php
@@ -6,7 +6,7 @@ class HTMLMultimediaImage extends Link
 {
     public $defaultZIndex = 50;
 
-    protected $_ocr= ['to'];
+    protected $_ocr = ['to'];
 
     public function getHTMLContainerClass()
     {
@@ -19,15 +19,15 @@ class HTMLMultimediaImage extends Link
         $h = $this->height;
         $this->copyExternalFile($this->to);
         $res = '<img class="multimediaimage" data-scroll="' . $this->scroll . '" data-width="' . $w . '" data-height="' . $h . '" src="' . $this->shortenURL(Link::getUniversalLocation($this->to)) . '" width="' . $w . '" height="' . $h . '" aria-hidden="1" />';
-        $alt=$this->getAlternativeText();
-        if($alt) {
+        $alt = $this->getAlternativeText();
+        if ($alt) {
             $res .= '<div class="visually-hidden" aria-live="polite">' . $alt . '</div>';
         }
         return $res;
     }
 
-    public function getAdditionnalContent()
+    public function getAdditionnalContent($content = false)
     {
-        return parent::getAdditionnalContent() . ' aria-hidden="true" data-scroll="' . $this->scroll . '" ';
+        return parent::getAdditionnalContent($content) . ' aria-hidden="true" data-scroll="' . $this->scroll . '" ';
     }
 }
diff --git a/src/Links/HTMLMultimediaPopupImage.php b/src/Links/HTMLMultimediaPopupImage.php
index 4ec0ba0..32ade45 100644
--- a/src/Links/HTMLMultimediaPopupImage.php
+++ b/src/Links/HTMLMultimediaPopupImage.php
@@ -23,9 +23,9 @@ class HTMLMultimediaPopupImage extends NormalLink
     /**
      * @throws \Exception
      */
-    public function getAdditionnalContent()
+    public function getAdditionnalContent($content = false)
     {
-        $res = parent::getAdditionnalContent();
+        $res = parent::getAdditionnalContent($content);
         $path = $this->compiler->working_path($this->to);
         try {
             $dim = Image::getimagesize($path);
diff --git a/src/Links/HTMLMultimediaPopupLink.php b/src/Links/HTMLMultimediaPopupLink.php
index 97b1e63..720a7ab 100644
--- a/src/Links/HTMLMultimediaPopupLink.php
+++ b/src/Links/HTMLMultimediaPopupLink.php
@@ -5,7 +5,7 @@ namespace Fluidbook\Tools\Links;
 class HTMLMultimediaPopupLink extends HTMLMultimediaPopupImage
 {
 
-    public function getAdditionnalContent()
+    public function getAdditionnalContent($content = false)
     {
         $i = $this->_init;
         $i['inline'] = 'inline';
diff --git a/src/Links/IFramePopupLink.php b/src/Links/IFramePopupLink.php
index 69750be..1634e1b 100644
--- a/src/Links/IFramePopupLink.php
+++ b/src/Links/IFramePopupLink.php
@@ -14,9 +14,9 @@ class IFramePopupLink extends NormalLink
         return ' data-track="' . $this->to . '"';
     }
 
-    public function getAdditionnalContent()
+    public function getAdditionnalContent($content = false)
     {
-        $res = parent::getAdditionnalContent();
+        $res = parent::getAdditionnalContent($content);
         $markup = '<div class="iframeContainer" data-type="' . $this->iframeType . '">';
         $markup .= '<iframe src="' . $this->shortenURL(IFrameLink::_handleFile($this)) . '" width="100%" height="100%" frameborder="0" marginwidth="0" marginheight="0" scrolling="auto" allowfullscreen mozallowfullscreen="true" webkitallowfullscreen="true" onmousewheel=""></iframe>';
         $markup .= '</div>';
diff --git a/src/Links/ImageLink.php b/src/Links/ImageLink.php
index 8a82448..06c0020 100644
--- a/src/Links/ImageLink.php
+++ b/src/Links/ImageLink.php
@@ -18,9 +18,9 @@ class ImageLink extends ContentLink
         return $res;
     }
 
-    public function getAdditionnalContent()
+    public function getAdditionnalContent($content = false)
     {
-        $res = parent::getAdditionnalContent();
+        $res = parent::getAdditionnalContent($content);
         $res .= ' data-image="' . $this->getImageUrl() . '"';
         if (isset($this->rollover) && $this->rollover) {
             $res .= ' data-rollover="' . $this->rollover . '"';
diff --git a/src/Links/InternalLink.php b/src/Links/InternalLink.php
index b467dd9..dbb5c0c 100644
--- a/src/Links/InternalLink.php
+++ b/src/Links/InternalLink.php
@@ -5,6 +5,8 @@ namespace Fluidbook\Tools\Links;
 class InternalLink extends NormalLink
 {
 
+    protected $role='button';
+
     public function getURL()
     {
         return '#/page/' . $this->getPage();
@@ -31,11 +33,6 @@ class InternalLink extends NormalLink
         return $res;
     }
 
-    public function getAdditionnalContent()
-    {
-        return parent::getAdditionnalContent() . ' role="button"';
-    }
-
     public function getDefaultTooltip()
     {
         return 'go to page';
diff --git a/src/Links/LayerLink.php b/src/Links/LayerLink.php
index cbc284f..76e28df 100644
--- a/src/Links/LayerLink.php
+++ b/src/Links/LayerLink.php
@@ -37,9 +37,9 @@ class LayerLink extends ImageLink
         }
     }
 
-    public function getAdditionnalContent()
+    public function getAdditionnalContent($content = false)
     {
-        $res = parent::getAdditionnalContent();
+        $res = parent::getAdditionnalContent($content);
         $res .= ' data-layer="' . $this->to . '"';
         return $res;
     }
diff --git a/src/Links/Link.php b/src/Links/Link.php
index ded1f5a..7816466 100644
--- a/src/Links/Link.php
+++ b/src/Links/Link.php
@@ -764,10 +764,10 @@ class Link
         return '';
     }
 
-    public function getAdditionnalContent()
+    public function getAdditionnalContent($content = false)
     {
         $res = '';
-        if ($this->role !== '') {
+        if ($content && $this->role !== '') {
             $res .= ' role="' . $this->role . '"';
         }
         if ($this->maxWidth > 0) {
diff --git a/src/Links/NormalLink.php b/src/Links/NormalLink.php
index 3c6567d..43332ce 100644
--- a/src/Links/NormalLink.php
+++ b/src/Links/NormalLink.php
@@ -30,7 +30,7 @@ class NormalLink extends Link
             $attrs .= ' data-blinkdelay="' . intval($this->blinkdelay) . '"';
         }
 
-        return '<a href="' . $this->getURL() . '" data-type="' . $this->type . '" target="' . $this->getTarget() . '"' . $attrs . $this->getAdditionnalContent() . $this->getTrack() . '>' . $this->getInnerContent() . '</a>';
+        return '<a href="' . $this->getURL() . '" data-type="' . $this->type . '" target="' . $this->getTarget() . '"' . $attrs . $this->getAdditionnalContent(true) . $this->getTrack() . '>' . $this->getInnerContent() . '</a>';
     }
 
 
diff --git a/src/Links/Object3DPopupLink.php b/src/Links/Object3DPopupLink.php
index f333b89..424b4be 100644
--- a/src/Links/Object3DPopupLink.php
+++ b/src/Links/Object3DPopupLink.php
@@ -16,7 +16,7 @@ class Object3DPopupLink extends NormalLink
         return '#/o3d/' . md5($this->to . '/' . $this->extra . '/' . $this->id . '/' . $this->background_color);
     }
 
-    public function getAdditionnalContent()
+    public function getAdditionnalContent($content=false)
     {
         return ' data-stats-type="popup_o3d" data-stats-name="' . $this->to . '" data-model="' . $this->to . '" data-background-color="' . $this->background_color . '" ';
     }
diff --git a/src/Links/ShowLinkLink.php b/src/Links/ShowLinkLink.php
index 7a5e46f..795af62 100644
--- a/src/Links/ShowLinkLink.php
+++ b/src/Links/ShowLinkLink.php
@@ -22,9 +22,9 @@ class ShowLinkLink extends NormalLink
         return $res;
     }
 
-    public function getAdditionnalContent()
+    public function getAdditionnalContent($content=false)
     {
-        $res = parent::getAdditionnalContent();
+        $res = parent::getAdditionnalContent($content);
         $this->close_button = $this->close_button ?: 'none';
         $res .= ' data-showmode="' . $this->target . '" data-showclose="' . $this->close_button . '" data-showtransition="' . ($this->transition ?: 'fadein') . '" data-showid="' . $this->to . '"';
         return $res;
diff --git a/src/Links/SlideshowLink.php b/src/Links/SlideshowLink.php
index c15ffa2..c977ec6 100644
--- a/src/Links/SlideshowLink.php
+++ b/src/Links/SlideshowLink.php
@@ -36,9 +36,9 @@ class SlideshowLink extends NormalLink
         return '#/slideshow/' . $this->uid;
     }
 
-    public function getAdditionnalContent()
+    public function getAdditionnalContent($content = false)
     {
-        return parent::getAdditionnalContent() . ' data-slideshow="' . rawurlencode($this->generateSlideshow('popup')) . '" ';
+        return parent::getAdditionnalContent($content) . ' data-slideshow="' . rawurlencode($this->generateSlideshow('popup')) . '" ';
     }
 
     public function getDefaultTooltip()
diff --git a/src/Links/TextPopupLink.php b/src/Links/TextPopupLink.php
index df6e594..30d3c14 100644
--- a/src/Links/TextPopupLink.php
+++ b/src/Links/TextPopupLink.php
@@ -2,18 +2,22 @@
 
 namespace Fluidbook\Tools\Links;
 
-class TextPopupLink extends NormalLink {
-    public function getClasses() {
+class TextPopupLink extends NormalLink
+{
+    public function getClasses()
+    {
         return array_merge(array('lazy', 'textpopup'), parent::getClasses());
     }
 
-    public function getAdditionnalContent() {
-        $res = parent::getAdditionnalContent();
+    public function getAdditionnalContent($content = false)
+    {
+        $res = parent::getAdditionnalContent($content);
         $res .= ' data-text="' . htmlspecialchars($this->to, ENT_QUOTES) . '" ';
         return $res;
     }
 
-    public function getURL() {
+    public function getURL()
+    {
         return '#';
     }
 }
diff --git a/src/Links/TooltipLink.php b/src/Links/TooltipLink.php
index 9641cef..310e975 100644
--- a/src/Links/TooltipLink.php
+++ b/src/Links/TooltipLink.php
@@ -13,9 +13,9 @@ class TooltipLink extends NormalLink
         return array_merge(array('lazy'), parent::getClasses());
     }
 
-    public function getAdditionnalContent()
+    public function getAdditionnalContent($content = false)
     {
-        $res = parent::getAdditionnalContent();
+        $res = parent::getAdditionnalContent($content);
         if ($this->backgroundColor) {
             $res .= 'data-tooltip-background="' . $this->backgroundColor . '" ';
         }
@@ -25,7 +25,7 @@ class TooltipLink extends NormalLink
         if ($this->tooltipMaxWidth) {
             $res .= ' data-tooltip-maxwidth="' . $this->tooltipMaxWidth . '" ';
         } else {
-            $res .= ' data-tooltip-maxwidth="' . $this->compiler->getSetting('linkTooltipMaxWidth',140) . '" ';
+            $res .= ' data-tooltip-maxwidth="' . $this->compiler->getSetting('linkTooltipMaxWidth', 140) . '" ';
         }
         $res .= ' data-tooltip-touch="1" ';
         return $res;
diff --git a/src/Links/TriggerLink.php b/src/Links/TriggerLink.php
index d5442cc..ee459b4 100644
--- a/src/Links/TriggerLink.php
+++ b/src/Links/TriggerLink.php
@@ -17,10 +17,9 @@ class TriggerLink extends NormalLink
         return $res;
     }
 
-    public function getAdditionnalContent()
+    public function getAdditionnalContent($content = false)
     {
-        $res = parent::getAdditionnalContent();
-
+        $res = parent::getAdditionnalContent($content);
         $res .= ' data-trigger-event="' . $this->target . '" data-trigger-id="' . $this->_normalizeId($this->to) . '"';
         return $res;
     }
diff --git a/src/Links/VideoLink.php b/src/Links/VideoLink.php
index 1e6b4d9..f51e77a 100644
--- a/src/Links/VideoLink.php
+++ b/src/Links/VideoLink.php
@@ -125,9 +125,9 @@ class VideoLink extends Link
         return $attr;
     }
 
-    public function getAdditionnalContent()
+    public function getAdditionnalContent($content = false)
     {
-        $res = parent::getAdditionnalContent();
+        $res = parent::getAdditionnalContent($content);
         if ($this->video_autohide) {
             $res .= ' data-autohide="' . (($data->video_autohide ?? '1') ? '1' : '0') . '"';
         }
diff --git a/src/Links/VideoPopupLink.php b/src/Links/VideoPopupLink.php
index 43a610a..3bde656 100644
--- a/src/Links/VideoPopupLink.php
+++ b/src/Links/VideoPopupLink.php
@@ -28,7 +28,7 @@ class VideoPopupLink extends NormalLink
         return '#/video/' . self::getBasename($this->to);
     }
 
-    public function getAdditionnalContent()
+    public function getAdditionnalContent($content = false)
     {
         $this->video_auto_start = true; // Videos should always autoplay
         $this->video_sound_on = true;
diff --git a/src/Links/WebVideoPopupLink.php b/src/Links/WebVideoPopupLink.php
index 9ceddf5..f8ac186 100644
--- a/src/Links/WebVideoPopupLink.php
+++ b/src/Links/WebVideoPopupLink.php
@@ -25,7 +25,7 @@ class WebVideoPopupLink extends VideoPopupLink
         }
     }
 
-    public function getAdditionnalContent()
+    public function getAdditionnalContent($content = false)
     {
         $this->video_auto_start = true; // Videos should always autoplay
         return ' data-video="' . rawurlencode(WebVideoLink::makeVideoTag($this, 1280, 720, $this->compiler)) . '" ';
diff --git a/src/Links/ZoomHDLink.php b/src/Links/ZoomHDLink.php
index 860032e..2a7d16a 100644
--- a/src/Links/ZoomHDLink.php
+++ b/src/Links/ZoomHDLink.php
@@ -16,9 +16,9 @@ class ZoomHDLink extends NormalLink
         return '#/zoomhd/' . $this->uid;
     }
 
-    public function getAdditionnalContent()
+    public function getAdditionnalContent($content = false)
     {
-        $res = parent::getAdditionnalContent();
+        $res = parent::getAdditionnalContent($content);
         $res .= ' data-image="' . $this->to . '" ';
         return $res;
     }
diff --git a/src/Links/ZoomLink.php b/src/Links/ZoomLink.php
index 83da356..f70b984 100644
--- a/src/Links/ZoomLink.php
+++ b/src/Links/ZoomLink.php
@@ -60,9 +60,9 @@ class ZoomLink extends NormalLink
         return 'zoom in';
     }
 
-    public function getAdditionnalContent()
+    public function getAdditionnalContent($content = false)
     {
-        $res = parent::getAdditionnalContent();
+        $res = parent::getAdditionnalContent($content);
 
         $res .= ' id="' . $this->uid . '"';