amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-29 15:15:37 +00:00
Code Issues Projects Releases Wiki Activity

merge of '8ba8b3fa9da7cc4d1b86cc06f7f6907b8f8e56f7'

Browse Source 
and 'b3bd45e420720798687eac0aee6758ecefab1487'

Monotone-Parent: 8ba8b3fa9da7cc4d1b86cc06f7f6907b8f8e56f7
Monotone-Parent: b3bd45e420720798687eac0aee6758ecefab1487
Monotone-Revision: 7d318403d9fb30ae3156447d2ba6eb707f654fce

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2009-01-12T23:58:46
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2009-01-12 23:58:46 +00:00
parent 1076f87b07 4176730d50
commit a7afca257e
7 changed files with 76 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+14
View File
@@ -1,7 +1,21 @@
2009-01-09 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/SOGoContentObject.m ([SOGoContentObject
-aclUsers]): fixed method to invoke [container
aclUsersForObjectAtPath:] with the resulting path as argument
instead of the path itself.
* SoObjects/SOGo/SOGoGCSFolder.m ([SOGoGCSFolder
-sendFolderAdvisoryTemplate:template]): the condition check for
sending folder advisories has been moved here.
([SOGoGCSFolder -sendFolderAdvisoryTemplate:template]): now a
public method.
2008-01-07 Ludovic Marcotte <lmarcotte@inverse.ca>
* Added Documentation/SOGo Mobile Devices Configuration.odt
* Fixed typos in the Intallation & Configuration guide
* Added Documentation/SOGo Mozilla Thunderbird Configuration.odt
2009-01-07 Francis Lachapelle <flachapelle@inverse.ca>
Documentation/SOGo Mozilla Thunderbird Configuration.odt
BIN
View File
Binary file not shown.
Main/SOGo.h
+44
View File
@@ -0,0 +1,44 @@
/*
Copyright (C) 2004-2005 SKYRIX Software AG
This file is part of OpenGroupware.org.
OGo is free software; you can redistribute it and/or modify it under
the terms of the GNU Lesser General Public License as published by the
Free Software Foundation; either version 2, or (at your option) any
later version.
OGo 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 Lesser General Public
License for more details.
You should have received a copy of the GNU Lesser General Public
License along with OGo; see the file COPYING. If not, write to the
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA.
*/
#ifndef MAIN_SOGO_H
#define MAIN_SOGO_H
#import <NGObjWeb/SoApplication.h>
@class NSArray;
@class NSDictionary;
@class NSMutableDictionary;
@class SOGoCache;
@interface SOGo : SoApplication
{
NSMutableDictionary *localeLUT;
SOGoCache *cache;
}
- (NSDictionary *) currentLocaleConsideringLanguages:(NSArray *)_langs;
- (NSDictionary *) localeForLanguageNamed:(NSString *)_name;
@end
#endif /* MAIN_SOGO_H */
Main/SOGo.m
+1 -11
View File
@@ -31,7 +31,6 @@
#import <GDLAccess/EOAdaptorChannel.h>
#import <GDLContentStore/GCSChannelManager.h>
#import <NGObjWeb/SoApplication.h>
#import <NGObjWeb/SoClassSecurityInfo.h>
#import <NGObjWeb/WOContext.h>
#import <NGObjWeb/WORequest.h>
@@ -57,16 +56,7 @@
#import "SOGoProductLoader.h"
#import "NSException+Stacktrace.h"
@interface SOGo : SoApplication
{
NSMutableDictionary *localeLUT;
SOGoCache *cache;
}
- (NSDictionary *) currentLocaleConsideringLanguages:(NSArray *)_langs;
- (NSDictionary *) localeForLanguageNamed:(NSString *)_name;
@end
#import "SOGo.h"
@implementation SOGo
SoObjects/SOGo/SOGoContentObject.m
+1 -1
View File
@@ -432,7 +432,7 @@
pathArray = [NSMutableArray arrayWithArray: [container pathArrayToFolder]];
[pathArray addObject: nameInContainer];
return pathArray;
return [container aclUsersForObjectAtPath: pathArray];
}
- (NSArray *) aclsForUser: (NSString *) uid
SoObjects/SOGo/SOGoGCSFolder.h
+3
View File
@@ -98,6 +98,9 @@
- (void) removeAclsForUsers: (NSArray *) users
forObjectAtPath: (NSArray *) objectPathArray;
/* advisories */
- (void) sendFolderAdvisoryTemplate: (NSString *) template;
@end
#endif /* __SOGo_SOGoGCSFolder_H__ */
SoObjects/SOGo/SOGoGCSFolder.m
+13 -12
View File
@@ -378,15 +378,18 @@ static NSArray *childRecordFields = nil;
SOGoUser *user;
SOGoFolderAdvisory *page;
user = [context activeUser];
pageName = [NSString stringWithFormat: @"SOGoFolder%@%@Advisory",
[user language], template];
if (sendFolderAdvisories)
{
user = [context activeUser];
pageName = [NSString stringWithFormat: @"SOGoFolder%@%@Advisory",
[user language], template];
page = [[WOApplication application] pageWithName: pageName
inContext: context];
[page setFolderObject: self];
[page setRecipientUID: [user login]];
[page send];
page = [[WOApplication application] pageWithName: pageName
inContext: context];
[page setFolderObject: self];
[page setRecipientUID: [user login]];
[page send];
}
}
- (BOOL) create
@@ -398,8 +401,7 @@ static NSArray *childRecordFields = nil;
atPath: ocsPath];
if (!result
&& [[context request] handledByDefaultHandler]
&& sendFolderAdvisories)
&& [[context request] handledByDefaultHandler])
[self sendFolderAdvisoryTemplate: @"Addition"];
return (result == nil);
@@ -418,8 +420,7 @@ static NSArray *childRecordFields = nil;
else
error = [[self folderManager] deleteFolderAtPath: ocsPath];
if (!error && sendFolderAdvisories
&& [[context request] handledByDefaultHandler])
if (!error && [[context request] handledByDefaultHandler])
[self sendFolderAdvisoryTemplate: @"Removal"];
return error;