git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1166 d1b88da0-ebda-0310...

diff --git a/ChangeLog b/ChangeLog
index 012f73bf1f1294e39a0eacc1f836781bc22e448c..d542f488f4379043637216051824274108d50b63 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-09-04  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+       * UI/MainUI/SOGoUserHomePage.m ([SOGoUserHomePage -logoffAction]):
+       set the cookie path to "/".
+
        * Main/SOGo.m ([SOGo -authenticatorInContext:_ctx]): choose the
        authenticator based on the request handler key. "dav" returns the
        SOGoDAVAuthenticator, anything else returns the Web authenticator.

diff --git a/Main/SOGo.m b/Main/SOGo.m
index 52c2a0d767fbf6b90451ea423ead6c41f8d95122..dc5065f7e5a302e16a6dbd675cf259169f0842ab 100644 (file)
--- a/Main/SOGo.m
+++ b/Main/SOGo.m
@@ -232,12 +232,12 @@ static BOOL debugObjectAllocation = NO;
 
 /* authenticator */
 
-- (id) authenticatorInContext: (id) _ctx
+- (id) authenticatorInContext: (WOContext *) context
 {
   id authenticator;
   NSString *key;
 
-  key = [[_ctx request] requestHandlerKey];
+  key = [[context request] requestHandlerKey];
   if ([key isEqualToString: @"dav"])
     authenticator = [SOGoDAVAuthenticator sharedSOGoDAVAuthenticator];
   else

diff --git a/SoObjects/SOGo/SOGoDAVAuthenticator.m b/SoObjects/SOGo/SOGoDAVAuthenticator.m
index 2380e672f805a034a512fda58bb679af0481c1a8..d52f57406d721d8b4386fb54d31c8ec83acf1676 100644 (file)
--- a/SoObjects/SOGo/SOGoDAVAuthenticator.m
+++ b/SoObjects/SOGo/SOGoDAVAuthenticator.m
@@ -135,33 +135,4 @@
   return user;
 }
 
-// - (BOOL) renderException: (NSException *) exception
-//                inContext: (WOContext *) context
-// {
-//   id renderedException;
-//   WOComponent *tmpComponent;
-//   WOResponse *response;
-//   BOOL rc;
-
-//   rc = [super renderException: exception inContext: context];
-//   if (!rc)
-//     {
-//       tmpComponent = [WOComponent new];
-//       renderedException = [tmpComponent pageWithName: @"UIxException"];
-//       if (renderedException)
-//         {
-//           rc = YES;
-//           response = [context response];
-//           [response setHeader: @"text/html" forKey: @"content-type"];
-//           [renderedException setClientObject: exception];
-//           [context setPage: renderedException];
-//           [renderedException appendToResponse: response
-//                              inContext: context];
-//         }
-//       [tmpComponent release];
-//     }
-
-//   return rc;
-// }
-
 @end /* SOGoDAVAuthenticator */

diff --git a/SoObjects/SOGo/SOGoWebAuthenticator.m b/SoObjects/SOGo/SOGoWebAuthenticator.m
index 2ab8cb6ef86cb4a2f577ccbfa7a0985bce547067..9bd84e2a5b58e94aea2f2b3562e1f03b7307c3cb 100644 (file)
--- a/SoObjects/SOGo/SOGoWebAuthenticator.m
+++ b/SoObjects/SOGo/SOGoWebAuthenticator.m
@@ -121,37 +121,8 @@
   id page;
 
   page = [[WOApplication application] pageWithName: @"SOGoRootPage"
-                                     inContext: context];
+                                     forRequest: [context request]];
   [page appendToResponse: response inContext: context];
 }
 
-// - (BOOL) renderException: (NSException *) exception
-//                inContext: (WOContext *) context
-// {
-//   id renderedException;
-//   WOComponent *tmpComponent;
-//   WOResponse *response;
-//   BOOL rc;
-
-//   rc = [super renderException: exception inContext: context];
-//   if (!rc)
-//     {
-//       tmpComponent = [WOComponent new];
-//       renderedException = [tmpComponent pageWithName: @"UIxException"];
-//       if (renderedException)
-//         {
-//           rc = YES;
-//           response = [context response];
-//           [response setHeader: @"text/html" forKey: @"content-type"];
-//           [renderedException setClientObject: exception];
-//           [context setPage: renderedException];
-//           [renderedException appendToResponse: response
-//                              inContext: context];
-//         }
-//       [tmpComponent release];
-//     }
-
-//   return rc;
-// }
-
 @end /* SOGoWebAuthenticator */

diff --git a/UI/MainUI/SOGoUserHomePage.m b/UI/MainUI/SOGoUserHomePage.m
index 572ee1aa803bcbdbe8f24094caa0ed56ef68c92a..6f211ce67d677d3e41d5292369fe383bd2a6afe7 100644 (file)
--- a/UI/MainUI/SOGoUserHomePage.m
+++ b/UI/MainUI/SOGoUserHomePage.m
@@ -218,6 +218,7 @@ static NSString *defaultModule = nil;
   auth = [[self clientObject] authenticatorInContext: context];
   cookie = [WOCookie cookieWithName: [auth cookieNameInContext: context]
                     value: @"logoff"];
+  [cookie setPath: @"/"];
   [response addCookie: cookie];
 
   return response;

diff --git a/UI/Templates/MainUI/SOGoRootPage.wox b/UI/Templates/MainUI/SOGoRootPage.wox
index 314b97f893a4da91b2dcb3c3a389b0af7fa82cbb..c5f08cbd86a055f903813288f917faad916f695e 100644 (file)
--- a/UI/Templates/MainUI/SOGoRootPage.wox
+++ b/UI/Templates/MainUI/SOGoRootPage.wox
@@ -30,6 +30,7 @@
     <body class="loginPage">
       <script type="text/javascript">
        var ResourcesURL = '/SOGo.woa/WebServerResources';
+        var ApplicationBaseURL = '<var:string value="applicationPath" />';
       </script>
 
       <script type="text/javascript" rsrc:src="_IEtoW3C.js"><!-- space required --></script>

diff --git a/UI/WebServerResources/SOGoRootPage.js b/UI/WebServerResources/SOGoRootPage.js
index dd93cb3b2e593f913ae87a244965dc8946fd77c3..7e311008d916f99fc03c21540853fb6c7835b86f 100644 (file)
--- a/UI/WebServerResources/SOGoRootPage.js
+++ b/UI/WebServerResources/SOGoRootPage.js
@@ -9,7 +9,8 @@ function onLoginClick(event) {
   startAnimation($("loginButton"), $("submit"));
 
   var loginString = $("userName").value + ":" + $("password").value;
-  document.cookie = "0xHIGHFLYxSOGo-0.9 = basic" + loginString.base64encode();
+  document.cookie = ("0xHIGHFLYxSOGo-0.9 = basic" + loginString.base64encode()
+                    + "; path=/");
 }
 
 addEvent(window, 'load', initLogin);