X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/0d9539d577886549b51d2bf70167db05f3f2514c..11126bd74ec6a7a8c57a53893db1c980f34b5bae:/IkiWiki/CGI.pm
diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 08d796142..7360ca998 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -2,45 +2,78 @@
use warnings;
use strict;
+use IkiWiki;
+use IkiWiki::UserInfo;
+use open qw{:utf8 :std};
+use Encode;
package IkiWiki;
+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;
my $nonfatal=shift;
my $user=$session->param("name");
- return if length $user && is_admin($user);
+ return if defined $user && is_admin($user);
foreach my $admin (@{$config{adminuser}}) {
my $locked_pages=userinfo_get($admin, "locked_pages");
if (globlist_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.");
+ error(htmllink("", "", $page, 1)." is locked by ".
+ htmllink("", "", $admin, 1)." and cannot be edited.");
}
}
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};
+ memoize("htmllink");
+
+ my $template=template("recentchanges.tmpl");
$template->param(
title => "RecentChanges",
indexlink => indexlink(),
wikiname => $config{wikiname},
changelog => [rcs_recentchanges(100)],
styleurl => styleurl(),
+ baseurl => "$config{url}/",
);
- print $q->header, $template->output;
+ print $q->header(-charset=>'utf-8'), $template->output;
} #}}}
sub cgi_signin ($$) { #{{{
@@ -52,6 +85,7 @@ sub cgi_signin ($$) { #{{{
title => "signin",
fields => [qw(do title page subpage from name password confirm_password email)],
header => 1,
+ charset => "utf-8",
method => 'POST',
validate => {
confirm_password => {
@@ -62,12 +96,14 @@ sub cgi_signin ($$) { #{{{
required => 'NONE',
javascript => 0,
params => $q,
- action => $q->request_uri,
+ action => $config{cgiurl},
header => 0,
template => (-e "$config{templatedir}/signin.tmpl" ?
- "$config{templatedir}/signin.tmpl" : ""),
+ {template_params("signin.tmpl")} : ""),
stylesheet => styleurl(),
);
+
+ decode_form_utf8($form);
$form->field(name => "name", required => 0);
$form->field(name => "do", type => "hidden");
@@ -116,6 +152,7 @@ sub cgi_signin ($$) { #{{{
validate => sub {
my $name=shift;
length $name &&
+ $name=~/$config{wiki_file_regexp}/ &&
! userinfo_get($name, "regdate");
},
);
@@ -146,7 +183,7 @@ sub cgi_signin ($$) { #{{{
$session->param("name", $form->field("name"));
if (defined $form->field("do") &&
$form->field("do") ne 'signin') {
- print $q->redirect(cgiurl(
+ redirect($q, cgiurl(
do => $form->field("do"),
page => $form->field("page"),
title => $form->field("title"),
@@ -155,7 +192,7 @@ sub cgi_signin ($$) { #{{{
));
}
else {
- print $q->redirect($config{url});
+ redirect($q, $config{url});
}
}
elsif ($form->submitted eq 'Register') {
@@ -168,7 +205,7 @@ 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();
+ print $session->header(-charset=>'utf-8');
print misctemplate($form->title, $form->render(submit => ["Login"]));
}
else {
@@ -177,9 +214,7 @@ sub cgi_signin ($$) { #{{{
}
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"),
@@ -189,22 +224,21 @@ sub cgi_signin ($$) { #{{{
);
eval q{use Mail::Sendmail};
- my ($fromhost) = $config{cgiurl} =~ m!/([^/]+)!;
sendmail(
To => userinfo_get($user_name, "email"),
- From => "$config{wikiname} admin <".(getpwuid($>))[0]."@".$fromhost.">",
+ 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();
+ print $session->header(-charset=>'utf-8');
print misctemplate($form->title, $form->render(submit => ["Login", "Register", "Mail Password"]));
}
}
else {
- print $session->header();
+ print $session->header(-charset=>'utf-8');
print misctemplate($form->title, $form->render(submit => ["Login", "Register", "Mail Password"]));
}
} #}}}
@@ -216,8 +250,10 @@ sub cgi_prefs ($$) { #{{{
eval q{use CGI::FormBuilder};
my $form = CGI::FormBuilder->new(
title => "preferences",
- fields => [qw(do name password confirm_password email locked_pages)],
+ fields => [qw(do name password confirm_password email
+ subscriptions locked_pages)],
header => 0,
+ charset => "utf-8",
method => 'POST',
validate => {
confirm_password => {
@@ -228,9 +264,9 @@ sub cgi_prefs ($$) { #{{{
required => 'NONE',
javascript => 0,
params => $q,
- action => $q->request_uri,
+ action => $config{cgiurl},
template => (-e "$config{templatedir}/prefs.tmpl" ?
- "$config{templatedir}/prefs.tmpl" : ""),
+ {template_params("prefs.tmpl")} : ""),
stylesheet => styleurl(),
);
my @buttons=("Save Preferences", "Logout", "Cancel");
@@ -241,8 +277,10 @@ sub cgi_prefs ($$) { #{{{
value => $user_name, force => 1);
$form->field(name => "password", type => "password");
$form->field(name => "confirm_password", type => "password");
+ $form->field(name => "subscriptions", size => 50,
+ comment => "(".htmllink("", "", "GlobList", 1).")");
$form->field(name => "locked_pages", size => 50,
- comment => "(".htmllink("", "GlobList", 1).")");
+ comment => "(".htmllink("", "", "GlobList", 1).")");
if (! is_admin($user_name)) {
$form->field(name => "locked_pages", type => "hidden");
@@ -251,21 +289,25 @@ sub cgi_prefs ($$) { #{{{
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"));
}
+ 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) {
- foreach my $field (qw(password email locked_pages)) {
+ 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");
}
@@ -273,7 +315,7 @@ sub cgi_prefs ($$) { #{{{
$form->text("Preferences saved.");
}
- print $session->header();
+ print $session->header(-charset=>'utf-8');
print misctemplate($form->title, $form->render(submit => \@buttons));
} #}}}
@@ -283,34 +325,60 @@ sub cgi_editpage ($$) { #{{{
eval q{use CGI::FormBuilder};
my $form = CGI::FormBuilder->new(
- fields => [qw(do rcsinfo subpage from page content comments)],
+ fields => [qw(do rcsinfo subpage from page type editcontent comments)],
header => 1,
+ charset => "utf-8",
method => 'POST',
validate => {
- content => '/.+/',
+ editcontent => '/.+/',
},
- required => [qw{content}],
+ required => [qw{editcontent}],
javascript => 0,
params => $q,
- action => $q->request_uri,
+ action => $config{cgiurl},
table => 0,
- template => "$config{templatedir}/editpage.tmpl"
+ template => {template_params("editpage.tmpl")},
);
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(lc($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});
+ }
+ else {
+ $type=$config{default_pageext};
+ }
+ $file=$page.".".$type;
}
+
my $newfile=0;
if (! -e "$config{srcdir}/$file") {
$newfile=1;
@@ -320,29 +388,36 @@ 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 => "content", type => "textarea", rows => 20,
+ $form->field(name => "editcontent", type => "textarea", rows => 20,
cols => 80);
$form->tmpl_param("can_commit", $config{rcs});
$form->tmpl_param("indexlink", indexlink());
$form->tmpl_param("helponformattinglink",
- htmllink("", "HelpOnFormatting", 1));
+ htmllink("", "", "HelpOnFormatting", 1));
$form->tmpl_param("styleurl", styleurl());
+ $form->tmpl_param("baseurl", "$config{url}/");
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));
+ redirect($q, "$config{url}/".htmlpage($page));
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);
$form->tmpl_param("page_preview",
- htmlize($config{default_pageext},
- linkify($form->field('content'), $page)));
+ htmlize($type, linkify($page, $page, filter($page, $content))));
}
else {
$form->tmpl_param("page_preview", "");
@@ -352,18 +427,10 @@ sub cgi_editpage ($$) { #{{{
if (! $form->submitted || $form->submitted eq "Preview" ||
! $form->validate) {
if ($form->field("do") eq "create") {
- if (exists $pagesources{lc($page)}) {
- # hmm, someone else made the page in the
- # meantime?
- print $q->redirect("$config{url}/".htmlpage($page));
- return;
- }
-
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") {
@@ -371,9 +438,9 @@ sub cgi_editpage ($$) { #{{{
}
else {
my $dir=$from."/";
- $dir=~s![^/]+/$!!;
+ $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";
}
@@ -384,35 +451,50 @@ sub cgi_editpage ($$) { #{{{
push @page_locs, $dir.$page;
push @page_locs, "$from/$page";
while (length $dir) {
- $dir=~s![^/]+/$!!;
+ $dir=~s![^/]+/+$!!;
push @page_locs, $dir.$page;
}
-
- @page_locs = grep {
- ! exists $pagesources{lc($_)} &&
- ! page_locked($_, $session, 1)
- } @page_locs;
}
+ @page_locs = grep {
+ ! exists $pagesources{lc($_)} &&
+ ! page_locked($_, $session, 1)
+ } @page_locs;
+
+ if (! @page_locs) {
+ # hmm, someone else made the page in the
+ # meantime?
+ 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") {
page_locked($page, $session);
- if (! defined $form->field('content') ||
- ! length $form->field('content')) {
+ if (! defined $form->field('editcontent') ||
+ ! length $form->field('editcontent')) {
my $content="";
if (exists $pagesources{lc($page)}) {
$content=readfile(srcfile($pagesources{lc($page)}));
$content=~s/\n/\r\n/g;
}
- $form->field(name => "content", value => $content,
+ $form->field(name => "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("editing ".pagetitle($page));
}
@@ -422,13 +504,15 @@ sub cgi_editpage ($$) { #{{{
# save page
page_locked($page, $session);
- my $content=$form->field('content');
+ 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 {
@@ -454,10 +538,12 @@ sub cgi_editpage ($$) { #{{{
$form->field(name => "rcsinfo", value => rcs_prepedit($file),
force => 1);
$form->tmpl_param("page_conflict", 1);
- $form->field("content", value => $conflict, force => 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;
@@ -471,29 +557,31 @@ 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_hyperestraier () { #{{{
- # only works for GET requests
- chdir("$config{wikistatedir}/hyperestraier") || error("chdir: $!");
- exec("./".basename($config{cgiurl})) || error("estseek.cgi failed");
-} #}}}
-
sub cgi () { #{{{
eval q{use CGI};
eval q{use CGI::Session};
my $q=CGI->new;
- if (defined $q->param('phrase')) {
- cgi_hyperestraier();
+ if (exists $hooks{cgi}) {
+ foreach my $id (keys %{$hooks{cgi}}) {
+ $hooks{cgi}{$id}{call}->($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.
@@ -508,14 +596,14 @@ sub cgi () { #{{{
CGI::Session->name("ikiwiki_session_$config{wikiname}");
my $oldmask=umask(077);
- my $session = CGI::Session->new("driver:db_file", $q,
+ my $session = CGI::Session->new("driver:DB_File", $q,
{ FileName => "$config{wikistatedir}/sessions.db" });
umask($oldmask);
# Everything below this point needs the user to be signed in.
- if ((! $config{anonok} && ! defined $session->param("name") ||
- ! defined $session->param("name") ||
- ! userinfo_get($session->param("name"), "regdate")) || $do eq 'signin') {
+ if ((! $config{anonok} &&
+ (! defined $session->param("name") ||
+ ! userinfo_get($session->param("name"), "regdate"))) || $do eq 'signin') {
cgi_signin($q, $session);
# Force session flush with safe umask.