Changeset 289
- Timestamp:
- 12/16/07 14:55:47 (15 years ago)
- Location:
- dev
- Files:
-
- 15 modified
Legend:
- Unmodified
- Added
- Removed
-
dev/common/admin/option_generic.php
r282 r289 22 22 options::fadd('Use gmdate instead of date', 'date_gmtime', 'checkbox'); 23 23 options::fadd('Classify kills for hours:', 'kill_classified', 'edit:size:4', '', '', '0 to disable, 1-24hrs'); 24 options::fadd('Display a summary line below a killsummarytable', 'summarytable_summary', 'checkbox');25 24 26 25 options::cat('Appearance', 'Generic', 'Posting'); … … 41 40 options::fadd('Include dropped value into total loss', 'kd_droptototal', 'checkbox'); 42 41 42 options::cat('Appearance', 'Generic', 'Killsummarytables'); 43 options::fadd('Stats Row Count', 'summarytable_rowcount', 'edit:size:2'); 44 options::fadd('Display a summary line below a killsummarytable', 'summarytable_summary', 'checkbox'); 45 43 46 options::cat('Appearance', 'Generic', 'Public-Mode v0.2'); 44 47 options::fadd('Only Kills in SummaryTables', 'public_summarytable', 'checkbox','','','CORP_ID and ALLIANCE_ID in config has to be 0 to work "public"'); -
dev/common/alliance_detail.php
r281 r289 34 34 $kill_summary = new KillSummaryTable(); 35 35 $kill_summary->addInvolvedAlliance($alliance); 36 $kill_summary->setBreak( 6);36 $kill_summary->setBreak(config::get('summarytable_rowcount')); 37 37 $summary_html = $kill_summary->generate(); 38 38 -
dev/common/cc_detail.php
r281 r289 40 40 $llist = $contract->getLossList(); 41 41 $killsummary = new KillSummaryTable($klist, $llist); 42 $killsummary->setBreak( 6);42 $killsummary->setBreak(config::get('summarytable_rowcount')); 43 43 if ($_GET['view'] == "") 44 44 $killsummary->setFilter(false); -
dev/common/corp_detail.php
r281 r289 25 25 $kill_summary = new KillSummaryTable(); 26 26 $kill_summary->addInvolvedCorp($corp); 27 $kill_summary->setBreak( 6);27 $kill_summary->setBreak(config::get('summarytable_rowcount')); 28 28 $summary_html = $kill_summary->generate(); 29 29 -
dev/common/home.php
r281 r289 29 29 $summarytable = new KillSummaryTable($kslist, $llist); 30 30 } 31 $summarytable->setBreak( 6);31 $summarytable->setBreak(config::get('summarytable_rowcount')); 32 32 $html .= $summarytable->generate(); 33 33 -
dev/common/igb_home.php
r281 r289 24 24 25 25 $summarytable = new KillSummaryTable($kslist, $llist); 26 $summarytable->setBreak( 6);26 $summarytable->setBreak(config::get('summarytable_rowcount')); 27 27 28 28 if ($week == 1) -
dev/common/includes/class.config.php
r254 r289 126 126 if (!isset($cache[$key])) 127 127 { 128 return null;128 return config::defaultval($key); 129 129 } 130 130 return stripslashes($cache[$key]); 131 131 } 132 133 function defaultval($key) 134 { 135 // add important upgrade configs here, they will return the default if not set 136 $defaults = array('summarytable_rowcount' => 6); 137 138 if (!isset($defaults[$key])) 139 { 140 return null; 141 } 142 return $defaults[$key]; 143 } 132 144 } 133 145 ?> -
dev/common/includes/class.kill.php
r272 r289 438 438 itd_itl_id, itl_location 439 439 from kb3_items_destroyed itd 440 left join kb3_items itm on itd.itd_itm_id = itm.itm_id441 left join kb3_item_locations itl on (itd.itd_itl_id = itl.itl_id or (itd.itd_itl_id = 0 and itl.itl_id = 1))442 where itd.itd_kll_id = ".$this->getID()."443 group by itd_itm_id, itd_itl_id444 order by itd.itd_itl_id, itm.itm_type";445 446 if (DB_USE_CCP)447 {448 $sql = "select sum(itd.itd_quantity) as itd_quantity, itd_itm_id,449 itd_itl_id, itl_location450 from kb3_items_destroyed itd451 440 left join kb3_item_locations itl on (itd.itd_itl_id = itl.itl_id or (itd.itd_itl_id = 0 and itl.itl_id = 1)) 452 441 where itd.itd_kll_id = ".$this->getID()." 453 442 group by itd_itm_id, itd_itl_id 454 443 order by itd.itd_itl_id"; 455 }456 444 $qry->execute($sql); 457 445 while ($row = $qry->getRow()) … … 463 451 } 464 452 465 if (DB_USE_CCP) 466 { 467 $sql = "select sum(itd.itd_quantity) as itd_quantity, itd_itm_id, 468 itd_itl_id, itl_location 469 from kb3_items_dropped itd 470 left join kb3_item_locations itl on (itd.itd_itl_id = itl.itl_id or (itd.itd_itl_id = 0 and itl.itl_id = 1)) 471 where itd.itd_kll_id = ".$this->getID()." 472 group by itd_itm_id, itd_itl_id 473 order by itd.itd_itl_id"; 474 $qry->execute($sql); 475 while ($row = $qry->getRow()) 476 { 477 $destroyed = new DroppedItem(new Item($row['itd_itm_id']), 478 $row['itd_quantity'], 479 $row['itl_location']); 480 array_push($this->droppeditems_, $destroyed); 481 } 453 // dropped items 454 $sql = "select sum(itd.itd_quantity) as itd_quantity, itd_itm_id, 455 itd_itl_id, itl_location 456 from kb3_items_dropped itd 457 left join kb3_item_locations itl on (itd.itd_itl_id = itl.itl_id or (itd.itd_itl_id = 0 and itl.itl_id = 1)) 458 where itd.itd_kll_id = ".$this->getID()." 459 group by itd_itm_id, itd_itl_id 460 order by itd.itd_itl_id"; 461 $qry->execute($sql); 462 while ($row = $qry->getRow()) 463 { 464 $destroyed = new DroppedItem(new Item($row['itd_itm_id']), 465 $row['itd_quantity'], 466 $row['itl_location']); 467 array_push($this->droppeditems_, $destroyed); 482 468 } 483 469 } -
dev/common/includes/class.killsummarytable.php
r281 r289 140 140 } 141 141 142 142 143 143 $sql = 'SELECT count(*) AS lnb, scl_id, scl_class,'; 144 144 if (config::get('ship_values')) … … 231 231 $odd = false; 232 232 $prevdate = ""; 233 $width = round($this->break_/count($entry)*100); 234 $width_abs = round($this->break_/count($entry)*600); 235 233 236 $html .= "<table class=kb-subtable width=\"100%\" border=\"0\" cellspacing=0>"; 234 237 if ($this->break_) 235 $html .= "<tr><td valign=top ><table class=kb-table cellspacing=\"1\" width=\"100%\">";238 $html .= "<tr><td valign=top width=\"$width%\"><table class=kb-table cellspacing=\"1\" width=\"100%\">"; 236 239 $counter = 1; 237 240 238 if ($this->verbose_) 239 { 240 $header = "<tr class=kb-table-header><td class=kb-table-cell width= 110>Ship class</td><td class=kb-table-cell width=60 align=center>Kills</td><td class=kb-table-cell width=60 align=center>ISK (M)</td><td class=kb-table-cell width=60 align=center>Losses</td><td class=kb-table-cell width=60 align=center>ISK (M)</td></tr>";241 if ($this->verbose_) 242 { 243 $header = "<tr class=kb-table-header><td class=kb-table-cell width=\"$width_abs\">Ship class</td><td class=kb-table-cell width=60 align=center>Kills</td><td class=kb-table-cell width=60 align=center>ISK (M)</td><td class=kb-table-cell width=60 align=center>Losses</td><td class=kb-table-cell width=60 align=center>ISK (M)</td></tr>"; 241 244 } 242 245 else 243 246 { 244 $header = "<tr class=kb-table-header><td class=kb-table-cell width= 110>Ship class</td><td class=kb-table-cell width=30 align=center>K</td><td class=kb-table-cell width=30 align=center>L</td></tr>";245 } 246 247 $header = "<tr class=kb-table-header><td class=kb-table-cell width=\"$width_abs\">Ship class</td><td class=kb-table-cell width=30 align=center>K</td><td class=kb-table-cell width=30 align=center>L</td></tr>"; 248 } 249 247 250 $html .= $header; 248 251 … … 254 257 { 255 258 $html .= "</table></td>"; 256 $html .= "<td valign=top ><table class=kb-table cellspacing=\"1\">";259 $html .= "<td valign=top width=\"$width%\"><table class=kb-table cellspacing=\"1\">"; 257 260 $html .= $header; 258 261 $counter = 1; … … 293 296 $qrystring .= '&view='.$this->view_; 294 297 } 295 $html .= "<td class=kb-table-cell><b>";298 $html .= "<td nowrap class=kb-table-cell><b>"; 296 299 297 300 if ($this->filter_) $html .= "<a class=kb-shipclass".$highlight." href=\"?".$qrystring."&scl_id=".$v['id']."\">"; … … 306 309 if ($this->verbose_) 307 310 $html .= "<td class=".$kclass." align=center>".round($v['kills_isk']/1000000, 2)."</td>"; 308 311 309 312 $html .= "<td class=".$lclass." align=center>".$v['losses']."</td>"; 310 313 if ($this->verbose_) … … 314 317 315 318 $counter++; 316 319 317 320 $this->tkcount_ += $kcount; 318 321 $this->tkisk_ += $kisk; 319 $this->tkpoints_ += $kpoints; 322 $this->tkpoints_ += $kpoints; 320 323 $this->tlcount_ += $lcount; 321 324 $this->tlisk_ += $lisk; … … 333 336 .$this->tkcount_.' Ships killed ('.round($this->tkisk_/1000000, 2).'M ISK)</span></td><td width=49%><span class="losscount">'.$this->tlcount_.' Ships lost ('.round($this->tlisk_/1000000, 2).'M ISK)</span></td></tr></table>'; 334 337 } 335 338 336 339 if ($_GET['scl_id'] != "") 337 340 { -
dev/common/kill_related.php
r281 r289 89 89 90 90 $summarytable = new KillSummaryTable($kslist, $lslist); 91 $summarytable->setBreak( 6);91 $summarytable->setBreak(config::get('summarytable_rowcount')); 92 92 $html .= $summarytable->generate(); 93 93 -
dev/common/kills.php
r281 r289 57 57 $summarytable = new KillSummaryTable($kslist, $llist); 58 58 } 59 $summarytable->setBreak( 6);59 $summarytable->setBreak(config::get('summarytable_rowcount')); 60 60 $html .= $summarytable->generate(); 61 61 -
dev/common/losses.php
r281 r289 54 54 55 55 $summarytable = new KillSummaryTable($klist, $lslist); 56 $summarytable->setBreak( 6);56 $summarytable->setBreak(config::get('summarytable_rowcount')); 57 57 $html .= $summarytable->generate(); 58 58 // $html .= "<table width=\"99%\" align=center><tr><td class=weeknav align=left>"; -
dev/common/pilot_detail.php
r281 r289 56 56 $lpoints = $llist->getPoints(); 57 57 $summary = new KillSummaryTable($klist, $llist); 58 $summary->setBreak( 6);58 $summary->setBreak(config::get('summarytable_rowcount')); 59 59 if ($_GET['view'] == "ships_weapons") 60 60 { -
dev/common/system_detail.php
r281 r289 31 31 32 32 $summarytable = new KillSummaryTable($kslist, $lslist); 33 $summarytable->setBreak( 6);33 $summarytable->setBreak(config::get('summarytable_rowcount')); 34 34 $html .= $summarytable->generate(); 35 35 -
dev/mods/signature_generator/sig.php
r192 r289 80 80 { 81 81 header('Content-Type: image/png'); 82 imagepng($im, 'cache/data/sig_'.$id.'_'.$plt_id); 82 83 } 83 84 else 84 85 { 85 86 header('Content-Type: image/jpeg'); 87 imagejpeg($im, 'cache/data/sig_'.$id.'_'.$plt_id, 90); 86 88 } 87 imagejpeg($im, 'cache/data/sig_'.$id.'_'.$plt_id, 95);88 89 readfile('cache/data/sig_'.$id.'_'.$plt_id); 89 90 ?>