Changeset 440

Timestamp:

07/13/04 23:55:53 (4 years ago)

Author:

kake

Message:

Fixed HTML escaping bug, added test.

Location:

trunk

Files:

• Changes (modified) (1 diff)
• MANIFEST (modified) (1 diff)
• lib/OpenGuides.pm (modified) (4 diffs)
• t/64_bug_node_history.t (added)
• wiki.cgi (modified) (1 diff)

trunk/Changes

@@ -1 @@
-0.36
-        Changed node template to include link to diff of current version
-          from previous version. 
-        Fixed case sensitivity bug in index node autocreation.
+0.36    13 July 2004
+        Added diff link to node template. Fixed case sensitivity bug in
+          index node autocreation.  Fixed bug with node history comments
+          not being HTML-escaped.
 
 0.35    25 June 2004

trunk/MANIFEST

@@ -65 +65 @@
 t/62_bug_os_coords.t
 t/63_bug_map_link_no_address.t
+t/64_bug_node_history.t
 t/templates/15_test.tt
 wiki.cgi

trunk/lib/OpenGuides.pm

@@ -13 +13 @@
 use vars qw( $VERSION );
 
-$VERSION = '0.35';
+$VERSION = '0.36';
 
 =head1 NAME
@@ -432 +432 @@
   $guide->list_all_versions ( id => "Home Page" );
 
+  # Or return output as a string (useful for writing tests).
+  $guide->list_all_versions (
+                              id            => "Home Page",
+                              return_output => 1,
+                            );
+
+  # Or return the hash of variables that will be passed to the template
+  # (not including those set additionally by OpenGuides::Template).
+  $guide->list_all_versions (
+                              id             => "Home Page",
+                              return_tt_vars => 1,
+                            );
+
 =cut
 
 sub list_all_versions {
     my ($self, %args) = @_;
+    my $return_output = $args{return_output} || 0;
     my $node = $args{id};
     my %curr_data = $self->wiki->retrieve_node($node);
@@ -445 +459 @@
                                                     version => $version );
         # $node_data{version} will be zero if this version was deleted.
-        push @history, { version  => $version,
-                         modified => $node_data{last_modified},
-                         username => $node_data{metadata}{username}[0],
-                         comment  => $node_data{metadata}{comment}[0],
+        push @history, {
+            version  => CGI->escapeHTML( $version ),
+            modified => CGI->escapeHTML( $node_data{last_modified} ),
+            username => CGI->escapeHTML( $node_data{metadata}{username}[0] ),
+            comment  => CGI->escapeHTML( $node_data{metadata}{comment}[0] ),
                        } if $node_data{version};
     }
@@ -456 +471 @@
                     not_deletable => 1,
                     history       => \@history );
-    print $self->process_template(
-                                   id       => $node,
-                                   template => "node_history.tt",
-                                   tt_vars  => \%tt_vars,
-                                 );
+    return %tt_vars if $args{return_tt_vars};
+    my $output = $self->process_template(
+                                          id       => $node,
+                                          template => "node_history.tt",
+                                          tt_vars  => \%tt_vars,
+                                        );
+    return $output if $return_output;
+    print $output;
 }
 

trunk/wiki.cgi

@@ -5 +5 @@
 
 use vars qw( $VERSION );
-$VERSION = '0.35';
+$VERSION = '0.36';
 
 use CGI qw/:standard/;