From ef7df2520a1fd779a7712dd4de5de97b4bf2b9d5 Mon Sep 17 00:00:00 2001
From: Tuan Pham Ngoc <github@joomdonation.com>
Date: Thu, 21 Dec 2017 07:08:35 +0700
Subject: [PATCH 01/19] Update route.php (#19109)

---
 components/com_users/helpers/route.php | 42 +++++++++-----------------
 1 file changed, 14 insertions(+), 28 deletions(-)

diff --git a/components/com_users/helpers/route.php b/components/com_users/helpers/route.php
index 646370a3c1..89d4699891 100644
--- a/components/com_users/helpers/route.php
+++ b/components/com_users/helpers/route.php
@@ -32,10 +32,8 @@ public static function &getItems()
 		// Get the menu items for this component.
 		if (!isset($items))
 		{
-			$app   = JFactory::getApplication();
-			$menu  = $app->getMenu();
-			$com   = JComponentHelper::getComponent('com_users');
-			$items = $menu->getItems('component_id', $com->id);
+			$component = JComponentHelper::getComponent('com_users');
+			$items     = JFactory::getApplication()->getMenu()->getItems('component_id', $component->id);
 
 			// If no items found, set to empty array.
 			if (!$items)
@@ -59,19 +57,17 @@ public static function getLoginRoute()
 	{
 		// Get the items.
 		$items  = self::getItems();
-		$itemid = null;
 
 		// Search for a suitable menu id.
 		foreach ($items as $item)
 		{
 			if (isset($item->query['view']) && $item->query['view'] === 'login')
 			{
-				$itemid = $item->id;
-				break;
+				return $item->id;
 			}
 		}
 
-		return $itemid;
+		return null;
 	}
 
 	/**
@@ -86,7 +82,6 @@ public static function getProfileRoute()
 	{
 		// Get the items.
 		$items  = self::getItems();
-		$itemid = null;
 
 		// Search for a suitable menu id.
 		// Menu link can only go to users own profile.
@@ -95,12 +90,11 @@ public static function getProfileRoute()
 		{
 			if (isset($item->query['view']) && $item->query['view'] === 'profile')
 			{
-				$itemid = $item->id;
-				break;
+				return $item->id;
 			}
 		}
 
-		return $itemid;
+		return null;
 	}
 
 	/**
@@ -115,19 +109,17 @@ public static function getRegistrationRoute()
 	{
 		// Get the items.
 		$items  = self::getItems();
-		$itemid = null;
 
 		// Search for a suitable menu id.
 		foreach ($items as $item)
 		{
 			if (isset($item->query['view']) && $item->query['view'] === 'registration')
 			{
-				$itemid = $item->id;
-				break;
+				return $item->id;
 			}
 		}
 
-		return $itemid;
+		return null;
 	}
 
 	/**
@@ -142,19 +134,17 @@ public static function getRemindRoute()
 	{
 		// Get the items.
 		$items  = self::getItems();
-		$itemid = null;
 
 		// Search for a suitable menu id.
 		foreach ($items as $item)
 		{
 			if (isset($item->query['view']) && $item->query['view'] === 'remind')
 			{
-				$itemid = $item->id;
-				break;
+				return $item->id;
 			}
 		}
 
-		return $itemid;
+		return null;
 	}
 
 	/**
@@ -169,19 +159,17 @@ public static function getResendRoute()
 	{
 		// Get the items.
 		$items  = self::getItems();
-		$itemid = null;
 
 		// Search for a suitable menu id.
 		foreach ($items as $item)
 		{
 			if (isset($item->query['view']) && $item->query['view'] === 'resend')
 			{
-				$itemid = $item->id;
-				break;
+				return $item->id;
 			}
 		}
 
-		return $itemid;
+		return null;
 	}
 
 	/**
@@ -196,18 +184,16 @@ public static function getResetRoute()
 	{
 		// Get the items.
 		$items  = self::getItems();
-		$itemid = null;
 
 		// Search for a suitable menu id.
 		foreach ($items as $item)
 		{
 			if (isset($item->query['view']) && $item->query['view'] === 'reset')
 			{
-				$itemid = $item->id;
-				break;
+				return $item->id;
 			}
 		}
 
-		return $itemid;
+		return null;
 	}
 }

From d88bc6b7f988b93450547787f704e69578f95d12 Mon Sep 17 00:00:00 2001
From: Michael Babker <michael.babker@gmail.com>
Date: Thu, 21 Dec 2017 01:09:25 +0100
Subject: [PATCH 02/19] Don't hardcode class/method names into Exception
 messages (#19049)

---
 libraries/cms/html/select.php               |  5 +++-
 libraries/cms/html/sortablelist.php         |  2 +-
 libraries/joomla/filesystem/path.php        | 25 +++++++++++++++++---
 libraries/src/Feed/Feed.php                 | 26 +++++++++++++++++----
 libraries/src/Feed/FeedEntry.php            | 26 +++++++++++++++++----
 libraries/src/Form/Form.php                 |  6 ++---
 libraries/src/Helper/RouteHelper.php        |  2 +-
 libraries/src/Log/Logger/CallbackLogger.php |  2 +-
 libraries/src/Table/ContentType.php         |  6 ++---
 9 files changed, 79 insertions(+), 21 deletions(-)

diff --git a/libraries/cms/html/select.php b/libraries/cms/html/select.php
index 835d1dff14..3cccd385b7 100644
--- a/libraries/cms/html/select.php
+++ b/libraries/cms/html/select.php
@@ -159,7 +159,10 @@ public static function suggestionlist($data, $optKey = 'value', $optText = 'text
 	{
 		// Log deprecated message
 		JLog::add(
-			'JHtmlSelect::suggestionlist() is deprecated. Create the <datalist> tag directly instead.',
+			sprintf(
+				'%s() is deprecated. Create the <datalist> tag directly instead.',
+				__METHOD__
+			),
 			JLog::WARNING,
 			'deprecated'
 		);
diff --git a/libraries/cms/html/sortablelist.php b/libraries/cms/html/sortablelist.php
index 51646b0fa4..48171a811a 100644
--- a/libraries/cms/html/sortablelist.php
+++ b/libraries/cms/html/sortablelist.php
@@ -49,7 +49,7 @@ public static function sortable($tableId, $formId, $sortDir = 'asc', $saveOrderi
 		// Note: $i is required but has to be an optional argument in the function call due to argument order
 		if ($saveOrderingUrl === null)
 		{
-			throw new InvalidArgumentException('$saveOrderingUrl is a required argument in JHtmlSortablelist::sortable');
+			throw new InvalidArgumentException(sprintf('$saveOrderingUrl is a required argument in %s()', __METHOD__));
 		}
 
 		$displayData = array(
diff --git a/libraries/joomla/filesystem/path.php b/libraries/joomla/filesystem/path.php
index 3827382f1d..d39368ce06 100644
--- a/libraries/joomla/filesystem/path.php
+++ b/libraries/joomla/filesystem/path.php
@@ -167,14 +167,27 @@ public static function check($path)
 		if (strpos($path, '..') !== false)
 		{
 			// Don't translate
-			throw new Exception('JPath::check Use of relative paths not permitted', 20);
+			throw new Exception(
+				sprintf(
+					'%s() - Use of relative paths not permitted',
+					__METHOD__
+				),
+				20
+			);
 		}
 
 		$path = self::clean($path);
 
 		if ((JPATH_ROOT != '') && strpos($path, self::clean(JPATH_ROOT)) !== 0)
 		{
-			throw new Exception('JPath::check Snooping out of bounds @ ' . $path, 20);
+			throw new Exception(
+				sprintf(
+					'%1$s() - Snooping out of bounds @ %2$s',
+					__METHOD__,
+					$path
+				),
+				20
+			);
 		}
 
 		return $path;
@@ -195,7 +208,13 @@ public static function clean($path, $ds = DIRECTORY_SEPARATOR)
 	{
 		if (!is_string($path) && !empty($path))
 		{
-			throw new UnexpectedValueException('JPath::clean: $path is not a string.');
+			throw new UnexpectedValueException(
+				sprintf(
+					'%s() - $path is not a string',
+					__METHOD__
+				),
+				20
+			);
 		}
 
 		$path = trim($path);
diff --git a/libraries/src/Feed/Feed.php b/libraries/src/Feed/Feed.php
index 21147b693f..b6964067e2 100644
--- a/libraries/src/Feed/Feed.php
+++ b/libraries/src/Feed/Feed.php
@@ -85,13 +85,25 @@ public function __set($name, $value)
 		// Validate that any authors that are set are instances of JFeedPerson or null.
 		if (($name == 'author') && (!($value instanceof FeedPerson) || ($value === null)))
 		{
-			throw new \InvalidArgumentException('Feed "author" must be of type FeedPerson. ' . gettype($value) . 'given.');
+			throw new \InvalidArgumentException(
+				sprintf(
+					'%1$s "author" must be an instance of Joomla\\CMS\\Feed\\FeedPerson. %2$s given.',
+					get_class($this),
+					gettype($value) === 'object' ? get_class($value) : gettype($value)
+				)
+			);
 		}
 
 		// Disallow setting categories or contributors directly.
-		if (($name == 'categories') || ($name == 'contributors'))
+		if (in_array($name, array('categories', 'contributors')))
 		{
-			throw new \InvalidArgumentException('Cannot directly set Feed property "' . $name . '".');
+			throw new \InvalidArgumentException(
+				sprintf(
+					'Cannot directly set %1$s property "%2$s".',
+					get_class($this),
+					$name
+				)
+			);
 		}
 
 		$this->properties[$name] = $value;
@@ -231,7 +243,13 @@ public function offsetSet($offset, $value)
 	{
 		if (!($value instanceof FeedEntry))
 		{
-			throw new \InvalidArgumentException('Cannot set value of type "' . gettype($value) . '".');
+			throw new \InvalidArgumentException(
+				sprintf(
+					'%1$s entries must be an instance of Joomla\\CMS\\Feed\\FeedPerson. %2$s given.',
+					get_class($this),
+					gettype($value) === 'object' ? get_class($value) : gettype($value)
+				)
+			);
 		}
 
 		$this->entries[$offset] = $value;
diff --git a/libraries/src/Feed/FeedEntry.php b/libraries/src/Feed/FeedEntry.php
index 66867df79d..f19261d450 100644
--- a/libraries/src/Feed/FeedEntry.php
+++ b/libraries/src/Feed/FeedEntry.php
@@ -80,19 +80,37 @@ public function __set($name, $value)
 		// Validate that any authors that are set are instances of JFeedPerson or null.
 		if (($name == 'author') && (!($value instanceof FeedPerson) || ($value === null)))
 		{
-			throw new \InvalidArgumentException('FeedEntry "author" must be of type FeedPerson. ' . gettype($value) . 'given.');
+			throw new \InvalidArgumentException(
+				sprintf(
+					'%1$s "author" must be an instance of Joomla\\CMS\\Feed\\FeedPerson. %2$s given.',
+					get_class($this),
+					gettype($value) === 'object' ? get_class($value) : gettype($value)
+				)
+			);
 		}
 
 		// Validate that any sources that are set are instances of JFeed or null.
 		if (($name == 'source') && (!($value instanceof Feed) || ($value === null)))
 		{
-			throw new \InvalidArgumentException('FeedEntry "source" must be of type Feed. ' . gettype($value) . 'given.');
+			throw new \InvalidArgumentException(
+				sprintf(
+					'%1$s "source" must be an instance of Joomla\\CMS\\Feed\\Feed. %2$s given.',
+					get_class($this),
+					gettype($value) === 'object' ? get_class($value) : gettype($value)
+				)
+			);
 		}
 
 		// Disallow setting categories, contributors, or links directly.
-		if (($name == 'categories') || ($name == 'contributors') || ($name == 'links'))
+		if (in_array($name, array('categories', 'contributors', 'links')))
 		{
-			throw new \InvalidArgumentException('Cannot directly set FeedEntry property "' . $name . '".');
+			throw new \InvalidArgumentException(
+				sprintf(
+					'Cannot directly set %1$s property "%2$s".',
+					get_class($this),
+					$name
+				)
+			);
 		}
 
 		$this->properties[$name] = $value;
diff --git a/libraries/src/Form/Form.php b/libraries/src/Form/Form.php
index 6faa1c1081..700cf67387 100644
--- a/libraries/src/Form/Form.php
+++ b/libraries/src/Form/Form.php
@@ -2205,7 +2205,7 @@ public static function getInstance($name, $data = null, $options = array(), $rep
 
 			if (empty($data))
 			{
-				throw new \InvalidArgumentException(sprintf('Form::getInstance(%s, *%s*)', $name, gettype($data)));
+				throw new \InvalidArgumentException(sprintf('%1$s(%2$s, *%3$s*)', __METHOD__, $name, gettype($data)));
 			}
 
 			// Instantiate the form.
@@ -2216,14 +2216,14 @@ public static function getInstance($name, $data = null, $options = array(), $rep
 			{
 				if ($forms[$name]->load($data, $replace, $xpath) == false)
 				{
-					throw new \RuntimeException('JForm::getInstance could not load form');
+					throw new \RuntimeException(sprintf('%s() could not load form', __METHOD__));
 				}
 			}
 			else
 			{
 				if ($forms[$name]->loadFile($data, $replace, $xpath) == false)
 				{
-					throw new \RuntimeException('JForm::getInstance could not load file');
+					throw new \RuntimeException(sprintf('%s() could not load file', __METHOD__));
 				}
 			}
 		}
diff --git a/libraries/src/Helper/RouteHelper.php b/libraries/src/Helper/RouteHelper.php
index d72cdb4552..6410bf9b38 100644
--- a/libraries/src/Helper/RouteHelper.php
+++ b/libraries/src/Helper/RouteHelper.php
@@ -241,7 +241,7 @@ public static function getCategoryRoute($catid, $language = 0, $extension = '')
 		// Note: $extension is required but has to be an optional argument in the function call due to argument order
 		if (empty($extension))
 		{
-			throw new \InvalidArgumentException('$extension is a required argument in RouteHelper::getCategoryRoute');
+			throw new \InvalidArgumentException(sprintf('$extension is a required argument in %s()', __METHOD__));
 		}
 
 		if ($catid instanceof \JCategoryNode)
diff --git a/libraries/src/Log/Logger/CallbackLogger.php b/libraries/src/Log/Logger/CallbackLogger.php
index b48682beb6..6d876bed5c 100644
--- a/libraries/src/Log/Logger/CallbackLogger.php
+++ b/libraries/src/Log/Logger/CallbackLogger.php
@@ -47,7 +47,7 @@ public function __construct(array &$options)
 		// Throw an exception if there is not a valid callback
 		if (!isset($this->options['callback']) || !is_callable($this->options['callback']))
 		{
-			throw new \RuntimeException('JLogLoggerCallback created without valid callback function.');
+			throw new \RuntimeException(sprintf('%s created without valid callback function.', get_class($this)));
 		}
 
 		$this->callback = $this->options['callback'];
diff --git a/libraries/src/Table/ContentType.php b/libraries/src/Table/ContentType.php
index 7e73d2a141..0b5dfb6c9d 100644
--- a/libraries/src/Table/ContentType.php
+++ b/libraries/src/Table/ContentType.php
@@ -132,12 +132,12 @@ public function getContentTable()
 		{
 			if (is_object($tableInfo->special) && isset($tableInfo->special->type) && isset($tableInfo->special->prefix))
 			{
-				$class = isset($tableInfo->special->class) ? $tableInfo->special->class : 'Joomla\\Cms\\Table\\Table';
+				$class = isset($tableInfo->special->class) ? $tableInfo->special->class : 'Joomla\\CMS\\Table\\Table';
 
-				if (!class_implements($class, 'Joomla\\Cms\\Table\\TableInterface'))
+				if (!class_implements($class, 'Joomla\\CMS\\Table\\TableInterface'))
 				{
 					// This isn't an instance of TableInterface. Abort.
-					throw new \RuntimeException('Class must be an instance of TableInterface');
+					throw new \RuntimeException('Class must be an instance of Joomla\\CMS\\Table\\TableInterface');
 				}
 
 				$result = $class::getInstance($tableInfo->special->type, $tableInfo->special->prefix);

From 5339ba9448b400d0077bc65c906ddd960588105a Mon Sep 17 00:00:00 2001
From: Michael Richey <github@richeyweb.com>
Date: Wed, 20 Dec 2017 18:10:24 -0600
Subject: [PATCH 03/19] [com_fields] Encode complex values to JSON (#19025)

* Minor adjustment to field value

This adjustment allows complex field types (types with more than one input) to store and retrieve data.

* coding style compliance

* coding style compliance

* more rigorous test

single dimension arrays are already handled, so this alteration changes the behavior to limit the effect to multi-dimensional arrays.

* Update fields.php
---
 plugins/system/fields/fields.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/plugins/system/fields/fields.php b/plugins/system/fields/fields.php
index 297baa493d..c20f770700 100644
--- a/plugins/system/fields/fields.php
+++ b/plugins/system/fields/fields.php
@@ -90,6 +90,12 @@ public function onContentAfterSave($context, $item, $isNew, $data = array())
 			// Determine the value if it is available from the data
 			$value = key_exists($field->name, $fieldsData) ? $fieldsData[$field->name] : null;
 
+			// JSON encode value for complex fields
+			if (is_array($value) && count($value, COUNT_NORMAL) !== count($value, COUNT_RECURSIVE))
+			{
+				$value = json_encode($value);
+			}
+
 			// Setting the value for the field and the item
 			$model->setFieldValue($field->id, $item->id, $value);
 		}

From 164a259fad089e3a019ae179194e12c6b9545781 Mon Sep 17 00:00:00 2001
From: Elijah Madden <okonomiyaki3000@gmail.com>
Date: Thu, 21 Dec 2017 09:11:06 +0900
Subject: [PATCH 04/19] In-menu-item modal modual editor fix (#18982)

Instead of one modal per module -> one generalized modal for ALL modules
Instead of specific js functions for each modal -> generalized js for ALL modals
---
 .../views/item/tmpl/edit_modules.php          | 100 +++++++++++-------
 1 file changed, 60 insertions(+), 40 deletions(-)

diff --git a/administrator/components/com_menus/views/item/tmpl/edit_modules.php b/administrator/components/com_menus/views/item/tmpl/edit_modules.php
index 726b4b8c2a..f0192db7aa 100644
--- a/administrator/components/com_menus/views/item/tmpl/edit_modules.php
+++ b/administrator/components/com_menus/views/item/tmpl/edit_modules.php
@@ -17,29 +17,69 @@
 
 JFactory::getDocument()->addScriptDeclaration('
 	var viewLevels = ' . json_encode($allLevels) . ',
-		menuId = parseInt(' . $this->item->id . ');
+		menuId = parseInt(' . (int) $this->item->id . ');
 
-	jQuery(document).ready(function() {
-		jQuery(document).on("click", "input:radio[id^=\'jform_toggle_modules_assigned1\']", function (event) {
-			jQuery(".table tr.no").hide();
-		});
-		jQuery(document).on("click", "input:radio[id^=\'jform_toggle_modules_assigned0\']", function (event) {
-			jQuery(".table tr.no").show();
-		});
-		jQuery(document).on("click", "input:radio[id^=\'jform_toggle_modules_published1\']", function (event) {
-			jQuery(".table tr.unpublished").hide();
-		});
-		jQuery(document).on("click", "input:radio[id^=\'jform_toggle_modules_published0\']", function (event) {
-			jQuery(".table tr.unpublished").show();
-		});
+	jQuery(function($) {
+		var baseLink = "index.php?option=com_modules&amp;client_id=0&amp;task=module.edit&amp;tmpl=component&amp;view=module&amp;layout=modal&amp;id=",
+			iFrameAttr = "class=\"iframe jviewport-height70\"";
+
+		$(document)
+			.on("click", "input:radio[id^=\'jform_toggle_modules_assigned1\']", function (event) {
+				$(".table tr.no").hide();
+			})
+			.on("click", "input:radio[id^=\'jform_toggle_modules_assigned0\']", function (event) {
+				$(".table tr.no").show();
+			})
+			.on("click", "input:radio[id^=\'jform_toggle_modules_published1\']", function (event) {
+				$(".table tr.unpublished").hide();
+			})
+			.on("click", "input:radio[id^=\'jform_toggle_modules_published0\']", function (event) {
+				$(".table tr.unpublished").show();
+			})
+			.on("click", ".module-edit-link", function () {
+				var link = baseLink + $(this).data("moduleId"),
+					iFrame = $("<iframe src=\"" + link + "\" " + iFrameAttr + "></iframe>");
+
+				$("#moduleEditModal").modal()
+					.find(".modal-body").empty().prepend(iFrame);
+			})
+			.on("click", "#moduleEditModal .modal-footer .btn", function () {
+				var target = $(this).data("target");
+
+				if (target) {
+					$("#moduleEditModal iframe").contents().find(target).click();
+				}
+			});
 	});
 ');
+
 JFactory::getDocument()->addStyleDeclaration('
 ul.horizontal-buttons li {
   display: inline-block;
   padding-right: 10%;
 }
 ');
+
+// Set up the bootstrap modal that will be used for all module editors
+echo JHtml::_(
+	'bootstrap.renderModal',
+	'moduleEditModal',
+	array(
+		'title'       => JText::_('COM_MENUS_EDIT_MODULE_SETTINGS'),
+		'backdrop'    => 'static',
+		'keyboard'    => false,
+		'closeButton' => false,
+		'bodyHeight'  => '70',
+		'modalWidth'  => '80',
+		'footer'      => '<a type="button" class="btn" data-dismiss="modal" data-target="#closeBtn" aria-hidden="true">'
+				. JText::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</a>'
+				. '<button type="button" class="btn btn-primary" data-dismiss="modal" data-target="#saveBtn" aria-hidden="true">'
+				. JText::_('JSAVE') . '</button>'
+				. '<button type="button" class="btn btn-success" data-target="#applyBtn" aria-hidden="true">'
+				. JText::_('JAPPLY') . '</button>',
+	)
+);
+
 ?>
 <?php
 // Set main fields.
@@ -85,8 +125,12 @@
 			<?php endif; ?>
 			<tr class="<?php echo $no; ?><?php echo $status; ?>row<?php echo $i % 2; ?>" id="tr-<?php echo $module->id; ?>" style="display:table-row">
 				<td id="<?php echo $module->id; ?>">
-					<?php $link = 'index.php?option=com_modules&amp;client_id=0&amp;task=module.edit&amp;id=' . $module->id . '&amp;tmpl=component&amp;view=module&amp;layout=modal'; ?>
-					<a href="#moduleEdit<?php echo $module->id; ?>Modal" role="button" class="btn btn-link" data-toggle="modal" title="<?php echo JText::_('COM_MENUS_EDIT_MODULE_SETTINGS'); ?>" id="title-<?php echo $module->id; ?>">
+					<a href="#moduleEditModal"
+						role="button"
+						class="btn btn-link module-edit-link"
+						title="<?php echo JText::_('COM_MENUS_EDIT_MODULE_SETTINGS'); ?>"
+						id="title-<?php echo $module->id; ?>"
+						data-module-id="<?php echo $module->id; ?>">
 						<?php echo $this->escape($module->title); ?></a>
 				</td>
 				<td id="access-<?php echo $module->id; ?>">
@@ -131,30 +175,6 @@
 							</span>
 						<?php endif; ?>
 				</td>
-			<?php echo JHtml::_(
-					'bootstrap.renderModal',
-					'moduleEdit' . $module->id . 'Modal',
-					array(
-						'title'       => JText::_('COM_MENUS_EDIT_MODULE_SETTINGS'),
-						'backdrop'    => 'static',
-						'keyboard'    => false,
-						'closeButton' => false,
-						'url'         => $link,
-						'height'      => '400px',
-						'width'       => '800px',
-						'bodyHeight'  => '70',
-						'modalWidth'  => '80',
-						'footer'      => '<a type="button" class="btn" data-dismiss="modal" aria-hidden="true"'
-								. ' onclick="jQuery(\'#moduleEdit' . $module->id . 'Modal iframe\').contents().find(\'#closeBtn\').click();">'
-								. JText::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</a>'
-								. '<button type="button" class="btn btn-primary" aria-hidden="true"'
-								. ' onclick="jQuery(\'#moduleEdit' . $module->id . 'Modal iframe\').contents().find(\'#saveBtn\').click();">'
-								. JText::_('JSAVE') . '</button>'
-								. '<button type="button" class="btn btn-success" aria-hidden="true"'
-								. ' onclick="jQuery(\'#moduleEdit' . $module->id . 'Modal iframe\').contents().find(\'#applyBtn\').click();">'
-								. JText::_('JAPPLY') . '</button>',
-					)
-				); ?>
 			</tr>
 		<?php endforeach; ?>
 		</tbody>

From 37ec66368b04d8fd91f82805fd2b177b6e51665c Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Thu, 21 Dec 2017 00:11:57 +0000
Subject: [PATCH 05/19] [com_fields] Color plugin - invalid markup (#18239)

* [com_fields]Color plugin - invalid markup

Create a color field for content and set it to be required
Open an article to edit and view the source
You will see
`<input type="text" name="jform[com_fields][colour]" id="jform_com_fields_colour" value="none"  placeholder="#rrggbb" class="minicolors required" data-position="default" data-control="hue"1 data-format="hex" data-validate="color"/>`

Note the data-control="hue"1 the 1 should not be there

This PR resolves that

PR for #18067

* revert readonly
---
 layouts/joomla/form/field/color/advanced.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layouts/joomla/form/field/color/advanced.php b/layouts/joomla/form/field/color/advanced.php
index b446b36541..ec3164d40e 100644
--- a/layouts/joomla/form/field/color/advanced.php
+++ b/layouts/joomla/form/field/color/advanced.php
@@ -77,4 +77,4 @@
 JHtml::_('script', 'system/color-field-adv-init.min.js', array('version' => 'auto', 'relative' => true));
 ?>
 <input type="text" name="<?php echo $name; ?>" id="<?php echo $id; ?>" value="<?php echo htmlspecialchars($color, ENT_COMPAT, 'UTF-8'); ?>" <?php
-echo $hint . $class . $position . $control . $readonly . $disabled . $required . $onchange . $autocomplete . $autofocus . $format . $keywords . $direction . $validate; ?>/>
+echo $hint . $class . $position . $control . $readonly . $disabled . $onchange . $autocomplete . $autofocus . $format . $keywords . $direction . $validate; ?>/>

From 0531d2f302bd3549e4a5aa0f868235aaf287b43a Mon Sep 17 00:00:00 2001
From: joomlart <khanhlh@joomsolutions.com>
Date: Thu, 21 Dec 2017 07:13:22 +0700
Subject: [PATCH 06/19] Passing a null value for the first argument of
 Text::script() is deprecated (#18101)

Use Text::getScriptStrings() instead.
---
 libraries/src/Document/HtmlDocument.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/src/Document/HtmlDocument.php b/libraries/src/Document/HtmlDocument.php
index 83191c4f72..098efa196b 100644
--- a/libraries/src/Document/HtmlDocument.php
+++ b/libraries/src/Document/HtmlDocument.php
@@ -145,7 +145,7 @@ public function getHeadData()
 		$data['scripts']     = $this->_scripts;
 		$data['script']      = $this->_script;
 		$data['custom']      = $this->_custom;
-		$data['scriptText']  = \JText::script();
+		$data['scriptText']  = \JText::getScriptStrings();
 
 		return $data;
 	}

From f925beb086d5a75d33065bab72d3e31faa5c82df Mon Sep 17 00:00:00 2001
From: zero-24 <zero-24@users.noreply.github.com>
Date: Sat, 31 Mar 2018 20:41:05 +0200
Subject: [PATCH 07/19] drop gmail on new installs (#18322)

---
 .../en-GB/en-GB.plg_authentication_gmail.ini  |  18 --
 .../en-GB.plg_authentication_gmail.sys.ini    |   7 -
 installation/sql/mysql/joomla.sql             |   1 -
 installation/sql/postgresql/joomla.sql        |   1 -
 plugins/authentication/gmail/gmail.php        | 242 ------------------
 plugins/authentication/gmail/gmail.xml        |  74 ------
 6 files changed, 343 deletions(-)
 delete mode 100644 administrator/language/en-GB/en-GB.plg_authentication_gmail.ini
 delete mode 100644 administrator/language/en-GB/en-GB.plg_authentication_gmail.sys.ini
 delete mode 100644 plugins/authentication/gmail/gmail.php
 delete mode 100644 plugins/authentication/gmail/gmail.xml

diff --git a/administrator/language/en-GB/en-GB.plg_authentication_gmail.ini b/administrator/language/en-GB/en-GB.plg_authentication_gmail.ini
deleted file mode 100644
index 2bfaf314a8..0000000000
--- a/administrator/language/en-GB/en-GB.plg_authentication_gmail.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-; Joomla! Project
-; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.
-; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
-; Note : All ini files need to be saved as UTF-8
-
-PLG_AUTHENTICATION_GMAIL="Authentication - Gmail"
-PLG_GMAIL_ERROR_LOCAL_USERNAME_CONFLICT="A local username conflicts with your Gmail username."
-PLG_GMAIL_FIELD_APPLYSUFFIX_LABEL="Apply Username Suffix"
-PLG_GMAIL_FIELD_BACKEND_LOGIN_LABEL="Backend Login"
-PLG_GMAIL_FIELD_SUFFIX_DESC="A suffix to use for the username, typically gmail.com (or googlemail.com) is the suffix but you may wish to use a Google Apps for Your Domain suffix, this doesn't include the @ symbol."
-PLG_GMAIL_FIELD_SUFFIX_LABEL="Username Suffix"
-PLG_GMAIL_FIELD_USER_BLACKLIST_DESC="The usernames should be separated by a comma."
-PLG_GMAIL_FIELD_USER_BLACKLIST_LABEL="Username Blacklist"
-PLG_GMAIL_FIELD_VALUE_APPLYSUFFIXALWAYS="Always use suffix"
-PLG_GMAIL_FIELD_VALUE_APPLYSUFFIXMISSING="Apply suffix if missing"
-PLG_GMAIL_FIELD_VALUE_NOAPPLYSUFFIX="Don't Apply Suffix"
-PLG_GMAIL_FIELD_VERIFYPEER_LABEL="Verify Peer"
-PLG_GMAIL_XML_DESCRIPTION="Handles User Authentication with a Gmail or Googlemail account (Requires cURL).<br>Users may need to enable <em>Access for less secure apps</em> at <a href=\"https://www.google.com/settings/security/lesssecureapps\" target=\"_blank\">https://www.google.com/settings/security/lesssecureapps</a> to be able to log in using this method.<br><strong> Warning! You must have at least one authentication plugin enabled or you will lose all access to your site.</strong>"
diff --git a/administrator/language/en-GB/en-GB.plg_authentication_gmail.sys.ini b/administrator/language/en-GB/en-GB.plg_authentication_gmail.sys.ini
deleted file mode 100644
index b9c9e63266..0000000000
--- a/administrator/language/en-GB/en-GB.plg_authentication_gmail.sys.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-; Joomla! Project
-; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.
-; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
-; Note : All ini files need to be saved as UTF-8
-
-PLG_AUTHENTICATION_GMAIL="Authentication - Gmail"
-PLG_GMAIL_XML_DESCRIPTION="Handles User Authentication with a Gmail or Googlemail account (Requires cURL).<br>Users may need to enable <em>Access for less secure apps</em> at <a href=\"https://www.google.com/settings/security/lesssecureapps\" target=\"_blank\">https://www.google.com/settings/security/lesssecureapps</a> to be able to log in using this method.<br><strong> Warning! You must have at least one authentication plugin enabled or you will lose all access to your site.</strong>"
diff --git a/installation/sql/mysql/joomla.sql b/installation/sql/mysql/joomla.sql
index 9b7452b823..5ea362f83a 100644
--- a/installation/sql/mysql/joomla.sql
+++ b/installation/sql/mysql/joomla.sql
@@ -559,7 +559,6 @@ INSERT INTO `#__extensions` (`extension_id`, `package_id`, `name`, `type`, `elem
 (316, 0, 'mod_tags_popular', 'module', 'mod_tags_popular', '', 0, 1, 1, 0, '', '{"maximum":"5","timeframe":"alltime","owncache":"1"}', 0, '0000-00-00 00:00:00', 0, 0, ''),
 (317, 0, 'mod_tags_similar', 'module', 'mod_tags_similar', '', 0, 1, 1, 0, '', '{"maximum":"5","matchtype":"any","owncache":"1"}', 0, '0000-00-00 00:00:00', 0, 0, ''),
 (318, 0, 'mod_sampledata', 'module', 'mod_sampledata', '', 1, 1, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0, ''),
-(400, 0, 'plg_authentication_gmail', 'plugin', 'gmail', 'authentication', 0, 0, 1, 0, '', '{"applysuffix":"0","suffix":"","verifypeer":"1","user_blacklist":""}', 0, '0000-00-00 00:00:00', 1, 0, ''),
 (401, 0, 'plg_authentication_joomla', 'plugin', 'joomla', 'authentication', 0, 1, 1, 1, '', '', 0, '0000-00-00 00:00:00', 0, 0, ''),
 (402, 0, 'plg_authentication_ldap', 'plugin', 'ldap', 'authentication', 0, 0, 1, 0, '', '{"host":"","port":"389","use_ldapV3":"0","negotiate_tls":"0","no_referrals":"0","auth_method":"bind","base_dn":"","search_string":"","users_dn":"","username":"admin","password":"bobby7","ldap_fullname":"fullName","ldap_email":"mail","ldap_uid":"uid"}', 0, '0000-00-00 00:00:00', 3, 0, ''),
 (403, 0, 'plg_content_contact', 'plugin', 'contact', 'content', 0, 1, 1, 0, '', '', 0, '0000-00-00 00:00:00', 1, 0, ''),
diff --git a/installation/sql/postgresql/joomla.sql b/installation/sql/postgresql/joomla.sql
index 6a5ac93c48..150c2027ee 100644
--- a/installation/sql/postgresql/joomla.sql
+++ b/installation/sql/postgresql/joomla.sql
@@ -570,7 +570,6 @@ INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "elem
 (315, 0, 'mod_stats_admin', 'module', 'mod_stats_admin', '', 1, 1, 1, 0, '', '{"serverinfo":"0","siteinfo":"0","counter":"0","increase":"0","cache":"1","cache_time":"900","cachemode":"static"}', 0, '1970-01-01 00:00:00', 0, 0, ''),
 (316, 0, 'mod_tags_popular', 'module', 'mod_tags_popular', '', 0, 1, 1, 0, '', '{"maximum":"5","timeframe":"alltime","owncache":"1"}', 0, '1970-01-01 00:00:00', 0, 0, ''),
 (317, 0, 'mod_tags_similar', 'module', 'mod_tags_similar', '', 0, 1, 1, 0, '', '{"maximum":"5","matchtype":"any","owncache":"1"}', 0, '1970-01-01 00:00:00', 0, 0, ''),
-(400, 0, 'plg_authentication_gmail', 'plugin', 'gmail', 'authentication', 0, 0, 1, 0, '', '{"applysuffix":"0","suffix":"","verifypeer":"1","user_blacklist":""}', 0, '1970-01-01 00:00:00', 1, 0, ''),
 (401, 0, 'plg_authentication_joomla', 'plugin', 'joomla', 'authentication', 0, 1, 1, 1, '', '', 0, '1970-01-01 00:00:00', 0, 0, ''),
 (402, 0, 'plg_authentication_ldap', 'plugin', 'ldap', 'authentication', 0, 0, 1, 0, '', '{"host":"","port":"389","use_ldapV3":"0","negotiate_tls":"0","no_referrals":"0","auth_method":"bind","base_dn":"","search_string":"","users_dn":"","username":"admin","password":"bobby7","ldap_fullname":"fullName","ldap_email":"mail","ldap_uid":"uid"}', 0, '1970-01-01 00:00:00', 3, 0, ''),
 (403, 0, 'plg_content_contact', 'plugin', 'contact', 'content', 0, 1, 1, 0, '', '', 0, '1970-01-01 00:00:00', 1, 0, ''),
diff --git a/plugins/authentication/gmail/gmail.php b/plugins/authentication/gmail/gmail.php
deleted file mode 100644
index 84acf797a4..0000000000
--- a/plugins/authentication/gmail/gmail.php
+++ /dev/null
@@ -1,242 +0,0 @@
-<?php
-/**
- * @package     Joomla.Plugin
- * @subpackage  Authentication.gmail
- *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-defined('_JEXEC') or die;
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Http\Response;
-use Joomla\CMS\Language\Text;
-use Joomla\Registry\Registry;
-use Joomla\CMS\Http\HttpFactory;
-use Joomla\CMS\Plugin\CMSPlugin;
-use Joomla\CMS\Authentication\Authentication;
-
-/**
- * GMail Authentication Plugin
- *
- * @since  1.5
- */
-class PlgAuthenticationGMail extends CMSPlugin
-{
-	/**
-	 * This method should handle any authentication and report back to the subject
-	 *
-	 * @param   array   $credentials  Array holding the user credentials
-	 * @param   array   $options      Array of extra options
-	 * @param   object  &$response    Authentication response object
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.5
-	 */
-	public function onUserAuthenticate($credentials, $options, &$response)
-	{
-		// Load plugin language
-		$this->loadLanguage();
-
-		// No backend authentication
-		if (Factory::getApplication()->isClient('administrator') && !$this->params->get('backendLogin', 0))
-		{
-			return;
-		}
-
-		$success = false;
-
-		$curlParams = array(
-			'follow_location' => true,
-			'transport.curl'  => array(
-				CURLOPT_SSL_VERIFYPEER => $this->params->get('verifypeer', 1)
-			),
-		);
-
-		$transportParams = new Registry($curlParams);
-
-		try
-		{
-			$http = HttpFactory::getHttp($transportParams, 'curl');
-		}
-		catch (RuntimeException $e)
-		{
-			$response->status        = Authentication::STATUS_FAILURE;
-			$response->type          = 'GMail';
-			$response->error_message = Text::sprintf('JGLOBAL_AUTH_FAILED', Text::_('JGLOBAL_AUTH_CURL_NOT_INSTALLED'));
-
-			return;
-		}
-
-		// Check if we have a username and password
-		if ($credentials['username'] === '' || $credentials['password'] === '')
-		{
-			$response->type          = 'GMail';
-			$response->status        = Authentication::STATUS_FAILURE;
-			$response->error_message = Text::sprintf('JGLOBAL_AUTH_FAILED', Text::_('JGLOBAL_AUTH_USER_BLACKLISTED'));
-
-			return;
-		}
-
-		$blacklist = explode(',', $this->params->get('user_blacklist', ''));
-
-		// Check if the username isn't blacklisted
-		if (in_array($credentials['username'], $blacklist))
-		{
-			$response->type          = 'GMail';
-			$response->status        = Authentication::STATUS_FAILURE;
-			$response->error_message = Text::sprintf('JGLOBAL_AUTH_FAILED', Text::_('JGLOBAL_AUTH_USER_BLACKLISTED'));
-
-			return;
-		}
-
-		$suffix      = $this->params->get('suffix', '');
-		$applysuffix = $this->params->get('applysuffix', 0);
-		$offset      = strpos($credentials['username'], '@');
-
-		// Check if we want to do suffix stuff, typically for Google Apps for Your Domain
-		if ($suffix && $applysuffix)
-		{
-			if ($applysuffix == 1 && $offset === false)
-			{
-				// Apply suffix if missing
-				$credentials['username'] .= '@' . $suffix;
-			}
-			elseif ($applysuffix == 2)
-			{
-				// Always use suffix
-				if ($offset)
-				{
-					// If we already have an @, get rid of it and replace it
-					$credentials['username'] = substr($credentials['username'], 0, $offset);
-				}
-
-				$credentials['username'] .= '@' . $suffix;
-			}
-		}
-
-		$headers = array(
-			'Authorization' => 'Basic ' . base64_encode($credentials['username'] . ':' . $credentials['password'])
-		);
-
-		try
-		{
-			$result = $http->get('https://mail.google.com/mail/feed/atom', $headers);
-		}
-		catch (Exception $e)
-		{
-			// If there was an error in the request then create a 'false' dummy response.
-			$result = new Response;
-			$result = $result->withStatus(500);
-		}
-
-		$code = $result->code;
-
-		switch ($code)
-		{
-			case 200 :
-				$message = Text::_('JGLOBAL_AUTH_ACCESS_GRANTED');
-				$success = true;
-				break;
-
-			case 401 :
-				$message = Text::_('JGLOBAL_AUTH_ACCESS_DENIED');
-				break;
-
-			default :
-				$message = Text::_('JGLOBAL_AUTH_UNKNOWN_ACCESS_DENIED');
-				break;
-		}
-
-		$response->type = 'GMail';
-
-		if (!$success)
-		{
-			$response->status        = Authentication::STATUS_FAILURE;
-			$response->error_message = Text::sprintf('JGLOBAL_AUTH_FAILED', $message);
-
-			return;
-		}
-
-		if (strpos($credentials['username'], '@') === false)
-		{
-			if ($suffix)
-			{
-				// If there is a suffix then we want to apply it
-				$email = $credentials['username'] . '@' . $suffix;
-			}
-			else
-			{
-				// If there isn't a suffix just use the default gmail one
-				$email = $credentials['username'] . '@gmail.com';
-			}
-		}
-		else
-		{
-			// The username looks like an email address (probably is) so use that
-			$email = $credentials['username'];
-		}
-
-		// Extra security checks with existing local accounts
-		$db                  = Factory::getDbo();
-		$localUsernameChecks = array(strstr($email, '@', true), $email);
-
-		$query = $db->getQuery(true)
-			->select('id, activation, username, email, block')
-			->from('#__users')
-			->where('username IN(' . implode(',', array_map(array($db, 'quote'), $localUsernameChecks)) . ')'
-				. ' OR email = ' . $db->quote($email)
-			);
-
-		$db->setQuery($query);
-
-		if ($localUsers = $db->loadObjectList())
-		{
-			foreach ($localUsers as $localUser)
-			{
-				// Local user exists with same username but different email address
-				if ($email !== $localUser->email)
-				{
-					$response->status        = Authentication::STATUS_FAILURE;
-					$response->error_message = Text::sprintf('JGLOBAL_AUTH_FAILED', Text::_('PLG_GMAIL_ERROR_LOCAL_USERNAME_CONFLICT'));
-
-					return;
-				}
-				else
-				{
-					// Existing user disabled locally
-					if ($localUser->block || !empty($localUser->activation))
-					{
-						$response->status        = Authentication::STATUS_FAILURE;
-						$response->error_message = Text::_('JGLOBAL_AUTH_ACCESS_DENIED');
-
-						return;
-					}
-
-					// We will always keep the local username for existing accounts
-					$credentials['username'] = $localUser->username;
-
-					break;
-				}
-			}
-		}
-		elseif (Factory::getApplication()->isClient('administrator'))
-		{
-			// We wont' allow backend access without local account
-			$response->status        = Authentication::STATUS_FAILURE;
-			$response->error_message = Text::_('JERROR_LOGIN_DENIED');
-
-			return;
-		}
-
-		$response->status        = Authentication::STATUS_SUCCESS;
-		$response->error_message = '';
-		$response->email         = $email;
-
-		// Reset the username to what we ended up using
-		$response->username = $credentials['username'];
-		$response->fullname = $credentials['username'];
-	}
-}
diff --git a/plugins/authentication/gmail/gmail.xml b/plugins/authentication/gmail/gmail.xml
deleted file mode 100644
index 60562234f9..0000000000
--- a/plugins/authentication/gmail/gmail.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<extension version="3.1" type="plugin" group="authentication" method="upgrade">
-	<name>plg_authentication_gmail</name>
-	<author>Joomla! Project</author>
-	<creationDate>February 2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.</copyright>
-	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<authorEmail>admin@joomla.org</authorEmail>
-	<authorUrl>www.joomla.org</authorUrl>
-	<version>3.0.0</version>
-	<description>PLG_GMAIL_XML_DESCRIPTION</description>
-	<files>
-		<filename plugin="gmail">gmail.php</filename>
-	</files>
-	<languages>
-		<language tag="en-GB">en-GB.plg_authentication_gmail.ini</language>
-		<language tag="en-GB">en-GB.plg_authentication_gmail.sys.ini</language>
-	</languages>
-	<config>
-		<fields name="params">
-			<fieldset name="basic">
-				<field
-					name="applysuffix"
-					type="list"
-					label="PLG_GMAIL_FIELD_APPLYSUFFIX_LABEL"
-					default="0"
-					>
-					<option value="0">PLG_GMAIL_FIELD_VALUE_NOAPPLYSUFFIX</option>
-					<option value="1">PLG_GMAIL_FIELD_VALUE_APPLYSUFFIXMISSING</option>
-					<option value="2">PLG_GMAIL_FIELD_VALUE_APPLYSUFFIXALWAYS</option>
-				</field>
-
-				<field
-					name="suffix"
-					type="text"
-					label="PLG_GMAIL_FIELD_SUFFIX_LABEL"
-					description="PLG_GMAIL_FIELD_SUFFIX_DESC"
-					size="20"
-					showon="applysuffix:1,2"
-				/>
-
-				<field
-					name="verifypeer"
-					type="radio"
-					label="PLG_GMAIL_FIELD_VERIFYPEER_LABEL"
-					default="1"
-					class="switcher"
-					>
-					<option value="0">JNO</option>
-					<option value="1">JYES</option>
-				</field>
-
-				<field
-					name="user_blacklist"
-					type="text"
-					label="PLG_GMAIL_FIELD_USER_BLACKLIST_LABEL"
-					description="PLG_GMAIL_FIELD_USER_BLACKLIST_DESC"
-					size="20"
-				/>
-
-				<field
-					name="backendLogin"
-					type="radio"
-					label="PLG_GMAIL_FIELD_BACKEND_LOGIN_LABEL"
-					default="0"
-					class="switcher"
-					>
-					<option value="0">JDISABLED</option>
-					<option value="1">JENABLED</option>
-				</field>
-			</fieldset>
-		</fields>
-	</config>
-</extension>

From 11daf532343471b68d72b43952dd5cec7220f9dd Mon Sep 17 00:00:00 2001
From: David Jardin <d.jardin@djumla.de>
Date: Sat, 31 Mar 2018 21:19:36 +0200
Subject: [PATCH 08/19] 4.0 Removed hardcoded error reporting levels from CLI
 scripts (#20027)

* Removed hardcoded maximum error reporting statement

* Also removed statement from finder indexer
---
 cli/finder_indexer.php | 4 ----
 cli/joomla.php         | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/cli/finder_indexer.php b/cli/finder_indexer.php
index 010f7ffcec..51b4ba412c 100644
--- a/cli/finder_indexer.php
+++ b/cli/finder_indexer.php
@@ -38,10 +38,6 @@
 // Get the framework.
 require_once JPATH_BASE . '/includes/framework.php';
 
-// Configure error reporting to maximum for CLI output.
-error_reporting(E_ALL);
-ini_set('display_errors', 1);
-
 // Load Library language
 $lang = JFactory::getLanguage();
 
diff --git a/cli/joomla.php b/cli/joomla.php
index 862611975c..b50de254fe 100644
--- a/cli/joomla.php
+++ b/cli/joomla.php
@@ -24,10 +24,6 @@
 // Get the framework.
 require_once JPATH_BASE . '/includes/framework.php';
 
-// Configure error reporting to maximum for CLI output.
-error_reporting(E_ALL);
-ini_set('display_errors', 1);
-
 $app = \Joomla\CMS\Factory::getContainer()->get(\Joomla\Console\Application::class);
 \Joomla\CMS\Factory::$application = $app;
 $app->execute();

From 5005838fa36b017fe898482075c64b32926d773d Mon Sep 17 00:00:00 2001
From: infograf768 <infografjms@gmail.com>
Date: Sun, 1 Apr 2018 01:48:34 +0200
Subject: [PATCH 09/19] [4.0] Multilanguage. Set the multilangstatus module as
 published or not in the modules manager depending on the status of the
 languagefilter plugin (#19463)

* [4.0] Multilanguage. Set the multilangstatus module as published or not
in the modules manager depending on the status of the languagefilter
plugin

* Adding various checks
---
 .../Helper/MultilangstatusAdminHelper.php     | 140 ++++++++++++++++++
 .../modules/mod_status/tmpl/default.php       |  22 ++-
 2 files changed, 158 insertions(+), 4 deletions(-)
 create mode 100644 administrator/modules/mod_multilangstatus/Helper/MultilangstatusAdminHelper.php

diff --git a/administrator/modules/mod_multilangstatus/Helper/MultilangstatusAdminHelper.php b/administrator/modules/mod_multilangstatus/Helper/MultilangstatusAdminHelper.php
new file mode 100644
index 0000000000..c7d19c21f4
--- /dev/null
+++ b/administrator/modules/mod_multilangstatus/Helper/MultilangstatusAdminHelper.php
@@ -0,0 +1,140 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_multilangstatus
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Module\Multilangstatus\Administrator\Helper;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Multilanguage;
+
+/**
+ * Helper class for the multilangstatus module
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class MultilangstatusAdminHelper
+{
+	/**
+	 * Method to check if the module exists and is enabled as extension
+	 *
+	 * @return  boolean
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public static function isEnabled()
+	{
+		$app   = Factory::getApplication();
+		$db    = Factory::getDbo();
+
+		$query = $db->getQuery(true)
+			->select($db->quoteName('enabled'))
+			->from($db->quoteName('#__extensions'))
+			->where($db->quoteName('type') . ' = ' . $db->quote('module'))
+			->where($db->quoteName('element') . ' = ' . $db->quote('mod_multilangstatus'));
+		$db->setQuery($query);
+
+		try
+		{
+			$result = (int) $db->loadResult();
+		}
+		catch (\RuntimeException $e)
+		{
+			$app->enqueueMessage($e->getMessage(), 'error');
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Method to check the state of the module
+	 *
+	 * @return  void
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public static function getState()
+	{
+		$app   = Factory::getApplication();
+		$db    = Factory::getDbo();
+
+		$query = $db->getQuery(true)
+			->select($db->quoteName('published'))
+			->from($db->quoteName('#__modules'))
+			->where($db->quoteName('module') . ' = ' . $db->quote('mod_multilangstatus'));
+		$db->setQuery($query);
+
+		try
+		{
+			$result = (int) $db->loadResult();
+		}
+		catch (\RuntimeException $e)
+		{
+			$app->enqueueMessage($e->getMessage(), 'error');
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Method to publish/unpublish the module depending on the languagefilter state
+	 *
+	 * @return  void
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public static function publish()
+	{
+		$app   = Factory::getApplication();
+		$db    = Factory::getDbo();
+
+		// If the module is trashed do not change its status
+		if (self::getState() != -2)
+		{
+			// Publish the module when the languagefilter is enabled
+			if (Multilanguage::isEnabled())
+			{
+				$query = $db->getQuery(true)
+					->update($db->quoteName('#__modules'))
+					->set($db->quoteName('published') . ' = ' . (int) 1)
+					->where($db->quoteName('module') . ' = ' . $db->quote('mod_multilangstatus'));
+
+				try
+				{
+					$db->setQuery($query)->execute();
+				}
+				catch (\RuntimeException $e)
+				{
+					$app->enqueueMessage($e->getMessage(), 'error');
+
+					return;
+				}
+			}
+			else
+			{
+				// Unpublish the module when the languagefilter is disabled
+				$query = $db->getQuery(true)
+					->update($db->quoteName('#__modules'))
+					->set($db->quoteName('published') . ' = ' . (int) 0)
+					->where($db->quoteName('module') . ' = ' . $db->quote('mod_multilangstatus'));
+
+				try
+				{
+					$db->setQuery($query)->execute();
+				}
+				catch (Exception $e)
+				{
+					$app->enqueueMessage($e->getMessage(), 'error');
+
+					return;
+				}
+			}
+		}
+	}
+}
diff --git a/administrator/modules/mod_status/tmpl/default.php b/administrator/modules/mod_status/tmpl/default.php
index 57c7e5c5ef..d8f0c7f4a8 100644
--- a/administrator/modules/mod_status/tmpl/default.php
+++ b/administrator/modules/mod_status/tmpl/default.php
@@ -17,16 +17,30 @@
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use Joomla\CMS\Helper\ModuleHelper;
+use Joomla\Module\Multilangstatus\Administrator\Helper\MultilangstatusAdminHelper;
 
 $hideLinks = $app->input->getBool('hidemainmenu');
 
+// Check if the multilangstatus module is present in the site
+if (class_exists(MultilangstatusAdminHelper::class))
+{
+	// Check if the module is present and enabled in the extensions table
+	if (MultilangstatusAdminHelper::isEnabled())
+	{
+		// Publish/Unpublish the module if it exists in the modules table
+		// depending on the status of the languagefilter
+		MultilangstatusAdminHelper::publish();
+	}
+}
 ?>
 <div class="ml-auto">
 	<ul class="nav text-center">
-		<?php if (Multilanguage::isEnabled()) : ?>
-			<?php $module = ModuleHelper::getModule('mod_multilangstatus'); ?>
-			<?php echo ModuleHelper::renderModule($module); ?>
-		<?php endif; ?>	
+		<?php if (class_exists(MultilangstatusAdminHelper::class)) : ?>
+			<?php if (Multilanguage::isEnabled() && MultilangstatusAdminHelper::isEnabled()) : ?>
+				<?php $module = ModuleHelper::getModule('mod_multilangstatus'); ?>
+				<?php echo ModuleHelper::renderModule($module); ?>
+			<?php endif; ?>
+		<?php endif; ?>
 
 		<li class="nav-item">
 			<a class="nav-link" href="<?php echo Uri::root(); ?>" title="<?php echo Text::sprintf('MOD_STATUS_PREVIEW', $sitename); ?>" target="_blank">

From 6bbbc497150f2f730a55577caa514bfc1cde197a Mon Sep 17 00:00:00 2001
From: David Neukirchen <david.neukirchen@gmail.com>
Date: Sun, 1 Apr 2018 11:53:49 +0200
Subject: [PATCH 10/19] Fix the excluded file list in the robo setup task
 (#20045)

Previously files and folders which are not needed for the test site were copied. In some szenarios (i.e. if you have the root instance installed) this made it unpossible to run the tests.
---
 RoboFile.php | 43 ++++++++++++++++++++++++++++++++++++-------
 1 file changed, 36 insertions(+), 7 deletions(-)

diff --git a/RoboFile.php b/RoboFile.php
index 4f65c925f3..d026513793 100644
--- a/RoboFile.php
+++ b/RoboFile.php
@@ -175,16 +175,45 @@ public function createTestingSite($useHtaccess = false)
 		}
 
 		$exclude = [
-			'tests',
-			'tests-phpunit',
-			'.run',
+			'.drone',
 			'.github',
 			'.git',
+			'.run',
+			'.idea',
+			'build',
+			'dev',
+			'node_modules',
+			'tests',
 			'test-install',
-			'libraries/vendor/codeception',
-			'libraries/vendor/behat',
-			'libraries/vendor/joomla-projects',
-			'libraries/vendor/consolidation'
+			'.appveyor.yml',
+			'.babelrc',
+			'.drone.yml',
+			'.eslintignore',
+			'.eslintrc',
+			'.gitignore',
+			'.hound.yml',
+			'.php_cs',
+			'.travis.yml',
+			'appveyor-phpunit.xml',
+			'build.js',
+			'build.xml',
+			'codeception.yml',
+			'composer.json',
+			'composer.lock',
+			'configuration.php',
+			'drone-package.json',
+			'Gemfile',
+			'htaccess.txt',
+			'karma.conf.js',
+			'package.json',
+			'package-lock.json',
+			'phpunit.xml.dist',
+			'RoboFile.dist.ini',
+			'RoboFile.php',
+			'robots.txt.dist',
+			'scss-lint.yml',
+			'selenium.log',
+			'travisci-phpunit.xml',
 		];
 
 		$this->copyJoomla($this->cmsPath, $exclude);

From af9576fc0954cc77fd3bf7851eee2d30160b80ce Mon Sep 17 00:00:00 2001
From: David Neukirchen <david.neukirchen@gmail.com>
Date: Sun, 1 Apr 2018 12:11:46 +0200
Subject: [PATCH 11/19] Add media manager system tests (#20047)

---
 RoboFile.php | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/RoboFile.php b/RoboFile.php
index d026513793..2e99bc572b 100644
--- a/RoboFile.php
+++ b/RoboFile.php
@@ -319,23 +319,22 @@ public function runTests($opts = ['use-htaccess' => false, 'env' => 'desktop'])
 			$pathToCodeception = $this->vendorPath . 'bin/codecept';
 		}
 
-		$this->taskCodecept($pathToCodeception)
-			->arg('--steps')
-			->arg('--debug')
-			->arg('--fail-fast')
-			->env($opts['env'])
-			->arg($this->testsPath . 'acceptance/install/')
-			->run()
-			->stopOnFail();
+		$suites = [
+			'acceptance/install/',
+			'acceptance/administrator/components/com_users',
+			'acceptance/administrator/components/com_media',
+		];
 
-		$this->taskCodecept()
-			->arg('--steps')
-			->arg('--debug')
-			->arg('--fail-fast')
-			->env($opts['env'])
-			->arg($this->testsPath . '/acceptance/administrator/components/com_users')
-			->run()
-			->stopOnFail();
+		foreach ($suites as $suite) {
+			$this->taskCodecept($pathToCodeception)
+				->arg('--steps')
+				->arg('--debug')
+				->arg('--fail-fast')
+				->env($opts['env'])
+				->arg($this->testsPath . $suite)
+				->run()
+				->stopOnFail();
+		}
 	}
 
 	/**

From 9f4aaad46e7e609d6e73495d20df567b05ec4656 Mon Sep 17 00:00:00 2001
From: Robert Deutz <rdeutz@googlemail.com>
Date: Sun, 1 Apr 2018 12:19:12 +0200
Subject: [PATCH 12/19] adding php 7.2 testing to appveyor

---
 .appveyor.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.appveyor.yml b/.appveyor.yml
index e067ca7090..ca6ceb7d89 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -7,6 +7,7 @@ environment:
   matrix:
   - php_ver_target: 7.0
   - php_ver_target: 7.1
+  - php_ver_target: 7.2
 
 init:
   - SET PATH=C:\Program Files\OpenSSL;C:\tools\php;%PATH%

From a2a33d5cc96e61a80259e636aa06b7ff4dc6aecc Mon Sep 17 00:00:00 2001
From: Robert Deutz <rdeutz@googlemail.com>
Date: Sun, 1 Apr 2018 12:43:50 +0200
Subject: [PATCH 13/19] composer update changing to dev branch for
 systemtesting

---
 composer.json |  2 +-
 composer.lock | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/composer.json b/composer.json
index b31a78f5f9..b5b7c72d36 100644
--- a/composer.json
+++ b/composer.json
@@ -89,7 +89,7 @@
         "squizlabs/php_codesniffer": "~1.5",
         "joomla-projects/joomla-browser": "~4.0@dev",
         "joomla-projects/robo-joomla": "dev-develop",
-        "joomla/test-system": "dev-master",
+        "joomla/test-system": "dev-4.0-dev",
         "joomla/test-unit": "~4.0"
     }
 }
diff --git a/composer.lock b/composer.lock
index b3e6f5f226..84319ba325 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "d03c348bc33d673dd750487429c8930a",
+    "content-hash": "37c9cb831217eb8164cdee2bbd185c9f",
     "packages": [
         {
             "name": "composer/ca-bundle",
@@ -3345,12 +3345,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/joomla-projects/joomla-browser.git",
-                "reference": "1ab94ea82b65eb0477c918e7ec17d1dd1ff4b96b"
+                "reference": "2a23ff98ccbca1aeecd3acc432157a14c4dd7a23"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla-projects/joomla-browser/zipball/1ab94ea82b65eb0477c918e7ec17d1dd1ff4b96b",
-                "reference": "1ab94ea82b65eb0477c918e7ec17d1dd1ff4b96b",
+                "url": "https://api.github.com/repos/joomla-projects/joomla-browser/zipball/2a23ff98ccbca1aeecd3acc432157a14c4dd7a23",
+                "reference": "2a23ff98ccbca1aeecd3acc432157a14c4dd7a23",
                 "shasum": ""
             },
             "require": {
@@ -3388,7 +3388,7 @@
                 "acceptance testing",
                 "joomla"
             ],
-            "time": "2018-03-30T10:56:37+00:00"
+            "time": "2018-03-31T15:09:06+00:00"
         },
         {
             "name": "joomla-projects/robo-joomla",
@@ -3523,16 +3523,16 @@
         },
         {
             "name": "joomla/test-system",
-            "version": "dev-master",
+            "version": "dev-4.0-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/joomla/test-system.git",
-                "reference": "2b755760e672c62e4094ca7db2ae382fda81c45b"
+                "reference": "7bd119b085058bb06393fea9401043547f3bc634"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla/test-system/zipball/2b755760e672c62e4094ca7db2ae382fda81c45b",
-                "reference": "2b755760e672c62e4094ca7db2ae382fda81c45b",
+                "url": "https://api.github.com/repos/joomla/test-system/zipball/7bd119b085058bb06393fea9401043547f3bc634",
+                "reference": "7bd119b085058bb06393fea9401043547f3bc634",
                 "shasum": ""
             },
             "require": {
@@ -3553,7 +3553,7 @@
                 "cms",
                 "joomla"
             ],
-            "time": "2018-03-30T15:17:52+00:00"
+            "time": "2018-04-01T10:28:20+00:00"
         },
         {
             "name": "joomla/test-unit",

From 541fe9dc3594d2106d23b72a29498b57b228f960 Mon Sep 17 00:00:00 2001
From: Yves Hoppe <yves@compojoom.com>
Date: Sun, 1 Apr 2018 15:18:12 +0200
Subject: [PATCH 14/19] [4.0] Updated RoboFile.php to no longer use
 RoboFile.dist.ini (#20048)

---
 RoboFile.dist.ini |  6 ----
 RoboFile.php      | 89 ++++++-----------------------------------------
 2 files changed, 10 insertions(+), 85 deletions(-)
 delete mode 100644 RoboFile.dist.ini

diff --git a/RoboFile.dist.ini b/RoboFile.dist.ini
deleted file mode 100644
index a4f60e68ee..0000000000
--- a/RoboFile.dist.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-; If you want to setup your test website (document root) in a different folder, you can do that here.
-; You can also set an absolute path, i.e. /path/to/my/cms/folder
-cmsPath = test-install
-
-; (Linux / Mac only) If you want to set a different owner for the CMS root folder, you can set it here.
-localUser =
diff --git a/RoboFile.php b/RoboFile.php
index 2e99bc572b..2782e11505 100644
--- a/RoboFile.php
+++ b/RoboFile.php
@@ -57,28 +57,12 @@ class RoboFile extends \Robo\Tasks
 	 */
 	private $testsPath = 'libraries/vendor/joomla/test-system/src/';
 
-	/**
-	 * Local configuration parameters
-	 *
-	 * @var    array
-	 * @since  3.7.3
-	 */
-	private $configuration = array();
-
 	/**
 	 * @var array | null
 	 * @since  3.7.3
 	 */
 	private $suiteConfig;
 
-	/**
-	 * Path to the local CMS test folder
-	 *
-	 * @var    string
-	 * @since  3.7.3
-	 */
-	protected $cmsPath = null;
-
 	/**
 	 * RoboFile constructor.
 	 *
@@ -86,67 +70,11 @@ class RoboFile extends \Robo\Tasks
 	 */
 	public function __construct()
 	{
-		$this->configuration = $this->getConfiguration();
-		$this->cmsPath       = $this->getTestingPath();
 
 		// Set default timezone (so no warnings are generated if it is not set)
 		date_default_timezone_set('UTC');
 	}
 
-	/**
-	 * Get (optional) configuration from an external file
-	 *
-	 * @since   3.7.3
-	 *
-	 * @return  \stdClass|null
-	 */
-	public function getConfiguration()
-	{
-		$configurationFile = __DIR__ . '/RoboFile.ini';
-
-		if (!file_exists($configurationFile))
-		{
-			$this->say('No local configuration file');
-
-			return null;
-		}
-
-		$configuration = parse_ini_file($configurationFile);
-
-		if ($configuration === false)
-		{
-			$this->say('Local configuration file is empty or wrong (check is it in correct .ini format');
-
-			return null;
-		}
-
-		return json_decode(json_encode($configuration));
-	}
-
-	/**
-	 * Get the correct CMS root path
-	 *
-	 * @since   3.7.3
-	 *
-	 * @return  string
-	 */
-	private function getTestingPath()
-	{
-		if (empty($this->configuration->cmsPath))
-		{
-			return 'test-install';
-		}
-
-		if (!file_exists(dirname($this->configuration->cmsPath)))
-		{
-			$this->say('CMS path written in local configuration does not exists or is not readable');
-
-			return 'test-install';
-		}
-
-		return $this->configuration->cmsPath;
-	}
-
 	/**
 	 * Creates a testing Joomla site for running the tests (use it before run:test)
 	 *
@@ -158,17 +86,20 @@ private function getTestingPath()
 	 */
 	public function createTestingSite($useHtaccess = false)
 	{
+		$cmsPath   = $this->getSuiteConfig()['modules']['config']['Helper\\Acceptance']['cmsPath'];
+		$localUser = $this->getSuiteConfig()['modules']['config']['Helper\\Acceptance']['localUser'];
+
 		// Clean old testing site
-		if (is_dir($this->cmsPath))
+		if (is_dir($cmsPath))
 		{
 			try
 			{
-				$this->taskDeleteDir($this->cmsPath)->run();
+				$this->taskDeleteDir($cmsPath)->run();
 			}
 			catch (Exception $e)
 			{
 				// Sorry, we tried :(
-				$this->say('Sorry, you will have to delete ' . $this->cmsPath . ' manually.');
+				$this->say('Sorry, you will have to delete ' . $cmsPath . ' manually.');
 
 				exit(1);
 			}
@@ -216,19 +147,19 @@ public function createTestingSite($useHtaccess = false)
 			'travisci-phpunit.xml',
 		];
 
-		$this->copyJoomla($this->cmsPath, $exclude);
+		$this->copyJoomla($cmsPath, $exclude);
 
 		// Optionally change owner to fix permissions issues
-		if (!empty($this->configuration->localUser))
+		if (!empty($localUser))
 		{
-			$this->_exec('chown -R ' . $this->configuration->localUser . ' ' . $this->cmsPath);
+			$this->_exec('chown -R ' . $localUser . ' ' . $cmsPath);
 		}
 
 		// Optionally uses Joomla default htaccess file. Used by TravisCI
 		if ($useHtaccess == true)
 		{
 			$this->say('Renaming htaccess.txt to .htaccess');
-			$this->_copy('./htaccess.txt', $this->cmsPath . '/.htaccess');
+			$this->_copy('./htaccess.txt', $cmsPath . '/.htaccess');
 			$this->_exec('sed -e "s,# RewriteBase /,RewriteBase /test-install/joomla-cms,g" -in-place test-install/joomla-cms/.htaccess');
 		}
 	}

From ee0dc72ccd5027692e3616efec9aed34281bbcb7 Mon Sep 17 00:00:00 2001
From: Robert Deutz <rdeutz@googlemail.com>
Date: Sun, 1 Apr 2018 15:31:04 +0200
Subject: [PATCH 15/19] re-add javascript testing

---
 .drone.yml         | 13 +++++++
 drone-package.json | 14 +------
 karma.conf.js      | 97 ----------------------------------------------
 3 files changed, 15 insertions(+), 109 deletions(-)
 delete mode 100644 karma.conf.js

diff --git a/.drone.yml b/.drone.yml
index 8839a3216c..16864c533a 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -33,6 +33,19 @@ pipeline:
     commands:
       - ./libraries/vendor/bin/phpunit --configuration ./libraries/vendor/joomla/test-unit/phpunit.xml.dist
 
+  javascript:
+    image: joomlaprojects/docker-systemtests:latest
+    commands:
+      - apt-get install nodejs npm
+      - ln -s /usr/bin/nodejs /usr/bin/node
+      - export DISPLAY=:0
+      - Xvfb -screen 0 1024x768x24 -ac +extension GLX +render -noreset > /dev/null 2>&1 &
+      - sleep 3
+      - mv -f drone-package.json package.json
+      - fluxbox  > /dev/null 2>&1 &
+      - npm install
+      - node_modules/karma/bin/karma start node_modules/joomla-javascript-tests/src/karma.conf.js --single-run
+
 services:
   mysql:
     image: mysql:5.7
diff --git a/drone-package.json b/drone-package.json
index 39a7b30631..d48d14e493 100644
--- a/drone-package.json
+++ b/drone-package.json
@@ -13,18 +13,8 @@
     "javascript-tests": "node node_modules/karma/bin/karma start karma.conf.js --single-run"
   },
   "devDependencies": {
-    "jasmine-core": "^2.4.1",
-    "jasmine-jquery": "^2.1.1",
-    "jquery": "^1.12.4",
-    "karma": "^0.13.22",
-    "karma-coverage": "^1.1.1",
-    "karma-firefox-launcher": "^0.1.7",
-    "karma-jasmine": "^0.3.8",
-    "karma-jasmine-ajax": "^0.1.13",
-    "karma-requirejs": "^1.0.0",
-    "karma-verbose-reporter": "0.0.3",
-    "requirejs": "^2.2.0",
-    "text": "requirejs/text"
+    "@webcomponents/webcomponentsjs": "1.1.0",
+    "joomla-javascript-tests": "latest"
   },
   "license": "GPL-2.0+"
 }
diff --git a/karma.conf.js b/karma.conf.js
deleted file mode 100644
index da47d8ee5a..0000000000
--- a/karma.conf.js
+++ /dev/null
@@ -1,97 +0,0 @@
-// Karma configuration
-
-module.exports = function (config) {
-	config.set({
-
-		// base path that will be used to resolve all patterns (eg. files, exclude)
-		basePath: '',
-
-		// frameworks to use
-		// available frameworks: https://npmjs.org/browse/keyword/karma-adapter
-		frameworks: ['jasmine-ajax', 'jasmine', 'requirejs'],
-
-		// list of files / patterns to load in the browser
-		files: [
-			{pattern: 'media/vendor/webcomponentsjs/js/webcomponents-lite.min.js', included: true, served: true, watched: true},
-			{pattern: 'node_modules/jquery/dist/jquery.min.js', included: false},
-			{pattern: 'node_modules/jasmine-jquery/lib/jasmine-jquery.js', included: false},
-			{pattern: 'node_modules/text/text.js', included: false},
-			{pattern: 'media/vendor/bootstrap/js/bootstrap.min.js', included: false},
-			{pattern: 'media/vendor/jquery-ui/js/jquery.ui.core.min.js', included: false},
-			{pattern: 'media/vendor/jquery-ui/js/jquery.ui.sortable.min.js', included: false},
-			{pattern: 'media/system/js/*.js', included: false},
-			{pattern: 'media/system/js/core.js', included: false,served: true, watched: true},
-			{pattern: 'media/legacy/js/*.js', included: false},
-			{pattern: 'media/system/js/fields/*.js', included: false},
-			{pattern: 'media/vendor/joomla-custom-elements/js/joomla-alert.min.js', included: false, served: true, watched: true},
-			{pattern: 'media/system/js/fields/calendar-locales/*.js', included: false},
-			{pattern: 'media/system/js/fields/calendar-locales/date/gregorian/*.js', included: false},
-			{pattern: 'tests/javascript/**/fixture.html', included: false},
-			{pattern: 'tests/javascript/**/spec.js', included: false},
-			{pattern: 'tests/javascript/**/spec-setup.js', included: false},
-			{pattern: 'media/system/webcomponents/js/*.js', included: false},
-			{pattern: 'media/vendor/webcomponentsjs/js/*.js', included: false},
-			{pattern: 'images/*.png', included: false},
-
-			'tests/javascript/test-main.js'
-		],
-
-		exclude: [
-			'media/system/webcomponents/js/*-es5.js',
-			'media/system/webcomponents/js/*.min.js',
-			'media/system/webcomponents/js/*-es5.min.js',
-		],
-
-		// preprocess matching files before serving them to the browser
-		// available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
-		preprocessors: {
-			'**/system/js/*.js': ['coverage']
-		},
-
-		// coverage reporter configuration
-		coverageReporter: {
-			type : 'html',
-			dir : 'build/coverage-js/'
-		},
-
-		// test results reporter to use
-		// possible values: 'dots', 'progress'
-		// available reporters: https://npmjs.org/browse/keyword/karma-reporter
-		reporters: ['verbose', 'progress', 'coverage'],
-
-		// web server port
-		port: 9876,
-
-		// enable / disable colors in the output (reporters and logs)
-		colors: true,
-
-		// level of logging
-		// possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
-		logLevel: config.LOG_INFO,
-
-		// enable / disable watching file and executing tests whenever any file changes
-		autoWatch: true,
-
-		// start these browsers
-		// available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
-		browsers: ['Firefox'],
-
-		// Continuous Integration mode
-		// if true, Karma captures browsers, runs the tests and exits
-		singleRun: false,
-
-		// list of plugins
-		plugins: [
-			'karma-jasmine',
-			'karma-jasmine-ajax',
-			'karma-firefox-launcher',
-			'karma-coverage',
-			'karma-requirejs',
-			'karma-verbose-reporter'
-		],
-
-		// Concurrency level
-		// how many browser should be started simultaneous
-		concurrency: Infinity
-	});
-};

From 1b9a26a8ea24e4a340230c3030a6b71b05742e4e Mon Sep 17 00:00:00 2001
From: Puneet Kala <puneet.0191@gmail.com>
Date: Sun, 1 Apr 2018 19:56:37 +0530
Subject: [PATCH 16/19] [4.0] System Tests on Drone (#20025)

* System Tests on Drone

* ldap extension

* Change the call

* Temp Testing

* Reverting the changes

* Trying another method

* Kill the noise

* Minor changes

* Moving the dist file

* Updating Robo

* Run all of them

* Another change in Robo

* Minor Update

* Removing symphony

* CHanges not needed

* Fixing the error

* Exclude Vendor

* Minor changes in Drone

* Minor change lets see

* Skip the vendor Issue

* Trying with Update

* Move the acceptance config file

* Adding Owner

* Chown Minor Change

* Update and fixes

* Test

* Check with fake return

* I am not proud of this

* Apache fix

* Updates

* Sample to test

* Test

* wip

* wip

* WIP

* Mysql minor change

* Fix WIP

* WIP WIP WIP

* Adding back System Tests Layer

* Using the mysql layer

* Updating user

* wip

* wip

* wip

* clean up

* updating robofile

* Add date

* Deleting the lock

* adding back the original Composer lock file

* wip

* Reverting back composer.lock

* UPdating Robo FIle

* Test Commit, WIP

* Check the versions

* Update

* Update

* Adding a new folder

* Avoid Crap on Console, Keep life Simple

* Updating

* WIP

* Minor update

* Temp
---
 .drone.yml   | 13 +++++++++++++
 RoboFile.php |  5 ++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 16864c533a..3b07485be5 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -46,6 +46,19 @@ pipeline:
       - npm install
       - node_modules/karma/bin/karma start node_modules/joomla-javascript-tests/src/karma.conf.js --single-run
 
+  system-tests:
+      image: joomlaprojects/docker-systemtests:latest
+      commands:
+        - date
+        - apache2ctl -D FOREGROUND &
+        - google-chrome --version
+        - apt-get update > /dev/null 2>&1
+        - composer update > /dev/null 2>&1
+        - chmod 755 libraries/vendor/joomla-projects/selenium-server-standalone/bin/webdrivers/chrome/linux/chromedriver
+        - mv libraries/vendor/joomla/test-system/src/acceptance.suite.dist.yml libraries/vendor/joomla/test-system/src/acceptance.suite.yml
+        - libraries/vendor/bin/robo run:tests
+        - date
+
 services:
   mysql:
     image: mysql:5.7
diff --git a/RoboFile.php b/RoboFile.php
index 2782e11505..bd920884da 100644
--- a/RoboFile.php
+++ b/RoboFile.php
@@ -253,13 +253,12 @@ public function runTests($opts = ['use-htaccess' => false, 'env' => 'desktop'])
 		$suites = [
 			'acceptance/install/',
 			'acceptance/administrator/components/com_users',
-			'acceptance/administrator/components/com_media',
+			'acceptance/administrator/components/com_content',
+			'acceptance/administrator/components/com_menu',
 		];
 
 		foreach ($suites as $suite) {
 			$this->taskCodecept($pathToCodeception)
-				->arg('--steps')
-				->arg('--debug')
 				->arg('--fail-fast')
 				->env($opts['env'])
 				->arg($this->testsPath . $suite)

From 889d6aa08fe357b308e67229012b9c5a9850070e Mon Sep 17 00:00:00 2001
From: Dimitri Grammatikogianni <mit505@upshift.gr>
Date: Sun, 1 Apr 2018 22:23:22 +0200
Subject: [PATCH 17/19] [4.0] email cloaking without inline script (#19089)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* cloak-init

* Let’s move to custom elements here

* scratch Joomla storage, use simple encoding

* more

* cs

* upd

* CS

* CS

* unit tests

* nope

* more php unit

* don’t add slashes

* Fix failing cases

* escape is deprecated, let’s not use it then

* let’s have media folder also for local images

* fix was not good

* one slash missing

* fix tests
---
 .../js/hidden-mail/hidden-mail.js             |  50 +++
 libraries/cms/html/email.php                  | 114 ++-----
 .../js/joomla-hidden-mail-es5.js              |  77 +++++
 .../js/joomla-hidden-mail-es5.min.js          |   4 +
 .../webcomponents/js/joomla-hidden-mail.js    |  50 +++
 .../js/joomla-hidden-mail.min.js              |   1 +
 package.json                                  |  10 +-
 plugins/content/emailcloak/emailcloak.php     |  89 +----
 .../libraries/cms/html/JHtmlEmailTest.php     |  10 +-
 .../emailcloak/PlgContentEmailcloakTest.php   | 314 +++---------------
 10 files changed, 278 insertions(+), 441 deletions(-)
 create mode 100644 build/webcomponents/js/hidden-mail/hidden-mail.js
 create mode 100644 media/system/webcomponents/js/joomla-hidden-mail-es5.js
 create mode 100644 media/system/webcomponents/js/joomla-hidden-mail-es5.min.js
 create mode 100644 media/system/webcomponents/js/joomla-hidden-mail.js
 create mode 100644 media/system/webcomponents/js/joomla-hidden-mail.min.js

diff --git a/build/webcomponents/js/hidden-mail/hidden-mail.js b/build/webcomponents/js/hidden-mail/hidden-mail.js
new file mode 100644
index 0000000000..a8bfb250db
--- /dev/null
+++ b/build/webcomponents/js/hidden-mail/hidden-mail.js
@@ -0,0 +1,50 @@
+;customElements.define('joomla-hidden-mail', class extends HTMLElement {
+	connectedCallback() {
+		let newEl;
+		let base = this.getAttribute('base') + '/';
+
+		if (this.getAttribute('is-link') === '1') {
+			newEl = document.createElement('a');
+			newEl.setAttribute('href', 'mailto:' + this.b64DecodeUnicode(this.getAttribute('first')) + '@' + this.b64DecodeUnicode(this.getAttribute('last')));
+
+			// Get all of the original element attributes, and pass them to the link
+			for(let i = 0, l = this.attributes.length; i < l; ++i){
+				const nodeName  = this.attributes.item(i).nodeName;
+
+				if (nodeName) {
+					// We do care for some attributes
+					if (['is-link', 'is-email', 'first', 'last', 'text'].indexOf(nodeName) > -1) {
+						continue;
+					}
+
+					const nodeValue = this.attributes.item(i).nodeValue;
+
+					newEl.setAttribute(nodeName, nodeValue);
+				}
+			}
+		} else {
+			newEl = document.createElement('span');
+		}
+
+		if (this.getAttribute('text')) {
+			let innerStr = this.b64DecodeUnicode(this.getAttribute('text'));
+
+			innerStr = innerStr.replace('src="images/', `src="${base}images/`).replace('src="media/', `src="${base}media/`);
+			newEl.innerHTML = innerStr;
+		} else {
+			newEl.innerText = window.atob(this.getAttribute('first')) + '@' + window.atob(this.getAttribute('last'));
+		}
+
+		// Remove the noscript message
+		this.innerText = '';
+
+		// Display the new element
+		this.appendChild(newEl);
+	}
+
+	b64DecodeUnicode(str) {
+		return decodeURIComponent(Array.prototype.map.call(atob(str), (c) => {
+			return '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2)
+		}).join(''))
+	}
+});
diff --git a/libraries/cms/html/email.php b/libraries/cms/html/email.php
index 76959fa29c..aea3a966b6 100644
--- a/libraries/cms/html/email.php
+++ b/libraries/cms/html/email.php
@@ -7,6 +7,12 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\String\PunycodeHelper;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Uri\Uri;
+
 defined('JPATH_PLATFORM') or die;
 
 /**
@@ -21,110 +27,46 @@ abstract class JHtmlEmail
 	 *
 	 * By default replaces an email with a mailto link with email cloaked
 	 *
-	 * @param   string   $mail    The -mail address to cloak.
-	 * @param   boolean  $mailto  True if text and mailing address differ
-	 * @param   string   $text    Text for the link
-	 * @param   boolean  $email   True if text is an email address
+	 * @param   string   $mail           The -mail address to cloak.
+	 * @param   boolean  $mailto         True if text and mailing address differ
+	 * @param   string   $text           Text for the link
+	 * @param   boolean  $email          True if text is an email address
+	 * @param   string   $attribsBefore  Any attributes before the email address
+	 * @param   string   $attribsAfter   Any attributes before the email address
 	 *
 	 * @return  string  The cloaked email.
 	 *
 	 * @since   1.5
 	 */
-	public static function cloak($mail, $mailto = true, $text = '', $email = true)
+	public static function cloak($mail, $mailto = true, $text = '', $email = true, $attribsBefore = '', $attribsAfter = '')
 	{
 		// Handle IDN addresses: punycode for href but utf-8 for text displayed.
 		if ($mailto && (empty($text) || $email))
 		{
 			// Use dedicated $text whereas $mail is used as href and must be punycoded.
-			$text = JStringPunycode::emailToUTF8($text ?: $mail);
+			$text = PunycodeHelper::emailToUTF8($text ?: $mail);
 		}
 		elseif (!$mailto)
 		{
 			// In that case we don't use link - so convert $mail back to utf-8.
-			$mail = JStringPunycode::emailToUTF8($mail);
+			$mail = PunycodeHelper::emailToUTF8($mail);
 		}
 
-		// Convert mail
-		$mail = static::convertEncoding($mail);
-
-		// Random hash
-		$rand = md5($mail . mt_rand(1, 100000));
-
 		// Split email by @ symbol
-		$mail       = explode('@', $mail);
-		$mail_parts = explode('.', $mail[1]);
-
-		if ($mailto)
-		{
-			// Special handling when mail text is different from mail address
-			if ($text)
-			{
-				// Convert text - here is the right place
-				$text = static::convertEncoding($text);
-
-				if ($email)
-				{
-					// Split email by @ symbol
-					$text = explode('@', $text);
-					$text_parts = explode('.', $text[1]);
-					$tmpScript = "var addy_text" . $rand . " = '" . @$text[0] . "' + '&#64;' + '" . implode("' + '&#46;' + '", @$text_parts)
-						. "';";
-				}
-				else
-				{
-					$tmpScript = "var addy_text" . $rand . " = '" . $text . "';";
-				}
-
-				$tmpScript .= "document.getElementById('cloak" . $rand . "').innerHTML += '<a ' + path + '\'' + prefix + ':' + addy"
-					. $rand . " + '\'>'+addy_text" . $rand . "+'<\/a>';";
-			}
-			else
-			{
-				$tmpScript = "document.getElementById('cloak" . $rand . "').innerHTML += '<a ' + path + '\'' + prefix + ':' + addy"
-					. $rand . " + '\'>' +addy" . $rand . "+'<\/a>';";
-			}
-		}
-		else
-		{
-			$tmpScript = "document.getElementById('cloak" . $rand . "').innerHTML += addy" . $rand . ";";
-		}
-
-		$script       = "
-				document.getElementById('cloak" . $rand . "').innerHTML = '';
-				var prefix = '&#109;a' + 'i&#108;' + '&#116;o';
-				var path = 'hr' + 'ef' + '=';
-				var addy" . $rand . " = '" . @$mail[0] . "' + '&#64;';
-				addy" . $rand . " = addy" . $rand . " + '" . implode("' + '&#46;' + '", $mail_parts) . "';
-				$tmpScript
-		";
-
-		// TODO: Use inline script for now
-		$inlineScript = "<script type='text/javascript'>" . $script . "</script>";
-
-		return '<span id="cloak' . $rand . '">' . JText::_('JLIB_HTML_CLOAKING') . '</span>' . $inlineScript;
-	}
-
-	/**
-	 * Convert encoded text
-	 *
-	 * @param   string  $text  Text to convert
-	 *
-	 * @return  string  The converted text.
-	 *
-	 * @since   1.5
-	 */
-	protected static function convertEncoding($text)
-	{
-		$text = html_entity_decode($text);
+		$mail   = explode('@', $mail);
+		$name   = @$mail[0];
+		$domain = @$mail[1];
 
-		// Replace vowels with character encoding
-		$text = str_replace('a', '&#97;', $text);
-		$text = str_replace('e', '&#101;', $text);
-		$text = str_replace('i', '&#105;', $text);
-		$text = str_replace('o', '&#111;', $text);
-		$text = str_replace('u', '&#117;', $text);
-		$text = htmlentities($text, ENT_QUOTES, 'UTF-8', false);
+		// Include the email cloaking script
+		HTMLHelper::_('webcomponent', ['joomla-hidden-mail' => 'system/webcomponents/joomla-hidden-mail.js'], ['version' => 'auto', 'relative' => true]);
 
-		return $text;
+		return '<joomla-hidden-mail '
+			. $attribsBefore . ' is-link="'
+			. $mailto . '" is-email="'
+			. $email . '" first="'
+			. base64_encode($name) . '" last="'
+			. base64_encode($domain) . '" text="'
+			. base64_encode($text) . '" base="'
+			. Uri::root(true) . '" ' . $attribsAfter . '>' . Text::_('JLIB_HTML_CLOAKING') . '</joomla-hidden-mail>';
 	}
 }
diff --git a/media/system/webcomponents/js/joomla-hidden-mail-es5.js b/media/system/webcomponents/js/joomla-hidden-mail-es5.js
new file mode 100644
index 0000000000..a01f8fd500
--- /dev/null
+++ b/media/system/webcomponents/js/joomla-hidden-mail-es5.js
@@ -0,0 +1,77 @@
+(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
+'use strict';
+
+var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+
+;customElements.define('joomla-hidden-mail', function (_HTMLElement) {
+	_inherits(_class, _HTMLElement);
+
+	function _class() {
+		_classCallCheck(this, _class);
+
+		return _possibleConstructorReturn(this, (_class.__proto__ || Object.getPrototypeOf(_class)).apply(this, arguments));
+	}
+
+	_createClass(_class, [{
+		key: 'connectedCallback',
+		value: function connectedCallback() {
+			var newEl = void 0;
+			var base = this.getAttribute('base') + '/';
+
+			if (this.getAttribute('is-link') === '1') {
+				newEl = document.createElement('a');
+				newEl.setAttribute('href', 'mailto:' + this.b64DecodeUnicode(this.getAttribute('first')) + '@' + this.b64DecodeUnicode(this.getAttribute('last')));
+
+				// Get all of the original element attributes, and pass them to the link
+				for (var i = 0, l = this.attributes.length; i < l; ++i) {
+					var nodeName = this.attributes.item(i).nodeName;
+
+					if (nodeName) {
+						// We do care for some attributes
+						if (['is-link', 'is-email', 'first', 'last', 'text'].indexOf(nodeName) > -1) {
+							continue;
+						}
+
+						var nodeValue = this.attributes.item(i).nodeValue;
+
+						newEl.setAttribute(nodeName, nodeValue);
+					}
+				}
+			} else {
+				newEl = document.createElement('span');
+			}
+
+			if (this.getAttribute('text')) {
+				var innerStr = this.b64DecodeUnicode(this.getAttribute('text'));
+
+				innerStr = innerStr.replace('src="images/', 'src="' + base + 'images/').replace('src="media/', 'src="' + base + 'media/');
+				newEl.innerHTML = innerStr;
+			} else {
+				newEl.innerText = window.atob(this.getAttribute('first')) + '@' + window.atob(this.getAttribute('last'));
+			}
+
+			// Remove the noscript message
+			this.innerText = '';
+
+			// Display the new element
+			this.appendChild(newEl);
+		}
+	}, {
+		key: 'b64DecodeUnicode',
+		value: function b64DecodeUnicode(str) {
+			return decodeURIComponent(Array.prototype.map.call(atob(str), function (c) {
+				return '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2);
+			}).join(''));
+		}
+	}]);
+
+	return _class;
+}(HTMLElement));
+
+},{}]},{},[1]);
diff --git a/media/system/webcomponents/js/joomla-hidden-mail-es5.min.js b/media/system/webcomponents/js/joomla-hidden-mail-es5.min.js
new file mode 100644
index 0000000000..c03479d516
--- /dev/null
+++ b/media/system/webcomponents/js/joomla-hidden-mail-es5.min.js
@@ -0,0 +1,4 @@
+(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
+'use strict';var _createClass=function(){function a(a,b){for(var c,d=0;d<b.length;d++)c=b[d],c.enumerable=c.enumerable||!1,c.configurable=!0,'value'in c&&(c.writable=!0),Object.defineProperty(a,c.key,c)}return function(b,c,d){return c&&a(b.prototype,c),d&&a(b,d),b}}();function _classCallCheck(a,b){if(!(a instanceof b))throw new TypeError('Cannot call a class as a function')}function _possibleConstructorReturn(a,b){if(!a)throw new ReferenceError('this hasn\'t been initialised - super() hasn\'t been called');return b&&('object'==typeof b||'function'==typeof b)?b:a}function _inherits(a,b){if('function'!=typeof b&&null!==b)throw new TypeError('Super expression must either be null or a function, not '+typeof b);a.prototype=Object.create(b&&b.prototype,{constructor:{value:a,enumerable:!1,writable:!0,configurable:!0}}),b&&(Object.setPrototypeOf?Object.setPrototypeOf(a,b):a.__proto__=b)}customElements.define('joomla-hidden-mail',function(a){function b(){return _classCallCheck(this,b),_possibleConstructorReturn(this,(b.__proto__||Object.getPrototypeOf(b)).apply(this,arguments))}return _inherits(b,a),_createClass(b,[{key:'connectedCallback',value:function connectedCallback(){var a,b=this.getAttribute('base')+'/';if('1'===this.getAttribute('is-link')){a=document.createElement('a'),a.setAttribute('href','mailto:'+this.b64DecodeUnicode(this.getAttribute('first'))+'@'+this.b64DecodeUnicode(this.getAttribute('last')));for(var c,d=0,e=this.attributes.length;d<e;++d)if(c=this.attributes.item(d).nodeName,c){if(-1<['is-link','is-email','first','last','text'].indexOf(c))continue;var f=this.attributes.item(d).nodeValue;a.setAttribute(c,f)}}else a=document.createElement('span');if(this.getAttribute('text')){var g=this.b64DecodeUnicode(this.getAttribute('text'));g=g.replace('src="images/','src="'+b+'images/').replace('src="media/','src="'+b+'media/'),a.innerHTML=g}else a.innerText=window.atob(this.getAttribute('first'))+'@'+window.atob(this.getAttribute('last'));this.innerText='',this.appendChild(a)}},{key:'b64DecodeUnicode',value:function b64DecodeUnicode(a){return decodeURIComponent(Array.prototype.map.call(atob(a),function(a){return'%'+('00'+a.charCodeAt(0).toString(16)).slice(-2)}).join(''))}}]),b}(HTMLElement));
+
+},{}]},{},[1]);
diff --git a/media/system/webcomponents/js/joomla-hidden-mail.js b/media/system/webcomponents/js/joomla-hidden-mail.js
new file mode 100644
index 0000000000..a8bfb250db
--- /dev/null
+++ b/media/system/webcomponents/js/joomla-hidden-mail.js
@@ -0,0 +1,50 @@
+;customElements.define('joomla-hidden-mail', class extends HTMLElement {
+	connectedCallback() {
+		let newEl;
+		let base = this.getAttribute('base') + '/';
+
+		if (this.getAttribute('is-link') === '1') {
+			newEl = document.createElement('a');
+			newEl.setAttribute('href', 'mailto:' + this.b64DecodeUnicode(this.getAttribute('first')) + '@' + this.b64DecodeUnicode(this.getAttribute('last')));
+
+			// Get all of the original element attributes, and pass them to the link
+			for(let i = 0, l = this.attributes.length; i < l; ++i){
+				const nodeName  = this.attributes.item(i).nodeName;
+
+				if (nodeName) {
+					// We do care for some attributes
+					if (['is-link', 'is-email', 'first', 'last', 'text'].indexOf(nodeName) > -1) {
+						continue;
+					}
+
+					const nodeValue = this.attributes.item(i).nodeValue;
+
+					newEl.setAttribute(nodeName, nodeValue);
+				}
+			}
+		} else {
+			newEl = document.createElement('span');
+		}
+
+		if (this.getAttribute('text')) {
+			let innerStr = this.b64DecodeUnicode(this.getAttribute('text'));
+
+			innerStr = innerStr.replace('src="images/', `src="${base}images/`).replace('src="media/', `src="${base}media/`);
+			newEl.innerHTML = innerStr;
+		} else {
+			newEl.innerText = window.atob(this.getAttribute('first')) + '@' + window.atob(this.getAttribute('last'));
+		}
+
+		// Remove the noscript message
+		this.innerText = '';
+
+		// Display the new element
+		this.appendChild(newEl);
+	}
+
+	b64DecodeUnicode(str) {
+		return decodeURIComponent(Array.prototype.map.call(atob(str), (c) => {
+			return '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2)
+		}).join(''))
+	}
+});
diff --git a/media/system/webcomponents/js/joomla-hidden-mail.min.js b/media/system/webcomponents/js/joomla-hidden-mail.min.js
new file mode 100644
index 0000000000..77d03bfd87
--- /dev/null
+++ b/media/system/webcomponents/js/joomla-hidden-mail.min.js
@@ -0,0 +1 @@
+customElements.define("joomla-hidden-mail",class extends HTMLElement{connectedCallback(){let t,e=this.getAttribute("base")+"/";if("1"===this.getAttribute("is-link")){(t=document.createElement("a")).setAttribute("href","mailto:"+this.b64DecodeUnicode(this.getAttribute("first"))+"@"+this.b64DecodeUnicode(this.getAttribute("last")));for(let e=0,i=this.attributes.length;e<i;++e){const i=this.attributes.item(e).nodeName;if(i){if(["is-link","is-email","first","last","text"].indexOf(i)>-1)continue;const s=this.attributes.item(e).nodeValue;t.setAttribute(i,s)}}}else t=document.createElement("span");if(this.getAttribute("text")){let i=this.b64DecodeUnicode(this.getAttribute("text"));i=i.replace('src="images/',`src="${e}images/`).replace('src="media/',`src="${e}media/`),t.innerHTML=i}else t.innerText=window.atob(this.getAttribute("first"))+"@"+window.atob(this.getAttribute("last"));this.innerText="",this.appendChild(t)}b64DecodeUnicode(t){return decodeURIComponent(Array.prototype.map.call(atob(t),t=>"%"+("00"+t.charCodeAt(0).toString(16)).slice(-2)).join(""))}});
\ No newline at end of file
diff --git a/package.json b/package.json
index b892e5581d..028432f1d9 100644
--- a/package.json
+++ b/package.json
@@ -45,6 +45,7 @@
     "babel-plugin-static-fs": "latest",
     "babel-preset-env": "^1.6.1",
     "babel-preset-es2015": "^6.24.1",
