X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/975ae0944cdd18a510d803da7a499c2247ac855e..065f298986eff2577b87aa3801e1ea9e8f135c87:/IkiWiki/CGI.pm

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 6fd1f6506..15e86651d 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -2,6 +2,8 @@
 
 use warnings;
 use strict;
+use IkiWiki;
+use IkiWiki::UserInfo;
 
 package IkiWiki;
 
@@ -11,7 +13,7 @@ sub page_locked ($$;$) { #{{{
 	my $nonfatal=shift;
 	
 	my $user=$session->param("name");
-	return if length $user && is_admin($user);
+	return if defined $user && is_admin($user);
 
 	foreach my $admin (@{$config{adminuser}}) {
 		my $locked_pages=userinfo_get($admin, "locked_pages");
@@ -39,6 +41,7 @@ sub cgi_recentchanges ($) { #{{{
 		wikiname => $config{wikiname},
 		changelog => [rcs_recentchanges(100)],
 		styleurl => styleurl(),
+		baseurl => "$config{url}/",
 	);
 	print $q->header, $template->output;
 } #}}}
@@ -62,7 +65,7 @@ sub cgi_signin ($$) { #{{{
 		required => 'NONE',
 		javascript => 0,
 		params => $q,
-		action => $q->request_uri,
+		action => $config{cgiurl},
 		header => 0,
 		template => (-e "$config{templatedir}/signin.tmpl" ?
 		              "$config{templatedir}/signin.tmpl" : ""),
@@ -116,6 +119,7 @@ sub cgi_signin ($$) { #{{{
 				validate => sub {
 					my $name=shift;
 					length $name &&
+					$name=~/$config{wiki_file_regexp}/ &&
 					! userinfo_get($name, "regdate");
 				},
 			);
@@ -189,10 +193,9 @@ sub cgi_signin ($$) { #{{{
 			);
 			
 			eval q{use Mail::Sendmail};
-			my ($fromhost) = $config{cgiurl} =~ m!/([^/]+)!;
 			sendmail(
 				To => userinfo_get($user_name, "email"),
-				From => "$config{wikiname} admin <".(getpwuid($>))[0]."@".$fromhost.">",
+				From => "$config{wikiname} admin <$config{adminemail}>",
 				Subject => "$config{wikiname} information",
 				Message => $template->output,
 			) or error("Failed to send mail");
@@ -216,7 +219,8 @@ sub cgi_prefs ($$) { #{{{
 	eval q{use CGI::FormBuilder};
 	my $form = CGI::FormBuilder->new(
 		title => "preferences",
-		fields => [qw(do name password confirm_password email locked_pages)],
+		fields => [qw(do name password confirm_password email 
+		              subscriptions locked_pages)],
 		header => 0,
 		method => 'POST',
 		validate => {
@@ -228,7 +232,7 @@ sub cgi_prefs ($$) { #{{{
 		required => 'NONE',
 		javascript => 0,
 		params => $q,
-		action => $q->request_uri,
+		action => $config{cgiurl},
 		template => (-e "$config{templatedir}/prefs.tmpl" ?
 		              "$config{templatedir}/prefs.tmpl" : ""),
 		stylesheet => styleurl(),
@@ -241,6 +245,8 @@ sub cgi_prefs ($$) { #{{{
 		value => $user_name, force => 1);
 	$form->field(name => "password", type => "password");
 	$form->field(name => "confirm_password", type => "password");
+	$form->field(name => "subscriptions", size => 50,
+		comment => "(".htmllink("", "GlobList", 1).")");
 	$form->field(name => "locked_pages", size => 50,
 		comment => "(".htmllink("", "GlobList", 1).")");
 	
@@ -251,6 +257,8 @@ sub cgi_prefs ($$) { #{{{
 	if (! $form->submitted) {
 		$form->field(name => "email", force => 1,
 			value => userinfo_get($user_name, "email"));
+		$form->field(name => "subscriptions", force => 1,
+			value => userinfo_get($user_name, "subscriptions"));
 		$form->field(name => "locked_pages", force => 1,
 			value => userinfo_get($user_name, "locked_pages"));
 	}
@@ -265,7 +273,7 @@ sub cgi_prefs ($$) { #{{{
 		return;
 	}
 	elsif ($form->submitted eq "Save Preferences" && $form->validate) {
-		foreach my $field (qw(password email locked_pages)) {
+		foreach my $field (qw(password email subscriptions locked_pages)) {
 			if (length $form->field($field)) {
 				userinfo_set($user_name, $field, $form->field($field)) || error("failed to set $field");
 			}
@@ -292,7 +300,7 @@ sub cgi_editpage ($$) { #{{{
 		required => [qw{content}],
 		javascript => 0,
 		params => $q,
-		action => $q->request_uri,
+		action => $config{cgiurl},
 		table => 0,
 		template => "$config{templatedir}/editpage.tmpl"
 	);
@@ -308,10 +316,12 @@ sub cgi_editpage ($$) { #{{{
 	$page=lc($page);
 	
 	my $file=$page.$config{default_pageext};
-	my $newfile=1;
 	if (exists $pagesources{lc($page)}) {
 		$file=$pagesources{lc($page)};
-		$newfile=0;
+	}
+	my $newfile=0;
+	if (! -e "$config{srcdir}/$file") {
+		$newfile=1;
 	}
 
 	$form->field(name => "do", type => 'hidden');
@@ -327,6 +337,7 @@ sub cgi_editpage ($$) { #{{{
 	$form->tmpl_param("helponformattinglink",
 		htmllink("", "HelpOnFormatting", 1));
 	$form->tmpl_param("styleurl", styleurl());
+	$form->tmpl_param("baseurl", "$config{url}/");
 	if (! $form->submitted) {
 		$form->field(name => "rcsinfo", value => rcs_prepedit($file),
 			force => 1);
@@ -350,13 +361,6 @@ sub cgi_editpage ($$) { #{{{
 	if (! $form->submitted || $form->submitted eq "Preview" || 
 	    ! $form->validate) {
 		if ($form->field("do") eq "create") {
-			if (exists $pagesources{lc($page)}) {
-				# hmm, someone else made the page in the
-				# meantime?
-				print $q->redirect("$config{url}/".htmlpage($page));
-				return;
-			}
-			
 			my @page_locs;
 			my $best_loc;
 			my ($from)=$form->param('from')=~/$config{wiki_file_regexp}/;
@@ -369,7 +373,7 @@ sub cgi_editpage ($$) { #{{{
 			}
 			else {
 				my $dir=$from."/";
-				$dir=~s![^/]+/$!!;
+				$dir=~s![^/]+/+$!!;
 				
 				if ((defined $form->param('subpage') && length $form->param('subpage')) ||
 				    $page eq 'discussion') {
@@ -382,16 +386,23 @@ sub cgi_editpage ($$) { #{{{
 				push @page_locs, $dir.$page;
 				push @page_locs, "$from/$page";
 				while (length $dir) {
-					$dir=~s![^/]+/$!!;
+					$dir=~s![^/]+/+$!!;
 					push @page_locs, $dir.$page;
 				}
-
-				@page_locs = grep {
-					! exists $pagesources{lc($_)} &&
-					! page_locked($_, $session, 1)
-				} @page_locs;
 			}
 
+			@page_locs = grep {
+				! exists $pagesources{lc($_)} &&
+				! page_locked($_, $session, 1)
+			} @page_locs;
+			
+			if (! @page_locs) {
+				# hmm, someone else made the page in the
+				# meantime?
+				print $q->redirect("$config{url}/".htmlpage($page));
+				return;
+			}
+				
 			$form->tmpl_param("page_select", 1);
 			$form->field(name => "page", type => 'select',
 				options => \@page_locs, value => $best_loc);
@@ -423,7 +434,7 @@ sub cgi_editpage ($$) { #{{{
 		my $content=$form->field('content');
 		$content=~s/\r\n/\n/g;
 		$content=~s/\r/\n/g;
-		writefile("$config{srcdir}/$file", $content);
+		writefile($file, $config{srcdir}, $content);
 		
 		my $message="web commit ";
 		if (length $session->param("name")) {
@@ -479,6 +490,12 @@ sub cgi () { #{{{
 	
 	my $q=CGI->new;
 	
+	if (exists $hooks{cgi}) {
+		foreach my $id (keys %{$hooks{cgi}}) {
+			$hooks{cgi}{$id}{call}->($q);
+		}
+	}
+	
 	my $do=$q->param('do');
 	if (! defined $do || ! length $do) {
 		error("\"do\" parameter missing");
@@ -489,18 +506,21 @@ sub cgi () { #{{{
 		cgi_recentchanges($q);
 		return;
 	}
+	elsif ($do eq 'hyperestraier') {
+		cgi_hyperestraier();
+	}
 	
 	CGI::Session->name("ikiwiki_session_$config{wikiname}");
 	
 	my $oldmask=umask(077);
-	my $session = CGI::Session->new("driver:db_file", $q,
+	my $session = CGI::Session->new("driver:DB_File", $q,
 		{ FileName => "$config{wikistatedir}/sessions.db" });
 	umask($oldmask);
 	
 	# Everything below this point needs the user to be signed in.
-	if ((! $config{anonok} && ! defined $session->param("name") ||
-	     ! defined $session->param("name") ||
-	     ! userinfo_get($session->param("name"), "regdate")) || $do eq 'signin') {
+	if ((! $config{anonok} &&
+	     (! defined $session->param("name") ||
+	     ! userinfo_get($session->param("name"), "regdate"))) || $do eq 'signin') {
 		cgi_signin($q, $session);
 	
 		# Force session flush with safe umask.