X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/29e6ff03b078a0c6abb659c9e81343d523d3b13a..bc79a6d50398a9718f15cf2247e24c429ab4a30e:/IkiWiki/CGI.pm
diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 6c489df8d..788d0487e 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -20,6 +20,24 @@ 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);
+ });
+ }
+ else {
+ printheader($session);
+ print misctemplate($form->title, $form->render(submit => $buttons));
+ }
+}
sub redirect ($$) { #{{{
my $q=shift;
@@ -89,7 +107,9 @@ sub cgi_recentchanges ($) { #{{{
delete @{$change->{pages}}[10 .. @{$change->{pages}}] if $is_excess;
$change->{pages} = [
map {
- $_->{link} = htmllink("", "", $_->{page}, 1, 0, pagetitle($_->{page}));
+ $_->{link} = htmllink("", "", $_->{page},
+ noimageinline => 1,
+ linktext => pagetitle($_->{page}));
$_;
} @{$change->{pages}}
];
@@ -135,7 +155,7 @@ sub cgi_signin ($$) { #{{{
error($@) if $@;
my $form = CGI::FormBuilder->new(
title => "signin",
- header => 1,
+ name => "signin",
charset => "utf-8",
method => 'POST',
required => 'NONE',
@@ -143,7 +163,7 @@ sub cgi_signin ($$) { #{{{
params => $q,
action => $config{cgiurl},
header => 0,
- template => scalar template_params("signin.tmpl"),
+ template => {type => 'div'},
stylesheet => baseurl()."style.css",
);
my $buttons=["Login"];
@@ -154,37 +174,37 @@ sub cgi_signin ($$) { #{{{
$form->field(name => "do", type => "hidden", value => "signin",
force => 1);
+ decode_form_utf8($form);
+
run_hooks(formbuilder_setup => sub {
- shift->(form => $form, cgi => $q, session => $session);
+ 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;
-
+
# Continue with whatever was being done before the signin process.
- my $postsignin=CGI->new($session->param("postsignin"));
- $session->clear("postsignin");
- cgi($postsignin, $session);
- cgi_savesession($session);
- exit;
+ if (defined $session->param("postsignin")) {
+ my $postsignin=CGI->new($session->param("postsignin"));
+ $session->clear("postsignin");
+ cgi($postsignin, $session);
+ cgi_savesession($session);
+ exit;
+ }
+ else {
+ # This can occur, for example, if a user went to the signin
+ # url via a bookmark.
+ redirect($q, $config{url});
+ }
} #}}}
sub cgi_prefs ($$) { #{{{
@@ -197,6 +217,7 @@ sub cgi_prefs ($$) { #{{{
error($@) if $@;
my $form = CGI::FormBuilder->new(
title => "preferences",
+ name => "preferences",
header => 0,
charset => "utf-8",
method => 'POST',
@@ -207,20 +228,30 @@ sub cgi_prefs ($$) { #{{{
javascript => 0,
params => $q,
action => $config{cgiurl},
- template => scalar template_params("prefs.tmpl"),
+ template => {type => 'div'},
stylesheet => baseurl()."style.css",
+ fieldsets => [
+ [login => gettext("Login")],
+ [preferences => gettext("Preferences")],
+ [admin => gettext("Admin")]
+ ],
);
my $buttons=["Save Preferences", "Logout", "Cancel"];
+ decode_form_utf8($form);
+
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 => "email", size => 50);
+ $form->field(name => "email", size => 50, fieldset => "preferences");
$form->field(name => "subscriptions", size => 50,
- comment => "(".htmllink("", "", "PageSpec", 1).")");
- $form->field(name => "banned_users", size => 50);
+ fieldset => "preferences",
+ comment => "(".htmllink("", "", "PageSpec", noimageinline => 1).")");
+ $form->field(name => "banned_users", size => 50,
+ fieldset => "admin");
my $user_name=$session->param("name");
if (! is_admin($user_name)) {
@@ -238,8 +269,6 @@ sub cgi_prefs ($$) { #{{{
}
}
- decode_form_utf8($form);
-
if ($form->submitted eq 'Logout') {
$session->delete();
redirect($q, $config{url});
@@ -252,26 +281,20 @@ sub cgi_prefs ($$) { #{{{
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");
+ 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")));
+ split(' ',
+ $form->field("banned_users"))) ||
+ error("failed saving changes");
}
$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 ($$) { #{{{
@@ -284,8 +307,8 @@ sub cgi_editpage ($$) { #{{{
eval q{use CGI::FormBuilder};
error($@) if $@;
my $form = CGI::FormBuilder->new(
+ title => "editpage",
fields => \@fields,
- header => 1,
charset => "utf-8",
method => 'POST',
validate => {
@@ -295,21 +318,25 @@ sub cgi_editpage ($$) { #{{{
javascript => 0,
params => $q,
action => $config{cgiurl},
+ header => 0,
table => 0,
template => scalar template_params("editpage.tmpl"),
+ wikiname => $config{wikiname},
);
+ decode_form_utf8($form);
+
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));
- 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");
}
@@ -320,12 +347,16 @@ sub cgi_editpage ($$) { #{{{
my $file;
my $type;
- if (exists $pagesources{$page}) {
+ if (exists $pagesources{$page} && $form->field("do") ne "create") {
$file=$pagesources{$page};
$type=pagetype($file);
if (! defined $type) {
error(sprintf(gettext("%s is not an editable page"), $page));
}
+ if (! $form->submitted) {
+ $form->field(name => "rcsinfo",
+ value => rcs_prepedit($file), force => 1);
+ }
}
else {
$type=$form->param('type');
@@ -338,18 +369,16 @@ sub cgi_editpage ($$) { #{{{
}
$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 => "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,
@@ -357,18 +386,14 @@ sub cgi_editpage ($$) { #{{{
$form->tmpl_param("can_commit", $config{rcs});
$form->tmpl_param("indexlink", indexlink());
$form->tmpl_param("helponformattinglink",
- htmllink("", "", "HelpOnFormatting", 1));
+ 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 eq "Cancel") {
- if ($newfile && defined $from) {
+ if ($form->field("do") eq "create" && defined $from) {
redirect($q, "$config{url}/".htmlpage($from));
}
- elsif ($newfile) {
+ elsif ($form->field("do") eq "create") {
redirect($q, $config{url});
}
else {
@@ -378,25 +403,26 @@ sub cgi_editpage ($$) { #{{{
}
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,
- filter($page, $content)))));
+ filter($page, $page, $content), 0, 1))));
}
- else {
+ elsif ($form->submitted eq "Save Page") {
$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;
@@ -454,10 +480,12 @@ sub cgi_editpage ($$) { #{{{
$form->tmpl_param("page_select", 1);
$form->field(name => "page", type => 'select',
- options => \@editable_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)));
+
}
elsif ($form->field("do") eq "edit") {
check_canedit($page, $q, $session);
@@ -477,18 +505,71 @@ sub cgi_editpage ($$) { #{{{
$form->title(sprintf(gettext("editing %s"), pagetitle($page)));
}
- print $form->render(submit => \@buttons);
+ showform($form, \@buttons, $session, $q);
+ saveindex();
}
else {
# save page
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');
-
+ 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;
- writefile($file, $config{srcdir}, $content);
+
+ $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') &&
@@ -496,47 +577,50 @@ sub cgi_editpage ($$) { #{{{
$message=$form->field('comments');
}
- if ($newfile) {
+ if (! $exists) {
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 (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(sprintf(gettext("editing %s"), $page));
- print $form->render(submit => \@buttons);
- return;
- }
- else {
- # Make sure that the repo is up-to-date;
- # locking prevents the post-commit hook
- # from updating it.
- rcs_update();
- }
+ # Refresh even if there was a conflict, since other changes
+ # may have been committed while the post-commit hook was
+ # disabled.
+ require IkiWiki::Render;
+ # Reload index, since the first time it's loaded is before
+ # the wiki is locked, and things may have changed in the
+ # meantime.
+ loadindex();
+ 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 {
- 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");
}
} #}}}
@@ -592,9 +676,6 @@ sub cgi (;$$) { #{{{
cgi_recentchanges($q);
return;
}
- elsif ($do eq 'hyperestraier') {
- cgi_hyperestraier();
- }
# Need to lock the wiki before getting a session.
lockwiki();
@@ -616,7 +697,7 @@ sub cgi (;$$) { #{{{
email => "",
password => "",
regdate => time,
- });
+ }) || error("failed adding user");
}
}
}
@@ -628,7 +709,10 @@ sub cgi (;$$) { #{{{
print gettext("You are banned.");
cgi_savesession($session);
}
- elsif ($do eq 'signin') {
+
+ run_hooks(sessioncgi => sub { shift->($q, $session) });
+
+ if ($do eq 'signin') {
cgi_signin($q, $session);
cgi_savesession($session);
}
@@ -641,21 +725,6 @@ sub cgi (;$$) { #{{{
elsif ($do eq 'create' || $do eq 'edit') {
cgi_editpage($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');
- cgi_editpage($q, $session);
- }
elsif ($do eq 'postsignin') {
error(gettext("login failed, perhaps you need to turn on cookies?"));
}
@@ -688,7 +757,7 @@ sub userlink ($) { #{{{
else {
return htmllink("", "", escapeHTML(
length $config{userdir} ? $config{userdir}."/".$user : $user
- ), 1);
+ ), noimageinline => 1);
}
} #}}}