releasing version 2.31.1

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

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 5d21d0674eca2b273aaeef28e77e5c418b62531a..4d4464c2872a48c32b331c88cfe4a35c9349a1fc 100644 (file)
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -21,6 +21,23 @@ sub printheader ($) { #{{{
 
 } #}}}
 
 
 } #}}}
 

+sub showform ($$$$) { #{{{
+       my $form=shift;
+       my $buttons=shift;
+       my $session=shift;
+       my $cgi=shift;
+
+       if (exists $hooks{formbuilder}) {
+               run_hooks(formbuilder => sub {
+                       shift->(form => $form, cgi => $cgi, session => $session,
+                               buttons => $buttons);
+               });
+       }
+
+       printheader($session);
+       print misctemplate($form->title, $form->render(submit => $buttons));
+}
+

 sub redirect ($$) { #{{{
        my $q=shift;
        my $url=shift;
 sub redirect ($$) { #{{{
        my $q=shift;
        my $url=shift;


@@ -33,93 +50,65 @@ sub redirect ($$) { #{{{
        }
 } #}}}
 
        }
 } #}}}
 

-sub page_locked ($$;$) { #{{{
+sub check_canedit ($$$;$) { #{{{

        my $page=shift;
        my $page=shift;

+       my $q=shift;

        my $session=shift;
        my $nonfatal=shift;
        
        my $session=shift;
        my $nonfatal=shift;
        

-       my $user=$session->param("name");
-       return if defined $user && is_admin($user);
-
-       foreach my $admin (@{$config{adminuser}}) {
-               my $locked_pages=userinfo_get($admin, "locked_pages");
-               if (pagespec_match($page, userinfo_get($admin, "locked_pages"))) {
-                       return 1 if $nonfatal;
-
-                       error(sprintf(gettext("%s is locked by %s and cannot be edited"),
-                               htmllink("", "", $page, 1),
-                               userlink($admin)));
+       my $canedit;
+       run_hooks(canedit => sub {
+               return if defined $canedit;
+               my $ret=shift->($page, $q, $session);
+               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 0;
+       });
+       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 ($) { #{{{
+# Check if the user is signed in. If not, redirect to the signin form and
+# save their place to return to later.
+sub needsignin ($$) { #{{{

        my $q=shift;
        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 $session=shift;

 
 

-               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}, 1);
-                               $_;
-                       } @{$change->{pages}}
-               ];
-               push @{$change->{pages}}, { link => '...' } if $is_excess;
+       if (! defined $session->param("name") ||
+           ! userinfo_get($session->param("name"), "regdate")) {
+               $session->param(postsignin => $ENV{QUERY_STRING});
+               cgi_signin($q, $session);
+               cgi_savesession($session);
+               exit;

        }
        }

-
-       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;
-} #}}}
+} #}}} 

 
 sub cgi_signin ($$) { #{{{
        my $q=shift;
        my $session=shift;
 
 
 sub cgi_signin ($$) { #{{{
        my $q=shift;
        my $session=shift;
 

+       decode_cgi_utf8($q);

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

-               header => 1,
+               name => "signin",

                charset => "utf-8",
                method => 'POST',
                required => 'NONE',
                charset => "utf-8",
                method => 'POST',
                required => 'NONE',


@@ -127,46 +116,35 @@ sub cgi_signin ($$) { #{{{
                params => $q,
                action => $config{cgiurl},
                header => 0,
                params => $q,
                action => $config{cgiurl},
                header => 0,

-               template => (-e "$config{templatedir}/signin.tmpl" ?
-                            {template_params("signin.tmpl")} : ""),
+               template => {type => 'div'},

                stylesheet => baseurl()."style.css",
        );
        my $buttons=["Login"];
        
                stylesheet => baseurl()."style.css",
        );
        my $buttons=["Login"];
        

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

        if ($q->param("do") ne "signin" && !$form->submitted) {
                $form->text(gettext("You need to log in first."));
        }
        if ($q->param("do") ne "signin" && !$form->submitted) {
                $form->text(gettext("You need to log in first."));
        }

+       $form->field(name => "do", type => "hidden", value => "signin",
+               force => 1);

        
        run_hooks(formbuilder_setup => sub {
        
        run_hooks(formbuilder_setup => sub {

-               shift->(form => $form, cgi => $q, session => $session);
+               shift->(form => $form, cgi => $q, session => $session,
+                       buttons => $buttons);

        });
        });

-       
-       decode_form_utf8($form);

 
 

-       if (exists $hooks{formbuilder}) {
-               run_hooks(formbuilder => sub {
-                       shift->(form => $form, cgi => $q, session => $session,
-                               buttons => $buttons);
-               });
-       }
-       else {
-               if ($form->submitted) {
-                       $form->validate;
-               }
-               printheader($session);
-               print misctemplate($form->title, $form->render(submit => $buttons));
+       if ($form->submitted) {
+               $form->validate;

        }
        }

+
+       showform($form, $buttons, $session, $q);

 } #}}}
 
 sub cgi_postsignin ($$) { #{{{
        my $q=shift;
        my $session=shift;
 } #}}}
 
 sub cgi_postsignin ($$) { #{{{
        my $q=shift;
        my $session=shift;

-
+       

        # Continue with whatever was being done before the signin process.
        # Continue with whatever was being done before the signin process.

-       if (defined $q->param("do") && $q->param("do") ne "signin" &&
-           defined $session->param("postsignin")) {
+       if (defined $session->param("postsignin")) {

                my $postsignin=CGI->new($session->param("postsignin"));
                $session->clear("postsignin");
                cgi($postsignin, $session);
                my $postsignin=CGI->new($session->param("postsignin"));
                $session->clear("postsignin");
                cgi($postsignin, $session);


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

-               redirect($q, $config{url});
+               error(gettext("login failed, perhaps you need to turn on cookies?"));

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


@@ -182,10 +160,14 @@ sub cgi_prefs ($$) { #{{{
        my $q=shift;
        my $session=shift;
 
        my $q=shift;
        my $session=shift;
 

+       needsignin($q, $session);
+
+       decode_cgi_utf8($q);

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

+               name => "preferences",

                header => 0,
                charset => "utf-8",
                method => 'POST',
                header => 0,
                charset => "utf-8",
                method => 'POST',


@@ -196,45 +178,40 @@ sub cgi_prefs ($$) { #{{{
                javascript => 0,
                params => $q,
                action => $config{cgiurl},
                javascript => 0,
                params => $q,
                action => $config{cgiurl},

-               template => (-e "$config{templatedir}/prefs.tmpl" ?
-                            {template_params("prefs.tmpl")} : ""),
+               template => {type => 'div'},

                stylesheet => baseurl()."style.css",
                stylesheet => baseurl()."style.css",

+               fieldsets => [
+                       [login => gettext("Login")],
+                       [preferences => gettext("Preferences")],
+                       [admin => gettext("Admin")]
+               ],

        );
        my $buttons=["Save Preferences", "Logout", "Cancel"];
 
        run_hooks(formbuilder_setup => sub {
        );
        my $buttons=["Save Preferences", "Logout", "Cancel"];
 
        run_hooks(formbuilder_setup => sub {

-               shift->(form => $form, cgi => $q, session => $session);
+               shift->(form => $form, cgi => $q, session => $session,
+                       buttons => $buttons);

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

-       $form->field(name => "email", size => 50);
-       $form->field(name => "subscriptions", size => 50,
-               comment => "(".htmllink("", "", "PageSpec", 1).")");
-       $form->field(name => "locked_pages", size => 50,
-               comment => "(".htmllink("", "", "PageSpec", 1).")");
-       $form->field(name => "banned_users", size => 50);
+       $form->field(name => "email", size => 50, fieldset => "preferences");
+       $form->field(name => "banned_users", size => 50,
+               fieldset => "admin");

        
        my $user_name=$session->param("name");
        if (! is_admin($user_name)) {
        
        my $user_name=$session->param("name");
        if (! is_admin($user_name)) {

-               $form->field(name => "locked_pages", type => "hidden");

                $form->field(name => "banned_users", type => "hidden");
        }
 
        if (! $form->submitted) {
                $form->field(name => "email", force => 1,
                        value => userinfo_get($user_name, "email"));
                $form->field(name => "banned_users", type => "hidden");
        }
 
        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"));
-               $form->field(name => "locked_pages", force => 1,
-                       value => userinfo_get($user_name, "locked_pages"));

                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()));
                }
        }
        

-       decode_form_utf8($form);
-       

        if ($form->submitted eq 'Logout') {
                $session->delete();
                redirect($q, $config{url});
        if ($form->submitted eq 'Logout') {
                $session->delete();
                redirect($q, $config{url});


@@ -245,28 +222,20 @@ 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 locked_pages)) {
-                       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($_) }

-                                       split(' ', $form->field("banned_users")));
+                                       split(' ',
+                                               $form->field("banned_users"))) ||
+                               error("failed saving changes");

                }
                $form->text(gettext("Preferences saved."));
        }
        
                }
                $form->text(gettext("Preferences saved."));
        }
        

