From 7e8687cb2fc9a8c1c76b2f239abc7b0817455e75 Mon Sep 17 00:00:00 2001
From: ReLater <ReLater@users.noreply.github.com>
Date: Mon, 26 Mar 2018 00:36:45 +0200
Subject: [PATCH 1/4] Update mod_wrapper.xml

---
 modules/mod_wrapper/mod_wrapper.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/modules/mod_wrapper/mod_wrapper.xml b/modules/mod_wrapper/mod_wrapper.xml
index 3c3639956e627..5a002e261a782 100644
--- a/modules/mod_wrapper/mod_wrapper.xml
+++ b/modules/mod_wrapper/mod_wrapper.xml
@@ -22,6 +22,18 @@
 	<config>
 		<fields name="params">
 			<fieldset name="basic">
+				<field
+					name="mode"
+					type="radio"
+					label="MOD_WRAPPER_FIELD_MODE_LABEL"
+					description="MOD_WRAPPER_FIELD_MODE_DESC"
+					class="btn-group"
+					default="legacy"
+					>
+					<option value="legacy">MOD_WRAPPER_FIELD_VALUE_LEGACY</option>
+					<option value="html5">MOD_WRAPPER_FIELD_VALUE_HTML5</option>
+				</field>
+
 				<field
 					name="url"
 					type="text"

From ba931a6c58515d3fca7d8f31328b22f8180b40ae Mon Sep 17 00:00:00 2001
From: ReLater <ReLater@users.noreply.github.com>
Date: Mon, 26 Mar 2018 00:41:38 +0200
Subject: [PATCH 2/4] Update mod_wrapper.php

---
 modules/mod_wrapper/mod_wrapper.php | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/modules/mod_wrapper/mod_wrapper.php b/modules/mod_wrapper/mod_wrapper.php
index 5caea9455544f..ff9615758e141 100644
--- a/modules/mod_wrapper/mod_wrapper.php
+++ b/modules/mod_wrapper/mod_wrapper.php
@@ -21,8 +21,22 @@
 $height          = htmlspecialchars($params->get('height'), ENT_COMPAT, 'UTF-8');
 $scroll          = htmlspecialchars($params->get('scrolling'), ENT_COMPAT, 'UTF-8');
 $moduleclass_sfx = htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8');
-$frameborder     = htmlspecialchars($params->get('frameborder'), ENT_COMPAT, 'UTF-8');
+$frameborder     = htmlspecialchars($params->get('frameborder', 1), ENT_COMPAT, 'UTF-8');
 $ititle          = $module->title;
 $id              = $module->id;
+$isHtml5         = $params->get('mode', 'legacy') === 'html5';
+
+if ($isHtml5)
+{
+	$overflow = $scroll;
+	
+	if ($overflow !== 'auto')
+	{
+		$overflow = $overflow === 'no' ? 'hidden' : 'scroll';
+	}
+
+	$frameborder = !$frameborder ? 'none' : $frameborder . 'px solid #000';
+	$height      = (int) $height . 'px';
+}
 
 require JModuleHelper::getLayoutPath('mod_wrapper', $params->get('layout', 'default'));

From 762d1fcaf2c918e3c81313a4ba30c3df88a61f1c Mon Sep 17 00:00:00 2001
From: ReLater <ReLater@users.noreply.github.com>
Date: Mon, 26 Mar 2018 00:49:10 +0200
Subject: [PATCH 3/4] Update default.php

---
 modules/mod_wrapper/tmpl/default.php | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/modules/mod_wrapper/tmpl/default.php b/modules/mod_wrapper/tmpl/default.php
index 045e3fb24de92..b8a6e24f864cf 100644
--- a/modules/mod_wrapper/tmpl/default.php
+++ b/modules/mod_wrapper/tmpl/default.php
@@ -9,16 +9,26 @@
 
 defined('_JEXEC') or die;
 
-JHtml::_('script', 'com_wrapper/iframe-height.min.js', array('version' => 'auto', 'relative' => true));
+if ($params->get('height_auto'))
+{
+	JHtml::_('script', 'com_wrapper/iframe-height.min.js', array('version' => 'auto', 'relative' => true));
+}
 ?>
 <iframe <?php echo $load; ?>
 	id="blockrandom-<?php echo $id; ?>"
 	name="<?php echo $target; ?>"
 	src="<?php echo $url; ?>"
