X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/49928906b0f643bca968bc8d82bdaa473d81e251..154c4ea9e:/IkiWiki/CGI.pm?ds=sidebyside diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm index e8850cc54..5baa6c179 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,39 +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"); - # The base url needs to be a full URL, and urlto may return a path. - my $baseurl = absurl(urlto($params{page}), $cgi); - - showform($form, $buttons, $session, $cgi, @_, - forcebaseurl => $baseurl); -} + my $topurl = defined $cgi ? $cgi->url : $config{url}; -# Forces a partial url (path only) to absolute, using the same -# URL scheme as the CGI. Full URLs are left unchanged. -sub absurl ($$) { - my $partialurl=shift; - my $q=shift; - - eval q{use URI}; - return URI->new_abs($partialurl, $q->url); + 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(absurl(shift, $q)); + my $url=URI->new(urlabs(shift, $q->url)); if (! $config{w3mmode}) { print $q->redirect($url); } @@ -119,7 +131,7 @@ sub needsignin ($$) { if (! defined $session->param("name") || ! userinfo_get($session->param("name"), "regdate")) { - $session->param(postsignin => $ENV{QUERY_STRING}); + $session->param(postsignin => $q->query_string); cgi_signin($q, $session); cgi_savesession($session); exit; @@ -417,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"); @@ -449,7 +461,7 @@ sub cgierror ($) { my $message=shift; print "Content-type: text/html\n\n"; - print misctemplate(gettext("Error"), + print cgitemplate(undef, gettext("Error"), "
".gettext("Error").": $message
"); die $@; }