%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 {
die "usage: ikiwiki [options] source dest\n";
$bestlink=htmlpage($bestlink);
}
if (! grep { $_ eq $bestlink } values %renderedfiles) {
- return "<a href=\"?\">?</a>$link"
+ return "<a href=\"$cgiurl?do=create&page=$link&from=$page\">?</a>$link"
}
$bestlink=File::Spec->abs2rel($bestlink, dirname($page));
$path=~s/\.\.\/$/index.html/;
$pagelink="<a href=\"$path\">$wikiname</a>/ $pagelink";
+ my @actions;
+ if (length $cgiurl) {
+ push @actions, "<a href=\"$cgiurl?do=edit&page=$page\">Edit</a>";
+ push @actions, "<a href=\"$cgiurl?do=recentchanges\">RecentChanges</a>";
+ }
+
$content="<html>\n<head><title>$title</title></head>\n<body>\n".
"<h1>$pagelink</h1>\n".
+ "@actions\n<hr>\n".
$content.
"</body>\n</html>\n";
close OUT;
}
-sub update () {
+sub rcs_update () {
if (-d "$srcdir/.svn") {
if (system("svn", "update", "--quiet", $srcdir) != 0) {
warn("svn update failed\n");
}
}
+sub rcs_commit ($) {
+ my $message=shift;
+
+ if (-d "$srcdir/.svn") {
+ if (system("svn", "commit", "--quiet", "-m",
+ possibly_foolish_untaint($message), $srcdir) != 0) {
+ warn("svn commit failed\n");
+ }
+ }
+}
+
+sub rcs_ad ($) {
+ my $file=shift;
+
+ if (-d "$srcdir/.svn") {
+ if (system("svn", "add", "--quiet", $file) != 0) {
+ warn("svn add failed\n");
+ }
+ }
+}
+
sub prune ($) {
my $file=shift;
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");
# Generates a C wrapper program for running ikiwiki in a specific way.
# The wrapper may be safely made suid.
sub gen_wrapper ($$) {
- my ($offline, $rebuild)=@_;
+ my ($svn, $rebuild)=@_;
eval {use Cwd 'abs_path'};
$srcdir=abs_path($srcdir);
if (! -x $this) {
error("$this doesn't seem to be executable");
}
+
+ my @params=($srcdir, $destdir, "--wikiname=$wikiname");
+ push @params, "--verbose" if $verbose;
+ push @params, "--rebuild" if $rebuild;
+ 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) {
+ $call.=qq{"$p", };
+ }
+ $call.="NULL";
- my $call=qq{"$this", "$this", "$srcdir", "$destdir", "--wikiname=$wikiname"};
- $call.=', "--verbose"' if $verbose;
- $call.=', "--rebuild"' if $rebuild;
- $call.=', "--offline"' if $offline;
- $call.=', "--cgi"' if $cgi;
- $call.=', "--url='.$url.'"' if $url;
-
- # For CGI we need all these environment variables.
- my @envsave=qw{REMOTE_ADDR QUERY_STRING REQUEST_METHOD REQUEST_URI
- CONTENT_TYPE CONTENT_LENGTH GATEWAY_INTERFACE};
+ my @envsave;
+ push @envsave, qw{REMOTE_ADDR QUERY_STRING REQUEST_METHOD REQUEST_URI
+ CONTENT_TYPE CONTENT_LENGTH GATEWAY_INTERFACE} if $cgi;
my $envsave="";
foreach my $var (@envsave) {
$envsave.=<<"EOF"
- if ((s=getenv("$var")))
- asprintf(&newenviron[i++], "%s=%s", "$var", s);
+ if ((s=getenv("$var")))
+ asprintf(&newenviron[i++], "%s=%s", "$var", s);
EOF
}
extern char **environ;
-int main (void) {
+int main (int argc, char **argv) {
/* Sanitize environment. */
- if ($cgi) {
- char *s;
- char *newenviron[$#envsave+2];
- int i=0;
- $envsave;
- newenviron[i]=NULL;
- environ=newenviron;
- }
- else {
- clearenv();
+ char *s;
+ char *newenviron[$#envsave+3];
+ int i=0;
+$envsave
+ newenviron[i++]="HOME=$ENV{HOME}";
+ newenviron[i]=NULL;
+ environ=newenviron;
+
+ if (argc == 2 && strcmp(argv[1], "--params") == 0) {
+ printf("$params\\n");
+ exit(0);
}
-
- execl($call, NULL);
+
+ execl($call);
perror("failed to run $this");
exit(1);
}
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)}");
-default => $content,
-rows => 20,
-columns => 80),
- $q->p,
- $q->submit("Save Changes"),
- # TODO: Cancel button returns to page.
- # TODO: Preview button.
- # TODO: Commit message field.
- # TODO: Conflict prevention.
+ $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 'save') {
my $file=$page.$default_pagetype;
+ my $newfile=1;
if (exists $pagesources{lc($page)}) {
$file=$pagesources{lc($page)};
+ $newfile=0;
}
my $content=$q->param('content');
$content=~s/\r/\n/g;
writefile("$srcdir/$file", $content);
+ my $message="web commit from $ENV{REMOTE_ADDR}";
+ if (defined $q->param('comments')) {
+ $message.=": ".$q->param('comments');
+ }
+
+ if ($svn) {
+ if ($newfile) {
+ rcs_add($file);
+ }
+ # presumably the commit will trigger an update
+ # of the wiki
+ rcs_commit($message);
+ }
+ else {
+ refresh();
+ }
+
print $q->redirect("$url/".htmlpage($page));
}
else {
}
my $rebuild=0;
-my $offline=0;
my $wrapper=0;
if (grep /^-/, @ARGV) {
eval {use Getopt::Long};
"verbose|v" => \$verbose,
"rebuild" => \$rebuild,
"wrapper" => \$wrapper,
- "offline" => \$offline,
+ "svn!" => \$svn,
"cgi" => \$cgi,
"url=s" => \$url,
+ "cgiurl=s" => \$cgiurl,
) || usage();
}
usage() unless @ARGV == 2;
error("Must specify url to wiki with --url when using --cgi");
}
-gen_wrapper($offline, $rebuild) if $wrapper;
+gen_wrapper($svn, $rebuild) if $wrapper;
memoize('pagename');
memoize('bestlink');
loadindex() unless $rebuild;
cgi();
}
else {
- update() unless $offline;
+ rcs_update() if $svn;
refresh();
saveindex();
}
projects / ikiwiki.git / blobdiff