Changeset 154 for dev/common/class.kill.php
- Timestamp:
- 12/15/06 06:33:49 (16 years ago)
- Files:
-
- 1 modified
Legend:
- Unmodified
- Added
- Removed
-
dev/common/class.kill.php
r133 r154 270 270 from kb3_kills 271 271 where kll_timestamp <= 272 date_add( '".$this->timestamp_."', INTERVAL ' 3:0' MINUTE_SECOND )272 date_add( '".$this->timestamp_."', INTERVAL '5:0' MINUTE_SECOND ) 273 273 and kll_timestamp >= 274 date_sub( '".$this->timestamp_."', INTERVAL ' 3:0' MINUTE_SECOND )274 date_sub( '".$this->timestamp_."', INTERVAL '5:0' MINUTE_SECOND ) 275 275 and kll_victim_id = ".$this->victimid_." 276 276 and kll_ship_id = ".$this->victimship_->getID()." … … 299 299 kll.kll_crp_id, kll.kll_points, 300 300 fbplt.plt_id as fbplt_id, 301 fbplt.plt_externalid as fbplt_externalid, 301 302 fbcrp.crp_id as fbcrp_id, 302 303 fbali.all_id as fbali_id, … … 333 334 $this->setFBAllianceName($row['fbali_name']); 334 335 $this->setKillPoints($row['kll_points']); 336 $this->plt_ext_ = $row['plt_externalid']; 337 $this->fbplt_ext_ = $row['fbplt_externalid']; 335 338 336 339 if (!$row) … … 571 574 function add($id = null) 572 575 { 576 global $config; 573 577 if (!$this->solarsystem_->getID()) 574 578 { … … 584 588 $this->realadd(); 585 589 } 586 else 590 elseif ($config->getConfig('readd_dupes')) 587 591 { 588 592 $this->dupeid_ = $dupe; … … 590 594 $this->remove(false); 591 595 $this->realadd($dupe); 596 $this->id_ = -1; 597 } 598 else 599 { 600 $this->dupeid_ = $dupe; 592 601 $this->id_ = -1; 593 602 }