take a few more things literally

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

diff --git a/src/Modules/zfi.pl b/src/Modules/zfi.pl
index 458411953bae36c7132daa0683f6fde73a3055da..dee9f5f5bc309309600036169c71e49abc751ac6 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,12 +75,12 @@ 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);
 
                        if ($res_count < $res_return) {
-                               $result .= "$name ($desc) $href\n";
+                               $result .= "$name ($desc) $href : ";
                                $res_display ++;
                        }
                        $res_count ++;
@@ -86,7 +88,7 @@ sub queryText {
        }
 
        if (($query) && ($res_count > $res_display)) {
-               $result .= "$res_display of $res_count shown. All at http://zaurii.com/zfi/index.phtml?p=r&r=$query\n";
+               $result .= "$res_display of $res_count shown. All at http://zaurii.com/zfi/index.phtml?p=r&r=$query";
        }
 
        return $result;
@@ -95,7 +97,7 @@ sub queryText {
 sub query {
        my ($args) = @_;
        &::performStrictReply(&queryText($args));
-  return;
+       return;
 }
 
 1;