X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/2411e2be1f97ce55a0ba8aa20b6d6e1abe0766de..8c9c3915ecaf9cce4d0335f2b3c588d7f96d2b36:/IkiWiki/CGI.pm

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index e0bfda9ae..df5179834 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -12,7 +12,7 @@ use Encode;
 sub printheader ($) {
 	my $session=shift;
 	
-	if ($config{sslcookie}) {
+	if ($ENV{HTTPS} || $config{sslcookie}) {
 		print $session->header(-charset => 'utf-8',
 			-cookie => $session->cookie(-httponly => 1, -secure => 1));
 	}
@@ -49,6 +49,24 @@ sub showform ($$$$;@) {
 	print misctemplate($form->title, $form->render(submit => $buttons), @_);
 }
 
+# Like showform, but the base url will be set to allow edit previews
+# that use links relative to the specified page.
+sub showform_preview ($$$$;@) {
+	my $form=shift;
+	my $buttons=shift;
+	my $session=shift;
+	my $cgi=shift;
+	my %params=@_;
+
+	eval q{use URI};
+	# The base url needs to be a full URL. If urlto returns relative,
+	# force it absolute, using the same URL scheme used for the cgi.
+	my $baseurl = URI->new_abs(urlto($params{page}), $cgi->url);
+
+	showform($form, $buttons, $session, $cgi, @_,
+		forcebaseurl => $baseurl);
+}
+
 sub redirect ($$) {
 	my $q=shift;
 	eval q{use URI};