Changeset 487 for dev/common/includes/class.eveapi.php

Timestamp:

01/06/10 03:12:08 (11 years ago)

Author:

kovell

Message:

Fixes: date, alliance = None for killlist tables. Added: CCPDB update code from EDK3

Files:

• dev/common/includes/class.eveapi.php (modified) (7 diffs)

dev/common/includes/class.eveapi.php

@@ -57 +57 @@
                 $this->API_CacheTime_ = ApiCache::get('API_CachedUntil_' . $keyindex);
                 $this->API_UseCaching_ = config::get('API_UseCache');
-                $this->API_CCPErrorCorrecting = config::get('API_CCPErrorCorrecting');
         $this->keyindex_ = $keyindex;
 
@@ -217 +216 @@
                                                 $this->pname_ = $v;
 
-                                                // Error Correction is on (0 = on, 1 = off(I know, just don't ask))
-                                                if ( $this->API_CCPErrorCorrecting == 0 )
-                                                {
-                                                        if ( ($this->charid_ != "0" ) && (strlen($this->pname_) == 0) )
-                                                        {
-                                                                // name is blank but ID is valid - convert ID into name
-                                                                $this->myIDName->clear();
-                                                                $this->myIDName->setIDs($this->charid_);
-                                                                $this->Output_ .= $this->myIDName->fetchXML();
-                                                                $myNames = $this->myIDName->getIDData();
-                                                                $this->pname_ = $myNames[0]['name'];
-                                                        }
-                                                }
                         break;
                                         case "CORPORATIONID":
@@ -237 +223 @@
                                                 $this->corporation_ = $v;
 
-                                                // Error Correction is on (0 = on, 1 = off(I know, just don't ask))
-                                                if ( $this->API_CCPErrorCorrecting == 0 )
-                                                {
-                                                        if ( ($this->corporationID_ != "0" ) && (strlen($this->corporation_) == 0) )
-                                                        { // name is blank but ID is valid - convert ID into name
-                                                                $this->myIDName->clear();
-                                                                $this->myIDName->setIDs($this->corporationID_);
-                                                                $this->Output_ .= $this->myIDName->fetchXML();
-                                                                $myNames = $this->myIDName->getIDData();
-                                                                $this->corporation_ = $myNames[0]['name'];
-                                                        }
-                                                }
                         break;
                     case "ALLIANCEID":
@@ -255 +229 @@
                     case "ALLIANCENAME":
                                                 $this->alliance_ = $v;
-
-                                                // Error Correction is on (0 = on, 1 = off(I know, just don't ask))
-                                                //if ( $this->API_CCPErrorCorrecting == 0 )
-                                                // conditional branch removed - ALWAYS fix alliance name bugs
-                                                {
-                                                        if ( ($this->allianceID_ != "0" ) && (strlen($this->alliance_) == 0) )
-                                                        { // name is blank but ID is valid - convert ID into name
-                                                                $this->myIDName->clear();
-                                                                $this->myIDName->setIDs($this->allianceID_);
-                                                                $this->Output_ .= $this->myIDName->fetchXML();
-                                                                $myNames = $this->myIDName->getIDData();
-                                                                $this->alliance_ = $myNames[0]['name'];
-                                                        }
-                                                }
 
                                                 if (strlen($this->alliance_) == 0)
@@ -406 +366 @@
                     //$this->shipname_ = "Unknown"; // this is done else mail will not parse
                     $this->isposkill_ = true;
-                } elseif (($this->moonid_ == 0) && ($this->pname_ == "") && ($this->charid_ != 0)) {
+                } elseif (($this->moonid_ == 0) && ($this->pname_ == "") && ($this->charid_ == 0)) {
                                         // catches unanchored POS modules - as moon is unknown, we will use system name instead
                                         $this->pname_ = $this->systemname_;
@@ -4840 +4800 @@
         $qry->execute($sql);
                 if(!$qry->recordCount()) return "";
-                
+
                 $sql = 'select moon.itemID, moon.itemName from kb3_moons moon where moon.itemID = '.$id;
 
@@ -4934 +4894 @@
         return $cachetime;
 }
-?>