git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@4614
7612ce4b-ef26-0410-bec9-
ea0150e637f0
: $this->mailbox);
$personal = trim($this->personal);
$is_encoded = false;
: $this->mailbox);
$personal = trim($this->personal);
$is_encoded = false;
- if (preg_match('/^(=\?([^?]*)\?(Q|B)\?([^?]*)\?=)(.*)/Ui',$personal,$reg)) {
+ if (preg_match('/(=\?([^?]*)\?(Q|B)\?([^?]*)\?=)(.*)/Ui',$personal,$reg)) {
$is_encoded = true;
}
if ($personal) {
$is_encoded = true;
}
if ($personal) {
if (preg_match('/^(=\?([^?]*)\?(Q|B)\?([^?]*)\?=)(.*)/Ui',substr($address,$pos),$reg)) {
$name .= $reg[1];
$pos += strlen($reg[1]);
if (preg_match('/^(=\?([^?]*)\?(Q|B)\?([^?]*)\?=)(.*)/Ui',substr($address,$pos),$reg)) {
$name .= $reg[1];
$pos += strlen($reg[1]);
$addr_start = $pos;
$is_encoded = true;
break;
$addr_start = $pos;
$is_encoded = true;
break;
} else if ($name == '') {
$name = trim(substr($address, 0, $addr_start));
}
} else if ($name == '') {
$name = trim(substr($address, 0, $addr_start));
}
- if (!$name && $comment) $name = $comment;
+ if (!$name && $comment) {
+ $name = $comment;
+ } else if ($name && $comment) {
+ $name = $name .' ('.$comment.')';
+ }
$at = strpos($addr, '@');
$addr_structure = new AddressStructure();
$addr_structure->group = $group;
$at = strpos($addr, '@');
$addr_structure = new AddressStructure();
$addr_structure->group = $group;