From 1710ad6563993035601d94fe96f68c9b964e866c Mon Sep 17 00:00:00 2001 From: pdontthink Date: Sat, 6 Feb 2021 08:02:22 +0000 Subject: [PATCH] Stop using curly braces git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@14894 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- functions/auth.php | 4 +- functions/imap_general.php | 16 ++-- functions/imap_messages.php | 20 ++--- functions/mime.php | 74 +++++++++---------- functions/rfc822address.php | 12 +-- plugins/administrator/options.php | 50 ++++++------- .../message_details_bottom.php | 4 +- 7 files changed, 90 insertions(+), 90 deletions(-) diff --git a/functions/auth.php b/functions/auth.php index ef788ade..d1d73ea0 100644 --- a/functions/auth.php +++ b/functions/auth.php @@ -236,13 +236,13 @@ function digest_md5_parse_challenge($challenge) { $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); diff --git a/functions/imap_general.php b/functions/imap_general.php index 9fcd8396..ade39d62 100755 --- a/functions/imap_general.php +++ b/functions/imap_general.php @@ -422,7 +422,7 @@ function sqimap_retrieve_imap_response($imap_stream, $tag, $handle_errors, $read = sqimap_fgets($imap_stream); $i = 0; while ($read) { - $char = $read{0}; + $char = $read[0]; switch ($char) { case '+': @@ -430,7 +430,7 @@ function sqimap_retrieve_imap_response($imap_stream, $tag, $handle_errors, $read = sqimap_fgets($imap_stream); break; - case $tag{0}: + case $tag[0]: { /* get the command */ $arg = ''; @@ -478,7 +478,7 @@ function sqimap_retrieve_imap_response($imap_stream, $tag, $handle_errors, break 2; /* switch while */ } break; - } // end case $tag{0} + } // end case $tag[0] case '*': { @@ -530,11 +530,11 @@ function sqimap_retrieve_imap_response($imap_stream, $tag, $handle_errors, 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 */ @@ -566,7 +566,7 @@ function sqimap_retrieve_imap_response($imap_stream, $tag, $handle_errors, $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); @@ -1015,7 +1015,7 @@ function sqimap_login ($username, $password, $imap_server_address, // 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); @@ -1542,7 +1542,7 @@ function sqimap_append_checkresponse($response, $sMailbox, $sid='', $query='') { if ($sid) { $imapsid = $sid; } - if ($response{0} == '+') { + if ($response[0] == '+') { // continuation request triggerd by sqimap_append() $bDone = true; } else { diff --git a/functions/imap_messages.php b/functions/imap_messages.php index 022e90df..2640ce64 100755 --- a/functions/imap_messages.php +++ b/functions/imap_messages.php @@ -400,7 +400,7 @@ function get_thread_sort($imap_stream, $search='ALL') { if ($sThreadResponse) { for ($i=0,$iCnt = strlen($sThreadResponse);$i<$iCnt;++$i) { - $cChar = $sThreadResponse{$i}; + $cChar = $sThreadResponse[$i]; switch ($cChar) { case '(': // new sub thread // correction for a subthread of a thread with no parents in thread @@ -468,14 +468,14 @@ function elapsedTime($start) { * @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; 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; @@ -704,7 +704,7 @@ function parseFetch(&$aResponse,$aMessageList = array()) { 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() @@ -773,8 +773,8 @@ function sqimap_parse_envelope($read, &$i, &$msg) { $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 '{': case '"': @@ -797,8 +797,8 @@ function sqimap_parse_envelope($read, &$i, &$msg) { $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 = sqimap_parse_address($read, $i); if (($addr[3] == '') && ($addr[2] != '')) { /* start of group */ @@ -852,8 +852,8 @@ function sqimap_parse_envelope($read, &$i, &$msg) { */ function sqimap_parse_address($read, &$i) { $arg_a = array(); - for (; $read{$i} != ')'; ++$i) { - $char = strtoupper($read{$i}); + for (; $read[$i] != ')'; ++$i) { + $char = strtoupper($read[$i]); switch ($char) { case '{': case '"': $arg_a[] = parseString($read,$i); break; diff --git a/functions/mime.php b/functions/mime.php index 38a058c4..9bc61820 100644 --- a/functions/mime.php +++ b/functions/mime.php @@ -71,7 +71,7 @@ function mime_structure ($bodystructure, $flags=array()) { if (count($flags)) { foreach ($flags as $flag) { //FIXME: please document why it is we have to check the first char of the flag but we then go ahead and do a full string comparison anyway. Is this a speed enhancement? If not, let's keep it simple and just compare the full string and forget the switch block. - $char = strtoupper($flag{1}); + $char = strtoupper($flag[1]); switch ($char) { case 'S': if (strtolower($flag) == '\\seen') { @@ -151,7 +151,7 @@ function mime_fetch_body($imap_stream, $id, $ent_id=1, $fetch_size=0) { /* There is some information in the content info header that could be important * in order to parse html messages. Let's get them here. */ -// if ($ret{0} == '<') { +// if ($ret[0] == '<') { // $data = sqimap_run_command ($imap_stream, "FETCH $id BODY[$ent_id.MIME]", true, $response, $message, TRUE); // } } else if (preg_match('/"([^"]*)"/', $topline, $regs)) { @@ -1001,7 +1001,7 @@ function encodeHeader ($string) { $iEncStart = $enc_init = false; $cur_l = $iOffset = 0; for($i = 0; $i < $j; ++$i) { - switch($string{$i}) + switch($string[$i]) { case '"': case '=': @@ -1023,7 +1023,7 @@ function encodeHeader ($string) { $ret = ''; $iEncStart = false; } else { - $ret .= sprintf("=%02X",ord($string{$i})); + $ret .= sprintf("=%02X",ord($string[$i])); } break; case '(': @@ -1053,7 +1053,7 @@ function encodeHeader ($string) { } break; default: - $k = ord($string{$i}); + $k = ord($string[$i]); if ($k > 126) { if ($iEncStart === false) { // do not start encoding in the middle of a string, also take the rest of the word. @@ -1087,7 +1087,7 @@ function encodeHeader ($string) { $cur_l = 0; $ret = ''; } else { - $ret .= $string{$i}; + $ret .= $string[$i]; } } } @@ -1463,12 +1463,12 @@ function sq_findnxreg($body, $offset, $reg){ $matches = Array(); $retarr = Array(); preg_match("%^(.*?)($reg)%si", substr($body, $offset), $matches); - if (!isset($matches{0}) || !$matches{0}){ + if (!isset($matches[0]) || !$matches[0]){ $retarr = false; } else { - $retarr{0} = $offset + strlen($matches{1}); - $retarr{1} = $matches{1}; - $retarr{2} = $matches{2}; + $retarr[0] = $offset + strlen($matches[1]); + $retarr[1] = $matches[1]; + $retarr[2] = $matches[2]; } return $retarr; } @@ -1626,8 +1626,8 @@ function sq_getnxtag($body, $offset){ /** * Yep. So we did. */ - $pos += strlen($matches{1}); - if ($matches{2} == "/>"){ + $pos += strlen($matches[1]); + if ($matches[2] == "/>"){ $tagtype = 3; $pos++; } @@ -1684,7 +1684,7 @@ function sq_getnxtag($body, $offset){ return $retary; } case '>': - $attary{$attname} = '"yes"'; + $attary[$attname] = '"yes"'; return Array($tagname, $attary, $tagtype, $lt, $pos); break; default: @@ -1718,7 +1718,7 @@ function sq_getnxtag($body, $offset){ } list($pos, $attval, $match) = $regary; $pos++; - $attary{$attname} = "'" . $attval . "'"; + $attary[$attname] = "'" . $attval . "'"; } else if ($quot == '"'){ $regary = sq_findnxreg($body, $pos+1, '\"'); if ($regary == false){ @@ -1726,7 +1726,7 @@ function sq_getnxtag($body, $offset){ } list($pos, $attval, $match) = $regary; $pos++; - $attary{$attname} = '"' . $attval . '"'; + $attary[$attname] = '"' . $attval . '"'; } else { /** * These are hateful. Look for \s, or >. @@ -1740,13 +1740,13 @@ function sq_getnxtag($body, $offset){ * If it's ">" it will be caught at the top. */ $attval = preg_replace("/\"/s", """, $attval); - $attary{$attname} = '"' . $attval . '"'; + $attary[$attname] = '"' . $attval . '"'; } } else if (preg_match("|[\w/>]|", $char)) { /** * That was attribute type 4. */ - $attary{$attname} = '"yes"'; + $attary[$attname] = '"yes"'; } else { /** * An illegal character. Find next '>' and return. @@ -1785,7 +1785,7 @@ function sq_deent(&$attvalue, $regex, $hex=false){ if ($hex){ $numval = hexdec($numval); } - $repl{$matches[0][$i]} = chr($numval); + $repl[$matches[0][$i]] = chr($numval); } $attvalue = strtr($attvalue, $repl); return true; @@ -1824,7 +1824,7 @@ function sq_fixatts($tagname, if (preg_match($matchtag, $tagname)){ foreach ($matchattrs as $matchattr){ if (preg_match($matchattr, $attname)){ - unset($attary{$attname}); + unset($attary[$attname]); continue; } } @@ -1845,7 +1845,7 @@ function sq_fixatts($tagname, // entities are used in the attribute value. In 99% of the cases it's there as XSS // i.e.
$attvalue = "idiocy"; - $attary{$attname} = $attvalue; + $attary[$attname] = $attvalue; } sq_unspace($attvalue); @@ -1868,7 +1868,7 @@ function sq_fixatts($tagname, $newvalue = preg_replace($valmatch, $valrepl, $attvalue); if ($newvalue != $attvalue){ - $attary{$attname} = $newvalue; + $attary[$attname] = $newvalue; $attvalue = $newvalue; } } @@ -1878,7 +1878,7 @@ function sq_fixatts($tagname, if ($attname == 'style') { if (preg_match('/[\0-\37\200-\377]+/',$attvalue)) { // 8bit and control characters in style attribute values can be used for XSS, remove them - $attary{$attname} = '"disallowed character"'; + $attary[$attname] = '"disallowed character"'; } preg_match_all("/url\s*\((.+)\)/si",$attvalue,$aMatch); if (count($aMatch)) { @@ -1886,7 +1886,7 @@ function sq_fixatts($tagname, // url value $urlvalue = $sMatch; sq_fix_url($attname, $urlvalue, $message, $id, $mailbox,"'"); - $attary{$attname} = str_replace($sMatch,$urlvalue,$attvalue); + $attary[$attname] = str_replace($sMatch,$urlvalue,$attvalue); } } } @@ -1897,7 +1897,7 @@ function sq_fixatts($tagname, || $attname == 'poster' || $attname == 'formaction' || $attname == 'background' || $attname == 'action') { sq_fix_url($attname, $attvalue, $message, $id, $mailbox); - $attary{$attname} = $attvalue; + $attary[$attname] = $attvalue; } } /** @@ -2083,7 +2083,7 @@ function sq_fixstyle($body, $pos, $message, $id, $mailbox){ $bSucces = false; $bEndTag = false; for ($i=$pos,$iCount=strlen($body);$i<$iCount;++$i) { - $char = $body{$i}; + $char = $body[$i]; switch ($char) { case '<': $sToken = $char; @@ -2114,7 +2114,7 @@ function sq_fixstyle($body, $pos, $message, $id, $mailbox){ case '!': if ($sToken == '<') { // possible comment - if (isset($body{$i+2}) && substr($body,$i,3) == '!--') { + if (isset($body[$i+2]) && substr($body,$i,3) == '!--') { $i = strpos($body,'-->',$i+3); if ($i === false) { // no end comment $i = strlen($body); @@ -2337,7 +2337,7 @@ function sq_body2div($attary, $mailbox, $message, $id){ $styledef .= "color: $text; "; } if (strlen($styledef) > 0){ - $divattary{"style"} = "\"$styledef\""; + $divattary["style"] = "\"$styledef\""; } } return $divattary; @@ -2488,9 +2488,9 @@ function sq_sanitize($body, if ($tagname == "body"){ $tagname = "div"; } - if (isset($open_tags{$tagname}) && - $open_tags{$tagname} > 0){ - $open_tags{$tagname}--; + if (isset($open_tags[$tagname]) && + $open_tags[$tagname] > 0){ + $open_tags[$tagname]--; } else { $tagname = false; } @@ -2532,10 +2532,10 @@ function sq_sanitize($body, $message, $id); } if ($tagtype == 1){ - if (isset($open_tags{$tagname})){ - $open_tags{$tagname}++; + if (isset($open_tags[$tagname])){ + $open_tags[$tagname]++; } else { - $open_tags{$tagname}=1; + $open_tags[$tagname]=1; } } /** @@ -2757,13 +2757,13 @@ function magicHTML($body, $id, $message, $mailbox = 'INBOX', $take_mailto_links * Remove any references to http/https if view_unsafe_images set * to false. */ - array_push($bad_attvals{'/.*/'}{'/^src|background/i'}[0], + array_push($bad_attvals['/.*/']['/^src|background/i'][0], '/^([\'\"])\s*https*:.*([\'\"])/si'); - array_push($bad_attvals{'/.*/'}{'/^src|background/i'}[1], + array_push($bad_attvals['/.*/']['/^src|background/i'][1], "\\1$secremoveimg\\1"); - array_push($bad_attvals{'/.*/'}{'/^style/i'}[0], + array_push($bad_attvals['/.*/']['/^style/i'][0], '/url\([\'\"]?https?:[^\)]*[\'\"]?\)/si'); - array_push($bad_attvals{'/.*/'}{'/^style/i'}[1], + array_push($bad_attvals['/.*/']['/^style/i'][1], "url(\\1$secremoveimg\\1)"); } diff --git a/functions/rfc822address.php b/functions/rfc822address.php index 17d8a055..69be3e8d 100644 --- a/functions/rfc822address.php +++ b/functions/rfc822address.php @@ -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 '=': @@ -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 $j + 1 && - $line{$j}.$line{$j+1} == '*/' ) { + $line[$j].$line[$j+1] == '*/' ) { $mode = ''; $j++; } break; case 'D': // Delimiter detect - switch ( $line{$j} ) { + switch ( $line[$j] ) { case '"': case "'": // Double quote string - $delimiter = $value = $line{$j}; + $delimiter = $value = $line[$j]; $mode = 'S'; break; case ' ': @@ -110,22 +110,22 @@ function parseConfig( $cfg_file ) { default: if ( strtoupper( substr( $line, $j, 4 ) ) == 'TRUE' ) { // Boolean TRUE - $newcfg{$key} = 'TRUE'; + $newcfg[$key] = 'TRUE'; $key = ''; $mode = ';'; } else if ( strtoupper( substr( $line, $j, 5 ) ) == 'FALSE' ) { - $newcfg{$key} = 'FALSE'; + $newcfg[$key] = 'FALSE'; $key = ''; $mode = ';'; } else { // Number or function call $mode = 'N'; - $value = $line{$j}; + $value = $line[$j[; } } break; default: - if ( $line{$j} == '$' ) { + if ( $line[$j] == '$' ) { // We must detect $key name $mode = 'K'; $key = '$'; @@ -134,10 +134,10 @@ function parseConfig( $cfg_file ) { // Skip untill next ; $mode = ';'; $j += 6; - } else if ( $line{$j}.$line{$j+1} == '/*' ) { + } else if ( $line[$j].$line[$j+1] == '/*' ) { $mode = 'C'; $j++; - } else if ( $line{$j} == '#' || $line{$j}.$line{$j+1} == '//' ) { + } else if ( $line[$j] == '#' || $line[$j].$line[$j+1] == '//' ) { // Delete till the end of the line $j = $s; } @@ -309,9 +309,9 @@ foreach ( $newcfg as $k => $v ) { } else if ( $l == 'false' ) { $v = 'FALSE'; $type = SMOPT_TYPE_BOOLEAN; - } else if ( $v{0} == "'" ) { + } else if ( $v[0] == "'" ) { $type = SMOPT_TYPE_STRING; - } else if ( $v{0} == '"' ) { + } else if ( $v[0] == '"' ) { $type = SMOPT_TYPE_STRING; } @@ -631,7 +631,7 @@ if ( $fp = @fopen( $cfgfile, 'w' ) ) { "\n" ); foreach ( $newcfg as $k => $v ) { - if ( $k{0} == '$' && $v <> '' || is_int($v)) { + if ( $k[0] == '$' && $v <> '' || is_int($v)) { if ( substr( $k, 1, 11 ) == 'ldap_server' ) { $v = substr( $v, 0, strlen( $v ) - 1 ) . "\n)"; $v = str_replace( 'array(', "array(\n\t", $v ); diff --git a/plugins/message_details/message_details_bottom.php b/plugins/message_details/message_details_bottom.php index 4baad531..725d5325 100644 --- a/plugins/message_details/message_details_bottom.php +++ b/plugins/message_details/message_details_bottom.php @@ -211,7 +211,7 @@ function get_message_details($mailbox, $passed_id, $passed_ent_id=0, $stripHTML= } } - if (($line != '' && $line{0} == '-' || $header) && isset($boundaries[0])) { + if (($line != '' && $line[0] == '-' || $header) && isset($boundaries[0])) { $cnt=count($boundaries)-1; $bnd = $boundaries[$cnt]['bnd']; $bndreg = $boundaries[$cnt]['bndreg']; @@ -221,7 +221,7 @@ function get_message_details($mailbox, $passed_id, $passed_ent_id=0, $stripHTML= $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; } if ($bndend) { -- 2.25.1