From 1652ba8c0bb1d02de50348252370fc01487ce41c Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Tue, 18 Aug 2009 17:36:20 +0000 Subject: [PATCH 1/2] Monotone-Parent: 3015b169187acab527747642b2900806a48dbe60 Monotone-Revision: c0ba6ea9411e86e50582cdd4036256776349b556 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2009-08-18T17:36:20 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 8 ++++++++ SoObjects/SOGo/SOGoGCSFolder.m | 6 ++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7b40d8160..0a8396f22 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2009-08-18 Wolfgang Sourdeau + + * SoObjects/SOGo/SOGoGCSFolder.m + (-initializeQuickTablesAclsInContext:): don't give the right to + view everything to users who can delete objects. This may cause + deletion from working from a web method, but everyone who uses + such as configuration will probably use DAV instead. + 2009-08-17 Cyril Robert * UI/Scheduler/UIxCalListingActions.m: Added support for new user default: diff --git a/SoObjects/SOGo/SOGoGCSFolder.m b/SoObjects/SOGo/SOGoGCSFolder.m index edcc5c0fd..b4eec7d26 100644 --- a/SoObjects/SOGo/SOGoGCSFolder.m +++ b/SoObjects/SOGo/SOGoGCSFolder.m @@ -1171,10 +1171,8 @@ static NSArray *childRecordFields = nil; /* we only grant "userCanAccessAllObjects" for role "ObjectEraser" and not "ObjectCreator" because the latter doesn't imply we can read properties from subobjects or even know their existence. */ - userCanAccessAllObjects = ([[self ownerInContext: localContext] - isEqualToString: login] - || [[self aclsForUser: login] - containsObject: SOGoRole_ObjectEraser]); + userCanAccessAllObjects + = [[self ownerInContext: localContext] isEqualToString: login]; } } From 11d5455737c73506901430442162d3db1c7b4ad2 Mon Sep 17 00:00:00 2001 From: C Robert Date: Tue, 18 Aug 2009 17:41:14 +0000 Subject: [PATCH 2/2] Removed apache2 dependency Monotone-Parent: 2c8266b41b53ae4ece560d6f611a57376986383a Monotone-Revision: fc29c1b763c506067039095b47f73dfd6301f0e2 Monotone-Author: crobert@inverse.ca Monotone-Date: 2009-08-18T17:41:14 Monotone-Branch: ca.inverse.sogo --- debian/control | 2 +- debian/rules | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index e467e416a..07a1934a1 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Standards-Version: 3.8.2 Package: sogo Section: web Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, tmpreaper, apache2 +Depends: ${shlibs:Depends}, ${misc:Depends}, tmpreaper Suggests: nginx Description: a modern and scalable groupware SOGo is a groupware server built around OpenGroupware.org (OGo) and diff --git a/debian/rules b/debian/rules index af4f59612..8ad6d9e1f 100755 --- a/debian/rules +++ b/debian/rules @@ -49,7 +49,8 @@ install-arch: build-arch cp Scripts/sogod-wrapper debian/tmp/usr/sbin/sogod-wrapper mkdir -p debian/tmp/usr/share/lintian/overrides cp debian/sogo.overrides debian/tmp/usr/share/lintian/overrides/sogo - cp Apache/SOGo-debian.conf /etc/apache2/conf.d/SOGo.conf + mkdir -p debian/tmp/etc/apache2/conf.d + cp Apache/SOGo-debian.conf debian/tmp/etc/apache2/conf.d/SOGo.conf binary-indep: build-indep install-indep