-       if (exists $hooks{formbuilder}) {
-               run_hooks(formbuilder => sub {
-                       shift->(form => $form, cgi => $q, session => $session,
-                               buttons => $buttons);
-               });
-       }
-       else {
-               printheader($session);
-               print misctemplate($form->title, $form->render(submit => $buttons));
-       }
+       showform($form, $buttons, $session, $q);

 } #}}}
 
 sub cgi_editpage ($$) { #{{{
 } #}}}
 
 sub cgi_editpage ($$) { #{{{


@@ -276,36 +245,35 @@ 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(

+               title => "editpage",

                fields => \@fields,
                fields => \@fields,

-               header => 1,

                charset => "utf-8",
                method => 'POST',
                charset => "utf-8",
                method => 'POST',

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

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

+               header => 0,

                table => 0,
                table => 0,

-               template => (-e "$config{templatedir}/editpage.tmpl" ?
-                               {template_params("editpage.tmpl")} : ""),
+               template => scalar template_params("editpage.tmpl"),
+               wikiname => $config{wikiname},

        );
        
        run_hooks(formbuilder_setup => sub {
        );
        
        run_hooks(formbuilder_setup => sub {

-               shift->(form => $form, cgi => $q, session => $session);
+               shift->(form => $form, cgi => $q, session => $session,
+                       buttons => \@buttons);

        });
        
        });
        

