X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/f9957d11ed3674b5c2ff7ba7c234bed7cb036b5f..5c0e56d149c6b33d010561f64f583e7ad1c529da:/IkiWiki/Plugin/google.pm?ds=inline

diff --git a/IkiWiki/Plugin/google.pm b/IkiWiki/Plugin/google.pm
index be07ca2be..1683220e7 100644
--- a/IkiWiki/Plugin/google.pm
+++ b/IkiWiki/Plugin/google.pm
@@ -3,33 +3,38 @@ package IkiWiki::Plugin::google;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 use URI;
 
-sub import { #{{{
+my $host;
+
+sub import {
 	hook(type => "getsetup", id => "google", call => \&getsetup);
 	hook(type => "checkconfig", id => "google", call => \&checkconfig);
 	hook(type => "pagetemplate", id => "google", call => \&pagetemplate);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
 			rebuild => 1,
 		},
-} #}}}
+}
 
-sub checkconfig () { #{{{
-	foreach my $required (qw(url)) {
-		if (! length $config{$required}) {
-			error(sprintf(gettext("Must specify %s when using the google search plugin"), $required));
-		}
+sub checkconfig () {
+	if (! length $config{url}) {
+		error(sprintf(gettext("Must specify %s when using the %s plugin"), "url", 'google'));
+	}
+	my $uri=URI->new($config{url});
+	if (! $uri || ! defined $uri->host) {
+		error(gettext("Failed to parse url, cannot determine domain name"));
 	}
-} #}}}
+	$host=$uri->host;
+}
 
 my $form;
-sub pagetemplate (@) { #{{{
+sub pagetemplate (@) {
 	my %params=@_;
 	my $page=$params{page};
 	my $template=$params{template};
@@ -38,12 +43,12 @@ sub pagetemplate (@) { #{{{
 	if ($template->query(name => "searchform")) {
 		if (! defined $form) {
 			my $searchform = template("googleform.tmpl", blind_cache => 1);
-			$searchform->param(sitefqdn => URI->new($config{url})->host);
+			$searchform->param(sitefqdn => $host);
 			$form=$searchform->output;
 		}
 
 		$template->param(searchform => $form);
 	}
-} #}}}
+}
 
 1