X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=blobdiff_plain;f=ikiwiki;h=b57611b668c0d939ba4c7d8f64d5d7844677ff77;hp=fcf081ccbb797a9863f3a281da4469609e8362f6;hb=0c7bcdaa297ef38f7596cc2298a6ed6714b0529a;hpb=2aaab7db29f154816d6338a1329b42090209d966
diff --git a/ikiwiki b/ikiwiki
index fcf081ccb..b57611b66 100755
--- a/ikiwiki
+++ b/ikiwiki
@@ -17,12 +17,13 @@ my ($srcdir, $destdir, %links, %oldlinks, %oldpagemtime, %renderedfiles,
%pagesources);
my $wiki_link_regexp=qr/\[\[([^\s]+)\]\]/;
my $wiki_file_regexp=qr/(^[-A-Za-z0-9_.:\/+]+$)/;
-my $wiki_file_prune_regexp=qr!((^|/).svn/|\.\.)!;
+my $wiki_file_prune_regexp=qr!((^|/).svn/|\.\.|^\.|\/\.|\.html?$)!;
my $verbose=0;
my $wikiname="wiki";
my $default_pagetype=".mdwn";
my $cgi=0;
my $url="";
+my $cgiurl="";
my $svn=1;
sub usage {
@@ -182,7 +183,7 @@ sub htmllink ($$) {
$bestlink=htmlpage($bestlink);
}
if (! grep { $_ eq $bestlink } values %renderedfiles) {
- return "?$link"
+ return "?$link"
}
$bestlink=File::Spec->abs2rel($bestlink, dirname($page));
@@ -262,8 +263,15 @@ sub finalize ($$) {
$path=~s/\.\.\/$/index.html/;
$pagelink="$wikiname/ $pagelink";
+ my @actions;
+ if (length $cgiurl) {
+ push @actions, "Edit";
+ push @actions, "RecentChanges";
+ }
+
$content="\n$title\n\n".
"$pagelink
\n".
+ "@actions\n
\n".
$content.
"\n\n";
@@ -372,7 +380,7 @@ sub refresh () {
if (/$wiki_file_prune_regexp/) {
$File::Find::prune=1;
}
- elsif (! -d $_ && ! /\.html$/ && ! /\/\./) {
+ elsif (! -d $_) {
my ($f)=/$wiki_file_regexp/; # untaint
if (! defined $f) {
warn("skipping bad filename $_\n");
@@ -504,6 +512,7 @@ sub gen_wrapper ($$) {
push @params, "--nosvn" if !$svn;
push @params, "--cgi" if $cgi;
push @params, "--url=$url" if $url;
+ push @params, "--cgiurl=$cgiurl" if $cgiurl;
my $params=join(" ", @params);
my $call='';
foreach my $p ($this, $this, @params) {
@@ -571,16 +580,62 @@ sub cgi () {
error("\"do\" parameter missing");
}
- my ($page)=$q->param('page')=~/$wiki_file_regexp/; # untaint
+ my ($page)=$q->param('page')=~/$wiki_file_regexp/;
if (! defined $page || ! length $page || $page ne $q->param('page') ||
$page=~/$wiki_file_prune_regexp/ || $page=~/^\//) {
error("bad page name");
}
+ $page=lc($page);
my $action=$q->request_uri;
$action=~s/\?.*//;
- if ($do eq 'edit') {
+ if ($do eq 'create') {
+ if (exists $pagesources{lc($page)}) {
+ # hmm, someone else made the page in the meantime?
+ print $q->redirect("$url/".htmlpage($page));
+ }
+
+ my @page_locs;
+ my $default_loc="";
+ my ($from)=$q->param('from')=~/$wiki_file_regexp/;
+ if (! defined $from || ! length $from ||
+ $from ne $q->param('from') ||
+ $from=~/$wiki_file_prune_regexp/ || $from=~/^\//) {
+ @page_locs=$page;
+ }
+ else {
+ @page_locs="$from/$page";
+ $from=dirname($from);
+ $default_loc="$from/$page";
+ while (length $from) {
+ push @page_locs, "$from/$page";
+ }
+ push @page_locs, $page;
+ }
+
+ $q->param("do", "save");
+ print $q->header,
+ $q->start_html("$wikiname: Creating $page"),
+ $q->h1("$wikiname: Creating $page"),
+ $q->start_form(-action => $action),
+ $q->hidden('do'),
+ "Select page location:",
+ $q->popup_menu('page', \@page_locs, $default_loc),
+ $q->textarea(-name => 'content',
+ -default => "",
+ -rows => 20,
+ -columns => 80),
+ $q->br,
+ "Optional comment about this change:",
+ $q->br,
+ $q->textfield(-name => "comments", -size => 80),
+ $q->br,
+ $q->submit("Save Page"),
+ $q->end_form,
+ $q->end_html;
+ }
+ elsif ($do eq 'edit') {
my $content="";
if (exists $pagesources{lc($page)}) {
$content=readfile("$srcdir/$pagesources{lc($page)}");
@@ -598,11 +653,11 @@ sub cgi () {
-rows => 20,
-columns => 80),
$q->br,
- "Optional comment about this change",
+ "Optional comment about this change:",
$q->br,
$q->textfield(-name => "comments", -size => 80),
$q->br,
- $q->submit("Save Changes"),
+ $q->submit("Save Page"),
$q->end_form,
$q->end_html;
}
@@ -655,6 +710,7 @@ if (grep /^-/, @ARGV) {
"svn!" => \$svn,
"cgi" => \$cgi,
"url=s" => \$url,
+ "cgiurl=s" => \$cgiurl,
) || usage();
}
usage() unless @ARGV == 2;