added default to disable etag caching in mail objects

fixed the title of image attachments
removed use of tb.view method names (use view instead)

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

diff --git a/SoObjects/Mailer/ChangeLog b/SoObjects/Mailer/ChangeLog
index 230be68ec788746d44ff8d40d7edc8e3ee9cf76e..c8651eaca0eff15f42c24f67f53b8a2a7d00a21d 100644 (file)
--- a/SoObjects/Mailer/ChangeLog
+++ b/SoObjects/Mailer/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-30  Helge Hess  <helge.hess@opengroupware.org>
+
+       * SOGoMailBodyPart.m, SOGoMailObject.m: added default to disable etag
+         delivery/checks for mail objects (SOGoMailDisableETag) (v0.9.124)
+
 2005-07-22  Helge Hess  <helge.hess@opengroupware.org>
 
        * v0.9.123

diff --git a/SoObjects/Mailer/README b/SoObjects/Mailer/README
index 8d0e5cc9b82ff698efa428319780d3394726d51c..86087a35ca754f9841043ec6df54bfa0a33ecc92 100644 (file)
--- a/SoObjects/Mailer/README
+++ b/SoObjects/Mailer/README
@@ -56,3 +56,5 @@ SOGoDoNotFetchMailHeader   YES|NO - whether or not to fetch the mail header
   - the header gives much more information about the mail
     - eg: spam status
   - parsing the mail header takes time
+
+SOGoMailDisableETag        YES|NO - whether or not to check/deliver an etag

diff --git a/SoObjects/Mailer/SOGoMailBodyPart.m b/SoObjects/Mailer/SOGoMailBodyPart.m
index 3ee0a3dbbcf93b9659f5299f33ba6fd6f464150c..ddad7dffa350b2c6831bd93bf45e830b6f15b76d 100644 (file)
--- a/SoObjects/Mailer/SOGoMailBodyPart.m
+++ b/SoObjects/Mailer/SOGoMailBodyPart.m
@@ -34,16 +34,22 @@ static BOOL debugOn = NO;
 }
 
 + (void)initialize {
+  NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
+  
   NSAssert2([super version] == 1,
             @"invalid superclass (%@) version %i !",
             NSStringFromClass([self superclass]), [super version]);
   
-  mailETag = [[NSString alloc] initWithFormat:@"\"imap4url_%d_%d_%03d\"",
+  if (![[ud objectForKey:@"SOGoMailDisableETag"] boolValue]) {
+    mailETag = [[NSString alloc] initWithFormat:@"\"imap4url_%d_%d_%03d\"",
                                 UIX_MAILER_MAJOR_VERSION,
                                 UIX_MAILER_MINOR_VERSION,
                                 UIX_MAILER_SUBMINOR_VERSION];
-  NSLog(@"Note(SOGoMailBodyPart): using constant etag for mail parts: '%@'", 
-       mailETag);
+    NSLog(@"Note(SOGoMailBodyPart): using constant etag for mail parts: '%@'", 
+         mailETag);
+  }
+  else
+    NSLog(@"Note(SOGoMailBodyPart): etag caching disabled!");
 }
 
 - (void)dealloc {
@@ -271,7 +277,7 @@ static BOOL debugOn = NO;
        [self partInfo]];
   
   // TODO: wrong, could be encoded
-  r = [_ctx response];
+  r = [(WOContext *)_ctx response];
   [r setHeader:[self davContentType] forKey:@"content-type"];
   [r setHeader:[NSString stringWithFormat:@"%d", [data length]]
      forKey:@"content-length"];

diff --git a/SoObjects/Mailer/SOGoMailObject.m b/SoObjects/Mailer/SOGoMailObject.m
index 1bbba74c557a078c1b1e90029afd6c2e5ad6c07a..3e60fc73302d327e6052fe48671856ef7c1632b2 100644 (file)
--- a/SoObjects/Mailer/SOGoMailObject.m
+++ b/SoObjects/Mailer/SOGoMailObject.m
@@ -73,12 +73,16 @@ static BOOL debugSoParts       = NO;
                                    nil];
   }
 
