LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Monotone-Parent: 3e221864601a9820fef140de7c772be29079ed48 

Monotone-Revision: 87549a04ea4f0186bec4f2810f59f6075fa464b2

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-05-02T23:14:51
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2008-05-02 23:14:51 +00:00
parent 9fbc828c10
commit 212f438551
13 changed files with 56 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
SoObjects/Appointments/GNUmakefile
View File

@ -6,6 +6,7 @@ WOBUNDLE_NAME = Appointments
Appointments_PRINCIPAL_CLASS = SOGoAppointmentsProduct
# SOGoGroupAppointmentFolder.m
Appointments_OBJC_FILES = \
Product.m \
NSArray+Appointments.m \
@ -19,8 +20,8 @@ Appointments_OBJC_FILES = \
SOGoTaskObject.m \
SOGoAppointmentFolder.m \
SOGoAppointmentFolders.m \
SOGoGroupAppointmentFolder.m \
SOGoFreeBusyObject.m \
SOGoUserFolder+Appointments.m \
\
SOGoAptMailNotification.m \
SOGoAptMailInvitation.m \

6
SoObjects/Appointments/product.plist
View File

@ -30,9 +30,9 @@
"RespondToConfidentialRecords" = ( "Owner", "ConfidentialModifier", "ConfidentialResponder" );
};
};
SOGoGroupAppointmentFolder = {
superclass = "SOGoAppointmentFolder";
};
// SOGoGroupAppointmentFolder = {
// superclass = "SOGoAppointmentFolder";
// };
SOGoCalendarComponent = {
superclass = "SOGoContentObject";
defaultRoles = {

2
SoObjects/Mailer/product.plist
View File

@ -43,7 +43,7 @@
"Delete Objects" = ( "Owner", "ObjectEraser" );
"WebDAV Access" = ( "Owner", "ObjectViewer" );
"ReadAcls" = ( "Owner", "MailAdministrator" );
"SaveAcls" = ( "Owner", "MailAdministrator" );
"Change Permissions" = ( "Owner", "MailAdministrator" );
};
};
/* SOGoSharedInboxFolder = {

3
SoObjects/SOGo/DAVReportMap.plist
View File

@ -10,6 +10,9 @@
"{urn:ietf:params:xml:ns:carddav}supported-collation-set"
= davSupportedCollectionSet;
/* WebDAV ACL */
"{DAV:}principal-match" = davPrincipalMatch;
/* Inverse DAV */
"{urn:inverse:params:xml:ns:inverse-dav}collection-query"
= davCollectionQuery;

45
SoObjects/SOGo/GNUmakefile
View File

