From 41fe0341a333de3c09664a13593aa4eda05b9441 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Thu, 10 Jun 2010 21:57:14 +0000
Subject: [PATCH] Monotone-Parent: ebbadbdb3549dd7264241be0a6c21ab9a481341f
 Monotone-Revision: 1fb8a3cbc4132cfe8736e6233d540222301c0485

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-06-10T21:57:14
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                |  4 ++++
 UI/Common/UIxPageFrame.m | 14 +-------------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8edb2d266..f06dc0c5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2010-06-10  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/Common/UIxPageFrame.m (-logoffPath): reverted previous change
+	as we now make use of the logoffAction to redirect to the CAS
+	logout url.
+
 	* SoObjects/SOGo/SOGoSystemDefaults.m (-davAuthenticationType):
 	new method similar to -authenticationType. Currently used for CAS
 	or non-CAS authentication.
diff --git a/UI/Common/UIxPageFrame.m b/UI/Common/UIxPageFrame.m
index dd0cb5b7f..cc81a8e3f 100644
--- a/UI/Common/UIxPageFrame.m
+++ b/UI/Common/UIxPageFrame.m
@@ -26,7 +26,6 @@
 #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>
@@ -156,18 +155,7 @@
 
 - (NSString *) logoffPath
 {
-  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;
+  return [self relativePathToUserFolderSubPath: @"logoff"];
 }
 
 /* popup handling */