openguides-commits

openguides-commits@lists.openguides.org

873 discussions

r665 - trunk
by svnadmin＠urchin.earth.li 23 Jul '05

23 Jul '05

Author: earle Date: 2005-07-23 02:56:20 +0100 (Sat, 23 Jul 2005) New Revision: 665 Modified: trunk/Build.PL trunk/PREREQUISITES Log: update prereqs for CGI::Wiki::Plugin::RSS::ModWiki Modified: trunk/Build.PL =================================================================== --- trunk/Build.PL 2005-07-23 01:54:27 UTC (rev 664) +++ trunk/Build.PL 2005-07-23 01:56:20 UTC (rev 665) @@ -222,7 +222,7 @@ 'CGI::Wiki::Plugin::Categoriser' => 0, 'CGI::Wiki::Plugin::Diff' => '0.07', # earlier buggy 'CGI::Wiki::Plugin::Locator::Grid'=> '0.02', # cope with sqlite 3 - 'CGI::Wiki::Plugin::RSS::ModWiki' => '0.071', # provides RSS timestamp + 'CGI::Wiki::Plugin::RSS::ModWiki' => '0.072', # provides RSS timestamp 'CGI::Wiki::Plugin::RSS::Reader' => '1.3', # earlier versions don't support RSS 2.0 'Class::Accessor' => 0, 'Config::Tiny' => 0, Modified: trunk/PREREQUISITES =================================================================== --- trunk/PREREQUISITES 2005-07-23 01:54:27 UTC (rev 664) +++ trunk/PREREQUISITES 2005-07-23 01:56:20 UTC (rev 665) @@ -10,7 +10,7 @@ CGI::Wiki::Plugin::Categoriser CGI::Wiki::Plugin::Diff (version 0.07 or later) CGI::Wiki::Plugin::Locator::Grid (version 0.02 or later) -CGI::Wiki::Plugin::RSS::ModWiki (version 0.06 or later) +CGI::Wiki::Plugin::RSS::ModWiki (version 0.072 or later) CGI::Wiki::Plugin::RSS::Reader (version 1.3 or later) Class::Accessor Config::Tiny

1 0

r664 - trunk
by svnadmin＠urchin.earth.li 23 Jul '05

23 Jul '05

Author: earle Date: 2005-07-23 02:54:27 +0100 (Sat, 23 Jul 2005) New Revision: 664 Modified: trunk/Changes Log: very minor style change Modified: trunk/Changes =================================================================== --- trunk/Changes 2005-07-22 16:39:20 UTC (rev 663) +++ trunk/Changes 2005-07-23 01:54:27 UTC (rev 664) @@ -25,9 +25,9 @@ Replace <label> tags in display_metadata.tt with <span class="metadata_label">. Wanted pages listing now displays, and sorts by, the number of nodes - pointing to each node. + pointing to each node. Prevent redirect loops. - Add _ to the list of forbidden characters in node names + Add _ to the list of forbidden characters in node names. 0.47 15 January 2005 Fixed bug with list_all_versions for nodes with only one version.

1 0

r663 - trunk/t
by svnadmin＠urchin.earth.li 22 Jul '05

22 Jul '05

Author: dom Date: 2005-07-22 17:39:20 +0100 (Fri, 22 Jul 2005) New Revision: 663 Modified: trunk/t/54_redirect.t Log: test fix Modified: trunk/t/54_redirect.t =================================================================== --- trunk/t/54_redirect.t 2005-07-22 16:22:33 UTC (rev 662) +++ trunk/t/54_redirect.t 2005-07-22 16:39:20 UTC (rev 663) @@ -45,6 +45,6 @@ # Old versions of CGI.pm mistakenly print location: instead of Location: like( $output, - qr/[lL]ocation: http:\/\/example.com\/wiki.cgi\?id=Test_Page_2\&oldid=Test_Page/, + qr/[lL]ocation: http:\/\/example.com\/wiki.cgi\?id=Test_Page_2\;oldid=Test_Page/, "...and redirects to the right place" ); }

1 0

r662 - trunk/lib/OpenGuides
by svnadmin＠urchin.earth.li 22 Jul '05

22 Jul '05

