Happy New Year

[squirrelmail.git] / functions / rfc822address.php

diff --git a/functions/rfc822address.php b/functions/rfc822address.php
index 16885ababc3eab99de31bd0c75e83b8312e416d9..0ebd8f6184a521f73a3694bf747183b5f03cad6e 100644 (file)
--- a/functions/rfc822address.php
+++ b/functions/rfc822address.php
@@ -1,13 +1,12 @@
 <?php
+
 /**
  * rfc822address.php
  *
- * Copyright (c) 2004 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-2020 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