Use local paths for redirection where possible

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index f2a32a9581077553d5b542fde40f428c15a5e41a..ed6959f89d7202ac0ea408ed838b0578c2b148ed 100644 (file)
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -231,11 +231,11 @@ sub cgi_prefs ($$) {
        
        if ($form->submitted eq 'Logout') {
                $session->delete();
        
        if ($form->submitted eq 'Logout') {
                $session->delete();

-               redirect($q, $config{url});
+               redirect($q, baseurl(undef));

                return;
        }
        elsif ($form->submitted eq 'Cancel') {
                return;
        }
        elsif ($form->submitted eq 'Cancel') {

-               redirect($q, $config{url});
+               redirect($q, baseurl(undef));

                return;
        }
        elsif ($form->submitted eq 'Save Preferences' && $form->validate) {
                return;
        }
        elsif ($form->submitted eq 'Save Preferences' && $form->validate) {

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index a39dab36cdb81e6c06049d9c0bc312a6e58b1dd2..eefd6574137accdac2a12452dfcb9569b0ce826d 100644 (file)
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -386,7 +386,7 @@ sub editcomment ($$) {
        if ($form->submitted eq CANCEL) {
                # bounce back to the page they wanted to comment on, and exit.
                # CANCEL need not be considered in future
        if ($form->submitted eq CANCEL) {
                # bounce back to the page they wanted to comment on, and exit.
                # CANCEL need not be considered in future

-               IkiWiki::redirect($cgi, urlto($page, undef, 1));
+               IkiWiki::redirect($cgi, urlto($page, undef));

                exit;
        }
 
                exit;
        }
 


@@ -552,7 +552,7 @@ sub editcomment ($$) {
                # Jump to the new comment on the page.
                # The trailing question mark tries to avoid broken
                # caches and get the most recent version of the page.
                # Jump to the new comment on the page.
                # The trailing question mark tries to avoid broken
                # caches and get the most recent version of the page.

-               IkiWiki::redirect($cgi, urlto($page, undef, 1).
+               IkiWiki::redirect($cgi, urlto($page, undef).

                        "?updated#".page_to_id($location));
 
        }
                        "?updated#".page_to_id($location));
 
        }

diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index 1a04a72b5568f2980d8a7e00d0eaaa06a62e0e0d..8915211d48279ea33f36eeb4739ed1bec99a641d 100644 (file)
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -156,13 +156,13 @@ sub cgi_editpage ($$) {
        my $previewing=0;
        if ($form->submitted eq "Cancel") {
                if ($form->field("do") eq "create" && defined $from) {
        my $previewing=0;
        if ($form->submitted eq "Cancel") {
                if ($form->field("do") eq "create" && defined $from) {

-                       redirect($q, urlto($from, undef, 1));
+                       redirect($q, urlto($from, undef));

                }
                elsif ($form->field("do") eq "create") {
                }
                elsif ($form->field("do") eq "create") {

-                       redirect($q, $config{url});
+                       redirect($q, baseurl(undef));

                }
                else {
                }
                else {

-                       redirect($q, urlto($page, undef, 1));
+                       redirect($q, urlto($page, undef));

                }
                exit;
        }
                }
                exit;
        }


@@ -262,7 +262,7 @@ sub cgi_editpage ($$) {
                                        @page_locs=$page;
                                }
                                else {
                                        @page_locs=$page;
                                }
                                else {

-                                       redirect($q, urlto($page, undef, 1));
+                                       redirect($q, urlto($page, undef));

                                        exit;
                                }
                        }
                                        exit;
                                }
                        }


@@ -434,7 +434,7 @@ sub cgi_editpage ($$) {
                else {
                        # The trailing question mark tries to avoid broken
                        # caches and get the most recent version of the page.
                else {
                        # The trailing question mark tries to avoid broken
                        # caches and get the most recent version of the page.

-                       redirect($q, urlto($page, undef, 1)."?updated");
+                       redirect($q, urlto($page, undef)."?updated");

                }
        }
 
                }
        }
 

