openguides-commits June 2007

openguides-commits@lists.openguides.org

1 participants
59 discussions

r1100 - trunk
by svnadmin＠urchin.earth.li 28 Jun '07

28 Jun '07

Author: dom Date: 2007-06-29 00:20:37 +0100 (Fri, 29 Jun 2007) New Revision: 1100 Modified: trunk/Changes Log: Add missing ticket reference Modified: trunk/Changes =================================================================== --- trunk/Changes 2007-06-28 23:06:45 UTC (rev 1099) +++ trunk/Changes 2007-06-28 23:20:37 UTC (rev 1100) @@ -10,7 +10,7 @@ want it, add div#title_edit_link {display:none;} to your stylesheet. Removed dependency on Test::MockObject. Remove misleading CSS examples - Support alternative database ports + Support alternative database ports (#165) Only display the google maps preference if node maps are enabled (#192). Respect redirect=0 (#104).

1 0

r1099 - in trunk: . templates
by svnadmin＠urchin.earth.li 28 Jun '07

28 Jun '07

Author: dom Date: 2007-06-29 00:06:45 +0100 (Fri, 29 Jun 2007) New Revision: 1099 Modified: trunk/Changes trunk/templates/header.tt Log: Include licence URL in <head> (fixes #226) Modified: trunk/Changes =================================================================== --- trunk/Changes 2007-06-24 02:10:37 UTC (rev 1098) +++ trunk/Changes 2007-06-28 23:06:45 UTC (rev 1099) @@ -27,6 +27,7 @@ Add email notifications when moderated nodes are edited (#138) Add IP addresses into non-anonymous changes in Recent Changes (#113) Add an OpenSearch description, and automatic discovery for it (#180) + Include machine-readable link to licence, if configured (#226) 0.60 13 May 2007 Removed footer search from edit page (shouldn't have been there). Modified: trunk/templates/header.tt =================================================================== --- trunk/templates/header.tt 2007-06-24 02:10:37 UTC (rev 1098) +++ trunk/templates/header.tt 2007-06-28 23:06:45 UTC (rev 1099) @@ -49,6 +49,9 @@ type="application/opensearchdescription+xml" title="Search the site '[% site_name %]'" href="[% full_cgi_url %]?action=about;format=opensearch" /> + [% IF licence_url %] + <link rel="copyright" href="[% licence_url %]" /> + [% END %] [% IF deter_robots %] <meta name="robots" content="noindex,nofollow" /> [% END %]

1 0

r1098 - in trunk: lib/OpenGuides t
by svnadmin＠urchin.earth.li 24 Jun '07

24 Jun '07

Author: kake Date: 2007-06-24 03:10:37 +0100 (Sun, 24 Jun 2007) New Revision: 1098 Modified: trunk/lib/OpenGuides/Template.pm trunk/t/51_display_node.t Log: Fix changeset [1095] - categories and locales weren't getting linkified even if they _did_ exist. Modified: trunk/lib/OpenGuides/Template.pm =================================================================== --- trunk/lib/OpenGuides/Template.pm 2007-06-21 11:25:06 UTC (rev 1097) +++ trunk/lib/OpenGuides/Template.pm 2007-06-24 02:10:37 UTC (rev 1098) @@ -290,7 +290,8 @@ my ($class, %args) = @_; my %metadata = %{$args{metadata} || {} }; my $q = $args{cgi_obj}; - my $formatter = $args{wiki}->formatter; + my $wiki = $args{wiki}; + my $formatter = $wiki->formatter; my $config = $args{config}; my $script_name = $config->script_name; @@ -318,13 +319,33 @@ split("\r\n", $locales_text); } - my @categories = map { { name => $_, - url => $args{wiki}->node_exists( "Category_" . $formatter->node_name_to_node_param($_)) ? "$script_name?Category_" - . uri_escape($formatter->node_name_to_node_param($_)) : "" } } @catlist; + # Some stuff here is copied from OpenGuides->_autoCreateCategoryLocale + # - we should rationalise this. + my @categories = map { + my $param = $formatter->node_name_to_node_param( $_ ); + my $name = $_; + $name =~ s/(.*)/\u$1/; + $name = $wiki->formatter->_do_freeupper( "Category $name" ); + { + name => $_, + url => $wiki->node_exists( $name ) + ? "$script_name?Category_" . uri_escape( $param ) + : "", + }; + } @catlist; - my @locales = map { { name => $_, - url => $args{wiki}->node_exists( "Locale_" . $formatter->node_name_to_node_param($_)) ? "$script_name?Locale_" - . uri_escape($formatter->node_name_to_node_param($_)) : "" } } @loclist; + my @locales = map { + my $param = $formatter->node_name_to_node_param( $_ ); + my $name = $_; + $name =~ s/(.*)/\u$1/; + $name = $wiki->formatter->_do_freeupper( "Locale $name" ); + { + name => $_, + url => $wiki->node_exists( $name ) + ? "$script_name?Locale_" . uri_escape( $param ) + : "", + }; + } @loclist; # The 'website' attribute might contain a URL so we wiki-format it here # rather than just CGI::escapeHTMLing it all in the template. Modified: trunk/t/51_display_node.t =================================================================== --- trunk/t/51_display_node.t 2007-06-21 11:25:06 UTC (rev 1097) +++ trunk/t/51_display_node.t 2007-06-24 02:10:37 UTC (rev 1098) @@ -2,6 +2,7 @@ use Wiki::Toolkit::Setup::SQLite; use OpenGuides::Config; use OpenGuides; +use OpenGuides::Test; use Test::More; eval { require DBD::SQLite; }; @@ -12,7 +13,7 @@ plan skip_all => "DBD::SQLite could not be used - no database to test with ($error)"; } -plan tests => 13; +plan tests => 15; Wiki::Toolkit::Setup::SQLite::cleardb( { dbname => "t/node.db" } ); Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); @@ -26,6 +27,7 @@ site_name => "Test Site", template_path => "./templates", home_name => "Home", + admin_pass => "password", } ); eval { require Wiki::Toolkit::Search::Plucene; }; @@ -62,36 +64,49 @@ unlike( $output, qr{^\QLocation: }ms, '...but not with redirect=0' ); -$wiki->write_node( "Non-existent categories and locales", "foo", undef, - { category => [ "Does not exist" ], - locale => [ "Does not exist" ] } ); +# Write a node, then delete one each of its categories and locales. +OpenGuides::Test->write_data( + guide => $guide, + node => "Non-existent categories and locales", + categories => "Does Not Exist\r\nDoes Exist", + locales => "Does Not Exist\r\nDoes Exist", + return_output => 1, + ); +foreach my $id ( ( "Category Does Not Exist", "Locale Does Not Exist" ) ) { + $guide->delete_node( + id => $id, + password => "password", + return_output => 1, + ); +} +# Check the display comes up right for the existent and nonexistent. $output = $guide->display_node( id => 'Non-existent categories and locales', return_output => 1 ); unlike( $output, qr{\Q<a href="wiki.cgi?Category_Does_Not_Exist"}, - 'Category name not linked if category does not exist' ); - -$wiki->write_node( "Category_Does_Not_Exist", "bar", undef, undef ); - -$output = $guide->display_node( id => 'Non-existent categories and locales', - return_output => 1 - ); - -like( $output, qr{\Q<a href="wiki.cgi?Category_Does_Not_Exist"}, - 'but does when it does exist' ); - + "category name not linked if category does not exist" ); +like( $output, qr{\Q<a href="wiki.cgi?Category_Does_Exist"}, + "...but does when it does exist" ); unlike( $output, qr{\Q<a href="wiki.cgi?Locale_Does_Not_Exist"}, - 'Locale name not linked if category does not exist' ); + "locale name not linked if category does not exist" ); +like( $output, qr{\Q<a href="wiki.cgi?Locale_Does_Exist"}, + "...but does when it does exist" ); -$wiki->write_node( "Locale_Does_Not_Exist", "wibble", undef, undef ); +# Check it works when the case is different too. +OpenGuides::Test->write_data( + guide => $guide, + node => "Existent categories and locales", + categories => "does exist", + locales => "does exist", + return_output => 1, + ); -$output = $guide->display_node( id => 'Non-existent categories and locales', +$output = $guide->display_node( id => "Existent categories and locales", return_output => 1 ); - -like( $output, qr{\Q<a href="wiki.cgi?Locale_Does_Not_Exist"}, - 'but does when it does exist' ); - - +like( $output, qr{\Q<a href="wiki.cgi?Category_Does_Exist"}, + "wrongly-cased categories are linked as they should be" ); +like( $output, qr{\Q<a href="wiki.cgi?Locale_Does_Exist"}, + "wrongly-cased locales are linked as they should be" );

1 0

r1097 - in trunk: . lib templates
by svnadmin＠urchin.earth.li 21 Jun '07

21 Jun '07

Author: dom Date: 2007-06-21 12:25:06 +0100 (Thu, 21 Jun 2007) New Revision: 1097 Modified: trunk/Changes trunk/lib/OpenGuides.pm trunk/templates/header.tt Log: Tweak OpenSearch description, and add autodiscovery (fixes #180) Modified: trunk/Changes =================================================================== --- trunk/Changes 2007-06-20 18:54:54 UTC (rev 1096) +++ trunk/Changes 2007-06-21 11:25:06 UTC (rev 1097) @@ -26,6 +26,7 @@ templates (#214). Add email notifications when moderated nodes are edited (#138) Add IP addresses into non-anonymous changes in Recent Changes (#113) + Add an OpenSearch description, and automatic discovery for it (#180) 0.60 13 May 2007 Removed footer search from edit page (shouldn't have been there). Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2007-06-20 18:54:54 UTC (rev 1096) +++ trunk/lib/OpenGuides.pm 2007-06-21 11:25:06 UTC (rev 1097) @@ -1206,7 +1206,7 @@ <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"> <ShortName>$site_name</ShortName> - <Description>Search the $site_name</Description> + <Description>Search the site '$site_name'</Description> <Tags>$site_name</Tags> <Contact>$contact_email</Contact> <Url type="application/atom+xml" Modified: trunk/templates/header.tt =================================================================== --- trunk/templates/header.tt 2007-06-20 18:54:54 UTC (rev 1096) +++ trunk/templates/header.tt 2007-06-21 11:25:06 UTC (rev 1097) @@ -1,7 +1,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <html lang="[% language %]"> -<head> +<head profile="http://a9.com/-/spec/opensearch/1.1/"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> [% IF page_title %] <title>[% page_title %]</title> @@ -37,8 +37,18 @@ <meta name="ICBM" content="[% wgs84_lat %], [% wgs84_long %]" /> <meta name="geo.position" content="[% wgs84_lat %], [% wgs84_long %]" /> [% END %] - <link rel="alternate" type="application/rss+xml" title="[% site_name %] - Recent Changes (RSS 1.0)" href="[% full_cgi_url %]?action=rc;format=rss" /> - <link rel="alternate" type="application/atom+xml" title="[% site_name %] - Recent Changes (Atom)" href="[% full_cgi_url %]?action=rc;format=atom" /> + <link rel="alternate" + type="application/rss+xml" + title="[% site_name %] - Recent Changes (RSS 1.0)" + href="[% full_cgi_url %]?action=rc;format=rss" /> + <link rel="alternate" + type="application/atom+xml" + title="[% site_name %] - Recent Changes (Atom)" + href="[% full_cgi_url %]?action=rc;format=atom" /> + <link rel="search" + type="application/opensearchdescription+xml" + title="Search the site '[% site_name %]'" + href="[% full_cgi_url %]?action=about;format=opensearch" /> [% IF deter_robots %] <meta name="robots" content="noindex,nofollow" /> [% END %]

1 0

r1096 - in trunk: . lib t
by svnadmin＠urchin.earth.li 20 Jun '07

20 Jun '07

Author: dom Date: 2007-06-20 19:54:54 +0100 (Wed, 20 Jun 2007) New Revision: 1096 Added: trunk/t/78_about.t Modified: trunk/MANIFEST trunk/lib/OpenGuides.pm Log: Add OpenSearch description (references #180) Modified: trunk/MANIFEST =================================================================== --- trunk/MANIFEST 2007-06-20 16:34:42 UTC (rev 1095) +++ trunk/MANIFEST 2007-06-20 18:54:54 UTC (rev 1096) @@ -141,5 +141,6 @@ t/75_revert_user.t t/76_detect_spam.t t/77_send_email.t +t/78_about.t t/templates/15_test.tt wiki.cgi Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2007-06-20 16:34:42 UTC (rev 1095) +++ trunk/lib/OpenGuides.pm 2007-06-20 18:54:54 UTC (rev 1096) @@ -1123,6 +1123,14 @@ print $output; } +=item B<display_about> + + print $guide->display_about(format => "rdf"); + +Displays static 'about' information in various format. Defaults to HTML. + +=cut + sub display_about { my ($self, %args) = @_; @@ -1188,8 +1196,28 @@ </Project> </rdf:RDF>}; - } - else { + } elsif ($args{format} && $args{format} eq 'opensearch') { + my $site_name = $self->config->site_name; + my $search_url = $self->config->script_url . 'search.cgi'; + my $contact_email = $self->config->contact_email; + $output = qq{Content-Type: application/opensearchdescription+xml; charset=utf-8 + +<?xml version="1.0" encoding="UTF-8"?> + +<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"> + <ShortName>$site_name</ShortName> + <Description>Search the $site_name</Description> + <Tags>$site_name</Tags> + <Contact>$contact_email</Contact> + <Url type="application/atom+xml" + template="$search_url?search={searchTerms};format=atom"/> + <Url type="application/rss+xml" + template="$search_url?search={searchTerms};format=rss"/> + <Url type="text/html" + template="$search_url?search={searchTerms}"/> + <Query role="example" searchTerms="pubs"/> +</OpenSearchDescription>}; + } else { my $site_name = $self->config->{site_name}; my $script_name = $self->config->{script_name}; $output = qq{Content-Type: text/html; charset=utf-8 Added: trunk/t/78_about.t =================================================================== --- trunk/t/78_about.t (rev 0) +++ trunk/t/78_about.t 2007-06-20 18:54:54 UTC (rev 1096) @@ -0,0 +1,32 @@ +use strict; +use warnings; + +use Test::More; +use OpenGuides; +use OpenGuides::Test; + +plan tests => 3; + +my $config = OpenGuides::Test->make_basic_config; +$config->site_name('My site'); +$config->contact_email('me(a)example.com'); +my $guide = OpenGuides->new(config => $config); + +my $output = $guide->display_about(return_output => 1); + +like( $output, qr|My site</a></h1>.*<h2>is powered by|ms, + "HTML about text is displayed, including the site name" ); + +$output = $guide->display_about(return_output => 1, + format => "opensearch" + ); + +like( $output, qr|OpenSearchDescription.*<Tags>My site</Tags>.*<Contact>me\(a)example.com</Contact>|ms, + "OpenSearch about text is displayed, including the site name and contact"); + +$output = $guide->display_about(return_output => 1, + format => "rdf" + ); + +like( $output, qr|<Project rdf:ID="OpenGuides">|ms, + "RDF about text is displayed");

1 0

r1095 - in trunk: lib/OpenGuides t templates
by svnadmin＠urchin.earth.li 20 Jun '07

20 Jun '07

Author: dom Date: 2007-06-20 17:34:42 +0100 (Wed, 20 Jun 2007) New Revision: 1095 Modified: trunk/lib/OpenGuides/Template.pm trunk/t/51_display_node.t trunk/templates/display_metadata.tt Log: Only linkify categories and locales if they exist (fixes #15) Modified: trunk/lib/OpenGuides/Template.pm =================================================================== --- trunk/lib/OpenGuides/Template.pm 2007-06-19 18:32:56 UTC (rev 1094) +++ trunk/lib/OpenGuides/Template.pm 2007-06-20 16:34:42 UTC (rev 1095) @@ -319,12 +319,12 @@ } my @categories = map { { name => $_, - url => "$script_name?Category_" - . uri_escape($formatter->node_name_to_node_param($_)) } } @catlist; + url => $args{wiki}->node_exists( "Category_" . $formatter->node_name_to_node_param($_)) ? "$script_name?Category_" + . uri_escape($formatter->node_name_to_node_param($_)) : "" } } @catlist; my @locales = map { { name => $_, - url => "$script_name?Locale_" - . uri_escape($formatter->node_name_to_node_param($_)) } } @loclist; + url => $args{wiki}->node_exists( "Locale_" . $formatter->node_name_to_node_param($_)) ? "$script_name?Locale_" + . uri_escape($formatter->node_name_to_node_param($_)) : "" } } @loclist; # The 'website' attribute might contain a URL so we wiki-format it here # rather than just CGI::escapeHTMLing it all in the template. Modified: trunk/t/51_display_node.t =================================================================== --- trunk/t/51_display_node.t 2007-06-19 18:32:56 UTC (rev 1094) +++ trunk/t/51_display_node.t 2007-06-20 16:34:42 UTC (rev 1095) @@ -12,8 +12,9 @@ plan skip_all => "DBD::SQLite could not be used - no database to test with ($error)"; } -plan tests => 9; +plan tests => 13; +Wiki::Toolkit::Setup::SQLite::cleardb( { dbname => "t/node.db" } ); Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Config->new( vars => { @@ -60,3 +61,37 @@ $output = $guide->display_node( id => 'Redirect Test', return_output => 1, redirect => 0 ); unlike( $output, qr{^\QLocation: }ms, '...but not with redirect=0' ); + +$wiki->write_node( "Non-existent categories and locales", "foo", undef, + { category => [ "Does not exist" ], + locale => [ "Does not exist" ] } ); + +$output = $guide->display_node( id => 'Non-existent categories and locales', + return_output => 1 + ); + +unlike( $output, qr{\Q<a href="wiki.cgi?Category_Does_Not_Exist"}, + 'Category name not linked if category does not exist' ); + +$wiki->write_node( "Category_Does_Not_Exist", "bar", undef, undef ); + +$output = $guide->display_node( id => 'Non-existent categories and locales', + return_output => 1 + ); + +like( $output, qr{\Q<a href="wiki.cgi?Category_Does_Not_Exist"}, + 'but does when it does exist' ); + +unlike( $output, qr{\Q<a href="wiki.cgi?Locale_Does_Not_Exist"}, + 'Locale name not linked if category does not exist' ); + +$wiki->write_node( "Locale_Does_Not_Exist", "wibble", undef, undef ); + +$output = $guide->display_node( id => 'Non-existent categories and locales', + return_output => 1 + ); + +like( $output, qr{\Q<a href="wiki.cgi?Locale_Does_Not_Exist"}, + 'but does when it does exist' ); + + Modified: trunk/templates/display_metadata.tt =================================================================== --- trunk/templates/display_metadata.tt 2007-06-19 18:32:56 UTC (rev 1094) +++ trunk/templates/display_metadata.tt 2007-06-20 16:34:42 UTC (rev 1095) @@ -81,7 +81,11 @@ <li class="categories_list"> <span class="metadata_label">Categories:</span> [% FOREACH category = categories %] - <a href="[% category.url %]" class="category">[% category.name %]</a>[%- "," UNLESS loop.last %] + [% IF category.url != "" %] + <a href="[% category.url %]" class="category">[% category.name %]</a>[%- "," UNLESS loop.last %] + [% ELSE %] + [% category.name %][%- "," UNLESS loop.last %] + [% END %] [% END %] </li> [% END %] @@ -90,7 +94,11 @@ <li class="locales_list"> <span class="metadata_label">Locales:</span> [% FOREACH locale = locales %] - <a href="[% locale.url %]" class="addr locality">[% locale.name %]</a>[%- "," UNLESS loop.last %] + [% IF locale.url != "" %] + <a href="[% locale.url %]" class="addr locality">[% locale.name %]</a>[%- "," UNLESS loop.last %] + [% ELSE %] + [% locale.name %][%- "," UNLESS loop.last %] + [% END %] [% END %] </li> [% END %]

1 0

r1094 - in trunk: . templates
by svnadmin＠urchin.earth.li 19 Jun '07

19 Jun '07

Author: dom Date: 2007-06-19 19:32:56 +0100 (Tue, 19 Jun 2007) New Revision: 1094 Modified: trunk/Changes trunk/templates/recent_changes.tt Log: Display IP address in recent changes, even when edit is not anonymous (fixes #113) Modified: trunk/Changes =================================================================== --- trunk/Changes 2007-06-19 13:01:53 UTC (rev 1093) +++ trunk/Changes 2007-06-19 18:32:56 UTC (rev 1094) @@ -25,6 +25,7 @@ Move the common categories/locales navbar display decision into the templates (#214). Add email notifications when moderated nodes are edited (#138) + Add IP addresses into non-anonymous changes in Recent Changes (#113) 0.60 13 May 2007 Removed footer search from edit page (shouldn't have been there). Modified: trunk/templates/recent_changes.tt =================================================================== --- trunk/templates/recent_changes.tt 2007-06-19 13:01:53 UTC (rev 1093) +++ trunk/templates/recent_changes.tt 2007-06-19 18:32:56 UTC (rev 1094) @@ -42,6 +42,7 @@ <td><span class="recentchanges_user"> [% IF (node.username != 'Anonymous') %] <a href="[% cgi_url %]?username=[% node.username %];action=userstats">[% node.username %]</a> + (<a href="[% cgi_url %]?host=[% node.host %];action=userstats">[% node.host %]</a>) [% ELSE %] <a href="[% cgi_url %]?host=[% node.host %];action=userstats">[% node.host %]</a> [% END %]

1 0

r1093 - in trunk: . lib lib/OpenGuides
by svnadmin＠urchin.earth.li 19 Jun '07

19 Jun '07

Author: dom Date: 2007-06-19 14:01:53 +0100 (Tue, 19 Jun 2007) New Revision: 1093 Modified: trunk/Build.PL trunk/Changes trunk/lib/OpenGuides.pm trunk/lib/OpenGuides/Config.pm Log: Send email notifications when moderated nodes are edited (fixes #138) Modified: trunk/Build.PL =================================================================== --- trunk/Build.PL 2007-06-18 20:31:33 UTC (rev 1092) +++ trunk/Build.PL 2007-06-19 13:01:53 UTC (rev 1093) @@ -42,7 +42,8 @@ moderation_requires_password enable_node_image enable_common_categories enable_common_locales recent_changes_on_home_page random_page_omits_locales random_page_omits_categories - content_above_navbar_in_html show_gmap_in_node_display); + content_above_navbar_in_html show_gmap_in_node_display + send_moderation_notifications); my $skip_config = Module::Build->y_n("Skip OpenGuides configuration?", "n"); if ( $skip_config ) { @@ -104,7 +105,7 @@ default_gmaps_search_zoom force_wgs84 google_analytics_key licence_name licence_url licence_info_url moderation_requires_password enable_node_image enable_common_categories enable_common_locales - spam_detector_module static_path static_url + spam_detector_module static_path static_url send_moderation_notifications ) ) { my $q_method = $var . "__qu"; my $qu = $existing_config->$q_method; Modified: trunk/Changes =================================================================== --- trunk/Changes 2007-06-18 20:31:33 UTC (rev 1092) +++ trunk/Changes 2007-06-19 13:01:53 UTC (rev 1093) @@ -24,6 +24,7 @@ (#216). Move the common categories/locales navbar display decision into the templates (#214). + Add email notifications when moderated nodes are edited (#138) 0.60 13 May 2007 Removed footer search from edit page (shouldn't have been there). Modified: trunk/lib/OpenGuides/Config.pm =================================================================== --- trunk/lib/OpenGuides/Config.pm 2007-06-18 20:31:33 UTC (rev 1092) +++ trunk/lib/OpenGuides/Config.pm 2007-06-19 13:01:53 UTC (rev 1093) @@ -21,7 +21,7 @@ centre_lat default_gmaps_zoom default_gmaps_search_zoom force_wgs84 licence_name licence_url licence_info_url moderation_requires_password enable_node_image enable_common_categories enable_common_locales - spam_detector_module static_path static_url + spam_detector_module static_path static_url send_moderation_notifications ); my @questions = map { $_ . "__qu" } @variables; OpenGuides::Config->mk_accessors( @variables ); @@ -109,6 +109,7 @@ licence_info_url => "", spam_detector_module => "", static_path => "/usr/local/share/openguides/static", + send_moderation_notifications => 1 ); # See if we already have some config variables set. @@ -192,6 +193,7 @@ spam_detector_module => "What module would you like to use for spam detection? (optional)", static_path => "What directory should we install static content (CSS, images, javascript) to?", 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?" ); foreach my $var ( keys %questions ) { @@ -322,6 +324,8 @@ =item * static_url +=item * send_moderation_notifications + =back =head1 AUTHOR Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2007-06-18 20:31:33 UTC (rev 1092) +++ trunk/lib/OpenGuides.pm 2007-06-19 13:01:53 UTC (rev 1093) @@ -1404,7 +1404,8 @@ # Check to make sure all the indexable nodes are created # Skip this for nodes needing moderation - this occurs for them once # they've been moderated - unless($wiki->node_required_moderation($node)) { + my $needs_moderation = $wiki->node_required_moderation($node); + unless( $needs_moderation ) { $self->_autoCreateCategoryLocale( id => $node, metadata => \%new_metadata @@ -1415,6 +1416,24 @@ \%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 + ); + }; + warn $@ if $@; + } + my $output = $self->redirect_to_node($node); return $output if $return_output; print $output;

1 0

r1092 - in trunk: . lib/OpenGuides t
by svnadmin＠urchin.earth.li 18 Jun '07

18 Jun '07

Author: dom Date: 2007-06-18 21:31:33 +0100 (Mon, 18 Jun 2007) New Revision: 1092 Added: trunk/t/77_send_email.t Modified: trunk/Build.PL trunk/MANIFEST trunk/PREREQUISITES trunk/lib/OpenGuides/Utils.pm Log: Add send_email function (references #138) Modified: trunk/Build.PL =================================================================== --- trunk/Build.PL 2007-06-18 15:20:16 UTC (rev 1091) +++ trunk/Build.PL 2007-06-18 20:31:33 UTC (rev 1092) @@ -294,6 +294,7 @@ 'Geography::NationalGrid' => 0, 'HTML::Entities' => 0, 'LWP::Simple' => 0, + 'MIME::Lite' => 0, 'Parse::RecDescent' => 0, $search_module => 0, 'POSIX' => 0, Modified: trunk/MANIFEST =================================================================== --- trunk/MANIFEST 2007-06-18 15:20:16 UTC (rev 1091) +++ trunk/MANIFEST 2007-06-18 20:31:33 UTC (rev 1092) @@ -140,5 +140,6 @@ t/74_ping_plugin.t t/75_revert_user.t t/76_detect_spam.t +t/77_send_email.t t/templates/15_test.tt wiki.cgi Modified: trunk/PREREQUISITES =================================================================== --- trunk/PREREQUISITES 2007-06-18 15:20:16 UTC (rev 1091) +++ trunk/PREREQUISITES 2007-06-18 20:31:33 UTC (rev 1092) @@ -35,6 +35,7 @@ ) HTML::Entities LWP::Simple +MIME::Lite Module::Build (version 0.26 or later) Parse::RecDescent Plucene Modified: trunk/lib/OpenGuides/Utils.pm =================================================================== --- trunk/lib/OpenGuides/Utils.pm 2007-06-18 15:20:16 UTC (rev 1091) +++ trunk/lib/OpenGuides/Utils.pm 2007-06-18 20:31:33 UTC (rev 1092) @@ -9,6 +9,7 @@ use Wiki::Toolkit::Formatter::UseMod; use Wiki::Toolkit::Plugin::RSS::Reader; use URI::Escape; +use MIME::Lite; =head1 NAME @@ -392,6 +393,62 @@ }; +=item B<send_email> + + eval { OpenGuides::Utils->send_email( + config => $config, + subject => "Subject", + body => "Test body", + admin => 1, + nobcc => 1, + return_output => 1 + ) }; + + if ($@) { + print "Error mailing admin: $@\n"; + } else { + print "Mailed admin\n"; + } + +Send out email. If C<admin> is true, the email will be sent to the site +admin. If C<to> is defined, email will be sent to addresses in that +arrayref. If C<nobcc> is true, there will be no Bcc to the admin. + +C<subject> and C<body> are mandatory arguments. + +Debugging: if C<return_output> is true, the message will be returned as +a string instead of being sent by email. + +=cut + +sub send_email { + my ( $self, %args ) = @_; + my $config = $args{config} or die "config argument not supplied"; + my @to; + @to = @{$args{to}} if $args{to}; + my @bcc; + push @to, $config->contact_email if $args{admin}; + die "No recipients specified" unless scalar @to; + die "No subject specified" unless $args{subject}; + die "No body specified" unless $args{body}; + my $to_str = join ',', @to; + push @bcc, $config->contact_email unless $args{nobcc}; + my $bcc_str = join ',', @bcc; + my $msg = MIME::Lite->new( + From => $config->contact_email, + To => $to_str, + Bcc => $bcc_str, + Subject => $args{subject}, + Data => $args{body} + ); + + if ( $args{return_output} ) { + return $msg->as_string; + } else { + $msg->send or die "Couldn't send mail!"; + } +} + =back =head1 AUTHOR Added: trunk/t/77_send_email.t =================================================================== --- trunk/t/77_send_email.t (rev 0) +++ trunk/t/77_send_email.t 2007-06-18 20:31:33 UTC (rev 1092) @@ -0,0 +1,44 @@ +use strict; +use OpenGuides::Config; +use OpenGuides::Utils; +use Test::More; + +plan tests => 6; + +my $config = OpenGuides::Config->new( + vars => { + contact_email => 'admin(a)example.com' + } +); + +my $output = OpenGuides::Utils->send_email( + config => $config, + return_output => 1, + to => [ 'user(a)example.com' ], + subject => 'Test subject', + body => 'Test body' +); + +like( $output, qr|^From: admin\(a)example\.com|m, "From address shown" ); +like( $output, qr|^To: user\(a)example\.com|m, "To address shown correctly" ); +like( $output, qr|^Subject: Test subject|m, "Subject shown correctly" ); +like( $output, qr|^Test body|m, "Body text appears at the start of a line" ); + +$output = OpenGuides::Utils->send_email( + config => $config, + return_output => 1, + admin => 1, + subject => 'Test subject', + body => 'Test body' +); + +like( $output, qr|^To: admin\(a)example\.com|m, "Admin address appropriately" ); + +eval { $output = OpenGuides::Utils->send_email( + config => $config, + return_output => 1, + subject => 'Test subject', + body => 'Test body' +); }; + +like( $@, qr|No recipients specified|, "No recipients error caught" );

1 0

r1091 - in trunk: . lib/OpenGuides t
by svnadmin＠urchin.earth.li 18 Jun '07

18 Jun '07

Author: dom Date: 2007-06-18 16:20:16 +0100 (Mon, 18 Jun 2007) New Revision: 1091 Modified: trunk/lib/OpenGuides/Template.pm trunk/t/15_template.t trunk/t/58_navbar_common_locales_categories.t trunk/t/59_preferences.t trunk/wiki.cgi Log: Add noheaders option, and use that in preference to black content_type arg. (fixes #220) Modified: trunk/lib/OpenGuides/Template.pm =================================================================== --- trunk/lib/OpenGuides/Template.pm 2007-06-17 16:51:11 UTC (rev 1090) +++ trunk/lib/OpenGuides/Template.pm 2007-06-18 15:20:16 UTC (rev 1091) @@ -50,7 +50,8 @@ template => "node.tt", content_type => "text/html", cookies => $cookie, - vars => {foo => "bar"} + vars => {foo => "bar"}, + noheaders => 1 ); Returns everything you need to send to STDOUT, including the @@ -111,6 +112,9 @@ Content-Type: defaults to C<text/html> and is omitted if the C<content_type> arg is explicitly set to the blank string. +However, what you more often need is the C<noheaders> option, +which suppresses all HTTP headers, not just the Content-Type. + The HTTP response code may be explictly set with the C<http_status> arg. =cut @@ -187,31 +191,32 @@ $tt_vars = { %$tt_vars, %{ $args{vars} || {} } }; my $header = ""; - my %cgi_header_args; - if ( defined $args{content_type} and $args{content_type} eq "" ) { - $cgi_header_args{'-type'} = ''; - } else { - if ( $args{content_type} ) { - $cgi_header_args{'-type'} = $args{content_type}; + unless ( $args{noheaders} ) { + my %cgi_header_args; + + if ( defined $args{content_type} and $args{content_type} eq "" ) { + $cgi_header_args{'-type'} = ''; } else { - $cgi_header_args{'-type'} = "text/html"; + if ( $args{content_type} ) { + $cgi_header_args{'-type'} = $args{content_type}; + } else { + $cgi_header_args{'-type'} = "text/html"; + } } + if ( $tt_vars->{http_charset} ) { $cgi_header_args{'-type'} .= "; charset=".$tt_vars->{http_charset}; } - # XXX should possibly not be inside this block, but retaining - # existing functionality for now. See - # http://dev.openguides.org/ticket/220 $cgi_header_args{'-cookie'} = $args{cookies}; - } - if ( $args{http_status} ) { - $cgi_header_args{'-status'} = $args{http_status}; + if ( $args{http_status} ) { + $cgi_header_args{'-status'} = $args{http_status}; + } + + $header = CGI::header( %cgi_header_args ); } - $header = CGI::header( %cgi_header_args ); - # vile hack my %field_vars = OpenGuides::Template->extract_metadata_vars( wiki => $args{wiki}, @@ -219,7 +224,7 @@ set_coord_field_vars => 1, metadata => {}, ); - + $tt_vars = { %field_vars, %$tt_vars }; my $output; Modified: trunk/t/15_template.t =================================================================== --- trunk/t/15_template.t 2007-06-17 16:51:11 UTC (rev 1090) +++ trunk/t/15_template.t 2007-06-18 15:20:16 UTC (rev 1091) @@ -5,7 +5,7 @@ use OpenGuides; use OpenGuides::Template; use OpenGuides::Test; -use Test::More tests => 28; +use Test::More tests => 29; my $config = OpenGuides::Test->make_basic_config; $config->template_path( cwd . "/t/templates" ); @@ -52,6 +52,17 @@ "Content-Type header omitted if content_type arg explicitly blank" ); $output = OpenGuides::Template->output( + wiki => $wiki, + config => $config, + template => "15_test.tt", + noheaders => 1, + http_response => 500 +); + +unlike( $output, qr/^Status: /, + "Headers omitted if noheaders arg given" ); + +$output = OpenGuides::Template->output( wiki => $wiki, config => $config, template => "15_idonotexist.tt" Modified: trunk/t/58_navbar_common_locales_categories.t =================================================================== --- trunk/t/58_navbar_common_locales_categories.t 2007-06-17 16:51:11 UTC (rev 1090) +++ trunk/t/58_navbar_common_locales_categories.t 2007-06-18 15:20:16 UTC (rev 1091) @@ -32,7 +32,7 @@ wiki => $guide->wiki, config => $guide->config, template => "preferences.tt", - content_type => '', + noheaders => 1, vars => { not_editable => 1, show_form => 1 Modified: trunk/t/59_preferences.t =================================================================== --- trunk/t/59_preferences.t 2007-06-17 16:51:11 UTC (rev 1090) +++ trunk/t/59_preferences.t 2007-06-18 15:20:16 UTC (rev 1091) @@ -59,7 +59,7 @@ wiki => $wiki, config => $config, template => "preferences.tt", - content_type => '', + noheaders => 1, vars => { not_editable => 1, show_form => 1 Modified: trunk/wiki.cgi =================================================================== --- trunk/wiki.cgi 2007-06-17 16:51:11 UTC (rev 1090) +++ trunk/wiki.cgi 2007-06-18 15:20:16 UTC (rev 1091) @@ -302,7 +302,7 @@ template => $template, vars => $vars ); - $output_conf{content_type} = "" if $omit_header; # defaults otherwise + $output_conf{noheaders} = 1 if $omit_header; # defaults otherwise print OpenGuides::Template->output( %output_conf ); }

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

openguides-commits June 2007