Changeset 6316

Timestamp:

02/13/10 16:30:45 (2 years ago)

Author:

MichaelTempest

Message:

Item8422: Add here-document support for %STARTSECTION and %ENDSECTION

Foswiki::parseSections is a static method. So I passed "undef" instead of $this, and modified _extractHereDocuments to cope with that. Perhaps parseSections should pass $Foswiki::Plugins::SESSION instead.

File:

• trunk/core/lib/Foswiki.pm (modified) (4 diffs)

trunk/core/lib/Foswiki.pm

@@ -2147 +2147 @@
     my $ntext  = '';
     my $offset = 0;
-    foreach my $bit ( split( /(%(?:START|END)SECTION(?:{.*?})?%)/, $_[0] ) ) {
+    my @queue = split( /(%(?:START|END)SECTION(?:{.*?})?%)/, $_[0] );
+    while ( scalar(@queue) ) {
+        my $bit = shift(@queue);
         if ( $bit =~ /^%STARTSECTION(?:{(.*)})?%$/ ) {
             require Foswiki::Attrs;
@@ -2153 +2155 @@
             # SMELL: unchecked implicit untaint?
             my $attrs = new Foswiki::Attrs($1);
+            _extractHereDocuments(undef, $attrs, \@queue);
             $attrs->{type} ||= 'section';
             $attrs->{name} =
@@ -2185 +2188 @@
             # SMELL: unchecked implicit untaint?
             my $attrs = new Foswiki::Attrs($1);
+            _extractHereDocuments(undef, $attrs, \@queue);
             $attrs->{type} ||= 'section';
             $attrs->{name} = $attrs->{_DEFAULT} || $attrs->{name} || '';
@@ -2990 +2994 @@
             $attrs->{$param} =~ s/%/%/g;
             # Emit a warning to help wiki-app developers see what is wrong
-            $attrs->{$param} .= $this->inlineAlert( 'alerts', 'here_not_found', $here );
+            if ($this) {
+                $attrs->{$param} .= $this->inlineAlert( 'alerts', 'here_not_found', $here );
+            }
+            else {
+                Foswiki::Func::writeWarning("HERE-document end marker '$here' not found");
+            }
         }
     }