Changeset 82a1417 in github

Timestamp:

May 23, 2012 2:06:57 PM (12 months ago)

Author:

Aleksander Machniak <alec@…>

Branches:

release-0.8

Children:

8b31d99

Parents:

da19e0e

git-author:

Aleksander Machniak <alec@…> (05/23/12 03:19:51)

git-committer:

Aleksander Machniak <alec@…> (05/23/12 14:06:57)

Message:

Improved PERMANENTFLAGS checking code, added code for flags caching (currently commented out)

File:

• program/include/rcube_imap.php (modified) (1 diff)

program/include/rcube_imap.php

@@ -405 +405 @@
     public function check_permflag($flag)
     {
-        $flag = strtoupper($flag);
-        $imap_flag = $this->conn->flags[$flag];
-
-        if ($this->folder !== null) {
-            $this->check_connection();
-        }
-        // @TODO: cache permanent flags (?)
-
-        return (in_array_nocase($imap_flag, $this->conn->data['PERMANENTFLAGS']));
+        $flag       = strtoupper($flag);
+        $imap_flag  = $this->conn->flags[$flag];
+        $perm_flags = $this->get_permflags($this->folder);
+
+        return in_array_nocase($imap_flag, $perm_flags);
+    }
+
+
+    /**
+     * Returns PERMANENTFLAGS of the specified folder
+     *
+     * @param  string $folder Folder name
+     *
+     * @return array Flags
+     */
+    public function get_permflags($folder)
+    {
+        if (!strlen($folder)) {
+            return array();
+        }
+/*
+        Checking PERMANENTFLAGS is rather rare, so we disable caching of it
+        Re-think when we'll use it for more than only MDNSENT flag
+
+        $cache_key = 'mailboxes.permanentflags.' . $folder;
+        $permflags = $this->get_cache($cache_key);
+
+        if ($permflags !== null) {
+            return explode(' ', $permflags);
+        }
+*/
+        if (!$this->check_connection()) {
+            return array();
+        }
+
+        if ($this->conn->select($folder)) {
+            $permflags = $this->conn->data['PERMANENTFLAGS'];
+        }
+        else {
+            return array();
+        }
+
+        if (!is_array($permflags)) {
+            $permflags = array();
+        }
+/*
+        // Store permflags as string to limit cached object size
+        $this->update_cache($cache_key, implode(' ', $permflags));
+*/
+        return $permflags;
     }