From: wolfgang <wolfgang@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Tue, 7 Aug 2007 18:14:10 +0000 (+0000)
Subject: git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1137 d1b88da0-ebda-0310... 
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4844139f4aecb0cd78783560ae15c6a5a6fdca17;p=scalable-opengroupware.org

git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1137 d1b88da0-ebda-0310-925b-ed51d893ca5b
---

diff --git a/ChangeLog b/ChangeLog
index 0a756aff..93ede875 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,3 @@
-2007-08-06  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
-
-	* SoObjects/Mailer/SOGoMailObject.m ([SOGoMailObject
-	-bodyStructure]): fetch the "bodystructure" key instead of "body".
-
 2007-08-02  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/Contacts/UIxContactFoldersView.m ([UIxContactFoldersView _responseForResults:]):
diff --git a/SoObjects/Mailer/SOGoMailFolder.m b/SoObjects/Mailer/SOGoMailFolder.m
index 7a265714..3232947f 100644
--- a/SoObjects/Mailer/SOGoMailFolder.m
+++ b/SoObjects/Mailer/SOGoMailFolder.m
@@ -217,27 +217,28 @@ static BOOL useAltNamespace = NO;
 {
   // TODO: we might want to check for existence prior controller creation
   NSURL *sf;
+  SOGoMailFolder *newFolder;
 
   /* check whether URL exists */
   
   sf = [self imap4URL];
-  sf = [NSURL URLWithString: _key relativeToURL: sf];
+  sf = [NSURL URLWithString: [_key substringFromIndex: 6]
+	      relativeToURL: sf];
 
 // -  sf = [NSURL URLWithString:[[sf path] stringByAppendingPathComponent:_key]
 // -	      relativeToURL:sf];
+
+  if ([[self imap4Connection] doesMailboxExistAtURL: sf])
+    newFolder = [SOGoMailFolder objectWithName: _key inContainer: self];
+  else
+    newFolder = nil;
+  /* 
+     We may not return 404, confuses path traversal - but we still do in the
+     calling method. Probably the traversal process should be fixed to
+     support 404 exceptions (as stop traversal _and_ acquisition).
+  */
   
-  if (![[self imap4Connection] doesMailboxExistAtURL: sf]) {
-    /* 
-       We may not return 404, confuses path traversal - but we still do in the
-       calling method. Probably the traversal process should be fixed to
-       support 404 exceptions (as stop traversal _and_ acquisition).
-    */
-    return nil;
-  }
-  
-  /* create object */
-  
-  return [SOGoMailFolder objectWithName: _key inContainer: self];
+  return newFolder;
 }
 
 - (id) lookupImap4Message: (NSString *) _key
@@ -254,8 +255,7 @@ static BOOL useAltNamespace = NO;
   id obj;
 
   if ([_key hasPrefix: @"folder"])
-    obj = [self lookupImap4Folder: [_key substringFromIndex: 6]
-		inContext: _ctx];
+    obj = [self lookupImap4Folder: _key inContext: _ctx];
   else
     {
       if (isdigit ([_key characterAtIndex: 0]))
diff --git a/UI/Common/UIxAppNavView.m b/UI/Common/UIxAppNavView.m
index 28e903de..87dfc098 100644
--- a/UI/Common/UIxAppNavView.m
+++ b/UI/Common/UIxAppNavView.m
@@ -18,7 +18,6 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
 
 #import <NGObjWeb/SoObject+SoDAV.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
diff --git a/UI/Contacts/ContactsUIProduct.m b/UI/Contacts/ContactsUIProduct.m
index e57ee717..f79264ff 100644
--- a/UI/Contacts/ContactsUIProduct.m
+++ b/UI/Contacts/ContactsUIProduct.m
@@ -18,7 +18,6 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
 
 #import <Foundation/NSObject.h>
 
diff --git a/UI/SOGoUI/SOGoJSStringFormatter.m b/UI/SOGoUI/SOGoJSStringFormatter.m
index 25ea1697..59b3e72e 100644
--- a/UI/SOGoUI/SOGoJSStringFormatter.m
+++ b/UI/SOGoUI/SOGoJSStringFormatter.m
@@ -18,8 +18,6 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
-
 
 #import "SOGoJSStringFormatter.h"