Changeset 5297 in subversion

Timestamp:

Sep 30, 2011 11:22:08 AM (20 months ago)

Author:

thomasb

Message:

Restrict folders list to write-only in selectors for special folders and save-message-to option

Location:

trunk/roundcubemail/program

Files:

• include/main.inc (modified) (1 diff)
• include/rcube_imap.php (modified) (7 diffs)
• steps/mail/compose.inc (modified) (1 diff)
• steps/settings/func.inc (modified) (1 diff)

trunk/roundcubemail/program/include/main.inc

@@ -1215 +1215 @@
 
   if ($p['unsubscribed'])
-    $list = $RCMAIL->imap->list_unsubscribed('', $p['folder_name'], $p['folder_filter']);
+    $list = $RCMAIL->imap->list_unsubscribed('', $p['folder_name'], $p['folder_filter'], $p['folder_rights']);
   else
-    $list = $RCMAIL->imap->list_mailboxes('', $p['folder_name'], $p['folder_filter']);
+    $list = $RCMAIL->imap->list_mailboxes('', $p['folder_name'], $p['folder_filter'], $p['folder_rights']);
 
   $delimiter = $RCMAIL->imap->get_hierarchy_delimiter();

trunk/roundcubemail/program/include/rcube_imap.php

@@ -2918 +2918 @@
      * @param   string  $name   Optional name pattern
      * @param   string  $filter Optional filter
+     * @param   string  $rights Optional ACL requirements
      *
      * @return  array   List of mailboxes/folders
      * @access  public
      */
-    function list_mailboxes($root='', $name='*', $filter=null)
-    {
-        $a_mboxes = $this->_list_mailboxes($root, $name, $filter);
+    function list_mailboxes($root='', $name='*', $filter=null, $rights=null)
+    {
+        $a_mboxes = $this->_list_mailboxes($root, $name, $filter, $rights);
 
         // INBOX should always be available
@@ -2944 +2945 @@
      * @param   string  $name   Optional name pattern
      * @param   mixed   $filter Optional filter
+     * @param   string  $rights Optional ACL requirements
      *
      * @return  array   List of mailboxes/folders
@@ -2949 +2951 @@
      * @access  private
      */
-    private function _list_mailboxes($root='', $name='*', $filter=null)
+    private function _list_mailboxes($root='', $name='*', $filter=null, $rights=null)
     {
         $cache_key = $root.':'.$name;
@@ -2955 +2957 @@
             $cache_key .= ':'.(is_string($filter) ? $filter : serialize($filter));
         }
+        $cache_key .= ':'.$rights;
 
         $cache_key = 'mailboxes.'.md5($cache_key);
@@ -3022 +3025 @@
         }
 
+        // filter folders list according to rights requirements
+        if ($rights && $this->get_capability('ACL')) {
+            $a_folders = $this->filter_rights($a_folders, $rights);
+        }
+
         // write mailboxlist to cache
         $this->update_cache($cache_key, $a_folders);
@@ -3035 +3043 @@
      * @param string  $name   Optional name pattern
      * @param mixed   $filter Optional filter
+     * @param string  $rights Optional ACL requirements
      *
      * @return array Indexed array with folder names
      */
-    function list_unsubscribed($root='', $name='*', $filter=null)
+    function list_unsubscribed($root='', $name='*', $filter=null, $rights=null)
     {
         // @TODO: caching
@@ -3062 +3071 @@
         }
 
+        // filter folders list according to rights requirements
+        if ($rights && $this->get_capability('ACL')) {
+            $a_folders = $this->filter_rights($a_folders, $rights);
+        }
+
         // filter folders and sort them
         $a_mboxes = $this->_sort_mailbox_list($a_mboxes);
 
         return $a_mboxes;
+    }
+
+
+    /**
+     * Filter the given list of folders according to access rights
+     */
+    private function filter_rights($a_folders, $rights)
+    {
+        $regex = '/('.$rights.')/';
+        foreach ($a_folders as $idx => $folder) {
+            $myrights = join('', (array)$this->my_rights($folder));
+            if ($myrights !== null && !preg_match($regex, $myrights))
+                unset($a_folders[$idx]);
+        }
+
+        return $a_folders;
     }
 

trunk/roundcubemail/program/steps/mail/compose.inc

@@ -1384 +1384 @@
   $select = rcmail_mailbox_select(array_merge($attrib, array(
     'noselection' => '- '.rcube_label('dontsave').' -',
-    'folder_filter' => 'mail'
+    'folder_filter' => 'mail',
+    'folder_rights' => 'w',
   )));
   return $select->show($_SESSION['compose']['param']['sent_mbox'], $attrib);

trunk/roundcubemail/program/steps/settings/func.inc

@@ -677 +677 @@
       if ($current) {
         $select = rcmail_mailbox_select(array('noselection' => '---', 'realnames' => true,
-          'maxlength' => 30, 'exceptions' => array('INBOX')));
+          'maxlength' => 30, 'exceptions' => array('INBOX'), 'folder_filter' => 'mail', 'folder_rights' => 'w'));
       }
       else // dummy select