Changeset 3d695da in github

Timestamp:

Feb 12, 2008 7:48:39 PM (5 years ago)

Author:

till <till@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

2f93b03

Parents:

8b661f6

Message:

• cs fixes

File:

• program/lib/imap.inc (modified) (46 diffs)

program/lib/imap.inc

@@ -57 +57 @@
 /**
  * @todo Possibly clean up more CS.
+ * @todo Try to replace most double-quotes with single-quotes.
  * @todo Split this file into smaller files.
  * @todo Refactor code.
@@ -63 +64 @@
 
 // changed path to work within roundcube webmail
-include_once("lib/icl_commons.inc");
+include_once 'lib/icl_commons.inc';
 
 
@@ -254 +255 @@
     // initialize ipad, opad
     for ($i=0;$i<64;$i++) {
-        $ipad .=chr(0x36);
-        $opad .=chr(0x5C);
+        $ipad .= chr(0x36);
+        $opad .= chr(0x5C);
     }
     // pad $pass so it's 64 bytes
@@ -265 +266 @@
     // generate hash
     $hash  = iil_xor($pass,$opad);
-    $hash .= pack("H*",md5(iil_xor($pass, $ipad) . base64_decode($encChallenge)));
+    $hash .= pack("H*", md5(iil_xor($pass, $ipad) . base64_decode($encChallenge)));
     $hash  = md5($hash);
     
@@ -457 +458 @@
         //check for SSL
         if ($ICL_SSL) {
-                $host = $ICL_SSL."://".$host;
+                $host = $ICL_SSL . '://' . $host;
         }
         
@@ -475 +476 @@
                 
                 //default to plain text auth
-                $auth_method = "plain";
+                $auth_method = 'plain';
                         
                 //check for CRAM-MD5
@@ -481 +482 @@
                 do {
                     $line = trim(chop(iil_ReadLine($conn->fp, 100)));
-                    $conn->message.="$line\n";
+
+                    $conn->message .= "$line\n";
+
                         $a = explode(' ', $line);
-                        if ($line[0]=="*") {
-                                while ( list($k, $w) = each($a) ) {
-                                    if ($w!='*' && $w!='CAPABILITY') {
+                        if ($line[0] == '*') {
+                                while (list($k, $w) = each($a)) {
+                                    if ($w != '*' && $w != 'CAPABILITY') {
                                         $conn->capability[] = $w;
                     }
@@ -494 +497 @@
                                 }
                         }
-                } while ($a[0]!="cp01");
-        }
-
-        if (strcasecmp($auth_method, "auth") == 0) {
+                } while ($a[0] != 'cp01');
+        }
+
+        if (strcasecmp($auth_method, 'auth') == 0) {
                 $conn->message .= "Trying CRAM-MD5\n";
+
                 //do CRAM-MD5 authentication
                 fputs($conn->fp, "a000 AUTHENTICATE CRAM-MD5\r\n");
                 $line = trim(chop(iil_ReadLine($conn->fp, 1024)));
         
-                $conn->message.="$line\n";
+                $conn->message .= "$line\n";
         
-                if ($line[0] == "+") {
-                        $conn->message .= 'Got challenge: ' . htmlspecialchars($line)."\n";
+                if ($line[0] == '+') {
+                        $conn->message .= 'Got challenge: ' . htmlspecialchars($line) . "\n";
 
                         //got a challenge string, try CRAM-5
@@ -761 +765 @@
     }
         //explode, take good parts
-        $a=explode(' ',$str);
+        $a = explode(' ', $str);
 
         $month_str = $a[1];
@@ -791 +795 @@
             $field = 'ARRIVAL';
     }
-        $fields = array('ARRIVAL'=>1,'CC'=>1,'DATE'=>1,'FROM'=>1,'SIZE'=>1,
- 'SUBJECT'=>1,'TO'=>1);
+        $fields = array('ARRIVAL' => 1,'CC' => 1,'DATE' => 1,
+        'FROM' => 1, 'SIZE' => 1, 'SUBJECT' => 1, 'TO' => 1);
         
         if (!$fields[$field]) {
@@ -804 +808 @@
     }
 
-        $fp      = $conn->fp;
-        $command = 's '. $is_uid .'SORT ('.$field.') '.$encoding.' ALL'."$add\r\n";
-        $line    = $data = '';
+        $fp       = $conn->fp;
+        $command  = 's ' . $is_uid . 'SORT (' . $field . ') ';
+    $command .= $encoding . ' ALL' . "$add\r\n";
+        $line     = $data = '';
         
         if (!fputs($fp, $command)) {
@@ -943 +948 @@
 
                 $key     = 'fhi' . ($c++);
-                $request = $key." FETCH $message_set (INTERNALDATE)\r\n";
+                $request = $key . " FETCH $message_set (INTERNALDATE)\r\n";
                 if (!fputs($fp, $request)) {
                     return false;
@@ -1015 +1020 @@
 
         //check number of elements...
-        list($start_mid,$end_mid) = explode(':', $message_set);
+        list($start_mid, $end_mid) = explode(':', $message_set);
         if (is_numeric($start_mid) && is_numeric($end_mid)) {
                 //count how many we should have
@@ -1021 +1026 @@
                 
                 //if we have less, try and fill in the "gaps"
-                if (count($result)<$should_have) {
-                        for ($i=$start_mid;$i<=$end_mid;$i++) {
+                if (count($result) < $should_have) {
+                        for ($i=$start_mid; $i<=$end_mid; $i++) {
                             if (!isset($result[$i])) {
                                 $result[$i] = '';
@@ -1029 +1034 @@
                 }
         }
-        
         return $result; 
-
 }
 
@@ -1049 +1052 @@
     
         //separate, then sort
-        $ids = explode(',',$message_set);
+        $ids = explode(',', $message_set);
         sort($ids);
         
         $result = array();
-        $start = $prev = $ids[0];
+        $start  = $prev = $ids[0];
+
         foreach ($ids as $id) {
                 $incr = $id - $prev;
-                if ($incr>1) {                  //found a gap
-                        if ($start==$prev) {
+                if ($incr > 1) {                        //found a gap
+                        if ($start == $prev) {
                             $result[] = $prev;  //push single id
                         } else {
-                            $result[] = $start.':'.$prev;               //push sequence as start_id:end_id
+                            $result[] = $start . ':' . $prev;   //push sequence as start_id:end_id
                         }
             $start = $id;                                                       //start of new sequence
@@ -1081 +1085 @@
             return array();
     }
-        return iil_C_Search($conn, $mailbox, "UID ".implode(",", $uids));
+        return iil_C_Search($conn, $mailbox, 'UID ' . implode(',', $uids));
 }
 
 function iil_C_UIDToMID(&$conn, $mailbox, $uid) {
         $result = iil_C_UIDsToMIDs($conn, $mailbox, array($uid));
-        if (count($result)==1) {
+        if (count($result) == 1) {
             return $result[0];
         }
@@ -1120 +1124 @@
     
         //make sure number of messages were the same
-        if ($cache_good>0 && $data['n']!=$num) {
+        if ($cache_good > 0 && $data['n'] != $num) {
             $cache_good = -2;
         }
     
         //if everything's okay so far...
-        if ($cache_good>0) {
+        if ($cache_good > 0) {
                 //check UIDs of highest mid with current and cached
                 $temp = iil_C_Search($conn, $mailbox, 'UID ' . $data['d'][$num]);
@@ -1134 +1138 @@
 
         //if cached data's good, return it
-        if ($cache_good>0) {
+        if ($cache_good > 0) {
                 return $data['d'];
         }
@@ -1219 +1223 @@
                                 $new_thhd->id = $a[1];
                                 do {
-                                        $line=chop(iil_ReadLine($fp, 1024),"\r\n");
+                                        $line = chop(iil_ReadLine($fp, 1024), "\r\n");
                                         if (iil_StartsWithI($line, 'Message-ID:')
                         || (iil_StartsWithI($line,'In-Reply-To:'))
                         || (iil_StartsWithI($line,'SUBJECT:'))) {
-                                                $pos = strpos($line, ":");
+
+                                                $pos        = strpos($line, ':');
                                                 $field_name = substr($line, 0, $pos);
-                                                $field_val = substr($line, $pos+1);
+                                                $field_val  = substr($line, $pos+1);
+
                                                 $new[strtoupper($field_name)] = trim($field_val);
+
                                         } else if (ereg('^[[:space:]]', $line)) {
-                                                $new[strtoupper($field_name)].= trim($line);
+                                                $new[strtoupper($field_name)] .= trim($line);
                                         }
                                 } while ($line[0] != ')');
@@ -1302 +1309 @@
                 //                      'IN-REPLY-TO'=>$header['r'], 'SUBJECT'=>$header['s']);
                 $id  = $header->id;
-                $new = array('id'=>$id, 'MESSAGE-ID'=>$header->mid, 
-            'IN-REPLY-TO'=>$header->irt, 'SUBJECT'=>$header->sbj);
+                $new = array('id' => $id, 'MESSAGE-ID' => $header->mid, 
+            'IN-REPLY-TO' => $header->irt, 'SUBJECT' => $header->sbj);
 
                 /* add to message-id -> mid lookup table */
