X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/848ff1bf5e218c57cc738a85ed02d7e1396c1d22..50d6abf28b71234b424eb8349f85eb465bc83983:/IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 66fea4369..e260fffea 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -18,10 +18,10 @@ use vars qw{%config %links %oldlinks %pagemtime %pagectime %pagecase
 
 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 urlto targetpage
-		 add_underlay pagetitle titlepage linkpage newpagefile
-		 inject
+                 pagespec_match_list bestlink htmllink readfile writefile
+		 pagetype srcfile pagename displaytime will_render gettext urlto
+		 targetpage add_underlay pagetitle titlepage linkpage
+		 newpagefile inject
                  %config %links %pagestate %wikistate %renderedfiles
                  %pagesources %destsources);
 our $VERSION = 3.00; # plugin interface version, next is ikiwiki version
@@ -321,7 +321,7 @@ sub getsetup () {
 		default => [qr/(^|\/)\.\.(\/|$)/, qr/^\./, qr/\/\./,
 			qr/\.x?html?$/, qr/\.ikiwiki-new$/,
 			qr/(^|\/).svn\//, qr/.arch-ids\//, qr/{arch}\//,
-			qr/(^|\/)_MTN\//,
+			qr/(^|\/)_MTN\//, qr/(^|\/)_darcs\//,
 			qr/\.dpkg-tmp$/],
 		description => "regexps of source files to ignore",
 		safe => 0,
@@ -533,7 +533,7 @@ sub loadplugins () {
 
 	run_hooks(getopt => sub { shift->() });
 	if (grep /^-/, @ARGV) {
-		print STDERR "Unknown option: $_\n"
+		print STDERR "Unknown option (or missing parameter): $_\n"
 			foreach grep /^-/, @ARGV;
 		usage();
 	}
@@ -627,27 +627,34 @@ sub dirname ($) {
 	return $file;
 }
 
-sub pagetype ($) {
+sub isinternal ($) {
 	my $page=shift;
+	return exists $pagesources{$page} &&
+		$pagesources{$page} =~ /\._([^.]+)$/;
+}
+
+sub pagetype ($) {
+	my $file=shift;
 	
-	if ($page =~ /\.([^.]+)$/) {
+	if ($file =~ /\.([^.]+)$/) {
 		return $1 if exists $hooks{htmlize}{$1};
 	}
+	my $base=basename($file);
+	if (exists $hooks{htmlize}{$base} &&
+	    $hooks{htmlize}{$base}{noextension}) {
+		return $base;
+	}
 	return;
 }
 
-sub isinternal ($) {
-	my $page=shift;
-	return exists $pagesources{$page} &&
-		$pagesources{$page} =~ /\._([^.]+)$/;
-}
-
 sub pagename ($) {
 	my $file=shift;
 
 	my $type=pagetype($file);
 	my $page=$file;
-	$page=~s/\Q.$type\E*$// if defined $type && !$hooks{htmlize}{$type}{keepextension};
+ 	$page=~s/\Q.$type\E*$//
+		if defined $type && !$hooks{htmlize}{$type}{keepextension}
+			&& !$hooks{htmlize}{$type}{noextension};
 	if ($config{indexpages} && $page=~/(.*)\/index$/) {
 		$page=$1;
 	}
@@ -1293,6 +1300,70 @@ sub indexlink () {
 	return "<a href=\"$config{url}\">$config{wikiname}</a>";
 }
 
+sub check_canedit ($$$;$) {
+	my $page=shift;
+	my $q=shift;
+	my $session=shift;
+	my $nonfatal=shift;
+	
+	my $canedit;
+	run_hooks(canedit => sub {
+		return if defined $canedit;
+		my $ret=shift->($page, $q, $session);
+		if (defined $ret) {
+			if ($ret eq "") {
+				$canedit=1;
+			}
+			elsif (ref $ret eq 'CODE') {
+				$ret->() unless $nonfatal;
+				$canedit=0;
+			}
+			elsif (defined $ret) {
+				error($ret) unless $nonfatal;
+				$canedit=0;
+			}
+		}
+	});
+	return defined $canedit ? $canedit : 1;
+}
+
+sub check_content (@) {
+	my %params=@_;
+	
+	return 1 if ! exists $hooks{checkcontent}; # optimisation
+
+	if (exists $pagesources{$params{page}}) {
+		my @diff;
+		my %old=map { $_ => 1 }
+		        split("\n", readfile(srcfile($pagesources{$params{page}})));
+		foreach my $line (split("\n", $params{content})) {
+			push @diff, $line if ! exists $old{$_};
+		}
+		$params{content}=join("\n", @diff);
+	}
+
+	my $ok;
+	run_hooks(checkcontent => sub {
+		return if defined $ok;
+		my $ret=shift->(%params);
+		if (defined $ret) {
+			if ($ret eq "") {
+				$ok=1;
+			}
+			elsif (ref $ret eq 'CODE') {
+				$ret->() unless $params{nonfatal};
+				$ok=0;
+			}
+			elsif (defined $ret) {
+				error($ret) unless $params{nonfatal};
+				$ok=0;
+			}
+		}
+
+	});
+	return defined $ok ? $ok : 1;
+}
+
 my $wikilock;
 
 sub lockwiki () {
@@ -1729,7 +1800,7 @@ sub pagespec_translate ($) {
 				$code.="IkiWiki::PageSpec::match_$1(\$page, ".safequote($2).", \@_)";
 			}
 			else {
-				$code.="IkiWiki::FailReason->new(".safequote(qq{unknown function in pagespec "$word"}).")";
+				$code.="IkiWiki::ErrorReason->new(".safequote(qq{unknown function in pagespec "$word"}).")";
 			}
 		}
 		else {
@@ -1756,11 +1827,35 @@ sub pagespec_match ($$;@) {
 	}
 
 	my $sub=pagespec_translate($spec);
-	return IkiWiki::FailReason->new("syntax error in pagespec \"$spec\"")
+	return IkiWiki::ErrorReason->new("syntax error in pagespec \"$spec\"")
 		if $@ || ! defined $sub;
 	return $sub->($page, @params);
 }
 
+sub pagespec_match_list ($$;@) {
+	my $pages=shift;
+	my $spec=shift;
+	my @params=@_;
+
+	my $sub=pagespec_translate($spec);
+	error "syntax error in pagespec \"$spec\""
+		if $@ || ! defined $sub;
+	
+	my @ret;
+	my $r;
+	foreach my $page (@$pages) {
+		$r=$sub->($page, @params);
+		push @ret, $page if $r;
+	}
+
+	if (! @ret && defined $r && $r->isa("IkiWiki::ErrorReason")) {
+		error(sprintf(gettext("cannot match pages: %s"), $r));
+	}
+	else {
+		return @ret;
+	}
+}
+
 sub pagespec_valid ($) {
 	my $spec=shift;
 
@@ -1790,6 +1885,10 @@ sub new {
 	return bless \$value, $class;
 }
 
+package IkiWiki::ErrorReason;
+
+our @ISA = 'IkiWiki::FailReason';
+
 package IkiWiki::SuccessReason;
 
 use overload (
@@ -1950,7 +2049,7 @@ sub match_user ($$;@) {
 	my %params=@_;
 	
 	if (! exists $params{user}) {
-		return IkiWiki::FailReason->new("no user specified");
+		return IkiWiki::ErrorReason->new("no user specified");
 	}
 
 	if (defined $params{user} && lc $params{user} eq lc $user) {
@@ -1970,7 +2069,7 @@ sub match_admin ($$;@) {
 	my %params=@_;
 	
 	if (! exists $params{user}) {
-		return IkiWiki::FailReason->new("no user specified");
+		return IkiWiki::ErrorReason->new("no user specified");
 	}
 
 	if (defined $params{user} && IkiWiki::is_admin($params{user})) {
@@ -1990,7 +2089,7 @@ sub match_ip ($$;@) {
 	my %params=@_;
 	
 	if (! exists $params{ip}) {
-		return IkiWiki::FailReason->new("no IP specified");
+		return IkiWiki::ErrorReason->new("no IP specified");
 	}
 
 	if (defined $params{ip} && lc $params{ip} eq lc $ip) {