Author: dom Date: 2005-07-22 17:22:33 +0100 (Fri, 22 Jul 2005) New Revision: 662 Modified: trunk/lib/OpenGuides/Config.pm Log: Non-existent config files aren't always an error. Modified: trunk/lib/OpenGuides/Config.pm =================================================================== --- trunk/lib/OpenGuides/Config.pm 2005-07-22 16:17:35 UTC (rev 661) +++ trunk/lib/OpenGuides/Config.pm 2005-07-22 16:22:33 UTC (rev 662) @@ -83,7 +83,7 @@ my %stored; if ( $args{file} ) { my $read_config = Config::Tiny->read( $args{file} ) or - die "Cannot read config file $args{file}"; + warn "Cannot read config file $args{file}"; %stored = $read_config ? %{ $read_config->{_} } : (); } elsif ( $args{vars} ) { %stored = %{ $args{vars} };

1 0

r661 - in trunk: . lib
by svnadmin＠urchin.earth.li 22 Jul '05

22 Jul '05

Author: dom Date: 2005-07-22 17:17:35 +0100 (Fri, 22 Jul 2005) New Revision: 661 Modified: trunk/Changes trunk/PREREQUISITES trunk/lib/OpenGuides.pm trunk/wiki.cgi Log: Prepare for 0.48 release. Modified: trunk/Changes =================================================================== --- trunk/Changes 2005-07-22 16:15:35 UTC (rev 660) +++ trunk/Changes 2005-07-22 16:17:35 UTC (rev 661) @@ -1,4 +1,4 @@ -0.48 +0.48 22 July 2005 RDF enhancements: Removed redundant "id" parameter specification from dc:source in rdf:Description in RDF node listings. Modified: trunk/PREREQUISITES =================================================================== --- trunk/PREREQUISITES 2005-07-22 16:15:35 UTC (rev 660) +++ trunk/PREREQUISITES 2005-07-22 16:17:35 UTC (rev 661) @@ -1,4 +1,4 @@ -Modules required by OpenGuides 0.47 +Modules required by OpenGuides 0.48 =================================== Algorithm::Diff (version 0.13 or later) Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2005-07-22 16:15:35 UTC (rev 660) +++ trunk/lib/OpenGuides.pm 2005-07-22 16:17:35 UTC (rev 661) @@ -13,7 +13,7 @@ use vars qw( $VERSION ); -$VERSION = '0.47'; +$VERSION = '0.48'; =head1 NAME Modified: trunk/wiki.cgi =================================================================== --- trunk/wiki.cgi 2005-07-22 16:15:35 UTC (rev 660) +++ trunk/wiki.cgi 2005-07-22 16:17:35 UTC (rev 661) @@ -4,7 +4,7 @@ use warnings; use vars qw( $VERSION ); -$VERSION = '0.47'; +$VERSION = '0.48'; use CGI qw/:standard/; use CGI::Carp qw(croak);

1 0

r660 - trunk
by svnadmin＠urchin.earth.li 22 Jul '05

22 Jul '05

Author: dom Date: 2005-07-22 17:15:35 +0100 (Fri, 22 Jul 2005) New Revision: 660 Modified: trunk/Changes Log: Update for changes. Modified: trunk/Changes =================================================================== --- trunk/Changes 2005-07-22 00:37:33 UTC (rev 659) +++ trunk/Changes 2005-07-22 16:15:35 UTC (rev 660) @@ -27,6 +27,7 @@ Wanted pages listing now displays, and sorts by, the number of nodes pointing to each node. Prevent redirect loops. + Add _ to the list of forbidden characters in node names 0.47 15 January 2005 Fixed bug with list_all_versions for nodes with only one version.

1 0

r659 - trunk/lib
by svnadmin＠urchin.earth.li 22 Jul '05

22 Jul '05