-       decode_form_utf8($form);
-       

        # This untaint is safe because titlepage removes any problematic
        # characters.
        my ($page)=$form->field('page');
        $page=titlepage(possibly_foolish_untaint($page));
        # This untaint is safe because titlepage removes any problematic
        # 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");
        }
        


@@ -316,33 +284,40 @@ sub cgi_editpage ($$) { #{{{
        
        my $file;
        my $type;
        
        my $file;
        my $type;

-       if (exists $pagesources{$page}) {
+       if (exists $pagesources{$page} && $form->field("do") ne "create") {

                $file=$pagesources{$page};
                $type=pagetype($file);
                $file=$pagesources{$page};
                $type=pagetype($file);

+               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);
+               }
+               $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});
                }
                $type=$config{default_pageext} unless defined $type;
                $file=$page.".".$type;
                        # favor the type of linking page
                        $type=pagetype($pagesources{$from});
                }
                $type=$config{default_pageext} unless defined $type;
                $file=$page.".".$type;

-       }
-
-       my $newfile=0;
-       if (! -e "$config{srcdir}/$file") {
-               $newfile=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 => "from", type => 'hidden');
        $form->field(name => "rcsinfo", type => 'hidden');
        $form->field(name => "subpage", type => 'hidden');
        }
 
        $form->field(name => "do", type => 'hidden');
        $form->field(name => "from", type => 'hidden');
        $form->field(name => "rcsinfo", type => 'hidden');
        $form->field(name => "subpage", type => 'hidden');

