X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/dae0f48e91304afcb6ebe0936360e51b22a56548..eda6949e4dc1c25694b9eade4329344a4d812a84:/IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 1cbe975c0..5f7bdfd06 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -8,12 +8,15 @@ use HTML::Entities;
 use open qw{:utf8 :std};
 
 use vars qw{%config %links %oldlinks %oldpagemtime %pagectime %pagecase
-            %renderedfiles %pagesources %depends %hooks %forcerebuild};
+            %renderedfiles %oldrenderedfiles %pagesources %depends %hooks
+	    %forcerebuild};
 
 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
                  %config %links %renderedfiles %pagesources);
+our $VERSION = 1.01; # plugin interface version
 
 # Optimisation.
 use Memoize;
@@ -21,11 +24,13 @@ memoize("abs2rel");
 memoize("pagespec_translate");
 
 my $installdir=''; # INSTALLDIR_AUTOREPLACE done by Makefile, DNE
+our $version='unknown'; # VERSION_AUTOREPLACE done by Makefile, DNE
 
 sub defaultconfig () { #{{{
-	wiki_file_prune_regexp => qr{((^|/).svn/|\.\.|^\.|\/\.|\.x?html?$|\.rss$)},
+	wiki_file_prune_regexp => qr{((^|/).svn/|\.\.|^\.|\/\.|\.x?html?$|\.rss$|\.atom$|.arch-ids/|{arch}/)},
 	wiki_link_regexp => qr/\[\[(?:([^\]\|]+)\|)?([^\s\]]+)\]\]/,
 	wiki_file_regexp => qr/(^[-[:alnum:]_.:\/+]+$)/,
+	web_commit_regexp => qr/^web commit (by (.*?(?=: |$))|from (\d+\.\d+\.\d+\.\d+)):?(.*)/,
 	verbose => 0,
 	syslog => 0,
 	wikiname => "wiki",
