mirror of
https://github.com/e107inc/e107.git
synced 2025-07-24 16:31:48 +02:00
Fixes #3676 - 'required' was not displayed on extended user fields.
This commit is contained in:
@@ -559,10 +559,14 @@ class usersettings_shortcodes extends e_shortcode
|
||||
$uVal = str_replace(chr(1), "", $this->var['user_' . $parm]);
|
||||
$fval = $ue->user_extended_edit($fInfo, $uVal);
|
||||
|
||||
|
||||
$rVal = !empty($fInfo['user_extended_struct_required']) ;
|
||||
|
||||
$ret = $USEREXTENDED_FIELD;
|
||||
$ret = str_replace("{FIELDNAME}", $fname, $ret);
|
||||
$ret = str_replace("{FIELDVAL}", $fval, $ret);
|
||||
$ret = str_replace("{HIDEFIELD}", $fhide, $ret);
|
||||
$ret = str_replace("{REQUIRED}", $this->required($rVal), $ret);
|
||||
}
|
||||
|
||||
$extended_showed['field'][$parm] = 1;
|
||||
@@ -578,6 +582,17 @@ class usersettings_shortcodes extends e_shortcode
|
||||
|
||||
}
|
||||
|
||||
private function required($val=null)
|
||||
{
|
||||
if(empty($val))
|
||||
{
|
||||
return '';
|
||||
}
|
||||
|
||||
return "<span class='required'><!-- empty --></span>";
|
||||
|
||||
}
|
||||
|
||||
function sc_deleteaccountbutton($parm=array())
|
||||
{
|
||||
|
||||
|
@@ -246,7 +246,9 @@ $USERSETTINGS_WRAPPER['edit']['SIGNATURE'] = "<div class='form-group'>
|
||||
|
||||
|
||||
|
||||
// Bootstrap 3 only.
|
||||
// Bootstrap 3 only.
|
||||
|
||||
$USERSETTINGS_TEMPLATE = array();
|
||||
|
||||
$USERSETTINGS_TEMPLATE['edit'] = "
|
||||
|
||||
@@ -309,7 +311,7 @@ $USERSETTINGS_TEMPLATE['edit'] = "
|
||||
|
||||
$USERSETTINGS_TEMPLATE['extended-category'] = "<h3>{CATNAME}</h3>";
|
||||
$USERSETTINGS_TEMPLATE['extended-field'] = "<div class='form-group'>
|
||||
<label class='col-sm-3 control-label'>{FIELDNAME}</label>
|
||||
<label class='col-sm-3 control-label'>{FIELDNAME} {REQUIRED}</label>
|
||||
<div class='col-sm-9'>
|
||||
{FIELDVAL} {HIDEFIELD}
|
||||
</div>
|
||||
@@ -317,5 +319,3 @@ $USERSETTINGS_TEMPLATE['extended-field'] = "<div class='form-group'>
|
||||
";
|
||||
|
||||
|
||||
|
||||
?>
|
||||
|
@@ -1110,7 +1110,7 @@ function req($field)
|
||||
$ret = "";
|
||||
if ($field == 2)
|
||||
{
|
||||
$ret = "<span class='required'> *</span>";
|
||||
$ret = "<span class='required'><!-- empty --></span>";
|
||||
}
|
||||
return $ret;
|
||||
}
|
||||
|
Reference in New Issue
Block a user