Ticket #3407: 3407.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 )
                                                 break;
 
                                         writeName = element.name;
@@ -135 +135 @@
                                 attributes = element.attributes;
                         }
 
+                        if ( element.type == CKEDITOR.NODE_TEXT )
+                        {
+                                writer.text( element.value );
+                                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/fakeobjects/plugin.js

@@ -11 +11 @@
                 {
                         $ : function( element )
                         {
-                                var realHtml = element.attributes._cke_realelement,
-                                        realFragment = realHtml && new CKEDITOR.htmlParser.fragment.fromHtml( decodeURIComponent( realHtml ) ),
-                                        realElement = realFragment && realFragment.children[ 0 ];
+                                var realHtml = element.attributes && element.attributes._cke_realelement;
+                                realHtml = realHtml && decodeURIComponent( realHtml );
 
+                                if ( realHtml && element.attributes._cke_protect )
+                                        return new CKEDITOR.htmlParser.text( realHtml, true );
+
+                                var realFragment = realHtml && new CKEDITOR.htmlParser.fragment.fromHtml( realHtml ),
+                                realElement = realFragment && realFragment.children[ 0 ];
+
                                 if ( realElement )
                                 {
                                         // If we have width/height in the element, we must move it into
@@ -60 +65 @@
         });
 })();
 
-CKEDITOR.editor.prototype.createFakeElement = function( realElement, className, realElementType, isResizable )
+CKEDITOR.editor.prototype.createFakeElement = function( realElement, className, realElementType, isResizable, protectContent )
 {
         var attributes =
         {
                 'class' : className,
                 src : CKEDITOR.getUrl( 'images/spacer.gif' ),
-                _cke_realelement : encodeURIComponent( realElement.getOuterHtml() )
+                _cke_realelement : encodeURIComponent( ( typeof realElement == 'string' ) ? realElement : realElement.getOuterHtml() )
         };
         if ( realElementType )
                 attributes._cke_real_element_type = realElementType;
         if ( isResizable )
                 attributes._cke_resizable = isResizable;
+        if ( protectContent )
+                attributes._cke_protect = true;
 
-        return this.document.createElement( 'img', { attributes : attributes } );
+        var document = this.document || CKEDITOR.document;
+        return document.createElement( 'img', { attributes : attributes } );
 };
 
-CKEDITOR.editor.prototype.createFakeParserElement = function( realElement, className, realElementType, isResizable )
+CKEDITOR.editor.prototype.createFakeParserElement = function( realElement, className, realElementType, isResizable, protectContent )
 {
         var writer = new CKEDITOR.htmlParser.basicWriter();
 
@@ -91 +99 @@
                 _cke_realelement : encodeURIComponent( html )
         };
 
+        if ( protectContent )
+                attributes._cke_protect = true;
+
         if ( realElementType )
                 attributes._cke_real_element_type = realElementType;
 

_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 +151 @@
                         // 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
+*/
+
+CKEDITOR.plugins.add( 'protectedsource',
+{
+        requires : [ 'fakeobjects' ],
+
+        afterInit : function( editor )
+        {
+                var protectedSource = editor.config.protectedSource;
+                if ( !protectedSource )
+                        return;
+
+                var dataProcessor = editor.dataProcessor,
+                        dataFilter = dataProcessor && dataProcessor.dataFilter,
+                        htmlFilter = dataProcessor && dataProcessor.htmlFilter;
+
+                if ( !dataFilter || !htmlFilter )
+                        return;
+
+                editor.addCss(
+                        'img.cke_code' +
+                        '{' +
+                                'background-image: url(' + CKEDITOR.getUrl( this.path + 'images/code.gif' ) + ');' +
+                                'background-position: center center;' +
+                                'background-repeat: no-repeat;' +
+                                'border: 1px solid #a9a9a9;' +
+                                'width: 32px;' +
+                                'height: 32px;' +
+                        '}'     );
+                
+                var regExpRules = 
+                {
+                        regExp : []
+                };
+
+                for ( var i=0; i < protectedSource.length; i++ )
+                {
+                        var rule = protectedSource[ i ];
+                        regExpRules.regExp.push(
+                                (function( rule )                       // Remember proper context.
+                                        {
+                                                return {
+                                                        regExp : rule.regExp,
+                                                        replaceWith : function ( data ) 
+                                                        {
+                                                                return ( rule.editable ? 
+                                                                        editor.createFakeElement( data, rule.className || "cke_code", rule.name, false, true ).getOuterHtml()
+                                                                :
+                                                                        editor.createProtectedElement( data ).getOuterHtml());
+                                                        }
+                                                };
+                                        })( rule )
+                        );
+                }
+
+                // Add rules: Html to Data;
+                dataFilter.addRules( regExpRules );
+                        
+                // Add rules: Data to Html.
+                htmlFilter.addRules(
+                        {
+                                comment : function( content )
+                                {
+                                        var realData = content.match( /^cke_protected\((.*?)\)$/i );
+                                        if ( realData )
+                                        {
+                                                realData = decodeURIComponent( realData[1] );
+                                                return new CKEDITOR.htmlParser.text( realData, true );
+                                        }
+                                }
+                        }
+                );
+        }
+});
+
+
+CKEDITOR.editor.prototype.createProtectedElement = function( realElement )
+{
+        var content = "cke_protected(" + encodeURIComponent( ( typeof realElement == 'string' ) ? realElement : realElement.getOuterHtml() ) + ")";
+        var document = this.document || CKEDITOR.document;
+
+        return document.createElement( document.$.createComment( content ) );
+};
+
+CKEDITOR.config.protectedSource =
+[
+        {
+                name : "ASP",
+                regExp : /<%[\s\S]*?%>/g,
+                editable : false
+        },
+        {
+                name : "ASP.Net",
+                regExp : /(<asp:[^\>]+>[\s|\S]*?<\/asp:[^\>]+>)|(<asp:[^\>]+\/>)/gi,
+                editable : false
+        },
+        {
+                name : "php",
+                regExp : /<\?[\s\S]*?\?>/g,
+                editable : false
+        },
+        {
+                name : "script",
+                regExp : /<script[^>]*>(.|\n|\r)*?<\/script[^>]*>/g,
+                editable : false
+        }
+]