-       $form->field(name => "page", value => $page, force => 1);
+       $form->field(name => "page", value => pagetitle($page, 1), force => 1);

        $form->field(name => "type", value => $type, force => 1);
        $form->field(name => "comments", type => "text", size => 80);
        $form->field(name => "editcontent", type => "textarea", rows => 20,
        $form->field(name => "type", value => $type, force => 1);
        $form->field(name => "comments", type => "text", size => 80);
        $form->field(name => "editcontent", type => "textarea", rows => 20,


@@ -350,18 +325,16 @@ 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", 1));
+               htmllink("", "", "ikiwiki/formatting",
+                       noimageinline => 1,
+                       linktext => "FormattingHelp"));

        $form->tmpl_param("baseurl", baseurl());
        $form->tmpl_param("baseurl", baseurl());

-       if (! $form->submitted) {
-               $form->field(name => "rcsinfo", value => rcs_prepedit($file),
-                       force => 1);
-       }

        
        if ($form->submitted eq "Cancel") {
        
        if ($form->submitted eq "Cancel") {

-               if ($newfile && defined $from) {
+               if ($form->field("do") eq "create" && defined $from) {

                        redirect($q, "$config{url}/".htmlpage($from));
                }
                        redirect($q, "$config{url}/".htmlpage($from));
                }

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

                        redirect($q, $config{url});
                }
                else {
                        redirect($q, $config{url});
                }
                else {


@@ -371,25 +344,28 @@ sub cgi_editpage ($$) { #{{{
        }
        elsif ($form->submitted eq "Preview") {
                my $content=$form->field('editcontent');
        }
        elsif ($form->submitted eq "Preview") {
                my $content=$form->field('editcontent');

-               my $comments=$form->field('comments');
-               $form->field(name => "editcontent",
-                               value => $content, force => 1);
-               $form->field(name => "comments",
-                               value => $comments, force => 1);
-               $config{rss}=$config{atom}=0; # avoid preview writing a feed!
+               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, $content)))));
+                       filter($page, $page, $content), 0, 1))));
+               # previewing may have created files on disk
+               saveindex();

        }
        }

-       else {
+       elsif ($form->submitted eq "Save Page") {

                $form->tmpl_param("page_preview", "");
        }
        $form->tmpl_param("page_conflict", "");
        
                $form->tmpl_param("page_preview", "");
        }
        $form->tmpl_param("page_conflict", "");
        

