- modules: woops, used wrong var. should work now.

- "INIC: invalid chan"... perlness hits back.
- more misc shit.

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

diff --git a/src/Modules/News.pl b/src/Modules/News.pl
index fcf62b9ca28bba6a357fedff093902811cbb291d..128bb2c821c85d9034bdd5b52582dbcc53cbd687 100644 (file)
--- a/src/Modules/News.pl
+++ b/src/Modules/News.pl
@@ -751,9 +751,9 @@ sub latest {
     }
 
     if (!defined $t) {
+#      &::msg($who, "News is disabled for $chan");
        &::DEBUG("news: something went really wrong.");
-       &::DEBUG("news: chan => $chan, ::chan => $::chan");
-#      &::notice($who, "something went really wrong.");
+       &::DEBUG("news: chan => $chan.");
        return;
     }
 
@@ -786,7 +786,7 @@ sub latest {
     # scalar @new, !$flag
     my $unread = scalar @new;
     my $total  = scalar keys %{ $::news{$chan} };
-    if (!$flag) {
+    if (!$flag || &::IsChanConf("newsTellUnread")) {
        return unless ($unread);
 
        # just a temporary measure not to flood ourself off the 
@@ -898,6 +898,8 @@ sub getNewsItem {
     my($what)  = @_;
     my $item   = 0;
 
+    $what =~ s/^\#//;  # '#1' for example.
+
     my %time;
     foreach (keys %{ $::news{$chan} }) {
        my $t = $::news{$chan}{$_}{Time};

diff --git a/src/Process.pl b/src/Process.pl
index 5a166e12eec7da1e8b4007b66f95784feef18768..05f297b95b7cd345fd6b81066d6d0151edae9d7f 100644 (file)
--- a/src/Process.pl
+++ b/src/Process.pl
@@ -190,6 +190,8 @@ sub process {
        my $found = 0;
 
        foreach (keys %channels) {
+           # don't test for $channel{_default} elsewhere !!!
+           next if (/^\s*$/ || /^_?default$/);
            next unless (&IsNickInChan($who,$_));
 
            $found++;

diff --git a/src/modules.pl b/src/modules.pl
index 09a1ef44637bf33ff125a5843704b2b15cdc762f..acacb4c517581af915bf541d4a5320c9de2e840e 100644 (file)
--- a/src/modules.pl
+++ b/src/modules.pl
@@ -337,7 +337,7 @@ sub loadMyModule {
            &shutdown() if (defined $shm and defined $dbh);
        } else {                        # child.
            &DEBUG("b4 delfork 1");
-           &delForked($modulebase);
+           &delForked($modulename);
        }
 
        exit 1;
@@ -348,7 +348,7 @@ sub loadMyModule {
        &ERROR("cannot load my module: $modulebase");
        if ($bot_pid != $$) {   # child.
            &DEBUG("b4 delfork 2");
-           &delForked($modulebase);
+           &delForked($modulename);
            exit 1;
        }