Ticket #3660: 3660.patch

java-core/src/main/resources/META-INF/FCKeditor.tld

@@ -56 +56 @@
                 </attribute>
                 <attribute>
                         <description>
+                                The parameter name to use when passing this content in
+                                a HTTPRequest.  If not passed, parameter name is the
+                                same as instanceName
+                        </description>
+                        <name>name</name>
+                        <required>false</required>
+                        <rtexprvalue>false</rtexprvalue>
+                        <type>java.lang.String</type>
+                </attribute>            
+                <attribute>
+                        <description>
                                 Width of the FCKeditor instance in the browser window.
                         </description>
                         <name>width</name>

java-core/src/main/java/net/fckeditor/tags/EditorTag.java

@@ -48 +48 @@
         private String toolbarSet;
         private String value;
         private String basePath;
+        private String name;
 
         /** The underlying FCKeditor instance */
         private transient FCKeditor fckEditor;
@@ -58 +59 @@
         public void setInstanceName(String instanceName) {
                 this.instanceName = instanceName;
         }
+        
+        /**
+         * @see FCKeditor#setName(String)
+         */
+        public void setName(String name) {
+                this.name = name;
+        }
 
         /**
          * @see FCKeditor#setWidth(String)
@@ -128 +136 @@
                                 fckEditor.setValue(value);
                         if (Utils.isNotEmpty(basePath))
                                 fckEditor.setBasePath(basePath);
+                        if (Utils.isNotEmpty(name))
+                                fckEditor.setParamName(name);
 
                 } catch (Exception e) {
                         throw new JspException(e);
@@ -151 +161 @@
                 return EVAL_PAGE;
         }
 
-}
- No newline at end of file
+}
+

java-core/src/main/java/net/fckeditor/FCKeditor.java

@@ -43 +43 @@
 
         private FCKeditorConfig fckConfig = new FCKeditorConfig();
         private String instanceName;
+        private String paramName;
         private String value;
         private HttpServletRequest request;
 
@@ -51 +52 @@
         private String width = PropertiesLoader.getEditorWidth();
         private String height = PropertiesLoader.getEditorHeight();
         private String basePath = PropertiesLoader.getEditorBasePath();
+        
+        /*
+         * Static counter for auto generated id tags
+         */
+        private static long IDCounter = 0l;
+        private String sID = "";
 
         /**
          * Class constructor with all basic parameters.
@@ -78 +85 @@
          *             if instanceName is empty or not a valid XHTML id
          */
         public FCKeditor(final HttpServletRequest request,
-                        final String instanceName, final String width, final String height,
+                        final String instanceName, final String paramName,
+                        final String width, final String height,
                         final String toolbarSet, final String value, final String basePath) {
 
                 this(request, instanceName);
+                this.paramName = paramName;
                 this.width = width;
                 this.height = height;
                 this.toolbarSet = toolbarSet;
@@ -130 +139 @@
         }
 
         /**
+         * Sets the initial value of the input element's name
+         * 
+         * @param value the name of the input element
+         */
+        public void setParamName(String value) {
+                this.paramName = value;
+        }
+        
+        /**
          * Sets the initial value to be edited as HTML markup.
          * 
          * @param value
@@ -300 +318 @@
         @Override
         public String toString() {
                 StringBuffer strEditor = new StringBuffer();
+                
+                /*
+                 * Set the ID tag
+                 */
+                sID = instanceName;
+                if (instanceName.equals("auto")) {
+                        sID = "auto" + IDCounter++;
+                }
+                
+                /*
+                 * Set the paramName is not already set
+                 */
+                if (paramName == null || paramName.equals("")) {
+                        paramName = sID;
+                }
 
                 strEditor.append("<div>");
                 String encodedValue = escapeXml(value);
 
                 if (Compatibility.isCompatibleBrowser(request)) {
-                        strEditor.append(createInputForVariable(instanceName, instanceName,
+                        strEditor.append(createInputForVariable(paramName, sID,
                                         encodedValue));
 
                         // create config HTML
                         String configStr = fckConfig.getUrlParams();
                         if (Utils.isNotEmpty(configStr))
-                                strEditor.append(createInputForVariable(null, instanceName
+                                strEditor.append(createInputForVariable(null, sID
                                                 .concat("___Config"), configStr));
 
                         // create IFrame
                         StringBuffer editorLink = new StringBuffer(request.getContextPath());
                         editorLink.append(basePath);
                         editorLink.append("/editor/fckeditor.html?InstanceName=").append(
-                                        instanceName);
+                                        sID);
                         if (Utils.isNotEmpty(toolbarSet))
                                 editorLink.append("&amp;Toolbar=").append(toolbarSet);
-
+                        
                         XHtmlTagTool iframeTag = new XHtmlTagTool("iframe",
                                         XHtmlTagTool.SPACE);
-                        iframeTag.addAttribute("id", instanceName.concat("___Frame"));
+                        iframeTag.addAttribute("id", sID.concat("___Frame"));
                         iframeTag.addAttribute("src", editorLink.toString());
                         iframeTag.addAttribute("width", width);
                         iframeTag.addAttribute("height", height);
@@ -335 +368 @@
                 } else {
                         XHtmlTagTool textareaTag = new XHtmlTagTool("textarea",
                                         encodedValue);
-                        textareaTag.addAttribute("name", instanceName);
+                        textareaTag.addAttribute("name", sID);
                         textareaTag.addAttribute("rows", "4");
                         textareaTag.addAttribute("cols", "40");
                         textareaTag.addAttribute("wrap", "virtual");