mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-10-05 09:32:08 +02:00
* Mail: revert to use first and second part of full rfc822 mail address outside angle brackets as first and last name
This commit is contained in:
parent
08a2e4cdb8
commit
7321354bcf
@ -73,14 +73,19 @@ class Avatar
|
|||||||
{
|
{
|
||||||
if (($parts = preg_split('/[, ]+/', $matches[1])))
|
if (($parts = preg_split('/[, ]+/', $matches[1])))
|
||||||
{
|
{
|
||||||
return ['fname' => array_shift($parts), 'lname' => array_pop($parts)];
|
// if we have a usual title prefixing the name, skip it
|
||||||
|
while (preg_match('/^(Hr\.|Herr|Mr.|Mister|Fr\.|Frau|Ms.|Miss|Dr\.|Doktor|Prof.|Professor)/', $parts[0]))
|
||||||
|
{
|
||||||
|
array_shift($parts);
|
||||||
|
}
|
||||||
|
return ['fname' => array_shift($parts), 'lname' => array_shift($parts), 'label' => $matches[1]];
|
||||||
}
|
}
|
||||||
$address = $matches[2];
|
$address = $matches[2];
|
||||||
}
|
}
|
||||||
if (($parts = preg_split('/[._]/', $address)) && count($parts) >= 2)
|
if (($parts = preg_split('/[._]/', $address)) && count($parts) >= 2)
|
||||||
{
|
{
|
||||||
return ['fname' => array_shift($parts), 'lname' => array_pop($parts)];
|
return ['fname' => array_shift($parts), 'lname' => array_pop($parts), 'label' => $address];
|
||||||
}
|
}
|
||||||
return ['fname' => $address[0], 'lname' => $address[1]];
|
return ['fname' => $address[0], 'lname' => $address[1], 'label' => $address];
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
Reference in New Issue
Block a user