www/admin

[Bogomil Shopov]

 www/admin/user/activesync.php |   16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

New commits:
commit 327962055608c278c6d2bb449f8d0b5afc0437b1
Author: Bogomil Shopov <bogomil at efb.bg>
Date:   Wed May 11 14:34:29 2011 +0300

    Fixing subfolders issue: https://bugzilla.kolabsys.com/show_bug.cgi?id=98

diff --git a/www/admin/user/activesync.php b/www/admin/user/activesync.php
index dfc25a8..ebce78a 100755
--- a/www/admin/user/activesync.php
+++ b/www/admin/user/activesync.php
@@ -215,16 +215,22 @@ function __construct()
 		     //remove Inbox/ part from the name
 		     $folder_chunk=explode("/",$folder);
 		     
-		     //if if only inbox/ show it
-		     if($folder_chunk[1]!=""){
+		     //if it's only inbox/ show it
+		     
+		     
+		     if($folder_chunk[1]!="" and count($folder_chunk)==2 and $folder_chunk[0]=="INBOX"){
 		     //else is inbox/somepart - show only somepart
 		     $folder=$folder_chunk[1];
 		     
-		     }if($folder_chunk[2]!="")
+		     }if($folder_chunk[2]!="" and count($folder_chunk)==3 and $folder_chunk[0]=="user")
 		     {
 		      //user folder
-		     $folder="(".$folder_chunk[1].") ".$folder_chunk[2];
-		     }
+		      $folder="(".$folder_chunk[1].") ".$folder_chunk[2];
+		     }else
+			 	{
+			 		$folder= preg_replace(array('/INBOX\//','/\//'),array('','/'),$folder);
+					
+			 	}
 		     //for saving annot
 		     $part_folder[]=$folders[$i]['realname'];