Fix color and format plugins to appear in the websetup interface.

[git.ikiwiki.info.git] / IkiWiki / Plugin / google.pm

diff --git a/IkiWiki/Plugin/google.pm b/IkiWiki/Plugin/google.pm
index 5394c5a6f8a503533d5388d602fbb64bbbf03ed7..483fa1707dca4dd60be7d8b3328f1a343b1fe026 100644 (file)
--- a/IkiWiki/Plugin/google.pm
+++ b/IkiWiki/Plugin/google.pm
@@ -3,11 +3,9 @@ package IkiWiki::Plugin::google;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki 2.00;
+use IkiWiki 3.00;

 use URI;
 
 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);


@@ -24,13 +22,8 @@ sub getsetup () {
 
 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;


@@ -43,7 +36,7 @@ sub pagetemplate (@) {
        if ($template->query(name => "searchform")) {
                if (! defined $form) {
                        my $searchform = template("googleform.tmpl", blind_cache => 1);
        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;
                }
 
                        $form=$searchform->output;
                }