mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-05-23 04:15:26 +00:00
Monotone-Parent: 96c27e14c931ea4da44d9e27355efd4f8b92a679
Monotone-Revision: f008e3c8a12e79d2a86e41320fe6a81f4adf4257 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-09-06T22:16:30 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
@@ -1,5 +1,9 @@
|
||||
2007-09-06 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||
|
||||
* UI/SOGoUI/UIxComponent.m ([UIxComponent -applicationPath]):
|
||||
returns the path to the application if the clientObject is not a
|
||||
SOGoObject.
|
||||
|
||||
* SoObjects/SOGo/SOGoUserFolder.m ([SOGoUserFolder +initialize]):
|
||||
moved the requirement of authentication from the SOGo application
|
||||
class to here.
|
||||
|
||||
+20
-17
@@ -312,28 +312,31 @@ static BOOL uixDebugEnabled = NO;
|
||||
SOGoObject *currentClient, *parent;
|
||||
BOOL found;
|
||||
Class objectClass, groupFolderClass, userFolderClass;
|
||||
WOContext *ctx;
|
||||
|
||||
groupFolderClass = [SOGoCustomGroupFolder class];
|
||||
userFolderClass = [SOGoUserFolder class];
|
||||
|
||||
currentClient = [self clientObject];
|
||||
objectClass = [currentClient class];
|
||||
found = (objectClass == groupFolderClass || objectClass == userFolderClass);
|
||||
while (!found && currentClient)
|
||||
if (currentClient
|
||||
&& [currentClient isKindOfClass: [SOGoObject class]])
|
||||
{
|
||||
parent = [currentClient container];
|
||||
objectClass = [parent class];
|
||||
if (objectClass == groupFolderClass
|
||||
|| objectClass == userFolderClass)
|
||||
found = YES;
|
||||
else
|
||||
currentClient = parent;
|
||||
groupFolderClass = [SOGoCustomGroupFolder class];
|
||||
userFolderClass = [SOGoUserFolder class];
|
||||
|
||||
objectClass = [currentClient class];
|
||||
found = (objectClass == groupFolderClass || objectClass == userFolderClass);
|
||||
while (!found && currentClient)
|
||||
{
|
||||
parent = [currentClient container];
|
||||
objectClass = [parent class];
|
||||
if (objectClass == groupFolderClass
|
||||
|| objectClass == userFolderClass)
|
||||
found = YES;
|
||||
else
|
||||
currentClient = parent;
|
||||
}
|
||||
}
|
||||
else
|
||||
currentClient = [WOApplication application];
|
||||
|
||||
ctx = context;
|
||||
|
||||
return [[currentClient baseURLInContext:ctx] hostlessURL];
|
||||
return [[currentClient baseURLInContext: context] hostlessURL];
|
||||
}
|
||||
|
||||
- (NSString *) resourcesPath
|
||||
|
||||
Reference in New Issue
Block a user