-       if (! $form->submitted || $form->submitted eq "Preview" || 
-           ! $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;


@@ -423,31 +399,40 @@ sub cgi_editpage ($$) { #{{{
                                if length $config{userdir};
 
                        @page_locs = grep {
                                if length $config{userdir};
 
                        @page_locs = grep {

-                               ! exists $pagecase{lc $_} &&
-                               ! page_locked($_, $session, 1)
+                               ! exists $pagecase{lc $_}

                        } @page_locs;
                        } @page_locs;

-                       

                        if (! @page_locs) {
                                # hmm, someone else made the page in the
                                # meantime?
                                redirect($q, "$config{url}/".htmlpage($page));
                                return;
                        }
                        if (! @page_locs) {
                                # hmm, someone else made the page in the
                                # meantime?
                                redirect($q, "$config{url}/".htmlpage($page));
                                return;
                        }

+
+                       my @editable_locs = grep {
+                               check_canedit($_, $q, $session, 1)
+                       } @page_locs;
+                       if (! @editable_locs) {
+                               # let it throw an error this time
+                               map { check_canedit($_, $q, $session) } @page_locs;
+                       }

                        
                        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->field(name => "page", type => 'select',
                        }
                        
                        $form->tmpl_param("page_select", 1);
                        $form->field(name => "page", type => 'select',

-                               options => \@page_locs, value => $best_loc);
+                               options => [ map { pagetitle($_, 1) } @editable_locs ],
+                               value => pagetitle($best_loc, 1));

                        $form->field(name => "type", type => 'select',
                                options => \@page_types);
                        $form->title(sprintf(gettext("creating %s"), pagetitle($page)));
                        $form->field(name => "type", type => 'select',
                                options => \@page_types);
                        $form->title(sprintf(gettext("creating %s"), pagetitle($page)));

+                       

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

-                       page_locked($page, $session);
+                       check_canedit($page, $q, $session);

                        if (! defined $form->field('editcontent') || 
                            ! length $form->field('editcontent')) {
                                my $content="";
                        if (! defined $form->field('editcontent') || 
                            ! length $form->field('editcontent')) {
                                my $content="";


@@ -464,18 +449,71 @@ sub cgi_editpage ($$) { #{{{
                        $form->title(sprintf(gettext("editing %s"), pagetitle($page)));
                }
                
                        $form->title(sprintf(gettext("editing %s"), pagetitle($page)));
                }
                

-               print $form->render(submit => \@buttons);
+               showform($form, \@buttons, $session, $q);

        }
        else {
                # save page
        }
        else {
                # save page

-               page_locked($page, $session);
+               check_canedit($page, $q, $session);
+
+               my $exists=-e "$config{srcdir}/$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->field(name => "page", type => 'hidden');
+                       $form->field(name => "type", type => 'hidden');
+                       $form->title(sprintf(gettext("editing %s"), $page));
+                       showform($form, \@buttons, $session, $q);
+                       return;
+               }
+               elsif ($form->field("do") eq "create" && $exists) {
+                       $form->tmpl_param("creation_conflict", 1);
+                       $form->field(name => "do", value => "edit", force => 1);
+                       $form->tmpl_param("page_select", 0);
+                       $form->field(name => "page", type => 'hidden');
+                       $form->field(name => "type", type => 'hidden');
+                       $form->title(sprintf(gettext("editing %s"), $page));
+                       $form->field("editcontent", 
+                               value => readfile("$config{srcdir}/$file").
+                                        "\n\n\n".$form->field("editcontent"),
+                               force => 1);
+                       showform($form, \@buttons, $session, $q);
+                       return;
+               }

                
                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;

-               writefile($file, $config{srcdir}, $content);
+               $content.="\n" if $content !~ /\n$/;
+
+               $config{cgi}=0; # avoid cgi error message
+               eval { writefile($file, $config{srcdir}, $content) };
+               $config{cgi}=1;
+               if ($@) {
+                       $form->field(name => "rcsinfo", value => rcs_prepedit($file),
+                               force => 1);
+                       $form->tmpl_param("failed_save", 1);
+                       $form->tmpl_param("error_message", $@);
+                       $form->field("editcontent", value => $content, force => 1);
+                       $form->tmpl_param("page_select", 0);
+                       $form->field(name => "page", type => 'hidden');
+                       $form->field(name => "type", type => 'hidden');
+                       $form->title(sprintf(gettext("editing %s"), $page));
+                       showform($form, \@buttons, $session, $q);
+                       return;
+               }

                
                

+               my $conflict;

                if ($config{rcs}) {
                        my $message="";
                        if (defined $form->field('comments') &&
                if ($config{rcs}) {
                        my $message="";
                        if (defined $form->field('comments') &&


@@ -483,41 +521,46 @@ sub cgi_editpage ($$) { #{{{
                                $message=$form->field('comments');
                        }
                        
                                $message=$form->field('comments');
                        }
                        

-                       if ($newfile) {
+                       if (! $exists) {

                                rcs_add($file);
                        }
                                rcs_add($file);
                        }

-                       # prevent deadlock with post-commit hook
-                       unlockwiki();
-                       # presumably the commit will trigger an update
-                       # of the wiki
-                       my $conflict=rcs_commit($file, $message,
+
+                       # Prevent deadlock with post-commit hook by
+                       # signaling to it that it should not try to
+                       # do anything.
+                       disable_commit_hook();
+                       $conflict=rcs_commit($file, $message,

                                $form->field("rcsinfo"),
                                $session->param("name"), $ENV{REMOTE_ADDR});
                                $form->field("rcsinfo"),
                                $session->param("name"), $ENV{REMOTE_ADDR});

+                       enable_commit_hook();
+                       rcs_update();
+               }

                
                

-                       if (defined $conflict) {
-                               $form->field(name => "rcsinfo", value => rcs_prepedit($file),
-                                       force => 1);
-                               $form->tmpl_param("page_conflict", 1);
-                               $form->field("editcontent", value => $conflict, force => 1);
-                               $form->field(name => "comments", value => $form->field('comments'), force => 1);
-                               $form->field("do", "edit)");
-                               $form->tmpl_param("page_select", 0);
-                               $form->field(name => "page", type => 'hidden');
-                               $form->field(name => "type", type => 'hidden');
-                               $form->title(sprintf(gettext("editing %s"), $page));
-                               print $form->render(submit => \@buttons);
-                               return;
-                       }
+               # Refresh even if there was a conflict, since other changes
+               # may have been committed while the post-commit hook was
+               # disabled.
+               require IkiWiki::Render;
+               refresh();
+               saveindex();
+
+               if (defined $conflict) {
+                       $form->field(name => "rcsinfo", value => rcs_prepedit($file),
+                               force => 1);
+                       $form->tmpl_param("page_conflict", 1);
+                       $form->field("editcontent", value => $conflict, force => 1);
+                       $form->field("do", "edit", force => 1);
+                       $form->tmpl_param("page_select", 0);
+                       $form->field(name => "page", type => 'hidden');
+                       $form->field(name => "type", type => 'hidden');
+                       $form->title(sprintf(gettext("editing %s"), $page));
+                       showform($form, \@buttons, $session, $q);
+                       return;

                }
                else {
                }
                else {

-                       require IkiWiki::Render;
-                       refresh();
-                       saveindex();
+                       # The trailing question mark tries to avoid broken
+                       # caches and get the most recent version of the page.
+                       redirect($q, "$config{url}/".htmlpage($page)."?updated");

                }
                }

-               
-               # The trailing question mark tries to avoid broken
-               # caches and get the most recent version of the page.
-               redirect($q, "$config{url}/".htmlpage($page)."?updated");

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


@@ -542,7 +585,7 @@ sub cgi_savesession ($) { #{{{
        my $oldmask=umask(077);
        $session->flush;
        umask($oldmask);
        my $oldmask=umask(077);
        $session->flush;
        umask($oldmask);

-}
+} #}}}

 
 sub cgi (;$$) { #{{{
        my $q=shift;
 
 sub cgi (;$$) { #{{{
        my $q=shift;


@@ -568,17 +611,9 @@ sub cgi (;$$) { #{{{
                }
        }
        
                }
        }
        

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

        # 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);


