X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/26774c931ce1aa4b91e7129ad602a23b244008b2..43ede4be2e82dd07e8689c9ef7029ed7d3adc5bb:/IkiWiki/CGI.pm

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index f550b673a..b42489210 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -314,6 +314,11 @@ sub cgi_prefs ($$) { #{{{
 	if (! is_admin($user_name)) {
 		$form->field(name => "locked_pages", type => "hidden");
 	}
+
+	if ($config{httpauth}) {
+		$form->field(name => "password", type => "hidden");
+		$form->field(name => "confirm_password", type => "hidden");
+	}
 	
 	if (! $form->submitted) {
 		$form->field(name => "email", force => 1,
@@ -643,6 +648,7 @@ sub cgi () { #{{{
 	
 	# Everything below this point needs the user to be signed in.
 	if (((! $config{anonok} || $do eq 'prefs') &&
+	     (! $config{httpauth}) &&
 	     (! defined $session->param("name") ||
 	     ! userinfo_get($session->param("name"), "regdate"))) || $do eq 'signin') {
 		cgi_signin($q, $session);
@@ -654,6 +660,22 @@ sub cgi () { #{{{
 		
 		return;
 	}
+
+	if ($config{httpauth} && (! defined $session->param("name"))) {
+		if (! defined $q->remote_user()) {
+			error("Could not determine authenticated username.");
+		}
+		else {
+			$session->param("name", $q->remote_user());
+			if (!userinfo_get($session->param("name"),"regdate")) {
+				userinfo_setall($session->param("name"), {
+					email => "",
+					password => "",
+					regdate=>time,
+				});
+			}
+		}
+	}
 	
 	if ($do eq 'create' || $do eq 'edit') {
 		cgi_editpage($q, $session);