Item2183: Protect div with style= attribute by default

git-svn-id: http://svn.foswiki.org/branches/Release01x00@5356 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Oct 22, 2009 · 853ec4a · 853ec4a
1 parent 16b6c81
commit 853ec4a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/WysiwygPlugin/data/System/WysiwygPlugin.txt b/WysiwygPlugin/data/System/WysiwygPlugin.txt
@@ -169,6 +169,7 @@ Many thanks to the following sponsors for supporting this work:
 |  Version: | %$VERSION% |
 |  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) |
 |  6 Jun 2009 | Foswikitask:Item1013: Correct dependency on HTML::Parser (Will Norris) Foswikitask:Item1397: Foswikitask:Item1535: Foswikitask:Item1666: Correct processing of colour and typewriter-text in several situations, include application to bold text and table cells (Michael Tempest) Foswikitask:Item1667: Remove unwanted extra &lt;sticky&gt; tags (Michael Tempest) Foswikitask:Item1674: Let plugins register XML tags that should be protected like macros |

diff --git a/WysiwygPlugin/data/System/WysiwygPluginSettings.txt b/WysiwygPlugin/data/System/WysiwygPluginSettings.txt
@@ -55,7 +55,7 @@ in the plugin:
     COL=char,charoff,span,valign,width;
     COLGROUP=align,char,charoff,span,valign,width;
     DIR=compact;
-    DIV=align;
+    DIV=align,style;
     DL=compact;
     FONT=size,face;
     H[0-9]=align;

diff --git a/WysiwygPlugin/lib/Foswiki/Plugins/WysiwygPlugin.pm b/WysiwygPlugin/lib/Foswiki/Plugins/WysiwygPlugin.pm
@@ -694,7 +694,7 @@ br=clear;
 col=char,charoff,span,valign,width;
 colgroup=align,char,charoff,span,valign,width;
 dir=compact;
-div=align;
+div=align,style;
 dl=compact;
 font=size,face;
 h\d=align;
@@ -728,7 +728,10 @@ DEFAULT
     }
     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;
+            }
         }
     }
     return 0;