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

Monotone-Parent: 8f0073cb31f66a3816d5e09f9f7510b671ed7a2f

Browse Source 
Monotone-Revision: 6f5248c5ddc427c834c3d0c9cd2457425bac2ac2

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-04-05T13:50:09
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2011-04-05 13:50:09 +00:00
parent 2ed6a7dadf
commit 4b77925f85
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/SOGo/SOGoGCSFolder.h
+4
View File
@@ -36,6 +36,8 @@
@class DOMElement;
@class SOGoUser;
/*
SOGoGCSFolder
@@ -72,6 +74,8 @@
- (void) setFolderPropertyValue: (id) theValue
inCategory: (NSString *) theKey;
- (id) folderPropertyValueInCategory: (NSString *) theKey;
- (id) folderPropertyValueInCategory: (NSString *) theKey
forUser: (SOGoUser *) theUser;
/* lower level fetches */
- (BOOL) nameExistsInFolder: (NSString *) objectName;
SoObjects/SOGo/SOGoGCSFolder.m
+3 -8
View File
@@ -156,14 +156,13 @@ static NSArray *childRecordFields = nil;
{
id newFolder;
NSArray *elements, *pathElements;
NSString *path, *objectPath, *login, *currentUser, *ocsName, *folderName;
NSString *path, *objectPath, *login, *ocsName, *folderName;
WOContext *localContext;
BOOL localIsSubscription;
elements = [reference componentsSeparatedByString: @":"];
login = [elements objectAtIndex: 0];
localContext = [[WOApplication application] context];
currentUser = [[localContext activeUser] login];
objectPath = [elements objectAtIndex: 1];
pathElements = [objectPath componentsSeparatedByString: @"/"];
if ([pathElements count] > 1)
@@ -605,13 +604,10 @@ static NSArray *childRecordFields = nil;
- (void) renameTo: (NSString *) newName
{
SOGoUser *activeUser;
#warning SOGoFolder should have the corresponding method
[displayName release];
displayName = nil;
activeUser = [context activeUser];
if (activeUserIsOwner)
[self _ownerRenameTo: newName];
else
@@ -1808,7 +1804,6 @@ static NSArray *childRecordFields = nil;
NSString *url, *currentURL, *componentURLPath, *cName, *baseURLString;
NSMutableDictionary *cNames;
NSURL *componentURL, *baseURL;
NSArray *urlComponents;
max = [urls count];
cNames = [NSMutableDictionary dictionaryWithCapacity: max];
@@ -1829,7 +1824,6 @@ static NSArray *childRecordFields = nil;
if ([componentURLPath rangeOfString: baseURLString].location
!= NSNotFound)
{
urlComponents = [componentURLPath componentsSeparatedByString: @"/"];
cName = [[urls objectAtIndex: count] lastPathComponent];
[cNames setObject: [urls objectAtIndex: count] forKey: cName];
}
@@ -2075,7 +2069,8 @@ static NSArray *childRecordFields = nil;
buffer = [NSMutableString stringWithCapacity: max*512];
for (count = 0; count < max; count++)
{
currentComponent = [components objectForKey: [urls objectAtIndex: count]];
currentURL = [urls objectAtIndex: count];
currentComponent = [components objectForKey: currentURL];
if (currentComponent)
[self appendObject: currentComponent
properties: propertiesArray