mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-12 17:44:37 +02:00
Code Issues Releases Wiki Activity

Fixes #592 Missing User-extended fields when using Bootstrap with usersettings page.

Browse Source 
Closes #539 Tabs view of user-extended categories when using Bootstrap.
Added missing css classes to extended-fields.
This commit is contained in:
Cameron
2014-10-05 00:21:58 -07:00
parent 6c9680d3c0
commit abeb140fe6
6 changed files with 94 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
e107_handlers/user_extended_class.php
View File

@@ -675,10 +675,11 @@ class e107_user_extended
$regex = $tp->toText($parms[1]);
$regexfail = $tp->toText($parms[2]);
$fname = "ue[user_".$struct['user_extended_struct_name']."]";
$required = vartrue($struct['user_extended_struct_required']) ? "required" : "";
if(strpos($include, 'class') === FALSE)
{
$include .= " class='tbox' ";
$include .= " class='form-control tbox' ";
}
@@ -686,7 +687,8 @@ class e107_user_extended
{
case EUF_TEXT : //textbox
case EUF_INTEGER : //integer
$ret = "<input name='{$fname}' value='{$curval}' {$include} />";
$ret = "<input name='{$fname}' value='{$curval}' {$include} {$required} />";
return $ret;
break;
@@ -715,12 +717,12 @@ class e107_user_extended
if(deftrue('BOOTSTRAP'))
{
$ret .= $frm->radio($fname,$val,($curval == $val),array('label'=>$label));
$ret .= $frm->radio($fname,$val,($curval == $val),array('label'=>$label, 'required'=> $struct['user_extended_struct_required']));
}
else
{
$chk = ($curval == $val)? " checked='checked' " : "";
$ret .= "<input {$include} type='radio' name='{$fname}' value='{$val}' {$chk} /> {$label}";
$ret .= "<input {$include} type='radio' name='{$fname}' value='{$val}' {$chk} {$required} /> {$label}";
}
}
@@ -751,7 +753,7 @@ class e107_user_extended
if(deftrue('BOOTSTRAP'))
{
$ret .= $frm->checkbox($fname,$val,($curval == $val),array('label'=>$label));
$ret .= $frm->checkbox($fname,$val,($curval == $val),array('label'=>$label, 'required'=> $struct['user_extended_struct_required']));
}
else
{
@@ -764,7 +766,7 @@ class e107_user_extended
break;
case EUF_DROPDOWN : //dropdown
$ret = "<select {$include} name='{$fname}'>\n";
$ret = "<select {$include} name='{$fname}' {$required} >\n";
$ret .= "<option value=''>&nbsp;</option>\n"; // ensures that the user chose it.
foreach($choices as $choice)
{
@@ -788,7 +790,7 @@ class e107_user_extended
if (!method_exists($className, 'getValue')) return '???-???';
$temp->pointerReset();
$ret = "<select {$include} name='{$fname}'>\n";
$ret = "<select {$include} name='{$fname}' {$required} >\n";
$ret .= "<option value=''>&nbsp;</option>\n"; // ensures that the user chooses it.
while (FALSE !== ($row = $temp->getValue(0, 'next')))
{
@@ -808,7 +810,7 @@ class e107_user_extended
if($sql->db_Select($tp -> toDB($choices[0], true), $tp -> toDB($choices[1], true).",".$tp -> toDB($choices[2], true), "1 $order")){
$choiceList = $sql->db_getList('ALL',FALSE);
$ret = "<select {$include} name='{$fname}' >\n";
$ret = "<select {$include} name='{$fname}' {$required} >\n";
$ret .= "<option value=''>&nbsp;</option>\n"; // ensures that the user chose it.
foreach($choiceList as $cArray)
{
@@ -825,7 +827,7 @@ class e107_user_extended
break;
case EUF_TEXTAREA : //textarea
return "<textarea {$include} name='{$fname}' >{$curval}</textarea>";
return "<textarea {$include} name='{$fname}' {$required} >{$curval}</textarea>";
break;
case EUF_DATE : //date
@@ -839,11 +841,10 @@ class e107_user_extended
break;
case EUF_LANGUAGE : // language
require_once(e_HANDLER."file_class.php");
$fl = new e_file;
$lanlist = $fl->get_dirs(e_LANGUAGEDIR);
$lanlist = e107::getLanguage()->installed();
sort($lanlist);
$ret = "<select {$include} name='{$fname}'>\n";
$ret = "<select {$include} name='{$fname}' {$required} >\n";
$ret .= "<option value=''>&nbsp;</option>\n"; // ensures that the user chose it.
foreach($lanlist as $choice)
{
@@ -852,6 +853,7 @@ class e107_user_extended
$ret .= "<option value='{$choice}' {$sel}>{$choice}</option>\n";
}
$ret .= "</select>\n";
break;
}