@@ -1344 +1351 @@
             $sub_mids[$new['MESSAGE-ID']] = $root_id;
                         $result[$root_id][]           = $id;
-                }else if (!isset($roots[$sbj])||(!$has_re&&$root_in_root[$root_id])) {
+                }else if (!isset($roots[$sbj]) || (!$has_re && $root_in_root[$root_id])) {
                         /* try to use In-Reply-To header to find root 
                                 unless subject contains 'Re:' */
@@ -1387 +1394 @@
         //now that we've gone through all the messages,
         //go back and try and link up the stray threads
-        if (count($strays)>0) {
+        if (count($strays) > 0) {
                 foreach ($strays as $id=>$irt) {
                         $root_id = $sub_mids[$irt];
@@ -1453 +1460 @@
         //sort by key, this basically sorts all threads
         ksort($itree);
-        $i=0;
-        $out=array();
+        $i   = 0;
+        $out = array();
         foreach ($itree as $k=>$node) {
                 $out[$i] = $itree[$k];
@@ -1659 +1666 @@
         */
         $command_key = 'fh' . ($c++);
-        $request  = $command_key . $prefix;
-        $request .= " FETCH $message_set (UID RFC822.SIZE FLAGS INTERNALDATE)\r\n";
+        $request     = $command_key . $prefix;
+        $request    .= " FETCH $message_set (UID RFC822.SIZE FLAGS INTERNALDATE)\r\n";
         
         if (!fputs($fp, $request)) {
@@ -1700 +1707 @@
                                         // process flags
                                         $flags_str = eregi_replace('[\\\"]', '', $flags_str);
-                                        $flags_a = explode(' ', $flags_str);
-                                        //echo "<!-- ID: $id FLAGS: ".implode(",", $flags_a)." //-->\n";
+                                        $flags_a   = explode(' ', $flags_str);
+
+                    /*
+                    trigger_error("<!-- ID: $id FLAGS: ".implode(",", $flags_a)." //-->\n",
+                        E_USER_WARNING);
+                    */
                                         
                                         if (is_array($flags_a)) {
@@ -1789 +1800 @@
 
         $c=count($a);
-        if ($c>0) {
+        if ($c > 0) {
                 /*
                         Strategy:
@@ -1839 +1850 @@
         $fp = $conn->fp;
         if (iil_C_Select($conn, $mailbox)) {
-                $c=0;
+                $c = 0;
                 fputs($fp, "exp1 EXPUNGE\r\n");
                 do {
@@ -1878 +1889 @@
     
         if (iil_C_Select($conn, $mailbox)) {
-                $c=0;
+                $c = 0;
                 fputs($fp, "flg STORE $messages " . $mod . "FLAGS (" . $flag . ")\r\n");
                 do {
@@ -1993 +2004 @@
         $fp = $conn->fp;
         if (iil_C_Select($conn, $folder)) {
-                $c=0;
+                $c = 0;
                 
                 $query = 'srch1 SEARCH ' . chop($criteria) . "\r\n";
@@ -2003 +2014 @@
                                 $messages = explode(' ', $str);
                         }
-                } while (!iil_StartsWith($line, "srch1"));
+                } while (!iil_StartsWith($line, 'srch1'));
                 
-                $result_code=iil_ParseResult($line);
-                if ($result_code==0) {
+                $result_code = iil_ParseResult($line);
+                if ($result_code == 0) {
                     return $messages;
                 }
@@ -2024 +2035 @@
         }
     
-        $r=iil_C_Copy($conn, $messages, $from,$to);
+        $r = iil_C_Copy($conn, $messages, $from,$to);
         if ($r==0) {
                 return iil_C_Delete($conn, $from, $messages);
@@ -2238 +2249 @@
         $query = 'sub1 SUBSCRIBE "' . $folder. '"' . "\r\n";
         fputs($fp, $query);
+
         $line = trim(chop(iil_ReadLine($fp, 10000)));
         return iil_ParseResult($line);
@@ -2268 +2280 @@
                 if (!fputs($fp, $request)) return false;
                 do {
-                        $line=chop(iil_ReadLine($fp, 200));
-                        $a=explode(' ', $line);
+                        $line = chop(iil_ReadLine($fp, 200));
+                        $a    = explode(' ', $line);
                         if (($line[0] == '*') && ($a[2] == 'FETCH')
                 && ($line[strlen($line)-1] != ')')) {
                                 $line=iil_ReadLine($fp, 300);
-                                while (chop($line)!=")") {
-                                        $result.=$line;
+                                while (chop($line) != ')') {
+                                        $result .= $line;
                                         $line=iil_ReadLine($fp, 300);
                                 }
                         }
-                } while (strcmp($a[0], $key)!=0);
+                } while (strcmp($a[0], $key) != 0);
         }
         
@@ -2293 +2305 @@
         $fp     = $conn->fp;
         $result = false;
-        if (($part==0) || (empty($part))) {
+        if (($part == 0) || empty($part)) {
             $part = 'TEXT';
         }
     
         if (iil_C_Select($conn, $mailbox)) {
-        $reply_key='* ' . $id;
+        $reply_key = '* ' . $id;
         
         // format request
@@ -2343 +2355 @@
                 }
                 $received += strlen($line);
-                if ($mode==1) {
-                    $result .= chop($line)."\n";
-                } else if ($mode==2) {
-                    echo chop($line)."\n"; flush();
-                } else if ($mode==3) {
+                if ($mode == 1) {
+                    $result .= chop($line) . "\n";
+                } else if ($mode == 2) {
+                    echo chop($line) . "\n"; flush();
+                } else if ($mode == 3) {
                     echo base64_decode($line); flush();
                 }
@@ -2400 +2412 @@
         if (fputs($fp, 'r RENAME "' . $from . '" "' . $to . '"' . "\r\n")) {
                 do {
-                        $line=iil_ReadLine($fp, 300);
-                } while ($line[0]!="r");
+                        $line = iil_ReadLine($fp, 300);
+                } while ($line[0] != 'r');
                 return (iil_ParseResult($line) == 0);
         }
-    return false;       
+    return false;
 }
 
@@ -2412 +2424 @@
                 do {
                         $line=iil_ReadLine($fp, 300);
-                } while ($line[0]!="d");
+                } while ($line[0] != 'd');
                 return (iil_ParseResult($line) == 0);
         }
@@ -2420 +2432 @@
 
 function iil_C_Append(&$conn, $folder, &$message) {
-        if (!$folder) return false;
+        if (!$folder) {
+        return false;
+    }
         $fp = $conn->fp;
 
@@ -2427 +2441 @@
 
         $len = strlen($message);
-        if (!$len) return false;
-        
+        if (!$len) {
+        return false;
+        }
         $request = 'A APPEND "' . $folder .'" (\\Seen) {' . $len . "}\r\n";
     
@@ -2476 +2491 @@
         $bytes_sent = 0;
         if (fputs($fp, $request)) {
-                $line=iil_ReadLine($fp, 100);
+                $line = iil_ReadLine($fp, 100);
                                 
                 //send file
                 while (!feof($in_fp)) {
-                        $buffer = fgets($in_fp, 4096);
+                        $buffer      = fgets($in_fp, 4096);
                         $bytes_sent += strlen($buffer);
                         fputs($fp, $buffer);
@@ -2490 +2505 @@
                 //read response
                 do {
-                        $line=iil_ReadLine($fp, 1000);
+                        $line = iil_ReadLine($fp, 1000);
                 } while ($line[0] != 'A');
                         
@@ -2534 +2549 @@
                                         $result = substr($post, 0, strlen($post)-1);
                                 }
-                        } while (!preg_match("/^$key/",$line));
+                        } while (!preg_match("/^$key/", $line));
                 }
         }
@@ -2570 +2585 @@
         //return false if not found, parse if found
         if (!empty($quota_line)) {
-                $quota_line = eregi_replace('[()]', '', $quota_line);
-                $parts = explode(' ', $quota_line);
+                $quota_line   = eregi_replace('[()]', '', $quota_line);
+                $parts        = explode(' ', $quota_line);
                 $storage_part = array_search('STORAGE', $parts);
-                if ($storage_part>0) {
+                if ($storage_part > 0) {
                         $result = array();
                         $used   = $parts[$storage_part+1];
@@ -2584 +2599 @@
                 }
         }
-        
         return $result;
 }
@@ -2596 +2610 @@
         return (iil_C_Expunge($conn, $folder) >= 0);
 }
-
 ?>