-  mailETag = [[NSString alloc] initWithFormat:@"\"imap4url_%d_%d_%03d\"",
+  if (![[ud objectForKey:@"SOGoMailDisableETag"] boolValue]) {
+    mailETag = [[NSString alloc] initWithFormat:@"\"imap4url_%d_%d_%03d\"",
                                 UIX_MAILER_MAJOR_VERSION,
                                 UIX_MAILER_MINOR_VERSION,
                                 UIX_MAILER_SUBMINOR_VERSION];
-  NSLog(@"Note(SOGoMailObject): using constant etag for mail parts: '%@'", 
-       mailETag);
+    NSLog(@"Note(SOGoMailObject): using constant etag for mail parts: '%@'", 
+         mailETag);
+  }
+  else
+    NSLog(@"Note(SOGoMailObject): etag caching disabled!");
 }
 
 - (void)dealloc {
@@ -720,7 +724,7 @@ static BOOL debugSoParts       = NO;
                        reason:@"did not find IMAP4 message"];
   }
   
-  r = [_ctx response];
+  r = [(WOContext *)_ctx response];
   [r setHeader:@"message/rfc822" forKey:@"content-type"];
   [r setContent:content];
   return r;

diff --git a/SoObjects/Mailer/Version b/SoObjects/Mailer/Version
index ad01846343ce3fa7208c95047a4f75e33422e4fc..31b0a460c0be7a81c32271258153b1c08ead387e 100644 (file)
--- a/SoObjects/Mailer/Version
+++ b/SoObjects/Mailer/Version
@@ -1,6 +1,6 @@
 # Version file
 
-SUBMINOR_VERSION:=123
+SUBMINOR_VERSION:=124
 
 # v0.9.114 requires libNGMime       v4.5.229
 # v0.9.114 requires libNGExtensions v4.5.165

diff --git a/UI/MailerUI/ChangeLog b/UI/MailerUI/ChangeLog
index c5ec6ef3e8c0ccf48f372b2b0ac7413cefb208c7..56117495212c77881c4e0303651b51509290e81a 100644 (file)
--- a/UI/MailerUI/ChangeLog
+++ b/UI/MailerUI/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-30  Helge Hess  <helge.hess@opengroupware.org>
+
+       * v0.9.173
+
+       * product.plist: removed tb.view methods (just use 'view' instead)
+
 2005-07-26  Helge Hess  <helge.hess@opengroupware.org>
 
        * UIxMailTree.m: improved block debugging (v0.9.172)

diff --git a/UI/MailerUI/Version b/UI/MailerUI/Version
index 08fd93f977ba3e391af139bc05cf8b4ef96287f6..89e77effc9a61353f519f1c7992ee776dcd29652 100644 (file)
--- a/UI/MailerUI/Version
+++ b/UI/MailerUI/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=172
+SUBMINOR_VERSION:=173
 
 # v0.9.140 requires SoObjects/Mailer v0.9.100
 # v0.9.134 requires libSOGo          v0.9.41

diff --git a/UI/MailerUI/product.plist b/UI/MailerUI/product.plist
index ac33909db757e4aabf94bd9d670e26022ffa3818..35f10cb2e322a9da6118a609b6921d62a92d2411 100644 (file)
--- a/UI/MailerUI/product.plist
+++ b/UI/MailerUI/product.plist
@@ -89,10 +89,6 @@
           protectedBy = "View";
           pageName    = "UIxMailListView"; 
         };
-        "tb.view" = { /* primary entry for mailer actions */
-          protectedBy = "View";
-          pageName    = "UIxMailListView"; 
-        };
         index = {
           protectedBy = "View";
           pageName    = "UIxMailListView"; 
@@ -176,10 +172,6 @@
           protectedBy = "View";
           pageName    = "UIxMailView"; 
         };
-        "tb.view" = { /* primary entry for mailer actions */
-          protectedBy = "View";
-          pageName    = "UIxMailView"; 
-        };
 
         getMail = {
           protectedBy = "View";
@@ -246,10 +238,6 @@
           protectedBy = "View";
           pageName    = "UIxMailAccountsView"; 
         };
-        "tb.view" = { /* primary entry for mailer actions */
-          protectedBy = "View";
-          pageName    = "UIxMailAccountsView"; 
-        };
         getMail = {
           protectedBy = "View";
           pageName    = "UIxMailAccountsView"; 
@@ -269,10 +257,6 @@
           protectedBy = "View";
           pageName    = "UIxMailAccountView"; 
         };
-        "tb.view" = { /* primary entry for mailer actions */
-          protectedBy = "View";
-          pageName    = "UIxMailAccountView"; 
-        };
         getMail = {
           protectedBy = "View";
           pageName    = "UIxMailAccountView"; 
@@ -321,10 +305,6 @@
           protectedBy = "View";
           pageName    = "UIxMailListView"; 
         };
-        "tb.view" = { /* primary entry for mailer actions */
-          protectedBy = "View";
-          pageName    = "UIxMailListView"; 
-        };
         getMail = {
           protectedBy = "View";
           pageName    = "UIxMailListView"; 
@@ -349,10 +329,6 @@
           protectedBy = "View";
           pageName    = "UIxMailEditor"; 
         };
