urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- add --exclude 

- move all the config vars into %config
master
joey 2006-03-13 02:08:04 +00:00
parent 46308ef825
commit 0990216956
4 changed files with 154 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -1,5 +1,6 @@
all: all:
./ikiwiki doc templates html --wikiname="ikiwiki" --verbose --nosvn ./ikiwiki doc templates html --wikiname="ikiwiki" --verbose \
--nosvn --exclude=/discussion
clean: clean:
rm -rf html rm -rf html

13
doc/todo.mdwn
View File

@ -21,7 +21,8 @@ is built. (As long as all changes to all pages is ok.)
## docs ## docs
Need to document all the command line switches in a man page and somehow on this wiki too. Can markdown generate a man page somehow? Need to turn [[usage]] into a man page.
this wiki too. Can markdown generate a man page somehow?
## pluggable renderers ## pluggable renderers
@ -61,4 +62,14 @@ and that includes the date.
What syntax do other wikis use for this? I'm considering "[[ -- ]]" (with What syntax do other wikis use for this? I'm considering "[[ -- ]]" (with
spaces removed) as it has a nice nmemonic. spaces removed) as it has a nice nmemonic.
## recentchanges links to commit diffs
Would take a bit more viewcvs integration, let the be a "[diff]" link in
recentchanges that goes to the diff for any listed change.
## recentchanges more than 100
Possibly add "next 100" link to it, but OTOH, you can just use svn log if
you need that data..
## [[Bugs]] ## [[Bugs]]

5
doc/usage.mdwn
View File

@ -66,6 +66,11 @@ Note that most options can be shortened to single letters, and boolean flags suc
Specifies the url to link to for page history browsing. In the url, "[[]]" is replaced with the page to browse. It's common to use [[ViewCVS]] for this. Specifies the url to link to for page history browsing. In the url, "[[]]" is replaced with the page to browse. It's common to use [[ViewCVS]] for this.
* --exclude regexp
Specifies a rexexp of source files to exclude from processing.
May be specified multiple times to add to exclude list.
# AUTHOR # AUTHOR
Joey Hess <joey@kitenet.net> Joey Hess <joey@kitenet.net>

259
ikiwiki
View File

