From 169efa09b9e4e68b90278244b4bad7b54dced982 Mon Sep 17 00:00:00 2001 From: Nick Liu Date: Sun, 6 Feb 2022 16:49:56 +0100 Subject: [PATCH] `e_parse::toAttributes()`: New API to concatenate HTML attributes `e_parse::toAttributes()` is an expansion of the formerly private method `e_form::attributes()`. Now, all client code can use `e_parse::toAttributes()` to make it easy to concatenate variable-length HTML attributes. Values are guaranteed to be encoded so that they cannot escape an HTML attribute value. All client code usages are encouraged to build HTML tags with this new method to prevent cross-site scripting (XSS) attacks and prevent breaking the HTML validity due to improperly escaped HTML attributes. This new method is an extension to `e_parse::toAttribute()`, which escaped one single HTML attribute value. --- e107_handlers/e_parse_class.php | 1424 ++++---- e107_handlers/form_handler.php | 90 +- e107_tests/tests/unit/e_parseTest.php | 4794 +++++++++++++------------ 3 files changed, 3220 insertions(+), 3088 deletions(-) diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php index 77e177b0f..2aba8bf6b 100644 --- a/e107_handlers/e_parse_class.php +++ b/e107_handlers/e_parse_class.php @@ -10,7 +10,7 @@ * */ -if(!defined('e107_INIT')) +if (!defined('e107_INIT')) { exit(); } @@ -97,19 +97,19 @@ class e_parse 'link_replace' => true, // Parse shortcodes - TRUE enables parsing - 'parse_sc' => false, + 'parse_sc' => false, // remove HTML tags. - 'no_tags' => false, + 'no_tags' => false, // Restore entity form of quotes and such to single characters - TRUE disables - 'value' => false, + 'value' => false, // Line break compression - TRUE removes newline characters - 'nobreak' => false, + 'nobreak' => false, // Retain newlines - wraps to \n instead of
if TRUE (for non-HTML email text etc) - 'retain_nl' => false + 'retain_nl' => false ); // Super modifiers override default option values @@ -178,10 +178,10 @@ class e_parse array( 'nobreak' => true, 'retain_nl' => true, 'link_click' => false, 'emotes' => false, 'hook' => false, 'no_tags' => true ), - 'NODEFAULT' => - array ('context' => false, 'fromadmin' => false, 'emotes' => false, 'defs' => false, 'constants' => false, 'hook' => false, - 'scripts' => false, 'link_click' => false, 'link_replace' => false, 'parse_sc' => false, 'no_tags' => false, 'value' => false, - 'nobreak' => false, 'retain_nl' => false + 'NODEFAULT' => + array('context' => false, 'fromadmin' => false, 'emotes' => false, 'defs' => false, 'constants' => false, 'hook' => false, + 'scripts' => false, 'link_click' => false, 'link_replace' => false, 'parse_sc' => false, 'no_tags' => false, 'value' => false, + 'nobreak' => false, 'retain_nl' => false ) ); @@ -251,11 +251,11 @@ class e_parse private $bootstrap; private $fontawesome; - private $removedList = array(); - private $nodesToDelete = array(); - private $nodesToConvert = array(); + private $removedList = array(); + private $nodesToDelete = array(); + private $nodesToConvert = array(); private $nodesToDisableSC = array(); - private $pathList = array(); + private $pathList = array(); private $allowedAttributes = array(); @@ -265,7 +265,7 @@ class e_parse private $replaceAttrValues = array(); private $allowedTags = array(); - private $scriptTags = array(); + private $scriptTags = array(); private $scriptAttributes = array(); @@ -290,7 +290,7 @@ class e_parse public function getModifierList($type = '') { - if($type === 'super') + if ($type === 'super') { return $this->e_SuperMods; } @@ -310,13 +310,14 @@ class e_parse public function setMultibyte($bool) { - if($bool === false) + if ($bool === false) { $this->multibyte = false; + return null; } - if(extension_loaded('mbstring')) + if (extension_loaded('mbstring')) { $this->multibyte = true; mb_internal_encoding('UTF-8'); @@ -333,14 +334,14 @@ class e_parse */ public function ustrlen($str) { - if($this->multibyte) + if ($this->multibyte) { return mb_strlen($str); } return strlen($str); - // return strlen(utf8_decode($str)); + // return strlen(utf8_decode($str)); } @@ -353,7 +354,7 @@ class e_parse */ public function ustrtolower($str) { - if($this->multibyte) + if ($this->multibyte) { return mb_strtolower($str); } @@ -372,7 +373,7 @@ class e_parse public function ustrtoupper($str) { - if($this->multibyte) + if ($this->multibyte) { return mb_strtoupper($str); } @@ -389,16 +390,16 @@ class e_parse * Returns the numeric position (offset in amount of UTF-8 characters) * of the first occurrence of needle in the haystack string. * - * @param string $haystack The UTF-8 encoded string being searched in. - * @param integer $needle The UTF-8 encoded string being searched for. - * @param integer $offset [optional] The optional offset parameter allows you to specify which character in haystack to start searching. - * The position returned is still relative to the beginning of haystack. + * @param string $haystack The UTF-8 encoded string being searched in. + * @param integer $needle The UTF-8 encoded string being searched for. + * @param integer $offset [optional] The optional offset parameter allows you to specify which character in haystack to start searching. + * The position returned is still relative to the beginning of haystack. * @return integer|boolean Returns the position as an integer. If needle is not found, the function will return boolean FALSE. */ public function ustrpos($haystack, $needle, $offset = 0) { - if($this->multibyte) + if ($this->multibyte) { return mb_strpos($haystack, $needle, $offset); } @@ -413,15 +414,15 @@ class e_parse * Returns the numeric position (offset in amount of UTF-8 characters) * of the last occurrence of needle in the haystack string. * - * @param string $haystack The UTF-8 encoded string being searched in. - * @param integer $needle The UTF-8 encoded string being searched for. - * @param integer $offset [optional] - The optional offset parameter allows you to specify which character in haystack to start searching. - * The position returned is still relative to the beginning of haystack. + * @param string $haystack The UTF-8 encoded string being searched in. + * @param integer $needle The UTF-8 encoded string being searched for. + * @param integer $offset [optional] - The optional offset parameter allows you to specify which character in haystack to start searching. + * The position returned is still relative to the beginning of haystack. * @return integer|boolean Returns the position as an integer. If needle is not found, the function will return boolean FALSE. */ public function ustrrpos($haystack, $needle, $offset = 0) { - if($this->multibyte) + if ($this->multibyte) { return mb_strrpos($haystack, $needle, $offset); } @@ -434,15 +435,15 @@ class e_parse * Returns all of haystack starting from and including the first occurrence of needle to the end. * Unicode (UTF-8) analogue of standard @link http://php.net/stristr stristr PHP function. * - * @param string $haystack The UTF-8 encoded string to search in. - * @param mixed $needle If needle is not a string, it is converted to an integer and applied as the ordinal value of a character. - * @param bool $before_needle [optional] (PHP 5.3+) If TRUE, returns the part of the haystack before the first occurrence of the needle (excluding needle). + * @param string $haystack The UTF-8 encoded string to search in. + * @param mixed $needle If needle is not a string, it is converted to an integer and applied as the ordinal value of a character. + * @param bool $before_needle [optional] (PHP 5.3+) If TRUE, returns the part of the haystack before the first occurrence of the needle (excluding needle). * @return string Returns the matched substring. If needle is not found, returns FALSE. */ public function ustristr($haystack, $needle, $before_needle = false) { - if($this->multibyte) + if ($this->multibyte) { return mb_stristr($haystack, $needle, $before_needle); } @@ -458,17 +459,17 @@ class e_parse * NOTE: May be subtle differences in return values dependent on which routine is used. * Native substr() routine can return FALSE. mb_substr() and utf8_substr() just return an empty string. * - * @param string $str The UTF-8 encoded string. - * @param integer $start Start of portion to be returned. Position is counted in amount of UTF-8 characters from the beginning of str. - * First character's position is 0. Second character position is 1, and so on. + * @param string $str The UTF-8 encoded string. + * @param integer $start Start of portion to be returned. Position is counted in amount of UTF-8 characters from the beginning of str. + * First character's position is 0. Second character position is 1, and so on. * @param integer $length [optional] If length is given, the string returned will contain at most length characters beginning from start - * (depending on the length of string). If length is omitted, the rest of string from start will be returned. + * (depending on the length of string). If length is omitted, the rest of string from start will be returned. * @return string The extracted UTF-8 encoded part of input string. */ public function usubstr($str, $start, $length = null) { - if($this->multibyte) + if ($this->multibyte) { return ($length === null) ? mb_substr($str, $start) : mb_substr($str, $start, $length); } @@ -480,14 +481,14 @@ class e_parse /** * Converts the supplied text (presumed to be from user input) to a format suitable for storing in a database table. * - * @param mixed $data - * @param boolean $nostrip [optional] Assumes all data is GPC ($_GET, $_POST, $_COOKIE) unless indicate otherwise by setting this var to TRUE. - * If magic quotes is enabled on the server and you do not tell toDB() that the data is non GPC then slashes will be stripped when they should not be. - * @param boolean $no_encode [optional] This parameter should nearly always be FALSE. It is used by the save_prefs() function to preserve HTML content within prefs even when - * the save_prefs() function has been called by a non admin user / user without html posting permissions. - * @param boolean|string $mod [optional] model = admin-ui usage. The 'no_html' and 'no_php' modifiers blanket prevent HTML and PHP posting regardless of posting permissions. (used in logging) - * The 'pReFs' value is for internal use only, when saving prefs, to prevent sanitisation of HTML. - * @param mixed $parm [optional] + * @param mixed $data + * @param boolean $nostrip [optional] Assumes all data is GPC ($_GET, $_POST, $_COOKIE) unless indicate otherwise by setting this var to TRUE. + * If magic quotes is enabled on the server and you do not tell toDB() that the data is non GPC then slashes will be stripped when they should not be. + * @param boolean $no_encode [optional] This parameter should nearly always be FALSE. It is used by the save_prefs() function to preserve HTML content within prefs even when + * the save_prefs() function has been called by a non admin user / user without html posting permissions. + * @param boolean|string $mod [optional] model = admin-ui usage. The 'no_html' and 'no_php' modifiers blanket prevent HTML and PHP posting regardless of posting permissions. (used in logging) + * The 'pReFs' value is for internal use only, when saving prefs, to prevent sanitisation of HTML. + * @param mixed $parm [optional] * @return mixed * @todo complete the documentation of this essential method */ @@ -496,16 +497,16 @@ class e_parse $variableType = gettype($data); - if(($variableType !== 'string' && $variableType !== 'array') || $data === '0') + if (($variableType !== 'string' && $variableType !== 'array') || $data === '0') { return $data; } - if($variableType === 'array') + if ($variableType === 'array') { $ret = array(); - foreach($data as $key => $var) + foreach ($data as $key => $var) { //Fix - sanitize keys as well $key = str_replace(['"', "'"], ['"', '''], $key); @@ -516,20 +517,20 @@ class e_parse } - if(MAGIC_QUOTES_GPC === true && $nostrip === false) + if (MAGIC_QUOTES_GPC === true && $nostrip === false) { $data = stripslashes($data); } $core_pref = e107::getConfig(); - if($mod !== 'pReFs') //XXX We're not saving prefs. + if ($mod !== 'pReFs') //XXX We're not saving prefs. { $data = $this->preFilter($data); // used by bb_xxx.php toDB() functions. bb_code.php toDB() allows us to properly bypass HTML cleaning below. $data = $this->cleanHtml($data); // clean it regardless of if it is text or html. (html could have missing closing tags) - if(($this->isHtml($data)) && strpos($mod, 'no_html') === false) + if (($this->isHtml($data)) && strpos($mod, 'no_html') === false) { $this->isHtml = true; // $data = $this->cleanHtml($data); // sanitize all html. (moved above to include everything) @@ -546,7 +547,7 @@ class e_parse } - if(!check_class($core_pref->get('post_html', e_UC_MAINADMIN))) + if (!check_class($core_pref->get('post_html', e_UC_MAINADMIN))) { $data = strip_tags($data); // remove tags from cleaned html. $data = str_replace(array('[html]', '[/html]'), '', $data); @@ -556,17 +557,17 @@ class e_parse } - if(check_class($core_pref->get('post_html'))) /*$core_pref->is('post_html') && XXX preformecd by cleanHtml() */ + if (check_class($core_pref->get('post_html'))) /*$core_pref->is('post_html') && XXX preformecd by cleanHtml() */ { $no_encode = true; } - if($parm !== null && is_numeric($parm) && !check_class($core_pref->get('post_html'), '', $parm)) + if ($parm !== null && is_numeric($parm) && !check_class($core_pref->get('post_html'), '', $parm)) { $no_encode = false; } - if($no_encode === true && strpos($mod, 'no_html') === false) + if ($no_encode === true && strpos($mod, 'no_html') === false) { $search = array('$', '"', "'", '\\', 'get('php_bbcode'))) + if ((strpos($mod, 'no_php') !== false) || !check_class($core_pref->get('php_bbcode'))) { $ret = preg_replace("#\[(php)#i", "[\\1", $ret); } // Don't allow hooks to mess with prefs. - if($mod !== 'model') + if ($mod !== 'model') { return $ret; } @@ -602,7 +603,7 @@ class e_parse * e_parse hook */ $eParseList = $core_pref->get('e_parse_list'); - if(!empty($eParseList)) + if (!empty($eParseList)) { $opts = array( @@ -612,10 +613,10 @@ class e_parse 'field' => $parm['field'] ); - foreach($eParseList as $plugin) + foreach ($eParseList as $plugin) { $hookObj = e107::getAddon($plugin, 'e_parse'); - if($tmp = e107::callMethod($hookObj, 'toDB', $ret, $opts)) + if ($tmp = e107::callMethod($hookObj, 'toDB', $ret, $opts)) { $ret = $tmp; } @@ -632,6 +633,7 @@ class e_parse /** * Check for umatched 'dangerous' HTML tags * (these can destroy page layout where users are able to post HTML) + * * @param string $data * @param string $tagList - if empty, uses default list of input tags. Otherwise a CSV list of tags to check (any type) * @@ -672,7 +674,7 @@ class e_parse public function preFilter($data) { - if(!$this->isBBcode($data)) + if (!$this->isBBcode($data)) { return $data; } @@ -684,6 +686,7 @@ class e_parse /** * Takes a multi-dimensional array and converts the keys to a list of routing paths. * paths are the key and value are the top most key. + * * @param array $array * @return array */ @@ -692,24 +695,24 @@ class e_parse $res = $this->_processRoute($array); $tmp = explode("_#_", $res); $ret = []; - foreach($tmp as $v) + foreach ($tmp as $v) { - list($k) = explode('/',$v); + list($k) = explode('/', $v); $ret[$v] = $k; } return $ret; } - private function _processRoute($array, $prefix='') + private function _processRoute($array, $prefix = '') { $text = []; - if(is_array($array)) + if (is_array($array)) { - foreach($array as $key=>$val) + foreach ($array as $key => $val) { - if($tag = $this->_processRoute($val, $key.'/')) + if ($tag = $this->_processRoute($val, $key . '/')) { $add = $tag; } @@ -718,27 +721,25 @@ class e_parse $add = $key; } - $text[] = $prefix.$add; + $text[] = $prefix . $add; } } - return implode('_#_',$text); + return implode('_#_', $text); } - - public function toForm($text) { - if(empty($text)) // fix - handle proper 0, Space etc values. + if (empty($text)) // fix - handle proper 0, Space etc values. { return $text; } - if(is_string($text) && strpos($text, '[html]') === 0) + if (is_string($text) && strpos($text, '[html]') === 0) { // $text = $this->toHTML($text,true); $search = array('"', ''', '\', '&',); // '&' must be last. @@ -758,7 +759,7 @@ class e_parse $replace = array('$', '"', '<', '>', '%2B'); $text = str_replace($search, $replace, $text); - if(is_string($text) && e107::wysiwyg() !== true) + if (is_string($text) && e107::wysiwyg() !== true) { // fix for utf-8 issue with html_entity_decode(); ??? $text = urldecode($text); @@ -775,10 +776,10 @@ class e_parse public function post_toForm($text) { - if(is_array($text)) + if (is_array($text)) { $arr = array(); - foreach($text as $key => $value) + foreach ($text as $key => $value) { $key = $this->post_toForm($key); $arr[$key] = $this->post_toForm($value); @@ -789,7 +790,7 @@ class e_parse $text = (string) $text; - if(MAGIC_QUOTES_GPC == true) + if (MAGIC_QUOTES_GPC == true) { $text = stripslashes($text); } @@ -807,16 +808,16 @@ class e_parse } /** - * @param $text - template to parse. - * @param boolean $parseSCFiles - parse core 'single' shortcodes - * @param object|array $extraCodes - shortcode class containing sc_xxxxx methods or an array of key/value pairs or legacy shortcode content (eg. content within .sc) - * @param object $eVars - XXX more info needed. + * @param $text - template to parse. + * @param boolean $parseSCFiles - parse core 'single' shortcodes + * @param object|array $extraCodes - shortcode class containing sc_xxxxx methods or an array of key/value pairs or legacy shortcode content (eg. content within .sc) + * @param object $eVars - XXX more info needed. * @return string */ public function parseTemplate($text, $parseSCFiles = true, $extraCodes = null, $eVars = null) { - if(!is_bool($parseSCFiles)) + if (!is_bool($parseSCFiles)) { trigger_error('$parseSCFiles in parseTemplate() was given incorrect data'); } @@ -826,10 +827,10 @@ class e_parse /** * @experimental - * @param string $text - * @param bool $parseSCFiles + * @param string $text + * @param bool $parseSCFiles * @param object|array $extraCodes - * @param object $eVars + * @param object $eVars * @return string */ public function parseSchemaTemplate($text, $parseSCFiles = true, $extraCodes = null, $eVars = null) @@ -839,6 +840,7 @@ class e_parse $text = e107::getScParser()->parseCodes($text, $parseSCFiles, $extraCodes, $eVars); $text = str_replace(''; - $homeIcon = ($this->_fontawesome) ? e107::getParser()->toGlyph('fa-home.glyph') : $fallbackIcon; + $homeIcon = ($this->_fontawesome) ? $this->tp->toGlyph('fa-home.glyph') : $fallbackIcon; } @@ -3812,7 +3810,7 @@ var_dump($select_options);*/ 'target' => '_blank', 'title' => LAN_EDIT, 'href' => $url, - ]) . ">" . e107::getParser()->toGlyph('fa-edit') . ''; + ]) . ">" . $this->tp->toGlyph('fa-edit') . ''; } return ''; @@ -4037,22 +4035,7 @@ var_dump($select_options);*/ */ private function attributes($attributes) { - $stringifiedAttributes = []; - - foreach ($attributes as $key => $value) - { - - if ($value === true && (strpos($key,'data-') !== 0)) - { - $value = $key; - } - if (!empty($value) || is_numeric($value) || $key === "value" || strpos($key,'data-') === 0) - { - $stringifiedAttributes[] = $key . "='" . htmlspecialchars((string) $value, ENT_QUOTES) . "'"; - } - } - - return count($stringifiedAttributes) > 0 ? " ".implode(" ", $stringifiedAttributes) : ""; + return $this->tp->toAttributes($attributes, true); } public function get_attributes($options, $name = '', $value = '') @@ -4454,7 +4437,6 @@ var_dump($select_options);*/ public function thead($fieldarray, $columnPref = array(), $querypattern = '', $requeststr = '') { - $tp = e107::getParser(); $text = ''; $querypattern = strip_tags($querypattern); @@ -4631,7 +4613,7 @@ var_dump($select_options);*/ - $tp = e107::getParser(); + $tp = $this->tp; $types = explode(',',$parm['types']); $list = array(); @@ -4857,7 +4839,7 @@ var_dump($select_options);*/ } } - $source = e107::getParser()->toJSON($jsonArray, true); + $source = $this->tp->toJSON($jsonArray, true); $mode = preg_replace('/[\W]/', '', vartrue($_GET['mode'])); @@ -4946,7 +4928,7 @@ var_dump($select_options);*/ } elseif (!empty($model)) // old way. { - $tp = e107::getParser(); + $tp = $this->tp; $data = $model->getData(); @@ -4994,7 +4976,7 @@ var_dump($select_options);*/ private function renderOptions($parms, $id, $attributes) { - $tp = e107::getParser(); + $tp = $this->tp; $cls = false; $editIconDefault = deftrue('ADMIN_EDIT_ICON', $tp->toGlyph('fa-edit')); @@ -5134,7 +5116,7 @@ var_dump($select_options);*/ } // @see custom fields in cpage which accept json params. - if(!empty($attributes['writeParms']) && $tmpOpt = e107::getParser()->isJSON($attributes['writeParms'])) + if(!empty($attributes['writeParms']) && $tmpOpt = $this->tp->isJSON($attributes['writeParms'])) { $attributes['writeParms'] = $tmpOpt; unset($tmpOpt); @@ -5158,7 +5140,7 @@ var_dump($select_options);*/ $this->renderValueTrigger($field, $value, $parms, $id); - $tp = e107::getParser(); + $tp = $this->tp; switch($field) // special fields { case 'options': @@ -5602,7 +5584,7 @@ var_dump($select_options);*/ } else { - $url = e107::getParser()->replaceConstants($value, 'full'); + $url = $this->tp->replaceConstants($value, 'full'); } $name = basename($value); $value = ''.$name.''; @@ -5640,7 +5622,7 @@ var_dump($select_options);*/ $vparm = array('thumb'=>'tag','w'=> vartrue($parms['thumb_aw'],'80')); - if($video = e107::getParser()->toVideo($value,$vparm)) + if($video = $tp->toVideo($value,$vparm)) { return $video; } @@ -5653,7 +5635,7 @@ var_dump($select_options);*/ $icon = '{e_IMAGE}filemanager/zip_32.png'; $src = $tp->replaceConstants(vartrue($parms['pre']).$icon, 'abs'); // return $value; - return e107::getParser()->toGlyph('fa-file','size=2x'); + return $tp->toGlyph('fa-file','size=2x'); // return ''.$value.''; } @@ -6275,7 +6257,7 @@ var_dump($select_options);*/ $value = html_entity_decode($value, ENT_QUOTES); } - $tp = e107::getParser(); + $tp = $this->tp; $ret = ''; $parms = vartrue($attributes['writeParms'], array()); @@ -6498,7 +6480,7 @@ var_dump($select_options);*/ if(!empty($parms['maxlength']) && empty($parms['post'])) { - $charMsg = e107::getParser()->lanVars(defset('LAN_X_CHARS_REMAINING', '[x] chars remaining'), "" . $parms['maxlength'] . ""); + $charMsg = $tp->lanVars(defset('LAN_X_CHARS_REMAINING', '[x] chars remaining'), "" . $parms['maxlength'] . ""); $parms['post'] = "attributes([ 'id' => $this->name2id($key) . "-char-count", 'class' => 'text-muted', @@ -6928,7 +6910,7 @@ var_dump($select_options);*/ case 'upload': //TODO - from method // TODO uploadfile SC is now processing uploads as well (add it to admin UI), write/readParms have to be added (see uploadfile.php parms) $disbut = varset($parms['disable_button'], '0'); - $ret = $tp->parseTemplate('{UPLOADFILE=' .(vartrue($parms['path']) ? e107::getParser()->replaceConstants($parms['path']) : e_UPLOAD)."|nowarn&trigger=etrigger_uploadfiles&disable_button={$disbut}}"); + $ret = $tp->parseTemplate('{UPLOADFILE=' .(vartrue($parms['path']) ? $tp->replaceConstants($parms['path']) : e_UPLOAD)."|nowarn&trigger=etrigger_uploadfiles&disable_button={$disbut}}"); break; case 'hidden': @@ -7014,7 +6996,7 @@ var_dump($select_options);*/ foreach($parms['optArray'] as $key=>$val) { - $thumbnail = e107::getParser()->toImage($val['thumbnail'], $parms); + $thumbnail = $this->tp->toImage($val['thumbnail'], $parms); $active = ($key === $value) ? ' active' : ''; $text .= "
@@ -7055,7 +7037,7 @@ var_dump($select_options);*/ foreach($parms['optArray'] as $key=>$val) { - $thumbnail = e107::getParser()->toImage($val,$parms); + $thumbnail = $this->tp->toImage($val,$parms); $text .= "
attributes([ @@ -7122,7 +7104,7 @@ var_dump($select_options);*/ */ public function renderListForm($form_options, $tree_models, $nocontainer = false) { - $tp = e107::getParser(); + $tp = $this->tp; $text = ''; $formPre = ''; $formPost = ''; @@ -7294,7 +7276,7 @@ var_dump($select_options);*/ */ public function renderGridForm($form_options, $tree_models, $nocontainer = false) { - $tp = e107::getParser(); + $tp = $this->tp; $text = ''; @@ -7516,7 +7498,7 @@ var_dump($select_options);*/ } $query = isset($form['query']) ? $form['query'] : e_QUERY ; - $url = (isset($form['url']) ? e107::getParser()->replaceConstants($form['url'], 'abs') : e_SELF).($query ? '?'.$query : ''); + $url = (isset($form['url']) ? $this->tp->replaceConstants($form['url'], 'abs') : e_SELF).($query ? '?'.$query : ''); $curTab = (string) varset($_GET['tab'], '0'); $text .= " @@ -7902,7 +7884,7 @@ var_dump($select_options);*/ foreach ($forms as $fid => $form) { $query = isset($form['query']) ? $form['query'] : e_QUERY ; - $url = (isset($form['url']) ? e107::getParser()->replaceConstants($form['url'], 'abs') : e_SELF).($query ? '?'.$query : ''); + $url = (isset($form['url']) ? $this->tp->replaceConstants($form['url'], 'abs') : e_SELF).($query ? '?'.$query : ''); $text .= ' ' .vartrue($form['form_pre'])." diff --git a/e107_tests/tests/unit/e_parseTest.php b/e107_tests/tests/unit/e_parseTest.php index c265a9a63..65cec4ebb 100644 --- a/e107_tests/tests/unit/e_parseTest.php +++ b/e107_tests/tests/unit/e_parseTest.php @@ -1,112 +1,111 @@ tp = $this->make('e_parse'); + } + catch (Exception $e) + { + $this->assertTrue(false, "Couldn't load e_parser object"); + } + + $this->tp->__construct(); + } + + public function testInit() + { + $this->tp->init(); + } + + public function testToRoute() + { + + $posted = array( + 'myfield' => array( + 'computer' => array( + 'apple' => array('imac' => '1') + ), + 'os' => array( + 'microsoft' => array('windows' => 'xp') + ) + ), + 'myfield2' => array( + 'house' => array('car' => 'red') + ), + 'myfield3' => 'string', + + ); + + $expected = array( + 'myfield/computer/apple/imac' => 'myfield', + 'myfield/os/microsoft/windows' => 'myfield', + 'myfield2/house/car' => 'myfield2', + 'myfield3' => 'myfield3', + ); + + $result = $this->tp->toRoute($posted); + $this->assertSame($expected, $result); + + } + + + public function testStripBlockTags() + { + $tests = array( + 0 => array( + 'text' => '

Paragraph 1

Paragraph 2
Line 3

', + 'expected' => "Paragraph 1Paragraph 2
Line 3", + ), + + + ); + + foreach ($tests as $var) + { + $result = $this->tp->stripBlockTags($var['text']); + + if (empty($var['expected'])) { - $this->tp = $this->make('e_parse'); - } - catch (Exception $e) - { - $this->assertTrue(false, "Couldn't load e_parser object"); + echo $result . "\n\n"; + continue; } - $this->tp->__construct(); - } - - public function testInit() - { - $this->tp->init(); - } - - public function testToRoute() - { - - $posted = array( - 'myfield' => array( - 'computer' => array( - 'apple' => array('imac' => '1') - ), - 'os' => array( - 'microsoft' => array('windows' => 'xp') - ) - ), - 'myfield2' => array( - 'house' => array('car' => 'red') - ), - 'myfield3' => 'string', - - ); - - $expected = array ( - 'myfield/computer/apple/imac' => 'myfield', - 'myfield/os/microsoft/windows' => 'myfield', - 'myfield2/house/car' => 'myfield2', - 'myfield3' => 'myfield3', - ); - - $result = $this->tp->toRoute($posted); - $this->assertSame($expected, $result); - + $this->assertEquals($var['expected'], $result); } - public function testStripBlockTags() - { - $tests = array( - 0 => array( - 'text' => '

Paragraph 1

Paragraph 2
Line 3

', - 'expected' => "Paragraph 1Paragraph 2
Line 3", - ), + } - - ); - - foreach($tests as $var) + /* + public function testHtmlAbuseFilter() { - $result = $this->tp->stripBlockTags($var['text']); - if(empty($var['expected'])) - { - echo $result."\n\n"; - continue; - } - - $this->assertEquals($var['expected'], $result); } + public function testE_highlight() + { + }*/ - } - -/* - public function testHtmlAbuseFilter() - { - - } - - public function testE_highlight() - { - - }*/ - - public function testToHTML() - { - $src = <<tp->toHTML($src,true); + $actual = $this->tp->toHTML($src, true); - $this->assertEquals($expected,$actual, "BBcode parsing failed"); + $this->assertEquals($expected, $actual, "BBcode parsing failed"); $src = "[center][img]{e_IMAGE}generic/blank_avatar.jpg[/img][/center]"; - - $actual = $this->tp->toHTML($src,true); - $expected = "
Blank Avatar
"; + $actual = $this->tp->toHTML($src, true); + + $expected = "
Blank Avatar
"; $this->assertEquals($expected, $actual, "BBcode parsing failed on [img]"); @@ -147,7 +146,7 @@ src="http://pagead2.googlesyndication.com/pagead/show_ads.js"> [/center] SRC; - $expected = <<
EXPECTED; - $actual = $this->tp->toHTML($src,true); - $this->assertEquals($expected,$actual); + $actual = $this->tp->toHTML($src, true); + $this->assertEquals($expected, $actual); -/* -$src = "[html] -
$sql = e107::getDb();
-$sql->select('tablename', 'field1, field2', 'field_id = 1');
-while($row = $sql->fetch())
-{
-    echo $row['field1'];
-}
-[/html]"; + /* + $src = "[html] + 
$sql = e107::getDb();
+		$sql->select('tablename', 'field1, field2', 'field_id = 1');
+		while($row = $sql->fetch())
+		{
+			echo $row['field1'];
+		}
+ [/html]"; - $actual = $this->tp->toHTML($src,true); - $expected = ''; + $actual = $this->tp->toHTML($src,true); + $expected = ''; - $this->assertEquals($expected, $actual, "BBcode parsing failed on 
");*/
+				$this->assertEquals($expected, $actual, "BBcode parsing failed on 
");*/
 
 
-		}
-/*
-		public function testUstrpos()
-		{
+	}
 
-		}
-*/
-		public function testThumbUrlDecode()
-		{
-			$tests = array(
-				0   => array(
-					'input' => '/media/img/a400xa500/myimage.jpg',
-					'expected' => array (
-					  'src' => 'e_MEDIA_IMAGE/myimage.jpg',
-					  'aw' => '400',
-					  'ah' => '500',
-					)
-				),
-				1   => array(
-					'input' => '/media/img/400x500/myimage2.jpg',
-					'expected' => array (
-					  'src' => 'e_MEDIA_IMAGE/myimage2.jpg',
-					  'w' => '400',
-					  'h' => '500',
-					)
-				),
-				2   => array(
-					'input' => '/theme/img/a400xa500/mytheme/myimage.jpg',
-					'expected' => array (
-					  'src' => 'e_THEME/mytheme/myimage.jpg',
-					  'aw' => '400',
-					  'ah' => '500',
-					)
-				),
-				3   => array(
-					'input' => '/theme/img/400x500/mytheme/myimage2.jpg',
-					'expected' => array (
-					  'src' => 'e_THEME/mytheme/myimage2.jpg',
-					  'w' => '400',
-					  'h' => '500',
-					)
-				),
-
-			);
-
-			foreach($tests as $var)
+	/*
+			public function testUstrpos()
 			{
-				$result = $this->tp->thumbUrlDecode($var['input']);
-				$this->assertSame($var['expected'], $result);
+
 			}
+	*/
+	public function testThumbUrlDecode()
+	{
+		$tests = array(
+			0 => array(
+				'input'    => '/media/img/a400xa500/myimage.jpg',
+				'expected' => array(
+					'src' => 'e_MEDIA_IMAGE/myimage.jpg',
+					'aw'  => '400',
+					'ah'  => '500',
+				)
+			),
+			1 => array(
+				'input'    => '/media/img/400x500/myimage2.jpg',
+				'expected' => array(
+					'src' => 'e_MEDIA_IMAGE/myimage2.jpg',
+					'w'   => '400',
+					'h'   => '500',
+				)
+			),
+			2 => array(
+				'input'    => '/theme/img/a400xa500/mytheme/myimage.jpg',
+				'expected' => array(
+					'src' => 'e_THEME/mytheme/myimage.jpg',
+					'aw'  => '400',
+					'ah'  => '500',
+				)
+			),
+			3 => array(
+				'input'    => '/theme/img/400x500/mytheme/myimage2.jpg',
+				'expected' => array(
+					'src' => 'e_THEME/mytheme/myimage2.jpg',
+					'w'   => '400',
+					'h'   => '500',
+				)
+			),
 
+		);
 
+		foreach ($tests as $var)
+		{
+			$result = $this->tp->thumbUrlDecode($var['input']);
+			$this->assertSame($var['expected'], $result);
 		}
 
 
-		function testToHTMLModifiers()
-		{
+	}
+
+
+	function testToHTMLModifiers()
+	{
 		//	e107::getConfig()->set('make_clickable', 0)->save(false, true);
 
-			$list = $this->tp->getModifierList();
+		$list = $this->tp->getModifierList();
 
-			$tests = array (
-				'emotes_off'        =>
-					array(
-						'input'    => ":-)",
-						'expected' => ':-)',
-					),
-				'emotes_on'         =>
-					array(
-						'input'    => ":-)",
-						'expected' => 'smile',
-					),
-				'no_hook'           =>
-					array(
-						'input'    => "",
-						'expected' => '',
-					),
-				'do_hook'           =>
-					array(
-						'input'    => "",
-						'expected' => '',
-					),
-				'scripts_off'       =>
-					array(
-						'input'    => "",
-						'expected' => '',
-					),
-				'scripts_on'        =>
-					array(
-						'input'    => "",
-						'expected' => '',
-					),
-				'no_make_clickable' =>
-					array(
-						'input'    => "www.somewhere.com mailto:myemail@somewhere.com",
-						'expected' => 'www.somewhere.com mailto:myemail@somewhere.com',
-					),
-				'make_clickable'    =>
-					array(
-						'input'    => "www.somewhere.com mailto:myemail@somewhere.com",
-						'expected' => '', // random obfiscation
-					),
-				'no_replace'        =>
-					array(
-						'input'    => "www.somewhere.com",
-						'expected' => '',
-					),
-				'replace'           =>
-					array(
-						'input'    => "www.somewhere.com",
-						'expected' => '',
-					),
-				'consts_off'        =>
-					array(
-						'input'    => "{e_PLUGIN}",
-						'expected' => '{e_PLUGIN}',
-					),
-				'consts_rel'        =>
-					array(
-						'input'    => "{e_PLUGIN}",
-						'expected' => 'e107_plugins/',
-					),
-				'consts_abs'        =>
-					array(
-						'input'    => "{e_PLUGIN}",
-						'expected' => '/e107_plugins/',
-					),
-				'consts_full'       =>
-					array(
-						'input'    => "{e_PLUGIN}",
-						'expected' => 'https://localhost/e107/e107_plugins/',
-					),
-				'scparse_off'       =>
-					array(
-						'input'    => "{SITENAME}",
-						'expected' => '{SITENAME}',
-					),
-				'scparse_on'        =>
-					array(
-						'input'    => "{SITENAME}",
-						'expected' => 'e107',
-					),
-				'no_tags'           =>
-					array(
-						'input'    => "bold",
-						'expected' => 'bold',
-					),
-				'do_tags'           =>
-					array(
-						'input'    => "bold",
-						'expected' => 'bold',
-					),
-				'fromadmin'         =>
-					array(
-						'input'    => "My Text {SITENAME} {e_PLUGIN} www.somewhere.com \nNew line :-)",
-						'expected' => '',
-					),
-				'notadmin'          =>
-					array(
-						'input'    => "My Text {SITENAME} {e_PLUGIN} www.somewhere.com \nNew line :-)",
-						'expected' => '',
-					),
-				'er_off'            =>
-					array(
-						'input'    => "My Text {SITENAME} {e_PLUGIN} www.somewhere.com \nNew line :-)",
-						'expected' => '',
-					),
-				'er_on'             =>
-					array(
-						'input'    => "My Text {SITENAME} {e_PLUGIN} www.somewhere.com \nNew line :-)",
-						'expected' => '',
-					),
-				'defs_off'          =>
-					array(
-						'input'    => "LAN_THANK_YOU",
-						'expected' => 'LAN_THANK_YOU',
-					),
-				'defs_on'           =>
-					array(
-						'input'    => "LAN_THANK_YOU",
-						'expected' => 'Thank you',
-					),
-				'dobreak'           =>
-					array(
-						'input'    => "Line 1\nLine 2\nLine 3",
-						'expected' => 'Line 1
Line 2
Line 3',
-					),
-				'nobreak'           =>
-					array(
-						'input'    => "Line 1\nLine 2\nLine 3",
-						'expected' => "Line 1\nLine 2\nLine 3",
-					),
-				'lb_nl'             =>
-					array(
-						'input'    => "Line 1\nLine 2\nLine 3",
-						'expected' => "Line 1\nLine 2\nLine 3",
-					),
-				'lb_br'             =>
-					array(
-						'input'    => "Line 1\nLine 2\nLine 3",
-						'expected' => 'Line 1
Line 2
Line 3',
-					),
-				'retain_nl'         =>
-					array(
-						'input'    => "Line 1\nLine 2\nLine 3",
-						'expected' => "Line 1\nLine 2\nLine 3",
-					),
-				'defs'              =>
-					array(
-						'input'    => "LAN_THANK_YOU",
-						'expected' => 'Thank you',
-					),
-				'parse_sc'          =>
-					array(
-						'input'    => "{SITENAME}",
-						'expected' => 'e107',
-					),
-				'constants'         =>
-					array(
-						'input'    => "{e_PLUGIN}",
-						'expected' => 'e107_plugins/',
-					),
-				'value'             =>
-					array(
-						'input'    => "",
-						'expected' => '',
-					),
-				'wysiwyg'           =>
-					array(
-						'input'    => "",
-						'expected' => '',
-					),
-			);
+		$tests = array(
+			'emotes_off'        =>
+				array(
+					'input'    => ":-)",
+					'expected' => ':-)',
+				),
+			'emotes_on'         =>
+				array(
+					'input'    => ":-)",
+					'expected' => 'smile',
+				),
+			'no_hook'           =>
+				array(
+					'input'    => "",
+					'expected' => '',
+				),
+			'do_hook'           =>
+				array(
+					'input'    => "",
+					'expected' => '',
+				),
+			'scripts_off'       =>
+				array(
+					'input'    => "",
+					'expected' => '',
+				),
+			'scripts_on'        =>
+				array(
+					'input'    => "",
+					'expected' => '',
+				),
+			'no_make_clickable' =>
+				array(
+					'input'    => "www.somewhere.com mailto:myemail@somewhere.com",
+					'expected' => 'www.somewhere.com mailto:myemail@somewhere.com',
+				),
+			'make_clickable'    =>
+				array(
+					'input'    => "www.somewhere.com mailto:myemail@somewhere.com",
+					'expected' => '', // random obfiscation
+				),
+			'no_replace'        =>
+				array(
+					'input'    => "www.somewhere.com",
+					'expected' => '',
+				),
+			'replace'           =>
+				array(
+					'input'    => "www.somewhere.com",
+					'expected' => '',
+				),
+			'consts_off'        =>
+				array(
+					'input'    => "{e_PLUGIN}",
+					'expected' => '{e_PLUGIN}',
+				),
+			'consts_rel'        =>
+				array(
+					'input'    => "{e_PLUGIN}",
+					'expected' => 'e107_plugins/',
+				),
+			'consts_abs'        =>
+				array(
+					'input'    => "{e_PLUGIN}",
+					'expected' => '/e107_plugins/',
+				),
+			'consts_full'       =>
+				array(
+					'input'    => "{e_PLUGIN}",
+					'expected' => 'https://localhost/e107/e107_plugins/',
+				),
+			'scparse_off'       =>
+				array(
+					'input'    => "{SITENAME}",
+					'expected' => '{SITENAME}',
+				),
+			'scparse_on'        =>
+				array(
+					'input'    => "{SITENAME}",
+					'expected' => 'e107',
+				),
+			'no_tags'           =>
+				array(
+					'input'    => "bold",
+					'expected' => 'bold',
+				),
+			'do_tags'           =>
+				array(
+					'input'    => "bold",
+					'expected' => 'bold',
+				),
+			'fromadmin'         =>
+				array(
+					'input'    => "My Text {SITENAME} {e_PLUGIN} www.somewhere.com \nNew line :-)",
+					'expected' => '',
+				),
+			'notadmin'          =>
+				array(
+					'input'    => "My Text {SITENAME} {e_PLUGIN} www.somewhere.com \nNew line :-)",
+					'expected' => '',
+				),
+			'er_off'            =>
+				array(
+					'input'    => "My Text {SITENAME} {e_PLUGIN} www.somewhere.com \nNew line :-)",
+					'expected' => '',
+				),
+			'er_on'             =>
+				array(
+					'input'    => "My Text {SITENAME} {e_PLUGIN} www.somewhere.com \nNew line :-)",
+					'expected' => '',
+				),
+			'defs_off'          =>
+				array(
+					'input'    => "LAN_THANK_YOU",
+					'expected' => 'LAN_THANK_YOU',
+				),
+			'defs_on'           =>
+				array(
+					'input'    => "LAN_THANK_YOU",
+					'expected' => 'Thank you',
+				),
+			'dobreak'           =>
+				array(
+					'input'    => "Line 1\nLine 2\nLine 3",
+					'expected' => 'Line 1
Line 2
Line 3',
+				),
+			'nobreak'           =>
+				array(
+					'input'    => "Line 1\nLine 2\nLine 3",
+					'expected' => "Line 1\nLine 2\nLine 3",
+				),
+			'lb_nl'             =>
+				array(
+					'input'    => "Line 1\nLine 2\nLine 3",
+					'expected' => "Line 1\nLine 2\nLine 3",
+				),
+			'lb_br'             =>
+				array(
+					'input'    => "Line 1\nLine 2\nLine 3",
+					'expected' => 'Line 1
Line 2
Line 3',
+				),
+			'retain_nl'         =>
+				array(
+					'input'    => "Line 1\nLine 2\nLine 3",
+					'expected' => "Line 1\nLine 2\nLine 3",
+				),
+			'defs'              =>
+				array(
+					'input'    => "LAN_THANK_YOU",
+					'expected' => 'Thank you',
+				),
+			'parse_sc'          =>
+				array(
+					'input'    => "{SITENAME}",
+					'expected' => 'e107',
+				),
+			'constants'         =>
+				array(
+					'input'    => "{e_PLUGIN}",
+					'expected' => 'e107_plugins/',
+				),
+			'value'             =>
+				array(
+					'input'    => "",
+					'expected' => '',
+				),
+			'wysiwyg'           =>
+				array(
+					'input'    => "",
+					'expected' => '',
+				),
+		);
 
 
-
-			$ret = [];
-			foreach($list as $mod => $val)
+		$ret = [];
+		foreach ($list as $mod => $val)
+		{
+			if (empty($tests[$mod]['expected']))
 			{
-				if(empty($tests[$mod]['expected']))
-				{
-					continue;
-				}
+				continue;
+			}
 
-				$result = $this->tp->toHTML($tests[$mod]['input'], false, 'defaults_off,'.$mod);
-				$this->assertSame($tests[$mod]['expected'], $result, $mod." didn't match the expected result.");
+			$result = $this->tp->toHTML($tests[$mod]['input'], false, 'defaults_off,' . $mod);
+			$this->assertSame($tests[$mod]['expected'], $result, $mod . " didn't match the expected result.");
 			//	$ret[$mod] = $result;
 
-			}
+		}
 
 
 		//	e107::getConfig()->set('make_clickable', 0)->save(false, true);
 		//	var_export($ret);
 
-		}
+	}
 
 
+	function testToHTMLWithBBcode()
+	{
+		$tests = array(
+			0 => array(
+				'text'     => '[code]$something = "something";[/code]',
+				'expected' => "
\$something = "something";
",
+			),
+			1 => array(
+				'text'     => '[b]Title[/b][code]$something = "something"; [b]Not parsed[/b][/code]',
+				'expected' => "Title
\$something = "something"; [b]Not parsed[/b]
",
+			),
+			2 => array(
+				'text'     => '[php] "",
+			),
+			3 => array(
+				'text'     => "[table][tr]\n[td]cell[/td]\n[/tr][/table]",
+				'expected' => "\n\n
cell
",
+			),
 
-		function testToHTMLWithBBcode()
+			4 => array(
+				'text'     => "Test\n[b]first line[/b][b]\nsecond line[/b]",
+				'expected' => "Test
first line
second line",
+			),
+
+			5 => array(
+				'text'     => "Test\n[code]1st [b]line[/b] of code[/code]\n[code]2nd line of code[/code]",
+				'expected' => "Test
1st [b]line[/b] of code
2nd line of code
",
+			),
+
+
+		);
+
+		foreach ($tests as $index => $var)
 		{
-			$tests = array(
-				0 => array(
-					'text'  => '[code]$something = "something";[/code]',
-					'expected'  => "
\$something = "something";
",
-				),
-				1 => array(
-					'text'  => '[b]Title[/b][code]$something = "something"; [b]Not parsed[/b][/code]',
-					'expected'  => "Title
\$something = "something"; [b]Not parsed[/b]
",
-				),
-				2 => array(
-					'text'  => '[php] "",
-				),
-				3 => array(
-					'text'  => "[table][tr]\n[td]cell[/td]\n[/tr][/table]", 
-					'expected'  => "\n\n
cell
",
-				),
+			$result = $this->tp->toHTML($var['text'], true);
 
-				4 => array(
-					'text'  => "Test\n[b]first line[/b][b]\nsecond line[/b]",
-					'expected'  => "Test
first line
second line",
-				),
-
-				5 => array(
-					'text'  => "Test\n[code]1st [b]line[/b] of code[/code]\n[code]2nd line of code[/code]",
-					'expected'  => "Test
1st [b]line[/b] of code
2nd line of code
",
-				),
-
-
-			);
-
-			foreach($tests as $index => $var)
+			if (!isset($var['expected']))
 			{
-				$result = $this->tp->toHTML($var['text'], true);
-
-				if(!isset($var['expected']))
-				{
-					echo $result."\n\n";
-					continue;
-				}
-
-				$this->assertEquals($var['expected'], $result, 'Test #'.$index.' failed.');
+				echo $result . "\n\n";
+				continue;
 			}
 
-
-
+			$this->assertEquals($var['expected'], $result, 'Test #' . $index . ' failed.');
 		}
 
-		public function testParseTemplateWithEnabledCoreShortcodes()
-		{
-			$needle = '
    ';
-			$result = $this->tp->parseTemplate('{NAVIGATION}', true);
-			$this->assertStringContainsString($needle, $result);
-		}
 
-		public function testParseTemplateWithDisabledCoreShortcodes()
-		{
-			$result = $this->tp->parseTemplate('{NAVIGATION}', false);
-			$this->assertEmpty($result);
-		}
+	}
 
-		public function testParseTemplateWithCoreAddonShortcodes()
-		{
-			$shortcodeObject = e107::getScBatch('online', true);
+	public function testParseTemplateWithEnabledCoreShortcodes()
+	{
+		$needle = '
      ';
+		$result = $this->tp->parseTemplate('{NAVIGATION}', true);
+		$this->assertStringContainsString($needle, $result);
+	}
 
-			$expected = "lost";
-			$result = $this->tp->parseTemplate('{ONLINE_MEMBER_PAGE}', false, $shortcodeObject);
-			$this->assertEquals($expected, $result);
+	public function testParseTemplateWithDisabledCoreShortcodes()
+	{
+		$result = $this->tp->parseTemplate('{NAVIGATION}', false);
+		$this->assertEmpty($result);
+	}
 
-			e107::getPlugin()->uninstall('online');
-			$sc = e107::getScParser();
-			$sc->__construct();
+	public function testParseTemplateWithCoreAddonShortcodes()
+	{
+		$shortcodeObject = e107::getScBatch('online', true);
+
+		$expected = "lost";
+		$result = $this->tp->parseTemplate('{ONLINE_MEMBER_PAGE}', false, $shortcodeObject);
+		$this->assertEquals($expected, $result);
+
+		e107::getPlugin()->uninstall('online');
+		$sc = e107::getScParser();
+		$sc->__construct();
 		//	$sc->resetscClass('online', null);
 
-			$result = $this->tp->parseTemplate('{ONLINE_MEMBER_PAGE}', false);
-			$this->assertEmpty($result);
+		$result = $this->tp->parseTemplate('{ONLINE_MEMBER_PAGE}', false);
+		$this->assertEmpty($result);
 
-			$result = $this->tp->parseTemplate('{ONLINE_MEMBER_PAGE}', true);
-			$this->assertEmpty($result, "{ONLINE_MEMBER_PAGE} wasn't empty: ".$result);
+		$result = $this->tp->parseTemplate('{ONLINE_MEMBER_PAGE}', true);
+		$this->assertEmpty($result, "{ONLINE_MEMBER_PAGE} wasn't empty: " . $result);
 
-			$shortcodeObject = e107::getScBatch('online', true);
+		$shortcodeObject = e107::getScBatch('online', true);
 
-			$expected = "lost";
-			$result = $this->tp->parseTemplate('{ONLINE_MEMBER_PAGE}', false, $shortcodeObject);
-			$this->assertEquals($expected, $result);
+		$expected = "lost";
+		$result = $this->tp->parseTemplate('{ONLINE_MEMBER_PAGE}', false, $shortcodeObject);
+		$this->assertEquals($expected, $result);
 
-			$result = $this->tp->parseTemplate('{ONLINE_MEMBER_PAGE}', true);
-			$this->assertEmpty($result);
+		$result = $this->tp->parseTemplate('{ONLINE_MEMBER_PAGE}', true);
+		$this->assertEmpty($result);
 
 		//	$result = $this->tp->parseTemplate('{ONLINE_MEMBER_PAGE}', true);
 		//	$this->assertEquals($expected, $result);
-		}
+	}
 
-		public function testParseTemplateWithNonCoreShortcodes()
-		{
-			e107::getPlugin()->uninstall('download');
-			e107::getScParser()->__construct();
+	public function testParseTemplateWithNonCoreShortcodes()
+	{
+		e107::getPlugin()->uninstall('download');
+		e107::getScParser()->__construct();
 
-			$result = $this->tp->parseTemplate('{DOWNLOAD_CAT_SEARCH}', false);
-			$this->assertEmpty($result);
+		$result = $this->tp->parseTemplate('{DOWNLOAD_CAT_SEARCH}', false);
+		$this->assertEmpty($result);
 
-			$result = $this->tp->parseTemplate('{DOWNLOAD_CAT_SEARCH}', true);
-			$this->assertEmpty($result);
+		$result = $this->tp->parseTemplate('{DOWNLOAD_CAT_SEARCH}', true);
+		$this->assertEmpty($result);
 
-			$shortcodeObject = e107::getScBatch('download', true);
+		$shortcodeObject = e107::getScBatch('download', true);
 
-			$needle = "
      tp->parseTemplate('{DOWNLOAD_CAT_SEARCH}', false, $shortcodeObject);
-			$this->assertStringContainsString($needle, $result);
+		$needle = "tp->parseTemplate('{DOWNLOAD_CAT_SEARCH}', false, $shortcodeObject);
+		$this->assertStringContainsString($needle, $result);
 
-			$result = $this->tp->parseTemplate('{DOWNLOAD_CAT_SEARCH}', false);
-			$this->assertEmpty($result);
+		$result = $this->tp->parseTemplate('{DOWNLOAD_CAT_SEARCH}', false);
+		$this->assertEmpty($result);
 
-			$result = $this->tp->parseTemplate('{DOWNLOAD_CAT_SEARCH}', true);
-			$this->assertEmpty($result);
-		}
+		$result = $this->tp->parseTemplate('{DOWNLOAD_CAT_SEARCH}', true);
+		$this->assertEmpty($result);
+	}
 
-		public function testParseTemplateWithEvars()
-		{
-			$obj = new e_vars(array('ACTIVE' => "yes"));
-			$result = $this->tp->parseTemplate('
      something {ACTIVE}
      ', true, null, $obj);
-			$expected = '
      something yes
      ';
+	public function testParseTemplateWithEvars()
+	{
+		$obj = new e_vars(array('ACTIVE' => "yes"));
+		$result = $this->tp->parseTemplate('
      something {ACTIVE}
      ', true, null, $obj);
+		$expected = '
      something yes
      ';
 
-			$this->assertEquals($expected, $result);
+		$this->assertEquals($expected, $result);
 
-		}
+	}
 
-/*
-		public function testCreateConstants()
-		{
-
-		}
-
-		public function testThumbEncode()
-		{
-
-		}
-
-		public function testEmailObfuscate()
-		{
-
-		}
-*/
-		public function testToFlatArray()
-		{
-			$input = [
-				'a' => [
-					'b' => [
-						'c' => 'value',
-					],
-				],
-			];
-			$expected = [
-				'prepend/xyza/b/c' => 'value'
-			];
-
-			$tp = $this->tp;
-			$actual = $tp->toFlatArray($input, 'prepend/xyz');
-
-			$this->assertSame($expected, $actual);
-		}
-
-		public function testFromFlatArray()
-		{
-			$input = [
-				'prepend/xyza/b/c' => 'value'
-			];
-			$expected = [
-				'a' => [
-					'b' => [
-						'c' => 'value',
-					],
-				],
-			];
-
-			$tp = $this->tp;
-			$actual = $tp->fromFlatArray($input, 'prepend/xyz');
-
-			$this->assertSame($expected, $actual);
-		}
-
-		public function testToForm()
-		{
-
-			$orig = "lr.src = window._lr.url + '/Scripts/api.js';";
-
-			$db = $this->tp->toDB($orig);
-
-			e107::getConfig()->updatePref('wysiwyg', true);
-			e107::wysiwyg('default');
-			$actual = $this->tp->toForm($db);
-			$expected = 'lr.src = window._lr.url %2B '/Scripts/api.js';';
-			$this->assertEquals($expected, $actual);
-
-			e107::getConfig()->updatePref('wysiwyg', false);
-			$actual = $this->tp->toForm($db);
-			$expected = 'lr.src = window._lr.url + '/Scripts/api.js';';
-			$this->assertEquals($expected, $actual);
-
-
-			$actual = $this->tp->toForm("[html]Something "hi"[/html]");
-			$this->assertSame('[html]Something "hi"[/html]', $actual);
-
-		}
-/*
-		public function testUstristr()
-		{
-
-		}
-
-		public function testThumbDimensions()
-		{
-
-		}
-*/
-		public function testToASCII()
-		{
-
-			$array = array(
-				array('input' => 'ľ, ú, ŕ, ô, ť', 'expected' => 'l, u, r, o, t'),
-			);
-
-			foreach($array as $arr)
+	/*
+			public function testCreateConstants()
 			{
-				$result = $this->tp->toASCII($arr['input']);
-				$this->assertEquals($arr['expected'], $result);
+
 			}
 
+			public function testThumbEncode()
+			{
+
+			}
+
+			public function testEmailObfuscate()
+			{
+
+			}
+	*/
+	public function testToFlatArray()
+	{
+		$input = [
+			'a' => [
+				'b' => [
+					'c' => 'value',
+				],
+			],
+		];
+		$expected = [
+			'prepend/xyza/b/c' => 'value'
+		];
+
+		$tp = $this->tp;
+		$actual = $tp->toFlatArray($input, 'prepend/xyz');
+
+		$this->assertSame($expected, $actual);
+	}
+
+	public function testFromFlatArray()
+	{
+		$input = [
+			'prepend/xyza/b/c' => 'value'
+		];
+		$expected = [
+			'a' => [
+				'b' => [
+					'c' => 'value',
+				],
+			],
+		];
+
+		$tp = $this->tp;
+		$actual = $tp->fromFlatArray($input, 'prepend/xyz');
+
+		$this->assertSame($expected, $actual);
+	}
+
+	public function testToForm()
+	{
+
+		$orig = "lr.src = window._lr.url + '/Scripts/api.js';";
+
+		$db = $this->tp->toDB($orig);
+
+		e107::getConfig()->updatePref('wysiwyg', true);
+		e107::wysiwyg('default');
+		$actual = $this->tp->toForm($db);
+		$expected = 'lr.src = window._lr.url %2B '/Scripts/api.js';';
+		$this->assertEquals($expected, $actual);
+
+		e107::getConfig()->updatePref('wysiwyg', false);
+		$actual = $this->tp->toForm($db);
+		$expected = 'lr.src = window._lr.url + '/Scripts/api.js';';
+		$this->assertEquals($expected, $actual);
 
 
-		}
+		$actual = $this->tp->toForm("[html]Something "hi"[/html]");
+		$this->assertSame('[html]Something "hi"[/html]', $actual);
 
-		public function testToNumber()
+	}
+
+	/*
+			public function testUstristr()
+			{
+
+			}
+
+			public function testThumbDimensions()
+			{
+
+			}
+	*/
+	public function testToASCII()
+	{
+
+		$array = array(
+			array('input' => 'ľ, ú, ŕ, ô, ť', 'expected' => 'l, u, r, o, t'),
+		);
+
+		foreach ($array as $arr)
 		{
-			$result = $this->tp->toNumber('v2a');
-			$this->assertEquals('2', $result);
-
-			$result = $this->tp->toNumber('v1.5');
-			$this->assertEquals('1.5', $result);
-
-
-			$result = $this->tp->toNumber('v3.5');
-			$this->assertEquals('3.5', $result);
+			$result = $this->tp->toASCII($arr['input']);
+			$this->assertEquals($arr['expected'], $result);
 		}
-/*
-		public function testthumbUrlSEF()
-		{
-		//	$this->tp->thumbUrlSEF($url);
+
+
+	}
+
+	public function testToNumber()
+	{
+		$result = $this->tp->toNumber('v2a');
+		$this->assertEquals('2', $result);
+
+		$result = $this->tp->toNumber('v1.5');
+		$this->assertEquals('1.5', $result);
+
+
+		$result = $this->tp->toNumber('v3.5');
+		$this->assertEquals('3.5', $result);
+	}
+	/*
+			public function testthumbUrlSEF()
+			{
+			//	$this->tp->thumbUrlSEF($url);
 
 
 
 
-		}
-*/
+			}
+	*/
 	/*	public function testTextclean()
 		{
 			$string = "\n\n\nSomething\n\n\n";
@@ -702,2063 +699,2140 @@ while($row = $sql->fetch())
 			//$this->assertSame();
 		}*/
 
-		public function testMultibyteOn()
-		{
+	public function testMultibyteOn()
+	{
 
-			// enable multibyte mode.
-			$this->tp->setMultibyte(true);
+		// enable multibyte mode.
+		$this->tp->setMultibyte(true);
 
-			$input = "русские";
+		$input = "русские";
 
-			// strtoupper
-			$result = $this->tp->ustrtoupper($input);
-			$this->assertEquals('РУССКИЕ', $result);
+		// strtoupper
+		$result = $this->tp->ustrtoupper($input);
+		$this->assertEquals('РУССКИЕ', $result);
 
-			// strlen
-			$result = $this->tp->ustrlen($input);
-			$this->assertEquals(7, $result);
+		// strlen
+		$result = $this->tp->ustrlen($input);
+		$this->assertEquals(7, $result);
 
-			// strtolower
-			$result = $this->tp->ustrtolower('РУССКИЕ');
-			$this->assertEquals($input, $result);
+		// strtolower
+		$result = $this->tp->ustrtolower('РУССКИЕ');
+		$this->assertEquals($input, $result);
 
-			// strpos
-			$result = $this->tp->ustrpos($input, 'и');
-			$this->assertEquals(5, $result);
+		// strpos
+		$result = $this->tp->ustrpos($input, 'и');
+		$this->assertEquals(5, $result);
 
-			// substr
-			$result = $this->tp->usubstr($input, 0, 5);
-			$this->assertEquals('русск', $result);
+		// substr
+		$result = $this->tp->usubstr($input, 0, 5);
+		$this->assertEquals('русск', $result);
 
-			// stristr
-			$result = $this->tp->ustristr($input, 'ские', true);
-			$this->assertEquals('рус', $result);
+		// stristr
+		$result = $this->tp->ustristr($input, 'ские', true);
+		$this->assertEquals('рус', $result);
 
-			// strrpos (last occurance of a string)
-			$result = $this->tp->ustrrpos($input, 'с');
-			$this->assertEquals(3, $result);
+		// strrpos (last occurance of a string)
+		$result = $this->tp->ustrrpos($input, 'с');
+		$this->assertEquals(3, $result);
 
-			$this->tp->setMultibyte(false); // disable after test.
+		$this->tp->setMultibyte(false); // disable after test.
 
-		}
+	}
 
-		public function testMultibyteOff()
-		{
+	public function testMultibyteOff()
+	{
 
-			// enable multibyte mode.
-			$this->tp->setMultibyte(false);
+		// enable multibyte mode.
+		$this->tp->setMultibyte(false);
 
-			$input = "an example of text";
+		$input = "an example of text";
 
-			// strtoupper
-			$result = $this->tp->ustrtoupper($input);
-			$this->assertEquals('AN EXAMPLE OF TEXT', $result);
+		// strtoupper
+		$result = $this->tp->ustrtoupper($input);
+		$this->assertEquals('AN EXAMPLE OF TEXT', $result);
 
-			// strlen
-			$result = $this->tp->ustrlen($input);
-			$this->assertEquals(18, $result);
+		// strlen
+		$result = $this->tp->ustrlen($input);
+		$this->assertEquals(18, $result);
 
-			// strtolower
-			$result = $this->tp->ustrtolower('AN EXAMPLE OF TEXT');
-			$this->assertEquals($input, $result);
+		// strtolower
+		$result = $this->tp->ustrtolower('AN EXAMPLE OF TEXT');
+		$this->assertEquals($input, $result);
 
-			// strpos
-			$result = $this->tp->ustrpos($input, 't');
-			$this->assertEquals(14, $result);
+		// strpos
+		$result = $this->tp->ustrpos($input, 't');
+		$this->assertEquals(14, $result);
 
-			// substr
-			$result = $this->tp->usubstr($input, 0, 5);
-			$this->assertEquals('an ex', $result);
+		// substr
+		$result = $this->tp->usubstr($input, 0, 5);
+		$this->assertEquals('an ex', $result);
 
-			// stristr
-			$result = $this->tp->ustristr($input, 'of', true);
-			$this->assertEquals('an example ', $result);
+		// stristr
+		$result = $this->tp->ustristr($input, 'of', true);
+		$this->assertEquals('an example ', $result);
 
-			// strrpos (last occurance of a string)
-			$result = $this->tp->ustrrpos($input, 'e');
-			$this->assertEquals(15, $result);
+		// strrpos (last occurance of a string)
+		$result = $this->tp->ustrrpos($input, 'e');
+		$this->assertEquals(15, $result);
 
 
-		}
-/*
-		public function testUstrlen()
-		{
+	}
 
-		}
+	/*
+			public function testUstrlen()
+			{
 
-		public function testAmpEncode()
-		{
+			}
 
-		}
+			public function testAmpEncode()
+			{
 
-		public function testThumbUrlScale()
-		{
+			}
 
-		}
+			public function testThumbUrlScale()
+			{
 
-		public function testToEmail()
-		{
+			}
 
-		}
+			public function testToEmail()
+			{
 
-		public function testUsubstr()
-		{
+			}
 
-		}
+			public function testUsubstr()
+			{
 
-		public function testThumbCrop()
-		{
+			}
 
-		}
-*/
+			public function testThumbCrop()
+			{
+
+			}
+	*/
 
 
-		public function testToDB()
-		{
+	public function testToDB()
+	{
 
-			$tests = array(
-				0  => array(
-					'input'     => " '<svg/onload=prompt(1)//'
-				),
-				1  => array(
-					'input'     => "some plain text with a\nline break",
-					'expected'  => "some plain text with a\nline break"
-				),
-				2  => array(
-					'input'     => "some [b]text[/b] with bbcodes",
-					'expected'  => "some [b]text[/b] with bbcodes"
-				),
-				3  => array(
-					'input'     => 'some "quoted text" with a $ sign',
-					'expected'  => "some "quoted text" with a $ sign"
-				),
-				4  => array(
-					'input'     => 'some 
      simple html
      link',
-					'expected'  => 'some 
      simple html
      link'
-				),
-				5  => array(
-					'input'     => "[img]http://something.com[/img]",
-					'expected'  => "[img]http://something.com[/img]"
-				),
-				6  => array(
-					'input'     => "
      日本語 简体中文
      ",
-					'expected'  => "
      日本語 简体中文
      "
-				),
-				7  => array(
-					'input'     => "",
-					'expected'  => "" // stripped xss
-				),
-				8  => array(
-					'input'     => '
      Hi there
      ',
-					'expected'  => '
      Hi there
      '
-				),
-				9  => array(
-					'input'     => '',
-					'expected'  => ""
-				),
-				10 => array(
-					'input'     => '
      ',
-					'expected'  => '
      '),
-				11 => array(
-					'input'     => 'Test',
-					'expected'  => 'Test'
-				),
-				12 => array(
-					'input'     => "From here > to there",
-					'expected'  => "From here > to there"
-				),
-				13 => array(
-					'input'     => "[html]
      Hello World!
      [/html]",
-					'expected'  => '[html]
      Hello World!
      [/html]'
-				),
-				14 => array(
-					'input'     => "Something & something",
-					'expected'  => 'Something & something'
-				),
-				15 => array(
-					'input'     => array('news_category', '2', '0'),
-					'expected'  => array('news_category', '2', '0')
-				),
-				16 => array(
-					'input'     => array('my/customer/key'=>'news_category', 3=>'2', 'bla'=>5, 'true'=>true, 'false'=>false, 'empty'=>''),
-					'expected'  => array('my/customer/key'=>'news_category', 3=>'2', 'bla'=>5, 'true'=>true, 'false'=>false, 'empty'=>''),
-				),
-				17 => array(
-					'input'     => array('Some long string & stuff'=> 0, 'other'=>null, 'extra'=>0.3, 'null'=>null),
-					'expected'  => array('Some long string & stuff'=> 0, 'other'=>null, 'extra'=>0.3, 'null'=>null),
-				),
+		$tests = array(
+			0  => array(
+				'input'    => " '<svg/onload=prompt(1)//'
+			),
+			1  => array(
+				'input'    => "some plain text with a\nline break",
+				'expected' => "some plain text with a\nline break"
+			),
+			2  => array(
+				'input'    => "some [b]text[/b] with bbcodes",
+				'expected' => "some [b]text[/b] with bbcodes"
+			),
+			3  => array(
+				'input'    => 'some "quoted text" with a $ sign',
+				'expected' => "some "quoted text" with a $ sign"
+			),
+			4  => array(
+				'input'    => 'some 
      simple html
      link',
+				'expected' => 'some 
      simple html
      link'
+			),
+			5  => array(
+				'input'    => "[img]http://something.com[/img]",
+				'expected' => "[img]http://something.com[/img]"
+			),
+			6  => array(
+				'input'    => "
      日本語 简体中文
      ",
+				'expected' => "
      日本語 简体中文
      "
+			),
+			7  => array(
+				'input'    => "",
+				'expected' => "" // stripped xss
+			),
+			8  => array(
+				'input'    => '
      Hi there
      ',
+				'expected' => '
      Hi there
      '
+			),
+			9  => array(
+				'input'    => '',
+				'expected' => ""
+			),
+			10 => array(
+				'input'    => '
      ',
+				'expected' => '
      '),
+			11 => array(
+				'input'    => 'Test',
+				'expected' => 'Test'
+			),
+			12 => array(
+				'input'    => "From here > to there",
+				'expected' => "From here > to there"
+			),
+			13 => array(
+				'input'    => "[html]
      Hello World!
      [/html]",
+				'expected' => '[html]
      Hello World!
      [/html]'
+			),
+			14 => array(
+				'input'    => "Something & something",
+				'expected' => 'Something & something'
+			),
+			15 => array(
+				'input'    => array('news_category', '2', '0'),
+				'expected' => array('news_category', '2', '0')
+			),
+			16 => array(
+				'input'    => array('my/customer/key' => 'news_category', 3 => '2', 'bla' => 5, 'true' => true, 'false' => false, 'empty' => ''),
+				'expected' => array('my/customer/key' => 'news_category', 3 => '2', 'bla' => 5, 'true' => true, 'false' => false, 'empty' => ''),
+			),
+			17 => array(
+				'input'    => array('Some long string & stuff' => 0, 'other' => null, 'extra' => 0.3, 'null' => null),
+				'expected' => array('Some long string & stuff' => 0, 'other' => null, 'extra' => 0.3, 'null' => null),
+			),
 			/*	18 => array(
 					'input'     => '">',
 					'expected'  => '',
 					'mode'      => 'model',
 					'parm'      => array('type'=>'text', 'field'=>'news_title')
 				),*/
-				19  => array( // admin log simulation
-					'input'     => "Array[!br!]([!br!]    [0] => zero[!br!]    [1] => one[!br!]    [2] => two[!br!])[!br!]",
-					'expected'  => "Array[!br!]([!br!]    [0] => zero[!br!]    [1] => one[!br!]    [2] => two[!br!])[!br!]",
-					'mode'      => 'no_html',
-				),
-				20  => array(
-					'input'     => '\\',
-					'expected'  => '\',
-					'mode'      => 'no_html',
-				),
-				21 => array(
-					'input'     => 'Hello',
-					'expected'  => '<a href="">Hello</a>',
-					'mode'      => 'no_html',
-				),
-				22 => array(
-					'input'     => '< 200',
-					'expected'  => '< 200',
-				),
-				23 => array(
-					'input'     => '[html]
      echo {e_BASE}."index.php";
      [/html]',
-					'expected'  => '[html]
      echo {e_BASE}."index.php";
      [/html]'
-				),
-				24 => array(
-					'input'     => '[html]echo {e_BASE}."index.php";[/html]',
-					'expected'  => '[html]echo {e_BASE}."index.php";[/html]'
-				),
-				25 => array(
-					'input'     => '[html][/html]',
-					'expected'  => '[html]""[/html]'
-				),
-				26 => array(
-				    'input'     => "[html]function sc_my_shortcode(){\nreturn \"Something\";}[/html]",
-				    'expected'  => "[html]function sc_my_shortcode(){\nreturn "Something";}[/html]"
-                ),
-                27 => array(
-                    'input'     =>"[html]
      require_once(\"class2.php\");\nrequire_once(HEADERF);\necho \"test\";<br>\nrequire_once(FOOTERF);
      ",
-                    'expected'  =>"[html]
      require_once("class2.php");\nrequire_once(HEADERF);\necho "test";<br>\nrequire_once(FOOTERF);
      ",
+			19 => array( // admin log simulation
+				'input'    => "Array[!br!]([!br!]    [0] => zero[!br!]    [1] => one[!br!]    [2] => two[!br!])[!br!]",
+				'expected' => "Array[!br!]([!br!]    [0] => zero[!br!]    [1] => one[!br!]    [2] => two[!br!])[!br!]",
+				'mode'     => 'no_html',
+			),
+			20 => array(
+				'input'    => '\\',
+				'expected' => '\',
+				'mode'     => 'no_html',
+			),
+			21 => array(
+				'input'    => 'Hello',
+				'expected' => '<a href="">Hello</a>',
+				'mode'     => 'no_html',
+			),
+			22 => array(
+				'input'    => '< 200',
+				'expected' => '< 200',
+			),
+			23 => array(
+				'input'    => '[html]
      echo {e_BASE}."index.php";
      [/html]',
+				'expected' => '[html]
      echo {e_BASE}."index.php";
      [/html]'
+			),
+			24 => array(
+				'input'    => '[html]echo {e_BASE}."index.php";[/html]',
+				'expected' => '[html]echo {e_BASE}."index.php";[/html]'
+			),
+			25 => array(
+				'input'    => '[html][/html]',
+				'expected' => '[html]""[/html]'
+			),
+			26 => array(
+				'input'    => "[html]function sc_my_shortcode(){\nreturn \"Something\";}[/html]",
+				'expected' => "[html]function sc_my_shortcode(){\nreturn "Something";}[/html]"
+			),
+			27 => array(
+				'input'    => "[html]
      require_once(\"class2.php\");\nrequire_once(HEADERF);\necho \"test\";<br>\nrequire_once(FOOTERF);
      ",
+				'expected' => "[html]
      require_once("class2.php");\nrequire_once(HEADERF);\necho "test";<br>\nrequire_once(FOOTERF);
      ",
 
-                ),
-                28 => array(
-                    'html'      => "
      {THEME_PREF: code=header_width&default=container}
      ",
-                    'expected'  => "
      {THEME_PREF: code=header_width&default=container}
      ",
-                ),
+			),
+			28 => array(
+				'html'     => "
      {THEME_PREF: code=header_width&default=container}
      ",
+				'expected' => "
      {THEME_PREF: code=header_width&default=container}
      ",
+			),
 
-                29 => array(
-                    'html'      => "
      /* {THEME_PREF: code=header_width&default=container} */
      ",
-                    'expected'  => "
      /* {THEME_PREF: code=header_width&default=container} */
      ",
-                ),
+			29 => array(
+				'html'     => "
      /* {THEME_PREF: code=header_width&default=container} */
      ",
+				'expected' => "
      /* {THEME_PREF: code=header_width&default=container} */
      ",
+			),
 
-                30 => array(
-                    'html'      => "
      ",
-                    'expected'  => "
      ",
-                ),
+			30 => array(
+				'html'     => "
      ",
+				'expected' => "
      ",
+			),
 
-			);
+		);
 
-			foreach($tests as $k=>$var)
+		foreach ($tests as $k => $var)
+		{
+			if (empty($var['input']))
 			{
-				if(empty($var['input']))
-				{
-					continue;
-				}
+				continue;
+			}
 
-				$mode = varset($var['mode']);
-				$parm = varset($var['parm']);
+			$mode = varset($var['mode']);
+			$parm = varset($var['parm']);
 
-				$result = $this->tp->toDB($var['input'], false, false, $mode, $parm);
-				$this->assertSame($var['expected'], $result, 'Test #'.$k." failed.". print_r($this->tp->getRemoved(),true));
+			$result = $this->tp->toDB($var['input'], false, false, $mode, $parm);
+			$this->assertSame($var['expected'], $result, 'Test #' . $k . " failed." . print_r($this->tp->getRemoved(), true));
+
+		}
+
+
+	}
+
+	/*
+
+			public function testToJSONhelper()
+			{
 
 			}
 
+			public function testToJSON()
+			{
+
+			}
+	*/
+	public function testPostToForm()
+	{
+		$text = "
      My Test
      ";
+		$expected = '<div class='something'>My Test</div>';
+		$result = $this->tp->post_toForm($text);
+		$this->assertSame($expected, $result);
+
+		$array = array($text);
+		$arrayExp = array($expected);
+		$result = $this->tp->post_toForm($array);
+		$this->assertSame($arrayExp, $result);
 
 
-		}
-/*
+	}
 
-		public function testToJSONhelper()
-		{
+	public function testHtml_truncate()
+	{
+		$this->tp->setMultibyte(true);
 
-		}
-
-		public function testToJSON()
-		{
-
-		}
-*/
-		public function testPostToForm()
-		{
-			$text = "
      My Test
      ";
-			$expected = '<div class='something'>My Test</div>';
-			$result = $this->tp->post_toForm($text);
-			$this->assertSame($expected, $result);
-
-			$array = array($text);
-			$arrayExp = array($expected);
-			$result = $this->tp->post_toForm($array);
-			$this->assertSame($arrayExp, $result);
-
-
-		}
-
-		public function testHtml_truncate()
-		{
-			$this->tp->setMultibyte(true);
-
-			$tests  = array(
-				0   => array(
-					'input'     => '
      Lorem ipsum dolor sit amet.
      ',
-					'expected'  => '
      Lorem ipsum dolor...
      ',
-				),
-				1   => array(
-					'input'     => '
      Lorem ipsum dolor sit amet.
      ',
-					'expected'  => '
      Lorem ipsum dolor...
      ',
-				),
-				2   => array(
-					'input'     => '
      Lorem ipsum  dolor sit amet.
      ',
-					'expected'  => '
      Lorem ipsum  dolo...
      ',
-				),
-				3   => array(
-					'input'     => '
      Это предложение на русском языке
      ',
-					'expected'  => '
      Это предложение н...
      ',
-				),
-				4   => array(
-					'input'     => '
      Lorem ipsum & dolor sit amet.
      ',
-					'expected'  => '
      Lorem ipsum & dol...
      ',
-				),
-				5   => array(
-					'input'     => '
      Это предложение на русском языке
      ',
-					'expected'  => '
      Это предложение...
      ',
-					'exact'     => false,
-				),
+		$tests = array(
+			0 => array(
+				'input'    => '
      Lorem ipsum dolor sit amet.
      ',
+				'expected' => '
      Lorem ipsum dolor...
      ',
+			),
+			1 => array(
+				'input'    => '
      Lorem ipsum dolor sit amet.
      ',
+				'expected' => '
      Lorem ipsum dolor...
      ',
+			),
+			2 => array(
+				'input'    => '
      Lorem ipsum  dolor sit amet.
      ',
+				'expected' => '
      Lorem ipsum  dolo...
      ',
+			),
+			3 => array(
+				'input'    => '
      Это предложение на русском языке
      ',
+				'expected' => '
      Это предложение н...
      ',
+			),
+			4 => array(
+				'input'    => '
      Lorem ipsum & dolor sit amet.
      ',
+				'expected' => '
      Lorem ipsum & dol...
      ',
+			),
+			5 => array(
+				'input'    => '
      Это предложение на русском языке
      ',
+				'expected' => '
      Это предложение...
      ',
+				'exact'    => false,
+			),
 			/*	6   => array(
 					'input'     => '
      Lorem
       ipsum dolor sit amet',
 					'expected'  => '',
 				),
 				*/
 
-			);
+		);
 
-			foreach($tests as $index => $var)
+		foreach ($tests as $index => $var)
+		{
+			if (empty($var['input']))
 			{
-				if(empty($var['input']))
-				{
-					continue;
-				}
-
-				$exact = isset($var['exact']) ? $var['exact']: true;
-				$result = $this->tp->html_truncate($var['input'], 17, '...', $exact);
-
-				if(empty($var['expected']))
-				{
-					echo $result."\n\n";
-					continue;
-				}
-
-				$this->assertSame($var['expected'], $result, "Failed on test #".$index);
+				continue;
 			}
 
+			$exact = isset($var['exact']) ? $var['exact'] : true;
+			$result = $this->tp->html_truncate($var['input'], 17, '...', $exact);
 
-		}
-/*
-		public function testCheckHighlighting()
-		{
-
-		}
-
-		public function testThumbWidth()
-		{
-
-		}
-*/
-		public function testReplaceConstants()
-		{
-			$tests = array(
-				0 => array(
-					'path'  => '{e_BASE}news',
-					'type'  => 'abs',
-					'match' => e_HTTP,
-				),
-				1 => array(
-					'path'  => '{e_BASE}news.php',
-					'type'  => 'full',
-					'match' => 'https://localhost/e107/news.php',
-				),
-				2 => array(
-					'path'  => '{e_PLUGIN}news/index.php',
-					'type'  => null,
-					'match' => 'e107_plugins/news/index.php',
-				),
-			);
-
-
-			foreach($tests as $var)
+			if (empty($var['expected']))
 			{
-				$actual = $this->tp->replaceConstants($var['path'],$var['type']);
-				$this->assertStringContainsString($var['match'], $actual);
+				echo $result . "\n\n";
+				continue;
 			}
-			
+
+			$this->assertSame($var['expected'], $result, "Failed on test #" . $index);
 		}
-/*
-		public function testHtmlwrap()
-		{
-			$html = "
      My paragraph bold
      ";
 
-			$result = $this->tp->htmlwrap($html, 20);
-		}*/
 
-		public function testToRss()
+	}
+
+	/*
+			public function testCheckHighlighting()
+			{
+
+			}
+
+			public function testThumbWidth()
+			{
+
+			}
+	*/
+	public function testReplaceConstants()
+	{
+		$tests = array(
+			0 => array(
+				'path'  => '{e_BASE}news',
+				'type'  => 'abs',
+				'match' => e_HTTP,
+			),
+			1 => array(
+				'path'  => '{e_BASE}news.php',
+				'type'  => 'full',
+				'match' => 'https://localhost/e107/news.php',
+			),
+			2 => array(
+				'path'  => '{e_PLUGIN}news/index.php',
+				'type'  => null,
+				'match' => 'e107_plugins/news/index.php',
+			),
+		);
+
+
+		foreach ($tests as $var)
 		{
+			$actual = $this->tp->replaceConstants($var['path'], $var['type']);
+			$this->assertStringContainsString($var['match'], $actual);
+		}
+
+	}
+
+	/*
+			public function testHtmlwrap()
+			{
+				$html = "
      My paragraph bold
      ";
+
+				$result = $this->tp->htmlwrap($html, 20);
+			}*/
+
+	public function testToRss()
+	{
 		/*	if(PHP_VERSION_ID <  71000 )
 			{
 				$this->markTestSkipped("testToRSS() skipped. Requires a healthy libxml installation");
 				return null;
 			}*/
 
-			$tests = array(
-				'[html]
      </p><p><core name="e_jslib_plugin"><![CDATA[Array]]></core></p><p><core name="e_jslib_theme"><![CDATA[Array]]></core>
      [/html]',
-				'
      One & Two < and > " or \'
      ',
-			);
+		$tests = array(
+			'[html]
      </p><p><core name="e_jslib_plugin"><![CDATA[Array]]></core></p><p><core name="e_jslib_theme"><![CDATA[Array]]></core>
      [/html]',
+			'
      One & Two < and > " or \'
      ',
+		);
 
-			foreach($tests as $html)
-			{
+		foreach ($tests as $html)
+		{
 
-				$result = $this->tp->toRss($html, true);
-				$valid = $this->isValidXML($result);
+			$result = $this->tp->toRss($html, true);
+			$valid = $this->isValidXML($result);
 
-				$this->assertTrue($valid);
-			}
-
-
-			// Test with $tags = false;
-			$html = '
      One & Two < and > " or \'
      ';
-			$result = $this->tp->toRss($html);
-			$this->assertSame("One & Two < and > \" or '", $result);
-			$valid = $this->isValidXML(''.$result.'');
 			$this->assertTrue($valid);
-
-
 		}
 
-		private function isValidXML($xmlContent)
-	    {
-	        if (trim($xmlContent) == '')
-	        {
-	            return false;
-	        }
 
-	        $xmlContent = ''."\n".''.$xmlContent.'';
-
-	        libxml_use_internal_errors(true);
-	        libxml_clear_errors();
-
-	        $doc = new DOMDocument('1.0', 'utf-8');
-	        $doc->loadXML($xmlContent);
-
-	        $errors = libxml_get_errors();
-
-	        if(!empty($errors))
-	        {
-	            codecept_debug($errors);
-	        }
-
-	        libxml_clear_errors();
-
-	        return empty($errors);
-	    }
+		// Test with $tags = false;
+		$html = '
      One & Two < and > " or \'
      ';
+		$result = $this->tp->toRss($html);
+		$this->assertSame("One & Two < and > \" or '", $result);
+		$valid = $this->isValidXML('' . $result . '');
+		$this->assertTrue($valid);
 
 
-/*
-		public function testPreFilter()
+	}
+
+	private function isValidXML($xmlContent)
+	{
+		if (trim($xmlContent) == '')
 		{
-
+			return false;
 		}
-*/
-		public function testThumbUrl()
+
+		$xmlContent = '' . "\n" . '' . $xmlContent . '';
+
+		libxml_use_internal_errors(true);
+		libxml_clear_errors();
+
+		$doc = new DOMDocument('1.0', 'utf-8');
+		$doc->loadXML($xmlContent);
+
+		$errors = libxml_get_errors();
+
+		if (!empty($errors))
 		{
-			$urls = array(
-				0 => array(
-					'path'      => '{e_PLUGIN}gallery/images/butterfly.jpg',
-					'options'   =>  array('w'=>300, 'h'=>200),
-					'expected'  =>'/thumb.php?src=e_PLUGIN%2Fgallery%2Fimages%2Fbutterfly.jpg&w=300&h=200'
-					),
-				1 => array(
-					'path'      => '{e_PLUGIN}dummy/Freesample.svg',
-					'options'   =>  array('w'=>300, 'h'=>200),
-					'expected'  =>'/e107_plugins/dummy/Freesample.svg'
-					),
-				2 => array(
-					'path'      => '{e_PLUGIN}gallery/images/butterfly.jpg',
-					'options'   =>  array('w'=>300, 'h'=>200, 'type'=>'webp'),
-					'expected'  =>'/thumb.php?src=e_PLUGIN%2Fgallery%2Fimages%2Fbutterfly.jpg&w=300&h=200&type=webp'
-					),
-				3 => array(
-					'path'      => '{e_PLUGIN}gallery/images/butterfly.jpg',
-					'options'   =>  array('w'=>300, 'h'=>200, 'scale'=>'2x'),
-					'expected'  =>'/thumb.php?src=e_PLUGIN%2Fgallery%2Fimages%2Fbutterfly.jpg&w=600&h=400'
-					),
-				4 => array(
-					'path'      => '{e_PLUGIN}gallery/images/horse.jpg',
-					'options'   =>  array('w'=>300, 'h'=>200, 'scale'=>'2x', 'type'=>'webp'),
-					'expected'  =>'/thumb.php?src=e_PLUGIN%2Fgallery%2Fimages%2Fhorse.jpg&w=600&h=400&type=webp'
-					),
+			codecept_debug($errors);
+		}
 
-			);
+		libxml_clear_errors();
 
-			foreach($urls as $val)
+		return empty($errors);
+	}
+
+
+	/*
+			public function testPreFilter()
 			{
 
-				$actual = $this->tp->thumbUrl($val['path'],$val['options']);
-
-				$this->assertStringContainsString($val['expected'], $actual);
-				//echo $$actual."\n\n";
 			}
+	*/
+	public function testThumbUrl()
+	{
+		$urls = array(
+			0 => array(
+				'path'     => '{e_PLUGIN}gallery/images/butterfly.jpg',
+				'options'  => array('w' => 300, 'h' => 200),
+				'expected' => '/thumb.php?src=e_PLUGIN%2Fgallery%2Fimages%2Fbutterfly.jpg&w=300&h=200'
+			),
+			1 => array(
+				'path'     => '{e_PLUGIN}dummy/Freesample.svg',
+				'options'  => array('w' => 300, 'h' => 200),
+				'expected' => '/e107_plugins/dummy/Freesample.svg'
+			),
+			2 => array(
+				'path'     => '{e_PLUGIN}gallery/images/butterfly.jpg',
+				'options'  => array('w' => 300, 'h' => 200, 'type' => 'webp'),
+				'expected' => '/thumb.php?src=e_PLUGIN%2Fgallery%2Fimages%2Fbutterfly.jpg&w=300&h=200&type=webp'
+			),
+			3 => array(
+				'path'     => '{e_PLUGIN}gallery/images/butterfly.jpg',
+				'options'  => array('w' => 300, 'h' => 200, 'scale' => '2x'),
+				'expected' => '/thumb.php?src=e_PLUGIN%2Fgallery%2Fimages%2Fbutterfly.jpg&w=600&h=400'
+			),
+			4 => array(
+				'path'     => '{e_PLUGIN}gallery/images/horse.jpg',
+				'options'  => array('w' => 300, 'h' => 200, 'scale' => '2x', 'type' => 'webp'),
+				'expected' => '/thumb.php?src=e_PLUGIN%2Fgallery%2Fimages%2Fhorse.jpg&w=600&h=400&type=webp'
+			),
 
+		);
 
+		foreach ($urls as $val)
+		{
+
+			$actual = $this->tp->thumbUrl($val['path'], $val['options']);
+
+			$this->assertStringContainsString($val['expected'], $actual);
+			//echo $$actual."\n\n";
 		}
 
-		public function testThumbUrlSEF()
+
+	}
+
+	public function testThumbUrlSEF()
+	{
+		$urls = array(
+			0 => array(
+				'path'     => '{e_MEDIA_IMAGE}butterfly.jpg',
+				'options'  => array('w' => 300, 'h' => 200),
+				'expected' => '/media/img/300x200/butterfly.jpg'
+			),
+			1 => array(
+				'path'     => '{e_THEME}dummy/Freesample.svg',
+				'options'  => array('w' => 300, 'h' => 200),
+				'expected' => '/theme/img/300x200/dummy/Freesample.svg'
+			),
+			2 => array(
+				'path'     => '{e_AVATAR}avatar.jpg',
+				'options'  => array('w' => 100, 'h' => 100),
+				'expected' => '/media/avatar/100x100/avatar.jpg'
+			),
+
+			/*2 => array(
+				'path'      => '{e_MEDIA_IMAGE}gallery/images/butterfly.jpg',
+				'options'   =>  array('w'=>300, 'h'=>200, 'type'=>'webp'),
+				'expected'  =>'/media/img/300x200/gallery/images/butterfly.webp'
+				),*/
+			3 => array(
+				'path'     => '{e_MEDIA_IMAGE}gallery/images/butterfly.jpg',
+				'options'  => array('w' => 300, 'h' => 200, 'scale' => '2x'),
+				'expected' => '/media/img/600x400/gallery/images/butterfly.jpg'
+			),
+
+		);
+
+		foreach ($urls as $val)
 		{
-			$urls = array(
-				0 => array(
-					'path'      => '{e_MEDIA_IMAGE}butterfly.jpg',
-					'options'   =>  array('w'=>300, 'h'=>200),
-					'expected'  =>'/media/img/300x200/butterfly.jpg'
-					),
-				1 => array(
-					'path'      => '{e_THEME}dummy/Freesample.svg',
-					'options'   =>  array('w'=>300, 'h'=>200),
-					'expected'  =>'/theme/img/300x200/dummy/Freesample.svg'
-					),
-				2 => array(
-					'path'      => '{e_AVATAR}avatar.jpg',
-					'options'   =>  array('w'=>100, 'h'=>100),
-					'expected'  =>'/media/avatar/100x100/avatar.jpg'
-					),
+			$actual = $this->tp->thumbUrlSEF($val['path'], $val['options']);
+			$this->assertStringContainsString($val['expected'], $actual);
+			//echo $$actual."\n\n";
+		}
 
-				/*2 => array(
-					'path'      => '{e_MEDIA_IMAGE}gallery/images/butterfly.jpg',
-					'options'   =>  array('w'=>300, 'h'=>200, 'type'=>'webp'),
-					'expected'  =>'/media/img/300x200/gallery/images/butterfly.webp'
-					),*/
-				3 => array(
-					'path'      => '{e_MEDIA_IMAGE}gallery/images/butterfly.jpg',
-					'options'   =>  array('w'=>300, 'h'=>200, 'scale'=>'2x'),
-					'expected'  =>'/media/img/600x400/gallery/images/butterfly.jpg'
-					),
 
-			);
+	}
 
-			foreach($urls as $val)
+	/*
+			public function testParseBBCodes()
 			{
-				$actual = $this->tp->thumbUrlSEF($val['path'],$val['options']);
-				$this->assertStringContainsString($val['expected'], $actual);
-				//echo $$actual."\n\n";
+
 			}
 
+			public function testGetEmotes()
+			{
 
+			}
 
+			public function testThumbHeight()
+			{
 
+			}
 
+			public function testDataFilter()
+			{
 
-		}
-/*
-		public function testParseBBCodes()
+			}
+	*/
+	public function testToAttributeReplaceConstants()
+	{
+		$input = "This is e_THEME: {e_THEME}";
+		$expected = "This is e_THEME: ./e107_themes/";
+
+		$actual = $this->tp->toAttribute($input);
+
+		$this->assertEquals($expected, $actual);
+	}
+
+	public function testToAttributeDoesNotReplaceConstantsWhenStringHasSingleQuote()
+	{
+		$input = "This isn't e_THEME: {e_THEME}";
+		$expected = "This isn't e_THEME: {e_THEME}";
+
+		$actual = $this->tp->toAttribute($input);
+
+		$this->assertEquals($expected, $actual);
+	}
+
+	public function testToAttributeDoesReplaceConstantsWhenStringHasLeftAngleBracket()
+	{
+		$input = "{e_THEME} <-- e_THEME";
+		$expected = "./e107_themes/ <-- e_THEME";
+
+		$actual = $this->tp->toAttribute($input);
+
+		$this->assertEquals($expected, $actual);
+	}
+
+	public function testToAttributeExplicitPure()
+	{
+		$input = "{e_THEME} <-- Not e_THEME";
+		$expected = "{e_THEME} <-- Not e_THEME";
+
+		$actual = $this->tp->toAttribute($input, true);
+
+		$this->assertEquals($expected, $actual);
+	}
+
+	public function testToAttributeImplicitPure()
+	{
+		$input = "\"It's a Wonderful Life (1946)\"";
+		$expected = ""It's a Wonderful Life (1946)"";
+
+		$actual = $this->tp->toAttribute($input);
+
+		$this->assertEquals($expected, $actual);
+	}
+
+	public function testToAttributesEmpty()
+	{
+		$input = [];
+		$expected = "";
+
+		$actual = $this->tp->toAttributes($input);
+
+		$this->assertEquals($expected, $actual);
+	}
+
+	public function testToAttributesOne()
+	{
+		$input = ["href" => "https://e107.org"];
+		$expected = " href='https://e107.org'";
+
+		$actual = $this->tp->toAttributes($input);
+
+		$this->assertEquals($expected, $actual);
+	}
+
+	public function testToAttributesMixedPureAndReplaceConstants()
+	{
+		$input = [
+			"href"  => "{e_THEME}",
+			"title" => "I would say, \"I'm the e_THEME folder!\"",
+			"alt"   => "'{e_THEME}'",
+		];
+		$expected = " href='./e107_themes/'" .
+			" title='I would say, "I'm the e_THEME folder!"'" .
+			" alt=''{e_THEME}''";
+
+		$actual = $this->tp->toAttributes($input);
+
+		$this->assertEquals($expected, $actual);
+	}
+
+	public function testThumbCacheFile()
+	{
+		$tests = array(
+			0 => array(
+				'file'     => 'e107_plugins/gallery/images/butterfly.jpg',
+				'options'  => array('w' => 222, 'h' => 272, 'aw' => 0, 'ah' => 0, 'c' => 0,),
+				'expected' => array('prefix' => 'thumb_butterfly_', 'suffix' => '.jpg.cache.bin'),
+			),
+			1 => array(
+				'file'     => 'e107_plugins/gallery/images/butterfly.jpg',
+				'options'  => array('w' => 222, 'h' => 272, 'aw' => 0, 'ah' => 0, 'c' => 0, 'type' => 'webp'),
+				'expected' => array('prefix' => 'thumb_butterfly_', 'suffix' => '.webp.cache.bin'),
+			),
+
+		);
+
+		foreach ($tests as $var)
 		{
 
+			$result = $this->tp->thumbCacheFile($var['file'], $var['options']);
+
+			$this->assertStringStartsWith($var['expected']['prefix'], $result);
+			$this->assertStringEndsWith($var['expected']['suffix'], $result);
+
 		}
 
-		public function testGetEmotes()
-		{
 
-		}
+	}
 
-		public function testThumbHeight()
-		{
+	public function testText_truncate()
+	{
+		$string = "This is a long string that will be truncated.";
+		$result = $this->tp->text_truncate($string, 20);
+		$this->assertSame('This is a long  ... ', $result);
 
-		}
+		$string = "This is has something & something";
+		$result = $this->tp->text_truncate($string, 29);
+		$this->assertSame('This is has something &  ... ', $result);
 
-		public function testDataFilter()
-		{
+		$string = "Can't fail me now [b]Bold[/b]";
+		$result = $this->tp->text_truncate($string, 25);
+		$this->assertSame("Can't fail me now Bold", $result);
 
-		}
+		$string = "Can't fail me now Bold";
+		$result = $this->tp->text_truncate($string, 25);
+		$this->assertSame("Can't fail me now Bold", $result);
 
-		public function testToAttribute()
-		{
+	}
 
-		}
-*/
-		public function testThumbCacheFile()
-		{
-			$tests = array(
-				0 => array(
-					'file'      => 'e107_plugins/gallery/images/butterfly.jpg',
-					'options'   => array ('w' => 222, 'h' => 272, 'aw' => 0, 'ah' => 0, 'c' => 0,),
-					'expected' => array('prefix'=>'thumb_butterfly_', 'suffix'=>'.jpg.cache.bin'),
+	public function testTruncate()
+	{
+		// html
+		$string = "Can't fail me now Bold";
+		$result = $this->tp->truncate($string, 25);
+		$this->assertSame("Can't fail me now Bold", $result); // html ignored in char count.
+
+		// bbcode - stripped.
+		$string = "Can't fail me now [b]Bold[/b]";
+		$result = $this->tp->truncate($string, 25);
+		$this->assertSame("Can't fail me now Bold", $result);
+
+		// text
+		$string = "This is a long string that will be truncated.";
+		$result = $this->tp->truncate($string, 20);
+		$this->assertSame('This is a long st...', $result);
+
+	}
+
+	/*
+			public function testSetThumbSize()
+			{
+
+			}
+
+			public function testToJS()
+			{
+
+			}
+	*/
+	public function testSimpleParse()
+	{
+		$vars = array(
+			'CONTACT_SUBJECT' => "My Subject",
+			'CONTACT_PERSON'  => "My Name"
+		);
+
+		$template = "{CONTACT_SUBJECT} {CONTACT_PERSON}{MISSING_SHORTCODE}";
+
+		$result = $this->tp->simpleParse($template, $vars);
+		$this->assertEquals("My Subject My Name", $result);
+
+		$result = $this->tp->simpleParse($template, null);
+		$this->assertEquals(" ", $result);
+
+
+		$vars = array(
+			'aaBB_123' => "Simple Replacement"
+		);
+
+		$template = "-- {aaBB_123} --";
+		$result = $this->tp->simpleParse($template, $vars);
+		$this->assertEquals('-- Simple Replacement --', $result);
+
+	}
+
+	public function testGetModifierList()
+	{
+		$expected = array(
+			'TITLE'        =>
+				array(
+					'context'      => 'TITLE',
+					'fromadmin'    => false,
+					'emotes'       => false,
+					'defs'         => true,
+					'constants'    => false,
+					'hook'         => true,
+					'scripts'      => true,
+					'link_click'   => false,
+					'link_replace' => true,
+					'parse_sc'     => true,
+					'no_tags'      => false,
+					'value'        => false,
+					'nobreak'      => true,
+					'retain_nl'    => true,
 				),
-				1 => array(
-					'file'      => 'e107_plugins/gallery/images/butterfly.jpg',
-					'options'   => array ('w' => 222, 'h' => 272, 'aw' => 0, 'ah' => 0, 'c' => 0, 'type'=>'webp'),
-					'expected' => array('prefix'=>'thumb_butterfly_', 'suffix'=>'.webp.cache.bin'),
+			'TITLE_PLAIN'  =>
+				array(
+					'context'      => 'TITLE_PLAIN',
+					'fromadmin'    => false,
+					'emotes'       => false,
+					'defs'         => true,
+					'constants'    => false,
+					'hook'         => true,
+					'scripts'      => true,
+					'link_click'   => false,
+					'link_replace' => true,
+					'parse_sc'     => true,
+					'no_tags'      => true,
+					'value'        => false,
+					'nobreak'      => true,
+					'retain_nl'    => true,
 				),
+			'USER_TITLE'   =>
+				array(
+					'context'      => 'USER_TITLE',
+					'fromadmin'    => false,
+					'emotes'       => false,
+					'defs'         => false,
+					'constants'    => false,
+					'hook'         => false,
+					'scripts'      => false,
+					'link_click'   => false,
+					'link_replace' => true,
+					'parse_sc'     => false,
+					'no_tags'      => false,
+					'value'        => false,
+					'nobreak'      => true,
+					'retain_nl'    => true,
+				),
+			'E_TITLE'      =>
+				array(
+					'context'      => 'E_TITLE',
+					'fromadmin'    => false,
+					'emotes'       => false,
+					'defs'         => true,
+					'constants'    => false,
+					'hook'         => true,
+					'scripts'      => false,
+					'link_click'   => false,
+					'link_replace' => true,
+					'parse_sc'     => true,
+					'no_tags'      => false,
+					'value'        => false,
+					'nobreak'      => true,
+					'retain_nl'    => true,
+				),
+			'SUMMARY'      =>
+				array(
+					'context'      => 'SUMMARY',
+					'fromadmin'    => false,
+					'emotes'       => true,
+					'defs'         => true,
+					'constants'    => 'full',
+					'hook'         => true,
+					'scripts'      => true,
+					'link_click'   => true,
+					'link_replace' => true,
+					'parse_sc'     => true,
+					'no_tags'      => false,
+					'value'        => false,
+					'nobreak'      => false,
+					'retain_nl'    => false,
+				),
+			'DESCRIPTION'  =>
+				array(
+					'context'      => 'DESCRIPTION',
+					'fromadmin'    => false,
+					'emotes'       => true,
+					'defs'         => true,
+					'constants'    => 'full',
+					'hook'         => true,
+					'scripts'      => true,
+					'link_click'   => true,
+					'link_replace' => true,
+					'parse_sc'     => true,
+					'no_tags'      => false,
+					'value'        => false,
+					'nobreak'      => false,
+					'retain_nl'    => false,
+				),
+			'BODY'         =>
+				array(
+					'context'      => 'BODY',
+					'fromadmin'    => false,
+					'emotes'       => true,
+					'defs'         => true,
+					'constants'    => 'full',
+					'hook'         => true,
+					'scripts'      => true,
+					'link_click'   => true,
+					'link_replace' => true,
+					'parse_sc'     => true,
+					'no_tags'      => false,
+					'value'        => false,
+					'nobreak'      => false,
+					'retain_nl'    => false,
+				),
+			'WYSIWYG'      =>
+				array(
+					'context'      => 'WYSIWYG',
+					'fromadmin'    => false,
+					'emotes'       => true,
+					'defs'         => false,
+					'constants'    => false,
+					'hook'         => false,
+					'scripts'      => true,
+					'link_click'   => false,
+					'link_replace' => false,
+					'parse_sc'     => false,
+					'no_tags'      => false,
+					'value'        => false,
+					'nobreak'      => false,
+					'retain_nl'    => true,
+				),
+			'USER_BODY'    =>
+				array(
+					'context'      => 'USER_BODY',
+					'fromadmin'    => false,
+					'emotes'       => true,
+					'defs'         => false,
+					'constants'    => 'full',
+					'hook'         => true,
+					'scripts'      => false,
+					'link_click'   => true,
+					'link_replace' => true,
+					'parse_sc'     => false,
+					'no_tags'      => false,
+					'value'        => false,
+					'nobreak'      => false,
+					'retain_nl'    => false,
+					'nostrip'      => false,
+				),
+			'E_BODY'       =>
+				array(
+					'context'      => 'E_BODY',
+					'fromadmin'    => false,
+					'emotes'       => false,
+					'defs'         => true,
+					'constants'    => 'full',
+					'hook'         => true,
+					'scripts'      => false,
+					'link_click'   => false,
+					'link_replace' => true,
+					'parse_sc'     => true,
+					'no_tags'      => false,
+					'value'        => false,
+					'nobreak'      => false,
+					'retain_nl'    => false,
+				),
+			'E_BODY_PLAIN' =>
+				array(
+					'context'      => 'E_BODY_PLAIN',
+					'fromadmin'    => false,
+					'emotes'       => false,
+					'defs'         => true,
+					'constants'    => 'full',
+					'hook'         => true,
+					'scripts'      => false,
+					'link_click'   => false,
+					'link_replace' => true,
+					'parse_sc'     => true,
+					'no_tags'      => true,
+					'value'        => false,
+					'nobreak'      => false,
+					'retain_nl'    => true,
+				),
+			'LINKTEXT'     =>
+				array(
+					'context'      => 'LINKTEXT',
+					'fromadmin'    => false,
+					'emotes'       => false,
+					'defs'         => true,
+					'constants'    => false,
+					'hook'         => false,
+					'scripts'      => true,
+					'link_click'   => false,
+					'link_replace' => true,
+					'parse_sc'     => true,
+					'no_tags'      => false,
+					'value'        => false,
+					'nobreak'      => true,
+					'retain_nl'    => true,
+				),
+			'RAWTEXT'      =>
+				array(
+					'context'      => 'RAWTEXT',
+					'fromadmin'    => false,
+					'emotes'       => false,
+					'defs'         => false,
+					'constants'    => false,
+					'hook'         => false,
+					'scripts'      => true,
+					'link_click'   => false,
+					'link_replace' => true,
+					'parse_sc'     => false,
+					'no_tags'      => true,
+					'value'        => false,
+					'nobreak'      => true,
+					'retain_nl'    => true,
+				),
+			'NODEFAULT'    => array(
+				'context'      => 'NODEFAULT',
+				'fromadmin'    => false,
+				'emotes'       => false,
+				'defs'         => false,
+				'constants'    => false,
+				'hook'         => false,
+				'scripts'      => false,
+				'link_click'   => false,
+				'link_replace' => false,
+				'parse_sc'     => false,
+				'no_tags'      => false,
+				'value'        => false,
+				'nobreak'      => false,
+				'retain_nl'    => false,
+			)
+		);
 
-			);
+		$list = $this->tp->getModifierList('super');
+		$this->assertSame($expected, $list);
 
-			foreach($tests as $var)
+
+	}
+
+	public function testToText()
+	{
+		$arr = array(
+			0 => array('html' => "
      My Caption
      ", 'expected' => 'My Caption'),
+			1 => array('html' => "", 'expected' => 'My Caption'),
+			2 => array('html' => 'Line 1
      Line 2
      Line 3
      ', 'expected' => "Line 1\nLine 2\nLine 3\n"),
+			3 => array('html' => "Line 1
      \nLine 2
      \nLine 3
      ", 'expected' => "Line 1\nLine 2\nLine 3\n"),
+		);
+
+
+		foreach ($arr as $var)
+		{
+			$result = $this->tp->toText($var['html']);
+			$this->assertEquals($var['expected'], $result);
+		}
+
+	}
+
+	/*
+			public function testUstrtolower()
 			{
 
-				$result = $this->tp->thumbCacheFile($var['file'], $var['options']);
-
-				$this->assertStringStartsWith($var['expected']['prefix'], $result);
-				$this->assertStringEndsWith($var['expected']['suffix'], $result);
-
 			}
 
-
-
-
-		}
-
-		public function testText_truncate()
-		{
-			$string = "This is a long string that will be truncated." ;
-			$result = $this->tp->text_truncate($string, 20);
-			$this->assertSame('This is a long  ... ', $result);
-
-			$string = "This is has something & something" ;
-			$result = $this->tp->text_truncate($string, 29);
-			$this->assertSame('This is has something &  ... ', $result);
-
-			$string = "Can't fail me now [b]Bold[/b]";
-			$result = $this->tp->text_truncate($string, 25);
-			$this->assertSame("Can't fail me now Bold", $result);
-
-			$string = "Can't fail me now Bold";
-			$result = $this->tp->text_truncate($string, 25);
-			$this->assertSame("Can't fail me now Bold", $result);
-
-		}
-
-		public function testTruncate()
-		{
-			// html
-			$string = "Can't fail me now Bold";
-			$result = $this->tp->truncate($string, 25);
-			$this->assertSame("Can't fail me now Bold", $result); // html ignored in char count.
-
-			// bbcode - stripped.
-			$string = "Can't fail me now [b]Bold[/b]";
-			$result = $this->tp->truncate($string, 25);
-			$this->assertSame("Can't fail me now Bold", $result);
-
-			// text
-			$string = "This is a long string that will be truncated." ;
-			$result = $this->tp->truncate($string, 20);
-			$this->assertSame('This is a long st...', $result);
-
-		}
-/*
-		public function testSetThumbSize()
-		{
-
-		}
-
-		public function testToJS()
-		{
-
-		}
-*/
-		public function testSimpleParse()
-		{
-			$vars = array(
-				'CONTACT_SUBJECT'=> "My Subject",
-				'CONTACT_PERSON' => "My Name"
-			);
-
-			$template = "{CONTACT_SUBJECT} {CONTACT_PERSON}{MISSING_SHORTCODE}";
-
-			$result = $this->tp->simpleParse($template, $vars);
-			$this->assertEquals("My Subject My Name", $result);
-
-			$result = $this->tp->simpleParse($template, null);
-			$this->assertEquals(" ", $result);
-
-
-			$vars = array(
-				'aaBB_123'   => "Simple Replacement"
-			);
-
-			$template = "-- {aaBB_123} --";
-			$result = $this->tp->simpleParse($template, $vars);
-			$this->assertEquals('-- Simple Replacement --', $result);
-
-		}
-
-		public function testGetModifierList()
-		{
-			$expected = array (
-				'TITLE'        =>
-					 array (
-					 'context'      => 'TITLE',
-					 'fromadmin'    => false,
-					 'emotes'       => false,
-					 'defs'         => true,
-					 'constants'    => false,
-					 'hook'         => true,
-					 'scripts'      => true,
-					 'link_click'   => false,
-					 'link_replace' => true,
-					 'parse_sc'     => true,
-					 'no_tags'      => false,
-					 'value'        => false,
-					 'nobreak'      => true,
-					 'retain_nl'    => true,
-				 ),
-				 'TITLE_PLAIN'  =>
-				    array (
-					 'context'      => 'TITLE_PLAIN',
-					 'fromadmin'    => false,
-					 'emotes'       => false,
-					 'defs'         => true,
-					 'constants'    => false,
-					 'hook'         => true,
-					 'scripts'      => true,
-					 'link_click'   => false,
-					 'link_replace' => true,
-					 'parse_sc'     => true,
-					 'no_tags'      => true,
-					 'value'        => false,
-					 'nobreak'      => true,
-					 'retain_nl'    => true,
-				 ),
-				 'USER_TITLE'   =>
-				 array (
-				 'context'      => 'USER_TITLE',
-				 'fromadmin'    => false,
-				 'emotes'       => false,
-				 'defs'         => false,
-				 'constants'    => false,
-				 'hook'         => false,
-				 'scripts'      => false,
-				 'link_click'   => false,
-				 'link_replace' => true,
-				 'parse_sc'     => false,
-				 'no_tags'      => false,
-				 'value'        => false,
-				 'nobreak'      => true,
-				 'retain_nl'    => true,
-				 ),
-				 'E_TITLE'      =>
-				 array (
-				 'context'      => 'E_TITLE',
-				 'fromadmin'    => false,
-				 'emotes'       => false,
-				 'defs'         => true,
-				 'constants'    => false,
-				 'hook'         => true,
-				 'scripts'      => false,
-				 'link_click'   => false,
-				 'link_replace' => true,
-				 'parse_sc'     => true,
-				 'no_tags'      => false,
-				 'value'        => false,
-				 'nobreak'      => true,
-				 'retain_nl'    => true,
-				 ),
-				 'SUMMARY'      =>
-				 array (
-				 'context'      => 'SUMMARY',
-				 'fromadmin'    => false,
-				 'emotes'       => true,
-				 'defs'         => true,
-				 'constants'    => 'full',
-				 'hook'         => true,
-				 'scripts'      => true,
-				 'link_click'   => true,
-				 'link_replace' => true,
-				 'parse_sc'     => true,
-				 'no_tags'      => false,
-				 'value'        => false,
-				 'nobreak'      => false,
-				 'retain_nl'    => false,
-				 ),
-				 'DESCRIPTION'  =>
-				 array (
-				 'context'      => 'DESCRIPTION',
-				 'fromadmin'    => false,
-				 'emotes'       => true,
-				 'defs'         => true,
-				 'constants'    => 'full',
-				 'hook'         => true,
-				 'scripts'      => true,
-				 'link_click'   => true,
-				 'link_replace' => true,
-				 'parse_sc'     => true,
-				 'no_tags'      => false,
-				 'value'        => false,
-				 'nobreak'      => false,
-				 'retain_nl'    => false,
-				 ),
-				 'BODY'         =>
-				 array (
-				 'context'      => 'BODY',
-				 'fromadmin'    => false,
-				 'emotes'       => true,
-				 'defs'         => true,
-				 'constants'    => 'full',
-				 'hook'         => true,
-				 'scripts'      => true,
-				 'link_click'   => true,
-				 'link_replace' => true,
-				 'parse_sc'     => true,
-				 'no_tags'      => false,
-				 'value'        => false,
-				 'nobreak'      => false,
-				 'retain_nl'    => false,
-				 ),
-				 'WYSIWYG'      =>
-				 array (
-				 'context'      => 'WYSIWYG',
-				 'fromadmin'    => false,
-				 'emotes'       => true,
-				 'defs'         => false,
-				 'constants'    => false,
-				 'hook'         => false,
-				 'scripts'      => true,
-				 'link_click'   => false,
-				 'link_replace' => false,
-				 'parse_sc'     => false,
-				 'no_tags'      => false,
-				 'value'        => false,
-				 'nobreak'      => false,
-				 'retain_nl'    => true,
-				 ),
-				 'USER_BODY'    =>
-				 array (
-				 'context'      => 'USER_BODY',
-				 'fromadmin'    => false,
-				 'emotes'       => true,
-				 'defs'         => false,
-				 'constants'    => 'full',
-				 'hook'         => true,
-				 'scripts'      => false,
-				 'link_click'   => true,
-				 'link_replace' => true,
-				 'parse_sc'     => false,
-				 'no_tags'      => false,
-				 'value'        => false,
-				 'nobreak'      => false,
-				 'retain_nl'    => false,
-				 'nostrip'      => false,
-				 ),
-				 'E_BODY'       =>
-				 array (
-				 'context'      => 'E_BODY',
-				 'fromadmin'    => false,
-				 'emotes'       => false,
-				 'defs'         => true,
-				 'constants'    => 'full',
-				 'hook'         => true,
-				 'scripts'      => false,
-				 'link_click'   => false,
-				 'link_replace' => true,
-				 'parse_sc'     => true,
-				 'no_tags'      => false,
-				 'value'        => false,
-				 'nobreak'      => false,
-				 'retain_nl'    => false,
-				 ),
-				 'E_BODY_PLAIN' =>
-				 array (
-				 'context'      => 'E_BODY_PLAIN',
-				 'fromadmin'    => false,
-				 'emotes'       => false,
-				 'defs'         => true,
-				 'constants'    => 'full',
-				 'hook'         => true,
-				 'scripts'      => false,
-				 'link_click'   => false,
-				 'link_replace' => true,
-				 'parse_sc'     => true,
-				 'no_tags'      => true,
-				 'value'        => false,
-				 'nobreak'      => false,
-				 'retain_nl'    => true,
-				 ),
-				 'LINKTEXT'     =>
-				 array (
-				 'context'      => 'LINKTEXT',
-				 'fromadmin'    => false,
-				 'emotes'       => false,
-				 'defs'         => true,
-				 'constants'    => false,
-				 'hook'         => false,
-				 'scripts'      => true,
-				 'link_click'   => false,
-				 'link_replace' => true,
-				 'parse_sc'     => true,
-				 'no_tags'      => false,
-				 'value'        => false,
-				 'nobreak'      => true,
-				 'retain_nl'    => true,
-				 ),
-				 'RAWTEXT'      =>
-				 array (
-				 'context'      => 'RAWTEXT',
-				 'fromadmin'    => false,
-				 'emotes'       => false,
-				 'defs'         => false,
-				 'constants'    => false,
-				 'hook'         => false,
-				 'scripts'      => true,
-				 'link_click'   => false,
-				 'link_replace' => true,
-				 'parse_sc'     => false,
-				 'no_tags'      => true,
-				 'value'        => false,
-				 'nobreak'      => true,
-				 'retain_nl'    => true,
-				 ),
-				 'NODEFAULT' => array(
-			        'context' => 'NODEFAULT',
-			        'fromadmin' => false,
-			        'emotes' => false,
-			        'defs' => false,
-			        'constants' => false,
-			        'hook' => false,
-			        'scripts' => false,
-			        'link_click' => false,
-			        'link_replace' => false,
-			        'parse_sc' => false,
-			        'no_tags' => false,
-			        'value' => false,
-			        'nobreak' => false,
-			        'retain_nl' => false,
-			        )
-				 );
-
-			$list = $this->tp->getModifierList('super');
-			$this->assertSame($expected, $list);
-
-
-		}
-
-		public function testToText()
-		{
-			$arr = array(
-				0   => array('html'=>"
      My Caption
      ", 'expected' => 'My Caption'),
-				1   => array('html'=>"", 'expected' => 'My Caption'),
-				2   => array('html'=>'Line 1
      Line 2
      Line 3
      ', 'expected'=> "Line 1\nLine 2\nLine 3\n"),
-				3   => array('html'=>"Line 1
      \nLine 2
      \nLine 3
      ", 'expected'=> "Line 1\nLine 2\nLine 3\n"),
-			);
-
-
-			foreach($arr as $var)
+			public function testObfuscate()
 			{
-				$result = $this->tp->toText($var['html']);
-				$this->assertEquals($var['expected'],$result);
+
 			}
 
-		}
-/*
-		public function testUstrtolower()
-		{
-
-		}
-
-		public function testObfuscate()
-		{
-
-		}
-
-		public function testDoReplace()
-		{
-
-		}
-*/
-		public function testStaticUrl()
-		{
-
-			$tests = array(
-				0   => array(
-					'expected'  => 'https://static.mydomain.com/',
-					'input'     => null,
-					'static'    => true,
-					),
-				1   => array(
-					'expected'  => 'https://static.mydomain.com/e107_web/lib/font-awesome/4.7.0/fonts/fontawesome-webfont.woff2?v=4.7.0',
-					'input'     => e_WEB_ABS.'lib/font-awesome/4.7.0/fonts/fontawesome-webfont.woff2?v=4.7.0',
-					'static'    => true,
-					),
-				2   => array(
-					'expected'  => 'https://static.mydomain.com/e107_media/000000test/myimage.jpg',
-					'input'     => e_MEDIA_ABS.'myimage.jpg',
-					'static'    => true,
-					),
-				3   => array(
-					'expected'  => 'https://static.mydomain.com/e107_themes/bootstrap3/images/myimage.jpg',
-					'input'     => '{THEME}images/myimage.jpg',
-					'static'    => true,
-					),
-				4   => array(
-					'expected'  => e_WEB_ABS.'lib/font-awesome/4.7.0/fonts/fontawesome-webfont.woff2?v=4.7.0',
-					'input'     => '{e_WEB}lib/font-awesome/4.7.0/fonts/fontawesome-webfont.woff2?v=4.7.0',
-					'static'    => false,
-					),
-			);
-
-			foreach($tests as $val)
+			public function testDoReplace()
 			{
-				$static = !empty($val['static']) ? 'https://static.mydomain.com/' : null;
-				$this->tp->setStaticUrl($static);
-				$actual = $this->tp->staticUrl($val['input']);
-				$this->assertSame( $val['expected'], $actual);
+
+			}
+	*/
+	public function testStaticUrl()
+	{
+
+		$tests = array(
+			0 => array(
+				'expected' => 'https://static.mydomain.com/',
+				'input'    => null,
+				'static'   => true,
+			),
+			1 => array(
+				'expected' => 'https://static.mydomain.com/e107_web/lib/font-awesome/4.7.0/fonts/fontawesome-webfont.woff2?v=4.7.0',
+				'input'    => e_WEB_ABS . 'lib/font-awesome/4.7.0/fonts/fontawesome-webfont.woff2?v=4.7.0',
+				'static'   => true,
+			),
+			2 => array(
+				'expected' => 'https://static.mydomain.com/e107_media/000000test/myimage.jpg',
+				'input'    => e_MEDIA_ABS . 'myimage.jpg',
+				'static'   => true,
+			),
+			3 => array(
+				'expected' => 'https://static.mydomain.com/e107_themes/bootstrap3/images/myimage.jpg',
+				'input'    => '{THEME}images/myimage.jpg',
+				'static'   => true,
+			),
+			4 => array(
+				'expected' => e_WEB_ABS . 'lib/font-awesome/4.7.0/fonts/fontawesome-webfont.woff2?v=4.7.0',
+				'input'    => '{e_WEB}lib/font-awesome/4.7.0/fonts/fontawesome-webfont.woff2?v=4.7.0',
+				'static'   => false,
+			),
+		);
+
+		foreach ($tests as $val)
+		{
+			$static = !empty($val['static']) ? 'https://static.mydomain.com/' : null;
+			$this->tp->setStaticUrl($static);
+			$actual = $this->tp->staticUrl($val['input']);
+			$this->assertSame($val['expected'], $actual);
+		}
+
+		$this->tp->setStaticUrl(null);
+
+
+	}
+
+	/*
+			public function testGetUrlConstants()
+			{
+
 			}
 
-			$this->tp->setStaticUrl(null);
+			public function testUstrrpos()
+			{
 
+			}
+	*/
+	public function testPost_toHTML()
+	{
+		$text = "Test"; // invalid html.
+		$result = $this->tp->post_toHTML($text);
+		$this->assertEmpty($result);
 
+		$text = "
      Test
      "; // valid html.
+		$cleaned = '
      Test
      '; // valid and cleaned html.
+		$result = $this->tp->post_toHTML($text);
+		$this->assertSame($cleaned, $result);
 
-		}
-/*
-		public function testGetUrlConstants()
-		{
+	}
 
-		}
+	/*
+	public function testAddAllowedTag()
+	{
 
-		public function testUstrrpos()
-		{
+	}
 
-		}
+	public function testAddAllowedAttribute()
+	{
+
+	}
+
+	public function testSetAllowedTags()
+	{
+
+	}
 */
-		public function testPost_toHTML()
-		{
-			$text = "Test"; // invalid html.
-			$result = $this->tp->post_toHTML($text);
-			$this->assertEmpty($result);
+	public function testSetScriptAccess()
+	{
+		$this->tp->setScriptAccess(e_UC_PUBLIC);
+		$result = $this->tp->getScriptAccess();
+		$this->assertEquals(e_UC_PUBLIC, $result);
+	}
 
-			$text = "
      Test
      "; // valid html.
-			$cleaned = '
      Test
      '; // valid and cleaned html.
-			$result = $this->tp->post_toHTML($text);
-			$this->assertSame($cleaned, $result);
+	/*
+			public function testGetAllowedTags()
+			{
 
-		}
+			}
+	*/
+	public function testGetScriptAccess()
+	{
+		$result = $this->tp->getScriptAccess();
+		$this->assertFalse($result);
+	}
 
-		/*
-		public function testAddAllowedTag()
-		{
-
-		}
-
-		public function testAddAllowedAttribute()
-		{
-
-		}
-
-		public function testSetAllowedTags()
-		{
-
-		}
-*/
-		public function testSetScriptAccess()
-		{
-            $this->tp->setScriptAccess(e_UC_PUBLIC);
-            $result = $this->tp->getScriptAccess();
-            $this->assertEquals(e_UC_PUBLIC, $result);
-		}
-/*
-		public function testGetAllowedTags()
-		{
-
-		}
-*/
-		public function testGetScriptAccess()
-		{
-            $result = $this->tp->getScriptAccess();
-            $this->assertFalse($result);
-		}
-
-		public function testGetAllowedAttributes()
-		{
-			$expected = array (
-			  'default' =>
-			  array (
-			    0 => 'id',
-			    1 => 'style',
-			    2 => 'class',
-			    3 => 'title',
-			    4 => 'lang',
-			    5 => 'accesskey',
-			  ),
-			  'img' =>
-			  array (
-			    0 => 'src',
-			    1 => 'alt',
-			    2 => 'width',
-			    3 => 'height',
-			    4 => 'id',
-			    5 => 'style',
-			    6 => 'class',
-			    7 => 'title',
-			    8 => 'lang',
-			    9 => 'accesskey',
-			  ),
-			  'a' =>
-			  array (
-			    0 => 'href',
-			    1 => 'target',
-			    2 => 'rel',
-			    3 => 'id',
-			    4 => 'style',
-			    5 => 'class',
-			    6 => 'title',
-			    7 => 'lang',
-			    8 => 'accesskey',
-			  ),
-			  'script' =>
-			  array (
-			    0 => 'type',
-			    1 => 'src',
-			    2 => 'language',
-			    3 => 'async',
-			    4 => 'id',
-			    5 => 'style',
-			    6 => 'class',
-			    7 => 'title',
-			    8 => 'lang',
-			    9 => 'accesskey',
-			  ),
-			  'iframe' =>
-			  array (
-			    'src',
-			    'frameborder',
-			    'width',
-			    'height',
-			    'allowfullscreen',
-			    'allow',
-			    'id',
-			    'style',
-			    'class',
-			    'title',
-			    'lang',
-			    'accesskey',
-			  ),
-			  'input' =>
-			  array (
-			    0 => 'type',
-			    1 => 'name',
-			    2 => 'value',
-			    3 => 'id',
-			    4 => 'style',
-			    5 => 'class',
-			    6 => 'title',
-			    7 => 'lang',
-			    8 => 'accesskey',
-			  ),
-			  'form' =>
-			  array (
-			    0 => 'action',
-			    1 => 'method',
-			    2 => 'target',
-			    3 => 'id',
-			    4 => 'style',
-			    5 => 'class',
-			    6 => 'title',
-			    7 => 'lang',
-			    8 => 'accesskey',
-			  ),
-			  'audio' =>
-			  array (
-			    0 => 'src',
-			    1 => 'controls',
-			    2 => 'autoplay',
-			    3 => 'loop',
-			    4 => 'muted',
-			    5 => 'preload',
-			    6 => 'id',
-			    7 => 'style',
-			    8 => 'class',
-			    9 => 'title',
-			    10 => 'lang',
-			    11 => 'accesskey',
-			  ),
-			  'video' =>
-			  array (
-			    0 => 'autoplay',
-			    1 => 'controls',
-			    2 => 'height',
-			    3 => 'loop',
-			    4 => 'muted',
-			    5 => 'poster',
-			    6 => 'preload',
-			    7 => 'src',
-			    8 => 'width',
-			    9 => 'id',
-			    10 => 'style',
-			    11 => 'class',
-			    12 => 'title',
-			    13 => 'lang',
-			    14 => 'accesskey',
-			  ),
-			  'table' => array(
-		        0 => 'border',
-		        1 => 'cellpadding',
-		        2 => 'cellspacing',
-		        3 => 'id',
-		        4 => 'style',
-		        5 => 'class',
-		        6 => 'title',
-		        7 => 'lang',
-		        8 => 'accesskey',
-		    ),
-			  'td' =>
-			  array (
-			  	0 => 'colspan',
-		        1 => 'rowspan',
-		        2 => 'name',
-		        3 => 'bgcolor',
-		        4 => 'id',
-		        5 => 'style',
-		        6 => 'class',
-		        7 => 'title',
-		        8 => 'lang',
-		        9 => 'accesskey',
-			  ),
-			  'th' =>
-			  array (
-			    0 => 'colspan',
-			    1 => 'rowspan',
-			    2 => 'id',
-			    3 => 'style',
-			    4 => 'class',
-			    5 => 'title',
-			    6 => 'lang',
-			    7 => 'accesskey',
-			  ),
-			  'col' =>
-			  array (
-			    0 => 'span',
-			    1 => 'id',
-			    2 => 'style',
-			    3 => 'class',
-			    4 => 'title',
-			    5 => 'lang',
-			    6 => 'accesskey',
-			  ),
-			  'embed' =>
-			  array (
-			    0 => 'src',
-			    1 => 'wmode',
-			    2 => 'type',
-			    3 => 'width',
-			    4 => 'height',
-			    5 => 'id',
-			    6 => 'style',
-			    7 => 'class',
-			    8 => 'title',
-			    9 => 'lang',
-			    10 => 'accesskey',
-			  ),
-			  'x-bbcode' =>
-			  array (
-			    0 => 'alt',
-			    1 => 'id',
-			    2 => 'style',
-			    3 => 'class',
-			    4 => 'title',
-			    5 => 'lang',
-			    6 => 'accesskey',
-			  ),
-			  'label' =>
-			  array (
-			    0 => 'for',
-			    1 => 'id',
-			    2 => 'style',
-			    3 => 'class',
-			    4 => 'title',
-			    5 => 'lang',
-			    6 => 'accesskey',
-			  ),
-			  'source' =>
-			  array (
-			    0 => 'media',
-			    1 => 'sizes',
-			    2 => 'src',
-			    3 => 'srcset',
-			    4 => 'type',
-			    5 => 'id',
-			    6 => 'style',
-			    7 => 'class',
-			    8 => 'title',
-			    9 => 'lang',
-			    10 => 'accesskey',
-			  ),
-			);
+	public function testGetAllowedAttributes()
+	{
+		$expected = array(
+			'default'  =>
+				array(
+					0 => 'id',
+					1 => 'style',
+					2 => 'class',
+					3 => 'title',
+					4 => 'lang',
+					5 => 'accesskey',
+				),
+			'img'      =>
+				array(
+					0 => 'src',
+					1 => 'alt',
+					2 => 'width',
+					3 => 'height',
+					4 => 'id',
+					5 => 'style',
+					6 => 'class',
+					7 => 'title',
+					8 => 'lang',
+					9 => 'accesskey',
+				),
+			'a'        =>
+				array(
+					0 => 'href',
+					1 => 'target',
+					2 => 'rel',
+					3 => 'id',
+					4 => 'style',
+					5 => 'class',
+					6 => 'title',
+					7 => 'lang',
+					8 => 'accesskey',
+				),
+			'script'   =>
+				array(
+					0 => 'type',
+					1 => 'src',
+					2 => 'language',
+					3 => 'async',
+					4 => 'id',
+					5 => 'style',
+					6 => 'class',
+					7 => 'title',
+					8 => 'lang',
+					9 => 'accesskey',
+				),
+			'iframe'   =>
+				array(
+					'src',
+					'frameborder',
+					'width',
+					'height',
+					'allowfullscreen',
+					'allow',
+					'id',
+					'style',
+					'class',
+					'title',
+					'lang',
+					'accesskey',
+				),
+			'input'    =>
+				array(
+					0 => 'type',
+					1 => 'name',
+					2 => 'value',
+					3 => 'id',
+					4 => 'style',
+					5 => 'class',
+					6 => 'title',
+					7 => 'lang',
+					8 => 'accesskey',
+				),
+			'form'     =>
+				array(
+					0 => 'action',
+					1 => 'method',
+					2 => 'target',
+					3 => 'id',
+					4 => 'style',
+					5 => 'class',
+					6 => 'title',
+					7 => 'lang',
+					8 => 'accesskey',
+				),
+			'audio'    =>
+				array(
+					0  => 'src',
+					1  => 'controls',
+					2  => 'autoplay',
+					3  => 'loop',
+					4  => 'muted',
+					5  => 'preload',
+					6  => 'id',
+					7  => 'style',
+					8  => 'class',
+					9  => 'title',
+					10 => 'lang',
+					11 => 'accesskey',
+				),
+			'video'    =>
+				array(
+					0  => 'autoplay',
+					1  => 'controls',
+					2  => 'height',
+					3  => 'loop',
+					4  => 'muted',
+					5  => 'poster',
+					6  => 'preload',
+					7  => 'src',
+					8  => 'width',
+					9  => 'id',
+					10 => 'style',
+					11 => 'class',
+					12 => 'title',
+					13 => 'lang',
+					14 => 'accesskey',
+				),
+			'table'    => array(
+				0 => 'border',
+				1 => 'cellpadding',
+				2 => 'cellspacing',
+				3 => 'id',
+				4 => 'style',
+				5 => 'class',
+				6 => 'title',
+				7 => 'lang',
+				8 => 'accesskey',
+			),
+			'td'       =>
+				array(
+					0 => 'colspan',
+					1 => 'rowspan',
+					2 => 'name',
+					3 => 'bgcolor',
+					4 => 'id',
+					5 => 'style',
+					6 => 'class',
+					7 => 'title',
+					8 => 'lang',
+					9 => 'accesskey',
+				),
+			'th'       =>
+				array(
+					0 => 'colspan',
+					1 => 'rowspan',
+					2 => 'id',
+					3 => 'style',
+					4 => 'class',
+					5 => 'title',
+					6 => 'lang',
+					7 => 'accesskey',
+				),
+			'col'      =>
+				array(
+					0 => 'span',
+					1 => 'id',
+					2 => 'style',
+					3 => 'class',
+					4 => 'title',
+					5 => 'lang',
+					6 => 'accesskey',
+				),
+			'embed'    =>
+				array(
+					0  => 'src',
+					1  => 'wmode',
+					2  => 'type',
+					3  => 'width',
+					4  => 'height',
+					5  => 'id',
+					6  => 'style',
+					7  => 'class',
+					8  => 'title',
+					9  => 'lang',
+					10 => 'accesskey',
+				),
+			'x-bbcode' =>
+				array(
+					0 => 'alt',
+					1 => 'id',
+					2 => 'style',
+					3 => 'class',
+					4 => 'title',
+					5 => 'lang',
+					6 => 'accesskey',
+				),
+			'label'    =>
+				array(
+					0 => 'for',
+					1 => 'id',
+					2 => 'style',
+					3 => 'class',
+					4 => 'title',
+					5 => 'lang',
+					6 => 'accesskey',
+				),
+			'source'   =>
+				array(
+					0  => 'media',
+					1  => 'sizes',
+					2  => 'src',
+					3  => 'srcset',
+					4  => 'type',
+					5  => 'id',
+					6  => 'style',
+					7  => 'class',
+					8  => 'title',
+					9  => 'lang',
+					10 => 'accesskey',
+				),
+		);
 
 
-
-
-            $result = $this->tp->getAllowedAttributes();
-			$this->assertSame($expected, $result);
+		$result = $this->tp->getAllowedAttributes();
+		$this->assertSame($expected, $result);
 
 
 		//	var_export($result);
-          //  $true = is_array($result) && in_array('style',$result['img']);
+		//  $true = is_array($result) && in_array('style',$result['img']);
 
-          //  $this->assertTrue($true);
-		}
-/*
-		public function testSetScriptTags()
-		{
+		//  $this->assertTrue($true);
+	}
 
-		}
-
-		public function testLeadingZeros()
-		{
-
-		}
-
-		public function testLanVars()
-		{
-
-		}
-*/
-		public function testGetTags()
-		{
-			$html = "
      whatever
      ";
-			$result = $this->tp->getTags($html, 'img');
-			$expected = array (
-				  'img' =>
-				  array (
-				    0 =>
-				    array (
-				      'src' => '#',
-				      'alt' => 'whatever',
-				      '@value' => 'whatever',
-				    ),
-				  ),
-				);
-
-			if(empty($expected['img'][0]))
+	/*
+			public function testSetScriptTags()
 			{
-				$this->assertTrue(false, "getTags() didn't return the correct value");
+
 			}
 
-			$this->assertSame($expected['img'][0]['src'], $result['img'][0]['src']);
-			$this->assertSame($expected['img'][0]['alt'], $result['img'][0]['alt']);
-		}
-
-		public function testToGlyph()
-		{
-			$this->tp->setFontAwesome(4);
-
-			$result = $this->tp->toGlyph('fa-envelope.glyph');
-			$expected = " ";
-			$this->assertEquals($expected,$result);
-
-			$this->tp->setFontAwesome(5);
-
-			$result = $this->tp->toGlyph('fa-mailchimp');
-			$expected = " ";
-			$this->assertEquals($expected, $result);
-
-
-			$this->tp->setFontAwesome(4);
-
-			$result = $this->tp->toGlyph('fab-mailchimp'); // spefific call
-			$expected = " ";
-			$this->assertEquals($expected, $result);
-
-			$result = $this->tp->toGlyph('fas-camera'); // spefific call
-			$this->assertSame( " ", $result);
-
-			// test core, shims and old identifiers with FontAwesome 5 installed.
-			$this->tp->setFontAwesome(5);
-
-			$tests = array(
-				'e-database-16'     => "",
-				'e-database-32'     => "",
-				'fa-sun-o'          => " ",
-				'fa-comments-o'     => " ",
-				'fa-file-text-o'    => " ",
-				'fa-bank'           => " ",
-				'fa-warning'        => " ",
-				'glyphicon-star'    => " ",
-				'icon-star'         => " ",
-				'floppy-disk'       => " ",
-				'icon-user'         => " ",
-				'user'              => " ",
-				'flag'              => " ",
-				'fa-'               => null,
-
-			);
-
-			foreach($tests as $icon => $expected)
+			public function testLeadingZeros()
 			{
-				$result = $this->tp->toGlyph($icon);
-				$this->assertSame($expected, $result);
+
 			}
 
-
-			// test core, shims and old identifiers with FontAwesome 4 installed.
-			$this->tp->setFontAwesome(4);
-
-			$tests = array(
-				'e-database-16'     => "",
-				'e-database-32'     => "",
-				'fa-sun-o'          => " ",
-				'fa-comments-o'     => " ",
-				'fa-file-text-o'    => " ",
-				'fa-bank'           => " ",
-				'fa-warning'        => " ",
-				'glyphicon-star'    => " ",
-				'icon-star'         => " ",
-				'floppy-disk'       => " ",
-				'icon-user'         => " ",
-				'user'              => " ",
-				'flag'              => " ",
-				'fa-'               => null,
-
-			);
-
-			foreach($tests as $icon => $expected)
+			public function testLanVars()
 			{
-				$result = $this->tp->toGlyph($icon);
-				$this->assertSame($expected, $result, 'Input was: '.$icon);
+
 			}
-
-
-
-
-		}
-
-		function testToGlyphFallback()
-		{
-			$this->tp->setFontAwesome(5);
-			$result =  $this->tp->toGlyph('fa-paypal.glyph');
-			$this->assertSame(" ", $result);
-		}
-/*
-		public function testToBadge()
-		{
-
-		}
-
-		public function testToLabel()
-		{
-
-		}
-
-		public function testToFile()
-		{
-
-		}
-*/
-		public function testToAvatar()
-		{
-			$icon = codecept_data_dir()."icon_64.png";
-
-			if(!is_dir(e_AVATAR_UPLOAD))
-			{
-				mkdir(e_AVATAR_UPLOAD,0755, true);
-			}
-
-			if(!is_dir(e_AVATAR_DEFAULT))
-			{
-				mkdir(e_AVATAR_DEFAULT,0755, true);
-			}
-
-			if(!copy($icon, e_AVATAR_UPLOAD."avatartest.png"))
-			{
-				echo "Couldn't copy the avatar";
-			}
-			if(!copy($icon, e_AVATAR_DEFAULT."avatartest.png"))
-			{
-				echo "Couldn't copy the avatar";
-			}
-
-			$tests = array(
-				0   => array(
-					'input'     => array('user_image'=>'-upload-avatartest.png'),
-					'parms'     => array('w'=>50, 'h'=>50, 'crop'=>false),
-					'expected'  => array(
-									"thumb.php?src=%7Be_AVATAR%7Dupload%2Favatartest.png&w=50&h=50",
-									"class='img-rounded rounded user-avatar'"
-								)
+	*/
+	public function testGetTags()
+	{
+		$html = "
      whatever
      ";
+		$result = $this->tp->getTags($html, 'img');
+		$expected = array(
+			'img' =>
+				array(
+					0 =>
+						array(
+							'src'    => '#',
+							'alt'    => 'whatever',
+							'@value' => 'whatever',
+						),
 				),
-				1   => array(
-					'input'     => array('user_image'=>'avatartest.png'),
-					'parms'     => array('w'=>50, 'h'=>50, 'crop'=>false),
-					'expected'  => array(
-									"thumb.php?src=%7Be_AVATAR%7Ddefault%2Favatartest.png&w=50&h=50",
-									"class='img-rounded rounded user-avatar'"
-								)
-				),
-				2   => array(
-					'input'     => array('user_image'=>''),
-					'parms'     => array('w'=>50, 'h'=>50, 'crop'=>false),
-					'expected'  => array(
-									"thumb.php?src=%7Be_IMAGE%7Dgeneric%2Fblank_avatar.jpg&w=50&h=50",
-									"class='img-rounded rounded user-avatar'"
-								)
-				),
-				3   => array(
-					'input'     => array('user_image'=>'https://mydomain.com/remoteavatar.jpg'),
-					'parms'     => array('w'=>50, 'h'=>50, 'crop'=>false,),
-					'expected'  => array(
-									"src='https://mydomain.com/remoteavatar.jpg'",
-									"class='img-rounded rounded user-avatar'",
-									"width='50' height='50'",
-								)
-				),
-				4   => array(
-					'input'     => array('user_image'=>'', 'user_id'=>1),
-					'parms'     => array('w'=>50, 'h'=>50, 'crop'=>false, 'link'=>true),
-					'expected'  => array(
-									"thumb.php?src=%7Be_IMAGE%7Dgeneric%2Fblank_avatar.jpg&w=50&h=50",
-									"class='img-rounded rounded user-avatar'",
-									" array(
-					'input'     => array('user_image'=>'avatartest.png'),
-					'parms'     => array('w'=>30, 'h'=>30, 'crop'=>false, 'shape'=>'circle', 'alt'=>'mytitle'),
-					'expected'  => array(
-									"thumb.php?src=%7Be_AVATAR%7Ddefault%2Favatartest.png&w=30&h=30",
-									"class='img-circle rounded-circle user-avatar'",
-									'alt="mytitle"',
-								)
-				),
-				/** @fixme - doesn't pass under CLI  */
-				/*
-				7   => array(
-					'input'     => array('user_image'=>'avatartest.png'),
-					'parms'     => array('w'=>50, 'h'=>50, 'crop'=>true, 'base64'=>true, 'shape'=>'circle'),
-					'expected'  => array(
-									"src='data:image/png;base64,",
-									"class='img-circle user-avatar'"
-								)
-				),*/
-
-
-			);
-
-			foreach($tests as $index => $var)
-			{
-				$result = $this->tp->toAvatar($var['input'], $var['parms']);
-				foreach($var['expected'] as $str)
-				{
-					$this->assertStringContainsString($str, $result, "Failed on index #".$index);
-				}
-			}
-
+		);
 
+		if (empty($expected['img'][0]))
+		{
+			$this->assertTrue(false, "getTags() didn't return the correct value");
 		}
 
-		public function testToIcon()
+		$this->assertSame($expected['img'][0]['src'], $result['img'][0]['src']);
+		$this->assertSame($expected['img'][0]['alt'], $result['img'][0]['alt']);
+	}
+
+	public function testToGlyph()
+	{
+		$this->tp->setFontAwesome(4);
+
+		$result = $this->tp->toGlyph('fa-envelope.glyph');
+		$expected = " ";
+		$this->assertEquals($expected, $result);
+
+		$this->tp->setFontAwesome(5);
+
+		$result = $this->tp->toGlyph('fa-mailchimp');
+		$expected = " ";
+		$this->assertEquals($expected, $result);
+
+
+		$this->tp->setFontAwesome(4);
+
+		$result = $this->tp->toGlyph('fab-mailchimp'); // spefific call
+		$expected = " ";
+		$this->assertEquals($expected, $result);
+
+		$result = $this->tp->toGlyph('fas-camera'); // spefific call
+		$this->assertSame(" ", $result);
+
+		// test core, shims and old identifiers with FontAwesome 5 installed.
+		$this->tp->setFontAwesome(5);
+
+		$tests = array(
+			'e-database-16'  => "",
+			'e-database-32'  => "",
+			'fa-sun-o'       => " ",
+			'fa-comments-o'  => " ",
+			'fa-file-text-o' => " ",
+			'fa-bank'        => " ",
+			'fa-warning'     => " ",
+			'glyphicon-star' => " ",
+			'icon-star'      => " ",
+			'floppy-disk'    => " ",
+			'icon-user'      => " ",
+			'user'           => " ",
+			'flag'           => " ",
+			'fa-'            => null,
+
+		);
+
+		foreach ($tests as $icon => $expected)
 		{
-			$icon = codecept_data_dir()."icon_64.png";
-
-			if(!copy($icon,e_MEDIA_IMAGE."icon_64.png"))
-			{
-				echo "Couldn't copy the icon";
-			}
-			if(!copy($icon,e_MEDIA_ICON."icon_64.png"))
-			{
-				echo "Couldn't copy the icon";
-			}
-
-			$tests = array(
-				0   => array('input'=> '{e_IMAGE}e107_icon_32.png',    'parms'=>null,             'expected'  => '/e107_images/e107_icon_32.png'),
-				1   => array('input'=> '{e_MEDIA_IMAGE}icon_64.png',   'parms'=>null,             'expected'  => 'thumb.php?src=e_MEDIA_IMAGE'),
-				2   => array('input'=> '{e_MEDIA_ICON}icon_64.png',     'parms'=>null,            'expected'  => '/e107_media/000000test/icons/icon_64.png'),
-				3   => array('input'=> '{e_PLUGIN}gallery/images/gallery_32.png',  'parms'=>null, 'expected'  => '/e107_plugins/gallery/images/gallery_32.png'),
-				4   => array('input'=> 'config_16.png', 'parms'=>array('legacy'=> "{e_IMAGE}icons/"), 'expected' => '/e107_images/icons/config_16.png'),
-			);
-
-			foreach($tests as $var)
-			{
-				$result = $this->tp->toIcon($var['input'],$var['parms']);
-				$this->assertStringContainsString($var['expected'],$result);
-			}
+			$result = $this->tp->toGlyph($icon);
+			$this->assertSame($expected, $result);
 		}
 
-		public function testToImage()
+
+		// test core, shims and old identifiers with FontAwesome 4 installed.
+		$this->tp->setFontAwesome(4);
+
+		$tests = array(
+			'e-database-16'  => "",
+			'e-database-32'  => "",
+			'fa-sun-o'       => " ",
+			'fa-comments-o'  => " ",
+			'fa-file-text-o' => " ",
+			'fa-bank'        => " ",
+			'fa-warning'     => " ",
+			'glyphicon-star' => " ",
+			'icon-star'      => " ",
+			'floppy-disk'    => " ",
+			'icon-user'      => " ",
+			'user'           => " ",
+			'flag'           => " ",
+			'fa-'            => null,
+
+		);
+
+		foreach ($tests as $icon => $expected)
 		{
-			$src = "{e_PLUGIN}gallery/images/butterfly.jpg";
-			$this->tp->setThumbSize(80,80); // set defaults.
-
-			// test with defaults set above.
-			$result = $this->tp->toImage($src);
-			$this->assertStringContainsString('butterfly.jpg&w=80&h=80', $result); // src
-			$this->assertStringContainsString('butterfly.jpg&w=320&h=320', $result); // srcset 4x the size on small images.
-
-			// test overriding of defaults.
-			$override = array('w'=>800, 'h'=>0);
-			$result2 = $this->tp->toImage($src, $override);
-			$this->assertStringContainsString('butterfly.jpg&w=800&h=0', $result2); // src
-			$this->assertStringContainsString('Fbutterfly.jpg&w=1600&h=0', $result2); // srcset
+			$result = $this->tp->toGlyph($icon);
+			$this->assertSame($expected, $result, 'Input was: ' . $icon);
+		}
 
 
-			$override = array('w'=>0, 'h'=>0); // display image without resizing
-			$result3 = $this->tp->toImage($src, $override);
-			$this->assertStringContainsString('Fbutterfly.jpg&w=0&h=0', $result3); // src
+	}
 
-			$result4 = $this->tp->toImage($src, ['loading'=>'lazy']);
-			$this->assertStringContainsString('loading="lazy"', $result4); // src
+	function testToGlyphFallback()
+	{
+		$this->tp->setFontAwesome(5);
+		$result = $this->tp->toGlyph('fa-paypal.glyph');
+		$this->assertSame(" ", $result);
+	}
 
-			$result5 = $this->tp->toImage($src, ['type'=>'webp']);
-			$this->assertStringContainsString('&type=webp', $result5); // src
-
-
-
-
-			$tests = array(
-				0 => array(
-					'src'       => '{e_PLUGIN}gallery/images/butterfly.jpg',
-					'parms'     => array('w'=>300, 'alt'=>"Custom"),
-					'expected'  => 'Custom'
-				),
-
-			);
-
-			foreach($tests as $index => $var)
+	/*
+			public function testToBadge()
 			{
-				$result = $this->tp->toImage($var['src'], $var['parms']);
-				$result = preg_replace('/"([^"]*)thumb.php/','"thumb.php', $result);
-				$this->assertSame($var['expected'], $result);
 
 			}
 
-
-		}
-
-		public function testThumbSrcSet()
-		{
-			$src = "{e_PLUGIN}gallery/images/butterfly.jpg";
-			$parms = array('w'=>800, 'h'=>0, 'size'=>'2x');
-
-			$result = $this->tp->thumbSrcSet($src, $parms);
-			$this->assertStringContainsString('butterfly.jpg&w=1600&h=0', $result);
-
-			$this->tp->setThumbSize(80,80); // set defaults.
-
-			$result2 = $this->tp->thumbSrcSet($src, $parms); // testing overrides
-			$this->assertStringContainsString('butterfly.jpg&w=1600&h=0', $result2);
-
-			$result3 = $this->tp->thumbSrcSet($src, array('w'=>800, 'size'=>'2x')); // testing overrides without 'h' being set.
-			$this->assertStringContainsString('butterfly.jpg&w=1600&h=0', $result3);
-
-			$result4 = $this->tp->thumbSrcSet($src); // no overrides
-			$this->assertStringContainsString('butterfly.jpg&w=160&h=160', $result4);
-
-		}
-
-		public function testIsBBcode()
-		{
-			$tests = array(
-				0   => array("My Simple Text", false), // input , expected result
-				1   => array("
      ", false),
-				2   => array("[b]Bbcode[/b]", true),
-				3   => array("
      [code]something[/code]
      ", false),
-				4   => array("[code]<b>someting</b>[/code]", true),
-				5   => array("[html]something[/html]", false),
-				6   => array("http://something.com/index.php?what=ever", false)
-			);
-
-
-			foreach($tests as $val)
+			public function testToLabel()
 			{
-				list($input, $expected) = $val;
-				$actual = $this->tp->isBBcode($input);
 
-				$this->assertEquals($expected, $actual, $input);
 			}
 
+			public function testToFile()
+			{
+
+			}
+	*/
+	public function testToAvatar()
+	{
+		$icon = codecept_data_dir() . "icon_64.png";
+
+		if (!is_dir(e_AVATAR_UPLOAD))
+		{
+			mkdir(e_AVATAR_UPLOAD, 0755, true);
 		}
 
-		public function testIsHtml()
+		if (!is_dir(e_AVATAR_DEFAULT))
 		{
-			$tests = array(
-				0   => array("My Simple Text", false), // input , expected result
-				1   => array("
      ", true),
-				2   => array("[b]Bbcode[/b]", false),
-				3   => array("
      [code]something[/code]
      ", true),
-				4   => array("[code]<b>someting</b>[/code]", false),
-				5   => array("[html]something[/html]", true),
-				6   => array("http://something.com/index.php?what=ever", false),
-				7   => array("< 200", false),
-				8   => array("<200>", true),
-			);
+			mkdir(e_AVATAR_DEFAULT, 0755, true);
+		}
+
+		if (!copy($icon, e_AVATAR_UPLOAD . "avatartest.png"))
+		{
+			echo "Couldn't copy the avatar";
+		}
+		if (!copy($icon, e_AVATAR_DEFAULT . "avatartest.png"))
+		{
+			echo "Couldn't copy the avatar";
+		}
+
+		$tests = array(
+			0 => array(
+				'input'    => array('user_image' => '-upload-avatartest.png'),
+				'parms'    => array('w' => 50, 'h' => 50, 'crop' => false),
+				'expected' => array(
+					"thumb.php?src=%7Be_AVATAR%7Dupload%2Favatartest.png&w=50&h=50",
+					"class='img-rounded rounded user-avatar'"
+				)
+			),
+			1 => array(
+				'input'    => array('user_image' => 'avatartest.png'),
+				'parms'    => array('w' => 50, 'h' => 50, 'crop' => false),
+				'expected' => array(
+					"thumb.php?src=%7Be_AVATAR%7Ddefault%2Favatartest.png&w=50&h=50",
+					"class='img-rounded rounded user-avatar'"
+				)
+			),
+			2 => array(
+				'input'    => array('user_image' => ''),
+				'parms'    => array('w' => 50, 'h' => 50, 'crop' => false),
+				'expected' => array(
+					"thumb.php?src=%7Be_IMAGE%7Dgeneric%2Fblank_avatar.jpg&w=50&h=50",
+					"class='img-rounded rounded user-avatar'"
+				)
+			),
+			3 => array(
+				'input'    => array('user_image' => 'https://mydomain.com/remoteavatar.jpg'),
+				'parms'    => array('w' => 50, 'h' => 50, 'crop' => false,),
+				'expected' => array(
+					"src='https://mydomain.com/remoteavatar.jpg'",
+					"class='img-rounded rounded user-avatar'",
+					"width='50' height='50'",
+				)
+			),
+			4 => array(
+				'input'    => array('user_image' => '', 'user_id' => 1),
+				'parms'    => array('w' => 50, 'h' => 50, 'crop' => false, 'link' => true),
+				'expected' => array(
+					"thumb.php?src=%7Be_IMAGE%7Dgeneric%2Fblank_avatar.jpg&w=50&h=50",
+					"class='img-rounded rounded user-avatar'",
+					"       array(
+				'input'    => array('user_image' => 'avatartest.png'),
+				'parms'    => array('w' => 30, 'h' => 30, 'crop' => false, 'shape' => 'circle', 'alt' => 'mytitle'),
+				'expected' => array(
+					"thumb.php?src=%7Be_AVATAR%7Ddefault%2Favatartest.png&w=30&h=30",
+					"class='img-circle rounded-circle user-avatar'",
+					'alt="mytitle"',
+				)
+			),
+			/** @fixme - doesn't pass under CLI */
+			/*
+			7   => array(
+				'input'     => array('user_image'=>'avatartest.png'),
+				'parms'     => array('w'=>50, 'h'=>50, 'crop'=>true, 'base64'=>true, 'shape'=>'circle'),
+				'expected'  => array(
+								"src='data:image/png;base64,",
+								"class='img-circle user-avatar'"
+							)
+			),*/
 
 
-			foreach($tests as $val)
+		);
+
+		foreach ($tests as $index => $var)
+		{
+			$result = $this->tp->toAvatar($var['input'], $var['parms']);
+			foreach ($var['expected'] as $str)
+			{
+				$this->assertStringContainsString($str, $result, "Failed on index #" . $index);
+			}
+		}
+
+
+	}
+
+	public function testToIcon()
+	{
+		$icon = codecept_data_dir() . "icon_64.png";
+
+		if (!copy($icon, e_MEDIA_IMAGE . "icon_64.png"))
+		{
+			echo "Couldn't copy the icon";
+		}
+		if (!copy($icon, e_MEDIA_ICON . "icon_64.png"))
+		{
+			echo "Couldn't copy the icon";
+		}
+
+		$tests = array(
+			0 => array('input' => '{e_IMAGE}e107_icon_32.png', 'parms' => null, 'expected' => '/e107_images/e107_icon_32.png'),
+			1 => array('input' => '{e_MEDIA_IMAGE}icon_64.png', 'parms' => null, 'expected' => 'thumb.php?src=e_MEDIA_IMAGE'),
+			2 => array('input' => '{e_MEDIA_ICON}icon_64.png', 'parms' => null, 'expected' => '/e107_media/000000test/icons/icon_64.png'),
+			3 => array('input' => '{e_PLUGIN}gallery/images/gallery_32.png', 'parms' => null, 'expected' => '/e107_plugins/gallery/images/gallery_32.png'),
+			4 => array('input' => 'config_16.png', 'parms' => array('legacy' => "{e_IMAGE}icons/"), 'expected' => '/e107_images/icons/config_16.png'),
+		);
+
+		foreach ($tests as $var)
+		{
+			$result = $this->tp->toIcon($var['input'], $var['parms']);
+			$this->assertStringContainsString($var['expected'], $result);
+		}
+	}
+
+	public function testToImage()
+	{
+		$src = "{e_PLUGIN}gallery/images/butterfly.jpg";
+		$this->tp->setThumbSize(80, 80); // set defaults.
+
+		// test with defaults set above.
+		$result = $this->tp->toImage($src);
+		$this->assertStringContainsString('butterfly.jpg&w=80&h=80', $result); // src
+		$this->assertStringContainsString('butterfly.jpg&w=320&h=320', $result); // srcset 4x the size on small images.
+
+		// test overriding of defaults.
+		$override = array('w' => 800, 'h' => 0);
+		$result2 = $this->tp->toImage($src, $override);
+		$this->assertStringContainsString('butterfly.jpg&w=800&h=0', $result2); // src
+		$this->assertStringContainsString('Fbutterfly.jpg&w=1600&h=0', $result2); // srcset
+
+
+		$override = array('w' => 0, 'h' => 0); // display image without resizing
+		$result3 = $this->tp->toImage($src, $override);
+		$this->assertStringContainsString('Fbutterfly.jpg&w=0&h=0', $result3); // src
+
+		$result4 = $this->tp->toImage($src, ['loading' => 'lazy']);
+		$this->assertStringContainsString('loading="lazy"', $result4); // src
+
+		$result5 = $this->tp->toImage($src, ['type' => 'webp']);
+		$this->assertStringContainsString('&type=webp', $result5); // src
+
+
+		$tests = array(
+			0 => array(
+				'src'      => '{e_PLUGIN}gallery/images/butterfly.jpg',
+				'parms'    => array('w' => 300, 'alt' => "Custom"),
+				'expected' => 'Custom'
+			),
+
+		);
+
+		foreach ($tests as $index => $var)
+		{
+			$result = $this->tp->toImage($var['src'], $var['parms']);
+			$result = preg_replace('/"([^"]*)thumb.php/', '"thumb.php', $result);
+			$this->assertSame($var['expected'], $result);
+
+		}
+
+
+	}
+
+	public function testThumbSrcSet()
+	{
+		$src = "{e_PLUGIN}gallery/images/butterfly.jpg";
+		$parms = array('w' => 800, 'h' => 0, 'size' => '2x');
+
+		$result = $this->tp->thumbSrcSet($src, $parms);
+		$this->assertStringContainsString('butterfly.jpg&w=1600&h=0', $result);
+
+		$this->tp->setThumbSize(80, 80); // set defaults.
+
+		$result2 = $this->tp->thumbSrcSet($src, $parms); // testing overrides
+		$this->assertStringContainsString('butterfly.jpg&w=1600&h=0', $result2);
+
+		$result3 = $this->tp->thumbSrcSet($src, array('w' => 800, 'size' => '2x')); // testing overrides without 'h' being set.
+		$this->assertStringContainsString('butterfly.jpg&w=1600&h=0', $result3);
+
+		$result4 = $this->tp->thumbSrcSet($src); // no overrides
+		$this->assertStringContainsString('butterfly.jpg&w=160&h=160', $result4);
+
+	}
+
+	public function testIsBBcode()
+	{
+		$tests = array(
+			0 => array("My Simple Text", false), // input , expected result
+			1 => array("
      ", false),
+			2 => array("[b]Bbcode[/b]", true),
+			3 => array("
      [code]something[/code]
      ", false),
+			4 => array("[code]<b>someting</b>[/code]", true),
+			5 => array("[html]something[/html]", false),
+			6 => array("http://something.com/index.php?what=ever", false)
+		);
+
+
+		foreach ($tests as $val)
+		{
+			list($input, $expected) = $val;
+			$actual = $this->tp->isBBcode($input);
+
+			$this->assertEquals($expected, $actual, $input);
+		}
+
+	}
+
+	public function testIsHtml()
+	{
+		$tests = array(
+			0 => array("My Simple Text", false), // input , expected result
+			1 => array("
      ", true),
+			2 => array("[b]Bbcode[/b]", false),
+			3 => array("
      [code]something[/code]
      ", true),
+			4 => array("[code]<b>someting</b>[/code]", false),
+			5 => array("[html]something[/html]", true),
+			6 => array("http://something.com/index.php?what=ever", false),
+			7 => array("< 200", false),
+			8 => array("<200>", true),
+		);
+
+
+		foreach ($tests as $val)
+		{
+			list($input, $expected) = $val;
+			$actual = $this->tp->isHtml($input);
+
+			$this->assertEquals($expected, $actual, $input);
+		}
+
+
+	}
+
+	/*
+			public function testIsJSON()
 			{
-				list($input, $expected) = $val;
-				$actual = $this->tp->isHtml($input);
 
-				$this->assertEquals($expected, $actual, $input);
 			}
 
+			public function testIsUTF8()
+			{
 
-		}
-/*
-		public function testIsJSON()
-		{
+			}
 
-		}
+			public function testIsVideo()
+			{
 
-		public function testIsUTF8()
-		{
+			}
+	*/
+	public function testIsImage()
+	{
+		$this->assertTrue($this->tp->isImage('/path-to-file/myfile.jpg'));
+		$this->assertFalse($this->tp->isImage('/path-to-file/myfile.mov'));
 
-		}
+	}
 
-		public function testIsVideo()
-		{
-
-		}
-*/
-		public function testIsImage()
-		{
-			$this->assertTrue($this->tp->isImage('/path-to-file/myfile.jpg'));
-			$this->assertFalse($this->tp->isImage('/path-to-file/myfile.mov'));
-
-		}
-
-		public function testtoAudio()
-		{
-			$expected = '      ', $result);
+
+		// -----
+
+		$result = $tp->makeClickable($email, 'email', array('sub' => 'fa-envelope.glyph'));
+		$this->assertStringContainsString("fa-envelope' >", $result);
+
+		// links standard.
+		$tests = array(
+			array("before www.somewhere.com after", 'before www.somewhere.com after'),
+			array("before http://something.com after", 'before http://something.com after'),
+			array("before https://someplace.com after", 'before https://someplace.com after'),
+			array("before (www.something.com) after", 'before (www.something.com) after'),
+			array('', ''),
+		);
+
+		foreach ($tests as $row)
+		{
+			list($sample, $expected) = $row;
+			$result = $tp->makeClickable($sample, 'url');
 			$this->assertEquals($expected, $result);
-
 		}
-/*
-		public function testToVideo()
+
+		// links with substituion..
+		$tests = array(
+			array("before www.somewhere.com after", 'before [link] after'),
+			array("before http://something.com after", 'before [link] after'),
+			array("before https://someplace.com after", 'before [link] after'),
+			array("before (www.something.com) after", 'before ([link]) after'),
+		);
+
+		foreach ($tests as $row)
 		{
+			list($sample, $expected) = $row;
+			$result = $tp->makeClickable($sample, 'url', array('sub' => '[link]'));
+			$this->assertEquals($expected, $result);
+		}
 
-		}*/
+		// links with substituion and target.
+		$tests = array(
+			array("before www.somewhere.com after", 'before [link] after'),
+			array("before http://something.com after", 'before [link] after'),
+			array("before https://someplace.com after", 'before [link] after'),
+			array("before (www.something.com) after", 'before ([link]) after'),
+		);
 
-		public function testMakeClickable()
+		foreach ($tests as $row)
 		{
-			$email = 'myemail@somewhere.com.tk';
-
-			$tp = $this->tp;
-
-			// ----
-
-			$result = $tp->makeClickable($email, 'email', array('sub' => '[email]'));
-
-			$this->assertStringContainsString('[email]', $result);
-
-			// -----
-
-			$result = $tp->makeClickable($email, 'email', array('sub' => 'fa-envelope.glyph'));
-			$this->assertStringContainsString("fa-envelope' >", $result);
-
-			// links standard.
-			$tests = array(
-				array("before www.somewhere.com after",     'before www.somewhere.com after'),
-				array("before http://something.com after",  'before http://something.com after'),
-				array("before https://someplace.com after", 'before https://someplace.com after'),
-				array("before (www.something.com) after",   'before (www.something.com) after'),
-				array('', ''),
-			);
-
-			foreach($tests as $row)
-			{
-				list($sample,$expected) = $row;
-				$result = $tp->makeClickable($sample, 'url');
-				$this->assertEquals($expected, $result);
-			}
-
-			// links with substituion..
-			$tests = array(
-				array("before www.somewhere.com after",     'before [link] after'),
-				array("before http://something.com after",  'before [link] after'),
-				array("before https://someplace.com after", 'before [link] after'),
-				array("before (www.something.com) after",   'before ([link]) after'),
-			);
-
-			foreach($tests as $row)
-			{
-				list($sample,$expected) = $row;
-				$result = $tp->makeClickable($sample, 'url',array('sub' => '[link]'));
-				$this->assertEquals($expected, $result);
-			}
-
-			// links with substituion and target.
-			$tests = array(
-				array("before www.somewhere.com after",     'before [link] after'),
-				array("before http://something.com after",  'before [link] after'),
-				array("before https://someplace.com after", 'before [link] after'),
-				array("before (www.something.com) after",   'before ([link]) after'),
-			);
-
-			foreach($tests as $row)
-			{
-				list($sample,$expected) = $row;
-				$result = $tp->makeClickable($sample, 'url',array('sub' => '[link]', 'ext'=>true));
-				$this->assertEquals($expected, $result);
-			}
-
-
+			list($sample, $expected) = $row;
+			$result = $tp->makeClickable($sample, 'url', array('sub' => '[link]', 'ext' => true));
+			$this->assertEquals($expected, $result);
 		}
 
 
+	}
 
 
-
-		public function testToDate()
-		{
+	public function testToDate()
+	{
 
 
-			$class = $this->tp;
+		$class = $this->tp;
 
-			$time = 1519512067; //  Saturday 24 February 2018 - 22:41:07
+		$time = 1519512067; //  Saturday 24 February 2018 - 22:41:07
 
-			$long = $class->toDate($time, 'long');
-			$this->assertStringContainsString('Saturday 24 February 2018',$long);
+		$long = $class->toDate($time, 'long');
+		$this->assertStringContainsString('Saturday 24 February 2018', $long);
 
-			$short = $class->toDate($time, 'short');
-			$this->assertStringContainsString('Feb 2018', $short);
+		$short = $class->toDate($time, 'short');
+		$this->assertStringContainsString('Feb 2018', $short);
 
-			$rel = $class->toDate($time, 'relative');
-			$this->assertStringContainsString('ago', $rel);
-			$this->assertStringContainsString('data-livestamp="1519512067"', $rel);
+		$rel = $class->toDate($time, 'relative');
+		$this->assertStringContainsString('ago', $rel);
+		$this->assertStringContainsString('data-livestamp="1519512067"', $rel);
 
-			$custom = $class->toDate($time, 'dd-M-yy');
-			$this->assertStringContainsString('24-Feb-18', $custom);
+		$custom = $class->toDate($time, 'dd-M-yy');
+		$this->assertStringContainsString('24-Feb-18', $custom);
 
 
+	}
 
-		}
-/*
-		public function testParseBBTags()
-		{
-
-		}
-*/
-		public function testFilter()
-		{
-			$url = 'http://www.domain.com/folder/folder2//1234_1_0.jpg';
-
-			// Filter tests.
-
-			$tests = array(
-				0   => array('input' => 'test123 xxx',      'mode' => 'w',        'expected' => 'test123xxx'),
-				1   => array('input' => 'test123 xxx',      'mode' => 'd',        'expected' => '123'),
-				2   => array('input' => 'test123 xxx',      'mode' => 'wd',       'expected' => 'test123xxx'),
-				3   => array('input' => 'test123 xxx',      'mode' => 'wds',      'expected' => 'test123 xxx'),
-				4   => array('input' => 'test123 xxx.jpg',  'mode' => 'file',     'expected' => 'test123-xxx.jpg'),
-				5   => array('input' => '2.1.4 (test)',     'mode' => 'version',  'expected' => '2.1.4'),
-				6   => array('input' => $url,               'mode'=>'url',        'expected' => $url),
-				7   => array('input' => array('1', 'xxx'),  'mode'=>'str',        'expected' => array('1', 'xxx')),
-				8   => array('input' => 'myemail@email.com',  'mode'=>'email',    'expected' => 'myemail@email.com'),
-			);
-
-			foreach($tests as $index=>$var)
+	/*
+			public function testParseBBTags()
 			{
-				$result = $this->tp->filter($var['input'],$var['mode']);
-				$this->assertEquals($var['expected'],$result, "Failed on index: ".$index);
+
 			}
+	*/
+	public function testFilter()
+	{
+		$url = 'http://www.domain.com/folder/folder2//1234_1_0.jpg';
 
-			// Validate.
+		// Filter tests.
 
-			$tests2 = array(
-				0   => array('input' => 'http://www.domain.com/folder/file.zip', 'mode'=>'url'), // good url
-				1   => array('input' => 'http:/www.domain.com/folder/file.zip', 'mode'=>'url'), // bad url
-				2   => array('input' => array('1', 'xxx'),  'mode'=>'int'), // good and bad integer
-				3   => array('input' => 'myemail@email.com',  'mode'=>'email'), // good email
-				4   => array('input' => 'bad-email.com',  'mode'=>'email'), // bad email
-				5   => array('input' => '123.23.123.125',  'mode'=>'ip'), // good ip
-				6   => array('input' => 'xx.23.123.125',  'mode'=>'ip'), // bad ip
-			);
+		$tests = array(
+			0 => array('input' => 'test123 xxx', 'mode' => 'w', 'expected' => 'test123xxx'),
+			1 => array('input' => 'test123 xxx', 'mode' => 'd', 'expected' => '123'),
+			2 => array('input' => 'test123 xxx', 'mode' => 'wd', 'expected' => 'test123xxx'),
+			3 => array('input' => 'test123 xxx', 'mode' => 'wds', 'expected' => 'test123 xxx'),
+			4 => array('input' => 'test123 xxx.jpg', 'mode' => 'file', 'expected' => 'test123-xxx.jpg'),
+			5 => array('input' => '2.1.4 (test)', 'mode' => 'version', 'expected' => '2.1.4'),
+			6 => array('input' => $url, 'mode' => 'url', 'expected' => $url),
+			7 => array('input' => array('1', 'xxx'), 'mode' => 'str', 'expected' => array('1', 'xxx')),
+			8 => array('input' => 'myemail@email.com', 'mode' => 'email', 'expected' => 'myemail@email.com'),
+		);
 
-			$expected2 = array (
-			  0       => 'http://www.domain.com/folder/file.zip',
-			  1       => false,
-			  2       =>  array ( 1, false),
-			  3       => 'myemail@email.com',
-			  4       => false,
-			  5       => '123.23.123.125',
-			  6       => false,
-			);
+		foreach ($tests as $index => $var)
+		{
+			$result = $this->tp->filter($var['input'], $var['mode']);
+			$this->assertEquals($var['expected'], $result, "Failed on index: " . $index);
+		}
+
+		// Validate.
+
+		$tests2 = array(
+			0 => array('input' => 'http://www.domain.com/folder/file.zip', 'mode' => 'url'), // good url
+			1 => array('input' => 'http:/www.domain.com/folder/file.zip', 'mode' => 'url'), // bad url
+			2 => array('input' => array('1', 'xxx'), 'mode' => 'int'), // good and bad integer
+			3 => array('input' => 'myemail@email.com', 'mode' => 'email'), // good email
+			4 => array('input' => 'bad-email.com', 'mode' => 'email'), // bad email
+			5 => array('input' => '123.23.123.125', 'mode' => 'ip'), // good ip
+			6 => array('input' => 'xx.23.123.125', 'mode' => 'ip'), // bad ip
+		);
+
+		$expected2 = array(
+			0 => 'http://www.domain.com/folder/file.zip',
+			1 => false,
+			2 => array(1, false),
+			3 => 'myemail@email.com',
+			4 => false,
+			5 => '123.23.123.125',
+			6 => false,
+		);
 
 		//	$ret = [];
-			foreach($tests2 as $index=>$var)
-			{
-				$result = $this->tp->filter($var['input'],$var['mode'], true);
+		foreach ($tests2 as $index => $var)
+		{
+			$result = $this->tp->filter($var['input'], $var['mode'], true);
 			//	$ret[$index] = $result;
-				$this->assertSame($expected2[$index], $result);
-			}
-
+			$this->assertSame($expected2[$index], $result);
 		}
 
-		/**
-		 * e107 v0.6.0 requires strings to be passed around with quotation marks escaped for HTML as a way to prevent
-		 * both SQL injection and cross-site scripting. Although {@see e_parse::toDB()} is supposed to do that, some
-		 * usages, specifically {@see e_front_model::sanitizeValue()} call {@see e_parse::filter()} instead.
-		 *
-		 * @version 2.3.1
-		 */
-		public function testFilterStr()
-		{
-			$input = "\"e107's\"";
-			$expected = ""e107's"";
+	}
 
-			$actual = $this->tp->filter($input, 'str');
+	/**
+	 * e107 v0.6.0 requires strings to be passed around with quotation marks escaped for HTML as a way to prevent
+	 * both SQL injection and cross-site scripting. Although {@see e_parse::toDB()} is supposed to do that, some
+	 * usages, specifically {@see e_front_model::sanitizeValue()} call {@see e_parse::filter()} instead.
+	 *
+	 * @version 2.3.1
+	 */
+	public function testFilterStr()
+	{
+		$input = "\"e107's\"";
+		$expected = ""e107's"";
 
-			$this->assertEquals($expected, $actual);
-		}
+		$actual = $this->tp->filter($input, 'str');
 
-		public function testCleanHtml()
-		{
-		    global $_E107;
-			$_E107['phpunit'] = true; // disable CLI "all access" permissions to simulated a non-cli scenario.
+		$this->assertEquals($expected, $actual);
+	}
 
-		    $this->tp->setScriptAccess(e_UC_NOBODY);
+	public function testCleanHtml()
+	{
+		global $_E107;
+		$_E107['phpunit'] = true; // disable CLI "all access" permissions to simulated a non-cli scenario.
 
-			$tests = array(
-				0   => array(
-				    'html' => " '<svg/onload=prompt(1)//'
-                ),
+		$this->tp->setScriptAccess(e_UC_NOBODY);
+
+		$tests = array(
+			0  => array(
+				'html'     => " '<svg/onload=prompt(1)//'
+			),
 			//	1   => array('html' => '', 'expected'=>''),
 			//	2   => array('html' => '">', 'expected'=>'">'),
-				3   => array(
-				    'html' => '< 200',
-				    'expected'=>'< 200'
-                ),
-				4   => array(
-				    'html' => "function sc_my_shortcode(){\nreturn \"Something\";}",
-				    'expected' =>  "function sc_my_shortcode(){\nreturn \"Something\";}"
-                ),
-               	5   => array(
-               	    'html' => "
      function sc_my_shortcode(){\nreturn \"Something\";}
      ",
-               	    'expected' => "
      function sc_my_shortcode(){\nreturn \"Something\";}
      "
-                ),
-                6   => array(
-                    'html'      => '',
-                    'expected'  =>''
-                ),
-                7 => array( // with 
       inside 
       ie. TinyMce
-                    'html'      => '
      require_once("class2.php");
      require_once(HEADERF);
      echo "test";<br>
      require_once(FOOTERF);
      ',
-                    'expected'  => "
      require_once(\"class2.php\");\nrequire_once(HEADERF);\necho \"test\";<br>\nrequire_once(FOOTERF);
      "
-                ),
-                8 => array( // with \n
-                    'html'      => "
      require_once(\"class2.php\");\nrequire_once(HEADERF);\necho \"test\";<br>\nrequire_once(FOOTERF);
      ",
-                    'expected'  => "
      require_once(\"class2.php\");\nrequire_once(HEADERF);\necho \"test\";<br>\nrequire_once(FOOTERF);
      "
-                ),
-                9 => array( // with \r\n (windows) line-breaks.
-                    'html'      => "
      require_once(\"class2.php\");\r\nrequire_once(HEADERF);\r\necho \"test\";<br>\r\nrequire_once(FOOTERF);
      ",
-                    'expected'  => "
      require_once(\"class2.php\");\nrequire_once(HEADERF);\necho \"test\";<br>\nrequire_once(FOOTERF);
      "
-                ),
-                10   => array(
-			        'html'=>    'Test',
-			        'expected'=>'Test'
-                ),
+			3  => array(
+				'html'     => '< 200',
+				'expected' => '< 200'
+			),
+			4  => array(
+				'html'     => "function sc_my_shortcode(){\nreturn \"Something\";}",
+				'expected' => "function sc_my_shortcode(){\nreturn \"Something\";}"
+			),
+			5  => array(
+				'html'     => "
      function sc_my_shortcode(){\nreturn \"Something\";}
      ",
+				'expected' => "
      function sc_my_shortcode(){\nreturn \"Something\";}
      "
+			),
+			6  => array(
+				'html'     => '',
+				'expected' => ''
+			),
+			7  => array( // with 
       inside 
       ie. TinyMce
+				'html'     => '
      require_once("class2.php");
      require_once(HEADERF);
      echo "test";<br>
      require_once(FOOTERF);
      ',
+				'expected' => "
      require_once(\"class2.php\");\nrequire_once(HEADERF);\necho \"test\";<br>\nrequire_once(FOOTERF);
      "
+			),
+			8  => array( // with \n
+				'html'     => "
      require_once(\"class2.php\");\nrequire_once(HEADERF);\necho \"test\";<br>\nrequire_once(FOOTERF);
      ",
+				'expected' => "
      require_once(\"class2.php\");\nrequire_once(HEADERF);\necho \"test\";<br>\nrequire_once(FOOTERF);
      "
+			),
+			9  => array( // with \r\n (windows) line-breaks.
+				'html'     => "
      require_once(\"class2.php\");\r\nrequire_once(HEADERF);\r\necho \"test\";<br>\r\nrequire_once(FOOTERF);
      ",
+				'expected' => "
      require_once(\"class2.php\");\nrequire_once(HEADERF);\necho \"test\";<br>\nrequire_once(FOOTERF);
      "
+			),
+			10 => array(
+				'html'     => 'Test',
+				'expected' => 'Test'
+			),
 
-                11 => array(
-                    'html'      => "
      {THEME_PREF: code=header_width&default=container}
      ",
-                    'expected'  => "
      {THEME_PREF: code=header_width&default=container}
      ",
-                ),
+			11 => array(
+				'html'     => "
      {THEME_PREF: code=header_width&default=container}
      ",
+				'expected' => "
      {THEME_PREF: code=header_width&default=container}
      ",
+			),
 
-                12 => array(
-                    'html'      => "
      /* {THEME_PREF: code=header_width&default=container} */
      ",
-                    'expected'  => "
      /* {THEME_PREF: code=header_width&default=container} */
      ",
-                ),
+			12 => array(
+				'html'     => "
      /* {THEME_PREF: code=header_width&default=container} */
      ",
+				'expected' => "
      /* {THEME_PREF: code=header_width&default=container} */
      ",
+			),
 
-                13 => array(
-                    'html'      => '
      ',
-                    'expected'  => '
      '
-                ),
-				14 => array(
-                    'html'      => '', // test removal of 'script' tags
-                    'expected'  => ''
-                ),
+			13 => array(
+				'html'     => '
      ',
+				'expected' => '
      '
+			),
+			14 => array(
+				'html'     => '', // test removal of 'script' tags
+				'expected' => ''
+			),
 
-                15  => array(
-                    'html'      => '',
-                    'expected'  => ''
+			15 => array(
+				'html'     => '',
+				'expected' => ''
 
-				),
-				// BC Compat.
-				16 => array(
-					'html'      => '
      ',
-					'expected'  => '
      ',
-				),
-				// BC Compat.
-				17 => array(
-					'html'      => 'colored',
-					'expected'  => 'colored',
-				),
+			),
+			// BC Compat.
+			16 => array(
+				'html'     => '
      ',
+				'expected' => '
      ',
+			),
+			// BC Compat.
+			17 => array(
+				'html'     => 'colored',
+				'expected' => 'colored',
+			),
 
 
-			);
+		);
 
 
-			foreach($tests as $var)
-			{
-				$result = $this->tp->cleanHtml($var['html']);
-				$this->assertEquals($var['expected'], $result);
-			}
-
-            // ----------- Test with Script access enabled --------------
-
-
-			$this->tp->setScriptAccess(e_UC_PUBLIC);
-
-			$scriptAccess = array(
-			    0   => array(
-			        'html'      => 'Test',
-			        'expected'  => 'Test'
-                ),
-                1 => array(
-                    'html'      => '', // test support for 'script' tags
-                    'expected'  => ''
-                )
-            );
-
-			foreach($scriptAccess as $var)
-			{
-				$result = $this->tp->cleanHtml($var['html']);
-				$this->assertEquals($var['expected'], $result);
-			}
-
-            $this->tp->setScriptAccess(false);
-            unset($_E107['phpunit']);
-
-		}
-
-
-/*
-		public function testSecureAttributeValue()
+		foreach ($tests as $var)
 		{
-
+			$result = $this->tp->cleanHtml($var['html']);
+			$this->assertEquals($var['expected'], $result);
 		}
 
-		public function testInvalidAttributeValue()
+		// ----------- Test with Script access enabled --------------
+
+
+		$this->tp->setScriptAccess(e_UC_PUBLIC);
+
+		$scriptAccess = array(
+			0 => array(
+				'html'     => 'Test',
+				'expected' => 'Test'
+			),
+			1 => array(
+				'html'     => '', // test support for 'script' tags
+				'expected' => ''
+			)
+		);
+
+		foreach ($scriptAccess as $var)
 		{
-
+			$result = $this->tp->cleanHtml($var['html']);
+			$this->assertEquals($var['expected'], $result);
 		}
-*/
-/*
-        public function testGrantScriptAccess()
-        {
-            $before = $this->tp->getAllowedAttributes();
 
-            $this->tp->grantScriptAccess();
+		$this->tp->setScriptAccess(false);
+		unset($_E107['phpunit']);
 
-            $after = $this->tp->getAllowedAttributes();
-
-
-        }*/
 	}
+
+
+	/*
+			public function testSecureAttributeValue()
+			{
+
+			}
+
+			public function testInvalidAttributeValue()
+			{
+
+			}
+	*/
+	/*
+			public function testGrantScriptAccess()
+			{
+				$before = $this->tp->getAllowedAttributes();
+
+				$this->tp->grantScriptAccess();
+
+				$after = $this->tp->getAllowedAttributes();
+
+
+			}*/
+}