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

Fix dolGetFirstLastname() for 4 and 5

Browse Source
This commit is contained in:
Laurent Destailleur 2020-11-27 01:18:01 +01:00
parent 0834e4801e
commit 47a5037155
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/adherents/class/adherent.class.php
View File

@ -1992,7 +1992,7 @@ class Adherent extends CommonObject
* @param string $morecss Add more css on link * @param string $morecss Add more css on link
* @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking * @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
* @param int $notooltip 1=Disable tooltip * @param int $notooltip 1=Disable tooltip
* @param int $addlinktonotes 1=Add link to notes * @param int $addlinktonotes 1=Add link to notes
* @return string Chaine avec URL * @return string Chaine avec URL
*/ */
public function getNomUrl($withpictoimg = 0, $maxlen = 0, $option = 'card', $mode = '', $morecss = '', $save_lastsearch_value = -1, $notooltip = 0, $addlinktonotes = 0) public function getNomUrl($withpictoimg = 0, $maxlen = 0, $option = 'card', $mode = '', $morecss = '', $save_lastsearch_value = -1, $notooltip = 0, $addlinktonotes = 0)

2
htdocs/core/class/commonobject.class.php
View File

@ -578,7 +578,7 @@ abstract class CommonObject
* *
* @param Translate $langs Language object for translation of civility (used only if option is 1) * @param Translate $langs Language object for translation of civility (used only if option is 1)
* @param int $option 0=No option, 1=Add civility * @param int $option 0=No option, 1=Add civility
* @param int $nameorder -1=Auto, 0=Lastname+Firstname, 1=Firstname+Lastname, 2=Firstname, 3=Firstname if defined else lastname * @param int $nameorder -1=Auto, 0=Lastname+Firstname, 1=Firstname+Lastname, 2=Firstname, 3=Firstname if defined else lastname, 4=Lastname, 5=Lastname if defined else firstname
* @param int $maxlen Maximum length * @param int $maxlen Maximum length
* @return string String with full name * @return string String with full name
*/ */

22
htdocs/core/lib/functions.lib.php
View File

@ -6725,7 +6725,7 @@ function get_date_range($date_start, $date_end, $format = '', $outputlangs = '',
* *
* @param string $firstname Firstname * @param string $firstname Firstname
* @param string $lastname Lastname * @param string $lastname Lastname
* @param int $nameorder -1=Auto, 0=Lastname+Firstname, 1=Firstname+Lastname, 2=Firstname, 3=Firstname if defined else lastname * @param int $nameorder -1=Auto, 0=Lastname+Firstname, 1=Firstname+Lastname, 2=Firstname, 3=Firstname if defined else lastname, 4=Lastname, 5=Lastname if defined else firstname
* @return string Firstname + lastname or Lastname + firstname * @return string Firstname + lastname or Lastname + firstname
*/ */
function dolGetFirstLastname($firstname, $lastname, $nameorder = -1) function dolGetFirstLastname($firstname, $lastname, $nameorder = -1)
@ -6735,22 +6735,24 @@ function dolGetFirstLastname($firstname, $lastname, $nameorder = -1)
$ret = ''; $ret = '';
// If order not defined, we use the setup // If order not defined, we use the setup
if ($nameorder < 0) $nameorder = (empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION) ? 1 : 0); if ($nameorder < 0) $nameorder = (empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION) ? 1 : 0);
if ($nameorder && $nameorder != 2 && $nameorder != 3) if ($nameorder == 1) {
{
$ret .= $firstname; $ret .= $firstname;
if ($firstname && $lastname) $ret .= ' '; if ($firstname && $lastname) $ret .= ' ';
$ret .= $lastname; $ret .= $lastname;
} elseif ($nameorder == 2 || $nameorder == 3) } elseif ($nameorder == 2 || $nameorder == 3) {
{
$ret .= $firstname; $ret .= $firstname;
if (empty($ret) && $nameorder == 3) if (empty($ret) && $nameorder == 3) {
{
$ret .= $lastname; $ret .= $lastname;
} }
} else { } else { // 0, 4 or 5
$ret .= $lastname; $ret .= $lastname;
if ($firstname && $lastname) $ret .= ' '; if (empty($ret) && $nameorder == 5) {
$ret .= $firstname; $ret .= $firstname;
}
if ($nameorder == 0) {
if ($firstname && $lastname) $ret .= ' ';
$ret .= $firstname;
}
} }
return $ret; return $ret;
} }