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

diff --git a/ChangeLog b/ChangeLog
index fddc5fa7caae25e29d5d23c2e00e0715eea5fa5c..01b581ad8ea89d305e2d6490ab0510c0e15c1c3a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2007-11-08  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+       * UI/MailPartViewers/UIxMailPartHTMLViewer.m
+       ([UIxMailPartHTMLViewer -_attachmentIds]): the reference was one
+       character too short, which cause the images not to be displayed
+       sometimes and crashes to happen whenever the references on a
+       message were wrong (due to bugs in SOPE).
+
+       * UI/MailerUI/UIxMailListView.m ([UIxMailListView
+       -hasMessageAttachment]): consider an attachment any content that
+       has a non-nil disposition.
+
        * SoObjects/SOGo/SOGoParentFolder.m ([SOGoParentFolder
        -newFolderWithName:nameandNameInContainer:newNameInContainer]):
        fixed method to make use of the parameters instead of the useless

diff --git a/SoObjects/Contacts/SOGoContactGCSFolder.m b/SoObjects/Contacts/SOGoContactGCSFolder.m
index e917d40ccc0b7150b3095e8bf8efbbda804e69e0..f8a7b4a2405a28246ad3c214fe0afe50ea807d85 100644 (file)
--- a/SoObjects/Contacts/SOGoContactGCSFolder.m
+++ b/SoObjects/Contacts/SOGoContactGCSFolder.m
@@ -26,6 +26,7 @@
 #import <NGObjWeb/SoObject+SoDAV.h>
 #import <NGObjWeb/WOContext.h>
 #import <NGObjWeb/WORequest.h>
+#import <NGObjWeb/WOResponse.h>
 #import <NGExtensions/NSObject+Logs.h>
 #import <NGExtensions/NSString+misc.h>
 #import <EOControl/EOQualifier.h>

diff --git a/SoObjects/Contacts/SOGoContactLDAPFolder.m b/SoObjects/Contacts/SOGoContactLDAPFolder.m
index dd1bfd3c2d281a75d4042fd24b45540d3d999d5f..d47883f159689c8e7f3690403f8518e47bda1ecd 100644 (file)
--- a/SoObjects/Contacts/SOGoContactLDAPFolder.m
+++ b/SoObjects/Contacts/SOGoContactLDAPFolder.m
@@ -25,10 +25,11 @@
 #import <Foundation/NSString.h>
 
 #import <NGObjWeb/NSException+HTTP.h>
-#import <NGObjWeb/SoObject.h>
 #import <NGObjWeb/WOApplication.h>
 #import <NGObjWeb/WOContext.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
+#import <NGObjWeb/WOResponse.h>
+#import <NGObjWeb/SoObject.h>
 #import <NGObjWeb/SoUser.h>
 #import <EOControl/EOSortOrdering.h>
 #import <SaxObjC/XMLNamespaces.h>

diff --git a/SoObjects/Mailer/SOGoMailObject+Draft.m b/SoObjects/Mailer/SOGoMailObject+Draft.m
index 3b406d1b6c89253f618b9a258f541fe9398284d2..91f3a17a93ee0eb7be84b9559baf29057066f3cf 100644 (file)
--- a/SoObjects/Mailer/SOGoMailObject+Draft.m
+++ b/SoObjects/Mailer/SOGoMailObject+Draft.m
@@ -23,6 +23,7 @@
 #import <Foundation/NSArray.h>
 
 #import <NGObjWeb/WOApplication.h>
+#import <NGObjWeb/WOResponse.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
 #import <NGExtensions/NSString+misc.h>
 #import <NGExtensions/NSObject+Logs.h>

diff --git a/SoObjects/SOGo/AgenorUserDefaults.m b/SoObjects/SOGo/AgenorUserDefaults.m
index e5b541ea5b2bbe2baf836aced0317878257a4f0a..156b4ffeb48f4f4ce5c4293c3fde0c54affdaded 100644 (file)
--- a/SoObjects/SOGo/AgenorUserDefaults.m
+++ b/SoObjects/SOGo/AgenorUserDefaults.m
@@ -19,6 +19,7 @@
   02111-1307, USA.
 */
 
+#import <Foundation/NSCalendarDate.h>
 #import <Foundation/NSPropertyList.h>
 #import <Foundation/NSUserDefaults.h>
 #import <Foundation/NSValue.h>

diff --git a/SoObjects/SOGo/SOGoDateFormatter.m b/SoObjects/SOGo/SOGoDateFormatter.m
index 9bddd7626523948d58c44255e5e2d5200a1e2a01..97eb90b565538d3d59d4d5ae2a4578012bdef39f 100644 (file)
--- a/SoObjects/SOGo/SOGoDateFormatter.m
+++ b/SoObjects/SOGo/SOGoDateFormatter.m
@@ -19,6 +19,7 @@
   02111-1307, USA.
 */
 
+#import <Foundation/NSDictionary.h>
 #import <Foundation/NSCalendarDate.h>
 #import <Foundation/NSUserDefaults.h>
 

