Stop using curly braces

[squirrelmail.git] / functions / rfc822address.php

diff --git a/functions/rfc822address.php b/functions/rfc822address.php
index 1225ed0ba4d8dc5ac2ca4312229030b2446684b4..69be3e8d4990bc2cc6610ccd457d799d2d4b4c3f 100644 (file)
--- a/functions/rfc822address.php
+++ b/functions/rfc822address.php
@@ -5,7 +5,7 @@
  *
  * Contains rfc822 email address function parsing functions.
  *
- * @copyright © 2004-2006 The SquirrelMail Project Team
+ * @copyright 2004-2021 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
@@ -31,7 +31,7 @@ function parseRFC822Address($sAddress,$iLimit = 0) {
         if ($iLimit && $iLimit == count($aAddress)) {
             return $aAddress;
         }
-        $cChar = $sToken{0};
+        $cChar = $sToken[0];
         switch ($cChar)
         {
         case '=':
@@ -90,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
@@ -290,7 +290,7 @@ function _getAddressTokens($address) {
     $iCnt = strlen($address);
     $i = 0;
     while ($i < $iCnt) {
-        $cChar = $address{$i};
+        $cChar = $address[$i];
         switch($cChar)
         {
         case '<':
@@ -309,11 +309,11 @@ function _getAddressTokens($address) {
             $iEnd = strpos($address,$cChar,$i+1);
             if ($iEnd) {
                 // skip escaped quotes
-                $prev_char = $address{$iEnd-1};
+                $prev_char = $address[$iEnd-1];
                 while ($prev_char === '\\' && substr($address,$iEnd-2,2) !== '\\\\') {
                     $iEnd = strpos($address,$cChar,$iEnd+1);
                     if ($iEnd) {
-                        $prev_char = $address{$iEnd-1};
+                        $prev_char = $address[$iEnd-1];
                     } else {
                         $prev_char = false;
                     }
@@ -340,7 +340,7 @@ function _getAddressTokens($address) {
                 $iDepth = 1;
                 $iComment = $i;
                 while (($iDepth > 0) && (++$iComment < $iCnt)) {
-                    $cCharComment = $address{$iComment};
+                    $cCharComment = $address[$iComment];
                     switch($cCharComment) {
                         case '\\':
                             ++$iComment;
@@ -366,7 +366,7 @@ function _getAddressTokens($address) {
             // check the next token in case comments appear in the middle of email addresses
             $prevToken = end($aTokens);
             if (!in_array($prevToken,$aSpecials,true)) {
-                if ($i+1<strlen($address) && !in_array($address{$i+1},$aSpecials,true)) {
+                if ($i+1<strlen($address) && !in_array($address[$i+1],$aSpecials,true)) {
                     $iEnd = strpos($address,' ',$i+1);
                     if ($iEnd) {
                         $sNextToken = trim(substr($address,$i+1,$iEnd - $i -1));
@@ -406,4 +406,3 @@ function _getAddressTokens($address) {
     }
     return $aTokens;
 }
-?>
\ No newline at end of file