X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=blobdiff_plain;f=ikiwiki;h=4057564833f9e6479bc34d8dc13cd510126c08b3;hp=5efca6c7ffa24a1993a2b83824df7fd4ed7dc038;hb=dba92e88fb00f29dc5d158358ad3d1613ed3c0cc;hpb=deb4e4b0c231c190f91f08b6185a618280e27c04 diff --git a/ikiwiki b/ikiwiki index 5efca6c7f..405756483 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"; @@ -342,16 +350,73 @@ sub rcs_commit ($) { } } -sub rcs_ad ($) { +sub rcs_add ($) { my $file=shift; if (-d "$srcdir/.svn") { - if (system("svn", "add", "--quiet", $file) != 0) { + my $parent=dirname($file); + while (! -d "$srcdir/$parent/.svn") { + $file=$parent; + $parent=dirname($file); + } + + if (system("svn", "add", "--quiet", "$srcdir/$file") != 0) { warn("svn add failed\n"); } } } +sub rcs_recentchanges ($) { + my $num=shift; + my @ret; + + eval {use Date::Parse}; + eval {use Time::Duration}; + + if (-d "$srcdir/.svn") { + my $info=`LANG=C svn info $srcdir`; + my ($svn_url)=$info=~/^URL: (.*)$/m; + + my $div=qr/^--------------------+$/; + my $infoline=qr/^r(\d+)\s+\|\s+([^\s]+)\s+\|\s+(\d+-\d+-\d+\s+\d+:\d+:\d+\s+[-+]?\d+).*/; + my $state='start'; + my ($rev, $user, $when, @pages, $message); + foreach (`LANG=C svn log -v '$svn_url'`) { + print STDERR "state: $state\n"; + chomp; + if ($state eq 'start' && /$div/) { + $state='header'; + } + elsif ($state eq 'header' && /$infoline/) { + $rev=$1; + $user=$2; + $when=ago(time - str2time($3)); + } + elsif ($state eq 'header' && /^\s+(.*)/) { + push @pages, $1; + } + elsif ($state eq 'header' && /^$/) { + $state='body'; + } + elsif ($state eq 'body' && /$div/) { + push @ret, {rev => $rev, user => $user, + date => $when, message => $message, + pages => [@pages]}, + last if @ret >= $num; + + $state='header'; + $message=$rev=$user=$when=undef; + @pages=(); + } + elsif ($state eq 'body') { + $message.="$_
\n"; + } + } + } + + return @ret; +} + sub prune ($) { my $file=shift; @@ -372,7 +437,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"); @@ -497,13 +562,20 @@ sub gen_wrapper ($$) { if (! -x $this) { error("$this doesn't seem to be executable"); } - - my $call=qq{"$this", "$this", "$srcdir", "$destdir", "--wikiname=$wikiname"}; - $call.=', "--verbose"' if $verbose; - $call.=', "--rebuild"' if $rebuild; - $call.=', "--nosvn"' if !$svn; - $call.=', "--cgi"' if $cgi; - $call.=', "--url='.$url.'"' if $url; + + 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 @envsave; push @envsave, qw{REMOTE_ADDR QUERY_STRING REQUEST_METHOD REQUEST_URI @@ -511,8 +583,8 @@ sub gen_wrapper ($$) { 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 } @@ -527,17 +599,22 @@ EOF extern char **environ; -int main (void) { +int main (int argc, char **argv) { /* Sanitize environment. */ char *s; char *newenviron[$#envsave+3]; int i=0; - $envsave; +$envsave newenviron[i++]="HOME=$ENV{HOME}"; newenviron[i]=NULL; environ=newenviron; - execl($call, NULL); + if (argc == 2 && strcmp(argv[1], "--params") == 0) { + printf("$params\\n"); + exit(0); + } + + execl($call); perror("failed to run $this"); exit(1); } @@ -560,16 +637,86 @@ sub cgi () { error("\"do\" parameter missing"); } - my ($page)=$q->param('page')=~/$wiki_file_regexp/; # untaint + if ($do eq 'recentchanges') { + my $list="

"; + foreach my $page (@{$change->{pages}}) { + $list.=$page." "; + } + $list.="
\n"; + $list.="changed ".$change->{when}." by ". + htmllink("index", $change->{user}). + ": ".$change->{message}."
\n"; + $list.="

\n"; + } + $list.="

\n"; + + print $q->header, + $q->start_html("RecentChanges"), + $q->h1("$wikiname/ RecentChanges"), + $list, + $q->end_form, + $q->end_html; + return; + } + + 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 ($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 { + my $dir=$from."/"; + $dir=~s![^/]+/$!!; + push @page_locs, $dir.$page; + push @page_locs, "$from/$page"; + while (length $dir) { + $dir=~s![^/]+/$!!; + push @page_locs, $dir.$page; + } + } + + $q->param("do", "save"); + print $q->header, + $q->start_html("Creating $page"), + $q->start_h1("$wikiname/ Creating $page"), + $q->start_form(-action => $action), + $q->hidden('do'), + "Select page location:", + $q->popup_menu('page', \@page_locs), + $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)}"); @@ -577,8 +724,8 @@ sub cgi () { } $q->param("do", "save"); print $q->header, - $q->start_html("$wikiname: Editing $page"), - $q->h1("$wikiname: Editing $page"), + $q->start_html("Editing $page"), + $q->h1("$wikiname/ Editing $page"), $q->start_form(-action => $action), $q->hidden('do'), $q->hidden('page'), @@ -587,11 +734,11 @@ sub cgi () { -rows => 20, -columns => 80), $q->br, - "$ENV{HOME} 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; } @@ -610,7 +757,7 @@ sub cgi () { my $message="web commit from $ENV{REMOTE_ADDR}"; if (defined $q->param('comments')) { - $message.="\n".$q->param('comments'); + $message.=": ".$q->param('comments'); } if ($svn) { @@ -644,6 +791,7 @@ if (grep /^-/, @ARGV) { "svn!" => \$svn, "cgi" => \$cgi, "url=s" => \$url, + "cgiurl=s" => \$cgiurl, ) || usage(); } usage() unless @ARGV == 2;