Changeset 5356

Timestamp:

10/22/09 15:19:47 (2 years ago)

Author:

GeorgeClark

Message:

Item2183: Protect div with style= attribute by default

Location:

branches/Release01x00/WysiwygPlugin

Files:

• data/System/WysiwygPlugin.txt (modified) (1 diff)
• data/System/WysiwygPluginSettings.txt (modified) (1 diff)
• lib/Foswiki/Plugins/WysiwygPlugin.pm (modified) (2 diffs)

branches/Release01x00/WysiwygPlugin/data/System/WysiwygPlugin.txt

@@ -170 +170 @@
 |  Release: | %$RELEASE% |
 |  Change History: | |
+|  22 Oct 2009 | Foswikitask:Item2183: Protect div style= by default | 
 |  18 Sep 2009 | Foswikitask:Item1980: Prevent dataloss when saving a topic in Wysiwyg where there are a pair of sticky tags inside verbatim tags |
 |  28 Jun 2009 | Foswikitask:Item1770: Protect XML tags registered by plugins, and not just the content between them (Michael Tempest) |

branches/Release01x00/WysiwygPlugin/data/System/WysiwygPluginSettings.txt

@@ -56 +56 @@
     COLGROUP=align,char,charoff,span,valign,width;
     DIR=compact;
-    DIV=align;
+    DIV=align,style;
     DL=compact;
     FONT=size,face;

branches/Release01x00/WysiwygPlugin/lib/Foswiki/Plugins/WysiwygPlugin.pm

@@ -695 +695 @@
 colgroup=align,char,charoff,span,valign,width;
 dir=compact;
-div=align;
+div=align,style;
 dl=compact;
 font=size,face;
@@ -729 +729 @@
     foreach my $row (@protectedByAttr) {
         if ( $tag =~ /^$row->{tag}$/i ) {
-            return 1 if ( $attr =~ /^($row->{attrs})$/i );
+            if ( $attr =~ /^($row->{attrs})$/i ) {
+                #print STDERR "Protecting  $tag with $attr matches $row->{attrs} \n";    #debug
+                return 1;
+            }
         }
     }