fixing bug #3643

Author: NicolasEYSSERIC

lib-core/src/main/java/com/silverpeas/form/PagesContext.java

@@ -24,6 +24,10 @@
 
 package com.silverpeas.form;
 
+import javax.servlet.http.HttpServletRequest;
+
+import com.stratelia.silverpeas.peasCore.URLManager;
+
 /**
  * The page context where a form is displayed.
  */
@@ -54,6 +58,7 @@ public class PagesContext {
   int updatePolicy = ON_UPDATE_REPLACE_EMPTY_VALUES;
   String encoding = "UTF-8";
   boolean creation = false;
+  String serverURL;
 
   public PagesContext() {
   }
@@ -315,4 +320,12 @@ public boolean isCreation() {
   public void setCreation(boolean creation) {
     this.creation = creation;
   }
+  
+  public String getServerURL() {
+    return serverURL;
+  }
+  
+  public void setRequest(HttpServletRequest request) {
+    this.serverURL = URLManager.getServerURL(request);
+  }
 }

lib-core/src/main/java/com/silverpeas/form/displayers/WysiwygFCKFieldDisplayer.java

@@ -254,7 +254,10 @@ public void display(PrintWriter out, TextField field, FieldTemplate template,
       builder.append("width : '").append(editorWidth).append("',\n");
       builder.append("height : ").append(editorHeight).append(",\n");
       builder.append("language : '").append(pageContext.getLanguage()).append("',\n");
-      builder.append("baseHref : '").append(URLManager.getApplicationURL()).append("/wysiwyg/jsp/ckeditor/").append("',\n");
+      String basehref = settings.getString("baseHref", pageContext.getServerURL());
+      if (StringUtil.isDefined(basehref)) {
+        builder.append("baseHref : '").append(basehref).append("',\n");
+      }
       builder.append("filebrowserImageBrowseUrl : '").append(Util.getPath()
           + "/wysiwyg/jsp/uploadFile.jsp?ComponentId=" + pageContext.getComponentId() + "&ObjectId="
           + pageContext.getObjectId() + "&Context=" + fieldName).append("',\n");

web-core/src/main/java/com/stratelia/webactiv/util/viewGenerator/html/wysiwyg/Wysiwyg.java

@@ -13,6 +13,7 @@ public class Wysiwyg {
   private String toolbar = "Default";
   private boolean toolbarStartExpanded = true;
   private String imageBrowserURL;
+  private String serverURL;
 
   ResourceLocator wysiwygSettings = new ResourceLocator("com.stratelia.silverpeas.wysiwyg.settings.wysiwygSettings", "");
 
@@ -28,7 +29,8 @@ public String print() {
     builder.append("width : '").append(getWidth()).append("',\n");
     builder.append("height : ").append(getHeight()).append(",\n");
     builder.append("language : '").append(getLanguage()).append("',\n");
-    builder.append("baseHref : '").append(URLManager.getApplicationURL()).append("/wysiwyg/jsp/ckeditor/").append("',\n");
+    String basehref = wysiwygSettings.getString("baseHref", getServerURL());
+    builder.append("baseHref : '").append(basehref).append("',\n");
     if (StringUtil.isDefined(getImageBrowserURL())) {
       builder.append("filebrowserImageBrowseUrl : '").append(getImageBrowserURL()).append("',\n");
     }
@@ -95,8 +97,13 @@ public String getImageBrowserURL() {
   public void setImageBrowserURL(String imageBrowserURL) {
     this.imageBrowserURL = imageBrowserURL;
   }
-  
-  
-  
+
+  public void setServerURL(String serverURL) {
+    this.serverURL = serverURL;
+  }
+
+  public String getServerURL() {
+    return serverURL;
+  }
 
 }

web-core/src/main/java/com/stratelia/webactiv/util/viewGenerator/html/wysiwyg/WysiwygTag.java

@@ -2,9 +2,12 @@
 
 import java.io.IOException;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.TagSupport;
 
+import com.stratelia.silverpeas.peasCore.URLManager;
+
 public class WysiwygTag extends TagSupport {
 
   private static final long serialVersionUID = -7606894410387540973L;
@@ -63,6 +66,7 @@ public int doEndTag() throws JspException {
     wysiwyg.setHeight(getHeight());
     wysiwyg.setLanguage(getLanguage());
     wysiwyg.setToolbar(getToolbar());
+    wysiwyg.setServerURL(URLManager.getServerURL((HttpServletRequest) pageContext.getRequest()));
 
     try {     
       pageContext.getOut().println(wysiwyg.print());