From 55474f44d93ffb35f650ab8ba8b32f4478eba1c3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 8 Sep 2009 15:17:39 -0400
Subject: Expand banned_users; it can now include PageSpecs, which allows
 banning by IP address.

---
 IkiWiki/CGI.pm | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

(limited to 'IkiWiki')

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index af58d7cb5..52cafade0 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -252,16 +252,30 @@ sub check_banned ($$) {
 	my $q=shift;
 	my $session=shift;
 
+	my $banned=0;
 	my $name=$session->param("name");
-	if (defined $name) {
-		if (grep { $name eq $_ } @{$config{banned_users}}) {
-			$session->delete();
-			cgi_savesession($session);
-			cgi_custom_failure(
-				$q->header(-status => "403 Forbidden"),
-				gettext("You are banned."));
+	if (defined $name && 
+	    grep { $name eq $_ } @{$config{banned_users}}) {
+		$banned=1;
+	}
+
+	foreach my $b (@{$config{banned_users}}) {
+		if (pagespec_match("", $b,
+			ip => $ENV{REMOTE_ADDR},
+			name => defined $name ? $name : "",
+		)) {
+			$banned=1;
+			last;
 		}
 	}
+
+	if ($banned) {
+		$session->delete();
+		cgi_savesession($session);
+		cgi_custom_failure(
+			$q->header(-status => "403 Forbidden"),
+			gettext("You are banned."));
+	}
 }
 
 sub cgi_getsession ($) {
-- 
cgit v1.2.3


From 2a99ebf2766a08f8d68a82255d1518ecac73ec84 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 8 Sep 2009 17:27:37 -0400
Subject: underlay: Also allow configuring additional directories to search 
 for template files in.

---
 IkiWiki.pm                 | 10 +++++++++-
 IkiWiki/Plugin/underlay.pm | 11 +++++++++--
 debian/changelog           |  2 ++
 doc/plugins/underlay.mdwn  |  8 +++++++-
 4 files changed, 27 insertions(+), 4 deletions(-)

(limited to 'IkiWiki')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 01898936f..2f11069c6 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -150,6 +150,13 @@ sub getsetup () {
 		safe => 0, # path
 		rebuild => 1,
 	},
+	templatedirs => {
+		type => "internal",
+		default => [],
+		description => "additional directories containing template files",
+		safe => 0,
+		rebuild => 0,
+	},
 	underlaydir => {
 		type => "string",
 		default => "$installdir/share/ikiwiki/basewiki",
@@ -1610,7 +1617,8 @@ sub saveindex () {
 sub template_file ($) {
 	my $template=shift;
 
-	foreach my $dir ($config{templatedir}, "$installdir/share/ikiwiki/templates") {
+	foreach my $dir ($config{templatedir}, @{$config{templatedirs}},
+	                 "$installdir/share/ikiwiki/templates") {
 		return "$dir/$template" if -e "$dir/$template";
 	}
 	return;
diff --git a/IkiWiki/Plugin/underlay.pm b/IkiWiki/Plugin/underlay.pm
index 380d418fb..c59935672 100644
--- a/IkiWiki/Plugin/underlay.pm
+++ b/IkiWiki/Plugin/underlay.pm
@@ -27,14 +27,21 @@ sub getsetup () {
 			safe => 0,
 			rebuild => 1,
 		},
+		add_templates => {
+			type => "string",
+			default => [],
+			description => "extra template directories to add",
+			advanced => 1,
+			safe => 0,
+			rebuild => 1,
+		},
 }
 
 sub checkconfig () {
-	return unless exists $config{add_underlays};
-
 	foreach my $dir (@{$config{add_underlays}}) {
 		add_underlay($dir);
 	}
+	push @{$config{templatedirs}}, @{$config{add_templates}};
 }
 
 1;
diff --git a/debian/changelog b/debian/changelog
index 86e8513f7..de165e4ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ ikiwiki (3.14159265) UNRELEASED; urgency=low
     including Philippe Batailler, Alexandre Dupas, and Steve Petruzzello.
   * Expand banned_users; it can now include PageSpecs, which
     allows banning by IP address.
+  * underlay: Also allow configuring additional directories to search 
+    for template files in.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 02 Sep 2009 15:01:27 -0400
 
diff --git a/doc/plugins/underlay.mdwn b/doc/plugins/underlay.mdwn
index 09d096a6e..f7eafee7c 100644
--- a/doc/plugins/underlay.mdwn
+++ b/doc/plugins/underlay.mdwn
@@ -1,7 +1,7 @@
 [[!template id=plugin name=underlay author="[[Simon_McVittie|smcv]]"]]
 [[!tag type/useful]]
 
-This plugin adds an `add_underlays` option to the `.setup` file.
+This plugin adds an `add_underlays` option to the setup file.
 Its value is a list of underlay directories whose content is added to the wiki.
 
 Multiple underlays are normally set up automatically by other plugins (for
@@ -12,3 +12,9 @@ like photos or software releases.
 Directories in `add_underlays` should usually be absolute. If relative, they're
 interpreted as relative to the parent directory of the basewiki underlay, which
 is probably not particularly useful in this context.
+
+--
+
+This plugin also adds an `add_templates` option to the setup file.
+Its value is a list of template directories to look for template files in,
+if they are not present in the `templatedir`.
-- 
cgit v1.2.3