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

diff --git a/ChangeLog b/ChangeLog
index 89bf1d6693a06a1d2ce1ef8cbf67f7cf7fcee0f9..b492fefdf48d02ff6d636a9980d4924365b55f63 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-01-29  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+       * SoObjects/SOGo/SOGoGCSFolder.m ([SOGoGCSFolder
+       -davSetProperties:setPropsremovePropertiesNamed:removedPropsinContext:localContext]):
+       new method that takes the displayname into account.
+
+       * SoObjects/SOGo/SOGoParentFolder.m ([SOGoParentFolder
+       -davCreateCollection:pathInfoinContext:localContext]): new method
+       that acts as a proxy to newFolderWithName:andNameInContainer:.
+
 2008-01-28  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
        * UI/Scheduler/UIxComponentEditor.m ([UIxComponentEditor

diff --git a/SOPE/sope-patchset-r1583.diff b/SOPE/sope-patchset-r1593.diff
similarity index 96%
rename from SOPE/sope-patchset-r1583.diff
rename to SOPE/sope-patchset-r1593.diff
index 2ac86aa1b67c88e5cfee6005ac413785efb85ab4..2fb75ed9ee59ae3bf0d8a532a2273801232a336a 100644 (file)
--- a/SOPE/sope-patchset-r1583.diff
+++ b/SOPE/sope-patchset-r1593.diff
@@ -1,6 +1,136 @@
+Index: sope-gdl1/PostgreSQL/PostgreSQL72Channel.m
+===================================================================
+--- sope-gdl1/PostgreSQL/PostgreSQL72Channel.m (révision 1593)
++++ sope-gdl1/PostgreSQL/PostgreSQL72Channel.m (copie de travail)
+@@ -713,6 +713,39 @@
+   return ms;
+ }
+ 
++/* GCSEOAdaptorChannel protocol */
++static NSString *sqlFolderFormat = (@"CREATE TABLE %@ (\n"    \
++                                  @"  c_name VARCHAR (256) NOT NULL,\n"
++                                  @"  c_content VARCHAR (100000) NOT NULL,\n"
++                                  @"  c_creationdate INT4 NOT NULL,\n"
++                                  @"  c_lastmodified INT4 NOT NULL,\n"
++                                  @"  c_version INT4 NOT NULL,\n"
++                                  @"  c_deleted INT4 NULL\n"
++                                  @")");
++static NSString *sqlFolderACLFormat = (@"CREATE TABLE %@ (\n" \
++                                     @"  c_uid VARCHAR (256) NOT NULL,\n"
++                                     @"  c_object VARCHAR (256) NOT NULL,\n"
++                                     @"  c_role VARCHAR (80) NOT NULL\n"
++                                     @")");
++
++- (NSException *) createGCSFolderTableWithName: (NSString *) tableName
++{
++  NSString *sql;
++
++  sql = [NSString stringWithFormat: sqlFolderFormat, tableName];
++
++  return [self evaluateExpressionX: sql];
++}
++
++- (NSException *) createGCSFolderACLTableWithName: (NSString *) tableName
++{
++  NSString *sql;
++
++  sql = [NSString stringWithFormat: sqlFolderACLFormat, tableName];
++
++  return [self evaluateExpressionX: sql];
++}
++
+ @end /* PostgreSQL72Channel */
+ 
+ @implementation PostgreSQL72Channel(PrimaryKeyGeneration)
+Index: sope-gdl1/Oracle8/OracleAdaptorChannel.m
+===================================================================
+--- sope-gdl1/Oracle8/OracleAdaptorChannel.m   (révision 1593)
++++ sope-gdl1/Oracle8/OracleAdaptorChannel.m   (copie de travail)
+@@ -30,6 +30,7 @@
+ 
+ #import <NGExtensions/NSObject+Logs.h>
+ 
++static BOOL debugOn = NO;
+ //
+ //
+ //
+@@ -41,10 +42,19 @@
+ 
+ @implementation OracleAdaptorChannel (Private)
+ 
+--  (void) _cleanup
+++ (void) initialize
+ {
++  NSUserDefaults *ud;
++
++  ud = [NSUserDefaults standardUserDefaults];
++  debugOn = [ud boolForKey: @"OracleAdaptorDebug"];
++}
++
++- (void) _cleanup
++{
+   column_info *info;
+   int c;
++  sword result;
+ 
+   [_resultSetProperties removeAllObjects];
+ 
+@@ -58,11 +68,29 @@
+       // so we just free the value instead.
+       if (info->value)
+       {
+-        if (OCIDescriptorFree((dvoid *)info->value, (ub4)OCI_DTYPE_LOB) != OCI_SUCCESS)
++        if (info->type == SQLT_CLOB
++            || info->type == SQLT_BLOB
++            || info->type == SQLT_BFILEE
++            || info->type == SQLT_CFILEE)
++          {
++            result = OCIDescriptorFree((dvoid *)info->value, (ub4) OCI_DTYPE_LOB);
++            if (result != OCI_SUCCESS)
++              {
++                NSLog (@"value was not a LOB descriptor");
++                abort();
++              }
++          }
++        else
+           free(info->value);
+         info->value = NULL;
+       }
+-       free(info);
++      else
++      {
++        NSLog (@"trying to free an already freed value!");
++        abort();
++      }
++      free(info);
++
+       [_row_buffer removeObjectAtIndex: c];
+     }
+ 
+@@ -231,6 +259,9 @@
+ 
+   [self _cleanup];
+ 
++  if (debugOn)
++    [self logWithFormat: @"expression: %@", theExpression];
++
+   if (!theExpression || ![theExpression length])
+     {
+       [NSException raise: @"OracleInvalidExpressionException"
+@@ -302,7 +333,9 @@
+       // We read the maximum width of a column
+       info->max_width = 0;
+       status = OCIAttrGet((dvoid*)param, (ub4)OCI_DTYPE_PARAM, (dvoid*)&(info->max_width), (ub4 *)0, (ub4)OCI_ATTR_DATA_SIZE, (OCIError *)_oci_err);
+-      
++
++      if (debugOn)
++      NSLog(@"name: %s, type: %d", cname, info->type);
+       attribute = [EOAttribute attributeWithOracleType: info->type  name: cname  length: clen  width: info->max_width];
+       [_resultSetProperties addObject: attribute];
+ 
 Index: sope-mime/NGImap4/NGImap4Connection.m
 ===================================================================
---- sope-mime/NGImap4/NGImap4Connection.m      (révision 1583)
+--- sope-mime/NGImap4/NGImap4Connection.m      (révision 1593)
 +++ sope-mime/NGImap4/NGImap4Connection.m      (copie de travail)
 @@ -381,7 +381,7 @@
    
@@ -13,7 +143,7 @@ Index: sope-mime/NGImap4/NGImap4Connection.m
      [self errorWithFormat:@"Could not list mailbox hierarchy!"];
 Index: sope-mime/NGImap4/NGImap4ResponseNormalizer.m
 ===================================================================
---- sope-mime/NGImap4/NGImap4ResponseNormalizer.m      (révision 1583)
+--- sope-mime/NGImap4/NGImap4ResponseNormalizer.m      (révision 1593)
 +++ sope-mime/NGImap4/NGImap4ResponseNormalizer.m      (copie de travail)
 @@ -648,14 +648,13 @@
    enumerator = [_flags objectEnumerator];
@@ -39,7 +169,7 @@ Index: sope-mime/NGImap4/NGImap4ResponseNormalizer.m
    if (objs) free(objs);
 Index: sope-mime/NGImap4/NGImap4ResponseParser.m
 ===================================================================
---- sope-mime/NGImap4/NGImap4ResponseParser.m  (révision 1583)
+--- sope-mime/NGImap4/NGImap4ResponseParser.m  (révision 1593)
 +++ sope-mime/NGImap4/NGImap4ResponseParser.m  (copie de travail)
 @@ -84,6 +84,8 @@
  static NSDictionary *_parseMultipartBody(NGImap4ResponseParser *self,
@@ -58,7 +188,7 @@ Index: sope-mime/NGImap4/NGImap4ResponseParser.m
  
  static __inline__ NSException *_consumeIfMatch
    (NGImap4ResponseParser *self, unsigned char _m);
-@@ -649,12 +652,31 @@
+@@ -649,12 +652,35 @@
  }
  
  - (NSString *)_parseQuotedString {
@@ -88,11 +218,15 @@ Index: sope-mime/NGImap4/NGImap4ResponseParser.m
 +  else {
 +    quotedString = nil;
 +  }
++
++  [quotedString replaceString:@"?=\t=?"
++              withString:@"?==?"];
++
 +  return quotedString;
  }
  - (void)_consumeOptionalSpace {
    if (_la(self, 0) == ' ') _consume(self, 1);
-@@ -1185,7 +1207,7 @@
+@@ -1185,7 +1211,7 @@
    route   = [self _parseQuotedStringOrNIL]; [self _consumeOptionalSpace];
    mailbox = [self _parseQuotedStringOrNIL]; [self _consumeOptionalSpace];
    host    = [self _parseQuotedStringOrNIL]; [self _consumeOptionalSpace];
@@ -101,7 +235,7 @@ Index: sope-mime/NGImap4/NGImap4ResponseParser.m
    if (_la(self, 0) != ')') {
      [self logWithFormat:@"WARNING: IMAP4 envelope "
            @"address not properly closed (c0=%c,c1=%c): %@",
-@@ -1197,6 +1219,7 @@
+@@ -1197,6 +1223,7 @@
    address = [[NGImap4EnvelopeAddress alloc] initWithPersonalName:pname
                                            sourceRoute:route mailbox:mailbox
                                            host:host];
@@ -109,7 +243,7 @@ Index: sope-mime/NGImap4/NGImap4ResponseParser.m
    return address;
  }
  
-@@ -1620,13 +1643,35 @@
+@@ -1620,13 +1647,35 @@
    return str;
  }
  
@@ -146,7 +280,7 @@ Index: sope-mime/NGImap4/NGImap4ResponseParser.m
  static NSDictionary *_parseBodyParameterList(NGImap4ResponseParser *self)
  {
    NSMutableDictionary *list;
-@@ -1646,7 +1691,7 @@
+@@ -1646,7 +1695,7 @@
        _consumeIfMatch(self, ' ');
        value = _parseBodyDecodeString(self, YES, YES);
  
@@ -155,7 +289,7 @@ Index: sope-mime/NGImap4/NGImap4ResponseParser.m
      }
      _consumeIfMatch(self, ')');
    }
-@@ -1734,10 +1779,11 @@
+@@ -1734,10 +1783,11 @@
                      *encoding, *bodysize;
    NSDictionary        *parameterList;
    NSMutableDictionary *dict;
@@ -168,7 +302,7 @@ Index: sope-mime/NGImap4/NGImap4ResponseParser.m
    _consumeIfMatch(self, ' ');
    parameterList = _parseBodyParameterList(self);
    _consumeIfMatch(self, ' ');
-@@ -1762,7 +1808,8 @@
+@@ -1762,7 +1812,8 @@
      _consumeIfMatch(self, ' ');
      [dict setObject:_parseBodyString(self, YES) forKey:@"lines"];
    }
@@ -178,7 +312,7 @@ Index: sope-mime/NGImap4/NGImap4ResponseParser.m
      if (_la(self, 0) != ')') {
        _consumeIfMatch(self, ' ');
        _consumeIfMatch(self, '(');
-@@ -1805,14 +1852,9 @@
+@@ -1805,14 +1856,9 @@
              forKey: @"disposition"];
        if (_la(self, 0) != ')') {
          _consume(self,1);
@@ -196,7 +330,7 @@ Index: sope-mime/NGImap4/NGImap4ResponseParser.m
          if (_la(self, 0) != ')') {
            _consume(self,1);
            [dict setObject: _parseBodyString(self, YES)
-@@ -1829,6 +1871,7 @@
+@@ -1829,6 +1875,7 @@
  static NSDictionary *_parseMultipartBody(NGImap4ResponseParser *self,
                                         BOOL isBodyStructure) {
    NSMutableArray *parts;
@@ -204,7 +338,7 @@ Index: sope-mime/NGImap4/NGImap4ResponseParser.m
    NSString       *kind;
    NSMutableDictionary *dict;
  
-@@ -1854,14 +1897,9 @@
+@@ -1854,14 +1901,9 @@
              forKey: @"disposition"];
        if (_la(self, 0) != ')') {
          _consume(self,1);
@@ -222,7 +356,7 @@ Index: sope-mime/NGImap4/NGImap4ResponseParser.m
          if (_la(self, 0) != ')') {
            _consume(self,1);
            [dict setObject: _parseBodyString(self, YES)
-@@ -2170,6 +2208,21 @@
+@@ -2170,6 +2212,21 @@
    }
  }
  
@@ -246,7 +380,7 @@ Index: sope-mime/NGImap4/NGImap4ResponseParser.m
  {
 Index: sope-mime/NGMail/NGSmtpClient.m
 ===================================================================
---- sope-mime/NGMail/NGSmtpClient.m    (révision 1583)
+--- sope-mime/NGMail/NGSmtpClient.m    (révision 1593)
 +++ sope-mime/NGMail/NGSmtpClient.m    (copie de travail)
 @@ -24,6 +24,82 @@
  #include "NGSmtpReplyCodes.h"
@@ -402,7 +536,7 @@ Index: sope-mime/NGMail/NGSmtpClient.m
      reply = [self receiveReply];
 Index: sope-mime/NGMail/NGMimeMessageGenerator.m
 ===================================================================
---- sope-mime/NGMail/NGMimeMessageGenerator.m  (révision 1583)
+--- sope-mime/NGMail/NGMimeMessageGenerator.m  (révision 1593)
 +++ sope-mime/NGMail/NGMimeMessageGenerator.m  (copie de travail)
 @@ -86,37 +86,40 @@
    char         *des    = NULL;
@@ -468,7 +602,7 @@ Index: sope-mime/NGMail/NGMimeMessageGenerator.m
      unsigned    isoEndLen = 2;
 Index: sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m
 ===================================================================
---- sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m       (révision 1583)
+--- sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m       (révision 1593)
 +++ sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m       (copie de travail)
 @@ -19,88 +19,45 @@
    02111-1307, USA.
@@ -863,20 +997,19 @@ Index: sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m
  #if 0  
 Index: sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m
 ===================================================================
---- sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m   (révision 1583)
+--- sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m   (révision 1593)
 +++ sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m   (copie de travail)
-@@ -70,6 +70,8 @@
-     [rfc822Set setGenerator:gen forField:Fields->cc];
+@@ -77,6 +77,7 @@
      [rfc822Set setGenerator:gen forField:@"bcc"];
      [rfc822Set setGenerator:gen forField:Fields->from];
-+    [rfc822Set setGenerator:gen forField:@"reply-to"];
+     [rfc822Set setGenerator:gen forField:@"reply-to"];
 +    [rfc822Set setGenerator:gen forField:@"in-reply-to"];
+     [rfc822Set setGenerator:gen forField:@"Disposition-Notification-To"];
    }
    
-   if ((gen = [NGMimeStringHeaderFieldGenerator headerFieldGenerator]))
 Index: sope-mime/NGMime/NGMimeBodyPart.m
 ===================================================================
---- sope-mime/NGMime/NGMimeBodyPart.m  (révision 1583)
+--- sope-mime/NGMime/NGMimeBodyPart.m  (révision 1593)
 +++ sope-mime/NGMime/NGMimeBodyPart.m  (copie de travail)
 @@ -31,18 +31,6 @@
    return 2;
@@ -914,7 +1047,7 @@ Index: sope-mime/NGMime/NGMimeBodyPart.m
  - (NSString *)contentId {
 Index: sope-mime/NGMime/GNUmakefile.preamble
 ===================================================================
---- sope-mime/NGMime/GNUmakefile.preamble      (révision 1583)
+--- sope-mime/NGMime/GNUmakefile.preamble      (révision 1593)
 +++ sope-mime/NGMime/GNUmakefile.preamble      (copie de travail)
 @@ -5,6 +5,11 @@
        -DLIBRARY_MINOR_VERSION=${MINOR_VERSION} \
@@ -930,7 +1063,7 @@ Index: sope-mime/NGMime/GNUmakefile.preamble
        -I../../sope-core/NGStreams/    \
 Index: sope-mime/NGMime/NGMimeBodyParser.m
 ===================================================================
---- sope-mime/NGMime/NGMimeBodyParser.m        (révision 1583)
+--- sope-mime/NGMime/NGMimeBodyParser.m        (révision 1593)
 +++ sope-mime/NGMime/NGMimeBodyParser.m        (copie de travail)
 @@ -67,7 +67,10 @@
    if (_data == nil) return nil;
@@ -946,7 +1079,7 @@ Index: sope-mime/NGMime/NGMimeBodyParser.m
    
 Index: sope-mime/NGMime/NGMimePartParser.h
 ===================================================================
---- sope-mime/NGMime/NGMimePartParser.h        (révision 1583)
+--- sope-mime/NGMime/NGMimePartParser.h        (révision 1593)
 +++ sope-mime/NGMime/NGMimePartParser.h        (copie de travail)
 @@ -117,6 +117,7 @@
      BOOL parserParseRawBodyDataOfPart:1;
@@ -968,7 +1101,7 @@ Index: sope-mime/NGMime/NGMimePartParser.h
  @interface NSObject(NGMimePartParser)
 Index: sope-mime/NGMime/NGMimePartParser.m
 ===================================================================
---- sope-mime/NGMime/NGMimePartParser.m        (révision 1583)
+--- sope-mime/NGMime/NGMimePartParser.m        (révision 1593)
 +++ sope-mime/NGMime/NGMimePartParser.m        (copie de travail)
 @@ -227,7 +227,7 @@
  }
@@ -993,12 +1126,12 @@ Index: sope-mime/NGMime/NGMimePartParser.m
      : [NGMimeType mimeType:[ctype stringValue]];
 Index: sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m
 ===================================================================
---- sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m       (révision 1583)
+--- sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m       (révision 1593)
 +++ sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m       (copie de travail)
-@@ -122,8 +122,13 @@
-     }
+@@ -130,8 +130,13 @@
      
      if (doEnc) {
+       /* FIXME - better use UTF8 encoding! */
 +#if NeXT_Foundation_LIBRARY
        unsigned char iso[]     = "=?iso-8859-15?q?";
        unsigned      isoLen    = 16;
@@ -1009,7 +1142,7 @@ Index: sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m
        unsigned char isoEnd[]  = "?=";
        unsigned      isoEndLen = 2;
        unsigned      desLen;
-@@ -133,10 +138,10 @@
+@@ -141,10 +146,10 @@
        {
          NSData *data;
  
@@ -1024,7 +1157,7 @@ Index: sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m
          bufLen  = [data length];
 Index: sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m
 ===================================================================
---- sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m    (révision 1583)
+--- sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m    (révision 1593)
 +++ sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m    (copie de travail)
 @@ -49,80 +49,70 @@
    
@@ -1158,139 +1291,9 @@ Index: sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m
    }
    return data;
  }
-Index: sope-gdl1/PostgreSQL/PostgreSQL72Channel.m
-===================================================================
---- sope-gdl1/PostgreSQL/PostgreSQL72Channel.m (révision 1583)
-+++ sope-gdl1/PostgreSQL/PostgreSQL72Channel.m (copie de travail)
-@@ -713,6 +713,39 @@
-   return ms;
- }
- 
-+/* GCSEOAdaptorChannel protocol */
-+static NSString *sqlFolderFormat = (@"CREATE TABLE %@ (\n"    \
-+                                  @"  c_name VARCHAR (256) NOT NULL,\n"
-+                                  @"  c_content VARCHAR (100000) NOT NULL,\n"
-+                                  @"  c_creationdate INT4 NOT NULL,\n"
-+                                  @"  c_lastmodified INT4 NOT NULL,\n"
-+                                  @"  c_version INT4 NOT NULL,\n"
-+                                  @"  c_deleted INT4 NULL\n"
-+                                  @")");
-+static NSString *sqlFolderACLFormat = (@"CREATE TABLE %@ (\n" \
-+                                     @"  c_uid VARCHAR (256) NOT NULL,\n"
-+                                     @"  c_object VARCHAR (256) NOT NULL,\n"
-+                                     @"  c_role VARCHAR (80) NOT NULL\n"
-+                                     @")");
-+
-+- (NSException *) createGCSFolderTableWithName: (NSString *) tableName
-+{
-+  NSString *sql;
-+
-+  sql = [NSString stringWithFormat: sqlFolderFormat, tableName];
-+
-+  return [self evaluateExpressionX: sql];
-+}
-+
-+- (NSException *) createGCSFolderACLTableWithName: (NSString *) tableName
-+{
-+  NSString *sql;
-+
-+  sql = [NSString stringWithFormat: sqlFolderACLFormat, tableName];
-+
-+  return [self evaluateExpressionX: sql];
-+}
-+
- @end /* PostgreSQL72Channel */
- 
- @implementation PostgreSQL72Channel(PrimaryKeyGeneration)
-Index: sope-gdl1/Oracle8/OracleAdaptorChannel.m
-===================================================================
---- sope-gdl1/Oracle8/OracleAdaptorChannel.m   (révision 1583)
-+++ sope-gdl1/Oracle8/OracleAdaptorChannel.m   (copie de travail)
-@@ -30,6 +30,7 @@
- 
- #import <NGExtensions/NSObject+Logs.h>
- 
-+static BOOL debugOn = NO;
- //
- //
- //
-@@ -41,10 +42,19 @@
- 
- @implementation OracleAdaptorChannel (Private)
- 
---  (void) _cleanup
-++ (void) initialize
- {
-+  NSUserDefaults *ud;
-+
-+  ud = [NSUserDefaults standardUserDefaults];
-+  debugOn = [ud boolForKey: @"OracleAdaptorDebug"];
-+}
-+
-+- (void) _cleanup
-+{
-   column_info *info;
-   int c;
-+  sword result;
- 
-   [_resultSetProperties removeAllObjects];
- 
-@@ -58,11 +68,29 @@
-       // so we just free the value instead.
-       if (info->value)
-       {
--        if (OCIDescriptorFree((dvoid *)info->value, (ub4)OCI_DTYPE_LOB) != OCI_SUCCESS)
-+        if (info->type == SQLT_CLOB
-+            || info->type == SQLT_BLOB
-+            || info->type == SQLT_BFILEE
-+            || info->type == SQLT_CFILEE)
-+          {
-+            result = OCIDescriptorFree((dvoid *)info->value, (ub4) OCI_DTYPE_LOB);
-+            if (result != OCI_SUCCESS)
-+              {
-+                NSLog (@"value was not a LOB descriptor");
-+                abort();
-+              }
-+          }
-+        else
-           free(info->value);
-         info->value = NULL;
-       }
--       free(info);
-+      else
-+      {
-+        NSLog (@"trying to free an already freed value!");
-+        abort();
-+      }
-+      free(info);
-+
-       [_row_buffer removeObjectAtIndex: c];
-     }
- 
-@@ -231,6 +259,9 @@
- 
-   [self _cleanup];
- 
-+  if (debugOn)
-+    [self logWithFormat: @"expression: %@", theExpression];
-+
-   if (!theExpression || ![theExpression length])
-     {
-       [NSException raise: @"OracleInvalidExpressionException"
-@@ -302,7 +333,9 @@
-       // We read the maximum width of a column
-       info->max_width = 0;
-       status = OCIAttrGet((dvoid*)param, (ub4)OCI_DTYPE_PARAM, (dvoid*)&(info->max_width), (ub4 *)0, (ub4)OCI_ATTR_DATA_SIZE, (OCIError *)_oci_err);
--      
-+
-+      if (debugOn)
-+      NSLog(@"name: %s, type: %d", cname, info->type);
-       attribute = [EOAttribute attributeWithOracleType: info->type  name: cname  length: clen  width: info->max_width];
-       [_resultSetProperties addObject: attribute];
- 
 Index: sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m
 ===================================================================
---- sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m   (révision 1583)
+--- sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m   (révision 1593)
 +++ sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m   (copie de travail)
 @@ -140,8 +140,12 @@
  
@@ -1333,7 +1336,7 @@ Index: sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m
  static char *iconv_wrapper(id self, char *_src, unsigned _srcLen,
 Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h
 ===================================================================
---- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h     (révision 1583)
+--- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h     (révision 1593)
 +++ sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h     (copie de travail)
 @@ -19,6 +19,8 @@
    02111-1307, USA.
@@ -1355,7 +1358,7 @@ Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h
    id<NSObject,SaxEntityResolver> entityResolver;
 Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m
 ===================================================================
---- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m     (révision 1583)
+--- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m     (révision 1593)
 +++ sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m     (copie de travail)
 @@ -30,6 +30,12 @@
  #include <libxml/HTMLparser.h>
@@ -1415,7 +1418,7 @@ Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m
  - (void)tearDownParser {
 Index: sope-appserver/mod_ngobjweb/config.c
 ===================================================================
---- sope-appserver/mod_ngobjweb/config.c       (révision 1583)
+--- sope-appserver/mod_ngobjweb/config.c       (révision 1593)
 +++ sope-appserver/mod_ngobjweb/config.c       (copie de travail)
 @@ -21,7 +21,7 @@
  
@@ -1428,7 +1431,7 @@ Index: sope-appserver/mod_ngobjweb/config.c
    if (buf == NULL)
 Index: sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c
 ===================================================================
---- sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c (révision 1583)
+--- sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c (révision 1593)
 +++ sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c (copie de travail)
 @@ -23,6 +23,7 @@
  #include <unistd.h>
@@ -1440,7 +1443,7 @@ Index: sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c
  // returns the number of bytes which where read from the buffer
 Index: sope-appserver/mod_ngobjweb/GNUmakefile
 ===================================================================
---- sope-appserver/mod_ngobjweb/GNUmakefile    (révision 1583)
+--- sope-appserver/mod_ngobjweb/GNUmakefile    (révision 1593)
 +++ sope-appserver/mod_ngobjweb/GNUmakefile    (copie de travail)
 @@ -81,7 +81,7 @@
  
@@ -1453,7 +1456,7 @@ Index: sope-appserver/mod_ngobjweb/GNUmakefile
  
 Index: sope-appserver/mod_ngobjweb/handler.c
 ===================================================================
---- sope-appserver/mod_ngobjweb/handler.c      (révision 1583)
+--- sope-appserver/mod_ngobjweb/handler.c      (révision 1593)
 +++ sope-appserver/mod_ngobjweb/handler.c      (copie de travail)
 @@ -267,7 +267,7 @@
    const char           *uri;
@@ -1581,7 +1584,7 @@ Index: sope-appserver/mod_ngobjweb/handler.c
  static void test(void) {
 Index: sope-appserver/NGObjWeb/GNUmakefile.postamble
 ===================================================================
---- sope-appserver/NGObjWeb/GNUmakefile.postamble      (révision 1583)
+--- sope-appserver/NGObjWeb/GNUmakefile.postamble      (révision 1593)
 +++ sope-appserver/NGObjWeb/GNUmakefile.postamble      (copie de travail)
 @@ -23,14 +23,20 @@
  
@@ -1610,7 +1613,7 @@ Index: sope-appserver/NGObjWeb/GNUmakefile.postamble
 -endif
 Index: sope-appserver/NGObjWeb/WOContext.m
 ===================================================================
---- sope-appserver/NGObjWeb/WOContext.m        (révision 1583)
+--- sope-appserver/NGObjWeb/WOContext.m        (révision 1593)
 +++ sope-appserver/NGObjWeb/WOContext.m        (copie de travail)
 @@ -64,11 +64,13 @@
  static BOOL     testNSURLs           = NO;
@@ -1650,7 +1653,7 @@ Index: sope-appserver/NGObjWeb/WOContext.m
        serverURL = [@"http://" stringByAppendingString:host];
 Index: sope-appserver/NGObjWeb/DAVPropMap.plist
 ===================================================================
---- sope-appserver/NGObjWeb/DAVPropMap.plist   (révision 1583)
+--- sope-appserver/NGObjWeb/DAVPropMap.plist   (révision 1593)
 +++ sope-appserver/NGObjWeb/DAVPropMap.plist   (copie de travail)
 @@ -123,11 +123,14 @@
  
@@ -1669,9 +1672,21 @@ Index: sope-appserver/NGObjWeb/DAVPropMap.plist
      davNotificationsURL;
    "{com.apple.ical:}calendarcolor" = davCalendarColor;
  }
+Index: sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m
+===================================================================
+--- sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m     (révision 1593)
++++ sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m     (copie de travail)
+@@ -655,6 +655,7 @@
+       if (self->responses == nil)
+       self->responses = [[NSMutableArray alloc] initWithCapacity:64];
+     }
++
+     break;
+ 
+   case 'n':
 Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m
 ===================================================================
---- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m  (révision 1583)
+--- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m  (révision 1593)
 +++ sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m  (copie de travail)
 @@ -216,6 +216,12 @@
        assocCount++;
@@ -1688,7 +1703,7 @@ Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m
    
 Index: sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m
 ===================================================================
---- sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m      (révision 1583)
+--- sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m      (révision 1593)
 +++ sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m      (copie de travail)
 @@ -40,6 +40,7 @@
    WOAssociation *string;
@@ -1718,7 +1733,7 @@ Index: sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m
      return YES;
 Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h
 ===================================================================
---- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h  (révision 1583)
+--- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h  (révision 1593)
 +++ sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h  (copie de travail)
 @@ -41,7 +41,8 @@
    WOAssociation *pageName;
@@ -1732,7 +1747,7 @@ Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h
    /* 'ivar' associations */
 Index: sope-appserver/NGObjWeb/SoObjects/SoObject.m
 ===================================================================
---- sope-appserver/NGObjWeb/SoObjects/SoObject.m       (révision 1583)
+--- sope-appserver/NGObjWeb/SoObjects/SoObject.m       (révision 1593)
 +++ sope-appserver/NGObjWeb/SoObjects/SoObject.m       (copie de travail)
 @@ -39,22 +39,34 @@
  static int debugLookup  = -1;
@@ -1883,7 +1898,7 @@ Index: sope-appserver/NGObjWeb/SoObjects/SoObject.m
    
 Index: sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m
 ===================================================================
---- sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m  (révision 1583)
+--- sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m  (révision 1593)
 +++ sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m  (copie de travail)
 @@ -31,6 +31,7 @@
  #include <NGObjWeb/WOCookie.h>

diff --git a/SoObjects/SOGo/SOGoGCSFolder.m b/SoObjects/SOGo/SOGoGCSFolder.m
index b1f0e6df4c44d33365e83fe852f1793afd43ef66..7b87323971a13094ef00537e7c58ae4c63abfb9f 100644 (file)
--- a/SoObjects/SOGo/SOGoGCSFolder.m
+++ b/SoObjects/SOGo/SOGoGCSFolder.m
@@ -503,6 +503,19 @@ static BOOL sendFolderAdvisories = NO;
   return [self _subscribe: NO inContext: localContext];
 }
 
+- (NSException *) davSetProperties: (NSDictionary *) setProps
+            removePropertiesNamed: (NSDictionary *) removedProps
+                        inContext: (WOContext *) localContext
+{
+  NSString *newDisplayName;
+
+  newDisplayName = [setProps objectForKey: @"davDisplayName"];
+  if ([newDisplayName length])
+    [self renameTo: newDisplayName];
+
+  return nil;
+}
+
 /* acls as a container */
 
 - (NSArray *) aclUsersForObjectAtPath: (NSArray *) objectPathArray;

diff --git a/SoObjects/SOGo/SOGoParentFolder.m b/SoObjects/SOGo/SOGoParentFolder.m
index fb27adcb3bc87df0dc069ecbb99c960eab16c70e..c7291168a33b4fe7bb40aafaceff9a1addc4eba9 100644 (file)
--- a/SoObjects/SOGo/SOGoParentFolder.m
+++ b/SoObjects/SOGo/SOGoParentFolder.m
@@ -314,4 +314,11 @@ static SoSecurityManager *sm = nil;
           sortedArrayUsingSelector: @selector (compare:)];
 }
 
+- (NSException *) davCreateCollection: (NSString *) pathInfo
+                           inContext: (WOContext *) localContext
+{
+  return [self newFolderWithName: pathInfo
+              andNameInContainer: pathInfo];
+}
+
 @end

diff --git a/UI/Common/UIxPageFrame.m b/UI/Common/UIxPageFrame.m
index 54b70d5d7801ef4be9a34bf602dbf0f4d757aed4..72397542073103c6d3cb754481a5de714a46b796 100644 (file)
--- a/UI/Common/UIxPageFrame.m
+++ b/UI/Common/UIxPageFrame.m
@@ -93,7 +93,7 @@
 
 - (NSString *) doctype
 {
-  return (@"<?xml version=\"1.0\"?>\n"
+  return (@"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
           @"<!DOCTYPE html"
           @" PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\""
           @" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">");

diff --git a/UI/Templates/MainUI/SOGoRootPage.wox b/UI/Templates/MainUI/SOGoRootPage.wox
index 3eaf672a3a66be43a9557b2ea8c88d7626d40a3f..00590eac3db9d442f915eb96a9e2e781bfbaef70 100644 (file)
--- a/UI/Templates/MainUI/SOGoRootPage.wox
+++ b/UI/Templates/MainUI/SOGoRootPage.wox
@@ -10,7 +10,7 @@
   ><var:string var:value="doctype" const:escapeHTML="NO"/>
   <form id="connectForm" var:href="connectURL">
     <div id="loginScreen">
-      <img id="splash" rsrc:src="lori-login.jpg"/><br/><br/>
+      <img const:alt="*" id="splash" rsrc:src="lori-login.jpg"/><br/><br/>
       <var:if condition="shortUserNameForDisplay" const:value="wrongusernamepassword"
       ><p class="error"><var:string label:value="Wrong username or password."/></p>
       </var:if><label><var:string label:value="Username:"/><br/>
@@ -24,5 +24,5 @@
       </div>
     </div>
   </form
-  ><img id="preparedAnimation" rsrc:src="busy.gif"/>
+  ><img const:alt="*" id="preparedAnimation" rsrc:src="busy.gif"/>
 </var:component>

diff --git a/UI/Templates/UIxPageFrame.wox b/UI/Templates/UIxPageFrame.wox
index 7aefda2c97c7d6f0608c72a38bd209d22a01c72f..073110b73d5d1158b7587c23a5a750c33bd668f7 100644 (file)
--- a/UI/Templates/UIxPageFrame.wox
+++ b/UI/Templates/UIxPageFrame.wox
@@ -2,13 +2,15 @@
 <!DOCTYPE container>
 <container 
   xmlns="http://www.w3.org/1999/xhtml"
+  xmlns:xml="http://www.w3.org/XML/1998/namespace"
   xmlns:var="http://www.skyrix.com/od/binding"
   xmlns:const="http://www.skyrix.com/od/constant"
   xmlns:rsrc="OGo:url"
   xmlns:label="OGo:label"
   ><var:string var:value="doctype" const:escapeHTML="NO" />
   <var:if condition="hideFrame" const:negate="YES"
-    ><html>
+    ><html const:xmlns="http://www.w3.org/1999/xhtml"
+      xml:lang="en" const:lang="en">
       <head>
        <title>
          <var:string value="title"/>
@@ -141,17 +143,17 @@
         </var:if>
         <var:if condition="isCompatibleBrowser" const:negate="YES">
          <div id="loginScreen">
-           <img id="splash" rsrc:src="lori-login.jpg"/><br/><br/>
+           <img const:alt="*" id="splash" rsrc:src="lori-login.jpg"/><br/><br/>
            <p><var:string label:value="browserNotCompatible"/></p>
-           <p class="browser"><a href="http://www.getfirefox.com/"><img rsrc:src="browser_firefox.gif"/><var:string label:value="Download"/> Firefox</a></p>
+           <p class="browser"><a href="http://www.getfirefox.com/"><img const:alt="*" rsrc:src="browser_firefox.gif"/><var:string label:value="Download"/> Firefox</a></p>
            <var:if condition="isIE7Compatible">
              <p><var:string label:value="alternativeBrowsers"/></p>
-             <p class="browser"><a href="http://www.microsoft.com/ie/download/"><img rsrc:src="browser_ie.gif"/><var:string label:value="Download"/> Internet Explorer 7</a></p>
-             <p class="browser"><a href="http://www.apple.com/safari/download/"><img rsrc:src="browser_safari.gif"/><var:string label:value="Download"/> Safari 3</a></p>
+             <p class="browser"><a href="http://www.microsoft.com/ie/download/"><img const:alt="*" rsrc:src="browser_ie.gif"/><var:string label:value="Download"/> Internet Explorer 7</a></p>
+             <p class="browser"><a href="http://www.apple.com/safari/download/"><img const:alt="*" rsrc:src="browser_safari.gif"/><var:string label:value="Download"/> Safari 3</a></p>
            </var:if>
            <var:if condition="isMac">
              <p><var:string label:value="alternativeBrowserSafari"/></p>
-             <p class="browser"><a href="http://www.apple.com/safari/download/"><img rsrc:src="browser_safari.gif"/><var:string label:value="Download"/> Safari 3</a></p>
+             <p class="browser"><a href="http://www.apple.com/safari/download/"><img const:alt="*" rsrc:src="browser_safari.gif"/><var:string label:value="Download"/> Safari 3</a></p>
            </var:if>
          </div>
        </var:if>

diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index f93362544079fd269cede1ae2f4d3c22522f1772..9604045a41cd6f4852ca1dc77ec17b7c00393264 100644 (file)
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -735,6 +735,8 @@ function onMessageSelectionChange() {
       loadMessage(idx);
     }
   }
+  else if (rows.length > 1)
+    $('messageContent').update();
 }
 
 function loadMessage(idx) {

diff --git a/UI/WebServerResources/UIxMailEditor.js b/UI/WebServerResources/UIxMailEditor.js
index e1eb173d9f479b07e4080fd0cd6517d22254a896..fbcf30a1c9222b6e15a232a1aa6eecd8ca083c16 100644 (file)
--- a/UI/WebServerResources/UIxMailEditor.js
+++ b/UI/WebServerResources/UIxMailEditor.js
@@ -271,6 +271,18 @@ function onTextFirstFocus() {
   Event.stopObserving(this, "focus", onTextFirstFocus);
 }
 
+function onTextContextMenu(event) {
+  log("coucou");
+  event.returnValue = true;
+  event.cancelBubble = true;
+}
+
+function onTextMouseDown(event) {
+  log("coucou 1");
+  event.returnValue = false;
+  event.cancelBubble = false;
+}
+
 function initMailEditor() {
   var list = $("attachments");
   $(list).attachMenu("attachmentsMenu");
@@ -295,6 +307,8 @@ function initMailEditor() {
   textarea.scrollTop = textarea.scrollHeight;
   textarea.observe("focus", onTextFirstFocus);
   textarea.observe("focus", onTextFocus);
+  textarea.observe("contextmenu", onTextContextMenu);
+  textarea.observe("mousedown", onTextMouseDown);
 
   onWindowResize(null);
   Event.observe(window, "resize", onWindowResize);