web commit by MarkusSchaber: fixed formatting error by adding blank line.

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

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 4c15be0aeecb09221d27863ceb580d55f759d66e..cd6ddc0345350c79566dfbad5235b235ad4b0cac 100644 (file)
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -9,6 +9,18 @@ use Encode;
 
 package IkiWiki;
 
 
 package IkiWiki;
 

+sub printheader ($) { #{{{
+       my $session=shift;
+       
+       if ($config{sslcookie}) {
+               print $session->header(-charset => 'utf-8',
+                       -cookie => $session->cookie(-secure => 1));
+       } else {
+               print $session->header(-charset => 'utf-8');
+       }
+
+} #}}}
+

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


@@ -21,24 +33,25 @@ 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(htmllink("", "", $page, 1)." is locked by ".
-                             htmllink("", "", $admin, 1)." and cannot be edited.");
+       my $canedit;
+       run_hooks(canedit => sub {
+               return if defined $canedit;
+               my $ret=shift->($page, $q, $session);
+               if (defined $ret && $ret eq "") {
+                       $canedit=1;

                }
                }

-       }
-
-       return 0;
+               elsif (defined $ret) {
+                       $canedit=0;
+                       error($ret) unless $nonfatal;
+               }
+       });
+       return $canedit;

 } #}}}
 
 sub decode_form_utf8 ($) { #{{{
 } #}}}
 
 sub decode_form_utf8 ($) { #{{{


@@ -55,191 +68,131 @@ sub decode_form_utf8 ($) { #{{{
 sub cgi_recentchanges ($) { #{{{
        my $q=shift;
        
 sub cgi_recentchanges ($) { #{{{
        my $q=shift;
        

-       unlockwiki();
-

        # 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};
        # 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");
 
        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},
        my $template=template("recentchanges.tmpl"); 
        $template->param(
                title => "RecentChanges",
                indexlink => indexlink(),
                wikiname => $config{wikiname},

-               changelog => [rcs_recentchanges(100)],
-               styleurl => styleurl(),
-               baseurl => "$config{url}/",
+               changelog => $changelog,
+               baseurl => baseurl(),

        );
        );

-       print $q->header(-charset=>'utf-8'), $template->output;
+       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 ($$) { #{{{
+       my $q=shift;
+       my $session=shift;
+
+       if (! defined $session->param("name") ||
+           ! userinfo_get($session->param("name"), "regdate")) {
+               if (! defined $session->param("postsignin")) {
+                       $session->param(postsignin => $ENV{QUERY_STRING});
+               }
+               cgi_signin($q, $session);
+               cgi_savesession($session);
+               exit;
+       }
+} #}}} 
+

 sub cgi_signin ($$) { #{{{
        my $q=shift;
        my $session=shift;
 
        eval q{use CGI::FormBuilder};
 sub cgi_signin ($$) { #{{{
        my $q=shift;
        my $session=shift;
 
        eval q{use CGI::FormBuilder};

+       error($@) if $@;

        my $form = CGI::FormBuilder->new(
                title => "signin",
        my $form = CGI::FormBuilder->new(
                title => "signin",

-               fields => [qw(do title page subpage from name password confirm_password email)],

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

-               validate => {
-                       confirm_password => {
-                               perl => q{eq $form->field("password")},
-                       },
-                       email => 'EMAIL',
-               },

                required => 'NONE',
                javascript => 0,
                params => $q,
                action => $config{cgiurl},
                header => 0,
                required => 'NONE',
                javascript => 0,
                params => $q,
                action => $config{cgiurl},
                header => 0,

-               template => (-e "$config{templatedir}/signin.tmpl" ?
-                            {template_params("signin.tmpl")} : ""),
-               stylesheet => styleurl(),
+               template => scalar template_params("signin.tmpl"),
+               stylesheet => baseurl()."style.css",

        );
        );

-               
-       decode_form_utf8($form);
+       my $buttons=["Login"];

        
        

-       $form->field(name => "name", required => 0);
-       $form->field(name => "do", type => "hidden");
-       $form->field(name => "page", type => "hidden");
-       $form->field(name => "title", type => "hidden");
-       $form->field(name => "from", type => "hidden");
-       $form->field(name => "subpage", type => "hidden");
-       $form->field(name => "password", type => "password", required => 0);
-       $form->field(name => "confirm_password", type => "password", required => 0);
-       $form->field(name => "email", required => 0);

        if ($q->param("do") ne "signin" && !$form->submitted) {
        if ($q->param("do") ne "signin" && !$form->submitted) {

-               $form->text("You need to log in first.");
+               $form->text(gettext("You need to log in first."));

        }
        }

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

        
        

-       if ($form->submitted) {
-               # Set required fields based on how form was submitted.
-               my %required=(
-                       "Login" => [qw(name password)],
-                       "Register" => [qw(name password confirm_password email)],
-                       "Mail Password" => [qw(name)],
-               );
-               foreach my $opt (@{$required{$form->submitted}}) {
-                       $form->field(name => $opt, required => 1);
-               }
+       run_hooks(formbuilder_setup => sub {
+               shift->(form => $form, cgi => $q, session => $session);
+       });

        
        

-               # Validate password differently depending on how
-               # form was submitted.
-               if ($form->submitted eq 'Login') {
-                       $form->field(
-                               name => "password",
-                               validate => sub {
-                                       length $form->field("name") &&
-                                       shift eq userinfo_get($form->field("name"), 'password');
-                               },
-                       );
-                       $form->field(name => "name", validate => '/^\w+$/');
-               }
-               else {
-                       $form->field(name => "password", validate => 'VALUE');
-               }
-               # And make sure the entered name exists when logging
-               # in or sending email, and does not when registering.
-               if ($form->submitted eq 'Register') {
-                       $form->field(
-                               name => "name",
-                               validate => sub {
-                                       my $name=shift;
-                                       length $name &&
-                                       $name=~/$config{wiki_file_regexp}/ &&
-                                       ! userinfo_get($name, "regdate");
-                               },
-                       );
-               }
-               else {
-                       $form->field(
-                               name => "name",
-                               validate => sub {
-                                       my $name=shift;
-                                       length $name &&
-                                       userinfo_get($name, "regdate");
-                               },
-                       );
-               }
+       decode_form_utf8($form);
+
+       if (exists $hooks{formbuilder}) {
+               run_hooks(formbuilder => sub {
+                       shift->(form => $form, cgi => $q, session => $session,
+                               buttons => $buttons);
+               });

        }
        else {
        }
        else {

-               # First time settings.
-               $form->field(name => "name", comment => "use FirstnameLastName");
-               $form->field(name => "confirm_password", comment => "(only needed");
-               $form->field(name => "email",            comment => "for registration)");
-               if ($session->param("name")) {
-                       $form->field(name => "name", value => $session->param("name"));
+               if ($form->submitted) {
+                       $form->validate;

                }
                }

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

        }
        }

+} #}}}

 
 

-       if ($form->submitted && $form->validate) {
-               if ($form->submitted eq 'Login') {
-                       $session->param("name", $form->field("name"));
-                       if (defined $form->field("do") && 
-                           $form->field("do") ne 'signin') {
-                               redirect($q, cgiurl(
-                                       do => $form->field("do"),
-                                       page => $form->field("page"),
-                                       title => $form->field("title"),
-                                       subpage => $form->field("subpage"),
-                                       from => $form->field("from"),
-                               ));
-                       }
-                       else {
-                               redirect($q, $config{url});
-                       }
-               }
-               elsif ($form->submitted eq 'Register') {
-                       my $user_name=$form->field('name');
-                       if (userinfo_setall($user_name, {
-                                          'email' => $form->field('email'),
-                                          'password' => $form->field('password'),
-                                          'regdate' => time
-                                        })) {
-                               $form->field(name => "confirm_password", type => "hidden");
-                               $form->field(name => "email", type => "hidden");
-                               $form->text("Registration successful. Now you can Login.");
-                               print $session->header(-charset=>'utf-8');
-                               print misctemplate($form->title, $form->render(submit => ["Login"]));
-                       }
-                       else {
-                               error("Error saving registration.");
-                       }
-               }
-               elsif ($form->submitted eq 'Mail Password') {
-                       my $user_name=$form->field("name");
-                       my $template=template("passwordmail.tmpl");
-                       $template->param(
-                               user_name => $user_name,
-                               user_password => userinfo_get($user_name, "password"),
-                               wikiurl => $config{url},
-                               wikiname => $config{wikiname},
-                               REMOTE_ADDR => $ENV{REMOTE_ADDR},
-                       );
-                       
-                       eval q{use Mail::Sendmail};
-                       sendmail(
-                               To => userinfo_get($user_name, "email"),
-                               From => "$config{wikiname} admin <$config{adminemail}>",
-                               Subject => "$config{wikiname} information",
-                               Message => $template->output,
-                       ) or error("Failed to send mail");
-                       
-                       $form->text("Your password has been emailed to you.");
-                       $form->field(name => "name", required => 0);
-                       print $session->header(-charset=>'utf-8');
-                       print misctemplate($form->title, $form->render(submit => ["Login", "Register", "Mail Password"]));
-               }
+sub cgi_postsignin ($$) { #{{{
+       my $q=shift;
+       my $session=shift;
+       
+       # Continue with whatever was being done before the signin process.
+       if (defined $session->param("postsignin")) {
+               my $postsignin=CGI->new($session->param("postsignin"));
+               $session->clear("postsignin");
+               cgi($postsignin, $session);
+               cgi_savesession($session);
+               exit;

        }
        else {
        }
        else {

-               print $session->header(-charset=>'utf-8');
-               print misctemplate($form->title, $form->render(submit => ["Login", "Register", "Mail Password"]));
+               # This can occur, for example, if a user went to the signin
+               # url via a bookmark.
+               redirect($q, $config{url});

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


@@ -247,52 +200,51 @@ sub cgi_prefs ($$) { #{{{
        my $q=shift;
        my $session=shift;
 
        my $q=shift;
        my $session=shift;
 

+       needsignin($q, $session);
+

        eval q{use CGI::FormBuilder};
        eval q{use CGI::FormBuilder};

+       error($@) if $@;

        my $form = CGI::FormBuilder->new(
                title => "preferences",
        my $form = CGI::FormBuilder->new(
                title => "preferences",

-               fields => [qw(do name password confirm_password email 
-                             subscriptions locked_pages)],

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

-                       confirm_password => {
-                               perl => q{eq $form->field("password")},
-                       },

                        email => 'EMAIL',
                },
                required => 'NONE',
                javascript => 0,
                params => $q,
                action => $config{cgiurl},
                        email => 'EMAIL',
                },
                required => 'NONE',
                javascript => 0,
                params => $q,
                action => $config{cgiurl},

-               template => (-e "$config{templatedir}/prefs.tmpl" ?
-                            {template_params("prefs.tmpl")} : ""),
-               stylesheet => styleurl(),
+               template => scalar template_params("prefs.tmpl"),
+               stylesheet => baseurl()."style.css",

        );
        );

-       my @buttons=("Save Preferences", "Logout", "Cancel");
+       my $buttons=["Save Preferences", "Logout", "Cancel"];
+
+       run_hooks(formbuilder_setup => sub {
+               shift->(form => $form, cgi => $q, session => $session);
+       });

        
        

-       my $user_name=$session->param("name");

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

-       $form->field(name => "name", disabled => 1,
-               value => $user_name, force => 1);
-       $form->field(name => "password", type => "password");
-       $form->field(name => "confirm_password", type => "password");
+       $form->field(name => "email", size => 50);

        $form->field(name => "subscriptions", size => 50,
        $form->field(name => "subscriptions", size => 50,

-               comment => "(".htmllink("", "", "PageSpec", 1).")");
-       $form->field(name => "locked_pages", size => 50,
-               comment => "(".htmllink("", "", "PageSpec", 1).")");
+               comment => "(".htmllink("", "", "PageSpec", noimageinline => 1).")");
+       $form->field(name => "banned_users", size => 50);

        
        

+       my $user_name=$session->param("name");

        if (! is_admin($user_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 => "subscriptions", force => 1,
                        value => userinfo_get($user_name, "subscriptions"));
        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()));
+               }

        }
        
        decode_form_utf8($form);
        }
        
        decode_form_utf8($form);


@@ -306,26 +258,46 @@ sub cgi_prefs ($$) { #{{{
                redirect($q, $config{url});
                return;
        }
                redirect($q, $config{url});
                return;
        }

