Changeset 73

Timestamp:

11/16/06 23:20:05 (16 years ago)

Author:

exi

Message:

Small fix for unknown system names so they don't break up the parser.

Location:

dev/common

Files:

• class.kill.php (modified) (20 diffs)
• class.system.php (modified) (2 diffs)

dev/common/class.kill.php

@@ -161 +161 @@
     function getVictimShipImage($size)
     {
-        return IMG_URL . "/ships/" . $size . "_" . $size . "/"
-         . $this->victimshipexternalid_ . ".png";
+        return IMG_URL."/ships/".$size."_".$size."/".$this->victimshipexternalid_.".png";
     }
 
@@ -184 +183 @@
             $color = "purple";
 
-        return IMG_URL . "/ships/ship-" . $color . ".gif";
+        return IMG_URL."/ships/ship-".$color.".gif";
     }
 
@@ -191 +190 @@
         $this->execQuery();
 
-        $mail .= substr(str_replace('-', '.' , $this->getTimeStamp()), 0, 16) . "\r\n\r\n";
-        $mail .= "Victim: " . $this->getVictimName() . "\r\n";
-        $mail .= "Alliance: " . $this->getVictimAllianceName() . "\r\n";
-        $mail .= "Corp: " . $this->getVictimCorpName() . "\r\n";
+        $mail .= substr(str_replace('-', '.' , $this->getTimeStamp()), 0, 16)."\r\n\r\n";
+        $mail .= "Victim: ".$this->getVictimName()."\r\n";
+        $mail .= "Alliance: ".$this->getVictimAllianceName()."\r\n";
+        $mail .= "Corp: ".$this->getVictimCorpName()."\r\n";
         $ship = $this->getVictimShip();
-        $mail .= "Destroyed: " . $ship->getName() . "\r\n";
+        $mail .= "Destroyed: ".$ship->getName()."\r\n";
         $system = $this->getSystem();
-        $mail .= "System: " . $system->getName() . "\r\n";
-        $mail .= "Security: " . $system->getSecurity(true) . "\r\n\r\n";
+        $mail .= "System: ".$system->getName()."\r\n";
+        $mail .= "Security: ".$system->getSecurity(true)."\r\n\r\n";
         $mail .= "Involved parties:\r\n\r\n";
 
@@ -211 +210 @@
             $ship = $inv->getShip();
             if ($pilot->getName() == $weapon->getName())
-                $name = $pilot->getName() . " / " . $corp->getName();
+            {
+                $name = $pilot->getName()." / ".$corp->getName();
+            }
             else
+            {
                 $name = $pilot->getName();
-
-            $mail .= "Name: " . $name;
+            }
+
+            $mail .= "Name: ".$name;
             if ($pilot->getID() == $this->getFBPilotID())
+            {
                 $mail .= " (laid the final blow)";
+            }
             $mail .= "\r\n";
 
             if ($pilot->getName() != $weapon->getName())
             {
-                $mail .= "Security: " . $inv->getSecStatus() . "\r\n";
-                $mail .= "Alliance: " . $alliance->getName() . "\r\n";
-                $mail .= "Corp: " . $corp->getName() . "\r\n";
-                $mail .= "Ship: " . $ship->getName() . "\r\n";
-                $mail .= "Weapon: " . $weapon->getName() . "\r\n";
+                $mail .= "Security: ".$inv->getSecStatus()."\r\n";
+                $mail .= "Alliance: ".$alliance->getName()."\r\n";
+                $mail .= "Corp: ".$corp->getName()."\r\n";
+                $mail .= "Ship: ".$ship->getName()."\r\n";
+                $mail .= "Weapon: ".$weapon->getName()."\r\n";
             }
             $mail .= "\r\n";
@@ -240 +245 @@
                 $mail .= $item->getName();
                 if ($destroyed->getQuantity() > 1)
-                    $mail .= ", Qty: " . $destroyed->getQuantity();
+                    $mail .= ", Qty: ".$destroyed->getQuantity();
                 if ($destroyed->getLocationID() == 4) // cargo
                     $mail .= " (Cargo)";
@@ -252 +257 @@
     }
 
