X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/070f255d6cc16dd2eb6c53b40790a5fb905300af..a829378f1da89626ed5a52aaafb57e88cdef4f79:/IkiWiki/CGI.pm
diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 4f4c48876..53237bcdb 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -4,9 +4,35 @@ use warnings;
use strict;
use IkiWiki;
use IkiWiki::UserInfo;
+use open qw{:utf8 :std};
+use Encode;
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;
+ if (! $config{w3mmode}) {
+ print $q->redirect($url);
+ }
+ else {
+ print "Content-type: text/plain\n";
+ print "W3m-control: GOTO $url\n\n";
+ }
+} #}}}
+
sub page_locked ($$;$) { #{{{
my $page=shift;
my $session=shift;
@@ -17,7 +43,7 @@ sub page_locked ($$;$) { #{{{
foreach my $admin (@{$config{adminuser}}) {
my $locked_pages=userinfo_get($admin, "locked_pages");
- if (globlist_match($page, 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.");
@@ -27,24 +53,72 @@ sub page_locked ($$;$) { #{{{
return 0;
} #}}}
+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 cgi_recentchanges ($) { #{{{
my $q=shift;
unlockwiki();
- my $template=HTML::Template->new(
- filename => "$config{templatedir}/recentchanges.tmpl"
- );
+ # 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 $@;
+ eval q{use CGI 'escapeHTML'};
+ error($@) if $@;
+
+ my $changelog=[rcs_recentchanges(100)];
+ foreach my $change (@$changelog) {
+ $change->{when} = concise(ago($change->{when}));
+
+ if ($change->{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 => $change->{user});
+ $change->{user} = "{user}."\">".escapeHTML($oid->display)."";
+ }
+ else {
+ $change->{user} = htmllink("", "", escapeHTML($change->{user}), 1);
+ }
+
+ 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;
+ }
+
+ 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(),
);
- require Encode;
- print $q->header(-charset=>'utf-8'), Encode::decode_utf8($template->output);
+ run_hooks(pagetemplate => sub {
+ shift->(page => "", destpage => "", template => $template);
+ });
+ print $q->header(-charset => 'utf-8'), $template->output;
} #}}}
sub cgi_signin ($$) { #{{{
@@ -52,9 +126,10 @@ sub cgi_signin ($$) { #{{{
my $session=shift;
eval q{use CGI::FormBuilder};
+ error($@) if $@;
my $form = CGI::FormBuilder->new(
title => "signin",
- fields => [qw(do title page subpage from name password confirm_password email)],
+ fields => [qw(do name password openid_url)],
header => 1,
charset => "utf-8",
method => 'POST',
@@ -70,37 +145,69 @@ sub cgi_signin ($$) { #{{{
action => $config{cgiurl},
header => 0,
template => (-e "$config{templatedir}/signin.tmpl" ?
- "$config{templatedir}/signin.tmpl" : ""),
- stylesheet => styleurl(),
+ {template_params("signin.tmpl")} : ""),
+ stylesheet => baseurl()."style.css",
);
+
+ decode_form_utf8($form);
- $form->field(name => "name", required => 0);
+ $form->field(name => "name", required => 0, size => 30);
$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") {
+ if ($config{openid}) {
+ $form->field(name => "openid_url", label => "OpenID", size => 30,
+ comment => '('.
+ htmllink("", "", "OpenID", 1, 0, "What's this?")
+ .($config{openidsignup} ? " | Get an OpenID" : "")
+ .')');
+ }
+ else {
+ $form->field(name => "openid_url", type => "hidden");
+ }
+ if ($form->submitted eq "Register" || $form->submitted eq "Create Account") {
+ $form->title("register");
+ $form->text("");
+ $form->fields(qw(do name password confirm_password email));
+ $form->field(name => "confirm_password", type => "password");
+ $form->field(name => "email", type => "text");
+ $form->field(name => "openid_url", type => "hidden");
+ }
+ if ($q->param("do") ne "signin" && !$form->submitted) {
$form->text("You need to log in first.");
}
if ($form->submitted) {
+ my $submittype=$form->submitted;
+ # OpenID login uses the Login button, but validates
+ # differently.
+ if ($submittype eq "Login" && $config{openid} &&
+ length $form->field("openid_url")) {
+ $submittype="OpenID";
+
+ $form->field(
+ name => "openid_url",
+ validate => sub {
+ # FIXME: ugh
+ IkiWiki::Plugin::openid::validate($q, $session, shift, $form);
+ },
+ );
+ }
+
# Set required fields based on how form was submitted.
my %required=(
"Login" => [qw(name password)],
- "Register" => [qw(name password confirm_password email)],
+ "Register" => [],
+ "Create Account" => [qw(name password confirm_password email)],
"Mail Password" => [qw(name)],
+ "OpenID" => [qw(openid_url)],
);
- foreach my $opt (@{$required{$form->submitted}}) {
+ foreach my $opt (@{$required{$submittype}}) {
$form->field(name => $opt, required => 1);
}
# Validate password differently depending on how
# form was submitted.
- if ($form->submitted eq 'Login') {
+ if ($submittype eq 'Login') {
$form->field(
name => "password",
validate => sub {
@@ -110,12 +217,13 @@ sub cgi_signin ($$) { #{{{
);
$form->field(name => "name", validate => '/^\w+$/');
}
- else {
+ elsif ($submittype ne 'OpenID') {
$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') {
+ if ($submittype eq 'Create Account' ||
+ $submittype eq 'Register') {
$form->field(
name => "name",
validate => sub {
@@ -126,7 +234,7 @@ sub cgi_signin ($$) { #{{{
},
);
}
- else {
+ elsif ($submittype ne 'OpenID') {
$form->field(
name => "name",
validate => sub {
@@ -140,8 +248,6 @@ sub cgi_signin ($$) { #{{{
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"));
}
@@ -150,21 +256,9 @@ sub cgi_signin ($$) { #{{{
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') {
- print $q->redirect(cgiurl(
- do => $form->field("do"),
- page => $form->field("page"),
- title => $form->field("title"),
- subpage => $form->field("subpage"),
- from => $form->field("from"),
- ));
- }
- else {
- print $q->redirect($config{url});
- }
+ cgi_postsignin($q, $session);
}
- elsif ($form->submitted eq 'Register') {
+ elsif ($form->submitted eq 'Create Account') {
my $user_name=$form->field('name');
if (userinfo_setall($user_name, {
'email' => $form->field('email'),
@@ -173,19 +267,17 @@ sub cgi_signin ($$) { #{{{
})) {
$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');
+ $form->text("Account creation successful. Now you can Login.");
+ printheader($session);
print misctemplate($form->title, $form->render(submit => ["Login"]));
}
else {
- error("Error saving registration.");
+ error("Error creating account.");
}
}
elsif ($form->submitted eq 'Mail Password') {
my $user_name=$form->field("name");
- my $template=HTML::Template->new(
- filename => "$config{templatedir}/passwordmail.tmpl"
- );
+ my $template=template("passwordmail.tmpl");
$template->param(
user_name => $user_name,
user_password => userinfo_get($user_name, "password"),
@@ -195,6 +287,7 @@ sub cgi_signin ($$) { #{{{
);
eval q{use Mail::Sendmail};
+ error($@) if $@;
sendmail(
To => userinfo_get($user_name, "email"),
From => "$config{wikiname} admin <$config{adminemail}>",
@@ -204,21 +297,47 @@ sub cgi_signin ($$) { #{{{
$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"]));
+ printheader($session);
+ print misctemplate($form->title, $form->render(submit => ["Login", "Mail Password"]));
+ }
+ elsif ($form->submitted eq "Register") {
+ printheader($session);
+ print misctemplate($form->title, $form->render(submit => ["Create Account"]));
}
}
+ elsif ($form->submitted eq "Create Account") {
+ printheader($session);
+ print misctemplate($form->title, $form->render(submit => ["Create Account"]));
+ }
else {
- print $session->header(-charset=>'utf-8');
+ printheader($session);
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 $q->param("do") && $q->param("do") ne "signin" &&
+ defined $session->param("postsignin")) {
+ my $postsignin=CGI->new($session->param("postsignin"));
+ $session->clear("postsignin");
+ cgi($postsignin, $session);
+ exit;
+ }
+ else {
+ redirect($q, $config{url});
+ }
+} #}}}
+
sub cgi_prefs ($$) { #{{{
my $q=shift;
my $session=shift;
eval q{use CGI::FormBuilder};
+ error($@) if $@;
my $form = CGI::FormBuilder->new(
title => "preferences",
fields => [qw(do name password confirm_password email
@@ -237,24 +356,31 @@ sub cgi_prefs ($$) { #{{{
params => $q,
action => $config{cgiurl},
template => (-e "$config{templatedir}/prefs.tmpl" ?
- "$config{templatedir}/prefs.tmpl" : ""),
- stylesheet => styleurl(),
+ {template_params("prefs.tmpl")} : ""),
+ stylesheet => baseurl()."style.css",
);
my @buttons=("Save Preferences", "Logout", "Cancel");
my $user_name=$session->param("name");
$form->field(name => "do", type => "hidden");
$form->field(name => "name", disabled => 1,
- value => $user_name, force => 1);
+ value => $user_name, force => 1, size => 30);
$form->field(name => "password", type => "password");
$form->field(name => "confirm_password", type => "password");
$form->field(name => "subscriptions", size => 50,
- comment => "(".htmllink("", "", "GlobList", 1).")");
+ comment => "(".htmllink("", "", "PageSpec", 1).")");
$form->field(name => "locked_pages", size => 50,
- comment => "(".htmllink("", "", "GlobList", 1).")");
+ comment => "(".htmllink("", "", "PageSpec", 1).")");
+ $form->field(name => "banned_users", size => 50);
if (! is_admin($user_name)) {
$form->field(name => "locked_pages", type => "hidden");
+ $form->field(name => "banned_users", type => "hidden");
+ }
+
+ if ($config{httpauth}) {
+ $form->field(name => "password", type => "hidden");
+ $form->field(name => "confirm_password", type => "hidden");
}
if (! $form->submitted) {
@@ -264,15 +390,21 @@ sub cgi_prefs ($$) { #{{{
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);
+
if ($form->submitted eq 'Logout') {
$session->delete();
- print $q->redirect($config{url});
+ redirect($q, $config{url});
return;
}
elsif ($form->submitted eq 'Cancel') {
- print $q->redirect($config{url});
+ redirect($q, $config{url});
return;
}
elsif ($form->submitted eq "Save Preferences" && $form->validate) {
@@ -281,10 +413,14 @@ sub cgi_prefs ($$) { #{{{
userinfo_set($user_name, $field, $form->field($field)) || error("failed to set $field");
}
}
+ if (is_admin($user_name)) {
+ set_banned_users(grep { ! is_admin($_) }
+ split(' ', $form->field("banned_users")));
+ }
$form->text("Preferences saved.");
}
- print $session->header(-charset=>'utf-8');
+ printheader($session);
print misctemplate($form->title, $form->render(submit => \@buttons));
} #}}}
@@ -292,9 +428,20 @@ sub cgi_editpage ($$) { #{{{
my $q=shift;
my $session=shift;
- eval q{use CGI::FormBuilder};
+ my @fields=qw(do rcsinfo subpage from page type editcontent comments);
+ my @buttons=("Save Page", "Preview", "Cancel");
+
+ eval q{use CGI::FormBuilder; use CGI::FormBuilder::Template::HTML};
+ error($@) if $@;
+ my $renderer=CGI::FormBuilder::Template::HTML->new(
+ fields => \@fields,
+ template_params("editpage.tmpl"),
+ );
+ run_hooks(pagetemplate => sub {
+ shift->(page => "", destpage => "", template => $renderer->engine);
+ });
my $form = CGI::FormBuilder->new(
- fields => [qw(do rcsinfo subpage from page editcontent comments)],
+ fields => \@fields,
header => 1,
charset => "utf-8",
method => 'POST',
@@ -306,23 +453,44 @@ sub cgi_editpage ($$) { #{{{
params => $q,
action => $config{cgiurl},
table => 0,
- template => "$config{templatedir}/editpage.tmpl"
+ template => $renderer,
);
- my @buttons=("Save Page", "Preview", "Cancel");
- # This untaint is safe because titlepage removes any problimatic
+ decode_form_utf8($form);
+
+ # This untaint is safe because titlepage removes any problematic
# characters.
- my ($page)=titlepage(possibly_foolish_untaint(lc($form->param('page'))));
+ my ($page)=$form->field('page');
+ $page=titlepage(possibly_foolish_untaint($page));
if (! defined $page || ! length $page ||
$page=~/$config{wiki_file_prune_regexp}/ || $page=~/^\//) {
error("bad page name");
}
- $page=lc($page);
- my $file=$page.$config{default_pageext};
- if (exists $pagesources{lc($page)}) {
- $file=$pagesources{lc($page)};
+ my $from;
+ if (defined $form->field('from')) {
+ ($from)=$form->field('from')=~/$config{wiki_file_regexp}/;
}
+
+ my $file;
+ my $type;
+ if (exists $pagesources{$page}) {
+ $file=$pagesources{$page};
+ $type=pagetype($file);
+ }
+ else {
+ $type=$form->param('type');
+ if (defined $type && length $type && $hooks{htmlize}{$type}) {
+ $type=possibly_foolish_untaint($type);
+ }
+ elsif (defined $from) {
+ # 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;
@@ -332,7 +500,8 @@ sub cgi_editpage ($$) { #{{{
$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 => $page, 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,
cols => 80);
@@ -340,25 +509,37 @@ sub cgi_editpage ($$) { #{{{
$form->tmpl_param("indexlink", indexlink());
$form->tmpl_param("helponformattinglink",
htmllink("", "", "HelpOnFormatting", 1));
- $form->tmpl_param("styleurl", styleurl());
- $form->tmpl_param("baseurl", "$config{url}/");
+ $form->tmpl_param("baseurl", baseurl());
if (! $form->submitted) {
$form->field(name => "rcsinfo", value => rcs_prepedit($file),
force => 1);
}
if ($form->submitted eq "Cancel") {
- print $q->redirect("$config{url}/".htmlpage($page));
+ if ($newfile && defined $from) {
+ redirect($q, "$config{url}/".htmlpage($from));
+ }
+ elsif ($newfile) {
+ redirect($q, $config{url});
+ }
+ else {
+ redirect($q, "$config{url}/".htmlpage($page));
+ }
return;
}
elsif ($form->submitted eq "Preview") {
- require IkiWiki::Render;
- require Encode;
- my $content = Encode::decode_utf8($form->field('editcontent'));
- $form->field(name => "editcontent", value => $content, 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",
- Encode::decode_utf8(htmlize($config{default_pageext},
- linkify($page, $page, $content))));
+ htmlize($page, $type,
+ linkify($page, "",
+ preprocess($page, $page,
+ filter($page, $content)))));
}
else {
$form->tmpl_param("page_preview", "");
@@ -370,9 +551,8 @@ sub cgi_editpage ($$) { #{{{
if ($form->field("do") eq "create") {
my @page_locs;
my $best_loc;
- my ($from)=$form->param('from')=~/$config{wiki_file_regexp}/;
if (! defined $from || ! length $from ||
- $from ne $form->param('from') ||
+ $from ne $form->field('from') ||
$from=~/$config{wiki_file_prune_regexp}/ ||
$from=~/^\// ||
$form->submitted eq "Preview") {
@@ -382,7 +562,7 @@ sub cgi_editpage ($$) { #{{{
my $dir=$from."/";
$dir=~s![^/]+/+$!!;
- if ((defined $form->param('subpage') && length $form->param('subpage')) ||
+ if ((defined $form->field('subpage') && length $form->field('subpage')) ||
$page eq 'discussion') {
$best_loc="$from/$page";
}
@@ -399,20 +579,27 @@ sub cgi_editpage ($$) { #{{{
}
@page_locs = grep {
- ! exists $pagesources{lc($_)} &&
+ ! exists $pagecase{lc $_} &&
! page_locked($_, $session, 1)
} @page_locs;
if (! @page_locs) {
# hmm, someone else made the page in the
# meantime?
- print $q->redirect("$config{url}/".htmlpage($page));
+ redirect($q, "$config{url}/".htmlpage($page));
return;
}
-
+
+ my @page_types;
+ if (exists $hooks{htmlize}) {
+ @page_types=keys %{$hooks{htmlize}};
+ }
+
$form->tmpl_param("page_select", 1);
$form->field(name => "page", type => 'select',
options => \@page_locs, value => $best_loc);
+ $form->field(name => "type", type => 'select',
+ options => \@page_types);
$form->title("creating ".pagetitle($page));
}
elsif ($form->field("do") eq "edit") {
@@ -420,9 +607,8 @@ sub cgi_editpage ($$) { #{{{
if (! defined $form->field('editcontent') ||
! length $form->field('editcontent')) {
my $content="";
- if (exists $pagesources{lc($page)}) {
- require Encode;
- $content=Encode::decode_utf8(readfile(srcfile($pagesources{lc($page)})));
+ if (exists $pagesources{$page}) {
+ $content=readfile(srcfile($pagesources{$page}));
$content=~s/\n/\r\n/g;
}
$form->field(name => "editcontent", value => $content,
@@ -430,6 +616,7 @@ sub cgi_editpage ($$) { #{{{
}
$form->tmpl_param("page_select", 0);
$form->field(name => "page", type => 'hidden');
+ $form->field(name => "type", type => 'hidden');
$form->title("editing ".pagetitle($page));
}
@@ -440,12 +627,14 @@ sub cgi_editpage ($$) { #{{{
page_locked($page, $session);
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 (length $session->param("name")) {
+ if (defined $session->param("name") &&
+ length $session->param("name")) {
$message.="by ".$session->param("name");
}
else {
@@ -453,8 +642,7 @@ sub cgi_editpage ($$) { #{{{
}
if (defined $form->field('comments') &&
length $form->field('comments')) {
- require Encode;
- $message.=Encode::decode_utf8(": ".$form->field('comments'));
+ $message.=": ".$form->field('comments');
}
if ($config{rcs}) {
@@ -473,9 +661,11 @@ sub cgi_editpage ($$) { #{{{
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;
@@ -489,25 +679,32 @@ sub cgi_editpage ($$) { #{{{
# The trailing question mark tries to avoid broken
# caches and get the most recent version of the page.
- print $q->redirect("$config{url}/".htmlpage($page)."?updated");
+ redirect($q, "$config{url}/".htmlpage($page)."?updated");
}
} #}}}
-sub cgi () { #{{{
- eval q{use CGI};
- eval q{use CGI::Session};
+sub cgi (;$$) { #{{{
+ my $q=shift;
+ my $session=shift;
+
+ if (! $q) {
+ eval q{use CGI; use CGI::Session};
+ error($@) if $@;
- my $q=CGI->new;
+ $q=CGI->new;
- if (exists $hooks{cgi}) {
- foreach my $id (keys %{$hooks{cgi}}) {
- $hooks{cgi}{$id}{call}->($q);
- }
+ run_hooks(cgi => sub { shift->($q) });
}
-
+
my $do=$q->param('do');
if (! defined $do || ! length $do) {
- error("\"do\" parameter missing");
+ my $error = $q->cgi_error;
+ if ($error) {
+ error("Request not processed: $error");
+ }
+ else {
+ error("\"do\" parameter missing");
+ }
}
# Things that do not need a session.
@@ -519,17 +716,41 @@ sub cgi () { #{{{
cgi_hyperestraier();
}
- CGI::Session->name("ikiwiki_session_$config{wikiname}");
+ if (! $session) {
+ CGI::Session->name("ikiwiki_session_".encode_utf8($config{wikiname}));
- my $oldmask=umask(077);
- my $session = CGI::Session->new("driver:DB_File", $q,
- { FileName => "$config{wikistatedir}/sessions.db" });
- umask($oldmask);
+ my $oldmask=umask(077);
+ $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,
+ });
+ }
+ }
+ }
+
# Everything below this point needs the user to be signed in.
- if ((! $config{anonok} &&
+ if (((! $config{anonok} || $do eq 'prefs') &&
(! defined $session->param("name") ||
- ! userinfo_get($session->param("name"), "regdate"))) || $do eq 'signin') {
+ ! 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);
# Force session flush with safe umask.
@@ -539,6 +760,16 @@ sub cgi () { #{{{
return;
}
+ elsif (defined $session->param("postsignin")) {
+ cgi_postsignin($q, $session);
+ }
+
+ if (defined $session->param("name") && userinfo_get($session->param("name"), "banned")) {
+ print $q->header(-status => "403 Forbidden");
+ $session->delete();
+ print "You are banned.";
+ exit;
+ }
if ($do eq 'create' || $do eq 'edit') {
cgi_editpage($q, $session);
@@ -547,11 +778,11 @@ sub cgi () { #{{{
cgi_prefs($q, $session);
}
elsif ($do eq 'blog') {
- my $page=titlepage(lc($q->param('title')));
+ my $page=titlepage(decode_utf8($q->param('title')));
# if the page already exists, munge it to be unique
my $from=$q->param('from');
my $add="";
- while (exists $oldpagemtime{"$from/$page$add"}) {
+ while (exists $pagecase{lc "$from/$page$add"}) {
$add=1 unless length $add;
$add++;
}