openguides-commits October 2008

openguides-commits@lists.openguides.org

1 participants
24 discussions

by svnadmin＠urchin.earth.li

Author: dom Date: 2008-10-25 00:11:24 +0100 (Sat, 25 Oct 2008) New Revision: 1247 Modified: trunk/Changes trunk/lib/OpenGuides/Utils.pm Log: Warn about errors fetching remote RSS feeds, but carry on generating the page content (fixes #228) Modified: trunk/Changes =================================================================== --- trunk/Changes 2008-10-24 22:05:54 UTC (rev 1246) +++ trunk/Changes 2008-10-24 23:11:24 UTC (rev 1247) @@ -20,6 +20,8 @@ without explicit moderation (#203) Don't add delete links unless the user requests (#159) Fix clean target to remove everything it should (#242) + Warn about errors fetching remote RSS feeds, but carry on + generating the page content (#228) 0.63 16 August 2008 Major overhaul of RDF output. Modified: trunk/lib/OpenGuides/Utils.pm =================================================================== --- trunk/lib/OpenGuides/Utils.pm 2008-10-24 22:05:54 UTC (rev 1246) +++ trunk/lib/OpenGuides/Utils.pm 2008-10-24 23:11:24 UTC (rev 1247) @@ -211,7 +211,13 @@ $url = $1; } - my $rss = Wiki::Toolkit::Plugin::RSS::Reader->new(url => $url); + # We can't do much about remote errors fetching + # at this stage + my $rss = eval { Wiki::Toolkit::Plugin::RSS::Reader->new(url => $url); }; + if ( $@ ) { + warn $@; + return ''; + } my @items = $rss->retrieve; # Ten items only at this till.

14 years, 11 months

r1246 - trunk

by svnadmin＠urchin.earth.li

Author: dom Date: 2008-10-24 23:05:54 +0100 (Fri, 24 Oct 2008) New Revision: 1246 Added: trunk/CONTRIBUTORS Modified: trunk/MANIFEST Log: add CONTRIBUTORS Added: trunk/CONTRIBUTORS =================================================================== --- trunk/CONTRIBUTORS (rev 0) +++ trunk/CONTRIBUTORS 2008-10-24 22:05:54 UTC (rev 1246) @@ -0,0 +1,16 @@ +Many people have contributed to making the OpenGuides software. +Some of them are listed below, in alphabetical order. This is by no means +complete; if you are missing, let us know! + +Andrew Black +Nick Burch +Oliver Gorwits +Dominic Hargreaves +Earle Martin +Chris Prather +Kake Pugh +Christopher Schmidt +David Sheldon +Inigo Surguy +Bob Walker +Ivor Williams Modified: trunk/MANIFEST =================================================================== --- trunk/MANIFEST 2008-10-24 21:59:43 UTC (rev 1245) +++ trunk/MANIFEST 2008-10-24 22:05:54 UTC (rev 1246) @@ -1,4 +1,5 @@ Build.PL +CONTRIBUTORS CUSTOMISATION Changes INSTALL

14 years, 11 months

r1245 - trunk

by svnadmin＠urchin.earth.li

Author: dom Date: 2008-10-24 22:59:43 +0100 (Fri, 24 Oct 2008) New Revision: 1245 Modified: trunk/Changes Log: typo fix Modified: trunk/Changes =================================================================== --- trunk/Changes 2008-10-22 12:39:36 UTC (rev 1244) +++ trunk/Changes 2008-10-24 21:59:43 UTC (rev 1245) @@ -7,7 +7,7 @@ Correctly specify all build_requires (#245) Fix some broken POD (#246) Metadata discovery features (action=metadata) - JSON support for node details and metatdata discovery + JSON support for node details and metadata discovery Correctly validate web site URLs during edit and display, and truncate URLs that are too long (#21) Change default database type to sqlite (#241)

14 years, 11 months

r1244 - trunk

by svnadmin＠urchin.earth.li

Author: dom Date: 2008-10-22 13:39:36 +0100 (Wed, 22 Oct 2008) New Revision: 1244 Modified: trunk/Build.PL trunk/Changes Log: Fix clean target to remove everything it should (fixes #242) Modified: trunk/Build.PL =================================================================== --- trunk/Build.PL 2008-10-22 12:35:20 UTC (rev 1243) +++ trunk/Build.PL 2008-10-22 12:39:36 UTC (rev 1244) @@ -338,6 +338,7 @@ $build->add_to_cleanup( "t/indexes/" ); $build->add_to_cleanup( "t/node.db" ); +$build->add_to_cleanup( "t/prefs.db" ); $build->add_to_cleanup( "t/templates/tmp/" ); # Tell OpenGuides::Build which additional scripts and templates to install. Modified: trunk/Changes =================================================================== --- trunk/Changes 2008-10-22 12:35:20 UTC (rev 1243) +++ trunk/Changes 2008-10-22 12:39:36 UTC (rev 1244) @@ -19,6 +19,7 @@ Add the ability to whitelist hosts who can change moderated nodes without explicit moderation (#203) Don't add delete links unless the user requests (#159) + Fix clean target to remove everything it should (#242) 0.63 16 August 2008 Major overhaul of RDF output.

14 years, 11 months

r1243 - in trunk: . t templates

by svnadmin＠urchin.earth.li

Author: dom Date: 2008-10-22 13:35:20 +0100 (Wed, 22 Oct 2008) New Revision: 1243 Added: trunk/t/83_show_delete_to_admins_only.t trunk/t/84_navbar_admin.t Modified: trunk/Changes trunk/MANIFEST trunk/t/41_deletion.t trunk/templates/footer.tt trunk/templates/navbar_this_page.tt trunk/templates/node_history.tt Log: Don't add delete links unless the user requests (fixes #159 - thanks bob) Modified: trunk/Changes =================================================================== --- trunk/Changes 2008-10-22 11:25:56 UTC (rev 1242) +++ trunk/Changes 2008-10-22 12:35:20 UTC (rev 1243) @@ -18,6 +18,7 @@ Move the node image outside the metadata div, to aid styling (#222) Add the ability to whitelist hosts who can change moderated nodes without explicit moderation (#203) + Don't add delete links unless the user requests (#159) 0.63 16 August 2008 Major overhaul of RDF output. Modified: trunk/MANIFEST =================================================================== --- trunk/MANIFEST 2008-10-22 11:25:56 UTC (rev 1242) +++ trunk/MANIFEST 2008-10-22 12:35:20 UTC (rev 1243) @@ -146,6 +146,8 @@ t/78_about.t t/79_host_blacklist.t t/81_node_moderate_whitelist.t +t/83_show_delete_to_admins_only.t +t/84_navbar_admin.t t/85_universal_edit_link.t t/templates/15_test.tt wiki.cgi Modified: trunk/t/41_deletion.t =================================================================== --- trunk/t/41_deletion.t 2008-10-22 11:25:56 UTC (rev 1242) +++ trunk/t/41_deletion.t 2008-10-22 12:35:20 UTC (rev 1243) @@ -2,6 +2,7 @@ use OpenGuides; use OpenGuides::Template; use OpenGuides::Test; +use OpenGuides::CGI; use Test::More tests => 3; my $config = OpenGuides::Test->make_basic_config; @@ -19,13 +20,28 @@ unlike( $output, qr/action=delete/, "doesn't offer page deletion link by default" ); $config->enable_page_deletion( "y" ); + # set is_admin to 1 +my $cookie = OpenGuides::CGI->make_prefs_cookie( + config => $config, + username => "bob", + include_geocache_link => 1, + preview_above_edit_box => 1, + omit_help_links => 1, + show_minor_edits_in_rc => 1, + default_edit_type => "tidying", + cookie_expires => "never", + track_recent_changes_views => 1, + is_admin => 1, +); +$ENV{HTTP_COOKIE} = $cookie; + $output = OpenGuides::Template->output( wiki => $wiki, config => $config, template => "node.tt", ); like( $output, qr/action=delete/, - "...but does when enable_page_deletion is set to 'y'" ); + "...but does when enable_page_deletion is set to 'y' and is_admin is 1" ); $config->enable_page_deletion( 1 ); $output = OpenGuides::Template->output( wiki => $wiki, @@ -33,4 +49,4 @@ template => "node.tt", ); like( $output, qr/action=delete/, - "...and when enable_page_deletion is set to '1'" ); + "...and when enable_page_deletion is set to '1' and is_admin is 1" ); Added: trunk/t/83_show_delete_to_admins_only.t =================================================================== --- trunk/t/83_show_delete_to_admins_only.t (rev 0) +++ trunk/t/83_show_delete_to_admins_only.t 2008-10-22 12:35:20 UTC (rev 1243) @@ -0,0 +1,122 @@ +use strict; +use OpenGuides; +use OpenGuides::Test; +use Test::More; +use Wiki::Toolkit::Setup::SQLite; +use OpenGuides::Config; +use OpenGuides::CGI; + + +eval { require DBD::SQLite; }; +if ( $@ ) { + plan skip_all => "DBD::SQLite not installed - no database to test with"; + exit 0; +} + +eval { require Test::HTML::Content; }; +if ( $@ ) { + plan skip_all => "Test::HTML::Content not installed"; + exit 0; +} + +sub get_recent_changes { + my ($guide) = @_; + + my $output = $guide->display_recent_changes( return_output => 1 ); + $output =~ s/^Content-Type.*[\r\n]+//m; + + return $output; +} + +sub get_preferences { + my ($guide) = @_; + + return OpenGuides::Template->output( + wiki => $guide->wiki, + config => $guide->config, + template => "preferences.tt", + noheaders => 1, + vars => { + not_editable => 1, + show_form => 1 + }, + ); +} + + +plan tests => 4; + +my ( $config, $guide, $wiki, $output ); + +# Clear out the database from any previous runs. +unlink "t/node.db"; +unlink <t/indexes/*>; +Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); + + + # Make a guide + $config = OpenGuides::Test->make_basic_config; +$config->enable_page_deletion( 1 ); + $guide = OpenGuides->new( config => $config ); + # set is_admin to 1 +my $cookie = OpenGuides::CGI->make_prefs_cookie( + config => $config, + username => "bob", + include_geocache_link => 1, + preview_above_edit_box => 1, + omit_help_links => 1, + show_minor_edits_in_rc => 1, + default_edit_type => "tidying", + cookie_expires => "never", + track_recent_changes_views => 1, + is_admin => 1, +); +$ENV{HTTP_COOKIE} = $cookie; +OpenGuides::Test->write_data( + guide => $guide, + node => "Test Page", + ); + + $output = $guide->display_node( + return_output => 1, + id => "Test Page", + ); +# check delete link is shown in footer + Test::HTML::Content::tag_ok( $output, "div", { id => "footer_delete_link" }, + "delete link in footer for admin" ); + + $output = $guide->list_all_versions( + return_output => 1, + id => "Test Page", + ); + like( $output, qr/version=1;action=delete/, + "delete links on history page"); + +# set is_admin to 0 + $cookie = OpenGuides::CGI->make_prefs_cookie( + config => $config, + username => "bob", + include_geocache_link => 1, + preview_above_edit_box => 1, + omit_help_links => 1, + show_minor_edits_in_rc => 1, + default_edit_type => "tidying", + cookie_expires => "never", + track_recent_changes_views => 1, + is_admin => 0, +); +$ENV{HTTP_COOKIE} = $cookie; + + $output = $guide->display_node( + return_output => 1, + id => "Test Page", + ); +# check that the delete link in footer isnt shown + Test::HTML::Content::no_tag( $output, "div", { id => "footer_delete_link" }, + "delete link in footer not shown"); + $output = $guide->list_all_versions( + return_output => 1, + id => "Test Page", + ); + unlike( $output, qr/version=1;action=delete/, + "no delete links on history page"); Added: trunk/t/84_navbar_admin.t =================================================================== --- trunk/t/84_navbar_admin.t (rev 0) +++ trunk/t/84_navbar_admin.t 2008-10-22 12:35:20 UTC (rev 1243) @@ -0,0 +1,107 @@ +use strict; +use OpenGuides; +use OpenGuides::Test; +use Test::More; +use Wiki::Toolkit::Setup::SQLite; +use OpenGuides::Config; +use OpenGuides::CGI; + + +eval { require DBD::SQLite; }; +if ( $@ ) { + plan skip_all => "DBD::SQLite not installed - no database to test with"; + exit 0; +} + +eval { require Test::HTML::Content; }; +if ( $@ ) { + plan skip_all => "Test::HTML::Content not installed"; + exit 0; +} + +sub get_recent_changes { + my ($guide) = @_; + + my $output = $guide->display_recent_changes( return_output => 1 ); + $output =~ s/^Content-Type.*[\r\n]+//m; + + return $output; +} + +sub get_preferences { + my ($guide) = @_; + + return OpenGuides::Template->output( + wiki => $guide->wiki, + config => $guide->config, + template => "preferences.tt", + noheaders => 1, + vars => { + not_editable => 1, + show_form => 1 + }, + ); +} + + +plan tests => 2; + +my ( $config, $guide, $wiki, $output ); + +# Clear out the database from any previous runs. +unlink "t/node.db"; +unlink <t/indexes/*>; +Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); + + + # Make a guide + $config = OpenGuides::Test->make_basic_config; + $guide = OpenGuides->new( config => $config ); + # set is_admin to 1 +my $cookie = OpenGuides::CGI->make_prefs_cookie( + config => $config, + username => "bob", + include_geocache_link => 1, + preview_above_edit_box => 1, + omit_help_links => 1, + show_minor_edits_in_rc => 1, + default_edit_type => "tidying", + cookie_expires => "never", + track_recent_changes_views => 1, + is_admin => 1, +); +$ENV{HTTP_COOKIE} = $cookie; +OpenGuides::Test->write_data( + guide => $guide, + node => "Test Page", + ); + + $output = $guide->display_node( + return_output => 1, + id => "Test Page", + ); +# check navbar_admin div is shown. + Test::HTML::Content::tag_ok( $output, "div", { id => "navbar_admin" }, + "admin section displayed in navbar" ); +# set is_admin to 0 + $cookie = OpenGuides::CGI->make_prefs_cookie( + config => $config, + username => "bob", + include_geocache_link => 1, + preview_above_edit_box => 1, + omit_help_links => 1, + show_minor_edits_in_rc => 1, + default_edit_type => "tidying", + cookie_expires => "never", + track_recent_changes_views => 1, + is_admin => 0, +); +$ENV{HTTP_COOKIE} = $cookie; + + $output = $guide->display_node( + return_output => 1, + id => "Test Page", + ); +# check that the navbar_admin div isnt shown + Test::HTML::Content::no_tag( $output, "div", { id => "navbar_admin" }, + "navbar not shown"); Modified: trunk/templates/footer.tt =================================================================== --- trunk/templates/footer.tt 2008-10-22 11:25:56 UTC (rev 1242) +++ trunk/templates/footer.tt 2008-10-22 12:35:20 UTC (rev 1243) @@ -11,7 +11,7 @@ <div id="footer"> [% BLOCK delete_link %] - [% IF enable_page_deletion AND NOT not_deletable %] + [% IF enable_page_deletion AND is_admin AND NOT not_deletable %] <div id="footer_delete_link"> <a href="[% full_cgi_url %]?id=[% node_param %];action=delete">Delete page</a> (admins only) </div> Modified: trunk/templates/navbar_this_page.tt =================================================================== --- trunk/templates/navbar_this_page.tt 2008-10-22 11:25:56 UTC (rev 1242) +++ trunk/templates/navbar_this_page.tt 2008-10-22 12:35:20 UTC (rev 1243) @@ -8,7 +8,7 @@ <li><a href="[% full_cgi_url %]?action=list_all_versions;id=[% node_param %]">List all revisions</a></li> [% END %] <li><a href="[% full_cgi_url %]?id=[% node_param %];format=rdf">RDF/XML version</a></li> - [% IF enable_page_deletion %] + [% IF enable_page_deletion and is_admin %] <li><a href="[% full_cgi_url %]?id=[% node_param %];action=delete">Delete (admin only)</a></li> [% END %] </ul> Modified: trunk/templates/node_history.tt =================================================================== --- trunk/templates/node_history.tt 2008-10-22 11:25:56 UTC (rev 1242) +++ trunk/templates/node_history.tt 2008-10-22 12:35:20 UTC (rev 1243) @@ -54,7 +54,7 @@ [% IF revision.comment %]   <i>([% revision.comment %])</i> [% END %] - [% IF enable_page_deletion %] + [% IF enable_page_deletion AND is_admin %]   <small>[<a href="[% full_cgi_url %]?id=[% node_param %];version=[% revision.version %];action=delete">delete</a>]</small> [% END %] </li>

14 years, 11 months

r1242 - trunk

by svnadmin＠urchin.earth.li

Author: dom Date: 2008-10-22 12:25:56 +0100 (Wed, 22 Oct 2008) New Revision: 1242 Modified: trunk/Build.PL Log: fix up configure prereqs and removed unused 'use Data::Dumper' Modified: trunk/Build.PL =================================================================== --- trunk/Build.PL 2008-10-22 11:17:19 UTC (rev 1241) +++ trunk/Build.PL 2008-10-22 11:25:56 UTC (rev 1242) @@ -1,6 +1,5 @@ use strict; use lib "lib"; -use Data::Dumper; use Getopt::Long; eval { @@ -322,6 +321,8 @@ }, configure_requires => { 'Config::Tiny' => 0, + 'Class::Accessor' => 0, + 'Module::Build' => '0.26', # API change for accessing config data }, recommends => { 'DBD::SQLite' => 0, # for testing

14 years, 11 months

r1241 - trunk

by svnadmin＠urchin.earth.li

Author: dom Date: 2008-10-22 12:17:19 +0100 (Wed, 22 Oct 2008) New Revision: 1241 Modified: trunk/Build.PL Log: fix misnamed prereq Modified: trunk/Build.PL =================================================================== --- trunk/Build.PL 2008-10-19 23:24:51 UTC (rev 1240) +++ trunk/Build.PL 2008-10-22 11:17:19 UTC (rev 1241) @@ -312,7 +312,7 @@ 'XML::RSS' => 0, 'Data::Validate::URI' => 0, 'Net::Netmask' => 0, - 'List::Utils' => 0, + 'List::Util' => 0, }, build_requires => { 'Module::Build' => '0.26', # API change for accessing config data

14 years, 11 months

r1240 - in trunk: . lib lib/OpenGuides t

by svnadmin＠urchin.earth.li

Author: dom Date: 2008-10-20 00:24:51 +0100 (Mon, 20 Oct 2008) New Revision: 1240 Added: trunk/t/81_node_moderate_whitelist.t Modified: trunk/Build.PL trunk/Changes trunk/MANIFEST trunk/lib/OpenGuides.pm trunk/lib/OpenGuides/Config.pm trunk/lib/OpenGuides/Test.pm trunk/lib/OpenGuides/Utils.pm Log: Add the ability to whitelist hosts who can change moderated nodes without explicit moderation - thanks Oliver (fixes #203) Modified: trunk/Build.PL =================================================================== --- trunk/Build.PL 2008-10-19 17:09:42 UTC (rev 1239) +++ trunk/Build.PL 2008-10-19 23:24:51 UTC (rev 1240) @@ -311,6 +311,8 @@ 'URI::Escape' => 0, 'XML::RSS' => 0, 'Data::Validate::URI' => 0, + 'Net::Netmask' => 0, + 'List::Utils' => 0, }, build_requires => { 'Module::Build' => '0.26', # API change for accessing config data Modified: trunk/Changes =================================================================== --- trunk/Changes 2008-10-19 17:09:42 UTC (rev 1239) +++ trunk/Changes 2008-10-19 23:24:51 UTC (rev 1240) @@ -16,6 +16,8 @@ Fix install with CPAN when Config::Tiny not already installed (#224) Add an admin navbar, to be displayed if the user requests (#261) Move the node image outside the metadata div, to aid styling (#222) + Add the ability to whitelist hosts who can change moderated nodes + without explicit moderation (#203) 0.63 16 August 2008 Major overhaul of RDF output. Modified: trunk/MANIFEST =================================================================== --- trunk/MANIFEST 2008-10-19 17:09:42 UTC (rev 1239) +++ trunk/MANIFEST 2008-10-19 23:24:51 UTC (rev 1240) @@ -145,6 +145,7 @@ t/77_send_email.t t/78_about.t t/79_host_blacklist.t +t/81_node_moderate_whitelist.t t/85_universal_edit_link.t t/templates/15_test.tt wiki.cgi Modified: trunk/lib/OpenGuides/Config.pm =================================================================== --- trunk/lib/OpenGuides/Config.pm 2008-10-19 17:09:42 UTC (rev 1239) +++ trunk/lib/OpenGuides/Config.pm 2008-10-19 23:24:51 UTC (rev 1240) @@ -22,7 +22,8 @@ custom_template_path geo_handler ellipsoid gmaps_api_key centre_long show_gmap_in_node_display google_analytics_key centre_lat default_gmaps_zoom default_gmaps_search_zoom force_wgs84 - licence_name licence_url licence_info_url moderation_requires_password + licence_name licence_url licence_info_url + moderation_requires_password moderate_whitelist enable_node_image enable_common_categories enable_common_locales spam_detector_module host_checker_module static_path static_url send_moderation_notifications website_link_max_chars @@ -80,6 +81,7 @@ indexing_directory => "/usr/lib/cgi-bin/openguides/indexes/", enable_page_deletion => 0, moderation_requires_password => 1, + moderate_whitelist => "", admin_pass => "Change This!", enable_node_image => 1, enable_common_categories => 0, @@ -202,6 +204,7 @@ static_url => "What is the URL corresponding to the static content?", send_moderation_notifications => "Should we send email notifications when a moderated node is edited?", website_link_max_chars => "How many characters of the URL of node websites should be displayed?", + moderate_whitelist => "Enter a comma-separated list of IP addresses able to make changes to moderated nodes and have them show up immediately", ); foreach my $var ( keys %questions ) { @@ -336,6 +339,8 @@ =item * send_moderation_notifications +=item * moderate_whitelist + =item * website_link_max_chars (default: C<20>) =back Modified: trunk/lib/OpenGuides/Test.pm =================================================================== --- trunk/lib/OpenGuides/Test.pm 2008-10-19 17:09:42 UTC (rev 1239) +++ trunk/lib/OpenGuides/Test.pm 2008-10-19 23:24:51 UTC (rev 1240) @@ -66,6 +66,7 @@ geo_handler => 1, force_wgs84 => 1, contact_email => 'admins(a)example.org', + moderate_whitelist => "", } ); Modified: trunk/lib/OpenGuides/Utils.pm =================================================================== --- trunk/lib/OpenGuides/Utils.pm 2008-10-19 17:09:42 UTC (rev 1239) +++ trunk/lib/OpenGuides/Utils.pm 2008-10-19 23:24:51 UTC (rev 1240) @@ -10,6 +10,8 @@ use Wiki::Toolkit::Plugin::RSS::Reader; use URI::Escape; use MIME::Lite; +use Net::Netmask; +use List::Util qw( first ); use Data::Validate::URI qw( is_web_uri ); =head1 NAME @@ -497,6 +499,35 @@ } } +=item B<in_moderate_whitelist> + + if (OpenGuides::Utils->in_moderate_whitelist( '127.0.0.1' )) { + # skip moderation and apply new verson to published site + } + +Admins can supply a comma separated list of IP addresses or CIDR-notation +subnets indicating the hosts which can bypass enforced moderation. Any +values which cannot be parsed by C<NetAddr::IP> will be ignored. + +=cut + +sub in_moderate_whitelist { + my ($self, $config, $ip) = @_; + return undef if not defined $ip; + + # create NetAddr::IP object of the test IP + my $addr = Net::Netmask->new2($ip) or return undef; + + # load the configured whitelist + my @whitelist + = split ',', $config->moderate_whitelist; + + # test each entry in the whitelist + return eval{ + first { Net::Netmask->new2($_)->match($addr->base) } @whitelist + }; +} + =back =head1 AUTHOR Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2008-10-19 17:09:42 UTC (rev 1239) +++ trunk/lib/OpenGuides.pm 2008-10-19 23:24:51 UTC (rev 1240) @@ -1556,7 +1556,10 @@ # Skip this for nodes needing moderation - this occurs for them once # they've been moderated my $needs_moderation = $wiki->node_required_moderation($node); - unless( $needs_moderation ) { + my $in_moderate_whitelist + = OpenGuides::Utils->in_moderate_whitelist($self->config, $new_metadata{host}); + + if ( $in_moderate_whitelist or not $needs_moderation ) { $self->_autoCreateCategoryLocale( id => $node, metadata => \%new_metadata @@ -1567,22 +1570,30 @@ \%new_metadata ); if ($written) { - if ( $needs_moderation and $config->send_moderation_notifications ) { - my $body = "The node '$node' in the OpenGuides installation\n" . - "'" . $config->site_name . "' requires moderation. ". - "Please visit\n" . - $config->script_url . $config->script_name . - "?action=show_needing_moderation\nat your convenience.\n"; - eval { - OpenGuides::Utils->send_email( - config => $config, - subject => "Node requires moderation", - body => $body, - admin => 1, - return_output => $return_output + if ( $needs_moderation ) { + if ( $in_moderate_whitelist ) { + $self->wiki->moderate_node( + name => $node, + version => $written ); - }; - warn $@ if $@; + } + elsif ( $config->send_moderation_notifications ) { + my $body = "The node '$node' in the OpenGuides installation\n" . + "'" . $config->site_name . "' requires moderation. ". + "Please visit\n" . + $config->script_url . $config->script_name . + "?action=show_needing_moderation\nat your convenience.\n"; + eval { + OpenGuides::Utils->send_email( + config => $config, + subject => "Node requires moderation", + body => $body, + admin => 1, + return_output => $return_output + ); + }; + warn $@ if $@; + } } my $output = $self->redirect_to_node($node); Added: trunk/t/81_node_moderate_whitelist.t =================================================================== --- trunk/t/81_node_moderate_whitelist.t (rev 0) +++ trunk/t/81_node_moderate_whitelist.t 2008-10-19 23:24:51 UTC (rev 1240) @@ -0,0 +1,96 @@ +use strict; +use Wiki::Toolkit::Setup::SQLite; +use OpenGuides; +use OpenGuides::Test; +use Test::More; + +eval { require DBD::SQLite; }; + +if ( $@ ) { + my ($error) = $@ =~ /^(.*?)\n/; + plan skip_all => "DBD::SQLite could not be used - no database to test with ($error)"; +} + +plan tests => 12; + +Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); +my $config = OpenGuides::Test->make_basic_config; +$config->script_name( "wiki.cgi" ); +$config->script_url( "http://example.com/" ); +$config->moderate_whitelist( "127.0.0.1,127.0.0.2" ); +my $guide = OpenGuides->new( config => $config ); +isa_ok( $guide, "OpenGuides" ); +my $wiki = $guide->wiki; +isa_ok( $wiki, "Wiki::Toolkit" ); + +# Clear out the database from any previous runs. +foreach my $del_node ( $wiki->list_all_nodes ) { + print "# Deleting node $del_node\n"; + $wiki->delete_node( $del_node ) or die "Can't delete $del_node"; +} + + +# Add a page +my $q = CGI->new; +$q->param( -name => "content", -value => "foo" ); +$q->param( -name => "categories", -value => "Alpha" ); +$q->param( -name => "locales", -value => "" ); +$q->param( -name => "phone", -value => "" ); +$q->param( -name => "fax", -value => "" ); +$q->param( -name => "website", -value => "" ); +$q->param( -name => "hours_text", -value => "" ); +$q->param( -name => "address", -value => "" ); +$q->param( -name => "postcode", -value => "" ); +$q->param( -name => "map_link", -value => "" ); +$q->param( -name => "os_x", -value => "" ); +$q->param( -name => "os_y", -value => "" ); +$q->param( -name => "username", -value => "bob" ); +$q->param( -name => "comment", -value => "foo" ); +$q->param( -name => "edit_type", -value => "Minor tidying" ); +$ENV{REMOTE_ADDR} = "127.0.0.1"; + +my $output = $guide->commit_node( + return_output => 1, + id => "Wombats", + cgi_obj => $q, + ); + +# Check it's moderated +my %details = $wiki->retrieve_node("Wombats"); +is($details{'moderated'}, 1, "Moderated"); +is($wiki->node_required_moderation("Wombats"), 0, "No moderation"); + +# Turn on moderation +$wiki->set_node_moderation( + name => "Wombats", + required => 1, +); +is($wiki->node_required_moderation("Wombats"), 1, "Moderation"); + + +# Now add a new one, with new categories and locales +$q->param( -name => "categories", -value => "Alpha\r\nBeta" ); +$q->param( -name => "locales", -value => "Hello" ); +$q->param( -name => "edit_type", -value => "Normal edit" ); +$q->param( -name => "checksum", -value => $details{checksum} ); +$output = $guide->commit_node( + return_output => 1, + id => "Wombats", + cgi_obj => $q, + ); + +# Check that the current version is now 2 +%details = $wiki->retrieve_node("Wombats"); +is($details{'version'}, 2, "Still on v1"); +is($details{'moderated'}, 1, "v1 Moderated"); + +# Check that version 2 is moderated +my %v2 = $wiki->retrieve_node(name=>"Wombats",version=>2); +is($v2{'version'}, 2, "Is v2"); +is($v2{'moderated'}, 1, "Moderated"); + +# Check that the new categories and locales are there +is(1, $wiki->node_exists("Category Alpha"), "Right Categories"); +is(1, $wiki->node_exists("Category Beta"), "Right Categories"); +is(1, $wiki->node_exists("Locale Hello"), "Right Locales"); +

14 years, 11 months

r1239 - trunk

by svnadmin＠urchin.earth.li

Author: dom Date: 2008-10-19 18:09:42 +0100 (Sun, 19 Oct 2008) New Revision: 1239 Modified: trunk/Build.PL Log: Add dist_abstract, needed for newer Module::Build Modified: trunk/Build.PL =================================================================== --- trunk/Build.PL 2008-10-19 17:08:09 UTC (rev 1238) +++ trunk/Build.PL 2008-10-19 17:09:42 UTC (rev 1239) @@ -274,6 +274,7 @@ my $build = OpenGuides::Build->new( sign => 1, dist_name => "OpenGuides", + dist_abstract => "A complete web application for managing a collaboratively-written guide to a city or town.", module_name => "OpenGuides", dist_version_from => "wiki.cgi", license => "perl",

14 years, 11 months

r1238 - trunk

by svnadmin＠urchin.earth.li

Author: dom Date: 2008-10-19 18:08:09 +0100 (Sun, 19 Oct 2008) New Revision: 1238 Modified: trunk/Build.PL trunk/Changes Log: Add Config::Tiny into configure_requires; new enough CPAN will install Config::Tiny before running Build.PL (fixes #224) Modified: trunk/Build.PL =================================================================== --- trunk/Build.PL 2008-10-19 16:41:25 UTC (rev 1237) +++ trunk/Build.PL 2008-10-19 17:08:09 UTC (rev 1238) @@ -317,6 +317,9 @@ 'Config::Tiny' => 0, 'Data::Dumper' => 0, }, + configure_requires => { + 'Config::Tiny' => 0, + }, recommends => { 'DBD::SQLite' => 0, # for testing 'Test::HTML::Content' => 0, # for testing, oddly enough Modified: trunk/Changes =================================================================== --- trunk/Changes 2008-10-19 16:41:25 UTC (rev 1237) +++ trunk/Changes 2008-10-19 17:08:09 UTC (rev 1238) @@ -13,6 +13,7 @@ Change default database type to sqlite (#241) Set content charset correctly in RDF (#260) Display geodata ellipsoid to user in edit from (#230) + Fix install with CPAN when Config::Tiny not already installed (#224) Add an admin navbar, to be displayed if the user requests (#261) Move the node image outside the metadata div, to aid styling (#222)

14 years, 11 months

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

openguides-commits October 2008