Changeset 430

Timestamp:

07/18/09 09:11:42 (13 years ago)

Author:

kovell

Message:

Fixes: kill_related debug code removed. Corp and Pilot retrieve external id when created. Changed names are identified by external id and updated. Deprecated code updated.

Location:

dev

Files:

• common/includes/class.contract.php (modified) (2 diffs)
• common/includes/class.corp.php (modified) (1 diff)
• common/includes/class.pilot.php (modified) (4 diffs)
• common/includes/globals.php (modified) (1 diff)
• common/kill_related.php (modified) (1 diff)
• cron/cron_fetcher.php (modified) (1 diff)

dev/common/includes/class.contract.php

@@ -57 +57 @@
         while ($carow = $caqry->getRow())
         {
-            $contracttarget = &new ContractTarget($this, $carow['ctd_crp_id'], $carow['ctd_all_id'], $carow['ctd_reg_id'], $carow['ctd_sys_id']);
+            $contracttarget = new ContractTarget($this, $carow['ctd_crp_id'], $carow['ctd_all_id'], $carow['ctd_reg_id'], $carow['ctd_sys_id']);
             array_push($this->contracttargets_, $contracttarget);
             if ($carow['ctd_crp_id'])
@@ -262 +262 @@
         $this->sys_id_ = $sys_id;
 
-        $this->klist_ = &new KillList();
-        $this->llist_ = &new KillList();
+        $this->klist_ = new KillList();
+        $this->llist_ = new KillList();
 
         if ($this->crp_id_)

dev/common/includes/class.corp.php

@@ -121 +121 @@
         $qry->execute("select * from kb3_corps
                                where crp_name = '".slashfix($name)."'");
-
+                // If the corp name is not present in the db add it.
         if ($qry->recordCount() == 0)
         {
-                        if(intval($externalid)) $qry->execute("insert into kb3_corps ".
+                        $externalid = intval($externalid);
+                        // If no external id is given then look it up.
+                        if(!$externalid)
+                        {
+                                $corpname = str_replace(" ", "%20", $name );
+                                require_once("common/includes/class.eveapi.php");
+                                $myID = new API_NametoID();
+                                $myID->setNames($corpname);
+                                $myID->fetchXML();
+                                $myNames = $myID->getNameData();
+                                $externalid = $myNames[0]['characterID'];
+                        }
+                        // If we have an external id then check it isn't already in use
+                        // If we find it then update the old corp with the new name and
+                        // return.
+                        if($externalid)
+                        {
+                                $qry->execute("SELECT * FROM kb3_corps WHERE crp_external_id = ".$externalid);
+                                if ($qry->recordCount() > 0)
+                                {
+                                        $row = $qry->getRow();
+                                        $qry->execute("UPDATE kb3_corps SET crp_name = '".slashfix($name)."' WHERE crp_external_id = ".$externalid);
+
+                                        $this->id_ = $row['crp_id'];
+                                        $this->name_ = slashfix($name);
+                                        $this->externalid_ = $row['crp_external_id'];
+                                        $this->alliance_ = $row['crp_all_id'];
+
+                                        // Now check if the alliance needs to be updated.
+                                        if ($row['crp_all_id'] != $alliance->getID() && $this->isUpdatable($timestamp))
+                                        {
+                                                $sql = 'update kb3_corps
+                                                                           set crp_all_id = '.$alliance->getID().', ';
+                                                $sql .= "crp_updated = date_format( '".
+                                                        $timestamp."','%Y.%m.%d %H:%i:%s') ".
+                                                        "where crp_id = ".$this->id_;
+                                                $qry->execute($sql);
+                                                $this->alliance_ = $alliance;
+                                        }
+                                        return $this->id_;
+                                }
+                        }
+                        // Neither corp name or external id was found so add this corp as new
+                        if($externalid) $qry->execute("insert into kb3_corps ".
                                 "(crp_id, crp_name, crp_all_id, crp_external_id, crp_updated) ".
                                 "values ( null, '".slashfix($name)."',".$alliance->getID().
-                                ", ".intval($externalid).", date_format('".$timestamp.
+                                ", ".$externalid.", date_format('".$timestamp.
                                 "','%Y.%m.%d %H:%i:%s'))");
             else $qry->execute("insert into kb3_corps ".

dev/common/includes/class.pilot.php

@@ -80 +80 @@
                         else return '?a=thumb&id='.$this->externalid_.'&size='.$size;
         }
-    }   
+    }
     //! Fetch the pilot details from the database using the id given on construction.
     function execQuery()
@@ -109 +109 @@
                 $this->corp_ = $row['plt_crp_id'];
                 $this->externalid_ = intval($row['plt_externalid']);
-                                
+
             }
         }
@@ -141 +141 @@
          * \param $externalID CCP external id
      */
-    function add($name, $corp, $timestamp, $externalID = '0')
+    function add($name, $corp, $timestamp, $externalID = 0)
     {
         $qry = new DBQuery();
@@ -150 +150 @@
         if ($qry->recordCount() == 0)
         {
+                        $externalid = intval($externalid);
+                        // If no external id is given then look it up.
+                        if(!$externalid)
+                        {
+                                $pilotname = str_replace(" ", "%20", $name );
+                                require_once("common/includes/class.eveapi.php");
+                                $myID = new API_NametoID();
+                                $myID->setNames($pilotname);
+                                $myID->fetchXML();
+                                $myNames = $myID->getNameData();
+                                $externalid = $myNames[0]['characterID'];
+                        }
+                        // If we have an external id then check it isn't already in use.
+                        // If we find it then update the old corp with the new name and
+                        // return.
+                        if($externalid)
+                        {
+                                $qry->execute("SELECT * FROM kb3_pilots WHERE plt_externalid = ".$externalid);
+                                if ($qry->recordCount() > 0)
+                                {
+                                        $row = $qry->getRow();
+                                        $qry->execute("UPDATE kb3_pilots SET plt_name = '".slashfix($name)."' WHERE plt_externalid = ".$externalid);
+
+                                        $this->id_ = $row['plt_id'];
+                                        $this->name_ = slashfix($name);
+                                        $this->externalid_ = $row['plt_externalid'];
+                                        $this->corp_ = $row['plt_crp_id'];
+
+                                        // Now check if the corp needs to be updated.
+                                        if ($row['plt_crp_id'] != $corp->getID() && $this->isUpdatable($timestamp))
+                                        {
+                                                $qry->execute("update kb3_pilots
+                                                                         set plt_crp_id = ".$corp->getID().",
+                                                                                 plt_updated = date_format( '".$timestamp."', '%Y.%m.%d %H:%i:%s') where plt_id = ".$this->id_);
+                                        }
+                                        return $this->id_;
+                                }
+                        }
             $qry->execute("insert into kb3_pilots (plt_id, plt_name, plt_crp_id, plt_externalid, plt_updated) values ( null,
                                                         '".slashfix($name)."',

dev/common/includes/globals.php

@@ -7 +7 @@
 else
 {
-        $svn_rev = '429';
+        $svn_rev = '430';
 }
 define('SVN_REV', $svn_rev);

dev/common/kill_related.php

@@ -12 +12 @@
 }
 $kill = new Kill($kll_id);
-echo $kill->getID();
 if($kill->isClassified())
 {

dev/cron/cron_fetcher.php

@@ -16 +16 @@
 //echo "Edit the \$KB_HOME and remove this line and the next\n";
 //die();
-$KB_HOME = ereg_replace('[/\\]cron$', '', getcwd());
+$KB_HOME = preg_replace('/[\/\\\\]cron$/', '', getcwd());
 chdir($KB_HOME);