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

Monotone-Parent: f6d042dc3889e0377296ef4de7738ca4cb2569d9

Browse Source 
Monotone-Revision: 0508e0037d1a44a60737fdd18b1830b167d7ab72

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-04-14T23:27:00
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2008-04-14 23:27:00 +00:00
parent 13b3344aba
commit 1047e26fe8
2 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2008-04-14 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Appointments/SOGoAppointmentFolder.m ([SOGoAppointmentFolder -davCalendarQuery:queryContext])
([SOGoAppointmentFolder -davCalendarMultiget:queryContext]):
deduce the cname of objects even if we are using hostless urls.
2008-03-31 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/SOGoUI/SOGoACLAdvisory.m ([SOGoACLAdvisory -resourceName]):

31
SoObjects/Appointments/SOGoAppointmentFolder.m
View File

@@ -494,16 +494,29 @@ static NSNumber *sharedYes = nil;
component = nil;
realBaseURL = [NSURL URLWithString: baseURL];
componentURL = [[NSURL URLWithString: url
relativeToURL: realBaseURL]
standardizedURL];
componentURLPath = [componentURL absoluteString];
if ([componentURLPath rangeOfString: [realBaseURL absoluteString]].location
!= NSNotFound)
if (realBaseURL) /* url has a host part */
{
urlComponents = [componentURLPath componentsSeparatedByString: @"/"];
cName = [urlComponents objectAtIndex: [urlComponents count] - 1];
component = [NSDictionary dictionaryWithObject: cName forKey: @"c_name"];
componentURL = [[NSURL URLWithString: url
relativeToURL: realBaseURL]
standardizedURL];
componentURLPath = [componentURL absoluteString];
if ([componentURLPath rangeOfString: [realBaseURL absoluteString]].location
!= NSNotFound)
{
urlComponents = [componentURLPath componentsSeparatedByString: @"/"];
cName = [urlComponents objectAtIndex: [urlComponents count] - 1];
component = [NSDictionary dictionaryWithObject: cName forKey: @"c_name"];
}
}
else
{
if ([url hasPrefix: baseURL])
{
urlComponents = [[url stringByDeletingPrefix: baseURL]
componentsSeparatedByString: @"/"];
cName = [urlComponents objectAtIndex: [urlComponents count] - 1];
component = [NSDictionary dictionaryWithObject: cName forKey: @"c_name"];
}
}
return component;