Changeset 4220 in subversion

Timestamp:

Nov 12, 2010 9:43:33 AM (3 years ago)

Author:

alec

Message:

• More fixes for folders with name "0"

File:

• trunk/roundcubemail/program/include/rcube_imap.php (modified) (16 diffs)

trunk/roundcubemail/program/include/rcube_imap.php

@@ -725 +725 @@
     function list_headers($mbox_name='', $page=NULL, $sort_field=NULL, $sort_order=NULL, $slice=0)
     {
-        $mailbox = $mbox_name ? $this->mod_mailbox($mbox_name) : $this->mailbox;
+        $mailbox = strlen($mbox_name) ? $this->mod_mailbox($mbox_name) : $this->mailbox;
         return $this->_list_headers($mailbox, $page, $sort_field, $sort_order, false, $slice);
     }
@@ -1290 +1290 @@
     function mailbox_status($mbox_name = null)
     {
-        $mailbox = $mbox_name ? $this->mod_mailbox($mbox_name) : $this->mailbox;
+        $mailbox = strlen($mbox_name) ? $this->mod_mailbox($mbox_name) : $this->mailbox;
         $old = $this->get_folder_stats($mailbox);
 
@@ -1357 +1357 @@
         $this->_set_sort_order($sort_field, $sort_order);
 
-        $mailbox = $mbox_name ? $this->mod_mailbox($mbox_name) : $this->mailbox;
+        $mailbox = strlen($mbox_name) ? $this->mod_mailbox($mbox_name) : $this->mailbox;
         $key = "{$mailbox}:{$this->sort_field}:{$this->sort_order}:{$this->search_string}.msgi";
 
@@ -1467 +1467 @@
         $this->_set_sort_order($sort_field, $sort_order);
 
-        $mailbox = $mbox_name ? $this->mod_mailbox($mbox_name) : $this->mailbox;
+        $mailbox = strlen($mbox_name) ? $this->mod_mailbox($mbox_name) : $this->mailbox;
         $key = "{$mailbox}:{$this->sort_field}:{$this->sort_order}:{$this->search_string}.thi";
 
@@ -1644 +1644 @@
             return false;
 
-        $mailbox = $mbox_name ? $this->mod_mailbox($mbox_name) : $this->mailbox;
+        $mailbox = strlen($mbox_name) ? $this->mod_mailbox($mbox_name) : $this->mailbox;
 
         $results = $this->_search_index($mailbox, $str, $charset, $sort_field);
@@ -1749 +1749 @@
             return false;
 
-        $mailbox = $mbox_name ? $this->mod_mailbox($mbox_name) : $this->mailbox;
+        $mailbox = strlen($mbox_name) ? $this->mod_mailbox($mbox_name) : $this->mailbox;
 
         return $this->conn->search($mailbox, $str, $ret_uid);
@@ -1926 +1926 @@
     function get_headers($id, $mbox_name=NULL, $is_uid=true, $bodystr=false)
     {
-        $mailbox = $mbox_name ? $this->mod_mailbox($mbox_name) : $this->mailbox;
+        $mailbox = strlen($mbox_name) ? $this->mod_mailbox($mbox_name) : $this->mailbox;
         $uid = $is_uid ? $id : $this->_id2uid($id, $mailbox);
 
@@ -2459 +2459 @@
     function set_flag($uids, $flag, $mbox_name=NULL, $skip_cache=false)
     {
-        $mailbox = $mbox_name ? $this->mod_mailbox($mbox_name) : $this->mailbox;
+        $mailbox = strlen($mbox_name) ? $this->mod_mailbox($mbox_name) : $this->mailbox;
 
         $flag = strtoupper($flag);
@@ -2669 +2669 @@
     function delete_message($uids, $mbox_name='')
     {
-        $mailbox = $mbox_name ? $this->mod_mailbox($mbox_name) : $this->mailbox;
+        $mailbox = strlen($mbox_name) ? $this->mod_mailbox($mbox_name) : $this->mailbox;
 
         list($uids, $all_mode) = $this->_parse_uids($uids, $mailbox);
@@ -2750 +2750 @@
     function expunge($mbox_name='', $clear_cache=true)
     {
-        $mailbox = $mbox_name ? $this->mod_mailbox($mbox_name) : $this->mailbox;
+        $mailbox = strlen($mbox_name) ? $this->mod_mailbox($mbox_name) : $this->mailbox;
         return $this->_expunge($mailbox, $clear_cache);
     }
@@ -2835 +2835 @@
     function get_id($uid, $mbox_name=NULL)
     {
-        $mailbox = $mbox_name ? $this->mod_mailbox($mbox_name) : $this->mailbox;
+        $mailbox = strlen($mbox_name) ? $this->mod_mailbox($mbox_name) : $this->mailbox;
         return $this->_uid2id($uid, $mailbox);
     }
@@ -2847 +2847 @@
      * @return int   Message UID
      */
-    function get_uid($id,$mbox_name=NULL)
-    {
-        $mailbox = $mbox_name ? $this->mod_mailbox($mbox_name) : $this->mailbox;
+    function get_uid($id, $mbox_name=NULL)
+    {
+        $mailbox = strlen($mbox_name) ? $this->mod_mailbox($mbox_name) : $this->mailbox;
         return $this->_id2uid($id, $mailbox);
     }
@@ -4458 +4458 @@
     private function _uid2id($uid, $mbox_name=NULL)
     {
-        if (!$mbox_name)
+        if (!strlen($mbox_name))
             $mbox_name = $this->mailbox;
 
@@ -4480 +4480 @@
     private function _id2uid($id, $mbox_name=NULL)
     {
-        if (!$mbox_name)
+        if (!strlen($mbox_name))
             $mbox_name = $this->mailbox;
 
@@ -4541 +4541 @@
     {
         $a_mailbox_cache = false;
-        $mailbox = $mbox_name ? $mbox_name : $this->mailbox;
+        $mailbox = strlen($mbox_name) ? $mbox_name : $this->mailbox;
         $mode = strtoupper($mode);
 
@@ -4569 +4569 @@
     private function _clear_messagecount($mbox_name='', $mode=null)
     {
-        $mailbox = $mbox_name ? $mbox_name : $this->mailbox;
+        $mailbox = strlen($mbox_name) ? $mbox_name : $this->mailbox;
 
         $a_mailbox_cache = $this->get_cache('messagecount');