diff --git a/e107_core/shortcodes/batch/usersettings_shortcodes.php b/e107_core/shortcodes/batch/usersettings_shortcodes.php index 87f74f8a3..fc1e38eda 100755 --- a/e107_core/shortcodes/batch/usersettings_shortcodes.php +++ b/e107_core/shortcodes/batch/usersettings_shortcodes.php @@ -198,7 +198,7 @@ class usersettings_shortcodes extends e_shortcode $inclass = implode(',',$is_checked); // $ret = "
"; - $ret .= $e_userclass->vetted_tree('class',array($e_userclass,checkbox_desc),$inclass,'editable, no-excludes'); + $ret .= $e_userclass->vetted_tree('class',array($e_userclass,'checkbox_desc'),$inclass,'editable, no-excludes'); // $ret .= "
\n"; return $ret; @@ -473,7 +473,7 @@ class usersettings_shortcodes extends e_shortcode $parms = explode("^,^",$fInfo['user_extended_struct_parms']); $fhide=""; - if($parms[3]) + if(varset($parms[3])) { $chk = (strpos($this->var['user_hidden_fields'], "^user_".$parm."^") === FALSE) ? FALSE : TRUE; if(isset($_POST['updatesettings'])) diff --git a/e107_core/templates/usersettings_template.php b/e107_core/templates/usersettings_template.php index ffe828a5d..c5222a588 100755 --- a/e107_core/templates/usersettings_template.php +++ b/e107_core/templates/usersettings_template.php @@ -46,7 +46,7 @@ $sc_style['PASSWORD_LEN']['pre'] = "
(".LAN_USE $sc_style['PASSWORD_LEN']['post'] = " ".LAN_USER_79.")"; $sc_style['USERCLASSES']['pre'] = " - ".LAN_USER_76.":".req($pref['signup_option_class'])." + ".LAN_USER_76.":".req(varset($pref['signup_option_class']))."
".LAN_USER_73." "; @@ -77,7 +77,7 @@ $sc_style['LOGINNAME']['pre'] = " $sc_style['LOGINNAME']['post'] = "\n"; -$sc_style['SIGNATURE']['pre'] = "".LAN_USER_71.req($pref['signup_option_signature'])." +$sc_style['SIGNATURE']['pre'] = "".LAN_USER_71.req(varset($pref['signup_option_signature']))." "; //$sc_style['SIGNATURE']['pre'] = " @@ -125,14 +125,14 @@ $USERSETTINGS_EDIT = " {LOGINNAME} - ".LAN_USER_60.req(!$pref['disable_emailcheck'])." + ".LAN_USER_60.req(!varset($pref['disable_emailcheck']))." {EMAIL} - ".LAN_USER_63.req($pref['signup_option_realname'])." + ".LAN_USER_63.req(varset($pref['signup_option_realname']))." {REALNAME} @@ -154,7 +154,7 @@ $USERSETTINGS_EDIT = " - ".LAN_USER_07.req($pref['signup_option_image'])." + ".LAN_USER_07.req(varset($pref['signup_option_image']))." {AVATAR_REMOTE} @@ -214,7 +214,7 @@ $USERSETTINGS_WRAPPER['edit']['CUSTOMTITLE'] = "
"; $USERSETTINGS_WRAPPER['edit']['USERCLASSES'] = "
- +
{---}
"; @@ -233,7 +233,7 @@ $USERSETTINGS_WRAPPER['edit']['PHOTO_UPLOAD'] = "
$USERSETTINGS_WRAPPER['edit']['SIGNATURE'] = "
- +
{---}
"; @@ -256,14 +256,14 @@ $USERSETTINGS_TEMPLATE['edit'] = "
- +
{EMAIL}
- +
{REALNAME}
@@ -284,7 +284,7 @@ $USERSETTINGS_TEMPLATE['edit'] = "
- +
{AVATAR_REMOTE}
@@ -320,4 +320,4 @@ $USERSETTINGS_TEMPLATE['extended-field'] = "
-?> \ No newline at end of file +?> diff --git a/e107_handlers/user_extended_class.php b/e107_handlers/user_extended_class.php index 9a8e300c1..8488a8b78 100644 --- a/e107_handlers/user_extended_class.php +++ b/e107_handlers/user_extended_class.php @@ -726,8 +726,8 @@ class e107_user_extended $parms = explode("^,^",$struct['user_extended_struct_parms']); $include = preg_replace("/\n/", " ", $tp->toHtml($parms[0])); - $regex = $tp->toText($parms[1]); - $regexfail = $tp->toText($parms[2]); + $regex = $tp->toText(varset($parms[1])); + $regexfail = $tp->toText(varset($parms[2])); $fname = "ue[user_".$struct['user_extended_struct_name']."]"; $required = vartrue($struct['user_extended_struct_required']) == 1 ? "required" : ""; $fid = $frm->name2id($fname); diff --git a/e107_handlers/user_handler.php b/e107_handlers/user_handler.php index a4a2dfff1..4140ab628 100644 --- a/e107_handlers/user_handler.php +++ b/e107_handlers/user_handler.php @@ -731,7 +731,7 @@ class UserHandler } else { - if ($userData['user_class'] != '') $classList = explode(',',$userData['user_class']); + if (!empty($userData['user_class'])) $classList = explode(',',$userData['user_class']); } foreach (array(e_UC_MEMBER, e_UC_READONLY, e_UC_PUBLIC) as $c) { diff --git a/usersettings.php b/usersettings.php index c7ae44be3..b546c4173 100644 --- a/usersettings.php +++ b/usersettings.php @@ -178,7 +178,7 @@ if (isset($_POST['updatesettings'])) } // Uploaded avatar and/or photo - if ($file_userfile['error'] != 4) + if (varset($file_userfile['error']) != 4) { require_once (e_HANDLER.'upload_handler.php'); require_once (e_HANDLER.'resize_handler.php');