Author: earle Date: 2005-07-22 01:37:33 +0100 (Fri, 22 Jul 2005) New Revision: 659 Modified: trunk/lib/OpenGuides.pm Log: fix bug introducing unneeded 'id=' into URLs when saving pages Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2005-07-21 15:20:13 UTC (rev 658) +++ trunk/lib/OpenGuides.pm 2005-07-22 00:37:33 UTC (rev 659) @@ -865,10 +865,12 @@ my $oldid; $oldid = $formatter->node_name_to_node_param( $redirected_from ) if $redirected_from; - my $redir_param =''; - $redir_param = ";oldid=$oldid" if $oldid; - - return CGI->redirect( "$script_url$script_name?id=$id$redir_param" ); + my $redir_param = "$script_url$script_name?"; + $redir_param .= 'id=' if $oldid; + $redir_param .= $id; + $redir_param .= ";oldid=$oldid" if $oldid; + + return CGI->redirect( $redir_param ); } sub get_cookie {

1 0

r658 - trunk
by svnadmin＠urchin.earth.li 21 Jul '05

21 Jul '05

Author: earle Date: 2005-07-21 16:20:13 +0100 (Thu, 21 Jul 2005) New Revision: 658 Modified: trunk/newpage.cgi Log: add underscore to bad characters list Modified: trunk/newpage.cgi =================================================================== --- trunk/newpage.cgi 2005-07-21 15:11:35 UTC (rev 657) +++ trunk/newpage.cgi 2005-07-21 15:20:13 UTC (rev 658) @@ -9,7 +9,7 @@ use OpenGuides::Utils; use URI::Escape; -my @badchars = qw( & ? ); +my @badchars = qw( & ? _ ); push @badchars, '#'; # Avoid warning about possible comments in qw() my $q = CGI->new;

1 0

r657 - trunk/lib
by svnadmin＠urchin.earth.li 21 Jul '05

21 Jul '05

Author: earle Date: 2005-07-21 16:11:35 +0100 (Thu, 21 Jul 2005) New Revision: 657 Modified: trunk/lib/OpenGuides.pm Log: fix redirect checking in a less stupid way Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2005-07-21 14:58:27 UTC (rev 656) +++ trunk/lib/OpenGuides.pm 2005-07-21 15:11:35 UTC (rev 657) @@ -173,16 +173,12 @@ # Avoid loops by not generating redirects to the same node or the # previous node. - if ( $wiki->node_exists($redirect) ) { - unless ($redirect eq $id) { - unless ($redirect eq $oldid) { + if ( $wiki->node_exists($redirect) && $redirect ne $id && $redirect ne $oldid ) { my $output = $self->redirect_to_node($redirect, $id); return $output if $return_output; print $output; exit 0; - } } - } } my $content = $wiki->format($raw); my $modified = $node_data{last_modified};

1 0

r656 - trunk/lib
by svnadmin＠urchin.earth.li 21 Jul '05

21 Jul '05

Author: earle Date: 2005-07-21 15:58:27 +0100 (Thu, 21 Jul 2005) New Revision: 656 Modified: trunk/lib/OpenGuides.pm Log: fix redirect checking Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2005-06-15 13:55:29 UTC (rev 655) +++ trunk/lib/OpenGuides.pm 2005-07-21 14:58:27 UTC (rev 656) @@ -173,13 +173,17 @@ # Avoid loops by not generating redirects to the same node or the # previous node. - if ( $wiki->node_exists($redirect) && $redirect != $id && $redirect != $oldid ) { + if ( $wiki->node_exists($redirect) ) { + unless ($redirect eq $id) { + unless ($redirect eq $oldid) { my $output = $self->redirect_to_node($redirect, $id); return $output if $return_output; print $output; exit 0; + } + } + } } - } my $content = $wiki->format($raw); my $modified = $node_data{last_modified}; my %metadata = %{$node_data{metadata}}; @@ -855,7 +859,7 @@ } sub redirect_to_node { - my ($self, $node, $redirect) = @_; + my ($self, $node, $redirected_from) = @_; my $script_url = $self->config->script_url; my $script_name = $self->config->script_name; @@ -863,10 +867,10 @@ my $id = $formatter->node_name_to_node_param( $node ); my $oldid; - $oldid = $formatter->node_name_to_node_param( $redirect ) if $redirect; + $oldid = $formatter->node_name_to_node_param( $redirected_from ) if $redirected_from; my $redir_param =''; - $redir_param = "&oldid=$oldid" if $oldid; + $redir_param = ";oldid=$oldid" if $oldid; return CGI->redirect( "$script_url$script_name?id=$id$redir_param" ); }

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

openguides-commits