Monotone-Parent: d45b9825eb29bcbb89f32b7326fed4cd3b64ca00
Monotone-Revision: 4b26b52413afe9c0e02b06099d1261720125fdca Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-11-08T20:35:09 Monotone-Branch: ca.inverse.sogomaint-2.0.2
parent
97476404c4
commit
71db9eca36
|
@ -26,6 +26,7 @@
|
|||
#import <NGObjWeb/SoObject+SoDAV.h>
|
||||
#import <NGObjWeb/WOContext.h>
|
||||
#import <NGObjWeb/WORequest.h>
|
||||
#import <NGObjWeb/WOResponse.h>
|
||||
#import <NGExtensions/NSObject+Logs.h>
|
||||
#import <NGExtensions/NSString+misc.h>
|
||||
#import <EOControl/EOQualifier.h>
|
||||
|
|
|
@ -25,10 +25,11 @@
|
|||
#import <Foundation/NSString.h>
|
||||
|
||||
#import <NGObjWeb/NSException+HTTP.h>
|
||||
#import <NGObjWeb/SoObject.h>
|
||||
#import <NGObjWeb/WOApplication.h>
|
||||
#import <NGObjWeb/WOContext.h>
|
||||
#import <NGObjWeb/WOContext+SoObjects.h>
|
||||
#import <NGObjWeb/WOResponse.h>
|
||||
#import <NGObjWeb/SoObject.h>
|
||||
#import <NGObjWeb/SoUser.h>
|
||||
#import <EOControl/EOSortOrdering.h>
|
||||
#import <SaxObjC/XMLNamespaces.h>
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
#import <Foundation/NSArray.h>
|
||||
|
||||
#import <NGObjWeb/WOApplication.h>
|
||||
#import <NGObjWeb/WOResponse.h>
|
||||
#import <NGObjWeb/WOContext+SoObjects.h>
|
||||
#import <NGExtensions/NSString+misc.h>
|
||||
#import <NGExtensions/NSObject+Logs.h>
|
||||
|
|
|
@ -19,6 +19,7 @@
|
|||
02111-1307, USA.
|
||||
*/
|
||||
|
||||
#import <Foundation/NSCalendarDate.h>
|
||||
#import <Foundation/NSPropertyList.h>
|
||||
#import <Foundation/NSUserDefaults.h>
|
||||
#import <Foundation/NSValue.h>
|
||||
|
|
|
@ -19,6 +19,7 @@
|
|||
02111-1307, USA.
|
||||
*/
|
||||
|
||||
#import <Foundation/NSDictionary.h>
|
||||
#import <Foundation/NSCalendarDate.h>
|
||||
#import <Foundation/NSUserDefaults.h>
|
||||
|
||||
|
|
|
@ -61,10 +61,10 @@ static NSString *defaultUserID = @"<default>";
|
|||
{
|
||||
id newFolder;
|
||||
NSArray *elements, *pathElements;
|
||||
NSString *ocsPath, *objectPath, *owner, *ocsName, *folderName;
|
||||
NSString *ocsPath, *objectPath, *login, *ocsName, *folderName;
|
||||
|
||||
elements = [reference componentsSeparatedByString: @":"];
|
||||
owner = [elements objectAtIndex: 0];
|
||||
login = [elements objectAtIndex: 0];
|
||||
objectPath = [elements objectAtIndex: 1];
|
||||
pathElements = [objectPath componentsSeparatedByString: @"/"];
|
||||
if ([pathElements count] > 1)
|
||||
|
@ -73,12 +73,12 @@ static NSString *defaultUserID = @"<default>";
|
|||
ocsName = @"personal";
|
||||
|
||||
ocsPath = [NSString stringWithFormat: @"/Users/%@/%@/%@",
|
||||
owner, [pathElements objectAtIndex: 0], ocsName];
|
||||
folderName = [NSString stringWithFormat: @"%@_%@", owner, ocsName];
|
||||
login, [pathElements objectAtIndex: 0], ocsName];
|
||||
folderName = [NSString stringWithFormat: @"%@_%@", login, ocsName];
|
||||
newFolder = [[self alloc] initWithName: folderName
|
||||
inContainer: aContainer];
|
||||
[newFolder setOCSPath: ocsPath];
|
||||
[newFolder setOwner: owner];
|
||||
[newFolder setOwner: login];
|
||||
|
||||
return newFolder;
|
||||
}
|
||||
|
|
|
@ -108,17 +108,17 @@ NSString *SOGoWeekStartFirstFullWeek = @"FirstFullWeek";
|
|||
{
|
||||
NSArray *bLanguages;
|
||||
WOContext *context;
|
||||
NSString *language;
|
||||
NSString *lng;
|
||||
|
||||
context = [[WOApplication application] context];
|
||||
bLanguages = [[context request] browserLanguages];
|
||||
if ([bLanguages count] > 0)
|
||||
language = [bLanguages objectAtIndex: 0];
|
||||
lng = [bLanguages objectAtIndex: 0];
|
||||
|
||||
if (![language length])
|
||||
language = defaultLanguage;
|
||||
if (![lng length])
|
||||
lng = defaultLanguage;
|
||||
|
||||
return language;
|
||||
return lng;
|
||||
}
|
||||
|
||||
+ (SOGoUser *) userWithLogin: (NSString *) newLogin
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
#import <NGObjWeb/WOContext+SoObjects.h>
|
||||
#import <NGObjWeb/WODynamicElement.h>
|
||||
#import <NGObjWeb/WORequest.h>
|
||||
#import <NGObjWeb/WOResponse.h>
|
||||
#import <NGObjWeb/WOResourceManager.h>
|
||||
#import <NGObjWeb/WOSession.h>
|
||||
#import <NGExtensions/NSObject+Logs.h>
|
||||
|
|
Loading…
Reference in New Issue