Clean up iframe attributes

humhub · Jun 7, 2024 · 2d77a28 · 2d77a28
1 parent 151d799
commit 2d77a28
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 3 deletions.
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -4,6 +4,7 @@ Changelog
 Unreleased
 ---------------------
 - Fix #328: Missing Iframe attributes in snippet
+- Fix #332: Clean up iframe attributes
 
 1.10.3 (May 15, 2024)
 ---------------------

diff --git a/models/CustomContentContainer.php b/models/CustomContentContainer.php
@@ -539,4 +539,13 @@ public function afterDelete()
     public function fixVisibility()
     {
     }
+
+    public function getIframeAttrs(): string
+    {
+        if (empty($this->iframe_attrs)) {
+            return '';
+        }
+
+        return preg_replace('/(^|\s)srcdoc\s*=\s*("|\').+?\2/i', '', $this->iframe_attrs);
+    }
 }
diff --git a/views/container/iframe.php b/views/container/iframe.php
@@ -1,11 +1,15 @@
 <?php
 
 use humhub\libs\Html;
+use humhub\modules\custom_pages\models\CustomContentContainer;
+
+/* @var CustomContentContainer $page */
+/* @var string $url */
 
 $cssClass = ($page->hasAttribute('cssClass') && !empty($page->cssClass)) ? $page->cssClass : 'custom-pages-page';
 ?>
 
-<iframe class="<?= Html::encode($cssClass) ?>" id="iframepage" <?= $page->iframe_attrs ?? '' ?>
+<iframe class="<?= Html::encode($cssClass) ?>" id="iframepage" <?= $page->getIframeAttrs() ?>
         style="width:100%; height: 100%; min-height: 400px;"
         src="<?= Html::encode($url); ?>"></iframe>
 

diff --git a/views/global/iframe.php b/views/global/iframe.php
@@ -1,8 +1,13 @@
 <?php
 
 use humhub\libs\Html;
+use humhub\modules\custom_pages\models\CustomContentContainer;
 use humhub\modules\custom_pages\models\Page;
 
+/* @var CustomContentContainer $page */
+/* @var string $url */
+/* @var string $navigationClass */
+
 $cssClass = ($page->hasAttribute('cssClass') && !empty($page->cssClass)) ? $page->cssClass : 'custom-pages-page';
 $margin = $navigationClass == Page::NAV_CLASS_TOPNAV ? -15 : 0;
 ?>
@@ -14,7 +19,7 @@
     }
 </style>
 
-<iframe class="<?= Html::encode($cssClass) ?>" id="iframepage" <?= $page->iframe_attrs ?? '' ?>
+<iframe class="<?= Html::encode($cssClass) ?>" id="iframepage" <?= $page->getIframeAttrs() ?>
         style="width:100%;height: 100%" src="<?= Html::encode($url) ?>"></iframe>
 
 <?= Html::script(<<<JS

diff --git a/widgets/views/snippet_iframe.php b/widgets/views/snippet_iframe.php
@@ -16,7 +16,7 @@
 <?=
 SnippetContent::widget([
     'model' => $model,
-    'content' => '<iframe id="' . $iframeId . '" style="border:0px;width:100%;" src="' . \yii\helpers\Html::encode($model->getPageContent()) . '"' . ($model->iframe_attrs ? ' ' . $model->iframe_attrs : '') . '></iframe>',
+    'content' => '<iframe id="' . $iframeId . '" style="border:0px;width:100%;" src="' . \yii\helpers\Html::encode($model->getPageContent()) . '" ' . $model->getIframeAttrs() . '></iframe>',
     'navigation' => $navigation
 ]);
 ?>