openguides-commits June 2008

openguides-commits@lists.openguides.org

1 participants
17 discussions

r1179 - trunk
by svnadmin＠urchin.earth.li 30 Jun '08

30 Jun '08

Author: dom Date: 2008-06-30 18:54:14 +0100 (Mon, 30 Jun 2008) New Revision: 1179 Modified: trunk/Changes Log: added ticket number to changelog entry Modified: trunk/Changes =================================================================== --- trunk/Changes 2008-06-26 22:12:09 UTC (rev 1178) +++ trunk/Changes 2008-06-30 17:54:14 UTC (rev 1179) @@ -19,7 +19,7 @@ * Replace unnecessary instances of rdf:ID with rdf:nodeID. * Model relationship of neighborhood to parent city. * Reduce acres of whitespace in output and clean up indenting. - Added a Universal Edit Link (http://universaleditbutton.org/) + Added a Universal Edit Link (http://universaleditbutton.org/) (#254) 0.62 8 June 2008 Allow wiki page links (simple: [[Foo]], title: [[Foo|bar]]) in

1 0

r1178 - in trunk: . t templates
by svnadmin＠urchin.earth.li 26 Jun '08

26 Jun '08

Author: kake Date: 2008-06-26 23:12:09 +0100 (Thu, 26 Jun 2008) New Revision: 1178 Added: trunk/t/85_universal_edit_link.t Modified: trunk/Changes trunk/MANIFEST trunk/templates/header.tt Log: Added a Universal Edit Link + test (ta Bob). Modified: trunk/Changes =================================================================== --- trunk/Changes 2008-06-22 23:53:31 UTC (rev 1177) +++ trunk/Changes 2008-06-26 22:12:09 UTC (rev 1178) @@ -19,6 +19,7 @@ * Replace unnecessary instances of rdf:ID with rdf:nodeID. * Model relationship of neighborhood to parent city. * Reduce acres of whitespace in output and clean up indenting. + Added a Universal Edit Link (http://universaleditbutton.org/) 0.62 8 June 2008 Allow wiki page links (simple: [[Foo]], title: [[Foo|bar]]) in Modified: trunk/MANIFEST =================================================================== --- trunk/MANIFEST 2008-06-22 23:53:31 UTC (rev 1177) +++ trunk/MANIFEST 2008-06-26 22:12:09 UTC (rev 1178) @@ -144,5 +144,6 @@ t/77_send_email.t t/78_about.t t/79_host_blacklist.t +t/85_universal_edit_link.t t/templates/15_test.tt wiki.cgi Added: trunk/t/85_universal_edit_link.t =================================================================== --- trunk/t/85_universal_edit_link.t (rev 0) +++ trunk/t/85_universal_edit_link.t 2008-06-26 22:12:09 UTC (rev 1178) @@ -0,0 +1,45 @@ +use strict; +use OpenGuides; +use OpenGuides::Test; +use Test::More; +use Wiki::Toolkit::Setup::SQLite; + +eval { require DBD::SQLite; }; +if ( $@ ) { + plan skip_all => "DBD::SQLite not installed - no database to test with"; +} + +plan tests => 2; + +# An editable page should get the universal edit <link>; a non-editable one +# shouldn't. + +my ( $config, $guide, $wiki, $cookie, $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 ); +$wiki = $guide->wiki; + +# Write a node. +OpenGuides::Test->write_data( + guide => $guide, + node => "Red Lion", + return_output => 1, + ); + +# Check an editable node. +$output = $guide->display_node( + id => "Red Lion", + return_output => 1, + ); +like( $output, qr|<link rel="alternate" type="application/wiki" title="Edit this page!"|ms, "universal edit link present on editable page" ); + +# Check a non-editable node. +$output = $guide->display_recent_changes( return_output => 1 ); +unlike( $output, qr|<link rel="alternate" type="application/wiki" title="Edit this page!"|ms, "universal edit link not present on non-editable page" ); Modified: trunk/templates/header.tt =================================================================== --- trunk/templates/header.tt 2008-06-22 23:53:31 UTC (rev 1177) +++ trunk/templates/header.tt 2008-06-26 22:12:09 UTC (rev 1178) @@ -55,6 +55,10 @@ [% IF deter_robots %] <meta name="robots" content="noindex,nofollow" /> [% END %] + [% UNLESS not_editable %] + <link rel="alternate" type="application/wiki" title="Edit this page!" + href="[% source_site or full_cgi_url %]?id=[% node_param %];action=edit"> + [% END %] [% IF enable_gmaps AND display_google_maps AND gmaps_api_key %] <script src="http://maps.google.com/maps?file=api&v=2&key=[% gmaps_api_key %]" type="text/javascript"></script> [% END %]

1 0

r1177 - sites/oxford.openguides.org/lib/OpenGuides/SpamPlugin
by svnadmin＠urchin.earth.li 22 Jun '08

22 Jun '08

Author: dom Date: 2008-06-23 00:53:31 +0100 (Mon, 23 Jun 2008) New Revision: 1177 Modified: sites/oxford.openguides.org/lib/OpenGuides/SpamPlugin/Akismet.pm Log: put this in its own section so that OpenGuides::Config doesn't whinge Modified: sites/oxford.openguides.org/lib/OpenGuides/SpamPlugin/Akismet.pm =================================================================== --- sites/oxford.openguides.org/lib/OpenGuides/SpamPlugin/Akismet.pm 2008-06-22 00:10:02 UTC (rev 1176) +++ sites/oxford.openguides.org/lib/OpenGuides/SpamPlugin/Akismet.pm 2008-06-22 23:53:31 UTC (rev 1177) @@ -33,7 +33,7 @@ # shouldn't have to fish this out ourselves # hacking core OpenGuides code is for another day my $config = Config::Tiny->read('wiki.conf'); - my $api_key = $config->{_}->{'spam_detector_akismet_key'}; + my $api_key = $config->{'akismet'}->{'spam_detector_akismet_key'}; my $url = $config->{_}->{'script_url'}; my $email = $config->{_}->{'contact_email'};

1 0

r1176 - sites/oxford.openguides.org/lib/OpenGuides/SpamPlugin
by svnadmin＠urchin.earth.li 22 Jun '08

22 Jun '08

Author: dom Date: 2008-06-22 01:10:02 +0100 (Sun, 22 Jun 2008) New Revision: 1176 Modified: sites/oxford.openguides.org/lib/OpenGuides/SpamPlugin/Akismet.pm Log: no reason here Modified: sites/oxford.openguides.org/lib/OpenGuides/SpamPlugin/Akismet.pm =================================================================== --- sites/oxford.openguides.org/lib/OpenGuides/SpamPlugin/Akismet.pm 2008-06-22 00:07:34 UTC (rev 1175) +++ sites/oxford.openguides.org/lib/OpenGuides/SpamPlugin/Akismet.pm 2008-06-22 00:10:02 UTC (rev 1176) @@ -15,7 +15,6 @@ sub notify_admins { my ( $class, %args ) = @_; - my $reason = delete $args{reason}; my $message = MIME::Lite->new( From => $args{email}, To => $args{email},

1 0

r1175 - sites/oxford.openguides.org/lib/OpenGuides/SpamPlugin
by svnadmin＠urchin.earth.li 22 Jun '08

22 Jun '08

Author: dom Date: 2008-06-22 01:07:34 +0100 (Sun, 22 Jun 2008) New Revision: 1175 Modified: sites/oxford.openguides.org/lib/OpenGuides/SpamPlugin/Akismet.pm Log: fix last bit of hardcoding Modified: sites/oxford.openguides.org/lib/OpenGuides/SpamPlugin/Akismet.pm =================================================================== --- sites/oxford.openguides.org/lib/OpenGuides/SpamPlugin/Akismet.pm 2008-06-22 00:05:51 UTC (rev 1174) +++ sites/oxford.openguides.org/lib/OpenGuides/SpamPlugin/Akismet.pm 2008-06-22 00:07:34 UTC (rev 1175) @@ -20,7 +20,7 @@ From => $args{email}, To => $args{email}, Subject => "Attempted spam edit on " . $args{'url'}, - Data => "Someone just tried to edit oxford.openguides.org, and " + Data => "Someone just tried to edit " . $args{'url'} . ", and " . "Akismet said no.\n\n" . "Here's a dump of the details:\n" . Dumper( \%args ),

1 0

r1174 - in sites/oxford.openguides.org: . lib lib/OpenGuides lib/OpenGuides/SpamPlugin
by svnadmin＠urchin.earth.li 22 Jun '08

22 Jun '08

Author: dom Date: 2008-06-22 01:05:51 +0100 (Sun, 22 Jun 2008) New Revision: 1174 Added: sites/oxford.openguides.org/lib/ sites/oxford.openguides.org/lib/OpenGuides/ sites/oxford.openguides.org/lib/OpenGuides/SpamPlugin/ sites/oxford.openguides.org/lib/OpenGuides/SpamPlugin/Akismet.pm Log: local akismet spam detector Added: sites/oxford.openguides.org/lib/OpenGuides/SpamPlugin/Akismet.pm =================================================================== --- sites/oxford.openguides.org/lib/OpenGuides/SpamPlugin/Akismet.pm (rev 0) +++ sites/oxford.openguides.org/lib/OpenGuides/SpamPlugin/Akismet.pm 2008-06-22 00:05:51 UTC (rev 1174) @@ -0,0 +1,62 @@ +# $HeadURL$ +# $LastChangedRevision$ +# $LastChangedDate$ +# $LastChangedBy$ + +package OpenGuides::SpamPlugin::Akismet; + +use strict; +use warnings; + +use Net::Akismet; +use Data::Dumper; +use Config::Tiny; +use MIME::Lite; + +sub notify_admins { + my ( $class, %args ) = @_; + my $reason = delete $args{reason}; + my $message = MIME::Lite->new( + From => $args{email}, + To => $args{email}, + Subject => "Attempted spam edit on " . $args{'url'}, + Data => "Someone just tried to edit oxford.openguides.org, and " + . "Akismet said no.\n\n" + . "Here's a dump of the details:\n" + . Dumper( \%args ), + ); + $message->send; +} + +sub looks_like_spam { + my ( $class, %args ) = @_; + # http://dev.openguides.org/ticket/253 + # shouldn't have to fish this out ourselves + # hacking core OpenGuides code is for another day + my $config = Config::Tiny->read('wiki.conf'); + my $api_key = $config->{_}->{'spam_detector_akismet_key'}; + my $url = $config->{_}->{'script_url'}; + my $email = $config->{_}->{'contact_email'}; + + my $akismet = Net::Akismet->new( + KEY => $api_key, + URL => $url, + ) + or die "Could not verify API key\n"; + my %check_data = ( + USER_IP => $ENV{'REMOTE_ADDR'}, + COMMENT_USER_AGENT => $ENV{'HTTP_USER_AGENT'}, + COMMENT_CONTENT => $args{content}, + COMMENT_AUTHOR => $args{metadata}->{username}, + ); + my $result = $akismet->check( %check_data ); + + if ( $result eq 'true' ) { + $class->notify_admins( %args, url => $url, email => $email ); + return 1; + } else { + return 0; + } +} + +1; Property changes on: sites/oxford.openguides.org/lib/OpenGuides/SpamPlugin/Akismet.pm ___________________________________________________________________ Name: svn:keywords + HeadURL LastChangedRevision LastChangedDate LastChangedBy

1 0

r1173 - branches/new-install-process
by svnadmin＠urchin.earth.li 21 Jun '08

21 Jun '08

Author: kake Date: 2008-06-21 19:48:15 +0100 (Sat, 21 Jun 2008) New Revision: 1173 Modified: branches/new-install-process/TROUBLESHOOTING Log: Documented use of wiki-toolkit-setupdb for people who need to rerun the table creation process. Modified: branches/new-install-process/TROUBLESHOOTING =================================================================== --- branches/new-install-process/TROUBLESHOOTING 2008-06-21 17:24:00 UTC (rev 1172) +++ branches/new-install-process/TROUBLESHOOTING 2008-06-21 18:48:15 UTC (rev 1173) @@ -36,3 +36,9 @@ do failed...". ---------------------------------------------------------------------- + +If you need to rerun the table creation process for any reason, use +wiki-toolkit-setupdb, which should have been installed when you installed +the Wiki::Toolkit modules. + +----------------------------------------------------------------------

1 0

r1172 - in branches/new-install-process: bin lib/OpenGuides
by svnadmin＠urchin.earth.li 21 Jun '08

21 Jun '08

Author: kake Date: 2008-06-21 18:24:00 +0100 (Sat, 21 Jun 2008) New Revision: 1172 Modified: branches/new-install-process/bin/openguides-install branches/new-install-process/lib/OpenGuides/Config.pm Log: Standardise slash vs. no slash on ends of directory names in install process (cosmetic change only). Modified: branches/new-install-process/bin/openguides-install =================================================================== --- branches/new-install-process/bin/openguides-install 2008-06-21 17:15:43 UTC (rev 1171) +++ branches/new-install-process/bin/openguides-install 2008-06-21 17:24:00 UTC (rev 1172) @@ -231,12 +231,12 @@ if ( $var eq "template_path" && !defined $existing_config->$var ) { $def = $install_directory; $def .= "/" unless $def =~ m|/$|; - $def .= "templates"; + $def .= "templates/"; } if ( $var eq "custom_template_path" && !defined $existing_config->$var ) { $def = $install_directory; $def .= "/" unless $def =~ m|/$|; - $def .= "custom-templates"; + $def .= "custom-templates/"; } # If a Google Maps URL was provided last time we know the centre_lat Modified: branches/new-install-process/lib/OpenGuides/Config.pm =================================================================== --- branches/new-install-process/lib/OpenGuides/Config.pm 2008-06-21 17:15:43 UTC (rev 1171) +++ branches/new-install-process/lib/OpenGuides/Config.pm 2008-06-21 17:24:00 UTC (rev 1172) @@ -113,7 +113,7 @@ licence_info_url => "", spam_detector_module => "", host_checker_module => "", - static_path => "/usr/local/share/openguides/static", + static_path => "/usr/local/share/openguides/static/", send_moderation_notifications => 1 );

1 0

r1171 - in branches/new-install-process: . bin
by svnadmin＠urchin.earth.li 21 Jun '08

21 Jun '08

Author: kake Date: 2008-06-21 18:15:43 +0100 (Sat, 21 Jun 2008) New Revision: 1171 Modified: branches/new-install-process/SETUP branches/new-install-process/bin/openguides-install Log: Make it clear in SETUP that the script_url needs an http Modified: branches/new-install-process/SETUP =================================================================== --- branches/new-install-process/SETUP 2008-06-21 17:13:23 UTC (rev 1170) +++ branches/new-install-process/SETUP 2008-06-21 17:15:43 UTC (rev 1171) @@ -173,7 +173,8 @@ "What URL does the install directory map to?" Give the full address needed to access the installation directory with -a web browser - for example http://london.openguides.org/ +a web browser, including the "http://" prefix - for example, +http://london.openguides.org/ "Do you want me to munge a custom lib path into the scripts?" Modified: branches/new-install-process/bin/openguides-install =================================================================== --- branches/new-install-process/bin/openguides-install 2008-06-21 17:13:23 UTC (rev 1170) +++ branches/new-install-process/bin/openguides-install 2008-06-21 17:15:43 UTC (rev 1171) @@ -78,9 +78,6 @@ $targets{"$label.cgi"} = find_script( "openguides-$label-script" ); } -# The database setup script. -my $setup = find_script( "wiki-toolkit-setupdb" ); - my $force; GetOptions('force' => \$force); unless ($force) { @@ -116,6 +113,9 @@ content_above_navbar_in_html show_gmap_in_node_display force_wgs84 send_moderation_notifications); +my %blank_ok = map { $_ => 1 } + qw( dbpass dbhost ); + my $skip_config = $force ? 'y' : prompt( "y", "Skip OpenGuides configuration?", "y or n", "n" ); @@ -166,7 +166,8 @@ sqlite => "DBD::SQLite", ); eval "require $drivers{$dbtype}"; -warn "$drivers{$dbtype} is needed to run a $dbtype database" if $@; +die "\nSorry; $drivers{$dbtype} is needed to run a $dbtype database - please " + . "install this\nmodule and try again.\n\n" if $@; push @answers, { question => $dbtype_qu, variable => "dbtype", @@ -205,13 +206,12 @@ ) ) { my $q_method = $var . "__qu"; my $qu = $existing_config->$q_method; - my $type = $yn_vars{$var} ? "y_n" : ""; my $def = $existing_config->$var || ""; my $val = $def; # Override dbname question for SQLite only. if ( $dbtype eq "sqlite" and $var eq "dbname" ) { - $qu = "what's the full filename of the SQLite database this site runs on?"; + $qu = "What's the full filename of the SQLite database this site runs on?"; } if ( $dbtype eq "sqlite" and @@ -322,12 +322,17 @@ # Here is where we actually ask the questions. unless ( $skip_config ) { - if ( $type eq "y_n" ) { +print $var . "\n"; + if ( $yn_vars{$var} ) { # may be stored as true/false integer value if ( $def =~ /^\d+$/ ) { $def = $def ? "y" : "n"; } $val = prompt( "y", $qu, "y or n", $def ); + } elsif ( $blank_ok{$var} ) { +print "boo!\n"; + $val = prompt( "s", $qu, "optional", $def, + sub { print "hello!\n"; return 1; } ); } else { $val = prompt( "x", $qu, "", $def ); }

1 0

r1170 - branches/new-install-process
by svnadmin＠urchin.earth.li 21 Jun '08

21 Jun '08

Author: kake Date: 2008-06-21 18:13:23 +0100 (Sat, 21 Jun 2008) New Revision: 1170 Modified: branches/new-install-process/Build.PL branches/new-install-process/PREREQUISITES Log: Added missing prereq of Term::Prompt; removed some hardcoding. Modified: branches/new-install-process/Build.PL =================================================================== --- branches/new-install-process/Build.PL 2008-06-21 16:55:10 UTC (rev 1169) +++ branches/new-install-process/Build.PL 2008-06-21 17:13:23 UTC (rev 1170) @@ -22,19 +22,24 @@ mkdir( File::Spec->catfile( $path, "OpenGuides" ) ); die "Can't make template install folder: $!\n" unless (-d File::Spec->catfile( $path, "OpenGuides" ) ); - mkdir( File::Spec->catfile( $path, "OpenGuides", "templates" ) ); - die "Can't make template install folder: $!\n" unless (-d File::Spec->catfile( $path, "OpenGuides", "templates" ) ); + my $templ_dir = File::Spec->catfile( $path, "OpenGuides", "templates" ); - print "Installing templates to $path/OpenGuides/templates\n"; - opendir TEMPLATES, "templates" or die "Can't open template source folder: $!\n"; + mkdir( $templ_dir ); + die "Can't make template install folder: $!\n" unless (-d $templ_dir ); + + print "Installing templates to $templ_dir\n"; + opendir TEMPLATES, "templates" + or die "Can't open template source folder: $!\n"; + for (grep { /\.(tt)$/ } readdir(TEMPLATES)) { - print " installing template $_\n"; + #print " installing template $_\n"; File::Copy::copy( - File::Spec->catfile('templates', $_), - File::Spec->catfile( $path, "OpenGuides", "templates", $_ ) + File::Spec->catfile( "templates", $_ ), + File::Spec->catfile( $templ_dir, $_ ) ) or die "Error copying $_: $!\n";; } closedir(TEMPLATES); + print "Done!\n"; return $ret; } @@ -78,6 +83,7 @@ 'Parse::RecDescent' => 0, 'POSIX' => 0, 'Template' => '2.15', # for hash.delete and string.remove vmethods + 'Term::Prompt' => 0, 'Time::Piece' => 0, 'URI::Escape' => 0, 'XML::RSS' => 0, Modified: branches/new-install-process/PREREQUISITES =================================================================== --- branches/new-install-process/PREREQUISITES 2008-06-21 16:55:10 UTC (rev 1169) +++ branches/new-install-process/PREREQUISITES 2008-06-21 17:13:23 UTC (rev 1170) @@ -41,6 +41,7 @@ Plucene POSIX Template +Term::Prompt Time::Piece URI::Escape XML::RSS

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 2008