some cleanups

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

diff --git a/SOGo/SoObjects/Mailer/ChangeLog b/SOGo/SoObjects/Mailer/ChangeLog
index 2373a95dde545e1a1051784840e2fa5efae262aa..bc440db2ce06fa7b0954d8933c20d9e1fe58c295 100644 (file)
--- a/SOGo/SoObjects/Mailer/ChangeLog
+++ b/SOGo/SoObjects/Mailer/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-28  Helge Hess  <helge.hess@skyrix.com>
+
+       * SOGoDraftObject.m: do not patch NGImap4Envelope ivars and use the new
+         constructor method (v0.9.44)
+
 2004-10-27  Helge Hess  <helge.hess@opengroupware.org>
 
        * SOGoMailManager.m: added 'SOGoIMAP4StringSeparator' default to

diff --git a/SOGo/SoObjects/Mailer/README b/SOGo/SoObjects/Mailer/README
index e61ff72517633e1bc49415df7329a92db7a19e9c..44ee0015d066d8d43e3e66118a0a21e3b5a07ebc 100644 (file)
--- a/SOGo/SoObjects/Mailer/README
+++ b/SOGo/SoObjects/Mailer/README
@@ -9,5 +9,7 @@ SOGoMailManager
 Defaults
 ========
 
-SOGoEnableIMAP4Debug    YES|NO - enable/disable debugging in SOGoMailManager
-SOGoDisableIMAP4Pooling YES|NO - disable IMAP4 connection pooling
+SOGoEnableIMAP4Debug       YES|NO - enable/disable debugging in SOGoMailManager
+SOGoDisableIMAP4Pooling    YES|NO - disable IMAP4 connection pooling
+SOGoMailSpoolPath         path   - FS path where mail drafts are stored
+SOGoNoDraftDeleteAfterSend YES|NO - makes the draft's -delete method a NOOP

diff --git a/SOGo/SoObjects/Mailer/SOGoDraftObject.m b/SOGo/SoObjects/Mailer/SOGoDraftObject.m
index 47f7f016aa9afc12d3acd651ea6cd4fddc70ee33..bf07045fc4f7b240983230b7b969eda849edcc4f 100644 (file)
--- a/SOGo/SoObjects/Mailer/SOGoDraftObject.m
+++ b/SOGo/SoObjects/Mailer/SOGoDraftObject.m
@@ -40,6 +40,11 @@ static BOOL       draftDeleteDisabled = NO; // for debugging
 static BOOL       debugOn = NO;
 
 + (void)initialize {
+  NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
+
+  if ((draftDeleteDisabled = [ud boolForKey:@"SOGoNoDraftDeleteAfterSend"]))
+    NSLog(@"WARNING: draft delete is disabled! (SOGoNoDraftDeleteAfterSend)");
+  
   TextPlainType  = [[NGMimeType mimeType:@"text"      subType:@"plain"]  copy];
   MultiMixedType = [[NGMimeType mimeType:@"multipart" subType:@"mixed"]  copy];
 }
@@ -99,11 +104,12 @@ static BOOL       debugOn = NO;
     return NO;
   }
   if (![self _ensureDraftFolderPath]) {
-    [self logWithFormat:@"ERROR: could not create folder for draft!"];
+    [self logWithFormat:@"ERROR: could not create folder for draft: '%@'",
+           [self draftFolderPath]];
     return NO;
   }
   if (![_info writeToFile:[self infoPath] atomically:YES]) {
-    [self logWithFormat:@"ERROR: could not write info %@", [self infoPath]];
+    [self logWithFormat:@"ERROR: could not write info: '%@'", [self infoPath]];
     return NO;
   }
   return YES;
@@ -699,25 +705,14 @@ static BOOL       debugOn = NO;
   if ((lInfo = [self fetchInfo]) == nil)
     return nil;
   
