X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/8c9c3915ecaf9cce4d0335f2b3c588d7f96d2b36..6c05a70d98e194f9ce935cc2053920a9b7da89dd:/IkiWiki/CGI.pm

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index df5179834..62383b6fd 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -12,7 +12,7 @@ use Encode;
 sub printheader ($) {
 	my $session=shift;
 	
-	if ($ENV{HTTPS} || $config{sslcookie}) {
+	if (($ENV{HTTPS} && lc $ENV{HTTPS} ne "off") || $config{sslcookie}) {
 		print $session->header(-charset => 'utf-8',
 			-cookie => $session->cookie(-httponly => 1, -secure => 1));
 	}
@@ -46,31 +46,51 @@ sub showform ($$$$;@) {
 	my $cgi=shift;
 
 	printheader($session);
-	print misctemplate($form->title, $form->render(submit => $buttons), @_);
+	print cgitemplate($cgi, $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;
+sub cgitemplate ($$$;@) {
 	my $cgi=shift;
+	my $title=shift;
+	my $content=shift;
 	my %params=@_;
+	
+	my $template=template("page.tmpl");
 
-	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);
+	my $topurl = defined $cgi ? $cgi->url : $config{url};
 
-	showform($form, $buttons, $session, $cgi, @_,
-		forcebaseurl => $baseurl);
+	my $page="";
+	if (exists $params{page}) {
+		$page=delete $params{page};
+		$params{forcebaseurl}=urlabs(urlto($page), $topurl);
+	}
+	run_hooks(pagetemplate => sub {
+		shift->(
+			page => $page,
+			destpage => $page,
+			template => $template,
+		);
+	});
+	templateactions($template, "");
+
+	$template->param(
+		dynamic => 1,
+		title => $title,
+		wikiname => $config{wikiname},
+		content => $content,
+		baseurl => urlabs(baseurl(), $topurl),
+		html5 => $config{html5},
+		%params,
+	);
+	
+	return $template->output;
 }
 
 sub redirect ($$) {
 	my $q=shift;
 	eval q{use URI};
-	my $url=URI->new(shift);
+	my $url=URI->new(urlabs(shift, $q->url));
 	if (! $config{w3mmode}) {
 		print $q->redirect($url);
 	}
@@ -409,7 +429,7 @@ sub cgi (;$$) {
 			# userinfo db.
 			if (! userinfo_get($session->param("name"), "regdate")) {
 				userinfo_setall($session->param("name"), {
-					email => "",
+					email => defined $session->param("email") ? $session->param("email") : "",
 					password => "",
 					regdate => time,
 				}) || error("failed adding user");
@@ -441,7 +461,7 @@ sub cgierror ($) {
 	my $message=shift;
 
 	print "Content-type: text/html\n\n";
-	print misctemplate(gettext("Error"),
+	print cgitemplate(undef, gettext("Error"),
 		"<p class=\"error\">".gettext("Error").": $message</p>");
 	die $@;
 }