projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert last change, which caused nasty sesion ID errors, although now we still have...
[squirrelmail.git]
/
functions
/
rfc822address.php
diff --git
a/functions/rfc822address.php
b/functions/rfc822address.php
index 4623fb42eef72e3a0e187ac2d153ee106fa12580..c8d915bebbd4602ba2f8091ac8952344d5019a81 100644
(file)
--- a/
functions/rfc822address.php
+++ b/
functions/rfc822address.php
@@
-1,13
+1,12
@@
<?php
<?php
+
/**
* rfc822address.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.
*
* Contains rfc822 email address function parsing functions.
*
- *
+ * @copyright © 2004-2007 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
*/
* @version $Id$
* @package squirrelmail
*/
@@
-46,8
+45,8
@@
function parseRFC822Address($sAddress,$iLimit = 0) {
case ';':
if ($sGroup) {
$aAddress[] = _createAddressElement($aStack,$aComment,$sEmail);
case ';':
if ($sGroup) {
$aAddress[] = _createAddressElement($aStack,$aComment,$sEmail);
- $
o
Addr = end($aAddress);
- if(!$
oAddr || ((isset($oAddr)) && !$oAddr->mailbox && !$oAddr->personal
)) {
+ $
a
Addr = end($aAddress);
+ if(!$
aAddr || ((isset($aAddr)) && !$aAddr[SQM_ADDR_MAILBOX] && !$aAddr[SQM_ADDR_PERSONAL]
)) {
$sEmail = $sGroup . ':;';
}
$aAddress[] = _createAddressElement($aStack,$aComment,$sEmail);
$sEmail = $sGroup . ':;';
}
$aAddress[] = _createAddressElement($aStack,$aComment,$sEmail);
@@
-407,4
+406,3
@@
function _getAddressTokens($address) {
}
return $aTokens;
}
}
return $aTokens;
}
-?>
\ No newline at end of file