X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/ce7966a82cf8d0043a771a1a5b26e3a953e909b2..c0c0068a0308884dc41921157d672c62eef9e83d:/IkiWiki/CGI.pm

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index d7c85ecb8..11b2f2ce3 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -22,7 +22,7 @@ sub printheader ($) {
 	}
 }
 
-sub showform ($$$$;@) {
+sub prepform {
 	my $form=shift;
 	my $buttons=shift;
 	my $session=shift;
@@ -35,6 +35,16 @@ sub showform ($$$$;@) {
 		});
 	}
 
+	return $form;
+}
+
+sub showform ($$$$;@) {
+	my $form=prepform(@_);
+	shift;
+	my $buttons=shift;
+	my $session=shift;
+	my $cgi=shift;
+
 	printheader($session);
 	print misctemplate($form->title, $form->render(submit => $buttons), @_);
 }
@@ -90,9 +100,10 @@ sub needsignin ($$) {
 	}
 }
 
-sub cgi_signin ($$) {
+sub cgi_signin ($$;$) {
 	my $q=shift;
 	my $session=shift;
+	my $returnhtml=shift;
 
 	decode_cgi_utf8($q);
 	eval q{use CGI::FormBuilder};
@@ -108,17 +119,12 @@ sub cgi_signin ($$) {
 		action => $config{cgiurl},
 		header => 0,
 		template => {type => 'div'},
-		stylesheet => baseurl()."style.css",
+		stylesheet => 1,
 	);
 	# MITLOGIN: These should be restored when logins are allowed again.
 	#my $buttons=["Login"];
 	my $buttons=[];
-
-	if ($q->param("do") ne "signin" && !$form->submitted) {
-	    #$form->text(gettext("You need to log in first."));
-		$form->text(
-		  "You must have an MIT personal certificate to edit");
-	}
+	
 	$form->field(name => "do", type => "hidden", value => "signin",
 		force => 1);
 	
@@ -133,6 +139,11 @@ sub cgi_signin ($$) {
 		$form->validate;
 	}
 
+	if ($returnhtml) {
+		$form=prepform($form, $buttons, $session, $q);
+		return $form->render(submit => $buttons);
+	}
+
 	showform($form, $buttons, $session, $q);
 }
 
@@ -191,7 +202,7 @@ sub cgi_prefs ($$) {
 		params => $q,
 		action => $config{cgiurl},
 		template => {type => 'div'},
-		stylesheet => baseurl()."style.css",
+		stylesheet => 1,
 		fieldsets => [
 			[login => gettext("Login")],
 			[preferences => gettext("Preferences")],
@@ -244,7 +255,9 @@ sub cgi_prefs ($$) {
 		$form->text(gettext("Preferences saved."));
 	}
 	
-	showform($form, $buttons, $session, $q);
+	showform($form, $buttons, $session, $q,
+		prefsurl => "", # avoid showing the preferences link
+	);
 }
 
 sub cgi_custom_failure ($$$) {