From: timriker <timriker@c11ca15a-4712-0410-83d8-924469b57eb5>
Date: Fri, 18 Feb 2005 03:08:09 +0000 (+0000)
Subject: no main:: if not needed
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=dc498609afa162c127a4e31529e9725734278d0b;p=infobot.git

no main:: if not needed


git-svn-id: https://svn.code.sf.net/p/infobot/code/trunk/blootbot@1138 c11ca15a-4712-0410-83d8-924469b57eb5
---

diff --git a/src/Modules/BZFlag.pl b/src/Modules/BZFlag.pl
index 9ea8d2f..33538af 100755
--- a/src/Modules/BZFlag.pl
+++ b/src/Modules/BZFlag.pl
@@ -28,7 +28,7 @@ sub BZFlag {
 	my ($message) = @_;
 	my ($retval);
 	if ($no_BZFlag) {
-		&main::status("BZFlag module requires Socket.");
+		&::status("BZFlag module requires Socket.");
 		return 'BZFlag module not active';
 	}
 	if ($message =~ /^bzfquery\s+([^:]*)(?::([0-9]*))?$/xi) {
@@ -117,7 +117,7 @@ sub querytext {
 	my ($servernameport) = @_;
 	my ($servername,$port) = split(":",$servernameport);
 	if ($no_BZFlag) {
-		&main::status("BZFlag module requires Socket.");
+		&::status("BZFlag module requires Socket.");
 		return 'BZFlag module not active';
 	}
 	#my @teamName = ("Rogue", "Red", "Green", "Blue", "Purple", "Observer", "Rabbit");
diff --git a/src/Modules/babelfish.pl b/src/Modules/babelfish.pl
index 3a2e9f0..4a8d095 100644
--- a/src/Modules/babelfish.pl
+++ b/src/Modules/babelfish.pl
@@ -56,7 +56,7 @@ BEGIN {
 sub babelfishParam {
     return '' if $no_babelfish;
   my ($from, $to, $phrase) = @_;
-  &main::DEBUG("babelfish($from, $to, $phrase)");
+  &::DEBUG("babelfish($from, $to, $phrase)");
 
   $from = $lang_code{$from};
   $to = $lang_code{$to};
@@ -84,11 +84,11 @@ sub babelfishParam {
 sub translate {
     return '' if $no_babelfish;
   my ($phrase, $languagepair, $req, $ua) = @_;
-  &main::DEBUG("translate($phrase, $languagepair, $req, $ua)");
+  &::DEBUG("translate($phrase, $languagepair, $req, $ua)");
 
   my $urltext = uri_escape($phrase);
   $req->content("urltext=$urltext&lp=$languagepair");
-  &main::DEBUG("http://babelfish.altavista.com/babelfish/tr??urltext=$urltext&lp=$languagepair");
+  &::DEBUG("http://babelfish.altavista.com/babelfish/tr??urltext=$urltext&lp=$languagepair");
 
   my $res = $ua->request($req);
   my $translated;
@@ -102,13 +102,13 @@ sub translate {
     $translated =~ s/<[^>]*>//sg;
     $translated =~ s/&nbsp;/ /sg;
     $translated =~ s/\s+/ /sg;
-    #&main::DEBUG("$translated\n===remove <attributes>\n");
+    #&::DEBUG("$translated\n===remove <attributes>\n");
 
     $translated =~ s/\s*Translate again.*//i;
-    &main::DEBUG("$translated\n===remove after 'Translate again'\n");
+    &::DEBUG("$translated\n===remove after 'Translate again'\n");
 
     $translated =~ s/[^:]*?:\s*(Help\s*)?//s;
-    &main::DEBUG("len=" . length($translated) . " $translated\n===remove to first ':', optional Help\n");
+    &::DEBUG("len=" . length($translated) . " $translated\n===remove to first ':', optional Help\n");
 
     $translated =~ s/\n/ /g;
     # FIXME: should we do unicode->iso (no. use utf8!)
diff --git a/src/Modules/dns.pl b/src/Modules/dns.pl
index 17d76b8..415444d 100644
--- a/src/Modules/dns.pl
+++ b/src/Modules/dns.pl
@@ -19,7 +19,7 @@ sub dns::dns {
 	if ($dns =~ /(\d+\.\d+\.\d+\.\d+)/) {
 		use Socket;
 
-		&main::status("DNS query by IP address: $dns");
+		&::status("DNS query by IP address: $dns");
 
 		$y = pack('C4', split(/\./, $dns));
 		$x = (gethostbyaddr($y, &AF_INET));
@@ -32,7 +32,7 @@ sub dns::dns {
 
 	} else {
 
-		&main::status("DNS query by name: $dns");
+		&::status("DNS query by name: $dns");
 		$x = join('.',unpack('C4',(gethostbyname($dns))[4]));
 
 		if ($x !~ /^\s*$/) {
diff --git a/src/Modules/pager.pl b/src/Modules/pager.pl
index 1753401..3d21175 100644
--- a/src/Modules/pager.pl
+++ b/src/Modules/pager.pl
@@ -31,7 +31,7 @@ sub pager::page {
 	# TODO only allow registered users?
 
 	if ($no_page) {
-		&main::status('page module requires Mail::Mailer.');
+		&::status('page module requires Mail::Mailer.');
 		return 'page module not active';
 	}
 
@@ -66,7 +66,7 @@ sub pager::page {
 		my $channel = $::chan || 'infobot';
 		# TODO disallow use from private message? $chan="_default"
 
-		&main::status("pager: from $from <$fromaddr>, to $to <$toaddr>, msg \"$msg\"");
+		&::status("pager: from $from <$fromaddr>, to $to <$toaddr>, msg \"$msg\"");
 		my %headers = (
 			To => "$to <$toaddr>",
 			From => "$from <$fromaddr>",
@@ -79,7 +79,7 @@ sub pager::page {
 #			$logmsg .= "$_: $headers{$_}\n";
 #		}
 #		$logmsg .= "\n$msg\n";
-#		&main::status("pager:\n$logmsg");
+#		&::status("pager:\n$logmsg");
 
 		my $failed;
 		my $mailer = new Mail::Mailer 'sendmail';
diff --git a/src/Modules/spell.pl b/src/Modules/spell.pl
index b34b3e6..dda751f 100644
--- a/src/Modules/spell.pl
+++ b/src/Modules/spell.pl
@@ -32,7 +32,7 @@ sub spell::spell {
 		return("no binary found.");
 	}
 
-	if (!&main::validExec($query)) {
+	if (!&::validExec($query)) {
 		return("argument appears to be fuzzy.");
 	}
 
@@ -54,13 +54,13 @@ sub spell::spell {
 			$reply = "possible spellings for $query: @array";
 			last;
 		} elsif (/^\+/) {
-			&main::DEBUG("spell: '+' found => '$_'.");
+			&::DEBUG("spell: '+' found => '$_'.");
 			last;
 		} elsif (/^# (.*?) 0$/) {
 			# none found.
 			last;
 		} else {
-			&main::DEBUG("spell: unknown: '$_'.");
+			&::DEBUG("spell: unknown: '$_'.");
 		}
 	}
 
diff --git a/src/Modules/wikipedia.pl b/src/Modules/wikipedia.pl
index e81322f..1a73e2e 100644
--- a/src/Modules/wikipedia.pl
+++ b/src/Modules/wikipedia.pl
@@ -31,9 +31,9 @@ sub wikipedia {
   my ($phrase) = @_;
   my ($reply, $valid_result) = wikipedia_lookup(@_);
   if ($reply) {
-    &main::pSReply($reply);
+    &::performStrictReply($reply);
   } else {
-    &main::pSReply("'$phrase' not found in Wikipedia. Perhaps try a different spelling or case?");
+    &::performStrictReply("'$phrase' not found in Wikipedia. Perhaps try a different spelling or case?");
   }
 }
 
@@ -41,13 +41,13 @@ sub wikipedia_silent {
   return '' if $missing;
   my ($reply, $valid_result) = wikipedia_lookup(@_);
   if ($valid_result and $reply) {
-    &main::pSReply($reply);
+    &::performStrictReply($reply);
   }
 }
 
 sub wikipedia_lookup {
   my ($phrase) = @_;
-  &main::DEBUG("wikipedia($phrase)");
+  &::DEBUG("wikipedia($phrase)");
 
   my $ua = new LWP::UserAgent;
   $ua->proxy('http', $::param{'httpProxy'}) if (&::IsParam("httpProxy"));
@@ -69,10 +69,10 @@ sub wikipedia_lookup {
   my $url = $wikipedia_search_url . 'search=' . $phrase . '&go=Go';
   my $req = HTTP::Request->new('HEAD', $url);
   $req->header('Accept-Language' => 'en');
-  &main::DEBUG($url);
+  &::DEBUG($url);
 
   my $res = $ua->request($req);
-  &main::DEBUG($res->code);
+  &::DEBUG($res->code);
 
   if (!$res->is_success) {
     return("Wikipedia might be temporarily unavailable (".$res->code."). Please try again in a few minutes...",
@@ -147,7 +147,7 @@ sub wikipedia_lookup {
 sub wikipedia_get_text {
   return '' if $missing;
   my ($article) = @_;
-  &main::DEBUG("wikipedia_get_text($article)");
+  &::DEBUG("wikipedia_get_text($article)");
 
   my $ua = new LWP::UserAgent;
   $ua->proxy('http', $::param{'httpProxy'}) if (&::IsParam("httpProxy"));
@@ -155,7 +155,7 @@ sub wikipedia_get_text {
   $ua->agent("Mozilla/5.0 " . $ua->agent);
   $ua->timeout(5);
 
-  &main::DEBUG($wikipedia_export_url . $article);
+  &::DEBUG($wikipedia_export_url . $article);
   my $req = HTTP::Request->new('GET', $wikipedia_export_url .
 			       $article);
   $req->header('Accept-Language' => 'en');
@@ -163,7 +163,7 @@ sub wikipedia_get_text {
 
   my $res = $ua->request($req);
   my ($title, $redirect, $text);
-  &main::DEBUG($res->code);
+  &::DEBUG($res->code);
 
   if ($res->is_success) {
     if ($res->code == '200' ) {
@@ -174,7 +174,7 @@ sub wikipedia_get_text {
 	} elsif (/#REDIRECT\s*\[\[(.*?)\]\]/i) {
 	  $redirect = $1;
 	  $redirect =~ tr/ /_/;
-	  &main::DEBUG("wiki redirect to " . $redirect);
+	  &::DEBUG("wiki redirect to " . $redirect);
 	  last;
 	} elsif (/<text>(.*)/) {
 	  $text = '"' . $1;
@@ -185,7 +185,7 @@ sub wikipedia_get_text {
 	  $text = $text . " " . $_;
 	}
       }
-      &main::DEBUG("wikipedia returned text: " . $text . 
+      &::DEBUG("wikipedia returned text: " . $text .
 		   ", redirect " . $redirect. "\n");
 
       if (!$redirect and !$text) {
diff --git a/src/Modules/wtf.pl b/src/Modules/wtf.pl
index 79fee7f..e654f36 100644
--- a/src/Modules/wtf.pl
+++ b/src/Modules/wtf.pl
@@ -31,7 +31,7 @@ sub wtf::wtf {
 	if ($query =~ /^$|[^\w]/){
 		return("usage: wtf <foo>.");
 	}
-	if (!&main::validExec($query)) {
+	if (!&::validExec($query)) {
 		return("argument appears to be fuzzy.");
 	}
 
diff --git a/src/Modules/zfi.pl b/src/Modules/zfi.pl
index d63e176..103f56f 100644
--- a/src/Modules/zfi.pl
+++ b/src/Modules/zfi.pl
@@ -38,7 +38,7 @@ sub queryText {
 	my ($query) = @_;
 
 	if ($no_zfi) {
-		&main::status("zfi module requires LWP::UserAgent.");
+		&::status("zfi module requires LWP::UserAgent.");
 		return '';
 	}
 
diff --git a/src/Modules/zsi.pl b/src/Modules/zsi.pl
index 0347a02..b11c277 100644
--- a/src/Modules/zsi.pl
+++ b/src/Modules/zsi.pl
@@ -38,7 +38,7 @@ sub queryText {
 	my ($query) = @_;
 
 	if ($no_zsi) {
-		&main::status("zsi module requires LWP::UserAgent.");
+		&::status("zsi module requires LWP::UserAgent.");
 		return '';
 	}