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

Monotone-Parent: 227d08b1bace5a1e7b0760cc82dc7381016175ae

Browse Source 
Monotone-Revision: a1b9a10da6c763d93711deaf538e81314618e5e7

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-06-10T18:42:26
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2010-06-10 18:42:26 +00:00
parent e91844e3a3
commit b1a7398de1
2 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,5 +1,11 @@
2010-06-10 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/Common/UIxPageFrame.m (-canLogoff)): return YES when the
authentication type is set to "cas" and SOGoCASLogoutEnabled is
set.
(-logoffPath): return an href to the CAS service logout URL when
using "cas" as authentication type.
* SoObjects/SOGo/SOGoSystemDefaults.m (-CASLogoutEnabled): new
method that returns whether the "SOGoCASLogoutEnabled" ud is set.

19
UI/Common/UIxPageFrame.m
View File

@@ -26,6 +26,7 @@
#import <NGObjWeb/WOResourceManager.h>
#import <SOGo/NSDictionary+Utilities.h>
#import <SOGo/NSString+Utilities.h>
#import <SOGo/SOGoUser.h>
#import <SOGo/SOGoUserDefaults.h>
#import <SOGo/SOGoUserProfile.h>
@@ -155,7 +156,18 @@
- (NSString *) logoffPath
{
return [self relativePathToUserFolderSubPath: @"logoff"];
NSString *logoffPath;
SOGoSystemDefaults *sd;
sd = [SOGoSystemDefaults sharedSystemDefaults];
if ([[sd authenticationType] isEqualToString: @"cas"])
logoffPath = [[sd CASServiceURL] composeURLWithAction: @"logout"
parameters: nil
andHash: NO];
else
logoffPath = [self relativePathToUserFolderSubPath: @"logoff"];
return logoffPath;
}
/* popup handling */
@@ -416,8 +428,9 @@
if ([auth respondsToSelector: @selector (cookieNameInContext:)])
{
sd = [SOGoSystemDefaults sharedSystemDefaults];
canLogoff = ([[auth cookieNameInContext: context] length] > 0
&& ![[sd authenticationType] isEqualToString: @"cas"]);
canLogoff = (([[sd authenticationType] isEqualToString: @"cas"]
&& [sd CASLogoutEnabled])
|| [[auth cookieNameInContext: context] length] > 0);
}
else
canLogoff = NO;