Index: /FCKeditor/trunk/PackageDefinition.xml =================================================================== --- /FCKeditor/trunk/PackageDefinition.xml (revision 131) +++ /FCKeditor/trunk/PackageDefinition.xml (revision 132) @@ -1,5 +1,25 @@ + - + Index: /FCKeditor/trunk/_dev/browserbugs/firefox/baseruntime.html =================================================================== --- /FCKeditor/trunk/_dev/browserbugs/firefox/baseruntime.html (revision 131) +++ /FCKeditor/trunk/_dev/browserbugs/firefox/baseruntime.html (revision 132) @@ -11,5 +11,5 @@ return ; var base = document.createElement( 'BASE' ) ; - + //var html = '' ; document.getElementsByTagName("HEAD")[0].appendChild( base ) ; Index: /FCKeditor/trunk/_dev/browserbugs/firefox/deletetable.html =================================================================== --- /FCKeditor/trunk/_dev/browserbugs/firefox/deletetable.html (revision 131) +++ /FCKeditor/trunk/_dev/browserbugs/firefox/deletetable.html (revision 132) @@ -62,5 +62,5 @@

- Select the table and hit <DEL> or <BACKSPACE> (actually, there + Select the table and hit <DEL> or <BACKSPACE> (actually, there is no way to select the table).
Index: /FCKeditor/trunk/_dev/browserbugs/firefox/docwrite.html =================================================================== --- /FCKeditor/trunk/_dev/browserbugs/firefox/docwrite.html (revision 131) +++ /FCKeditor/trunk/_dev/browserbugs/firefox/docwrite.html (revision 132) @@ -6,5 +6,5 @@ window.onload = function() { - var oIFrame = document.createElement('iframe') ; + var oIFrame = document.createElement('iframe') ; oIFrame.frameBorder = 0 ; oIFrame.style.border = '#000000 1px solid' ; @@ -12,5 +12,5 @@ document.body.appendChild( oIFrame ) ; - + var oDoc = oIFrame.contentWindow.document ; @@ -20,10 +20,10 @@ oDoc.write( '' ) ; - oDoc.write( + oDoc.write( '' ) ; - + oDoc.write( '' ) ; oDoc.write( 'This is a Test Case.' ) ; Index: /FCKeditor/trunk/_dev/browserbugs/firefox/geckohistorybug2.html =================================================================== --- /FCKeditor/trunk/_dev/browserbugs/firefox/geckohistorybug2.html (revision 131) +++ /FCKeditor/trunk/_dev/browserbugs/firefox/geckohistorybug2.html (revision 132) @@ -5,5 +5,5 @@ @@ -144,9 +159,9 @@ - Match + Match case

- Match + Match whole word
Index: /FCKeditor/trunk/_samples/_plugins/findreplace/lang/en.js =================================================================== --- /FCKeditor/trunk/_samples/_plugins/findreplace/lang/en.js (revision 131) +++ /FCKeditor/trunk/_samples/_plugins/findreplace/lang/en.js (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header - - English language file for the sample plugin. - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * English language file for the sample plugin. + */ FCKLang['DlgMyReplaceTitle'] = 'Plugin - Replace' ; Index: /FCKeditor/trunk/_samples/_plugins/findreplace/lang/fr.js =================================================================== --- /FCKeditor/trunk/_samples/_plugins/findreplace/lang/fr.js (revision 131) +++ /FCKeditor/trunk/_samples/_plugins/findreplace/lang/fr.js (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header - - French language file for the sample plugin. - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * French language file for the sample plugin. + */ FCKLang['DlgMyReplaceTitle'] = 'Plugin - Remplacer' ; Index: /FCKeditor/trunk/_samples/_plugins/findreplace/lang/it.js =================================================================== --- /FCKeditor/trunk/_samples/_plugins/findreplace/lang/it.js (revision 131) +++ /FCKeditor/trunk/_samples/_plugins/findreplace/lang/it.js (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header - - Italian language file for the sample plugin. - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Italian language file for the sample plugin. + */ FCKLang['DlgMyReplaceTitle'] = 'Plugin - Sostituisci' ; Index: /FCKeditor/trunk/_samples/_plugins/findreplace/replace.html =================================================================== --- /FCKeditor/trunk/_samples/_plugins/findreplace/replace.html (revision 131) +++ /FCKeditor/trunk/_samples/_plugins/findreplace/replace.html (revision 132) @@ -1,12 +1,27 @@ - - @@ -25,6 +40,6 @@ function btnStat(frm) { - document.getElementById('btnReplace').disabled = - document.getElementById('btnReplaceAll').disabled = + document.getElementById('btnReplace').disabled = + document.getElementById('btnReplaceAll').disabled = ( document.getElementById('txtFind').value.length == 0 ) ; } @@ -51,5 +66,5 @@ return true ; } - + return hasFound ; } @@ -61,9 +76,9 @@ else var sExpr = document.getElementById('txtFind').value ; - + return sExpr ; } -function GetCase() +function GetCase() { return ( document.getElementById('chkCase').checked ? '' : 'i' ) ; @@ -99,5 +114,5 @@ - Replace + Replace with: @@ -109,8 +124,8 @@ - Match + Match case
- Match + Match whole word Index: /FCKeditor/trunk/_samples/_plugins/samples/fckplugin.js =================================================================== --- /FCKeditor/trunk/_samples/_plugins/samples/fckplugin.js (revision 131) +++ /FCKeditor/trunk/_samples/_plugins/samples/fckplugin.js (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header - - This is a sample plugin definition file. - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * This is a sample plugin definition file. + */ // Here we define our custom Style combo, with custom widths. @@ -25,5 +41,5 @@ // Get image URL (src). var sUrl = FCKSelection.GetSelectedElement().src ; - + // Open the URL in a new window. window.top.open( sUrl ) ; Index: /FCKeditor/trunk/_samples/afp/fck.afpa.code =================================================================== --- /FCKeditor/trunk/_samples/afp/fck.afpa.code (revision 131) +++ /FCKeditor/trunk/_samples/afp/fck.afpa.code (revision 132) @@ -1,29 +1,23 @@ * FCKeditor - The text editor for Internet - http://www.fckeditor.net * Copyright (C) 2003-2007 Frederico Caldeira Knabben - * + * * == BEGIN LICENSE == - * + * * Licensed under the terms of any of the following licenses at your * choice: - * + * * - GNU General Public License Version 2 or later (the "GPL") * http://www.gnu.org/licenses/gpl.html - * + * * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") * http://www.gnu.org/licenses/lgpl.html - * + * * - Mozilla Public License Version 1.1 or later (the "MPL") * http://www.mozilla.org/MPL/MPL-1.1.html - * + * * == END LICENSE == - * - * File Name: fxk.afp.code - * This is the class definition file for the sample pages. - * - * Version: 1.01 - * Modified: 2006-11-13 - * - * File Authors: Soenke Freitag (contact at www.afp-hosting.de) - * + * + * This is the class definition file for the sample pages. + * DEFINE CLASS fckeditor AS custom Index: /FCKeditor/trunk/_samples/afp/sample01.afp =================================================================== --- /FCKeditor/trunk/_samples/afp/sample01.afp (revision 131) +++ /FCKeditor/trunk/_samples/afp/sample01.afp (revision 132) @@ -1,30 +1,24 @@ -<% +<% * FCKeditor - The text editor for Internet - http://www.fckeditor.net * Copyright (C) 2003-2007 Frederico Caldeira Knabben - * + * * == BEGIN LICENSE == - * + * * Licensed under the terms of any of the following licenses at your * choice: - * + * * - GNU General Public License Version 2 or later (the "GPL") * http://www.gnu.org/licenses/gpl.html - * + * * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") * http://www.gnu.org/licenses/lgpl.html - * + * * - Mozilla Public License Version 1.1 or later (the "MPL") * http://www.mozilla.org/MPL/MPL-1.1.html - * + * * == END LICENSE == - * - * File Name: sampleposteddata.php - * This page lists the data posted by a form. - * - * Version: 1.0 - * Modified: 2005-07-01 - * - * File Authors: Soenke Freitag (www.afp-hosting.de) - * + * + * This page lists the data posted by a form. + * %> @@ -50,8 +44,8 @@ oFCKeditor = CREATEOBJECT("FCKeditor") oFCKeditor.fckeditor("FCKeditor1") - oFCKeditor.BasePath = sBasePath + oFCKeditor.BasePath = sBasePath oFCKeditor.cValue = lcText - ? oFCKeditor.Create() + ? oFCKeditor.Create() %> Index: /FCKeditor/trunk/_samples/afp/sample02.afp =================================================================== --- /FCKeditor/trunk/_samples/afp/sample02.afp (revision 131) +++ /FCKeditor/trunk/_samples/afp/sample02.afp (revision 132) @@ -1,31 +1,24 @@ -<% +<% * FCKeditor - The text editor for Internet - http://www.fckeditor.net * Copyright (C) 2003-2007 Frederico Caldeira Knabben - * + * * == BEGIN LICENSE == - * + * * Licensed under the terms of any of the following licenses at your * choice: - * + * * - GNU General Public License Version 2 or later (the "GPL") * http://www.gnu.org/licenses/gpl.html - * + * * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") * http://www.gnu.org/licenses/lgpl.html - * + * * - Mozilla Public License Version 1.1 or later (the "MPL") * http://www.mozilla.org/MPL/MPL-1.1.html - * + * * == END LICENSE == * - * File Name: sample02.afp - * This page is a basic Sample for FCKeditor integration in the AFP script language (www.afpages.de) - * - * Version: 1.00 - * Modified: 2006-11-13 - * - * File Authors: Soenke Freitag (contact at www.afp-hosting.de) - * Frederico Caldeira Knabben (fredck@fckeditor.net) - + * This page is a basic Sample for FCKeditor integration in the AFP script language (www.afpages.de) + * %> @@ -46,18 +39,18 @@ } oCombo.value = editorInstance.Language.ActiveLanguage.Code ; - } - + } + function AddComboOption(combo, optionText, optionValue) { var oOption = document.createElement("OPTION") ; - + combo.options.add(oOption) ; - + oOption.innerHTML = optionText ; oOption.value = optionValue ; - + return oOption ; } - + function ChangeLanguage( languageCode ) { @@ -86,5 +79,5 @@ sBasePath="../../../fckeditor/" && Change this to your local path - + oFCKeditor = CREATEOBJECT("FCKeditor") oFCKeditor.fckeditor("FCKeditor1") @@ -93,5 +86,5 @@ lcLanguage=request.querystring("Lang") && Request Parameter lcLanguage=oFCKeditor.StripAttacks(lcLanguage) && Remove special escape characters - IF EMPTY(lcLanguage) + IF EMPTY(lcLanguage) oFCKeditor.aconfig[1,1]="AutoDetectLanguage" oFCKeditor.aconfig[1,2]="true" @@ -108,8 +101,8 @@ lcText=lcText+[FCKeditor.] - oFCKeditor.BasePath = sBasePath + oFCKeditor.BasePath = sBasePath oFCKeditor.cValue = lcText - ? oFCKeditor.Create() + ? oFCKeditor.Create() %> Index: /FCKeditor/trunk/_samples/afp/sample03.afp =================================================================== --- /FCKeditor/trunk/_samples/afp/sample03.afp (revision 131) +++ /FCKeditor/trunk/_samples/afp/sample03.afp (revision 132) @@ -1,31 +1,24 @@ -<% +<% * FCKeditor - The text editor for Internet - http://www.fckeditor.net * Copyright (C) 2003-2007 Frederico Caldeira Knabben - * + * * == BEGIN LICENSE == - * + * * Licensed under the terms of any of the following licenses at your * choice: - * + * * - GNU General Public License Version 2 or later (the "GPL") * http://www.gnu.org/licenses/gpl.html - * + * * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") * http://www.gnu.org/licenses/lgpl.html - * + * * - Mozilla Public License Version 1.1 or later (the "MPL") * http://www.mozilla.org/MPL/MPL-1.1.html - * + * * == END LICENSE == - * - * File Name: sample03.afp - * This page is a basic Sample for FCKeditor integration in the AFP script language (www.afpages.de) - * - * Version: 1.00 - * Modified: 2006-11-13 - * - * File Authors: Soenke Freitag (contact at www.afp-hosting.de) - * Frederico Caldeira Knabben (fredck@fckeditor.net) - + * + * This page is a basic Sample for FCKeditor integration in the AFP script language (www.afpages.de) + * %> @@ -44,5 +37,5 @@ oCombo.style.visibility = '' ; } - + function ChangeToolbar( toolbarName ) { @@ -73,5 +66,5 @@ sBasePath="../../../fckeditor/" && Change this to your local path - + oFCKeditor = CREATEOBJECT("FCKeditor") oFCKeditor.fckeditor("FCKeditor1") @@ -79,5 +72,5 @@ lcToolbar=request.querystring("Toolbar") && Request Parameter lcToolbar=oFCKeditor.StripAttacks(lcToolbar) && Remove special escape characters - IF !EMPTY(lcToolbar) + IF !EMPTY(lcToolbar) oFCKeditor.ToolbarSet=lcToolbar ENDIF @@ -86,9 +79,9 @@ lcText=lcText+[FCKeditor.] - oFCKeditor.BasePath = sBasePath + oFCKeditor.BasePath = sBasePath oFCKeditor.cValue = lcText - - ? oFCKeditor.Create() - + + ? oFCKeditor.Create() + %>
Index: /FCKeditor/trunk/_samples/afp/sample04.afp =================================================================== --- /FCKeditor/trunk/_samples/afp/sample04.afp (revision 131) +++ /FCKeditor/trunk/_samples/afp/sample04.afp (revision 132) @@ -1,31 +1,24 @@ -<% +<% * FCKeditor - The text editor for Internet - http://www.fckeditor.net * Copyright (C) 2003-2007 Frederico Caldeira Knabben - * + * * == BEGIN LICENSE == - * + * * Licensed under the terms of any of the following licenses at your * choice: - * + * * - GNU General Public License Version 2 or later (the "GPL") * http://www.gnu.org/licenses/gpl.html - * + * * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") * http://www.gnu.org/licenses/lgpl.html - * + * * - Mozilla Public License Version 1.1 or later (the "MPL") * http://www.mozilla.org/MPL/MPL-1.1.html - * + * * == END LICENSE == - * - * File Name: sample04.afp - * This page is a basic Sample for FCKeditor integration in the AFP script language (www.afpages.de) - * - * Version: 1.00 - * Modified: 2006-11-13 - * - * File Authors: Soenke Freitag (contact at www.afp-hosting.de) - * Frederico Caldeira Knabben (fredck@fckeditor.net) - + * + * This page is a basic Sample for FCKeditor integration in the AFP script language (www.afpages.de) + * %> @@ -41,13 +34,13 @@ { var oCombo = document.getElementById( 'cmbSkins' ) ; - + // Get the active skin. var sSkin = editorInstance.Config['SkinPath'] ; sSkin = sSkin.match( /[^\/]+(?=\/$)/g ) ; - + oCombo.value = sSkin ; oCombo.style.visibility = '' ; } - + function ChangeSkin( skinName ) { @@ -79,23 +72,23 @@ sBasePath="../../../fckeditor/" && <-- Change this to your local path - + oFCKeditor = CREATEOBJECT("FCKeditor") oFCKeditor.fckeditor("FCKeditor1") - + lcSkin=request.querystring("Skin") && Request Parameter lcSkin=oFCKeditor.StripAttacks(lcSkin) && Remove special escape characters - IF !EMPTY(lcSkin) + IF !EMPTY(lcSkin) oFCKeditor.aconfig[1,1]="SkinPath" oFCKeditor.aconfig[1,2]="/fckeditor/editor/skins/"+lcSkin+"/" && <-- Change this to your local path ENDIF - + lcText=[This is some sample text. You are using ] lcText=lcText+[FCKeditor.] - oFCKeditor.BasePath = sBasePath + oFCKeditor.BasePath = sBasePath oFCKeditor.cValue = lcText - - ? oFCKeditor.Create() - + + ? oFCKeditor.Create() + %>
Index: /FCKeditor/trunk/_samples/afp/sampleposteddata.afp =================================================================== --- /FCKeditor/trunk/_samples/afp/sampleposteddata.afp (revision 131) +++ /FCKeditor/trunk/_samples/afp/sampleposteddata.afp (revision 132) @@ -1,30 +1,24 @@ -<% +<% * FCKeditor - The text editor for Internet - http://www.fckeditor.net * Copyright (C) 2003-2007 Frederico Caldeira Knabben - * + * * == BEGIN LICENSE == - * + * * Licensed under the terms of any of the following licenses at your * choice: - * + * * - GNU General Public License Version 2 or later (the "GPL") * http://www.gnu.org/licenses/gpl.html - * + * * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") * http://www.gnu.org/licenses/lgpl.html - * + * * - Mozilla Public License Version 1.1 or later (the "MPL") * http://www.mozilla.org/MPL/MPL-1.1.html - * + * * == END LICENSE == - * - * File Name: sampleposteddata.php - * This page lists the data posted by a form. - * - * Version: 1.0 - * Modified: 2005-07-01 - * - * File Authors: Soenke Freitag (www.afp-hosting.de) - * + * + * This page lists the data posted by a form. + * %> @@ -52,10 +46,10 @@ lcZeile=ALLTRIM(MLINE(lcForm,lnLoop)) IF AT("=",lcZeile)>0 - lcVariable=UPPER(ALLTRIM(LEFT(lcZeile,AT("=",lcZeile)-1))) + lcVariable=UPPER(ALLTRIM(LEFT(lcZeile,AT("=",lcZeile)-1))) lcWert=ALLTRIM(RIGHT(lcZeile,LEN(lcZeile)-AT("=",lcZeile))) - lcWert=Server.UrlDecode( lcWert ) + lcWert=Server.UrlDecode( lcWert ) lcWert=STRTRAN(lcWert,"<","<") lcWert=STRTRAN(lcWert,">",">") && ... if wanted remove/translate HTML Chars ... - + ? []+lcVariable+[ =]+lcWert+[] ENDIF Index: /FCKeditor/trunk/_samples/asp/sample01.asp =================================================================== --- /FCKeditor/trunk/_samples/asp/sample01.asp (revision 131) +++ /FCKeditor/trunk/_samples/asp/sample01.asp (revision 132) @@ -1,9 +1,25 @@ -<%@ codepage="65001" language="VBScript" %> +<%@ codepage="65001" language="VBScript" %> <% Option Explicit %> - <% ' You must set "Enable Parent Paths" on your web site in order this relative include to work. %> Index: /FCKeditor/trunk/_samples/asp/sample02.asp =================================================================== --- /FCKeditor/trunk/_samples/asp/sample02.asp (revision 131) +++ /FCKeditor/trunk/_samples/asp/sample02.asp (revision 132) @@ -1,9 +1,25 @@ -<%@ CodePage=65001 Language="VBScript"%> +<%@ CodePage=65001 Language="VBScript"%> <% Option Explicit %> - <% ' You must set "Enable Parent Paths" on your web site in order this relative include to work. %> @@ -26,5 +42,5 @@ } oCombo.value = editorInstance.Language.ActiveLanguage.Code ; -} +} function AddComboOption(combo, optionText, optionValue) @@ -36,5 +52,5 @@ oOption.innerHTML = optionText ; oOption.value = optionValue ; - + return oOption ; } Index: /FCKeditor/trunk/_samples/asp/sample03.asp =================================================================== --- /FCKeditor/trunk/_samples/asp/sample03.asp (revision 131) +++ /FCKeditor/trunk/_samples/asp/sample03.asp (revision 132) @@ -1,9 +1,25 @@ -<%@ CodePage=65001 Language="VBScript"%> +<%@ CodePage=65001 Language="VBScript"%> <% Option Explicit %> - <% ' You must set "Enable Parent Paths" on your web site in order this relative include to work. %> Index: /FCKeditor/trunk/_samples/asp/sample04.asp =================================================================== --- /FCKeditor/trunk/_samples/asp/sample04.asp (revision 131) +++ /FCKeditor/trunk/_samples/asp/sample04.asp (revision 132) @@ -1,9 +1,25 @@ -<%@ CodePage=65001 Language="VBScript"%> +<%@ CodePage=65001 Language="VBScript"%> <% Option Explicit %> - <% ' You must set "Enable Parent Paths" on your web site in order this relative include to work. %> @@ -21,9 +37,9 @@ { var oCombo = document.getElementById( 'cmbSkins' ) ; - + // Get the active skin. var sSkin = editorInstance.Config['SkinPath'] ; sSkin = sSkin.match( /[^\/]+(?=\/$)/g ) ; - + oCombo.value = sSkin ; oCombo.style.visibility = '' ; Index: /FCKeditor/trunk/_samples/asp/sampleposteddata.asp =================================================================== --- /FCKeditor/trunk/_samples/asp/sampleposteddata.asp (revision 131) +++ /FCKeditor/trunk/_samples/asp/sampleposteddata.asp (revision 132) @@ -1,9 +1,25 @@ <%@ CodePage=65001 Language="VBScript"%> <% Option Explicit %> - @@ -24,7 +40,7 @@ Value - <% + <% Dim sForm - For Each sForm in Request.Form + For Each sForm in Request.Form %> Index: /FCKeditor/trunk/_samples/cfm/sample01.cfm =================================================================== --- /FCKeditor/trunk/_samples/cfm/sample01.cfm (revision 131) +++ /FCKeditor/trunk/_samples/cfm/sample01.cfm (revision 132) @@ -1,10 +1,24 @@ - @@ -22,5 +36,5 @@
FCKeditor - ColdFusion - Sample 1
- + This sample displays a normal HTML form with a FCKeditor with full features enabled; invoked by a ColdFusion Custom Tag / Module.
@@ -28,5 +42,5 @@ - - @@ -11,5 +26,5 @@ * You must set the url path to the base directory for your media files (images, flash, files) * The best position for this variable is in your Application.cfm file - * + * * Possible variable scopes are: * @@ -69,6 +84,6 @@ - Index: /FCKeditor/trunk/_samples/default.html =================================================================== --- /FCKeditor/trunk/_samples/default.html (revision 131) +++ /FCKeditor/trunk/_samples/default.html (revision 132) @@ -1,9 +1,25 @@ - - Index: /FCKeditor/trunk/_samples/html/sample01.html =================================================================== --- /FCKeditor/trunk/_samples/html/sample01.html (revision 131) +++ /FCKeditor/trunk/_samples/html/sample01.html (revision 132) @@ -1,8 +1,24 @@ - - Index: /FCKeditor/trunk/_samples/html/sample02.html =================================================================== --- /FCKeditor/trunk/_samples/html/sample02.html (revision 131) +++ /FCKeditor/trunk/_samples/html/sample02.html (revision 132) @@ -1,8 +1,24 @@ - - Index: /FCKeditor/trunk/_samples/html/sample03.html =================================================================== --- /FCKeditor/trunk/_samples/html/sample03.html (revision 131) +++ /FCKeditor/trunk/_samples/html/sample03.html (revision 132) @@ -1,8 +1,24 @@ - - @@ -23,7 +39,7 @@ var oCombo = document.getElementById( 'cmbLanguages' ) ; - + var aLanguages = new Array() ; - + for ( code in editorInstance.Language.AvailableLanguages ) aLanguages.push( { Code : code, Name : editorInstance.Language.AvailableLanguages[code] } ) ; @@ -33,9 +49,9 @@ for ( var i = 0 ; i < aLanguages.length ; i++ ) AddComboOption( oCombo, aLanguages[i].Name + ' (' + aLanguages[i].Code + ')', aLanguages[i].Code ) ; - + oCombo.value = editorInstance.Language.ActiveLanguage.Code ; - + document.getElementById('eNumLangs').innerHTML = '(' + aLanguages.length + ' languages available!)' ; - + bIsLoaded = true ; } @@ -54,5 +70,5 @@ oOption.innerHTML = optionText ; oOption.value = optionValue ; - + return oOption ; } Index: /FCKeditor/trunk/_samples/html/sample04.html =================================================================== --- /FCKeditor/trunk/_samples/html/sample04.html (revision 131) +++ /FCKeditor/trunk/_samples/html/sample04.html (revision 132) @@ -1,8 +1,24 @@ - Index: /FCKeditor/trunk/_samples/html/sample05.html =================================================================== --- /FCKeditor/trunk/_samples/html/sample05.html (revision 131) +++ /FCKeditor/trunk/_samples/html/sample05.html (revision 132) @@ -1,8 +1,24 @@ - - @@ -18,9 +34,9 @@ { var oCombo = document.getElementById( 'cmbSkins' ) ; - + // Get the active skin. var sSkin = editorInstance.Config['SkinPath'] ; sSkin = sSkin.match( /[^\/]+(?=\/$)/g ) ; - + oCombo.value = sSkin ; oCombo.style.visibility = '' ; @@ -88,5 +104,5 @@ sSkinPath + 'images/toolbar.buttonarrow.gif' ; break ; - + case 'silver' : oFCKeditor.Config['PreloadImages'] = Index: /FCKeditor/trunk/_samples/html/sample06.config.js =================================================================== --- /FCKeditor/trunk/_samples/html/sample06.config.js (revision 131) +++ /FCKeditor/trunk/_samples/html/sample06.config.js (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header - - Sample custom configuration settings used in the plugin sample page (sample06). - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Sample custom configuration settings used in the plugin sample page (sample06). + */ // Set our sample toolbar. Index: /FCKeditor/trunk/_samples/html/sample06.html =================================================================== --- /FCKeditor/trunk/_samples/html/sample06.html (revision 131) +++ /FCKeditor/trunk/_samples/html/sample06.html (revision 132) @@ -1,8 +1,24 @@ - Index: /FCKeditor/trunk/_samples/html/sample07.html =================================================================== --- /FCKeditor/trunk/_samples/html/sample07.html (revision 131) +++ /FCKeditor/trunk/_samples/html/sample07.html (revision 132) @@ -1,8 +1,24 @@ - - Index: /FCKeditor/trunk/_samples/html/sample08.html =================================================================== --- /FCKeditor/trunk/_samples/html/sample08.html (revision 131) +++ /FCKeditor/trunk/_samples/html/sample08.html (revision 132) @@ -1,8 +1,24 @@ - - @@ -111,5 +127,5 @@ // Get the editor instance that we want to interact with. var oEditor = FCKeditorAPI.GetInstance('FCKeditor1') ; - alert( oEditor.IsDirty() ) ; + alert( oEditor.IsDirty() ) ; } @@ -118,5 +134,5 @@ // Get the editor instance that we want to interact with. var oEditor = FCKeditorAPI.GetInstance('FCKeditor1') ; - oEditor.ResetIsDirty() ; + oEditor.ResetIsDirty() ; alert( 'The "IsDirty" status has been reset' ) ; } Index: /FCKeditor/trunk/_samples/html/sample09.html =================================================================== --- /FCKeditor/trunk/_samples/html/sample09.html (revision 131) +++ /FCKeditor/trunk/_samples/html/sample09.html (revision 132) @@ -1,8 +1,24 @@ - - Index: /FCKeditor/trunk/_samples/html/sample10.html =================================================================== --- /FCKeditor/trunk/_samples/html/sample10.html (revision 131) +++ /FCKeditor/trunk/_samples/html/sample10.html (revision 132) @@ -1,8 +1,24 @@ - - Index: /FCKeditor/trunk/_samples/html/sample11.html =================================================================== --- /FCKeditor/trunk/_samples/html/sample11.html (revision 131) +++ /FCKeditor/trunk/_samples/html/sample11.html (revision 132) @@ -1,8 +1,24 @@ - - Index: /FCKeditor/trunk/_samples/html/sample11_frame.html =================================================================== --- /FCKeditor/trunk/_samples/html/sample11_frame.html (revision 131) +++ /FCKeditor/trunk/_samples/html/sample11_frame.html (revision 132) @@ -1,7 +1,23 @@ - Index: /FCKeditor/trunk/_samples/html/sample12.html =================================================================== --- /FCKeditor/trunk/_samples/html/sample12.html (revision 131) +++ /FCKeditor/trunk/_samples/html/sample12.html (revision 132) @@ -1,8 +1,24 @@ - - Index: /FCKeditor/trunk/_samples/html/sample13.html =================================================================== --- /FCKeditor/trunk/_samples/html/sample13.html (revision 131) +++ /FCKeditor/trunk/_samples/html/sample13.html (revision 132) @@ -1,10 +1,24 @@ - - @@ -27,5 +41,5 @@ var eTextareaDiv = document.getElementById( '_Textarea' ) ; var eFCKeditorDiv = document.getElementById( '_FCKeditor' ) ; - + // If the _Textarea DIV is visible, switch to FCKeditor. if ( eTextareaDiv.style.display != 'none' ) @@ -41,9 +55,9 @@ oEditor.SetHTML( document.getElementById('_DataTextarea').value ) ; } - + // Switch the DIVs display. eTextareaDiv.style.display = 'none' ; eFCKeditorDiv.style.display = '' ; - + // This is a hack for Gecko 1.0.x ... it stops editing when the editor is hidden. if ( oEditor && !document.all ) @@ -68,5 +82,5 @@ // Copy the value of the current textarea, to the textarea that will be used by the editor. document.getElementById('_DataFCKeditor').value = document.getElementById('_DataTextarea').value ; - + // Automatically calculates the editor base path based on the _samples directory. // This is usefull only for these samples. A real application should use something like this: Index: /FCKeditor/trunk/_samples/html/sampleposteddata.asp =================================================================== --- /FCKeditor/trunk/_samples/html/sampleposteddata.asp (revision 131) +++ /FCKeditor/trunk/_samples/html/sampleposteddata.asp (revision 132) @@ -1,8 +1,24 @@ - Index: /FCKeditor/trunk/_samples/html/sampleposteddata.html =================================================================== --- /FCKeditor/trunk/_samples/html/sampleposteddata.html (revision 131) +++ /FCKeditor/trunk/_samples/html/sampleposteddata.html (revision 132) @@ -1,9 +1,25 @@ - Index: /FCKeditor/trunk/_samples/lasso/sample01.lasso =================================================================== --- /FCKeditor/trunk/_samples/lasso/sample01.lasso (revision 131) +++ /FCKeditor/trunk/_samples/lasso/sample01.lasso (revision 132) @@ -1,9 +1,25 @@ [//lasso -/* @Packager.Header - - Sample page. - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Sample page. + */ ] @@ -17,5 +33,5 @@
FCKeditor - Lasso - Sample 1
- This sample displays a normal HTML form with an FCKeditor with full features + This sample displays a normal HTML form with an FCKeditor with full features enabled.
@@ -30,5 +46,5 @@ -initialvalue='This is some sample text. You are using FCKeditor.' ); - + $myeditor->create; ] Index: /FCKeditor/trunk/_samples/lasso/sample02.lasso =================================================================== --- /FCKeditor/trunk/_samples/lasso/sample02.lasso (revision 131) +++ /FCKeditor/trunk/_samples/lasso/sample02.lasso (revision 132) @@ -1,9 +1,25 @@ [//lasso -/* @Packager.Header - - Sample page. - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Sample page. + */ ] @@ -24,5 +40,5 @@ } oCombo.value = editorInstance.Language.ActiveLanguage.Code ; -} +} function AddComboOption(combo, optionText, optionValue) @@ -34,5 +50,5 @@ oOption.innerHTML = optionText ; oOption.value = optionValue ; - + return oOption ; } @@ -84,5 +100,5 @@ -initialvalue='This is some sample text. You are using FCKeditor.' ); - + $myeditor->create; ] Index: /FCKeditor/trunk/_samples/lasso/sample03.lasso =================================================================== --- /FCKeditor/trunk/_samples/lasso/sample03.lasso (revision 131) +++ /FCKeditor/trunk/_samples/lasso/sample03.lasso (revision 132) @@ -1,9 +1,25 @@ [//lasso -/* @Packager.Header - - Sample page. - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Sample page. + */ ] @@ -62,5 +78,5 @@ $myeditor->toolbarset = action_param('Toolbar'); /if; - + $myeditor->create; ] Index: /FCKeditor/trunk/_samples/lasso/sample04.lasso =================================================================== --- /FCKeditor/trunk/_samples/lasso/sample04.lasso (revision 131) +++ /FCKeditor/trunk/_samples/lasso/sample04.lasso (revision 132) @@ -1,9 +1,25 @@ [//lasso -/* @Packager.Header - - Sample page. - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Sample page. + */ ] @@ -19,9 +35,9 @@ { var oCombo = document.getElementById( 'cmbSkins' ) ; - + // Get the active skin. var sSkin = editorInstance.Config['SkinPath'] ; sSkin = sSkin.match( /[^\/]+(?=\/$)/g ) ; - + oCombo.value = sSkin ; oCombo.style.visibility = '' ; @@ -64,9 +80,9 @@ -initialvalue='This is some sample text. You are using FCKeditor.' ); - + if(action_param('Skin')); $myeditor->config = array('SkinPath' = $basepath + 'editor/skins/' + action_param('Skin') + '/'); /if; - + $myeditor->create; ] Index: /FCKeditor/trunk/_samples/lasso/sampleposteddata.lasso =================================================================== --- /FCKeditor/trunk/_samples/lasso/sampleposteddata.lasso (revision 131) +++ /FCKeditor/trunk/_samples/lasso/sampleposteddata.lasso (revision 132) @@ -1,10 +1,25 @@ [//lasso -/* @Packager.Header - - Sample page. - - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Sample page. + */ ] Index: /FCKeditor/trunk/_samples/perl/sample01.cgi =================================================================== --- /FCKeditor/trunk/_samples/perl/sample01.cgi (revision 131) +++ /FCKeditor/trunk/_samples/perl/sample01.cgi (revision 132) @@ -1,9 +1,25 @@ -#!/usr/bin/env perl +#!/usr/bin/env perl -##### @Packager.Header -# -# Sample page. -# -# +##### +# FCKeditor - The text editor for Internet - http://www.fckeditor.net +# Copyright (C) 2003-2007 Frederico Caldeira Knabben +# +# == BEGIN LICENSE == +# +# Licensed under the terms of any of the following licenses at your +# choice: +# +# - GNU General Public License Version 2 or later (the "GPL") +# http://www.gnu.org/licenses/gpl.html +# +# - GNU Lesser General Public License Version 2.1 or later (the "LGPL") +# http://www.gnu.org/licenses/lgpl.html +# +# - Mozilla Public License Version 1.1 or later (the "MPL") +# http://www.mozilla.org/MPL/MPL-1.1.html +# +# == END LICENSE == +# +# Sample page. ##### @@ -55,5 +71,5 @@
FCKeditor - Perl - Sample 1
- This sample displays a normal HTML form with an FCKeditor with full features + This sample displays a normal HTML form with an FCKeditor with full features enabled.
Index: /FCKeditor/trunk/_samples/perl/sample02.cgi =================================================================== --- /FCKeditor/trunk/_samples/perl/sample02.cgi (revision 131) +++ /FCKeditor/trunk/_samples/perl/sample02.cgi (revision 132) @@ -1,9 +1,25 @@ -#!/usr/bin/env perl +#!/usr/bin/env perl -##### @Packager.Header -# -# Sample page. -# -# +##### +# FCKeditor - The text editor for Internet - http://www.fckeditor.net +# Copyright (C) 2003-2007 Frederico Caldeira Knabben +# +# == BEGIN LICENSE == +# +# Licensed under the terms of any of the following licenses at your +# choice: +# +# - GNU General Public License Version 2 or later (the "GPL") +# http://www.gnu.org/licenses/gpl.html +# +# - GNU Lesser General Public License Version 2.1 or later (the "LGPL") +# http://www.gnu.org/licenses/lgpl.html +# +# - Mozilla Public License Version 1.1 or later (the "MPL") +# http://www.mozilla.org/MPL/MPL-1.1.html +# +# == END LICENSE == +# +# Sample page. ##### @@ -79,5 +95,5 @@ } oCombo.value = editorInstance.Language.ActiveLanguage.Code ; -} +} function AddComboOption(combo, optionText, optionValue) @@ -89,5 +105,5 @@ oOption.innerHTML = optionText ; oOption.value = optionValue ; - + return oOption ; } Index: /FCKeditor/trunk/_samples/perl/sample03.cgi =================================================================== --- /FCKeditor/trunk/_samples/perl/sample03.cgi (revision 131) +++ /FCKeditor/trunk/_samples/perl/sample03.cgi (revision 132) @@ -1,9 +1,25 @@ -#!/usr/bin/env perl +#!/usr/bin/env perl -##### @Packager.Header -# -# Sample page. -# -# +##### +# FCKeditor - The text editor for Internet - http://www.fckeditor.net +# Copyright (C) 2003-2007 Frederico Caldeira Knabben +# +# == BEGIN LICENSE == +# +# Licensed under the terms of any of the following licenses at your +# choice: +# +# - GNU General Public License Version 2 or later (the "GPL") +# http://www.gnu.org/licenses/gpl.html +# +# - GNU Lesser General Public License Version 2.1 or later (the "LGPL") +# http://www.gnu.org/licenses/lgpl.html +# +# - Mozilla Public License Version 1.1 or later (the "MPL") +# http://www.mozilla.org/MPL/MPL-1.1.html +# +# == END LICENSE == +# +# Sample page. ##### Index: /FCKeditor/trunk/_samples/perl/sample04.cgi =================================================================== --- /FCKeditor/trunk/_samples/perl/sample04.cgi (revision 131) +++ /FCKeditor/trunk/_samples/perl/sample04.cgi (revision 132) @@ -1,9 +1,25 @@ -#!/usr/bin/env perl +#!/usr/bin/env perl -##### @Packager.Header -# -# Sample page. -# -# +##### +# FCKeditor - The text editor for Internet - http://www.fckeditor.net +# Copyright (C) 2003-2007 Frederico Caldeira Knabben +# +# == BEGIN LICENSE == +# +# Licensed under the terms of any of the following licenses at your +# choice: +# +# - GNU General Public License Version 2 or later (the "GPL") +# http://www.gnu.org/licenses/gpl.html +# +# - GNU Lesser General Public License Version 2.1 or later (the "LGPL") +# http://www.gnu.org/licenses/lgpl.html +# +# - Mozilla Public License Version 1.1 or later (the "MPL") +# http://www.mozilla.org/MPL/MPL-1.1.html +# +# == END LICENSE == +# +# Sample page. ##### Index: /FCKeditor/trunk/_samples/perl/sampleposteddata.cgi =================================================================== --- /FCKeditor/trunk/_samples/perl/sampleposteddata.cgi (revision 131) +++ /FCKeditor/trunk/_samples/perl/sampleposteddata.cgi (revision 132) @@ -1,9 +1,25 @@ -#!/usr/bin/env perl +#!/usr/bin/env perl -##### @Packager.Header -# -# This page lists the data posted by a form. -# -# +##### +# FCKeditor - The text editor for Internet - http://www.fckeditor.net +# Copyright (C) 2003-2007 Frederico Caldeira Knabben +# +# == BEGIN LICENSE == +# +# Licensed under the terms of any of the following licenses at your +# choice: +# +# - GNU General Public License Version 2 or later (the "GPL") +# http://www.gnu.org/licenses/gpl.html +# +# - GNU Lesser General Public License Version 2.1 or later (the "LGPL") +# http://www.gnu.org/licenses/lgpl.html +# +# - Mozilla Public License Version 1.1 or later (the "MPL") +# http://www.mozilla.org/MPL/MPL-1.1.html +# +# == END LICENSE == +# +# This page lists the data posted by a form. ##### Index: /FCKeditor/trunk/_samples/php/sample01.php =================================================================== --- /FCKeditor/trunk/_samples/php/sample01.php (revision 131) +++ /FCKeditor/trunk/_samples/php/sample01.php (revision 132) @@ -1,8 +1,25 @@ - - Sample page. - - -*/ +
FCKeditor - PHP - Sample 1
- This sample displays a normal HTML form with an FCKeditor with full features + This sample displays a normal HTML form with an FCKeditor with full features enabled.
Index: /FCKeditor/trunk/_samples/php/sample02.php =================================================================== --- /FCKeditor/trunk/_samples/php/sample02.php (revision 131) +++ /FCKeditor/trunk/_samples/php/sample02.php (revision 132) @@ -1,8 +1,25 @@ - - Sample page. - - -*/ + - Sample page. - - -*/ + - Sample page. - - -*/ + - This page lists the data posted by a form. - - - -*/ + Index: /FCKeditor/trunk/_samples/py/sample01.py =================================================================== --- /FCKeditor/trunk/_samples/py/sample01.py (revision 131) +++ /FCKeditor/trunk/_samples/py/sample01.py (revision 132) @@ -1,9 +1,25 @@ #!/usr/bin/env python -""" @Packager.Header - - Sample page. - - +""" +FCKeditor - The text editor for Internet - http://www.fckeditor.net +Copyright (C) 2003-2007 Frederico Caldeira Knabben + +== BEGIN LICENSE == + +Licensed under the terms of any of the following licenses at your +choice: + + - GNU General Public License Version 2 or later (the "GPL") + http://www.gnu.org/licenses/gpl.html + + - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + http://www.gnu.org/licenses/lgpl.html + + - Mozilla Public License Version 1.1 or later (the "MPL") + http://www.mozilla.org/MPL/MPL-1.1.html + +== END LICENSE == + +Sample page. """ @@ -29,5 +45,5 @@
FCKeditor - Python - Sample 1
- This sample displays a normal HTML form with an FCKeditor with full features + This sample displays a normal HTML form with an FCKeditor with full features enabled.
@@ -36,5 +52,5 @@ # This is the real work -try: +try: sBasePath = os.environ.get("SCRIPT_NAME") sBasePath = sBasePath[0:sBasePath.find("_samples")] Index: /FCKeditor/trunk/_samples/py/sampleposteddata.py =================================================================== --- /FCKeditor/trunk/_samples/py/sampleposteddata.py (revision 131) +++ /FCKeditor/trunk/_samples/py/sampleposteddata.py (revision 132) @@ -1,9 +1,25 @@ #!/usr/bin/env python -""" @Packager.Header - - This page lists the data posted by a form. - - +""" +FCKeditor - The text editor for Internet - http://www.fckeditor.net +Copyright (C) 2003-2007 Frederico Caldeira Knabben + +== BEGIN LICENSE == + +Licensed under the terms of any of the following licenses at your +choice: + + - GNU General Public License Version 2 or later (the "GPL") + http://www.gnu.org/licenses/gpl.html + + - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + http://www.gnu.org/licenses/lgpl.html + + - Mozilla Public License Version 1.1 or later (the "MPL") + http://www.mozilla.org/MPL/MPL-1.1.html + +== END LICENSE == + +This page lists the data posted by a form. """ @@ -33,5 +49,5 @@ """ -# This is the real work +# This is the real work print """
FCKeditor - Samples - Posted Data
Index: /FCKeditor/trunk/_samples/sample.css =================================================================== --- /FCKeditor/trunk/_samples/sample.css (revision 131) +++ /FCKeditor/trunk/_samples/sample.css (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header - - Styles used in the samples pages. - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Styles used in the samples pages. + */ body, td, input, select, textarea Index: /FCKeditor/trunk/_samples/sampleslist.html =================================================================== --- /FCKeditor/trunk/_samples/sampleslist.html (revision 131) +++ /FCKeditor/trunk/_samples/sampleslist.html (revision 132) @@ -1,8 +1,24 @@ - Index: /FCKeditor/trunk/_test/automated/_jsunit/app/css/readme =================================================================== --- /FCKeditor/trunk/_test/automated/_jsunit/app/css/readme (revision 131) +++ /FCKeditor/trunk/_test/automated/_jsunit/app/css/readme (revision 132) @@ -1,9 +1,9 @@ -this file is required due to differences in behavior between Mozilla/Opera +this file is required due to differences in behavior between Mozilla/Opera and Internet Explorer. main-data.html calls kickOffTests() which calls top.testManager.start() -in the top most frame. top.testManager.start() initializes the output -frames using document.write and HTML containing a relative to the -jsUnitStyle.css file. In MSIE, the base href used to find the CSS file is +in the top most frame. top.testManager.start() initializes the output +frames using document.write and HTML containing a relative to the +jsUnitStyle.css file. In MSIE, the base href used to find the CSS file is that of the top level frame however in Mozilla/Opera the base href is that of main-data.html. This leads to not-found for the jsUnitStyle.css Index: /FCKeditor/trunk/_test/automated/_jsunit/app/jsUnitCore.js =================================================================== --- /FCKeditor/trunk/_test/automated/_jsunit/app/jsUnitCore.js (revision 131) +++ /FCKeditor/trunk/_test/automated/_jsunit/app/jsUnitCore.js (revision 132) @@ -1,3 +1,3 @@ -var JSUNIT_UNDEFINED_VALUE; +var JSUNIT_UNDEFINED_VALUE; var JSUNIT_VERSION = 2.2; var isTestPageLoaded = false; Index: /FCKeditor/trunk/_test/automated/_jsunit/app/jsUnitMockTimeout.js =================================================================== --- /FCKeditor/trunk/_test/automated/_jsunit/app/jsUnitMockTimeout.js (revision 131) +++ /FCKeditor/trunk/_test/automated/_jsunit/app/jsUnitMockTimeout.js (revision 132) @@ -1,3 +1,3 @@ -// Mock setTimeout, clearTimeout +// Mock setTimeout, clearTimeout // Contributed by Pivotal Computer Systems, www.pivotalsf.com Index: /FCKeditor/trunk/_test/automated/_jsunit/app/jsUnitTestManager.js =================================================================== --- /FCKeditor/trunk/_test/automated/_jsunit/app/jsUnitTestManager.js (revision 131) +++ /FCKeditor/trunk/_test/automated/_jsunit/app/jsUnitTestManager.js (revision 132) @@ -1,3 +1,3 @@ -function jsUnitTestManager() { +function jsUnitTestManager() { this._windowForAllProblemMessages = null; Index: /FCKeditor/trunk/_test/automated/_jsunit/app/jsUnitTestSuite.js =================================================================== --- /FCKeditor/trunk/_test/automated/_jsunit/app/jsUnitTestSuite.js (revision 131) +++ /FCKeditor/trunk/_test/automated/_jsunit/app/jsUnitTestSuite.js (revision 132) @@ -1,3 +1,3 @@ -function jsUnitTestSuite() { +function jsUnitTestSuite() { this.isjsUnitTestSuite = true; this.testPages = Array(); Index: /FCKeditor/trunk/_test/automated/_jsunit/app/jsUnitTracer.js =================================================================== --- /FCKeditor/trunk/_test/automated/_jsunit/app/jsUnitTracer.js (revision 131) +++ /FCKeditor/trunk/_test/automated/_jsunit/app/jsUnitTracer.js (revision 132) @@ -1,3 +1,3 @@ -var TRACE_LEVEL_NONE = new JsUnitTraceLevel(0, null); +var TRACE_LEVEL_NONE = new JsUnitTraceLevel(0, null); var TRACE_LEVEL_WARNING = new JsUnitTraceLevel(1, "#FF0000"); var TRACE_LEVEL_INFO = new JsUnitTraceLevel(2, "#009966"); Index: /FCKeditor/trunk/_test/automated/_jsunit/app/jsUnitVersionCheck.js =================================================================== --- /FCKeditor/trunk/_test/automated/_jsunit/app/jsUnitVersionCheck.js (revision 131) +++ /FCKeditor/trunk/_test/automated/_jsunit/app/jsUnitVersionCheck.js (revision 132) @@ -1,3 +1,3 @@ -var versionRequest; +var versionRequest; function isOutOfDate(newVersionNumber) { Index: /FCKeditor/trunk/_test/automated/_jsunit/app/xbDebug.js =================================================================== --- /FCKeditor/trunk/_test/automated/_jsunit/app/xbDebug.js (revision 131) +++ /FCKeditor/trunk/_test/automated/_jsunit/app/xbDebug.js (revision 132) @@ -1,3 +1,3 @@ -// xbDebug.js revision: 0.003 2002-02-26 +// xbDebug.js revision: 0.003 2002-02-26 /* ***** BEGIN LICENSE BLOCK ***** @@ -24,5 +24,5 @@ ChangeLog: -2002-02-25: bclary - modified xbDebugTraceOject to make sure +2002-02-25: bclary - modified xbDebugTraceOject to make sure that original versions of wrapped functions were not rewrapped. This had caused an infinite loop in IE. Index: /FCKeditor/trunk/_test/automated/_jsunit/bin/mac/readme.txt =================================================================== --- /FCKeditor/trunk/_test/automated/_jsunit/bin/mac/readme.txt (revision 131) +++ /FCKeditor/trunk/_test/automated/_jsunit/bin/mac/readme.txt (revision 132) Index: /FCKeditor/trunk/_test/automated/_jsunit/licenses/JDOM_license.txt =================================================================== --- /FCKeditor/trunk/_test/automated/_jsunit/licenses/JDOM_license.txt (revision 131) +++ /FCKeditor/trunk/_test/automated/_jsunit/licenses/JDOM_license.txt (revision 132) @@ -1,3 +1,3 @@ -/*-- +/*-- $Id: JDOM_license.txt 81 2003-07-24 04:44:54Z edwardhieatt $ @@ -5,15 +5,15 @@ Copyright (C) 2000-2003 Jason Hunter & Brett McLaughlin. All rights reserved. - + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - + 1. Redistributions of source code must retain the above copyright notice, this list of conditions, and the following disclaimer. - + 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions, and the disclaimer that follows - these conditions in the documentation and/or other materials + notice, this list of conditions, and the disclaimer that follows + these conditions in the documentation and/or other materials provided with the distribution. @@ -21,15 +21,15 @@ derived from this software without prior written permission. For written permission, please contact . - + 4. Products derived from this software may not be called "JDOM", nor may "JDOM" appear in their name, without prior written permission from the JDOM Project Management . - - In addition, we request (but do not require) that you include in the - end-user documentation provided with the redistribution and/or in the + + In addition, we request (but do not require) that you include in the + end-user documentation provided with the redistribution and/or in the software itself an acknowledgement equivalent to the following: "This product includes software developed by the JDOM Project (http://www.jdom.org/)." - Alternatively, the acknowledgment may be graphical using the logos + Alternatively, the acknowledgment may be graphical using the logos available at http://www.jdom.org/images/logos. @@ -47,10 +47,10 @@ SUCH DAMAGE. - This software consists of voluntary contributions made by many - individuals on behalf of the JDOM Project and was originally + This software consists of voluntary contributions made by many + individuals on behalf of the JDOM Project and was originally created by Jason Hunter and Brett McLaughlin . For more information on the JDOM Project, please see . - + */ Index: /FCKeditor/trunk/_test/automated/_jsunit/licenses/lgpl-2.1.txt =================================================================== --- /FCKeditor/trunk/_test/automated/_jsunit/licenses/lgpl-2.1.txt (revision 131) +++ /FCKeditor/trunk/_test/automated/_jsunit/licenses/lgpl-2.1.txt (revision 132) @@ -149,5 +149,5 @@ writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. - + 1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that Index: /FCKeditor/trunk/_test/automated/default.html =================================================================== --- /FCKeditor/trunk/_test/automated/default.html (revision 131) +++ /FCKeditor/trunk/_test/automated/default.html (revision 132) @@ -1,2 +1,22 @@ + Index: /FCKeditor/trunk/_test/automated/tests/fckdomrange.html =================================================================== --- /FCKeditor/trunk/_test/automated/tests/fckdomrange.html (revision 131) +++ /FCKeditor/trunk/_test/automated/tests/fckdomrange.html (revision 132) @@ -1,3 +1,23 @@ + @@ -17,9 +37,9 @@ var range = new FCKDomRange( window ) ; range.SetStart( document.getElementById('_Span'), 1 ) ; - + assertEquals( 'StartContainer', document.getElementById('_Span'), range.StartContainer ) ; assertEquals( 'StartBlock', document.getElementById('_P'), range.StartBlock ) ; assertEquals( 'StartBlockLimit', document.body, range.StartBlockLimit ) ; - + assertEquals( 'EndContainer', document.getElementById('_Span'), range.EndContainer ) ; assertEquals( 'EndBlock', document.getElementById('_P'), range.EndBlock ) ; @@ -33,9 +53,9 @@ var range = new FCKDomRange( window ) ; range.SetStart( document.getElementById('_Span'), 2 ) ; - + assertEquals( 'StartContainer', document.getElementById('_Span'), range.StartContainer ) ; assertEquals( 'StartBlock', document.getElementById('_P'), range.StartBlock ) ; assertEquals( 'StartBlockLimit', document.body, range.StartBlockLimit ) ; - + assertEquals( 'EndContainer', document.getElementById('_Span'), range.EndContainer ) ; assertEquals( 'EndBlock', document.getElementById('_P'), range.EndBlock ) ; @@ -49,9 +69,9 @@ var range = new FCKDomRange( window ) ; range.SetStart( document.getElementById('_Span'), 3 ) ; - - assertEquals( 'StartContainer', document.getElementById('_P'), range.StartContainer ) ; - assertEquals( 'StartBlock', document.getElementById('_P'), range.StartBlock ) ; - assertEquals( 'StartBlockLimit', document.body, range.StartBlockLimit ) ; - + + assertEquals( 'StartContainer', document.getElementById('_P'), range.StartContainer ) ; + assertEquals( 'StartBlock', document.getElementById('_P'), range.StartBlock ) ; + assertEquals( 'StartBlockLimit', document.body, range.StartBlockLimit ) ; + assertEquals( 'EndContainer', document.getElementById('_P'), range.EndContainer ) ; assertEquals( 'EndBlock', document.getElementById('_P'), range.EndBlock ) ; @@ -65,9 +85,9 @@ var range = new FCKDomRange( window ) ; range.SetStart( document.getElementById('_Span'), 4 ) ; - - assertEquals( 'StartContainer', document.getElementById('_P'), range.StartContainer ) ; - assertEquals( 'StartBlock', document.getElementById('_P'), range.StartBlock ) ; - assertEquals( 'StartBlockLimit', document.body, range.StartBlockLimit ) ; - + + assertEquals( 'StartContainer', document.getElementById('_P'), range.StartContainer ) ; + assertEquals( 'StartBlock', document.getElementById('_P'), range.StartBlock ) ; + assertEquals( 'StartBlockLimit', document.body, range.StartBlockLimit ) ; + assertEquals( 'EndContainer', document.getElementById('_P'), range.EndContainer ) ; assertEquals( 'EndBlock', document.getElementById('_P'), range.EndBlock ) ; @@ -81,9 +101,9 @@ var range = new FCKDomRange( window ) ; range.SetEnd( document.getElementById('_Span'), 1 ) ; - + assertEquals( 'StartContainer', document.getElementById('_Span'), range.StartContainer ) ; assertEquals( 'StartBlock', document.getElementById('_P'), range.StartBlock ) ; assertEquals( 'StartBlockLimit', document.body, range.StartBlockLimit ) ; - + assertEquals( 'EndContainer', document.getElementById('_Span'), range.EndContainer ) ; assertEquals( 'EndBlock', document.getElementById('_P'), range.EndBlock ) ; @@ -97,9 +117,9 @@ var range = new FCKDomRange( window ) ; range.SetEnd( document.getElementById('_Span'), 2 ) ; - + assertEquals( 'StartContainer', document.getElementById('_Span'), range.StartContainer ) ; assertEquals( 'StartBlock', document.getElementById('_P'), range.StartBlock ) ; assertEquals( 'StartBlockLimit', document.body, range.StartBlockLimit ) ; - + assertEquals( 'EndContainer', document.getElementById('_Span'), range.EndContainer ) ; assertEquals( 'EndBlock', document.getElementById('_P'), range.EndBlock ) ; @@ -113,9 +133,9 @@ var range = new FCKDomRange( window ) ; range.SetEnd( document.getElementById('_Span'), 3 ) ; - - assertEquals( 'StartContainer', document.getElementById('_P'), range.StartContainer ) ; - assertEquals( 'StartBlock', document.getElementById('_P'), range.StartBlock ) ; - assertEquals( 'StartBlockLimit', document.body, range.StartBlockLimit ) ; - + + assertEquals( 'StartContainer', document.getElementById('_P'), range.StartContainer ) ; + assertEquals( 'StartBlock', document.getElementById('_P'), range.StartBlock ) ; + assertEquals( 'StartBlockLimit', document.body, range.StartBlockLimit ) ; + assertEquals( 'EndContainer', document.getElementById('_P'), range.EndContainer ) ; assertEquals( 'EndBlock', document.getElementById('_P'), range.EndBlock ) ; @@ -129,9 +149,9 @@ var range = new FCKDomRange( window ) ; range.SetEnd( document.getElementById('_Span'), 4 ) ; - - assertEquals( 'StartContainer', document.getElementById('_P'), range.StartContainer ) ; - assertEquals( 'StartBlock', document.getElementById('_P'), range.StartBlock ) ; - assertEquals( 'StartBlockLimit', document.body, range.StartBlockLimit ) ; - + + assertEquals( 'StartContainer', document.getElementById('_P'), range.StartContainer ) ; + assertEquals( 'StartBlock', document.getElementById('_P'), range.StartBlock ) ; + assertEquals( 'StartBlockLimit', document.body, range.StartBlockLimit ) ; + assertEquals( 'EndContainer', document.getElementById('_P'), range.EndContainer ) ; assertEquals( 'EndBlock', document.getElementById('_P'), range.EndBlock ) ; @@ -145,5 +165,5 @@ var range = new FCKDomRange( window ) ; range.SetStart( document.getElementById('_P'), 1 ) ; - + assertTrue( 'CheckIsCollapsed', range.CheckIsCollapsed() ) ; } @@ -154,20 +174,20 @@ range.SetStart( document.getElementById('_P'), 1 ) ; range.SetEnd( document.getElementById('_Span'), 2 ) ; - - assertEquals( 'StartContainer', document.getElementById('_P'), range.StartContainer ) ; - assertEquals( 'StartBlock', document.getElementById('_P'), range.StartBlock ) ; - assertEquals( 'StartBlockLimit', document.body, range.StartBlockLimit ) ; - + + assertEquals( 'StartContainer', document.getElementById('_P'), range.StartContainer ) ; + assertEquals( 'StartBlock', document.getElementById('_P'), range.StartBlock ) ; + assertEquals( 'StartBlockLimit', document.body, range.StartBlockLimit ) ; + assertEquals( 'EndContainer', document.getElementById('_Span'), range.EndContainer ) ; assertEquals( 'EndBlock', document.getElementById('_P'), range.EndBlock ) ; assertEquals( 'EndBlockLimit', document.body, range.EndBlockLimit ) ; assertFalse( 'CheckIsCollapsed', range.CheckIsCollapsed() ) ; - + range.Collapse( true ) ; - - assertEquals( 'StartContainer', document.getElementById('_P'), range.StartContainer ) ; - assertEquals( 'StartBlock', document.getElementById('_P'), range.StartBlock ) ; - assertEquals( 'StartBlockLimit', document.body, range.StartBlockLimit ) ; - + + assertEquals( 'StartContainer', document.getElementById('_P'), range.StartContainer ) ; + assertEquals( 'StartBlock', document.getElementById('_P'), range.StartBlock ) ; + assertEquals( 'StartBlockLimit', document.body, range.StartBlockLimit ) ; + assertEquals( 'EndContainer', document.getElementById('_P'), range.EndContainer ) ; assertEquals( 'EndBlock', document.getElementById('_P'), range.EndBlock ) ; @@ -181,5 +201,5 @@ range.SetStart( document.getElementById('_P'), 1 ) ; range.SetEnd( document.getElementById('_Strong'), 2 ) ; - + range.DeleteContents() ; @@ -189,5 +209,5 @@ assertEquals( 'StartBlock', document.getElementById('_P'), range.StartBlock ) ; assertEquals( 'StartBlockLimit', document.body, range.StartBlockLimit ) ; - + assertEquals( 'EndContainer', document.getElementById('_P'), range.EndContainer ) ; assertEquals( 'EndBlock', document.getElementById('_P'), range.EndBlock ) ; @@ -202,5 +222,5 @@ range.SetStart( document.getElementById('_P2'), 1 ) ; range.SetEnd( document.getElementById('_Em'), 2 ) ; - + var docFrag = range.ExtractContents() ; @@ -214,5 +234,5 @@ assertEquals( 'StartBlock', document.getElementById('_P2'), range.StartBlock ) ; assertEquals( 'StartBlockLimit', document.body, range.StartBlockLimit ) ; - + assertEquals( 'EndContainer', document.getElementById('_P2'), range.EndContainer ) ; assertEquals( 'EndBlock', document.getElementById('_P2'), range.EndBlock ) ; @@ -227,5 +247,5 @@ range.SetStart( document.getElementById('_P2'), 1 ) ; range.SetEnd( document.getElementById('_Em'), 2 ) ; - + var clone = range.Clone() ; clone.SetStart( document.getElementById('_P'), 1 ) ; @@ -281,5 +301,5 @@ var range = new FCKDomRange( window ) ; range.MoveToElementStart( document.getElementById('_Strong') ) ; - + var eNewNode = document.createElement( 'span' ) ; eNewNode.innerHTML = 'test' ; @@ -301,5 +321,5 @@ var range = new FCKDomRange( window ) ; range.MoveToElementStart( document.getElementById('_Strong') ) ; - + assertTrue( range.CheckIsEmpty() ) ; } @@ -309,5 +329,5 @@ var range = new FCKDomRange( window ) ; range.MoveToNodeContents( document.getElementById('_Strong') ) ; - + assertFalse( range.CheckIsEmpty() ) ; } @@ -393,5 +413,5 @@ range.SetStart( document.getElementById('_Span'), 1 ) ; range.SetEnd( document.getElementById('_P'), 2 ) ; - + assertEquals( '1.StartContainer', document.getElementById('_Span'), range.StartContainer ) ; assertEquals( '1.StartBlock', document.getElementById('_P'), range.StartBlock ) ; @@ -401,7 +421,7 @@ assertEquals( '1.EndBlockLimit', document.body, range.EndBlockLimit ) ; assertFalse( '1.CheckIsCollapsed', range.CheckIsCollapsed() ) ; - + var bookmark = range.CreateBookmark() ; - + range.MoveToElementStart( document.getElementById('_P2') ) ; @@ -434,5 +454,5 @@ var range = new FCKDomRange( window ) ; range.SetStart( document.getElementById('_Span'), 1 ) ; - + assertEquals( '1.StartContainer', document.getElementById('_Span'), range.StartContainer ) ; assertEquals( '1.StartBlock', document.getElementById('_P'), range.StartBlock ) ; @@ -442,7 +462,7 @@ assertEquals( '1.EndBlockLimit', document.body, range.EndBlockLimit ) ; assertTrue( '1.CheckIsCollapsed', range.CheckIsCollapsed() ) ; - + var bookmark = range.CreateBookmark() ; - + range.MoveToNodeContents( document.getElementById('_P2') ) ; @@ -474,5 +494,5 @@ range.SetStart( document.getElementById('_A'), 1 ) ; range.SetEnd( document.getElementById('_Img'), 3 ) ; - + range.Expand( 'block_contents' ) ; @@ -493,5 +513,5 @@ var range = new FCKDomRange( window ) ; range.MoveToNodeContents( document.getElementById('_StrongNoPara') ) ; - + range.Expand( 'block_contents' ) ; @@ -527,5 +547,5 @@ { // Reset the body (because of changes by test functions). - document.body.innerHTML = _BodyHtml ; + document.body.innerHTML = _BodyHtml ; } Index: /FCKeditor/trunk/_test/automated/tests/fcktools.html =================================================================== --- /FCKeditor/trunk/_test/automated/tests/fcktools.html (revision 131) +++ /FCKeditor/trunk/_test/automated/tests/fcktools.html (revision 132) @@ -1,3 +1,23 @@ + @@ -63,7 +83,7 @@ ArrayObject : [ 1, 3, 5 ] } ; - + var clone = FCKTools.CloneObject( original ) ; - + assertEquals( 'original.Text', 'Some Text', original.Text ) ; assertEquals( 'original.Number', 10, original.Number ) ; Index: /FCKeditor/trunk/_test/automated/tests/fckw3crange.html =================================================================== --- /FCKeditor/trunk/_test/automated/tests/fckw3crange.html (revision 131) +++ /FCKeditor/trunk/_test/automated/tests/fckw3crange.html (revision 132) @@ -1,3 +1,23 @@ + @@ -16,8 +36,8 @@ { var range = FCKW3CRange.CreateRange( document ) ; - + assertNotNull( range ) ; assertNotUndefined( range.startContainer ) ; - + if ( range.TypeName == 'FCKW3CRange' ) inform( 'FCKW3CRange is our custom implementation' ) ; @@ -30,5 +50,5 @@ var range = FCKW3CRange.CreateRange( document ) ; range.setStart( document.body, 1 ) ; - + assertEquals( document.body, range.startContainer ) ; assertEquals( 1, range.startOffset ) ; @@ -43,5 +63,5 @@ var range = FCKW3CRange.CreateRange( document ) ; range.setEnd( document.body, 1 ) ; - + assertEquals( document.body, range.startContainer ) ; assertEquals( 1, range.startOffset ) ; @@ -56,5 +76,5 @@ range.setStartAfter( document.getElementById( '_B' ) ) ; range.setStartAfter( document.getElementById( '_H1' ).firstChild ) ; - + assertEquals( 'range.startContainer', document.getElementById( '_H1' ), range.startContainer ) ; assertEquals( 'range.startOffset', 1, range.startOffset ) ; @@ -69,5 +89,5 @@ range.setStartBefore( document.getElementById( '_B' ) ) ; range.setStartBefore( document.getElementById( '_H1' ).firstChild ) ; - + assertEquals( 'range.startContainer', document.getElementById( '_H1' ), range.startContainer ) ; assertEquals( 'range.startOffset', 0, range.startOffset ) ; @@ -82,5 +102,5 @@ range.setEndAfter( document.getElementById( '_H1' ).firstChild ) ; range.setEndAfter( document.getElementById( '_B' ) ) ; - + assertEquals( 'range.startContainer', document.getElementById( '_H1' ), range.startContainer ) ; assertEquals( 'range.startOffset', 1, range.startOffset ) ; @@ -95,5 +115,5 @@ range.setEndBefore( document.getElementById( '_H1' ).firstChild ) ; range.setEndBefore( document.getElementById( '_B' ) ) ; - + assertEquals( 'range.startContainer', document.getElementById( '_H1' ), range.startContainer ) ; assertEquals( 'range.startOffset', 0, range.startOffset ) ; @@ -106,8 +126,8 @@ { var range = FCKW3CRange.CreateRange( document ) ; - + // Test with an Element node. range.selectNodeContents( document.getElementById( '_P' ) ) ; - + assertEquals( 'range.startContainer', document.getElementById( '_P' ), range.startContainer ) ; assertEquals( 'range.startOffset', 0, range.startOffset ) ; @@ -134,6 +154,6 @@ { var range = FCKW3CRange.CreateRange( document ) ; - - range.selectNodeContents( document.getElementById( '_P' ) ) ; + + range.selectNodeContents( document.getElementById( '_P' ) ) ; range.collapse( true ) ; @@ -148,8 +168,8 @@ { var range = FCKW3CRange.CreateRange( document ) ; - + range.selectNodeContents( document.getElementById( '_P' ) ) ; range.collapse( false ) ; - + assertEquals( 'range.startContainer', document.getElementById( '_P' ), range.startContainer ) ; assertEquals( 'range.startOffset', 3, range.startOffset ) ; @@ -185,5 +205,5 @@ range.setStartBefore( document.getElementById( '_P' ) ) ; range.insertNode( eNewNode ) ; - + assertEquals( 'range.startContainer', document.body, range.startContainer ) ; assertEquals( 'range.startOffset', 1, range.startOffset ) ; @@ -241,5 +261,5 @@ range.setStart( document.getElementById( '_H1' ).firstChild, 3 ) ; range.insertNode( eNewNode ) ; - + assertEquals( 'range.startContainer', document.getElementById( '_H1' ).firstChild, range.startContainer ) ; assertEquals( 'range.startOffset', 3, range.startOffset ) ; @@ -292,7 +312,7 @@ range.setStart( document.getElementById( '_P' ).firstChild, 1 ) ; range.setEnd( document.getElementById( '_P' ), 2 ) ; - + range.deleteContents() ; - + assertEquals( 'HTML after deletion', 't text.', GetTestInnerHtml( document.getElementById( '_P' ) ) ) ; @@ -311,7 +331,7 @@ range.setStart( document.getElementById( '_B' ).firstChild, 1 ) ; range.setEnd( document.getElementById( '_B' ).nextSibling, 1 ) ; - + range.deleteContents() ; - + assertEquals( 'this is stext.', GetTestInnerHtml( document.getElementById( '_P' ) ) ) ; @@ -330,7 +350,7 @@ range.setStart( document.getElementById( '_B' ).previousSibling, 1 ) ; range.setEnd( document.getElementById( '_B' ).firstChild, 1 ) ; - + range.deleteContents() ; - + assertEquals( 'tome text.', GetTestInnerHtml( document.getElementById( '_P' ) ) ) ; @@ -351,5 +371,5 @@ range.deleteContents() ; - + assertEquals( '
f
nother paragraph.
', GetTestInnerHtml( document.body ) ) ; @@ -367,5 +387,5 @@ range.setStart( document.getElementById( '_H1' ), 0 ) ; range.setEnd( document.body.lastChild, 1 ) ; - + range.deleteContents() ; @@ -385,5 +405,5 @@ range.setStart( document.body, 0 ) ; range.setEnd( document.body, 2 ) ; - + range.deleteContents() ; @@ -402,5 +422,5 @@ range.selectNodeContents( document.getElementById('_B') ) ; - + range.deleteContents() ; @@ -419,7 +439,7 @@ range.selectNodeContents( document.getElementById('_P') ) ; - + range.deleteContents() ; - + assertEquals( '', GetTestInnerHtml( document.getElementById('_P') ) ) ; @@ -438,7 +458,7 @@ range.setStart( document.getElementById( '_P' ).firstChild, 1 ) ; range.setEnd( document.getElementById( '_P' ), 2 ) ; - + var docFrag = range.extractContents() ; - + var tmpDiv = document.createElement( 'div' ) ; if ( docFrag.AppendTo ) docFrag.AppendTo( tmpDiv ) ; else tmpDiv.appendChild( docFrag ) ; @@ -461,11 +481,11 @@ range.setStart( document.getElementById( '_B' ).firstChild, 1 ) ; range.setEnd( document.getElementById( '_B' ).nextSibling, 2 ) ; - + var docFrag = range.extractContents() ; - - var tmpDiv = document.createElement( 'div' ) ; - if ( docFrag.AppendTo ) docFrag.AppendTo( tmpDiv ) ; else tmpDiv.appendChild( docFrag ) ; - - assertEquals( 'Extracted HTML', 'ome t', GetTestInnerHtml( tmpDiv ) ) ; + + var tmpDiv = document.createElement( 'div' ) ; + if ( docFrag.AppendTo ) docFrag.AppendTo( tmpDiv ) ; else tmpDiv.appendChild( docFrag ) ; + + assertEquals( 'Extracted HTML', 'ome t', GetTestInnerHtml( tmpDiv ) ) ; assertEquals( 'HTML after extraction', 'this is sext.', GetTestInnerHtml( document.getElementById( '_P' ) ) ) ; @@ -484,11 +504,11 @@ range.setStart( document.getElementById( '_B' ).previousSibling, 1 ) ; range.setEnd( document.getElementById( '_B' ).firstChild, 1 ) ; - + var docFrag = range.extractContents() ; - - var tmpDiv = document.createElement( 'div' ) ; - if ( docFrag.AppendTo ) docFrag.AppendTo( tmpDiv ) ; else tmpDiv.appendChild( docFrag ) ; - - assertEquals( 'Extracted HTML', 'his is s', GetTestInnerHtml( tmpDiv ) ) ; + + var tmpDiv = document.createElement( 'div' ) ; + if ( docFrag.AppendTo ) docFrag.AppendTo( tmpDiv ) ; else tmpDiv.appendChild( docFrag ) ; + + assertEquals( 'Extracted HTML', 'his is s', GetTestInnerHtml( tmpDiv ) ) ; assertEquals( 'HTML after extraction', 'tome text.', GetTestInnerHtml( document.getElementById( '_P' ) ) ) ; @@ -509,9 +529,9 @@ var docFrag = range.extractContents() ; - - var tmpDiv = document.createElement( 'div' ) ; - if ( docFrag.AppendTo ) docFrag.AppendTo( tmpDiv ) ; else tmpDiv.appendChild( docFrag ) ; - - assertEquals( 'Extracted HTML', '
ckw3crange test
this is some text.
a
', GetTestInnerHtml( tmpDiv ) ) ; + + var tmpDiv = document.createElement( 'div' ) ; + if ( docFrag.AppendTo ) docFrag.AppendTo( tmpDiv ) ; else tmpDiv.appendChild( docFrag ) ; + + assertEquals( 'Extracted HTML', '
ckw3crange test
this is some text.
a
', GetTestInnerHtml( tmpDiv ) ) ; assertEquals( '
f
nother paragraph.
', GetTestInnerHtml( document.body ) ) ; @@ -529,11 +549,11 @@ range.setStart( document.getElementById( '_H1' ), 0 ) ; range.setEnd( document.body.lastChild, 1 ) ; - + var docFrag = range.extractContents() ; - - var tmpDiv = document.createElement( 'div' ) ; - if ( docFrag.AppendTo ) docFrag.AppendTo( tmpDiv ) ; else tmpDiv.appendChild( docFrag ) ; - - assertEquals( 'Extracted HTML', '
fckw3crange test
this is some text.
another paragraph.
', GetTestInnerHtml( tmpDiv ) ) ; + + var tmpDiv = document.createElement( 'div' ) ; + if ( docFrag.AppendTo ) docFrag.AppendTo( tmpDiv ) ; else tmpDiv.appendChild( docFrag ) ; + + assertEquals( 'Extracted HTML', '
fckw3crange test
this is some text.
another paragraph.
', GetTestInnerHtml( tmpDiv ) ) ; assertEquals( '
', GetTestInnerHtml( document.body ) ) ; @@ -551,11 +571,11 @@ range.setStart( document.body, 0 ) ; range.setEnd( document.body, 2 ) ; - + var docFrag = range.extractContents() ; - - var tmpDiv = document.createElement( 'div' ) ; - if ( docFrag.AppendTo ) docFrag.AppendTo( tmpDiv ) ; else tmpDiv.appendChild( docFrag ) ; - - assertEquals( 'Extracted HTML', '
fckw3crange test
this is some text.
', GetTestInnerHtml( tmpDiv ) ) ; + + var tmpDiv = document.createElement( 'div' ) ; + if ( docFrag.AppendTo ) docFrag.AppendTo( tmpDiv ) ; else tmpDiv.appendChild( docFrag ) ; + + assertEquals( 'Extracted HTML', '
fckw3crange test
this is some text.
', GetTestInnerHtml( tmpDiv ) ) ; assertEquals( '
another paragraph.
', document.body.innerHTML.replace( /id=_H1/, 'id="_H1"' ).toLowerCase().replace( /\n|\r/g, '' ) ) ; @@ -572,11 +592,11 @@ range.selectNodeContents( document.getElementById('_B') ) ; - + var docFrag = range.extractContents() ; - - var tmpDiv = document.createElement( 'div' ) ; - if ( docFrag.AppendTo ) docFrag.AppendTo( tmpDiv ) ; else tmpDiv.appendChild( docFrag ) ; - - assertEquals( 'Extracted HTML', 'some', GetTestInnerHtml( tmpDiv ) ) ; + + var tmpDiv = document.createElement( 'div' ) ; + if ( docFrag.AppendTo ) docFrag.AppendTo( tmpDiv ) ; else tmpDiv.appendChild( docFrag ) ; + + assertEquals( 'Extracted HTML', 'some', GetTestInnerHtml( tmpDiv ) ) ; assertEquals( 'HTML after extraction', '', GetTestInnerHtml( document.getElementById('_B') ) ) ; @@ -593,11 +613,11 @@ range.selectNodeContents( document.getElementById('_P') ) ; - + var docFrag = range.extractContents() ; - - var tmpDiv = document.createElement( 'div' ) ; - if ( docFrag.AppendTo ) docFrag.AppendTo( tmpDiv ) ; else tmpDiv.appendChild( docFrag ) ; - - assertEquals( 'Extracted HTML', 'this is some text.', GetTestInnerHtml( tmpDiv ) ) ; + + var tmpDiv = document.createElement( 'div' ) ; + if ( docFrag.AppendTo ) docFrag.AppendTo( tmpDiv ) ; else tmpDiv.appendChild( docFrag ) ; + + assertEquals( 'Extracted HTML', 'this is some text.', GetTestInnerHtml( tmpDiv ) ) ; assertEquals( 'HTML after extraction', '', GetTestInnerHtml( document.getElementById('_P') ) ) ; @@ -616,12 +636,12 @@ range.setStart( document.getElementById( '_P' ).firstChild, 1 ) ; range.setEnd( document.getElementById( '_P' ), 2 ) ; - + var bodyHtml = document.body.innerHTML ; - + var docFrag = range.cloneContents() ; - - var tmpDiv = document.createElement( 'div' ) ; - if ( docFrag.AppendTo ) docFrag.AppendTo( tmpDiv ) ; else tmpDiv.appendChild( docFrag ) ; - + + var tmpDiv = document.createElement( 'div' ) ; + if ( docFrag.AppendTo ) docFrag.AppendTo( tmpDiv ) ; else tmpDiv.appendChild( docFrag ) ; + assertEquals( 'Cloned HTML', 'his is some', GetTestInnerHtml( tmpDiv ) ) ; @@ -644,13 +664,13 @@ range.setStart( document.getElementById( '_B' ).firstChild, 1 ) ; range.setEnd( document.getElementById( '_B' ).nextSibling, 2 ) ; - + var bodyHtml = document.body.innerHTML ; - + var docFrag = range.cloneContents() ; - - var tmpDiv = document.createElement( 'div' ) ; - if ( docFrag.AppendTo ) docFrag.AppendTo( tmpDiv ) ; else tmpDiv.appendChild( docFrag ) ; - - assertEquals( 'Cloned HTML', 'ome t', GetTestInnerHtml( tmpDiv ) ) ; + + var tmpDiv = document.createElement( 'div' ) ; + if ( docFrag.AppendTo ) docFrag.AppendTo( tmpDiv ) ; else tmpDiv.appendChild( docFrag ) ; + + assertEquals( 'Cloned HTML', 'ome t', GetTestInnerHtml( tmpDiv ) ) ; // The body HTML must remain unchanged. @@ -672,13 +692,13 @@ range.setStart( document.getElementById( '_B' ).previousSibling, 1 ) ; range.setEnd( document.getElementById( '_B' ).firstChild, 1 ) ; - + var bodyHtml = document.body.innerHTML ; - + var docFrag = range.cloneContents() ; - - var tmpDiv = document.createElement( 'div' ) ; - if ( docFrag.AppendTo ) docFrag.AppendTo( tmpDiv ) ; else tmpDiv.appendChild( docFrag ) ; - - assertEquals( 'Cloned HTML', 'his is s', GetTestInnerHtml( tmpDiv ) ) ; + + var tmpDiv = document.createElement( 'div' ) ; + if ( docFrag.AppendTo ) docFrag.AppendTo( tmpDiv ) ; else tmpDiv.appendChild( docFrag ) ; + + assertEquals( 'Cloned HTML', 'his is s', GetTestInnerHtml( tmpDiv ) ) ; // The body HTML must remain unchanged. @@ -702,11 +722,11 @@ var bodyHtml = document.body.innerHTML ; - + var docFrag = range.cloneContents() ; - - var tmpDiv = document.createElement( 'div' ) ; - if ( docFrag.AppendTo ) docFrag.AppendTo( tmpDiv ) ; else tmpDiv.appendChild( docFrag ) ; - - assertEquals( 'Cloned HTML', '
ckw3crange test
this is some text.
a
', GetTestInnerHtml( tmpDiv ) ) ; + + var tmpDiv = document.createElement( 'div' ) ; + if ( docFrag.AppendTo ) docFrag.AppendTo( tmpDiv ) ; else tmpDiv.appendChild( docFrag ) ; + + assertEquals( 'Cloned HTML', '
ckw3crange test
this is some text.
a
', GetTestInnerHtml( tmpDiv ) ) ; // The body HTML must remain unchanged. @@ -727,13 +747,13 @@ range.setStart( document.getElementById( '_H1' ), 0 ) ; range.setEnd( document.body.lastChild, 1 ) ; - + var bodyHtml = document.body.innerHTML ; - + var docFrag = range.cloneContents() ; - - var tmpDiv = document.createElement( 'div' ) ; - if ( docFrag.AppendTo ) docFrag.AppendTo( tmpDiv ) ; else tmpDiv.appendChild( docFrag ) ; - - assertEquals( 'Cloned HTML', '
fckw3crange test
this is some text.
another paragraph.
', GetTestInnerHtml( tmpDiv ) ) ; + + var tmpDiv = document.createElement( 'div' ) ; + if ( docFrag.AppendTo ) docFrag.AppendTo( tmpDiv ) ; else tmpDiv.appendChild( docFrag ) ; + + assertEquals( 'Cloned HTML', '
fckw3crange test
this is some text.
another paragraph.
', GetTestInnerHtml( tmpDiv ) ) ; // The body HTML must remain unchanged. @@ -754,13 +774,13 @@ range.setStart( document.body, 0 ) ; range.setEnd( document.body, 2 ) ; - + var bodyHtml = document.body.innerHTML ; - + var docFrag = range.cloneContents() ; - - var tmpDiv = document.createElement( 'div' ) ; - if ( docFrag.AppendTo ) docFrag.AppendTo( tmpDiv ) ; else tmpDiv.appendChild( docFrag ) ; - - assertEquals( 'Cloned HTML', '
fckw3crange test
this is some text.
', GetTestInnerHtml( tmpDiv ) ) ; + + var tmpDiv = document.createElement( 'div' ) ; + if ( docFrag.AppendTo ) docFrag.AppendTo( tmpDiv ) ; else tmpDiv.appendChild( docFrag ) ; + + assertEquals( 'Cloned HTML', '
fckw3crange test
this is some text.
', GetTestInnerHtml( tmpDiv ) ) ; // The body HTML must remain unchanged. @@ -780,13 +800,13 @@ range.selectNodeContents( document.getElementById('_B') ) ; - + var bodyHtml = document.body.innerHTML ; var docFrag = range.cloneContents() ; - - var tmpDiv = document.createElement( 'div' ) ; - if ( docFrag.AppendTo ) docFrag.AppendTo( tmpDiv ) ; else tmpDiv.appendChild( docFrag ) ; - - assertEquals( 'Cloned HTML', 'some', GetTestInnerHtml( tmpDiv ) ) ; + + var tmpDiv = document.createElement( 'div' ) ; + if ( docFrag.AppendTo ) docFrag.AppendTo( tmpDiv ) ; else tmpDiv.appendChild( docFrag ) ; + + assertEquals( 'Cloned HTML', 'some', GetTestInnerHtml( tmpDiv ) ) ; // The body HTML must remain unchanged. @@ -805,13 +825,13 @@ range.selectNodeContents( document.getElementById('_P') ) ; - + var bodyHtml = document.body.innerHTML ; var docFrag = range.cloneContents() ; - - var tmpDiv = document.createElement( 'div' ) ; - if ( docFrag.AppendTo ) docFrag.AppendTo( tmpDiv ) ; else tmpDiv.appendChild( docFrag ) ; - - assertEquals( 'Cloned HTML', 'this is some text.', GetTestInnerHtml( tmpDiv ) ) ; + + var tmpDiv = document.createElement( 'div' ) ; + if ( docFrag.AppendTo ) docFrag.AppendTo( tmpDiv ) ; else tmpDiv.appendChild( docFrag ) ; + + assertEquals( 'Cloned HTML', 'this is some text.', GetTestInnerHtml( tmpDiv ) ) ; // The body HTML must remain unchanged. @@ -832,5 +852,5 @@ range.setStart( document.getElementById( '_P' ).firstChild, 1 ) ; range.setEnd( document.getElementById( '_P' ), 2 ) ; - + assertEquals( 'his is some', range.toString() ) ; } @@ -844,6 +864,6 @@ range.setStart( document.getElementById( '_B' ).firstChild, 1 ) ; range.setEnd( document.getElementById( '_B' ).nextSibling, 1 ) ; - - assertEquals( 'Cloned HTML', 'ome ', range.toString() ) ; + + assertEquals( 'Cloned HTML', 'ome ', range.toString() ) ; } @@ -856,5 +876,5 @@ range.setEnd( document.getElementById( '_B' ).firstChild, 1 ) ; - assertEquals( 'Cloned HTML', 'his is s', range.toString() ) ; + assertEquals( 'Cloned HTML', 'his is s', range.toString() ) ; } @@ -867,5 +887,5 @@ range.setEnd( document.body.lastChild.firstChild, 1 ) ; - assertEquals( 'Cloned HTML', 'CKW3CRange TestThis is some text.A', range.toString() ) ; + assertEquals( 'Cloned HTML', 'CKW3CRange TestThis is some text.A', range.toString() ) ; } @@ -887,5 +907,5 @@ range.setEnd( document.body, 2 ) ; - assertEquals( 'Cloned HTML', 'FCKW3CRange TestThis is some text.', range.toString() ) ; + assertEquals( 'Cloned HTML', 'FCKW3CRange TestThis is some text.', range.toString() ) ; } @@ -897,5 +917,5 @@ { // Reset the body (because of changes by test functions). - document.body.innerHTML = '
FCKW3CRange Test
This is some text.
Another paragraph.
' ; + document.body.innerHTML = '
FCKW3CRange Test
This is some text.
Another paragraph.
' ; } Index: /FCKeditor/trunk/_test/automated/tests/suite.html =================================================================== --- /FCKeditor/trunk/_test/automated/tests/suite.html (revision 131) +++ /FCKeditor/trunk/_test/automated/tests/suite.html (revision 132) @@ -1,3 +1,23 @@ + @@ -12,9 +32,9 @@ var suite = new top.jsUnitTestSuite() ; - + suite.addTestPage( '../tests/fcktools.html' ) ; suite.addTestPage( '../tests/fckw3crange.html' ) ; suite.addTestPage( '../tests/fckdomrange.html' ) ; - + return suite ; } Index: /FCKeditor/trunk/_test/automated/tests/tests.js =================================================================== --- /FCKeditor/trunk/_test/automated/tests/tests.js (revision 131) +++ /FCKeditor/trunk/_test/automated/tests/tests.js (revision 132) @@ -1,3 +1,24 @@ -if ( window == window.top ) +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + */ + +if ( window == window.top ) window.location = '../_jsunit/testRunner.html?testpage=' + document.location.pathname ; Index: /FCKeditor/trunk/_test/manual/_common/testskin.css =================================================================== --- /FCKeditor/trunk/_test/manual/_common/testskin.css (revision 131) +++ /FCKeditor/trunk/_test/manual/_common/testskin.css (revision 132) @@ -1,5 +1,5 @@ .Default, .Menu { - cursor: default; + cursor: default; background-color: #efefde; } @@ -7,5 +7,5 @@ .Office { - cursor: default; + cursor: default; background-color: #f7f8fd; } @@ -106,5 +106,5 @@ /* Office Skin (applied in the same page) - This is done just for testing. It is used on rare cases where you need to + This is done just for testing. It is used on rare cases where you need to place differente toolbars in the same page. It is not complete. Just the necessary things used in the test pages are set. Index: /FCKeditor/trunk/_test/manual/behaviors/showtableborders.html =================================================================== --- /FCKeditor/trunk/_test/manual/behaviors/showtableborders.html (revision 131) +++ /FCKeditor/trunk/_test/manual/behaviors/showtableborders.html (revision 132) @@ -1,10 +1,30 @@ + Untitled Page Index: /FCKeditor/trunk/_test/manual/fckbrowserinfo/test1.html =================================================================== --- /FCKeditor/trunk/_test/manual/fckbrowserinfo/test1.html (revision 131) +++ /FCKeditor/trunk/_test/manual/fckbrowserinfo/test1.html (revision 132) @@ -1,3 +1,23 @@ + Index: /FCKeditor/trunk/_test/manual/fckcontextmenu/test1.htm =================================================================== --- /FCKeditor/trunk/_test/manual/fckcontextmenu/test1.htm (revision 131) +++ /FCKeditor/trunk/_test/manual/fckcontextmenu/test1.htm (revision 132) @@ -1,3 +1,23 @@ + @@ -6,5 +26,5 @@ // Used by fckconfig -var FCK = new Object() ; +var FCK = new Object() ; // Used by FCKPanel. @@ -30,5 +50,5 @@ @@ -25,5 +45,5 @@ var sSuffix = /msie/.test( navigator.userAgent.toLowerCase() ) ? 'ie' : 'gecko' ; LoadScript( '../../../editor/_source/internals/fcktools_' + sSuffix + '.js' ) ; - + Index: /FCKeditor/trunk/_test/manual/fckenterkey/test1.html =================================================================== --- /FCKeditor/trunk/_test/manual/fckenterkey/test1.html (revision 131) +++ /FCKeditor/trunk/_test/manual/fckenterkey/test1.html (revision 132) @@ -1,2 +1,22 @@ + @@ -23,5 +43,5 @@ { oInnerWindow = innerWindow ; - + oEnterKey = new FCKEnterKey( innerWindow ) ; } Index: /FCKeditor/trunk/_test/manual/fckenterkey/test1_inner.html =================================================================== --- /FCKeditor/trunk/_test/manual/fckenterkey/test1_inner.html (revision 131) +++ /FCKeditor/trunk/_test/manual/fckenterkey/test1_inner.html (revision 132) @@ -1,3 +1,23 @@ + Index: /FCKeditor/trunk/_test/manual/fckimagepreloader/test1.html =================================================================== --- /FCKeditor/trunk/_test/manual/fckimagepreloader/test1.html (revision 131) +++ /FCKeditor/trunk/_test/manual/fckimagepreloader/test1.html (revision 132) @@ -1,3 +1,23 @@ + @@ -19,5 +39,5 @@ oPreloader.OnComplete = LoadImages ; oPreloader.Start() ; - + // To test the undesired behavior, just comment the above Start() call and // uncomment the following line. @@ -31,5 +51,5 @@ var sHtml3 = '' ; var sHtml4 = '' ; - + for ( var i = 0 ; i < 10 ; i++ ) { @@ -39,5 +59,5 @@ sHtml4 += '' ; } - + document.body.innerHTML += sHtml1 + sHtml2 + sHtml3 + sHtml4 ; } Index: /FCKeditor/trunk/_test/manual/fckkeystrokehandler/test1.html =================================================================== --- /FCKeditor/trunk/_test/manual/fckkeystrokehandler/test1.html (revision 131) +++ /FCKeditor/trunk/_test/manual/fckkeystrokehandler/test1.html (revision 132) @@ -1,3 +1,23 @@ + @@ -6,5 +26,5 @@ // Used by fckconfig -var FCK = new Object() ; +var FCK = new Object() ; @@ -26,5 +46,5 @@ var sSuffix = /msie/.test( navigator.userAgent.toLowerCase() ) ? 'ie' : 'gecko' ; LoadScript( '../../../editor/_source/internals/fcktools_' + sSuffix + '.js' ) ; - + @@ -27,5 +47,5 @@ var sSuffix = FCKBrowserInfo.IsIE ? 'ie' : 'gecko' ; LoadScript( '../../../editor/_source/internals/fcktools_' + sSuffix + '.js' ) ; - + ' + document.getElementById( 'xToolbarSpace' ).innerHTML + '' ) ; eTargetDocument.close() ; - + eTargetDocument.oncontextmenu = FCKTools.CancelEvent ; @@ -72,5 +88,5 @@ // have the document DOM ready to be used right away. FCKTools.AppendStyleSheet( eTargetDocument, FCKConfig.SkinPath + 'fck_editor.css' ) ; - + oToolbarSet = eToolbarTarget.__FCKToolbarSet = new FCKToolbarSet( eTargetDocument ) ; oToolbarSet._IFrame = eToolbarIFrame ; @@ -79,5 +95,5 @@ FCK.IECleanup.AddItem( eToolbarTarget, FCKToolbarSet_Target_Cleanup ) ; } - + oToolbarSet.CurrentInstance = FCK ; @@ -90,5 +106,5 @@ { var eToolbarSet = editorInstance.ToolbarSet ; - + if ( eToolbarSet.CurrentInstance == editorInstance ) eToolbarSet.Disable() ; @@ -99,11 +115,11 @@ var oToolbarset = editorInstance.ToolbarSet ; var oInstance = editorInstance || FCK ; - + // Unregister the toolbar window from the current instance. oToolbarset.CurrentInstance.FocusManager.RemoveWindow( oToolbarset._IFrame.contentWindow ) ; - + // Set the new current instance. oToolbarset.CurrentInstance = oInstance ; - + // Register the toolbar window in the current instance. oInstance.FocusManager.AddWindow( oToolbarset._IFrame.contentWindow, true ) ; @@ -125,9 +141,9 @@ var FCKToolbarSet = function( targetDocument ) { - this._Document = targetDocument ; + this._Document = targetDocument ; // Get the element that will hold the elements structure. this._TargetElement = targetDocument.getElementById( 'xToolbar' ) ; - + // Setup the expand and collapse handlers. var eExpandHandle = targetDocument.getElementById( 'xExpandHandle' ) ; @@ -136,5 +152,5 @@ eExpandHandle.title = FCKLang.ToolbarExpand ; eExpandHandle.onclick = FCKToolbarSet_Expand_OnClick ; - + eCollapseHandle.title = FCKLang.ToolbarCollapse ; eCollapseHandle.onclick = FCKToolbarSet_Collapse_OnClick ; @@ -153,5 +169,5 @@ else targetDocument.getElementById( 'xTBLeftBorder' ).style.display = '' ; - + // Set the default properties. this.Toolbars = new Array() ; @@ -186,5 +202,5 @@ this._Document.getElementById( 'xCollapsed' ).style.display = collapse ? '' : 'none' ; this._Document.getElementById( 'xExpanded' ).style.display = collapse ? 'none' : '' ; - + if ( FCKBrowserInfo.IsGecko ) { @@ -200,5 +216,5 @@ this.Items = new Array() ; - + // Reset the array of toolbat items that are active only on WYSIWYG mode. this.ItemsWysiwygOnly = new Array() ; @@ -206,10 +222,10 @@ // Reset the array of toolbar items that are sensitive to the cursor position. this.ItemsContextSensitive = new Array() ; - + // Cleanup the target element. this._TargetElement.innerHTML = '' ; - + var ToolbarSet = FCKConfig.ToolbarSets[toolbarSetName] ; - + if ( !ToolbarSet ) { @@ -217,13 +233,13 @@ return ; } - + this.Toolbars = new Array() ; - - for ( var x = 0 ; x < ToolbarSet.length ; x++ ) + + for ( var x = 0 ; x < ToolbarSet.length ; x++ ) { var oToolbarItems = ToolbarSet[x] ; - + var oToolbar ; - + if ( typeof( oToolbarItems ) == 'string' ) { @@ -234,9 +250,9 @@ { oToolbar = new FCKToolbar() ; - - for ( var j = 0 ; j < oToolbarItems.length ; j++ ) + + for ( var j = 0 ; j < oToolbarItems.length ; j++ ) { var sItem = oToolbarItems[j] ; - + if ( sItem == '-') oToolbar.AddSeparator() ; @@ -252,5 +268,5 @@ if ( !oItem.SourceView ) this.ItemsWysiwygOnly.push( oItem ) ; - + if ( oItem.ContextSensitive ) this.ItemsContextSensitive.push( oItem ) ; @@ -258,13 +274,13 @@ } } - + // oToolbar.AddTerminator() ; } - + oToolbar.Create( this._TargetElement ) ; this.Toolbars[ this.Toolbars.length ] = oToolbar ; } - + FCKTools.DisableSelection( this._Document.getElementById( 'xCollapseHandle' ).parentNode ) ; @@ -311,5 +327,5 @@ var oToolbarSet = editorInstance ? editorInstance.ToolbarSet : this ; var aItems = oToolbarSet.ItemsWysiwygOnly ; - + if ( FCK.EditMode == FCK_EDITMODE_WYSIWYG ) { @@ -329,5 +345,5 @@ for ( var j = 0 ; j < aItems.length ; j++ ) aItems[j].Disable() ; - } + } } @@ -335,7 +351,7 @@ { // FCKDebug.Output( 'Refreshing Commands...' ) ; // @Packager.RemoveLine - + var aItems = ( editorInstance ? editorInstance.ToolbarSet : this ).ItemsContextSensitive ; - + for ( var i = 0 ; i < aItems.length ; i++ ) aItems[i].RefreshState() ; Index: /FCKeditor/trunk/editor/_source/internals/fcktools.js =================================================================== --- /FCKeditor/trunk/editor/_source/internals/fcktools.js (revision 131) +++ /FCKeditor/trunk/editor/_source/internals/fcktools.js (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header - - Utility functions. - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Utility functions. + */ // Constant for the Gecko Bogus Node. @@ -52,16 +68,16 @@ if ( FCKBrowserInfo.IsSafari && !document.parentWindow ) this.FixDocumentParentWindow( window.top ) ; - + return document.parentWindow || document.defaultView ; } /* - This is a Safari specific function that fix the reference to the parent + This is a Safari specific function that fix the reference to the parent window from the document object. */ FCKTools.FixDocumentParentWindow = function( targetWindow ) { - targetWindow.document.parentWindow = targetWindow ; - + targetWindow.document.parentWindow = targetWindow ; + for ( var i = 0 ; i < targetWindow.frames.length ; i++ ) FCKTools.FixDocumentParentWindow( targetWindow.frames[i] ) ; @@ -88,5 +104,5 @@ oOption.text = optionText ; - oOption.value = optionValue ; + oOption.value = optionValue ; selectElement.options.add(oOption) ; @@ -103,5 +119,5 @@ FCKTools.SetTimeout = function( func, milliseconds, thisObject, paramsArray, timerWindow ) { - return ( timerWindow || window ).setTimeout( + return ( timerWindow || window ).setTimeout( function() { @@ -116,5 +132,5 @@ FCKTools.SetInterval = function( func, milliseconds, thisObject, paramsArray, timerWindow ) { - return ( timerWindow || window ).setInterval( + return ( timerWindow || window ).setInterval( function() { @@ -159,10 +175,10 @@ { var aAllParams = [] ; - + for ( var i = 0 ; i < arguments.length ; i++ ) aAllParams.push( arguments[i] ) ; func.apply( this, aAllParams.concat( params ) ) ; - } + } return f ; @@ -181,7 +197,7 @@ startIndex = startIndex || 0 ; maxLength = maxLength || args.length ; - + var argsArray = new Array() ; - + for ( var i = startIndex ; i < startIndex + maxLength && i < args.length ; i++ ) argsArray.push( args[i] ) ; Index: /FCKeditor/trunk/editor/_source/internals/fcktools_gecko.js =================================================================== --- /FCKeditor/trunk/editor/_source/internals/fcktools_gecko.js (revision 131) +++ /FCKeditor/trunk/editor/_source/internals/fcktools_gecko.js (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header - - Utility functions. (Gecko version). - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Utility functions. (Gecko version). + */ FCKTools.CancelEvent = function( e ) @@ -15,5 +31,5 @@ { if ( FCKBrowserInfo.IsGecko ) - element.style.MozUserSelect = 'none' ; // Gecko only. + element.style.MozUserSelect = 'none' ; // Gecko only. else element.style.userSelect = 'none' ; // CSS3 (not supported yet). @@ -47,5 +63,5 @@ // Create the array that will hold all Ids. var aIds = new Array() ; - + // Define a recursive function that search for the Ids. var fGetIds = function( parent ) @@ -54,13 +70,13 @@ { var sId = parent.childNodes[i].id ; - + // Check if the Id is defined for the element. if ( sId && sId.length > 0 ) aIds[ aIds.length ] = sId ; - + // Recursive call. fGetIds( parent.childNodes[i] ) ; } } - + // Start the recursive calls. fGetIds( parentElement ) ; @@ -74,8 +90,8 @@ { var oFragment = e.ownerDocument.createDocumentFragment() ; - + for ( var i = 0 ; i < e.childNodes.length ; i++ ) oFragment.appendChild( e.childNodes[i].cloneNode(true) ) ; - + e.parentNode.replaceChild( oFragment, e ) ; } @@ -111,11 +127,11 @@ FCKTools.AddEventListenerEx = function( sourceObject, eventName, listener, paramsArray ) { - sourceObject.addEventListener( - eventName, + sourceObject.addEventListener( + eventName, function( e ) { listener.apply( sourceObject, [ e ].concat( paramsArray || [] ) ) ; }, - false + false ) ; } @@ -130,5 +146,5 @@ { var oSavedStyles = new Object() ; - + if ( element.className.length > 0 ) { @@ -160,6 +176,6 @@ FCKTools.RegisterDollarFunction = function( targetWindow ) { - targetWindow.$ = function( id ) - { + targetWindow.$ = function( id ) + { return this.document.getElementById( id ) ; } ; @@ -178,5 +194,5 @@ // Initializes the Coordinates object that will be returned by the function. var c = { X:0, Y:0 } ; - + var oWindow = relativeWindow || window ; @@ -190,5 +206,5 @@ // Check for non "static" elements. // 'FCKConfig.FloatingPanelsZIndex' -- Submenus are under a positioned IFRAME. - if ( sPosition && sPosition != 'static' && el.style.zIndex != FCKConfig.FloatingPanelsZIndex ) + if ( sPosition && sPosition != 'static' && el.style.zIndex != FCKConfig.FloatingPanelsZIndex ) break ; Index: /FCKeditor/trunk/editor/_source/internals/fcktools_ie.js =================================================================== --- /FCKeditor/trunk/editor/_source/internals/fcktools_ie.js (revision 131) +++ /FCKeditor/trunk/editor/_source/internals/fcktools_ie.js (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header - - Utility functions. (IE version). - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Utility functions. (IE version). + */ FCKTools.CancelEvent = function( e ) @@ -44,5 +60,5 @@ { var aObjs ; - + switch ( object ) { @@ -50,5 +66,5 @@ aObjs = [ 'MSXML2.XmlHttp', 'Microsoft.XmlHttp' ] ; break ; - + case 'DOMDocument' : aObjs = [ 'MSXML2.DOMDocument', 'Microsoft.XmlDom' ] ; @@ -59,8 +75,8 @@ { try { return new ActiveXObject( aObjs[i] ) ; } - catch (e) + catch (e) {} } - + if ( FCKLang.NoActiveX ) { @@ -99,5 +115,5 @@ // Try with the doc element. var oPos = { X : oDoc.documentElement.scrollLeft, Y : oDoc.documentElement.scrollTop } ; - + if ( oPos.X > 0 || oPos.Y > 0 ) return oPos ; @@ -130,8 +146,8 @@ return listener.apply( o.Source, [ ev ].concat( o.Params ) ) ; } - + if ( FCK.IECleanup ) FCK.IECleanup.AddItem( null, function() { o.Source = null ; o.Params = null ; } ) ; - + sourceObject.attachEvent( 'on' + eventName, o.Listener ) ; @@ -144,5 +160,5 @@ { var oSizeSource ; - + var oDoc = win.document.documentElement ; if ( oDoc && oDoc.clientWidth ) // IE6 Strict Mode @@ -150,5 +166,5 @@ else oSizeSource = top.document.body ; // Other IEs - + if ( oSizeSource ) return { Width : oSizeSource.clientWidth, Height : oSizeSource.clientHeight } ; @@ -160,5 +176,5 @@ { var oSavedStyles = new Object() ; - + if ( element.className.length > 0 ) { @@ -174,5 +190,5 @@ element.style.cssText = '' ; } - + return oSavedStyles ; } Index: /FCKeditor/trunk/editor/_source/internals/fckundo_gecko.js =================================================================== --- /FCKeditor/trunk/editor/_source/internals/fckundo_gecko.js (revision 131) +++ /FCKeditor/trunk/editor/_source/internals/fckundo_gecko.js (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header - - Fake implementation to ignore calls on Gecko. - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Fake implementation to ignore calls on Gecko. + */ var FCKUndo = new Object() ; Index: /FCKeditor/trunk/editor/_source/internals/fckundo_ie.js =================================================================== --- /FCKeditor/trunk/editor/_source/internals/fckundo_ie.js (revision 131) +++ /FCKeditor/trunk/editor/_source/internals/fckundo_ie.js (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header - - IE specific implementation for the Undo/Redo system. - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * IE specific implementation for the Undo/Redo system. + */ var FCKUndo = new Object() ; @@ -88,5 +104,5 @@ { var oData = FCKUndo.SavedData[ level ] ; - + if ( !oData ) return ; @@ -96,5 +112,5 @@ // FCK.EditorDocument.body.innerHTML = oData[0] ; - if ( oData[1] ) + if ( oData[1] ) { var oRange = FCK.EditorDocument.selection.createRange() ; @@ -102,6 +118,6 @@ oRange.select() ; } - - FCKUndo.TypesCount = 0 ; + + FCKUndo.TypesCount = 0 ; FCKUndo.Typing = false ; } Index: /FCKeditor/trunk/editor/_source/internals/fckurlparams.js =================================================================== --- /FCKeditor/trunk/editor/_source/internals/fckurlparams.js (revision 131) +++ /FCKeditor/trunk/editor/_source/internals/fckurlparams.js (revision 132) @@ -1,9 +1,25 @@ -/* @Packager.Header - - Defines the FCKURLParams object that is used to get all parameters - passed by the URL QueryString (after the "?"). - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Defines the FCKURLParams object that is used to get all parameters + * passed by the URL QueryString (after the "?"). + */ // #### URLParams: holds all URL passed parameters (like ?Param1=Value1&Param2=Value2) Index: /FCKeditor/trunk/editor/_source/internals/fckxhtml.js =================================================================== --- /FCKeditor/trunk/editor/_source/internals/fckxhtml.js (revision 131) +++ /FCKeditor/trunk/editor/_source/internals/fckxhtml.js (revision 132) @@ -1,9 +1,24 @@ -/* @Packager.Header - - Defines the FCKXHtml object, responsible for the XHTML operations. - - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Defines the FCKXHtml object, responsible for the XHTML operations. + */ var FCKXHtml = new Object() ; @@ -14,9 +29,9 @@ { FCKXHtmlEntities.Initialize() ; - + // Save the current IsDirty state. The XHTML processor may change the // original HTML, dirtying it. var bIsDirty = FCK.IsDirty() ; - + this._CreateNode = FCKConfig.ForceStrongEm ? FCKXHtml_CreateNode_StrongEm : FCKXHtml_CreateNode_Normal ; @@ -42,8 +57,8 @@ this.XML = null ; - + // Strip the "XHTML" root node. sXHTML = sXHTML.substr( 7, sXHTML.length - 15 ).Trim() ; - + // Remove the trailing
added by Gecko. // REMOVE: Maybe the following is not anymore necessary because a similar @@ -67,5 +82,5 @@ sXHTML = sXHTML.replace( oRegex, FCKXHtml.SpecialBlocks[i] ) ; } - + // Replace entities marker with the ampersand. sXHTML = sXHTML.replace( FCKRegexLib.GeckoEntitiesMarker, '&' ) ; @@ -88,9 +103,9 @@ if ( FCKConfig.ForceSimpleAmpersand ) attributeValue = attributeValue.replace( /&/g, '___FCKAmp___' ) ; - + // Entities must be replaced in the attribute values. attributeValue = attributeValue.replace( FCKXHtmlEntities.EntitiesRegex, FCKXHtml_GetEntity ) ; } - + // Create the attribute. var oXmlAtt = this.XML.createAttribute( attributeName ) ; @@ -112,5 +127,5 @@ var iCount = 0 ; - + var oNode = htmlNode.firstChild ; @@ -122,5 +137,5 @@ oNode = oNode.nextSibling ; } - + if ( iCount == 0 ) { @@ -130,7 +145,7 @@ return xmlNode ; } - + var sNodeName = xmlNode.nodeName ; - + // Some inline elements are required to have something inside (span, strong, etc...). if ( FCKListsLib.InlineChildReqElements[ sNodeName ] ) @@ -142,5 +157,5 @@ xmlNode.appendChild( this.XML.createTextNode('') ) ; } - + return xmlNode ; } @@ -156,14 +171,14 @@ case 1 : - // Here we found an element that is not the real element, but a + // Here we found an element that is not the real element, but a // fake one (like the Flash placeholder image), so we must get the real one. if ( htmlNode.getAttribute('_fckfakelement') ) return FCKXHtml._AppendNode( xmlNode, FCK.GetRealElement( htmlNode ) ) ; - + // Mozilla insert custom nodes in the DOM. if ( FCKBrowserInfo.IsGecko && htmlNode.hasAttribute('_moz_editor_bogus_node') ) return false ; - - // This is for elements that are instrumental to FCKeditor and + + // This is for elements that are instrumental to FCKeditor and // must be removed from the final HTML. if ( htmlNode.getAttribute('_fcktemp') ) @@ -172,5 +187,5 @@ // Get the element name. var sNodeName = htmlNode.tagName.toLowerCase() ; - + if ( FCKBrowserInfo.IsIE ) { @@ -201,8 +216,8 @@ var oNode = this._CreateNode( sNodeName ) ; - + // Add all attributes. FCKXHtml._AppendAttributes( xmlNode, htmlNode, oNode, sNodeName ) ; - + htmlNode._fckxhtmljob = FCKXHtml.CurrentJobNum ; @@ -215,5 +230,5 @@ oNode = this._AppendChildNodes( oNode, htmlNode, Boolean( FCKListsLib.NonEmptyBlockElements[ sNodeName ] ) ) ; - if ( !oNode ) + if ( !oNode ) break ; @@ -400,8 +415,8 @@ var ePSibling = targetNode.lastChild ; - + if ( ePSibling && ePSibling.nodeType == 3 ) ePSibling = ePSibling.previousSibling ; - + if ( ePSibling && ePSibling.nodeName.toUpperCase() == 'LI' ) { @@ -421,5 +436,5 @@ if ( htmlNode.innerHTML.length == 0 ) return false ; - + FCKXHtml._AppendChildNodes( node, htmlNode, false ) ; Index: /FCKeditor/trunk/editor/_source/internals/fckxhtml_gecko.js =================================================================== --- /FCKeditor/trunk/editor/_source/internals/fckxhtml_gecko.js (revision 131) +++ /FCKeditor/trunk/editor/_source/internals/fckxhtml_gecko.js (revision 132) @@ -1,9 +1,25 @@ -/* @Packager.Header - - Defines the FCKXHtml object, responsible for the XHTML operations. - Gecko specific. - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Defines the FCKXHtml object, responsible for the XHTML operations. + * Gecko specific. + */ FCKXHtml._GetMainXmlString = function() @@ -19,9 +35,9 @@ { var aAttributes = htmlNode.attributes ; - + for ( var n = 0 ; n < aAttributes.length ; n++ ) { var oAttribute = aAttributes[n] ; - + if ( oAttribute.specified ) { Index: /FCKeditor/trunk/editor/_source/internals/fckxhtml_ie.js =================================================================== --- /FCKeditor/trunk/editor/_source/internals/fckxhtml_ie.js (revision 131) +++ /FCKeditor/trunk/editor/_source/internals/fckxhtml_ie.js (revision 132) @@ -1,9 +1,25 @@ -/* @Packager.Header - - Defines the FCKXHtml object, responsible for the XHTML operations. - IE specific. - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Defines the FCKXHtml object, responsible for the XHTML operations. + * IE specific. + */ FCKXHtml._GetMainXmlString = function() @@ -42,9 +58,9 @@ else if ( oAttribute.nodeValue === true ) sAttValue = sAttName ; - else + else { // We must use getAttribute to get it exactly as it is defined. // There are some rare cases that IE throws an error here, so we must try/catch. - try + try { sAttValue = htmlNode.getAttribute( sAttName, 2 ) ; @@ -148,6 +164,6 @@ FCKXHtml._AppendAttribute( node, 'accept-charset', htmlNode.acceptCharset ) ; - if ( htmlNode.name ) - FCKXHtml._AppendAttribute( node, 'name', htmlNode.name ) ; + if ( htmlNode.name ) + FCKXHtml._AppendAttribute( node, 'name', htmlNode.name ) ; FCKXHtml._AppendChildNodes( node, htmlNode ) ; @@ -158,12 +174,12 @@ // IE doens't hold the name attribute as an attribute for the and <SELECT> tags. FCKXHtml.TagProcessors['textarea'] = FCKXHtml.TagProcessors['select'] = function( node, htmlNode ) -{ - if ( htmlNode.name ) - FCKXHtml._AppendAttribute( node, 'name', htmlNode.name ) ; +{ + if ( htmlNode.name ) + FCKXHtml._AppendAttribute( node, 'name', htmlNode.name ) ; - FCKXHtml._AppendChildNodes( node, htmlNode ) ; - - return node ; -} + FCKXHtml._AppendChildNodes( node, htmlNode ) ; + + return node ; +} // On very rare cases, IE is loosing the "align" attribute for DIV. (right align and apply bulleted list) Index: /FCKeditor/trunk/editor/_source/internals/fckxhtmlentities.js =================================================================== --- /FCKeditor/trunk/editor/_source/internals/fckxhtmlentities.js (revision 131) +++ /FCKeditor/trunk/editor/_source/internals/fckxhtmlentities.js (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header -<FileDescription> - This file define the HTML entities handled by the editor. -</FileDescription> -<Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * This file define the HTML entities handled by the editor. + */ var FCKXHtmlEntities = new Object() ; @@ -124,5 +140,5 @@ '♦':'diams', - // Other Special Characters + // Other Special Characters '"':'quot', @@ -230,6 +246,6 @@ 'š':'scaron', 'Ÿ':'Yuml' - } ; - + } ; + for ( e in oEntities ) { @@ -237,5 +253,5 @@ sChars += e ; } - + oEntities = null ; } @@ -303,5 +319,5 @@ oEntities = null ; - } + } } else @@ -317,5 +333,5 @@ // Create the Regex used to find entities in the text. var sRegexPattern = '[' + sChars + ']' ; - + if ( FCKConfig.ProcessNumericEntities ) sRegexPattern = '[^ -~]|' + sRegexPattern ; Index: /FCKeditor/trunk/editor/css/fck_editorarea.css =================================================================== --- /FCKeditor/trunk/editor/css/fck_editorarea.css (revision 131) +++ /FCKeditor/trunk/editor/css/fck_editorarea.css (revision 132) @@ -1,14 +1,29 @@ -/* @Packager.Header -<FileDescription> - This is the default CSS file used by the editor area. It defines the - initial font of the editor and background color. - - A user can configure the editor to use another CSS file. Just change - the value of the FCKConfig.EditorAreaCSS key in the configuration - file. -</FileDescription> -<Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" /> -<Author name="Alfonso Martinez de Lizarrondo - Uritec" email="alfonso at uritec dot net" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * This is the default CSS file used by the editor area. It defines the + * initial font of the editor and background color. + * + * A user can configure the editor to use another CSS file. Just change + * the value of the FCKConfig.EditorAreaCSS key in the configuration + * file. + */ /* @@ -35,6 +50,6 @@ } -/* - Just uncomment the following block if you want to avoid spaces between +/* + Just uncomment the following block if you want to avoid spaces between paragraphs. Remember to apply the same style in your output front end page. */ Index: /FCKeditor/trunk/editor/css/fck_internal.css =================================================================== --- /FCKeditor/trunk/editor/css/fck_internal.css (revision 131) +++ /FCKeditor/trunk/editor/css/fck_internal.css (revision 132) @@ -1,9 +1,24 @@ -/* @Packager.Header -<FileDescription> - This CSS Style Sheet defines rules used by the editor for its internal use. -</FileDescription> -<Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" /> -<Author name="Alfonso Martinez de Lizarrondo - Uritec" email="alfonso at uritec dot net" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * This CSS Style Sheet defines rules used by the editor for its internal use. + */ /* Fix to allow putting the caret at the end of the @@ -58,5 +73,5 @@ } -/* Any anchor for non-IE, if we combine it +/* Any anchor for non-IE, if we combine it with the previous rule IE ignores all. */ a[name] Index: /FCKeditor/trunk/editor/css/fck_showtableborders_gecko.css =================================================================== --- /FCKeditor/trunk/editor/css/fck_showtableborders_gecko.css (revision 131) +++ /FCKeditor/trunk/editor/css/fck_showtableborders_gecko.css (revision 132) @@ -1,14 +1,30 @@ -/* @Packager.Header -<FileDescription> - This CSS Style Sheet defines the rules to show table borders on Gecko. -</FileDescription> -<Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * This CSS Style Sheet defines the rules to show table borders on Gecko. + */ /* For tables with the "border" attribute set to "0" */ -table[border="0"], -table[border="0"] > tr > td, table[border="0"] > tr > th, -table[border="0"] > tbody > tr > td, table[border="0"] > tbody > tr > th, -table[border="0"] > thead > tr > td, table[border="0"] > thead > tr > th, +table[border="0"], +table[border="0"] > tr > td, table[border="0"] > tr > th, +table[border="0"] > tbody > tr > td, table[border="0"] > tbody > tr > th, +table[border="0"] > thead > tr > td, table[border="0"] > thead > tr > th, table[border="0"] > tfoot > tr > td, table[border="0"] > tfoot > tr > th { @@ -17,5 +33,5 @@ /* For tables with no "border" attribute set */ -table:not([border]), +table:not([border]), table:not([border]) > tr > td, table:not([border]) > tr > th, table:not([border]) > tbody > tr > td, table:not([border]) > tbody > tr > th, Index: /FCKeditor/trunk/editor/dialog/common/fck_dialog_common.css =================================================================== --- /FCKeditor/trunk/editor/dialog/common/fck_dialog_common.css (revision 131) +++ /FCKeditor/trunk/editor/dialog/common/fck_dialog_common.css (revision 132) @@ -1,9 +1,25 @@ -/* @Packager.Header -<FileDescription> - This is the CSS file used for interface details in some dialog - windows. -</FileDescription> -<Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * This is the CSS file used for interface details in some dialog + * windows. + */ .ImagePreviewArea Index: /FCKeditor/trunk/editor/dialog/common/fck_dialog_common.js =================================================================== --- /FCKeditor/trunk/editor/dialog/common/fck_dialog_common.js (revision 131) +++ /FCKeditor/trunk/editor/dialog/common/fck_dialog_common.js (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header -<FileDescription> - Useful functions used by almost all dialog window pages. -</FileDescription> -<Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Useful functions used by almost all dialog window pages. + */ var GECKO_BOGUS = '<br type="_moz">' ; @@ -37,5 +53,5 @@ var oValue = element.getAttribute( attName, 2 ) ; - + if ( oValue == null ) oValue = oAtt.nodeValue ; @@ -51,5 +67,5 @@ var iCode = ( e.keyCode || e.charCode ) ; - + return ( ( iCode >= 48 && iCode <= 57 ) // Numbers @@ -86,10 +102,10 @@ { var replaced = this ; - + for ( var i = 0 ; i < searchArray.length ; i++ ) { replaced = replaced.replace( searchArray[i], replaceArray[i] ) ; } - + return replaced ; } @@ -98,5 +114,5 @@ { // oEditor must be defined. - + var iLeft = ( oEditor.FCKConfig.ScreenWidth - width ) / 2 ; var iTop = ( oEditor.FCKConfig.ScreenHeight - height ) / 2 ; @@ -108,14 +124,14 @@ sOptions += ",top=" + iTop ; - // The "PreserveSessionOnFileBrowser" because the above code could be + // The "PreserveSessionOnFileBrowser" because the above code could be // blocked by popup blockers. if ( oEditor.FCKConfig.PreserveSessionOnFileBrowser && oEditor.FCKBrowserInfo.IsIE ) { - // The following change has been made otherwise IE will open the file + // The following change has been made otherwise IE will open the file // browser on a different server session (on some cases): // http://support.microsoft.com/default.aspx?scid=kb;en-us;831678 // by Simone Chiaretta. var oWindow = oEditor.window.open( url, 'FCKBrowseWindow', sOptions ) ; - + if ( oWindow ) { Index: /FCKeditor/trunk/editor/dialog/common/moz-bindings.xml =================================================================== --- /FCKeditor/trunk/editor/dialog/common/moz-bindings.xml (revision 131) +++ /FCKeditor/trunk/editor/dialog/common/moz-bindings.xml (revision 132) @@ -1,3 +1,3 @@ -<?xml version="1.0" encoding="utf-8" ?> +<?xml version="1.0" encoding="utf-8" ?> <bindings xmlns="http://www.mozilla.org/xbl"> <binding id="numericfield"> @@ -15,6 +15,6 @@ ( iCode >= 48 && iCode <= 57 ) // Numbers || (iCode >= 37 && iCode <= 40) // Arrows - || iCode == 8 // Backspace - || iCode == 46 // Delete + || iCode == 8 // Backspace + || iCode == 46 // Delete ) ; Index: /FCKeditor/trunk/editor/dialog/fck_about.html =================================================================== --- /FCKeditor/trunk/editor/dialog/fck_about.html (revision 131) +++ /FCKeditor/trunk/editor/dialog/fck_about.html (revision 132) @@ -1,8 +1,24 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> - <html xmlns="http://www.w3.org/1999/xhtml"> @@ -63,6 +79,6 @@ <span fcklang="DlgAboutVersion">version</span> <br /> - <b>[[@Packager.Version]]</b><br /> - Build [[@Packager.Build]]</td> + <b>2.4.1 (SVN)</b><br /> + Build 1156</td> </tr> </table> Index: /FCKeditor/trunk/editor/dialog/fck_anchor.html =================================================================== --- /FCKeditor/trunk/editor/dialog/fck_anchor.html (revision 131) +++ /FCKeditor/trunk/editor/dialog/fck_anchor.html (revision 132) @@ -1,9 +1,24 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" > - <html> @@ -12,5 +27,4 @@ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta content="noindex, nofollow" name="robots"> - <meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">  <script src="common/fck_dialog_common.js" type="text/javascript"></script> <script type="text/javascript"> @@ -68,5 +82,5 @@ { // Remove the anchor if the user leaves the name blank - if ( oAnchor ) + if ( oAnchor ) { RemoveAnchor() ; @@ -77,7 +91,7 @@ return false ; } - + oEditor.FCKUndo.SaveUndoStep() ; - + if ( oAnchor ) // Modifying an existent anchor. { @@ -101,10 +115,10 @@ { // Nothing was selected, so now just create a normal A - oAnchor = oEditor.FCK.CreateElement( 'a' ) ; + oAnchor = oEditor.FCK.CreateElement( 'a' ) ; } else { // Remove the fake href - oAnchor.removeAttribute( 'href' ) ; + oAnchor.removeAttribute( 'href' ) ; } // Set the name @@ -125,5 +139,5 @@ var oImg = oEditor.FCKDocumentProcessor_CreateFakeImage( 'FCK__Anchor', oAnchor.cloneNode(true) ) ; oImg.setAttribute( '_fckanchor', 'true', 0 ) ; - + oAnchor.parentNode.insertBefore( oImg, oAnchor ) ; oAnchor.parentNode.removeChild( oAnchor ) ; @@ -169,5 +183,5 @@ { var oDoc = FCK.EditorDocument ; - + var aLinks = oDoc.getElementsByTagName( 'A' ) ; Index: /FCKeditor/trunk/editor/dialog/fck_button.html =================================================================== --- /FCKeditor/trunk/editor/dialog/fck_button.html (revision 131) +++ /FCKeditor/trunk/editor/dialog/fck_button.html (revision 132) @@ -1,8 +1,24 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" > - <html xmlns="http://www.w3.org/1999/xhtml"> Index: /FCKeditor/trunk/editor/dialog/fck_checkbox.html =================================================================== --- /FCKeditor/trunk/editor/dialog/fck_checkbox.html (revision 131) +++ /FCKeditor/trunk/editor/dialog/fck_checkbox.html (revision 132) @@ -1,8 +1,24 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" > - <html> @@ -11,5 +27,4 @@ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta content="noindex, nofollow" name="robots"> - <meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">  <script src="common/fck_dialog_common.js" type="text/javascript"></script> <script type="text/javascript"> @@ -50,5 +65,5 @@ if ( GetE('txtName').value.length > 0 ) oActiveEl.name = GetE('txtName').value ; - + if ( oEditor.FCKBrowserInfo.IsIE ) oActiveEl.value = GetE('txtValue').value ; Index: /FCKeditor/trunk/editor/dialog/fck_colorselector.html =================================================================== --- /FCKeditor/trunk/editor/dialog/fck_colorselector.html (revision 131) +++ /FCKeditor/trunk/editor/dialog/fck_colorselector.html (revision 132) @@ -1,12 +1,27 @@ - -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" > <html> <head> - <meta name="vs_targetSchema" content="http://schemas.microsoft.com/intellisense/ie5">  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta name="robots" content="noindex, nofollow" /> @@ -21,5 +36,5 @@ </style> <script type="text/javascript"> - + var oEditor = window.parent.InnerDialogLoaded() ; @@ -28,8 +43,8 @@ // First of all, translate the dialog box texts oEditor.FCKLanguageManager.TranslatePage(document) ; - + CreateColorTable() ; - - window.parent.SetOkButton( true ) ; + + window.parent.SetOkButton( true ) ; window.parent.SetAutoSize( true ) ; } @@ -46,15 +61,15 @@ function AppendColorRow( rangeA, rangeB ) { - for ( var i = rangeA ; i < rangeA + 3 ; i++ ) - { - var oRow = oTable.insertRow(-1) ; + for ( var i = rangeA ; i < rangeA + 3 ; i++ ) + { + var oRow = oTable.insertRow(-1) ; - for ( var j = rangeB ; j < rangeB + 3 ; j++ ) - { - for ( var n = 0 ; n < 6 ; n++ ) - { - AppendColorCell( oRow, '#' + aColors[j] + aColors[n] + aColors[i] ) ; - } - } + for ( var j = rangeB ; j < rangeB + 3 ; j++ ) + { + for ( var n = 0 ; n < 6 ; n++ ) + { + AppendColorCell( oRow, '#' + aColors[j] + aColors[n] + aColors[i] ) ; + } + } } } @@ -66,5 +81,5 @@ oCell.className = 'ColorCell' ; oCell.bgColor = color ; - + oCell.onmouseover = function() { @@ -72,5 +87,5 @@ document.getElementById('hicolortext').innerHTML = this.bgColor ; } - + oCell.onclick = function() { @@ -87,15 +102,15 @@ // Create the last row. var oRow = oTable.insertRow(-1) ; - + // Create the gray scale colors cells. for ( var n = 0 ; n < 6 ; n++ ) { - AppendColorCell( oRow, '#' + aColors[n] + aColors[n] + aColors[n] ) ; + AppendColorCell( oRow, '#' + aColors[n] + aColors[n] + aColors[n] ) ; } - + // Fill the row with black cells. for ( var i = 0 ; i < 12 ; i++ ) { - AppendColorCell( oRow, '#000000' ) ; + AppendColorCell( oRow, '#000000' ) ; } } Index: /FCKeditor/trunk/editor/dialog/fck_docprops.html =================================================================== --- /FCKeditor/trunk/editor/dialog/fck_docprops.html (revision 131) +++ /FCKeditor/trunk/editor/dialog/fck_docprops.html (revision 132) @@ -1,8 +1,24 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> - <html xmlns="http://www.w3.org/1999/xhtml"> @@ -343,7 +359,7 @@ } -function SetColor( inputId, color ) -{ - GetE( inputId ).value = color + '' ; +function SetColor( inputId, color ) +{ + GetE( inputId ).value = color + '' ; UpdatePreview() ; } Index: /FCKeditor/trunk/editor/dialog/fck_docprops/fck_document_preview.html =================================================================== --- /FCKeditor/trunk/editor/dialog/fck_docprops/fck_document_preview.html (revision 131) +++ /FCKeditor/trunk/editor/dialog/fck_docprops/fck_document_preview.html (revision 132) @@ -1,8 +1,24 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> - <html> Index: /FCKeditor/trunk/editor/dialog/fck_find.html =================================================================== --- /FCKeditor/trunk/editor/dialog/fck_find.html (revision 131) +++ /FCKeditor/trunk/editor/dialog/fck_find.html (revision 132) @@ -1,8 +1,24 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> - <html xmlns="http://www.w3.org/1999/xhtml"> Index: /FCKeditor/trunk/editor/dialog/fck_flash.html =================================================================== --- /FCKeditor/trunk/editor/dialog/fck_flash.html (revision 131) +++ /FCKeditor/trunk/editor/dialog/fck_flash.html (revision 132) @@ -1,8 +1,24 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> - <html> @@ -11,5 +27,4 @@ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta content="noindex, nofollow" name="robots"> - <meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">  <script src="common/fck_dialog_common.js" type="text/javascript"></script> <script src="fck_flash/fck_flash.js" type="text/javascript"></script> @@ -78,5 +93,5 @@ <br /> <input id="btnUpload" type="submit" value="Send it to the Server" fckLang="DlgLnkBtnUpload" /> - <iframe name="UploadWindow" style="DISPLAY: none" src="javascript:void(0)"></iframe> + <iframe name="UploadWindow" style="DISPLAY: none" src="javascript:void(0)"></iframe> </form> </div> Index: /FCKeditor/trunk/editor/dialog/fck_flash/fck_flash.js =================================================================== --- /FCKeditor/trunk/editor/dialog/fck_flash/fck_flash.js (revision 131) +++ /FCKeditor/trunk/editor/dialog/fck_flash/fck_flash.js (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header -<FileDescription> - Scripts related to the Flash dialog window (see fck_flash.html). -</FileDescription> -<Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Scripts related to the Flash dialog window (see fck_flash.html). + */ var oEditor = window.parent.InnerDialogLoaded() ; @@ -79,5 +95,5 @@ GetE('chkMenu').checked = GetAttribute( oEmbed, 'menu', 'true' ) == 'true' ; GetE('cmbScale').value = GetAttribute( oEmbed, 'scale', '' ).toLowerCase() ; - + GetE('txtAttTitle').value = oEmbed.title ; @@ -115,5 +131,5 @@ } UpdateEmbed( oEmbed ) ; - + if ( !oFakeImage ) { @@ -124,5 +140,5 @@ else oEditor.FCKUndo.SaveUndoStep() ; - + oEditor.FCKFlashProcessor.RefreshView( oFakeImage, oEmbed ) ; @@ -138,10 +154,10 @@ SetAttribute( e, "width" , GetE('txtWidth').value ) ; SetAttribute( e, "height", GetE('txtHeight').value ) ; - + // Advances Attributes SetAttribute( e, 'id' , GetE('txtAttId').value ) ; SetAttribute( e, 'scale', GetE('cmbScale').value ) ; - + SetAttribute( e, 'play', GetE('chkAutoPlay').checked ? 'true' : 'false' ) ; SetAttribute( e, 'loop', GetE('chkLoop').checked ? 'true' : 'false' ) ; @@ -167,5 +183,5 @@ { ePreview = previewEl ; - + if ( GetE('txtUrl').value.length > 0 ) UpdatePreview() ; @@ -176,5 +192,5 @@ if ( !ePreview ) return ; - + while ( ePreview.firstChild ) ePreview.removeChild( ePreview.firstChild ) ; @@ -186,10 +202,10 @@ var oDoc = ePreview.ownerDocument || ePreview.document ; var e = oDoc.createElement( 'EMBED' ) ; - + e.src = GetE('txtUrl').value ; e.type = 'application/x-shockwave-flash' ; e.width = '100%' ; e.height = '100%' ; - + ePreview.appendChild( e ) ; } @@ -206,9 +222,9 @@ { GetE('txtUrl').value = url ; - + if ( width ) GetE('txtWidth').value = width ; - - if ( height ) + + if ( height ) GetE('txtHeight').value = height ; @@ -255,5 +271,5 @@ { var sFile = GetE('txtUploadFile').value ; - + if ( sFile.length == 0 ) { @@ -261,5 +277,5 @@ return false ; } - + if ( ( FCKConfig.FlashUploadAllowedExtensions.length > 0 && !oUploadAllowedExtRegex.test( sFile ) ) || ( FCKConfig.FlashUploadDeniedExtensions.length > 0 && oUploadDeniedExtRegex.test( sFile ) ) ) @@ -268,5 +284,5 @@ return false ; } - + return true ; } Index: /FCKeditor/trunk/editor/dialog/fck_flash/fck_flash_preview.html =================================================================== --- /FCKeditor/trunk/editor/dialog/fck_flash/fck_flash_preview.html (revision 131) +++ /FCKeditor/trunk/editor/dialog/fck_flash/fck_flash_preview.html (revision 132) @@ -1,9 +1,25 @@ - -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> @@ -11,5 +27,4 @@ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta name="robots" content="noindex, nofollow"> - <meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">  <link href="../common/fck_dialog_common.css" rel="stylesheet" type="text/css" /> <script language="javascript"> Index: /FCKeditor/trunk/editor/dialog/fck_form.html =================================================================== --- /FCKeditor/trunk/editor/dialog/fck_form.html (revision 131) +++ /FCKeditor/trunk/editor/dialog/fck_form.html (revision 132) @@ -1,8 +1,24 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" > - <html xmlns="http://www.w3.org/1999/xhtml"> @@ -26,5 +42,5 @@ oEditor.FCKLanguageManager.TranslatePage(document) ; - if ( oActiveEl ) + if ( oActiveEl ) { GetE('txtName').value = oActiveEl.name ; @@ -46,5 +62,5 @@ oActiveEl.innerHTML = ' ' ; } - + oActiveEl.name = GetE('txtName').value ; SetAttribute( oActiveEl, 'action' , GetE('txtAction').value ) ; Index: /FCKeditor/trunk/editor/dialog/fck_hiddenfield.html =================================================================== --- /FCKeditor/trunk/editor/dialog/fck_hiddenfield.html (revision 131) +++ /FCKeditor/trunk/editor/dialog/fck_hiddenfield.html (revision 132) @@ -1,8 +1,24 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" > - <html> @@ -11,5 +27,4 @@ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta content="noindex, nofollow" name="robots"> - <meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">  <script src="common/fck_dialog_common.js" type="text/javascript"></script> <script type="text/javascript"> @@ -27,5 +42,5 @@ oEditor.FCKLanguageManager.TranslatePage(document) ; - if ( oActiveEl && oActiveEl.tagName == 'INPUT' && oActiveEl.type == 'hidden' ) + if ( oActiveEl && oActiveEl.tagName == 'INPUT' && oActiveEl.type == 'hidden' ) { GetE('txtName').value = oActiveEl.name ; @@ -36,5 +51,5 @@ window.parent.SetOkButton( true ) ; -} +} @@ -47,5 +62,5 @@ oActiveEl = oEditor.FCK.InsertElementAndGetIt( oActiveEl ) ; } - + oActiveEl.name = GetE('txtName').value ; SetAttribute( oActiveEl, 'value', GetE('txtValue').value ) ; Index: /FCKeditor/trunk/editor/dialog/fck_image.html =================================================================== --- /FCKeditor/trunk/editor/dialog/fck_image.html (revision 131) +++ /FCKeditor/trunk/editor/dialog/fck_image.html (revision 132) @@ -1,9 +1,25 @@ - -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> Index: /FCKeditor/trunk/editor/dialog/fck_image/fck_image.js =================================================================== --- /FCKeditor/trunk/editor/dialog/fck_image/fck_image.js (revision 131) +++ /FCKeditor/trunk/editor/dialog/fck_image/fck_image.js (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header -<FileDescription> - Scripts related to the Image dialog window (see fck_image.html). -</FileDescription> -<Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Scripts related to the Image dialog window (see fck_image.html). + */ var oEditor = window.parent.InnerDialogLoaded() ; @@ -52,5 +68,5 @@ if ( !eImgPreview ) return ; - + if ( GetE('txtUrl').value.length == 0 ) { @@ -58,5 +74,5 @@ return ; } - + oImageOriginal = document.createElement( 'IMG' ) ; // new Image() ; @@ -120,5 +136,5 @@ var regexSize = /^\s*(\d+)px\s*$/i ; - + if ( oImage.style.width ) { @@ -167,5 +183,5 @@ if ( sLinkUrl == null ) sLinkUrl = oLink.getAttribute('href',2) ; - + GetE('txtLnkUrl').value = sLinkUrl ; GetE('cmbLnkTarget').value = oLink.target ; @@ -200,5 +216,5 @@ oImage = null ; } - + if ( !bHasImage ) { @@ -214,5 +230,5 @@ else oEditor.FCKUndo.SaveUndoStep() ; - + UpdateImage( oImage ) ; @@ -288,5 +304,5 @@ UpdatePreview() ; UpdateOriginal() ; - + bPreviewInitialized = true ; } @@ -336,5 +352,5 @@ { var e = dimension == 'Width' ? GetE('txtHeight') : GetE('txtWidth') ; - + if ( value.length == 0 || isNaN( value ) ) { @@ -411,5 +427,5 @@ UpdateOriginal( true ) ; } - + window.parent.SetSelectedTab( 'Info' ) ; } @@ -453,5 +469,5 @@ { var sFile = GetE('txtUploadFile').value ; - + if ( sFile.length == 0 ) { @@ -459,5 +475,5 @@ return false ; } - + if ( ( FCKConfig.ImageUploadAllowedExtensions.length > 0 && !oUploadAllowedExtRegex.test( sFile ) ) || ( FCKConfig.ImageUploadDeniedExtensions.length > 0 && oUploadDeniedExtRegex.test( sFile ) ) ) @@ -466,5 +482,5 @@ return false ; } - + return true ; } Index: /FCKeditor/trunk/editor/dialog/fck_image/fck_image_preview.html =================================================================== --- /FCKeditor/trunk/editor/dialog/fck_image/fck_image_preview.html (revision 131) +++ /FCKeditor/trunk/editor/dialog/fck_image/fck_image_preview.html (revision 132) @@ -1,10 +1,27 @@ - -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> @@ -23,5 +40,5 @@ window.onload = function() { - window.parent.SetPreviewElements( + window.parent.SetPreviewElements( document.getElementById( 'imgPreview' ), document.getElementById( 'lnkPreview' ) ) ; Index: /FCKeditor/trunk/editor/dialog/fck_link.html =================================================================== --- /FCKeditor/trunk/editor/dialog/fck_link.html (revision 131) +++ /FCKeditor/trunk/editor/dialog/fck_link.html (revision 132) @@ -1,9 +1,25 @@ - -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> @@ -93,5 +109,5 @@ <br /> <input id="btnUpload" type="submit" value="Send it to the Server" fckLang="DlgLnkBtnUpload" /> - <iframe name="UploadWindow" style="DISPLAY: none" src="javascript:void(0)"></iframe> + <iframe name="UploadWindow" style="DISPLAY: none" src="javascript:void(0)"></iframe> </form> </div> @@ -133,19 +149,19 @@ <td valign="top" nowrap="nowrap" width="50%"> <input id="chkPopupResizable" name="chkFeature" value="resizable" type="checkbox" /><label for="chkPopupResizable" fckLang="DlgLnkPopResize">Resizable</label><br /> - <input id="chkPopupLocationBar" name="chkFeature" value="location" type="checkbox" /><label for="chkPopupLocationBar" fckLang="DlgLnkPopLocation">Location + <input id="chkPopupLocationBar" name="chkFeature" value="location" type="checkbox" /><label for="chkPopupLocationBar" fckLang="DlgLnkPopLocation">Location Bar</label><br /> - <input id="chkPopupManuBar" name="chkFeature" value="menubar" type="checkbox" /><label for="chkPopupManuBar" fckLang="DlgLnkPopMenu">Menu + <input id="chkPopupManuBar" name="chkFeature" value="menubar" type="checkbox" /><label for="chkPopupManuBar" fckLang="DlgLnkPopMenu">Menu Bar</label><br /> - <input id="chkPopupScrollBars" name="chkFeature" value="scrollbars" type="checkbox" /><label for="chkPopupScrollBars" fckLang="DlgLnkPopScroll">Scroll + <input id="chkPopupScrollBars" name="chkFeature" value="scrollbars" type="checkbox" /><label for="chkPopupScrollBars" fckLang="DlgLnkPopScroll">Scroll Bars</label> </td> <td></td> <td valign="top" nowrap="nowrap" width="50%"> - <input id="chkPopupStatusBar" name="chkFeature" value="status" type="checkbox" /><label for="chkPopupStatusBar" fckLang="DlgLnkPopStatus">Status + <input id="chkPopupStatusBar" name="chkFeature" value="status" type="checkbox" /><label for="chkPopupStatusBar" fckLang="DlgLnkPopStatus">Status Bar</label><br /> <input id="chkPopupToolbar" name="chkFeature" value="toolbar" type="checkbox" /><label for="chkPopupToolbar" fckLang="DlgLnkPopToolbar">Toolbar</label><br /> - <input id="chkPopupFullScreen" name="chkFeature" value="fullscreen" type="checkbox" /><label for="chkPopupFullScreen" fckLang="DlgLnkPopFullScrn">Full + <input id="chkPopupFullScreen" name="chkFeature" value="fullscreen" type="checkbox" /><label for="chkPopupFullScreen" fckLang="DlgLnkPopFullScrn">Full Screen (IE)</label><br /> - <input id="chkPopupDependent" name="chkFeature" value="dependent" type="checkbox" /><label for="chkPopupDependent" fckLang="DlgLnkPopDependent">Dependent + <input id="chkPopupDependent" name="chkFeature" value="dependent" type="checkbox" /><label for="chkPopupDependent" fckLang="DlgLnkPopDependent">Dependent (Netscape)</label> </td> Index: /FCKeditor/trunk/editor/dialog/fck_link/fck_link.js =================================================================== --- /FCKeditor/trunk/editor/dialog/fck_link/fck_link.js (revision 131) +++ /FCKeditor/trunk/editor/dialog/fck_link/fck_link.js (revision 132) @@ -1,10 +1,24 @@ - /* @Packager.Header -<FileDescription> - Scripts related to the Link dialog window (see fck_link.html). -</FileDescription> -<Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" /> -<Author name="Dominik Pesch ?dom? (empty selection patch)" email="d.pesch@11com7.de" /> -<Author name="Alfonso Martinez de Lizarrondo - Uritec" email="alfonso at uritec dot net" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Scripts related to the Link dialog window (see fck_link.html). + */ var oEditor = window.parent.InnerDialogLoaded() ; @@ -50,5 +64,5 @@ oRegex.UrlOnChangeTestOther = new RegExp('') ; //oRegex.UrlOnChangeTestOther.compile( '^(javascript:|#|/)', 'gi' ) ; -oRegex.UrlOnChangeTestOther.compile( '^((javascript:)|[#/\.])', 'gi' ) ; +oRegex.UrlOnChangeTestOther.compile( '^((javascript:)|[#/\.])', 'gi' ) ; oRegex.ReserveTarget = new RegExp('') ; @@ -154,5 +168,5 @@ function LoadAnchorNamesAndIds() { - // Since version 2.0, the anchors are replaced in the DOM by IMGs so the user see the icon + // Since version 2.0, the anchors are replaced in the DOM by IMGs so the user see the icon // to edit them. So, we must look for that images now. var aAnchors = new Array() ; @@ -172,5 +186,5 @@ aAnchors[ aAnchors.length ] = oLinks[i] ; } - + var aIds = oEditor.FCKTools.GetAllChildrenIds( oEditor.FCK.EditorDocument.body ) ; @@ -497,5 +511,5 @@ if ( !oLink ) oLink = oEditor.FCK.CreateLink( sUri ) ; - + if ( oLink ) sInnerHtml = oLink.innerHTML ; // Save the innerHTML (IE changes it if it is like an URL). @@ -538,9 +552,9 @@ // Accesible popups - if( GetE('cmbTarget').value == 'popup' ) + if( GetE('cmbTarget').value == 'popup' ) { SetAttribute( oLink, 'onClick_fckprotectedatt', " onClick=\"" + BuildOnClickPopup() + "\"") ; - } - else + } + else { // Check if the previous onclick was for a popup: @@ -561,5 +575,5 @@ // Advances Attributes SetAttribute( oLink, 'id' , GetE('txtAttId').value ) ; - SetAttribute( oLink, 'name' , GetE('txtAttName').value ) ; + SetAttribute( oLink, 'name' , GetE('txtAttName').value ) ; SetAttribute( oLink, 'dir' , GetE('cmbAttLangDir').value ) ; SetAttribute( oLink, 'lang' , GetE('txtAttLangCode').value ) ; @@ -588,5 +602,5 @@ // Select the link. oEditor.FCKSelection.SelectNode(oLink); - + return true ; } @@ -641,5 +655,5 @@ { var sFile = GetE('txtUploadFile').value ; - + if ( sFile.length == 0 ) { @@ -647,5 +661,5 @@ return false ; } - + if ( ( FCKConfig.LinkUploadAllowedExtensions.length > 0 && !oUploadAllowedExtRegex.test( sFile ) ) || ( FCKConfig.LinkUploadDeniedExtensions.length > 0 && oUploadDeniedExtRegex.test( sFile ) ) ) @@ -654,5 +668,5 @@ return false ; } - + return true ; } Index: /FCKeditor/trunk/editor/dialog/fck_listprop.html =================================================================== --- /FCKeditor/trunk/editor/dialog/fck_listprop.html (revision 131) +++ /FCKeditor/trunk/editor/dialog/fck_listprop.html (revision 132) @@ -1,9 +1,24 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" > - <html xmlns="http://www.w3.org/1999/xhtml"> Index: /FCKeditor/trunk/editor/dialog/fck_paste.html =================================================================== --- /FCKeditor/trunk/editor/dialog/fck_paste.html (revision 131) +++ /FCKeditor/trunk/editor/dialog/fck_paste.html (revision 132) @@ -1,10 +1,26 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> - <html xmlns="http://www.w3.org/1999/xhtml"> @@ -23,11 +39,11 @@ // First of all, translate the dialog box texts oEditor.FCKLanguageManager.TranslatePage(document) ; - + if ( window.parent.dialogArguments.CustomValue == 'Word' ) { var oFrame = document.getElementById('frmData') ; oFrame.style.display = '' ; - - if ( oFrame.contentDocument ) + + if ( oFrame.contentDocument ) oFrame.contentDocument.designMode = 'on' ; else @@ -40,6 +56,6 @@ } - window.parent.SetOkButton( true ) ; - window.parent.SetAutoSize( true ) ; + window.parent.SetOkButton( true ) ; + window.parent.SetAutoSize( true ) ; } @@ -47,5 +63,5 @@ { var sHtml ; - + if ( window.parent.dialogArguments.CustomValue == 'Word' ) { @@ -53,5 +69,5 @@ var oBody ; - if ( oFrame.contentDocument ) + if ( oFrame.contentDocument ) oBody = oFrame.contentDocument.body ; else @@ -74,7 +90,7 @@ sHtml = sHtml.replace( /\n/g, '<BR>' ) ; } - + oEditor.FCK.InsertHtml( sHtml ) ; - + return true ; } @@ -83,6 +99,6 @@ { var oFrame = document.getElementById('frmData') ; - - if ( oFrame.contentDocument ) + + if ( oFrame.contentDocument ) oFrame.contentDocument.body.innerHTML = '' ; else @@ -92,5 +108,5 @@ // This function will be called from the PasteFromWord dialog (fck_paste.html) -// Input: oNode a DOM node that contains the raw paste from the clipboard +// Input: oNode a DOM node that contains the raw paste from the clipboard // bIgnoreFont, bRemoveStyles booleans according to the values set in the dialog // Output: the cleaned string @@ -101,5 +117,5 @@ html = html.replace(/<o:p>\s*<\/o:p>/g, '') ; html = html.replace(/<o:p>.*?<\/o:p>/g, ' ') ; - + // Remove mso-xxx styles. html = html.replace( /\s*mso-[^:]+:[^;"]+;?/gi, '' ) ; @@ -129,5 +145,5 @@ html = html.replace( /\s*FONT-FAMILY:[^;"]*;?/gi, '' ) ; } - + // Remove Class attributes html = html.replace(/<(\w[^>]*) class=([^ |>]*)([^>]*)/gi, "<$1$3") ; @@ -139,22 +155,22 @@ // Remove empty styles. html = html.replace( /\s*style="\s*"/gi, '' ) ; - + html = html.replace( /<SPAN\s*[^>]*>\s* \s*<\/SPAN>/gi, ' ' ) ; - + html = html.replace( /<SPAN\s*[^>]*><\/SPAN>/gi, '' ) ; - + // Remove Lang attributes html = html.replace(/<(\w[^>]*) lang=([^ |>]*)([^>]*)/gi, "<$1$3") ; - + html = html.replace( /<SPAN\s*>(.*?)<\/SPAN>/gi, '$1' ) ; - + html = html.replace( /<FONT\s*>(.*?)<\/FONT>/gi, '$1' ) ; // Remove XML elements and declarations html = html.replace(/<\\?\?xml[^>]*>/gi, '' ) ; - + // Remove Tags with XML namespace declarations: <o:p><\/o:p> html = html.replace(/<\/?\w+:[^>]*>/gi, '' ) ; - + // Remove comments [SF BUG-1481861]. html = html.replace(/<\!--.*-->/g, '' ) ; Index: /FCKeditor/trunk/editor/dialog/fck_radiobutton.html =================================================================== --- /FCKeditor/trunk/editor/dialog/fck_radiobutton.html (revision 131) +++ /FCKeditor/trunk/editor/dialog/fck_radiobutton.html (revision 132) @@ -1,8 +1,24 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" > - <html> @@ -11,5 +27,4 @@ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta content="noindex, nofollow" name="robots"> - <meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">  <script src="common/fck_dialog_common.js" type="text/javascript"></script> <script type="text/javascript"> @@ -50,5 +65,5 @@ if ( GetE('txtName').value.length > 0 ) oActiveEl.name = GetE('txtName').value ; - + if ( oEditor.FCKBrowserInfo.IsIE ) oActiveEl.value = GetE('txtValue').value ; Index: /FCKeditor/trunk/editor/dialog/fck_replace.html =================================================================== --- /FCKeditor/trunk/editor/dialog/fck_replace.html (revision 131) +++ /FCKeditor/trunk/editor/dialog/fck_replace.html (revision 132) @@ -1,9 +1,24 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> - <html xmlns="http://www.w3.org/1999/xhtml"> @@ -28,6 +43,6 @@ function btnStat(frm) { - document.getElementById('btnReplace').disabled = - document.getElementById('btnReplaceAll').disabled = + document.getElementById('btnReplace').disabled = + document.getElementById('btnReplaceAll').disabled = ( document.getElementById('txtFind').value.length == 0 ) ; } @@ -54,5 +69,5 @@ return true ; } - + return hasFound ; } @@ -68,5 +83,5 @@ } -function GetCase() +function GetCase() { return ( document.getElementById('chkCase').checked ? '' : 'i' ) ; Index: /FCKeditor/trunk/editor/dialog/fck_select.html =================================================================== --- /FCKeditor/trunk/editor/dialog/fck_select.html (revision 131) +++ /FCKeditor/trunk/editor/dialog/fck_select.html (revision 132) @@ -1,8 +1,24 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" > - <html> @@ -11,5 +27,4 @@ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta content="noindex, nofollow" name="robots"> - <meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">  <script src="common/fck_dialog_common.js" type="text/javascript"></script> <script type="text/javascript" src="fck_select/fck_select.js"></script> Index: /FCKeditor/trunk/editor/dialog/fck_select/fck_select.js =================================================================== --- /FCKeditor/trunk/editor/dialog/fck_select/fck_select.js (revision 131) +++ /FCKeditor/trunk/editor/dialog/fck_select/fck_select.js (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header -<FileDescription> - Scripts for the fck_select.html page. -</FileDescription> -<Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Scripts for the fck_select.html page. + */ function Select( combo ) Index: /FCKeditor/trunk/editor/dialog/fck_smiley.html =================================================================== --- /FCKeditor/trunk/editor/dialog/fck_smiley.html (revision 131) +++ /FCKeditor/trunk/editor/dialog/fck_smiley.html (revision 132) @@ -1,9 +1,25 @@ - -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" > <html xmlns="http://www.w3.org/1999/xhtml"> <head> @@ -33,5 +49,5 @@ oImg.src = url ; oImg.setAttribute( '_fcksavedurl', url ) ; - + // For long smileys list, it seams that IE continues loading the images in // the background when you quickly select one image. so, let's clear Index: /FCKeditor/trunk/editor/dialog/fck_source.html =================================================================== --- /FCKeditor/trunk/editor/dialog/fck_source.html (revision 131) +++ /FCKeditor/trunk/editor/dialog/fck_source.html (revision 132) @@ -1,9 +1,25 @@ - -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" > <html> <head> @@ -11,8 +27,7 @@ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta name="robots" content="noindex, nofollow"> - <meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">  <link href="common/fck_dialog_common.css" rel="stylesheet" type="text/css" /> <script language="javascript"> - + var oEditor = window.parent.InnerDialogLoaded() ; var FCK = oEditor.FCK ; @@ -34,7 +49,7 @@ if ( oEditor.FCKBrowserInfo.IsIE ) oEditor.FCKUndo.SaveUndoStep() ; - + FCK.SetHTML( document.getElementById('txtSource').value, false ) ; - + return true ; } Index: /FCKeditor/trunk/editor/dialog/fck_specialchar.html =================================================================== --- /FCKeditor/trunk/editor/dialog/fck_specialchar.html (revision 131) +++ /FCKeditor/trunk/editor/dialog/fck_specialchar.html (revision 132) @@ -1,19 +1,34 @@ - -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" > <html> <head> - <meta name="vs_targetSchema" content="http://schemas.microsoft.com/intellisense/ie5" />  <meta name="robots" content="noindex, nofollow"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <style type="text/css"> - .Hand - { + .Hand + { cursor: pointer ; - cursor: hand ; + cursor: hand ; } .Sample { font-size: 24px; } @@ -68,5 +83,5 @@ { document.write("<TR>") ; - for(var j = 0 ; j < cols ; j++) + for(var j = 0 ; j < cols ; j++) { if (aChars[i]) Index: /FCKeditor/trunk/editor/dialog/fck_spellerpages.html =================================================================== --- /FCKeditor/trunk/editor/dialog/fck_spellerpages.html (revision 131) +++ /FCKeditor/trunk/editor/dialog/fck_spellerpages.html (revision 132) @@ -1,8 +1,24 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" > - <html> @@ -11,5 +27,4 @@ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta content="noindex, nofollow" name="robots"> - <meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">  <script src="fck_spellerpages/spellerpages/spellChecker.js"></script> <script type="text/javascript"> Index: /FCKeditor/trunk/editor/dialog/fck_spellerpages/spellerpages/controlWindow.js =================================================================== --- /FCKeditor/trunk/editor/dialog/fck_spellerpages/spellerpages/controlWindow.js (revision 131) +++ /FCKeditor/trunk/editor/dialog/fck_spellerpages/spellerpages/controlWindow.js (revision 132) @@ -1,3 +1,3 @@ -//////////////////////////////////////////////////// +//////////////////////////////////////////////////// // controlWindow object //////////////////////////////////////////////////// Index: /FCKeditor/trunk/editor/dialog/fck_spellerpages/spellerpages/controls.html =================================================================== --- /FCKeditor/trunk/editor/dialog/fck_spellerpages/spellerpages/controls.html (revision 131) +++ /FCKeditor/trunk/editor/dialog/fck_spellerpages/spellerpages/controls.html (revision 132) @@ -139,5 +139,5 @@ </td> <td> </td> - <td> + <td>  - - @@ -37,5 +37,5 @@ <cfparam name="url.checktext" default=""> <cfparam name="form.checktext" default="#url.checktext#"> -<cfset submitted_text = replacelist(form.checktext,"%u201C,%u201D","%22,%22")> +<cfset submitted_text = replacelist(form.checktext,"%u201C,%u201D","%22,%22")>  @@ -119,5 +119,5 @@ <cfset texts.words = ListAppend(texts.words, "words[#input_cnt#] = [];", "#crlf#")> <cfset texts.words = ListAppend(texts.words, "suggs[#input_cnt#] = [];", "#crlf#")> - </cfif> + </cfif> </cfif> <cfset cnt = cnt + 1> Index: /FCKeditor/trunk/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.php =================================================================== --- /FCKeditor/trunk/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.php (revision 131) +++ /FCKeditor/trunk/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.php (revision 132) Index: /FCKeditor/trunk/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl =================================================================== --- /FCKeditor/trunk/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl (revision 131) +++ /FCKeditor/trunk/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl (revision 132) @@ -16,5 +16,5 @@ my $input_separator = "A"; -# set the 'wordtext' JavaScript variable to the submitted text. +# set the 'wordtext' JavaScript variable to the submitted text. sub printTextVar { for( my $i = 0; $i <= $#textinputs; $i++ ) { @@ -55,5 +55,5 @@ # temp file was created properly? - + # open temp file, add the submitted text. for( my $i = 0; $i <= $#textinputs; $i++ ) { @@ -67,5 +67,5 @@ print $fh "^$line\n"; } - + } # exec aspell command @@ -82,5 +82,5 @@ printTextIdxDecl( $textInputIdx ); $wordIdx = 0; - + } elsif( $ret =~ /^(&|#)/ ) { my @tokens = split( " ", $ret, 5 ); @@ -159,5 +159,5 @@ parent.init_spell( wordWindowObj ); } else { - error = "This page was loaded outside of a frameset. "; + error = "This page was loaded outside of a frameset. "; error += "It might not display properly"; alert( error ); Index: /FCKeditor/trunk/editor/dialog/fck_spellerpages/spellerpages/spellChecker.js =================================================================== --- /FCKeditor/trunk/editor/dialog/fck_spellerpages/spellerpages/spellChecker.js (revision 131) +++ /FCKeditor/trunk/editor/dialog/fck_spellerpages/spellerpages/spellChecker.js (revision 132) @@ -1,3 +1,3 @@ -//////////////////////////////////////////////////// +//////////////////////////////////////////////////// // spellChecker.js // @@ -37,5 +37,5 @@ this.wordWin = null; this.textArea = textObject; // deprecated - this.textInputs = arguments; + this.textInputs = arguments; // private methods @@ -97,5 +97,5 @@ this.wordWin = wordWindowObj; this.controlWin = controlWindowObj; - + // reset properties this.wordWin.resetForm(); @@ -112,5 +112,5 @@ // start this._spellcheck(); - + return true; } @@ -149,5 +149,5 @@ } - // set this word as an "ignore all" word. + // set this word as an "ignore all" word. this._setAsIgnored( ti, wi, this.ignrAllFlag ); @@ -157,5 +157,5 @@ if(( i == ti && j > wi ) || i > ti ) { // future word: set as "from ignore all" if - // 1) do not already have a flag and + // 1) do not already have a flag and // 2) have the same value as current word if(( this.wordWin.getTextVal( i, j ) == s_word_to_repl ) @@ -214,5 +214,5 @@ var newspell = new String( txt.value ); - // set this word as a "replace all" word. + // set this word as a "replace all" word. this._setWordText( ti, wi, newspell, this.replAllFlag ); @@ -222,5 +222,5 @@ if(( i == ti && j > wi ) || i > ti ) { // future word: set word text to s_word_to_repl if - // 1) do not already have a flag and + // 1) do not already have a flag and // 2) have the same value as s_word_to_repl if(( this.wordWin.getTextVal( i, j ) == s_word_to_repl ) @@ -231,5 +231,5 @@ } } - + // finally, move on this.currentWordIndex++; @@ -291,9 +291,9 @@ var ti = this.currentTextIndex; var wi = this.currentWordIndex; - + if( this.wordWin.totalPreviousWords( ti, wi ) > 0 ) { this.wordWin.removeFocus( ti, wi ); - // go back to the last word index that was acted upon + // go back to the last word index that was acted upon do { // if the current word index is zero then reset the seed @@ -307,23 +307,23 @@ } } - } while ( + } while ( this.wordWin.totalWords( this.currentTextIndex ) == 0 || this.wordFlags[this.currentTextIndex][this.currentWordIndex] == this.fromIgnrAll || this.wordFlags[this.currentTextIndex][this.currentWordIndex] == this.fromReplAll - ); + ); var text_idx = this.currentTextIndex; var idx = this.currentWordIndex; var preReplSpell = this.wordWin.originalSpellings[text_idx][idx]; - + // if we got back to the first word then set the Undo button back to disabled if( this.wordWin.totalPreviousWords( text_idx, idx ) == 0 ) { this.controlWin.disableUndo(); } - + var i, j, origSpell ; // examine what happened to this current word. switch( this.wordFlags[text_idx][idx] ) { - // replace all: go through this and all the future occurances of the word + // replace all: go through this and all the future occurances of the word // and revert them all to the original spelling and clear their flags case this.replAllFlag : @@ -339,6 +339,6 @@ } break; - - // ignore all: go through all the future occurances of the word + + // ignore all: go through all the future occurances of the word // and clear their flags case this.ignrAllFlag : @@ -348,5 +348,5 @@ origSpell = this.wordWin.originalSpellings[i][j]; if( origSpell == preReplSpell ) { - this.wordFlags[i][j] = undefined; + this.wordFlags[i][j] = undefined; } } @@ -354,5 +354,5 @@ } break; - + // replace: revert the word to its original spelling case this.replWordFlag : @@ -362,5 +362,5 @@ // For all four cases, clear the wordFlag of this word. re-start the process - this.wordFlags[text_idx][idx] = undefined; + this.wordFlags[text_idx][idx] = undefined; this._spellcheck(); } @@ -369,5 +369,5 @@ function _spellcheck() { var ww = this.wordWin; - + // check if this is the last word in the current text element if( this.currentWordIndex == ww.totalWords( this.currentTextIndex) ) { @@ -375,5 +375,5 @@ this.currentWordIndex = 0; // keep going if we're not yet past the last text element - if( this.currentTextIndex < this.wordWin.textInputs.length ) { + if( this.currentTextIndex < this.wordWin.textInputs.length ) { this._spellcheck(); return; @@ -383,5 +383,5 @@ } } - + // if this is after the first one make sure the Undo button is enabled if( this.currentWordIndex > 0 ) { @@ -409,8 +409,8 @@ // get the array of suggested words out of the // three-dimensional array containing all suggestions. - var a_suggests = this.wordWin.suggestions[text_num][word_num]; + var a_suggests = this.wordWin.suggestions[text_num][word_num]; if( a_suggests ) { // got an array of suggestions. - for( var ii = 0; ii < a_suggests.length; ii++ ) { + for( var ii = 0; ii < a_suggests.length; ii++ ) { this.controlWin.addSuggestion( a_suggests[ii] ); } @@ -454,6 +454,6 @@ for( var j = 0; j < document.forms[i].elements.length; j++ ) { if( document.forms[i].elements[j].type.match( inputPattern )) { - inputs[inputs.length] = document.forms[i].elements[j]; - } + inputs[inputs.length] = document.forms[i].elements[j]; + } } } Index: /FCKeditor/trunk/editor/dialog/fck_spellerpages/spellerpages/spellchecker.html =================================================================== --- /FCKeditor/trunk/editor/dialog/fck_spellerpages/spellerpages/spellchecker.html (revision 131) +++ /FCKeditor/trunk/editor/dialog/fck_spellerpages/spellerpages/spellchecker.html (revision 132) @@ -27,6 +27,6 @@ var s = new String( str ); s = encodeURIComponent( s ); - // additionally encode single quotes to evade any PHP - // magic_quotes_gpc setting (it inserts escape characters and + // additionally encode single quotes to evade any PHP + // magic_quotes_gpc setting (it inserts escape characters and // therefore skews the btye positions of misspelled words) return s.replace( /\'/g, '%27' ); Index: /FCKeditor/trunk/editor/dialog/fck_spellerpages/spellerpages/spellerStyle.css =================================================================== --- /FCKeditor/trunk/editor/dialog/fck_spellerpages/spellerpages/spellerStyle.css (revision 131) +++ /FCKeditor/trunk/editor/dialog/fck_spellerpages/spellerpages/spellerStyle.css (revision 132) Index: /FCKeditor/trunk/editor/dialog/fck_spellerpages/spellerpages/wordWindow.js =================================================================== --- /FCKeditor/trunk/editor/dialog/fck_spellerpages/spellerpages/wordWindow.js (revision 131) +++ /FCKeditor/trunk/editor/dialog/fck_spellerpages/spellerpages/wordWindow.js (revision 132) @@ -1,3 +1,3 @@ -//////////////////////////////////////////////////// +//////////////////////////////////////////////////// // wordWindow object //////////////////////////////////////////////////// @@ -13,5 +13,5 @@ this._isWordChar = _isWordChar; this._lastPos = _lastPos; - + // public properties this.wordChar = /[a-zA-Z]/; @@ -70,5 +70,5 @@ } else { total_words++; - } + } } } @@ -116,15 +116,15 @@ // update the text given the index of the string beginStr = this.textInputs[textIndex].substring( 0, pos ); - endStr = this.textInputs[textIndex].substring( - pos + oldText.length, - this.textInputs[textIndex].length + endStr = this.textInputs[textIndex].substring( + pos + oldText.length, + this.textInputs[textIndex].length ); this.textInputs[textIndex] = beginStr + newText + endStr; - - // adjust the indexes on the stack given the differences in - // length between the new word and old word. + + // adjust the indexes on the stack given the differences in + // length between the new word and old word. var lengthDiff = newText.length - oldText.length; this._adjustIndexes( textIndex, wordIndex, lengthDiff ); - + word.size = newText.length; word.value = newText; @@ -141,12 +141,12 @@ // iterate through each text input. - for( var txtid = 0; txtid < this.textInputs.length; txtid++ ) { + for( var txtid = 0; txtid < this.textInputs.length; txtid++ ) { var end_idx = 0; - var begin_idx = 0; + var begin_idx = 0; d.writeln( '<form name="textInput'+txtid+'">' ); var wordtxt = this.textInputs[txtid]; this.indexes[txtid] = []; - if( wordtxt ) { + if( wordtxt ) { var orig = this.originalSpellings[txtid]; if( !orig ) break; @@ -154,8 +154,8 @@ //!!! plain text, or HTML mode? d.writeln( '<div class="plainText">' ); - // iterate through each occurrence of a misspelled word. + // iterate through each occurrence of a misspelled word. for( var i = 0; i < orig.length; i++ ) { // find the position of the current misspelled word, - // starting at the last misspelled word. + // starting at the last misspelled word. // and keep looking if it's a substring of another word do { @@ -163,15 +163,15 @@ end_idx = begin_idx + orig[i].length; // word not found? messed up! - if( begin_idx == -1 ) break; - // look at the characters immediately before and after + if( begin_idx == -1 ) break; + // look at the characters immediately before and after // the word. If they are word characters we'll keep looking. var before_char = wordtxt.charAt( begin_idx - 1 ); var after_char = wordtxt.charAt( end_idx ); - } while ( - this._isWordChar( before_char ) + } while ( + this._isWordChar( before_char ) || this._isWordChar( after_char ) ); - // keep track of its position in the original text. + // keep track of its position in the original text. this.indexes[txtid][i] = begin_idx; @@ -182,5 +182,5 @@ } - // write out the misspelled word. + // write out the misspelled word. d.write( this._wordInputStr( orig[i] )); @@ -188,9 +188,9 @@ if( i == orig.length-1 ){ d.write( printForHtml( wordtxt.substr( end_idx ))); - } + } } d.writeln( '</div>' ); - + } d.writeln( '</form>' ); @@ -201,6 +201,6 @@ // alert( d.forms[j].elements[k].name + ": " + d.forms[j].elements[k].value ); // } - //} - + //} + // set the _forms property this._forms = d.forms; @@ -218,5 +218,5 @@ function printForHtml( n ) { return n ; // by FredCK -/* +/* var htmlstr = n; if( htmlstr.length == 1 ) { Index: /FCKeditor/trunk/editor/dialog/fck_table.html =================================================================== --- /FCKeditor/trunk/editor/dialog/fck_table.html (revision 131) +++ /FCKeditor/trunk/editor/dialog/fck_table.html (revision 132) @@ -1,9 +1,25 @@ - -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" > <html xmlns="http://www.w3.org/1999/xhtml"> <head> @@ -55,8 +71,8 @@ document.getElementById('selWidthType').value = "pixels" ; } - + if (iHeight && iHeight.indexOf('px') >= 0) // Style Pixel = px iHeight = iHeight.substr(0,iHeight.length - 2); - + document.getElementById('txtWidth').value = iWidth || '' ; document.getElementById('txtHeight').value = iHeight || '' ; @@ -69,11 +85,11 @@ if (table.caption) document.getElementById('txtCaption').value = table.caption.innerHTML ; - + document.getElementById('txtRows').disabled = true ; document.getElementById('txtColumns').disabled = true ; } - - window.parent.SetOkButton( true ) ; - window.parent.SetAutoSize( true ) ; + + window.parent.SetOkButton( true ) ; + window.parent.SetAutoSize( true ) ; } @@ -82,5 +98,5 @@ { var bExists = ( table != null ) ; - + if ( ! bExists ) table = oEditor.FCK.EditorDocument.createElement( "TABLE" ) ; @@ -116,10 +132,10 @@ else if ( bExists && eCaption ) eCaption.parentNode.removeChild( eCaption ) ; - + if (! bExists) { var iRows = document.getElementById('txtRows').value ; var iCols = document.getElementById('txtColumns').value ; - + for ( var r = 0 ; r < iRows ; r++ ) { @@ -133,10 +149,10 @@ } } - + oEditor.FCKUndo.SaveUndoStep() ; - + oEditor.FCK.InsertElement( table ) ; } - + return true ; } Index: /FCKeditor/trunk/editor/dialog/fck_tablecell.html =================================================================== --- /FCKeditor/trunk/editor/dialog/fck_tablecell.html (revision 131) +++ /FCKeditor/trunk/editor/dialog/fck_tablecell.html (revision 132) @@ -1,8 +1,24 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" > - <html xmlns="http://www.w3.org/1999/xhtml"> Index: /FCKeditor/trunk/editor/dialog/fck_template.html =================================================================== --- /FCKeditor/trunk/editor/dialog/fck_template.html (revision 131) +++ /FCKeditor/trunk/editor/dialog/fck_template.html (revision 132) @@ -1,8 +1,24 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> - <html xmlns="http://www.w3.org/1999/xhtml"> @@ -52,7 +68,7 @@ // Translate the dialog box texts. oEditor.FCKLanguageManager.TranslatePage(document) ; - + GetE('xChkReplaceAll').checked = ( FCKConfig.TemplateReplaceAll !== false ) ; - + if ( FCKConfig.TemplateReplaceCheckbox !== false ) GetE('xReplaceBlock').style.display = '' ; @@ -148,5 +164,5 @@ oItemDiv.innerHTML = sInner ; - + oItemDiv.onmouseover = ItemDiv_OnMouseOver ; oItemDiv.onmouseout = ItemDiv_OnMouseOut ; Index: /FCKeditor/trunk/editor/dialog/fck_textarea.html =================================================================== --- /FCKeditor/trunk/editor/dialog/fck_textarea.html (revision 131) +++ /FCKeditor/trunk/editor/dialog/fck_textarea.html (revision 132) @@ -1,8 +1,24 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" > - <html> @@ -11,5 +27,4 @@ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta content="noindex, nofollow" name="robots"> - <meta content="http://schemas.microsoft.com/intellisense/ie5" name="vs_targetSchema">  <script src="common/fck_dialog_common.js" type="text/javascript"></script> <script type="text/javascript"> Index: /FCKeditor/trunk/editor/dialog/fck_textfield.html =================================================================== --- /FCKeditor/trunk/editor/dialog/fck_textfield.html (revision 131) +++ /FCKeditor/trunk/editor/dialog/fck_textfield.html (revision 132) @@ -1,8 +1,24 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" > - <html xmlns="http://www.w3.org/1999/xhtml"> Index: /FCKeditor/trunk/editor/fckdebug.html =================================================================== --- /FCKeditor/trunk/editor/fckdebug.html (revision 131) +++ /FCKeditor/trunk/editor/fckdebug.html (revision 132) @@ -1,9 +1,25 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> - <html xmlns="http://www.w3.org/1999/xhtml"> @@ -32,8 +48,8 @@ if ( !noParse && message != null && isNaN( message ) ) message = message.replace(/</g, "<") ; - + if ( color ) message = '<font color="' + color + '">' + message + '<\/font>' ; - + window.FCKMessages[ window.FCKMessages.length ] = message ; StartTimer() ; @@ -43,16 +59,16 @@ { var message ; - - if ( anyObject != null ) + + if ( anyObject != null ) { message = 'Properties of: ' + anyObject + '</b><blockquote>' ; - + for (var prop in anyObject) { - try + try { var sVal = anyObject[ prop ] != null ? anyObject[ prop ] + '' : '[null]' ; message += '<b>' + prop + '</b> : ' + sVal.replace(/</g, '<') + '<br>' ; - } + } catch (e) { @@ -68,8 +84,8 @@ } - message += '</blockquote><b>' ; + message += '</blockquote><b>' ; } else message = 'OutputObject : Object is "null".' ; - + Output( message, color, true ) ; } @@ -86,5 +102,5 @@ // Get the first item in the queue var sMessage = window.FCKMessages[0] ; - + // Removes the first item from the queue var oTempArray = new Array() ; @@ -92,10 +108,10 @@ oTempArray[ i - 1 ] = window.FCKMessages[ i ] ; window.FCKMessages = oTempArray ; - + var d = new Date() ; - var sTime = - ( d.getHours() + 100 + '' ).substr( 1,2 ) + ':' + - ( d.getMinutes() + 100 + '' ).substr( 1,2 ) + ':' + - ( d.getSeconds() + 100 + '' ).substr( 1,2 ) + ':' + + var sTime = + ( d.getHours() + 100 + '' ).substr( 1,2 ) + ':' + + ( d.getMinutes() + 100 + '' ).substr( 1,2 ) + ':' + + ( d.getSeconds() + 100 + '' ).substr( 1,2 ) + ':' + ( d.getMilliseconds() + 1000 + '' ).substr( 1,3 ) ; Index: /FCKeditor/trunk/editor/fckdialog.html =================================================================== --- /FCKeditor/trunk/editor/fckdialog.html (revision 131) +++ /FCKeditor/trunk/editor/fckdialog.html (revision 132) @@ -1,8 +1,24 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> - <html xmlns="http://www.w3.org/1999/xhtml"> @@ -196,5 +212,5 @@ case 13 : // ENTER var oTarget = e.srcElement || e.target ; - if ( oTarget.tagName == 'TEXTAREA' ) + if ( oTarget.tagName == 'TEXTAREA' ) return true ; Ok() ; Index: /FCKeditor/trunk/editor/fckeditor.html =================================================================== --- /FCKeditor/trunk/editor/fckeditor.html (revision 131) +++ /FCKeditor/trunk/editor/fckeditor.html (revision 132) @@ -1,8 +1,24 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> - <html xmlns="http://www.w3.org/1999/xhtml"> @@ -138,5 +154,5 @@ document.execCommand( 'BackgroundImageCache', false, true ) ; } - catch (e) + catch (e) { // We have been reported about loading problems caused by the above @@ -183,5 +199,5 @@ </script> <script type="text/javascript"> - + // Set the editor interface direction. window.document.dir = FCKLang.Dir ; @@ -212,5 +228,5 @@ { var oToolbarSet = FCK.ToolbarSet = FCKToolbarSet_Create() ; - + if ( oToolbarSet.IsLoaded ) StartEditor() ; @@ -246,8 +262,8 @@ FCK.SetStatus( FCK_STATUS_COMPLETE ) ; - // Call the special "FCKeditor_OnComplete" function that should be present in + // Call the special "FCKeditor_OnComplete" function that should be present in // the HTML page where the editor is located. if ( typeof( window.parent.FCKeditor_OnComplete ) == 'function' ) - window.parent.FCKeditor_OnComplete( FCK ) ; + window.parent.FCKeditor_OnComplete( FCK ) ; } } Index: /FCKeditor/trunk/editor/filemanager/browser/default/browser.css =================================================================== --- /FCKeditor/trunk/editor/filemanager/browser/default/browser.css (revision 131) +++ /FCKeditor/trunk/editor/filemanager/browser/default/browser.css (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header -<FileDescription> - CSS styles used by all pages that compose the File Browser. -</FileDescription> -<Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * CSS styles used by all pages that compose the File Browser. + */ body Index: /FCKeditor/trunk/editor/filemanager/browser/default/browser.html =================================================================== --- /FCKeditor/trunk/editor/filemanager/browser/default/browser.html (revision 131) +++ /FCKeditor/trunk/editor/filemanager/browser/default/browser.html (revision 132) @@ -1,13 +1,28 @@ - -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> <title>FCKeditor - Resources Browser</title> - <meta name="vs_targetSchema" content="http://schemas.microsoft.com/intellisense/ie5" />  <link href="browser.css" type="text/css" rel="stylesheet"> <script type="text/javascript" src="js/fckxml.js"></script> @@ -18,5 +33,5 @@ var oRegex = new RegExp( '[\?&]' + paramName + '=([^&]+)', 'i' ) ; var oMatch = oRegex.exec( window.top.location.search ) ; - + if ( oMatch && oMatch.length > 1 ) return decodeURIComponent( oMatch[1] ) ; @@ -51,9 +66,9 @@ sUrl += '&Type=' + this.ResourceType ; sUrl += '&CurrentFolder=' + encodeURIComponent( this.CurrentFolder ) ; - + if ( params ) sUrl += '&' + params ; var oXML = new FCKXml() ; - + if ( callBackFunction ) oXML.LoadUrl( sUrl, callBackFunction ) ; // Asynchronous load. @@ -68,9 +83,9 @@ var iErrorNumber = 0 ; var oErrorNode = responseXml.SelectSingleNode( 'Connector/Error' ) ; - + if ( oErrorNode ) { iErrorNumber = parseInt( oErrorNode.attributes.getNamedItem('number').value, 10 ) ; - + switch ( iErrorNumber ) { @@ -102,8 +117,8 @@ var oIcons = new Object() ; -oIcons.AvailableIconsArray = [ +oIcons.AvailableIconsArray = [ 'ai','avi','bmp','cs','dll','doc','exe','fla','gif','htm','html','jpg','js', 'mdb','mp3','pdf','ppt','rdp','swf','swt','txt','vsd','xls','xml','zip' ] ; - + oIcons.AvailableIcons = new Object() ; Index: /FCKeditor/trunk/editor/filemanager/browser/default/connectors/asp/basexml.asp =================================================================== --- /FCKeditor/trunk/editor/filemanager/browser/default/connectors/asp/basexml.asp (revision 131) +++ /FCKeditor/trunk/editor/filemanager/browser/default/connectors/asp/basexml.asp (revision 132) @@ -1,7 +1,23 @@ - <% @@ -25,5 +41,5 @@ ' Create the main "Connector" node. Response.Write "<Connector command=""" & command & """ resourceType=""" & resourceType & """>" - + ' Add the current folder node. Response.Write "<CurrentFolder path=""" & ConvertToXmlAttribute( currentFolder ) & """ url=""" & ConvertToXmlAttribute( GetUrlFromPath( resourceType, currentFolder) ) & """ />" @@ -36,10 +52,10 @@ Sub SendError( number, text ) SetXmlHeaders - + ' Create the XML document header. Response.Write "<?xml version=""1.0"" encoding=""utf-8"" ?>" - + Response.Write "<Connector><Error number=""" & number & """ text=""" & Server.HTMLEncode( text ) & """ /></Connector>" - + Response.End End Sub Index: /FCKeditor/trunk/editor/filemanager/browser/default/connectors/asp/class_upload.asp =================================================================== --- /FCKeditor/trunk/editor/filemanager/browser/default/connectors/asp/class_upload.asp (revision 131) +++ /FCKeditor/trunk/editor/filemanager/browser/default/connectors/asp/class_upload.asp (revision 132) @@ -1,8 +1,24 @@ - <% @@ -35,14 +51,14 @@ Private oSourceData Private nMaxSize, nErr, sAllowed, sDenied - + Private Sub Class_Initialize nErr = 0 nMaxSize = 1048576 - + Set File = Server.CreateObject("Scripting.Dictionary") File.CompareMode = 1 Set Form = Server.CreateObject("Scripting.Dictionary") Form.CompareMode = 1 - + Set oSourceData = Server.CreateObject("ADODB.Stream") oSourceData.Type = 1 @@ -50,5 +66,5 @@ oSourceData.Open End Sub - + Private Sub Class_Terminate Form.RemoveAll @@ -56,9 +72,9 @@ File.RemoveAll Set File = Nothing - + oSourceData.Close Set oSourceData = Nothing End Sub - + Public Property Get Version Version = "NetRube Upload Class Version 1.0 Build 20041218" @@ -68,13 +84,13 @@ ErrNum = nErr End Property - + Public Property Let MaxSize(nSize) nMaxSize = nSize End Property - + Public Property Let Allowed(sExt) sAllowed = sExt End Property - + Public Property Let Denied(sExt) sDenied = sExt @@ -88,5 +104,5 @@ Exit Sub End If - + Dim nTotalSize nTotalSize = Request.TotalBytes @@ -99,10 +115,10 @@ Exit Sub End If - + oSourceData.Write Request.BinaryRead(nTotalSize) oSourceData.Position = 0 - + Dim oTotalData, oFormStream, sFormHeader, sFormName, bCrLf, nBoundLen, nFormStart, nFormEnd, nPosStart, nPosEnd, sBoundary - + oTotalData = oSourceData.Read bCrLf = ChrB(13) & ChrB(10) @@ -110,10 +126,10 @@ nBoundLen = LenB(sBoundary) + 2 nFormStart = nBoundLen - + Set oFormStream = Server.CreateObject("ADODB.Stream") - + Do While (nFormStart + 2) < nTotalSize nFormEnd = InStrB(nFormStart, oTotalData, bCrLf & bCrLf) + 3 - + With oFormStream .Type = 1 @@ -128,10 +144,10 @@ .Close End With - + nFormStart = InStrB(nFormEnd, oTotalData, sBoundary) - 1 nPosStart = InStr(22, sFormHeader, " name=", 1) + 7 nPosEnd = InStr(nPosStart, sFormHeader, """") sFormName = Mid(sFormHeader, nPosStart, nPosEnd - nPosStart) - + If InStr(45, sFormHeader, " filename=", 1) > 0 Then Set File(sFormName) = New NetRube_FileInfo @@ -161,8 +177,8 @@ End With End If - + nFormStart = nFormStart + nBoundLen Loop - + oTotalData = "" Set oFormStream = Nothing @@ -174,10 +190,10 @@ Exit Sub End If - + If Not IsAllowed(File(sItem).Ext) Then nErr = 4 Exit Sub End If - + Dim oFileStream Set oFileStream = Server.CreateObject("ADODB.Stream") @@ -194,5 +210,5 @@ Set oFileStream = Nothing End Sub - + Private Function IsAllowed(sExt) Dim oRE @@ -200,5 +216,5 @@ oRE.IgnoreCase = True oRE.Global = True - + If sDenied = "" Then oRE.Pattern = sAllowed @@ -208,5 +224,5 @@ IsAllowed = Not oRE.Test(sExt) End If - + Set oRE = Nothing End Function Index: /FCKeditor/trunk/editor/filemanager/browser/default/connectors/asp/commands.asp =================================================================== --- /FCKeditor/trunk/editor/filemanager/browser/default/connectors/asp/commands.asp (revision 131) +++ /FCKeditor/trunk/editor/filemanager/browser/default/connectors/asp/commands.asp (revision 132) @@ -1,8 +1,24 @@ - <% @@ -23,7 +39,7 @@ Response.Write "<Folder name=""" & ConvertToXmlAttribute( oFolder.name ) & """ />" Next - + Set oFSO = Nothing - + ' Close the "Folders" node. Response.Write "</Folders>" @@ -40,26 +56,26 @@ Set oFolders = oCurrentFolder.SubFolders Set oFiles = oCurrentFolder.Files - + ' Open the "Folders" node. Response.Write "<Folders>" - + For Each oFolder in oFolders Response.Write "<Folder name=""" & ConvertToXmlAttribute( oFolder.name ) & """ />" Next - + ' Close the "Folders" node. Response.Write "</Folders>" - + ' Open the "Files" node. Response.Write "<Files>" - + For Each oFile in oFiles Dim iFileSize iFileSize = Round( oFile.size / 1024 ) If ( iFileSize < 1 AND oFile.size <> 0 ) Then iFileSize = 1 - + Response.Write "<File name=""" & ConvertToXmlAttribute( oFile.name ) & """ size=""" & iFileSize & """ />" Next - + ' Close the "Files" node. Response.Write "</Files>" @@ -78,15 +94,15 @@ Dim sServerDir sServerDir = ServerMapFolder( resourceType, currentFolder & "/" & sNewFolderName ) - + On Error Resume Next CreateServerFolder sServerDir - + Dim iErrNumber, sErrDescription iErrNumber = err.number sErrDescription = err.Description - + On Error Goto 0 - + Select Case iErrNumber Case 0 @@ -117,5 +133,5 @@ Dim sErrorNumber sErrorNumber = "0" - + Dim sFileName, sOriginalFileName, sExtension sFileName = "" @@ -130,5 +146,5 @@ Dim oFSO Set oFSO = Server.CreateObject( "Scripting.FileSystemObject" ) - + ' Get the uploaded file name. sFileName = oUploader.File( "NewFile" ).Name Index: /FCKeditor/trunk/editor/filemanager/browser/default/connectors/asp/config.asp =================================================================== --- /FCKeditor/trunk/editor/filemanager/browser/default/connectors/asp/config.asp (revision 131) +++ /FCKeditor/trunk/editor/filemanager/browser/default/connectors/asp/config.asp (revision 132) @@ -1,14 +1,29 @@ - <% -' SECURITY: You must explicitelly enable this "connector" (set it to "True"). +' SECURITY: You must explicitelly enable this "connector" (set it to "True"). Dim ConfigIsEnabled ConfigIsEnabled = False -ConfigIsEnabled = True ' @Packager.RemoveLine ' Path to user files relative to the document root. Index: /FCKeditor/trunk/editor/filemanager/browser/default/connectors/asp/connector.asp =================================================================== --- /FCKeditor/trunk/editor/filemanager/browser/default/connectors/asp/connector.asp (revision 131) +++ /FCKeditor/trunk/editor/filemanager/browser/default/connectors/asp/connector.asp (revision 132) @@ -1,12 +1,28 @@ -<%@ CodePage=65001 Language="VBScript"%> +<%@ CodePage=65001 Language="VBScript"%> <% Option Explicit Response.Buffer = True %> -  @@ -47,5 +63,5 @@ Sub DoResponse() Dim sCommand, sResourceType, sCurrentFolder - + ' Get the main request information. sCommand = Request.QueryString("Command") @@ -54,5 +70,5 @@ sResourceType = Request.QueryString("Type") If ( sResourceType = "" ) Then Exit Sub - + sCurrentFolder = Request.QueryString("CurrentFolder") If ( sCurrentFolder = "" ) Then Exit Sub @@ -68,5 +84,5 @@ If ( InStr( 1, sCurrentFolder, ".." ) <> 0 OR InStr( 1, sResourceType, ".." ) <> 0 ) Then SendError 102, "" - End If + End If ' File Upload doesn't have to Return XML, so it must be intercepted before anything. @@ -77,5 +93,5 @@ SetXmlHeaders - + CreateXmlHeader sCommand, sResourceType, sCurrentFolder @@ -101,7 +117,7 @@ oRE.Global = True oRE.Pattern = "^(File|Image|Flash|Media)$" - + IsAllowedType = oRE.Test( resourceType ) - + Set oRE = Nothing End Function Index: /FCKeditor/trunk/editor/filemanager/browser/default/connectors/asp/io.asp =================================================================== --- /FCKeditor/trunk/editor/filemanager/browser/default/connectors/asp/io.asp (revision 131) +++ /FCKeditor/trunk/editor/filemanager/browser/default/connectors/asp/io.asp (revision 132) @@ -1,7 +1,23 @@ - <% @@ -22,5 +38,5 @@ Dim sResourceTypePath sResourceTypePath = sUserFilesDirectory & LCase( resourceType ) & "\" - + ' Ensure that the directory exists. CreateServerFolder sResourceTypePath @@ -33,15 +49,15 @@ Dim oFSO Set oFSO = Server.CreateObject( "Scripting.FileSystemObject" ) - + Dim sParent sParent = oFSO.GetParentFolderName( folderPath ) - + ' Check if the parent exists, or create it. If ( NOT oFSO.FolderExists( sParent ) ) Then CreateServerFolder( sParent ) - - If ( oFSO.FolderExists( folderPath ) = False ) Then + + If ( oFSO.FolderExists( folderPath ) = False ) Then oFSO.CreateFolder( folderPath ) End If - + Set oFSO = Nothing End Sub @@ -52,21 +68,21 @@ oRE.IgnoreCase = True oRE.Global = True - + Dim sAllowed, sDenied sAllowed = ConfigAllowedExtensions.Item( resourceType ) sDenied = ConfigDeniedExtensions.Item( resourceType ) - + IsAllowedExt = True - + If sDenied <> "" Then oRE.Pattern = sDenied IsAllowedExt = Not oRE.Test( extension ) - End If - + End If + If IsAllowedExt And sAllowed <> "" Then oRE.Pattern = sAllowed IsAllowedExt = oRE.Test( extension ) End If - + Set oRE = Nothing End Function Index: /FCKeditor/trunk/editor/filemanager/browser/default/connectors/asp/util.asp =================================================================== --- /FCKeditor/trunk/editor/filemanager/browser/default/connectors/asp/util.asp (revision 131) +++ /FCKeditor/trunk/editor/filemanager/browser/default/connectors/asp/util.asp (revision 132) @@ -1,7 +1,23 @@ - <% Index: /FCKeditor/trunk/editor/filemanager/browser/default/connectors/aspx/connector.aspx =================================================================== --- /FCKeditor/trunk/editor/filemanager/browser/default/connectors/aspx/connector.aspx (revision 131) +++ /FCKeditor/trunk/editor/filemanager/browser/default/connectors/aspx/connector.aspx (revision 132) @@ -1,14 +1,30 @@ <%@ Page language="c#" Inherits="FredCK.FCKeditorV2.FileBrowserConnector" AutoEventWireup="false" %> - +<%-- + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * This is the File Browser Connector for ASP.NET. + * + * The code of this page if included in the FCKeditor.Net package, + * in the FredCK.FCKeditorV2.dll assembly file. So to use it you must + * include that DLL in your "bin" directory. + * + * To download the FCKeditor.Net package, go to our official web site: + * http://www.fckeditor.net +--%> Index: /FCKeditor/trunk/editor/filemanager/browser/default/connectors/cfm/config.cfm =================================================================== --- /FCKeditor/trunk/editor/filemanager/browser/default/connectors/cfm/config.cfm (revision 131) +++ /FCKeditor/trunk/editor/filemanager/browser/default/connectors/cfm/config.cfm (revision 132) @@ -1,4 +1,23 @@ <cfsetting enablecfoutputonly="Yes"> - + <cfscript> config = structNew(); @@ -36,9 +55,9 @@ <cfelseif isDefined("server.userFilesPath")> - + <cflock scope="server" type="readonly" timeout="5"> <cfset config.userFilesPath = server.userFilesPath> </cflock> - + </cfif> Index: /FCKeditor/trunk/editor/filemanager/browser/default/connectors/cfm/connector.cfm =================================================================== --- /FCKeditor/trunk/editor/filemanager/browser/default/connectors/cfm/connector.cfm (revision 131) +++ /FCKeditor/trunk/editor/filemanager/browser/default/connectors/cfm/connector.cfm (revision 132) @@ -1,26 +1,41 @@ <cfsetting enablecfoutputonly="yes" showdebugoutput="no"> - <cfparam name="url.command"> -<cfparam name="url.type"> +<cfparam name="url.type"> <cfparam name="url.currentFolder">  @@ -32,5 +47,5 @@ lAllowedExtensions = config.allowedExtensions[url.type]; lDeniedExtensions = config.deniedExtensions[url.type]; - + // make sure the user files path is correctly formatted userFilesPath = replace(userFilesPath, "\", "/", "ALL"); @@ -42,5 +57,5 @@ userFilesPath = "/" & userFilesPath; } - + // make sure the current folder is correctly formatted url.currentFolder = replace(url.currentFolder, "\", "/", "ALL"); @@ -58,7 +73,7 @@ fs = "\"; } - + // Get the base physical path to the web root for this application. The code to determine the path automatically assumes that - // the "FCKeditor" directory in the http request path is directly off the web root for the application and that it's not a + // the "FCKeditor" directory in the http request path is directly off the web root for the application and that it's not a // virtual directory or a symbolic link / junction. Use the serverPath config setting to force a physical path if necessary. if ( len(config.serverPath) ) { @@ -67,8 +82,8 @@ serverPath = replaceNoCase(getBaseTemplatePath(),replace(cgi.script_name,"/",fs,"all"),""); } - + // map the user files path to a physical directory userFilesServerPath = serverPath & replace(userFilesPath,"/",fs,"all"); - + xmlContent = ""; // append to this string to build content </cfscript> @@ -77,9 +92,9 @@ <cfset xmlContent = "<Error number=""1"" text=""This connector is disabled. Please check the 'editor/filemanager/browser/default/connectors/cfm/config.cfm' file"" />"> - + <cfelseif find("..",url.currentFolder)> - + <cfset xmlContent = "<Error number=""102"" />"> - + </cfif> @@ -91,15 +106,15 @@ <cfloop list="#userFilesPath#" index="name" delimiters="/"> - + <cfif not directoryExists(currentPath & fs & name)> <cfdirectory action="create" directory="#currentPath##fs##name#" mode="755"> </cfif> - + <cfset currentPath = currentPath & fs & name> - + </cfloop> - +  - <cfif not directoryExists(userFilesServerPath & url.type)> + <cfif not directoryExists(userFilesServerPath & url.type)> <cfdirectory action="create" directory="#userFilesServerPath##url.type#" mode="755"> </cfif> @@ -118,20 +133,20 @@  - +  <cfset currentFolderPath = userFilesServerPath & url.type & replace(url.currentFolder,"/",fs,"all")> - + <cfswitch expression="#url.command#"> - - + + <cfcase value="FileUpload"> - + <cfset fileName = ""> <cfset fileExt = ""> - + <cftry> - +  - +  <cffile action="upload" @@ -141,22 +156,22 @@ mode="644" attributes="normal"> - + <cfif cffile.fileSize EQ 0> <cfthrow> </cfif> - + <cfif ( len(lAllowedExtensions) and not listFindNoCase(lAllowedExtensions,cffile.ServerFileExt) ) or ( len(lDeniedExtensions) and listFindNoCase(lDeniedExtensions,cffile.ServerFileExt) )> - + <cfset errorNumber = "202"> <cffile action="delete" file="#cffile.ServerDirectory##fs##cffile.ServerFile#"> - + <cfelse> - + <cfscript> errorNumber = 0; fileName = cffile.ClientFileName; fileExt = cffile.ServerFileExt; - + // munge filename for html download. Only a-z, 0-9, _, - and . are allowed if( reFind("[^A-Za-z0-9_\-\.]", fileName) ) { @@ -166,5 +181,5 @@ fileName = reReplace(fileName, "$_([^_]+)$", "\1", "ALL"); } - + // When the original filename already exists, add numbers (0), (1), (2), ... at the end of the filename. if( compare( cffile.ServerFileName, fileName ) ) { @@ -177,8 +192,8 @@ } </cfscript> - +  <cfif compare(cffile.ServerFileName,fileName)> - + <cfset errorNumber = "201"> <cffile @@ -188,20 +203,20 @@ mode="644" attributes="normal"> - - </cfif> - + + </cfif> + </cfif> - + <cfcatch type="Any"> - + <cfset errorNumber = "202"> - + </cfcatch> - + </cftry> - - + + <cfif errorNumber eq 201> - +  <cfoutput> @@ -212,5 +227,5 @@ <cfelse> - +  <cfoutput> @@ -219,21 +234,21 @@ </script> </cfoutput> - + </cfif> - + <cfabort> - + </cfcase> - - + + <cfcase value="GetFolders"> - +  - <cfdirectory - action="list" - directory="#currentFolderPath#" + <cfdirectory + action="list" + directory="#currentFolderPath#" name="qDir" sort="type,name"> - + <cfscript> i=1; @@ -246,20 +261,20 @@ i=i+1; } - + xmlContent = xmlContent & '<Folders>' & folders & '</Folders>'; </cfscript> - + </cfcase> - - + + <cfcase value="GetFoldersAndFiles"> - +  - <cfdirectory - action="list" - directory="#currentFolderPath#" + <cfdirectory + action="list" + directory="#currentFolderPath#" name="qDir" sort="type,name"> - + <cfscript> i=1; @@ -275,16 +290,16 @@ i=i+1; } - + xmlContent = xmlContent & '<Folders>' & folders & '</Folders>'; xmlContent = xmlContent & '<Files>' & files & '</Files>'; </cfscript> - + </cfcase> - - + + <cfcase value="CreateFolder"> - + <cfparam name="url.newFolderName" default=""> - + <cfscript> newFolderName = url.newFolderName; @@ -298,7 +313,7 @@ } </cfscript> - + <cfif not len(newFolderName) or len(newFolderName) gt 255> - <cfset errorNumber = 102> + <cfset errorNumber = 102> <cfelseif directoryExists(currentFolderPath & newFolderName)> <cfset errorNumber = 101> @@ -307,5 +322,5 @@ <cfelse> <cfset errorNumber = 0> - + <cftry> <cfdirectory @@ -314,8 +329,8 @@ mode="755"> <cfcatch> -  <cfset errorNumber = 110> @@ -323,19 +338,19 @@ </cftry> </cfif> - + <cfset xmlContent = xmlContent & '<Error number="#errorNumber#" />'> - + </cfcase> - - + + <cfdefaultcase> - + <cfthrow type="fckeditor.connector" message="Illegal command: #url.command#"> - + </cfdefaultcase> - - + + </cfswitch> - + </cfif> Index: /FCKeditor/trunk/editor/filemanager/browser/default/connectors/lasso/config.lasso =================================================================== --- /FCKeditor/trunk/editor/filemanager/browser/default/connectors/lasso/config.lasso (revision 131) +++ /FCKeditor/trunk/editor/filemanager/browser/default/connectors/lasso/config.lasso (revision 132) @@ -1,16 +1,32 @@ [//lasso -/* @Packager.Header -<FileDescription> - Configuration file for the File Manager Connector for Lasso. -</FileDescription> -<Author name="Jason Huck" email="jason.huck@corefive.com" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Configuration file for the File Manager Connector for Lasso. + */ - /*..................................................................... + /*..................................................................... The connector uses the file tags, which require authentication. Enter a valid username and password from Lasso admin for a group with file tags - permissions for uploads and the path you define in UserFilesPath below. - */ - + permissions for uploads and the path you define in UserFilesPath below. + */ + var('connection') = array( -username='xxxxxxxx', @@ -19,10 +35,10 @@ - /*..................................................................... + /*..................................................................... Set the base path for files that users can upload and browse (relative to server root). - - Set which file extensions are allowed and/or denied for each file type. - */ + + Set which file extensions are allowed and/or denied for each file type. + */ var('config') = map( 'Enabled' = true, Index: /FCKeditor/trunk/editor/filemanager/browser/default/connectors/lasso/connector.lasso =================================================================== --- /FCKeditor/trunk/editor/filemanager/browser/default/connectors/lasso/connector.lasso (revision 131) +++ /FCKeditor/trunk/editor/filemanager/browser/default/connectors/lasso/connector.lasso (revision 132) @@ -1,25 +1,41 @@ [//lasso -/* @Packager.Header -<FileDescription> - This is the File Manager Connector for Lasso. -</FileDescription> -<Author name="Jason Huck" email="jason.huck@corefive.com" /> -*/ - - /*..................................................................... - Include global configuration. See config.lasso for details. - */ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * This is the File Manager Connector for Lasso. + */ + + /*..................................................................... + Include global configuration. See config.lasso for details. + */ include('config.lasso'); - - /*..................................................................... - Translate current date/time to GMT for custom header. - */ + + /*..................................................................... + Translate current date/time to GMT for custom header. + */ var('headerDate') = date_localtogmt(date)->format('%a, %d %b %Y %T GMT'); - /*..................................................................... - Convert query string parameters to variables and initialize output. - */ + /*..................................................................... + Convert query string parameters to variables and initialize output. + */ var( 'Command' = action_param('Command'), @@ -41,10 +57,10 @@ - /*..................................................................... - Calculate the path to the current folder. - */ + /*..................................................................... + Calculate the path to the current folder. + */ $ServerPath == '' ? $ServerPath = $config->find('UserFilesPath'); - - var('currentFolderURL' = $ServerPath + + var('currentFolderURL' = $ServerPath + $config->find('Subdirectories')->find(action_param('Type')) + action_param('CurrentFolder') @@ -52,27 +68,27 @@ - /*..................................................................... + /*..................................................................... Build the appropriate response per the 'Command' parameter. Wrap the - entire process in an inline for file tag permissions. - */ + entire process in an inline for file tag permissions. + */ inline($connection); - select($Command); - /*............................................................. - List all subdirectories in the 'Current Folder' directory. - */ + select($Command); + /*............................................................. + List all subdirectories in the 'Current Folder' directory. + */ case('GetFolders'); $commandData += '\t<Folders>\n'; - + iterate(file_listdirectory($currentFolderURL), local('this')); #this->endswith('/') ? $commandData += '\t\t<Folder name="' + #this->removetrailing('/')& + '" />\n'; /iterate; - + $commandData += '\t</Folders>\n'; - /*............................................................. + /*............................................................. List both files and folders in the 'Current Folder' directory. - Include the file sizes in kilobytes. - */ + Include the file sizes in kilobytes. + */ case('GetFoldersAndFiles'); iterate(file_listdirectory($currentFolderURL), local('this')); @@ -82,24 +98,24 @@ local('size') = file_getsize($currentFolderURL + #this) / 1024; $files += '\t\t<File name="' + #this + '" size="' + #size + '" />\n'; - /if; + /if; /iterate; $folders += '\t</Folders>\n'; $files += '\t</Files>\n'; - + $commandData += $folders + $files; - /*............................................................. - Create a directory 'NewFolderName' within the 'Current Folder.' - */ + /*............................................................. + Create a directory 'NewFolderName' within the 'Current Folder.' + */ case('CreateFolder'); - var('newFolder' = $currentFolderURL + $NewFolderName + '/'); - file_create($newFolder); - - - /*......................................................... - Map Lasso's file error codes to FCKEditor's error codes. - */ + var('newFolder' = $currentFolderURL + $NewFolderName + '/'); + file_create($newFolder); + + + /*......................................................... + Map Lasso's file error codes to FCKEditor's error codes. + */ select(file_currenterror( -errorcode)); case(0); @@ -116,60 +132,60 @@ $errorNumber = 110; /select; - + $commandData += '<Error number="' + $errorNumber + '" />\n'; - /*............................................................. - Process an uploaded file. - */ - case('FileUpload'); - /*......................................................... - This is the only command that returns an HTML response. - */ + /*............................................................. + Process an uploaded file. + */ + case('FileUpload'); + /*......................................................... + This is the only command that returns an HTML response. + */ $responseType = 'html'; - - - /*......................................................... - Was a file actually uploaded? - */ + + + /*......................................................... + Was a file actually uploaded? + */ file_uploads->size ? $NewFile = file_uploads->get(1) | $uploadResult = '202'; - + if($uploadResult == '0'); - /*..................................................... + /*..................................................... Split the file's extension from the filename in order to follow the API's naming convention for duplicate - files. (Test.txt, Test(1).txt, Test(2).txt, etc.) - */ - $NewFileName = $NewFile->find('OrigName'); + files. (Test.txt, Test(1).txt, Test(2).txt, etc.) + */ + $NewFileName = $NewFile->find('OrigName'); $OrigFilePath = $currentFolderURL + $NewFileName; $NewFilePath = $OrigFilePath; - local('fileExtension') = '.' + $NewFile->find('OrigExtension'); + local('fileExtension') = '.' + $NewFile->find('OrigExtension'); local('shortFileName') = $NewFileName->removetrailing(#fileExtension)&; - /*..................................................... - Make sure the file extension is allowed. - */ + /*..................................................... + Make sure the file extension is allowed. + */ if($config->find('DeniedExtensions')->find($Type) >> $NewFile->find('OrigExtension')); $uploadResult = '202'; else; - /*................................................. - Rename the target path until it is unique. - */ + /*................................................. + Rename the target path until it is unique. + */ while(file_exists($NewFilePath)); $NewFilePath = $currentFolderURL + #shortFileName + '(' + loop_count + ')' + #fileExtension; /while; - - - /*................................................. - Copy the uploaded file to its final location. - */ + + + /*................................................. + Copy the uploaded file to its final location. + */ file_copy($NewFile->find('path'), $NewFilePath); - /*................................................. + /*................................................. Set the error code for the response. Note whether - the file had to be renamed. - */ + the file had to be renamed. + */ select(file_currenterror( -errorcode)); case(0); @@ -182,7 +198,7 @@ - /*......................................................... - Set the HTML response. - */ + /*......................................................... + Set the HTML response. + */ $__html_reply__ = '\ <script type="text/javascript"> @@ -194,7 +210,7 @@ - /*..................................................................... - Send a custom header for xml responses. - */ + /*..................................................................... + Send a custom header for xml responses. + */ if($responseType == 'xml'); header; @@ -214,13 +230,13 @@ - /*................................................................. - Set the content type encoding for Lasso. - */ + /*................................................................. + Set the content type encoding for Lasso. + */ content_type('text/xml; charset=utf-8'); - /*................................................................. - Wrap the response as XML and output. - */ + /*................................................................. + Wrap the response as XML and output. + */ $__html_reply__ = '\ <?xml version="1.0" encoding="utf-8" ?> @@ -231,3 +247,3 @@ '; /if; -] +] Index: /FCKeditor/trunk/editor/filemanager/browser/default/connectors/perl/basexml.pl =================================================================== --- /FCKeditor/trunk/editor/filemanager/browser/default/connectors/perl/basexml.pl (revision 131) +++ /FCKeditor/trunk/editor/filemanager/browser/default/connectors/perl/basexml.pl (revision 132) @@ -1,7 +1,23 @@ -##### @Packager.Header -#<FileDescription> -# This is the File Manager Connector for Perl. -#</FileDescription> -#<Author name="Takashi Yamaguchi" email="jack@omakase.net" /> +##### +# FCKeditor - The text editor for Internet - http://www.fckeditor.net +# Copyright (C) 2003-2007 Frederico Caldeira Knabben +# +# == BEGIN LICENSE == +# +# Licensed under the terms of any of the following licenses at your +# choice: +# +# - GNU General Public License Version 2 or later (the "GPL") +# http://www.gnu.org/licenses/gpl.html +# +# - GNU Lesser General Public License Version 2.1 or later (the "LGPL") +# http://www.gnu.org/licenses/lgpl.html +# +# - Mozilla Public License Version 1.1 or later (the "MPL") +# http://www.mozilla.org/MPL/MPL-1.1.html +# +# == END LICENSE == +# +# This is the File Manager Connector for Perl. ##### @@ -39,7 +55,7 @@ # Create the XML document header print '<?xml version="1.0" encoding="utf-8" ?>' ; - + print '<Connector><Error number="' . $number . '" text="' . &specialchar_cnv( $text ) . '" /></Connector>' ; - + exit ; } Index: /FCKeditor/trunk/editor/filemanager/browser/default/connectors/perl/commands.pl =================================================================== --- /FCKeditor/trunk/editor/filemanager/browser/default/connectors/perl/commands.pl (revision 131) +++ /FCKeditor/trunk/editor/filemanager/browser/default/connectors/perl/commands.pl (revision 132) @@ -1,7 +1,23 @@ -##### @Packager.Header -#<FileDescription> -# This is the File Manager Connector for Perl. -#</FileDescription> -#<Author name="Takashi Yamaguchi" email="jack@omakase.net" /> +##### +# FCKeditor - The text editor for Internet - http://www.fckeditor.net +# Copyright (C) 2003-2007 Frederico Caldeira Knabben +# +# == BEGIN LICENSE == +# +# Licensed under the terms of any of the following licenses at your +# choice: +# +# - GNU General Public License Version 2 or later (the "GPL") +# http://www.gnu.org/licenses/gpl.html +# +# - GNU Lesser General Public License Version 2.1 or later (the "LGPL") +# http://www.gnu.org/licenses/lgpl.html +# +# - Mozilla Public License Version 1.1 or later (the "MPL") +# http://www.mozilla.org/MPL/MPL-1.1.html +# +# == END LICENSE == +# +# This is the File Manager Connector for Perl. ##### Index: /FCKeditor/trunk/editor/filemanager/browser/default/connectors/perl/connector.cgi =================================================================== --- /FCKeditor/trunk/editor/filemanager/browser/default/connectors/perl/connector.cgi (revision 131) +++ /FCKeditor/trunk/editor/filemanager/browser/default/connectors/perl/connector.cgi (revision 132) @@ -1,10 +1,25 @@ -#!/usr/bin/env perl +#!/usr/bin/env perl -##### @Packager.Header -#<FileDescription> -# This is the File Manager Connector for Perl. -#</FileDescription> -#<Author name="Takashi Yamaguchi" email="jack@omakase.net" /> -#<Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" /> +##### +# FCKeditor - The text editor for Internet - http://www.fckeditor.net +# Copyright (C) 2003-2007 Frederico Caldeira Knabben +# +# == BEGIN LICENSE == +# +# Licensed under the terms of any of the following licenses at your +# choice: +# +# - GNU General Public License Version 2 or later (the "GPL") +# http://www.gnu.org/licenses/gpl.html +# +# - GNU Lesser General Public License Version 2.1 or later (the "LGPL") +# http://www.gnu.org/licenses/lgpl.html +# +# - Mozilla Public License Version 1.1 or later (the "MPL") +# http://www.mozilla.org/MPL/MPL-1.1.html +# +# == END LICENSE == +# +# This is the File Manager Connector for Perl. ##### @@ -48,7 +63,5 @@ # SECURITY: REMOVE/COMMENT THE FOLLOWING LINE TO ENABLE THIS CONNECTOR. ## -if ( 1==2 ) { # @Packager.RemoveLine &SendError( 1, 'This connector is disabled. Please check the "editor/filemanager/browser/default/connectors/perl/connector.cgi" file' ) ; -} # @Packager.RemoveLine &read_input(); @@ -87,5 +100,5 @@ $sCurrentFolder = '/' . $sCurrentFolder; } - + # Check for invalid folder paths (..) if ( $sCurrentFolder =~ /\.\./ ) { @@ -108,5 +121,5 @@ &CreateXmlHeader($sCommand,$sResourceType,$sCurrentFolder); - + # Execute the required command. if($sCommand eq 'GetFolders') { @@ -117,7 +130,7 @@ &CreateFolder($sResourceType,$sCurrentFolder); } - + &CreateXmlFooter(); - + exit ; } Index: /FCKeditor/trunk/editor/filemanager/browser/default/connectors/perl/io.pl =================================================================== --- /FCKeditor/trunk/editor/filemanager/browser/default/connectors/perl/io.pl (revision 131) +++ /FCKeditor/trunk/editor/filemanager/browser/default/connectors/perl/io.pl (revision 132) @@ -1,7 +1,23 @@ -##### @Packager.Header -#<FileDescription> -# This is the File Manager Connector for Perl. -#</FileDescription> -#<Author name="Takashi Yamaguchi" email="jack@omakase.net" /> +##### +# FCKeditor - The text editor for Internet - http://www.fckeditor.net +# Copyright (C) 2003-2007 Frederico Caldeira Knabben +# +# == BEGIN LICENSE == +# +# Licensed under the terms of any of the following licenses at your +# choice: +# +# - GNU General Public License Version 2 or later (the "GPL") +# http://www.gnu.org/licenses/gpl.html +# +# - GNU Lesser General Public License Version 2.1 or later (the "LGPL") +# http://www.gnu.org/licenses/lgpl.html +# +# - Mozilla Public License Version 1.1 or later (the "MPL") +# http://www.mozilla.org/MPL/MPL-1.1.html +# +# == END LICENSE == +# +# This is the File Manager Connector for Perl. ##### Index: /FCKeditor/trunk/editor/filemanager/browser/default/connectors/perl/upload_fck.pl =================================================================== --- /FCKeditor/trunk/editor/filemanager/browser/default/connectors/perl/upload_fck.pl (revision 131) +++ /FCKeditor/trunk/editor/filemanager/browser/default/connectors/perl/upload_fck.pl (revision 132) @@ -1,7 +1,23 @@ -##### @Packager.Header -#<FileDescription> -# This is the File Manager Connector for Perl. -#</FileDescription> -#<Author name="Takashi Yamaguchi" email="jack@omakase.net" /> +##### +# FCKeditor - The text editor for Internet - http://www.fckeditor.net +# Copyright (C) 2003-2007 Frederico Caldeira Knabben +# +# == BEGIN LICENSE == +# +# Licensed under the terms of any of the following licenses at your +# choice: +# +# - GNU General Public License Version 2 or later (the "GPL") +# http://www.gnu.org/licenses/gpl.html +# +# - GNU Lesser General Public License Version 2.1 or later (the "LGPL") +# http://www.gnu.org/licenses/lgpl.html +# +# - Mozilla Public License Version 1.1 or later (the "MPL") +# http://www.mozilla.org/MPL/MPL-1.1.html +# +# == END LICENSE == +# +# This is the File Manager Connector for Perl. ##### @@ -178,5 +194,5 @@ $ContentName # ) = &CheckContentType(\$value,$FileName,$ContentType); - + $FORM{$name} = $FileName; $new_fname = $FileName; @@ -334,5 +350,5 @@ $ImageHeight = $XbmHeight; } - } else { # + } else { # $Ext = 'txt'; } Index: /FCKeditor/trunk/editor/filemanager/browser/default/connectors/perl/util.pl =================================================================== --- /FCKeditor/trunk/editor/filemanager/browser/default/connectors/perl/util.pl (revision 131) +++ /FCKeditor/trunk/editor/filemanager/browser/default/connectors/perl/util.pl (revision 132) @@ -1,7 +1,23 @@ -##### @Packager.Header -#<FileDescription> -# This is the File Manager Connector for Perl. -#</FileDescription> -#<Author name="Takashi Yamaguchi" email="jack@omakase.net" /> +##### +# FCKeditor - The text editor for Internet - http://www.fckeditor.net +# Copyright (C) 2003-2007 Frederico Caldeira Knabben +# +# == BEGIN LICENSE == +# +# Licensed under the terms of any of the following licenses at your +# choice: +# +# - GNU General Public License Version 2 or later (the "GPL") +# http://www.gnu.org/licenses/gpl.html +# +# - GNU Lesser General Public License Version 2.1 or later (the "LGPL") +# http://www.gnu.org/licenses/lgpl.html +# +# - Mozilla Public License Version 1.1 or later (the "MPL") +# http://www.mozilla.org/MPL/MPL-1.1.html +# +# == END LICENSE == +# +# This is the File Manager Connector for Perl. ##### Index: /FCKeditor/trunk/editor/filemanager/browser/default/connectors/php/basexml.php =================================================================== --- /FCKeditor/trunk/editor/filemanager/browser/default/connectors/php/basexml.php (revision 131) +++ /FCKeditor/trunk/editor/filemanager/browser/default/connectors/php/basexml.php (revision 132) @@ -1,9 +1,26 @@ -<?php /* @Packager.Header -<FileDescription> - These functions define the base of the XML response sent by the PHP - connector. -</FileDescription> -<Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" /> -*/ +<?php +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * These functions define the base of the XML response sent by the PHP + * connector. + */ function SetXmlHeaders() @@ -29,5 +46,5 @@ { SetXmlHeaders() ; - + // Create the XML document header. echo '<?xml version="1.0" encoding="utf-8" ?>' ; @@ -35,5 +52,5 @@ // Create the main "Connector" node. echo '<Connector command="' . $command . '" resourceType="' . $resourceType . '">' ; - + // Add the current folder node. echo '<CurrentFolder path="' . ConvertToXmlAttribute( $currentFolder ) . '" url="' . ConvertToXmlAttribute( GetUrlFromPath( $resourceType, $currentFolder ) ) . '" />' ; @@ -48,10 +65,10 @@ { SetXmlHeaders() ; - + // Create the XML document header echo '<?xml version="1.0" encoding="utf-8" ?>' ; - + echo '<Connector><Error number="' . $number . '" text="' . htmlspecialchars( $text ) . '" /></Connector>' ; - + exit ; } Index: /FCKeditor/trunk/editor/filemanager/browser/default/connectors/php/commands.php =================================================================== --- /FCKeditor/trunk/editor/filemanager/browser/default/connectors/php/commands.php (revision 131) +++ /FCKeditor/trunk/editor/filemanager/browser/default/connectors/php/commands.php (revision 132) @@ -1,8 +1,25 @@ -<?php /* @Packager.Header -<FileDescription> - This is the File Manager Connector for PHP. -</FileDescription> -<Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" /> -*/ +<?php +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * This is the File Manager Connector for PHP. + */ function GetFolders( $resourceType, $currentFolder ) @@ -26,5 +43,5 @@ // Open the "Folders" node. echo "<Folders>" ; - + natcasesort( $aFolders ) ; foreach ( $aFolders as $sFolder ) @@ -148,5 +165,5 @@ // Get the uploaded file name. $sFileName = $oFile['name'] ; - + // Replace dots in the name with underscores (only one dot can be there... security issue). if ( $Config['ForceSingleExtension'] ) Index: /FCKeditor/trunk/editor/filemanager/browser/default/connectors/php/config.php =================================================================== --- /FCKeditor/trunk/editor/filemanager/browser/default/connectors/php/config.php (revision 131) +++ /FCKeditor/trunk/editor/filemanager/browser/default/connectors/php/config.php (revision 132) @@ -1,8 +1,25 @@ -<?php /* @Packager.Header -<FileDescription> - Configuration file for the File Manager Connector for PHP. -</FileDescription> -<Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" /> -*/ +<?php +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Configuration file for the File Manager Connector for PHP. + */ global $Config ; @@ -10,5 +27,4 @@ // SECURITY: You must explicitelly enable this "connector". (Set it to "true"). $Config['Enabled'] = false ; -$Config['Enabled'] = true ; // @Packager.RemoveLine // Path to user files relative to the document root. Index: /FCKeditor/trunk/editor/filemanager/browser/default/connectors/php/connector.php =================================================================== --- /FCKeditor/trunk/editor/filemanager/browser/default/connectors/php/connector.php (revision 131) +++ /FCKeditor/trunk/editor/filemanager/browser/default/connectors/php/connector.php (revision 132) @@ -1,8 +1,25 @@ -<?php /* @Packager.Header -<FileDescription> - This is the File Manager Connector for PHP. -</FileDescription> -<Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" /> -*/ +<?php +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * This is the File Manager Connector for PHP. + */ ob_start() ; @@ -30,5 +47,5 @@ $GLOBALS["UserFilesPath"] .= '/' ; -if ( strlen( $Config['UserFilesAbsolutePath'] ) > 0 ) +if ( strlen( $Config['UserFilesAbsolutePath'] ) > 0 ) { $GLOBALS["UserFilesDirectory"] = $Config['UserFilesAbsolutePath'] ; @@ -62,5 +79,5 @@ if ( ! ereg( '/$', $sCurrentFolder ) ) $sCurrentFolder .= '/' ; if ( strpos( $sCurrentFolder, '/' ) !== 0 ) $sCurrentFolder = '/' . $sCurrentFolder ; - + // Check for invalid folder paths (..) if ( strpos( $sCurrentFolder, '..' ) ) Index: /FCKeditor/trunk/editor/filemanager/browser/default/connectors/php/io.php =================================================================== --- /FCKeditor/trunk/editor/filemanager/browser/default/connectors/php/io.php (revision 131) +++ /FCKeditor/trunk/editor/filemanager/browser/default/connectors/php/io.php (revision 132) @@ -1,8 +1,25 @@ -<?php /* @Packager.Header -<FileDescription> - This is the File Manager Connector for ASP. -</FileDescription> -<Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" /> -*/ +<?php +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * This is the File Manager Connector for PHP. + */ function GetUrlFromPath( $resourceType, $folderPath ) Index: /FCKeditor/trunk/editor/filemanager/browser/default/connectors/php/util.php =================================================================== --- /FCKeditor/trunk/editor/filemanager/browser/default/connectors/php/util.php (revision 131) +++ /FCKeditor/trunk/editor/filemanager/browser/default/connectors/php/util.php (revision 132) @@ -1,8 +1,25 @@ -<?php /* @Packager.Header -<FileDescription> - Utility functions for the File Manager Connector for PHP. -</FileDescription> -<Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" /> -*/ +<?php +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Utility functions for the File Manager Connector for PHP. + */ function RemoveFromStart( $sourceString, $charToRemove ) Index: /FCKeditor/trunk/editor/filemanager/browser/default/connectors/py/connector.py =================================================================== --- /FCKeditor/trunk/editor/filemanager/browser/default/connectors/py/connector.py (revision 131) +++ /FCKeditor/trunk/editor/filemanager/browser/default/connectors/py/connector.py (revision 132) @@ -1,18 +1,34 @@ #!/usr/bin/env python -""" @Packager.Header -<FileDescription> - Connector for Python. - - Tested With: - Standard: - Python 2.3.3 - Zope: - Zope Version: (Zope 2.8.1-final, python 2.3.5, linux2) - Python Version: 2.3.5 (#4, Mar 10 2005, 01:40:25) - [GCC 3.3.3 20040412 (Red Hat Linux 3.3.3-7)] - System Platform: linux2 -</FileDescription> -<Author name="Andrew Liu" email="andrew@liuholdings.com" /> +""" +FCKeditor - The text editor for Internet - http://www.fckeditor.net +Copyright (C) 2003-2007 Frederico Caldeira Knabben + +== BEGIN LICENSE == + +Licensed under the terms of any of the following licenses at your +choice: + + - GNU General Public License Version 2 or later (the "GPL") + http://www.gnu.org/licenses/gpl.html + + - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + http://www.gnu.org/licenses/lgpl.html + + - Mozilla Public License Version 1.1 or later (the "MPL") + http://www.mozilla.org/MPL/MPL-1.1.html + +== END LICENSE == + +Connector for Python. + +Tested With: +Standard: + Python 2.3.3 +Zope: + Zope Version: (Zope 2.8.1-final, python 2.3.5, linux2) + Python Version: 2.3.5 (#4, Mar 10 2005, 01:40:25) + [GCC 3.3.3 20040412 (Red Hat Linux 3.3.3-7)] + System Platform: linux2 """ @@ -22,5 +38,5 @@ I am only supporting that part of the code that I use. Initially I had the upload directory as a part of zope (ie. uploading files -directly into Zope), before realising that there were too many +directly into Zope), before realising that there were too many complex intricacies within Zope to deal with. Zope is one ugly piece of code. So I decided to complement Zope by an Apache server (which @@ -31,5 +47,5 @@ terribly complex and something you don't want to do - trust me). -Maybe a Zope expert can touch up the Zope components. In the end, +Maybe a Zope expert can touch up the Zope components. In the end, I had FCKeditor loaded in Zope (probably a bad idea as well), and I replaced the connector.py with an alias to a server module. @@ -121,5 +137,5 @@ # Configuration for FCKEditor # can point to another server here, if linked correctly - #WEB_HOST = "http://127.0.0.1/" + #WEB_HOST = "http://127.0.0.1/" WEB_HOST = "" SERVER_DIR = "/var/www/html/" @@ -261,9 +277,9 @@ fileExtension = fileName[index:] return fileExtension - + def getParentFolder(self, folderPath): parentFolderPath = self.parentFolderRe.sub('', folderPath) return parentFolderPath - + """ serverMapFolder @@ -319,5 +335,5 @@ def getRootPath(self): return self.rootPath - + """ setXmlHeaders @@ -368,5 +384,5 @@ self.convertToXmlAttribute( self.getWebUrlFromPath( - resourceType, + resourceType, currentFolder ) @@ -438,5 +454,5 @@ s += """</Folders>""" return s - + """ getFoldersAndFiles @@ -494,5 +510,5 @@ s += """</Files>""" return s - + def findZopeFolder(self, resourceType, folderName): # returns the context of the resource / folder @@ -545,5 +561,5 @@ newFolder = self.request.get("NewFolderName", None) currentFolderPath = self.serverMapFolder( - resourceType, + resourceType, currentFolder ) @@ -610,5 +626,5 @@ self.zopeFileUpload(resourceType, currentFolder, count) return - + def nonZopeFileUpload(self, resourceType, currentFolder): errorNo = 0 @@ -645,5 +661,5 @@ # Map the virtual path to the local server path currentFolderPath = self.serverMapFolder( - resourceType, + resourceType, currentFolder ) @@ -681,5 +697,5 @@ newFileName = "No File" errorNo = 202 - + string = """ <script type="text/javascript"> @@ -700,9 +716,9 @@ # Make sure we have valid inputs if not( - (self.request.has_key("Command")) and - (self.request.has_key("Type")) and + (self.request.has_key("Command")) and + (self.request.has_key("Type")) and (self.request.has_key("CurrentFolder")) ): - return + return # Get command command = self.request.get("Command", None) @@ -739,5 +755,5 @@ s = "ERROR: %s" % e return s - + # Running from command line if __name__ == '__main__': @@ -748,6 +764,6 @@ """ -Running from zope, you will need to modify this connector. -If you have uploaded the FCKeditor into Zope (like me), you need to +Running from zope, you will need to modify this connector. +If you have uploaded the FCKeditor into Zope (like me), you need to move this connector out of Zope, and replace the "connector" with an alias as below. The key to it is to pass the Zope context in, as @@ -766,4 +782,4 @@ return connector.getFCKeditorConnector(context=context).run() """ - - + + Index: /FCKeditor/trunk/editor/filemanager/browser/default/connectors/test.html =================================================================== --- /FCKeditor/trunk/editor/filemanager/browser/default/connectors/test.html (revision 131) +++ /FCKeditor/trunk/editor/filemanager/browser/default/connectors/test.html (revision 132) @@ -1,7 +1,23 @@ - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> @@ -9,16 +25,14 @@ <head> <title>FCKeditor - Connectors Tests</title> - <meta name="vs_targetSchema" content="http://schemas.microsoft.com/intellisense/ie5" /> -  <script type="text/javascript"> function BuildBaseUrl( command ) { - var sUrl = + var sUrl = document.getElementById('cmbConnector').value + '?Command=' + command + '&Type=' + document.getElementById('cmbType').value + '&CurrentFolder=' + document.getElementById('txtFolder').value ; - + return sUrl ; } @@ -30,10 +44,10 @@ else document.getElementById('eRunningFrame').src = url ; - + document.getElementById('eUrl').innerHTML = url ; } function GetFolders() -{ +{ SetFrameUrl( BuildBaseUrl( 'GetFolders' ) ) ; return false ; @@ -49,8 +63,8 @@ { var sFolder = prompt( 'Type the folder name:', 'Test Folder' ) ; - + if ( ! sFolder ) return false ; - + var sUrl = BuildBaseUrl( 'CreateFolder' ) ; sUrl += '&NewFolderName=' + encodeURIComponent( sFolder ) ; Index: /FCKeditor/trunk/editor/filemanager/browser/default/frmactualfolder.html =================================================================== --- /FCKeditor/trunk/editor/filemanager/browser/default/frmactualfolder.html (revision 131) +++ /FCKeditor/trunk/editor/filemanager/browser/default/frmactualfolder.html (revision 132) @@ -1,12 +1,27 @@ - -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <meta name="vs_targetSchema" content="http://schemas.microsoft.com/intellisense/ie5" />  <link href="browser.css" type="text/css" rel="stylesheet"> <script type="text/javascript"> Index: /FCKeditor/trunk/editor/filemanager/browser/default/frmcreatefolder.html =================================================================== --- /FCKeditor/trunk/editor/filemanager/browser/default/frmcreatefolder.html (revision 131) +++ /FCKeditor/trunk/editor/filemanager/browser/default/frmcreatefolder.html (revision 132) @@ -1,13 +1,28 @@ - -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <meta name="vs_targetSchema" content="http://schemas.microsoft.com/intellisense/ie5" />  <link href="browser.css" type="text/css" rel="stylesheet"> <script type="text/javascript" src="js/common.js"></script> @@ -23,9 +38,9 @@ { var sFolderName ; - - while ( true ) + + while ( true ) { sFolderName = prompt( 'Type the name of the new folder:', '' ) ; - + if ( sFolderName == null ) return ; @@ -35,5 +50,5 @@ break ; } - + oConnector.SendCommand( 'CreateFolder', 'NewFolderName=' + encodeURIComponent( sFolderName) , CreateFolderCallBack ) ; } @@ -43,10 +58,10 @@ if ( oConnector.CheckError( fckXml ) == 0 ) window.parent.frames['frmResourcesList'].Refresh() ; - + /* // Get the current folder path. var oNode = fckXml.SelectSingleNode( 'Connector/Error' ) ; var iErrorNumber = parseInt( oNode.attributes.getNamedItem('number').value ) ; - + switch ( iErrorNumber ) { Index: /FCKeditor/trunk/editor/filemanager/browser/default/frmfolders.html =================================================================== --- /FCKeditor/trunk/editor/filemanager/browser/default/frmfolders.html (revision 131) +++ /FCKeditor/trunk/editor/filemanager/browser/default/frmfolders.html (revision 132) @@ -1,13 +1,28 @@ - -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> - <meta name="vs_targetSchema" content="http://schemas.microsoft.com/intellisense/ie5" />  <link href="browser.css" type="text/css" rel="stylesheet"> <script type="text/javascript" src="js/common.js"></script> @@ -26,5 +41,5 @@ this.UpRow = document.getElementById('trUp') ; - this.TableRows = new Object() ; + this.TableRows = new Object() ; } @@ -57,5 +72,5 @@ oCell.noWrap = true ; oCell.innerHTML = ' ' + sLink + folderName + '</a>' ; - + this.TableRows[ folderPath ] = oRow ; } @@ -64,5 +79,5 @@ { this.UpRow.style.display = ( upFolderPath != null ? '' : 'none' ) ; - + if ( upFolderPath != null ) { @@ -77,6 +92,6 @@ function CheckLoaded() { - if ( window.top.IsLoadedActualFolder - && window.top.IsLoadedCreateFolder + if ( window.top.IsLoadedActualFolder + && window.top.IsLoadedCreateFolder && window.top.IsLoadedUpload && window.top.IsLoadedResourcesList ) @@ -102,5 +117,5 @@ for ( var sFolderPath in oListManager.TableRows ) { - oListManager.TableRows[ sFolderPath ].className = + oListManager.TableRows[ sFolderPath ].className = ( sFolderPath == folderPath ? 'FolderListCurrentFolder' : 'FolderListFolder' ) ; } @@ -110,5 +125,5 @@ window.parent.frames['frmCreateFolder'].SetCurrentFolder( oConnector.ResourceType, folderPath ) ; window.parent.frames['frmUpload'].SetCurrentFolder( oConnector.ResourceType, folderPath ) ; - + // Load the resources list for this folder. window.parent.frames['frmResourcesList'].LoadResources( oConnector.ResourceType, folderPath ) ; @@ -127,5 +142,5 @@ // Show/Hide the Up Folder. oListManager.ShowUpFolder( sParentFolderPath ) ; - + if ( folderPath != '/' ) { @@ -142,11 +157,11 @@ if ( oConnector.CheckError( fckXml ) != 0 ) return ; - + // Get the current folder path. var oNode = fckXml.SelectSingleNode( 'Connector/CurrentFolder' ) ; var sCurrentFolderPath = oNode.attributes.getNamedItem('path').value ; - + var oNodes = fckXml.SelectNodes( 'Connector/Folders/Folder' ) ; - + for ( var i = 0 ; i < oNodes.length ; i++ ) { @@ -154,5 +169,5 @@ oListManager.AddItem( sFolderName, sCurrentFolderPath + sFolderName + "/" ) ; } - + OpenFolder( sActiveFolder ) ; } Index: /FCKeditor/trunk/editor/filemanager/browser/default/frmresourceslist.html =================================================================== --- /FCKeditor/trunk/editor/filemanager/browser/default/frmresourceslist.html (revision 131) +++ /FCKeditor/trunk/editor/filemanager/browser/default/frmresourceslist.html (revision 132) @@ -1,8 +1,24 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> - <html xmlns="http://www.w3.org/1999/xhtml"> @@ -29,6 +45,6 @@ '<img alt="" src="images/Folder.gif" width="16" height="16" border="0"></a>' + '</td><td nowrap colspan="2"> ' + - sLink + - folderName + + sLink + + folderName + '</a>' + '</td></tr>' ; @@ -45,12 +61,12 @@ return '<tr>' + '<td width="16">' + - sLink + + sLink + '<img alt="" src="images/icons/' + sIcon + '.gif" width="16" height="16" border="0"></a>' + '</td><td> ' + - sLink + - fileName + + sLink + + fileName + '</a>' + '</td><td align="right" nowrap> ' + - fileSize + + fileSize + ' KB' + '</td></tr>' ; @@ -102,5 +118,5 @@ var oHtml = new StringBuilder( '<table id="tableFiles" cellspacing="1" cellpadding="0" width="100%" border="0">' ) ; - // Add the Folders. + // Add the Folders. var oNodes ; oNodes = fckXml.SelectNodes( 'Connector/Folders/Folder' ) ; @@ -111,5 +127,5 @@ } - // Add the Files. + // Add the Files. oNodes = fckXml.SelectNodes( 'Connector/Files/File' ) ; for ( var j = 0 ; j < oNodes.length ; j++ ) @@ -122,10 +138,10 @@ var oFileUrlAtt = oNodes[j].attributes.getNamedItem('url') ; var sFileUrl = oFileUrlAtt != null ? oFileUrlAtt.value : sCurrentFolderUrl + sFileName ; - + oHtml.Append( oListManager.GetFileRowHtml( sFileName, sFileUrl, sFileSize ) ) ; } oHtml.Append( '<\/table>' ) ; - + document.body.innerHTML = oHtml.ToString() ; Index: /FCKeditor/trunk/editor/filemanager/browser/default/frmresourcetype.html =================================================================== --- /FCKeditor/trunk/editor/filemanager/browser/default/frmresourcetype.html (revision 131) +++ /FCKeditor/trunk/editor/filemanager/browser/default/frmresourcetype.html (revision 132) @@ -1,13 +1,28 @@ - -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <meta name="vs_targetSchema" content="http://schemas.microsoft.com/intellisense/ie5" />  <link href="browser.css" type="text/css" rel="stylesheet"> <script type="text/javascript" src="js/common.js"></script> Index: /FCKeditor/trunk/editor/filemanager/browser/default/frmupload.html =================================================================== --- /FCKeditor/trunk/editor/filemanager/browser/default/frmupload.html (revision 131) +++ /FCKeditor/trunk/editor/filemanager/browser/default/frmupload.html (revision 132) @@ -1,8 +1,24 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> - <html xmlns="http://www.w3.org/1999/xhtml"> @@ -17,5 +33,5 @@ sUrl += '&Type=' + resourceType ; sUrl += '&CurrentFolder=' + encodeURIComponent( folderPath ) ; - + document.getElementById('frmUpload').action = sUrl ; } @@ -32,5 +48,5 @@ document.getElementById('eUploadMessage').innerHTML = 'Upload a new file in this folder (Upload in progress, please wait...)' ; document.getElementById('btnUpload').disabled = true ; - + return true ; } @@ -40,5 +56,5 @@ // Reset the Upload Worker Frame. window.parent.frames['frmUploadWorker'].location = 'javascript:void(0)' ; - + // Reset the upload form (On IE we must do a little trick to avout problems). if ( document.all ) @@ -46,9 +62,9 @@ else document.getElementById('frmUpload').reset() ; - + // Reset the interface elements. document.getElementById('eUploadMessage').innerHTML = 'Upload a new file in this folder' ; document.getElementById('btnUpload').disabled = false ; - + switch ( errorNumber ) { Index: /FCKeditor/trunk/editor/filemanager/browser/default/js/common.js =================================================================== --- /FCKeditor/trunk/editor/filemanager/browser/default/js/common.js (revision 131) +++ /FCKeditor/trunk/editor/filemanager/browser/default/js/common.js (revision 132) @@ -1,9 +1,25 @@ -/* @Packager.Header -<FileDescription> - Common objects and functions shared by all pages that compose the - File Browser dialog window. -</FileDescription> -<Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Common objects and functions shared by all pages that compose the + * File Browser dialog window. + */ function AddSelectOption( selectElement, optionText, optionValue ) @@ -12,5 +28,5 @@ oOption.text = optionText ; - oOption.value = optionValue ; + oOption.value = optionValue ; selectElement.options.add(oOption) ; Index: /FCKeditor/trunk/editor/filemanager/browser/default/js/fckxml.js =================================================================== --- /FCKeditor/trunk/editor/filemanager/browser/default/js/fckxml.js (revision 131) +++ /FCKeditor/trunk/editor/filemanager/browser/default/js/fckxml.js (revision 132) @@ -1,11 +1,28 @@ -/* @Packager.Header -<FileDescription> - Defines the FCKXml object that is used for XML data calls - and XML processing. - This script is shared by almost all pages that compose the - File Browser frameset. -</FileDescription> -<Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Defines the FCKXml object that is used for XML data calls + * and XML processing. + * + * This script is shared by almost all pages that compose the + * File Browser frameset. + */ var FCKXml = function() @@ -19,5 +36,5 @@ // IE6 - try { return new ActiveXObject( 'Msxml2.XMLHTTP' ) ; } + try { return new ActiveXObject( 'Msxml2.XMLHTTP' ) ; } catch(e) {} @@ -36,10 +53,10 @@ var oXmlHttp = this.GetHttpRequest() ; - + oXmlHttp.open( "GET", urlToCall, bAsync ) ; if ( bAsync ) - { - oXmlHttp.onreadystatechange = function() + { + oXmlHttp.onreadystatechange = function() { if ( oXmlHttp.readyState == 4 ) @@ -60,7 +77,7 @@ } } - + oXmlHttp.send( null ) ; - + if ( ! bAsync ) { @@ -82,7 +99,7 @@ var aNodeArray = new Array(); - var xPathResult = this.DOMDocument.evaluate( xpath, this.DOMDocument, + var xPathResult = this.DOMDocument.evaluate( xpath, this.DOMDocument, this.DOMDocument.createNSResolver(this.DOMDocument.documentElement), XPathResult.ORDERED_NODE_ITERATOR_TYPE, null) ; - if ( xPathResult ) + if ( xPathResult ) { var oNode = xPathResult.iterateNext() ; @@ -92,10 +109,10 @@ oNode = xPathResult.iterateNext(); } - } + } return aNodeArray ; } } -FCKXml.prototype.SelectSingleNode = function( xpath ) +FCKXml.prototype.SelectSingleNode = function( xpath ) { if ( navigator.userAgent.indexOf('MSIE') >= 0 ) // IE @@ -108,5 +125,5 @@ if ( xPathResult && xPathResult.singleNodeValue ) return xPathResult.singleNodeValue ; - else + else return null ; } Index: /FCKeditor/trunk/editor/filemanager/upload/asp/class_upload.asp =================================================================== --- /FCKeditor/trunk/editor/filemanager/upload/asp/class_upload.asp (revision 131) +++ /FCKeditor/trunk/editor/filemanager/upload/asp/class_upload.asp (revision 132) @@ -1,8 +1,24 @@ - <% @@ -35,14 +51,14 @@ Private oSourceData Private nMaxSize, nErr, sAllowed, sDenied - + Private Sub Class_Initialize nErr = 0 nMaxSize = 1048576 - + Set File = Server.CreateObject("Scripting.Dictionary") File.CompareMode = 1 Set Form = Server.CreateObject("Scripting.Dictionary") Form.CompareMode = 1 - + Set oSourceData = Server.CreateObject("ADODB.Stream") oSourceData.Type = 1 @@ -50,5 +66,5 @@ oSourceData.Open End Sub - + Private Sub Class_Terminate Form.RemoveAll @@ -56,9 +72,9 @@ File.RemoveAll Set File = Nothing - + oSourceData.Close Set oSourceData = Nothing End Sub - + Public Property Get Version Version = "NetRube Upload Class Version 1.0 Build 20041218" @@ -68,13 +84,13 @@ ErrNum = nErr End Property - + Public Property Let MaxSize(nSize) nMaxSize = nSize End Property - + Public Property Let Allowed(sExt) sAllowed = sExt End Property - + Public Property Let Denied(sExt) sDenied = sExt @@ -88,5 +104,5 @@ Exit Sub End If - + Dim nTotalSize nTotalSize = Request.TotalBytes @@ -99,10 +115,10 @@ Exit Sub End If - + oSourceData.Write Request.BinaryRead(nTotalSize) oSourceData.Position = 0 - + Dim oTotalData, oFormStream, sFormHeader, sFormName, bCrLf, nBoundLen, nFormStart, nFormEnd, nPosStart, nPosEnd, sBoundary - + oTotalData = oSourceData.Read bCrLf = ChrB(13) & ChrB(10) @@ -110,10 +126,10 @@ nBoundLen = LenB(sBoundary) + 2 nFormStart = nBoundLen - + Set oFormStream = Server.CreateObject("ADODB.Stream") - + Do While (nFormStart + 2) < nTotalSize nFormEnd = InStrB(nFormStart, oTotalData, bCrLf & bCrLf) + 3 - + With oFormStream .Type = 1 @@ -128,10 +144,10 @@ .Close End With - + nFormStart = InStrB(nFormEnd, oTotalData, sBoundary) - 1 nPosStart = InStr(22, sFormHeader, " name=", 1) + 7 nPosEnd = InStr(nPosStart, sFormHeader, """") sFormName = Mid(sFormHeader, nPosStart, nPosEnd - nPosStart) - + If InStr(45, sFormHeader, " filename=", 1) > 0 Then Set File(sFormName) = New NetRube_FileInfo @@ -161,8 +177,8 @@ End With End If - + nFormStart = nFormStart + nBoundLen Loop - + oTotalData = "" Set oFormStream = Nothing @@ -174,10 +190,10 @@ Exit Sub End If - + If Not IsAllowed(File(sItem).Ext) Then nErr = 4 Exit Sub End If - + Dim oFileStream Set oFileStream = Server.CreateObject("ADODB.Stream") @@ -194,5 +210,5 @@ Set oFileStream = Nothing End Sub - + Private Function IsAllowed(sExt) Dim oRE @@ -200,5 +216,5 @@ oRE.IgnoreCase = True oRE.Global = True - + If sDenied = "" Then oRE.Pattern = sAllowed @@ -208,5 +224,5 @@ IsAllowed = Not oRE.Test(sExt) End If - + Set oRE = Nothing End Function Index: /FCKeditor/trunk/editor/filemanager/upload/asp/config.asp =================================================================== --- /FCKeditor/trunk/editor/filemanager/upload/asp/config.asp (revision 131) +++ /FCKeditor/trunk/editor/filemanager/upload/asp/config.asp (revision 132) @@ -1,16 +1,31 @@ - <% -' SECURITY: You must explicitelly enable this "uploader" (set it to "True"). +' SECURITY: You must explicitelly enable this "uploader" (set it to "True"). Dim ConfigIsEnabled ConfigIsEnabled = False -ConfigIsEnabled = True ' @Packager.RemoveLine -' Set if the file type must be considere in the target path. +' Set if the file type must be considere in the target path. ' Ex: /userfiles/image/ or /userfiles/file/ Dim ConfigUseFileType Index: /FCKeditor/trunk/editor/filemanager/upload/asp/io.asp =================================================================== --- /FCKeditor/trunk/editor/filemanager/upload/asp/io.asp (revision 131) +++ /FCKeditor/trunk/editor/filemanager/upload/asp/io.asp (revision 132) @@ -1,7 +1,23 @@ - <% Index: /FCKeditor/trunk/editor/filemanager/upload/asp/upload.asp =================================================================== --- /FCKeditor/trunk/editor/filemanager/upload/asp/upload.asp (revision 131) +++ /FCKeditor/trunk/editor/filemanager/upload/asp/upload.asp (revision 132) @@ -1,12 +1,28 @@ -<%@ CodePage=65001 Language="VBScript"%> +<%@ CodePage=65001 Language="VBScript"%> <% Option Explicit Response.Buffer = True %> -  @@ -61,8 +77,8 @@ sServerDir = sServerDir & "\" End If - + If ( ConfigUseFileType = True ) Then sServerDir = sServerDir & resourceType & "\" - End If + End If Dim oFSO @@ -99,5 +115,5 @@ SendResults sErrorNumber, sFileUrl, sFileName, "" - + End If Index: /FCKeditor/trunk/editor/filemanager/upload/aspx/upload.aspx =================================================================== --- /FCKeditor/trunk/editor/filemanager/upload/aspx/upload.aspx (revision 131) +++ /FCKeditor/trunk/editor/filemanager/upload/aspx/upload.aspx (revision 132) @@ -1,14 +1,30 @@ <%@ Page language="c#" Inherits="FredCK.FCKeditorV2.Uploader" AutoEventWireup="false" %> - +<%-- + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * This is the Uploader for ASP.NET. + * + * The code of this page if included in the FCKeditor.Net package, + * in the FredCK.FCKeditorV2.dll assemblyfile. So to use it you must + * include that DLL in your "bin" directory. + * + * To download the FCKeditor.Net package, go to our official web site: + * http://www.fckeditor.net +--%> Index: /FCKeditor/trunk/editor/filemanager/upload/cfm/config.cfm =================================================================== --- /FCKeditor/trunk/editor/filemanager/upload/cfm/config.cfm (revision 131) +++ /FCKeditor/trunk/editor/filemanager/upload/cfm/config.cfm (revision 132) @@ -1,29 +1,45 @@ - <cfscript> config = StructNew(); - - // SECURITY: You must explicitelly enable this "uploader". + + // SECURITY: You must explicitelly enable this "uploader". config.enabled = false; - + // Path to uploaded files relative to the document root. config.userFilesPath = "/userfiles/"; - + config.serverPath = ""; // use this to force the server path if FCKeditor is not running directly off the root of the application or the FCKeditor directory in the URL is a virtual directory or a symbolic link / junction - + config.allowedExtensions = StructNew(); config.deniedExtensions = StructNew(); - + config.allowedExtensions["File"] = ""; config.deniedExtensions["File"] = "html,htm,php,php2,php3,php4,php5,phtml,pwml,inc,asp,aspx,ascx,jsp,cfm,cfc,pl,bat,exe,com,dll,vbs,js,reg,cgi,htaccess,asis"; - + config.allowedExtensions["Image"] = "png,gif,jpg,jpeg,bmp"; config.deniedExtensions["Image"] = ""; - + config.allowedExtensions["Flash"] = "swf,fla"; config.deniedExtensions["Flash"] = ""; @@ -38,9 +54,9 @@ <cfelseif isDefined("server.userFilesPath")> - + <cflock scope="server" type="readonly" timeout="5"> <cfset config.userFilesPath = server.userFilesPath> </cflock> - + </cfif> Index: /FCKeditor/trunk/editor/filemanager/upload/cfm/upload.cfm =================================================================== --- /FCKeditor/trunk/editor/filemanager/upload/cfm/upload.cfm (revision 131) +++ /FCKeditor/trunk/editor/filemanager/upload/cfm/upload.cfm (revision 132) @@ -1,8 +1,24 @@ - @@ -16,8 +32,8 @@ <cfargument name="fileName" type="string" required="no" default=""> <cfargument name="customMsg" type="string" required="no" default=""> - + <cfoutput> <script type="text/javascript"> - window.parent.OnUploadCompleted(#errorNumber#, "#JSStringFormat(fileUrl)#", "#JSStringFormat(fileName)#", "#JSStringFormat(customMsg)#"); + window.parent.OnUploadCompleted(#errorNumber#, "#JSStringFormat(fileUrl)#", "#JSStringFormat(fileName)#", "#JSStringFormat(customMsg)#"); </script> </cfoutput> @@ -30,10 +46,10 @@ <cfelse> <cfscript> - + userFilesPath = config.userFilesPath; lAllowedExtensions = config.allowedExtensions[url.type]; lDeniedExtensions = config.deniedExtensions[url.type]; customMsg = ''; // Can be overwritten. The last value will be sent with the result - + // make sure the user files path is correctly formatted userFilesPath = replace(userFilesPath, "\", "/", "ALL"); @@ -45,5 +61,5 @@ userFilesPath = "/" & userFilesPath; } - + if (find("/",getBaseTemplatePath())) { fs = "/"; @@ -51,7 +67,7 @@ fs = "\"; } - + // Get the base physical path to the web root for this application. The code to determine the path automatically assumes that - // the "FCKeditor" directory in the http request path is directly off the web root for the application and that it's not a + // the "FCKeditor" directory in the http request path is directly off the web root for the application and that it's not a // virtual directory or a symbolic link / junction. Use the serverPath config setting to force a physical path if necessary. if ( len(config.serverPath) ) { @@ -60,19 +76,19 @@ serverPath = replaceNoCase(getBaseTemplatePath(),replace(cgi.script_name,"/",fs,"all"),""); } - + // map the user files path to a physical directory userFilesServerPath = serverPath & replace(userFilesPath,"/",fs,"all"); </cfscript> - + <cfset fileName = ""> <cfset fileExt = ""> - + <cftry> - +  <cfset currentFolderPath = userFilesServerPath & url.type & fs> - +  - +  <cffile action="upload" @@ -82,19 +98,19 @@ mode="644" attributes="normal"> - + <cfif (Len(lAllowedExtensions) AND NOT listFindNoCase(lAllowedExtensions, cffile.ServerFileExt)) OR (Len(lDeniedExtensions) AND listFindNoCase(lDeniedExtensions, cffile.ServerFileExt))> - +  <cfset errorNumber = "202"> <cffile action="delete" file="#cffile.ServerDirectory##fs##cffile.ServerFile#"> - + <cfelse> - + <cfscript> errorNumber = 0; fileName = cffile.ClientFileName; fileExt = cffile.ServerFileExt; - + // munge filename for html download. Only a-z, 0-9, _, - and . are allowed if( reFind("[^A-Za-z0-9_\-\.]", fileName) ) { @@ -104,5 +120,5 @@ fileName = reReplace(fileName, "$_([^_]+)$", "\1", "ALL"); } - + // When the original filename already exists, add numbers (0), (1), (2), ... at the end of the filename. if( compare( cffile.ServerFileName, fileName ) ) { @@ -115,8 +131,8 @@ } </cfscript> - +  <cfif compare(cffile.ServerFileName,fileName)> - + <cfset errorNumber = "201"> <cffile @@ -126,18 +142,18 @@ mode="644" attributes="normal"> - - </cfif> - + + </cfif> + </cfif> - + <cfcatch type="Any"> - + <cfset errorNumber = "1"> <cfset customMsg = "An error occured: " & cfcatch.message & " - " & cfcatch.detail> - + </cfcatch> - + </cftry> - + <cfif errorNumber EQ 0>  Index: /FCKeditor/trunk/editor/filemanager/upload/lasso/config.lasso =================================================================== --- /FCKeditor/trunk/editor/filemanager/upload/lasso/config.lasso (revision 131) +++ /FCKeditor/trunk/editor/filemanager/upload/lasso/config.lasso (revision 132) @@ -1,16 +1,32 @@ [//lasso -/* @Packager.Header -<FileDescription> - Configuration file for the Lasso File Uploader. -</FileDescription> -<Author name="Jason Huck" email="jason.huck@corefive.com" /> +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Configuration file for the Lasso File Uploader. */ - /*..................................................................... + /*..................................................................... The connector uses the file tags, which require authentication. Enter a valid username and password from Lasso admin for a group with file tags - permissions for uploads and the path you define in UserFilesPath below. - */ - + permissions for uploads and the path you define in UserFilesPath below. + */ + var('connection') = array( -username='xxxxxxxx', @@ -19,10 +35,10 @@ - /*..................................................................... + /*..................................................................... Set the base path for files that users can upload and browse (relative to server root). - - Set which file extensions are allowed and/or denied for each file type. - */ + + Set which file extensions are allowed and/or denied for each file type. + */ var('config') = map( 'Enabled' = false, Index: /FCKeditor/trunk/editor/filemanager/upload/lasso/upload.lasso =================================================================== --- /FCKeditor/trunk/editor/filemanager/upload/lasso/upload.lasso (revision 131) +++ /FCKeditor/trunk/editor/filemanager/upload/lasso/upload.lasso (revision 132) @@ -1,19 +1,35 @@ [//lasso -/* @Packager.Header -<FileDescription> - This is the "File Uploader" for Lasso. -</FileDescription> -<Author name="Jason Huck" email="jason.huck@corefive.com" /> +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * This is the "File Uploader" for Lasso. */ - /*..................................................................... - Include global configuration. See config.lasso for details. - */ + /*..................................................................... + Include global configuration. See config.lasso for details. + */ include('config.lasso'); - /*..................................................................... - Convert query string parameters to variables and initialize output. - */ + /*..................................................................... + Convert query string parameters to variables and initialize output. + */ var( 'Type' = action_param('Type'), @@ -31,10 +47,10 @@ - /*..................................................................... - Calculate the path to the current folder. - */ + /*..................................................................... + Calculate the path to the current folder. + */ $ServerPath == '' ? $ServerPath = $config->find('UserFilesPath'); - - var('currentFolderURL' = $ServerPath + + var('currentFolderURL' = $ServerPath + $config->find('Subdirectories')->find(action_param('Type')) + action_param('CurrentFolder') @@ -42,8 +58,8 @@ - /*..................................................................... - Custom tag sets the HTML response. + /*..................................................................... + Custom tag sets the HTML response. */ - + define_tag( 'sendresults', @@ -62,7 +78,7 @@ $__html_reply__ = '\ <script type="text/javascript"> - window.parent.OnUploadCompleted(' + #errorNumber + ',"' - + string_replace(#fileUrl, -find='"', -replace='\\"') + '","' - + string_replace(#fileName, -find='"', -replace='\\"') + '","' + window.parent.OnUploadCompleted(' + #errorNumber + ',"' + + string_replace(#fileUrl, -find='"', -replace='\\"') + '","' + + string_replace(#fileName, -find='"', -replace='\\"') + '","' + string_replace(#customMsg, -find='"', -replace='\\"') + '"); </script> @@ -72,51 +88,51 @@ if($config->find('Enabled')); - /*................................................................. - Process an uploaded file. - */ + /*................................................................. + Process an uploaded file. + */ inline($connection); - /*............................................................. - Was a file actually uploaded? - */ + /*............................................................. + Was a file actually uploaded? + */ file_uploads->size ? $NewFile = file_uploads->get(1) | $errorNumber = 202; - + if($errorNumber == 0); - /*......................................................... + /*......................................................... Split the file's extension from the filename in order to follow the API's naming convention for duplicate - files. (Test.txt, Test(1).txt, Test(2).txt, etc.) - */ - $NewFileName = $NewFile->find('OrigName'); + files. (Test.txt, Test(1).txt, Test(2).txt, etc.) + */ + $NewFileName = $NewFile->find('OrigName'); $OrigFilePath = $currentFolderURL + $NewFileName; $NewFilePath = $OrigFilePath; - local('fileExtension') = '.' + $NewFile->find('OrigExtension'); + local('fileExtension') = '.' + $NewFile->find('OrigExtension'); local('shortFileName') = $NewFileName->removetrailing(#fileExtension)&; - - - /*......................................................... - Make sure the file extension is allowed. - */ - + + + /*......................................................... + Make sure the file extension is allowed. + */ + if($config->find('DeniedExtensions')->find($Type) >> $NewFile->find('OrigExtension')); $errorNumber = 202; else; - /*..................................................... - Rename the target path until it is unique. - */ + /*..................................................... + Rename the target path until it is unique. + */ while(file_exists($NewFilePath)); $NewFileName = #shortFileName + '(' + loop_count + ')' + #fileExtension; $NewFilePath = $currentFolderURL + $NewFileName; /while; - - - /*..................................................... - Copy the uploaded file to its final location. - */ + + + /*..................................................... + Copy the uploaded file to its final location. + */ file_copy($NewFile->find('path'), $NewFilePath); - - - /*..................................................... - Set the error code for the response. - */ + + + /*..................................................... + Set the error code for the response. + */ select(file_currenterror( -errorcode)); case(0); @@ -132,5 +148,5 @@ $customMsg = 'This file uploader is disabled. Please check the "editor/filemanager/upload/lasso/config.lasso" file.'; /if; - + fck_sendresults( -errorNumber=$errorNumber, @@ -139,3 +155,3 @@ -customMsg=$customMsg ); -] +] Index: /FCKeditor/trunk/editor/filemanager/upload/php/config.php =================================================================== --- /FCKeditor/trunk/editor/filemanager/upload/php/config.php (revision 131) +++ /FCKeditor/trunk/editor/filemanager/upload/php/config.php (revision 132) @@ -1,16 +1,32 @@ -<?php /* @Packager.Header -<FileDescription> - Configuration file for the PHP File Uploader. -</FileDescription> -<Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" /> -*/ +<?php +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Configuration file for the PHP File Uploader. + */ global $Config ; -// SECURITY: You must explicitelly enable this "uploader". +// SECURITY: You must explicitelly enable this "uploader". $Config['Enabled'] = false ; -$Config['Enabled'] = true ; // @Packager.RemoveLine -// Set if the file type must be considere in the target path. +// Set if the file type must be considere in the target path. // Ex: /userfiles/image/ or /userfiles/file/ $Config['UseFileType'] = false ; Index: /FCKeditor/trunk/editor/filemanager/upload/php/upload.php =================================================================== --- /FCKeditor/trunk/editor/filemanager/upload/php/upload.php (revision 131) +++ /FCKeditor/trunk/editor/filemanager/upload/php/upload.php (revision 132) @@ -1,8 +1,25 @@ -<?php /* @Packager.Header -<FileDescription> - This is the "File Uploader" for PHP. -</FileDescription> -<Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" /> -*/ +<?php +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * This is the "File Uploader" for PHP. + */ require('config.php') ; @@ -66,5 +83,5 @@ if ( isset( $Config['UserFilesAbsolutePath'] ) && strlen( $Config['UserFilesAbsolutePath'] ) > 0 ) $sServerDir = $Config['UserFilesAbsolutePath'] ; -else +else $sServerDir = GetRootPath() . $Config["UserFilesPath"] ; @@ -94,5 +111,5 @@ umask( $oldumask ) ; } - + if ( $Config['UseFileType'] ) $sFileUrl = $Config["UserFilesPath"] . $sType . '/' . $sFileName ; Index: /FCKeditor/trunk/editor/filemanager/upload/php/util.php =================================================================== --- /FCKeditor/trunk/editor/filemanager/upload/php/util.php (revision 131) +++ /FCKeditor/trunk/editor/filemanager/upload/php/util.php (revision 132) @@ -1,8 +1,25 @@ -<?php /* @Packager.Header -<FileDescription> - This is the File Manager Connector for ASP. -</FileDescription> -<Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" /> -*/ +<?php +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * This is the File Manager Connector for PHP. + */ function RemoveExtension( $fileName ) Index: /FCKeditor/trunk/editor/filemanager/upload/test.html =================================================================== --- /FCKeditor/trunk/editor/filemanager/upload/test.html (revision 131) +++ /FCKeditor/trunk/editor/filemanager/upload/test.html (revision 132) @@ -1,12 +1,27 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">  <html> <head> <title>FCKeditor - Uploaders Tests</title> - <meta name="vs_targetSchema" content="http://schemas.microsoft.com/intellisense/ie5">  <script language="javascript"> @@ -14,8 +29,8 @@ { var sUploaderUrl = cmbUploaderUrl.value ; - + if ( sUploaderUrl.length == 0 ) sUploaderUrl = txtCustomUrl.value ; - + if ( sUploaderUrl.length == 0 ) { @@ -23,8 +38,8 @@ return ; } - + eURL.innerHTML = sUploaderUrl ; txtUrl.value = '' ; - + frmUpload.action = sUploaderUrl ; frmUpload.submit() ; Index: /FCKeditor/trunk/editor/lang/_getfontformat.html =================================================================== --- /FCKeditor/trunk/editor/lang/_getfontformat.html (revision 131) +++ /FCKeditor/trunk/editor/lang/_getfontformat.html (revision 132) @@ -1,7 +1,26 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> + <html> <head> <title></title> - <meta name="vs_targetSchema" content="http://schemas.microsoft.com/intellisense/ie5"> </head> <script language="javascript"> @@ -10,5 +29,5 @@ { var oRange = document.selection.createRange() ; - + var sNormal ; var sFormats = '' ; @@ -21,5 +40,5 @@ sFormats += ';' ; } - + document.getElementById('xFontFormats').innerHTML = sFormats + sNormal + ' (DIV)' ; } @@ -31,17 +50,17 @@ <h3>FontFormats Localization</h3> <p> - IE has some limits when handling the "Font Format". It actually uses localized - strings to retrieve the current format value. This makes it very difficult to + IE has some limits when handling the "Font Format". It actually uses localized + strings to retrieve the current format value. This makes it very difficult to make a system that works on every single computer in the world. </p> <p> - With FCKeditor, this problem impacts in the "Format" toolbar command that + With FCKeditor, this problem impacts in the "Format" toolbar command that doesn't reflects the format of the current cursor position. </p> <p> - There is only one way to make it work. We must localize FCKeditor using the - strings used by IE. In this way, we will have the expected behavior at least - when using FCKeditor in the same language as the browser. So, when localizing - FCKeditor, go to a computer with IE in the target language, open this page and + There is only one way to make it work. We must localize FCKeditor using the + strings used by IE. In this way, we will have the expected behavior at least + when using FCKeditor in the same language as the browser. So, when localizing + FCKeditor, go to a computer with IE in the target language, open this page and use the following string to the "FontFormats" value: </p> Index: /FCKeditor/trunk/editor/lang/_translationstatus.txt =================================================================== --- /FCKeditor/trunk/editor/lang/_translationstatus.txt (revision 131) +++ /FCKeditor/trunk/editor/lang/_translationstatus.txt (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header -<FileDescription> - Translations Status. -</FileDescription> -<Author name="Frederico Caldeira Knabben" email="fredck@fckeditor.net" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Translations Status. + */ af.js Found: 402 Missing: 0 Index: /FCKeditor/trunk/editor/lang/af.js =================================================================== --- /FCKeditor/trunk/editor/lang/af.js (revision 131) +++ /FCKeditor/trunk/editor/lang/af.js (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header -<FileDescription> - Afrikaans language file. -</FileDescription> -<Author name="Willem Petrus Botha" email="w@adesso.za.net" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Afrikaans language file. + */ var FCKLang = Index: /FCKeditor/trunk/editor/lang/ar.js =================================================================== --- /FCKeditor/trunk/editor/lang/ar.js (revision 131) +++ /FCKeditor/trunk/editor/lang/ar.js (revision 132) @@ -1,9 +1,24 @@ -/* @Packager.Header -<FileDescription> - Arabic language file. -</FileDescription> -<Author name="Abdul-Aziz Abdul-Kareem Al-Oraij" email="http://aziz.oraij.com" /> -<Author name="Abu Faisal" email="http://www.24at24.com" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Arabic language file. + */ var FCKLang = Index: /FCKeditor/trunk/editor/lang/bg.js =================================================================== --- /FCKeditor/trunk/editor/lang/bg.js (revision 131) +++ /FCKeditor/trunk/editor/lang/bg.js (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header -<FileDescription> - Bulgarian language file. -</FileDescription> -<Author name="Miroslav Ivanov" email="miro@primal-chaos.net" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Bulgarian language file. + */ var FCKLang = Index: /FCKeditor/trunk/editor/lang/bn.js =================================================================== --- /FCKeditor/trunk/editor/lang/bn.js (revision 131) +++ /FCKeditor/trunk/editor/lang/bn.js (revision 132) @@ -1,9 +1,24 @@ -/* @Packager.Header -<FileDescription> - Bengali/Bangla language file. -</FileDescription> -<Author name="Richard Walledge" email="darkdoctrine@hotmail.com" /> -<Author name="S M Mahbub Murshed" email="udvranto@yahoo.com" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Bengali/Bangla language file. + */ var FCKLang = Index: /FCKeditor/trunk/editor/lang/bs.js =================================================================== --- /FCKeditor/trunk/editor/lang/bs.js (revision 131) +++ /FCKeditor/trunk/editor/lang/bs.js (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header -<FileDescription> - Bosnian language file. -</FileDescription> -<Author name="Muris Trax (www.elektronika.ba)" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Bosnian language file. + */ var FCKLang = Index: /FCKeditor/trunk/editor/lang/ca.js =================================================================== --- /FCKeditor/trunk/editor/lang/ca.js (revision 131) +++ /FCKeditor/trunk/editor/lang/ca.js (revision 132) @@ -1,9 +1,24 @@ -/* @Packager.Header -<FileDescription> - Catalan language file. -</FileDescription> -<Author name="Jordi Cerdan" email="nan@myp.ad" /> -<Author name="Marc Folch" email="mcus21@gmail.com" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Catalan language file. + */ var FCKLang = Index: /FCKeditor/trunk/editor/lang/cs.js =================================================================== --- /FCKeditor/trunk/editor/lang/cs.js (revision 131) +++ /FCKeditor/trunk/editor/lang/cs.js (revision 132) @@ -1,10 +1,24 @@ -/* @Packager.Header -<FileDescription> - Czech language file. -</FileDescription> -<Author name="David Horák" email="david.horak@email.cz" /> -<Author name="Petr Plavjaník" email="plavjanik@gmail.com" /> -<Author name="Dave MacBlack" email="davemacblack@users.sourceforge.net" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Czech language file. + */ var FCKLang = Index: /FCKeditor/trunk/editor/lang/da.js =================================================================== --- /FCKeditor/trunk/editor/lang/da.js (revision 131) +++ /FCKeditor/trunk/editor/lang/da.js (revision 132) @@ -1,10 +1,24 @@ -/* @Packager.Header -<FileDescription> - Danish language file. -</FileDescription> -<Author name="Jørgen Nordstrøm" email="jn@FirstWeb.dk" /> -<Author name="Jesper Michelsen" email="jm@i-deVision.dk" /> -<Author name="Bo Brandt" email="bbr@dynamicweb.dk" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Danish language file. + */ var FCKLang = Index: /FCKeditor/trunk/editor/lang/de.js =================================================================== --- /FCKeditor/trunk/editor/lang/de.js (revision 131) +++ /FCKeditor/trunk/editor/lang/de.js (revision 132) @@ -1,9 +1,24 @@ -/* @Packager.Header -<FileDescription> - German language file. -</FileDescription> -<Author name="Maik Unruh" email="m.unruh@mm-concept.de" /> -<Author name="Hendrik Kramer" email="HK@lwd.de" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * German language file. + */ var FCKLang = Index: /FCKeditor/trunk/editor/lang/el.js =================================================================== --- /FCKeditor/trunk/editor/lang/el.js (revision 131) +++ /FCKeditor/trunk/editor/lang/el.js (revision 132) @@ -1,9 +1,24 @@ -/* @Packager.Header -<FileDescription> - Greek language file. -</FileDescription> -<Author name="Vangelis Bibakis" email="bibakisv[-a-t-]yahoo.com" /> -<Author name="Spyros Barbatos" email="sbarbatos{at}users.sourceforge.net" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Greek language file. + */ var FCKLang = Index: /FCKeditor/trunk/editor/lang/en-au.js =================================================================== --- /FCKeditor/trunk/editor/lang/en-au.js (revision 131) +++ /FCKeditor/trunk/editor/lang/en-au.js (revision 132) @@ -1,9 +1,24 @@ -/* @Packager.Header -<FileDescription> - English (Australia) language file. -</FileDescription> -<Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" /> -<Author name="Christopher Dawes" email="fckeditor@dawes.id.au" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * English (Australia) language file. + */ var FCKLang = Index: /FCKeditor/trunk/editor/lang/en-ca.js =================================================================== --- /FCKeditor/trunk/editor/lang/en-ca.js (revision 131) +++ /FCKeditor/trunk/editor/lang/en-ca.js (revision 132) @@ -1,9 +1,24 @@ -/* @Packager.Header -<FileDescription> - English (Canadian) language file. -</FileDescription> -<Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" /> -<Author name="Kevin Bennett" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * English (Canadian) language file. + */ var FCKLang = Index: /FCKeditor/trunk/editor/lang/en-uk.js =================================================================== --- /FCKeditor/trunk/editor/lang/en-uk.js (revision 131) +++ /FCKeditor/trunk/editor/lang/en-uk.js (revision 132) @@ -1,9 +1,24 @@ -/* @Packager.Header -<FileDescription> - English (United Kingdom) language file. -</FileDescription> -<Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" /> -<Author name="Christopher Dawes" email="fckeditor@dawes.id.au" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * English (United Kingdom) language file. + */ var FCKLang = Index: /FCKeditor/trunk/editor/lang/en.js =================================================================== --- /FCKeditor/trunk/editor/lang/en.js (revision 131) +++ /FCKeditor/trunk/editor/lang/en.js (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header -<FileDescription> - English language file. -</FileDescription> -<Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * English language file. + */ var FCKLang = Index: /FCKeditor/trunk/editor/lang/eo.js =================================================================== --- /FCKeditor/trunk/editor/lang/eo.js (revision 131) +++ /FCKeditor/trunk/editor/lang/eo.js (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header -<FileDescription> - Esperanto language file. -</FileDescription> -<Author name="Tim Morley" email="timsk@openoffice.org" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Esperanto language file. + */ var FCKLang = Index: /FCKeditor/trunk/editor/lang/es.js =================================================================== --- /FCKeditor/trunk/editor/lang/es.js (revision 131) +++ /FCKeditor/trunk/editor/lang/es.js (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header -<FileDescription> - Spanish language file. -</FileDescription> -<Author name="Gabriel Schillaci" email="internetbug@users.sourceforge.net" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Spanish language file. + */ var FCKLang = Index: /FCKeditor/trunk/editor/lang/et.js =================================================================== --- /FCKeditor/trunk/editor/lang/et.js (revision 131) +++ /FCKeditor/trunk/editor/lang/et.js (revision 132) @@ -1,9 +1,24 @@ -/* @Packager.Header -<FileDescription> - Estonian language file. -</FileDescription> -<Author name="Kristjan Kivikangur" email="kristjan@ttrk.ee" /> -<Author name="Gustav Kaskema" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Estonian language file. + */ var FCKLang = Index: /FCKeditor/trunk/editor/lang/eu.js =================================================================== --- /FCKeditor/trunk/editor/lang/eu.js (revision 131) +++ /FCKeditor/trunk/editor/lang/eu.js (revision 132) @@ -1,9 +1,25 @@ -/* @Packager.Header -<FileDescription> - Basque language file. - Euskara hizkuntza fitxategia. -</FileDescription> -<Author name="Ibon Igartua" email="Librezale.org" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Basque language file. + * Euskara hizkuntza fitxategia. + */ var FCKLang = Index: /FCKeditor/trunk/editor/lang/fa.js =================================================================== --- /FCKeditor/trunk/editor/lang/fa.js (revision 131) +++ /FCKeditor/trunk/editor/lang/fa.js (revision 132) @@ -1,9 +1,24 @@ -/* @Packager.Header -<FileDescription> - Persian language file. -</FileDescription> -<Author name="Hamed Taj-Abadi" email="hamed@ranginkaman.com" /> -<Author name="Pooyan Mahdavi" email="pooyanmx -@- gmail -.- com" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Persian language file. + */ var FCKLang = Index: /FCKeditor/trunk/editor/lang/fi.js =================================================================== --- /FCKeditor/trunk/editor/lang/fi.js (revision 131) +++ /FCKeditor/trunk/editor/lang/fi.js (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header -<FileDescription> - Finnish language file. -</FileDescription> -<Author name="Marko Korhonen" email="marko.korhonen@datafisher.com" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Finnish language file. + */ var FCKLang = Index: /FCKeditor/trunk/editor/lang/fo.js =================================================================== --- /FCKeditor/trunk/editor/lang/fo.js (revision 131) +++ /FCKeditor/trunk/editor/lang/fo.js (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header -<FileDescription> - Faroese language file. -</FileDescription> -<Author name="Jón Jallur Gaasedal" email="jon@faroenet.fo" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Faroese language file. + */ var FCKLang = Index: /FCKeditor/trunk/editor/lang/fr.js =================================================================== --- /FCKeditor/trunk/editor/lang/fr.js (revision 131) +++ /FCKeditor/trunk/editor/lang/fr.js (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header -<FileDescription> - French language file. -</FileDescription> -<Author name="Hubert Garrido" email="liane@users.sourceforge.net" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * French language file. + */ var FCKLang = Index: /FCKeditor/trunk/editor/lang/gl.js =================================================================== --- /FCKeditor/trunk/editor/lang/gl.js (revision 131) +++ /FCKeditor/trunk/editor/lang/gl.js (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header -<FileDescription> - Galician language file. -</FileDescription> -<Author name="Fernando Riveiro Lopez" email="" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Galician language file. + */ var FCKLang = Index: /FCKeditor/trunk/editor/lang/he.js =================================================================== --- /FCKeditor/trunk/editor/lang/he.js (revision 131) +++ /FCKeditor/trunk/editor/lang/he.js (revision 132) @@ -1,9 +1,24 @@ -/* @Packager.Header -<FileDescription> - Hebrew language file. -</FileDescription> -<Author name="Tamir Mordo" email="tamir@tetitu.co.il" /> -<Author name="Ophir Radnitz" email="ophir@liqweed.net" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Hebrew language file. + */ var FCKLang = Index: /FCKeditor/trunk/editor/lang/hi.js =================================================================== --- /FCKeditor/trunk/editor/lang/hi.js (revision 131) +++ /FCKeditor/trunk/editor/lang/hi.js (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header -<FileDescription> - Hindi language file. -</FileDescription> -<Author name="Utkarshraj Atmaram" email="utcursch@gmail.com" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Hindi language file. + */ var FCKLang = Index: /FCKeditor/trunk/editor/lang/hr.js =================================================================== --- /FCKeditor/trunk/editor/lang/hr.js (revision 131) +++ /FCKeditor/trunk/editor/lang/hr.js (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header -<FileDescription> - Croatian language file. -</FileDescription> -<Author name="Alex Varga" email="avarga@globaldizajn.hr" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Croatian language file. + */ var FCKLang = Index: /FCKeditor/trunk/editor/lang/hu.js =================================================================== --- /FCKeditor/trunk/editor/lang/hu.js (revision 131) +++ /FCKeditor/trunk/editor/lang/hu.js (revision 132) @@ -1,9 +1,24 @@ -/* @Packager.Header -<FileDescription> - Hungarian language file. -</FileDescription> -<Author name="Varga Zsolt" email="meridian@netteszt.hu" /> -<Author name="Géza Szűcs" email="flextor@flextor.hu" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Hungarian language file. + */ var FCKLang = Index: /FCKeditor/trunk/editor/lang/it.js =================================================================== --- /FCKeditor/trunk/editor/lang/it.js (revision 131) +++ /FCKeditor/trunk/editor/lang/it.js (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header -<FileDescription> - Italian language file. -</FileDescription> -<Author name="Simone Chiaretta" email="simone@piyosailing.com" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Italian language file. + */ var FCKLang = Index: /FCKeditor/trunk/editor/lang/ja.js =================================================================== --- /FCKeditor/trunk/editor/lang/ja.js (revision 131) +++ /FCKeditor/trunk/editor/lang/ja.js (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header -<FileDescription> - Japanese language file. -</FileDescription> -<Author name="Takashi Yamaguchi" email="jack@omakase.net" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Japanese language file. + */ var FCKLang = Index: /FCKeditor/trunk/editor/lang/km.js =================================================================== --- /FCKeditor/trunk/editor/lang/km.js (revision 131) +++ /FCKeditor/trunk/editor/lang/km.js (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header -<FileDescription> - Khmer language file. -</FileDescription> -<Author name="Chay Sengtha" email="sengtha@e-khmer.com - http://translate.e-khmer.net" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Khmer language file. + */ var FCKLang = Index: /FCKeditor/trunk/editor/lang/ko.js =================================================================== --- /FCKeditor/trunk/editor/lang/ko.js (revision 131) +++ /FCKeditor/trunk/editor/lang/ko.js (revision 132) @@ -1,9 +1,24 @@ -/* @Packager.Header -<FileDescription> - Korean language file. -</FileDescription> -<Author name="Taehwan Kwag" email="thkwag@nate.com" /> -<Author name="Hyung-chae, Kim" email="chaeya@gmail.com" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Korean language file. + */ var FCKLang = Index: /FCKeditor/trunk/editor/lang/lt.js =================================================================== --- /FCKeditor/trunk/editor/lang/lt.js (revision 131) +++ /FCKeditor/trunk/editor/lang/lt.js (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header -<FileDescription> - Lithuanian language file. -</FileDescription> -<Author name="Tauras Paliulis" email="tauras.paliulis@tauras.com" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Lithuanian language file. + */ var FCKLang = Index: /FCKeditor/trunk/editor/lang/lv.js =================================================================== --- /FCKeditor/trunk/editor/lang/lv.js (revision 131) +++ /FCKeditor/trunk/editor/lang/lv.js (revision 132) @@ -1,9 +1,24 @@ -/* @Packager.Header -<FileDescription> - Latvian language file. -</FileDescription> -<Author name="Jānis Kļaviņš" email="janis@4id.lv" /> -<Author name="Slowmo" email="slowmo@inbox.lv" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Latvian language file. + */ var FCKLang = Index: /FCKeditor/trunk/editor/lang/mn.js =================================================================== --- /FCKeditor/trunk/editor/lang/mn.js (revision 131) +++ /FCKeditor/trunk/editor/lang/mn.js (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header -<FileDescription> - Mongolian language file. -</FileDescription> -<Author name="Lkamtseren ODONBAATAR" email="odonbaatarl@yahoo.com" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Mongolian language file. + */ var FCKLang = Index: /FCKeditor/trunk/editor/lang/ms.js =================================================================== --- /FCKeditor/trunk/editor/lang/ms.js (revision 131) +++ /FCKeditor/trunk/editor/lang/ms.js (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header -<FileDescription> - Malay language file. -</FileDescription> -<Author name="Fairul Izham Mohd Mokhlas" email="eg86@hotmail.com" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Malay language file. + */ var FCKLang = Index: /FCKeditor/trunk/editor/lang/nb.js =================================================================== --- /FCKeditor/trunk/editor/lang/nb.js (revision 131) +++ /FCKeditor/trunk/editor/lang/nb.js (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header -<FileDescription> - Norwegian Bokmål language file. -</FileDescription> -<Author name="Martin Kronstad (www.siteman.no)" email="martin.kronstad@gmail.com" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Norwegian Bokmål language file. + */ var FCKLang = Index: /FCKeditor/trunk/editor/lang/nl.js =================================================================== --- /FCKeditor/trunk/editor/lang/nl.js (revision 131) +++ /FCKeditor/trunk/editor/lang/nl.js (revision 132) @@ -1,10 +1,24 @@ -/* @Packager.Header -<FileDescription> - Dutch language file. -</FileDescription> -<Author name="Bram Crins" email="bcrins@realdesign.nl" /> -<Author name="Aaron van Geffen" email="aaron@aaronweb.net" /> -<Author name="John van der Kamp" email="j.vdkamp@connectux.com" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Dutch language file. + */ var FCKLang = Index: /FCKeditor/trunk/editor/lang/no.js =================================================================== --- /FCKeditor/trunk/editor/lang/no.js (revision 131) +++ /FCKeditor/trunk/editor/lang/no.js (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header -<FileDescription> - Norwegian language file. -</FileDescription> -<Author name="Martin Kronstad (www.siteman.no)" email="martin.kronstad@gmail.com" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Norwegian language file. + */ var FCKLang = Index: /FCKeditor/trunk/editor/lang/pl.js =================================================================== --- /FCKeditor/trunk/editor/lang/pl.js (revision 131) +++ /FCKeditor/trunk/editor/lang/pl.js (revision 132) @@ -1,9 +1,24 @@ -/* @Packager.Header -<FileDescription> - Polish language file. -</FileDescription> -<Author name="Jakub Boesche" email="jboesche@gazeta.pl" /> -<Author name="Maciej Bochynski" email="maciej.bochynski@lubman.pl" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Polish language file. + */ var FCKLang = Index: /FCKeditor/trunk/editor/lang/pt-br.js =================================================================== --- /FCKeditor/trunk/editor/lang/pt-br.js (revision 131) +++ /FCKeditor/trunk/editor/lang/pt-br.js (revision 132) @@ -1,10 +1,24 @@ -/* @Packager.Header -<FileDescription> - Brazilian Portuguese language file. -</FileDescription> -<Author name="Carlos Alberto Tomatis Loth" email="carlos.loth@conectait.com.br" /> -<Author name="GibaPhp" email="www.xoopstotal.com.br" /> -<Author name="Francisco Ernesto Teixeira" email="fco_ernesto@yahoo.com.br" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Brazilian Portuguese language file. + */ var FCKLang = Index: /FCKeditor/trunk/editor/lang/pt.js =================================================================== --- /FCKeditor/trunk/editor/lang/pt.js (revision 131) +++ /FCKeditor/trunk/editor/lang/pt.js (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header -<FileDescription> - Portuguese language file. -</FileDescription> -<Author name="Francisco Pereira" email="fjpereira@netcabo.pt" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Portuguese language file. + */ var FCKLang = Index: /FCKeditor/trunk/editor/lang/ro.js =================================================================== --- /FCKeditor/trunk/editor/lang/ro.js (revision 131) +++ /FCKeditor/trunk/editor/lang/ro.js (revision 132) @@ -1,9 +1,24 @@ -/* @Packager.Header -<FileDescription> - Romanian language file. -</FileDescription> -<Author name="Adrian Nicoara" email="nicoara@users.sourceforge.net" /> -<Author name="Ionut Traian Popa" email="" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Romanian language file. + */ var FCKLang = Index: /FCKeditor/trunk/editor/lang/ru.js =================================================================== --- /FCKeditor/trunk/editor/lang/ru.js (revision 131) +++ /FCKeditor/trunk/editor/lang/ru.js (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header -<FileDescription> - Russian language file. -</FileDescription> -<Author name="Andrey Grebnev" email="andrey.grebnev@blandware.com" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Russian language file. + */ var FCKLang = Index: /FCKeditor/trunk/editor/lang/sk.js =================================================================== --- /FCKeditor/trunk/editor/lang/sk.js (revision 131) +++ /FCKeditor/trunk/editor/lang/sk.js (revision 132) @@ -1,9 +1,24 @@ -/* @Packager.Header -<FileDescription> - Slovak language file. -</FileDescription> -<Author name="Samuel Szabo" email="samuel@nanete.sk" /> -<Author name="Jozef Gaal" email="runcms.mayday.sk" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Slovak language file. + */ var FCKLang = Index: /FCKeditor/trunk/editor/lang/sl.js =================================================================== --- /FCKeditor/trunk/editor/lang/sl.js (revision 131) +++ /FCKeditor/trunk/editor/lang/sl.js (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header -<FileDescription> - Slovenian language file. -</FileDescription> -<Author name="Boris Volarič" email="vol@rutka.net" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Slovenian language file. + */ var FCKLang = Index: /FCKeditor/trunk/editor/lang/sr-latn.js =================================================================== --- /FCKeditor/trunk/editor/lang/sr-latn.js (revision 131) +++ /FCKeditor/trunk/editor/lang/sr-latn.js (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header -<FileDescription> - Serbian (Latin) language file. -</FileDescription> -<Author name="Zoran Subic" email="zoran@tf.zr.ac.yu" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Serbian (Latin) language file. + */ var FCKLang = Index: /FCKeditor/trunk/editor/lang/sr.js =================================================================== --- /FCKeditor/trunk/editor/lang/sr.js (revision 131) +++ /FCKeditor/trunk/editor/lang/sr.js (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header -<FileDescription> - Serbian (Cyrillic) language file. -</FileDescription> -<Author name="Zoran Subić" email="zoran@tf.zr.ac.yu" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Serbian (Cyrillic) language file. + */ var FCKLang = Index: /FCKeditor/trunk/editor/lang/sv.js =================================================================== --- /FCKeditor/trunk/editor/lang/sv.js (revision 131) +++ /FCKeditor/trunk/editor/lang/sv.js (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header -<FileDescription> - Swedish language file. -</FileDescription> -<Author name="Kristoffer Malvefors" email="kristoffer@intema.ws" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Swedish language file. + */ var FCKLang = Index: /FCKeditor/trunk/editor/lang/th.js =================================================================== --- /FCKeditor/trunk/editor/lang/th.js (revision 131) +++ /FCKeditor/trunk/editor/lang/th.js (revision 132) @@ -1,9 +1,24 @@ -/* @Packager.Header -<FileDescription> - Thai language file. -</FileDescription> -<Author name="Audy Charin Arsakit" email="arsakit@gmail.com" /> -<Author name="Joy Piyanoot Promnuan" email="piyanoot@gmail.com" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Thai language file. + */ var FCKLang = Index: /FCKeditor/trunk/editor/lang/tr.js =================================================================== --- /FCKeditor/trunk/editor/lang/tr.js (revision 131) +++ /FCKeditor/trunk/editor/lang/tr.js (revision 132) @@ -1,9 +1,24 @@ -/* @Packager.Header -<FileDescription> - Turkish language file. -</FileDescription> -<Author name="Bogac Guven" email="bogacmx@yahoo.com" /> -<Author name="Burak Gürsoy" email="burak@cpan.org" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Turkish language file. + */ var FCKLang = Index: /FCKeditor/trunk/editor/lang/uk.js =================================================================== --- /FCKeditor/trunk/editor/lang/uk.js (revision 131) +++ /FCKeditor/trunk/editor/lang/uk.js (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header -<FileDescription> - Ukrainian language file. -</FileDescription> -<Author name="Alexander Pervak" email="pervak@gmail.com" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Ukrainian language file. + */ var FCKLang = Index: /FCKeditor/trunk/editor/lang/vi.js =================================================================== --- /FCKeditor/trunk/editor/lang/vi.js (revision 131) +++ /FCKeditor/trunk/editor/lang/vi.js (revision 132) @@ -1,9 +1,24 @@ -/* @Packager.Header -<FileDescription> - Vietnamese language file. -</FileDescription> -<Author name="Phan Binh Giang" email="bbbgiang@yahoo.com" /> -<Author name="Hà Thanh Hải" email="thanhhai.ha@gmail.com" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Vietnamese language file. + */ var FCKLang = Index: /FCKeditor/trunk/editor/lang/zh-cn.js =================================================================== --- /FCKeditor/trunk/editor/lang/zh-cn.js (revision 131) +++ /FCKeditor/trunk/editor/lang/zh-cn.js (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header -<FileDescription> - Chinese Simplified language file. -</FileDescription> -<Author name="NetRube" email="netrube@gmail.com" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Chinese Simplified language file. + */ var FCKLang = Index: /FCKeditor/trunk/editor/lang/zh.js =================================================================== --- /FCKeditor/trunk/editor/lang/zh.js (revision 131) +++ /FCKeditor/trunk/editor/lang/zh.js (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header -<FileDescription> - Chinese Traditional language file. -</FileDescription> -<Author name="Zak Fong" email="zakfong@yahoo.com.tw" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Chinese Traditional language file. + */ var FCKLang = Index: /FCKeditor/trunk/editor/plugins/autogrow/fckplugin.js =================================================================== --- /FCKeditor/trunk/editor/plugins/autogrow/fckplugin.js (revision 131) +++ /FCKeditor/trunk/editor/plugins/autogrow/fckplugin.js (revision 132) @@ -1,9 +1,25 @@ -/* @Packager.Header -<FileDescription> - Plugin: automatically resizes the editor until a configurable maximun - height (FCKConfig.AutoGrowMax), based on its contents. -</FileDescription> -<Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Plugin: automatically resizes the editor until a configurable maximun + * height (FCKConfig.AutoGrowMax), based on its contents. + */ var FCKAutoGrow_Min = window.frameElement.offsetHeight ; @@ -14,5 +30,5 @@ var iFrameHeight, iInnerHeight ; - + if ( FCKBrowserInfo.IsIE ) { @@ -31,5 +47,5 @@ { var iMainFrameSize = window.frameElement.offsetHeight ; - + if ( iDiff > 0 && iMainFrameSize < FCKConfig.AutoGrowMax ) { @@ -46,5 +62,5 @@ else return ; - + window.frameElement.height = iMainFrameSize ; } Index: /FCKeditor/trunk/editor/plugins/placeholder/fck_placeholder.html =================================================================== --- /FCKeditor/trunk/editor/plugins/placeholder/fck_placeholder.html (revision 131) +++ /FCKeditor/trunk/editor/plugins/placeholder/fck_placeholder.html (revision 132) @@ -1,13 +1,28 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> - <html> <head> <title>Placeholder Properties</title> - <meta name="vs_targetSchema" content="http://schemas.microsoft.com/intellisense/ie5" />  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta content="noindex, nofollow" name="robots"> @@ -22,9 +37,9 @@ // First of all, translate the dialog box texts oEditor.FCKLanguageManager.TranslatePage( document ) ; - + LoadSelected() ; - + // Show the "Ok" button. - window.parent.SetOkButton( true ) ; + window.parent.SetOkButton( true ) ; } @@ -45,5 +60,5 @@ { var sValue = document.getElementById('txtName').value ; - + if ( eSelected && eSelected._fckplaceholder == sValue ) return true ; @@ -54,5 +69,5 @@ return false ; } - + if ( FCKPlaceholders.Exist( sValue ) ) { Index: /FCKeditor/trunk/editor/plugins/placeholder/fckplugin.js =================================================================== --- /FCKeditor/trunk/editor/plugins/placeholder/fckplugin.js (revision 131) +++ /FCKeditor/trunk/editor/plugins/placeholder/fckplugin.js (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header -<FileDescription> - Plugin to insert "Placeholders" in the editor. -</FileDescription> -<Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Plugin to insert "Placeholders" in the editor. + */ // Register the related command. @@ -88,5 +104,5 @@ if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG ) return ; - + var aPlaholders = FCK.EditorDocument.body.innerText.match( /\[\[[^\[\]]+\]\]/g ) ; if ( !aPlaholders ) @@ -111,5 +127,5 @@ if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG ) return ; - + var oInteractor = FCK.EditorDocument.createTreeWalker( FCK.EditorDocument.body, NodeFilter.SHOW_TEXT, FCKPlaceholders._AcceptNode, true ) ; @@ -145,5 +161,5 @@ aNodes[n].parentNode.removeChild( aNodes[n] ) ; } - + FCKPlaceholders._SetupClickListener() ; } Index: /FCKeditor/trunk/editor/plugins/placeholder/lang/de.js =================================================================== --- /FCKeditor/trunk/editor/plugins/placeholder/lang/de.js (revision 131) +++ /FCKeditor/trunk/editor/plugins/placeholder/lang/de.js (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header -<FileDescription> - Placholder German language file. -</FileDescription> -<Author name="José Fontanil" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Placholder German language file. + */ FCKLang.PlaceholderBtn = 'Einfügen/editieren Platzhalter' ; FCKLang.PlaceholderDlgTitle = 'Platzhalter Eigenschaften' ; Index: /FCKeditor/trunk/editor/plugins/placeholder/lang/en.js =================================================================== --- /FCKeditor/trunk/editor/plugins/placeholder/lang/en.js (revision 131) +++ /FCKeditor/trunk/editor/plugins/placeholder/lang/en.js (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header -<FileDescription> - Placholder English language file. -</FileDescription> -<Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Placholder English language file. + */ FCKLang.PlaceholderBtn = 'Insert/Edit Placeholder' ; FCKLang.PlaceholderDlgTitle = 'Placeholder Properties' ; Index: /FCKeditor/trunk/editor/plugins/placeholder/lang/fr.js =================================================================== --- /FCKeditor/trunk/editor/plugins/placeholder/lang/fr.js (revision 131) +++ /FCKeditor/trunk/editor/plugins/placeholder/lang/fr.js (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header -<FileDescription> - Placholder Italian language file. -</FileDescription> -<Author name="Hubert Garrido" email="liane@users.sourceforge.net" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Placholder Italian language file. + */ FCKLang.PlaceholderBtn = 'Insérer/Modifier Substitut' ; FCKLang.PlaceholderDlgTitle = 'Propriétés de Substitut' ; Index: /FCKeditor/trunk/editor/plugins/placeholder/lang/it.js =================================================================== --- /FCKeditor/trunk/editor/plugins/placeholder/lang/it.js (revision 131) +++ /FCKeditor/trunk/editor/plugins/placeholder/lang/it.js (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header -<FileDescription> - Placholder Italian language file. -</FileDescription> -<Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Placholder Italian language file. + */ FCKLang.PlaceholderBtn = 'Aggiungi/Modifica Placeholder' ; FCKLang.PlaceholderDlgTitle = 'Proprietà del Placeholder' ; Index: /FCKeditor/trunk/editor/plugins/placeholder/lang/pl.js =================================================================== --- /FCKeditor/trunk/editor/plugins/placeholder/lang/pl.js (revision 131) +++ /FCKeditor/trunk/editor/plugins/placeholder/lang/pl.js (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header -<FileDescription> - Placholder Polish language file. -</FileDescription> -<Author name="Marcin Pietrzak" email="fck@iworks.pl" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Placholder Polish language file. + */ FCKLang.PlaceholderBtn = 'Wstaw/Edytuj nagłówek' ; FCKLang.PlaceholderDlgTitle = 'Właśności nagłówka' ; Index: /FCKeditor/trunk/editor/plugins/simplecommands/fckplugin.js =================================================================== --- /FCKeditor/trunk/editor/plugins/simplecommands/fckplugin.js (revision 131) +++ /FCKeditor/trunk/editor/plugins/simplecommands/fckplugin.js (revision 132) @@ -1,9 +1,25 @@ -/* @Packager.Header -<FileDescription> - This plugin register Toolbar items for the combos modifying the style to - not show the box. -</FileDescription> -<Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * This plugin register Toolbar items for the combos modifying the style to + * not show the box. + */ FCKToolbarItems.RegisterItem( 'SourceSimple' , new FCKToolbarButton( 'Source', FCKLang.Source, null, FCK_TOOLBARITEM_ONLYICON, true, true, 1 ) ) ; Index: /FCKeditor/trunk/editor/plugins/tablecommands/fckplugin.js =================================================================== --- /FCKeditor/trunk/editor/plugins/tablecommands/fckplugin.js (revision 131) +++ /FCKeditor/trunk/editor/plugins/tablecommands/fckplugin.js (revision 132) @@ -1,9 +1,25 @@ -/* @Packager.Header -<FileDescription> - This plugin register the required Toolbar items to be able to insert the - toolbar commands in the toolbar. -</FileDescription> -<Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * This plugin register the required Toolbar items to be able to insert the + * toolbar commands in the toolbar. + */ FCKToolbarItems.RegisterItem( 'TableInsertRow' , new FCKToolbarButton( 'TableInsertRow' , FCKLang.InsertRow, null, null, null, null, 62 ) ) ; Index: /FCKeditor/trunk/editor/skins/_fckviewstrips.html =================================================================== --- /FCKeditor/trunk/editor/skins/_fckviewstrips.html (revision 131) +++ /FCKeditor/trunk/editor/skins/_fckviewstrips.html (revision 132) @@ -1,9 +1,24 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> - <html xmlns="http://www.w3.org/1999/xhtml"> @@ -49,7 +64,7 @@ if ( iMaxHeight < this.height ) iMaxHeight = this.height ; - + iTotalStrips-- ; - + if ( iTotalStrips == 0 ) LoadIcons( iMaxHeight / 16 ) ; @@ -63,8 +78,8 @@ { var eRow = xIconsTable.insertRow(-1) ; - + var eCell = eRow.insertCell(-1) ; eCell.innerHTML = i + 1 ; - + eCell = eRow.insertCell(-1) ; eCell.align = 'center' ; Index: /FCKeditor/trunk/editor/skins/default/fck_dialog.css =================================================================== --- /FCKeditor/trunk/editor/skins/default/fck_dialog.css (revision 131) +++ /FCKeditor/trunk/editor/skins/default/fck_dialog.css (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header -<FileDescription> - Styles used by the dialog boxes. -</FileDescription> -<Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Styles used by the dialog boxes. + */ body Index: /FCKeditor/trunk/editor/skins/default/fck_editor.css =================================================================== --- /FCKeditor/trunk/editor/skins/default/fck_editor.css (revision 131) +++ /FCKeditor/trunk/editor/skins/default/fck_editor.css (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header -<FileDescription> - Styles used by the editor IFRAME and Toolbar. -</FileDescription> -<Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Styles used by the editor IFRAME and Toolbar. + */ /* Index: /FCKeditor/trunk/editor/skins/office2003/fck_dialog.css =================================================================== --- /FCKeditor/trunk/editor/skins/office2003/fck_dialog.css (revision 131) +++ /FCKeditor/trunk/editor/skins/office2003/fck_dialog.css (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header -<FileDescription> - Styles used by the dialog boxes. -</FileDescription> -<Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Styles used by the dialog boxes. + */ body Index: /FCKeditor/trunk/editor/skins/office2003/fck_editor.css =================================================================== --- /FCKeditor/trunk/editor/skins/office2003/fck_editor.css (revision 131) +++ /FCKeditor/trunk/editor/skins/office2003/fck_editor.css (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header -<FileDescription> - Styles used by the editor IFRAME and Toolbar. -</FileDescription> -<Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Styles used by the editor IFRAME and Toolbar. + */ /* Index: /FCKeditor/trunk/editor/skins/silver/fck_dialog.css =================================================================== --- /FCKeditor/trunk/editor/skins/silver/fck_dialog.css (revision 131) +++ /FCKeditor/trunk/editor/skins/silver/fck_dialog.css (revision 132) @@ -1,8 +1,24 @@ -/* @Packager.Header -<FileDescription> - Styles used by the dialog boxes. -</FileDescription> -<Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Styles used by the dialog boxes. + */ body Index: /FCKeditor/trunk/editor/skins/silver/fck_editor.css =================================================================== --- /FCKeditor/trunk/editor/skins/silver/fck_editor.css (revision 131) +++ /FCKeditor/trunk/editor/skins/silver/fck_editor.css (revision 132) @@ -1,9 +1,24 @@ -/* @Packager.Header -<FileDescription> - Styles used by the editor IFRAME and Toolbar. -</FileDescription> -<Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" /> -<Author name="gazou[Fr]" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Styles used by the editor IFRAME and Toolbar. + */ /* @@ -180,6 +195,6 @@ /* For composed button ( icon + text, icon + arrow ), we must compensate the table */ -.TB_Button_On TABLE .TB_Button_Image, -.TB_Button_Off TABLE .TB_Button_Image, +.TB_Button_On TABLE .TB_Button_Image, +.TB_Button_Off TABLE .TB_Button_Image, .TB_Button_On_Over TABLE .TB_Button_Image, .TB_Button_Off_Over TABLE .TB_Button_Image, Index: /FCKeditor/trunk/fckconfig.js =================================================================== --- /FCKeditor/trunk/fckconfig.js (revision 131) +++ /FCKeditor/trunk/fckconfig.js (revision 132) @@ -1,11 +1,27 @@ -/* @Packager.Header -<FileDescription> - Editor configuration settings. - - Follow this link for more information: - http://wiki.fckeditor.net/Developer%27s_Guide/Configuration/Configurations_Settings -</FileDescription> -<Author name="Frederico Caldeira Knabben" email="www.fckeditor.net" /> -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * Editor configuration settings. + * + * Follow this link for more information: + * http://wiki.fckeditor.net/Developer%27s_Guide/Configuration/Configurations_Settings + */ // Disable the custom Enter Key Handler (this configuration will be removed in @@ -14,5 +30,4 @@ FCKConfig.CustomConfigurationsPath = '' ; -FCKConfig.CustomConfigurationsPath = '/fckeditor.config.js' ; // @Packager.RemoveLine FCKConfig.EditorAreaCSS = FCKConfig.BasePath + 'css/fck_editorarea.css' ; @@ -157,17 +172,15 @@ FCKConfig.CleanWordKeepsStructure = false ; -// The following value defines which File Browser connector and Quick Upload +// The following value defines which File Browser connector and Quick Upload // "uploader" to use. It is valid for the default implementaion and it is here -// just to make this configuration file cleaner. -// It is not possible to change this value using an external file or even -// inline when creating the editor instance. In that cases you must set the +// just to make this configuration file cleaner. +// It is not possible to change this value using an external file or even +// inline when creating the editor instance. In that cases you must set the // values of LinkBrowserURL, ImageBrowserURL and so on. // Custom implementations should just ignore it. var _FileBrowserLanguage = 'asp' ; // asp | aspx | cfm | lasso | perl | php | py var _QuickUploadLanguage = 'asp' ; // asp | aspx | cfm | lasso | php -_FileBrowserLanguage = 'php' ; // @Packager.RemoveLine -_QuickUploadLanguage = 'php' ; // @Packager.RemoveLine - -// Don't care about the following line. It just calculates the correct connector + +// Don't care about the following line. It just calculates the correct connector // extension to use for the default File Browser (Perl uses "cgi"). var _FileBrowserExtension = _FileBrowserLanguage == 'perl' ? 'cgi' : _FileBrowserLanguage ; Index: /FCKeditor/trunk/fckeditor.afp =================================================================== --- /FCKeditor/trunk/fckeditor.afp (revision 131) +++ /FCKeditor/trunk/fckeditor.afp (revision 132) @@ -1,30 +1,24 @@ -<% +<% * FCKeditor - The text editor for Internet - http://www.fckeditor.net * Copyright (C) 2003-2007 Frederico Caldeira Knabben - * + * * == BEGIN LICENSE == - * + * * Licensed under the terms of any of the following licenses at your * choice: - * + * * - GNU General Public License Version 2 or later (the "GPL") * http://www.gnu.org/licenses/gpl.html - * + * * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") * http://www.gnu.org/licenses/lgpl.html - * + * * - Mozilla Public License Version 1.1 or later (the "MPL") * http://www.mozilla.org/MPL/MPL-1.1.html - * + * * == END LICENSE == - * - * File Name: fckeditor.afp - * This is the integration file for Active FoxPro Pages. - * - * Version: 1.01 - * Modified: 2006-11-13 - * - * File Authors: Soenke Freitag (www.afp-hosting.de) - * + * + * This is the integration file for Active FoxPro Pages. + * DEFINE CLASS goFckeditor AS CONTAINER OLEPUBLIC Index: /FCKeditor/trunk/fckeditor.asp =================================================================== --- /FCKeditor/trunk/fckeditor.asp (revision 131) +++ /FCKeditor/trunk/fckeditor.asp (revision 132) @@ -1,10 +1,26 @@ - <% @@ -170,5 +186,5 @@ End Function - + Private Function EncodeConfig( valueToEncode ) EncodeConfig = Replace( valueToEncode, "&", "%26" ) Index: /FCKeditor/trunk/fckeditor.cfc =================================================================== --- /FCKeditor/trunk/fckeditor.cfc (revision 131) +++ /FCKeditor/trunk/fckeditor.cfc (revision 132) @@ -1,35 +1,51 @@ <cfcomponent output="false" displayname="FCKeditor" hint="Create an instance of the FCKeditor."> - -<cffunction - name="create" - access="public" - output="true" - returntype="void" +<cffunction + name="create" + access="public" + output="true" + returntype="void" hint="Initialize the FCKeditor instance." > @@ -131,8 +147,8 @@ hint="Create the html editor instance for compatible browsers." > - + <cfscript> var sURL = ""; - + // try to fix the basePath, if ending slash is missing if( len( this.basePath) and right( this.basePath, 1 ) is not "/" ) @@ -172,5 +188,5 @@ var lConfigKeys = ""; var iPos = ""; - + /** * CFML doesn't store casesensitive names for structure keys, but the configuration names must be casesensitive for js. @@ -185,5 +201,5 @@ lConfigKeys = lConfigKeys & ",LinkUpload,LinkUploadURL,LinkUploadWindowWidth,LinkUploadWindowHeight,LinkUploadAllowedExtensions,LinkUploadDeniedExtensions"; lConfigKeys = lConfigKeys & ",ImageBrowser,ImageBrowserURL,ImageBrowserWindowWidth,ImageBrowserWindowHeight,SmileyPath,SmileyImages,SmileyColumns,SmileyWindowWidth,SmileyWindowHeight"; - + for( key in this.config ) { @@ -196,5 +212,5 @@ fieldValue = this.config[key]; fieldName = listGetAt( lConfigKeys, iPos ); - + // set all boolean possibilities in CFML to true/false values if( isBoolean( fieldValue) and fieldValue ) @@ -202,5 +218,5 @@ else if( isBoolean( fieldValue) ) fieldValue = "false"; - + sParams = sParams & HTMLEditFormat( fieldName ) & '=' & HTMLEditFormat( fieldValue ); } Index: /FCKeditor/trunk/fckeditor.cfm =================================================================== --- /FCKeditor/trunk/fckeditor.cfm (revision 131) +++ /FCKeditor/trunk/fckeditor.cfm (revision 132) @@ -1,22 +1,37 @@ <cfsetting enablecfoutputonly="Yes"> -  - + <cfscript> if( attributes.checkBrowser ) @@ -97,5 +112,5 @@ /** - * CFML doesn't store casesensitive names for structure keys, but the configuration names must be casesensitive for js. + * CFML doesn't store casesensitive names for structure keys, but the configuration names must be casesensitive for js. * So we need to find out the correct case for the configuration keys. * We "fix" this by comparing the caseless configuration keys to a list of all available configuration options in the correct case. @@ -109,7 +124,7 @@ lConfigKeys = lConfigKeys & ",LinkUpload,LinkUploadURL,LinkUploadWindowWidth,LinkUploadWindowHeight,LinkUploadAllowedExtensions,LinkUploadDeniedExtensions"; lConfigKeys = lConfigKeys & ",ImageBrowser,ImageBrowserURL,ImageBrowserWindowWidth,ImageBrowserWindowHeight,SmileyPath,SmileyImages,SmileyColumns,SmileyWindowWidth,SmileyWindowHeight"; - + sConfig = ""; - + for( key in attributes.config ) { @@ -119,8 +134,8 @@ if( len( sConfig ) ) sConfig = sConfig & "&"; - + fieldValue = attributes.config[key]; fieldName = listGetAt( lConfigKeys, iPos ); - + sConfig = sConfig & urlEncodedFormat( fieldName ) & '=' & urlEncodedFormat( fieldValue ); } @@ -155,5 +170,5 @@ <textarea name="#attributes.instanceName#" rows="4" cols="40" style="WIDTH: #attributes.width#; HEIGHT: #attributes.height#">#HTMLEditFormat(attributes.value)# - + Index: /FCKeditor/trunk/fckeditor.js =================================================================== --- /FCKeditor/trunk/fckeditor.js (revision 131) +++ /FCKeditor/trunk/fckeditor.js (revision 132) @@ -1,12 +1,28 @@ -/* @Packager.Header - - This is the integration file for JavaScript. - - It defines the FCKeditor class that can be used to create editor - instances in a HTML page in the client side. For server side - operations, use the specific integration system. - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * This is the integration file for JavaScript. + * + * It defines the FCKeditor class that can be used to create editor + * instances in a HTML page in the client side. For server side + * operations, use the specific integration system. + */ // FCKeditor Class @@ -23,5 +39,5 @@ this.DisplayErrors = true ; this.EnableSafari = false ; // This is a temporary property, while Safari support is under development. - this.EnableSafari = true ; // @Packager.RemoveLine + this.EnableSafari = true ; // @Packager.RemoveLine this.EnableOpera = false ; // This is a temporary property, while Opera support is under development. this.EnableOpera = true ; // @Packager.RemoveLine @@ -33,6 +49,6 @@ } -FCKeditor.prototype.Version = '[[@Packager.Version]]' ; -FCKeditor.prototype.VersionBuild = '[[@Packager.Build]]' ; +FCKeditor.prototype.Version = '2.4.1 (SVN)' ; +FCKeditor.prototype.VersionBuild = '1156' ; FCKeditor.prototype.Create = function() @@ -66,5 +82,5 @@ sHtml += '' ; - + return sHtml ; } @@ -84,5 +100,5 @@ oTextarea = colElementsByName[i++] ; } - + if ( !oTextarea ) { @@ -125,5 +141,5 @@ { var sFile = 'fckeditor.html' ; - + try { Index: /FCKeditor/trunk/fckeditor.lasso =================================================================== --- /FCKeditor/trunk/fckeditor.lasso (revision 131) +++ /FCKeditor/trunk/fckeditor.lasso (revision 132) @@ -1,16 +1,32 @@ [//lasso -/* @Packager.Header - - This is the integration file for Lasso. - - It defines the FCKeditor class ("custom type" in Lasso terms) that can - be used to create editor instances in Lasso pages on server side. - - -*/ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2007 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + * + * This is the integration file for Lasso. + * + * It defines the FCKeditor class ("custom type" in Lasso terms) that can + * be used to create editor instances in Lasso pages on server side. + */ define_type( - 'editor', - -namespace='fck_', + 'editor', + -namespace='fck_', -description='Creates an instance of FCKEditor.' ); @@ -26,5 +42,5 @@ 'displayerrors' = false ); - + define_tag( 'onCreate', @@ -36,5 +52,5 @@ -optional='basepath', -type='string', -optional='config', -type='array' - ); + ); self->instancename = #instancename; local_defined('width') ? self->width = #width; @@ -45,5 +61,5 @@ local_defined('config') ? self->config = #config; /define_tag; - + define_tag('create'); if(self->isCompatibleBrowser); @@ -59,27 +75,27 @@
' + encode_html(self->initialvalue) + ' -
+ '); - /if; + /if; return(@#out); /define_tag; - + define_tag('isCompatibleBrowser'); - local('result' = true); - (client_browser >> 'Apple' || client_browser >> 'Opera' || client_browser >> 'KHTML') ? #result = false; + local('result' = true); + (client_browser >> 'Apple' || client_browser >> 'Opera' || client_browser >> 'KHTML') ? #result = false; return(#result); /define_tag; - + define_tag('parseConfig'); if(self->config->size); - local('out' = '\n'; + /iterate; + #out += '" style="display:none" />\n'; return(@#out); /if; /define_tag; - /define_type; + /define_type; ] Index: /FCKeditor/trunk/fckeditor.php =================================================================== --- /FCKeditor/trunk/fckeditor.php (revision 131) +++ /FCKeditor/trunk/fckeditor.php (revision 132) @@ -1,11 +1,28 @@ - - This is the integration file for PHP (All versions). - - It loads the correct integration file based on the PHP version (avoinding - strict error messages with PHP 5). - - -*/ + Index: /FCKeditor/trunk/fckeditor.pl =================================================================== --- /FCKeditor/trunk/fckeditor.pl (revision 131) +++ /FCKeditor/trunk/fckeditor.pl (revision 132) @@ -1,7 +1,23 @@ -##### @Packager.Header -# -# This is the integration file for Perl. -# -# +##### +# FCKeditor - The text editor for Internet - http://www.fckeditor.net +# Copyright (C) 2003-2007 Frederico Caldeira Knabben +# +# == BEGIN LICENSE == +# +# Licensed under the terms of any of the following licenses at your +# choice: +# +# - GNU General Public License Version 2 or later (the "GPL") +# http://www.gnu.org/licenses/gpl.html +# +# - GNU Lesser General Public License Version 2.1 or later (the "LGPL") +# http://www.gnu.org/licenses/lgpl.html +# +# - Mozilla Public License Version 1.1 or later (the "MPL") +# http://www.mozilla.org/MPL/MPL-1.1.html +# +# == END LICENSE == +# +# This is the integration file for Perl. ##### Index: /FCKeditor/trunk/fckeditor.py =================================================================== --- /FCKeditor/trunk/fckeditor.py (revision 131) +++ /FCKeditor/trunk/fckeditor.py (revision 132) @@ -1,7 +1,23 @@ -""" @Packager.Header - - This is the integration file for Python. - - +""" +FCKeditor - The text editor for Internet - http://www.fckeditor.net +Copyright (C) 2003-2007 Frederico Caldeira Knabben + +== BEGIN LICENSE == + +Licensed under the terms of any of the following licenses at your +choice: + + - GNU General Public License Version 2 or later (the "GPL") + http://www.gnu.org/licenses/gpl.html + + - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + http://www.gnu.org/licenses/lgpl.html + + - Mozilla Public License Version 1.1 or later (the "MPL") + http://www.mozilla.org/MPL/MPL-1.1.html + +== END LICENSE == + +This is the integration file for Python. """ @@ -91,5 +107,5 @@ Html += "" return Html - + def IsCompatible(self): if (os.environ.has_key("HTTP_USER_AGENT")): @@ -131,3 +147,3 @@ sParams += "%s=%s" % (k, v) return sParams - + Index: /FCKeditor/trunk/fckeditor_php4.php =================================================================== --- /FCKeditor/trunk/fckeditor_php4.php (revision 131) +++ /FCKeditor/trunk/fckeditor_php4.php (revision 132) @@ -1,11 +1,28 @@ - - This is the integration file for PHP 4. - - It defines the FCKeditor class that can be used to create editor - instances in PHP pages on server side. - - -*/ +CreateHtml() ; } - + function CreateHtml() { @@ -42,5 +59,5 @@ $Html = '
' ; - + if ( $this->IsCompatible() ) { @@ -51,5 +68,5 @@ $Link = "{$this->BasePath}editor/{$File}?InstanceName={$this->InstanceName}" ; - + if ( $this->ToolbarSet != '' ) $Link .= "&Toolbar={$this->ToolbarSet}" ; @@ -80,5 +97,5 @@ $Html .= '
' ; - + return $Html ; } @@ -118,5 +135,5 @@ else $bFirst = false ; - + if ( $sValue === true ) $sParams .= $this->EncodeConfig( $sKey ) . '=true' ; @@ -126,5 +143,5 @@ $sParams .= $this->EncodeConfig( $sKey ) . '=' . $this->EncodeConfig( $sValue ) ; } - + return $sParams ; } @@ -132,7 +149,7 @@ function EncodeConfig( $valueToEncode ) { - $chars = array( - '&' => '%26', - '=' => '%3D', + $chars = array( + '&' => '%26', + '=' => '%3D', '"' => '%22' ) ; Index: /FCKeditor/trunk/fckeditor_php5.php =================================================================== --- /FCKeditor/trunk/fckeditor_php5.php (revision 131) +++ /FCKeditor/trunk/fckeditor_php5.php (revision 132) @@ -1,11 +1,28 @@ - - This is the integration file for PHP 5. - - It defines the FCKeditor class that can be used to create editor - instances in PHP pages on server side. - - -*/ +CreateHtml() ; } - + function CreateHtml() { @@ -42,5 +59,5 @@ $Html = '
' ; - + if ( $this->IsCompatible() ) { @@ -51,5 +68,5 @@ $Link = "{$this->BasePath}editor/{$File}?InstanceName={$this->InstanceName}" ; - + if ( $this->ToolbarSet != '' ) $Link .= "&Toolbar={$this->ToolbarSet}" ; @@ -80,5 +97,5 @@ $Html .= '
' ; - + return $Html ; } @@ -118,5 +135,5 @@ else $bFirst = false ; - + if ( $sValue === true ) $sParams .= $this->EncodeConfig( $sKey ) . '=true' ; @@ -126,5 +143,5 @@ $sParams .= $this->EncodeConfig( $sKey ) . '=' . $this->EncodeConfig( $sValue ) ; } - + return $sParams ; } @@ -132,7 +149,7 @@ function EncodeConfig( $valueToEncode ) { - $chars = array( - '&' => '%26', - '=' => '%3D', + $chars = array( + '&' => '%26', + '=' => '%3D', '"' => '%22' ) ; Index: /FCKeditor/trunk/fckstyles.xml =================================================================== --- /FCKeditor/trunk/fckstyles.xml (revision 131) +++ /FCKeditor/trunk/fckstyles.xml (revision 132) @@ -1,10 +1,27 @@ - - Index: /FCKeditor/trunk/fcktemplates.xml =================================================================== --- /FCKeditor/trunk/fcktemplates.xml (revision 131) +++ /FCKeditor/trunk/fcktemplates.xml (revision 132) @@ -1,10 +1,27 @@ - Index: /FCKeditor/trunk/htaccess.txt =================================================================== --- /FCKeditor/trunk/htaccess.txt (revision 131) +++ /FCKeditor/trunk/htaccess.txt (revision 132) @@ -2,24 +2,24 @@ # FCKeditor - The text editor for Internet - http://www.fckeditor.net # Copyright (C) 2003-2007 Frederico Caldeira Knabben -# +# # == BEGIN LICENSE == -# +# # Licensed under the terms of any of the following licenses at your # choice: -# +# # - GNU General Public License Version 2 or later (the "GPL") # http://www.gnu.org/licenses/gpl.html -# +# # - GNU Lesser General Public License Version 2.1 or later (the "LGPL") # http://www.gnu.org/licenses/lgpl.html -# +# # - Mozilla Public License Version 1.1 or later (the "MPL") # http://www.mozilla.org/MPL/MPL-1.1.html -# +# # == END LICENSE == # -# ----------------------------------------------------------------------------- +# ----------------------------------------------------------------------------- # -# On some specific Linux installations you could face problems with Firefox. +# On some specific Linux installations you could face problems with Firefox. # It could give you errors when loading the editor saying that some illegal # characters were found (three strange chars in the beginning of the file). @@ -29,6 +29,6 @@ # All FCKeditor files are Unicode encoded. # -# Just rename this file to ".htaccess" and leave it in the editor directory. -# There are no security issues on doing it. It just sets the ".js" and ".css" +# Just rename this file to ".htaccess" and leave it in the editor directory. +# There are no security issues on doing it. It just sets the ".js" and ".css" # files to their correct content types. #

FCKeditor - ColdFusion - Sample 1

FCKeditor - Lasso - Sample 1

FCKeditor - Perl - Sample 1

FCKeditor - PHP - Sample 1

FCKeditor - Python - Sample 1

FCKeditor - Samples - Posted Data

f

ckw3crange test

ckw3crange test

f

fckw3crange test

fckw3crange test

fckw3crange test

fckw3crange test

ckw3crange test

ckw3crange test

fckw3crange test

fckw3crange test

fckw3crange test

fckw3crange test

FCKW3CRange Test

FCKW3CRange Test