Changeset 677 for trunk/wiki.cgi

Timestamp:

10/05/05 04:10:22 (3 years ago)

Author:

earle

Message:

replace tabstops with four spaces each

Files:

• trunk/wiki.cgi (modified) (11 diffs)

trunk/wiki.cgi

@@ -115 +115 @@
         } else {
             my $version = $q->param("version");
-            my $other_ver = $q->param("diffversion");
+        my $other_ver = $q->param("diffversion");
             if ( $other_ver ) {
                 $guide->display_diffs(
@@ -123 +123 @@
                                      );
             } else {
+                my $redirect;
+                
+                if ($q->param("redirect") && ($q->param("redirect") == 0)) {
+                  $redirect = 0;
+                } else {
+                  $redirect = 1;                
+                }
+                
                 $guide->display_node(
-                                      id      => $node,
-                                      version => $version,
-                                      oldid   => $oldid,
+                                      id       => $node,
+                                      version  => $version,
+                                      oldid    => $oldid,
+                                      redirect => $redirect;
                 );
                 
-            }
+        }
         }
     }
@@ -162 +171 @@
     my @nodes = $wiki->list_recent_changes( %criteria );
     @nodes = map { {name          => $q->escapeHTML($_->{name}),
-                    last_modified => $q->escapeHTML($_->{last_modified}),
-                    comment       => $q->escapeHTML($_->{metadata}{comment}[0]),
-                    url           => "$script_name?"
+            last_modified => $q->escapeHTML($_->{last_modified}),
+            comment       => $q->escapeHTML($_->{metadata}{comment}[0]),
+            url           => "$script_name?"
           . $q->escape($formatter->node_name_to_node_param($_->{name})) }
                        } @nodes;
     my %tt_vars = ( last_five_nodes => \@nodes,
-                    username        => $username,
-                    username_param  => $wiki->formatter->node_name_to_node_param($username),
+            username        => $username,
+            username_param  => $wiki->formatter->node_name_to_node_param($username),
                     host            => $host,
                   );
@@ -183 +192 @@
     my %tt_metadata_vars = OpenGuides::Template->extract_metadata_vars(
                                                wiki                 => $wiki,
-                                               config               => $config,
-                                               cgi_obj              => $q,
+                           config               => $config,
+                           cgi_obj              => $q,
                                                set_coord_field_vars => 1,
     );
@@ -198 +207 @@
             preview_above_edit_box => get_cookie( "preview_above_edit_box" ),
             checksum               => $q->escapeHTML($checksum)
-        );
+    );
         process_template("edit_form.tt", $node, \%tt_vars);
     } else {
@@ -235 +244 @@
                              wiki     => $wiki,
                              config   => $config,
-                             metadata => $node_data{metadata} );
+                 metadata => $node_data{metadata} );
 
     my %tt_vars = ( content         => $q->escapeHTML($content),
                     checksum        => $q->escapeHTML($checksum),
                     %metadata_vars,
-                    username        => $username,
+            username        => $username,
                     edit_type       => $edit_type,
                     deter_robots    => 1,
@@ -257 +266 @@
     my %args = @_;
     my $rdf_writer = OpenGuides::RDF->new( wiki      => $wiki,
-                                           config => $config );
+                       config => $config );
     print "Content-type: text/plain\n\n";
     print $rdf_writer->emit_rdfxml( node => $args{node} );
@@ -267 +276 @@
 
     my %output_conf = ( wiki     => $wiki,
-                        config   => $config,
+            config   => $config,
                         node     => $node,
-                        template => $template,
-                        vars     => $vars
+            template => $template,
+            vars     => $vars
     );
     $output_conf{content_type} = "" if $omit_header; # defaults otherwise
@@ -284 +293 @@
     my @results = map {
         { url   => $q->escape($formatter->node_name_to_node_param($_)),
-          title => $q->escapeHTML($_)
+      title => $q->escapeHTML($_)
         }             } @sorted;
     my %tt_vars = ( results      => \@results,
@@ -302 +311 @@
     foreach my $node_name (sort { $backlinks_count{$b} <=> $backlinks_count{$a} } @dangling) {
         my $node_param =
-            uri_escape($formatter->node_name_to_node_param($node_name));
+         uri_escape($formatter->node_name_to_node_param($node_name));
         push @wanted, {
             name          => $q->escapeHTML($node_name),
@@ -308 +317 @@
                            . "?action=edit;id=$node_param",
             backlink_link => $script_url . uri_escape($script_name)
-                           . "?action=show_backlinks;id=$node_param",
+                    . "?action=show_backlinks;id=$node_param",
             backlinks_count => $backlinks_count{$node_name}
         };