diff --git a/e107_admin/users_extended.php b/e107_admin/users_extended.php
index a6d76f1f0..d7ef5443f 100755
--- a/e107_admin/users_extended.php
+++ b/e107_admin/users_extended.php
@@ -920,7 +920,7 @@ e107::js('footer-inline', js());
$type = intval($current['user_extended_struct_type']);
- $val_hide = ($type != 4 && $type !=1 ) ? "visible" : "none";
+ $val_hide = ($type !== EUF_DB_FIELD && $type !== EUF_TEXT && $type !== EUF_COUNTRY ) ? "visible" : "none";
if($type == 0)
{
@@ -949,18 +949,21 @@ e107::js('footer-inline', js());
".EXTLAN_17."";
- $text .= "".$frm->checkbox('sort_user_values',1, false, EXTLAN_87)."
";
+ $text .= "".$frm->checkbox('sort_user_values',1, false, EXTLAN_87)."
";
$text .= "";
-
+ if($this->getController()->getMode() === 'edit' && ($type !== EUF_DB_FIELD))
+ {
+ return $text;
+ }
// End of Values. --------------------------------------
- $db_hide = ($current['user_extended_struct_type'] == 4) ? "block" : "none";
+ $db_hide = ($current['user_extended_struct_type'] == EUF_DB_FIELD) ? "block" : "none";
// Ajax URL for "Table" dropdown.
$ajaxGetTableSrc = e_SELF . '?mode=ajax&action=changeTable';
diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php
index e21e19165..1253fd86e 100644
--- a/e107_handlers/e_parse_class.php
+++ b/e107_handlers/e_parse_class.php
@@ -42,7 +42,7 @@ class e_parse extends e_parser
public $e_emote;
// 'Hooked' parsers (array)
- protected $e_hook;
+ protected $e_hook = array();
public $search = array(''', ''', ''', '"', 'onerror', '>', '"', ' & ');
@@ -1991,7 +1991,12 @@ class e_parse extends e_parser
{
foreach($pref['e_tohtml_list'] as $hook)
{
- if (!is_object($this->e_hook[$hook]))
+ if(empty($hook))
+ {
+ continue;
+ }
+
+ if (empty($this->e_hook[$hook]) /*&& !is_object($this->e_hook[$hook])*/)
{
if(is_readable(e_PLUGIN.$hook."/e_tohtml.php"))
{
@@ -2224,8 +2229,9 @@ class e_parse extends e_parser
/**
- * Use it on html attributes to avoid breaking markup .
- * @example echo "Hello";
+ * Use it on html attributes to avoid breaking markup .
+ * @param string $text
+ * @example echo "Hello";
*/
function toAttribute($text)
{
@@ -4564,10 +4570,10 @@ class e_parser
return null;
}
- if(strpos($icon,'e_MEDIA_IMAGE')!==false)
- {
+ // if(strpos($icon,'e_MEDIA_IMAGE')!==false)
+ // {
// return "Use \$tp->toImage() instead of toIcon() for ".$icon."
"; // debug info only.
- }
+ // }
if(substr($icon,0,3) == 'getScriptAccess();
- $accName = e107::getUserClass()->uc_get_classname($acc);
+ $accName = e107::getUserClass()->getName($acc);
echo "e107 Parser Test with script access by ".$accName."
";
echo"User-input (eg. from \$_POST)
";
@@ -5518,13 +5524,7 @@ return;
{
$html = ''.$html.'';
}
- else // Full HTML page.
- {
- // $this->allowedTags[] = 'head';
- // $this->allowedTags[] = 'body';
- // $this->allowedTags[] = 'title';
- //$this->allowedTags[] = 'meta';
- }
+
if(!is_object($this->domObj))
{
@@ -5755,7 +5755,7 @@ return;
/**
* Check for Invalid Attribute Values
* @param $value string
- * @return true/false
+ * @return bool true/false
*/
function invalidAttributeValue($value)
{