web commit from 193.205.5.2: poll vote (It's fast enough)

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

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index ac8890795fb8eadf435ff9508682feaacfa8227e..4aa545a93a67c6aa759a4aa67d7aa2ff65e6c66a 100644 (file)
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -24,6 +24,7 @@ sub filter (@) { #{{{
        my %params=@_;
        
        $meta{$params{page}}='';
        my %params=@_;
        
        $meta{$params{page}}='';

+       delete $pagestate{$params{page}}{meta}{redir};

 
        return $params{content};
 } # }}}
 
        return $params{content};
 } # }}}


@@ -70,14 +71,29 @@ sub preprocess (@) { #{{{
                }
        }
        elsif ($key eq 'redir') {
                }
        }
        elsif ($key eq 'redir') {

+               return "" if $destpage ne $page;

                my $safe=0;
                if ($value !~ /^\w+:\/\//) {
                my $safe=0;
                if ($value !~ /^\w+:\/\//) {

+                       add_depends($page, $value);

                        my $link=bestlink($page, $value);
                        if (! length $link) {
                                return "[[meta ".gettext("redir page not found")."]]";
                        }
                        my $link=bestlink($page, $value);
                        if (! length $link) {
                                return "[[meta ".gettext("redir page not found")."]]";
                        }

-                       $value=urlto($link, $destpage);
+
+                       $value=urlto($link, $page);

                        $safe=1;
                        $safe=1;

+
+                       # redir cycle detection
+                       $pagestate{$page}{meta}{redir}=$link;
+                       my $at=$page;
+                       my %seen;
+                       while (exists $pagestate{$at}{meta}{redir}) {
+                               if ($seen{$at}) {
+                                       return "[[meta ".gettext("redir cycle is not allowed")."]]";
+                               }
+                               $seen{$at}=1;
+                               $at=$pagestate{$at}{meta}{redir};
+                       }

                }
                else {
                        $value=encode_entities($value);
                }
                else {
                        $value=encode_entities($value);