-    function getDupe()
-    {
-        $this->execQuery();
+    function getDupe($checkonly = false)
+    {
+        if (!$checkonly)
+        {
+            $this->execQuery();
+        }
         $dupe = 0;
         $qry = new DBQuery();
@@ -261 +269 @@
         $qry->execute("select kll_id
                         from kb3_kills
-                       where kll_timestamp <=
-                             date_add( '" . $this->timestamp_ . "', INTERVAL '15:0' MINUTE_SECOND )
-                         and kll_timestamp >=
-                             date_sub( '" . $this->timestamp_ . "', INTERVAL '15:0' MINUTE_SECOND )
-                         and kll_victim_id = " . $this->victimid_ . "
-                         and kll_ship_id = " . $this->victimship_->getID() . "
-                         and kll_system_id = " . $this->solarsystem_->getID() . "
-                         and kll_fb_plt_id = " . $this->getFBPilotID() . "
-                         and kll_id != " . $this->id_);
+                        where kll_timestamp <=
+                        date_add( '".$this->timestamp_."', INTERVAL '3:0' MINUTE_SECOND )
+                        and kll_timestamp >=
+                        date_sub( '".$this->timestamp_."', INTERVAL '3:0' MINUTE_SECOND )
+                        and kll_victim_id = ".$this->victimid_."
+                        and kll_ship_id = ".$this->victimship_->getID()."
+                        and kll_system_id = ".$this->solarsystem_->getID()."
+                        and kll_fb_plt_id = ".$this->getFBPilotID()."
+                        and kll_id != ".$this->id_);
 
         $row = $qry->getRow();
@@ -288 +296 @@
                               crp.crp_name, ali.all_name, ali.all_id, kll.kll_ship_id,
                               kll.kll_system_id, kll.kll_ship_id,
-                              kll.kll_victim_id, plt.plt_externalid,
-                              kll.kll_crp_id, kll.kll_points,
-                              fbplt.plt_id as fbplt_id,
-                              fbcrp.crp_id as fbcrp_id,
-                              fbali.all_id as fbali_id,
+                                      kll.kll_victim_id, plt.plt_externalid,
+                                      kll.kll_crp_id, kll.kll_points,
+                                      fbplt.plt_id as fbplt_id,
+                                      fbcrp.crp_id as fbcrp_id,
+                                      fbali.all_id as fbali_id,
                               fbplt.plt_name as fbplt_name,
                               fbcrp.crp_name as fbcrp_name,
@@ -299 +307 @@
                               kb3_alliances ali, kb3_alliances fbali, kb3_corps fbcrp,
                               kb3_pilots fbplt
-                        where kll.kll_id = " . $this->id_ . "
+                        where kll.kll_id = ".$this->id_."
                           and plt.plt_id = kll.kll_victim_id
                           and crp.crp_id = kll.kll_crp_id
@@ -332 +340 @@
             // involved
             $sql = "select ind_plt_id, ind_crp_id, ind_all_id, ind_sec_status,
-                       ind_shp_id, ind_wep_id
-                  from kb3_inv_detail
-                 where ind_kll_id = " . $this->getID() . "
-                order by ind_order";
+                    ind_shp_id, ind_wep_id
+                    from kb3_inv_detail
+                    where ind_kll_id = ".$this->getID()."
+                    order by ind_order";
 
             $qry->execute($sql) or die($qry->getErrorMsg());
@@ -350 +358 @@
             // destroyed items
             $sql = "select sum( itd.itd_quantity ) as itd_quantity, itd_itm_id,
-                       itd_itl_id, itl_location
-                  from kb3_items_destroyed itd, kb3_items itm,
-                       kb3_item_locations itl
-                 where itd.itd_kll_id = " . $this->getID() . "
-                   and itd.itd_itm_id = itm.itm_id
-                   and ( itd.itd_itl_id = itl.itl_id or itd.itd_itl_id = 0 )
-                group by itd_itm_id, itd_itl_id
-                order by itd.itd_itl_id, itm.itm_type";
+                    itd_itl_id, itl_location
+                    from kb3_items_destroyed itd, kb3_items itm,
+                    kb3_item_locations itl
+                    where itd.itd_kll_id = ".$this->getID()."
+                    and itd.itd_itm_id = itm.itm_id
+                    and ( itd.itd_itl_id = itl.itl_id or itd.itd_itl_id = 0 )
+                    group by itd_itm_id, itd_itl_id
+                    order by itd.itd_itl_id, itm.itm_type";
 
             $qry->execute($sql) or die($qry->getErrorMsg());
@@ -502 +510 @@
     {
         $npc = strpos($fbpilotname, "#");
-                if($npc === false) {
-                $this->fbpilotname_ = $fbpilotname;
+                if ($npc === false)
+        {
+                $this->fbpilotname_ = $fbpilotname;
                 }
-                else {
-                $name = explode("#",$fbpilotname);
-                $plt = new Item();
-                $name = $plt->lookup($name[2]);
-                $this->fbpilotname_ = $name;
+                else
+        {
+                $name = explode("#", $fbpilotname);
+                $plt = new Item();
+                $name = $plt->lookup($name[2]);
+                $this->fbpilotname_ = $name;
                 }
     }
@@ -560 +570 @@
     }
 
-    function add()
+    function add($id = null)
     {
         // if ( $this->timestamp_ == "" || !$this->victimid_ || !$this->victimship_->getID() || !$this->solarsystem_->getID() ||
@@ -566 +576 @@
         // !$this->getFBPilotID() )
         // return 0;
-        $qry = new DBQuery();
-        $qry->execute("select kll_id
-                        from kb3_kills
-                       where kll_timestamp <=
-                             date_add( '" . $this->timestamp_ . "', INTERVAL '15:0' MINUTE_SECOND )
-                         and kll_timestamp >=
-                             date_sub( '" . $this->timestamp_ . "', INTERVAL '15:0' MINUTE_SECOND )
-                         and kll_victim_id = " . $this->victimid_ . "
-                         and kll_ship_id = " . $this->victimship_->getID() . "
-                         and kll_system_id = " . $this->solarsystem_->getID() . "
-                         and kll_fb_plt_id = " . $this->getFBPilotID()) or die($qry->getErrorMsg());
-
-        if ($qry->recordCount() == 0)
+        if (!$this->solarsystem_->getID())
+        {
+            echo 'INTERNAL ERROR; SOLARSYSTEM NOT FOUND; PLEASE CONTACT A DEV WITH THIS MESSAGE<br/>';
+            var_dump($this->solarsystem_);
+            var_dump($this->solarsystemname_);
+            return 0;
+        }
+        $dupe = $this->getDupe(true);
+
+        if ($dupe == 0)
         {
             $sql = "insert into kb3_kills
                 values ( null,
-                         date_format('" . $this->timestamp_ . "', '%Y.%m.%d %H:%i:%s'),
-                         " . $this->victimid_ . ", " . $this->victimallianceid_ . ",
-                         " . $this->victimcorpid_ . ", " . $this->victimship_->getID() . ",
-                         " . $this->solarsystem_->getID() . ", " . $this->getFBAllianceID() . ",
-                         " . $this->getFBCorpID() . ", " . $this->getFBPilotID() . ", " . $this->calculateKillPoints() . " )";
-            $qry->execute($sql) or die($qry->getErrorMsg());
-            $this->id_ = $qry->getInsertID();
+                         date_format('".$this->timestamp_."', '%Y.%m.%d %H:%i:%s'),
+                         ".$this->victimid_.", ".$this->victimallianceid_.",
+                         ".$this->victimcorpid_.", ".$this->victimship_->getID().",
+                         ".$this->solarsystem_->getID().", ".$this->getFBAllianceID().",
+                         ".$this->getFBCorpID().", ".$this->getFBPilotID().", ".$this->calculateKillPoints()." )";
+            $qry->execute($sql);
+            if ($id)
+            {
+                $this->id_ = $id;
+            }
+            else
+            {
+                $this->id_ = $qry->getInsertID();
+            }
             // involved
             $order = 0;
@@ -605 +619 @@
 
                 $sql = "insert into kb3_inv_detail
-                  values ( " . $this->getID() . ", " . $inv->getPilotID() . ", '" . $inv->getSecStatus() . "', "
-                 . $inv->getAllianceID() . ", " . $inv->getCorpID() . ", " . $ship->getID() . ", "
-                 . $weapon->getID() . ", " . $order++ . " )";
+                            values ( ".$this->getID().", ".$inv->getPilotID().", '".$inv->getSecStatus()."', "
+                .$inv->getAllianceID().", ".$inv->getCorpID().", ".$ship->getID().", "
+                .$weapon->getID().", ".$order++." )";
                 $qry->execute($sql) or die($qry->getErrorMsg());
 
@@ -613 +627 @@
                 {
                     array_push($invall, $inv->getAllianceID());
-                    $qry->execute("insert into kb3_inv_all values ( " . $this->getID() . ", " . $inv->getAllianceID() . " )") or die($qry->getErrorMsg());
+                    $qry->execute("insert into kb3_inv_all values ( ".$this->getID().", ".$inv->getAllianceID()." )") or die($qry->getErrorMsg());
                 }
                 if (!in_array($inv->getCorpID(), $invcrp))
                 {
                     array_push($invcrp, $inv->getCorpID());
-                    $qry->execute("insert into kb3_inv_crp values ( " . $this->getID() . ", " . $inv->getCorpID() . " )") or die($qry->getErrorMsg());
+                    $qry->execute("insert into kb3_inv_crp values ( ".$this->getID().", ".$inv->getCorpID()." )") or die($qry->getErrorMsg());
                 }
                 if (!in_array($inv->getPilotID(), $invplt))
                 {
                     array_push($invplt, $inv->getPilotID());
-                    $qry->execute("insert into kb3_inv_plt values ( " . $this->getID() . ", " . $inv->getPilotID() . " )") or die($qry->getErrorMsg());
+                    $qry->execute("insert into kb3_inv_plt values ( ".$this->getID().", ".$inv->getPilotID()." )") or die($qry->getErrorMsg());
                 }
             }
@@ -634 +648 @@
 
                 $sql = "insert into kb3_items_destroyed
-                  values ( " . $this->getID() . ", " . $item->getID() . ", " . $dest->getQuantity() . ", "
-                 . $dest->getLocationID() . " )";
-                $qry->execute($sql) or die($qry->getErrorMsg());
+                        values ( ".$this->getID().", ".$item->getID().", ".$dest->getQuantity().", "
+                .$dest->getLocationID()." )";
+                $qry->execute($sql);
             }
         }
@@ -654 +668 @@
 
         $qry = new DBQuery();
-        $qry->execute("delete from kb3_kills
-                       where kll_id = " . $this->id_);
-        $qry->execute("delete from kb3_inv_detail
-                       where ind_kll_id = " . $this->id_);
-        $qry->execute("delete from kb3_inv_all
-                       where ina_kll_id = " . $this->id_);
-        $qry->execute("delete from kb3_inv_crp
-                       where inc_kll_id = " . $this->id_);
-        $qry->execute("delete from kb3_inv_plt
-                       where inp_kll_id = " . $this->id_);
-        $qry->execute("delete from kb3_items_destroyed
-                       where itd_kll_id = " . $this->id_);
+        $qry->execute("delete from kb3_kills where kll_id = ".$this->id_);
+        $qry->execute("delete from kb3_inv_detail where ind_kll_id = ".$this->id_);
+        $qry->execute("delete from kb3_inv_all where ina_kll_id = ".$this->id_);
+        $qry->execute("delete from kb3_inv_crp where inc_kll_id = ".$this->id_);
+        $qry->execute("delete from kb3_inv_plt where inp_kll_id = ".$this->id_);
+        $qry->execute("delete from kb3_items_destroyed where itd_kll_id = ".$this->id_);
+        $qry->execute("delete from kb3_comments where kll_id = ".$this->id_);
     }
 
@@ -749 +758 @@
                 $id= $this->item_->getID(); // get Item ID
                 $qry = new DBQuery();
-        $qry->execute("select Value from kb3_items where itm_id= '" . $id . "'") or die($qry->getErrorMsg());
+        $qry->execute("select Value from kb3_items where itm_id= '".$id."'") or die($qry->getErrorMsg());
         $row = $qry->getRow();
         $value = $row['Value'];
                 if ($value == "") {
                         $value = 0;
-                } 
+                }
                 return $value;
         }
-        
+
     function getLocationID()
     {
@@ -768 +777 @@
         {
             $qry = new DBQuery();
-            $qry->execute("select itl_id from kb3_item_locations where itl_location = '" . $this->location_ . "'") or die($qry->getErrorMsg());
+            $qry->execute("select itl_id from kb3_item_locations where itl_location = '".$this->location_."'") or die($qry->getErrorMsg());
             $row = $qry->getRow();
             $id = $row['itl_id'];

dev/common/class.system.php

@@ -1 @@
-<?
-  require_once( "db.php" );
+<?php
+require_once("db.php");
 
-  class SolarSystem {
+class SolarSystem
+{
+    function SolarSystem($id = 0)
+    {
+        $this->id_ = $id;
+        $this->qry_ = new DBQuery();
 
-    function SolarSystem( $id = 0 )
-    {
-      $this->id_ = $id;
-      $this->qry_ = new DBQuery();
-
-      $this->sql_ = "select *
+        $this->sql_ = "select *
                        from kb3_systems sys, kb3_constellations con,
                             kb3_regions reg
-                      where sys.sys_id = ".$this->id_."
+                      where sys.sys_id = " . $this->id_ . "
                         and con.con_id = sys.sys_con_id
                         and reg.reg_id = con.con_reg_id";
@@ -19 +19 @@
     function getID()
     {
-      return $this->id_;
+        return $this->id_;
     }
 
     function getName()
     {
-      $this->execQuery();
-      return $this->row_['sys_name'];
+        $this->execQuery();
+        return $this->row_['sys_name'];
     }
 
-    function getSecurity( $rounded = false )
+    function getSecurity($rounded = false)
     {
-      $this->execQuery();
-      $sec = $this->row_['sys_sec'];
+        $this->execQuery();
+        $sec = $this->row_['sys_sec'];
 
-      if ( $rounded ) {
-        if ( $sec <= 0 )
-          return number_format( 0.0, 1 );
-        else
-          return number_format( round( $sec, 1 ), 1 );
-      } else return $sec;
+        if ($rounded)
+        {
+            if ($sec <= 0)
+                return number_format(0.0, 1);
+            else
+                return number_format(round($sec, 1), 1);
+        }
+        else return $sec;
     }
 
     function getConstellationName()
     {
-      $this->execQuery();
-      return $this->row_['con_name'];
+        $this->execQuery();
+        return $this->row_['con_name'];
     }
 
     function getRegionName()
     {
-      $this->execQuery();
-      return $this->row_['reg_name'];
+        $this->execQuery();
+        return $this->row_['reg_name'];
     }
 
     function execQuery()
     {
-      if ( !$this->qry_->executed_ ) {
-        $this->qry_->execute( $this->sql_ );
-        $this->row_ = $this->qry_->getRow();
-      }
+        if (!$this->qry_->executed_)
+        {
+            $this->qry_->execute($this->sql_);
+            $this->row_ = $this->qry_->getRow();
+        }
     }
 
-    function lookup( $name )
+    function lookup($name)
     {
-      $qry = new DBQuery();
-      $qry->execute( "select *
+        $qry = new DBQuery();
+        $qry->execute("select *
                         from kb3_systems
-                       where sys_name = '".slashfix( $name )."'" );
-                                                                                
-      $row = $qry->getRow();
-      $this->id_ = $row['sys_id'];
+                       where sys_name = '" . slashfix($name) . "'");
+
+        $row = $qry->getRow();
+        if (!$row['sys_id'])
+        {
+            echo 'INTERNAL ERROR: SYSTEM NOT FOUND: "'.$name.'"<br/>';
+        }
+        $this->id_ = $row['sys_id'];
     }
-  }
+}
 
-  class Region
-  {
-    function Region( $id = 0 )
+class Region
+{
+    function Region($id = 0)
     {
-      $this->id_ = $id;
+        $this->id_ = $id;
     }
 
     function getID()
     {
-      return $this->id_;
+        return $this->id_;
     }
 
     function getName()
     {
-      $this->execQuery();
-      return $this->row_['reg_name'];
+        $this->execQuery();
+        return $this->row_['reg_name'];
     }
 
     function execQuery()
     {
-      if ( !$this->qry_ ) {
-        $this->qry_ = new DBQuery();
-        $this->qry_->execute( "select * from kb3_regions
-                                where reg_id = ".$this->id_ );
-        $this->row_ = $this->qry_->getRow();
-      }
+        if (!$this->qry_)
+        {
+            $this->qry_ = new DBQuery();
+            $this->qry_->execute("select * from kb3_regions
+                                where reg_id = " . $this->id_);
+            $this->row_ = $this->qry_->getRow();
+        }
     }
-  }
+}
 ?>