Changeset 2498

Timestamp:

02/14/09 15:36:06 (4 years ago)

Author:

ArthurClemens

Message:

Item909: VIEW_TEMPLATE overrides preview template, leaving out all topic actions: fix for Preview.tmpl to load the topic content (in TMPL:DEF 'content') inside the preview template; ran perltidy

Location:

trunk/core/lib/Foswiki

Files:

• Meta.pm (modified) (6 diffs)
• Templates.pm (modified) (6 diffs)
• UI/Preview.pm (modified) (7 diffs)

trunk/core/lib/Foswiki/Meta.pm

@@ -78 +78 @@
 sub new {
     my ( $class, $session, $web, $topic, $text ) = @_;
+
     # $text - optional raw text to convert to meta-data form
     my $this = bless( { _session => $session }, $class );
@@ -140 +141 @@
 
 sub web {
-    my ($this, $web) = @_;
+    my ( $this, $web ) = @_;
     $this->{_web} = $web if defined $web;
     return $_[0]->{_web};
@@ -155 +156 @@
 
 sub topic {
-    my ($this, $topic) = @_;
+    my ( $this, $topic ) = @_;
     $this->{_topic} = $topic if defined $topic;
     return $this->{_topic};
@@ -635 +636 @@
 =begin TML
 
----++ ObjectMethod renderFormForDisplay() -> $html
+---++ ObjectMethod renderFormForDisplay( $templates ) -> $html
 
 Render the form contained in the meta for display.
@@ -642 +643 @@
 
 sub renderFormForDisplay {
-    my $this = shift;
+    my ( $this, $templates ) = @_;
+
+    # NOTE: param $templates is not used
 
     my $fname = $this->getFormName();
@@ -695 +698 @@
     if ($fname) {
         require Foswiki::Form;
-        my $form = new Foswiki::Form( $this->{_session}, $this->{_web}, $fname );
+        my $form =
+          new Foswiki::Form( $this->{_session}, $this->{_web}, $fname );
         if ($form) {
             my $field = $form->getField($name);

trunk/core/lib/Foswiki/Templates.pm

@@ -109 +109 @@
 $tmpls->expandTemplate('"blah");
 $tmpls->expandTemplate('context="view" then="sigh" else="humph"');
+</verbatim>
 
 =cut
@@ -247 +248 @@
             }
             $key = $1;
+
             # SMELL: unchecked implicit untaint?
             $val = $2;
@@ -257 +259 @@
             $key                  = '';
             $val                  = '';
+
             # SMELL: unchecked implicit untaint?
             $result .= $1;
@@ -303 +306 @@
     my $userdirname = $name;
     if ( $name =~ /^(.+)\.(.+?)$/ ) {
+
         # ucfirst taints if use locale is in force
-        $userdirweb  = Foswiki::Sandbox::untaintUnchecked(ucfirst($1));
-        $userdirname = Foswiki::Sandbox::untaintUnchecked(ucfirst($2));
+        $userdirweb  = Foswiki::Sandbox::untaintUnchecked( ucfirst($1) );
+        $userdirname = Foswiki::Sandbox::untaintUnchecked( ucfirst($2) );
 
         # if the name can be parsed into $web.$name, then this is an attempt
@@ -320 +324 @@
     }
     else {
+
         # ucfirst taints if use locale is in force
-       $userdirweb  = Foswiki::Sandbox::untaintUnchecked(ucfirst($userdirweb));
-       $userdirname = Foswiki::Sandbox::untaintUnchecked(ucfirst($userdirname));
+        $userdirweb =
+          Foswiki::Sandbox::untaintUnchecked( ucfirst($userdirweb) );
+        $userdirname =
+          Foswiki::Sandbox::untaintUnchecked( ucfirst($userdirname) );
     }
 
@@ -329 +336 @@
 
     my @templatePath = split( /\s*,\s*/, $Foswiki::cfg{TemplatePath} );
-    if (($Foswiki::cfg{Plugins}{TWikiCompatibilityPlugin}{Enabled})
-        && (lc($name) eq 'foswiki')
-        && defined($Foswiki::cfg{Plugins}{TWikiCompatibilityPlugin}{TemplatePath})
-         ) {
+    if (
+           ( $Foswiki::cfg{Plugins}{TWikiCompatibilityPlugin}{Enabled} )
+        && ( lc($name) eq 'foswiki' )
+        && defined(
+            $Foswiki::cfg{Plugins}{TWikiCompatibilityPlugin}{TemplatePath}
+        )
+      )
+    {
+
         #TWikiCompatibility, need to test to see if there is a twiki.skin tmpl
-        @templatePath = @{$Foswiki::cfg{Plugins}{TWikiCompatibilityPlugin}{TemplatePath}};
+        @templatePath =
+          @{ $Foswiki::cfg{Plugins}{TWikiCompatibilityPlugin}{TemplatePath} };
     }
 

trunk/core/lib/Foswiki/UI/Preview.pm

@@ -25 +25 @@
     # Note: param(formtemplate) has already been decoded by buildNewTopic
     # so the $meta entry reflects if it was used.
+    # get form fields to pass on
     my $formFields = '';
     my $form = $meta->get('FORM') || '';
+    my $formName;
     if ($form) {
-        $form = $form->{name};    # used later on as well
+        $formName = $form->{name};    # used later on as well
         require Foswiki::Form;
-        my $formDef = new Foswiki::Form( $session, $web, $form );
+        my $formDef = new Foswiki::Form( $session, $web, $formName );
         unless ($formDef) {
             throw Foswiki::OopsException(
@@ -37 +39 @@
                 web    => $session->{webName},
                 topic  => $session->{topicName},
-                params => [ $web, $form ]
+                params => [ $web, $formName ]
             );
         }
@@ -45 +47 @@
     $session->{plugins}->dispatch( 'afterEditHandler', $text, $topic, $web );
 
-    my $skin = $session->getSkin();
-    my $template =
-      $session->{prefs}->getPreferencesValue('VIEW_TEMPLATE')
+    my $skin     = $session->getSkin();
+    my $template = $session->{prefs}->getPreferencesValue('VIEW_TEMPLATE')
       || 'preview';
     my $tmpl = $session->templates->readTemplate( $template, $skin );
@@ -56 +57 @@
         $tmpl = $session->templates->readTemplate( 'preview', $skin );
     }
+
+    my $content = '';
+    if ( $template eq 'preview' ) {
+        $content = $text;
+    }
+    else {
+
+        # only get the contents of TMPL:DEF{"content"}
+        $content = $session->templates->expandTemplate('content');
+
+        # put the text we have inside this template's content
+        $content =~ s/%TEXT%/$text/go;
+        
+        # now we are ready to put the expanded and styled topic content in the
+        # 'normal' preview template
+    }
+
+    $tmpl = $session->templates->readTemplate( 'preview', $skin );
 
     if ( $saveOpts->{minor} ) {
@@ -75 +94 @@
     $tmpl =~ s/%REDIRECTTO%/$redirectTo/go;
 
-    $tmpl =~ s/%FORMTEMPLATE%/$form/g;
+    $tmpl =~ s/%FORMTEMPLATE%/$formName/g if $formName;
 
     my $parent = $meta->get('TOPICPARENT');
@@ -84 +103 @@
     $session->enterContext( 'can_render_meta', $meta );
 
-    my $dispText = $text;
-    $dispText = $session->handleCommonTags( $dispText, $web, $topic, $meta );
-    $dispText =
-      $session->renderer->getRenderedVersion( $dispText, $web, $topic );
+    my $displayText = $content;
+    $displayText =
+      $session->handleCommonTags( $displayText, $web, $topic, $meta );
+    $displayText =
+      $session->renderer->getRenderedVersion( $displayText, $web, $topic );
 
     # Disable links and inputs in the text
-    $dispText =~
+    $displayText =~
       s#<a\s[^>]*>(.*?)</a>#<span class="foswikiEmulatedLink">$1</span>#gis;
-    $dispText =~ s/<(input|button|textarea) /<$1 disabled="disabled" /gis;
-    $dispText =~ s(</?form(|\s.*?)>)()gis;
-    $dispText =~ s/(<[^>]*\bon[A-Za-z]+=)('[^']*'|"[^"]*")/$1''/gis;
+    $displayText =~ s/<(input|button|textarea) /<$1 disabled="disabled" /gis;
+    $displayText =~ s(</?form(|\s.*?)>)()gis;
+    $displayText =~ s/(<[^>]*\bon[A-Za-z]+=)('[^']*'|"[^"]*")/$1''/gis;
+
+    # let templates know the context so they can act on it
+    $session->enterContext( 'preview', 1 );
+
+    # note: preventing linkage in rendered form can only happen in templates
+    # see formtables.tmpl
 
     $tmpl = $session->handleCommonTags( $tmpl, $web, $topic, $meta );
     $tmpl = $session->renderer->getRenderedVersion( $tmpl, $web, $topic );
-    $tmpl =~ s/%TEXT%/$dispText/go;
+    $tmpl =~ s/%TEXT%/$displayText/go;
+
+    # write the hidden form fields
     $tmpl =~ s/%FORMFIELDS%/$formFields/go;
 
@@ -108 +136 @@
     $tmpl =~ s/<\/?(nop|noautolink)\/?>//gis;
 
- #I don't know _where_ these should be done, so I'll do them as late as possible
+    # I don't know _where_ these should be done,
+    # so I'll do them as late as possible
     my $originalrev = $query->param('originalrev');    # rev edit started on
          #ASSERT($originalrev ne '%ORIGINALREV%') if DEBUG;