Ticket #3407: 3407_3.patch

_source/core/config.js

@@ -150 +150 @@
          * config.plugins = 'basicstyles,button,htmldataprocessor,toolbar,wysiwygarea';
          */
 
-        plugins : 'about,basicstyles,blockquote,button,clipboard,colorbutton,contextmenu,elementspath,enterkey,entities,find,flash,font,format,forms,horizontalrule,htmldataprocessor,image,indent,justify,keystrokes,link,list,maximize,newpage,pagebreak,pastefromword,pastetext,preview,print,removeformat,save,smiley,showblocks,sourcearea,stylescombo,table,tabletools,specialchar,tab,templates,toolbar,undo,wysiwygarea,wsc',
+        plugins : 'about,basicstyles,blockquote,button,clipboard,colorbutton,contextmenu,elementspath,enterkey,entities,find,flash,font,format,forms,horizontalrule,htmldataprocessor,image,indent,justify,keystrokes,link,list,maximize,newpage,pagebreak,pastefromword,pastetext,preview,print,protectedsource,removeformat,save,smiley,showblocks,sourcearea,stylescombo,table,tabletools,specialchar,tab,templates,toolbar,undo,wysiwygarea,wsc',
 
         /**
          * List of additional plugins to be loaded. This is a tool setting which

_source/core/htmlparser/comment.js

@@ -45 +45 @@
                 if ( filter && !( comment = filter.onComment( comment ) ) )
                         return;
 
-                writer.comment( comment );
+                if ( typeof comment == 'string' )
+                        writer.comment( comment );
+                else
+                {
+                        var fragment = new CKEDITOR.htmlParser.fragment();
+                        fragment.add( comment )
+                        fragment.writeHtml( writer, filter );
+                }
         }
 };

_source/core/htmlparser/element.js

@@ -124 +124 @@
                                         if ( !( element = filter.onElement( element ) ) )
                                                 return;
 
-                                        if ( element.name == writeName )
+                                        if ( element.name == writeName || element.type == CKEDITOR.NODE_TEXT || element.type == CKEDITOR.NODE_COMMENT )
                                                 break;
 
                                         writeName = element.name;
@@ -135 +135 @@
                                 attributes = element.attributes;
                         }
 
+                        if ( element.type == CKEDITOR.NODE_COMMENT || element.type == CKEDITOR.NODE_TEXT )
+                        {
+                                element.writeHtml( writer );
+                                return;
+                        }
+
                         // Open element tag.
                         writer.openTag( writeName, attributes );
 

_source/core/htmlparser/filter.js

@@ -11 +11 @@
                 {
                         this._ =
                         {
+                                regExp : [],
                                 elementNames : [],
                                 attributeNames : [],
                                 elements : { $length : 0 },
@@ -29 +30 @@
                                         priority = 10;
 
                                 // Add the elementNames.
+                                addItemsToList( this._.regExp, rules.regExp, priority );
+
+                                // Add the elementNames.
                                 addItemsToList( this._.elementNames, rules.elementNames, priority );
 
                                 // Add the attributeNames.

_source/core/htmlparser/text.js

@@ -12 +12 @@
          * @constructor
          * @example
          */
-        CKEDITOR.htmlParser.text = function( value )
+        CKEDITOR.htmlParser.text = function( value, protect )
         {
                 /**
                  * The text value.
                  * @type String
                  * @example
                  */
-                this.value = value.replace( spacesRegex, ' ' );
+                this.value = protect ? value : value.replace( spacesRegex, ' ' );
 
                 /** @private */
                 this._ =
                 {
+                        protect : protect,
                         isBlockLike : false
                 };
         };
@@ -46 +47 @@
                 {
                         var text = this.value;
 
-                        if ( filter && !( text = filter.onText( text ) ) )
+                        if ( !this._.protect && filter && !( text = filter.onText( text ) ) )
                                 return;
 
                         writer.text( text );

_source/plugins/htmldataprocessor/plugin.js

@@ -111 +111 @@
                 return html.replace( protectAttributeRegex, '$& _cke_saved_$1' );
         }
 
