Changeset 326

Show
Ignore:
Timestamp:
05/13/08 21:43:37 (12 years ago)
Author:
ralle030583
Message:

ADD: Possiblity to browse through old months different alliance
ADD: Optinal to killist: "count of involved pilots" ( http://www.eve-dev.net/e107_plugins/forum/forum_viewtopic.php?11744.4)

Location:
dev
Files:
8 modified

Legend:

Unmodified
Added
Removed
  • dev/common/admin/option_generic.php

    r314 r326  
    3737options::fadd('Display Comment Count on Killlists', 'comments_count', 'checkbox'); 
    3838options::fadd('Display Alliance Logos on killlists', 'killlist_alogo', 'checkbox'); 
     39options::fadd('Display Involved Count on killlists', 'killlist_involved', 'checkbox'); 
    3940 
    4041options::cat('Appearance', 'Generic', 'Killdetail'); 
  • dev/common/alliance_detail.php

    r289 r326  
    1919    } 
    2020} 
     21 
     22$month = $_GET['m']; 
     23$year = $_GET['y']; 
     24 
     25if ($month == '') 
     26    $month = kbdate('m'); 
     27 
     28if ($year == '') 
     29    $year = kbdate('Y'); 
     30 
     31if ($month == 12) 
     32{ 
     33    $nmonth = 1; 
     34    $nyear = $year + 1; 
     35} 
     36else 
     37{ 
     38    $nmonth = $month + 1; 
     39    $nyear = $year; 
     40} 
     41if ($month == 1) 
     42{ 
     43    $pmonth = 12; 
     44    $pyear = $year - 1; 
     45} 
     46else 
     47{ 
     48    $pmonth = $month - 1; 
     49    $pyear = $year; 
     50} 
     51$monthname = kbdate("F", strtotime("2000-".$month."-2")); 
     52 
    2153$alliance = new Alliance($all_id); 
    2254$page = new Page('Alliance details - '.$alliance->getName()); 
     
    132164 
    133165        $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>"; 
    135167 
    136168        $list = new TopCorpKillsList(); 
    137169        $list->addInvolvedAlliance($alliance); 
    138170        $list->setPodsNoobShips(false); 
    139         $list->setMonth(kbdate("m")); 
    140         $list->setYear(kbdate("Y")); 
     171        $list->setMonth($month); 
     172        $list->setYear($year); 
    141173        $table = new TopCorpTable($list, "Kills"); 
    142174        $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         
    144179        $html .= "</td><td valign=top width=400>"; 
    145180        $html .= "<div class=block-header>All time</div>"; 
     
    189224 
    190225        } 
    191         $html .= "</tr></table>"; 
    192  
     226        $html .= "</tr></table>";         
    193227        break; 
    194228    case "kills_class": 
     
    308342 
    309343        $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>"; 
    311345 
    312346        $list = new TopCorpLossesList(); 
    313347        $list->addVictimAlliance($alliance); 
    314348        $list->setPodsNoobShips(false); 
    315         $list->setMonth(kbdate("m")); 
    316         $list->setYear(kbdate("Y")); 
     349        $list->setMonth($month); 
     350        $list->setYear($year); 
    317351        $table = new TopCorpTable($list, "Losses"); 
    318352        $html .= $table->generate(); 
    319353 
     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          
    320357        $html .= "</td><td valign=top width=400>"; 
    321358        $html .= "<div class=block-header>All time</div>"; 
     
    334371 
    335372        $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>"; 
    337374 
    338375        $list = new TopKillsList(); 
    339376        $list->addInvolvedAlliance($alliance); 
    340377        $list->setPodsNoobShips(false); 
    341         $list->setMonth(kbdate("m")); 
    342         $list->setYear(kbdate("Y")); 
     378        $list->setMonth($month); 
     379        $list->setYear($year); 
    343380        $table = new TopPilotTable($list, "Kills"); 
    344381        $html .= $table->generate(); 
    345382 
     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         
    346386        $html .= "</td><td valign=top width=400>"; 
    347387        $html .= "<div class=block-header>All time</div>"; 
     
    360400 
    361401        $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>"; 
    363403 
    364404        $list = new TopScoreList(); 
    365405        $list->addInvolvedAlliance($alliance); 
    366406        $list->setPodsNoobShips(true); 
    367         $list->setMonth(kbdate("m")); 
    368         $list->setYear(kbdate("Y")); 
     407        $list->setMonth($month); 
     408        $list->setYear($year); 
    369409        $table = new TopPilotTable($list, "Points"); 
    370410        $html .= $table->generate(); 
    371411 
     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           
    372415        $html .= "</td><td valign=top width=400>"; 
    373416        $html .= "<div class=block-header>All time</div>"; 
     
    386429 
    387430        $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>"; 
    389432 
    390433        $list = new TopLossesList(); 
    391434        $list->addVictimAlliance($alliance); 
    392435        $list->setPodsNoobShips(false); 
    393         $list->setMonth(kbdate("m")); 
    394         $list->setYear(kbdate("Y")); 
     436        $list->setMonth($month); 
     437        $list->setYear($year); 
    395438        $table = new TopPilotTable($list, "Losses"); 
    396439        $html .= $table->generate(); 
    397440 
     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         
    398444        $html .= "</td><td valign=top width=400>"; 
    399445        $html .= "<div class=block-header>All time</div>"; 
  • dev/common/corp_detail.php

    r289 r326  
    1919    } 
    2020} 
     21 
     22$month = $_GET['m']; 
     23$year = $_GET['y']; 
     24 
     25if ($month == '') 
     26    $month = kbdate('m'); 
     27 
     28if ($year == '') 
     29    $year = kbdate('Y'); 
     30 
     31if ($month == 12) 
     32{ 
     33    $nmonth = 1; 
     34    $nyear = $year + 1; 
     35} 
     36else 
     37{ 
     38    $nmonth = $month + 1; 
     39    $nyear = $year; 
     40} 
     41if ($month == 1) 
     42{ 
     43    $pmonth = 12; 
     44    $pyear = $year - 1; 
     45} 
     46else 
     47{ 
     48    $pmonth = $month - 1; 
     49    $pyear = $year; 
     50} 
     51$monthname = kbdate("F", strtotime("2000-".$month."-2")); 
     52 
     53 
    2154$all_id = $_GET['all_id']; 
    2255$corp = new Corporation($crp_id); 
     
    144177 
    145178        $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>"; 
    147180 
    148181        $list = new TopKillsList(); 
    149182        $list->addInvolvedCorp($corp); 
    150183        $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         
    156192        $html .= "</td><td valign=top width=400>"; 
    157193        $html .= "<div class=block-header>All time</div>"; 
     
    170206 
    171207        $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>"; 
    173209 
    174210        $list = new TopScoreList(); 
    175211        $list->addInvolvedCorp($corp); 
    176212        $list->setPodsNoobShips(true); 
    177         $list->setMonth(kbdate("m")); 
    178         $list->setYear(kbdate("Y")); 
     213        $list->setMonth($month); 
     214        $list->setYear($year); 
    179215        $table = new TopPilotTable($list, "Points"); 
    180216        $html .= $table->generate(); 
    181217 
     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         
    182221        $html .= "</td><td valign=top width=400>"; 
    183222        $html .= "<div class=block-header>All time</div>"; 
     
    196235 
    197236        $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>"; 
    199238 
    200239        $list = new TopSoloKillerList(); 
    201240        $list->addInvolvedCorp($corp); 
    202241        $list->setPodsNoobShips(false); 
    203         $list->setMonth(kbdate("m")); 
    204         $list->setYear(kbdate("Y")); 
     242        $list->setMonth($month); 
     243        $list->setYear($year); 
    205244        $table = new TopPilotTable($list, "Solokills"); 
    206245        $html .= $table->generate(); 
    207246 
     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         
    208250        $html .= "</td><td valign=top width=400>"; 
    209251        $html .= "<div class=block-header>All time</div>"; 
     
    223265 
    224266        $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>"; 
    226268 
    227269        $list = new TopDamageDealerList(); 
    228270        $list->addInvolvedCorp($corp); 
    229271        $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         
    235280        $html .= "</td><td valign=top width=400>"; 
    236281        $html .= "<div class=block-header>All time</div>"; 
     
    250295 
    251296        $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>"; 
    253298 
    254299        $list = new TopGrieferList(); 
    255300        $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         
    261309        $html .= "</td><td valign=top width=400>"; 
    262310        $html .= "<div class=block-header>All time</div>"; 
     
    275323 
    276324        $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>"; 
    278326 
    279327        $list = new TopLossesList(); 
    280328        $list->addVictimCorp($corp); 
    281329        $list->setPodsNoobShips(false); 
    282         $list->setMonth(kbdate("m")); 
    283         $list->setYear(kbdate("Y")); 
     330        $list->setMonth($month); 
     331        $list->setYear($year); 
    284332        $table = new TopPilotTable($list, "Losses"); 
    285333        $html .= $table->generate(); 
    286334 
     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         
    287338        $html .= "</td><td valign=top width=400>"; 
    288339        $html .= "<div class=block-header>All time</div>"; 
  • dev/common/includes/class.kill.php

    r289 r326  
    517517    } 
    518518 
     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     
    519527    function exists() 
    520528    { 
  • dev/common/includes/class.killlisttable.php

    r254 r326  
    7474            $kll['system'] = $kill->getSolarSystemName(); 
    7575            $kll['systemsecurity'] = $kill->getSolarSystemSecurity(); 
     76            $kll['inv'] = $kill->getInvolvedPartyCount(); 
    7677            $kll['timestamp'] = $kill->getTimeStamp(); 
    7778            if (config::get('killlist_alogo')) 
  • dev/common/includes/globals.php

    r325 r326  
    11<?php 
    22// current subversion revision 
    3 preg_match('/\$Re'.'vision: (.*?) \$/', '$Revision: 325 $', $match); 
     3preg_match('/\$Re'.'vision: (.*?) \$/', '$Revision: 326 $', $match); 
    44define('SVN_REV', $match[1]); 
    55 
  • dev/mods/history/history.xml

    r325 r326  
    11<?xml version="1.0" ?> 
    22<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> 
    320        <changeset> 
    421                <rev>325</rev> 
  • dev/templates/killlisttable.tpl

    r295 r326  
    99        <td class="kb-table-header">Final blow</td> 
    1010        <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} 
    1114        <td class="kb-table-header" align="center">Time</td> 
    1215    {if $comments_count} 
     
    3336        <td width="200" class="kb-table-cell"><b>{$k.fb}</b><br>{$k.fbcorp|truncate:30}</td> 
    3437        <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} 
    3541        {if $daybreak} 
    3642        <td class="kb-table-cell" align="center"><b>{$k.timestamp|date_format:"%H:%M"}</b></td>