Changeset 2451 in subversion

Timestamp:

May 4, 2009 3:53:01 AM (4 years ago)

Author:

alec

Message:

• use preg_* instead of ereg* + removed caching functions

File:

• trunk/roundcubemail/program/lib/imap.inc (modified) (29 diffs)

trunk/roundcubemail/program/lib/imap.inc

@@ -80 +80 @@
                 - added iil_C_FetchMIMEHeaders() function
                 - added \* flag support 
+                - use PREG instead of EREG
+                - removed caching functions
 
 ********************************************************/
@@ -135 +137 @@
         var $message;
         var $host;
-        var $cache;
-        var $uid_cache;
-        var $do_cache;
         var $exists;
         var $recent;
@@ -259 +258 @@
 function iil_MultLine($fp, $line) {
         $line = chop($line);
-        if (ereg('\{[0-9]+\}$', $line)) {
+        if (preg_match('/\{[0-9]+\}$/', $line)) {
                 $out = '';
         
@@ -321 +320 @@
                 return true;
         }
-        if ($error && preg_match('/^\* (BYE|BAD) /', $string)) {
+        if ($error && preg_match('/^\* (BYE|BAD) /i', $string)) {
                 return true;
         }
@@ -547 +546 @@
         global $iil_error, $iil_errornum;
         global $ICL_SSL, $ICL_PORT;
-        global $IMAP_NO_CACHE;
         global $my_prefs, $IMAP_USE_INTERNAL_DATE;
         
@@ -580 +578 @@
         $conn->user        = $user;
         $conn->host        = $host;
-        $conn->cache       = array();
-        $conn->do_cache    = (function_exists("cache_write")&&!$IMAP_NO_CACHE);
-        $conn->cache_dirty = array();
         
         if ($my_prefs['sort_field'] == 'INTERNALDATE') {
@@ -714 +709 @@
 
 function iil_Close(&$conn) {
-        iil_C_WriteCache($conn);
         if (iil_PutLine($conn->fp, "I LOGOUT")) {
                 fgets($conn->fp, 1024);
@@ -720 +714 @@
                 $conn->fp = false;
         }
-}
-
-function iil_ClearCache($user, $host) {
-}
-
-function iil_C_WriteCache(&$conn) {
-        //echo "<!-- doing iil_C_WriteCache //-->\n";
-        if (!$conn->do_cache) return false;
-        
-        if (is_array($conn->cache)) {
-                while (list($folder,$data)=each($conn->cache)) {
-                        if ($folder && is_array($data) && $conn->cache_dirty[$folder]) {
-                                $key = $folder.".imap";
-                                $result = cache_write($conn->user, $conn->host, $key, $data, true);
-                                //echo "<!-- writing $key $data: $result //-->\n";
-                        }
-                }
-        }
-}
-
-function iil_C_EnableCache(&$conn) {
-        $conn->do_cache = true;
-}
-
-function iil_C_DisableCache(&$conn) {
-        $conn->do_cache = false;
-}
-
-function iil_C_LoadCache(&$conn, $folder) {
-        if (!$conn->do_cache) {
-            return false;
-        }
-    
-        $key = $folder.'.imap';
-        if (!is_array($conn->cache[$folder])) {
-                $conn->cache[$folder]       = cache_read($conn->user, $conn->host, $key);
-                $conn->cache_dirty[$folder] = false;
-        }
-}
-
-function iil_C_ExpireCachedItems(&$conn, $folder, $message_set) {
-        
-        if (!$conn->do_cache) {
-                return; //caching disabled
-        }
-        if (!is_array($conn->cache[$folder])) {
-                return; //cache not initialized|empty
-        }
-        if (count($conn->cache[$folder]) == 0) {
-                return; //cache not initialized|empty
-        }
-    
-        $uids = iil_C_FetchHeaderIndex($conn, $folder, $message_set, 'UID');
-        $num_removed = 0;
-        if (is_array($uids)) {
-                //echo "<!-- unsetting: ".implode(",",$uids)." //-->\n";
-                while (list($n,$uid)=each($uids)) {
-                        unset($conn->cache[$folder][$uid]);
-                        //$conn->cache[$folder][$uid] = false;
-                        //$num_removed++;
-                }
-                $conn->cache_dirty[$folder] = true;
-
-                //echo '<!--'."\n";
-                //print_r($conn->cache);
-                //echo "\n".'//-->'."\n";
-        } else {
-                echo "<!-- failed to get uids: $message_set //-->\n";
-        }
-        
-        /*
-        if ($num_removed>0) {
-                $new_cache;
-                reset($conn->cache[$folder]);
-                while (list($uid,$item)=each($conn->cache[$folder])) {
-                        if ($item) $new_cache[$uid] = $conn->cache[$folder][$uid];
-                }
-                $conn->cache[$folder] = $new_cache;
-        }
-        */
 }
 
@@ -854 +768 @@
         }
     
-        iil_C_LoadCache($conn, $mailbox);
-        
         if (iil_PutLine($conn->fp, "sel1 SELECT \"".iil_Escape($mailbox).'"')) {
                 do {
@@ -1286 +1198 @@
         $message_set = '1' . ($num>1?':' . $num:'');
         
-        //if cache not enabled, just call iil_C_FetchHeaderIndex on 'UID' field
-        if (!$conn->do_cache)
-                return iil_C_FetchHeaderIndex($conn, $mailbox, $message_set, 'UID');
-
-        //otherwise, let's check cache first
-        $key        = $mailbox.'.uids';
-        $cache_good = true;
-        if ($conn->uid_cache) {
-            $data = $conn->uid_cache;
-        } else {
-            $data = cache_read($conn->user, $conn->host, $key);
-        }
-    
-        //was anything cached at all?
-        if ($data === false) {
-            $cache_good = -1;
-        }
-    
-        //make sure number of messages were the same
-        if ($cache_good > 0 && $data['n'] != $num) {
-            $cache_good = -2;
-        }
-    
-        //if everything's okay so far...
-        if ($cache_good > 0) {
-                //check UIDs of highest mid with current and cached
-                $temp = iil_C_Search($conn, $mailbox, 'UID ' . $data['d'][$num]);
-                if (!$temp || !is_array($temp) || $temp[0] != $num) {
-                    $cache_good = -3;
-                }
-        }
-
-        //if cached data's good, return it
-        if ($cache_good > 0) {
-                return $data['d'];
-        }
-
-        //otherwise, we need to fetch it
-        $data      = array('n' => $num, 'd' => array());
-        $data['d'] = iil_C_FetchHeaderIndex($conn, $mailbox, $message_set, 'UID');
-    
-        cache_write($conn->user, $conn->host, $key, $data);
-        $conn->uid_cache = $data;
-        return $data['d'];
+        return iil_C_FetchHeaderIndex($conn, $mailbox, $message_set, 'UID');
 }
 
@@ -1356 +1225 @@
         $debug  = false;
         
-        /* Get cached records where possible */
-        if ($conn->do_cache) {
-                $cached = cache_read($conn->user, $conn->host, $mailbox.'.thhd');
-                if ($cached && is_array($uids) && count($uids)>0) {
-                        $needed_set = '';
-                        foreach ($uids as $id=>$uid) {
-                                if ($cached[$uid]) {
-                                        $result[$uid]     = $cached[$uid];
-                                        $result[$uid]->id = $id;
-                                } else {
-                                    $needed_set .= ($needed_set ? ',' : '') . $id;
-                                }
-                        }
-                        if ($needed_set) {
-                            $message_set = $needed_set;
-                        } else {
-                            $message_set = '';
-                        }
-                }
-        }
         $message_set = iil_CompressMessageSet($message_set);
-        if ($debug) {
-            echo "Still need: ".$message_set;
-        }
     
         /* if we're missing any, get them */
@@ -1397 +1243 @@
                             echo $line . "\n";
                         }
-                        if (ereg('\{[0-9]+\}$', $line)) {
+                        if (preg_match('/\{[0-9]+\}$/', $line)) {
                                 $a       = explode(' ', $line);
                                 $new = array();
@@ -1415 +1261 @@
                                                 $new[strtoupper($field_name)] = trim($field_val);
 
-                                        } else if (ereg('^[[:space:]]', $line)) {
+                                        } else if (preg_match('/^\s+/', $line)) {
                                                 $new[strtoupper($field_name)] .= trim($line);
                                         }
@@ -1434 +1280 @@
         }
         
-        /* write new set to cache */
-        if ($conn->do_cache) {
-                if (count($result)!=count($cached)) {
-                        cache_write($conn->user, $conn->host, $mailbox . '.thhd', $result);
-                }
-        }
-        
         //echo 'iil_FetchThreadHeaders:'."\n";
         //print_r($result);
@@ -1465 +1304 @@
         $debug     = false;
         
-        $sbj_filter_pat = '[a-zA-Z]{2,3}(\[[0-9]*\])?:([[:space:]]*)';
+        $sbj_filter_pat = '/[a-z]{2,3}(\[[0-9]*\])?:(\s*)/i';
         
         /*  Do "SELECT" command */
@@ -1502 +1341 @@
         
                 /* if subject contains 'RE:' or has in-reply-to header, it's a reply */
-                $sbj_pre ='';
+                $sbj_pre = '';
                 $has_re = false;
-                if (eregi($sbj_filter_pat, $new['SUBJECT'])) {
+                if (preg_match($sbj_filter_pat, $new['SUBJECT'])) {
                     $has_re = true;
                 }
-                if ($has_re||$new['IN-REPLY-TO']) {
+                if ($has_re || $new['IN-REPLY-TO']) {
                     $sbj_pre = 'RE:';
                 }
@@ -1513 +1352 @@
                 /* strip out 're:', 'fw:' etc */
                 if ($has_re) {
-                    $sbj = ereg_replace($sbj_filter_pat, '', $new['SUBJECT']);
+                    $sbj = preg_replace($sbj_filter_pat, '', $new['SUBJECT']);
                 } else {
                     $sbj = $new['SUBJECT'];
@@ -1682 +1521 @@
         }
                 
-        /* Get cached records where possible */
-        if ($conn->do_cache) {
-                $uids = iil_C_FetchHeaderIndex($conn, $mailbox, $message_set, "UID");
-                if (is_array($uids) && count($conn->cache[$mailbox]>0)) {
-                        $needed_set = '';
-                        while (list($id,$uid)=each($uids)) {
-                                if ($conn->cache[$mailbox][$uid]) {
-                                        $result[$id]     = $conn->cache[$mailbox][$uid];
-                                        $result[$id]->id = $id;
-                                } else {
-                                    $needed_set.=($needed_set ? ',': '') . $id;
-                                }
-                        }
-                        //echo "<!-- iil_C_FetchHeader\nMessage Set: $message_set\nNeeded Set:$needed_set\n//-->\n";
-                        if ($needed_set) {
-                                $message_set = iil_CompressMessageSet($needed_set);
-                        } else {
-                                return $result;
-                        }
-                }
-        }
-        
         if ($add)
-          $add = ' '.strtoupper(trim($add));
+                $add = ' '.strtoupper(trim($add));
 
         /* FETCH uid, size, flags and headers */
@@ -1747 +1564 @@
 
                                 // swap parents with quotes, then explode
-                                $str = eregi_replace("[()]", "\"", $str);
+                                $str = preg_replace('/[()]/', '"', $str);
                                 $a = iil_ExplodeQuotedString(' ', $str);
 
@@ -1864 +1681 @@
                                         
                                         $field  = strtolower($field);
-                                        $string = ereg_replace("\n[[:space:]]*"," ",$string);
+                                        $string = preg_replace('/\n\s*/', ' ', $string);
                                         
                                         switch ($field) {
@@ -1905 +1722 @@
                                                 break;
                                         case 'in-reply-to':
-                                                $result[$id]->in_reply_to = ereg_replace("[\n<>]", '', $string);
+                                                $result[$id]->in_reply_to = preg_replace('/[\n<>]/', '', $string);
                                                 break;
                                         case 'references':
@@ -1928 +1745 @@
                                         } // end switch ()
                                 } // end while ()
-                
-                                if ($conn->do_cache) {
-                                        $uid = $result[$id]->uid;
-                                        $conn->cache[$mailbox][$uid] = $result[$id];
-                                        $conn->cache_dirty[$mailbox] = true;
-                                }
                         } else {
                                 $a = explode(' ', $line);
@@ -1940 +1751 @@
                         // process flags
                         if (!empty($flags_str)) {
-                                $flags_str = eregi_replace('[\\\"]', '', $flags_str);
+                                $flags_str = preg_replace('/[\\\"]/', '', $flags_str);
                                 $flags_a   = explode(' ', $flags_str);
                                         
@@ -2090 +1901 @@
 
                 if (iil_ParseResult($line) == 0) {
-                        iil_C_ExpireCachedItems($conn, $mailbox, $messages);
                         return $c;
                 }
@@ -2175 +1985 @@
                         do {
                                 $line=chop(iil_ReadLine($fp, 1024));
-                                if (eregi("^\* $id FETCH \(UID (.*)\)", $line, $r)) {
+                                if (preg_match("/^\* $id FETCH \(UID (.*)\)/i", $line, $r)) {
                                         $result = $r[1];
                                 }
@@ -2195 +2005 @@
                 do {
                         $line=trim(iil_ReadLine($fp, 10000));
-                        if (eregi("^\* SEARCH", $line)) {
+                        if (preg_match('/^\* SEARCH/i', $line)) {
                                 $str = trim(substr($line, 8));
                                 $messages = explode(' ', $str);
@@ -2338 +2148 @@
             
                         if (empty($ignore) || (!empty($ignore)
-                                && !eregi($ignore, $folder))) {
+                                && !preg_match('/'.preg_quote(ignore, '/').'/i', $folder))) {
                                 $folders[$i] = $folder;
                         }
@@ -2406 +2216 @@
             
                         if ((!in_array($folder, $folders)) && (empty($ignore)
-                                || (!empty($ignore) && !eregi($ignore, $folder)))) {
+                                || (!empty($ignore) && !preg_match('/'.preg_quote(ignore, '/').'/i', $folder)))) {
                             $folders[$i] = $folder;
                         }
@@ -2819 +2629 @@
         $min_free = PHP_INT_MAX;
         foreach ($quota_lines as $key => $quota_line) {
-                $quota_line   = eregi_replace('[()]', '', $quota_line);
+                $quota_line   = preg_replace('/[()]/', '', $quota_line);
                 $parts        = explode(' ', $quota_line);
                 $storage_part = array_search('STORAGE', $parts);