+        function protectSource( html, filter )
+        {
+                var rules = filter._.regExp;
+                
+                for ( var i = 0 ; i < rules.length ; i++ )
+                {
+                        var rule = rules[ i ];
+                        html = html.replace( rule.regExp, rule.replaceWith );
+                }
+                return html;
+        }
+
         CKEDITOR.plugins.add( 'htmldataprocessor',
         {
                 requires : [ 'htmlwriter' ],
@@ -140 +152 @@
                         // The source data is already HTML, but we need to clean
                         // it up and apply the filter.
 
-                        // Before anything, we must protect the URL attributes as the
+                        // Before anything, we must protect the PHP and ASP content.
+                        data = protectSource( data, this.dataFilter );
+
+                        // We must protect the URL attributes as the
                         // browser may changing them when setting the innerHTML later in
                         // the code.
                         data = protectAttributes( data );

_source/plugins/protectedsource/plugin.js

@@ +1 @@
+/*
+Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+(function()
+{
+        var encodeContent = function( data )
+        {
+                return encodeURIComponent( data ).replace( /--/g, "%2D%2D" );           // Protect comments in comment.
+        };
+
+        var createProtectedElement = function( realElement )
+        {
+                var realdata = ( typeof realElement == 'string' ) ? realElement : realElement.getOuterHtml(),
+                        realdata = restoreProtectedElement( realdata, false ),                                  // Restore inner text to avoid the second pass.
+                        content = "cke_protected(" + encodeContent( realdata ) + ")",
+                        doc = CKEDITOR.document;
+                        
+                return doc.createElement( doc.$.createComment( content ) );
+        };
+
+        var createProtectedParserElement = function( element )
+        {
+                var writer = new CKEDITOR.htmlParser.basicWriter(); 
+                element.writeHtml( writer );
+
+                var content = restoreProtectedElement( writer.getHtml(), false );                       // Restore inner text to avoid the second pass.
+                content = "cke_protected(" + encodeContent( content ) + ")";
+                return new CKEDITOR.htmlParser.comment( content );
+        };
+
+        var restoreProtectedElement = function( content, forParser )
+        {
+                if ( forParser )
+                {
+                        var realData = content.match( /^cke_protected\((.*?)\)$/i );
+                        if ( realData )
+                        {
+                                realData = decodeURIComponent( realData[1] );
+                                return new CKEDITOR.htmlParser.text( realData, true );  // true = protect content.
+                        }
+                        return content;
+                }
+                else
+                {
+                        content = content.replace(/<\!--cke_protected\((.*?)\)-->/g, 
+                                function( comment )
+                                        {
+                                                return decodeURIComponent(
+                                                                comment.substr( 18, ( comment.length -22 ) )                                    // Get the content. 
+                                                        );
+                                        }
+                        );
+                        return content;
+                }
+        };
+        
+        CKEDITOR.plugins.add( 'protectedsource',
+        {
+                afterInit : function( editor )
+                {
+                        var protectedSource = editor.config.protectedSource,
+                                dataProcessor = editor.dataProcessor,
+                                dataFilter = dataProcessor && dataProcessor.dataFilter,
+                                htmlFilter = dataProcessor && dataProcessor.htmlFilter;
+
+                        if ( !dataFilter || !htmlFilter )
+                                return;
+
+                        var rules = 
+                        {
+                                regExp : [],
+                                elements : []
+                        };
+
+                        // Create rules.
+                        for ( var i=0; i < protectedSource.length; i++ )
+                        {
+                                var rule = protectedSource[ i ];
+                                if ( rule.regExp )
+                                {
+                                        rules.regExp.push(
+                                                {
+                                                        regExp : rule.regExp,
+                                                        replaceWith : rule.replaceWith || function ( data ) 
+                                                        {
+                                                                return createProtectedElement( data ).getOuterHtml();
+                                                        }
+                                                }
+                                        );
+                                }
+                                else if ( rule.element )
+                                        rules.elements[ rule.element ] = createProtectedParserElement;
+                        }
+
+                        // Add rules: Html to Data;
+                        dataFilter.addRules( rules );
+                                
+                        // Add rules: Data to Html.
+                        htmlFilter.addRules(
+                                {
+                                        comment : function( content )
+                                        {
+                                                return restoreProtectedElement( content, true );
+                                        }
+                                }
+                        );
+
+                }
+        });
+})();
+
+CKEDITOR.config.protectedSource =
+[
+        {       // Protect existing coments before anything.
+                regExp : /<\!--[\s\S]*?-->/g
+        },
+        {
+                name : 'ASP',
+                regExp : /<%[\s\S]*?%>/g
+        },
+        {
+                name : 'ASP.Net',
+                regExp : /(<asp:[^\>]+>[\s|\S]*?<\/asp:[^\>]+>)|(<asp:[^\>]+\/>)/gi
+        },
+        {
+                name : 'php',
+                regExp : /<\?[\s\S]*?\?>/g
+        },
+        {
+                name : 'style',
+                regExp : /<style[^>]*>(.|\n|\r)*?<\/style[^>]*>/g
+        },
+        {
+                name : 'script',
+                element : 'script'
+        }
+]