Changeset 4173 in subversion

Timestamp:

Nov 3, 2010 10:40:35 AM (3 years ago)

Author:

alec

Message:

• Use consistent naming (folder -> mailbox), fixed #1487101

File:

• trunk/roundcubemail/program/include/rcube_imap_generic.php (modified) (14 diffs)

trunk/roundcubemail/program/include/rcube_imap_generic.php

@@ -1275 +1275 @@
             }
 
-        if (!$this->select($folder)) {
+        if (!$this->select($mailbox)) {
             return null;
         }
@@ -1763 +1763 @@
     }
 
-    function thread($folder, $algorithm='REFERENCES', $criteria='', $encoding='US-ASCII')
+    function thread($mailbox, $algorithm='REFERENCES', $criteria='', $encoding='US-ASCII')
     {
         $old_sel = $this->selected;
 
-            if (!$this->select($folder)) {
+            if (!$this->select($mailbox)) {
                 return false;
             }
 
         // return empty result when folder is empty and we're just after SELECT
-        if ($old_sel != $folder && !$this->data['EXISTS']) {
+        if ($old_sel != $mailbox && !$this->data['EXISTS']) {
             return array(array(), array(), array());
             }
@@ -1974 +1974 @@
                 // * LIST (<options>) <delimiter> <mailbox>
                 if (!$lstatus || $cmd == 'LIST' || $cmd == 'LSUB') {
-                    list($opts, $delim, $folder) = $this->tokenizeResponse($response, 3);
+                    list($opts, $delim, $mailbox) = $this->tokenizeResponse($response, 3);
 
                     // Add to result array
                     if (!$lstatus) {
-                                    $folders[] = $folder;
+                                    $folders[] = $mailbox;
                     }
                     else {
-                        $folders[$folder] = array();
+                        $folders[$mailbox] = array();
                     }
 
                     // Add to options array
                     if (!empty($opts)) {
-                        if (empty($this->data['LIST'][$folder]))
-                            $this->data['LIST'][$folder] = $opts;
+                        if (empty($this->data['LIST'][$mailbox]))
+                            $this->data['LIST'][$mailbox] = $opts;
                         else
-                            $this->data['LIST'][$folder] = array_unique(array_merge(
-                                $this->data['LIST'][$folder], $opts));
+                            $this->data['LIST'][$mailbox] = array_unique(array_merge(
+                                $this->data['LIST'][$mailbox], $opts));
                     }
                 }
                 // * STATUS <mailbox> (<result>)
                 else if ($cmd == 'STATUS') {
-                    list($folder, $status) = $this->tokenizeResponse($response, 2);
+                    list($mailbox, $status) = $this->tokenizeResponse($response, 2);
 
                     for ($i=0, $len=count($status); $i<$len; $i += 2) {
                         list($name, $value) = $this->tokenizeResponse($status, 2);
-                        $folders[$folder][$name] = $value;
+                        $folders[$mailbox][$name] = $value;
                     }
                 }
@@ -2211 +2211 @@
     }
 
-    function createFolder($folder)
-    {
-        $result = $this->execute('CREATE', array($this->escape($folder)),
+    function createFolder($mailbox)
+    {
+        $result = $this->execute('CREATE', array($this->escape($mailbox)),
                 self::COMMAND_NORESPONSE);
 
@@ -2227 +2227 @@
     }
 
-    function deleteFolder($folder)
-    {
-        $result = $this->execute('DELETE', array($this->escape($folder)),
+    function deleteFolder($mailbox)
+    {
+        $result = $this->execute('DELETE', array($this->escape($mailbox)),
                 self::COMMAND_NORESPONSE);
 
@@ -2235 +2235 @@
     }
 
-    function clearFolder($folder)
-    {
-            $num_in_trash = $this->countMessages($folder);
+    function clearFolder($mailbox)
+    {
+            $num_in_trash = $this->countMessages($mailbox);
             if ($num_in_trash > 0) {
-                    $this->delete($folder, '1:*');
-            }
-            return ($this->expunge($folder) >= 0);
-    }
-
-    function subscribe($folder)
-    {
-            $result = $this->execute('SUBSCRIBE', array($this->escape($folder)),
+                    $this->delete($mailbox, '1:*');
+            }
+            return ($this->expunge($mailbox) >= 0);
+    }
+
+    function subscribe($mailbox)
+    {
+            $result = $this->execute('SUBSCRIBE', array($this->escape($mailbox)),
                 self::COMMAND_NORESPONSE);
 
@@ -2252 +2252 @@
     }
 
-    function unsubscribe($folder)
-    {
-            $result = $this->execute('UNSUBSCRIBE', array($this->escape($folder)),
+    function unsubscribe($mailbox)
+    {
+            $result = $this->execute('UNSUBSCRIBE', array($this->escape($mailbox)),
                 self::COMMAND_NORESPONSE);
 
@@ -2260 +2260 @@
     }
 
-    function append($folder, &$message)
-    {
-            if (!$folder) {
+    function append($mailbox, &$message)
+    {
+            if (!$mailbox) {
                     return false;
             }
@@ -2275 +2275 @@
 
         $key = $this->next_tag();
-            $request = sprintf("$key APPEND %s (\\Seen) {%d%s}", $this->escape($folder),
+            $request = sprintf("$key APPEND %s (\\Seen) {%d%s}", $this->escape($mailbox),
             $len, ($this->prefs['literal+'] ? '+' : ''));
 
@@ -2298 +2298 @@
 
             // Clear internal status cache
-            unset($this->data['STATUS:'.$folder]);
+            unset($this->data['STATUS:'.$mailbox]);
 
                 return ($this->parseResult($line, 'APPEND: ') == self::ERROR_OK);
@@ -2309 +2309 @@
     }
 
-    function appendFromFile($folder, $path, $headers=null)
-    {
-            if (!$folder) {
+    function appendFromFile($mailbox, $path, $headers=null)
+    {
+            if (!$mailbox) {
                 return false;
             }
@@ -2339 +2339 @@
         // send APPEND command
         $key = $this->next_tag();
-            $request = sprintf("$key APPEND %s (\\Seen) {%d%s}", $this->escape($folder),
+            $request = sprintf("$key APPEND %s (\\Seen) {%d%s}", $this->escape($mailbox),
             $len, ($this->prefs['literal+'] ? '+' : ''));
 
@@ -2375 +2375 @@
 
             // Clear internal status cache
-            unset($this->data['STATUS:'.$folder]);
+            unset($this->data['STATUS:'.$mailbox]);
 
                     return ($this->parseResult($line, 'APPEND: ') == self::ERROR_OK);
@@ -2386 +2386 @@
     }
 
-    function fetchStructureString($folder, $id, $is_uid=false)
-    {
-            if (!$this->select($folder)) {
+    function fetchStructureString($mailbox, $id, $is_uid=false)
+    {
+            if (!$this->select($mailbox)) {
             return false;
         }