lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2016-07-21 17:25:45 +02:00
commit 73aeb9fcce
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
htdocs/core/class/extrafields.class.php
View File

@ -82,6 +82,7 @@ class ExtraFields
'chkbxlst' => 'ExtrafieldCheckBoxFromList',
'link' => 'ExtrafieldLink',
'separate' => 'ExtrafieldSeparator',
'password' => 'ExtrafieldPassword',
);
/**
@ -190,7 +191,7 @@ class ExtraFields
} elseif($type=='phone') {
$typedb='varchar';
$lengthdb='20';
}elseif($type=='mail') {
} elseif($type=='mail') {
$typedb='varchar';
$lengthdb='128';
} elseif (($type=='select') || ($type=='sellist') || ($type=='radio') ||($type=='checkbox') ||($type=='chkbxlst')){
@ -199,6 +200,9 @@ class ExtraFields
} elseif ($type=='link') {
$typedb='int';
$lengthdb='11';
} elseif($type=='password') {
$typedb='varchar';
$lengthdb='50';
} else {
$typedb=$type;
$lengthdb=$length;
@ -417,7 +421,7 @@ class ExtraFields
} elseif($type=='phone') {
$typedb='varchar';
$lengthdb='20';
}elseif($type=='mail') {
} elseif($type=='mail') {
$typedb='varchar';
$lengthdb='128';
} elseif (($type=='select') || ($type=='sellist') || ($type=='radio') || ($type=='checkbox') || ($type=='chkbxlst')) {
@ -426,6 +430,9 @@ class ExtraFields
} elseif ($type=='link') {
$typedb='int';
$lengthdb='11';
} elseif($type=='password') {
$typedb='varchar';
$lengthdb='50';
} else {
$typedb=$type;
$lengthdb=$length;
@ -1146,6 +1153,10 @@ class ExtraFields
$out.='Error bad setup of extrafield';
}
}
elseif ($type == 'password')
{
$out='<input type="password" class="flat" name="'.$keysuffix.'options_'.$key.$keyprefix.'" size="'.$showsize.'" value="'.$value.'" '.($moreparam?$moreparam:'').'>';
}
if (!empty($hidden)) {
$out='<input type="hidden" value="'.$value.'" name="'.$keysuffix.'options_'.$key.$keyprefix.'" id="'.$keysuffix.'options_'.$key.$keyprefix.'"/>';
}
@ -1404,6 +1415,10 @@ class ExtraFields
{
$value=dol_htmlentitiesbr($value);
}
elseif ($type == 'password')
{
$value=preg_replace('/./i','*',$value);
}
else
{
$showsize=round($size);

1
htdocs/langs/en_US/admin.lang
View File

@ -349,6 +349,7 @@ ExtrafieldMail = Email
ExtrafieldSelect = Select list
ExtrafieldSelectList = Select from table
ExtrafieldSeparator=Separator
ExtrafieldPassword=Password
ExtrafieldCheckBox=Checkbox
ExtrafieldRadio=Radio button
ExtrafieldCheckBoxFromList= Checkbox from table