X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/8c8ce06a1b267a5c5d0b1a4f2b229b6d15e63b71..7bdb9846379c5f410662c0a84785e52152a4d434:/IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 8a3c81755..a290b479a 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -5,32 +5,31 @@ use warnings;
 use strict;
 use Encode;
 use HTML::Entities;
+use URI::Escape q{uri_escape_utf8};
 use open qw{:utf8 :std};
 
-use vars qw{%config %links %oldlinks %oldpagemtime %pagectime %pagecase
+use vars qw{%config %links %oldlinks %pagemtime %pagectime %pagecase
             %renderedfiles %oldrenderedfiles %pagesources %depends %hooks
-	    %forcerebuild};
+	    %forcerebuild $gettext_obj};
 
 use Exporter q{import};
 our @EXPORT = qw(hook debug error template htmlpage add_depends pagespec_match
                  bestlink htmllink readfile writefile pagetype srcfile pagename
                  displaytime will_render gettext
                  %config %links %renderedfiles %pagesources);
-our $VERSION = 1.01; # plugin interface version
-
+our $VERSION = 1.02; # plugin interface version, next is ikiwiki version
+our $version="1.45";my $installdir="/usr";
 # Optimisation.
 use Memoize;
 memoize("abs2rel");
 memoize("pagespec_translate");
 memoize("file_pruned");
 
