Changeset 378
- Timestamp:
- 06/21/09 12:01:49 (13 years ago)
- Location:
- dev
- Files:
-
- 3 modified
Legend:
- Unmodified
- Added
- Removed
-
dev/common/includes/class.eveapi.php
r375 r378 63 63 $this->API_CCPErrorCorrecting = config::get('API_CCPErrorCorrecting'); 64 64 $this->keyindex_ = $keyindex; 65 66 65 66 67 67 // Initialise for error correcting and missing itemID resolution 68 68 $this->myIDName = new API_IDtoName(); … … 402 402 function endElement($parser, $name) 403 403 { 404 if($this->killmailExists_) return; 404 if($this->killmailExists_ && $name != "RESULT") return; 405 else $this->killmailExists_ = false; 405 406 switch ($name) 406 407 { -
dev/common/includes/class.parser.php
r370 r378 323 323 $slash = strpos($involved[$counter], '/'); 324 324 $name = trim(substr($involved[$counter], 5, $slash-5)); 325 $corp eration = trim(substr($involved[$counter], $slash+1, strlen($involved[$counter])- $shash+1));325 $corporation = trim(substr($involved[$counter], $slash+1, strlen($involved[$counter])- $shash+1)); 326 326 327 327 //alliance lookup for warp disruptors - normal NPCs aren't to be bundled uin 328 328 $crp = new Corporation(); 329 $crp->lookup($corp eration);329 $crp->lookup($corporation); 330 330 if($crp->getID() > 0 && stristr($name, ' warp ')) 331 331 { … … 335 335 336 336 //now if the corp bit has final blow info, note it 337 preg_match("/(.*) \\(laid the final blow\\)/", $corp eration, $matched);337 preg_match("/(.*) \\(laid the final blow\\)/", $corporation, $matched); 338 338 if($matched[1]) 339 339 { 340 340 $finalblow = 1; 341 341 $iwname = $name; 342 $end = strpos($corp eration, '(') -1;343 $corp eration = substr($corperation, 0, $end);342 $end = strpos($corporation, '(') -1; 343 $corporation = substr($corporation, 0, $end); 344 344 } 345 345 else … … 349 349 } 350 350 $ipname = $name; 351 $icname = $corp eration;351 $icname = $corporation; 352 352 } 353 353 else -
dev/mods/rank_mod/rank.php
r370 r378 3 3 require_once('common/includes/class.pilot.php'); 4 4 require_once('common/includes/class.killlist.php'); 5 6 class TopWeaponListNoLimit extends TopList 7 { 8 function TopWeaponList() 9 { 10 $this->TopWeaponListNoLimit(); 11 } 12 13 function generate() 14 { 15 $sql = "select count(1) as cnt, ind.ind_wep_id as itm_id, itm.itm_group as itm_grp 16 from kb3_inv_detail ind 17 inner join kb3_items itm on (itm_id = ind.ind_wep_id)"; 18 if (DB_USE_CCP) 19 { 20 $sql = "select count(*) as cnt, ind.ind_wep_id as itm_id, itm.GroupID as itm_grp 21 from kb3_inv_detail ind 22 inner join kb3_invtypes itm on (typeID = ind.ind_wep_id)"; 23 } 24 25 if ($this->invplt_) 26 $sqlbottom .= " and ind.ind_plt_id = ".$this->invplt_->getID(); 27 28 if ($this->invcrp_) 29 $sqlbottom .= " and ind.ind_crp_id = ".$this->invcrp_->getID(); 30 31 if ($this->invall_) 32 $sqlbottom .= " and ind.ind_all_id = ".$this->invall_->getID(); 33 34 $this->setSQLTop($sql); 35 if (DB_USE_CCP) 36 { 37 // since ccps database doesnt have icons for ships this will also fix the ship as weapon bug 38 $this->setSQLBottom(" and itm.volume < '12000' 39 and itm.typeName != 'Unknown' 40 group by ind.ind_wep_id order by 1 desc"); 41 } 42 else 43 $this->setSQLBottom(" //and itm.itm_icon not in ( '1', 'icon_null' ) 44 and itm.itm_name != 'Unknown' 45 group by ind.ind_wep_id order by 1 desc"); 46 } 47 } 48 49 class TopShipListNoLimit extends TopShipList 50 { 51 function TopShipListNoLimit() 52 { 53 $this->TopShipList(); 54 } 55 56 function generate() 57 { 58 $sql = "select count(1) as cnt, ind.ind_shp_id as shp_id, shp.shp_class as cls_id 59 from kb3_inv_detail ind 60 inner join kb3_ships shp on ( shp_id = ind.ind_shp_id )"; 61 62 if ($this->invplt_) 63 $sqlbottom .= " and ind.ind_plt_id = ".$this->invplt_->getID(); 64 65 if ($this->invcrp_) 66 $sqlbottom .= " and ind.ind_crp_id = ".$this->invcrp_->getID(); 67 68 if ($this->invall_) 69 $sqlbottom .= " and ind.ind_all_id = ".$this->invall_->getID(); 70 71 $this->setSQLTop($sql); 72 $this->setSQLBottom(" and ind.ind_shp_id != 31 73 and shp.shp_class != 17 74 group by ind.ind_shp_id order by 1 desc"); 75 } 76 } 5 77 6 78 function TimeID2Str($time_id)