merge of '4fb91535d64ab4fed607ffde0f99efdc1f92a6e6'

and 'c04765e5faa3be50bda54d32f06fb26120fc78e7'

Monotone-Parent: 4fb91535d64ab4fed607ffde0f99efdc1f92a6e6
Monotone-Parent: c04765e5faa3be50bda54d32f06fb26120fc78e7
Monotone-Revision: 5f353cb4ef5483f5d16dbec9eea1e66fab15c916

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-08-07T18:15:45
Monotone-Branch: ca.inverse.sogo

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]))

UI/Common/UIxAppNavView.m

@@ -18,7 +18,6 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id: UIxAppNavView.m 281 2004-08-27 03:51:08Z helge $
 
 #import <NGObjWeb/SoObject+SoDAV.h>
 #import <NGObjWeb/WOContext+SoObjects.h>

UI/Contacts/ContactsUIProduct.m

@@ -18,7 +18,6 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id: ContactsUIProduct.m 268 2004-08-25 15:40:21Z znek $
 
 #import <Foundation/NSObject.h>
 

UI/SOGoUI/SOGoJSStringFormatter.m

@@ -18,8 +18,6 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id: SOGoJSStringFormatter.m 415 2004-10-20 15:47:45Z znek $
-
 
 #import "SOGoJSStringFormatter.h"