Changeset 309

Timestamp:

12/29/03 14:29:25 (5 years ago)

Author:

kake

Message:

Page deletion must now be explicitly enabled in wiki.conf. Added some deletion-related tests. Sorted out PREREQUISITES.

Location:

trunk

Files:

• Build.PL (modified) (3 diffs)
• Changes (modified) (1 diff)
• INSTALL (modified) (1 diff)
• MANIFEST (modified) (1 diff)
• PREREQUISITES (modified) (2 diffs)
• examples/london.css (added)
• examples/vegan-oxford.css (added)
• examples/wiki.css (deleted)
• lib/OpenGuides.pm (modified) (1 diff)
• lib/OpenGuides/Template.pm (modified) (3 diffs)
• t/15_template.t (modified) (2 diffs)
• t/41_deletion.t (added)
• t/templates/15_test.tt (modified) (1 diff)
• templates/footer.tt (modified) (1 diff)
• wiki.cgi (modified) (2 diffs)

trunk/Build.PL

@@ -43 +43 @@
   variable => "indexing_directory",
   default  => "/usr/lib/cgi-bin/openguides/indexes/"
+  },
+{ question => "Do you want to enable page deletion?",
+  variable => "enable_page_deletion",
+  default  => "n",
+  type     => "y_n"
   },
 { question => "What's the URL of the wiki's stylesheet?",
@@ -160 +165 @@
     unless ( $skip_config ) {
         if ( $type eq "y_n" ) {
-            $def = $def ? "y" : "n";
+            # may be stored as true/false integer value
+            if ( $def =~ /^\d+$/ ) {
+                $def = $def ? "y" : "n";
+            }
             $val = Module::Build->y_n("\n$qu ", $def);
         } else {
@@ -194 +202 @@
 #####
 ##### When updating the prereqs PLEASE REMEMBER to update PREREQUISITES.
+##### Ivor, this means you too.
 #####
 

trunk/Changes

@@ -1 @@
-0.30    
-        Added method for adminds to delete nodes.
-        Major overhaul of templates. Added numerous style hooks and replaced
-          Oxford Guide stylesheet in examples/ with generic wiki.css that
-          takes advantage of them. Added new banner template for page
-          headers. Also ensured presence of navigation bar is consistent.
+0.30    29 December 2003
+        Added method to allow admins to delete nodes.  You will need to
+          explicitly enable this option in your wiki.conf, since it brings
+          with it the risk of accidental data loss.
+        Major overhaul of templates - added numerous style hooks.  See
+          examples/ for two stylesheet designs that take advantage of these.
+          Added new banner template for page headers. Also ensured presence
+          of navigation bar is consistent.
           *** INCOMPATIBLE CHANGE: *** The navbar class in the stylesheet
           has been renamed to, unsurprisingly, "navbar", for consistency 
-          (from "toolbar"). You are advised to create a duplicate wiki.cgi
-          that reads its data from your database but its stylesheet and 
-          templates from the new ones in order to test them *before* 
-          deploying them.
+          (from "toolbar"). *** YOU WILL NEED TO REWRITE YOUR STYLESHEET. ***
+          You are advised to create a duplicate wiki.cgi that reads its data
+          from your database but its stylesheet and templates from the new
+          ones in order to test them *before* deploying them.
         Added "FAQ", "How To Get Started" and "Wiki Etiquette" to the
           navigation, under "Help" - these won't exist unless you create them 

trunk/INSTALL

@@ -92 +92 @@
 
 
+  "Do you want to enable page deletion?"
+
+The default is to disable page deletion.  If you choose to enable the
+page deletion mechanism then you will need to add a password to your
+wiki.conf using a line such as
+  admin_pass = putyourpasswordhere
+Users who know this password will be able to delete unwanted pages -
+along with all their history - from your wiki.
+*** USE WITH CAUTION.  DELETED PAGES CANNOT BE RECOVERED. ***
+
+
   "What's the URL of the wiki's stylesheet?"
 
-Supplying an answer to this question is optional.  There is an example
-stylesheet in the examples/ directory - note that this will not be 
+Supplying an answer to this question is optional.  There are example
+stylesheets in the examples/ directory - note that these will not be 
 automatically installed.
 

trunk/MANIFEST

@@ -57 +57 @@
 t/31_supersearch.t
 t/32_supersearch_simple_metadata.t
+t/41_deletion.t
 t/51_diff.t
 t/61_bug_textareas.t

trunk/PREREQUISITES

@@ -9 +9 @@
 CGI::Wiki::Formatter::UseMod (version 0.09 or later)
 CGI::Wiki::Plugin::Categoriser
+CGI::Wiki::Plugin::Diff
 CGI::Wiki::Plugin::GeoCache
 CGI::Wiki::Plugin::Locator::UK (version 0.06 or later)
@@ -30 +31 @@
 Time::Piece
 URI::Escape
-VCS::Lite (version 0.04 or later)

trunk/lib/OpenGuides.pm

@@ -4 +4 @@
 use vars qw( $VERSION );
 
-$VERSION = '0.30_01';
+$VERSION = '0.30';
 
 =head1 NAME

trunk/lib/OpenGuides/Template.pm

@@ -73 +73 @@
 =item * C<full_cgi_url>
 
+=item * C<enable_page_deletion> (gets set to true or false - defaults to false)
+
 =item * C<contact_email>
 
@@ -123 +125 @@
         $formatting_rules_link = $script_url . $script_name . "?"
                                . uri_escape($args{wiki}->formatter->node_name_to_node_param($formatting_rules_node));
+    }
+
+    my $enable_page_deletion = 0;
+    if ( $config->{_}->{enable_page_deletion}
+         and ( lc($config->{_}->{enable_page_deletion}) eq "y"
+               or $config->{_}->{enable_page_deletion} eq "1" )
+       ) {
+        $enable_page_deletion = 1;
     }
 
@@ -136 +146 @@
                     formatting_rules_node => $formatting_rules_node,
                     openguides_version    => $OpenGuides::VERSION,
+                    enable_page_deletion  => $enable_page_deletion,
     };
 

trunk/t/15_template.t

@@ -1 +1 @@
 use strict;
-use Test::More tests => 23;
+use Test::More tests => 28;
 use Config::Tiny;
 use Cwd;
@@ -150 +150 @@
 like( $output, qr/OMIT FORMATTING LINK: fish/,
       "explicitly supplied TT vars override cookie ones" );
+
+# Test that enable_page_deletion is set correctly in various circumstances.
+$config = Config::Tiny->new;
+$config->{_}->{template_path} = cwd . "/t/templates";
+$config->{_}->{site_name} = "Test Site";
+
+$output = OpenGuides::Template->output(
+    wiki     => $fake_wiki,
+    config   => $config,
+    template => "15_test.tt",
+);
+like( $output, qr/ENABLE PAGE DELETION: 0/,
+      "enable_page_deletion var set correctly when not specified in conf" );
+
+$config->{_}->{enable_page_deletion} = "n";
+$output = OpenGuides::Template->output(
+    wiki     => $fake_wiki,
+    config   => $config,
+    template => "15_test.tt",
+);
+like( $output, qr/ENABLE PAGE DELETION: 0/,
+      "enable_page_deletion var set correctly when set to 'n' in conf" );
+
+$config->{_}->{enable_page_deletion} = "y";
+$output = OpenGuides::Template->output(
+    wiki     => $fake_wiki,
+    config   => $config,
+    template => "15_test.tt",
+);
+like( $output, qr/ENABLE PAGE DELETION: 1/,
+      "enable_page_deletion var set correctly when set to 'y' in conf" );
+
+$config->{_}->{enable_page_deletion} = 0;
+$output = OpenGuides::Template->output(
+    wiki     => $fake_wiki,
+    config   => $config,
+    template => "15_test.tt",
+);
+like( $output, qr/ENABLE PAGE DELETION: 0/,
+      "enable_page_deletion var set correctly when set to '0' in conf" );
+
+$config->{_}->{enable_page_deletion} = 1;
+$output = OpenGuides::Template->output(
+    wiki     => $fake_wiki,
+    config   => $config,
+    template => "15_test.tt",
+);
+like( $output, qr/ENABLE PAGE DELETION: 1/,
+      "enable_page_deletion var set correctly when set to '1' in conf" );

trunk/t/templates/15_test.tt

@@ -16 +16 @@
 FORMATTING RULES LINK: [% formatting_rules_link %]
 OMIT FORMATTING LINK: [% omit_formatting_link %]
+
+ENABLE PAGE DELETION: [% enable_page_deletion %]

trunk/templates/footer.tt

@@ -7 +7 @@
 </div>
 <div id="footer">
-<p>
-<a href="[% full_cgi_url %]?id=[% node_param %];action=delete">Delete page</a> (admins only)
-</p>
+[% IF enable_page_deletion %]
+  <p>
+  <a href="[% full_cgi_url %]?id=[% node_param %];action=delete">Delete page</a> (admins only)
+  </p>
+[% END %]
 <p>
 This wiki powered by <a

trunk/wiki.cgi

@@ -5 +5 @@
 
 use vars qw( $VERSION );
-$VERSION = '0.30_02';
+$VERSION = '0.30';
 
 use CGI qw/:standard/;
@@ -106 +106 @@
                            origin_param => $formatter->node_name_to_node_param($node),
                            limit  => "$metres metres" } );
-    } elsif ($action eq 'delete') {
+    } elsif ( $action eq 'delete'
+              and ( lc($config->{_}->{enable_page_deletion}) eq "y"
+                    or $config->{_}->{enable_page_deletion} eq "1" )
+            ) {
         delete_node($node);
     } elsif ($action eq 'userstats') {