Update setcalc and getcalc to new infrastructure

[NDIRC.git] / Commands / Def.pm

diff --git a/Commands/Def.pm b/Commands/Def.pm
index b115dd44be93aefc3cdcdc315e34fa02a88302fb..1762e7c20129e43fb113b63456cd40110999f41b 100644 (file)
--- a/Commands/Def.pm
+++ b/Commands/Def.pm
@@ -75,9 +75,9 @@ ORDER BY c.landing_tick;
                        return;
                }
        }
-       $c->message(notice => $ND::memchan, "DEFENSE REQUIRED!! WAKE UP!!");
-       $c->message(privmsg => $ND::memchan, "DEFENSE REQUIRED $mess $callinfo MSG "
-               .$c->nick." TO RESPOND");
+       $c->message(notice => $c->disp->targets->{members}, "DEFENSE REQUIRED!! WAKE UP!!");
+       $c->message(privmsg => $c->disp->targets->{members}, "DEFENSE REQUIRED "
+               ."$mess $callinfo MSG ".$c->nick." TO RESPOND");
 }
 
 sub settype
@@ -172,10 +172,10 @@ sub calltake
 
        $dbh->begin_work;
        my $rows = $dbh->do(q{
-UPDATE calls SET dc = (SELECT uid FROM users WHERE hostmask ILIKE $1)
+UPDATE calls SET dc = $1
        ,status = $3
 WHERE call = $2
-               },undef,$c->host,$id,$status);
+               },undef,$c->uid,$id,$status);
        if ($rows == 1){
                $c->reply("Setting status on call $id to $status");
                $c->def_log($id , "Changed status: [B]$status [/B]");
@@ -196,7 +196,7 @@ sub setcalc
        my $dbh = $c->model;
 
        $dbh->begin_work;
-       my $rows = $dbh->do(q{UPDATE calls SET calc = $2 WHERE id = $1}
+       my $rows = $dbh->do(q{UPDATE calls SET calc = $2 WHERE call = $1}
                ,undef,$id, $calc);
        if ($rows == 1){
                $c->reply("Updated calc call <b>$id</b>");
@@ -219,7 +219,7 @@ sub getcalc
        my $dbh = $c->model;
 
        my $calc = $dbh->selectrow_array(q{
-SELECT calc FROM calls WHERE id = $1}
+SELECT calc FROM calls WHERE call = $1}
                ,undef,$id);
        $calc //= "Bad call id, there is no such call.";
        $c->reply("Calc for call <b>$id</b>: $calc");