rename: pass the CGI and session to the rename hook

[git.ikiwiki.info.git] / IkiWiki / Plugin / link.pm

diff --git a/IkiWiki/Plugin/link.pm b/IkiWiki/Plugin/link.pm
index 529610710064e0a99c5ae29239f9a713534762fa..48691d97363881d2a70e210364e8fd76abb2eede 100644 (file)
--- a/IkiWiki/Plugin/link.pm
+++ b/IkiWiki/Plugin/link.pm
@@ -3,18 +3,27 @@ package IkiWiki::Plugin::link;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki 2.00;
+use IkiWiki 3.00;

 
 my $link_regexp;
 
 
 my $link_regexp;
 

-sub import { #{{{
+sub import {
+       hook(type => "getsetup", id => "link", call => \&getsetup);

        hook(type => "checkconfig", id => "link", call => \&checkconfig);
        hook(type => "linkify", id => "link", call => \&linkify);
        hook(type => "scan", id => "link", call => \&scan);
        hook(type => "checkconfig", id => "link", call => \&checkconfig);
        hook(type => "linkify", id => "link", call => \&linkify);
        hook(type => "scan", id => "link", call => \&scan);

-       hook(type => "renamepage", id => "link", call => \&renamepage);
-} # }}}
+       hook(type => "renamelink", id => "link", call => \&renamelink);
+}

 
 

-sub checkconfig () { #{{{
+sub getsetup () {
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => 1,
+               },
+}
+
+sub checkconfig () {

        if ($config{prefix_directives}) {
                $link_regexp = qr{
                        \[\[(?=[^!])            # beginning of link
        if ($config{prefix_directives}) {
                $link_regexp = qr{
                        \[\[(?=[^!])            # beginning of link


@@ -49,9 +58,9 @@ sub checkconfig () { #{{{
                        \]\]                    # end of link
                }x,
        }
                        \]\]                    # end of link
                }x,
        }

-} #}}}
+}

 
 

-sub linkify (@) { #{{{
+sub linkify (@) {

        my %params=@_;
        my $page=$params{page};
        my $destpage=$params{destpage};
        my %params=@_;
        my $page=$params{page};
        my $destpage=$params{destpage};


@@ -60,28 +69,28 @@ sub linkify (@) { #{{{
                defined $2
                        ? ( $1 
                                ? "[[$2|$3".($4 ? "#$4" : "")."]]" 
                defined $2
                        ? ( $1 
                                ? "[[$2|$3".($4 ? "#$4" : "")."]]" 

-                               : htmllink($page, $destpage, IkiWiki::linkpage($3),
-                                       anchor => $4, linktext => IkiWiki::pagetitle($2)))
+                               : htmllink($page, $destpage, linkpage($3),
+                                       anchor => $4, linktext => pagetitle($2)))

                        : ( $1 
                                ? "[[$3".($4 ? "#$4" : "")."]]"
                        : ( $1 
                                ? "[[$3".($4 ? "#$4" : "")."]]"

-                               : htmllink($page, $destpage, IkiWiki::linkpage($3),
+                               : htmllink($page, $destpage, linkpage($3),

                                        anchor => $4))
        }eg;
        
        return $params{content};
                                        anchor => $4))
        }eg;
        
        return $params{content};

-} #}}}
+}

 
 

-sub scan (@) { #{{{
+sub scan (@) {

        my %params=@_;
        my $page=$params{page};
        my $content=$params{content};
 
        while ($content =~ /(?<!\\)$link_regexp/g) {
        my %params=@_;
        my $page=$params{page};
        my $content=$params{content};
 
        while ($content =~ /(?<!\\)$link_regexp/g) {

-               push @{$links{$page}}, IkiWiki::linkpage($2);
+               push @{$links{$page}}, linkpage($2);

        }
        }

-} # }}}
+}

 
 

-sub renamepage (@) { #{{{
+sub renamelink (@) {

        my %params=@_;
        my $page=$params{page};
        my $old=$params{oldpage};
        my %params=@_;
        my $page=$params{page};
        my $old=$params{oldpage};


@@ -90,8 +99,9 @@ sub renamepage (@) { #{{{
        $params{content} =~ s{(?<!\\)$link_regexp}{
                my $linktext=$2;
                my $link=$linktext;
        $params{content} =~ s{(?<!\\)$link_regexp}{
                my $linktext=$2;
                my $link=$linktext;

-               if (bestlink($page, $2) eq $old) {
-                       $link=IkiWiki::pagetitle($new, 1);
+               if (bestlink($page, linkpage($linktext)) eq $old) {
+                       $link=pagetitle($new, 1);
+                       $link=~s/ /_/g;

                        if ($linktext =~ m/.*\/*?[A-Z]/) {
                                # preserve leading cap of last component
                                my @bits=split("/", $link);
                        if ($linktext =~ m/.*\/*?[A-Z]/) {
                                # preserve leading cap of last component
                                my @bits=split("/", $link);


@@ -108,6 +118,6 @@ sub renamepage (@) { #{{{
        }eg;
 
        return $params{content};
        }eg;
 
        return $params{content};

-} #}}}
+}

 
 1
 
 1