diff --git a/SoObjects/SOGo/SOGoGCSFolder.m b/SoObjects/SOGo/SOGoGCSFolder.m
index 45cf066361c86681d9283784cfed4dd7a368adcc..cf6f1296eef0b95c71175d7578dcf289a8365f5d 100644 (file)
--- a/SoObjects/SOGo/SOGoGCSFolder.m
+++ b/SoObjects/SOGo/SOGoGCSFolder.m
@@ -61,10 +61,10 @@ static NSString *defaultUserID = @"<default>";
 {
   id newFolder;
   NSArray *elements, *pathElements;
-  NSString *ocsPath, *objectPath, *owner, *ocsName, *folderName;
+  NSString *ocsPath, *objectPath, *login, *ocsName, *folderName;
 
   elements = [reference componentsSeparatedByString: @":"];
-  owner = [elements objectAtIndex: 0];
+  login = [elements objectAtIndex: 0];
   objectPath = [elements objectAtIndex: 1];
   pathElements = [objectPath componentsSeparatedByString: @"/"];
   if ([pathElements count] > 1)
@@ -73,12 +73,12 @@ static NSString *defaultUserID = @"<default>";
     ocsName = @"personal";
 
   ocsPath = [NSString stringWithFormat: @"/Users/%@/%@/%@",
-                     owner, [pathElements objectAtIndex: 0], ocsName];
-  folderName = [NSString stringWithFormat: @"%@_%@", owner, ocsName];
+                     login, [pathElements objectAtIndex: 0], ocsName];
+  folderName = [NSString stringWithFormat: @"%@_%@", login, ocsName];
   newFolder = [[self alloc] initWithName: folderName
                            inContainer: aContainer];
   [newFolder setOCSPath: ocsPath];
-  [newFolder setOwner: owner];
+  [newFolder setOwner: login];
 
   return newFolder;
 }

diff --git a/SoObjects/SOGo/SOGoUser.m b/SoObjects/SOGo/SOGoUser.m
index 64671657c587cee6a91e9c001ba8cfe9b5bc2031..9ffdfc6eca446774f89d98c215118f1b931d2de2 100644 (file)
--- a/SoObjects/SOGo/SOGoUser.m
+++ b/SoObjects/SOGo/SOGoUser.m
@@ -108,17 +108,17 @@ NSString *SOGoWeekStartFirstFullWeek = @"FirstFullWeek";
 {
   NSArray *bLanguages;
   WOContext *context;
-  NSString *language;
+  NSString *lng;
 
   context = [[WOApplication application] context];
   bLanguages = [[context request] browserLanguages];
   if ([bLanguages count] > 0)
-    language = [bLanguages objectAtIndex: 0];
+    lng = [bLanguages objectAtIndex: 0];
 
-  if (![language length])
-    language = defaultLanguage;
+  if (![lng length])
+    lng = defaultLanguage;
 
-  return language;
+  return lng;
 }
 
 + (SOGoUser *) userWithLogin: (NSString *) newLogin

diff --git a/UI/Common/common.h b/UI/Common/common.h
index 9c2549483cdf77fe87c2579e0ee7a36bc57ac3b2..2a816fbb1bdfd8f6e24cb27a670eb2394006c226 100644 (file)
--- a/UI/Common/common.h
+++ b/UI/Common/common.h
@@ -23,6 +23,7 @@
 #import <NGObjWeb/WOContext+SoObjects.h>
 #import <NGObjWeb/WODynamicElement.h>
 #import <NGObjWeb/WORequest.h>
+#import <NGObjWeb/WOResponse.h>
 #import <NGObjWeb/WOResourceManager.h>
 #import <NGObjWeb/WOSession.h>
 #import <NGExtensions/NSObject+Logs.h>

diff --git a/UI/MailPartViewers/UIxMailPartHTMLViewer.m b/UI/MailPartViewers/UIxMailPartHTMLViewer.m
index 4dbda7c495fe3e04c37416359be9ef97b677c91a..fbe39301f731ef71240f6c7e600dff9638d49688 100644 (file)
--- a/UI/MailPartViewers/UIxMailPartHTMLViewer.m
+++ b/UI/MailPartViewers/UIxMailPartHTMLViewer.m
@@ -449,7 +449,7 @@
       url = [NSMutableString new];
       [url appendString: baseURL];
       [url appendFormat: @"/%@", [partPath componentsJoinedByString: @"/"]];
-      [url deleteCharactersInRange: NSMakeRange([url length] - 3, 2)];
+      [url deleteCharactersInRange: NSMakeRange([url length] - 2, 2)];
       parts = [[parent bodyInfo] objectForKey: @"parts"];
       max = [parts count];
       for (count = 0; count < max; count++)

diff --git a/UI/MailerUI/UIxMailListView.m b/UI/MailerUI/UIxMailListView.m
index ed4d74f412e6fe590478976c864c0941f56634f3..13cf5fc473865503662f77427093356625af36cc 100644 (file)
--- a/UI/MailerUI/UIxMailListView.m
+++ b/UI/MailerUI/UIxMailListView.m
@@ -221,8 +221,7 @@
        = [[parts objectsForKey: @"disposition"] objectEnumerator];
       while (!hasAttachment
             && (currentDisp = [dispositions nextObject]))
-       hasAttachment = ([[currentDisp objectForKey: @"type"]
-                          isEqualToString: @"ATTACHMENT"]);
+         hasAttachment = ([currentDisp objectForKey: @"type"]);
     }
 
   return hasAttachment;