From f7cae48a17d6decd0a9bd997188271daa0a885b1 Mon Sep 17 00:00:00 2001 From: timriker Date: Tue, 11 Nov 2003 21:33:00 +0000 Subject: [PATCH] ws git-svn-id: https://svn.code.sf.net/p/infobot/code/trunk/blootbot@880 c11ca15a-4712-0410-83d8-924469b57eb5 --- ChangeLog | 2 +- ChangeLog.old | 10 +++--- INSTALL | 22 ++++++------- INSTALL.mysql | 6 ++-- INSTALL.sqlite | 2 +- README | 6 ++-- blootbot | 4 +-- doc/cmd.list | 16 +++++----- doc/old/BUGS | 6 ++-- doc/old/USAGE | 20 ++++++------ old/Freshmeat_II.pl | 4 +-- old/News.pl | 6 ++-- old/dbm.pl | 4 +-- patches/Google.pm | 64 +++++++++++++++++++------------------- scripts/dbm2mysql.pl | 2 +- scripts/irclog2html.pl | 2 +- scripts/makepasswd | 2 +- scripts/oreilly_prettyp.pl | 64 +++++++++++++++++++------------------- scripts/showvars.pl | 64 +++++++++++++++++++------------------- src/CommandStubs.pl | 4 +-- src/Factoids/Norm.pl | 2 +- src/Factoids/Reply.pl | 2 +- src/IRC/Irc.pl | 2 +- src/IRC/IrcHooks.pl | 2 +- src/IRC/Schedulers.pl | 2 +- src/Misc.pl | 2 +- src/Modules/Countdown.pl | 2 +- src/Modules/Exchange.pl | 18 ++++++----- src/Modules/Factoids.pl | 20 ++++++------ src/Modules/HTTPDtype.pl | 14 ++++----- src/Modules/News.pl | 6 ++-- src/Modules/Quote.pl | 4 +-- src/Modules/Units.pl | 50 ++++++++++++++--------------- src/Modules/Weather.pl | 2 +- src/Modules/babel.pl | 47 ++++++++++++++-------------- src/Modules/insult.pl | 2 +- src/Modules/zfi.pl | 2 +- src/Modules/zsi.pl | 2 +- src/Shm.pl | 3 +- src/UserExtra.pl | 6 ++-- src/core.pl | 6 ++-- src/dbi.pl | 2 +- src/modules.pl | 10 +++--- 43 files changed, 262 insertions(+), 256 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9039653..8491f04 100644 --- a/ChangeLog +++ b/ChangeLog @@ -199,7 +199,7 @@ and opt-out (news unnotify) irchooks: splitted into IrcHelpers.pl so we can reload it on the fly. factoids: added debugging for short factoids that may be botched up - references + references 2001-04-12 21:12 dms diff --git a/ChangeLog.old b/ChangeLog.old index 0986ea0..5d10ab1 100644 --- a/ChangeLog.old +++ b/ChangeLog.old @@ -3,11 +3,11 @@ v1.0.0 (20000725): bug fixes mainly. - Fixed warning in Modules/Uptime.pl for clean install. - More fixes for scripts/*mysql*.pl from GmLB. - Added command 'hex'. - - GmLB fixed mysql2txt.pl and txt2mysql.pl. You can now import and + - GmLB fixed mysql2txt.pl and txt2mysql.pl. You can now import and export to inforbot 'factpacks'.- v1.0.0RC3 (20000720): bug fixes mainly. - - Debian.pl's infoPackages() now checks for incoming + - Debian.pl's infoPackages() now checks for incoming automatically and shows the new file. - irq/dan found the bot wouldn't run if a stale (invalid) pid file exists. Fixed. @@ -215,7 +215,7 @@ v1.0.0pre3 (20000319): - Fixed Freshmeat.pl not to show duplicate packages found by 'name' and 'oneliner' search. Made showPackage() function. - Debian modules now does multi distro. (woody's non-us appears to - be different structure so does not work :(, very crude hack... + be different structure so does not work :(, very crude hack... may not even work). - Added subfactoid randomising. eg: '(one|two|three)'. - 'dauthor' now works! @@ -317,7 +317,7 @@ v0.99pre12 (20000125): v0.99pre11 (20000123): - Fixes here and there... - - Debian find now searches Package names. Fallback automatically + - Debian find now searches Package names. Fallback automatically to contents file search. - Fixed typo related to log cycling. - Added netsplit detection code. @@ -601,7 +601,7 @@ v0.17.0 (19991126): - Ability to turn off minVolunteerLength. - More changes to prevent chatter in unaddressed manner. - We remove any ansi or control chars when piping to the log file. - RevHippie++. + RevHippie++. - Added 'thanks' language. - Typo in Freshmeat.pl; Fixed. - Added $rootwarnmode = passive || aggressive to satisfy lilo@OPN. diff --git a/INSTALL b/INSTALL index ef5ee58..08d8a63 100644 --- a/INSTALL +++ b/INSTALL @@ -8,19 +8,19 @@ Method of installation. - Edit files/blootbot.chan to set which channels to join. - Install the following Perl modules: - - Net::IRC perl module - - Debian: (apt-get install libnet-irc-perl) - - WWW::Search - - Debian: (apt-get install libwww-search-perl) - - LWP - - Debian: (apt-get install libwww-perl) - - HTML::Parser - - Debian: (apt-get install libhtml-parser-perl) + - Net::IRC perl module + - Debian: (apt-get install libnet-irc-perl) + - WWW::Search + - Debian: (apt-get install libwww-search-perl) + - LWP + - Debian: (apt-get install libwww-perl) + - HTML::Parser + - Debian: (apt-get install libhtml-parser-perl) - Choose your database: - - MySQL, read INSTALL.mysql (supported) - - SQLite, read INSTALL.sqlite (supported) - - PgSQL, read INSTALL.pgsql (unsupported, may work) + - MySQL, read INSTALL.mysql (supported) + - SQLite, read INSTALL.sqlite (supported) + - PgSQL, read INSTALL.pgsql (unsupported, may work) - There are "bugs" in the perl modules. Read INSTALL.patches on how to fix. diff --git a/INSTALL.mysql b/INSTALL.mysql index 40063e5..5de7a16 100644 --- a/INSTALL.mysql +++ b/INSTALL.mysql @@ -11,10 +11,10 @@ INSTALL.mysql = Possible problems - if connection to localhost is (short) refused, run - '/etc/init.d/mysql stop' - '/etc/init.d/mysql start' + '/etc/init.d/mysql stop' + '/etc/init.d/mysql start' - if connection for user is refused, reload grant tables with - 'mysqladmin -u root -p reload' + 'mysqladmin -u root -p reload' * [OPTIONAL] - run 'scripts/dbm2mysql.pl old-db' to convert dbm database file diff --git a/INSTALL.sqlite b/INSTALL.sqlite index ec3b9c5..c156712 100644 --- a/INSTALL.sqlite +++ b/INSTALL.sqlite @@ -17,7 +17,7 @@ other distros might need to build from sources. SQLite sources: -http://www.hwaci.com/sw/sqlite/ +http://www.hwaci.com/sw/sqlite/ DBD::SQLite sources: diff --git a/README b/README index 092e416..7d080ff 100644 --- a/README +++ b/README @@ -50,7 +50,7 @@ cases. preliminary pgsql support has been added but someone with pgperl knowledge needs to fix it up or at least unify the module with mysql. INSTALLATION - - Read the included INSTALL file + - Read the included INSTALL file NOTICE Be warned that this bot consumes quite a lot of memory upon start @@ -66,7 +66,7 @@ However, these people do not realize the potential of open wingates. test all modifications properly (and extensively). Suggestions are welcomed. - gp@OPN is currently working on a C version of infobot or + gp@OPN is currently working on a C version of infobot or blootbot, not based on the above source base. Core factoid code and mysql support works - but that is it. @@ -80,7 +80,7 @@ features listed in 'TODO'. you to find the cookies than for me to hand-feed them to you ;) See 'EXAMPLES' for various usage of factoids and "hidden" -variables. If you're hardcore, check out 'CommandStubs.pl' and +variables. If you're hardcore, check out 'CommandStubs.pl' and 'UserExtras.pl' for cool features. topic [help] - Topic help. diff --git a/blootbot b/blootbot index 5be7642..323c122 100755 --- a/blootbot +++ b/blootbot @@ -5,7 +5,7 @@ use strict; use vars qw($bot_base_dir $bot_src_dir $bot_misc_dir $bot_state_dir - $bot_data_dir $bot_config_dir $bot_log_dir $bot_run_dir + $bot_data_dir $bot_config_dir $bot_log_dir $bot_run_dir $bot_pid $memusage %param ); @@ -47,7 +47,7 @@ BEGIN { # prevent duplicate processes of the same bot &duperuncheck(); -# initialize everything +# initialize everything &startup(); # first time initialization. &setup(); diff --git a/doc/cmd.list b/doc/cmd.list index 8cf384a..17600a6 100644 --- a/doc/cmd.list +++ b/doc/cmd.list @@ -61,15 +61,15 @@ if ($message =~ /^wantNick$/i) { &addCmdHook("main", 'chan(stats|info)', ('CODEREF' => 'chaninfo', ) ); &addCmdHook("main", 'cmd(stats|info)', ('CODEREF' => 'cmdstats', ) ); -&addCmdHook("main", 'factinfo', ('CODEREF' => 'factinfo', -&addCmdHook("main", 'factstats?', ('CODEREF' => 'factstats', -&addCmdHook("main", 'help', ('CODEREF' => 'help', +&addCmdHook("main", 'factinfo', ('CODEREF' => 'factinfo', +&addCmdHook("main", 'factstats?', ('CODEREF' => 'factstats', +&addCmdHook("main", 'help', ('CODEREF' => 'help', &addCmdHook("main", 'karma', ('CODEREF' => 'karma', ) ); -&addCmdHook("main", 'i?spell', ('CODEREF' => 'ispell', -&addCmdHook("main", 'd?nslookup', ('CODEREF' => 'DNS', -&addCmdHook("main", 'tell|explain', ('CODEREF' => 'tell', -&addCmdHook("main", 'news', ('CODEREF' => 'News::Parse', -&addCmdHook("main", 'countrystats', ('CODEREF' => 'countryStats', +&addCmdHook("main", 'i?spell', ('CODEREF' => 'ispell', +&addCmdHook("main", 'd?nslookup', ('CODEREF' => 'DNS', +&addCmdHook("main", 'tell|explain', ('CODEREF' => 'tell', +&addCmdHook("main", 'news', ('CODEREF' => 'News::Parse', +&addCmdHook("main", 'countrystats', ('CODEREF' => 'countryStats', # Modules/UserDCC.pl if ($message =~ /^(exit|quit)$/i) { if ($message =~ /^who$/) { diff --git a/doc/old/BUGS b/doc/old/BUGS index 9c45512..72f3449 100644 --- a/doc/old/BUGS +++ b/doc/old/BUGS @@ -15,7 +15,7 @@ Problem #2: [UPDATED 20000224] has not received notification of the new topic before changing to the second modification of the topic, it would use the absolute first (0) topic as a reference, - therefore missing out on the first alteration of the + therefore missing out on the first alteration of the topic. A very cheap solution exists. Edit IrcHooks.pl, search for @@ -53,7 +53,7 @@ Problem #4: 199912xx just 1 (total of 2), depending on the return of SELECT. If this still persists and memory leaks are happening, first make sure you are not using broken mysql tables, secondly bitch at the - mysql-perl author that there is a memory leak when a broken table + mysql-perl author that there is a memory leak when a broken table is in use. Problem #5: @@ -71,7 +71,7 @@ Problem #5: since __WARN__ hooks are not called from inside one. ### From 'perlvar'... - Note that __DIE__/__WARN__ handlers are very special in one + Note that __DIE__/__WARN__ handlers are very special in one respect: they may be called to report (probable) errors found by the parser. In such a case the parser may be in inconsistent state, so any attempt to evaluate Perl code from such a handler diff --git a/doc/old/USAGE b/doc/old/USAGE index 8f085ab..d922ed7 100644 --- a/doc/old/USAGE +++ b/doc/old/USAGE @@ -6,9 +6,9 @@ = === === ==== ====== ===== ==== ====== ==== ========================================================================== - ====================================== - USER COMMANDS - ====================================== + ====================================== + USER COMMANDS + ====================================== Command: 4op ============= @@ -215,7 +215,7 @@ Usage: Example: > blootbot: chanstats i am on 2 channels: #blootbot #debian - i've cached 5 users distributed over 2 channels. + i've cached 5 users distributed over 2 channels. > blootbot: chanstats #blootbot On #blootbot, there have been 1 Join, 1 Op and 20 @@ -366,9 +366,9 @@ Example: - ====================================== - MODULE COMMANDS - ====================================== + ====================================== + MODULE COMMANDS + ====================================== Command: babelfish ============= @@ -623,9 +623,9 @@ Example: DOES NOT WORK - ====================================== - MISCELLANEOUS/FACTOID COMMANDS - ====================================== + ====================================== + MISCELLANEOUS/FACTOID COMMANDS + ====================================== Command: forget ============= diff --git a/old/Freshmeat_II.pl b/old/Freshmeat_II.pl index f543c54..470b201 100644 --- a/old/Freshmeat_II.pl +++ b/old/Freshmeat_II.pl @@ -172,7 +172,7 @@ sub downloadIndex { ### lets get on with business. # set the last refresh time. fixes multiple spawn bug. - &::dbSet("freshmeat", + &::dbSet("freshmeat", { "projectname_short" => "_" }, { "latest_version" => time(), "desc_short" => "dummy project to track date" } @@ -341,7 +341,7 @@ sub xml_end { if ($i % 200 == 0 and $i != 0) { &::showProc(); - &::status("FM: unlocking and locking ($i): ". + &::status("FM: unlocking and locking ($i): ". &::Time2String( time() - $locktime ) ); $locktime = time(); diff --git a/old/News.pl b/old/News.pl index 1c1629d..e03f9a3 100644 --- a/old/News.pl +++ b/old/News.pl @@ -542,7 +542,7 @@ sub mod { if ($flags eq "") { $done++ if (!$done and $mod_news =~ s/\Q$op\E/$np/); $done++ if (!$done and $mod_nnews =~ s/\Q$op\E/$np/); - } elsif ($flags eq "g") { + } elsif ($flags eq "g") { $done++ if ($mod_news =~ s/\Q$op\E/$np/g); $done++ if ($mod_nnews =~ s/\Q$op\E/$np/g); } @@ -799,7 +799,7 @@ sub latest { if (!$flag) { return unless ($unread); - # just a temporary measure not to flood ourself off the + # just a temporary measure not to flood ourself off the # network with news until we get global notice() and msg() # throttling. if (time() - ($::cache{newsTime} || 0) < 5) { @@ -831,7 +831,7 @@ sub latest { $i = &newsS2N($_); $sorted[$i] = $_; } - + for ($i=0; $i<=scalar(@sorted); $i++) { my $news = $sorted[$i]; next unless (defined $news); diff --git a/old/dbm.pl b/old/dbm.pl index 0048143..8dc5d4b 100644 --- a/old/dbm.pl +++ b/old/dbm.pl @@ -346,7 +346,7 @@ sub searchTable { if (!scalar &dbGetColInfo($table)) { return; - } + } my @results; foreach (keys %{$table}) { @@ -391,7 +391,7 @@ sub getFactInfo { } &ERROR("gFI: should never happen."); -} +} ##### # Usage: &getFactoid($faqtoid); diff --git a/patches/Google.pm b/patches/Google.pm index 869eed3..04f586e 100644 --- a/patches/Google.pm +++ b/patches/Google.pm @@ -11,7 +11,7 @@ package WWW::Search::Google; =head1 NAME -WWW::Search::Google - class for searching Google +WWW::Search::Google - class for searching Google =head1 SYNOPSIS @@ -58,7 +58,7 @@ page in C<{_next_url}>. C is called (from C) whenever more hits are needed. It calls C to fetch the page specified by C<{_next_url}>. -It then parses this page, appending any search hits it finds to +It then parses this page, appending any search hits it finds to C<{cache}>. If it finds a ``next'' button in the text, it sets C<{_next_url}> to point to the page for the next set of results, otherwise it sets it to undef to indicate we''re done. @@ -66,7 +66,7 @@ set of results, otherwise it sets it to undef to indicate we''re done. =head1 TESTING -This module adheres to the C test suite mechanism. +This module adheres to the C test suite mechanism. =head1 AUTHOR @@ -75,7 +75,7 @@ This backend is written and maintained/supported by Jim Smyser. =head1 BUGS -Google is not an easy search engine to parse in that it is capable +Google is not an easy search engine to parse in that it is capable of altering it's output ever so slightly on different search terms. There may be new slight results output the author has not yet seen that will pop at any given time for certain searches. So, if you think you see @@ -94,11 +94,11 @@ Minor code correction for empty returned titles Forgot to add new next url regex in 2.19! 2.19 -Regex work on some search results url's that has changed. Number found +Regex work on some search results url's that has changed. Number found return should be right now. 2.17 -Insert url as a title when no title is found. +Insert url as a title when no title is found. 2.13 New regexp to parse newly found results format with certain search terms. @@ -118,7 +118,7 @@ Added Kingpin's new hash_to_cgi_string() 10/12/99 Fixed missing links / regexp crap. 2.05 -Matching overhaul to get the code parsing right due to multiple +Matching overhaul to get the code parsing right due to multiple tags being used by google on the hit lines. 9/25/99 2.02 @@ -139,10 +139,10 @@ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. =cut #' - - + + ##################################################################### - + require Exporter; @EXPORT = qw(); @EXPORT_OK = qw(); @@ -156,12 +156,12 @@ $TEST_CASES = <<"ENDTESTCASES"; &test('Google', '$MAINTAINER', 'one_page', '+LS'.'AM +rep'.'lication', \$TEST_RANGE, 2,99); &test('Google', '$MAINTAINER', 'multi', 'dir'.'ty ha'.'rr'.'y bimbo', \$TEST_GREATER_THAN, 101); ENDTESTCASES - + use Carp (); use WWW::Search(qw(generic_option strip_tags)); require WWW::SearchResult; - - + + sub undef_to_emptystring { return defined($_[0]) ? $_[0] : ""; } @@ -172,12 +172,12 @@ sub native_setup_search $self->user_agent('user'); $self->{_next_to_retrieve} = 0; $self->{'_num_hits'} = 100; - if (!defined($self->{_options})) { - $self->{_options} = { - 'search_url' => 'http://www.google.com/search', - 'num' => $self->{'_num_hits'}, - }; - }; + if (!defined($self->{_options})) { + $self->{_options} = { + 'search_url' => 'http://www.google.com/search', + 'num' => $self->{'_num_hits'}, + }; + }; my($options_ref) = $self->{_options}; if (defined($native_options_ref)) { # Copy in new options. @@ -195,7 +195,7 @@ sub native_setup_search $self->{_debug} = $options_ref->{'search_debug'}; $self->{_debug} = 2 if ($options_ref->{'search_parse_debug'}); $self->{_debug} = 0 if (!defined($self->{_debug})); - + # Finally figure out the url. $self->{_base_url} = $self->{_next_url} = @@ -203,7 +203,7 @@ sub native_setup_search "?" . $options . "q=" . $native_query; } - + # private sub begin_new_hit { my($self) = shift; @@ -236,13 +236,13 @@ sub native_retrieve_some { foreach ($self->split_lines($response->content())) { next if m@^$@; # short circuit for blank lines - if ($state == $HEADER && m/about ([\d,]+)<\/b>/) + if ($state == $HEADER && m/about ([\d,]+)<\/b>/) { my($n) = $1; $self->approximate_result_count($n); print STDERR "Found Total: $n\n" ; $state = $HITS; - } + } if ($state == $HITS && m|

]*)\>(.*?)|i) { my ($url, $title) = ($1,$2); @@ -255,7 +255,7 @@ sub native_retrieve_some { $title = "No Title" if ($title =~ /^\s+/); $hit->title(strip_tags($title)); $state = $HITS; - } + } elsif ($state == $HITS && m|(.*?)
<.*?>|i) { my ($url, $title) = ($1,$2); @@ -268,7 +268,7 @@ sub native_retrieve_some { $title = "No Title" if ($title =~ /^\s+/); $hit->title(strip_tags($title)); $state = $HITS; - } + } elsif ($state == $HITS && m@^

(.*)
(.*)@i || m@^

(.*).*?
(.*)@i) @@ -289,8 +289,8 @@ sub native_retrieve_some { $mDesc = $mDesc . '
' if not $mDesc =~ m@
@; $hit->description($mDesc) if (defined($hit)); $state = $HITS; - } - elsif ($state == $HITS && m@^(\.\.(.+))@i) + } + elsif ($state == $HITS && m@^(\.\.(.+))@i) { print STDERR "**Parsing Description Line**\n" if ($self->{_debug}); $raw .= $_; @@ -301,16 +301,16 @@ sub native_retrieve_some { $hit->description($sDesc) if $sDesc =~ m@^\.@; $sDesc = ''; $state = $HITS; - } - elsif ($state == $HITS && m@

@i) + } + elsif ($state == $HITS && m@
@i) { ($hit, $raw) = $self->begin_new_hit($hit, $raw); print STDERR "**Found Last Line**\n" if ($self->{_debug}); # end of hits $state = $TRAILER; - } - elsif ($state == $TRAILER && - m|.*?|i) + } + elsif ($state == $TRAILER && + m|.*?|i) { my($relative_url) = $1; print STDERR "**Fetching >>Next<< Page**\n" if ($self->{_debug}); diff --git a/scripts/dbm2mysql.pl b/scripts/dbm2mysql.pl index 2a28679..d9f6c31 100755 --- a/scripts/dbm2mysql.pl +++ b/scripts/dbm2mysql.pl @@ -53,7 +53,7 @@ foreach $factoid (keys %db) { } } else { # infobot dbm to blootbot sql support. - &sqlReplace("factoids", { + &sqlReplace("factoids", { factoid_key => $_, factoid_value => $db{$_}, } ); diff --git a/scripts/irclog2html.pl b/scripts/irclog2html.pl index 6714ffd..cad4d84 100755 --- a/scripts/irclog2html.pl +++ b/scripts/irclog2html.pl @@ -273,7 +273,7 @@ sub main { elsif ($line =~ /^>\;>\;>\; /) { $line =~ s/^>\;>\;>\; /\*\*\* /; - + # Process changed nick results, and remember colours accordingly # if ($line =~ /\*\*\* (.*?) are|is now known as (.*)/) { my $nick_old; diff --git a/scripts/makepasswd b/scripts/makepasswd index 897a4aa..b76617c 100755 --- a/scripts/makepasswd +++ b/scripts/makepasswd @@ -14,7 +14,7 @@ sub mkpasswd { my $what = $_[0]; my $salt = chr(65+rand(27)).chr(65+rand(27)); $salt =~ s/\W/x/g; - + return crypt($what, $salt); } diff --git a/scripts/oreilly_prettyp.pl b/scripts/oreilly_prettyp.pl index 814a973..db58d78 100644 --- a/scripts/oreilly_prettyp.pl +++ b/scripts/oreilly_prettyp.pl @@ -6,11 +6,11 @@ $level = -1; # Level of indentation sub pretty_print { my $var; foreach $var (@_) { - if (ref ($var)) { - print_ref($var); - } else { - print_scalar($var); - } + if (ref ($var)) { + print_ref($var); + } else { + print_scalar($var); + } } } @@ -23,26 +23,26 @@ sub print_scalar { sub print_ref { my $r = $_[0]; if (exists ($already_seen{$r})) { - print_indented ("$r (Seen earlier)"); - return; + print_indented ("$r (Seen earlier)"); + return; } else { - $already_seen{$r}=1; + $already_seen{$r}=1; } my $ref_type = ref($r); if ($ref_type eq "ARRAY") { - print_array($r); + print_array($r); } elsif ($ref_type eq "SCALAR") { - print "Ref -> $r"; - print_scalar($$r); + print "Ref -> $r"; + print_scalar($$r); } elsif ($ref_type eq "HASH") { - print_hash($r); + print_hash($r); } elsif ($ref_type eq "REF") { - ++$level; - print_indented("Ref -> ($r)"); - print_ref($$r); - --$level; + ++$level; + print_indented("Ref -> ($r)"); + print_ref($$r); + --$level; } else { - print_indented ("$ref_type (not supported)"); + print_indented ("$ref_type (not supported)"); } } @@ -51,11 +51,11 @@ sub print_array { ++$level; print_indented ("[ # $r_array"); foreach $var (@$r_array) { - if (ref ($var)) { - print_ref($var); - } else { - print_scalar($var); - } + if (ref ($var)) { + print_ref($var); + } else { + print_scalar($var); + } } print_indented ("]"); --$level; @@ -64,18 +64,18 @@ sub print_array { sub print_hash { my($r_hash) = @_; my($key, $val); - ++$level; + ++$level; print_indented ("{ # $r_hash"); while (($key, $val) = each %$r_hash) { - $val = ($val ? $val : '""'); - ++$level; - if (ref ($val)) { - print_indented ("$key => "); - print_ref($val); - } else { - print_indented ("$key => $val"); - } - --$level; + $val = ($val ? $val : '""'); + ++$level; + if (ref ($val)) { + print_indented ("$key => "); + print_ref($val); + } else { + print_indented ("$key => $val"); + } + --$level; } print_indented ("}"); --$level; diff --git a/scripts/showvars.pl b/scripts/showvars.pl index a8733e0..22c55ac 100644 --- a/scripts/showvars.pl +++ b/scripts/showvars.pl @@ -29,11 +29,11 @@ $level = -1; # Level of indentation sub pretty_print { my $var; foreach $var (@_) { - if (ref ($var)) { - print_ref($var); - } else { - print_scalar($var); - } + if (ref ($var)) { + print_ref($var); + } else { + print_scalar($var); + } } } @@ -46,26 +46,26 @@ sub print_scalar { sub print_ref { my $r = $_[0]; if (exists ($already_seen{$r})) { - print_indented ("$r (Seen earlier)"); - return; + print_indented ("$r (Seen earlier)"); + return; } else { - $already_seen{$r}=1; + $already_seen{$r}=1; } my $ref_type = ref($r); if ($ref_type eq "ARRAY") { - print_array($r); + print_array($r); } elsif ($ref_type eq "SCALAR") { - print "Ref -> $r"; - print_scalar($$r); + print "Ref -> $r"; + print_scalar($$r); } elsif ($ref_type eq "HASH") { - print_hash($r); + print_hash($r); } elsif ($ref_type eq "REF") { - ++$level; - print_indented("Ref -> ($r)"); - print_ref($$r); - --$level; + ++$level; + print_indented("Ref -> ($r)"); + print_ref($$r); + --$level; } else { - print_indented ("$ref_type (not supported)"); + print_indented ("$ref_type (not supported)"); } } @@ -74,11 +74,11 @@ sub print_array { ++$level; print_indented ("[ # $r_array"); foreach $var (@$r_array) { - if (ref ($var)) { - print_ref($var); - } else { - print_scalar($var); - } + if (ref ($var)) { + print_ref($var); + } else { + print_scalar($var); + } } print_indented ("]"); --$level; @@ -87,18 +87,18 @@ sub print_array { sub print_hash { my($r_hash) = @_; my($key, $val); - ++$level; + ++$level; print_indented ("{ # $r_hash"); while (($key, $val) = each %$r_hash) { - $val = ($val ? $val : '""'); - ++$level; - if (ref ($val)) { - print_indented ("$key => "); - print_ref($val); - } else { - print_indented ("$key => $val"); - } - --$level; + $val = ($val ? $val : '""'); + ++$level; + if (ref ($val)) { + print_indented ("$key => "); + print_ref($val); + } else { + print_indented ("$key => $val"); + } + --$level; } print_indented ("}"); --$level; diff --git a/src/CommandStubs.pl b/src/CommandStubs.pl index bdcaf0b..7da444e 100644 --- a/src/CommandStubs.pl +++ b/src/CommandStubs.pl @@ -18,7 +18,7 @@ $w3search_regex = "google"; ### COMMAND HOOK IMPLEMENTATION. # addCmdHook("SECTION", 'TEXT_HOOK', -# (CODEREF => 'Blah', +# (CODEREF => 'Blah', # Forker => 1, # CheckModule => 1, # ??? # Module => 'blah.pl' # preload module. @@ -190,7 +190,7 @@ sub parseCmdHook { 'Forker' => 1, 'Identifier' => 'kernel', 'Cmdstats' => 'Kernel', 'NoArgs' => 1) ); &addCmdHook("extra", 'listauth', ('CODEREF' => 'CmdListAuth', - 'Identifier' => 'search', Module => 'factoids', + 'Identifier' => 'search', Module => 'factoids', 'Help' => 'listauth') ); &addCmdHook("extra", 'quote', ('CODEREF' => 'Quote::Quote', 'Forker' => 1, 'Identifier' => 'quote', diff --git a/src/Factoids/Norm.pl b/src/Factoids/Norm.pl index 7aba3d2..028c72e 100644 --- a/src/Factoids/Norm.pl +++ b/src/Factoids/Norm.pl @@ -28,7 +28,7 @@ sub normquery { s/,?\s*(pretty )*please\??\s*$/\?/i; # what country is ... - if ($in =~ + if ($in =~ s/wh(at|ich)\s+(add?res?s|country|place|net (suffix|domain))/wh$1 /ig) { if ((length($in) == 2) && ($in !~ /^\./)) { $in = '.'.$in; diff --git a/src/Factoids/Reply.pl b/src/Factoids/Reply.pl index 4fc3b60..056f947 100644 --- a/src/Factoids/Reply.pl +++ b/src/Factoids/Reply.pl @@ -29,7 +29,7 @@ sub getReply { $message =~ tr/A-Z/a-z/; $message =~ s/^cmd:/CMD:/; - my ($count, $fauthor, $result) = &sqlSelect("factoids", + my ($count, $fauthor, $result) = &sqlSelect("factoids", "requested_count,created_by,factoid_value", { factoid_key => $message } ); diff --git a/src/IRC/Irc.pl b/src/IRC/Irc.pl index 75ca4cc..ad557ae 100644 --- a/src/IRC/Irc.pl +++ b/src/IRC/Irc.pl @@ -825,7 +825,7 @@ sub closeDCC { foreach $type (keys %dcc) { next if ($type ne uc($type)); - + my $nick; foreach $nick (keys %{ $dcc{$type} }) { next unless (defined $nick); diff --git a/src/IRC/IrcHooks.pl b/src/IRC/IrcHooks.pl index 4697d3f..9c9d87c 100644 --- a/src/IRC/IrcHooks.pl +++ b/src/IRC/IrcHooks.pl @@ -899,7 +899,7 @@ sub on_public { $v++; # don't allow ppl to cheat the stats :-) - if (defined $t && $time - $t > 60) { + if (defined $t && $time - $t > 60) { &sqlReplace("stats", { nick => $who, type => $x, diff --git a/src/IRC/Schedulers.pl b/src/IRC/Schedulers.pl index 56b9438..bf254ba 100644 --- a/src/IRC/Schedulers.pl +++ b/src/IRC/Schedulers.pl @@ -1012,7 +1012,7 @@ sub factoidCheck { my $time = time(); foreach (@list) { - my $age = &getFactInfo($_, "modified_time"); + my $age = &getFactInfo($_, "modified_time"); if (!defined $age or $age !~ /^\d+$/) { if (scalar @list > 50) { diff --git a/src/Misc.pl b/src/Misc.pl index 76f11eb..3163bb3 100644 --- a/src/Misc.pl +++ b/src/Misc.pl @@ -96,7 +96,7 @@ sub timeget { } else { # the real thing. return [gettimeofday()]; } -} +} sub timedelta { my($start_time) = shift; diff --git a/src/Modules/Countdown.pl b/src/Modules/Countdown.pl index 5a11948..a5e9edf 100644 --- a/src/Modules/Countdown.pl +++ b/src/Modules/Countdown.pl @@ -50,7 +50,7 @@ sub Countdown { $monname = (&sqlRawReturn("SELECT MONTHNAME('$sqldate')"))[0]; } elsif ($param{'DBType'} =~ /^pgsql$/i) { - $to_days = (&sqlRawReturn("SELECT date_trunc('day', + $to_days = (&sqlRawReturn("SELECT date_trunc('day', 'now'::timestamp - '$sqldate')"))[0]; $dayname = qw(Sun Mon Tue Wed Thu Fri Sat)[(&sqlRawReturn("SELECT extract(dow from timestamp '$sqldate')"))[0]]; $monname = qw(BAD Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec)[(&sqlRawReturn("SELECT extract(month from timestamp '$sqldate')"))[0]]; diff --git a/src/Modules/Exchange.pl b/src/Modules/Exchange.pl index d20cea0..ae8470f 100644 --- a/src/Modules/Exchange.pl +++ b/src/Modules/Exchange.pl @@ -277,7 +277,7 @@ sub exchange { my ($message) = @_; &::DEBUG("exchange(@_)"); - return "Exchange.pl needs LWP::UserAgent and HTTP::Request::Common" + return "Exchange.pl needs LWP::UserAgent and HTTP::Request::Common" if ($no_exchange); my ($From, $To, $Amount, $Country); @@ -293,8 +293,9 @@ sub exchange { } my $ua = new LWP::UserAgent; - #$ua->agent("Mozilla/5.0 " . $ua->agent); # Let's pretend - $ua->agent("Mozilla/5.0"); # Let's pretend + # Let's pretend + #$ua->agent("Mozilla/5.0 " . $ua->agent); + $ua->agent("Mozilla/5.0"); $ua->proxy('http', $::param{'httpProxy'}) if (&::IsParam("httpProxy")); $ua->timeout(10); @@ -316,7 +317,7 @@ sub exchange { if ($Country) { # Country lookup - # crysflame++ for the space fix. + # crysflame++ for the space fix. $retval = ''; foreach my $Found (grep /$Country/i, keys %CurrLookup){ $Found =~ s/,/ uses/g; @@ -355,9 +356,11 @@ sub exchange { # Falsify where we came from $req->referer($Referer); - my $res = $ua->request($req); # Submit request + # Submit request + my $res = $ua->request($req); - if ($res->is_success) { # Went through ok + if ($res->is_success) { + # Went through ok my $html = $res->as_string; # parse each one to avoid undefined warnings my ($When) = ($html =~ m/ as of (\d{4}\.\d\d.\d\d\s\d\d:\d\d:\d\d\s\S+)/gi); @@ -372,7 +375,8 @@ sub exchange { } else { return "i got some error trying that"; } - } else { # Oh dear. + } else { + # Oh dear. return "EXCHANGE: ". $res->status_line; } } else { diff --git a/src/Modules/Factoids.pl b/src/Modules/Factoids.pl index ef80889..438471f 100644 --- a/src/Modules/Factoids.pl +++ b/src/Modules/Factoids.pl @@ -172,7 +172,7 @@ sub CmdFactStats { return &formListReply(0, $prefix, @list); } elsif ($type =~ /^vandalism$/i) { - &status("factstats(vandalism): starting..."); + &status("factstats(vandalism): starting..."); my $start_time = &timeget(); my %data = &sqlSelectColHash("factoids", "factoid_key,factoid_value", undef, @@ -181,7 +181,7 @@ sub CmdFactStats { my @list; my $delta_time = &timedelta($start_time); - &status(sprintf("factstats(vandalism): %.02f sec to retreive all factoids.", $delta_time)) if ($delta_time > 0); + &status(sprintf("factstats(vandalism): %.02f sec to retreive all factoids.", $delta_time)) if ($delta_time > 0); $start_time = &timeget(); # parse the factoids. @@ -193,7 +193,7 @@ sub CmdFactStats { } $delta_time = &timedelta($start_time); - &status(sprintf("factstats(vandalism): %.02f sec to complete.", $delta_time)) if ($delta_time > 0); + &status(sprintf("factstats(vandalism): %.02f sec to complete.", $delta_time)) if ($delta_time > 0); # bail out on no results. if (scalar @list == 0) { @@ -205,7 +205,7 @@ sub CmdFactStats { return &formListReply(1, $prefix, @list); } elsif ($type =~ /^total$/i) { - &status("factstats(total): starting..."); + &status("factstats(total): starting..."); my $start_time = &timeget(); my @list; my $str; @@ -257,7 +257,7 @@ sub CmdFactStats { ### end of "job". my $delta_time = &timedelta($start_time); - &status(sprintf("factstats(broken): %.02f sec to retreive all factoids.", $delta_time)) if ($delta_time > 0); + &status(sprintf("factstats(broken): %.02f sec to retreive all factoids.", $delta_time)) if ($delta_time > 0); $start_time = &timeget(); # bail out on no results. @@ -303,9 +303,9 @@ sub CmdFactStats { return &formListReply(1, $prefix, @newlist); } elsif ($type =~ /^dup(licate|e)$/i) { - &status("factstats(dupe): starting..."); + &status("factstats(dupe): starting..."); my $start_time = &timeget(); - my %hash = &sqlSelectColHash("factoids", + my %hash = &sqlSelectColHash("factoids", "factoid_key,factoid_value", undef, "WHERE factoid_value IS NOT NULL", 1 ); @@ -339,7 +339,7 @@ sub CmdFactStats { &status("factstats(dupe): (good) dupe refs: $refs."); my $delta_time = &timedelta($start_time); - &status(sprintf("factstats(dupe): %.02f sec to complete", $delta_time)) if ($delta_time > 0); + &status(sprintf("factstats(dupe): %.02f sec to complete", $delta_time)) if ($delta_time > 0); # bail out on no results. if (scalar @list == 0) { @@ -424,7 +424,7 @@ sub CmdFactStats { return &formListReply(1, $prefix, @list); } elsif ($type =~ /^locked$/i) { - my %hash = &sqlSelectColhash("factoids", + my %hash = &sqlSelectColhash("factoids", "factoid_key,locked_by", undef, "WHERE locked_by IS NOT NULL" ); @@ -507,7 +507,7 @@ sub CmdFactStats { } my $delta_time = sprintf("%.02fs", &timedelta($start_time) ); - &status("factstats(partdupe): $delta_time sec to complete.") if ($delta_time > 0); + &status("factstats(partdupe): $delta_time sec to complete.") if ($delta_time > 0); # bail out on no results. if (scalar @list == 0) { diff --git a/src/Modules/HTTPDtype.pl b/src/Modules/HTTPDtype.pl index 3494846..b65cc75 100644 --- a/src/Modules/HTTPDtype.pl +++ b/src/Modules/HTTPDtype.pl @@ -16,15 +16,15 @@ sub HTTPDtype { return unless &::loadPerlModule("Net::HTTP::NB"); return unless &::loadPerlModule("IO::Select"); - my $s = Net::HTTP::NB->new(Host => $HOST) || return; - $s->write_request(HEAD => "/"); + my $s = Net::HTTP::NB->new(Host => $HOST) || return; + $s->write_request(HEAD => "/"); - my $sel = IO::Select->new($s); - $line = "Header timeout" unless $sel->can_read(10); - ($code, $mess, %h) = $s->read_response_headers; + my $sel = IO::Select->new($s); + $line = "Header timeout" unless $sel->can_read(10); + ($code, $mess, %h) = $s->read_response_headers; - $line = (length($h{Server}) > 0) ? $h{Server} : - "Couldn't fetch headers from $HOST"; + $line = (length($h{Server}) > 0) ? $h{Server} : + "Couldn't fetch headers from $HOST"; &::pSReply($line||"Unknown Error Condition"); diff --git a/src/Modules/News.pl b/src/Modules/News.pl index 2afb80a..caee5f1 100644 --- a/src/Modules/News.pl +++ b/src/Modules/News.pl @@ -542,7 +542,7 @@ sub mod { if ($flags eq "") { $done++ if (!$done and $mod_news =~ s/\Q$op\E/$np/); $done++ if (!$done and $mod_nnews =~ s/\Q$op\E/$np/); - } elsif ($flags eq "g") { + } elsif ($flags eq "g") { $done++ if ($mod_news =~ s/\Q$op\E/$np/g); $done++ if ($mod_nnews =~ s/\Q$op\E/$np/g); } @@ -799,7 +799,7 @@ sub latest { if (!$flag) { return unless ($unread); - # just a temporary measure not to flood ourself off the + # just a temporary measure not to flood ourself off the # network with news until we get global notice() and msg() # throttling. if (time() - ($::cache{newsTime} || 0) < 5) { @@ -831,7 +831,7 @@ sub latest { $i = &newsS2N($_); $sorted[$i] = $_; } - + for ($i=0; $i<=scalar(@sorted); $i++) { my $news = $sorted[$i]; next unless (defined $news); diff --git a/src/Modules/Quote.pl b/src/Modules/Quote.pl index 39e1521..147c230 100644 --- a/src/Modules/Quote.pl +++ b/src/Modules/Quote.pl @@ -36,8 +36,8 @@ sub Quote { my ($ticker, $recent, $date, $time, $change, $open, $high, $low, $volume) = split(',',$result); - # add some commas - # "+ 0" removes trailing cr/lf/etc. + # add some commas + # "+ 0" removes trailing cr/lf/etc. my $newvol = commify($volume + 0); $reply .= ' ;; ' if $reply; diff --git a/src/Modules/Units.pl b/src/Modules/Units.pl index bb973f7..ff16e7e 100644 --- a/src/Modules/Units.pl +++ b/src/Modules/Units.pl @@ -1,6 +1,6 @@ # Units.pl: convert units of measurement # Author: M-J. Dominus (mjd-perl-units-id-iut+buobvys+@plover.com) -# License: GPL, Copyright (C) 1996,1999 +# License: GPL, Copyright (C) 1996,1999 # NOTE: Integrated into blootbot by xk. package Units; @@ -122,7 +122,7 @@ sub convertUnits { } else { &::performStrictReply("$from cannot be correctly converted to $to."); -# print +# print # "conformability (Not the same dimension)\n", # "\t", $from, " is ", text_unit($hu), "\n", # "\t", $to, " is ", text_unit($wu), "\n", @@ -149,7 +149,7 @@ sub read_defs { print ">>> $_\n" if $DEBUG_d; my $r = definition_line($_); unless (defined $r) { - warn "Error in line $. of $file: $PARSE_ERROR. Skipping.\n"; + warn "Error in line $. of $file: $PARSE_ERROR. Skipping.\n"; } } print STDERR "Loaded file `$file'.\n" if $show_file_loading; @@ -302,7 +302,7 @@ sub text_unit { $text .= " $d"; $text .= "^$e" if $e > 1; } - + $text; } ################################################################ @@ -313,7 +313,7 @@ sub text_unit { BEGIN { sub sh { ['shift', $_[0]] }; sub go { ['goto', $_[0]] }; - @actions = + @actions = ( # Initial state {PREFIX => sh(1), @@ -355,7 +355,7 @@ BEGIN { DIVIDE => sh(12), _ => ['reduce', 1, 'topunit'], }, - # State 8: unit -> constant . unit + # State 8: unit -> constant . unit # unit -> constant . {PREFIX => sh(1), NUMBER => sh(2), # Shift-reduce conflict resolved in favor of shift @@ -389,7 +389,7 @@ BEGIN { }, # State 11: unit -> unit TIMES . unit {PREFIX => sh(1), - NUMBER => sh(2), + NUMBER => sh(2), NAME => sh(3), FUNDAMENTAL => sh(4), FRACTION => sh(5), @@ -399,7 +399,7 @@ BEGIN { }, # State 12: unit -> unit DIVIDE . unit {PREFIX => sh(1), - NUMBER => sh(2), + NUMBER => sh(2), NAME => sh(3), FUNDAMENTAL => sh(4), FRACTION => sh(5), @@ -409,7 +409,7 @@ BEGIN { }, # State 13: unit -> unit . TIMES unit # unit -> unit . DIVIDE unit - # unit -> constant unit . + # unit -> constant unit . # unit -> unit . NUMBER {NUMBER => sh(10), # Shift-reduce conflict resolved in favor of shift TIMES => sh(11), # Shift-reduce conflict resolved in favor of shift @@ -419,16 +419,16 @@ BEGIN { # State 14: unit => '(' unit ')' . { _ => ['reduce', 3, 'unit', sub {$_[1]}] }, # State 15: unit -> unit . TIMES unit - # unit -> unit TIMES unit . + # unit -> unit TIMES unit . # unit -> unit . DIVIDE unit - # unit -> unit . NUMBER + # unit -> unit . NUMBER {NUMBER => sh(10), # Shift-reduce conflict resolved in favor of shift _ => ['reduce', 3, 'unit', sub {unit_multiply($_[0], $_[2])}], }, # State 16: unit -> unit . TIMES unit - # unit -> unit DIVIDE unit . - # unit -> unit . DIVIDE unit - # unit -> unit . NUMBER + # unit -> unit DIVIDE unit . + # unit -> unit . DIVIDE unit + # unit -> unit . NUMBER {NUMBER => sh(10), # Shift-reduce conflict resolved in favor of shift _ => ['reduce', 3, 'unit', sub{unit_divide($_[2], $_[0])}], }, @@ -463,7 +463,7 @@ sub parse_unit { $PARSE_ERROR = 'Syntax error'; return Zero; } - + my ($primary, @actargs) = @$action; print STDERR " $primary (@actargs)\n" if $DEBUG_p; if ($primary eq 'accept') { @@ -489,7 +489,7 @@ sub parse_unit { push @state_st, $STATE; # $STATE = $state_st[-1]; print STDERR "Post-reduction state is $STATE.\n" if $DEBUG_p; - + # Now look for `goto' actions my $goto = $actions[$STATE]{$result_type}; unless ($goto && $goto->[0] eq 'goto') { @@ -509,16 +509,16 @@ sub parse_unit { sub lex { my ($s) = @_; my @t = split /( - \*{3} # Special `new unit' symbol - | [()*-] # Symbol - | \s*(?:\/|\bper\b)\s* # Division - | \d*\.\d+(?:[eE]-?\d+)? # Decimal number - | \d+\|\d+ # Fraction - | \d+ # Integer -# | (?:$PREF)-? # Prefix (handle differently) + \*{3} # Special `new unit' symbol + | [()*-] # Symbol + | \s*(?:\/|\bper\b)\s* # Division + | \d*\.\d+(?:[eE]-?\d+)? # Decimal number + | \d+\|\d+ # Fraction + | \d+ # Integer +# | (?:$PREF)-? # Prefix (handle differently) | [A-Za-z_][A-Za-z_.]* # identifier - | \s+ # White space - )/ox, $s; + | \s+ # White space + )/ox, $s; @t = grep {$_ ne ''} @t; # Discard empty and all-white tokens \@t; } diff --git a/src/Modules/Weather.pl b/src/Modules/Weather.pl index 1b3bade..bf1c05e 100644 --- a/src/Modules/Weather.pl +++ b/src/Modules/Weather.pl @@ -48,7 +48,7 @@ sub queryText { $ua->timeout(10); my $request = new HTTP::Request('GET', "http://weather.noaa.gov/weather/current/$station.html"); - my $response = $ua->request($request); + my $response = $ua->request($request); if (!$response->is_success) { if ($response->code == 404) { diff --git a/src/Modules/babel.pl b/src/Modules/babel.pl index 720f4b0..56dc427 100644 --- a/src/Modules/babel.pl +++ b/src/Modules/babel.pl @@ -27,23 +27,23 @@ BEGIN { # expects. use vars qw!%lang_code $lang_regex!; %lang_code = ( - 'fr' => 'fr', - 'sp' => 'es', - 'es' => 'es', - 'po' => 'pt', - 'pt' => 'pt', - 'it' => 'it', - 'ge' => 'de', - 'de' => 'de', - 'gr' => 'de', - 'en' => 'en', - 'zh' => 'zh', - 'ja' => 'ja', - 'jp' => 'ja', - 'ko' => 'ko', - 'kr' => 'ko', - 'ru' => 'ru' - ); + 'fr' => 'fr', + 'sp' => 'es', + 'es' => 'es', + 'po' => 'pt', + 'pt' => 'pt', + 'it' => 'it', + 'ge' => 'de', + 'de' => 'de', + 'gr' => 'de', + 'en' => 'en', + 'zh' => 'zh', + 'ja' => 'ja', + 'jp' => 'ja', + 'ko' => 'ko', + 'kr' => 'ko', + 'ru' => 'ru' + ); # Here's how we recognize the language you're asking for. It looks # like RTSL saves you a few keystrokes in #perl, huh? @@ -60,7 +60,8 @@ sub babelfish { my $ua = new LWP::UserAgent; $ua->proxy('http', $::param{'httpProxy'}) if (&::IsParam("httpProxy")); - $ua->agent("Mozilla/4.5 " . $ua->agent); # Let's pretend + # Let's pretend + $ua->agent("Mozilla/4.5 " . $ua->agent); $ua->timeout(5); my $req = @@ -115,11 +116,11 @@ sub translate { if (0) { if (-t STDIN) { - #my $result = babel::babelfish('en','sp','hello world'); - #my $result = babel::babelfish('en','sp','The cheese is old and moldy, where is the bathroom?'); - my $result = babel::babelfish('en','gr','doesn\'t seem to translate things longer than 40 characters'); - $result =~ s/; /\n/g; - print "Babelfish says: \"$result\"\n"; + #my $result = babel::babelfish('en','sp','hello world'); + #my $result = babel::babelfish('en','sp','The cheese is old and moldy, where is the bathroom?'); + my $result = babel::babelfish('en','gr','doesn\'t seem to translate things longer than 40 characters'); + $result =~ s/; /\n/g; + print "Babelfish says: \"$result\"\n"; } } diff --git a/src/Modules/insult.pl b/src/Modules/insult.pl index be37b91..79b85e9 100644 --- a/src/Modules/insult.pl +++ b/src/Modules/insult.pl @@ -18,7 +18,7 @@ sub Insult { $line = "No luck, $::who" unless (defined $line); - if ($insultwho ne $::who) { + if ($insultwho ne $::who) { $line =~ s/^\s*You are/$insultwho is/i; } diff --git a/src/Modules/zfi.pl b/src/Modules/zfi.pl index fd689d9..d63e176 100644 --- a/src/Modules/zfi.pl +++ b/src/Modules/zfi.pl @@ -57,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."; diff --git a/src/Modules/zsi.pl b/src/Modules/zsi.pl index faf2742..0347a02 100644 --- a/src/Modules/zsi.pl +++ b/src/Modules/zsi.pl @@ -57,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 ZSI web server. Try again later."; diff --git a/src/Shm.pl b/src/Shm.pl index 0c3116b..efdfced 100644 --- a/src/Shm.pl +++ b/src/Shm.pl @@ -235,7 +235,8 @@ sub shmFlush { my $time; my $shmmsg = &shmRead($shm); - $shmmsg =~ s/\0//g; # remove padded \0's. + # remove padded \0's. + $shmmsg =~ s/\0//g; return if (length($shmmsg) == 0); if ($shmmsg =~ s/^(\S+):(\d+):(\d+): //) { my $n = $1; diff --git a/src/UserExtra.pl b/src/UserExtra.pl index cc67265..ada60ce 100644 --- a/src/UserExtra.pl +++ b/src/UserExtra.pl @@ -225,7 +225,7 @@ sub factstats { sub karma { my $target = lc( shift || $who ); my $karma = &sqlSelect("stats", "counter", - { nick => $target, type => "karma" }) || 0; + { nick => $target, type => "karma" }) || 0; if ($karma != 0) { &pSReply("$target has karma of $karma"); @@ -330,7 +330,7 @@ sub tell { $target = $talkchannel if ($target =~ /^us$/i); $target = $who if ($target =~ /^(me|myself)$/i); - &status("tell: target = $target, query = $query"); + &status("tell: target = $target, query = $query"); # "intrusive". # if ($target !~ /^$mask{chan}$/ and !&IsNickInAnyChan($target)) { @@ -416,7 +416,7 @@ sub DNS { $result = $match." is ".$x unless ($x =~ /^\s*$/); } else { $result = "I can't seem to find that address in DNS"; - } + } } else { diff --git a/src/core.pl b/src/core.pl index 9aef5f6..802e4c2 100644 --- a/src/core.pl +++ b/src/core.pl @@ -31,7 +31,7 @@ use vars qw(@joinchan @ircServers @wingateBad @wingateNow @wingateCache ); ### hash. MUST BE REDUCED IN SIZE!!! -# +# use vars qw(%count %netsplit %netsplitservers %flood %dcc %orig %nuh %talkWho %seen %floodwarn %param %dbh %ircPort %topic %moduleAge %last %time %mask %file @@ -225,7 +225,7 @@ sub IsChanConf { return 0; } - # should we use IsParam() externally where needed or hack it in + # should we use IsParam() externally where needed or hack it in # here just in case? fix it later. if (&IsParam($param)) { &DEBUG("ICC: found '$param' option in main config file."); @@ -308,7 +308,7 @@ sub getChanConf { return 0; } - # this looks evil... + # this looks evil... if (0 and !defined $chan) { &DEBUG("gCC: ok !chan... doing _default instead."); } diff --git a/src/dbi.pl b/src/dbi.pl index 75464a1..5071404 100644 --- a/src/dbi.pl +++ b/src/dbi.pl @@ -558,7 +558,7 @@ sub searchTable { $str =~ s/\*/%/g; # end of string fix. - my $query = "SELECT $select FROM $table WHERE $key LIKE ". + my $query = "SELECT $select FROM $table WHERE $key LIKE ". &sqlQuote($str); my $sth = $dbh->prepare($query); diff --git a/src/modules.pl b/src/modules.pl index 05d22f3..7de063a 100644 --- a/src/modules.pl +++ b/src/modules.pl @@ -158,7 +158,7 @@ sub loadIRCModules { &ERROR("require \"$mod\" => $@"); &shutdown(); exit 1; - } + } $moduleAge{$mod} = (stat $mod)[9]; &showProc(" ($_)") if (&IsParam("DEBUG")); @@ -204,7 +204,7 @@ sub reloadAllModules { # obscure usage of map and regex :) foreach (map { s/.*?\/?src/src/; $_ } keys %moduleAge) { - $retval .= &reloadModule($_); + $retval .= &reloadModule($_); } &VERB("Module: reloading done.",2); @@ -304,7 +304,7 @@ sub loadMyModule { my ($tmp) = @_; if (!defined $tmp) { &WARN("loadMyModule: module is NULL."); - return 0; + return 0; } my ($modulename, $modulebase); @@ -388,8 +388,8 @@ sub getPerlFiles { my($dir) = @_; if (!opendir(DIR, $dir)) { - &ERROR("Cannot open source directory ($dir): $!"); - exit 1; + &ERROR("Cannot open source directory ($dir): $!"); + exit 1; } my @mods; -- 2.39.2