]> ruin.nu Git - NDIRC.git/blobdiff - Def.pm
Converted .settype and .settypeall
[NDIRC.git] / Def.pm
diff --git a/Def.pm b/Def.pm
index a21a17d5963d41c8542de5aab19ff3bdb14c41c4..f2285d1572930b887585f9ec31bfbfe726ae8514 100644 (file)
--- a/Def.pm
+++ b/Def.pm
@@ -23,11 +23,13 @@ use ND::DB;
 use ND::Include;
 use NDIRC::Access;
 use NDIRC::Misc;
+use CGI qw/:standard/;
 require Exporter;
 
 our @ISA = qw/Exporter/;
 
-our @EXPORT = qw/showCall setType takeCall covCall ignoreCall defcall anon setDefPrio/;
+our @EXPORT = qw/showCall takeCall covCall ignoreCall
+       setDefPrio setCalc getCalc/;
 
 sub showCall {
        my ($msg,$command) = @_;
@@ -56,69 +58,6 @@ SQL
        }
 }
 
-sub setType {
-       my ($msg,$command) = @_;
-       my ($type,$id,$x,$y,$z) = @_;
-       if ($command eq 'settypeall'){
-               if (defined $msg && $msg =~ /^(\d+) (.*)$/){
-                       $type = $2;
-                       $id = $1
-               }else{
-                       $ND::server->command("notice $ND::nick Usage: $command callId type");
-                       return;
-               }
-       }else{
-               if (defined $msg && $msg =~ /^(\d+) (\d+):(\d+):(\d+) (.*)$/){
-                       $type = $5;
-                       $id = $1;
-                       $x = $2;
-                       $y = $3;
-                       $z = $4;
-               }elsif (defined $msg && $msg =~ /^(\d+) (.*)$/){
-                       $id = $1;
-                       $type = $2;
-               }else{
-                       $ND::server->command("notice $ND::nick Usage: $command incId type | or: $command callId X:Y:Z type");
-                       return;
-               }
-       }
-       if (my $user = dc()){
-               my $fleet;
-               my $query = qq{
-                       SELECT i.id,call,shiptype, coords(x,y,z),c.landing_tick - tick() FROM incomings i 
-                               JOIN current_planet_stats p ON i.sender = p.id
-                               JOIN calls c ON i.call = c.id
-                       };
-               if ($command eq 'settypeall'){
-                       $fleet = $ND::DBH->prepare(qq{
-                                       $query
-                                       WHERE i.call = ?
-                               });
-                       $fleet->execute($id);
-               }elsif (defined $x){
-                       $fleet = $ND::DBH->prepare(qq{
-                                       $query
-                                       WHERE i.call = ? AND p.id = planetid(?,?,?,0) 
-                               });
-                       $fleet->execute($id,$x,$y,$z);
-               }else{
-                       $fleet = $ND::DBH->prepare(qq{
-                                       $query
-                                       WHERE i.id = ?
-                               });
-                       $fleet->execute($id);
-               }       
-               while (my ($id,$call,$oldtype,$coords,$tick) = $fleet->fetchrow()){
-                       if($ND::DBH->do(q{UPDATE incomings SET shiptype = ? WHERE id = ?},undef,$type,$id) == 1){
-                               log_message $user->{uid}, "DC set fleet: $id to: $type";
-                               $ND::server->command("msg $ND::target Set fleet from $coords on call $call to $type (previously $oldtype)");
-                               if ($tick < 0 && not (defined $x && $x eq 'call')){
-                                       $ND::server->command("msg $ND::target This call is old, did you use the call id, instead of inc id by accident? You can use .settypeall callid to set the type on all incs in a call.");
-                               }
-                       }
-               }
-       }
-}
 sub takeCall {
        my ($msg,$command) = @_;
        my ($id);
@@ -128,10 +67,11 @@ sub takeCall {
                $ND::server->command("notice $ND::nick Usage: $command callid");
                return;
        }
-       if (dc()){
+       if (my $user = dc()){
                if ($ND::DBH->do(q{UPDATE calls SET dc = (SELECT uid FROM users WHERE hostmask ILIKE ?) WHERE id = ?}
                                ,undef,$ND::address,$id) == 1){
                        $ND::server->command("msg $ND::target Updated the DC for call $id");
+                       def_log $user->{uid}, $id , "Used: [B] $command [/B]";
                }
        }
 }
@@ -145,10 +85,11 @@ sub covCall {
                $ND::server->command("notice $ND::nick Usage: $command callid");
                return;
        }
-       if (dc()){
+       if (my $user = dc()){
                if($ND::DBH->do(q{UPDATE calls SET dc = (SELECT uid FROM users WHERE hostmask ILIKE ?), covered = TRUE, open = FALSE WHERE id = ?}
                                ,undef,$ND::address,$id) == 1){
                        $ND::server->command("msg $ND::target Marked call $id as covered");
+                       def_log $user->{uid}, $id , "Used: [B] $command [/B]";
                }
        }
 }
@@ -162,64 +103,52 @@ sub ignoreCall {
                $ND::server->command("notice $ND::nick Usage: $command callid");
                return;
        }
-       if (dc()){
+       if (my $user = dc()){
                if($ND::DBH->do(q{UPDATE calls SET dc = (SELECT uid FROM users WHERE hostmask ILIKE ?), covered = FALSE, open = FALSE WHERE id = ?}
                                ,undef,$ND::address,$id) == 1){
                        $ND::server->command("msg $ND::target Marked call $id as ignored");
+                       def_log $user->{uid}, $id , "Used: [B] $command [/B]";
                }
        }
 }
 
-sub defcall {
+sub setCalc {
        my ($msg,$command) = @_;
-       my ($mess,$nick,$callnr) = @_;
-       if (defined $msg && $msg =~ /^(\d+)?(.*)$/){
-               $callnr = $1;
-               $mess = $2;
+       my ($id, $calc);
+       if (defined $msg && $msg =~ /^(\d+) (.+)$/){
+               $id = $1;
+               $calc = escapeHTML($2);
        }else{
-               $ND::server->command("notice $ND::nick Usage: $command [callid] message | if a call id is given, then shiptypes and eta will be fetched from the database and added to the message");
+               $ND::server->command("notice $ND::nick Usage: $command callid calc");
                return;
        }
-       if (dc()){
-               my $call = "";
-               if ($callnr){
-                       my $st = $ND::DBH->prepare(q{
-       SELECT c.landing_tick - (SELECT value::integer FROM misc WHERE id = 'TICK'), concat(i.shiptype||'/') AS shiptype
-       FROM calls c 
-               JOIN incomings i ON i.call = c.id
-               LEFT OUTER JOIN users dc ON dc.uid = c.dc
-               JOIN users u ON u.uid = c.member
-       WHERE not covered AND c.id = ?
-       GROUP BY c.id,c.landing_tick
-       ORDER BY c.landing_tick;
-                       });
-                       if (my @row = $ND::DBH->selectrow_array($st,undef,$callnr)){
-                               chop($row[1]);
-                               $call = "(Anti $row[1] ETA: $row[0])"
-                       }
+       if (my $user = dc()){
+               if ($ND::DBH->do(q{UPDATE calls SET calc = $2 WHERE id = $1}
+                               ,undef,$id, $calc) == 1){
+                       $ND::server->command("notice $ND::nick Updated calc call $ND::B$id$ND::O");
+                       def_log $user->{uid}, $id , 'Updated calc to: [URL]'
+                               .$calc.'[/URL]';
                }
-               $ND::server->command("notice $ND::memchan DEFENSE REQUIRED!! WAKE UP!!");
-               $ND::server->command("msg $ND::memchan DEFENSE REQUIRED $mess $call MSG $ND::nick TO RESPOND");
        }
 }
 
-sub anon {
+sub getCalc {
        my ($msg,$command) = @_;
-       my ($target,$mess);
-       if (defined $msg && $msg =~ /^(\S+) (.+)$/){
-               $target = $1;
-               $mess = $2;
+       my ($id);
+       if (defined $msg && $msg =~ /^(\d+)$/){
+               $id = $1;
        }else{
-               $ND::server->command("notice $ND::nick Usage: $command nick message");
+               $ND::server->command("notice $ND::nick Usage: $command callid");
                return;
        }
-       if (dc()){
-               $ND::server->command("msg $target ".chr(2).$mess);
-               $ND::server->command("msg $ND::target ".chr(3)."3$1 << $2");
+       if (my $user = dc()){
+               my $calc = $ND::DBH->selectrow_array(q{SELECT calc
+                       FROM calls WHERE id = $1}
+                       ,undef,$id);
+               $ND::server->command("notice $ND::nick calc for call $ND::B$id$ND::O: $calc");
        }
 }
 
-
 sub setDefPrio {
        my ($msg,$command) = @_;
        my ($min,$max);