Changeset 326
- Timestamp:
- 05/13/08 21:43:37 (13 years ago)
- Location:
- dev
- Files:
-
- 8 modified
-
common/admin/option_generic.php (modified) (1 diff)
-
common/alliance_detail.php (modified) (7 diffs)
-
common/corp_detail.php (modified) (7 diffs)
-
common/includes/class.kill.php (modified) (1 diff)
-
common/includes/class.killlisttable.php (modified) (1 diff)
-
common/includes/globals.php (modified) (1 diff)
-
mods/history/history.xml (modified) (1 diff)
-
templates/killlisttable.tpl (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
dev/common/admin/option_generic.php
r314 r326 37 37 options::fadd('Display Comment Count on Killlists', 'comments_count', 'checkbox'); 38 38 options::fadd('Display Alliance Logos on killlists', 'killlist_alogo', 'checkbox'); 39 options::fadd('Display Involved Count on killlists', 'killlist_involved', 'checkbox'); 39 40 40 41 options::cat('Appearance', 'Generic', 'Killdetail'); -
dev/common/alliance_detail.php
r289 r326 19 19 } 20 20 } 21 22 $month = $_GET['m']; 23 $year = $_GET['y']; 24 25 if ($month == '') 26 $month = kbdate('m'); 27 28 if ($year == '') 29 $year = kbdate('Y'); 30 31 if ($month == 12) 32 { 33 $nmonth = 1; 34 $nyear = $year + 1; 35 } 36 else 37 { 38 $nmonth = $month + 1; 39 $nyear = $year; 40 } 41 if ($month == 1) 42 { 43 $pmonth = 12; 44 $pyear = $year - 1; 45 } 46 else 47 { 48 $pmonth = $month - 1; 49 $pyear = $year; 50 } 51 $monthname = kbdate("F", strtotime("2000-".$month."-2")); 52 21 53 $alliance = new Alliance($all_id); 22 54 $page = new Page('Alliance details - '.$alliance->getName()); … … 132 164 133 165 $html .= "<table class=kb-subtable><tr><td valign=top width=440>"; 134 $html .= "<div class=block-header> This month</div>";166 $html .= "<div class=block-header>$monthname $year</div>"; 135 167 136 168 $list = new TopCorpKillsList(); 137 169 $list->addInvolvedAlliance($alliance); 138 170 $list->setPodsNoobShips(false); 139 $list->setMonth( kbdate("m"));140 $list->setYear( kbdate("Y"));171 $list->setMonth($month); 172 $list->setYear($year); 141 173 $table = new TopCorpTable($list, "Kills"); 142 174 $html .= $table->generate(); 143 175 176 $html .= "<table width=300 cellspacing=1><tr><td><a href='?a=alliance_detail&view=corp_kills&m=$pmonth&all_id=$all_id&y=$pyear'>previous</a></td>"; 177 $html .= "<td align='right'><a href='?a=alliance_detail&view=corp_kills&all_id=$all_id&m=$nmonth&y=$nyear'>next</a></p></td></tr></table>"; 178 144 179 $html .= "</td><td valign=top width=400>"; 145 180 $html .= "<div class=block-header>All time</div>"; … … 189 224 190 225 } 191 $html .= "</tr></table>"; 192 226 $html .= "</tr></table>"; 193 227 break; 194 228 case "kills_class": … … 308 342 309 343 $html .= "<table class=kb-subtable><tr><td valign=top width=440>"; 310 $html .= "<div class=block-header> This month</div>";344 $html .= "<div class=block-header>$monthname $year</div>"; 311 345 312 346 $list = new TopCorpLossesList(); 313 347 $list->addVictimAlliance($alliance); 314 348 $list->setPodsNoobShips(false); 315 $list->setMonth( kbdate("m"));316 $list->setYear( kbdate("Y"));349 $list->setMonth($month); 350 $list->setYear($year); 317 351 $table = new TopCorpTable($list, "Losses"); 318 352 $html .= $table->generate(); 319 353 354 $html .= "<table width=300 cellspacing=1><tr><td><a href='?a=alliance_detail&view=corp_losses&m=$pmonth&all_id=$all_id&y=$pyear'>previous</a></td>"; 355 $html .= "<td align='right'><a href='?a=alliance_detail&view=corp_losses&all_id=$all_id&m=$nmonth&y=$nyear'>next</a></p></td></tr></table>"; 356 320 357 $html .= "</td><td valign=top width=400>"; 321 358 $html .= "<div class=block-header>All time</div>"; … … 334 371 335 372 $html .= "<table class=kb-subtable><tr><td valign=top width=440>"; 336 $html .= "<div class=block-header> This month</div>";373 $html .= "<div class=block-header>$monthname $year</div>"; 337 374 338 375 $list = new TopKillsList(); 339 376 $list->addInvolvedAlliance($alliance); 340 377 $list->setPodsNoobShips(false); 341 $list->setMonth( kbdate("m"));342 $list->setYear( kbdate("Y"));378 $list->setMonth($month); 379 $list->setYear($year); 343 380 $table = new TopPilotTable($list, "Kills"); 344 381 $html .= $table->generate(); 345 382 383 $html .= "<table width=300 cellspacing=1><tr><td><a href='?a=alliance_detail&view=pilot_kills&m=$pmonth&all_id=$all_id&y=$pyear'>previous</a></td>"; 384 $html .= "<td align='right'><a href='?a=alliance_detail&view=pilot_kills&all_id=$all_id&m=$nmonth&y=$nyear'>next</a></p></td></tr></table>"; 385 346 386 $html .= "</td><td valign=top width=400>"; 347 387 $html .= "<div class=block-header>All time</div>"; … … 360 400 361 401 $html .= "<table class=kb-subtable><tr><td valign=top width=440>"; 362 $html .= "<div class=block-header> This month</div>";402 $html .= "<div class=block-header>$monthname $year</div>"; 363 403 364 404 $list = new TopScoreList(); 365 405 $list->addInvolvedAlliance($alliance); 366 406 $list->setPodsNoobShips(true); 367 $list->setMonth( kbdate("m"));368 $list->setYear( kbdate("Y"));407 $list->setMonth($month); 408 $list->setYear($year); 369 409 $table = new TopPilotTable($list, "Points"); 370 410 $html .= $table->generate(); 371 411 412 $html .= "<table width=300 cellspacing=1><tr><td><a href='?a=alliance_detail&view=pilot_scores&m=$pmonth&all_id=$all_id&y=$pyear'>previous</a></td>"; 413 $html .= "<td align='right'><a href='?a=alliance_detail&view=pilot_scores&all_id=$all_id&m=$nmonth&y=$nyear'>next</a></p></td></tr></table>"; 414 372 415 $html .= "</td><td valign=top width=400>"; 373 416 $html .= "<div class=block-header>All time</div>"; … … 386 429 387 430 $html .= "<table class=kb-subtable><tr><td valign=top width=440>"; 388 $html .= "<div class=block-header> This month</div>";431 $html .= "<div class=block-header>$monthname $year</div>"; 389 432 390 433 $list = new TopLossesList(); 391 434 $list->addVictimAlliance($alliance); 392 435 $list->setPodsNoobShips(false); 393 $list->setMonth( kbdate("m"));394 $list->setYear( kbdate("Y"));436 $list->setMonth($month); 437 $list->setYear($year); 395 438 $table = new TopPilotTable($list, "Losses"); 396 439 $html .= $table->generate(); 397 440 441 $html .= "<table width=300 cellspacing=1><tr><td><a href='?a=alliance_detail&view=pilot_losses&m=$pmonth&all_id=$all_id&y=$pyear'>previous</a></td>"; 442 $html .= "<td align='right'><a href='?a=alliance_detail&view=pilot_losses&all_id=$all_id&m=$nmonth&y=$nyear'>next</a></p></td></tr></table>"; 443 398 444 $html .= "</td><td valign=top width=400>"; 399 445 $html .= "<div class=block-header>All time</div>"; -
dev/common/corp_detail.php
r289 r326 19 19 } 20 20 } 21 22 $month = $_GET['m']; 23 $year = $_GET['y']; 24 25 if ($month == '') 26 $month = kbdate('m'); 27 28 if ($year == '') 29 $year = kbdate('Y'); 30 31 if ($month == 12) 32 { 33 $nmonth = 1; 34 $nyear = $year + 1; 35 } 36 else 37 { 38 $nmonth = $month + 1; 39 $nyear = $year; 40 } 41 if ($month == 1) 42 { 43 $pmonth = 12; 44 $pyear = $year - 1; 45 } 46 else 47 { 48 $pmonth = $month - 1; 49 $pyear = $year; 50 } 51 $monthname = kbdate("F", strtotime("2000-".$month."-2")); 52 53 21 54 $all_id = $_GET['all_id']; 22 55 $corp = new Corporation($crp_id); … … 144 177 145 178 $html .= "<table class=kb-subtable><tr><td valign=top width=440>"; 146 $html .= "<div class=block-header> This month</div>";179 $html .= "<div class=block-header>$monthname $year</div>"; 147 180 148 181 $list = new TopKillsList(); 149 182 $list->addInvolvedCorp($corp); 150 183 $list->setPodsNoobShips(false); 151 $list->setMonth(kbdate("m")); 152 $list->setYear(kbdate("Y")); 153 $table = new TopPilotTable($list, "Kills"); 154 $html .= $table->generate(); 155 184 $list->setMonth($month); 185 $list->setYear($year); 186 $table = new TopPilotTable($list, "Kills"); 187 $html .= $table->generate(); 188 189 $html .= "<table width=300 cellspacing=1><tr><td><a href='?a=corp_detail&view=pilot_kills&m=$pmonth&crp_id=$crp_id&y=$pyear'>previous</a></td>"; 190 $html .= "<td align='right'><a href='?a=corp_detail&view=pilot_kills&crp_id=$crp_id&m=$nmonth&y=$nyear'>next</a></p></td></tr></table>"; 191 156 192 $html .= "</td><td valign=top width=400>"; 157 193 $html .= "<div class=block-header>All time</div>"; … … 170 206 171 207 $html .= "<table class=kb-subtable><tr><td valign=top width=440>"; 172 $html .= "<div class=block-header> This month</div>";208 $html .= "<div class=block-header>$monthname $year</div>"; 173 209 174 210 $list = new TopScoreList(); 175 211 $list->addInvolvedCorp($corp); 176 212 $list->setPodsNoobShips(true); 177 $list->setMonth( kbdate("m"));178 $list->setYear( kbdate("Y"));213 $list->setMonth($month); 214 $list->setYear($year); 179 215 $table = new TopPilotTable($list, "Points"); 180 216 $html .= $table->generate(); 181 217 218 $html .= "<table width=300 cellspacing=1><tr><td><a href='?a=corp_detail&view=pilot_scores&m=$pmonth&crp_id=$crp_id&y=$pyear'>previous</a></td>"; 219 $html .= "<td align='right'><a href='?a=corp_detail&view=pilot_scores&crp_id=$crp_id&m=$nmonth&y=$nyear'>next</a></p></td></tr></table>"; 220 182 221 $html .= "</td><td valign=top width=400>"; 183 222 $html .= "<div class=block-header>All time</div>"; … … 196 235 197 236 $html .= "<table class=kb-subtable><tr><td valign=top width=440>"; 198 $html .= "<div class=block-header> This month</div>";237 $html .= "<div class=block-header>$monthname $year</div>"; 199 238 200 239 $list = new TopSoloKillerList(); 201 240 $list->addInvolvedCorp($corp); 202 241 $list->setPodsNoobShips(false); 203 $list->setMonth( kbdate("m"));204 $list->setYear( kbdate("Y"));242 $list->setMonth($month); 243 $list->setYear($year); 205 244 $table = new TopPilotTable($list, "Solokills"); 206 245 $html .= $table->generate(); 207 246 247 $html .= "<table width=300 cellspacing=1><tr><td><a href='?a=corp_detail&view=pilot_solo&m=$pmonth&crp_id=$crp_id&y=$pyear'>previous</a></td>"; 248 $html .= "<td align='right'><a href='?a=corp_detail&view=pilot_solo&crp_id=$crp_id&m=$nmonth&y=$nyear'>next</a></p></td></tr></table>"; 249 208 250 $html .= "</td><td valign=top width=400>"; 209 251 $html .= "<div class=block-header>All time</div>"; … … 223 265 224 266 $html .= "<table class=kb-subtable><tr><td valign=top width=440>"; 225 $html .= "<div class=block-header> This month</div>";267 $html .= "<div class=block-header>$monthname $year</div>"; 226 268 227 269 $list = new TopDamageDealerList(); 228 270 $list->addInvolvedCorp($corp); 229 271 $list->setPodsNoobShips(false); 230 $list->setMonth(kbdate("m")); 231 $list->setYear(kbdate("Y")); 232 $table = new TopPilotTable($list, "Kills"); 233 $html .= $table->generate(); 234 272 $list->setMonth($month); 273 $list->setYear($year); 274 $table = new TopPilotTable($list, "Kills"); 275 $html .= $table->generate(); 276 277 $html .= "<table width=300 cellspacing=1><tr><td><a href='?a=corp_detail&view=pilot_damage&m=$pmonth&crp_id=$crp_id&y=$pyear'>previous</a></td>"; 278 $html .= "<td align='right'><a href='?a=corp_detail&view=pilot_damage&crp_id=$crp_id&m=$nmonth&y=$nyear'>next</a></p></td></tr></table>"; 279 235 280 $html .= "</td><td valign=top width=400>"; 236 281 $html .= "<div class=block-header>All time</div>"; … … 250 295 251 296 $html .= "<table class=kb-subtable><tr><td valign=top width=440>"; 252 $html .= "<div class=block-header> This month</div>";297 $html .= "<div class=block-header>$monthname $year</div>"; 253 298 254 299 $list = new TopGrieferList(); 255 300 $list->addInvolvedCorp($corp); 256 $list->setMonth(kbdate("m")); 257 $list->setYear(kbdate("Y")); 258 $table = new TopPilotTable($list, "Kills"); 259 $html .= $table->generate(); 260 301 $list->setMonth($month); 302 $list->setYear($year); 303 $table = new TopPilotTable($list, "Kills"); 304 $html .= $table->generate(); 305 306 $html .= "<table width=300 cellspacing=1><tr><td><a href='?a=corp_detail&view=pilot_griefer&m=$pmonth&crp_id=$crp_id&y=$pyear'>previous</a></td>"; 307 $html .= "<td align='right'><a href='?a=corp_detail&view=pilot_griefer&crp_id=$crp_id&m=$nmonth&y=$nyear'>next</a></p></td></tr></table>"; 308 261 309 $html .= "</td><td valign=top width=400>"; 262 310 $html .= "<div class=block-header>All time</div>"; … … 275 323 276 324 $html .= "<table class=kb-subtable><tr><td valign=top width=440>"; 277 $html .= "<div class=block-header> This month</div>";325 $html .= "<div class=block-header>$monthname $year</div>"; 278 326 279 327 $list = new TopLossesList(); 280 328 $list->addVictimCorp($corp); 281 329 $list->setPodsNoobShips(false); 282 $list->setMonth( kbdate("m"));283 $list->setYear( kbdate("Y"));330 $list->setMonth($month); 331 $list->setYear($year); 284 332 $table = new TopPilotTable($list, "Losses"); 285 333 $html .= $table->generate(); 286 334 335 $html .= "<table width=300 cellspacing=1><tr><td><a href='?a=corp_detail&view=pilot_losses&m=$pmonth&crp_id=$crp_id&y=$pyear'>previous</a></td>"; 336 $html .= "<td align='right'><a href='?a=corp_detail&view=pilot_losses&crp_id=$crp_id&m=$nmonth&y=$nyear'>next</a></p></td></tr></table>"; 337 287 338 $html .= "</td><td valign=top width=400>"; 288 339 $html .= "<div class=block-header>All time</div>"; -
dev/common/includes/class.kill.php
r289 r326 517 517 } 518 518 519 function getInvolvedPartyCount() 520 { 521 $qry = new DBQuery(); 522 $qry->execute("select count(inp_kll_id) inv from kb3_inv_plt where inp_kll_id = ". $this->id_); 523 $result = $qry->getRow(); 524 return $result['inv']; 525 } 526 519 527 function exists() 520 528 { -
dev/common/includes/class.killlisttable.php
r254 r326 74 74 $kll['system'] = $kill->getSolarSystemName(); 75 75 $kll['systemsecurity'] = $kill->getSolarSystemSecurity(); 76 $kll['inv'] = $kill->getInvolvedPartyCount(); 76 77 $kll['timestamp'] = $kill->getTimeStamp(); 77 78 if (config::get('killlist_alogo')) -
dev/common/includes/globals.php
r325 r326 1 1 <?php 2 2 // current subversion revision 3 preg_match('/\$Re'.'vision: (.*?) \$/', '$Revision: 32 5$', $match);3 preg_match('/\$Re'.'vision: (.*?) \$/', '$Revision: 326 $', $match); 4 4 define('SVN_REV', $match[1]); 5 5 -
dev/mods/history/history.xml
r325 r326 1 1 <?xml version="1.0" ?> 2 2 <history> 3 <changeset> 4 <rev>326</rev> 5 <author>ralle030583</author> 6 <date>13.05.2008</date> 7 <comment> 8 <type>ADD</type> 9 <text> 10 Possiblity to browse through old months different alliance and corp detail stats 11 </text> 12 </comment> 13 <comment> 14 <type>ADD</type> 15 <text> 16 Optinal to killist: count of involved pilots (by sheezaa) 17 </text> 18 </comment> 19 </changeset> 3 20 <changeset> 4 21 <rev>325</rev> -
dev/templates/killlisttable.tpl
r295 r326 9 9 <td class="kb-table-header">Final blow</td> 10 10 <td class="kb-table-header" align="center">System</td> 11 {if $config->get('killlist_involved')} 12 <td class="kb-table-header" align="center">Inv.</td> 13 {/if} 11 14 <td class="kb-table-header" align="center">Time</td> 12 15 {if $comments_count} … … 33 36 <td width="200" class="kb-table-cell"><b>{$k.fb}</b><br>{$k.fbcorp|truncate:30}</td> 34 37 <td width="110" class="kb-table-cell" align="center"><b>{$k.system|truncate:10}</b><br/>({$k.systemsecurity|max:0|string_format:"%01.1f"})</td> 38 {if $config->get('killlist_involved')} 39 <td width="30" align="center" class="kb-table-cell"><b>{$k.inv}</b></td> 40 {/if} 35 41 {if $daybreak} 36 42 <td class="kb-table-cell" align="center"><b>{$k.timestamp|date_format:"%H:%M"}</b></td>
