I think I'm getting tired

[squirrelmail.git] / functions / rfc822address.php

diff --git a/functions/rfc822address.php b/functions/rfc822address.php
index c57af132fbe98d83f016b49bc775d8a277727500..d662a4625b6323002f468f550461d7bd6f86337e 100644 (file)
--- a/functions/rfc822address.php
+++ b/functions/rfc822address.php
@@ -2,7 +2,7 @@
 /**
  * rfc822address.php
  *
- * Copyright (c) 2004 The SquirrelMail Project Team
+ * 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.
@@ -12,6 +12,9 @@
  * @package squirrelmail
  */
 
+/**
+ * Undocumented defines
+ */
 if (!defined('SQM_ADDR_PERSONAL')) define('SQM_ADDR_PERSONAL', 0);
 if (!defined('SQM_ADDR_ADLL'))     define('SQM_ADDR_ADL',      1);
 if (!defined('SQM_ADDR_MAILBOX'))  define('SQM_ADDR_MAILBOX',  2);
@@ -29,19 +32,19 @@ if (!defined('SQM_ADDR_HOST'))     define('SQM_ADDR_HOST',     3);
  **/
 
 function parseRFC822Address($sAddress,$aProps) {
-    $aPropsDefault = array (
-                            'domain' => '',         //
-                            'limit'  => 0,          // limits returned addresses
-                            'abooklookup' => false); // callback function for addressbook lookup
-
-    $aProps = is_array($aProps) ? array_merge($aPropsDefault,$aProps) : $aPropsDefault;
+//    $aPropsDefault = array (
+//                            'domain' => '',         //
+//                            'limit'  => 0,          // limits returned addresses
+//                            'abooklookup' => false); // callback function for addressbook lookup
+//
+//    $aProps = is_array($aProps) ? array_merge($aPropsDefault,$aProps) : $aPropsDefault;
 
-    $cbLookup = $aProps['abooklookup'];
-    $sDomain  = $aProps['domain'];
+//    $cbLookup = $aProps['abooklookup'];
+//    $sDomain  = $aProps['domain'];
     $iLimit   = $aProps['limit'];
 
     $aTokens = _getAddressTokens($sAddress);
-    $sPersonal = $sEmail = $sComment = $sGroup = '';
+    $sEmail = $sGroup = '';
     $aStack = $aComment = $aAddress = array();
     foreach ($aTokens as $sToken) {
         if ($iLimit && $iLimit == count($aAddress)) {
@@ -299,7 +302,6 @@ function _createAddressElement(&$aStack,&$aComment,&$sEmail) {
 
 function _getAddressTokens($address) {
     $aTokens = array();
-    $aAddress = array();
     $aSpecials = array('(' ,'<' ,',' ,';' ,':');
     $aReplace =  array(' (',' <',' ,',' ;',' :');
     $address = str_replace($aSpecials,$aReplace,$address);