projects
/
ikiwiki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update
[ikiwiki.git]
/
IkiWiki
/
Plugin
/
google.pm
diff --git
a/IkiWiki/Plugin/google.pm
b/IkiWiki/Plugin/google.pm
index 4bba5775c2ba8583fc06504496e39792c2107bad..68cb16513c69812c47443ad2377c091e4d17037e 100644
(file)
--- a/
IkiWiki/Plugin/google.pm
+++ b/
IkiWiki/Plugin/google.pm
@@
-6,8
+6,6
@@
use strict;
use IkiWiki 3.00;
use URI;
use IkiWiki 3.00;
use URI;
-my $host;
-
sub import {
hook(type => "getsetup", id => "google", call => \&getsetup);
hook(type => "checkconfig", id => "google", call => \&checkconfig);
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,
plugin => {
safe => 1,
rebuild => 1,
+ section => "web",
},
}
sub checkconfig () {
if (! length $config{url}) {
},
}
sub checkconfig () {
if (! length $config{url}) {
- error(sprintf(gettext("Must specify %s when using the google search plugin"), "url"));
- }
- 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;
}
my $form;
@@
-42,8
+36,8
@@
sub pagetemplate (@) {
# Add search box to page header.
if ($template->query(name => "searchform")) {
if (! defined $form) {
# Add search box to page header.
if ($template->query(name => "searchform")) {
if (! defined $form) {
- my $searchform = template
("googleform.tmpl"
, blind_cache => 1);
- $searchform->param(
sitefqdn => $host
);
+ my $searchform = template
_depends("googleform.tmpl", $page
, blind_cache => 1);
+ $searchform->param(
url => $config{url}
);
$form=$searchform->output;
}
$form=$searchform->output;
}