@ -17,6 +17,9 @@ TOOL_NAME = \
SOGo_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
# SOGoCustomGroupFolder.h \
# SOGoGroupsFolder.h \
# SOGoGroupFolder.h
SOGo_HEADER_FILES = \
SOGoCache.h \
SOGoObject.h \
@ -24,28 +27,30 @@ SOGo_HEADER_FILES = \
SOGoFolder.h \
SOGoParentFolder.h \
SOGoUserFolder.h \
SOGoGroupsFolder.h \
SOGoGroupFolder.h \
SOGoCustomGroupFolder.h \
\
LDAPUserManager.h \
LDAPSource.h \
SOGoDateFormatter.h \
SOGoPermissions.h \
SOGoDAVRendererTypes.h \
iCalEntityObject+Utilities.h \
NSArray+DAV.h \
NSArray+Utilities.h \
NSCalendarDate+SOGo.h \
NSDictionary+DAV.h \
NSDictionary+URL.h \
NSDictionary+Utilities.h \
NSObject+Utilities.h \
NSString+Utilities.h \
NSNumber+Utilities.h \
NSNull+Utilities.h \
NSDictionary+URL.h \
NSCalendarDate+SOGo.h \
NSNumber+Utilities.h \
NSObject+DAV.h \
NSObject+Utilities.h \
NSString+DAV.h \
NSString+Utilities.h \
NSURL+DAV.h \
\
SOGoDAVAuthenticator.h \
SOGoWebAuthenticator.h \
SOGoWebDAVAclManager.h \
SOGoWebDAVValue.h \
SOGoMailer.h \
SOGoUser.h \
\
@ -54,6 +59,9 @@ SOGo_HEADER_FILES = \
\
WORequest+SOGo.h
# SOGoCustomGroupFolder.m \
# SOGoGroupsFolder.m \
# SOGoGroupFolder.m
SOGo_OBJC_FILES = \
SOGoCache.m \
SOGoObject.m \
@ -62,28 +70,31 @@ SOGo_OBJC_FILES = \
SOGoGCSFolder.m \
SOGoParentFolder.m \
SOGoUserFolder.m \
SOGoGroupsFolder.m \
SOGoGroupFolder.m \
SOGoCustomGroupFolder.m \
\
SOGoDateFormatter.m \
SOGoPermissions.m \
LDAPUserManager.m \
LDAPSource.m \
SOGoDAVRendererTypes.m \
AgenorUserDefaults.m \
iCalEntityObject+Utilities.m \
NSArray+DAV.m \
NSArray+Utilities.m \
NSCalendarDate+SOGo.m \
NSDictionary+DAV.m \
NSDictionary+URL.m \
NSDictionary+Utilities.m \
NSObject+Utilities.m \
NSString+Utilities.m \
NSNumber+Utilities.m \
NSNull+Utilities.m \
NSCalendarDate+SOGo.m \
NSNumber+Utilities.m \
NSObject+DAV.m \
NSObject+Utilities.m \
NSString+DAV.m \
NSString+Utilities.m \
NSURL+DAV.m \
\
SOGoDAVAuthenticator.m \
SOGoWebAuthenticator.m \
SOGoWebDAVAclManager.m \
SOGoWebDAVValue.m \
SOGoMailer.m \
SOGoUser.m \
\

2
SoObjects/SOGo/GNUmakefile.preamble
View File

@ -3,6 +3,8 @@
SOGo_INCLUDE_DIRS += -I.. -I../.. -DSOGO_MAJOR_VERSION="\"$(MAJOR_VERSION)\"" -DSOGO_MINOR_VERSION="\"$(MINOR_VERSION)\""
SOGo_LIBRARIES_DEPEND_UPON += \
-L../../OGoContentStore/$(GNUSTEP_OBJ_DIR)/ \
-L../../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)/ \
-lOGoContentStore \
-lGDLAccess \
-lNGObjWeb \

2
SoObjects/common.make
View File

@ -18,7 +18,7 @@ ADDITIONAL_INCLUDE_DIRS += \
-I../../SOPE
ADDITIONAL_LIB_DIRS += \
-L../SOGo/$(GNUSTEP_OBJ_DIR)/ \
-L../SOGo/SOGo.framework/ \
-L../../SOGo/$(GNUSTEP_OBJ_DIR)/ \
-L../../OGoContentStore/$(GNUSTEP_OBJ_DIR)/ \
-L../../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)/ \

2
UI/Common/UIxAclEditor.m
View File

