[TWiki-Dev] [SVN] PeterThoeny r17838 - twiki/trunk/core/lib

[<de...@de...>]

Author: PeterThoeny
Date: 2009-02-23 00:03:30 -0600 (Mon, 23 Feb 2009)
New Revision: 17838
Trac url: http://develop.twiki.org/trac/changeset/17838

Modified:
   twiki/trunk/core/lib/TWiki.pm
Log:
Item6186: Adding safe mode to ENCODE and URLPARAM variables (docs and unit tests pending)

Modified: twiki/trunk/core/lib/TWiki.pm
===================================================================
--- twiki/trunk/core/lib/TWiki.pm	2009-02-23 04:15:16 UTC (rev 17837)
+++ twiki/trunk/core/lib/TWiki.pm	2009-02-23 06:03:30 UTC (rev 17838)
@@ -3569,6 +3569,13 @@
     } elsif ($type =~ /^url$/i) {
         $text =~ s/\r*\n\r*/<br \/>/; # Legacy.
         return urlEncode( $text );
+    } elsif ( $type =~ /^(off|none)$/i ) {
+        # no encoding
+        return $text;
+    } else { # safe or default
+        # entity encode ' " < > and %
+        $text =~ s/([<>%'"])/'&#'.ord($1).';'/ge;
+        return $text;
     }
 }
 
@@ -3731,7 +3738,7 @@
     my( $this, $params ) = @_;
     my $param     = $params->{_DEFAULT} || '';
     my $newLine   = $params->{newline};
-    my $encode    = $params->{encode};
+    my $encode    = $params->{encode} || 'safe';
     my $multiple  = $params->{multiple};
     my $separator = $params->{separator};
     $separator="\n" unless (defined $separator);
@@ -3759,16 +3766,7 @@
     }
     if( defined $value ) {
         $value =~ s/\r?\n/$newLine/go if( defined $newLine );
-        if ( $encode ) {
-            if ( $encode =~ /^entit(y|ies)$/i ) {
-                $value = entityEncode( $value );
-            } elsif ( $encode =~ /^quotes?$/i ) {
-                $value =~ s/\"/\\"/go;    # escape quotes with backslash (Bugs:Item3383 fix)
-            } else {
-                $value =~ s/\r*\n\r*/<br \/>/; # Legacy
-                $value = urlEncode( $value );
-            }
-        }
+        $value = _encode( $encode, $value );
     }
     unless( defined $value ) {
         $value = $params->{default};