- added top3 irctextcounter stats

- fixed first-time-user passwd
- set $chan to "_default" in IsChanConf if undefined.
- modified dbGetCol to new style $select/$where args.
- &status() now deals with multiple lines input properly
- dcc close now works as it seems, enabled it
- run chanServCheck and chanLimitVerify in hookMode if we're opped
  straight away
- prevent guest/_default users from DCC CHAT
- added "factstats reqrate"
- typos, DEBUG/WARN -> VERB(,2), tiny things that don't need mentioning

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

diff --git a/src/CommandStubs.pl b/src/CommandStubs.pl
index addcb05ba398b7b642f8fd77b0dee9ee2e566e90..bfcc42e43bba2818af22268f89c67f68c5353275 100644 (file)
--- a/src/CommandStubs.pl
+++ b/src/CommandStubs.pl
@@ -282,10 +282,26 @@ sub Modules {
            my $arg     = $3;
 
            if (!defined $arg or $arg =~ /^\s*$/) {
+               # this is fucking ugly but it works :-)
                my $x = (&dbRawReturn("SELECT SUM(counter) FROM stats WHERE type=".&dbQuote($type) ))[0];
+               my %hash = &dbGetCol("stats", "nick,counter", "type=".&dbQuote($type).
+                       " ORDER BY nick DESC LIMIT 3", 1);
+               my $i;
+               my @top;
+               # unfortunately we have to sort it again!
+               # todo: make dbGetCol return hash and array? too much effort.
+               foreach $i (sort { $b <=> $a } keys %hash) {
+                   foreach (keys %{ $hash{$i} }) {
+                       push(@top, "$_ - $i");
+                   }
+               }
+               my $topstr = "";
+               if (scalar @top) {
+                   $topstr = ".  Top ".scalar(@top).": ".join(', ', @top);
+               }
 
                if (defined $x) {
-                   &pSReply("total count of '$type': $x");
+                   &pSReply("total count of '$type': $x$topstr");
                } else {
                    &pSReply("zero counter for '$type'.");
                }

diff --git a/src/DynaConfig.pl b/src/DynaConfig.pl
index e1acb4d3e3e46e351a344bf77d3a43751c5b5312..9fa01ddd57fe6ca88eb9ad7a21c1a081c28b4600 100644 (file)
--- a/src/DynaConfig.pl
+++ b/src/DynaConfig.pl
@@ -15,6 +15,11 @@ if (&IsParam("useStrict")) { use strict; }
 sub readUserFile {
     my $f = "$bot_misc_dir/blootbot.users";
 
+    if (! -f $f) {
+       &DEBUG("userfile not found; new fresh run detected.");
+       return;
+    }
+
     if ( -f $f and -f "$f~") {
        my $s1 = -s $f;
        my $s2 = -s "$f~";

diff --git a/src/IRC/Irc.pl b/src/IRC/Irc.pl
index 18ae6ef6225e443263c2541e93d3c6d9c5314b56..48a077df741eb978305ee584f8dd52bf5c9d762e 100644 (file)
--- a/src/IRC/Irc.pl
+++ b/src/IRC/Irc.pl
@@ -349,7 +349,7 @@ sub performReply {
        &msg($who, $reply);
     } elsif ($msgType eq 'chat') {
        if (!exists $dcc{'CHAT'}{$who}) {
-           &WARN("pSR: dcc{'CHAT'}{$who} does not exist.");
+           &VERB("pSR: dcc{'CHAT'}{$who} does not exist.",2);
            return;
        }
        $conn->privmsg($dcc{'CHAT'}{$who}, $reply);
@@ -379,17 +379,23 @@ sub performStrictReply {
     } elsif ($msgType eq 'public') {
        &say($reply);
     } elsif ($msgType eq 'chat') {
-       &dccsay(lc $who,$reply);
+       &dccsay(lc $who, $reply);
     } else {
        &ERROR("pSR: msgType invalid? ($msgType).");
     }
 }
 
 sub dccsay {
-    my ($who, $reply) = @_;
+    my($who, $reply) = @_;
+
+    if (!defined $reply or $reply =~ /^\s*$/) {
+       &WARN("dccsay: reply == NULL.");
+       return;
+    }
+
     if (!exists $dcc{'CHAT'}{$who}) {
-       &WARN("pSR: dcc{'CHAT'}{$who} does not exist.");
-       return '';
+       &VERB("pSR: dcc{'CHAT'}{$who} does not exist. (2)",2);
+       return;
     }
 
     &status("=>$who<= $reply");                # dcc chat.
@@ -405,6 +411,7 @@ sub dcc_close {
        my @who = grep /^\Q$who\E$/i, keys %{ $dcc{$type} };
        next unless (scalar @who);
        $who = $who[0];
+       &DEBUG("dcc_close... close $who!");
     }
 }
 
@@ -776,21 +783,23 @@ sub getJoinChans {
 }
 
 sub closeDCC {
-###    &DEBUG("closeDCC called.");
+#    &DEBUG("closeDCC called.");
 
     foreach $type (keys %dcc) {
        next if ($type ne uc($type));
  
        foreach $nick (keys %{ $dcc{$type} }) {
            next unless (defined $nick);
-           &DEBUG("closing DCC $type to $nick (FIXME).");
+           &status("DCC CHAT: closing DCC $type to $nick.");
            next unless (defined $dcc{$type}{$nick});
 
            my $ref = $dcc{$type}{$nick};
-           &DEBUG("ref => $ref");
-
-#          $dcc{$type}{$nick}->close();
+           &dccsay($nick, "bye bye, $nick") if ($type =~ /^chat$/i);
+           $dcc{$type}{$nick}->close();
+           delete $dcc{$type}{$nick};
+           &DEBUG("after close for $nick");
        }
+       delete $dcc{$type};
     }
 }
 

diff --git a/src/IRC/IrcHelpers.pl b/src/IRC/IrcHelpers.pl
index a157462d43a8e71644850e1b4e5c77fbdca897e0..40a3e18976dfc7c65c26dc84d0927c1197f1482c 100644 (file)
--- a/src/IRC/IrcHelpers.pl
+++ b/src/IRC/IrcHelpers.pl
@@ -45,13 +45,18 @@ sub hookMode {
 
            # modes w/ target affecting nick => cache it.
            if ($mode =~ /[bov]/) {
-               if ($mode eq "o" and $nick eq "ChanServ" and $target =~ /^\Q$ident\E$/i) {
-                   &VERB("hookmode: chanserv deopped us! asking",2);
-                   &chanServCheck($chan);
-               }
-
                $channels{$chan}{$mode}{$target}++      if  $parity;
                delete $channels{$chan}{$mode}{$target} if !$parity;
+
+               # lets do some custom stuff.
+               if ($mode eq "o" and $parity) {
+                   if ($nick eq "ChanServ" and $target =~ /^\Q$ident\E$/i) {
+                       &VERB("hookmode: chanserv deopped us! asking",2);
+                       &chanServCheck($chan);
+                   }
+
+                   &chanLimitVerify($chan);
+               }
            }
 
            if ($mode =~ /[l]/) {
@@ -257,46 +262,53 @@ sub hookMsg {
     return;
 }
 
+# this is basically run on on_join or on_quit
 sub chanLimitVerify {
-    my($chan)  = @_;
+    my($c)     = @_;
+    $chan      = $c;
     my $l      = $channels{$chan}{'l'};
 
-    &DEBUG("cLV: netsplitservers: ".scalar(keys %netsplitservers) );
-    &DEBUG("cLV: netsplit: ".scalar(keys %netsplit) );
+    return unless (&IsChanConf("chanlimitcheck"));
 
     if (scalar keys %netsplit) {
-       &WARN("clV: netsplit active (1); skipping.");
+       &WARN("clV: netsplit active (1, chan = $chan); skipping.");
+       return;
+    }
+
+    if (!defined $l) {
+       &DEBUG("running chanlimitCheck from chanLimitVerify; FIXME! (chan = $chan)");
+       &chanlimitCheck();
        return;
     }
 
     # only change it if it's not set.
-    if (defined $l and &IsChanConf("chanlimitcheck")) {
-       my $plus  = &getChanConfDefault("chanlimitcheckPlus", 5, $chan);
-       my $count = scalar(keys %{ $channels{$chan}{''} });
-       my $int   = &getChanConfDefault("chanlimitcheckInterval", 10, $chan);
+    my $plus  = &getChanConfDefault("chanlimitcheckPlus", 5, $chan);
+    my $count = scalar(keys %{ $channels{$chan}{''} });
+    my $int   = &getChanConfDefault("chanlimitcheckInterval", 10, $chan);
 
-       my $delta = $count + $plus - $l;
-       $delta    =~ s/^\-//;
+    my $delta = $count + $plus - $l;
+#   $delta    =~ s/^\-//;
 
-       if ($plus <= 3) {
-           &WARN("clc: stupid to have plus at $plus, fix it!");
-       }
+    if ($plus <= 3) {
+       &WARN("clc: stupid to have plus at $plus, fix it!");
+    }
 
-       if (exists $cache{chanlimitChange}{$chan}) {
-           if (time() - $cache{chanlimitChange}{$chan} < $int*60) {
-               return;
-           }
+    if (exists $cache{chanlimitChange}{$chan}) {
+       if (time() - $cache{chanlimitChange}{$chan} < $int*60) {
+           return;
        }
+    }
 
-       &chanServCheck($chan);
+    &chanServCheck($chan);
 
-       ### todo: unify code with chanlimitcheck()
-       if ($delta > 5) {
-           &status("clc: big change in limit; going for it.");
-           &rawout("MODE $chan +l ".($count+$plus) );
-           $cache{chanlimitChange}{$chan} = time();
-       }
-    }
+    ### todo: unify code with chanlimitcheck()
+    return if ($delta > 5);
+
+    &status("clc: big change in limit for $chan ($delta);".
+               "going for it. (was: $l; now: ".($count+$plus).")");
+
+    &rawout("MODE $chan +l ".($count+$plus) );
+    $cache{chanlimitChange}{$chan} = time();
 }
 
 sub chanServCheck {

diff --git a/src/IRC/IrcHooks.pl b/src/IRC/IrcHooks.pl
index ff75f369b984ece5b1b5decfe887c114828d9ee4..d7277de99e0a65ced51c6fcf915e92b49b3e3483 100644 (file)
--- a/src/IRC/IrcHooks.pl
+++ b/src/IRC/IrcHooks.pl
@@ -63,6 +63,11 @@ sub on_chat {
        my $crypto      = $users{$userHandle}{PASS};
        my $success     = 0;
 
+       if ($userHandle eq "_default") {
+           &WARN("DCC CHAT: _default/guest not allowed.");
+           return;
+       }
+
        ### TODO: prevent users without CRYPT chatting.
        if (!defined $crypto) {
            &DEBUG("todo: dcc close chat");
@@ -139,13 +144,15 @@ sub on_endofmotd {
 
     # first time run.
     if (!exists $users{_default}) {
-       &status("First time run... adding _default user.");
+       &status("!!! First time run... adding _default user.");
        $users{_default}{FLAGS} = "mrt";
-       $users{_default}{HOSTS} = "*!*@*";
+       $users{_default}{HOSTS}{"*!*@*"} = 1;
     }
 
     if (scalar keys %users < 2) {
-       &status("Ok... now /msg $ident PASS <pass> to get master access through DCC CHAT.");
+       &status("!"x40);
+       &status("!!! Ok.  Now type '/msg $ident PASS <pass>' to get master access through DCC CHAT.");
+       &status("!"x40);
     }
     # end of first time run.
 
@@ -227,9 +234,11 @@ sub on_dcc {
     } elsif ($type eq 'GET') { # SEND for us?
        &status("DCC: Initializing SEND for $nick.");
        $self->new_send($event->args);
+
     } elsif ($type eq 'CHAT') {
        &status("DCC: Initializing CHAT for $nick.");
        $self->new_chat($event);
+
     } else {
        &WARN("${b_green}DCC $type$ob (1)");
     }
@@ -294,7 +303,6 @@ sub on_dcc_open {
 
     } else {
        &WARN("${b_green}DCC $type$ob (3)");
-
     }
 }
 
@@ -314,17 +322,25 @@ sub on_dcc_open_chat {
 
     if (!exists $users{$userHandle}{HOSTS}) {
        &pSReply("you have no hosts defined in my user file; rejecting.");
-       ### TODO: $sock->close();
+       $sock->close();
        return;
     }
 
     my $crypto = $users{$userHandle}{PASS};
     $dcc{'CHAT'}{$nick} = $sock;
 
+    # todo: don't make DCC CHAT established in the first place.
+    if ($userHandle eq "_default") {
+       &dccsay($nick, "_default/guest not allowed");
+       $sock->close();
+       return;
+    }
+
     if (defined $crypto) {
+       &status("DCC CHAT: going to use ".$nick."'s crypt.");
        &dccsay($nick,"Enter your password.");
     } else {
-       &dccsay($nick,"Welcome to blootbot DCC CHAT interface, $userHandle.");
+#      &dccsay($nick,"Welcome to blootbot DCC CHAT interface, $userHandle.");
     }
 }
 

diff --git a/src/IRC/Schedulers.pl b/src/IRC/Schedulers.pl
index 9b9150705a4b1bb9d2e094ef4360caf15d3319cf..5775ab342cb6226391c693607ba82728fc37512f 100644 (file)
--- a/src/IRC/Schedulers.pl
+++ b/src/IRC/Schedulers.pl
@@ -399,13 +399,13 @@ sub chanlimitCheck {
        delete $cache{warn}{chanlimit}{$chan};
 
        if (!defined $limit) {
-           &status("ChanLimit: setting for first time or from netsplit, for $chan");
+           &status("chanLimit: setting for first time or from netsplit, for $chan");
        }
 
        if (exists $cache{chanlimitChange}{$chan}) {
            my $delta = time() - $cache{chanlimitChange}{$chan};
            if ($delta < $interval*60) {
-               &DEBUG("not going to change chanlimit! ($delta<$interval*60)");
+               &DEBUG("chanLimit: not going to change chanlimit! ($delta<$interval*60)");
                return;
            }
        }
@@ -427,16 +427,18 @@ sub netsplitCheck {
     &DEBUG("running netsplitCheck... $cache{netsplitCache}");
 
     if (!scalar %netsplit and scalar %netsplitservers) {
-       &DEBUG("nsc: FIRST!!! ok hash netsplit is NULL; purging hash netsplitservers");
+       &DEBUG("nsC: !hash netsplit but hash netsplitservers <- removing!");
        undef %netsplitservers;
+       return;
     }
 
+    # well... this shouldn't happen since %netsplit code does it anyway.
     foreach $s1 (keys %netsplitservers) {
 
        foreach $s2 (keys %{ $netsplitservers{$s1} }) {
            my $delta = time() - $netsplitservers{$s1}{$s2};
 
-           if ($delta > 3600) {
+           if ($delta > 60*30) {
                &status("netsplit between $s1 and $s2 appears to be stale.");
                delete $netsplitservers{$s1}{$s2};
                &chanlimitCheck();
@@ -449,29 +451,28 @@ sub netsplitCheck {
 
     # %netsplit hash checker.
     my $count  = scalar keys %netsplit;
-    my(@delete);
+    my $delete = 0;
     foreach (keys %netsplit) {
-       if (&IsNickInAnyChan($_)) {
-           &DEBUG("netsplitC: $_ is in some chan; removing from netsplit list.");
+       if (&IsNickInAnyChan($_)) {     # why would this happen?
+#          &DEBUG("nsC: $_ is in some chan; removing from netsplit list.");
            delete $netsplit{$_};
+           $delete++;
            next;
        }
-       # todo: change time value?
-       next unless (time() - $netsplit{$_} > 60*30);
 
-       push(@delete, $_);
+       next unless (time() - $netsplit{$_} > 60*15);
+
+       $delete++;
        delete $netsplit{$_};
     }
 
-    if (@delete) {
-       my $str = scalar(@delete)."/".scalar(keys %netsplit);
-       &DEBUG("removed from netsplit list ($str): @delete");
+    if ($delete) {
+       my $j = scalar(keys %netsplit);
+       &DEBUG("nsC: removed from netsplit list: (before: $count; after: $j)");
     }
-    &DEBUG("nsC: netsplitservers: ".scalar(keys %netsplitservers) );
-    &DEBUG("nsC: netsplit: ".scalar(keys %netsplit) );
 
     if (!scalar %netsplit and scalar %netsplitservers) {
-       &DEBUG("nsc: ok hash netsplit is NULL; purging hash netsplitservers");
+       &DEBUG("nsC: ok hash netsplit is NULL; purging hash netsplitservers");
        undef %netsplitservers;
     }
 
@@ -1168,7 +1169,7 @@ sub mkBackup {
     my $backup         = 0;
 
     if (! -f $file) {
-       &WARN("mkB: file '$file' does not exist.");
+       &VERB("mkB: file '$file' does not exist.",2);
        return;
     }
 

diff --git a/src/Modules/Factoids.pl b/src/Modules/Factoids.pl
index 64bc303aedbbc237b7b77d57a524b4b3f7ed2eed..3285dd9dfad26a2701ae0f26b17463a27745879e 100644 (file)
--- a/src/Modules/Factoids.pl
+++ b/src/Modules/Factoids.pl
@@ -143,7 +143,7 @@ sub CmdFactStats {
     my ($type) = @_;
 
     if ($type =~ /^author$/i) {
-       my %hash = &dbGetCol("factoids", "factoid_key","created_by");
+       my %hash = &dbGetCol("factoids", "factoid_key,created_by", "created_by IS NOT NULL");
        my %author;
 
        foreach (keys %hash) {
@@ -177,7 +177,7 @@ sub CmdFactStats {
     } elsif ($type =~ /^broken$/i) {
         &status("factstats(broken): starting...");
        my $start_time  = &timeget();
-       my %data        = &dbGetCol("factoids", "factoid_key","factoid_value");
+       my %data        = &dbGetCol("factoids", "factoid_key,factoid_value", "factoid_value IS NOT NULL");
        my @list;
 
        my $delta_time  = &timedelta($start_time);
@@ -304,7 +304,7 @@ sub CmdFactStats {
     } elsif ($type =~ /^dup(licate|e)$/i) {
         &status("factstats(dupe): starting...");
        my $start_time  = &timeget();
-       my %hash        = &dbGetCol("factoids", "factoid_key", "factoid_value", 1);
+       my %hash        = &dbGetCol("factoids", "factoid_key,factoid_value", "factoid_value IS NOT NULL", 1);
        my $refs        = 0;
        my @list;
        my $v;
@@ -420,7 +420,7 @@ sub CmdFactStats {
        return &formListReply(1, $prefix, @list);
 
     } elsif ($type =~ /^locked$/i) {
-       my %hash = &dbGetCol("factoids", "factoid_key","locked_by");
+       my %hash = &dbGetCol("factoids", "factoid_key,locked_by", "locked_by IS NOT NULL");
        my @list = keys %hash;
 
        for (@list) {
@@ -431,7 +431,7 @@ sub CmdFactStats {
        return &formListReply(0, $prefix, @list);
 
     } elsif ($type =~ /^new$/i) {
-       my %hash = &dbGetCol("factoids", "factoid_key","created_time");
+       my %hash = &dbGetCol("factoids", "factoid_key,created_time", "created_time IS NOT NULL");
        my %age;
 
        foreach (keys %hash) {
@@ -509,7 +509,7 @@ sub CmdFactStats {
        return &formListReply(1, $prefix, @list);
 
     } elsif ($type =~ /^profanity$/i) {
-       my %data = &dbGetCol("factoids", "factoid_key","factoid_value");
+       my %data = &dbGetCol("factoids", "factoid_key,factoid_value", "factoid_value IS NOT NULL");
        my @list;
 
        foreach (keys %data) {
@@ -555,7 +555,7 @@ sub CmdFactStats {
        return &formListReply(1, $prefix, @newlist);
 
     } elsif ($type =~ /^request(ed)?$/i) {
-       my %hash = &dbGetCol("factoids", "factoid_key", "requested_count",1);
+       my %hash = &dbGetCol("factoids", "factoid_key,requested_count", "requested_count IS NOT NULL", 1);
 
        if (!scalar keys %hash) {
            return 'sorry, no factoids have been questioned.';
@@ -579,8 +579,25 @@ sub CmdFactStats {
        my $prefix = "factoid statistics on $type ";
        return &formListReply(0, $prefix, @list);
 
+    } elsif ($type =~ /^reqrate$/i) {
+       my %hash = &dbGetCol("factoids",
+               "factoid_key,(unix_timestamp() - created_time)/requested_count as rate",
+               "requested_by IS NOT NULL and created_time IS NOT NULL ORDER BY rate LIMIT 15", 1);
+
+       my $rate;
+       my @list;
+       my $total       = 0;
+       my $users       = 0;
+       foreach $rate (sort { $b <=> $a } keys %hash) {
+           my $f       = join(", ", sort keys %{ $hash{$rate} });
+           push(@list, "$f - ".&Time2String($rate));
+       }
+
+       my $prefix = "Rank of top factoid rate (time/req): ";
+       return &formListReply(0, $prefix, @list);
+
     } elsif ($type =~ /^requesters?$/i) {
-       my %hash = &dbGetCol("factoids", "factoid_key","requested_by");
+       my %hash = &dbGetCol("factoids", "factoid_key,requested_by", "requested_by IS NOT NULL");
        my %requester;
 
        foreach (keys %hash) {

diff --git a/src/Modules/News.pl b/src/Modules/News.pl
index c9d0d580c06cecd7563ab43efb70925548354024..d856d80f144d736443ddaa3695867925a1e4ba8a 100644 (file)
--- a/src/Modules/News.pl
+++ b/src/Modules/News.pl
@@ -387,12 +387,13 @@ sub list {
     }
     my $timestr = &::Time2String(time() - $newest);
     &::msg($::who, "|= Last updated $timestr ago.");
-    &::msg($::who, " \037Num\037 \037Item ".(" "x40)." \037");
+    &::msg($::who, " \037Num\037  \037Item ".(" "x40)." \037");
 
     my $i = 1;
     foreach ( &getNewsAll() ) {
        my $subtopic    = $_;
        my $setby       = $::news{$chan}{$subtopic}{Author};
+       my $chr         = (exists $::News{$chan}{$subtopic}{Text}) ? "" : "*";
 
        if (!defined $subtopic) {
            &::DEBUG("news: warn: subtopic == undef.");
@@ -400,11 +401,18 @@ sub list {
        }
 
        # todo: show request stats aswell.
-       &::msg($::who, sprintf("\002[\002%2d\002]\002 %s",
-                               $i, $subtopic));
+       &::msg($::who, sprintf("\002[\002%2d\002]\002%s %s",
+                               $i, $chr, $subtopic));
        $i++;
     }
 
+    my $z = $::newsuser{$::who};
+    if (defined $z) {
+       &::DEBUG("cache $::who: $z");
+    } else {
+       &::DEBUG("cache: $::who doesn't have newscache set.");
+    }
+
     &::msg($::who, "|= End of News.");
     &::msg($::who, "use 'news read <#>' or 'news read <keyword>'");
 }
@@ -695,6 +703,12 @@ sub latest {
     }
 
     my $t = $::newsuser{$chan}{$who};
+    if (defined $t) {
+       &::DEBUG("newsuser: $chan/$who == $t");
+    } else {
+       &::DEBUG("newsuser: $chan/$who == undefined");
+    }
+
     if (defined $t and ($t == 0 or $t == -1)) {
        if ($flag) {
            &::notice($::who, "if you want to read news, try /msg $::ident news or /msg $::ident news notify");
@@ -737,7 +751,9 @@ sub latest {
 
     # !scalar @new, $flag
     if (!scalar @new and $flag) {
-       &::notice($::who, "no new news for $chan.");
+       &::notice($::who, "no new news for $chan for $who.");
+       # valid to set this?
+       $::newsuser{$chan}{$who} = time();
        return;
     }
 

diff --git a/src/Modules/RootWarn.pl b/src/Modules/RootWarn.pl
index 1a3d6c6df8536da241856226e82ce52c6c003d06..6944b196583c8215ea37a28bdd3d58e839829895 100644 (file)
--- a/src/Modules/RootWarn.pl
+++ b/src/Modules/RootWarn.pl
@@ -17,7 +17,7 @@ sub rootWarn {
            &status("rootwarn: Detected root user; notifying user");
        } else {
            &status("rootwarn: Detected root user; notifying nick and channel.");
-           rawout("PRIVMSG $chan :R".("O" x int(rand 70 + 2))."T has landed!");
+           rawout("PRIVMSG $chan :ROO".("O" x int(rand 68))."T has landed!");
        }
 
        if ($_ = &getFactoid("root")) {

diff --git a/src/Modules/UserDCC.pl b/src/Modules/UserDCC.pl
index 09082a86ee22c116f6a64ddcdb6b5e2cdfc154ba..58c67b48ac3b75acf6e3564d57293462b8e80447 100644 (file)
--- a/src/Modules/UserDCC.pl
+++ b/src/Modules/UserDCC.pl
@@ -696,7 +696,7 @@ sub userDCC {
 
        if (scalar @args == 1) {        # del pass.
            if (!&IsFlag("n") and $who !~ /^\Q$verifyUser\E$/i) {
-               &pSReply("cannto remove passwd of others.");
+               &pSReply("cannot remove passwd of others.");
                return;
            }
 

diff --git a/src/Process.pl b/src/Process.pl
index 4988e67e91a7548c2799cdf696a2dba04d458447..81c29a98bb9ea1446f654eb29c768c5e5b5abb2a 100644 (file)
--- a/src/Process.pl
+++ b/src/Process.pl
@@ -121,7 +121,7 @@ sub process {
     # 'pass'
     if ($msgType =~ /private/ and $message =~ s/^pass//i) {
        $message =~ s/^\s+|\s+$//g;
-       my @array = split / /, $message;
+       my @array = split ' ', $message;
 
        if ($who =~ /^_default$/i) {
            &pSReply("you are too eleet.");
@@ -134,14 +134,15 @@ sub process {
        }
 
        # todo: use &getUser()?
-       my $first       = (scalar keys %users) ? 1 : 0;
+       my $first       = (scalar keys %users < 2) ? 1 : 0;
+
        if (!exists $users{$who} and !$first) {
            &pSReply("nick $who is not in user list.");
            return;
        }
 
        if ($first) {
-           &pSReply("first time user... adding you as master.");
+           &pSReply("First time user... adding you as Master.");
            $users{$who}{FLAGS} = "mrsteon";
        }
 
@@ -158,7 +159,7 @@ sub process {
 
        if (!scalar keys %{ $users{$who}{HOSTS} }) {
            my $mask = "*!$user@".&makeHostMask($host);
-           &pSReply("added mask $mask to $who.");
+           &pSReply("Added hostmask '\002$mask\002' to $who");
            $users{$who}{HOSTS}{$mask}  = 1;
        }
 

diff --git a/src/core.pl b/src/core.pl
index 80a4be91327bee46cd85e9b2eb2cd37654ec57a0..b49d9b2dbbbfa7dec62356dfab07a30bdb3806eb 100644 (file)
--- a/src/core.pl
+++ b/src/core.pl
@@ -201,6 +201,8 @@ sub IsChanConf {
        return 0;
     }
 
+    $chan      ||= "_default";
+
     my $old = $chan;
     if ($chan =~ tr/A-Z/a-z/) {
        &WARN("IsChanConf: lowercased chan. ($old)");

diff --git a/src/db_mysql.pl b/src/db_mysql.pl
index 1fb8d4b9ec4f2a51e88494ebcb4efe57b40049c9..f7178deb3f36268b2a837063d46123782b97a08f 100644 (file)
--- a/src/db_mysql.pl
+++ b/src/db_mysql.pl
@@ -78,10 +78,11 @@ sub dbGet {
 }
 
 #####
-# Usage: &dbGetCol($table, $primkey, $key, [$type]);
+# Usage: &dbGetCol($table, $select, $where, [$type]);
 sub dbGetCol {
-    my ($table, $primkey, $key, $type) = @_;
-    my $query = "SELECT $primkey,$key FROM $table WHERE $key IS NOT NULL";
+    my ($table, $select, $where, $type) = @_;
+    my $query  = "SELECT $select FROM $table";
+    $query     .= " WHERE ".$where if ($where);
     my %retval;
 
     my $sth = $dbh->prepare($query);
@@ -93,11 +94,24 @@ sub dbGetCol {
        return;
     }
 
-    if (defined $type and $type == 1) {
+    if (defined $type and $type == 2) {
+       &DEBUG("dbgetcol: type 2!");
+       while (my @row = $sth->fetchrow_array) {
+           $retval{$row[0]} = join(':', $row[1..$#row]);
+       }
+       &DEBUG("dbgetcol: count => ".scalar(keys %retval) );
+
+    } elsif (defined $type and $type == 1) {
        while (my @row = $sth->fetchrow_array) {
            # reverse it to make it easier to count.
-           $retval{$row[1]}{$row[0]} = 1;
+           if (scalar @row == 2) {
+               $retval{$row[1]}{$row[0]} = 1;
+           } elsif (scalar @row == 3) {
+               $retval{$row[1]}{$row[0]} = 1;
+           }
+           # what to do if there's only one or more than 3?
        }
+
     } else {
        while (my @row = $sth->fetchrow_array) {
            $retval{$row[0]} = $row[1];

diff --git a/src/logger.pl b/src/logger.pl
index 3e159ae3390cfe8646a38743da7247dea6956e83..2ba41506fcbfc2aba6bd0c0711dda63363d7dc4c 100644 (file)
--- a/src/logger.pl
+++ b/src/logger.pl
@@ -222,10 +222,16 @@ sub status {
 
     for ($input) {
        s/\n+$//;
-       s/\n/<NL>/g;
        s/\002|037//g;  # bold,video,underline => remove.
     }
 
+    # does this work?
+    if ($input =~ /\n/) {
+       foreach (split(/\n/, $input)) {
+           &status($_);
+       }
+    }
+
     # pump up the stats.
     $statcount++;