@ -193,7 +193,7 @@
mgr = [SoSecurityManager sharedSecurityManager];
return (![mgr validatePermission: SOGoPerm_SaveAcls
return (![mgr validatePermission: SoPerm_ChangePermissions
onObject: [self clientObject]
inContext: context]);
}

14
UI/Common/product.plist
View File

@ -31,12 +31,12 @@
SOGoObject = {
methods = {
addUserInAcls = {
protectedBy = "SaveAcls";
protectedBy = "Change Permissions";
actionClass = "UIxObjectActions";
actionName = "addUserInAcls";
};
removeUserFromAcls = {
protectedBy = "SaveAcls";
protectedBy = "Change Permissions";
actionClass = "UIxObjectActions";
actionName = "removeUserFromAcls";
};
@ -45,7 +45,7 @@
pageName = "UIxAclEditor";
};
saveAcls = {
protectedBy = "SaveAcls";
protectedBy = "Change Permissions";
pageName = "UIxAclEditor";
actionName = "saveAcls";
};
@ -54,7 +54,7 @@
pageName = "UIxUserRightsEditor";
};
saveUserRights = {
protectedBy = "SaveAcls";
protectedBy = "Change Permissions";
pageName = "UIxUserRightsEditor";
actionName = "saveUserRights";
};
@ -63,7 +63,7 @@
SOGoParentFolder = {
methods = {
createFolder = {
protectedBy = "View";
protectedBy = "SoPerm_AddFolders";
actionClass = "UIxParentFolderActions";
actionName = "createFolder";
};
@ -97,12 +97,12 @@
actionName = "deactivateFolder";
};
deleteFolder = {
protectedBy = "SaveAcls"; /* a hack to force "owner" */
protectedBy = "Delete Objects";
actionClass = "UIxFolderActions";
actionName = "deleteFolder";
};
renameFolder = {
protectedBy = "SaveAcls";
protectedBy = "Change Permissions";
actionClass = "UIxFolderActions";
actionName = "renameFolder";
};

4
UI/Contacts/product.plist
View File

@ -37,7 +37,7 @@
pageName = "UIxAclEditor";
};
saveAcls = {
protectedBy = "SaveAcls";
protectedBy = "Change Permissions";
pageName = "UIxAclEditor";
actionName = "saveAcls";
};
@ -92,7 +92,7 @@
pageName = "UIxContactsUserRightsEditor";
};
saveUserRights = {
protectedBy = "SaveAcls";
protectedBy = "Change Permissions";
pageName = "UIxContactsUserRightsEditor";
actionName = "saveUserRights";
};

2
UI/MailerUI/product.plist
View File

@ -160,7 +160,7 @@
pageName = "UIxMailUserRightsEditor";
};
saveUserRights = {
protectedBy = "SaveAcls";
protectedBy = "Change Permissions";
pageName = "UIxMailUserRightsEditor";
actionName = "saveUserRights";
};

6
UI/Scheduler/product.plist
View File

@ -1,4 +1,4 @@
{ /* -*-javascript-*- */
{ /* -*-java-*- */
requires = ( MAIN, MainUI, CommonUI, Appointments, Contacts, ContactsUI );
publicResources = (
@ -99,7 +99,7 @@
pageName = "UIxCalUserRightsEditor";
};
saveUserRights = {
protectedBy = "SaveAcls";
protectedBy = "Change Permissions";
pageName = "UIxCalUserRightsEditor";
actionName = "saveUserRights";
};
@ -139,7 +139,7 @@
pageName = "UIxCalUserRightsEditor";
};
saveUserRights = {
protectedBy = "SaveAcls";
protectedBy = "Change Permissions";
pageName = "UIxCalUserRightsEditor";
actionName = "saveUserRights";
};

4
UI/common.make
View File

@ -20,13 +20,13 @@ ifeq ($(GNUSTEP_BUILD_DIR),)
ADDITIONAL_LIB_DIRS += \
-L../../SOPE/NGCards/$(GNUSTEP_OBJ_DIR) \
-L../SOGoUI/$(GNUSTEP_OBJ_DIR) \
-L../../SoObjects/SOGo/$(GNUSTEP_OBJ_DIR)
-L../../SoObjects/SOGo/SOGo.framework/
else
RELBUILD_DIR_libNGCards = \
$(GNUSTEP_BUILD_DIR)/../../SOPE/NGCards/$(GNUSTEP_OBJ_DIR_NAME)
RELBUILD_DIR_libSOGo = \
$(GNUSTEP_BUILD_DIR)/../../SoObjects/SOGo/$(GNUSTEP_OBJ_DIR_NAME)
$(GNUSTEP_BUILD_DIR)/../../SoObjects/SOGo/SOGo.framework/
RELBUILD_DIR_libSOGoUI = \
$(GNUSTEP_BUILD_DIR)/../SOGoUI/$(GNUSTEP_OBJ_DIR_NAME)
RELBUILD_DIR_libOGoContentStore = \