-my $installdir=''; # INSTALLDIR_AUTOREPLACE done by Makefile, DNE
-our $version='unknown'; # VERSION_AUTOREPLACE done by Makefile, DNE
-
 sub defaultconfig () { #{{{
-	wiki_file_prune_regexps => [qr/\.\./, qr/^\./, qr/\/\./, qr/\.x?html?$/,
+	wiki_file_prune_regexps => [qr/\.\./, qr/^\./, qr/\/\./,
+		qr/\.x?html?$/, qr/\.ikiwiki-new$/,
 		qr/(^|\/).svn\//, qr/.arch-ids\//, qr/{arch}\//],
-	wiki_link_regexp => qr/\[\[(?:([^\]\|]+)\|)?([^\s\]]+)\]\]/,
+	wiki_link_regexp => qr/\[\[(?:([^\]\|]+)\|)?([^\s\]#]+)(?:#([^\s\]]+))?\]\]/,
 	wiki_file_regexp => qr/(^[-[:alnum:]_.:\/+]+$)/,
 	web_commit_regexp => qr/^web commit (by (.*?(?=: |$))|from (\d+\.\d+\.\d+\.\d+)):?(.*)/,
 	verbose => 0,
@@ -38,13 +37,13 @@ sub defaultconfig () { #{{{
 	wikiname => "wiki",
 	default_pageext => "mdwn",
 	cgi => 0,
+	post_commit => 0,
 	rcs => '',
 	notify => 0,
 	url => '',
 	cgiurl => '',
 	historyurl => '',
 	diffurl => '',
-	anonok => 0,
 	rss => 0,
 	atom => 0,
 	discussion => 1,
@@ -56,6 +55,8 @@ sub defaultconfig () { #{{{
 	wrappermode => undef,
 	svnrepo => undef,
 	svnpath => "trunk",
+	gitorigin_branch => "origin",
+	gitmaster_branch => "master",
 	srcdir => undef,
 	destdir => undef,
 	pingurl => [],
@@ -64,7 +65,8 @@ sub defaultconfig () { #{{{
 	setup => undef,
 	adminuser => undef,
 	adminemail => undef,
-	plugin => [qw{mdwn inline htmlscrubber passwordauth}],
+	plugin => [qw{mdwn inline htmlscrubber passwordauth signinedit
+	              lockedit conditional}],
 	timeformat => '%c',
 	locale => undef,
 	sslcookie => 0,
@@ -81,8 +83,10 @@ sub checkconfig () { #{{{
 	if (defined $config{locale}) {
 		eval q{use POSIX};
 		error($@) if $@;
-		$ENV{LANG} = $config{locale}
-			if POSIX::setlocale(&POSIX::LC_ALL, $config{locale});
+		if (POSIX::setlocale(&POSIX::LC_ALL, $config{locale})) {
+			$ENV{LANG}=$config{locale};
+			$gettext_obj=undef;
+		}
 	}
 
 	if ($config{w3mmode}) {
@@ -138,14 +142,19 @@ sub loadplugin ($) { #{{{
 	}
 } #}}}
 
-sub error ($) { #{{{
+sub error ($;$) { #{{{
+	my $message=shift;
+	my $cleaner=shift;
 	if ($config{cgi}) {
 		print "Content-type: text/html\n\n";
 		print misctemplate(gettext("Error"),
-			"<p>".gettext("Error").": @_</p>");
+			"<p>".gettext("Error").": $message</p>");
+	}
+	log_message(debug => $message) if $config{syslog};
+	if (defined $cleaner) {
+		$cleaner->();
 	}
-	log_message(error => @_);
-	exit(1);
+	die $message."\n";
 } #}}}
 
 sub debug ($) { #{{{
@@ -165,7 +174,7 @@ sub log_message ($$) { #{{{
 			$log_open=1;
 		}
 		eval {
-			Sys::Syslog::syslog($type, join(" ", @_));
+			Sys::Syslog::syslog($type, "%s", join(" ", @_));
 		}
 	}
 	elsif (! $config{cgi}) {
@@ -228,9 +237,10 @@ sub srcfile ($) { #{{{
 	error("internal error: $file cannot be found");
 } #}}}
 
-sub readfile ($;$) { #{{{
+sub readfile ($;$$) { #{{{
 	my $file=shift;
 	my $binary=shift;
+	my $wantfd=shift;
 
 	if (-l $file) {
 		error("cannot read a symlink ($file)");
@@ -239,16 +249,18 @@ sub readfile ($;$) { #{{{
 	local $/=undef;
 	open (IN, $file) || error("failed to read $file: $!");
 	binmode(IN) if ($binary);
+	return \*IN if $wantfd;
 	my $ret=<IN>;
-	close IN;
+	close IN || error("failed to read $file: $!");
 	return $ret;
 } #}}}
 
-sub writefile ($$$;$) { #{{{
+sub writefile ($$$;$$) { #{{{
 	my $file=shift; # can include subdirs
 	my $destdir=shift; # directory to put file in
 	my $content=shift;
 	my $binary=shift;
+	my $writer=shift;
 	
 	my $test=$file;
 	while (length $test) {
@@ -257,8 +269,12 @@ sub writefile ($$$;$) { #{{{
 		}
 		$test=dirname($test);
 	}
+	my $newfile="$destdir/$file.ikiwiki-new";
+	if (-l $newfile) {
+		error("cannot write to a symlink ($newfile)");
+	}
 
-	my $dir=dirname("$destdir/$file");
+	my $dir=dirname($newfile);
 	if (! -d $dir) {
 		my $d="";
 		foreach my $s (split(m!/+!, $dir)) {
@@ -268,11 +284,19 @@ sub writefile ($$$;$) { #{{{
 			}
 		}
 	}
-	
-	open (OUT, ">$destdir/$file") || error("failed to write $destdir/$file: $!");
+
+	my $cleanup = sub { unlink($newfile) };
+	open (OUT, ">$newfile") || error("failed to write $newfile: $!", $cleanup);
 	binmode(OUT) if ($binary);
-	print OUT $content;
-	close OUT;
+	if ($writer) {
+		$writer->(\*OUT, $cleanup);
+	}
+	else {
+		print OUT $content or error("failed writing to $newfile: $!", $cleanup);
+	}
+	close OUT || error("failed saving $newfile: $!", $cleanup);
+	rename($newfile, "$destdir/$file") || 
+		error("failed renaming $newfile to $destdir/$file: $!", $cleanup);
 } #}}}
 
 my %cleared;
@@ -338,27 +362,32 @@ sub pagetitle ($;$) { #{{{
 	my $unescaped=shift;
 
 	if ($unescaped) {
-		$page=~s/__(\d+)__/chr($1)/eg;
+		$page=~s/(__(\d+)__|_)/$1 eq '_' ? ' ' : chr($2)/eg;
 	}
 	else {
-		$page=~s/__(\d+)__/&#$1;/g;
+		$page=~s/(__(\d+)__|_)/$1 eq '_' ? ' ' : "&#$2;"/eg;
 	}
-	$page=~y/_/ /;
 
 	return $page;
 } #}}}
 
 sub titlepage ($) { #{{{
 	my $title=shift;
-	$title=~y/ /_/;
-	$title=~s/([^-[:alnum:]_:+\/.])/"__".ord($1)."__"/eg;
+	$title=~s/([^-[:alnum:]:+\/.])/$1 eq ' ' ? '_' : "__".ord($1)."__"/eg;
 	return $title;
 } #}}}
 
+sub linkpage ($) { #{{{
+	my $link=shift;
+	$link=~s/([^-[:alnum:]:+\/._])/$1 eq ' ' ? '_' : "__".ord($1)."__"/eg;
+	return $link;
+} #}}}
+
 sub cgiurl (@) { #{{{
 	my %params=@_;
 
-	return $config{cgiurl}."?".join("&amp;", map "$_=$params{$_}", keys %params);
+	return $config{cgiurl}."?".
+		join("&amp;", map $_."=".uri_escape_utf8($params{$_}), keys %params);
 } #}}}
 
 sub baseurl (;$) { #{{{
@@ -395,23 +424,27 @@ sub displaytime ($) { #{{{
 			$config{timeformat}, localtime($time)));
 } #}}}
 
-sub htmllink ($$$;$$$) { #{{{
+sub htmllink ($$$;@) { #{{{
 	my $lpage=shift; # the page doing the linking
 	my $page=shift; # the page that will contain the link (different for inline)
 	my $link=shift;
-	my $noimageinline=shift; # don't turn links into inline html images
-	my $forcesubpage=shift; # force a link to a subpage
-	my $linktext=shift; # set to force the link text to something
+	my %opts=@_;
 
 	my $bestlink;
-	if (! $forcesubpage) {
+	if (! $opts{forcesubpage}) {
 		$bestlink=bestlink($lpage, $link);
 	}
 	else {
 		$bestlink="$lpage/".lc($link);
 	}
 
-	$linktext=pagetitle(basename($link)) unless defined $linktext;
+	my $linktext;
+	if (defined $opts{linktext}) {
+		$linktext=$opts{linktext};
+	}
+	else {
+		$linktext=pagetitle(basename($link));
+	}
 	
 	return "<span class=\"selflink\">$linktext</span>"
 		if length $bestlink && $page eq $bestlink;
@@ -422,15 +455,24 @@ sub htmllink ($$$;$$$) { #{{{
 	if (! grep { $_ eq $bestlink } map { @{$_} } values %renderedfiles) {
 		return $linktext unless length $config{cgiurl};
 		return "<span><a href=\"".
-			cgiurl(do => "create", page => lc($link), from => $page).
+			cgiurl(
+				do => "create",
+				page => pagetitle(lc($link), 1),
+				from => $lpage
+			).
 			"\">?</a>$linktext</span>"
 	}
 	
 	$bestlink=abs2rel($bestlink, dirname($page));
 	
-	if (! $noimageinline && isinlinableimage($bestlink)) {
+	if (! $opts{noimageinline} && isinlinableimage($bestlink)) {
 		return "<img src=\"$bestlink\" alt=\"$linktext\" />";
 	}
+
+	if (defined $opts{anchor}) {
+		$bestlink.="#".$opts{anchor};
+	}
+
 	return "<a href=\"$bestlink\">$linktext</a>";
 } #}}}
 
@@ -465,19 +507,26 @@ sub linkify ($$$) { #{{{
 	my $content=shift;
 
 	$content =~ s{(\\?)$config{wiki_link_regexp}}{
-		$2 ? ( $1 ? "[[$2|$3]]" : htmllink($lpage, $page, titlepage($3), 0, 0, pagetitle($2)))
-		   : ( $1 ? "[[$3]]" :    htmllink($lpage, $page, titlepage($3)))
+		defined $2
+			? ( $1 ? "[[$2|$3]]" : htmllink($lpage, $page, linkpage($3), anchor => $4, linktext => pagetitle($2)))
+			: ( $1 ? "[[$3]]"    : htmllink($lpage, $page, linkpage($3), anchor => $4))
 	}eg;
 	
 	return $content;
 } #}}}
 
 my %preprocessing;
-sub preprocess ($$$;$) { #{{{
+our $preprocess_preview=0;
+sub preprocess ($$$;$$) { #{{{
 	my $page=shift; # the page the data comes from
 	my $destpage=shift; # the page the data will appear in (different for inline)
 	my $content=shift;
 	my $scan=shift;
+	my $preview=shift;
+
+	# Using local because it needs to be set within any nested calls
+	# of this function.
+	local $preprocess_preview=$preview if defined $preview;
 
 	my $handle=sub {
 		my $escape=shift;
@@ -529,6 +578,7 @@ sub preprocess ($$$;$) { #{{{
 				@params,
 				page => $page,
 				destpage => $destpage,
+				preview => $preprocess_preview,
 			);
 			$preprocessing{$page}--;
 			return $ret;
@@ -565,11 +615,11 @@ sub lockwiki () { #{{{
 	}
 	open(WIKILOCK, ">$config{wikistatedir}/lockfile") ||
 		error ("cannot write to $config{wikistatedir}/lockfile: $!");
-	if (! flock(WIKILOCK, 2 | 4)) {
+	if (! flock(WIKILOCK, 2 | 4)) { # LOCK_EX | LOCK_NB
 		debug("wiki seems to be locked, waiting for lock");
 		my $wait=600; # arbitrary, but don't hang forever to 
 		              # prevent process pileup
-		for (1..600) {
+		for (1..$wait) {
 			return if flock(WIKILOCK, 2 | 4);
 			sleep 1;
 		}
@@ -581,6 +631,29 @@ sub unlockwiki () { #{{{
 	close WIKILOCK;
 } #}}}
 
+sub commit_hook_enabled () { #{{{
+	open(COMMITLOCK, "+>$config{wikistatedir}/commitlock") ||
+		error ("cannot write to $config{wikistatedir}/commitlock: $!");
+	if (! flock(COMMITLOCK, 1 | 4)) { # LOCK_SH | LOCK_NB to test
+		close COMMITLOCK;
+		return 0;
+	}
+	close COMMITLOCK;
+	return 1;
+} #}}}
+
+sub disable_commit_hook () { #{{{
+	open(COMMITLOCK, ">$config{wikistatedir}/commitlock") ||
+		error ("cannot write to $config{wikistatedir}/commitlock: $!");
+	if (! flock(COMMITLOCK, 2)) { # LOCK_EX
+		error("failed to get commit lock");
+	}
+} #}}}
+
+sub enable_commit_hook () { #{{{
+	close COMMITLOCK;
+} #}}}
+
 sub loadindex () { #{{{
 	open (IN, "$config{wikistatedir}/index") || return;
 	while (<IN>) {
@@ -599,7 +672,7 @@ sub loadindex () { #{{{
 		my $page=pagename($items{src}[0]);
 		if (! $config{rebuild}) {
 			$pagesources{$page}=$items{src}[0];
-			$oldpagemtime{$page}=$items{mtime}[0];
+			$pagemtime{$page}=$items{mtime}[0];
 			$oldlinks{$page}=[@{$items{link}}];
 			$links{$page}=[@{$items{link}}];
 			$depends{$page}=$items{depends}[0] if exists $items{depends};
@@ -618,11 +691,12 @@ sub saveindex () { #{{{
 	if (! -d $config{wikistatedir}) {
 		mkdir($config{wikistatedir});
 	}
-	open (OUT, ">$config{wikistatedir}/index") || 
-		error("cannot write to $config{wikistatedir}/index: $!");
-	foreach my $page (keys %oldpagemtime) {
-		next unless $oldpagemtime{$page};
-		my $line="mtime=$oldpagemtime{$page} ".
+	my $newfile="$config{wikistatedir}/index.new";
+	my $cleanup = sub { unlink($newfile) };
+	open (OUT, ">$newfile") || error("cannot write to $newfile: $!", $cleanup);
+	foreach my $page (keys %pagemtime) {
+		next unless $pagemtime{$page};
+		my $line="mtime=$pagemtime{$page} ".
 			"ctime=$pagectime{$page} ".
 			"src=$pagesources{$page}";
 		$line.=" dest=$_" foreach @{$renderedfiles{$page}};
@@ -631,9 +705,11 @@ sub saveindex () { #{{{
 		if (exists $depends{$page}) {
 			$line.=" depends=".encode_entities($depends{$page}, " \t\n");
 		}
-		print OUT $line."\n";
+		print OUT $line."\n" || error("failed writing to $newfile: $!", $cleanup);
 	}
-	close OUT;
+	close OUT || error("failed saving to $newfile: $!", $cleanup);
+	rename($newfile, "$config{wikistatedir}/index") ||
+		error("failed renaming $newfile to $config{wikistatedir}/index", $cleanup);
 } #}}}
 
 sub template_file ($) { #{{{
@@ -760,6 +836,49 @@ sub safequote ($) { #{{{
 	return "q{$s}";
 } #}}}
 
+sub add_depends ($$) { #{{{
+	my $page=shift;
+	my $pagespec=shift;
+	
+	if (! exists $depends{$page}) {
+		$depends{$page}=$pagespec;
+	}
+	else {
+		$depends{$page}=pagespec_merge($depends{$page}, $pagespec);
+	}
+} # }}}
+
+sub file_pruned ($$) { #{{{
+	require File::Spec;
+	my $file=File::Spec->canonpath(shift);
+	my $base=File::Spec->canonpath(shift);
+	$file=~s#^\Q$base\E/*##;
+
+	my $regexp='('.join('|', @{$config{wiki_file_prune_regexps}}).')';
+	$file =~ m/$regexp/;
+} #}}}
+
+sub gettext { #{{{
+	# Only use gettext in the rare cases it's needed.
+	if (exists $ENV{LANG} || exists $ENV{LC_ALL} || exists $ENV{LC_MESSAGES}) {
+		if (! $gettext_obj) {
+			$gettext_obj=eval q{
+				use Locale::gettext q{textdomain};
+				Locale::gettext->domain('ikiwiki')
+			};
+			if ($@) {
+				print STDERR "$@";
+				$gettext_obj=undef;
+				return shift;
+			}
+		}
+		return $gettext_obj->get(shift);
+	}
+	else {
+		return shift;
+	}
+} #}}}
+
 sub pagespec_merge ($$) { #{{{
 	my $a=shift;
 	my $b=shift;
@@ -800,64 +919,46 @@ sub pagespec_translate ($) { #{{{
 		elsif ($word eq "(" || $word eq ")" || $word eq "!") {
 			$code.=" ".$word;
 		}
-		elsif ($word =~ /^(link|backlink|created_before|created_after|creation_month|creation_year|creation_day)\((.+)\)$/) {
-			$code.=" match_$1(\$page, ".safequote($2).")";
+		elsif ($word =~ /^(\w+)\((.*)\)$/) {
+			if (exists $IkiWiki::PageSpec::{"match_$1"}) {
+				$code.="IkiWiki::PageSpec::match_$1(\$page, ".safequote($2).", \$from)";
+			}
+			else {
+				$code.=" 0";
+			}
 		}
 		else {
-			$code.=" match_glob(\$page, ".safequote($word).")";
+			$code.=" IkiWiki::PageSpec::match_glob(\$page, ".safequote($word).", \$from)";
 		}
 	}
 
 	return $code;
 } #}}}
 
-sub add_depends ($$) { #{{{
-	my $page=shift;
-	my $pagespec=shift;
-	
-	if (! exists $depends{$page}) {
-		$depends{$page}=$pagespec;
-	}
-	else {
-		$depends{$page}=pagespec_merge($depends{$page}, $pagespec);
-	}
-} # }}}
-
-sub file_pruned ($$) { #{{{
-	require File::Spec;
-	my $file=File::Spec->canonpath(shift);
-	my $base=File::Spec->canonpath(shift);
-	$file=~s#^\Q$base\E/*##;
-
-	my $regexp='('.join('|', @{$config{wiki_file_prune_regexps}}).')';
-	$file =~ m/$regexp/;
-} #}}}
-
-my $gettext_obj;
-sub gettext { #{{{
-	# Only use gettext in the rare cases it's needed.
-	if (exists $ENV{LANG} || exists $ENV{LC_ALL} || exists $ENV{LC_MESSAGES}) {
-		if (! $gettext_obj) {
-			eval q{use Locale::gettext ''};
-			$gettext_obj=Locale::gettext->domain('ikiwiki');
-		}
-		return $gettext_obj->get(shift);
-	}
-	else {
-		return shift;
-	}
-} #}}}
-
-sub pagespec_match ($$) { #{{{
+sub pagespec_match ($$;$) { #{{{
 	my $page=shift;
 	my $spec=shift;
+	my $from=shift;
 
 	return eval pagespec_translate($spec);
 } #}}}
 
-sub match_glob ($$) { #{{{
+package IkiWiki::PageSpec;
+
+sub match_glob ($$$) { #{{{
 	my $page=shift;
 	my $glob=shift;
+	my $from=shift;
+	if (! defined $from){
+		$from = "";
+	}
+
+	# relative matching
+	if ($glob =~ m!^\./!) {
+		$from=~s!/?[^/]+$!!;
+		$glob=~s!^\./!!;
+		$glob="$from/$glob" if length $from;
+	}
 
 	# turn glob into safe regexp
 	$glob=quotemeta($glob);
@@ -867,55 +968,68 @@ sub match_glob ($$) { #{{{
 	return $page=~/^$glob$/i;
 } #}}}
 
-sub match_link ($$) { #{{{
+sub match_link ($$$) { #{{{
 	my $page=shift;
 	my $link=lc(shift);
+	my $from=shift;
+	if (! defined $from){
+		$from = "";
+	}
+
+	# relative matching
+	if ($link =~ m!^\.! && defined $from) {
+		$from=~s!/?[^/]+$!!;
+		$link=~s!^\./!!;
+		$link="$from/$link" if length $from;
+	}
 
-	my $links = $links{$page} or return undef;
+	my $links = $IkiWiki::links{$page} or return undef;
+	return 0 unless @$links;
+	my $bestlink = IkiWiki::bestlink($from, $link);
 	foreach my $p (@$links) {
-		return 1 if lc $p eq $link;
+		return 1 if $bestlink eq IkiWiki::bestlink($page, $p);
 	}
 	return 0;
 } #}}}
 
-sub match_backlink ($$) { #{{{
-	match_link(pop, pop);
+sub match_backlink ($$$) { #{{{
+	match_link($_[1], $_[0], $_[3]);
 } #}}}
 
-sub match_created_before ($$) { #{{{
+sub match_created_before ($$$) { #{{{
 	my $page=shift;
 	my $testpage=shift;
 
-	if (exists $pagectime{$testpage}) {
-		return $pagectime{$page} < $pagectime{$testpage};
+	if (exists $IkiWiki::pagectime{$testpage}) {
+		return $IkiWiki::pagectime{$page} < $IkiWiki::pagectime{$testpage};
 	}
 	else {
 		return 0;
 	}
 } #}}}
 
-sub match_created_after ($$) { #{{{
+sub match_created_after ($$$) { #{{{
 	my $page=shift;
 	my $testpage=shift;
 
-	if (exists $pagectime{$testpage}) {
-		return $pagectime{$page} > $pagectime{$testpage};
+	if (exists $IkiWiki::pagectime{$testpage}) {
+		return $IkiWiki::pagectime{$page} > $IkiWiki::pagectime{$testpage};
 	}
 	else {
 		return 0;
 	}
 } #}}}
 
-sub match_creation_day ($$) { #{{{
-	return ((gmtime($pagectime{shift()}))[3] == shift);
+sub match_creation_day ($$$) { #{{{
+	return ((gmtime($IkiWiki::pagectime{shift()}))[3] == shift);
 } #}}}
 
-sub match_creation_month ($$) { #{{{
-	return ((gmtime($pagectime{shift()}))[4] + 1 == shift);
+sub match_creation_month ($$$) { #{{{
+	return ((gmtime($IkiWiki::pagectime{shift()}))[4] + 1 == shift);
 } #}}}
 
-sub match_creation_year ($$) { #{{{
-	return ((gmtime($pagectime{shift()}))[5] + 1900 == shift);
+sub match_creation_year ($$$) { #{{{
+	return ((gmtime($IkiWiki::pagectime{shift()}))[5] + 1900 == shift);
 } #}}}
 
 1