diff --git a/COPYRIGHT b/COPYRIGHT
index bc9de2f9a95..20ad88706d5 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -10,12 +10,12 @@ Composant Version License Compatible GPL Usage
----------------------------------------------------------------------------
In alphabetical order of external-lib directory:
ArtiChow 1.07 Public Domain Yes Graphics
-Smarty 2.6.0 LGPL 2.1 Yes Some pages templates
+Smarty 2.6.0 LGPL 2.1 Yes Some pages templates
In alphabetical order of includes directory:
AdoDb-Date 0.21 Modified BSD License Yes Date convertion
Php-barcode 0.3pl1 GPL 2.0 Yes Bar code generation
-FCKEditor 2.6 LGPL 2.1 or Mozilla PL 1.0 Yes Editor WYSIWYG
+FCKEditor 2.6.4 LGPL 2.1 or Mozilla PL 1.0 Yes Editor WYSIWYG
FPDF 1.53 Public domain Yes PDF generation (original code is modified)
FPDF_TPL 1.1.2 Apache Software License 2.0 No GPL3 only PDF templates management
FPDI 1.2.1 Apache Software License 2.0 No GPL3 only PDF templates management
diff --git a/htdocs/includes/fckeditor/_documentation.html b/htdocs/includes/fckeditor/_documentation.html
index 6546e598bde..2c551b007d2 100644
--- a/htdocs/includes/fckeditor/_documentation.html
+++ b/htdocs/includes/fckeditor/_documentation.html
@@ -1,7 +1,7 @@
TH, and TH --> TD.
+* input: the original node, and the new tag name
+* http://www.w3.org/TR/DOM-Level-3-Core/core.html#Document3-renameNode
+*/
+function RenameNode( oNode , newTag )
+{
+ // TODO: if the browser natively supports document.renameNode call it.
+ // does any browser currently support it in order to test?
+
+ // Only rename element nodes.
+ if ( oNode.nodeType != 1 )
+ return null ;
+
+ // If it's already correct exit here.
+ if ( oNode.nodeName == newTag )
+ return oNode ;
+
+ var oDoc = oNode.ownerDocument ;
+ // Create the new node
+ var newNode = oDoc.createElement( newTag ) ;
+
+ // Copy all attributes
+ CopyAttributes( oNode, newNode, {} ) ;
+
+ // Move children to the new node
+ FCKDomTools.MoveChildren( oNode, newNode ) ;
+
+ // Finally replace the node and return the new one
+ oNode.parentNode.replaceChild( newNode, oNode ) ;
+
+ return newNode ;
}
diff --git a/htdocs/includes/fckeditor/editor/dialog/fck_about.html b/htdocs/includes/fckeditor/editor/dialog/fck_about.html
index 34133a9901b..151a4a28272 100644
--- a/htdocs/includes/fckeditor/editor/dialog/fck_about.html
+++ b/htdocs/includes/fckeditor/editor/dialog/fck_about.html
@@ -1,7 +1,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Style
+
+
+
+
+ Stylesheet Classes
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Id
+
+
+
+
+ Language Code
+
+
+
+
+
+
+
+
+ Inline Style
+
+
+
+
+
+
+
+
+ Advisory Title
+
+
+
+
+
+
+
+
+ Language Direction
+
+
+
+
+
+
+
diff --git a/htdocs/includes/fckeditor/editor/dialog/fck_docprops.html b/htdocs/includes/fckeditor/editor/dialog/fck_docprops.html
index d78069df65d..749a507d8f7 100644
--- a/htdocs/includes/fckeditor/editor/dialog/fck_docprops.html
+++ b/htdocs/includes/fckeditor/editor/dialog/fck_docprops.html
@@ -1,7 +1,7 @@
/g, '' ) ;
+ html = html.replace(/<\!--[\s\S]*?-->/g, '' ) ;
html = html.replace( /<(U|I|STRIKE)> <\/\1>/g, ' ' ) ;
html = html.replace( /\s*<\/H\d>/gi, '' ) ;
// Remove "display:none" tags.
- html = html.replace( /<(\w+)[^>]*\sstyle="[^"]*DISPLAY\s?:\s?none(.*?)<\/\1>/ig, '' ) ;
+ html = html.replace( /<(\w+)[^>]*\sstyle="[^"]*DISPLAY\s?:\s?none[\s\S]*?<\/\1>/ig, '' ) ;
// Remove language tags
html = html.replace( /<(\w[^>]*) language=([^ |>]*)([^>]*)/gi, "<$1$3") ;
@@ -267,8 +275,8 @@ function CleanWord( oNode, bIgnoreFont, bRemoveStyles )
html = html.replace( /]*)>/gi, '' ) ;
// Word likes to insert extra tags, when using MSIE. (Wierd).
- html = html.replace( /<(H\d)>]*>(.*?)<\/FONT><\/\1>/gi, '<$1>$2<\/$1>' );
- html = html.replace( /<(H\d)>(.*?)<\/EM><\/\1>/gi, '<$1>$2<\/$1>' );
+ html = html.replace( /<(H\d)>]*>([\s\S]*?)<\/FONT><\/\1>/gi, '<$1>$2<\/$1>' );
+ html = html.replace( /<(H\d)>([\s\S]*?)<\/EM><\/\1>/gi, '<$1>$2<\/$1>' );
}
else
{
@@ -282,7 +290,7 @@ function CleanWord( oNode, bIgnoreFont, bRemoveStyles )
html = html.replace( /<\/H\d>/gi, '<\/font><\/b><\/div>' ) ;
// Transform
to
- var re = new RegExp( '(]*>.*?)(<\/P>)', 'gi' ) ; // Different because of a IE 5.0 error
+ var re = new RegExp( '(]*>[\\s\\S]*?)(<\/P>)', 'gi' ) ; // Different because of a IE 5.0 error
html = html.replace( re, '' ) ;
// Remove empty tags (three times, just to be sure).
diff --git a/htdocs/includes/fckeditor/editor/dialog/fck_radiobutton.html b/htdocs/includes/fckeditor/editor/dialog/fck_radiobutton.html
index e1d5815f60c..03bc1162c8a 100644
--- a/htdocs/includes/fckeditor/editor/dialog/fck_radiobutton.html
+++ b/htdocs/includes/fckeditor/editor/dialog/fck_radiobutton.html
@@ -1,7 +1,7 @@
+
-
-