From 18cdf6b15547f85b7ff369a5777451f40b149ea0 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 13 Jan 2010 07:37:51 -0500
Subject: [PATCH] - small code improvement in rcube_imap::mod_mailbox()

---
 program/include/rcube_imap.php |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index 2408fa2..8d20036 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -2893,11 +2893,13 @@
     if ((!empty($this->root_ns) && $this->root_ns == $mbox_name) || $mbox_name == 'INBOX')
       return $mbox_name;
 
-    if (!empty($this->root_dir) && $mode=='in') 
-      $mbox_name = $this->root_dir.$this->delimiter.$mbox_name;
-    else if (strlen($this->root_dir) && $mode=='out') 
-      $mbox_name = substr($mbox_name, strlen($this->root_dir)+1);
-
+    if (!empty($this->root_dir)) {
+      if ($mode=='in')
+        $mbox_name = $this->root_dir.$this->delimiter.$mbox_name;
+      else if (!empty($mbox_name)) // $mode=='out'
+        $mbox_name = substr($mbox_name, strlen($this->root_dir)+1);
+      }
+    
     return $mbox_name;
     }
 

--
Gitblit v1.9.1