diff --git a/IkiWiki/Plugin/goto.pm b/IkiWiki/Plugin/goto.pm
index 348a663efdd936d5004e0735ad41e4c393568c3e..7f31fa5ca87b4fd5f26a609ee7c909bb4d741701 100644 (file)
--- a/IkiWiki/Plugin/goto.pm
+++ b/IkiWiki/Plugin/goto.pm
@@ -64,7 +64,7 @@ sub cgi_goto ($;$) {
                )
        }
        else {
                )
        }
        else {

-               IkiWiki::redirect($q, urlto($link, undef, 1));
+               IkiWiki::redirect($q, urlto($link, undef));

        }
 
        exit;
        }
 
        exit;

diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index fae9fb77f8388a9e750b1d8e7dfdcee700f76a92..3b75c31a255ba9db8ee28d9141cd8e2ab1842446 100644 (file)
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -175,7 +175,7 @@ sub auth ($$) {
                        IkiWiki::redirect($q, $setup_url);
                }
                elsif ($csr->user_cancel) {
                        IkiWiki::redirect($q, $setup_url);
                }
                elsif ($csr->user_cancel) {

-                       IkiWiki::redirect($q, $config{url});
+                       IkiWiki::redirect($q, IkiWiki::baseurl(undef));

                }
                elsif (my $vident = $csr->verified_identity) {
                        $session->param(name => $vident->url);
                }
                elsif (my $vident = $csr->verified_identity) {
                        $session->param(name => $vident->url);

diff --git a/IkiWiki/Plugin/poll.pm b/IkiWiki/Plugin/poll.pm
index b333e2cdcff485edd81f4df426e1865c261a1199..988f4c11335a00726a23496be8390bb815a96880 100644 (file)
--- a/IkiWiki/Plugin/poll.pm
+++ b/IkiWiki/Plugin/poll.pm
@@ -103,7 +103,7 @@ sub sessioncgi ($$) {
                my $oldchoice=$session->param($choice_param);
                if (defined $oldchoice && $oldchoice eq $choice) {
                        # Same vote; no-op.
                my $oldchoice=$session->param($choice_param);
                if (defined $oldchoice && $oldchoice eq $choice) {
                        # Same vote; no-op.

-                       IkiWiki::redirect($cgi, urlto($page, undef, 1));
+                       IkiWiki::redirect($cgi, urlto($page, undef));

                        exit;
                }
 
                        exit;
                }
 


@@ -153,7 +153,7 @@ sub sessioncgi ($$) {
                error($@) if $@;
                my $cookie = CGI::Cookie->new(-name=> $session->name, -value=> $session->id);
                print $cgi->redirect(-cookie => $cookie,
                error($@) if $@;
                my $cookie = CGI::Cookie->new(-name=> $session->name, -value=> $session->id);
                print $cgi->redirect(-cookie => $cookie,

-                       -url => urlto($page, undef, 1));
+                       -url => urlto($page, undef));

                exit;
        }
 }
                exit;
        }
 }

diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
index 1717c8cf3759e07724098390387dedf177ddcbaa..ab189766302ecb842d8b24e049478bf5328c1507 100644 (file)
--- a/IkiWiki/Plugin/remove.pm
+++ b/IkiWiki/Plugin/remove.pm
@@ -240,7 +240,7 @@ sub sessioncgi ($$) {
                                if (! exists $pagesources{$parent}) {
                                        $parent="index";
                                }
                                if (! exists $pagesources{$parent}) {
                                        $parent="index";
                                }

-                               IkiWiki::redirect($q, urlto($parent, '/', 1));
+                               IkiWiki::redirect($q, urlto($parent, undef));

                        }
                }
                else {
                        }
                }
                else {

diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm
index 9c032fdc6780884c86b13bdece90a9f972efc7f1..ef9a93886036d923375630d14134fd3001e16e0e 100644 (file)
--- a/IkiWiki/Plugin/websetup.pm
+++ b/IkiWiki/Plugin/websetup.pm
@@ -344,7 +344,7 @@ sub showform ($$) {
        IkiWiki::decode_form_utf8($form);
        
        if ($form->submitted eq "Cancel") {
        IkiWiki::decode_form_utf8($form);
        
        if ($form->submitted eq "Cancel") {

-               IkiWiki::redirect($cgi, $config{url});
+               IkiWiki::redirect($cgi, IkiWiki::baseurl(undef));

                return;
        }
        elsif (($form->submitted eq 'Save Setup' || $form->submitted eq 'Rebuild Wiki') && $form->validate) {
                return;
        }
        elsif (($form->submitted eq 'Save Setup' || $form->submitted eq 'Rebuild Wiki') && $form->validate) {