amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-11 00:08:51 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: 2ae12f2c67f3e74fddaf5d592a19e233d0806899

Browse Source 
Monotone-Revision: 826bf932caacd3e649919ed612b65ec8aee72999

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-04-26T16:39:09
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2007-04-26 16:39:09 +00:00
parent 27d801a9fc
commit daaf7fb14e
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2007-04-26 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Appointments/SOGoAppointmentFolder.m
([SOGoAppointmentFolder -_privacySqlString]): the string for the
"freebusy" special user should only require opaque elements.
2007-04-25 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Appointments/SOGoAppointmentFolder.m

14
SoObjects/Appointments/SOGoAppointmentFolder.m
View File

@@ -728,15 +728,17 @@ static NSNumber *sharedYes = nil;
- (NSString *) _privacySqlString
{
NSString *privacySqlString, *owner, *currentUser, *email;
NSString *privacySqlString, *owner, *login, *email;
SOGoUser *activeUser;
activeUser = [context activeUser];
currentUser = [activeUser login];
login = [activeUser login];
owner = [self ownerInContext: context];
if ([currentUser isEqualToString: owner])
if ([login isEqualToString: owner])
privacySqlString = @"";
else if ([login isEqualToString: @"freebusy"])
privacySqlString = @"and (isopaque = 1)";
else
{
email = [activeUser email];
@@ -746,7 +748,7 @@ static NSNumber *sharedYes = nil;
@"(%@(orgmail = '%@')"
@" or ((partmails caseInsensitiveLike '%@%%'"
@" or partmails caseInsensitiveLike '%%\\n%@%%')))",
[self _privacyClassificationStringsForUID: currentUser],
[self _privacyClassificationStringsForUID: login],
email, email, email];
}
@@ -941,11 +943,9 @@ static NSNumber *sharedYes = nil;
{
Class objectClass;
unsigned int count, max;
NSString *currentId, *currentUser;
NSString *currentId;
id deleteObject;
currentUser = [[context activeUser] login];
max = [ids count];
for (count = 0; count < max; count++)
{