-        "tb.view" = { /* primary entry for mailer actions */
-          protectedBy = "View";
-          pageName    = "UIxMailEditor"; 
-        };
         edit = {
           protectedBy = "View";
           pageName    = "UIxMailEditor"; 
@@ -432,10 +408,6 @@
           protectedBy = "View";
           pageName    = "UIxFilterList"; 
         };
-        "tb.view" = { /* primary entry for mailer actions */
-          protectedBy = "View";
-          pageName    = "UIxFilterList"; 
-        };
         create = {
           protectedBy = "View";
           pageName    = "UIxFilterList"; 

diff --git a/UI/Templates/ChangeLog b/UI/Templates/ChangeLog
index 51f7fad82904515503324683c6ee39f317dba398..4f2fce6a60bd590a138982c9c26aa57871628b0e 100644 (file)
--- a/UI/Templates/ChangeLog
+++ b/UI/Templates/ChangeLog
@@ -1,3 +1,11 @@
+2005-07-30  Helge Hess  <helge.hess@opengroupware.org>
+
+       * MailPartViewers/UIxMailPartImageViewer.wox: fixed 'title' attribute
+         of image tag (now displays filename)
+
+       * MailerUI/UIxMailMainFrame.wox: use 'view' instead of 'tb.view' to
+         activate links
+
 2005-07-26  Helge Hess  <helge.hess@opengroupware.org>
 
        * ContactsUI/UIxContactEditor.wox: removed copy-from-anais button

diff --git a/UI/Templates/MailPartViewers/UIxMailPartImageViewer.wox b/UI/Templates/MailPartViewers/UIxMailPartImageViewer.wox
index fb176335d5a134aadded2288db82a3e35edc0a8b..1590d7a043de65aaa92182d85d1f99f29d05b373 100644 (file)
--- a/UI/Templates/MailPartViewers/UIxMailPartImageViewer.wox
+++ b/UI/Templates/MailPartViewers/UIxMailPartImageViewer.wox
@@ -4,6 +4,6 @@
   xmlns:var="http://www.skyrix.com/od/binding"
   
   var:src="pathToImage"
-  var:title="bodyInfo"
+  var:title="filenameForDisplay"
   class="mailer_imagecontent"
 ></img>

diff --git a/UI/Templates/MailerUI/UIxMailMainFrame.wox b/UI/Templates/MailerUI/UIxMailMainFrame.wox
index fe8398f0eeab97f419b2236ba3aad5321c8803e8..4c0f6c329650de3cef912329b865f51b9f65cb5a 100644 (file)
--- a/UI/Templates/MailerUI/UIxMailMainFrame.wox
+++ b/UI/Templates/MailerUI/UIxMailMainFrame.wox
@@ -134,7 +134,7 @@
                       <div class="embedwhite_in">
                         <var:component className="UIxMailTree" 
                            rootClassName="treeRootClassName" 
-                           const:treeFolderAction="tb.view" 
+                           const:treeFolderAction="view" 
                            />
                       </div>
                     </div>

diff --git a/UI/WebServerResources/ChangeLog b/UI/WebServerResources/ChangeLog
index 2c08f0a112c75f4c122ab29b2ffc683c9f31f95a..aa3e1f83bc21de0aaf7f2148afad90a1b8105eb4 100644 (file)
--- a/UI/WebServerResources/ChangeLog
+++ b/UI/WebServerResources/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-30  Helge Hess  <helge.hess@opengroupware.org>
+
+       * mailer.js: use standard 'view' instead of 'tb.view' method
+
 2005-07-22  Helge Hess  <helge.hess@opengroupware.org>
 
        * mailer-toolbar.css: fixed send and attach buttons to use 24x24 images

diff --git a/UI/WebServerResources/mailer.js b/UI/WebServerResources/mailer.js
index 1aa75b1b2aabc45a3a23413443fbd8362b62643d..2af615a86e1bcfd50718a33b4b474520075d9384 100644 (file)
--- a/UI/WebServerResources/mailer.js
+++ b/UI/WebServerResources/mailer.js
@@ -43,7 +43,7 @@ function openMessageWindow(sender, msguid, url) {
 
 function clickedUid(sender, msguid) {
   resetSelection(window);
-  openMessageWindow(sender, msguid, msguid + "/tb.view");
+  openMessageWindow(sender, msguid, msguid + "/view");
   return true;
 }
 function doubleClickedUid(sender, msguid) {