@@ -39,6 +44,7 @@ sub defaultconfig () { #{{{
 	diffurl => '',
 	anonok => 0,
 	rss => 0,
+	atom => 0,
 	discussion => 1,
 	rebuild => 0,
 	refresh => 0,
@@ -56,10 +62,11 @@ sub defaultconfig () { #{{{
 	setup => undef,
 	adminuser => undef,
 	adminemail => undef,
-	plugin => [qw{mdwn inline htmlscrubber}],
+	plugin => [qw{mdwn inline htmlscrubber passwordauth}],
 	timeformat => '%c',
 	locale => undef,
 	sslcookie => 0,
+	httpauth => 0,
 } #}}}
    
 sub checkconfig () { #{{{
@@ -70,12 +77,14 @@ sub checkconfig () { #{{{
 	}
 	if (defined $config{locale}) {
 		eval q{use POSIX};
+		error($@) if $@;
 		$ENV{LANG} = $config{locale}
 			if POSIX::setlocale(&POSIX::LC_TIME, $config{locale});
 	}
 
 	if ($config{w3mmode}) {
 		eval q{use Cwd q{abs_path}};
+		error($@) if $@;
 		$config{srcdir}=possibly_foolish_untaint(abs_path($config{srcdir}));
 		$config{destdir}=possibly_foolish_untaint(abs_path($config{destdir}));
 		$config{cgiurl}="file:///\$LIB/ikiwiki-w3m.cgi/".$config{cgiurl}
@@ -86,8 +95,8 @@ sub checkconfig () { #{{{
 	if ($config{cgi} && ! length $config{url}) {
 		error("Must specify url to wiki with --url when using --cgi\n");
 	}
-	if ($config{rss} && ! length $config{url}) {
-		error("Must specify url to wiki with --url when using --rss\n");
+	if (($config{rss} || $config{atom}) && ! length $config{url}) {
+		error("Must specify url to wiki with --url when using --rss or --atom\n");
 	}
 	
 	$config{wikistatedir}="$config{srcdir}/.ikiwiki"
@@ -107,13 +116,8 @@ sub checkconfig () { #{{{
 } #}}}
 
 sub loadplugins () { #{{{
-	foreach my $plugin (@{$config{plugin}}) {
-		my $mod="IkiWiki::Plugin::".possibly_foolish_untaint($plugin);
-		eval qq{use $mod};
-		if ($@) {
-			error("Failed to load plugin $mod: $@");
-		}
-	}
+	loadplugin($_) foreach @{$config{plugin}};
+	
 	run_hooks(getopt => sub { shift->() });
 	if (grep /^-/, @ARGV) {
 		print STDERR "Unknown option: $_\n"
@@ -122,6 +126,16 @@ sub loadplugins () { #{{{
 	}
 } #}}}
 
+sub loadplugin ($) { #{{{
+	my $plugin=shift;
+
+	my $mod="IkiWiki::Plugin::".possibly_foolish_untaint($plugin);
+	eval qq{use $mod};
+	if ($@) {
+		error("Failed to load plugin $mod: $@");
+	}
+} #}}}
+
 sub error ($) { #{{{
 	if ($config{cgi}) {
 		print "Content-type: text/html\n\n";
@@ -258,6 +272,27 @@ sub writefile ($$$;$) { #{{{
 	close OUT;
 } #}}}
 
+my %cleared;
+sub will_render ($$;$) { #{{{
+	my $page=shift;
+	my $dest=shift;
+	my $clear=shift;
+
+	# Important security check.
+	if (-e "$config{destdir}/$dest" && ! $config{rebuild} &&
+	    ! grep { $_ eq $dest } (@{$renderedfiles{$page}}, @{$oldrenderedfiles{$page}})) {
+		error("$config{destdir}/$dest independently created, not overwriting with version from $page");
+	}
+
+	if (! $clear || $cleared{$page}) {
+		$renderedfiles{$page}=[$dest, grep { $_ ne $dest } @{$renderedfiles{$page}}];
+	}
+	else {
+		$renderedfiles{$page}=[$dest];
+		$cleared{$page}=1;
+	}
+} #}}}
+
 sub bestlink ($$) { #{{{
 	my $page=shift;
 	my $link=shift;
@@ -319,7 +354,7 @@ sub baseurl (;$) { #{{{
 sub abs2rel ($$) { #{{{
 	# Work around very innefficient behavior in File::Spec if abs2rel
 	# is passed two relative paths. It's much faster if paths are
-	# absolute!
+	# absolute! (Debian bug #376658)
 	my $path="/".shift;
 	my $base="/".shift;
 
@@ -333,6 +368,7 @@ sub displaytime ($) { #{{{
 	my $time=shift;
 
 	eval q{use POSIX};
+	error($@) if $@;
 	# strftime doesn't know about encodings, so make sure
 	# its output is properly treated as utf8
 	return decode_utf8(POSIX::strftime(
@@ -363,10 +399,10 @@ sub htmllink ($$$;$$$) { #{{{
 	# TODO BUG: %renderedfiles may not have it, if the linked to page
 	# was also added and isn't yet rendered! Note that this bug is
 	# masked by the bug that makes all new files be rendered twice.
-	if (! grep { $_ eq $bestlink } values %renderedfiles) {
+	if (! grep { $_ eq $bestlink } map { @{$_} } values %renderedfiles) {
 		$bestlink=htmlpage($bestlink);
 	}
-	if (! grep { $_ eq $bestlink } values %renderedfiles) {
+	if (! grep { $_ eq $bestlink } map { @{$_} } values %renderedfiles) {
 		return "<span><a href=\"".
 			cgiurl(do => "create", page => lc($link), from => $page).
 			"\">?</a>$linktext</span>"
@@ -419,10 +455,11 @@ sub linkify ($$$) { #{{{
 } #}}}
 
 my %preprocessing;
-sub preprocess ($$$) { #{{{
+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 $handle=sub {
 		my $escape=shift;
@@ -432,6 +469,7 @@ sub preprocess ($$$) { #{{{
 			return "[[$command $params]]";
 		}
 		elsif (exists $hooks{preprocess}{$command}) {
+			return "" if $scan && ! $hooks{preprocess}{$command}{scan};
 			# Note: preserve order of params, some plugins may
 			# consider it significant.
 			my @params;
@@ -480,7 +518,7 @@ sub preprocess ($$$) { #{{{
 	return $content;
 } #}}}
 
-sub filter ($$) {
+sub filter ($$) { #{{{
 	my $page=shift;
 	my $content=shift;
 
@@ -489,7 +527,7 @@ sub filter ($$) {
 	});
 
 	return $content;
-}
+} #}}}
 
 sub indexlink () { #{{{
 	return "<a href=\"$config{url}\">$config{wikiname}</a>";
@@ -526,6 +564,7 @@ sub loadindex () { #{{{
 		chomp;
 		my %items;
 		$items{link}=[];
+		$items{dest}=[];
 		foreach my $i (split(/ /, $_)) {
 			my ($item, $val)=split(/=/, $i, 2);
 			push @{$items{$item}}, decode_entities($val);
@@ -540,7 +579,8 @@ sub loadindex () { #{{{
 			$oldlinks{$page}=[@{$items{link}}];
 			$links{$page}=[@{$items{link}}];
 			$depends{$page}=$items{depends}[0] if exists $items{depends};
-			$renderedfiles{$page}=$items{dest}[0];
+			$renderedfiles{$page}=[@{$items{dest}}];
+			$oldrenderedfiles{$page}=[@{$items{dest}}];
 			$pagecase{lc $page}=$page;
 		}
 		$pagectime{$page}=$items{ctime}[0];
@@ -560,9 +600,10 @@ sub saveindex () { #{{{
 		next unless $oldpagemtime{$page};
 		my $line="mtime=$oldpagemtime{$page} ".
 			"ctime=$pagectime{$page} ".
-			"src=$pagesources{$page} ".
-			"dest=$renderedfiles{$page}";
-		$line.=" link=$_" foreach @{$links{$page}};
+			"src=$pagesources{$page}";
+		$line.=" dest=$_" foreach @{$renderedfiles{$page}};
+		my %count;
+		$line.=" link=$_" foreach grep { ++$count{$_} == 1 } @{$links{$page}};
 		if (exists $depends{$page}) {
 			$line.=" depends=".encode_entities($depends{$page}, " \t\n");
 		}
@@ -589,7 +630,7 @@ sub template ($;@) { #{{{
 	HTML::Template->new(template_params(@_));
 } #}}}
 
-sub misctemplate ($$) { #{{{
+sub misctemplate ($$;@) { #{{{
 	my $title=shift;
 	my $pagebody=shift;
 	
@@ -599,8 +640,12 @@ sub misctemplate ($$) { #{{{
 		indexlink => indexlink(),
 		wikiname => $config{wikiname},
 		pagebody => $pagebody,
-	baseurl => baseurl(),
+		baseurl => baseurl(),
+		@_,
 	);
+	run_hooks(pagetemplate => sub {
+		shift->(page => "", destpage => "", template => $template);
+	});
 	return $template->output;
 }#}}}
 
@@ -610,6 +655,8 @@ sub hook (@) { # {{{
 	if (! exists $param{type} || ! ref $param{call} || ! exists $param{id}) {
 		error "hook requires type, call, and id parameters";
 	}
+
+	return if $param{no_override} && exists $hooks{$param{type}}{$param{id}};
 	
 	$hooks{$param{type}}{$param{id}}=\%param;
 } # }}}
@@ -621,7 +668,15 @@ sub run_hooks ($$) { # {{{
 	my $sub=shift;
 
 	if (exists $hooks{$type}) {
+		my @deferred;
 		foreach my $id (keys %{$hooks{$type}}) {
+			if ($hooks{$type}{$id}{last}) {
+				push @deferred, $id;
+				next;
+			}
+			$sub->($hooks{$type}{$id}{call});
+		}
+		foreach my $id (@deferred) {
 			$sub->($hooks{$type}{$id}{call});
 		}
 	}