X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/6bd8c6732e7ccda0013a3373c3618fca91c91d36..c037714b77535c849c8d8ef4807af2b59737a5c5:/IkiWiki/Wrapper.pm diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm index 0855a3ba2..84b4b5a2f 100644 --- a/IkiWiki/Wrapper.pm +++ b/IkiWiki/Wrapper.pm @@ -28,10 +28,11 @@ sub gen_wrappers () { %config=(%origconfig); } +our $program_to_wrap = $0; sub gen_wrapper () { $config{srcdir}=File::Spec->rel2abs($config{srcdir}); $config{destdir}=File::Spec->rel2abs($config{destdir}); - my $this=File::Spec->rel2abs($0); + my $this=File::Spec->rel2abs($program_to_wrap); if (! -x $this) { error(sprintf(gettext("%s doesn't seem to be executable"), $this)); } @@ -105,6 +106,14 @@ EOF my $i=int($config{cgi_overload_delay}); $pre_exec.="#define CGI_OVERLOAD_DELAY $i\n" if $i > 0; + my $msg=gettext("Please wait"); + $msg=~s/"/\\"/g; + $pre_exec.='#define CGI_PLEASE_WAIT_TITLE "'.$msg."\"\n"; + if (defined $config{cgi_overload_message} && length $config{cgi_overload_message}) { + $msg=$config{cgi_overload_message}; + $msg=~s/"/\\"/g; + } + $pre_exec.='#define CGI_PLEASE_WAIT_BODY "'.$msg."\"\n"; } $pre_exec.=<<"EOF"; lockfd=open("$config{wikistatedir}/cgilock", O_CREAT | O_RDWR, 0666); @@ -116,9 +125,11 @@ EOF set_cgilock_fd(lockfd); } else { - printf("Content-Type: text/html\\nRefresh: %i; URL=%s\\n\\n
Please wait ...
", + printf("Content-Type: text/html\\nRefresh: %i; URL=%s\\n\\n%s
", CGI_OVERLOAD_DELAY, - getenv("REQUEST_URI")); + getenv("REQUEST_URI"), + CGI_PLEASE_WAIT_TITLE, + CGI_PLEASE_WAIT_BODY); exit(0); } }