$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));
sub saveindex () {
open (OUT, ">$srcdir/.index") || error("cannot write to .index: $!");
foreach my $page (keys %oldpagemtime) {
- print OUT "$oldpagemtime{$page} $pagesources{$page} $renderedfiles{$page} ".
- join(" ", @{$links{$page}})."\n"
- if $oldpagemtime{$page};
+ print OUT "$oldpagemtime{$page} $pagesources{$page} $renderedfiles{$page} ".
+ join(" ", @{$links{$page}})."\n"
+ if $oldpagemtime{$page};
}
close OUT;
}
}
}
-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 q{use Date::Parse};
+ eval q{use Time::Duration};
+
+ if (-d "$srcdir/.svn") {
+ my $info=`LANG=C svn info $srcdir`;
+ my ($svn_url)=$info=~/^URL: (.*)$/m;
+
+ # FIXME: currently assumes that the wiki is somewhere
+ # under trunk in svn, doesn't support other layouts.
+ my ($svn_base)=$svn_url=~m!(/trunk(?:/.*)?)$!;
+
+ 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'`) {
+ chomp;
+ if ($state eq 'start' && /$div/) {
+ $state='header';
+ }
+ elsif ($state eq 'header' && /$infoline/) {
+ $rev=$1;
+ $user=$2;
+ $when=concise(ago(time - str2time($3)));
+ }
+ elsif ($state eq 'header' && /^\s+[A-Z]\s+\Q$svn_base\E\/(.+)$/) {
+ push @pages, pagename($1);
+ }
+ elsif ($state eq 'header' && /^$/) {
+ $state='body';
+ }
+ elsif ($state eq 'body' && /$div/) {
+ push @ret, { rev => $rev, user => $user,
+ when => $when, message => $message,
+ pages => [@pages] };
+ return @ret if @ret >= $num;
+
+ $state='header';
+ $message=$rev=$user=$when=undef;
+ @pages=();
+ }
+ elsif ($state eq 'body') {
+ $message.="$_<br>\n";
+ }
+ }
+ }
+
+ return @ret;
+}
+
sub prune ($) {
my $file=shift;
sub gen_wrapper ($$) {
my ($svn, $rebuild)=@_;
- eval {use Cwd 'abs_path'};
+ eval q{use Cwd 'abs_path'};
$srcdir=abs_path($srcdir);
$destdir=abs_path($destdir);
my $this=abs_path($0);
error("\"do\" parameter missing");
}
- my ($page)=$q->param('page')=~/$wiki_file_regexp/; # untaint
+ if ($do eq 'recentchanges') {
+ my $list="<ul>\n";
+ foreach my $change (rcs_recentchanges(100)) {
+ $list.="<li>";
+ foreach my $page (@{$change->{pages}}) {
+ $list.=$page." ";
+ }
+ $list.="<br>\n";
+ $list.="changed ".$change->{when}." by ".
+ htmllink("index", $change->{user}).
+ ": <i>".$change->{message}."</i>\n";
+ $list.="</li>\n";
+ }
+ $list.="</ul>\n";
+
+ print $q->header,
+ $q->start_html("RecentChanges"),
+ $q->h1("<a href=\"$url\">$wikiname</a>/ 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("<a href=\"$url\">$wikiname</a>/ 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)}");
}
$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("<a href=\"$url\">$wikiname</a>/ Editing $page"),
$q->start_form(-action => $action),
$q->hidden('do'),
$q->hidden('page'),
-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;
}