X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/2a16e15122574cca9c5b52ccfc46a022a71e25dc..2469114dc567fb3a52609b589d85eb28af0cd670:/IkiWiki/CGI.pm

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index b47c8e803..8201351ca 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -39,6 +39,7 @@ sub cgi_recentchanges ($) { #{{{
 		wikiname => $config{wikiname},
 		changelog => [rcs_recentchanges(100)],
 		styleurl => styleurl(),
+		baseurl => "$config{url}/",
 	);
 	print $q->header, $template->output;
 } #}}}
@@ -62,7 +63,7 @@ sub cgi_signin ($$) { #{{{
 		required => 'NONE',
 		javascript => 0,
 		params => $q,
-		action => $q->request_uri,
+		action => $config{cgiurl},
 		header => 0,
 		template => (-e "$config{templatedir}/signin.tmpl" ?
 		              "$config{templatedir}/signin.tmpl" : ""),
@@ -228,7 +229,7 @@ sub cgi_prefs ($$) { #{{{
 		required => 'NONE',
 		javascript => 0,
 		params => $q,
-		action => $q->request_uri,
+		action => $config{cgiurl},
 		template => (-e "$config{templatedir}/prefs.tmpl" ?
 		              "$config{templatedir}/prefs.tmpl" : ""),
 		stylesheet => styleurl(),
@@ -292,7 +293,7 @@ sub cgi_editpage ($$) { #{{{
 		required => [qw{content}],
 		javascript => 0,
 		params => $q,
-		action => $q->request_uri,
+		action => $config{cgiurl},
 		table => 0,
 		template => "$config{templatedir}/editpage.tmpl"
 	);
@@ -329,6 +330,7 @@ sub cgi_editpage ($$) { #{{{
 	$form->tmpl_param("helponformattinglink",
 		htmllink("", "HelpOnFormatting", 1));
 	$form->tmpl_param("styleurl", styleurl());
+	$form->tmpl_param("baseurl", "$config{url}/");
 	if (! $form->submitted) {
 		$form->field(name => "rcsinfo", value => rcs_prepedit($file),
 			force => 1);
@@ -425,7 +427,7 @@ sub cgi_editpage ($$) { #{{{
 		my $content=$form->field('content');
 		$content=~s/\r\n/\n/g;
 		$content=~s/\r/\n/g;
-		writefile("$config{srcdir}/$file", $content);
+		writefile($file, $config{srcdir}, $content);
 		
 		my $message="web commit ";
 		if (length $session->param("name")) {
@@ -475,6 +477,12 @@ sub cgi_editpage ($$) { #{{{
 	}
 } #}}}
 
+sub cgi_hyperestraier () { #{{{
+	# only works for GET requests
+	chdir("$config{wikistatedir}/hyperestraier") || error("chdir: $!");
+	exec("./".basename($config{cgiurl})) || error("estseek.cgi failed");
+} #}}}
+
 sub cgi () { #{{{
 	eval q{use CGI};
 	eval q{use CGI::Session};
@@ -483,7 +491,12 @@ sub cgi () { #{{{
 	
 	my $do=$q->param('do');
 	if (! defined $do || ! length $do) {
-		error("\"do\" parameter missing");
+		if (defined $q->param('phrase')) {
+			cgi_hyperestraier();
+		}
+		else {
+			error("\"do\" parameter missing");
+		}
 	}
 	
 	# Things that do not need a session.
@@ -491,18 +504,21 @@ sub cgi () { #{{{
 		cgi_recentchanges($q);
 		return;
 	}
+	elsif ($do eq 'hyperestraier') {
+		cgi_hyperestraier();
+	}
 	
 	CGI::Session->name("ikiwiki_session_$config{wikiname}");
 	
 	my $oldmask=umask(077);
-	my $session = CGI::Session->new("driver:db_file", $q,
+	my $session = CGI::Session->new("driver:DB_File", $q,
 		{ FileName => "$config{wikistatedir}/sessions.db" });
 	umask($oldmask);
 	
 	# Everything below this point needs the user to be signed in.
-	if ((! $config{anonok} && ! defined $session->param("name") ||
-	     ! defined $session->param("name") ||
-	     ! userinfo_get($session->param("name"), "regdate")) || $do eq 'signin') {
+	if ((! $config{anonok} &&
+	     (! defined $session->param("name") ||
+	     ! userinfo_get($session->param("name"), "regdate"))) || $do eq 'signin') {
 		cgi_signin($q, $session);
 	
 		# Force session flush with safe umask.