1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-03 13:17:24 +02:00

Issue #2846 LAN vars cleanup

This commit is contained in:
Cameron
2017-11-06 14:04:02 -08:00
parent 6bd8360e8a
commit fb77d03a19
3 changed files with 3 additions and 3 deletions

View File

@@ -344,7 +344,7 @@ class e107_user_extended
$err = $this->user_extended_validate_entry($val, $defs);
if ($err === true)
{ // General error - usually empty field; could be unacceptable value, or regex fail and no error message defined
$eufVals['errortext'][$f] = str_replace('--SOMETHING--',$tp->toHtml(defset($defs['user_extended_struct_text'], $defs['user_extended_struct_text']),FALSE,'defs'),LAN_USER_75);
$eufVals['errortext'][$f] = str_replace('[x]',$tp->toHtml(defset($defs['user_extended_struct_text'], $defs['user_extended_struct_text']),FALSE,'defs'),LAN_USER_75);
$eufVals['errors'][$f] = ERR_GENERIC;
}
elseif ($err)

View File

@@ -102,7 +102,7 @@ define("LAN_USER_71", "Signature: "); // LAN_120
define("LAN_USER_72", "Avatar: "); // LAN_121
define("LAN_USER_73", "choice of Content/Mail-lists");
define("LAN_USER_74", "Custom Title");
define("LAN_USER_75", "Your --SOMETHING-- is required"); // Replaces LAN_SIGNUP_6, LAN_SIGNUP_7 combination
define("LAN_USER_75", "Your [x] is required"); // Replaces LAN_SIGNUP_6, LAN_SIGNUP_7 combination
define("LAN_USER_76", "Subscribed to"); // LAN_USET_5
define("LAN_USER_77", "Your password must be at least [x] characters long."); // Replaces LAN_SIGNUP_4, LAN_SIGNUP_5 combination
define("LAN_USER_78", "Min."); // LAN_SIGNUP_1

View File

@@ -707,7 +707,7 @@ if (isset($_POST['register']) && intval($pref['user_reg']) === 1)
if ($pref['signup_option_'.$value] == 2 && !isset($alldata['data']['user_'.$value]) && !isset($alldata['errors']['user_'.$value]))
{
$alldata['errors']['user_'.$value] = ERR_GENERIC;
$alldata['errortext']['user_'.$value] = str_replace('--SOMETHING--',$signup_option_title[$key],LAN_USER_75);
$alldata['errortext']['user_'.$value] = str_replace('[x]',$signup_option_title[$key],LAN_USER_75);
}
}