X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/bf006f771b77dc37c525e4ee1d26e212871212c6..7fc3a41cfde7328d26145ff7127782fc03c62d91:/IkiWiki.pm?ds=inline diff --git a/IkiWiki.pm b/IkiWiki.pm index 212b0de08..aea5b7abf 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -69,15 +69,16 @@ sub defaultconfig () { #{{{ setup => undef, adminuser => undef, adminemail => undef, - plugin => [qw{mdwn inline htmlscrubber passwordauth signinedit + plugin => [qw{mdwn inline htmlscrubber passwordauth openid signinedit lockedit conditional}], timeformat => '%c', locale => undef, sslcookie => 0, httpauth => 0, userdir => "", - usedirs => 0, + usedirs => 1, numbacklinks => 10, + account_creation_password => "", } #}}} sub checkconfig () { #{{{ @@ -178,7 +179,7 @@ sub log_message ($$) { #{{{ $log_open=1; } eval { - Sys::Syslog::syslog($type, "%s", join(" ", @_)); + Sys::Syslog::syslog($type, "[$config{wikiname}] %s", join(" ", @_)); }; } elsif (! $config{cgi}) { @@ -1011,29 +1012,29 @@ sub pagespec_match ($$;@) { #{{{ package IkiWiki::FailReason; -use overload ( - '""' => sub { return ${$_[0]} }, - '0+' => sub { return 0 }, +use overload ( #{{{ + '""' => sub { ${$_[0]} }, + '0+' => sub { 0 }, '!' => sub { bless $_[0], 'IkiWiki::SuccessReason'}, fallback => 1, -); +); #}}} -sub new { +sub new { #{{{ bless \$_[1], $_[0]; -} +} #}}} package IkiWiki::SuccessReason; -use overload ( - '""' => sub { return ${$_[0]} }, - '0+' => sub { return 1 }, +use overload ( #{{{ + '""' => sub { ${$_[0]} }, + '0+' => sub { 1 }, '!' => sub { bless $_[0], 'IkiWiki::FailReason'}, fallback => 1, -); +); #}}} -sub new { +sub new { #{{{ bless \$_[1], $_[0]; -} +}; #}}} package IkiWiki::PageSpec;