-	width="<?php echo $width; ?>"
-	height="<?php echo $height; ?>"
 	scrolling="<?php echo $scroll; ?>"
-	frameborder="<?php echo $frameborder; ?>"
+	<?php if ($isHtml5) : ?>
+		style="width: <?php echo $width; ?>;
+		height: <?php echo $height; ?>;
+		overflow: <?php echo $overflow; ?>;
+		border: <?php echo $frameborder; ?>"
+	<?php else : ?>
+		width="<?php echo $width; ?>"
+		height="<?php echo $height; ?>"
+		frameborder="<?php echo $frameborder; ?>"
+	<?php endif; ?>
 	title="<?php echo $ititle; ?>"
 	class="wrapper<?php echo $moduleclass_sfx; ?>" >
 	<?php echo JText::_('MOD_WRAPPER_NO_IFRAMES'); ?>

From 967202367de26a68c38408710316ad11ece0b6dc Mon Sep 17 00:00:00 2001
From: ReLater <ReLater@users.noreply.github.com>
Date: Mon, 26 Mar 2018 00:52:55 +0200
Subject: [PATCH 4/4] Update en-GB.mod_wrapper.ini

---
 language/en-GB/en-GB.mod_wrapper.ini | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/language/en-GB/en-GB.mod_wrapper.ini b/language/en-GB/en-GB.mod_wrapper.ini
index 103d9cb8f47ce..feaea203c9561 100644
--- a/language/en-GB/en-GB.mod_wrapper.ini
+++ b/language/en-GB/en-GB.mod_wrapper.ini
@@ -10,6 +10,8 @@ MOD_WRAPPER_FIELD_AUTOHEIGHT_DESC="The height will automatically be set to the s
 MOD_WRAPPER_FIELD_AUTOHEIGHT_LABEL="Auto Height"
 MOD_WRAPPER_FIELD_HEIGHT_DESC="Height of the iframe window."
 MOD_WRAPPER_FIELD_HEIGHT_LABEL="Height"
+MOD_WRAPPER_FIELD_MODE_DESC="HTML5 mode uses CSS to style the IFRAME tag. Legacy mode uses HTML 4.01 IFRAME attributes and is backwards compatible with old template overrides."
+MOD_WRAPPER_FIELD_MODE_LABEL="Mode"
 MOD_WRAPPER_FIELD_SCROLL_DESC="Show or hide horizontal &amp; vertical scroll bars."
 MOD_WRAPPER_FIELD_SCROLL_LABEL="Scroll Bars"
 MOD_WRAPPER_FIELD_TARGET_DESC="Name of the iframe when used as target."
@@ -17,9 +19,11 @@ MOD_WRAPPER_FIELD_TARGET_LABEL="Target Name"
 MOD_WRAPPER_FIELD_URL_DESC="URL to site/file you wish to display within the iframe."
 MOD_WRAPPER_FIELD_URL_LABEL="URL"
 MOD_WRAPPER_FIELD_VALUE_AUTO="Auto"
+MOD_WRAPPER_FIELD_VALUE_HTML5="HTML5"
+MOD_WRAPPER_FIELD_VALUE_LEGACY="Legacy (HTML4)"
 MOD_WRAPPER_FIELD_WIDTH_DESC="Width of the iframe window. You can enter an absolute figure in pixels or a relative figure by adding a %."
 MOD_WRAPPER_FIELD_WIDTH_LABEL="Width"
 MOD_WRAPPER_NO_IFRAMES="No iframes"
 MOD_WRAPPER_XML_DESCRIPTION="This module shows an iframe window to specified location."
 MOD_WRAPPER_FIELD_FRAME_LABEL="Frame Border"
-MOD_WRAPPER_FIELD_FRAME_DESC="Show frame border which wraps the iframe."
\ No newline at end of file
+MOD_WRAPPER_FIELD_FRAME_DESC="Show frame border which wraps the iframe."