releasing version 2.31.1

[git.ikiwiki.info.git] / IkiWiki / CGI.pm

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index c800ddf6eab22d4d0b0fa9b91cfb3f7fcbd4f3a4..4d4464c2872a48c32b331c88cfe4a35c9349a1fc 100644 (file)
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -20,7 +20,7 @@ sub printheader ($) { #{{{
        }
 
 } #}}}
        }
 
 } #}}}

-       
+

 sub showform ($$$$) { #{{{
        my $form=shift;
        my $buttons=shift;
 sub showform ($$$$) { #{{{
        my $form=shift;
        my $buttons=shift;


@@ -33,10 +33,9 @@ sub showform ($$$$) { #{{{
                                buttons => $buttons);
                });
        }
                                buttons => $buttons);
                });
        }

-       else {
-               printheader($session);
-               print misctemplate($form->title, $form->render(submit => $buttons));
-       }
+
+       printheader($session);
+       print misctemplate($form->title, $form->render(submit => $buttons));

 }
 
 sub redirect ($$) { #{{{
 }
 
 sub redirect ($$) { #{{{


@@ -61,75 +60,30 @@ sub check_canedit ($$$;$) { #{{{
        run_hooks(canedit => sub {
                return if defined $canedit;
                my $ret=shift->($page, $q, $session);
        run_hooks(canedit => sub {
                return if defined $canedit;
                my $ret=shift->($page, $q, $session);

-               if (defined $ret && $ret eq "") {
-                       $canedit=1;
-               }
-               elsif (defined $ret) {
-                       $canedit=0;
-                       error($ret) unless $nonfatal;
+               if (defined $ret) {
+                       if ($ret eq "") {
+                               $canedit=1;
+                       }
+                       elsif (ref $ret eq 'CODE') {
+                               $ret->() unless $nonfatal;
+                               $canedit=0;
+                       }
+                       elsif (defined $ret) {
+                               error($ret) unless $nonfatal;
+                               $canedit=0;
+                       }

                }
        });
        return $canedit;
 } #}}}
 
                }
        });
        return $canedit;
 } #}}}
 

-sub decode_form_utf8 ($) { #{{{
-       my $form = shift;
-       foreach my $f ($form->field) {
-               next if Encode::is_utf8(scalar $form->field($f));
-               $form->field(name  => $f,
-                            value => decode_utf8($form->field($f)),
-                            force => 1,
-                           );
+sub decode_cgi_utf8 ($) { #{{{
+       my $cgi = shift;
+       foreach my $f ($cgi->param) {
+               $cgi->param($f, map { decode_utf8 $_ } $cgi->param($f));

        }
 } #}}}
 
        }
 } #}}}
 