-  self->envelope = [[NGImap4Envelope alloc] init];
-  
-  self->envelope->msgId   = [[self nameInContainer] copy];
-  self->envelope->subject = [[lInfo objectForKey:@"subject"] copy];
-  
-  self->envelope->from = 
-    [[NGImap4EnvelopeAddress alloc] initWithString:[self sender]];
-  
-  if ([(tmp = [lInfo objectForKey:@"replyTo"]) length] > 0) {
-    self->envelope->replyTo = 
-      [[NGImap4EnvelopeAddress alloc] initWithString:tmp];
-  }
-  
-  self->envelope->to = [[self imap4EnvelopeAddressesForStrings:
-                               [lInfo objectForKey:@"to"]] copy];
-  self->envelope->cc = [[self imap4EnvelopeAddressesForStrings:
-                               [lInfo objectForKey:@"cc"]] copy];
-  self->envelope->bcc = [[self imap4EnvelopeAddressesForStrings:
-                               [lInfo objectForKey:@"bcc"]] copy];
+  self->envelope = 
+    [[NGImap4Envelope alloc] initWithMessageID:[self nameInContainer]
+                            subject:[lInfo objectForKey:@"subject"]
+                            sender:[self sender]
+                            replyTo:[lInfo objectForKey:@"replyTo"]
+                            to:[lInfo objectForKey:@"to"]
+                            cc:[lInfo objectForKey:@"cc"]
+                            bcc:[lInfo objectForKey:@"bcc"]];
   return self->envelope;
 }
 

diff --git a/SOGo/SoObjects/Mailer/Version b/SOGo/SoObjects/Mailer/Version
index 8513b555081daeb94532d51e903841c3f411db23..50b45e8794e729814f564db79eb048b4ffd0ce57 100644 (file)
--- a/SOGo/SoObjects/Mailer/Version
+++ b/SOGo/SoObjects/Mailer/Version
@@ -1,7 +1,8 @@
 # Version file
 
-SUBMINOR_VERSION:=43
+SUBMINOR_VERSION:=44
 
-# v0.9.51 requires NGMime    v4.3.190
+# v0.9.44 requires NGMime    v4.3.194
+# v0.9.41 requires NGMime    v4.3.190
 # v0.9.35 requires SOGoLogic v0.9.24
 # v0.9.34 requires SOGoLogic v0.9.22

diff --git a/SOGo/UI/Mailer/ChangeLog b/SOGo/UI/Mailer/ChangeLog
index 2676dedfdd348c6c39506f57e6e59f54ad2b1b77..4ea1dc22091ef6c5a1d9e9da3eb38b462da731f4 100644 (file)
--- a/SOGo/UI/Mailer/ChangeLog
+++ b/SOGo/UI/Mailer/ChangeLog
@@ -1,5 +1,7 @@
 2004-10-28  Helge Hess  <helge.hess@skyrix.com>
 
+       * product.plist: fixed getMail for drafts folder (v0.9.56)
+
        * UIxMailListView.wox: fixed viewer activation for unread mails
          (v0.9.55)
 

diff --git a/SOGo/UI/Mailer/Version b/SOGo/UI/Mailer/Version
index 572e0a09ebe8f41b0fb8176f89df2d222f1837da..61d114270ba174b707f8f74b42900a6e32f36ecc 100644 (file)
--- a/SOGo/UI/Mailer/Version
+++ b/SOGo/UI/Mailer/Version
@@ -1,6 +1,6 @@
 # $Id$
 
-SUBMINOR_VERSION:=55
+SUBMINOR_VERSION:=56
 
 # v0.9.50 requires NGMime   v4.3.190
 # v0.9.43 requires NGObjWeb v4.3.73

diff --git a/SOGo/UI/Mailer/product.plist b/SOGo/UI/Mailer/product.plist
index c4d605f0fb48f18d945b06614e4adc2e95f26db5..c58bb716e15936d7140452727e625dec75754c53 100644 (file)
--- a/SOGo/UI/Mailer/product.plist
+++ b/SOGo/UI/Mailer/product.plist
@@ -299,6 +299,10 @@
           protectedBy = "View";
           pageName    = "UIxMailListView"; 
         };
+        getMail = {
+          protectedBy = "View";
+          pageName    = "UIxMailListView"; 
+        };
         compose = {
           protectedBy = "View";
           actionClass = "UIxMailEditorAction";