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

diff --git a/ChangeLog b/ChangeLog
index 5f811c70f91b83fbf384c2e7690e591cf8ca2df1..711bd8747f54854cc255a84f27c3dbe874fc510a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2007-02-21  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+       * SoObjects/SOGo/SOGoContentObject.m ([SOGoContentObject
+       -rolesOfUser:logininContext:context]): if object does not exists
+       (for example when it's being created), the current user has the
+       same rights on it than he/she has on its parent container.
+
+       * SoObjects/SOGo/SOGoFolder.m ([SOGoFolder
+       -nameExistsInFolder:objectName]): methods that tests if a c_name
+       corresponding to the name passed as parameter is present in the db
+       folder.
+
 2007-02-16  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
        * SoObjects/SOGo/SOGoUser.m ([SOGoUser

diff --git a/SOPE/NGCards/versitCardsSaxDriver/Version b/SOPE/NGCards/versitCardsSaxDriver/Version
index 462cacfe83ccfa3b7fd001c327d9e7c48814f8d2..160d81247656ec54ddfc2b70e92a702891734b56 100644 (file)
--- a/SOPE/NGCards/versitCardsSaxDriver/Version
+++ b/SOPE/NGCards/versitCardsSaxDriver/Version
@@ -2,6 +2,6 @@
 
 # SOPE version:
 MAJOR_VERSION=4
-MINOR_VERSION=5
+MINOR_VERSION=7
 
 SUBMINOR_VERSION:=24

diff --git a/SoObjects/Contacts/product.plist b/SoObjects/Contacts/product.plist
index 9c7b5f82b75e7152d8750ace750c349a1d78cc3e..4ff7a9372c19c616c83c11037768d77ed28c7cb0 100644 (file)
--- a/SoObjects/Contacts/product.plist
+++ b/SoObjects/Contacts/product.plist
@@ -22,18 +22,12 @@
 
     SOGoContactGCSFolder = {
       superclass    = "SOGoFolder";
-      defaultRoles = {
-        "PUT" = ( "Owner", "Delegate" );
-        "Add Documents, Images, and Files" = ( "Owner", "Delegate" );
-      };
     };
 
     SOGoContactGCSEntry = {
       superclass    = "SOGoContentObject";
       defaultRoles = {
         "View" = ( "Owner", "Delegate", "Organizer", "Authenticated" );
-        "PUT" = ( "Owner", "Delegate" );
-        "Add Documents, Images, and Files" = ( "Owner", "Delegate" );
       };
     };
 

diff --git a/SoObjects/SOGo/SOGoObject.m b/SoObjects/SOGo/SOGoObject.m
index a548e523f360bcf33bf590d6acebc45c3d22795a..5e0ba15c44fda26f26e86a834531c1226cbf2850 100644 (file)
--- a/SoObjects/SOGo/SOGoObject.m
+++ b/SoObjects/SOGo/SOGoObject.m
@@ -21,7 +21,9 @@
 
 #import <NGObjWeb/WEClientCapabilities.h>
 #import <NGObjWeb/SoObject+SoDAV.h>
+#import <NGObjWeb/WOContext.h>
 #import <NGObjWeb/WOResponse.h>
+#import <NGObjWeb/WORequest.h>
 #import <NGObjWeb/WOApplication.h>
 #import <NGCards/NSDictionary+NGCards.h>
 

diff --git a/SoObjects/SOGo/SOGoUser.m b/SoObjects/SOGo/SOGoUser.m
index 0c7a3947fbb9d55551cde1be46b7829454e5e88b..d3bb2eaac6552a4ef358b2c8c992b897d14b405d 100644 (file)
--- a/SoObjects/SOGo/SOGoUser.m
+++ b/SoObjects/SOGo/SOGoUser.m
@@ -151,9 +151,13 @@
   NSArray *sogoRoles;
   NSString *role;
 
-  rolesForObject
-    = [NSMutableArray arrayWithArray: [super rolesForObject: object
-                                             inContext: context]];
+  rolesForObject = [NSMutableArray new];
+  [rolesForObject autorelease];
+
+  sogoRoles = [super rolesForObject: object inContext: context];
+  if (sogoRoles)
+    [rolesForObject addObjectsFromArray: sogoRoles];
+
   if ([[object ownerInContext: context] isEqualToString: [self login]])
     [rolesForObject addObject: SoRole_Owner];
   if ([object isKindOfClass: [SOGoObject class]])

diff --git a/UI/Contacts/product.plist b/UI/Contacts/product.plist
index ce080e9e9dde4be83d6c68e211c620565be5e172..a3424d7ba40b810bbf37c30f68bc9c576a0236ff 100644 (file)
--- a/UI/Contacts/product.plist
+++ b/UI/Contacts/product.plist
@@ -111,10 +111,6 @@
               pageName    = "UIxContactsListView";
               actionName = "addressBooksContacts";
            };
-           PUT = {
-              protectedBy = "PUT";
-              actionName = "PUT";
-           };
         };
      };
 