-sub cgi_recentchanges ($) { #{{{
-       my $q=shift;
-       
-       # Optimisation: building recentchanges means calculating lots of
-       # links. Memoizing htmllink speeds it up a lot (can't be memoized
-       # during page builds as the return values may change, but they
-       # won't here.)
-       eval q{use Memoize};
-       error($@) if $@;
-       memoize("htmllink");
-
-       eval q{use Time::Duration};
-       error($@) if $@;
-
-       my $changelog=[rcs_recentchanges(100)];
-       foreach my $change (@$changelog) {
-               $change->{when} = concise(ago($change->{when}));
-
-               $change->{user} = userlink($change->{user});
-
-               my $is_excess = exists $change->{pages}[10]; # limit pages to first 10
-               delete @{$change->{pages}}[10 .. @{$change->{pages}}] if $is_excess;
-               $change->{pages} = [
-                       map {
-                               $_->{link} = htmllink("", "", $_->{page},
-                                       noimageinline => 1,
-                                       linktext => pagetitle($_->{page}));
-                               $_;
-                       } @{$change->{pages}}
-               ];
-               push @{$change->{pages}}, { link => '...' } if $is_excess;
-       }
-
-       my $template=template("recentchanges.tmpl"); 
-       $template->param(
-               title => "RecentChanges",
-               indexlink => indexlink(),
-               wikiname => $config{wikiname},
-               changelog => $changelog,
-               baseurl => baseurl(),
-       );
-       run_hooks(pagetemplate => sub {
-               shift->(page => "", destpage => "", template => $template);
-       });
-       print $q->header(-charset => 'utf-8'), $template->output;
-} #}}}
-

 # Check if the user is signed in. If not, redirect to the signin form and
 # save their place to return to later.
 sub needsignin ($$) { #{{{
 # Check if the user is signed in. If not, redirect to the signin form and
 # save their place to return to later.
 sub needsignin ($$) { #{{{


@@ -138,9 +92,7 @@ sub needsignin ($$) { #{{{
 
        if (! defined $session->param("name") ||
            ! userinfo_get($session->param("name"), "regdate")) {
 
        if (! defined $session->param("name") ||
            ! userinfo_get($session->param("name"), "regdate")) {

-               if (! defined $session->param("postsignin")) {
-                       $session->param(postsignin => $ENV{QUERY_STRING});
-               }
+               $session->param(postsignin => $ENV{QUERY_STRING});

                cgi_signin($q, $session);
                cgi_savesession($session);
                exit;
                cgi_signin($q, $session);
                cgi_savesession($session);
                exit;


@@ -151,6 +103,7 @@ sub cgi_signin ($$) { #{{{
        my $q=shift;
        my $session=shift;
 
        my $q=shift;
        my $session=shift;
 

+       decode_cgi_utf8($q);

        eval q{use CGI::FormBuilder};
        error($@) if $@;
        my $form = CGI::FormBuilder->new(
        eval q{use CGI::FormBuilder};
        error($@) if $@;
        my $form = CGI::FormBuilder->new(


@@ -174,8 +127,6 @@ sub cgi_signin ($$) { #{{{
        $form->field(name => "do", type => "hidden", value => "signin",
                force => 1);
        
        $form->field(name => "do", type => "hidden", value => "signin",
                force => 1);
        

-       decode_form_utf8($form);
-       

        run_hooks(formbuilder_setup => sub {
                shift->(form => $form, cgi => $q, session => $session,
                        buttons => $buttons);
        run_hooks(formbuilder_setup => sub {
                shift->(form => $form, cgi => $q, session => $session,
                        buttons => $buttons);


@@ -201,9 +152,7 @@ sub cgi_postsignin ($$) { #{{{
                exit;
        }
        else {
                exit;
        }
        else {

-               # This can occur, for example, if a user went to the signin
-               # url via a bookmark.
-               redirect($q, $config{url});
+               error(gettext("login failed, perhaps you need to turn on cookies?"));

        }
 } #}}}
 
        }
 } #}}}
 


@@ -213,6 +162,7 @@ sub cgi_prefs ($$) { #{{{
 
        needsignin($q, $session);
 
 
        needsignin($q, $session);
 

+       decode_cgi_utf8($q);

        eval q{use CGI::FormBuilder};
        error($@) if $@;
        my $form = CGI::FormBuilder->new(
        eval q{use CGI::FormBuilder};
        error($@) if $@;
        my $form = CGI::FormBuilder->new(


@@ -238,8 +188,6 @@ sub cgi_prefs ($$) { #{{{
        );
        my $buttons=["Save Preferences", "Logout", "Cancel"];
 
        );
        my $buttons=["Save Preferences", "Logout", "Cancel"];
 

-       decode_form_utf8($form);
-

        run_hooks(formbuilder_setup => sub {
                shift->(form => $form, cgi => $q, session => $session,
                        buttons => $buttons);
        run_hooks(formbuilder_setup => sub {
                shift->(form => $form, cgi => $q, session => $session,
                        buttons => $buttons);


@@ -247,9 +195,6 @@ sub cgi_prefs ($$) { #{{{
        
        $form->field(name => "do", type => "hidden");
        $form->field(name => "email", size => 50, fieldset => "preferences");
        
        $form->field(name => "do", type => "hidden");
        $form->field(name => "email", size => 50, fieldset => "preferences");

-       $form->field(name => "subscriptions", size => 50,
-               fieldset => "preferences",
-               comment => "(".htmllink("", "", "PageSpec", noimageinline => 1).")");

        $form->field(name => "banned_users", size => 50,
                fieldset => "admin");
        
        $form->field(name => "banned_users", size => 50,
                fieldset => "admin");
        


@@ -261,8 +206,6 @@ sub cgi_prefs ($$) { #{{{
        if (! $form->submitted) {
                $form->field(name => "email", force => 1,
                        value => userinfo_get($user_name, "email"));
        if (! $form->submitted) {
                $form->field(name => "email", force => 1,
                        value => userinfo_get($user_name, "email"));

-               $form->field(name => "subscriptions", force => 1,
-                       value => userinfo_get($user_name, "subscriptions"));

                if (is_admin($user_name)) {
                        $form->field(name => "banned_users", force => 1,
                                value => join(" ", get_banned_users()));
                if (is_admin($user_name)) {
                        $form->field(name => "banned_users", force => 1,
                                value => join(" ", get_banned_users()));


@@ -279,11 +222,9 @@ sub cgi_prefs ($$) { #{{{
                return;
        }
        elsif ($form->submitted eq 'Save Preferences' && $form->validate) {
                return;
        }
        elsif ($form->submitted eq 'Save Preferences' && $form->validate) {

-               foreach my $field (qw(email subscriptions)) {
-                       if (defined $form->field($field) && length $form->field($field)) {
-                               userinfo_set($user_name, $field, $form->field($field)) ||
-                                       error("failed to set $field");
-                       }
+               if (defined $form->field('email')) {
+                       userinfo_set($user_name, 'email', $form->field('email')) ||
+                               error("failed to set email");

                }
                if (is_admin($user_name)) {
                        set_banned_users(grep { ! is_admin($_) }
                }
                if (is_admin($user_name)) {
                        set_banned_users(grep { ! is_admin($_) }


@@ -304,6 +245,7 @@ sub cgi_editpage ($$) { #{{{
        my @fields=qw(do rcsinfo subpage from page type editcontent comments);
        my @buttons=("Save Page", "Preview", "Cancel");
        
        my @fields=qw(do rcsinfo subpage from page type editcontent comments);
        my @buttons=("Save Page", "Preview", "Cancel");
        

+       decode_cgi_utf8($q);

        eval q{use CGI::FormBuilder};
        error($@) if $@;
        my $form = CGI::FormBuilder->new(
        eval q{use CGI::FormBuilder};
        error($@) if $@;
        my $form = CGI::FormBuilder->new(


@@ -311,9 +253,6 @@ sub cgi_editpage ($$) { #{{{
                fields => \@fields,
                charset => "utf-8",
                method => 'POST',
                fields => \@fields,
                charset => "utf-8",
                method => 'POST',

-               validate => {
-                       editcontent => '/.+/',
-               },

                required => [qw{editcontent}],
                javascript => 0,
                params => $q,
                required => [qw{editcontent}],
                javascript => 0,
                params => $q,


@@ -324,8 +263,6 @@ sub cgi_editpage ($$) { #{{{
                wikiname => $config{wikiname},
        );
        
                wikiname => $config{wikiname},
        );
        

-       decode_form_utf8($form);
-       

        run_hooks(formbuilder_setup => sub {
                shift->(form => $form, cgi => $q, session => $session,
                        buttons => \@buttons);
        run_hooks(formbuilder_setup => sub {
                shift->(form => $form, cgi => $q, session => $session,
                        buttons => \@buttons);


@@ -335,7 +272,8 @@ sub cgi_editpage ($$) { #{{{
        # characters.
        my ($page)=$form->field('page');
        $page=titlepage(possibly_foolish_untaint($page));
        # characters.
        my ($page)=$form->field('page');
        $page=titlepage(possibly_foolish_untaint($page));

-       if (! defined $page || ! length $page || file_pruned($page, $config{srcdir}) || $page=~/^\//) {
+       if (! defined $page || ! length $page ||
+           file_pruned($page, $config{srcdir}) || $page=~/^\//) {

                error("bad page name");
        }
        
                error("bad page name");
        }
        


@@ -349,20 +287,21 @@ sub cgi_editpage ($$) { #{{{
        if (exists $pagesources{$page} && $form->field("do") ne "create") {
                $file=$pagesources{$page};
                $type=pagetype($file);
        if (exists $pagesources{$page} && $form->field("do") ne "create") {
                $file=$pagesources{$page};
                $type=pagetype($file);

-               if (! defined $type) {
+               if (! defined $type || $type=~/^_/) {

                        error(sprintf(gettext("%s is not an editable page"), $page));
                }
                if (! $form->submitted) {
                        $form->field(name => "rcsinfo",
                                value => rcs_prepedit($file), force => 1);
                }
                        error(sprintf(gettext("%s is not an editable page"), $page));
                }
                if (! $form->submitted) {
                        $form->field(name => "rcsinfo",
                                value => rcs_prepedit($file), force => 1);
                }

+               $form->field(name => "editcontent", validate => '/.*/');

        }
        else {
                $type=$form->param('type');
                if (defined $type && length $type && $hooks{htmlize}{$type}) {
                        $type=possibly_foolish_untaint($type);
                }
        }
        else {
                $type=$form->param('type');
                if (defined $type && length $type && $hooks{htmlize}{$type}) {
                        $type=possibly_foolish_untaint($type);
                }

-               elsif (defined $from) {
+               elsif (defined $from && exists $pagesources{$from}) {

                        # favor the type of linking page
                        $type=pagetype($pagesources{$from});
                }
                        # favor the type of linking page
                        $type=pagetype($pagesources{$from});
                }


@@ -371,6 +310,7 @@ sub cgi_editpage ($$) { #{{{
                if (! $form->submitted) {
                        $form->field(name => "rcsinfo", value => "", force => 1);
                }
                if (! $form->submitted) {
                        $form->field(name => "rcsinfo", value => "", force => 1);
                }

+               $form->field(name => "editcontent", validate => '/.+/');

        }
 
        $form->field(name => "do", type => 'hidden');
        }
 
        $form->field(name => "do", type => 'hidden');


@@ -385,7 +325,9 @@ sub cgi_editpage ($$) { #{{{
        $form->tmpl_param("can_commit", $config{rcs});
        $form->tmpl_param("indexlink", indexlink());
        $form->tmpl_param("helponformattinglink",
        $form->tmpl_param("can_commit", $config{rcs});
        $form->tmpl_param("indexlink", indexlink());
        $form->tmpl_param("helponformattinglink",

-               htmllink("", "", "HelpOnFormatting", noimageinline => 1));
+               htmllink("", "", "ikiwiki/formatting",
+                       noimageinline => 1,
+                       linktext => "FormattingHelp"));

        $form->tmpl_param("baseurl", baseurl());
        
        if ($form->submitted eq "Cancel") {
        $form->tmpl_param("baseurl", baseurl());
        
        if ($form->submitted eq "Cancel") {


@@ -401,19 +343,29 @@ sub cgi_editpage ($$) { #{{{
                return;
        }
        elsif ($form->submitted eq "Preview") {
                return;
        }
        elsif ($form->submitted eq "Preview") {

+               my $content=$form->field('editcontent');
+               run_hooks(editcontent => sub {
+                       $content=shift->(
+                               content => $content,
+                               page => $page,
+                               cgi => $q,
+                               session => $session,
+                       );
+               });

                $form->tmpl_param("page_preview",
                        htmlize($page, $type,
                        linkify($page, "",
                        preprocess($page, $page,
                $form->tmpl_param("page_preview",
                        htmlize($page, $type,
                        linkify($page, "",
                        preprocess($page, $page,

-                       filter($page, $page, $form->field('editcontent')), 0, 1))));
+                       filter($page, $page, $content), 0, 1))));
+               # previewing may have created files on disk
+               saveindex();

        }
        elsif ($form->submitted eq "Save Page") {
                $form->tmpl_param("page_preview", "");
        }
        $form->tmpl_param("page_conflict", "");
        
        }
        elsif ($form->submitted eq "Save Page") {
                $form->tmpl_param("page_preview", "");
        }
        $form->tmpl_param("page_conflict", "");
        

-       if ($form->submitted ne "Save Page" || 
-           ! $form->validate) {
+       if ($form->submitted ne "Save Page" || ! $form->validate) {

                if ($form->field("do") eq "create") {
                        my @page_locs;
                        my $best_loc;
                if ($form->field("do") eq "create") {
                        my @page_locs;
                        my $best_loc;


@@ -466,7 +418,8 @@ sub cgi_editpage ($$) { #{{{
                        
                        my @page_types;
                        if (exists $hooks{htmlize}) {
                        
                        my @page_types;
                        if (exists $hooks{htmlize}) {

-                               @page_types=keys %{$hooks{htmlize}};
+                               @page_types=grep { !/^_/ }
+                                       keys %{$hooks{htmlize}};

                        }
                        
                        $form->tmpl_param("page_select", 1);
                        }
                        
                        $form->tmpl_param("page_select", 1);


@@ -504,8 +457,8 @@ sub cgi_editpage ($$) { #{{{
 
                my $exists=-e "$config{srcdir}/$file";
 
 
                my $exists=-e "$config{srcdir}/$file";
 

-               if ($form->field("do") ne "create" &&
-                   ! $exists && ! -e "$config{underlaydir}/$file") {
+               if ($form->field("do") ne "create" && ! $exists &&
+                   ! eval { srcfile($file) }) {

                        $form->tmpl_param("page_gone", 1);
                        $form->field(name => "do", value => "create", force => 1);
                        $form->tmpl_param("page_select", 0);
                        $form->tmpl_param("page_gone", 1);
                        $form->field(name => "do", value => "create", force => 1);
                        $form->tmpl_param("page_select", 0);


@@ -531,9 +484,17 @@ sub cgi_editpage ($$) { #{{{
                }
                
                my $content=$form->field('editcontent');
                }
                
                my $content=$form->field('editcontent');

-
+               run_hooks(editcontent => sub {
+                       $content=shift->(
+                               content => $content,
+                               page => $page,
+                               cgi => $q,
+                               session => $session,
+                       );
+               });

                $content=~s/\r\n/\n/g;
                $content=~s/\r/\n/g;
                $content=~s/\r\n/\n/g;
                $content=~s/\r/\n/g;

+               $content.="\n" if $content !~ /\n$/;

 
                $config{cgi}=0; # avoid cgi error message
                eval { writefile($file, $config{srcdir}, $content) };
 
                $config{cgi}=0; # avoid cgi error message
                eval { writefile($file, $config{srcdir}, $content) };


@@ -566,7 +527,7 @@ sub cgi_editpage ($$) { #{{{
 
                        # Prevent deadlock with post-commit hook by
                        # signaling to it that it should not try to
 
                        # Prevent deadlock with post-commit hook by
                        # signaling to it that it should not try to

-                       # do anything (except send commit mails).
+                       # do anything.

                        disable_commit_hook();
                        $conflict=rcs_commit($file, $message,
                                $form->field("rcsinfo"),
                        disable_commit_hook();
                        $conflict=rcs_commit($file, $message,
                                $form->field("rcsinfo"),


@@ -650,14 +611,9 @@ sub cgi (;$$) { #{{{
                }
        }
        
                }
        }
        

-       # Things that do not need a session.
-       if ($do eq 'recentchanges') {
-               cgi_recentchanges($q);
-               return;
-       }
-

        # Need to lock the wiki before getting a session.
        lockwiki();
        # Need to lock the wiki before getting a session.
        lockwiki();

+       loadindex();

        
        if (! $session) {
                $session=cgi_getsession($q);
        
        if (! $session) {
                $session=cgi_getsession($q);


@@ -695,49 +651,18 @@ sub cgi (;$$) { #{{{
                cgi_signin($q, $session);
                cgi_savesession($session);
        }
                cgi_signin($q, $session);
                cgi_savesession($session);
        }

-       elsif (defined $session->param("postsignin")) {
-               cgi_postsignin($q, $session);
-       }

        elsif ($do eq 'prefs') {
                cgi_prefs($q, $session);
        }
        elsif ($do eq 'create' || $do eq 'edit') {
                cgi_editpage($q, $session);
        }
        elsif ($do eq 'prefs') {
                cgi_prefs($q, $session);
        }
        elsif ($do eq 'create' || $do eq 'edit') {
                cgi_editpage($q, $session);
        }

-       elsif ($do eq 'postsignin') {
-               error(gettext("login failed, perhaps you need to turn on cookies?"));
+       elsif (defined $session->param("postsignin") || $do eq 'postsignin') {
+               cgi_postsignin($q, $session);

        }
        else {
                error("unknown do parameter");
        }
 } #}}}
 
        }
        else {
                error("unknown do parameter");
        }
 } #}}}
 

-sub userlink ($) { #{{{
-       my $user=shift;
-
-       eval q{use CGI 'escapeHTML'};
-       error($@) if $@;
-       if ($user =~ m!^https?://! &&
-           eval q{use Net::OpenID::VerifiedIdentity; 1} && !$@) {
-               # Munge user-urls, as used by eg, OpenID.
-               my $oid=Net::OpenID::VerifiedIdentity->new(identity => $user);
-               my $display=$oid->display;
-               # Convert "user.somehost.com" to "user [somehost.com]".
-               if ($display !~ /\[/) {
-                       $display=~s/^(.*?)\.([^.]+\.[a-z]+)$/$1 [$2]/;
-               }
-               # Convert "http://somehost.com/user" to "user [somehost.com]".
-               if ($display !~ /\[/) {
-                       $display=~s/^https?:\/\/(.+)\/([^\/]+)$/$2 [$1]/;
-               }
-               $display=~s!^https?://!!; # make sure this is removed
-               return "<a href=\"$user\">".escapeHTML($display)."</a>";
-       }
-       else {
-               return htmllink("", "", escapeHTML(
-                       length $config{userdir} ? $config{userdir}."/".$user : $user
-               ), noimageinline => 1);
-       }
-} #}}}
-

 1
 1