From 544ab9e2beb181d3f788f7532c500af986937ad5 Mon Sep 17 00:00:00 2001 From: stekkel Date: Wed, 26 May 2004 01:18:42 +0000 Subject: [PATCH] make use of new parseRFC822Address function git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@7553 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- functions/imap_messages.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/functions/imap_messages.php b/functions/imap_messages.php index 5afd3030..2edf381c 100755 --- a/functions/imap_messages.php +++ b/functions/imap_messages.php @@ -193,8 +193,13 @@ function get_squirrel_sort ($imap_stream, $sSortField, $reverse = false) { if(!$walk) { array_walk($msgs, create_function('&$v,&$k,$f', '$v[$f] = (isset($v[$f])) ? $v[$f] : ""; - $addr = parseAddress($v[$f]); - $v[$f] = ($addr[0][1]) ? decodeHeader($addr[0][1]):$addr[0][0];'),$sSortField); + $addr = reset(parseRFC822Address($v[$f],1)); + $sPersonal = (isset($addr[SQM_ADDR_PERSONAL]) && $addr[SQM_ADDR_PERSONAL]) ? + $addr[SQM_ADDR_PERSONAL] : ""; + $sEmail = ($addr[SQM_ADDR_HOST]) ? + $addr[SQM_ADDR_HOST] . "@".$addr[SQM_ADDR_HOST] : + $addr[SQM_ADDR_HOST]; + $v[$f] = ($sPersonal) ? decodeHeader($sPersonal):$sEmail;'),$sSortField); $walk = true; } // nobreak -- 2.25.1