+    "babel-preset-minify": "^0.3.0",
     "babelify": "^8.0.0",
     "browserify": "*",
     "eslint": "^4.17.0",
@@ -69,7 +70,7 @@
     "recursive-copy": "latest",
     "recursive-readdir": "^2.2.1",
     "requirejs": "latest",
-    "text": "github:requirejs/text",
+    "text": "requirejs/text",
     "uglify-es": "^3.3.9",
     "uglifycss": "0.0.27"
   },
@@ -81,7 +82,8 @@
       "field-media",
       "field-user",
       "field-switcher",
-      "field-send-test-mail"
+      "field-send-test-mail",
+      "hidden-mail"
     ],
     "webcomponents": {
       "field-media": {
@@ -95,6 +97,10 @@
       "field-send-test-mail": {
         "css": "media/system/webcomponents/css",
         "js": "media/system/webcomponents/js"
+      },
+      "field-hidden-mail": {
+        "css": "media/system/webcomponents/css",
+        "js": "media/system/webcomponents/js"
       }
     },
     "vendors": {
diff --git a/plugins/content/emailcloak/emailcloak.php b/plugins/content/emailcloak/emailcloak.php
index fd0453cdcd..10d91b4606 100644
--- a/plugins/content/emailcloak/emailcloak.php
+++ b/plugins/content/emailcloak/emailcloak.php
@@ -61,32 +61,6 @@ protected function _getPattern ($link, $text)
 		return $pattern;
 	}
 
-	/**
-	 * Adds an attributes to the js cloaked email.
-	 *
-	 * @param   string  $jsEmail  Js cloaked email.
-	 * @param   string  $before   Attributes before email.
-	 * @param   string  $after    Attributes after email.
-	 *
-	 * @return string Js cloaked email with attributes.
-	 */
-	protected function _addAttributesToEmail($jsEmail, $before, $after)
-	{
-		if ($before !== '')
-		{
-			$before = str_replace("'", "\'", $before);
-			$jsEmail = str_replace(".innerHTML += '<a '", ".innerHTML += '<a {$before}'", $jsEmail);
-		}
-
-		if ($after !== '')
-		{
-			$after = str_replace("'", "\'", $after);
-			$jsEmail = str_replace("'\'>'", "'\'{$after}>'", $jsEmail);
-		}
-
-		return $jsEmail;
-	}
-
 	/**
 	 * Cloak all emails in text from spambots via Javascript.
 	 *
@@ -115,7 +89,8 @@ protected function _cloak(&$text, &$params)
 			return true;
 		}
 
-		$mode = $this->params->def('mode', 1);
+		$mode = (int) $this->params->def('mode', 1);
+		$mode =  $mode === 1 ? true : false;
 
 		// Example: any@example.org
 		$searchEmail = '([\w\.\'\-\+]+\@(?:[a-z0-9\.\-]+\.)+(?:[a-zA-Z0-9\-]{2,10}))';
@@ -151,9 +126,6 @@ protected function _cloak(&$text, &$params)
 			// Check to see if mail text is different from mail addy
 			$replacement = HTMLHelper::_('email.cloak', $mail, $mode, $mailText);
 
-			// Ensure that attributes is not stripped out by email cloaking
-			$replacement = $this->_addAttributesToEmail($replacement, $regs[1][0], $regs[4][0]);
-
 			// Replace the found address with the js cloaked email
 			$text = substr_replace($text, $replacement, $regs[0][1], strlen($regs[0][0]));
 		}
@@ -174,9 +146,6 @@ protected function _cloak(&$text, &$params)
 			// Check to see if mail text is different from mail addy
 			$replacement = HTMLHelper::_('email.cloak', $mail, $mode, $mailText, 0);
 
-			// Ensure that attributes is not stripped out by email cloaking
-			$replacement = $this->_addAttributesToEmail($replacement, $regs[1][0], $regs[4][0]);
-
 			// Replace the found address with the js cloaked email
 			$text = substr_replace($text, $replacement, $regs[0][1], strlen($regs[0][0]));
 		}
@@ -195,9 +164,6 @@ protected function _cloak(&$text, &$params)
 			// Check to see if mail text is different from mail addy
 			$replacement = HTMLHelper::_('email.cloak', $mail, $mode, $mailText);
 
-			// Ensure that attributes is not stripped out by email cloaking
-			$replacement = $this->_addAttributesToEmail($replacement, $regs[1][0], $regs[3][0]);
-
 			// Replace the found address with the js cloaked email
 			$text = substr_replace($text, $replacement, $regs[0][1], strlen($regs[0][0]));
 		}
@@ -216,9 +182,6 @@ protected function _cloak(&$text, &$params)
 			// Check to see if mail text is different from mail addy
 			$replacement = HTMLHelper::_('email.cloak', $mail, $mode, $mailText);
 
-			// Ensure that attributes is not stripped out by email cloaking
-			$replacement = html_entity_decode($this->_addAttributesToEmail($replacement, $regs[1][0], $regs[3][0]));
-
 			// Replace the found address with the js cloaked email
 			$text = substr_replace($text, $replacement, $regs[0][1], strlen($regs[0][0]));
 		}
@@ -232,13 +195,10 @@ protected function _cloak(&$text, &$params)
 		while (preg_match($pattern, $text, $regs, PREG_OFFSET_CAPTURE))
 		{
 			$mail = $regs[2][0];
-			$mailText = $regs[4][0] . addslashes($regs[5][0]) . $regs[6][0];
+			$mailText = $regs[4][0] . $regs[5][0] . $regs[6][0];
 
 			$replacement = HTMLHelper::_('email.cloak', $mail, $mode, $mailText, 0);
 
-			// Ensure that attributes is not stripped out by email cloaking
-			$replacement = html_entity_decode($this->_addAttributesToEmail($replacement, $regs[1][0], $regs[3][0]));
-
 			// Replace the found address with the js cloaked email
 			$text = substr_replace($text, $replacement, $regs[0][1], strlen($regs[0][0]));
 		}
@@ -252,13 +212,10 @@ protected function _cloak(&$text, &$params)
 		while (preg_match($pattern, $text, $regs, PREG_OFFSET_CAPTURE))
 		{
 			$mail = $regs[2][0];
-			$mailText = addslashes($regs[4][0]);
+			$mailText = $regs[4][0];
 
 			$replacement = HTMLHelper::_('email.cloak', $mail, $mode, $mailText, 0);
 
-			// Ensure that attributes is not stripped out by email cloaking
-			$replacement = $this->_addAttributesToEmail($replacement, $regs[1][0], $regs[3][0]);
-
 			// Replace the found address with the js cloaked email
 			$text = substr_replace($text, $replacement, $regs[0][1], strlen($regs[0][0]));
 		}
@@ -276,9 +233,6 @@ protected function _cloak(&$text, &$params)
 
 			$replacement = HTMLHelper::_('email.cloak', $mail, $mode, $mailText, 0);
 
-			// Ensure that attributes is not stripped out by email cloaking
-			$replacement = html_entity_decode($this->_addAttributesToEmail($replacement, $regs[1][0], $regs[3][0]));
-
 			// Replace the found address with the js cloaked email
 			$text = substr_replace($text, $replacement, $regs[0][1], strlen($regs[0][0]));
 		}
@@ -296,9 +250,6 @@ protected function _cloak(&$text, &$params)
 
 			$replacement = HTMLHelper::_('email.cloak', $mail, $mode, $mailText);
 
-			// Ensure that attributes is not stripped out by email cloaking
-			$replacement = html_entity_decode($this->_addAttributesToEmail($replacement, $regs[1][0], $regs[3][0]));
-
 			// Replace the found address with the js cloaked email
 			$text = substr_replace($text, $replacement, $regs[0][1], strlen($regs[0][0]));
 		}
@@ -312,13 +263,10 @@ protected function _cloak(&$text, &$params)
 		while (preg_match($pattern, $text, $regs, PREG_OFFSET_CAPTURE))
 		{
 			$mail = $regs[2][0];
-			$mailText = $regs[4][0] . addslashes($regs[5][0]);
+			$mailText = $regs[4][0] . $regs[5][0];
 
 			$replacement = HTMLHelper::_('email.cloak', $mail, $mode, $mailText, 0);
 
-			// Ensure that attributes is not stripped out by email cloaking
-			$replacement = html_entity_decode($this->_addAttributesToEmail($replacement, $regs[1][0], $regs[3][0]));
-
 			// Replace the found address with the js cloaked email
 			$text = substr_replace($text, $replacement, $regs[0][1], strlen($regs[0][0]));
 		}
@@ -340,9 +288,6 @@ protected function _cloak(&$text, &$params)
 			// Check to see if mail text is different from mail addy
 			$replacement = HTMLHelper::_('email.cloak', $mail, $mode, $mailText);
 
-			// Ensure that attributes is not stripped out by email cloaking
-			$replacement = $this->_addAttributesToEmail($replacement, $regs[1][0], $regs[4][0]);
-
 			// Replace the found address with the js cloaked email
 			$text = substr_replace($text, $replacement, $regs[0][1], strlen($regs[0][0]));
 		}
@@ -356,16 +301,13 @@ protected function _cloak(&$text, &$params)
 		while (preg_match($pattern, $text, $regs, PREG_OFFSET_CAPTURE))
 		{
 			$mail = $regs[2][0] . $regs[3][0];
-			$mailText = addslashes($regs[5][0]);
+			$mailText = $regs[5][0];
 
 			// Needed for handling of Body parameter
 			$mail = str_replace('&amp;', '&', $mail);
 
 			$replacement = HTMLHelper::_('email.cloak', $mail, $mode, $mailText, 0);
 
-			// Ensure that attributes is not stripped out by email cloaking
-			$replacement = $this->_addAttributesToEmail($replacement, $regs[1][0], $regs[4][0]);
-
 			// Replace the found address with the js cloaked email
 			$text = substr_replace($text, $replacement, $regs[0][1], strlen($regs[0][0]));
 		}
@@ -384,9 +326,6 @@ protected function _cloak(&$text, &$params)
 			// Check to see if mail text is different from mail addy
 			$replacement = HTMLHelper::_('email.cloak', $mail, $mode, $mailText);
 
-			// Ensure that attributes is not stripped out by email cloaking
-			$replacement = html_entity_decode($this->_addAttributesToEmail($replacement, $regs[1][0], $regs[4][0]));
-
 			// Replace the found address with the js cloaked email
 			$text = substr_replace($text, $replacement, $regs[0][1], strlen($regs[0][0]));
 		}
@@ -400,13 +339,10 @@ protected function _cloak(&$text, &$params)
 		while (preg_match($pattern, $text, $regs, PREG_OFFSET_CAPTURE))
 		{
 			$mail = $regs[2][0] . $regs[3][0];
-			$mailText = $regs[5][0] . addslashes($regs[6][0]) . $regs[7][0];
+			$mailText = $regs[5][0] . $regs[6][0] . $regs[7][0];
 
 			$replacement = HTMLHelper::_('email.cloak', $mail, $mode, $mailText, 0);
 
-			// Ensure that attributes is not stripped out by email cloaking
-			$replacement = html_entity_decode($this->_addAttributesToEmail($replacement, $regs[1][0], $regs[4][0]));
-
 			// Replace the found address with the js cloaked email
 			$text = substr_replace($text, $replacement, $regs[0][1], strlen($regs[0][0]));
 		}
@@ -428,9 +364,6 @@ protected function _cloak(&$text, &$params)
 			// Check to see if mail text is different from mail addy
 			$replacement = HTMLHelper::_('email.cloak', $mail, $mode, $mailText, 0);
 
-			// Ensure that attributes is not stripped out by email cloaking
-			$replacement = html_entity_decode($this->_addAttributesToEmail($replacement, $regs[1][0], $regs[4][0]));
-
 			// Replace the found address with the js cloaked email
 			$text = substr_replace($text, $replacement, $regs[0][1], strlen($regs[0][0]));
 		}
@@ -452,9 +385,6 @@ protected function _cloak(&$text, &$params)
 			// Check to see if mail text is different from mail addy
 			$replacement = HTMLHelper::_('email.cloak', $mail, $mode, $mailText);
 
-			// Ensure that attributes is not stripped out by email cloaking
-			$replacement = html_entity_decode($this->_addAttributesToEmail($replacement, $regs[1][0], $regs[4][0]));
-
 			// Replace the found address with the js cloaked email
 			$text = substr_replace($text, $replacement, $regs[0][1], strlen($regs[0][0]));
 		}
@@ -468,7 +398,7 @@ protected function _cloak(&$text, &$params)
 		while (preg_match($pattern, $text, $regs, PREG_OFFSET_CAPTURE))
 		{
 			$mail = $regs[1][0] . $regs[2][0] . $regs[3][0];
-			$mailText = $regs[4][0] . $regs[5][0] . addslashes($regs[6][0]);
+			$mailText = $regs[4][0] . $regs[5][0] . $regs[6][0];
 
 			// Needed for handling of Body parameter
 			$mail = str_replace('&amp;', '&', $mail);
@@ -476,9 +406,6 @@ protected function _cloak(&$text, &$params)
 			// Check to see if mail text is different from mail addy
 			$replacement = HTMLHelper::_('email.cloak', $mail, $mode, $mailText, 0);
 
-			// Ensure that attributes is not stripped out by email cloaking
-			$replacement = html_entity_decode($this->_addAttributesToEmail($replacement, $regs[1][0], $regs[4][0]));
-
 			// Replace the found address with the js cloaked email
 			$text = substr_replace($text, $replacement, $regs[0][1], strlen($regs[0][0]));
 		}
diff --git a/tests/unit/suites/libraries/cms/html/JHtmlEmailTest.php b/tests/unit/suites/libraries/cms/html/JHtmlEmailTest.php
index 96ddfede36..77c68ae0c6 100644
--- a/tests/unit/suites/libraries/cms/html/JHtmlEmailTest.php
+++ b/tests/unit/suites/libraries/cms/html/JHtmlEmailTest.php
@@ -27,25 +27,27 @@ public function testCloak()
 	{
 		$this->assertThat(
 			JHtmlEmail::cloak('admin@joomla.org'),
-			$this->StringContains('<span id="cloak'),
+			$this->StringContains('<joomla-hidden-mail'),
 			'Cloak email with mailto link'
+
 		);
 
 		$this->assertThat(
 			JHtmlEmail::cloak('admin@joomla.org', false),
-			$this->StringContains('<span id="cloak'),
+			$this->StringContains('<joomla-hidden-mail'),
 			'Cloak email with no mailto link'
+
 		);
 
 		$this->assertThat(
 			JHtmlEmail::cloak('admin@joomla.org', true, 'administrator@joomla.org'),
-			$this->StringContains('<span id="cloak'),
+			$this->StringContains('<joomla-hidden-mail'),
 			'Cloak email with mailto link and separate email address text'
 		);
 
 		$this->assertThat(
 			JHtmlEmail::cloak('admin@joomla.org', true, 'Joomla! Administrator', false),
-			$this->StringContains('<span id="cloak'),
+			$this->StringContains('<joomla-hidden-mail'),
 			'Cloak email with mailto link and separate non-email address text'
 		);
 	}
diff --git a/tests/unit/suites/plugins/content/emailcloak/PlgContentEmailcloakTest.php b/tests/unit/suites/plugins/content/emailcloak/PlgContentEmailcloakTest.php
index f317203033..1f1007a3b5 100644
--- a/tests/unit/suites/plugins/content/emailcloak/PlgContentEmailcloakTest.php
+++ b/tests/unit/suites/plugins/content/emailcloak/PlgContentEmailcloakTest.php
@@ -38,9 +38,6 @@ public function setup()
 		JFactory::$application = $this->getMockCmsApp();
 		JFactory::$session     = $this->getMockSession();
 
-		// Force the cloak JS inline so that we can unit test it easier than messing with script head in document
-		JFactory::getApplication()->input->server->set('HTTP_X_REQUESTED_WITH', 'xmlhttprequest');
-
 		// Create a mock dispatcher instance
 		$dispatcher = $this->getMockDispatcher();
 
@@ -82,270 +79,129 @@ public function dataTestOnContentPrepare()
 
 				// This third row is the full output of the cloak with inline javascript mode enabled
 				''
-
 			),
 
 			// 1
 			array(
 				'<a href="mailto:toto@toto.com?subject=Mysubject" class="myclass" >email</a>',
-				"<a href='mailto:toto@toto.com?subject=Mysubject' class=\"myclass\" >email</a>",
-				"<span id=\"cloak__HASH__\">JLIB_HTML_CLOAKING</span><script type='text/javascript'>
-				document.getElementById('cloak__HASH__').innerHTML = '';
-				var prefix = '&#109;a' + 'i&#108;' + '&#116;o';
-				var path = 'hr' + 'ef' + '=';
-				var addy__HASH__ = 't&#111;t&#111;' + '&#64;';
-				addy__HASH__ = addy__HASH__ + 't&#111;t&#111;' + '&#46;' + 'c&#111;m?s&#117;bj&#101;ct=Mys&#117;bj&#101;ct';
-				var addy_text__HASH__ = '&#101;m&#97;&#105;l';document.getElementById('cloak__HASH__').innerHTML += '<a ' + path + '\'' + prefix + ':' + addy__HASH__ + '\' class=\"myclass\" >'+addy_text__HASH__+'<\/a>';
-				</script>
-				"
+				'<joomla-hidden-mail  is-link="1" is-email="0" first="dG90bw==" last="dG90by5jb20/c3ViamVjdD1NeXN1YmplY3Q=" text="ZW1haWw=" base="" >JLIB_HTML_CLOAKING</joomla-hidden-mail>',
+				'<a href="mailto:toto@toto.com?subject=Mysubject" class="myclass" >email</a>',
 			),
 
 			// 2
 			array(
 				'<a href="http://mce_host/ourdirectory/email@example.org">anytext</a>',
-
-				"<a href='mailto:email@example.org'>anytext</a>",
-
-				"<span id=\"cloak__HASH__\">JLIB_HTML_CLOAKING</span><script type='text/javascript'>
-				document.getElementById('cloak__HASH__').innerHTML = '';
-				var prefix = '&#109;a' + 'i&#108;' + '&#116;o';
-				var path = 'hr' + 'ef' + '=';
-				var addy__HASH__ = '&#101;m&#97;&#105;l' + '&#64;';
-				addy__HASH__ = addy__HASH__ + '&#101;x&#97;mpl&#101;' + '&#46;' + '&#111;rg';
-				var addy_text__HASH__ = '&#97;nyt&#101;xt';document.getElementById('cloak__HASH__').innerHTML += '<a ' + path + '\'' + prefix + ':' + addy__HASH__ + '\'>'+addy_text__HASH__+'<\/a>';
-		</script>
-				"
+				'<joomla-hidden-mail  is-link="1" is-email="0" first="ZW1haWw=" last="ZXhhbXBsZS5vcmc=" text="YW55dGV4dA==" base="" >JLIB_HTML_CLOAKING</joomla-hidden-mail>',
+				'<a href="http://mce_host/ourdirectory/email@example.org">anytext</a>',
 			),
 
 			// 3
 			array(
 				'<p><a href="mailto:joe@nowhere.com"><span style="font-style: 8pt;">Joe_fontsize8</span></a></p>',
-
-				// This is out expected output - note the comment in above for the reason it doesnt have the surrounding <p> tags
-				"<a href='mailto:joe@nowhere.com'><span style=\"font-style: 8pt;\">Joe_fontsize8</span></a>",
-
-				"<p><span id=\"cloak__HASH__\">JLIB_HTML_CLOAKING</span><script type='text/javascript'>
-				document.getElementById('cloak__HASH__').innerHTML = '';
-				var prefix = 'ma' + 'il' + 'to';
-				var path = 'hr' + 'ef' + '=';
-				var addy__HASH__ = 'joe' + '@';
-				addy__HASH__ = addy__HASH__ + 'nowhere' + '.' + 'com';
-				var addy_text__HASH__ = '<span style=\"font-style: 8pt;\">Joe_fontsize8</span>';document.getElementById('cloak__HASH__').innerHTML += '<a ' + path + '\'' + prefix + ':' + addy__HASH__ + '\'>'+addy_text__HASH__+'<\/a>';
-		</script></p>
-				"
+				'<p><joomla-hidden-mail  is-link="1" is-email="0" first="am9l" last="bm93aGVyZS5jb20=" text="PHNwYW4gc3R5bGU9ImZvbnQtc3R5bGU6IDhwdDsiPkpvZV9mb250c2l6ZTg8L3NwYW4+" base="" >JLIB_HTML_CLOAKING</joomla-hidden-mail></p>',
+				'<p><a href="mailto:joe@nowhere.com"><span style="font-style: 8pt;">Joe_fontsize8</span></a></p>',
 			),
 
 			// 4
 			array(
 				'<p><a href="mailto:joe@nowhere13.com?subject= A text"><span style="font-size: 14pt;">Joe_subject_ fontsize13</span></a></p>',
-
-				'<a href=\'mailto:joe@nowhere13.com?subject= A text\'><span style="font-size: 14pt;">Joe_subject_ fontsize13</span></a>',
-
-				"
-				<p><span id=\"cloak__HASH__\">JLIB_HTML_CLOAKING</span><script type='text/javascript'>
-				document.getElementById('cloak__HASH__').innerHTML = '';
-				var prefix = 'ma' + 'il' + 'to';
-				var path = 'hr' + 'ef' + '=';
-				var addy__HASH__ = 'joe' + '@';
-				addy__HASH__ = addy__HASH__ + 'nowhere13' + '.' + 'com?subject= A text';
-				var addy_text__HASH__ = '<span style=\"font-size: 14pt;\">Joe_subject_ fontsize13</span>';document.getElementById('cloak__HASH__').innerHTML += '<a ' + path + '\'' + prefix + ':' + addy__HASH__ + '\'>'+addy_text__HASH__+'<\/a>';
-		</script></p>
-				"
+				'<p><joomla-hidden-mail  is-link="1" is-email="0" first="am9l" last="bm93aGVyZTEzLmNvbT9zdWJqZWN0PSBBIHRleHQ=" text="PHNwYW4gc3R5bGU9ImZvbnQtc2l6ZTogMTRwdDsiPkpvZV9zdWJqZWN0XyBmb250c2l6ZTEzPC9zcGFuPg==" base="" >JLIB_HTML_CLOAKING</joomla-hidden-mail></p>',
+				'<p><a href="mailto:joe@nowhere13.com?subject= A text"><span style="font-size: 14pt;">Joe_subject_ fontsize13</span></a></p>',
 			),
 
 			// 5
 			array(
 				'<p><a href="mailto:joe@nowhere.com"><strong>something</strong></a></p>',
-
-				'<a href=\'mailto:joe@nowhere.com\'><strong>something</strong></a>',
-
-				"
-				<p><span id=\"cloak__HASH__\">JLIB_HTML_CLOAKING</span><script type='text/javascript'>
-				document.getElementById('cloak__HASH__').innerHTML = '';
-				var prefix = 'ma' + 'il' + 'to';
-				var path = 'hr' + 'ef' + '=';
-				var addy__HASH__ = 'joe' + '@';
-				addy__HASH__ = addy__HASH__ + 'nowhere' + '.' + 'com';
-				var addy_text__HASH__ = '<strong>something</strong>';document.getElementById('cloak__HASH__').innerHTML += '<a ' + path + '\'' + prefix + ':' + addy__HASH__ + '\'>'+addy_text__HASH__+'<\/a>';
-		</script></p>
-				"
+				'<p><joomla-hidden-mail  is-link="1" is-email="0" first="am9l" last="bm93aGVyZS5jb20=" text="PHN0cm9uZz5zb21ldGhpbmc8L3N0cm9uZz4=" base="" >JLIB_HTML_CLOAKING</joomla-hidden-mail></p>',
+				'<p><a href="mailto:joe@nowhere.com"><strong>something</strong></a></p>',
 			),
 
 			// 6
 			// TODO: I would expect that the email in the strong tag should ALSO be converted?
 			array(
 				'<p><a href="mailto:joe@nowhere.com"><strong>mymail@mysite.com</strong></a></p>',
-
-				'<a href=\'mailto:joe@nowhere.com\'><strong>mymail@mysite.com</strong></a>',
-
-				"
-				<p><span id=\"cloak__HASH__\">JLIB_HTML_CLOAKING</span><script type='text/javascript'>
-				document.getElementById('cloak__HASH__').innerHTML = '';
-				var prefix = 'ma' + 'il' + 'to';
-				var path = 'hr' + 'ef' + '=';
-				var addy__HASH__ = 'joe' + '@';
-				addy__HASH__ = addy__HASH__ + 'nowhere' + '.' + 'com';
-				var addy_text__HASH__ = '<strong>mymail' + '@' + 'mysite' + '.' + 'com</strong>';document.getElementById('cloak__HASH__').innerHTML += '<a ' + path + '\'' + prefix + ':' + addy__HASH__ + '\'>'+addy_text__HASH__+'<\/a>';
-		</script></p>
-				"
+				'<p><joomla-hidden-mail  is-link="1" is-email="1" first="am9l" last="bm93aGVyZS5jb20=" text="PHN0cm9uZz5teW1haWxAbXlzaXRlLmNvbTwvc3Ryb25nPg==" base="" >JLIB_HTML_CLOAKING</joomla-hidden-mail></p>',
+				'<p><a href="mailto:joe@nowhere.com"><strong>mymail@mysite.com</strong></a></p>',
 			),
 
 			// 7
 			array(
 				'<p><a href="mailto:joe@nowhere.com"><strong><span style="font-size: 14px;">mymail@mysite.com</span></strong></a></p>',
-
-				'<a href=\'mailto:joe@nowhere.com\'><strong><span style="font-size: 14px;">mymail@mysite.com</span></strong></a>',
-
-				"
-				<p><span id=\"cloak__HASH__\">JLIB_HTML_CLOAKING</span><script type='text/javascript'>
-				document.getElementById('cloak__HASH__').innerHTML = '';
-				var prefix = 'ma' + 'il' + 'to';
-				var path = 'hr' + 'ef' + '=';
-				var addy__HASH__ = 'joe' + '@';
-				addy__HASH__ = addy__HASH__ + 'nowhere' + '.' + 'com';
-				var addy_text__HASH__ = '<strong><span style=\"font-size: 14px;\">mymail' + '@' + 'mysite' + '.' + 'com</span></strong>';document.getElementById('cloak__HASH__').innerHTML += '<a ' + path + '\'' + prefix + ':' + addy__HASH__ + '\'>'+addy_text__HASH__+'<\/a>';
-		</script></p>
-				"
+				'<p><joomla-hidden-mail  is-link="1" is-email="1" first="am9l" last="bm93aGVyZS5jb20=" text="PHN0cm9uZz48c3BhbiBzdHlsZT0iZm9udC1zaXplOiAxNHB4OyI+bXltYWlsQG15c2l0ZS5jb208L3NwYW4+PC9zdHJvbmc+" base="" >JLIB_HTML_CLOAKING</joomla-hidden-mail></p>',
+				'<p><a href="mailto:joe@nowhere.com"><strong><span style="font-size: 14px;">mymail@mysite.com</span></strong></a></p>',
 			),
 
 			// 8
 			array(
 				'<p><a href="mailto:joe@nowhere.com"><strong><span style="font-size: 14px;">Joe Nobody</span></strong></a></p>',
-
-				'<a href=\'mailto:joe@nowhere.com\'><strong><span style="font-size: 14px;">Joe Nobody</span></strong></a>',
-
-				"
-				<p><span id=\"cloak__HASH__\">JLIB_HTML_CLOAKING</span><script type='text/javascript'>
-				document.getElementById('cloak__HASH__').innerHTML = '';
-				var prefix = 'ma' + 'il' + 'to';
-				var path = 'hr' + 'ef' + '=';
-				var addy__HASH__ = 'joe' + '@';
-				addy__HASH__ = addy__HASH__ + 'nowhere' + '.' + 'com';
-				var addy_text__HASH__ = '<strong><span style=\"font-size: 14px;\">Joe Nobody</span></strong>';document.getElementById('cloak__HASH__').innerHTML += '<a ' + path + '\'' + prefix + ':' + addy__HASH__ + '\'>'+addy_text__HASH__+'<\/a>';
-		</script></p>
-				"
+				'<p><joomla-hidden-mail  is-link="1" is-email="0" first="am9l" last="bm93aGVyZS5jb20=" text="PHN0cm9uZz48c3BhbiBzdHlsZT0iZm9udC1zaXplOiAxNHB4OyI+Sm9lIE5vYm9keTwvc3Bhbj48L3N0cm9uZz4=" base="" >JLIB_HTML_CLOAKING</joomla-hidden-mail></p>',
+				'<p><a href="mailto:joe@nowhere.com"><strong><span style="font-size: 14px;">Joe Nobody</span></strong></a></p>',
 			),
 
 			// 9
 			// TODO: I would expect that the email in the strong tag should ALSO be converted?
 			array(
 				'<p><a href="mailto:joe@nowhere.com?subject= A text"><strong><span style="font-size: 16px;">joe@nowhere.com</span></strong></a></p>',
-
-				'<a href=\'mailto:joe@nowhere.com?subject= A text\'><strong><span style="font-size: 16px;">joe@nowhere.com</span></strong></a>',
-
-				"
-				<p><span id=\"cloak__HASH__\">JLIB_HTML_CLOAKING</span><script type='text/javascript'>
-				document.getElementById('cloak__HASH__').innerHTML = '';
-				var prefix = 'ma' + 'il' + 'to';
-				var path = 'hr' + 'ef' + '=';
-				var addy__HASH__ = 'joe' + '@';
-				addy__HASH__ = addy__HASH__ + 'nowhere' + '.' + 'com?subject= A text';
-				var addy_text__HASH__ = '<strong><span style=\"font-size: 16px;\">joe' + '@' + 'nowhere' + '.' + 'com</span></strong>';document.getElementById('cloak__HASH__').innerHTML += '<a ' + path + '\'' + prefix + ':' + addy__HASH__ + '\'>'+addy_text__HASH__+'<\/a>';
-		</script></p>
-				"
+				'<p><joomla-hidden-mail  is-link="1" is-email="1" first="am9l" last="bm93aGVyZS5jb20/c3ViamVjdD0gQSB0ZXh0" text="PHN0cm9uZz48c3BhbiBzdHlsZT0iZm9udC1zaXplOiAxNnB4OyI+am9lQG5vd2hlcmUuY29tPC9zcGFuPjwvc3Ryb25nPg==" base="" >JLIB_HTML_CLOAKING</joomla-hidden-mail></p>',
+				'<p><a href="mailto:joe@nowhere.com?subject= A text"><strong><span style="font-size: 16px;">joe@nowhere.com</span></strong></a></p>',
 			),
 
 			// 10
 			array(
 				'<p><a href="mailto:joe@nowhere.com?subject=Text"><img src="path/to/something.jpg">joe@nowhere.com</a></p>',
-
-				'<a href=\'mailto:joe@nowhere.com?subject=Text\'><img src="path/to/something.jpg">joe@nowhere.com</a>',
-
-				"
-				<p><span id=\"cloak__HASH__\">JLIB_HTML_CLOAKING</span><script type='text/javascript'>
-				document.getElementById('cloak__HASH__').innerHTML = '';
-				var prefix = 'ma' + 'il' + 'to';
-				var path = 'hr' + 'ef' + '=';
-				var addy__HASH__ = 'joe' + '@';
-				addy__HASH__ = addy__HASH__ + 'nowhere' + '.' + 'com?subject=Text';
-				var addy_text__HASH__ = '<img src=\"path/to/something.jpg\">joe' + '@' + 'nowhere' + '.' + 'com';document.getElementById('cloak__HASH__').innerHTML += '<a ' + path + '\'' + prefix + ':' + addy__HASH__ + '\'>'+addy_text__HASH__+'<\/a>';
-		</script></p>
-				"
+				'<p><joomla-hidden-mail  is-link="1" is-email="1" first="am9l" last="bm93aGVyZS5jb20/c3ViamVjdD1UZXh0" text="PGltZyBzcmM9InBhdGgvdG8vc29tZXRoaW5nLmpwZyI+am9lQG5vd2hlcmUuY29t" base="" >JLIB_HTML_CLOAKING</joomla-hidden-mail></p>',
+				'<p><a href="mailto:joe@nowhere.com?subject=Text"><img src="path/to/something.jpg">joe@nowhere.com</a></p>',
 			),
 
 			// 11
 			array(
 				'<a href="http://mce_host/ourdirectory/email@example.org">email@example.org</a>',
-
-				"<a href='mailto:email@example.org'>email@example.org</a>",
-
-				"<span id=\"cloak__HASH__\">JLIB_HTML_CLOAKING</span><script type='text/javascript'>
-				document.getElementById('cloak__HASH__').innerHTML = '';
-				var prefix = '&#109;a' + 'i&#108;' + '&#116;o';
-				var path = 'hr' + 'ef' + '=';
-				var addy__HASH__ = '&#101;m&#97;&#105;l' + '&#64;';
-				addy__HASH__ = addy__HASH__ + '&#101;x&#97;mpl&#101;' + '&#46;' + '&#111;rg';
-				var addy_text__HASH__ = '&#101;m&#97;&#105;l' + '&#64;' + '&#101;x&#97;mpl&#101;' + '&#46;' + '&#111;rg';document.getElementById('cloak__HASH__').innerHTML += '<a ' + path + '\'' + prefix + ':' + addy__HASH__ + '\'>'+addy_text__HASH__+'<\/a>';
-		</script>
-				"
+				'<joomla-hidden-mail  is-link="1" is-email="1" first="ZW1haWw=" last="ZXhhbXBsZS5vcmc=" text="ZW1haWxAZXhhbXBsZS5vcmc=" base="" >JLIB_HTML_CLOAKING</joomla-hidden-mail>',
+				'<a href="http://mce_host/ourdirectory/email@example.org">email@example.org</a>',
 			),
 
 			// 12 - similar to test 9 but with the addition of classes
 			// TODO: I would expect that the email in the strong tag should ALSO be converted?
 			array(
 				'<p><a href="mailto:joe@nowhere.com?subject= A text" class="class1 class2"><strong><span style="font-size: 16px;">joe@nowhere.com</span></strong></a></p>',
-
-				'<a href=\'mailto:joe@nowhere.com?subject= A text\' class="class1 class2"><strong><span style="font-size: 16px;">joe@nowhere.com</span></strong></a>',
-
-				"
-				<p><span id=\"cloak__HASH__\">JLIB_HTML_CLOAKING</span><script type='text/javascript'>
-				document.getElementById('cloak__HASH__').innerHTML = '';
-				var prefix = 'ma' + 'il' + 'to';
-				var path = 'hr' + 'ef' + '=';
-				var addy__HASH__ = 'joe' + '@';
-				addy__HASH__ = addy__HASH__ + 'nowhere' + '.' + 'com?subject= A text';
-				var addy_text__HASH__ = '<strong><span style=\"font-size: 16px;\">joe' + '@' + 'nowhere' + '.' + 'com</span></strong>';document.getElementById('cloak__HASH__').innerHTML += '<a ' + path + '\'' + prefix + ':' + addy__HASH__ + '\' class=\"class1 class2\">'+addy_text__HASH__+'<\/a>';
-		</script></p>
-				"
+				'<p><joomla-hidden-mail  is-link="1" is-email="1" first="am9l" last="bm93aGVyZS5jb20/c3ViamVjdD0gQSB0ZXh0" text="PHN0cm9uZz48c3BhbiBzdHlsZT0iZm9udC1zaXplOiAxNnB4OyI+am9lQG5vd2hlcmUuY29tPC9zcGFuPjwvc3Ryb25nPg==" base="" >JLIB_HTML_CLOAKING</joomla-hidden-mail></p>',
+				'<p><a href="mailto:joe@nowhere.com?subject= A text" class="class1 class2"><strong><span style="font-size: 16px;">joe@nowhere.com</span></strong></a></p>',
 			),
 
 			// 13 - Similar to test 4 but with the addition of classes
 			array(
 				'<p><a href="mailto:joe@nowhere13.com?subject= A text" class="class 1 class 2"><span style="font-size: 14pt;">Joe_subject_ fontsize13</span></a></p>',
-
-				'<a href=\'mailto:joe@nowhere13.com?subject= A text\' class="class 1 class 2"><span style="font-size: 14pt;">Joe_subject_ fontsize13</span></a>',
-
-				"
-				<p><span id=\"cloak__HASH__\">JLIB_HTML_CLOAKING</span><script type='text/javascript'>
-				document.getElementById('cloak__HASH__').innerHTML = '';
-				var prefix = 'ma' + 'il' + 'to';
-				var path = 'hr' + 'ef' + '=';
-				var addy__HASH__ = 'joe' + '@';
-				addy__HASH__ = addy__HASH__ + 'nowhere13' + '.' + 'com?subject= A text';
-				var addy_text__HASH__ = '<span style=\"font-size: 14pt;\">Joe_subject_ fontsize13</span>';document.getElementById('cloak__HASH__').innerHTML += '<a ' + path + '\'' + prefix + ':' + addy__HASH__ + '\' class=\"class 1 class 2\">'+addy_text__HASH__+'<\/a>';
-		</script></p>
-				"
+				'<p><joomla-hidden-mail  is-link="1" is-email="0" first="am9l" last="bm93aGVyZTEzLmNvbT9zdWJqZWN0PSBBIHRleHQ=" text="PHNwYW4gc3R5bGU9ImZvbnQtc2l6ZTogMTRwdDsiPkpvZV9zdWJqZWN0XyBmb250c2l6ZTEzPC9zcGFuPg==" base="" >JLIB_HTML_CLOAKING</joomla-hidden-mail></p>',
+				'<p><a href="mailto:joe@nowhere13.com?subject= A text" class="class 1 class 2"><span style="font-size: 14pt;">Joe_subject_ fontsize13</span></a></p>',
 			),
 
 			// 14
 			array(
 				'<a href="mailto:toto@toto.com" class="myclass" >toto@toto.com</a>',
-				"<a href='mailto:toto@toto.com' class=\"myclass\" >toto@toto.com</a>",
-				"<span id=\"cloak__HASH__\">JLIB_HTML_CLOAKING</span><script type='text/javascript'>
-				document.getElementById('cloak__HASH__').innerHTML = '';
-				var prefix = '&#109;a' + 'i&#108;' + '&#116;o';
-				var path = 'hr' + 'ef' + '=';
-				var addy__HASH__ = 't&#111;t&#111;' + '&#64;';
-				addy__HASH__ = addy__HASH__ + 't&#111;t&#111;' + '&#46;' + 'c&#111;m';
-				var addy_text__HASH__ = 't&#111;t&#111;' + '&#64;' + 't&#111;t&#111;' + '&#46;' + 'c&#111;m';document.getElementById('cloak__HASH__').innerHTML += '<a ' + path + '\'' + prefix + ':' + addy__HASH__ + '\' class=\"myclass\" >'+addy_text__HASH__+'<\/a>';
-				</script>
-				"
+				'<joomla-hidden-mail  is-link="1" is-email="1" first="dG90bw==" last="dG90by5jb20=" text="dG90b0B0b3RvLmNvbQ==" base="" >JLIB_HTML_CLOAKING</joomla-hidden-mail>',
+				'<a href="mailto:toto@toto.com" class="myclass" >toto@toto.com</a>',
 			),
 
 			// 15
 			array(
 				'<a href="mailto:toto@toto.com" class="myclass" >Click Here</a>',
-				"<a href='mailto:toto@toto.com' class=\"myclass\" >Click Here</a>",
-				"<span id=\"cloak__HASH__\">JLIB_HTML_CLOAKING</span><script type='text/javascript'>
-				document.getElementById('cloak__HASH__').innerHTML = '';
-				var prefix = '&#109;a' + 'i&#108;' + '&#116;o';
-				var path = 'hr' + 'ef' + '=';
-				var addy__HASH__ = 't&#111;t&#111;' + '&#64;';
-				addy__HASH__ = addy__HASH__ + 't&#111;t&#111;' + '&#46;' + 'c&#111;m';
-				var addy_text__HASH__ = 'Cl&#105;ck H&#101;r&#101;';document.getElementById('cloak__HASH__').innerHTML += '<a ' + path + '\'' + prefix + ':' + addy__HASH__ + '\' class=\"myclass\" >'+addy_text__HASH__+'<\/a>';
-				</script>
-				"
+				'<joomla-hidden-mail  is-link="1" is-email="0" first="dG90bw==" last="dG90by5jb20=" text="Q2xpY2sgSGVyZQ==" base="" >JLIB_HTML_CLOAKING</joomla-hidden-mail>',
+				'<a href="mailto:toto@toto.com" class="myclass" >Click Here</a>',
+			),
+
+			// 16 UTF8
+			array(
+				'<a href="mailto:joomlatest@xn----7sblgc4ag8bhcd.xn--p1ai"> joomlatest@джумла-тест.рф</a>',
+				'<joomla-hidden-mail  is-link="1" is-email="0" first="am9vbWxhdGVzdA==" last="eG4tLS0tN3NibGdjNGFnOGJoY2QueG4tLXAxYWk=" text="IGpvb21sYXRlc3RA0LTQttGD0LzQu9CwLdGC0LXRgdGCLtGA0YQ=" base="" >JLIB_HTML_CLOAKING</joomla-hidden-mail>',
+				'<a href="mailto:joomlatest@xn----7sblgc4ag8bhcd.xn--p1ai">Click Here</a>',
 			),
+
+			// 17 UTF8 and image
+			array(
+				'<a href="mailto:joomlatest@xn----7sblgc4ag8bhcd.xn--p1ai?subject= джумла-тес" rel="alternate"><img src="images/powered_by.png" alt="" /></a>',
+				'<joomla-hidden-mail  is-link="1" is-email="0" first="am9vbWxhdGVzdA==" last="eG4tLS0tN3NibGdjNGFnOGJoY2QueG4tLXAxYWk/c3ViamVjdD0g0LTQttGD0LzQu9CwLdGC0LXRgQ==" text="PGltZyBzcmM9ImltYWdlcy9wb3dlcmVkX2J5LnBuZyIgYWx0PSIiIC8+" base="" >JLIB_HTML_CLOAKING</joomla-hidden-mail>',
+				'<a href="mailto:joomlatest@xn----7sblgc4ag8bhcd.xn--p1ai?subject= джумла-тес" rel="alternate"><img src="images/powered_by.png" alt="" /></a>',
+			)
 		);
 	}
 
@@ -374,86 +230,8 @@ public function testOnContentPrepareWithRowNoFinder($input, $expectedHTML, $expe
 		$res = $this->class->onContentPrepare('com_content.article', $row, $params);
 		$this->assertEquals(1, $res);
 
-		// Get the md5 hash
-		preg_match("/addy_text([0-9a-z]{32})/", $row->text, $output_array);
-
-		// If we did some cloaking then test the JS
-		if (count($output_array))
-		{
-			$hash = $output_array[1];
-
-			// Assert the JLIB_HTML_CLOAKING span is intact
-			$this->assertRegExp('/\<span\sid\=\"cloak[0-9a-z]{32}\"\>JLIB_HTML_CLOAKING\<\/span\>/', $row->text);
-			$cloakHTML = '<span id="cloak' . $hash . '">JLIB_HTML_CLOAKING</span>';
-			$this->assertContains($cloakHTML, $row->text);
-
-			// Need to do this to overcome whitespace comparison issue in phpunit for some reason...
-			preg_match_all("/\<script type=\'text\/javascript\'\>(.*)<\/script>/ism", $row->text, $innerJS);
-			$result = trim($innerJS[1][0]);
-
-			preg_match_all("/\<script type=\'text\/javascript\'\>(.*)<\/script>/ism", $expectedJs, $innerJS);
-			$expected = trim($innerJS[1][0]);
-
-			// Assert the render is as the expected render with injected hash
-			$this->assertEquals(trim(str_replace('__HASH__', $hash, $expected)), $result);
-
-			$html = $this->convertJStoHTML($result, $hash);
-			$this->assertEquals($html, $expectedHTML);
-		}
-		else
-		{
-			// We never cloaked an email but lets ensure we did not screw up the article text anyway!
-			$this->assertEquals($expectedHTML, $row->text);
-		}
-	}
-
-	/**
-	 * Because phpunit cannot evaluate JS like a browser rendering testing framework can
-	 * we convert the JS back to HTML by converting to PHP first
-	 * Yes its probably a fudge, but is better than nothing as Joomla has no JS testing framework
-	 *
-	 * @param string $js the resultant JS
-	 * @param string $hash the md5 hash
-	 * @return string $resultantHTML the resultant HTML that would be rendered by JS.
-	 */
-	private function convertJStoHTML($js, $hash)
-	{
-		$resultantHTML = null;
-		$debug = false;
-
-		$js = html_entity_decode($js);
-		$js = str_replace(sprintf('document.getElementById(\'cloak%s\').innerHTML = \'\';', $hash), '', $js);
-		$js = str_replace(sprintf('document.getElementById(\'cloak%s\').innerHTML +=', $hash), "\n\n" . '$resultantHTML = ', $js);
-		$js = str_replace('var ', '$', $js);
-		$js = str_replace("' + '", "", $js);
-		$js = preg_replace("/\saddy/", '$addy', $js);
-		$js = preg_replace(sprintf("/\'\+addy_text%s\+\'/", $hash), sprintf('\' . \$addy_text%s .\'', $hash), $js);
-		$js = preg_replace(sprintf("/\+\$addy%s\s\+/", $hash), sprintf('\' . \$addy_text%s .\'', $hash), $js);
-		$js = str_replace("+ path +", '. $path .', $js);
-		$js = str_replace("+ prefix +", '. $prefix .', $js);
-		$js = str_replace("+$", '.$', $js);
-		$js = str_replace("\/", '/', $js);
-		$js = str_replace(
-			sprintf('$addy%s +', $hash),
-			sprintf('$addy%s .', $hash),
-			$js);
-
-		// Because with all those replaces, you and I will need this a lot :)
-		if (true === $debug)
-		{
-			echo "\n\n" . trim($js) . "\n\n";
-			eval($js);
-			echo "\n\n";
-			var_dump(trim($resultantHTML));
-			die;
-		}
-		else
-		{
-			// EVAL IS EVIL - I know - but here its not a security risk, and is 'ok'-ish.
-			eval($js);
-		}
-
-		return trim($resultantHTML);
+		// We never cloaked an email but lets ensure we did not screw up the article text anyway!
+		$this->assertEquals($expectedHTML, $row->text);
 	}
 
 	/**

From a9ee46c44450dc869ae03e2b9a1032e78917e9f5 Mon Sep 17 00:00:00 2001
From: Dimitri Grammatikogianni <mit505@upshift.gr>
Date: Sun, 1 Apr 2018 22:25:58 +0200
Subject: [PATCH 18/19] load webcomponents polyfills only if needed (#19984)

---
 media/system/js/core.js     | 33 ++++++++++++++++-----------------
 media/system/js/core.min.js |  2 +-
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/media/system/js/core.js b/media/system/js/core.js
index 2b591052de..1072530a70 100644
--- a/media/system/js/core.js
+++ b/media/system/js/core.js
@@ -920,12 +920,8 @@ Joomla.editors.instances = Joomla.editors.instances || {
 	 * @since   4.0.0
 	 */
 	Joomla.WebComponents = function() {
-		var wc, polyfills = [];
-
-		/* Get the web components */
-		if (Joomla.getOptions && typeof Joomla.getOptions === "function") {
-			wc = Joomla.getOptions('webcomponents', {});
-		}
+		var polyfills = [];
+		var wc = Joomla.getOptions('webcomponents');
 
 		/* Check if ES6 then apply the shim */
 		var checkES6 = function () {
@@ -940,9 +936,7 @@ Joomla.editors.instances = Joomla.editors.instances || {
 
 		/* Load web components async */
 		var loadWC = function () {
-			var wc = Joomla.getOptions('webcomponents');
-
-			if (wc.length) {
+			if (wc && wc.length) {
 				wc.forEach(function(component) {
 					if (component.match(/\.js/g)) {
 						var el = document.createElement('script');
@@ -979,8 +973,9 @@ Joomla.editors.instances = Joomla.editors.instances || {
 			polyfills = ['lite'];
 		}
 
-		if (polyfills.length) {
-			var name = "core.min.js", script = document.querySelector('script[src*="' + name + '"]');
+		if (polyfills.length && wc && wc.length) {
+			var name = "core.min.js";
+			var script = document.querySelector('script[src*="' + name + '"]');
 
 			if (!script) {
 				name = "core.js";
@@ -991,10 +986,10 @@ Joomla.editors.instances = Joomla.editors.instances || {
 				throw new Error('core(.min).js is not registered correctly!')
 			}
 
-			var newScript = document.createElement('script'),
-			    replacement = 'media/vendor/webcomponentsjs/js/webcomponents-' + polyfills.join('-') + '.min.js',
-			    mediaVersion = script.src.match(/\?.*/)[0],
-			    base = Joomla.getOptions('system.paths');
+			var newScript = document.createElement('script');
+			var replacement = 'media/vendor/webcomponentsjs/js/webcomponents-' + polyfills.join('-') + '.min.js';
+			var mediaVersion = script.src.match(/\?.*/)[0];
+			var base = Joomla.getOptions('system.paths');
 
 			if (!base) {
 				throw new Error('core(.min).js is not registered correctly!')
@@ -1004,13 +999,17 @@ Joomla.editors.instances = Joomla.editors.instances || {
 			document.head.appendChild(newScript);
 
 			document.addEventListener('WebComponentsReady', function () {
-				loadWC(wc);
+				loadWC();
 			});
 		} else {
+			if (!wc || !wc.length) {
+				return;
+			}
+
 			var fire = function () {
 				requestAnimationFrame(function () {
 					document.dispatchEvent(new CustomEvent('WebComponentsReady', { bubbles: true }));
-					loadWC(wc);
+					loadWC();
 				});
 			};
 
diff --git a/media/system/js/core.min.js b/media/system/js/core.min.js
index 3c2d36f459..bb9e71b6ff 100644
--- a/media/system/js/core.min.js
+++ b/media/system/js/core.min.js
@@ -1 +1 @@
-Joomla=window.Joomla||{},Joomla.editors=Joomla.editors||{},Joomla.editors.instances=Joomla.editors.instances||{},function(e,t){"use strict";e.submitform=function(e,o,n){o||(o=t.getElementById("adminForm")),e&&(o.task.value=e),o.noValidate=!n,n?o.hasAttribute("novalidate")&&o.removeAttribute("novalidate"):o.setAttribute("novalidate","");var r=t.createElement("input");r.style.display="none",r.type="submit",o.appendChild(r).click(),o.removeChild(r)},e.submitbutton=function(o){var n=t.querySelectorAll("form.form-validate");if(n.length>0)for(var r=0,s=n.length;r<s;r++){var a=o.split("."),i=n[r].getAttribute("data-cancel-task");i||(i=a[0]+".cancel"),(o==i||t.formvalidator.isValid(n[r]))&&e.submitform(o,n[r])}else e.submitform(o)},e.JText={strings:{},_:function(t,o){var n=e.getOptions("joomla.jtext");return n&&(this.load(n),e.loadOptions({"joomla.jtext":null})),o=void 0===o?"":o,t=t.toUpperCase(),void 0!==this.strings[t]?this.strings[t]:o},load:function(e){for(var t in e)e.hasOwnProperty(t)&&(this.strings[t.toUpperCase()]=e[t]);return this}},e.optionsStorage=e.optionsStorage||null,e.getOptions=function(t,o){return e.optionsStorage||e.loadOptions(),void 0!==e.optionsStorage[t]?e.optionsStorage[t]:o},e.loadOptions=function(o){if(!o){for(var n,r,s,a=t.querySelectorAll(".joomla-script-options.new"),i=0,l=0,c=a.length;l<c;l++)n=(r=a[l]).text||r.textContent,(s=JSON.parse(n))&&(e.loadOptions(s),i++),r.className=r.className.replace(" new"," loaded");if(i)return}if(e.optionsStorage){if(o)for(var d in o)o.hasOwnProperty(d)&&(null!==o[d]&&"object"==typeof e.optionsStorage[d]&&"object"==typeof o[d]?e.optionsStorage[d]=e.extend(e.optionsStorage[d],o[d]):e.optionsStorage[d]=o[d])}else e.optionsStorage=o||{}},e.replaceTokens=function(e){if(/^[0-9A-F]{32}$/i.test(e)){var o,n,r,s=t.getElementsByTagName("input");for(o=0,r=s.length;o<r;o++)"hidden"==(n=s[o]).type&&"1"==n.value&&32==n.name.length&&(n.name=e)}},e.isEmail=function(e){return/^[\w.!#$%&‚Äô*+\/=?^`{|}~-]+@[a-z0-9-]+(?:\.[a-z0-9-]{2,})+$/i.test(e)},e.checkAll=function(e,t){if(!e.form)return!1;t=t||"cb";var o,n,r,s=0;for(o=0,r=e.form.elements.length;o<r;o++)(n=e.form.elements[o]).type==e.type&&0===n.id.indexOf(t)&&(n.checked=e.checked,s+=n.checked?1:0);return e.form.boxchecked&&(e.form.boxchecked.value=s),!0},e.renderMessages=function(o,n,r,s){var a,i,l,c,d,m,u,f;for(i in a=void 0===n||n&&"#system-message-container"===n?t.getElementById("system-message-container"):t.querySelector(n),(void 0===r||r&&!1===r)&&e.removeMessages(a),o)if(o.hasOwnProperty(i)){if(l=o[i],"object"==typeof window.customElements&&"function"==typeof window.customElements.get("joomla-alert"))c=t.createElement("joomla-alert"),["notice","message","error"].indexOf(i)>-1?(f="notice"===i?"info":i,f="message"===i?"success":f,f="error"===i?"danger":f):f="info",c.setAttribute("type",f),c.setAttribute("dismiss","true"),s&&parseInt(s)>0&&c.setAttribute("autodismiss",s);else{c=t.createElement("div"),["notice","message","error"].indexOf(i)>-1?(f="notice"===i?"info":i,f="message"===i?"success":f,f="error"===i?"danger":f):f="info",c.className="alert "+f;var p=t.createElement("button");p.setAttribute("type","button"),p.setAttribute("data-dismiss","alert"),p.className="close",p.innerHTML="×",c.appendChild(p)}for(void 0!==e.JText._(i)&&((d=t.createElement("h4")).className="alert-heading",d.innerHTML=e.JText._(i)?e.JText._(i):i,c.appendChild(d)),m=l.length-1;m>=0;m--)(u=t.createElement("div")).innerHTML=l[m],c.appendChild(u);a.appendChild(c),"object"!=typeof window.customElements&&"function"!=typeof window.customElements.get("joomla-alert")&&s&&parseInt(s)>0&&setTimeout(function(){e.removeMessages(a)},s)}},e.removeMessages=function(e){var o;if(o=e||t.getElementById("system-message-container"),"object"==typeof window.customElements&&window.customElements.get("joomla-alert")){var n=o.querySelectorAll("joomla-alert");if(n.length)for(var r=0,s=n.length;r<s;r++)n[r].close()}else{for(;o.firstChild;)o.removeChild(o.firstChild);o.style.display="none",o.offsetHeight,o.style.display=""}},e.ajaxErrorsMessages=function(t,o,n){var r={};if("parsererror"===o){for(var s=t.responseText.trim(),a=[],i=s.length-1;i>=0;i--)a.unshift(["&#",s[i].charCodeAt(),";"].join(""));s=a.join(""),r.error=[e.JText._("JLIB_JS_AJAX_ERROR_PARSE").replace("%s",s)]}else"nocontent"===o?r.error=[e.JText._("JLIB_JS_AJAX_ERROR_NO_CONTENT")]:"timeout"===o?r.error=[e.JText._("JLIB_JS_AJAX_ERROR_TIMEOUT")]:"abort"===o?r.error=[e.JText._("JLIB_JS_AJAX_ERROR_CONNECTION_ABORT")]:t.responseJSON&&t.responseJSON.message?r.error=[e.JText._("JLIB_JS_AJAX_ERROR_OTHER").replace("%s",t.status)+" <em>"+t.responseJSON.message+"</em>"]:t.statusText?r.error=[e.JText._("JLIB_JS_AJAX_ERROR_OTHER").replace("%s",t.status)+" <em>"+t.statusText+"</em>"]:r.error=[e.JText._("JLIB_JS_AJAX_ERROR_OTHER").replace("%s",t.status)];return r},e.isChecked=function(e,o){if(void 0===o&&(o=t.getElementById("adminForm")),o.boxchecked.value=e?parseInt(o.boxchecked.value)+1:parseInt(o.boxchecked.value)-1,o.elements["checkall-toggle"]){var n,r,s,a=!0;for(n=0,s=o.elements.length;n<s;n++)if("checkbox"==(r=o.elements[n]).type&&"checkall-toggle"!=r.name&&!r.checked){a=!1;break}o.elements["checkall-toggle"].checked=a}},e.tableOrdering=function(o,n,r,s){void 0===s&&(s=t.getElementById("adminForm")),s.filter_order.value=o,s.filter_order_Dir.value=n,e.submitform(r,s)},window.getSelectedValue=function(e,o){var n=t[e][o],r=n.selectedIndex;return null!==r&&r>-1?n.options[r].value:null},window.listItemTask=function(t,o){return e.listItemTask(t,o)},e.listItemTask=function(e,o){var n,r=t.adminForm,s=0,a=r[e];if(!a)return!1;for(;n=r["cb"+s];)n.checked=!1,s++;return a.checked=!0,r.boxchecked.value=1,window.submitform(o),!1},window.submitbutton=function(t){e.submitbutton(t)},window.submitform=function(t){e.submitform(t)},window.saveorder=function(e,t){window.checkAll_button(e,t)},window.checkAll_button=function(o,n){var r,s;for(n=n||"saveorder",r=0;r<=o;r++){if(!(s=t.adminForm["cb"+r]))return void alert("You cannot change the order of items, as an item in the list is `Checked Out`");s.checked=!0}e.submitform(n)},e.loadingLayer=function(o,n){if(o=o||"show",n=n||t.body,"load"===o){var r=(e.getOptions("system.paths")||{}).root||"",s=t.createElement("div");s.id="loading-logo",s.style.position="fixed",s.style.top="0",s.style.left="0",s.style.width="100%",s.style.height="100%",s.style.opacity="0.8",s.style.filter="alpha(opacity=80)",s.style.overflow="hidden",s.style["z-index"]="10000",s.style.display="none",s.style["background-color"]="#fff",s.style["background-image"]='url("'+r+'/media/system/images/ajax-loader.gif")',s.style["background-position"]="center",s.style["background-repeat"]="no-repeat",s.style["background-attachment"]="fixed",n.appendChild(s)}else t.getElementById("loading-logo")||e.loadingLayer("load",n),t.getElementById("loading-logo").style.display="show"==o?"block":"none";return t.getElementById("loading-logo")},e.extend=function(e,t){for(var o in null===e&&(e={}),t)t.hasOwnProperty(o)&&(e[o]=t[o]);return e},e.request=function(t){t=e.extend({url:"",method:"GET",data:null,perform:!0},t);try{var o=window.XMLHttpRequest?new XMLHttpRequest:new ActiveXObject("MSXML2.XMLHTTP.3.0");if(o.open(t.method,t.url,!0),o.setRequestHeader("X-Requested-With","XMLHttpRequest"),o.setRequestHeader("X-Ajax-Engine","Joomla!"),"GET"!==t.method){var n=e.getOptions("csrf.token","");n&&o.setRequestHeader("X-CSRF-Token",n),t.headers&&t.headers["Content-Type"]||o.setRequestHeader("Content-Type","application/x-www-form-urlencoded")}if(t.headers)for(var r in t.headers)t.headers.hasOwnProperty(r)&&o.setRequestHeader(r,t.headers[r]);if(o.onreadystatechange=function(){4===o.readyState&&(200===o.status?t.onSuccess&&t.onSuccess.call(window,o.responseText,o):t.onError&&t.onError.call(window,o))},t.perform){if(t.onBefore&&!1===t.onBefore.call(window,o))return o;o.send(t.data)}}catch(e){return window.console&&console.log(e),!1}return o},e.localStorageEnabled=function(){var e="joomla-cms";try{return localStorage.setItem(e,e),localStorage.removeItem(e),!0}catch(e){return!1}},e.WebComponents=function(){var o=[];e.getOptions&&"function"==typeof e.getOptions&&e.getOptions("webcomponents",{});var n=function(){var o=e.getOptions("webcomponents");o.length&&o.forEach(function(e){if(e.match(/\.js/g)){var o,n=t.createElement("script");if(function(){try{return new Function("(a = 0) => a"),!0}catch(e){return!1}}())n.src=e;else e.match(/\.min\.js/g)?o=e.replace(/\.min\.js/g,"-es5.min.js"):e.match(/\.js/g)&&(o=e.replace(/\.js/g,"-es5.js")),n.src=o}n&&t.head.appendChild(n)})};if("import"in t.createElement("link")||o.push("hi"),(!("attachShadow"in Element.prototype&&"getRootNode"in Element.prototype)||window.ShadyDOM&&window.ShadyDOM.force)&&o.push("sd"),window.customElements&&!window.customElements.forcePolyfill||o.push("ce"),"content"in t.createElement("template")&&window.Promise&&Array.from&&t.createDocumentFragment().cloneNode()instanceof DocumentFragment||(o=["lite"]),o.length){var r="core.min.js",s=t.querySelector('script[src*="'+r+'"]');if(s||(r="core.js",s=t.querySelector('script[src*="'+r+'"]')),!s)throw new Error("core(.min).js is not registered correctly!");var a=t.createElement("script"),i="media/vendor/webcomponentsjs/js/webcomponents-"+o.join("-")+".min.js",l=s.src.match(/\?.*/)[0],c=e.getOptions("system.paths");if(!c)throw new Error("core(.min).js is not registered correctly!");a.src=c.rootFull+i+(l||""),t.head.appendChild(a),t.addEventListener("WebComponentsReady",function(){n()})}else{var d=function(){requestAnimationFrame(function(){t.dispatchEvent(new CustomEvent("WebComponentsReady",{bubbles:!0})),n()})};"loading"!==t.readyState?d():t.addEventListener("readystatechange",function e(){d(),t.removeEventListener("readystatechange",e)})}}}(Joomla,document),function(e,t){"use strict";t.Event||(t.Event={},t.Event.dispatch=function(t,o,n){var r;"string"==typeof t&&(n=o,o=t,t=e),n=n||{},e.CustomEvent&&"function"==typeof e.CustomEvent?r=new CustomEvent(o,{detail:n,bubbles:!0,cancelable:!0}):((r=document.createEvent("Event")).initEvent(o,!0,!0),r.detail=n),t.dispatchEvent(r)},t.Event.listenOnce=function(e,t,o){var n=function(r){return e.removeEventListener(t,n),o.call(e,r)};e.addEventListener(t,n)})}(window,Joomla),document.addEventListener("DOMContentLoaded",function(){Joomla.WebComponents()});
\ No newline at end of file
+Joomla=window.Joomla||{},Joomla.editors=Joomla.editors||{},Joomla.editors.instances=Joomla.editors.instances||{},function(e,t){"use strict";e.submitform=function(e,o,n){o||(o=t.getElementById("adminForm")),e&&(o.task.value=e),o.noValidate=!n,n?o.hasAttribute("novalidate")&&o.removeAttribute("novalidate"):o.setAttribute("novalidate","");var r=t.createElement("input");r.style.display="none",r.type="submit",o.appendChild(r).click(),o.removeChild(r)},e.submitbutton=function(o){var n=t.querySelectorAll("form.form-validate");if(n.length>0)for(var r=0,s=n.length;r<s;r++){var a=o.split("."),i=n[r].getAttribute("data-cancel-task");i||(i=a[0]+".cancel"),(o==i||t.formvalidator.isValid(n[r]))&&e.submitform(o,n[r])}else e.submitform(o)},e.JText={strings:{},_:function(t,o){var n=e.getOptions("joomla.jtext");return n&&(this.load(n),e.loadOptions({"joomla.jtext":null})),o=void 0===o?"":o,t=t.toUpperCase(),void 0!==this.strings[t]?this.strings[t]:o},load:function(e){for(var t in e)e.hasOwnProperty(t)&&(this.strings[t.toUpperCase()]=e[t]);return this}},e.optionsStorage=e.optionsStorage||null,e.getOptions=function(t,o){return e.optionsStorage||e.loadOptions(),void 0!==e.optionsStorage[t]?e.optionsStorage[t]:o},e.loadOptions=function(o){if(!o){for(var n,r,s,a=t.querySelectorAll(".joomla-script-options.new"),i=0,l=0,c=a.length;l<c;l++)n=(r=a[l]).text||r.textContent,(s=JSON.parse(n))&&(e.loadOptions(s),i++),r.className=r.className.replace(" new"," loaded");if(i)return}if(e.optionsStorage){if(o)for(var d in o)o.hasOwnProperty(d)&&(null!==o[d]&&"object"==typeof e.optionsStorage[d]&&"object"==typeof o[d]?e.optionsStorage[d]=e.extend(e.optionsStorage[d],o[d]):e.optionsStorage[d]=o[d])}else e.optionsStorage=o||{}},e.replaceTokens=function(e){if(/^[0-9A-F]{32}$/i.test(e)){var o,n,r,s=t.getElementsByTagName("input");for(o=0,r=s.length;o<r;o++)"hidden"==(n=s[o]).type&&"1"==n.value&&32==n.name.length&&(n.name=e)}},e.isEmail=function(e){return/^[\w.!#$%&‚Äô*+\/=?^`{|}~-]+@[a-z0-9-]+(?:\.[a-z0-9-]{2,})+$/i.test(e)},e.checkAll=function(e,t){if(!e.form)return!1;t=t||"cb";var o,n,r,s=0;for(o=0,r=e.form.elements.length;o<r;o++)(n=e.form.elements[o]).type==e.type&&0===n.id.indexOf(t)&&(n.checked=e.checked,s+=n.checked?1:0);return e.form.boxchecked&&(e.form.boxchecked.value=s),!0},e.renderMessages=function(o,n,r,s){var a,i,l,c,d,m,u,f;for(i in a=void 0===n||n&&"#system-message-container"===n?t.getElementById("system-message-container"):t.querySelector(n),(void 0===r||r&&!1===r)&&e.removeMessages(a),o)if(o.hasOwnProperty(i)){if(l=o[i],"object"==typeof window.customElements&&"function"==typeof window.customElements.get("joomla-alert"))c=t.createElement("joomla-alert"),["notice","message","error"].indexOf(i)>-1?(f="notice"===i?"info":i,f="message"===i?"success":f,f="error"===i?"danger":f):f="info",c.setAttribute("type",f),c.setAttribute("dismiss","true"),s&&parseInt(s)>0&&c.setAttribute("autodismiss",s);else{c=t.createElement("div"),["notice","message","error"].indexOf(i)>-1?(f="notice"===i?"info":i,f="message"===i?"success":f,f="error"===i?"danger":f):f="info",c.className="alert "+f;var p=t.createElement("button");p.setAttribute("type","button"),p.setAttribute("data-dismiss","alert"),p.className="close",p.innerHTML="×",c.appendChild(p)}for(void 0!==e.JText._(i)&&((d=t.createElement("h4")).className="alert-heading",d.innerHTML=e.JText._(i)?e.JText._(i):i,c.appendChild(d)),m=l.length-1;m>=0;m--)(u=t.createElement("div")).innerHTML=l[m],c.appendChild(u);a.appendChild(c),"object"!=typeof window.customElements&&"function"!=typeof window.customElements.get("joomla-alert")&&s&&parseInt(s)>0&&setTimeout(function(){e.removeMessages(a)},s)}},e.removeMessages=function(e){var o;if(o=e||t.getElementById("system-message-container"),"object"==typeof window.customElements&&window.customElements.get("joomla-alert")){var n=o.querySelectorAll("joomla-alert");if(n.length)for(var r=0,s=n.length;r<s;r++)n[r].close()}else{for(;o.firstChild;)o.removeChild(o.firstChild);o.style.display="none",o.offsetHeight,o.style.display=""}},e.ajaxErrorsMessages=function(t,o,n){var r={};if("parsererror"===o){for(var s=t.responseText.trim(),a=[],i=s.length-1;i>=0;i--)a.unshift(["&#",s[i].charCodeAt(),";"].join(""));s=a.join(""),r.error=[e.JText._("JLIB_JS_AJAX_ERROR_PARSE").replace("%s",s)]}else"nocontent"===o?r.error=[e.JText._("JLIB_JS_AJAX_ERROR_NO_CONTENT")]:"timeout"===o?r.error=[e.JText._("JLIB_JS_AJAX_ERROR_TIMEOUT")]:"abort"===o?r.error=[e.JText._("JLIB_JS_AJAX_ERROR_CONNECTION_ABORT")]:t.responseJSON&&t.responseJSON.message?r.error=[e.JText._("JLIB_JS_AJAX_ERROR_OTHER").replace("%s",t.status)+" <em>"+t.responseJSON.message+"</em>"]:t.statusText?r.error=[e.JText._("JLIB_JS_AJAX_ERROR_OTHER").replace("%s",t.status)+" <em>"+t.statusText+"</em>"]:r.error=[e.JText._("JLIB_JS_AJAX_ERROR_OTHER").replace("%s",t.status)];return r},e.isChecked=function(e,o){if(void 0===o&&(o=t.getElementById("adminForm")),o.boxchecked.value=e?parseInt(o.boxchecked.value)+1:parseInt(o.boxchecked.value)-1,o.elements["checkall-toggle"]){var n,r,s,a=!0;for(n=0,s=o.elements.length;n<s;n++)if("checkbox"==(r=o.elements[n]).type&&"checkall-toggle"!=r.name&&!r.checked){a=!1;break}o.elements["checkall-toggle"].checked=a}},e.tableOrdering=function(o,n,r,s){void 0===s&&(s=t.getElementById("adminForm")),s.filter_order.value=o,s.filter_order_Dir.value=n,e.submitform(r,s)},window.getSelectedValue=function(e,o){var n=t[e][o],r=n.selectedIndex;return null!==r&&r>-1?n.options[r].value:null},window.listItemTask=function(t,o){return e.listItemTask(t,o)},e.listItemTask=function(e,o){var n,r=t.adminForm,s=0,a=r[e];if(!a)return!1;for(;n=r["cb"+s];)n.checked=!1,s++;return a.checked=!0,r.boxchecked.value=1,window.submitform(o),!1},window.submitbutton=function(t){e.submitbutton(t)},window.submitform=function(t){e.submitform(t)},window.saveorder=function(e,t){window.checkAll_button(e,t)},window.checkAll_button=function(o,n){var r,s;for(n=n||"saveorder",r=0;r<=o;r++){if(!(s=t.adminForm["cb"+r]))return void alert("You cannot change the order of items, as an item in the list is `Checked Out`");s.checked=!0}e.submitform(n)},e.loadingLayer=function(o,n){if(o=o||"show",n=n||t.body,"load"===o){var r=(e.getOptions("system.paths")||{}).root||"",s=t.createElement("div");s.id="loading-logo",s.style.position="fixed",s.style.top="0",s.style.left="0",s.style.width="100%",s.style.height="100%",s.style.opacity="0.8",s.style.filter="alpha(opacity=80)",s.style.overflow="hidden",s.style["z-index"]="10000",s.style.display="none",s.style["background-color"]="#fff",s.style["background-image"]='url("'+r+'/media/system/images/ajax-loader.gif")',s.style["background-position"]="center",s.style["background-repeat"]="no-repeat",s.style["background-attachment"]="fixed",n.appendChild(s)}else t.getElementById("loading-logo")||e.loadingLayer("load",n),t.getElementById("loading-logo").style.display="show"==o?"block":"none";return t.getElementById("loading-logo")},e.extend=function(e,t){for(var o in null===e&&(e={}),t)t.hasOwnProperty(o)&&(e[o]=t[o]);return e},e.request=function(t){t=e.extend({url:"",method:"GET",data:null,perform:!0},t);try{var o=window.XMLHttpRequest?new XMLHttpRequest:new ActiveXObject("MSXML2.XMLHTTP.3.0");if(o.open(t.method,t.url,!0),o.setRequestHeader("X-Requested-With","XMLHttpRequest"),o.setRequestHeader("X-Ajax-Engine","Joomla!"),"GET"!==t.method){var n=e.getOptions("csrf.token","");n&&o.setRequestHeader("X-CSRF-Token",n),t.headers&&t.headers["Content-Type"]||o.setRequestHeader("Content-Type","application/x-www-form-urlencoded")}if(t.headers)for(var r in t.headers)t.headers.hasOwnProperty(r)&&o.setRequestHeader(r,t.headers[r]);if(o.onreadystatechange=function(){4===o.readyState&&(200===o.status?t.onSuccess&&t.onSuccess.call(window,o.responseText,o):t.onError&&t.onError.call(window,o))},t.perform){if(t.onBefore&&!1===t.onBefore.call(window,o))return o;o.send(t.data)}}catch(e){return window.console&&console.log(e),!1}return o},e.localStorageEnabled=function(){var e="joomla-cms";try{return localStorage.setItem(e,e),localStorage.removeItem(e),!0}catch(e){return!1}},e.WebComponents=function(){var o=[],n=e.getOptions("webcomponents"),r=function(){n&&n.length&&n.forEach(function(e){if(e.match(/\.js/g)){var o,n=t.createElement("script");if(function(){try{return new Function("(a = 0) => a"),!0}catch(e){return!1}}())n.src=e;else e.match(/\.min\.js/g)?o=e.replace(/\.min\.js/g,"-es5.min.js"):e.match(/\.js/g)&&(o=e.replace(/\.js/g,"-es5.js")),n.src=o}n&&t.head.appendChild(n)})};if("import"in t.createElement("link")||o.push("hi"),(!("attachShadow"in Element.prototype&&"getRootNode"in Element.prototype)||window.ShadyDOM&&window.ShadyDOM.force)&&o.push("sd"),window.customElements&&!window.customElements.forcePolyfill||o.push("ce"),"content"in t.createElement("template")&&window.Promise&&Array.from&&t.createDocumentFragment().cloneNode()instanceof DocumentFragment||(o=["lite"]),o.length&&n&&n.length){var s="core.min.js",a=t.querySelector('script[src*="'+s+'"]');if(a||(s="core.js",a=t.querySelector('script[src*="'+s+'"]')),!a)throw new Error("core(.min).js is not registered correctly!");var i=t.createElement("script"),l="media/vendor/webcomponentsjs/js/webcomponents-"+o.join("-")+".min.js",c=a.src.match(/\?.*/)[0],d=e.getOptions("system.paths");if(!d)throw new Error("core(.min).js is not registered correctly!");i.src=d.rootFull+l+(c||""),t.head.appendChild(i),t.addEventListener("WebComponentsReady",function(){r()})}else{if(!n||!n.length)return;var m=function(){requestAnimationFrame(function(){t.dispatchEvent(new CustomEvent("WebComponentsReady",{bubbles:!0})),r()})};"loading"!==t.readyState?m():t.addEventListener("readystatechange",function e(){m(),t.removeEventListener("readystatechange",e)})}}}(Joomla,document),function(e,t){"use strict";t.Event||(t.Event={},t.Event.dispatch=function(t,o,n){var r;"string"==typeof t&&(n=o,o=t,t=e),n=n||{},e.CustomEvent&&"function"==typeof e.CustomEvent?r=new CustomEvent(o,{detail:n,bubbles:!0,cancelable:!0}):((r=document.createEvent("Event")).initEvent(o,!0,!0),r.detail=n),t.dispatchEvent(r)},t.Event.listenOnce=function(e,t,o){var n=function(r){return e.removeEventListener(t,n),o.call(e,r)};e.addEventListener(t,n)})}(window,Joomla),document.addEventListener("DOMContentLoaded",function(){Joomla.WebComponents()});
\ No newline at end of file

From 61eb8982edb6fcf22fe65bc258ad1f100b79dc85 Mon Sep 17 00:00:00 2001
From: zero-24 <zero-24@users.noreply.github.com>
Date: Sun, 1 Apr 2018 23:02:12 +0200
Subject: [PATCH 19/19] fix web component call thanks to drone (#20053)

---
 libraries/cms/html/email.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/cms/html/email.php b/libraries/cms/html/email.php
index aea3a966b6..8d3e3e917c 100644
--- a/libraries/cms/html/email.php
+++ b/libraries/cms/html/email.php
@@ -58,7 +58,7 @@ public static function cloak($mail, $mailto = true, $text = '', $email = true, $
 		$domain = @$mail[1];
 
 		// Include the email cloaking script
-		HTMLHelper::_('webcomponent', ['joomla-hidden-mail' => 'system/webcomponents/joomla-hidden-mail.js'], ['version' => 'auto', 'relative' => true]);
+		HTMLHelper::_('webcomponent', 'system/webcomponents/joomla-hidden-mail.js', ['version' => 'auto', 'relative' => true]);
 
 		return '<joomla-hidden-mail '
 			. $attribsBefore . ' is-link="'