Monotone-Parent: f9a04cc4832d7c1ca8d70b594faba3c5a0eda334

Monotone-Revision: f3dd7372c4f74c5e1e309b528107e222964ca70b

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-11-10T21:39:40
Monotone-Branch: ca.inverse.sogo

UI/Contacts/UIxContactEditor.m

@@ -632,7 +632,7 @@
 	}
       
       if ([[[[self context] request] formValueForKey: @"nojs"] intValue])
-        result = [self redirectToLocation: [self applicationPath]];
+        result = [self redirectToLocation: [self modulePath]];
       else
         {
           jsRefreshMethod

UI/Contacts/UIxListEditor.m

@@ -235,7 +235,7 @@
     {
       [co save];
       if ([[[[self context] request] formValueForKey: @"nojs"] intValue])
-                   result = [self redirectToLocation: [self applicationPath]];
+                   result = [self redirectToLocation: [self modulePath]];
       else
         {
           jsRefreshMethod

UI/MainUI/SOGoRootPage.m

@@ -58,7 +58,7 @@ static NSArray *supportedLanguages = nil;
 
 - (NSString *) connectURL
 {
-  return [NSString stringWithFormat: @"%@connect", [self applicationPath]];
+  return [NSString stringWithFormat: @"%@/connect", [self applicationPath]];
 }
 
 /* actions */

UI/SOGoUI/UIxComponent.h

@@ -60,7 +60,8 @@
 - (NSString *)ownMethodName;
 
 - (NSString *)userFolderPath;
-- (NSString *) applicationPath;
+- (NSString *)applicationPath;
+- (NSString *)modulePath;
 
 - (NSString *)ownPath;
 - (NSString *)relativePathToUserFolderSubPath:(NSString *)_sub;

UI/SOGoUI/UIxComponent.m

@@ -328,6 +328,15 @@ static BOOL uixDebugEnabled = NO;
 }
 
 - (NSString *) applicationPath
+{
+  NSString *appName;
+
+  appName = [[context request] applicationName];
+
+  return [NSString stringWithFormat: @"/%@", appName];
+}
+
+- (NSString *) modulePath
 {
   SOGoObject *currentClient, *parent;
   BOOL found;

UI/Templates/UIxPageFrame.wox

@@ -113,7 +113,7 @@
 	  <div id="javascriptSafetyNet"><!-- space --></div>
 
 	  <script type="text/javascript">
-	    var ApplicationBaseURL = '<var:string value="applicationPath"/>';
+	    var ApplicationBaseURL = '<var:string value="modulePath"/>';
 	    var ResourcesURL = '<var:string value="applicationPath"/>.woa/WebServerResources';
 	    <var:if condition="isSuperUser"
 	      >var IsSuperUser = true;