@ -13,28 +13,34 @@ BEGIN {
} }
$ENV{PATH}="/usr/local/bin:/usr/bin:/bin"; $ENV{PATH}="/usr/local/bin:/usr/bin:/bin";
my ($srcdir, $templatedir, $destdir, %links, %oldlinks, %oldpagemtime, my (%links, %oldlinks, %oldpagemtime, %renderedfiles, %pagesources);
%renderedfiles, %pagesources);
my $wiki_link_regexp=qr/\[\[([^\s]+)\]\]/; my %config=(
my $wiki_file_regexp=qr/(^[-A-Za-z0-9_.:\/+]+$)/; wiki_file_prune_regexp => qr{((^|/).svn/|\.\.|^\.|\/\.|\.html?$)},
my $wiki_file_prune_regexp=qr!((^|/).svn/|\.\.|^\.|\/\.|\.html?$)!; wiki_link_regexp => qr/\[\[([^\s]+)\]\]/,
my $verbose=0; wiki_file_regexp => qr/(^[-A-Za-z0-9_.:\/+]+$)/,
my $wikiname="wiki"; verbose => 0,
my $default_pagetype=".mdwn"; wikiname => "wiki",
my $cgi=0; default_pageext => ".mdwn",
my $url=""; cgi => 0,
my $cgiurl=""; url => "",
my $historyurl=""; cgiurl => "",
my $svn=1; historyurl => "",
my $anonok=0; svn => 1,
my $rebuild=0; anonok => 0,
rebuild => 0,
wrapper => 0,
srcdir => undef,
destdir => undef,
templatedir => undef,
);
sub usage { #{{{ sub usage { #{{{
die "usage: ikiwiki [options] source templates dest\n"; die "usage: ikiwiki [options] source templates dest\n";
} #}}} } #}}}
sub error ($) { #{{{ sub error ($) { #{{{
if ($cgi) { if ($config{cgi}) {
print "Content-type: text/html\n\n"; print "Content-type: text/html\n\n";
print misctemplate("Error", "<p>Error: @_</p>"); print misctemplate("Error", "<p>Error: @_</p>");
exit 1; exit 1;
@ -45,11 +51,12 @@ sub error ($) { #{{{
} #}}} } #}}}
sub debug ($) { #{{{ sub debug ($) { #{{{
if (! $cgi) { return unless $config{verbose};
print "@_\n" if $verbose; if (! $config{cgi}) {
print "@_\n";
} }
else { else {
print STDERR "@_\n" if $verbose; print STDERR "@_\n";
} }
} #}}} } #}}}
@ -139,7 +146,7 @@ sub findlinks ($) { #{{{
my $content=shift; my $content=shift;
my @links; my @links;
while ($content =~ /$wiki_link_regexp/g) { while ($content =~ /$config{wiki_link_regexp}/g) {
push @links, lc($1); push @links, lc($1);
} }
return @links; return @links;
@ -194,10 +201,10 @@ sub htmllink { #{{{
} }
if (! grep { $_ eq $bestlink } values %renderedfiles) { if (! grep { $_ eq $bestlink } values %renderedfiles) {
if (! $createsubpage) { if (! $createsubpage) {
return "<a href=\"$cgiurl?do=create&page=$link&from=$page\">?</a>$link" return "<a href=\"$config{cgiurl}?do=create&page=$link&from=$page\">?</a>$link"
} }
else { else {
return "<a href=\"$cgiurl?do=create&page=$page/$link\">?</a>$link" return "<a href=\"$config{cgiurl}?do=create&page=$page/$link\">?</a>$link"
} }
} }
@ -213,7 +220,7 @@ sub linkify ($$) { #{{{
my $content=shift; my $content=shift;
my $file=shift; my $file=shift;
$content =~ s/$wiki_link_regexp/htmllink(pagename($file), $1)/eg; $content =~ s/$config{wiki_link_regexp}/htmllink(pagename($file), $1)/eg;
return $content; return $content;
} #}}} } #}}}
@ -271,12 +278,12 @@ sub parentlinks ($) { #{{{
} }
$path.="../"; $path.="../";
} }
unshift @ret, { url => $path , page => $wikiname }; unshift @ret, { url => $path , page => $config{wikiname} };
return @ret; return @ret;
} #}}} } #}}}
sub indexlink () { #{{{ sub indexlink () { #{{{
return "<a href=\"$url\">$wikiname</a>"; return "<a href=\"$config{url}\">$config{wikiname}</a>";
} #}}} } #}}}
sub finalize ($$) { #{{{ sub finalize ($$) { #{{{
@ -287,24 +294,24 @@ sub finalize ($$) { #{{{
$title=~s/_/ /g; $title=~s/_/ /g;
my $template=HTML::Template->new(blind_cache => 1, my $template=HTML::Template->new(blind_cache => 1,
filename => "$templatedir/page.tmpl"); filename => "$config{templatedir}/page.tmpl");
if (length $cgiurl) { if (length $config{cgiurl}) {
$template->param(editurl => "$cgiurl?do=edit&page=$page"); $template->param(editurl => "$config{cgiurl}?do=edit&page=$page");
if ($svn) { if ($config{svn}) {
$template->param(recentchangesurl => "$cgiurl?do=recentchanges"); $template->param(recentchangesurl => "$config{cgiurl}?do=recentchanges");
} }
} }
if (length $historyurl) { if (length $config{historyurl}) {
my $u=$historyurl; my $u=$config{historyurl};
$u=~s/\[\[\]\]/$pagesources{$page}/g; $u=~s/\[\[\]\]/$pagesources{$page}/g;
$template->param(historyurl => $u); $template->param(historyurl => $u);
} }
$template->param( $template->param(
title => $title, title => $title,
wikiname => $wikiname, wikiname => $config{wikiname},
parentlinks => [parentlinks($page)], parentlinks => [parentlinks($page)],
content => $content, content => $content,
backlinks => [backlinks($page)], backlinks => [backlinks($page)],
@ -320,7 +327,7 @@ sub check_overwrite ($$) { #{{{
my $dest=shift; my $dest=shift;
my $src=shift; my $src=shift;
if (! exists $renderedfiles{$src} && -e $dest && ! $rebuild) { if (! exists $renderedfiles{$src} && -e $dest && ! $config{rebuild}) {
error("$dest exists and was rendered from ". error("$dest exists and was rendered from ".
join(" ",(grep { $renderedfiles{$_} eq $dest } keys join(" ",(grep { $renderedfiles{$_} eq $dest } keys
%renderedfiles)). %renderedfiles)).
@ -332,7 +339,7 @@ sub render ($) { #{{{
my $file=shift; my $file=shift;
my $type=pagetype($file); my $type=pagetype($file);
my $content=readfile("$srcdir/$file"); my $content=readfile("$config{srcdir}/$file");
if ($type ne 'unknown') { if ($type ne 'unknown') {
my $page=pagename($file); my $page=pagename($file);
@ -342,22 +349,22 @@ sub render ($) { #{{{
$content=htmlize($type, $content); $content=htmlize($type, $content);
$content=finalize($content, $page); $content=finalize($content, $page);
check_overwrite("$destdir/".htmlpage($page), $page); check_overwrite("$config{destdir}/".htmlpage($page), $page);
writefile("$destdir/".htmlpage($page), $content); writefile("$config{destdir}/".htmlpage($page), $content);
$oldpagemtime{$page}=time; $oldpagemtime{$page}=time;
$renderedfiles{$page}=htmlpage($page); $renderedfiles{$page}=htmlpage($page);
} }
else { else {
$links{$file}=[]; $links{$file}=[];
check_overwrite("$destdir/$file", $file); check_overwrite("$config{destdir}/$file", $file);
writefile("$destdir/$file", $content); writefile("$config{destdir}/$file", $content);
$oldpagemtime{$file}=time; $oldpagemtime{$file}=time;
$renderedfiles{$file}=$file; $renderedfiles{$file}=$file;
} }
} #}}} } #}}}
sub loadindex () { #{{{ sub loadindex () { #{{{
open (IN, "$srcdir/.ikiwiki/index") || return; open (IN, "$config{srcdir}/.ikiwiki/index") || return;
while (<IN>) { while (<IN>) {
$_=possibly_foolish_untaint($_); $_=possibly_foolish_untaint($_);
chomp; chomp;
@ -373,10 +380,10 @@ sub loadindex () { #{{{
} #}}} } #}}}
sub saveindex () { #{{{ sub saveindex () { #{{{
if (! -d "$srcdir/.ikiwiki") { if (! -d "$config{srcdir}/.ikiwiki") {
mkdir("$srcdir/.ikiwiki"); mkdir("$config{srcdir}/.ikiwiki");
} }
open (OUT, ">$srcdir/.ikiwiki/index") || error("cannot write to index: $!"); open (OUT, ">$config{srcdir}/.ikiwiki/index") || error("cannot write to index: $!");
foreach my $page (keys %oldpagemtime) { foreach my $page (keys %oldpagemtime) {
print OUT "$oldpagemtime{$page} $pagesources{$page} $renderedfiles{$page} ". print OUT "$oldpagemtime{$page} $pagesources{$page} $renderedfiles{$page} ".
join(" ", @{$links{$page}})."\n" join(" ", @{$links{$page}})."\n"
@ -386,8 +393,8 @@ sub saveindex () { #{{{
} #}}} } #}}}
sub rcs_update () { #{{{ sub rcs_update () { #{{{
if (-d "$srcdir/.svn") { if (-d "$config{srcdir}/.svn") {
if (system("svn", "update", "--quiet", $srcdir) != 0) { if (system("svn", "update", "--quiet", $config{srcdir}) != 0) {
warn("svn update failed\n"); warn("svn update failed\n");
} }
} }
@ -396,9 +403,10 @@ sub rcs_update () { #{{{
sub rcs_commit ($) { #{{{ sub rcs_commit ($) { #{{{
my $message=shift; my $message=shift;
if (-d "$srcdir/.svn") { if (-d "$config{srcdir}/.svn") {
if (system("svn", "commit", "--quiet", "-m", if (system("svn", "commit", "--quiet", "-m",
possibly_foolish_untaint($message), $srcdir) != 0) { possibly_foolish_untaint($message),
$config{srcdir}) != 0) {
warn("svn commit failed\n"); warn("svn commit failed\n");
} }
} }
@ -407,14 +415,14 @@ sub rcs_commit ($) { #{{{
sub rcs_add ($) { #{{{ sub rcs_add ($) { #{{{
my $file=shift; my $file=shift;
if (-d "$srcdir/.svn") { if (-d "$config{srcdir}/.svn") {
my $parent=dirname($file); my $parent=dirname($file);
while (! -d "$srcdir/$parent/.svn") { while (! -d "$config{srcdir}/$parent/.svn") {
$file=$parent; $file=$parent;
$parent=dirname($file); $parent=dirname($file);
} }
if (system("svn", "add", "--quiet", "$srcdir/$file") != 0) { if (system("svn", "add", "--quiet", "$config{srcdir}/$file") != 0) {
warn("svn add failed\n"); warn("svn add failed\n");
} }
} }
@ -427,8 +435,8 @@ sub rcs_recentchanges ($) { #{{{
eval q{use Date::Parse}; eval q{use Date::Parse};
eval q{use Time::Duration}; eval q{use Time::Duration};
if (-d "$srcdir/.svn") { if (-d "$config{srcdir}/.svn") {
my $info=`LANG=C svn info $srcdir`; my $info=`LANG=C svn info $config{srcdir}`;
my ($svn_url)=$info=~/^URL: (.*)$/m; my ($svn_url)=$info=~/^URL: (.*)$/m;
# FIXME: currently assumes that the wiki is somewhere # FIXME: currently assumes that the wiki is somewhere
@ -504,22 +512,22 @@ sub refresh () { #{{{
find({ find({
no_chdir => 1, no_chdir => 1,
wanted => sub { wanted => sub {
if (/$wiki_file_prune_regexp/) { if (/$config{wiki_file_prune_regexp}/) {
$File::Find::prune=1; $File::Find::prune=1;
} }
elsif (! -d $_) { elsif (! -d $_) {
my ($f)=/$wiki_file_regexp/; # untaint my ($f)=/$config{wiki_file_regexp}/; # untaint
if (! defined $f) { if (! defined $f) {
warn("skipping bad filename $_\n"); warn("skipping bad filename $_\n");
} }
else { else {
$f=~s/^\Q$srcdir\E\/?//; $f=~s/^\Q$config{srcdir}\E\/?//;
push @files, $f; push @files, $f;
$exists{pagename($f)}=1; $exists{pagename($f)}=1;
} }
} }
}, },
}, $srcdir); }, $config{srcdir});
my %rendered; my %rendered;
@ -539,7 +547,7 @@ sub refresh () { #{{{
if (! $exists{$page}) { if (! $exists{$page}) {
debug("removing old page $page"); debug("removing old page $page");
push @del, $renderedfiles{$page}; push @del, $renderedfiles{$page};
prune($destdir."/".$renderedfiles{$page}); prune($config{destdir}."/".$renderedfiles{$page});
delete $renderedfiles{$page}; delete $renderedfiles{$page};
$oldpagemtime{$page}=0; $oldpagemtime{$page}=0;
delete $pagesources{$page}; delete $pagesources{$page};
@ -551,7 +559,7 @@ sub refresh () { #{{{
my $page=pagename($file); my $page=pagename($file);
if (! exists $oldpagemtime{$page} || if (! exists $oldpagemtime{$page} ||
mtime("$srcdir/$file") > $oldpagemtime{$page}) { mtime("$config{srcdir}/$file") > $oldpagemtime{$page}) {
debug("rendering changed file $file"); debug("rendering changed file $file");
render($file); render($file);
$rendered{$file}=1; $rendered{$file}=1;
@ -622,26 +630,25 @@ FILE: foreach my $file (@files) {
# Generates a C wrapper program for running ikiwiki in a specific way. # Generates a C wrapper program for running ikiwiki in a specific way.
# The wrapper may be safely made suid. # The wrapper may be safely made suid.
sub gen_wrapper ($$) { #{{{ sub gen_wrapper () { #{{{
my ($svn, $rebuild)=@_;
eval q{use Cwd 'abs_path'}; eval q{use Cwd 'abs_path'};
$srcdir=abs_path($srcdir); $config{srcdir}=abs_path($config{srcdir});
$destdir=abs_path($destdir); $config{destdir}=abs_path($config{destdir});
my $this=abs_path($0); my $this=abs_path($0);
if (! -x $this) { if (! -x $this) {
error("$this doesn't seem to be executable"); error("$this doesn't seem to be executable");
} }
my @params=($srcdir, $templatedir, $destdir, "--wikiname=$wikiname"); my @params=($config{srcdir}, $config{templatedir}, $config{destdir},
push @params, "--verbose" if $verbose; "--wikiname=$config{wikiname}");
push @params, "--rebuild" if $rebuild; push @params, "--verbose" if $config{verbose};
push @params, "--nosvn" if !$svn; push @params, "--rebuild" if $config{rebuild};
push @params, "--cgi" if $cgi; push @params, "--nosvn" if !$config{svn};
push @params, "--url=$url" if $url; push @params, "--cgi" if $config{cgi};
push @params, "--cgiurl=$cgiurl" if $cgiurl; push @params, "--url=$config{url}" if length $config{url};
push @params, "--historyurl=$historyurl" if $historyurl; push @params, "--cgiurl=$config{cgiurl}" if length $config{cgiurl};
push @params, "--anonok" if $anonok; push @params, "--historyurl=$config{historyurl}" if length $config{historyurl};
push @params, "--anonok" if $config{anonok};
my $params=join(" ", map { "\'$_\'" } @params); my $params=join(" ", map { "\'$_\'" } @params);
my $call=''; my $call='';
foreach my $p ($this, $this, @params) { foreach my $p ($this, $this, @params) {
@ -652,7 +659,7 @@ sub gen_wrapper ($$) { #{{{
my @envsave; my @envsave;
push @envsave, qw{REMOTE_ADDR QUERY_STRING REQUEST_METHOD REQUEST_URI push @envsave, qw{REMOTE_ADDR QUERY_STRING REQUEST_METHOD REQUEST_URI
CONTENT_TYPE CONTENT_LENGTH GATEWAY_INTERFACE CONTENT_TYPE CONTENT_LENGTH GATEWAY_INTERFACE
HTTP_COOKIE} if $cgi; HTTP_COOKIE} if $config{cgi};
my $envsave=""; my $envsave="";
foreach my $var (@envsave) { foreach my $var (@envsave) {
$envsave.=<<"EOF" $envsave.=<<"EOF"
@ -706,12 +713,12 @@ sub misctemplate ($$) { #{{{
my $pagebody=shift; my $pagebody=shift;
my $template=HTML::Template->new( my $template=HTML::Template->new(
filename => "$templatedir/misc.tmpl" filename => "$config{templatedir}/misc.tmpl"
); );
$template->param( $template->param(
title => $title, title => $title,
indexlink => indexlink(), indexlink => indexlink(),
wikiname => $wikiname, wikiname => $config{wikiname},
pagebody => $pagebody, pagebody => $pagebody,
); );
return $template->output; return $template->output;
@ -721,12 +728,12 @@ sub cgi_recentchanges ($) { #{{{
my $q=shift; my $q=shift;
my $template=HTML::Template->new( my $template=HTML::Template->new(
filename => "$templatedir/recentchanges.tmpl" filename => "$config{templatedir}/recentchanges.tmpl"
); );
$template->param( $template->param(
title => "RecentChanges", title => "RecentChanges",
indexlink => indexlink(), indexlink => indexlink(),
wikiname => $wikiname, wikiname => $config{wikiname},
changelog => [rcs_recentchanges(100)], changelog => [rcs_recentchanges(100)],
); );
print $q->header, $template->output; print $q->header, $template->output;
@ -737,7 +744,7 @@ sub userinfo_get ($$) { #{{{
my $field=shift; my $field=shift;
eval q{use Storable}; eval q{use Storable};
my $userdata=eval{ Storable::lock_retrieve("$srcdir/.ikiwiki/userdb") }; my $userdata=eval{ Storable::lock_retrieve("$config{srcdir}/.ikiwiki/userdb") };
if (! defined $userdata || ! ref $userdata || if (! defined $userdata || ! ref $userdata ||
! exists $userdata->{$user} || ! ref $userdata->{$user}) { ! exists $userdata->{$user} || ! ref $userdata->{$user}) {
return ""; return "";
@ -750,13 +757,13 @@ sub userinfo_set ($$) { #{{{
my $info=shift; my $info=shift;
eval q{use Storable}; eval q{use Storable};
my $userdata=eval{ Storable::lock_retrieve("$srcdir/.ikiwiki/userdb") }; my $userdata=eval{ Storable::lock_retrieve("$config{srcdir}/.ikiwiki/userdb") };
if (! defined $userdata || ! ref $userdata) { if (! defined $userdata || ! ref $userdata) {
$userdata={}; $userdata={};
} }
$userdata->{$user}=$info; $userdata->{$user}=$info;
my $oldmask=umask(077); my $oldmask=umask(077);
my $ret=Storable::lock_store($userdata, "$srcdir/.ikiwiki/userdb"); my $ret=Storable::lock_store($userdata, "$config{srcdir}/.ikiwiki/userdb");
umask($oldmask); umask($oldmask);
return $ret; return $ret;
} #}}} } #}}}
@ -767,7 +774,7 @@ sub cgi_signin ($$) { #{{{
eval q{use CGI::FormBuilder}; eval q{use CGI::FormBuilder};
my $form = CGI::FormBuilder->new( my $form = CGI::FormBuilder->new(
title => "$wikiname signin", title => "$config{wikiname} signin",
fields => [qw(do page from name password confirm_password email)], fields => [qw(do page from name password confirm_password email)],
header => 1, header => 1,
method => 'POST', method => 'POST',
@ -782,7 +789,8 @@ sub cgi_signin ($$) { #{{{
params => $q, params => $q,
action => $q->request_uri, action => $q->request_uri,
header => 0, header => 0,
template => (-e "$templatedir/signin.tmpl" ? "$templatedir/signin.tmpl" : "") template => (-e "$config{templatedir}/signin.tmpl" ?
"$config{templatedir}/signin.tmpl" : "")
); );
$form->field(name => "name", required => 0); $form->field(name => "name", required => 0);
@ -861,12 +869,12 @@ sub cgi_signin ($$) { #{{{
if (defined $form->field("do") && if (defined $form->field("do") &&
$form->field("do") ne 'signin') { $form->field("do") ne 'signin') {
print $q->redirect( print $q->redirect(
"$cgiurl?do=".$form->field("do"). "$config{cgiurl}?do=".$form->field("do").
"&page=".$form->field("page"). "&page=".$form->field("page").
"&from=".$form->field("from"));; "&from=".$form->field("from"));;
} }
else { else {
print $q->redirect($url); print $q->redirect($config{url});
} }
} }
elsif ($form->submitted eq 'Register') { elsif ($form->submitted eq 'Register') {
@ -889,23 +897,22 @@ sub cgi_signin ($$) { #{{{
elsif ($form->submitted eq 'Mail Password') { elsif ($form->submitted eq 'Mail Password') {
my $user_name=$form->field("name"); my $user_name=$form->field("name");
my $template=HTML::Template->new( my $template=HTML::Template->new(
filename => "$templatedir/passwordmail.tmpl" filename => "$config{templatedir}/passwordmail.tmpl"
); );
$template->param( $template->param(
user_name => $user_name, user_name => $user_name,
user_password => userinfo_get($user_name, "password"), user_password => userinfo_get($user_name, "password"),
wikiurl => $url, wikiurl => $config{url},
wikiname => $wikiname, wikiname => $config{wikiname},
REMOTE_ADDR => $ENV{REMOTE_ADDR}, REMOTE_ADDR => $ENV{REMOTE_ADDR},
); );
eval q{use Mail::Sendmail}; eval q{use Mail::Sendmail};
my ($fromhost) = $cgiurl =~ m!/([^/]+)!; my ($fromhost) = $config{cgiurl} =~ m!/([^/]+)!;
print STDERR "$< $> >>> $cgiurl ".(getpwuid($>))[0]."@".$fromhost."\n";
sendmail( sendmail(
To => userinfo_get($user_name, "email"), To => userinfo_get($user_name, "email"),
From => "$wikiname admin <".(getpwuid($>))[0]."@".$fromhost.">", From => "$config{wikiname} admin <".(getpwuid($>))[0]."@".$fromhost.">",
Subject => "$wikiname information", Subject => "$config{wikiname} information",
Message => $template->output, Message => $template->output,
) or error("Failed to send mail"); ) or error("Failed to send mail");
@ -938,12 +945,12 @@ sub cgi_editpage ($$) { #{{{
params => $q, params => $q,
action => $q->request_uri, action => $q->request_uri,
table => 0, table => 0,
template => "$templatedir/editpage.tmpl" template => "$config{templatedir}/editpage.tmpl"
); );
my ($page)=$form->param('page')=~/$wiki_file_regexp/; my ($page)=$form->param('page')=~/$config{wiki_file_regexp}/;
if (! defined $page || ! length $page || $page ne $q->param('page') || if (! defined $page || ! length $page || $page ne $q->param('page') ||
$page=~/$wiki_file_prune_regexp/ || $page=~/^\//) { $page=~/$config{wiki_file_prune_regexp}/ || $page=~/^\//) {
error("bad page name"); error("bad page name");
} }
$page=lc($page); $page=lc($page);
@ -956,7 +963,7 @@ sub cgi_editpage ($$) { #{{{
cols => 80); cols => 80);
if ($form->submitted eq "Cancel") { if ($form->submitted eq "Cancel") {
print $q->redirect("$url/".htmlpage($page)); print $q->redirect("$config{url}/".htmlpage($page));
return; return;
} }
if (! $form->submitted || ! $form->validate) { if (! $form->submitted || ! $form->validate) {
@ -964,15 +971,15 @@ sub cgi_editpage ($$) { #{{{
if (exists $pagesources{lc($page)}) { if (exists $pagesources{lc($page)}) {
# hmm, someone else made the page in the # hmm, someone else made the page in the
# meantime? # meantime?
print $q->redirect("$url/".htmlpage($page)); print $q->redirect("$config{url}/".htmlpage($page));
return; return;
} }
my @page_locs; my @page_locs;
my ($from)=$form->param('from')=~/$wiki_file_regexp/; my ($from)=$form->param('from')=~/$config{wiki_file_regexp}/;
if (! defined $from || ! length $from || if (! defined $from || ! length $from ||
$from ne $form->param('from') || $from ne $form->param('from') ||
$from=~/$wiki_file_prune_regexp/ || $from=~/^\//) { $from=~/$config{wiki_file_prune_regexp}/ || $from=~/^\//) {
@page_locs=$page; @page_locs=$page;
} }
else { else {
@ -994,7 +1001,7 @@ sub cgi_editpage ($$) { #{{{
elsif ($form->field("do") eq "edit") { elsif ($form->field("do") eq "edit") {
my $content=""; my $content="";
if (exists $pagesources{lc($page)}) { if (exists $pagesources{lc($page)}) {
$content=readfile("$srcdir/$pagesources{lc($page)}"); $content=readfile("$config{srcdir}/$pagesources{lc($page)}");
$content=~s/\n/\r\n/g; $content=~s/\n/\r\n/g;
} }
$form->tmpl_param("page_select", 0); $form->tmpl_param("page_select", 0);
@ -1004,13 +1011,13 @@ sub cgi_editpage ($$) { #{{{
$form->title("editing $page"); $form->title("editing $page");
} }
$form->tmpl_param("can_commit", $svn); $form->tmpl_param("can_commit", $config{svn});
$form->tmpl_param("indexlink", indexlink()); $form->tmpl_param("indexlink", indexlink());
print $form->render(submit => ["Save Page", "Cancel"]); print $form->render(submit => ["Save Page", "Cancel"]);
} }
else { else {
# save page # save page
my $file=$page.$default_pagetype; my $file=$page.$config{default_pageext};
my $newfile=1; my $newfile=1;
if (exists $pagesources{lc($page)}) { if (exists $pagesources{lc($page)}) {
$file=$pagesources{lc($page)}; $file=$pagesources{lc($page)};
@ -1020,7 +1027,7 @@ sub cgi_editpage ($$) { #{{{
my $content=$form->field('content'); my $content=$form->field('content');
$content=~s/\r\n/\n/g; $content=~s/\r\n/\n/g;
$content=~s/\r/\n/g; $content=~s/\r/\n/g;
writefile("$srcdir/$file", $content); writefile("$config{srcdir}/$file", $content);
my $message="web commit "; my $message="web commit ";
if ($session->param("name")) { if ($session->param("name")) {
@ -1034,7 +1041,7 @@ sub cgi_editpage ($$) { #{{{
$message.=": ".$form->field('comments'); $message.=": ".$form->field('comments');
} }
if ($svn) { if ($config{svn}) {
if ($newfile) { if ($newfile) {
rcs_add($file); rcs_add($file);
} }
@ -1048,7 +1055,7 @@ sub cgi_editpage ($$) { #{{{
# The trailing question mark tries to avoid broken # The trailing question mark tries to avoid broken
# caches and get the most recent version of the page. # caches and get the most recent version of the page.
print $q->redirect("$url/".htmlpage($page)."?updated"); print $q->redirect("$config{url}/".htmlpage($page)."?updated");
} }
} #}}} } #}}}
@ -1073,11 +1080,11 @@ sub cgi () { #{{{
my $oldmask=umask(077); my $oldmask=umask(077);
my $session = CGI::Session->new("driver:db_file", $q, my $session = CGI::Session->new("driver:db_file", $q,
{ FileName => "$srcdir/.ikiwiki/sessions.db" }); { FileName => "$config{srcdir}/.ikiwiki/sessions.db" });
umask($oldmask); umask($oldmask);
# Everything below this point needs the user to be signed in. # Everything below this point needs the user to be signed in.
if ((! $anonok && ! defined $session->param("name") || if ((! $config{anonok} && ! defined $session->param("name") ||
! userinfo_get($session->param("name"), "regdate")) || $do eq 'signin') { ! userinfo_get($session->param("name"), "regdate")) || $do eq 'signin') {
cgi_signin($q, $session); cgi_signin($q, $session);
@ -1098,40 +1105,42 @@ sub cgi () { #{{{
} #}}} } #}}}
# main {{{ # main {{{
my $wrapper=0;
if (grep /^-/, @ARGV) { if (grep /^-/, @ARGV) {
eval {use Getopt::Long}; eval {use Getopt::Long};
GetOptions( GetOptions(
"wikiname=s" => \$wikiname, "wikiname=s" => \$config{wikiname},
"verbose|v" => \$verbose, "verbose|v!" => \$config{verbose},
"rebuild!" => \$rebuild, "rebuild!" => \$config{rebuild},
"wrapper!" => \$wrapper, "wrapper!" => \$config{wrapper},
"svn!" => \$svn, "svn!" => \$config{svn},
"anonok!" => \$anonok, "anonok!" => \$config{anonok},
"cgi!" => \$cgi, "cgi!" => \$config{cgi},
"url=s" => \$url, "url=s" => \$config{url},
"cgiurl=s" => \$cgiurl, "cgiurl=s" => \$config{cgiurl},
"historyurl=s" => \$historyurl, "historyurl=s" => \$config{historyurl},
"exclude=s@" => sub {
$config{wiki_file_prune_regexp}=qr/$config{wiki_file_prune_regexp}|$_[1]/;
},
) || usage(); ) || usage();
} }
usage() unless @ARGV == 3; usage() unless @ARGV == 3;
($srcdir) = possibly_foolish_untaint(shift); $config{srcdir} = possibly_foolish_untaint(shift);
($templatedir) = possibly_foolish_untaint(shift); $config{templatedir} = possibly_foolish_untaint(shift);
($destdir) = possibly_foolish_untaint(shift); $config{destdir} = possibly_foolish_untaint(shift);
if ($cgi && ! length $url) { if ($config{cgi} && ! length $config{url}) {
error("Must specify url to wiki with --url when using --cgi"); error("Must specify url to wiki with --url when using --cgi");
} }
gen_wrapper($svn, $rebuild) if $wrapper; gen_wrapper() if $config{wrapper};
memoize('pagename'); memoize('pagename');
memoize('bestlink'); memoize('bestlink');
loadindex() unless $rebuild; loadindex() unless $config{rebuild};
if ($cgi) { if ($config{cgi}) {
cgi(); cgi();
} }
else { else {
rcs_update() if $svn; rcs_update() if $config{svn};
refresh(); refresh();
saveindex(); saveindex();
} }