X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/f50bd57bcebe08d26653299b189fe82beaea4a0f..79839d01a7f3e88ca9637d4ba3276ff5a7c33544:/ikiwiki

diff --git a/ikiwiki b/ikiwiki
index 6bf58017d..2087b1baf 100755
--- a/ikiwiki
+++ b/ikiwiki
@@ -27,24 +27,29 @@ sub getconfig () { #{{{
 			default_pageext => ".mdwn",
 			cgi => 0,
 			svn => 1,
+			notify => 0,
 			url => '',
 			cgiurl => '',
 			historyurl => '',
 			diffurl => '',
 			anonok => 0,
 			rss => 0,
+			sanitize => 1,
 			rebuild => 0,
 			refresh => 0,
 			getctime => 0,
 			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 +66,15 @@ sub getconfig () { #{{{
 			"hyperestraier" => \$config{hyperestraier},
 			"rss!" => \$config{rss},
 			"cgi!" => \$config{cgi},
+			"notify!" => \$config{notify},
+			"sanitize!" => \$config{sanitize},
 			"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]/;
 			},
@@ -148,14 +158,14 @@ sub debug ($) { #{{{
 sub basename ($) { #{{{
 	my $file=shift;
 
-	$file=~s!.*/!!;
+	$file=~s!.*/+!!;
 	return $file;
 } #}}}
 
 sub dirname ($) { #{{{
 	my $file=shift;
 
-	$file=~s!/?[^/]+$!!;
+	$file=~s!/*[^/]+$!!;
 	return $file;
 } #}}}
 
@@ -437,61 +447,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;
@@ -544,6 +499,7 @@ sub main () { #{{{
 		loadindex();
 		require IkiWiki::Render;
 		rcs_update();
+		rcs_notify() if $config{notify};
 		rcs_getctime() if $config{getctime};
 		refresh();
 		saveindex();