* Merge changes from prposed changes

[infobot.git] / src / Modules / zfi.pl

diff --git a/src/Modules/zfi.pl b/src/Modules/zfi.pl
index de77352af32c5634465ef32c09296080610e8c0b..13cc5ef2b6fb060fb3f0b7c39e4bd50182660054 100644 (file)
--- a/src/Modules/zfi.pl
+++ b/src/Modules/zfi.pl
@@ -24,6 +24,8 @@ package zfi;
 
 # We reply publicly or privately, depending how we were called
 
+use strict;
+
 my $no_zfi;
 
 BEGIN {
@@ -36,14 +38,14 @@ sub queryText {
        my ($query) = @_;
 
        if ($no_zfi) {
-               &main::status("zfi module requires LWP::UserAgent.");
+               &::status("zfi module requires LWP::UserAgent.");
                return '';
        }
 
        my $res_return = 5;
 
        my $ua = new LWP::UserAgent;
-  $ua->proxy('http', $::param{'httpProxy'}) if (&::IsParam("httpProxy"));
+       $ua->proxy('http', $::param{'httpProxy'}) if (&::IsParam('httpProxy'));
 
        $ua->timeout(10);
 
@@ -55,7 +57,7 @@ sub queryText {
        }
 
        my $request = new HTTP::Request('GET', "$searchpath");
-       my $response = $ua->request($request); 
+       my $response = $ua->request($request);
 
        if (!$response->is_success) {
                return "Something failed in connecting to the ZFI web server. Try again later.";
@@ -64,7 +66,7 @@ sub queryText {
        my $content = $response->content;
 
        if ($content =~ /No entries found/im) {
-               return "$result No results were found searching ZFI for '$query'.";
+               return "No results were found searching ZFI for '$query'.";
        }
 
        my $res_count = 0; #local counter
@@ -73,7 +75,7 @@ sub queryText {
        my @lines = split(/\n/,$content);
 
        my $result = '';
-       foreach $line(@lines) {
+       foreach my $line (@lines) {
                if (length($line) > 10) {
                        my ($name, $href, $desc) = split(/\|/,$line);
 
@@ -95,9 +97,10 @@ sub queryText {
 sub query {
        my ($args) = @_;
        &::performStrictReply(&queryText($args));
-  return;
+       return;
 }
 
 1;
-# vim: shiftwidth=2 tabstop=2
 __END__
+
+# vim:ts=4:sw=4:expandtab:tw=80