X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/832d4d31d177d5d5f848250496048a00e9d70e2f..54f600af14bf6dc067ffc30ec6f22d517001fe99:/IkiWiki/Plugin/google.pm diff --git a/IkiWiki/Plugin/google.pm b/IkiWiki/Plugin/google.pm index 71948a7e9..48ad4c8ce 100644 --- a/IkiWiki/Plugin/google.pm +++ b/IkiWiki/Plugin/google.pm @@ -6,8 +6,6 @@ use strict; use IkiWiki 3.00; use URI; -my $host; - sub import { hook(type => "getsetup", id => "google", call => \&getsetup); hook(type => "checkconfig", id => "google", call => \&checkconfig); @@ -19,18 +17,14 @@ sub getsetup () { plugin => { safe => 1, rebuild => 1, + section => "web", }, } sub checkconfig () { if (! length $config{url}) { - error(sprintf(gettext("Must specify %s when using the %s plugin"), "url", 'google search')); - } - my $uri=URI->new($config{url}); - if (! $uri || ! defined $uri->host) { - error(gettext("Failed to parse url, cannot determine domain name")); + error(sprintf(gettext("Must specify %s when using the %s plugin"), "url", 'google')); } - $host=$uri->host; } my $form; @@ -43,7 +37,7 @@ sub pagetemplate (@) { if ($template->query(name => "searchform")) { if (! defined $form) { my $searchform = template("googleform.tmpl", blind_cache => 1); - $searchform->param(sitefqdn => $host); + $searchform->param(url => $config{url}); $form=$searchform->output; }