X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Frfc822address.php;h=e308b637a903bc729d78b98a1586742e285604a3;hp=4623fb42eef72e3a0e187ac2d153ee106fa12580;hb=c3d4275eae0b920a3d25a2d3ec57117693c37fc5;hpb=1043bfcb66ffa871889c30f1fc4e45190013dc40

diff --git a/functions/rfc822address.php b/functions/rfc822address.php
index 4623fb42..e308b637 100644
--- a/functions/rfc822address.php
+++ b/functions/rfc822address.php
@@ -1,13 +1,12 @@
 <?php
+
 /**
  * rfc822address.php
  *
- * Copyright (c) 2004-2005 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
  * Contains rfc822 email address function parsing functions.
  *
- *
+ * @copyright 2004-2016 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
  */
@@ -46,8 +45,8 @@ function parseRFC822Address($sAddress,$iLimit = 0) {
         case ';':
             if ($sGroup) {
                 $aAddress[] = _createAddressElement($aStack,$aComment,$sEmail);
-                $oAddr = end($aAddress);
-                if(!$oAddr || ((isset($oAddr)) && !$oAddr->mailbox && !$oAddr->personal)) {
+                $aAddr = end($aAddress);
+                if(!$aAddr || ((isset($aAddr)) && !$aAddr[SQM_ADDR_MAILBOX] && !$aAddr[SQM_ADDR_PERSONAL])) {
                     $sEmail = $sGroup . ':;';
                 }
                 $aAddress[] = _createAddressElement($aStack,$aComment,$sEmail);
@@ -91,7 +90,7 @@ function parseRFC822Address($sAddress,$iLimit = 0) {
  **/
 function getAddressString($aAddressList,$aProps) {
     $aPropsDefault = array (
-                            'separator' => ',',     // address separator
+                            'separator' => ', ',     // address separator
                             'limit'  => 0,          // limits returned addresses
                             'personal' => true,     // show persnal part
                             'email'    => true,     // show email part
@@ -407,4 +406,3 @@ function _getAddressTokens($address) {
     }
     return $aTokens;
 }
-?>
\ No newline at end of file