projects
/
ikiwiki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
+users/fil
[ikiwiki.git]
/
IkiWiki
/
CGI.pm
diff --git
a/IkiWiki/CGI.pm
b/IkiWiki/CGI.pm
index f8617bfc63ca63f51a8f51c135c96641947faf7d..62383b6fd22cf3ca6bed2dc3571f5cafb3c10715 100644
(file)
--- a/
IkiWiki/CGI.pm
+++ b/
IkiWiki/CGI.pm
@@
-12,7
+12,7
@@
use Encode;
sub printheader ($) {
my $session=shift;
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));
}
print $session->header(-charset => 'utf-8',
-cookie => $session->cookie(-httponly => 1, -secure => 1));
}
@@
-79,7
+79,7
@@
sub cgitemplate ($$$;@) {
title => $title,
wikiname => $config{wikiname},
content => $content,
title => $title,
wikiname => $config{wikiname},
content => $content,
- baseurl => urlabs(
urlto(""
), $topurl),
+ baseurl => urlabs(
baseurl(
), $topurl),
html5 => $config{html5},
%params,
);
html5 => $config{html5},
%params,
);
@@
-429,7
+429,7
@@
sub cgi (;$$) {
# userinfo db.
if (! userinfo_get($session->param("name"), "regdate")) {
userinfo_setall($session->param("name"), {
# 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");
password => "",
regdate => time,
}) || error("failed adding user");