squirrelmail-cvs Mailing List for SquirrelMail (Page 7)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 14887
          http://sourceforge.net/p/squirrelmail/code/14887
Author:   pdontthink
Date:     2021-02-06 00:49:08 +0000 (Sat, 06 Feb 2021)
Log Message:
-----------
Stop using curly braces

Modified Paths:
--------------
    branches/SM-1_4-STABLE/squirrelmail/class/mime/Message.class.php
    branches/SM-1_4-STABLE/squirrelmail/class/mime/Rfc822Header.class.php
    branches/SM-1_4-STABLE/squirrelmail/functions/auth.php
    branches/SM-1_4-STABLE/squirrelmail/functions/imap_general.php
    branches/SM-1_4-STABLE/squirrelmail/functions/imap_messages.php

Modified: branches/SM-1_4-STABLE/squirrelmail/class/mime/Message.class.php
===================================================================

--- branches/SM-1_4-STABLE/squirrelmail/class/mime/Message.class.php	2021-02-05 19:29:03 UTC (rev 14886)
+++ branches/SM-1_4-STABLE/squirrelmail/class/mime/Message.class.php	2021-02-06 00:49:08 UTC (rev 14887)
@@ -214,7 +214,7 @@
         $ent_a = explode('.', $ent);
 
         for ($i = 0,$entCount = count($ent_a) - 1; $i < $entCount; ++$i) {
-            if (isset($cur_ent_a[$i]) && ($cur_ent_a[$i] != $ent_a[$i])) {
+            if (isset($cur_ent_a[$i]) && ($cur_ent_a[$i] != $ent_a[$i]) && is_object($msg->parent)) {
                 $msg = $msg->parent;
                 $cur_ent_a = explode('.', $msg->entity_id);
                 --$i;
@@ -352,7 +352,7 @@
         }
 
         for ($cnt = strlen($read); $i < $cnt; ++$i) {
-            $char = strtoupper($read{$i});
+            $char = strtoupper($read[$i]);
             switch ($char) {
                 case '(':
                     switch($arg_no) {
@@ -367,7 +367,7 @@
                             } else {
                                 $msg->header->type0 = 'multipart';
                                 $msg->type0 = 'multipart';
-                                while ($read{$i} == '(') {
+                                while ($read[$i] == '(') {
                                     $msg->addEntity($msg->parseBodyStructure($read, $i, $msg));
                                 }
                             }
@@ -400,7 +400,7 @@
                                 $msg->type1 = $arg_a[1];
                                 $rfc822_hdr = new Rfc822Header();
                                 $msg->rfc822_header = $msg->parseEnvelope($read, $i, $rfc822_hdr);
-                                while (($i < $cnt) && ($read{$i} != '(')) {
+                                while (($i < $cnt) && ($read[$i] != '(')) {
                                     ++$i;
                                 }
                                 $msg->addEntity($msg->parseBodyStructure($read, $i,$msg));
@@ -463,9 +463,9 @@
                     ++$arg_no;
                     break;
                 case '0':
-                case is_numeric($read{$i}):
+                case is_numeric($read[$i]):
                     /* process integers */
-                    if ($read{$i} == ' ') { break; }
+                    if ($read[$i] == ' ') { break; }
                     ++$arg_no;
                     if (preg_match('/^([0-9]+).*/',substr($read,$i), $regs)) {
                         $i += strlen($regs[1])-1;
@@ -527,11 +527,11 @@
         $properties = array();
         $prop_name = '';
 
-        for (; $read{$i} != ')'; ++$i) {
+        for (; $read[$i] != ')'; ++$i) {
             $arg_s = '';
-            if ($read{$i} == '"') {
+            if ($read[$i] == '"') {
                 $arg_s = $this->parseQuote($read, $i);
-            } else if ($read{$i} == '{') {
+            } else if ($read[$i] == '{') {
                 $arg_s = $this->parseLiteral($read, $i);
             }
 
@@ -558,8 +558,8 @@
         $arg_no = 0;
         $arg_a = array();
         ++$i;
-        for ($cnt = strlen($read); ($i < $cnt) && ($read{$i} != ')'); ++$i) {
-            $char = strtoupper($read{$i});
+        for ($cnt = strlen($read); ($i < $cnt) && ($read[$i] != ')'); ++$i) {
+            $char = strtoupper($read[$i]);
             switch ($char) {
                 case '"':
                     $arg_a[] = $this->parseQuote($read, $i);
@@ -588,8 +588,8 @@
                     $addr_a = array();
                     $group = '';
                     $a=0;
-                    for (; $i < $cnt && $read{$i} != ')'; ++$i) {
-                        if ($read{$i} == '(') {
+                    for (; $i < $cnt && $read[$i] != ')'; ++$i) {
+                        if ($read[$i] == '(') {
                             $addr = $this->parseAddress($read, $i);
                             if (($addr->host == '') && ($addr->mailbox != '')) {
                                 /* start of group */
@@ -687,11 +687,11 @@
         while (true) {
             $iPos = strpos($read,'"',$iPos);
             if (!$iPos) break;
-            if ($iPos && $read{$iPos -1} != '\\') {
+            if ($iPos && $read[$iPos -1] != '\\') {
                 $s = substr($read,$i,($iPos-$i));
                 $i = $iPos;
                 break;
-            } else if ($iPos > 1 && $read{$iPos -1} == '\\' && $read{$iPos-2} == '\\') {
+            } else if ($iPos > 1 && $read[$iPos -1] == '\\' && $read[$iPos-2] == '\\') {
                 // This is an unique situation where the fast detection of the string
                 // fails. If the quote string ends with \\ then we need to iterate
                 // through the entire string to make sure we detect the unexcaped
@@ -700,7 +700,7 @@
                 $bEscaped = false;
                 $k = 0;
                  for ($j=$iPosStart,$iCnt=strlen($read);$j<$iCnt;++$j) {
-                    $cChar = $read{$j};
+                    $cChar = $read[$j];
                     switch ($cChar) {
                         case '\\':
                            $bEscaped = !$bEscaped;
@@ -739,8 +739,8 @@
      */
     function parseAddress($read, &$i) {
         $arg_a = array();
-        for (; $read{$i} != ')'; ++$i) {
-            $char = strtoupper($read{$i});
+        for (; $read[$i] != ')'; ++$i) {
+            $char = strtoupper($read[$i]);
             switch ($char) {
                 case '"': $arg_a[] = $this->parseQuote($read, $i); break;
                 case '{': $arg_a[] = $this->parseLiteral($read, $i); break;
@@ -774,8 +774,8 @@
      */
     function parseDisposition($read, &$i) {
         $arg_a = array();
-        for (; $read{$i} != ')'; ++$i) {
-            switch ($read{$i}) {
+        for (; $read[$i] != ')'; ++$i) {
+            switch ($read[$i]) {
                 case '"': $arg_a[] = $this->parseQuote($read, $i); break;
                 case '{': $arg_a[] = $this->parseLiteral($read, $i); break;
                 case '(': $arg_a[] = $this->parseProperties($read, $i); break;
@@ -801,8 +801,8 @@
         /* no idea how to process this one without examples */
         $arg_a = array();
 
-        for (; $read{$i} != ')'; ++$i) {
-            switch ($read{$i}) {
+        for (; $read[$i] != ')'; ++$i) {
+            switch ($read[$i]) {
                 case '"': $arg_a[] = $this->parseQuote($read, $i); break;
                 case '{': $arg_a[] = $this->parseLiteral($read, $i); break;
                 case '(': $arg_a[] = $this->parseProperties($read, $i); break;
@@ -826,8 +826,8 @@
      * @return integer
      */
     function parseParenthesis($read, $i) {
-        for ($i++; $read{$i} != ')'; ++$i) {
-            switch ($read{$i}) {
+        for ($i++; $read[$i] != ')'; ++$i) {
+            switch ($read[$i]) {
                 case '"': $this->parseQuote($read, $i); break;
                 case '{': $this->parseLiteral($read, $i); break;
                 case '(': $this->parseProperties($read, $i); break;
@@ -880,7 +880,7 @@
                 }
             }
 
-            if ((($line{0} == '-') || $rfc822_header)  && isset($boundaries[0])) {
+            if ((($line[0] == '-') || $rfc822_header)  && isset($boundaries[0])) {
                 $cnt = count($boundaries)-1;
                 $bnd = $boundaries[$cnt]['bnd'];
                 $bndreg = $boundaries[$cnt]['bndreg'];
@@ -890,7 +890,7 @@
                     $bndlen = strlen($reg[1]);
                     $bndend = false;
                     if (strlen($line) > ($bndlen + 3)) {
-                        if (($line{$bndlen+2} == '-') && ($line{$bndlen+3} == '-')) {
+                        if (($line[$bndlen+2] == '-') && ($line[$bndlen+3] == '-')) {
                             $bndend = true;
                         }
                     }

Modified: branches/SM-1_4-STABLE/squirrelmail/class/mime/Rfc822Header.class.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/class/mime/Rfc822Header.class.php	2021-02-05 19:29:03 UTC (rev 14886)
+++ branches/SM-1_4-STABLE/squirrelmail/class/mime/Rfc822Header.class.php	2021-02-06 00:49:08 UTC (rev 14887)
@@ -177,22 +177,22 @@
         $result = '';
         $cnt = strlen($value);
         for ($i = 0; $i < $cnt; ++$i) {
-            switch ($value{$i}) {
+            switch ($value[$i]) {
                 case '"':
                     $result .= '"';
-                    while ((++$i < $cnt) && ($value{$i} != '"')) {
-                        if ($value{$i} == '\\') {
+                    while ((++$i < $cnt) && ($value[$i] != '"')) {
+                        if ($value[$i] == '\\') {
                             $result .= '\\';
                             ++$i;
                         }
-                        $result .= $value{$i};
+                        $result .= $value[$i];
                     }
-                    $result .= $value{$i};
+                    $result .= $value[$i];
                     break;
                 case '(':
                     $depth = 1;
                     while (($depth > 0) && (++$i < $cnt)) {
-                        switch($value{$i}) {
+                        switch($value[$i]) {
                             case '\\':
                                 ++$i;
                                 break;
@@ -208,7 +208,7 @@
                     }
                     break;
                 default:
-                    $result .= $value{$i};
+                    $result .= $value[$i];
                     break;
             }
         }
@@ -349,7 +349,7 @@
         $iCnt = strlen($address);
         $i = 0;
         while ($i < $iCnt) {
-            $cChar = $address{$i};
+            $cChar = $address[$i];
             switch($cChar)
             {
             case '<':
@@ -368,11 +368,11 @@
                 $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;
                        }
@@ -399,7 +399,7 @@
                     $iDepth = 1;
                     $iComment = $i;
                     while (($iDepth > 0) && (++$iComment < $iCnt)) {
-                        $cCharComment = $address{$iComment};
+                        $cCharComment = $address[$iComment];
                         switch($cCharComment) {
                             case '\\':
                                 ++$iComment;
@@ -425,7 +425,7 @@
                 // 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));
@@ -531,7 +531,7 @@
         $sPersonal = $sEmail = $sComment = $sGroup = '';
         $aStack = $aComment = array();
         foreach ($aTokens as $sToken) {
-            $cChar = $sToken{0};
+            $cChar = $sToken[0];
             switch ($cChar)
             {
             case '=':
@@ -737,7 +737,7 @@
             if ($pos > 0)  {
                 $key = trim(substr($prop, 0, $pos));
                 $val = trim(substr($prop, $pos+1));
-                if (strlen($val) > 0 && $val{0} == '"') {
+                if (strlen($val) > 0 && $val[0] == '"') {
                     $val = substr($val, 1, -1);
                 }
                 $propResultArray[$key] = $val;
@@ -775,7 +775,7 @@
         $value_a = explode(',', $value);
         foreach ($value_a as $val) {
             $val = trim($val);
-            if ($val{0} == '<') {
+            if ($val[0] == '<') {
                 $val = substr($val, 1, -1);
             }
             if (substr($val, 0, 7) == 'mailto:') {

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/auth.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/auth.php	2021-02-05 19:29:03 UTC (rev 14886)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/auth.php	2021-02-06 00:49:08 UTC (rev 14887)
@@ -227,13 +227,13 @@
     $challenge=base64_decode($challenge);
     $parsed = array();
     while (!empty($challenge)) {
-        if ($challenge{0} == ',') { // First char is a comma, must not be 1st time through loop
+        if ($challenge[0] == ',') { // First char is a comma, must not be 1st time through loop
             $challenge=substr($challenge,1);
         }
         $key=explode('=',$challenge,2);
         $challenge=$key[1];
         $key=$key[0];
-        if ($challenge{0} == '"') {
+        if ($challenge[0] == '"') {
             // We're in a quoted value
             // Drop the first quote, since we don't care about it
             $challenge=substr($challenge,1);

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/imap_general.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/imap_general.php	2021-02-05 19:29:03 UTC (rev 14886)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/imap_general.php	2021-02-06 00:49:08 UTC (rev 14887)
@@ -211,7 +211,7 @@
     
     $i = 0;
     while ($read) {
-        $char = $read{0};
+        $char = $read[0];
         switch ($char)
         {
           case '+':
@@ -223,7 +223,7 @@
             $read = sqimap_fgets($imap_stream);
             break;
 
-          case $tag{0}:
+          case $tag[0]:
           {
             /* get the command */
             $arg = '';
@@ -256,7 +256,7 @@
                 $read = sqimap_fgets($imap_stream);
                 break;
             }
-          } // end case $tag{0}
+          } // end case $tag[0]
 
           case '*':
           {
@@ -308,11 +308,11 @@
                             break 4; /* while while switch while */
                         }
                         /* check for next untagged reponse and break */
-                        if ($read{0} == '*') break 2;
+                        if ($read[0] == '*') break 2;
                         $s = substr($read,-3);
                     } while ($s === "}\r\n" || $read_literal);
                     $s = substr($read,-3);
-                } while ($read{0} !== '*' &&
+                } while ($read[0] !== '*' &&
                          substr($read,0,strlen($tag)) !== $tag);
                 $resultlist[] = $fetch_data;
                 /* release not neaded data */
@@ -344,7 +344,7 @@
                     $read = sqimap_fgets($imap_stream);
                     if ($read === false) {
                         break 3; /* while switch while */
-                    } else if ($read{0} == '*') {
+                    } else if ($read[0] == '*') {
                         break;
                     }
                     $s = substr($read,-3);
@@ -695,7 +695,7 @@
                     // Skip any rfc5530 response code: '[something]' at the
                     // start of the message
                     if (!empty($message)
-                     && $message{0} == '['
+                     && $message[0] == '['
                      && ($end = strstr($message, ']'))
                      && $end != ']') {
                         $message = substr($end, 1);
@@ -1120,7 +1120,7 @@
     $address = str_replace($aSpecials,$aReplace,$address);
     $i = 0;
     while ($i < $iCnt) {
-        $cChar = $address{$i};
+        $cChar = $address[$i];
         switch($cChar)
         {
         case '<':
@@ -1139,11 +1139,11 @@
             $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;
                     }
@@ -1197,7 +1197,7 @@
         if ($max && $max == count($aAddress)) {
             return $aAddress;
         }
-        $cChar = $sToken{0};
+        $cChar = $sToken[0];
         switch ($cChar)
         {
           case '=':

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/imap_messages.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/imap_messages.php	2021-02-05 19:29:03 UTC (rev 14886)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/imap_messages.php	2021-02-06 00:49:08 UTC (rev 14887)
@@ -465,7 +465,7 @@
  * @return string $s parsed string without the double quotes or literal count
  */
 function parseString($read,&$i) {
-    $char = $read{$i};
+    $char = $read[$i];
     $s = '';
     if ($char == '"') {
         $iPos = ++$i;
@@ -472,7 +472,7 @@
         while (true) {
             $iPos = strpos($read,'"',$iPos);
             if (!$iPos) break;
-            if ($iPos && $read{$iPos -1} != '\\') {
+            if ($iPos && $read[$iPos -1] != '\\') {
                 $s = substr($read,$i,($iPos-$i));
                 $i = $iPos;
                 break;
@@ -634,7 +634,7 @@
                                 case 'date':
                                     $aMsg['date'] = trim(str_replace('  ', ' ', $value));
                                     break;
-                                case 'x-priority': $aMsg['x-priority'] = ($value) ? (int) $value{0} : 3; break;
+                                case 'x-priority': $aMsg['x-priority'] = ($value) ? (int) $value[0] : 3; break;
                                 case 'priority':
                                 case 'importance':
                                     // duplicate code with Rfc822Header.cls:parsePriority()

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





2000	Jan	Feb	Mar	Apr (4)	May (5)	Jun (73)	Jul (155)	Aug (142)	Sep (50)	Oct (89)	Nov (39)	Dec (59)
2001	Jan (239)	Feb (293)	Mar (90)	Apr (149)	May (117)	Jun (52)	Jul (67)	Aug (15)	Sep (97)	Oct (304)	Nov (295)	Dec (372)
2002	Jan (357)	Feb (272)	Mar (153)	Apr (158)	May (170)	Jun (139)	Jul (226)	Aug (401)	Sep (314)	Oct (343)	Nov (270)	Dec (231)
2003	Jan (201)	Feb (112)	Mar (146)	Apr (103)	May (148)	Jun (287)	Jul (302)	Aug (139)	Sep (206)	Oct (281)	Nov (116)	Dec (191)
2004	Jan (82)	Feb (223)	Mar (175)	Apr (280)	May (260)	Jun (206)	Jul (107)	Aug (207)	Sep (108)	Oct (171)	Nov (186)	Dec (180)
2005	Jan (144)	Feb (226)	Mar (200)	Apr (286)	May (120)	Jun (144)	Jul (125)	Aug (111)	Sep (221)	Oct (51)	Nov (275)	Dec (73)
2006	Jan (178)	Feb (313)	Mar (87)	Apr (104)	May (145)	Jun (74)	Jul (197)	Aug (229)	Sep (118)	Oct (298)	Nov (39)	Dec (170)
2007	Jan (251)	Feb (109)	Mar (82)	Apr (5)	May (80)	Jun (63)	Jul (98)	Aug (103)	Sep (61)	Oct (41)	Nov (50)	Dec (47)
2008	Jan (74)	Feb (71)	Mar (102)	Apr (31)	May (117)	Jun (33)	Jul (61)	Aug (12)	Sep (22)	Oct (25)	Nov (21)	Dec (52)
2009	Jan (13)	Feb (16)	Mar (79)	Apr (181)	May (164)	Jun (10)	Jul (23)	Aug (30)	Sep (19)	Oct (18)	Nov (7)	Dec (5)
2010	Jan (23)	Feb (17)	Mar (15)	Apr (2)	May (4)	Jun (23)	Jul (89)	Aug (8)	Sep (13)	Oct (6)	Nov (4)	Dec (6)
2011	Jan (4)	Feb (1)	Mar (5)	Apr (13)	May (9)	Jun	Jul (23)	Aug (1)	Sep (9)	Oct (1)	Nov (11)	Dec (89)
2012	Jan (19)	Feb (16)	Mar (17)	Apr (24)	May (2)	Jun (2)	Jul (8)	Aug (5)	Sep (4)	Oct	Nov	Dec (2)
2013	Jan (2)	Feb	Mar (9)	Apr	May (4)	Jun (24)	Jul (4)	Aug	Sep (2)	Oct (5)	Nov (10)	Dec (9)
2014	Jan (25)	Feb (3)	Mar (14)	Apr (3)	May (5)	Jun (1)	Jul (4)	Aug (4)	Sep	Oct	Nov	Dec (2)
2015	Jan (23)	Feb	Mar (4)	Apr	May	Jun (16)	Jul	Aug (10)	Sep (2)	Oct	Nov (10)	Dec (2)
2016	Jan (9)	Feb (3)	Mar	Apr (3)	May (4)	Jun	Jul (1)	Aug	Sep (17)	Oct (30)	Nov (2)	Dec (31)
2017	Jan (11)	Feb	Mar	Apr (6)	May (2)	Jun (42)	Jul (16)	Aug (8)	Sep (5)	Oct (2)	Nov (23)	Dec (3)
2018	Jan (2)	Feb	Mar	Apr (15)	May (1)	Jun	Jul (2)	Aug (5)	Sep (8)	Oct (13)	Nov (5)	Dec
2019	Jan (2)	Feb (10)	Mar (1)	Apr (7)	May (5)	Jun (2)	Jul (6)	Aug	Sep (2)	Oct	Nov (1)	Dec
2020	Jan (11)	Feb	Mar (9)	Apr	May (14)	Jun	Jul (7)	Aug	Sep	Oct	Nov (4)	Dec
2021	Jan (7)	Feb (16)	Mar (11)	Apr (5)	May (6)	Jun	Jul (1)	Aug (4)	Sep (3)	Oct (2)	Nov (1)	Dec (2)
2022	Jan (3)	Feb (2)	Mar (2)	Apr (7)	May (20)	Jun (8)	Jul	Aug	Sep	Oct	Nov	Dec (2)
2023	Jan (7)	Feb	Mar	Apr (4)	May	Jun	Jul (2)	Aug (4)	Sep (2)	Oct	Nov (1)	Dec (2)
2024	Jan (9)	Feb	Mar (7)	Apr	May	Jun (2)	Jul	Aug	Sep (10)	Oct	Nov	Dec
2025	Jan (4)	Feb	Mar	Apr (4)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

squirrelmail-cvs Mailing List for SquirrelMail (Page 7)

squirrelmail-cvs — SquirrelMail CVS Mailing List