@@ -597,86 +632,36 @@ sub cgi (;$$) { #{{{
                                        email => "",
                                        password => "",
                                        regdate => time,
                                        email => "",
                                        password => "",
                                        regdate => time,

-                               });
+                               }) || error("failed adding user");

                        }
                }
        }
                        }
                }
        }

-
-       # Everything below this point needs the user to be signed in.
-       if (((! $config{anonok} || $do eq 'prefs') &&
-            (! defined $session->param("name") ||
-            ! userinfo_get($session->param("name"), "regdate")))
-            || $do eq 'signin') {
-               if ($do ne 'signin' && ! defined $session->param("postsignin")) {
-                       $session->param(postsignin => $ENV{QUERY_STRING});
-               }
-               cgi_signin($q, $session);
-               cgi_savesession($session);
-               return;
-       }
-       elsif (defined $session->param("postsignin")) {
-               cgi_postsignin($q, $session);
-       }
-
-       if (defined $session->param("name") && userinfo_get($session->param("name"), "banned")) {
+       
+       if (defined $session->param("name") &&
+           userinfo_get($session->param("name"), "banned")) {

                print $q->header(-status => "403 Forbidden");
                $session->delete();
                print gettext("You are banned.");
                cgi_savesession($session);
                print $q->header(-status => "403 Forbidden");
                $session->delete();
                print gettext("You are banned.");
                cgi_savesession($session);

-               exit;

        }
        }

-       
-       if ($do eq 'create' || $do eq 'edit') {
-               cgi_editpage($q, $session);
+
+       run_hooks(sessioncgi => sub { shift->($q, $session) });
+
+       if ($do eq 'signin') {
+               cgi_signin($q, $session);
+               cgi_savesession($session);

        }
        elsif ($do eq 'prefs') {
                cgi_prefs($q, $session);
        }
        }
        elsif ($do eq 'prefs') {
                cgi_prefs($q, $session);
        }

-       elsif ($do eq 'blog') {
-               my $page=titlepage(decode_utf8($q->param('title')));
-               $page=~s/(\/)/"__".ord($1)."__"/eg; # escape slashes too
-               # if the page already exists, munge it to be unique
-               my $from=$q->param('from');
-               my $add="";
-               while (exists $pagecase{lc "$from/$page$add"}) {
-                       $add=1 unless length $add;
-                       $add++;
-               }
-               $q->param('page', $page.$add);
-               # now run same as create
-               $q->param('do', 'create');
+       elsif ($do eq 'create' || $do eq 'edit') {

                cgi_editpage($q, $session);
        }
                cgi_editpage($q, $session);
        }

-       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>";
+       elsif (defined $session->param("postsignin") || $do eq 'postsignin') {
+               cgi_postsignin($q, $session);

        }
        else {
        }
        else {

-               return htmllink("", "", escapeHTML(
-                       length $config{userdir} ? $config{userdir}."/".$user : $user
-               ), 1);
+               error("unknown do parameter");

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