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

diff --git a/ChangeLog b/ChangeLog
index 0a756afff6774db9c8e14faa6ae8ee7f4786f2d5..93ede875057fe3b7ad76838c482eef640ceb0f46 100644 (file)
--- 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 7a2657142c012f505d5a562ceec53bda31afbf22..3232947fe3ab037b9ccc7c5186f803d3fd1332de 100644 (file)
--- 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 28e903dea0d1bf1755516110826e9fb8a47b0b92..87dfc0983c3a16376176591b1ce1e53edaf29eb0 100644 (file)
--- 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 e57ee717463fb83401b519cc67beb99833d15c04..f79264ff4f713e4fb15d2ebb652b60e539004c1c 100644 (file)
--- 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 25ea16976b3cffe6b53de5abfd19c61aace3f2db..59b3e72eb51f4a585afb252746231cfc1fa4fcb1 100644 (file)
--- 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"