@@ -193,9 +189,6 @@
               pageName    = "UIxContactView";
               actionName  = "vcard";
            };
-           PUT = {
-              protectedBy = "PUT";
-           };
         };
      };
 

diff --git a/UI/MailPartViewers/UIxMailPartHTMLViewer.h b/UI/MailPartViewers/UIxMailPartHTMLViewer.h
new file mode 100644 (file)
index 0000000..edc0143
--- /dev/null
+++ b/UI/MailPartViewers/UIxMailPartHTMLViewer.h
@@ -0,0 +1,34 @@
+/* UIxMailPartHTMLViewer.h - this file is part of SOGo
+ *
+ * Copyright (C) 2007 Inverse groupe conseil
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef UIXMAILPARTHTMLVIEWER_H
+#define UIXMAILPARTHTMLVIEWER_H
+
+#import "UIxMailPartViewer.h"
+
+@interface UIxMailPartHTMLViewer : UIxMailPartViewer
+
+- (NSString *) flatContentAsString;
+
+@end
+
+#endif /* UIXMAILPARTHTMLVIEWER_H */

diff --git a/UI/MailPartViewers/UIxMailPartViewer.m b/UI/MailPartViewers/UIxMailPartViewer.m
index bb988c4031d34a3c36df4c774e3934e7eb0a05b6..9f6285ac50efa91f48e7eaa4011439d5d1d034c1 100644 (file)
--- a/UI/MailPartViewers/UIxMailPartViewer.m
+++ b/UI/MailPartViewers/UIxMailPartViewer.m
@@ -19,12 +19,14 @@
   02111-1307, USA.
 */
 
-#include "UIxMailPartViewer.h"
-#include "UIxMailRenderingContext.h"
-#include "UIxMailSizeFormatter.h"
-#include "../MailerUI/WOContext+UIxMailer.h"
-#include <NGExtensions/NSString+Encoding.h>
-#include "common.h"
+#import <Foundation/NSDictionary.h>
+
+#import "UIxMailPartViewer.h"
+#import "UIxMailRenderingContext.h"
+#import "UIxMailSizeFormatter.h"
+#import "../MailerUI/WOContext+UIxMailer.h"
+#import <NGExtensions/NSString+Encoding.h>
+#import "common.h"
 
 @implementation UIxMailPartViewer
 

diff --git a/UI/MainUI/product.plist b/UI/MainUI/product.plist
index 1a32d592b7a0965e2cd74a791a4a992c49ac255d..0a3857ca7ccbd794ace76544dd98e03b5e2e2dda 100644 (file)
--- a/UI/MainUI/product.plist
+++ b/UI/MainUI/product.plist
@@ -33,7 +33,7 @@
         "View"          = ( "Owner", "Delegate", "Assistant" );
         "WebDAV Access" = ( "Owner", "Delegate", "Assistant" );
         "Access Contents Information" = ( "Owner", "Assistant", "Delegate" );
-        "ReadAcls" = ( "Owner", "Assistant", "Delegate" );
+        "ReadAcls" = ( "Owner", "Delegate", "Assistant" );
         "SaveAcls" = ( "Owner" );
         "Delete Objects" = ( "Owner", "Delegate" );
       };
@@ -67,13 +67,6 @@
     };
     SOGoRootPage = {
     };
-    SOGoFolder = {
-      methods = {
-        PUT = {
-          protectedBy = "Add Documents, Images, and Files";
-        };
-      };
-    };
     SOGoUserFolder = {
       methods = {
         view = {