X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/c4e0e8c36c89fa26e76bb21dbdb8263ee88d5143..13e3bf867157226076fcc14a0d3875fd129a66c7:/ikiwiki

diff --git a/ikiwiki b/ikiwiki
index f7ccaf743..3cf2a7cb3 100755
--- a/ikiwiki
+++ b/ikiwiki
@@ -21,12 +21,13 @@ sub getconfig () { #{{{
 			wiki_file_prune_regexp => qr{((^|/).svn/|\.\.|^\.|\/\.|\.html?$|\.rss$)},
 			wiki_link_regexp => qr/\[\[(?:([^\s\]\|]+)\|)?([^\s\]]+)\]\]/,
 			wiki_processor_regexp => qr/\[\[(\w+)\s+([^\]]+)\]\]/,
-			wiki_file_regexp => qr/(^[-A-Za-z0-9_.:\/+]+$)/,
+			wiki_file_regexp => qr/(^[-[:alnum:]_.:\/+]+$)/,
 			verbose => 0,
 			wikiname => "wiki",
 			default_pageext => ".mdwn",
 			cgi => 0,
 			svn => 1,
+			notify => 0,
 			url => '',
 			cgiurl => '',
 			historyurl => '',
@@ -39,12 +40,15 @@ sub getconfig () { #{{{
 			hyperestraier => 0,
 			wrapper => undef,
 			wrappermode => undef,
+			svnrepo => undef,
+			svnpath => "trunk",
 			srcdir => undef,
 			destdir => undef,
 			templatedir => "/usr/share/ikiwiki/templates",
 			underlaydir => "/usr/share/ikiwiki/basewiki",
 			setup => undef,
 			adminuser => undef,
+			adminemail => undef,
 		);
 
 		eval q{use Getopt::Long};
@@ -61,10 +65,14 @@ sub getconfig () { #{{{
 			"hyperestraier" => \$config{hyperestraier},
 			"rss!" => \$config{rss},
 			"cgi!" => \$config{cgi},
+			"notify!" => \$config{notify},
 			"url=s" => \$config{url},
 			"cgiurl=s" => \$config{cgiurl},
 			"historyurl=s" => \$config{historyurl},
 			"diffurl=s" => \$config{diffurl},
+			"svnrepo" => \$config{svnrepo},
+			"svnpath" => \$config{svnpath},
+			"adminemail=s" => \$config{adminemail},
 			"exclude=s@" => sub {
 				$config{wiki_file_prune_regexp}=qr/$config{wiki_file_prune_regexp}|$_[1]/;
 			},
@@ -193,24 +201,27 @@ sub srcfile ($) { #{{{
 	error("internal error: $file cannot be found");
 } #}}}
 
-sub readfile ($) { #{{{
+sub readfile ($;$) { #{{{
 	my $file=shift;
+	my $binary=shift;
 
 	if (-l $file) {
 		error("cannot read a symlink ($file)");
 	}
 	
 	local $/=undef;
-	open (IN, "$file") || error("failed to read $file: $!");
+	open (IN, $file) || error("failed to read $file: $!");
+	binmode(IN) if $binary;
 	my $ret=<IN>;
 	close IN;
 	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 $test=$file;
 	while (length $test) {
@@ -232,6 +243,7 @@ sub writefile ($$$) { #{{{
 	}
 	
 	open (OUT, ">$destdir/$file") || error("failed to write $destdir/$file: $!");
+	binmode(OUT) if $binary;
 	print OUT $content;
 	close OUT;
 } #}}}
@@ -277,7 +289,7 @@ sub pagetitle ($) { #{{{
 sub titlepage ($) { #{{{
 	my $title=shift;
 	$title=~y/ /_/;
-	$title=~s/([^-A-Za-z0-9_:+\/.])/"__".ord($1)."__"/eg;
+	$title=~s/([^-[:alnum:]_:+\/.])/"__".ord($1)."__"/eg;
 	return $title;
 } #}}}
 
@@ -433,61 +445,6 @@ sub misctemplate ($$) { #{{{
 	return $template->output;
 }#}}}
 
-sub userinfo_get ($$) { #{{{
-	my $user=shift;
-	my $field=shift;
-
-	eval q{use Storable};
-	my $userdata=eval{ Storable::lock_retrieve("$config{wikistatedir}/userdb") };
-	if (! defined $userdata || ! ref $userdata || 
-	    ! exists $userdata->{$user} || ! ref $userdata->{$user} ||
-            ! exists $userdata->{$user}->{$field}) {
-		return "";
-	}
-	return $userdata->{$user}->{$field};
-} #}}}
-
-sub userinfo_set ($$$) { #{{{
-	my $user=shift;
-	my $field=shift;
-	my $value=shift;
-	
-	eval q{use Storable};
-	my $userdata=eval{ Storable::lock_retrieve("$config{wikistatedir}/userdb") };
-	if (! defined $userdata || ! ref $userdata || 
-	    ! exists $userdata->{$user} || ! ref $userdata->{$user}) {
-		return "";
-	}
-	
-	$userdata->{$user}->{$field}=$value;
-	my $oldmask=umask(077);
-	my $ret=Storable::lock_store($userdata, "$config{wikistatedir}/userdb");
-	umask($oldmask);
-	return $ret;
-} #}}}
-
-sub userinfo_setall ($$) { #{{{
-	my $user=shift;
-	my $info=shift;
-	
-	eval q{use Storable};
-	my $userdata=eval{ Storable::lock_retrieve("$config{wikistatedir}/userdb") };
-	if (! defined $userdata || ! ref $userdata) {
-		$userdata={};
-	}
-	$userdata->{$user}=$info;
-	my $oldmask=umask(077);
-	my $ret=Storable::lock_store($userdata, "$config{wikistatedir}/userdb");
-	umask($oldmask);
-	return $ret;
-} #}}}
-
-sub is_admin ($) { #{{{
-	my $user_name=shift;
-
-	return grep { $_ eq $user_name } @{$config{adminuser}};
-} #}}}
-
 sub glob_match ($$) { #{{{
 	my $page=shift;
 	my $glob=shift;
@@ -540,6 +497,7 @@ sub main () { #{{{
 		loadindex();
 		require IkiWiki::Render;
 		rcs_update();
+		rcs_notify() if $config{notify};
 		rcs_getctime() if $config{getctime};
 		refresh();
 		saveindex();