-       elsif ($form->submitted eq "Save Preferences" && $form->validate) {
-               foreach my $field (qw(password email subscriptions locked_pages)) {
-                       if (length $form->field($field)) {
-                               userinfo_set($user_name, $field, $form->field($field)) || error("failed to set $field");
+       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");

                        }
                }
                        }
                }

-               $form->text("Preferences saved.");
+               if (is_admin($user_name)) {
+                       set_banned_users(grep { ! is_admin($_) }
+                                       split(' ',
+                                               $form->field("banned_users"))) ||
+                               error("failed saving changes");
+               }
+               $form->text(gettext("Preferences saved."));

        }
        
        }
        

-       print $session->header(-charset=>'utf-8');
-       print misctemplate($form->title, $form->render(submit => \@buttons));
+       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));
+       }

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

+       my @fields=qw(do rcsinfo subpage from page type editcontent comments
+                     newfile);
+       my @buttons=("Save Page", "Preview", "Cancel");
+       

        eval q{use CGI::FormBuilder};
        eval q{use CGI::FormBuilder};

+       error($@) if $@;

        my $form = CGI::FormBuilder->new(
        my $form = CGI::FormBuilder->new(

-               fields => [qw(do rcsinfo subpage from page type editcontent comments)],
+               fields => \@fields,

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


@@ -337,9 +309,12 @@ sub cgi_editpage ($$) { #{{{
                params => $q,
                action => $config{cgiurl},
                table => 0,
                params => $q,
                action => $config{cgiurl},
                table => 0,

-               template => {template_params("editpage.tmpl")},
+               template => scalar template_params("editpage.tmpl"),

        );
        );

-       my @buttons=("Save Page", "Preview", "Cancel");
+       
+       run_hooks(formbuilder_setup => sub {
+               shift->(form => $form, cgi => $q, session => $session);
+       });

        
        decode_form_utf8($form);
        
        
        decode_form_utf8($form);
        


@@ -347,8 +322,7 @@ 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 ||
-           $page=~/$config{wiki_file_prune_regexp}/ || $page=~/^\//) {
+       if (! defined $page || ! length $page || file_pruned($page, $config{srcdir}) || $page=~/^\//) {

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


@@ -362,6 +336,9 @@ sub cgi_editpage ($$) { #{{{
        if (exists $pagesources{$page}) {
                $file=$pagesources{$page};
                $type=pagetype($file);
        if (exists $pagesources{$page}) {
                $file=$pagesources{$page};
                $type=pagetype($file);

+               if (! defined $type) {
+                       error(sprintf(gettext("%s is not an editable page"), $page));
+               }

        }
        else {
                $type=$form->param('type');
        }
        else {
                $type=$form->param('type');


@@ -376,10 +353,6 @@ sub cgi_editpage ($$) { #{{{
                $file=$page.".".$type;
        }
 
                $file=$page.".".$type;
        }
 

-       my $newfile=0;
-       if (! -e "$config{srcdir}/$file") {
-               $newfile=1;
-       }

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


@@ -390,31 +363,45 @@ sub cgi_editpage ($$) { #{{{
        $form->field(name => "comments", type => "text", size => 80);
        $form->field(name => "editcontent", type => "textarea", rows => 20,
                cols => 80);
        $form->field(name => "comments", type => "text", size => 80);
        $form->field(name => "editcontent", type => "textarea", rows => 20,
                cols => 80);

+       $form->field(name => "newfile", type => 'hidden');

        $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));
-       $form->tmpl_param("styleurl", styleurl());
-       $form->tmpl_param("baseurl", "$config{url}/");
+               htmllink("", "", "HelpOnFormatting", noimageinline => 1));
+       $form->tmpl_param("baseurl", baseurl());

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

+               $form->field(name => "newfile", 
+                       value => ! -e "$config{srcdir}/$file",
+                       force => 1);

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

-               redirect($q, "$config{url}/".htmlpage($page));
+               if ($form->field(name => "newfile") && defined $from) {
+                       redirect($q, "$config{url}/".htmlpage($from));
+               }
+               elsif ($form->field(name => "newfile")) {
+                       redirect($q, $config{url});
+               }
+               else {
+                       redirect($q, "$config{url}/".htmlpage($page));
+               }

                return;
        }
        elsif ($form->submitted eq "Preview") {
                return;
        }
        elsif ($form->submitted eq "Preview") {

-               require IkiWiki::Render;

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

                $form->tmpl_param("page_preview",
                $form->tmpl_param("page_preview",

-                       htmlize($type, linkify($page, $page, filter($page, $content))));
+                       htmlize($page, $type,
+                       linkify($page, "",
+                       preprocess($page, $page,
+                       filter($page, $content)))));

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


@@ -428,7 +415,7 @@ sub cgi_editpage ($$) { #{{{
                        my $best_loc;
                        if (! defined $from || ! length $from ||
                            $from ne $form->field('from') ||
                        my $best_loc;
                        if (! defined $from || ! length $from ||
                            $from ne $form->field('from') ||

-                           $from=~/$config{wiki_file_prune_regexp}/ ||
+                           file_pruned($from, $config{srcdir}) ||

                            $from=~/^\// ||
                            $form->submitted eq "Preview") {
                                @page_locs=$best_loc=$page;
                            $from=~/^\// ||
                            $form->submitted eq "Preview") {
                                @page_locs=$best_loc=$page;


@@ -438,7 +425,7 @@ sub cgi_editpage ($$) { #{{{
                                $dir=~s![^/]+/+$!!;
                                
                                if ((defined $form->field('subpage') && length $form->field('subpage')) ||
                                $dir=~s![^/]+/+$!!;
                                
                                if ((defined $form->field('subpage') && length $form->field('subpage')) ||

-                                   $page eq 'discussion') {
+                                   $page eq gettext('discussion')) {

                                        $best_loc="$from/$page";
                                }
                                else {
                                        $best_loc="$from/$page";
                                }
                                else {


@@ -452,18 +439,26 @@ sub cgi_editpage ($$) { #{{{
                                        push @page_locs, $dir.$page;
                                }
                        }
                                        push @page_locs, $dir.$page;
                                }
                        }

+                       push @page_locs, "$config{userdir}/$page"
+                               if length $config{userdir};

 
                        @page_locs = grep {
 
                        @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}) {


@@ -472,13 +467,14 @@ sub cgi_editpage ($$) { #{{{
                        
                        $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 => $best_loc);

                        $form->field(name => "type", type => 'select',
                                options => \@page_types);
                        $form->field(name => "type", type => 'select',
                                options => \@page_types);

-                       $form->title("creating ".pagetitle($page));
+                       $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="";


@@ -492,80 +488,134 @@ sub cgi_editpage ($$) { #{{{
                        $form->tmpl_param("page_select", 0);
                        $form->field(name => "page", type => 'hidden');
                        $form->field(name => "type", type => 'hidden');
                        $form->tmpl_param("page_select", 0);
                        $form->field(name => "page", type => 'hidden');
                        $form->field(name => "type", type => 'hidden');

-                       $form->title("editing ".pagetitle($page));
+                       $form->title(sprintf(gettext("editing %s"), pagetitle($page)));

                }
                
                print $form->render(submit => \@buttons);
        }
        else {
                # save page
                }
                
                print $form->render(submit => \@buttons);
        }
        else {
                # save page

-               page_locked($page, $session);
+               check_canedit($page, $q, $session);
+               if (! -e "$config{srcdir}/$file" && ! $form->field(name => 'newfile')){
+                       $form->tmpl_param("page_gone", 1);
+                       $form->field(name => "newfile",
+                                    value => 1, force => 1);
+                       $form->tmpl_param("page_select", 0);
+                       $form->field(name => "page", type => 'hidden');
+                       $form->field(name => "type", type => 'hidden');
+                       print $form->render(submit => \@buttons);
+                       return;
+               }

                
                my $content=$form->field('editcontent');
 
                $content=~s/\r\n/\n/g;
                $content=~s/\r/\n/g;
                
                my $content=$form->field('editcontent');
 
                $content=~s/\r\n/\n/g;
                $content=~s/\r/\n/g;

-               writefile($file, $config{srcdir}, $content);
-               
-               my $message="web commit ";
-               if (defined $session->param("name") && 
-                   length $session->param("name")) {
-                       $message.="by ".$session->param("name");
-               }
-               else {
-                       $message.="from $ENV{REMOTE_ADDR}";
-               }
-               if (defined $form->field('comments') &&
-                   length $form->field('comments')) {
-                       $message.=": ".$form->field('comments');
+
+               $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));
+                       print $form->render(submit => \@buttons);
+                       return;

                }
                
                }
                

+               my $conflict;

                if ($config{rcs}) {
                if ($config{rcs}) {

-                       if ($newfile) {
+                       my $message="";
+                       if (defined $form->field('comments') &&
+                           length $form->field('comments')) {
+                               $message=$form->field('comments');
+                       }
+                       
+                       if ($form->field(name => "newfile")) {

                                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,
-                               $form->field("rcsinfo"));
+
+                       # Prevent deadlock with post-commit hook by
+                       # signaling to it that it should not try to
+                       # do anything (except send commit mails).
+                       disable_commit_hook();
+                       $conflict=rcs_commit($file, $message,
+                               $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("editing $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));
+                       print $form->render(submit => \@buttons);
+                       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");

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

-sub cgi () { #{{{
-       eval q{use CGI};
+sub cgi_getsession ($) { #{{{
+       my $q=shift;
+

        eval q{use CGI::Session};
        eval q{use CGI::Session};

+       CGI::Session->name("ikiwiki_session_".encode_utf8($config{wikiname}));

        
        

-       my $q=CGI->new;
+       my $oldmask=umask(077);
+       my $session = CGI::Session->new("driver:DB_File", $q,
+               { FileName => "$config{wikistatedir}/sessions.db" });
+       umask($oldmask);
+
+       return $session;
+} #}}}
+
+sub cgi_savesession ($) { #{{{
+       my $session=shift;
+
+       # Force session flush with safe umask.
+       my $oldmask=umask(077);
+       $session->flush;
+       umask($oldmask);
+} #}}}
+
+sub cgi (;$$) { #{{{
+       my $q=shift;
+       my $session=shift;
+
+       if (! $q) {
+               eval q{use CGI};
+               error($@) if $@;

        
        

-       run_hooks(cgi => sub { shift->($q) });
+               $q=CGI->new;

        
        

+               run_hooks(cgi => sub { shift->($q) });
+       }
+

        my $do=$q->param('do');
        if (! defined $do || ! length $do) {
                my $error = $q->cgi_error;
        my $do=$q->param('do');
        if (! defined $do || ! length $do) {
                my $error = $q->cgi_error;


@@ -585,36 +635,55 @@ sub cgi () { #{{{
        elsif ($do eq 'hyperestraier') {
                cgi_hyperestraier();
        }
        elsif ($do eq 'hyperestraier') {
                cgi_hyperestraier();
        }

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

        
        

-       CGI::Session->name("ikiwiki_session_$config{wikiname}");
+       if (! $session) {
+               $session=cgi_getsession($q);
+       }

        
        

-       my $oldmask=umask(077);
-       my $session = CGI::Session->new("driver:DB_File", $q,
-               { FileName => "$config{wikistatedir}/sessions.db" });
-       umask($oldmask);
+       # Auth hooks can sign a user in.
+       if ($do ne 'signin' && ! defined $session->param("name")) {
+               run_hooks(auth => sub {
+                       shift->($q, $session)
+               });
+               if (defined $session->param("name")) {
+                       # Make sure whatever user was authed is in the
+                       # userinfo db.
+                       if (! userinfo_get($session->param("name"), "regdate")) {
+                               userinfo_setall($session->param("name"), {
+                                       email => "",
+                                       password => "",
+                                       regdate => time,
+                               }) || error("failed adding user");
+                       }
+               }
+       }

        
        

-       # Everything below this point needs the user to be signed in.
-       if ((! $config{anonok} &&
-            (! defined $session->param("name") ||
-            ! userinfo_get($session->param("name"), "regdate"))) || $do eq 'signin') {
+       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);
+       }
+       elsif ($do eq 'signin') {

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

-       
-               # Force session flush with safe umask.
-               my $oldmask=umask(077);
-               $session->flush;
-               umask($oldmask);
-               
-               return;
+               cgi_savesession($session);

        }
        }

-       
-       if ($do eq 'create' || $do eq 'edit') {
-               cgi_editpage($q, $session);
+       elsif (defined $session->param("postsignin")) {
+               cgi_postsignin($q, $session);

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

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

        elsif ($do eq 'blog') {
                my $page=titlepage(decode_utf8($q->param('title')));
        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="";
                # if the page already exists, munge it to be unique
                my $from=$q->param('from');
                my $add="";


@@ -627,9 +696,40 @@ sub cgi () { #{{{
                $q->param('do', 'create');
                cgi_editpage($q, $session);
        }
                $q->param('do', 'create');
                cgi_editpage($q, $session);
        }

+       elsif ($do eq 'postsignin') {
+               error(gettext("login failed, perhaps you need to turn on cookies?"));
+       }

        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