';
$i = 0;
@@ -1828,7 +1822,6 @@ public function keyval($params)
// create an array with the key being the image name and the value being the caption (if it exists... otherwise the image name is used again)
$func = function($value) use ($process_key, $params, $row_delimiter, $split_delimiter) {
-
if (is_array($value))
{
foreach($value as $key => $val)
@@ -1845,12 +1838,11 @@ public function keyval($params)
$z = $val[$process_key][$params['name']];
}
-
$json = array();
- $rows = preg_split("#".$row_delimiter."#", $z);
+ $rows = preg_split("#'.$row_delimiter.'#", $z);
foreach($rows as $r)
{
- $vals = preg_split("#".$split_delimiter."#", $r, 2);
+ $vals = preg_split("#'.$split_delimiter.'#", $r, 2);
if (isset($vals[1]))
{
$v = $vals[1];
@@ -1862,7 +1854,6 @@ public function keyval($params)
$json[] = trim($vals[0]);
}
}
-
$first_item = current($json);
if (is_string($val[$process_key]))
{
@@ -1872,7 +1863,6 @@ public function keyval($params)
{
$value[$key][$process_key][$params['name']] = (!empty($first_item)) ? json_encode($json) : "";
}
-
}
}
diff --git a/fuel/modules/fuel/libraries/Fuel_notification.php b/fuel/modules/fuel/libraries/Fuel_notification.php
index 951a27413..6c7ee9811 100644
--- a/fuel/modules/fuel/libraries/Fuel_notification.php
+++ b/fuel/modules/fuel/libraries/Fuel_notification.php
@@ -39,7 +39,6 @@ class Fuel_notification extends Fuel_base_library {
public $attachments = array(); // attachments
public $use_dev_mode = TRUE; // whether to use dev mode or not which means it will send to the dev_email address in the config
public $mailtype = 'text';
- public $wrapchars = 76;
// --------------------------------------------------------------------
@@ -86,13 +85,11 @@ public function send($params = array())
// load email and set notification properties
$this->CI->load->library('email');
$this->CI->email->clear(TRUE);
- $this->CI->email->wrapchars = $this->wrapchars;
$this->CI->email->set_wordwrap(TRUE);
$this->CI->email->from($this->from, $this->from_name);
$this->CI->email->subject($this->subject);
$this->CI->email->message($this->message);
$this->CI->email->set_mailtype($this->mailtype);
-
if (!empty($this->attachments))
{
@@ -119,11 +116,7 @@ public function send($params = array())
$this->CI->email->to($this->to);
}
- if ($this->is_dev_mode())
- {
- $this->CI->email->cc($this->CI->config->item('dev_email'));
- }
- else
+ if ($this->cc)
{
$this->CI->email->cc($this->cc);
}
diff --git a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier.autoload-legacy.php b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier.autoload-legacy.php
index c271cd158..0a17ee4ad 100644
--- a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier.autoload-legacy.php
+++ b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier.autoload-legacy.php
@@ -4,12 +4,11 @@
* @file
* Legacy autoloader for systems lacking spl_autoload_register
*
- * Must be separate to prevent deprecation warning on PHP 7.2
*/
-function __autoload($class)
+spl_autoload_register(function($class)
{
- return HTMLPurifier_Bootstrap::autoload($class);
-}
+ return HTMLPurifier_Bootstrap::autoload($class);
+});
// vim: et sw=4 sts=4
diff --git a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier.autoload.php b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier.autoload.php
index 9d8d29926..7a691132f 100644
--- a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier.autoload.php
+++ b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier.autoload.php
@@ -17,6 +17,7 @@
require dirname(__FILE__) . '/HTMLPurifier.autoload-legacy.php';
}
+// phpcs:ignore PHPCompatibility.IniDirectives.RemovedIniDirectives.zend_ze1_compatibility_modeRemoved
if (ini_get('zend.ze1_compatibility_mode')) {
trigger_error("HTML Purifier is not compatible with zend.ze1_compatibility_mode; please turn it off", E_USER_ERROR);
}
diff --git a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier.includes.php b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier.includes.php
index 151e6752d..47ee0133d 100644
--- a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier.includes.php
+++ b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier.includes.php
@@ -7,7 +7,7 @@
* primary concern and you are using an opcode cache. PLEASE DO NOT EDIT THIS
* FILE, changes will be overwritten the next time the script is run.
*
- * @version 4.13.0
+ * @version 4.15.0
*
* @warning
* You must *not* include any other HTML Purifier files before this file,
@@ -107,6 +107,7 @@
require 'HTMLPurifier/AttrDef/HTML/Nmtokens.php';
require 'HTMLPurifier/AttrDef/HTML/Class.php';
require 'HTMLPurifier/AttrDef/HTML/Color.php';
+require 'HTMLPurifier/AttrDef/HTML/ContentEditable.php';
require 'HTMLPurifier/AttrDef/HTML/FrameTarget.php';
require 'HTMLPurifier/AttrDef/HTML/ID.php';
require 'HTMLPurifier/AttrDef/HTML/Pixels.php';
diff --git a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier.php b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier.php
index 3c0f8a0ec..26f061276 100644
--- a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier.php
+++ b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier.php
@@ -19,7 +19,7 @@
*/
/*
- HTML Purifier 4.13.0 - Standards Compliant HTML Filtering
+ HTML Purifier 4.15.0 - Standards Compliant HTML Filtering
Copyright (C) 2006-2008 Edward Z. Yang
This library is free software; you can redistribute it and/or
@@ -58,12 +58,12 @@ class HTMLPurifier
* Version of HTML Purifier.
* @type string
*/
- public $version = '4.13.0';
+ public $version = '4.15.0';
/**
* Constant with version of HTML Purifier.
*/
- const VERSION = '4.13.0';
+ const VERSION = '4.15.0';
/**
* Global configuration object.
diff --git a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier.safe-includes.php b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier.safe-includes.php
index a3261f8a3..94543f593 100644
--- a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier.safe-includes.php
+++ b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier.safe-includes.php
@@ -101,6 +101,7 @@
require_once $__dir . '/HTMLPurifier/AttrDef/HTML/Nmtokens.php';
require_once $__dir . '/HTMLPurifier/AttrDef/HTML/Class.php';
require_once $__dir . '/HTMLPurifier/AttrDef/HTML/Color.php';
+require_once $__dir . '/HTMLPurifier/AttrDef/HTML/ContentEditable.php';
require_once $__dir . '/HTMLPurifier/AttrDef/HTML/FrameTarget.php';
require_once $__dir . '/HTMLPurifier/AttrDef/HTML/ID.php';
require_once $__dir . '/HTMLPurifier/AttrDef/HTML/Pixels.php';
diff --git a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Background.php b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Background.php
index 7f1ea3b0f..28c49883a 100644
--- a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Background.php
+++ b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/CSS/Background.php
@@ -25,6 +25,7 @@ public function __construct($config)
$this->info['background-repeat'] = $def->info['background-repeat'];
$this->info['background-attachment'] = $def->info['background-attachment'];
$this->info['background-position'] = $def->info['background-position'];
+ $this->info['background-size'] = $def->info['background-size'];
}
/**
@@ -53,6 +54,7 @@ public function validate($string, $config, $context)
$caught['repeat'] = false;
$caught['attachment'] = false;
$caught['position'] = false;
+ $caught['size'] = false;
$i = 0; // number of catches
diff --git a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/ContentEditable.php b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/ContentEditable.php
new file mode 100644
index 000000000..5b03d3e37
--- /dev/null
+++ b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrDef/HTML/ContentEditable.php
@@ -0,0 +1,16 @@
+get('HTML.Trusted')) {
+ $allowed = array('', 'true', 'false');
+ }
+
+ $enum = new HTMLPurifier_AttrDef_Enum($allowed);
+
+ return $enum->validate($string, $config, $context);
+ }
+}
diff --git a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/NameSync.php b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/NameSync.php
index 36079b786..5a1fdbbfc 100644
--- a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/NameSync.php
+++ b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/NameSync.php
@@ -8,6 +8,11 @@
class HTMLPurifier_AttrTransform_NameSync extends HTMLPurifier_AttrTransform
{
+ /**
+ * @type HTMLPurifier_AttrDef_HTML_ID
+ */
+ public $idDef;
+
public function __construct()
{
$this->idDef = new HTMLPurifier_AttrDef_HTML_ID();
diff --git a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeParam.php b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeParam.php
index 1143b4b49..1033106b3 100644
--- a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeParam.php
+++ b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTransform/SafeParam.php
@@ -24,6 +24,11 @@ class HTMLPurifier_AttrTransform_SafeParam extends HTMLPurifier_AttrTransform
*/
private $uri;
+ /**
+ * @type HTMLPurifier_AttrDef_Enum
+ */
+ public $wmode;
+
public function __construct()
{
$this->uri = new HTMLPurifier_AttrDef_URI(true); // embedded
diff --git a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTypes.php b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTypes.php
index 3b70520b6..e4429e86d 100644
--- a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTypes.php
+++ b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/AttrTypes.php
@@ -41,6 +41,7 @@ public function __construct()
$this->info['IAlign'] = self::makeEnum('top,middle,bottom,left,right');
$this->info['LAlign'] = self::makeEnum('top,bottom,left,right');
$this->info['FrameTarget'] = new HTMLPurifier_AttrDef_HTML_FrameTarget();
+ $this->info['ContentEditable'] = new HTMLPurifier_AttrDef_HTML_ContentEditable();
// unimplemented aliases
$this->info['ContentType'] = new HTMLPurifier_AttrDef_Text();
diff --git a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/CSSDefinition.php b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/CSSDefinition.php
index 21f1a5899..3f08b81c5 100644
--- a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/CSSDefinition.php
+++ b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/CSSDefinition.php
@@ -109,6 +109,22 @@ protected function doSetup($config)
);
$this->info['background-position'] = new HTMLPurifier_AttrDef_CSS_BackgroundPosition();
+ $this->info['background-size'] = new HTMLPurifier_AttrDef_CSS_Composite(
+ array(
+ new HTMLPurifier_AttrDef_Enum(
+ array(
+ 'auto',
+ 'cover',
+ 'contain',
+ 'initial',
+ 'inherit',
+ )
+ ),
+ new HTMLPurifier_AttrDef_CSS_Percentage(),
+ new HTMLPurifier_AttrDef_CSS_Length()
+ )
+ );
+
$border_color =
$this->info['border-top-color'] =
$this->info['border-bottom-color'] =
diff --git a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/List.php b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/List.php
index 4fc70e0ef..3d584e727 100644
--- a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/List.php
+++ b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/List.php
@@ -22,6 +22,8 @@ class HTMLPurifier_ChildDef_List extends HTMLPurifier_ChildDef
// XXX: This whole business with 'wrap' is all a bit unsatisfactory
public $elements = array('li' => true, 'ul' => true, 'ol' => true);
+ public $whitespace;
+
/**
* @param array $children
* @param HTMLPurifier_Config $config
diff --git a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Table.php b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Table.php
index cb6b3e6cd..67c7e9535 100644
--- a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Table.php
+++ b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ChildDef/Table.php
@@ -164,7 +164,7 @@ public function validateChildren($children, $config, $context)
}
}
- if (empty($content)) {
+ if (empty($content) && $thead === false && $tfoot === false) {
return false;
}
diff --git a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Config.php b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Config.php
index 3133d8a4f..797d26877 100644
--- a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Config.php
+++ b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Config.php
@@ -21,7 +21,7 @@ class HTMLPurifier_Config
* HTML Purifier's version
* @type string
*/
- public $version = '4.13.0';
+ public $version = '4.15.0';
/**
* Whether or not to automatically finalize
@@ -803,7 +803,7 @@ public static function prepareArrayFromForm($array, $index = false, $allowed = t
if ($index !== false) {
$array = (isset($array[$index]) && is_array($array[$index])) ? $array[$index] : array();
}
- $mq = $mq_fix && function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc();
+ $mq = $mq_fix && version_compare(PHP_VERSION, '7.4.0', '<') && function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc();
$allowed = HTMLPurifier_Config::getAllowedDirectivesForForm($allowed, $schema);
$ret = array();
diff --git a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ElementDef.php b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ElementDef.php
index d5311cedc..57cfd2bb0 100644
--- a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ElementDef.php
+++ b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/ElementDef.php
@@ -176,7 +176,7 @@ public function mergeIn($def)
if (!empty($def->content_model)) {
$this->content_model =
- str_replace("#SUPER", $this->content_model, $def->content_model);
+ str_replace("#SUPER", (string)$this->content_model, $def->content_model);
$this->child = false;
}
if (!empty($def->content_model_type)) {
diff --git a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Encoder.php b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Encoder.php
index 40a24266a..d4791cc1b 100644
--- a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Encoder.php
+++ b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Encoder.php
@@ -398,8 +398,8 @@ public static function convertToUTF8($str, $config, $context)
// characters to their true byte-wise ASCII/UTF-8 equivalents.
$str = strtr($str, self::testEncodingSupportsASCII($encoding));
return $str;
- } elseif ($encoding === 'iso-8859-1') {
- $str = utf8_encode($str);
+ } elseif ($encoding === 'iso-8859-1' && function_exists('mb_convert_encoding')) {
+ $str = mb_convert_encoding($str, 'UTF-8', 'ISO-8859-1');
return $str;
}
$bug = HTMLPurifier_Encoder::testIconvTruncateBug();
@@ -450,8 +450,8 @@ public static function convertFromUTF8($str, $config, $context)
// Normal stuff
$str = self::iconv('utf-8', $encoding . '//IGNORE', $str);
return $str;
- } elseif ($encoding === 'iso-8859-1') {
- $str = utf8_decode($str);
+ } elseif ($encoding === 'iso-8859-1' && function_exists('mb_convert_encoding')) {
+ $str = mb_convert_encoding($str, 'ISO-8859-1', 'UTF-8');
return $str;
}
trigger_error('Encoding not supported', E_USER_ERROR);
diff --git a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule.php b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule.php
index 6d898f80c..9dbb98729 100644
--- a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule.php
+++ b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule.php
@@ -257,8 +257,9 @@ public function mergeInAttrIncludes(&$attr, $attr_includes)
*/
public function makeLookup($list)
{
+ $args = func_get_args();
if (is_string($list)) {
- $list = func_get_args();
+ $list = $args;
}
$ret = array();
foreach ($list as $value) {
diff --git a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/CommonAttributes.php b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/CommonAttributes.php
index a96ab1bef..7220c14cc 100644
--- a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/CommonAttributes.php
+++ b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/CommonAttributes.php
@@ -17,6 +17,7 @@ class HTMLPurifier_HTMLModule_CommonAttributes extends HTMLPurifier_HTMLModule
'class' => 'Class',
'id' => 'ID',
'title' => 'CDATA',
+ 'contenteditable' => 'ContentEditable',
),
'Lang' => array(),
'I18N' => array(
diff --git a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy.php b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy.php
index 08aa23247..12173ba70 100644
--- a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy.php
+++ b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy.php
@@ -146,10 +146,7 @@ public function populate($fixes)
$type = "info_$type";
$e = $this;
}
- // PHP does some weird parsing when I do
- // $e->$type[$attr], so I have to assign a ref.
- $f =& $e->$type;
- $f[$attr] = $fix;
+ $e->{$type}[$attr] = $fix;
break;
case 'tag_transform':
$this->info_tag_transform[$params['element']] = $fix;
diff --git a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php
index 700a25dbc..9ee3ffcc9 100644
--- a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php
+++ b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/HTMLModule/Tidy/XHTMLAndHTML4.php
@@ -168,9 +168,11 @@ public function makeFixes()
// @vspace for img ------------------------------------------------
$r['img@vspace'] = new HTMLPurifier_AttrTransform_ImgSpace('vspace');
- // @width for hr, td, th ------------------------------------------
+ // @width for table, hr, td, th, col ------------------------------------------
+ $r['table@width'] =
$r['td@width'] =
$r['th@width'] =
+ $r['col@width'] =
$r['hr@width'] = new HTMLPurifier_AttrTransform_Length('width');
return $r;
diff --git a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/Linkify.php b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/Linkify.php
index 74f83eaa7..3b6d70f6e 100644
--- a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/Linkify.php
+++ b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/Linkify.php
@@ -40,6 +40,9 @@ public function handleText(&$token)
'/\\b((?:[a-z][\\w\\-]+:(?:\\/{1,3}|[a-z0-9%])|www\\d{0,3}[.]|[a-z0-9.\\-]+[.][a-z]{2,4}\\/)(?:[^\\s()<>]|\\((?:[^\\s()<>]|(?:\\([^\\s()<>]+\\)))*\\))+(?:\\((?:[^\\s()<>]|(?:\\([^\\s()<>]+\\)))*\\)|[^\\s`!()\\[\\]{};:\'".,<>?\x{00ab}\x{00bb}\x{201c}\x{201d}\x{2018}\x{2019}]))/iu',
$token->data, -1, PREG_SPLIT_DELIM_CAPTURE);
+ if ($bits === false) {
+ return;
+ }
$token = array();
diff --git a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php
index 9ee7aa84d..42d514447 100644
--- a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php
+++ b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Injector/RemoveSpansWithoutAttributes.php
@@ -31,6 +31,16 @@ class HTMLPurifier_Injector_RemoveSpansWithoutAttributes extends HTMLPurifier_In
*/
private $context;
+ /**
+ * @type SplObjectStorage
+ */
+ private $markForDeletion;
+
+ public function __construct()
+ {
+ $this->markForDeletion = new SplObjectStorage();
+ }
+
public function prepare($config, $context)
{
$this->attrValidator = new HTMLPurifier_AttrValidator();
@@ -64,7 +74,7 @@ public function handleElement(&$token)
if ($current instanceof HTMLPurifier_Token_End && $current->name === 'span') {
// Mark closing span tag for deletion
- $current->markForDeletion = true;
+ $this->markForDeletion->attach($current);
// Delete open span tag
$token = false;
}
@@ -75,7 +85,8 @@ public function handleElement(&$token)
*/
public function handleEnd(&$token)
{
- if ($token->markForDeletion) {
+ if ($this->markForDeletion->contains($token)) {
+ $this->markForDeletion->detach($token);
$token = false;
}
}
diff --git a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Length.php b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Length.php
index e70da55a9..b6ea12345 100644
--- a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Length.php
+++ b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Length.php
@@ -78,7 +78,7 @@ protected function validate()
if ($this->n === '0' && $this->unit === false) {
return true;
}
- if (!ctype_lower($this->unit)) {
+ if ($this->unit === false || !ctype_lower($this->unit)) {
$this->unit = strtolower($this->unit);
}
if (!isset(HTMLPurifier_Length::$allowedUnits[$this->unit])) {
diff --git a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Lexer.php b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Lexer.php
index e9da3ed5e..c21f36491 100644
--- a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Lexer.php
+++ b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Lexer.php
@@ -48,6 +48,11 @@ class HTMLPurifier_Lexer
*/
public $tracksLineNumbers = false;
+ /**
+ * @type HTMLPurifier_EntityParser
+ */
+ private $_entity_parser;
+
// -- STATIC ----------------------------------------------------------
/**
@@ -306,8 +311,8 @@ public function normalize($html, $config, $context)
{
// normalize newlines to \n
if ($config->get('Core.NormalizeNewlines')) {
- $html = str_replace("\r\n", "\n", $html);
- $html = str_replace("\r", "\n", $html);
+ $html = str_replace("\r\n", "\n", (string)$html);
+ $html = str_replace("\r", "\n", (string)$html);
}
if ($config->get('HTML.Trusted')) {
diff --git a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Lexer/PH5P.php b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Lexer/PH5P.php
index 72476ddf3..1564f283d 100644
--- a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Lexer/PH5P.php
+++ b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/Lexer/PH5P.php
@@ -4410,7 +4410,7 @@ private function insertElement($token, $append = true, $check = false)
foreach ($token['attr'] as $attr) {
if (!$el->hasAttribute($attr['name'])) {
- $el->setAttribute($attr['name'], $attr['value']);
+ $el->setAttribute($attr['name'], (string)$attr['value']);
}
}
diff --git a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/PropertyListIterator.php b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/PropertyListIterator.php
index 15b330ea3..f68fc8c30 100644
--- a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/PropertyListIterator.php
+++ b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/PropertyListIterator.php
@@ -29,6 +29,7 @@ public function __construct(Iterator $iterator, $filter = null)
/**
* @return bool
*/
+ #[\ReturnTypeWillChange]
public function accept()
{
$key = $this->getInnerIterator()->key();
diff --git a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/StringHash.php b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/StringHash.php
index c07370197..c41ae3a76 100644
--- a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/StringHash.php
+++ b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/StringHash.php
@@ -20,6 +20,7 @@ class HTMLPurifier_StringHash extends ArrayObject
* @param mixed $index
* @return mixed
*/
+ #[\ReturnTypeWillChange]
public function offsetGet($index)
{
$this->accessed[$index] = true;
diff --git a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/HostBlacklist.php b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/HostBlacklist.php
index a6645c17e..32197c0e6 100644
--- a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/HostBlacklist.php
+++ b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/HostBlacklist.php
@@ -35,7 +35,7 @@ public function prepare($config)
public function filter(&$uri, $config, $context)
{
foreach ($this->blacklist as $blacklisted_host_fragment) {
- if (strpos($uri->host, $blacklisted_host_fragment) !== false) {
+ if ($uri->host !== null && strpos($uri->host, $blacklisted_host_fragment) !== false) {
return false;
}
}
diff --git a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/Munge.php b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/Munge.php
index 6e03315a1..e1393deb7 100644
--- a/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/Munge.php
+++ b/fuel/modules/fuel/libraries/HTML5Purifier/vendor/ezyang/htmlpurifier/library/HTMLPurifier/URIFilter/Munge.php
@@ -100,11 +100,11 @@ protected function makeReplace($uri, $config, $context)
$string = $uri->toString();
// always available
$this->replace['%s'] = $string;
- $this->replace['%r'] = $context->get('EmbeddedURI', true);
- $token = $context->get('CurrentToken', true);
- $this->replace['%n'] = $token ? $token->name : null;
- $this->replace['%m'] = $context->get('CurrentAttr', true);
- $this->replace['%p'] = $context->get('CurrentCSSProperty', true);
+ $this->replace['%r'] = $context->get('EmbeddedURI', true) ?: '';
+ $token = $context->get('CurrentToken', true) ?: '';
+ $this->replace['%n'] = $token ? $token->name : '';
+ $this->replace['%m'] = $context->get('CurrentAttr', true) ?: '';
+ $this->replace['%p'] = $context->get('CurrentCSSProperty', true) ?: '';
// not always available
if ($this->secretKey) {
$this->replace['%t'] = hash_hmac("sha256", $string, $this->secretKey);
diff --git a/fuel/modules/fuel/libraries/MY_Image_lib.php b/fuel/modules/fuel/libraries/MY_Image_lib.php
index 8e5d37aa1..bdb7233c2 100644
--- a/fuel/modules/fuel/libraries/MY_Image_lib.php
+++ b/fuel/modules/fuel/libraries/MY_Image_lib.php
@@ -50,10 +50,6 @@ public function __construct($props = array())
*/
public function initialize($props = array())
{
- // Need to be reset back to empty so repeated calls don't use the same width/height values.
- $this->width = '';
- $this->height = '';
-
foreach($this->_save_props as $sp)
{
$p = '_'.$sp;
diff --git a/fuel/modules/fuel/libraries/Menu.php b/fuel/modules/fuel/libraries/Menu.php
index e3c107e0f..9699d4b58 100644
--- a/fuel/modules/fuel/libraries/Menu.php
+++ b/fuel/modules/fuel/libraries/Menu.php
@@ -612,9 +612,11 @@ protected function _render_breadcrumb($menu)
}
- $li = (!empty($this->item_tag)) ? $this->_create_open_li($home_anchor, 0, 0, FALSE) : $home_anchor;
- $str .= $li;
-
+ if (!empty($this->item_tag))
+ {
+ $str .= "\t<".$this->item_tag.">";
+ }
+ $str .= $home_anchor;
if ($num >= 0) $str .= '
'.$this->delimiter.' ';
if (!empty($this->item_tag))
{
@@ -625,17 +627,18 @@ protected function _render_breadcrumb($menu)
{
$val = $this->_active_items[$i];
$label = $this->_get_label($this->_items[$val]);
+ if (!empty($this->item_tag))
+ {
+ $str .= "\t<".$this->item_tag.">";
+ }
if ($i != 0)
{
- $li = anchor($this->_items[$val]['location'], $label);
- $li .= '
'.$this->delimiter.' ';
-
- $str .= $this->_create_open_li($li, 0, $num - $i + 1, FALSE);
+ $str .= anchor($this->_items[$val]['location'], $label);
+ $str .= '
'.$this->delimiter.' ';
}
else if ($this->display_current)
{
- $li = '
'.$label.'';
- $str .= $this->_create_open_li($li, 0, $num - $i + 1, TRUE);
+ $str .= $label;
}
if (!empty($this->item_tag))
{
@@ -892,8 +895,7 @@ protected function _create_open_li($val, $level, $i, $is_last = FALSE)
$str .= $this->_get_li_classes($val, $level, $i, $is_last);
$str .= '>';
}
- $active = (is_array($val)) ? $val['id'] : $val;
- $str .= $this->_create_link($val, $active);
+ $str .= $this->_create_link($val);
return $str;
}
@@ -935,7 +937,7 @@ protected function _create_link($val, $active = NULL)
if (!empty($active) AND $this->active == $active)
{
- $attrs .= ' class="'.$this->active_class.'" aria-current="page"';
+ $attrs .= ' class="'.$this->active_class.'"';
}
$location = (preg_match('/^#/', $val['location'])) ? $val['location'] : url_to($val['location']);
@@ -945,7 +947,7 @@ protected function _create_link($val, $active = NULL)
{
if (!empty($active) AND $this->active == $active)
{
- $str .= '
';
+ $str .= '';
$has_active = TRUE;
}
$str .= $label;
diff --git a/fuel/modules/fuel/libraries/parser/Fuel_dwoo_parser.php b/fuel/modules/fuel/libraries/parser/Fuel_dwoo_parser.php
index eafcc7587..2db8cfe8b 100644
--- a/fuel/modules/fuel/libraries/parser/Fuel_dwoo_parser.php
+++ b/fuel/modules/fuel/libraries/parser/Fuel_dwoo_parser.php
@@ -184,7 +184,7 @@ public function php_to_syntax($str)
// translate HTML comments NOT! Javascript
// close ending php
- $str = preg_replace('#([:|;])?\s*\?>#U', $r_delim.'$3', (string) $str);
+ $str = preg_replace('#([:|;])?\s*\?>#U', $r_delim.'$3', $str);
$str = str_replace($find, $replace, $str);
diff --git a/fuel/modules/fuel/models/Base_model_helpers.php b/fuel/modules/fuel/models/Base_model_helpers.php
index b578216b0..37ad62392 100644
--- a/fuel/modules/fuel/models/Base_model_helpers.php
+++ b/fuel/modules/fuel/models/Base_model_helpers.php
@@ -823,14 +823,14 @@ public function initialize($values, $parent_model)
*/
public function vars($vars = array())
{
- $defaults['values'] = $this->get_values();
- $defaults['rec'] = $this->record();
- $defaults['model'] = $this->get_parent_model();
- $defaults['CI'] =& $this->CI;
- $defaults['fuel'] =& $this->fuel;
- $defaults['class'] = get_class($this->get_parent_model());
- $defaults['ref'] =& $this;
- return array_merge($defaults, $vars);
+ $vars['values'] = $this->get_values();
+ $vars['rec'] = $this->record();
+ $vars['model'] = $this->get_parent_model();
+ $vars['CI'] =& $this->CI;
+ $vars['fuel'] =& $this->fuel;
+ $vars['class'] = get_class($this->get_parent_model());
+ $vars['ref'] =& $this;
+ return $vars;
}
// --------------------------------------------------------------------
diff --git a/fuel/modules/fuel/models/Base_module_model.php b/fuel/modules/fuel/models/Base_module_model.php
index de25c3a7b..cecc6dc02 100644
--- a/fuel/modules/fuel/models/Base_module_model.php
+++ b/fuel/modules/fuel/models/Base_module_model.php
@@ -1047,15 +1047,7 @@ public function export_data($params = array())
{
foreach($val as $k => $v)
{
- if (is_string($v) || is_numeric($v) || is_null($v))
- {
- $data[$key][$k] = strip_tags((string) $v);
- }
- else
- {
- $data[$key][$k] = '';
- }
-
+ $data[$key][$k] = strip_tags($v);
}
}
$data = $this->csv($data);
@@ -1262,10 +1254,8 @@ public function get_embedded_list_items($params, $list_cols = array(), $actions
{
$limit = (int) $limit;
$tooltip_func = function($values) use ($field, $limit) {
- if (is_string($values[$field]))
- {
- $value = strip_tags($values[$field]);
- if (strlen($value) > $limit)
+ $value = strip_tags($values[$field]);
+ if (strlen($value) > $limit)
{
// display tooltip for long notes
$trimmed = character_limiter($value, $limit);
@@ -1276,7 +1266,6 @@ public function get_embedded_list_items($params, $list_cols = array(), $actions
$data = $value;
}
return $data;
- }
};
$data_table->add_field_formatter($field, $tooltip_func);
}
diff --git a/fuel/modules/fuel/views/_docs/installation/troubleshooting.php b/fuel/modules/fuel/views/_docs/installation/troubleshooting.php
index 44c135f28..21cd3a579 100644
--- a/fuel/modules/fuel/views/_docs/installation/troubleshooting.php
+++ b/fuel/modules/fuel/views/_docs/installation/troubleshooting.php
@@ -4,8 +4,8 @@
CodeIgniter
diff --git a/fuel/modules/fuel/views/_layouts/admin_main.php b/fuel/modules/fuel/views/_layouts/admin_main.php
index 46f714bcd..aa80dd375 100644
--- a/fuel/modules/fuel/views/_layouts/admin_main.php
+++ b/fuel/modules/fuel/views/_layouts/admin_main.php
@@ -31,7 +31,7 @@
load->module_view(FUEL_FOLDER, '_blocks/titlebar')?>
- form->open('action="'.$form_action.'" method="'.((!empty($form_method)) ? $form_method : 'post').'" id="form" data-uri="'.fuel_uri_string().'" enctype="multipart/form-data"'.((!empty($form_target)) ? ' target="'.$form_target.'"' : ''))?>
+ form->open('action="'.$form_action.'" method="'.((!empty($form_method)) ? $form_method : 'post').'" id="form" enctype="multipart/form-data"'.((!empty($form_target)) ? ' target="'.$form_target.'"' : ''))?>
fuel->admin->has_panel('actions') AND !empty($actions)) : ?>