Changeset 240

Show
Ignore:
Timestamp:
09/25/07 15:26:51 (15 years ago)
Author:
ralle030583
Message:

Implemented exi's involvedloader class

Location:
dev
Files:
1 added
18 modified

Legend:

Unmodified
Added
Removed

  • dev/common/awards.php

    r239 r240  
    4949$tklist->setMonth($month); 
    5050$tklist->setYear($year); 
    51 if (CORP_ID) 
    52     $tklist->addInvolvedCorp(new Corporation(CORP_ID)); 
    53 if (ALLIANCE_ID) 
    54     $tklist->addInvolvedAlliance(new Alliance(ALLIANCE_ID)); 
     51involved::load($tklist,'kill'); 
    5552 
    5653$tklist->generate(); 
    … …  
    6360    $tklist->setMonth($month); 
    6461    $tklist->setYear($year); 
    65     if (CORP_ID) 
    66         $tklist->addInvolvedCorp(new Corporation(CORP_ID)); 
    67     if (ALLIANCE_ID) 
    68         $tklist->addInvolvedAlliance(new Alliance(ALLIANCE_ID)); 
     62    involved::load($tklist,'kill'); 
    6963 
    7064    $tklist->generate(); 
    … …  
    7670$tklist->setMonth($month); 
    7771$tklist->setYear($year); 
    78 if (CORP_ID) 
    79     $tklist->addInvolvedCorp(new Corporation(CORP_ID)); 
    80 if (ALLIANCE_ID) 
    81     $tklist->addInvolvedAlliance(new Alliance(ALLIANCE_ID)); 
     72involved::load($tklist,'kill'); 
    8273 
    8374$tklist->generate(); 
    … …  
    8879$tklist->setMonth($month); 
    8980$tklist->setYear($year); 
    90 if (CORP_ID) 
    91     $tklist->addInvolvedCorp(new Corporation(CORP_ID)); 
    92 if (ALLIANCE_ID) 
    93     $tklist->addInvolvedAlliance(new Alliance(ALLIANCE_ID)); 
     81involved::load($tklist,'kill'); 
    9482 
    9583$tklist->generate(); 
    … …  
    10290$tklist->setMonth($month); 
    10391$tklist->setYear($year); 
    104 if (CORP_ID) 
    105     $tklist->addInvolvedCorp(new Corporation(CORP_ID)); 
    106 if (ALLIANCE_ID) 
    107     $tklist->addInvolvedAlliance(new Alliance(ALLIANCE_ID)); 
     92involved::load($tklist,'kill'); 
    10893 
    10994$tklist->generate(); 
    … …  
    11499$tklist->setMonth($month); 
    115100$tklist->setYear($year); 
    116 if (CORP_ID) 
    117     $tklist->addInvolvedCorp(new Corporation(CORP_ID)); 
    118 if (ALLIANCE_ID) 
    119     $tklist->addInvolvedAlliance(new Alliance(ALLIANCE_ID)); 
     101involved::load($tklist,'kill'); 
    120102 
    121103$tklist->generate(); 
    … …  
    126108$tklist->setMonth($month); 
    127109$tklist->setYear($year); 
    128 if (CORP_ID) 
    129     $tklist->addInvolvedCorp(new Corporation(CORP_ID)); 
    130 if (ALLIANCE_ID) 
    131     $tklist->addInvolvedAlliance(new Alliance(ALLIANCE_ID)); 
     110involved::load($tklist,'kill'); 
    132111 
    133112$tklist->generate(); 
    … …  
    138117$tklist->setMonth($month); 
    139118$tklist->setYear($year); 
    140 if (CORP_ID) 
    141     $tklist->addInvolvedCorp(new Corporation(CORP_ID)); 
    142 if (ALLIANCE_ID) 
    143     $tklist->addInvolvedAlliance(new Alliance(ALLIANCE_ID)); 
     119involved::load($tklist,'kill'); 
    144120 
    145121$tklist->generate(); 

  • dev/common/cc_detail.php

    r234 r240  
    207207$tklist = new TopContractKillsList(); 
    208208$tklist->setContract(new Contract($ctr_id)); 
    209 if (CORP_ID) 
    210     $tklist->addInvolvedCorp(new Corporation(CORP_ID)); 
    211 if (ALLIANCE_ID) 
    212     $tklist->addInvolvedAlliance(new Alliance(ALLIANCE_ID)); 
     209involved::load($tklist,'kill'); 
    213210 
    214211$tklist->generate(); 
    … …  
    225222    $tklist = new TopContractScoreList(); 
    226223    $tklist->setContract(new Contract($ctr_id)); 
    227     if (CORP_ID) 
    228         $tklist->addInvolvedCorp(new Corporation(CORP_ID)); 
    229     if (ALLIANCE_ID) 
    230         $tklist->addInvolvedAlliance(new Alliance(ALLIANCE_ID)); 
     224    involved::load($tklist,'kill'); 
    231225 
    232226    $tklist->generate(); 

  • dev/common/home.php

    r233 r240  
    1414 
    1515$kslist = new KillList(); 
    16 if (CORP_ID) 
    17     $kslist->addInvolvedCorp(new Corporation(CORP_ID)); 
    18 if (ALLIANCE_ID) 
    19     $kslist->addInvolvedAlliance(new Alliance(ALLIANCE_ID)); 
    20  
     16involved::load($kslist,'kill'); 
    2117$kslist->setWeek($week); 
    2218$kslist->setYear($year); 
    2319 
    2420$llist = new KillList(); 
    25 if (CORP_ID) 
    26     $llist->addVictimCorp(new Corporation(CORP_ID)); 
    27 if (ALLIANCE_ID) 
    28     $llist->addVictimAlliance(new Alliance(ALLIANCE_ID)); 
    29  
     21involved::load($llist,'loss'); 
    3022$llist->setWeek($week); 
    3123$llist->setYear($year); 
    … …  
    7870$klist = new KillList(); 
    7971$klist->setOrdered(true); 
    80 if (CORP_ID) 
    81     $klist->addInvolvedCorp(new Corporation(CORP_ID)); 
    82 if (ALLIANCE_ID) 
    83     $klist->addInvolvedAlliance(new Alliance(ALLIANCE_ID)); 
     72involved::load($klist,'kill'); 
     73 
    8474 
    8575// boards with low killcount could not display 20 kills with those limits 
    … …  
    10797$tklist->setWeek($week); 
    10898$tklist->setYear($year); 
    109 if (CORP_ID) 
    110     $tklist->addInvolvedCorp(new Corporation(CORP_ID)); 
    111 if (ALLIANCE_ID) 
    112     $tklist->addInvolvedAlliance(new Alliance(ALLIANCE_ID)); 
     99involved::load($tklist,'kill'); 
    113100 
    114101$tklist->generate(); 
    … …  
    121108    $tklist->setWeek($week); 
    122109    $tklist->setYear($year); 
    123     if (CORP_ID) 
    124         $tklist->addInvolvedCorp(new Corporation(CORP_ID)); 
    125     if (ALLIANCE_ID) 
    126         $tklist->addInvolvedAlliance(new Alliance(ALLIANCE_ID)); 
     110    involved::load($tklist,'kill'); 
    127111 
    128112    $tklist->generate(); 

  • dev/common/igb_home.php

    r233 r240  
    1414 
    1515$kslist = new KillList(); 
    16 if (CORP_ID) 
    17     $kslist->addInvolvedCorp(new Corporation(CORP_ID)); 
    18 if (ALLIANCE_ID) 
    19     $kslist->addInvolvedAlliance(new Alliance(ALLIANCE_ID)); 
    20  
     16involved::load($kslist,'kill'); 
    2117$kslist->setWeek($week); 
    2218$kslist->setYear($year); 
    2319 
    2420$llist = new KillList(); 
    25 if (CORP_ID) 
    26     $llist->addVictimCorp(new Corporation(CORP_ID)); 
    27 if (ALLIANCE_ID) 
    28     $llist->addVictimAlliance(new Alliance(ALLIANCE_ID)); 
    29  
     21involved::load($llist,'loss'); 
    3022$llist->setWeek($week); 
    3123$llist->setYear($year); 
    … …  
    7062$klist = new KillList(); 
    7163$klist->setOrdered(true); 
    72 if (CORP_ID) 
    73     $klist->addInvolvedCorp(new Corporation(CORP_ID)); 
    74 if (ALLIANCE_ID) 
    75     $klist->addInvolvedAlliance(new Alliance(ALLIANCE_ID)); 
     64involved::load($klist,'kill'); 
    7665 
    7766// boards with low killcount could not display 20 kills with those limits 
    … …  
    9988$tklist->setWeek($week); 
    10089$tklist->setYear($year); 
    101 if (CORP_ID) 
    102     $tklist->addInvolvedCorp(new Corporation(CORP_ID)); 
    103 if (ALLIANCE_ID) 
    104     $tklist->addInvolvedAlliance(new Alliance(ALLIANCE_ID)); 
     90involved::load($tklist,'kill'); 
    10591 
    10692$tklist->generate(); 
    … …  
    11399    $tklist->setWeek($week); 
    114100    $tklist->setYear($year); 
    115     if (CORP_ID) 
    116         $tklist->addInvolvedCorp(new Corporation(CORP_ID)); 
    117     if (ALLIANCE_ID) 
    118         $tklist->addInvolvedAlliance(new Alliance(ALLIANCE_ID)); 
     101    involved::load($tklist,'kill'); 
    119102 
    120103    $tklist->generate(); 

  • dev/common/includes/class.contract.php

    r201 r240  
    1515        $this->klist_ = new KillList(); 
    1616        $this->llist_ = new KillList(); 
    17         if (CORP_ID) 
    18         { 
    19             $this->klist_->addInvolvedCorp(new Corporation(CORP_ID)); 
    20             $this->llist_->addVictimCorp(new Corporation(CORP_ID)); 
    21         } 
    22         if (ALLIANCE_ID) 
    23         { 
    24             $this->klist_->addInvolvedAlliance(new Alliance(ALLIANCE_ID)); 
    25             $this->llist_->addVictimAlliance(new Alliance(ALLIANCE_ID)); 
    26         } 
     17        involved::load($this->klist_,'kill'); 
     18        involved::load($this->llist_,'loss'); 
    2719        $this->contractpointer_ = 0; 
    2820        $this->qry_ = null; 
    … …  
    301293            $this->id_ = $this->sys_id_; 
    302294        } 
    303         if (CORP_ID) 
    304         { 
    305             $this->klist_->addInvolvedCorp(new Corporation(CORP_ID)); 
    306             $this->llist_->addVictimCorp(new Corporation(CORP_ID)); 
    307         } 
    308         if (ALLIANCE_ID) 
    309         { 
    310             $this->klist_->addInvolvedAlliance(new Alliance(ALLIANCE_ID)); 
    311             $this->llist_->addVictimAlliance(new Alliance(ALLIANCE_ID)); 
    312         } 
     295         
     296        involved::load($this->klist_,'kill'); 
     297        involved::load($this->llist_,'loss'); 
    313298 
    314299        $this->klist_->setStartDate($contract->getStartDate()); 

  • dev/common/includes/class.kill.php

    r226 r240  
    448448        $kslist = new KillList(); 
    449449        $kslist->setRelated($this->id_); 
    450         if (CORP_ID) 
    451             $kslist->addInvolvedCorp(new Corporation(CORP_ID)); 
    452         if (ALLIANCE_ID) 
    453             $kslist->addInvolvedAlliance(new Alliance(ALLIANCE_ID)); 
     450        involved::load($kslist,'kill'); 
    454451 
    455452        return $kslist->getCount(); 
    … …  
    460457        $lslist = new KillList(); 
    461458        $lslist->setRelated($this->id_); 
    462         if (CORP_ID) 
    463             $lslist->addVictimCorp(new Corporation(CORP_ID)); 
    464         if (ALLIANCE_ID) 
    465             $lslist->addVictimAlliance(new Alliance(ALLIANCE_ID)); 
     459        involved::load($lslist,'loss'); 
    466460 
    467461        return $lslist->getCount(); 

  • dev/common/includes/globals.php

    r239 r240  
    11<?php 
    22// current subversion revision 
    3 preg_match('/\$Re'.'vision: (.*?) \$/', '$Revision: 239 $', $match); 
     3preg_match('/\$Re'.'vision: (.*?) \$/', '$Revision: 240 $', $match); 
    44define('SVN_REV', $match[1]); 
    55 

  • dev/common/index.php

    r239 r240  
    3131require_once('common/includes/class.user.php'); 
    3232require_once('common/includes/class.session.php'); 
     33require_once('common/includes/class.involvedloader.php'); 
    3334require_once('common/smarty/Smarty.class.php'); 
    3435 

  • dev/common/kill_related.php

    r233 r240  
    7979$kslist->setStartDate($firstts); 
    8080$kslist->setEndDate($lastts); 
    81 if (CORP_ID) 
    82     $kslist->addInvolvedCorp(new Corporation(CORP_ID)); 
    83 if (ALLIANCE_ID) 
    84     $kslist->addInvolvedAlliance(new Alliance(ALLIANCE_ID)); 
     81involved::load($kslist,'kill'); 
    8582 
    8683$lslist = new KillList(); 
    … …  
    8986$lslist->setStartDate($firstts); 
    9087$lslist->setEndDate($lastts); 
    91 if (CORP_ID) 
    92     $lslist->addVictimCorp(new Corporation(CORP_ID)); 
    93 if (ALLIANCE_ID) 
    94     $lslist->addVictimAlliance(new Alliance(ALLIANCE_ID)); 
     88involved::load($lslist,'loss'); 
    9589 
    9690$summarytable = new KillSummaryTable($kslist, $lslist); 
    … …  
    10397$klist->setStartDate($firstts); 
    10498$klist->setEndDate($lastts); 
    105 if (CORP_ID) 
    106     $klist->addInvolvedCorp(new Corporation(CORP_ID)); 
    107 if (ALLIANCE_ID) 
    108     $klist->addInvolvedAlliance(new Alliance(ALLIANCE_ID)); 
     99involved::load($klist,'kill'); 
    109100 
    110101$llist = new KillList(); 
    … …  
    113104$llist->setStartDate($firstts); 
    114105$llist->setEndDate($lastts); 
    115 if (CORP_ID) 
    116     $llist->addVictimCorp(new Corporation(CORP_ID)); 
    117 if (ALLIANCE_ID) 
    118     $llist->addVictimAlliance(new Alliance(ALLIANCE_ID)); 
     106involved::load($llist,'loss'); 
    119107 
    120108if ($_GET['scl_id']) 

  • dev/common/kills.php

    r233 r240  
    4444$kslist->setWeek($week); 
    4545$kslist->setYear($year); 
    46 if (CORP_ID) 
    47     $kslist->addInvolvedCorp(new Corporation(CORP_ID)); 
    48 if (ALLIANCE_ID) 
    49     $kslist->addInvolvedAlliance(new Alliance(ALLIANCE_ID)); 
     46involved::load($kslist,'kill'); 
    5047 
    5148$llist = new KillList(); 
    5249$llist->setWeek($week); 
    5350$llist->setYear($year); 
    54 if (CORP_ID) 
    55     $llist->addVictimCorp(new Corporation(CORP_ID)); 
    56 if (ALLIANCE_ID) 
    57     $llist->addVictimAlliance(new Alliance(ALLIANCE_ID)); 
     51involved::load($llist,'loss'); 
    5852 
    5953$summarytable = new KillSummaryTable($kslist, $llist); 
    … …  
    6559$klist->setWeek($week); 
    6660$klist->setYear($year); 
    67 if (CORP_ID) 
    68     $klist->addInvolvedCorp(new Corporation(CORP_ID)); 
    69 if (ALLIANCE_ID) 
    70     $klist->addInvolvedAlliance(new Alliance(ALLIANCE_ID)); 
     61involved::load($klist,'kill'); 
    7162if ($_GET['scl_id']) 
    7263    $klist->addVictimShipClass(new ShipClass($_GET['scl_id'])); 
    … …  
    9182$tklist->setWeek($week); 
    9283$tklist->setYear($year); 
    93 if (CORP_ID) 
    94     $tklist->addInvolvedCorp(new Corporation(CORP_ID)); 
    95 if (ALLIANCE_ID) 
    96     $tklist->addInvolvedAlliance(new Alliance(ALLIANCE_ID)); 
     84involved::load($tklist,'kill'); 
    9785 
    9886$tklist->generate(); 
    … …  
    10593    $tklist->setWeek($week); 
    10694    $tklist->setYear($year); 
    107     if (CORP_ID) 
    108         $tklist->addInvolvedCorp(new Corporation(CORP_ID)); 
    109     if (ALLIANCE_ID) 
    110         $tklist->addInvolvedAlliance(new Alliance(ALLIANCE_ID)); 
     95    involved::load($tklist,'kill'); 
    11196 
    11297    $tklist->generate(); 

  • dev/common/losses.php

    r233 r240  
    4646$klist->setWeek($week); 
    4747$klist->setYear($year); 
    48 if (CORP_ID) 
    49     $klist->addInvolvedCorp(new Corporation(CORP_ID)); 
    50 if (ALLIANCE_ID) 
    51     $klist->addInvolvedAlliance(new Alliance(ALLIANCE_ID)); 
     48involved::load($klist,'kill'); 
    5249 
    5350$lslist = new KillList(); 
    5451$lslist->setWeek($week); 
    5552$lslist->setYear($year); 
    56 if (CORP_ID) 
    57     $lslist->addVictimCorp(new Corporation(CORP_ID)); 
    58 if (ALLIANCE_ID) 
    59     $lslist->addVictimAlliance(new Alliance(ALLIANCE_ID)); 
     53involved::load($lslist,'loss'); 
    6054 
    6155$summarytable = new KillSummaryTable($klist, $lslist); 
    … …  
    7064$llist->setWeek($week); 
    7165$llist->setYear($year); 
    72 if (CORP_ID) 
    73     $llist->addVictimCorp(new Corporation(CORP_ID)); 
    74 if (ALLIANCE_ID) 
    75     $llist->addVictimAlliance(new Alliance(ALLIANCE_ID)); 
     66involved::load($llist,'loss'); 
    7667if ($_GET['scl_id']) 
    7768    $llist->addVictimShipClass(new ShipClass($_GET['scl_id'])); 
    … …  
    9586$tllist->setWeek($week); 
    9687$tllist->setYear($year); 
    97 if (CORP_ID) 
    98     $tllist->addVictimCorp(new Corporation(CORP_ID)); 
    99 if (ALLIANCE_ID) 
    100     $tllist->addVictimAlliance(new Alliance(ALLIANCE_ID)); 
     88involved::load($tllist,'loss'); 
    10189 
    10290$tllist->generate(); 

  • dev/common/system_detail.php

    r233 r240  
    2323 
    2424$kslist = new KillList(); 
    25 if (CORP_ID) 
    26     $kslist->addInvolvedCorp(new Corporation(CORP_ID)); 
    27 if (ALLIANCE_ID) 
    28     $kslist->addInvolvedAlliance(new Alliance(ALLIANCE_ID)); 
     25involved::load($kslist,'kill'); 
    2926$kslist->addSystem($system); 
    3027 
    3128$lslist = new KillList(); 
    32 if (CORP_ID) 
    33     $lslist->addVictimCorp(new Corporation(CORP_ID)); 
    34 if (ALLIANCE_ID) 
    35     $lslist->addVictimAlliance(new Alliance(ALLIANCE_ID)); 
     29involved::load($lslist,'loss'); 
    3630$lslist->addSystem($system); 
    3731 
    … …  
    4438if ($_GET['view'] == 'losses') 
    4539{ 
    46     if (CORP_ID) 
    47         $klist->addVictimCorp(new Corporation(CORP_ID)); 
    48     if (ALLIANCE_ID) 
    49         $klist->addVictimAlliance(new Alliance(ALLIANCE_ID)); 
     40        involved::load($klist,'loss'); 
    5041} 
    5142else 
    5243{ 
    53     if (CORP_ID) 
    54         $klist->addInvolvedCorp(new Corporation(CORP_ID)); 
    55     if (ALLIANCE_ID) 
    56         $klist->addInvolvedAlliance(new Alliance(ALLIANCE_ID)); 
     44   involved::load($klist,'kill'); 
    5745} 
    5846$klist->addSystem($system); 

  • dev/mods/example_mod/home.php

    r233 r240  
    11<?php 
    2 require_once("common/includes/class.killsummarytable.php"); 
    3 require_once("common/includes/class.box.php"); 
    4 require_once("common/includes/class.corp.php"); 
    5 require_once("common/includes/class.alliance.php"); 
    6 require_once("common/includes/class.killlist.php"); 
    7 require_once("common/includes/class.killlisttable.php"); 
    8 require_once("common/includes/class.contract.php"); 
    9 require_once("common/includes/class.graph.php"); 
    10 require_once("common/includes/class.toplist.php"); 
     2require_once('common/includes/class.killsummarytable.php'); 
     3require_once('common/includes/class.corp.php'); 
     4require_once('common/includes/class.alliance.php'); 
     5require_once('common/includes/class.killlist.php'); 
     6require_once('common/includes/class.killlisttable.php'); 
     7require_once('common/includes/class.contract.php'); 
     8require_once('common/includes/class.toplist.php'); 
    119 
    12 $week = date("W"); 
    13 $year = date("Y"); 
     10$week = kbdate('W'); 
     11$year = kbdate('Y'); 
    1412 
    1513$page = new Page("omgwtfpwnd!!!1"); 
    1614 
    1715$kslist = new KillList(); 
    18 if (CORP_ID) 
    19     $kslist->addInvolvedCorp(new Corporation(CORP_ID)); 
    20 if (ALLIANCE_ID) 
    21     $kslist->addInvolvedAlliance(new Alliance(ALLIANCE_ID)); 
    22  
     16involved::load($kslist,'kill'); 
    2317$kslist->setWeek($week); 
    2418$kslist->setYear($year); 
    2519 
    2620$llist = new KillList(); 
    27 if (CORP_ID) 
    28     $llist->addVictimCorp(new Corporation(CORP_ID)); 
    29 if (ALLIANCE_ID) 
    30     $llist->addVictimAlliance(new Alliance(ALLIANCE_ID)); 
    31  
     21involved::load($llist,'loss'); 
    3222$llist->setWeek($week); 
    3323$llist->setYear($year); 
    … …  
    3525$summarytable = new KillSummaryTable($kslist, $llist); 
    3626$summarytable->setBreak(5); 
    37 //$html .= $summarytable->generate(); 
     27$html .= $summarytable->generate(); 
    3828 
    3929if ($week == 1) 
    4030{ 
    41     $pyear = date("Y") - 1; 
     31    $pyear = kbdate("Y") - 1; 
    4232    $pweek = 52; 
    4333} 
    4434else 
    4535{ 
    46     $pyear = date("Y"); 
     36    $pyear = kbdate("Y"); 
    4737    $pweek = $week - 1; 
    4838} 
    … …  
    6858} 
    6959 
    70 $html .= "<div class=kb-kills-header>20 most recent pwns</div>"; 
     60// bad hax0ring, we really need mod callback stuff 
     61if (strpos(config::get('mods_active'), 'rss_feed') !== false) 
     62{ 
     63    $html .= "<div class=kb-kills-header><a href=\"?a=rss\"><img src=\"mods/rss_feed/rss_icon.png\" alt=\"RSS-Feed\" border=\"0\"></a>&nbsp;20 most recent kills</div>"; 
     64} 
     65else 
     66{ 
     67    $html .= "<div class=kb-kills-header>20 most recent kills</div>"; 
     68} 
    7169 
    7270$klist = new KillList(); 
    7371$klist->setOrdered(true); 
    74 if (CORP_ID) 
    75     $klist->addInvolvedCorp(new Corporation(CORP_ID)); 
    76 if (ALLIANCE_ID) 
    77     $klist->addInvolvedAlliance(new Alliance(ALLIANCE_ID)); 
     72involved::load($klist,'kill'); 
     73 
    7874 
    7975// boards with low killcount could not display 20 kills with those limits 
    8076//$klist->setStartWeek($week - 1); 
    8177//$klist->setYear($year); 
     78$klist->setLimit(20); 
    8279 
    8380if ($_GET['scl_id']) 
    … …  
    9188 
    9289$page->setContent($html); 
    93 $menubox = new MenuBox(); 
    94 $menubox->addCaption("Navigation"); 
    95 $menubox->addOption("Previous week", "?a=kills&w=" . $pweek . "&y=" . $pyear); 
     90$menubox = new box("Menu"); 
     91$menubox->setIcon("menu-item.gif"); 
     92$menubox->addOption("caption","Navigation"); 
     93$menubox->addOption("link","Previous week", "?a=kills&w=" . $pweek . "&y=" . $pyear); 
    9694$page->addContext($menubox->generate()); 
    9795 
    … …  
    9997$tklist->setWeek($week); 
    10098$tklist->setYear($year); 
    101 if (CORP_ID) 
    102     $tklist->addInvolvedCorp(new Corporation(CORP_ID)); 
    103 if (ALLIANCE_ID) 
    104     $tklist->addInvolvedAlliance(new Alliance(ALLIANCE_ID)); 
     99involved::load($tklist,'kill'); 
    105100 
    106101$tklist->generate(); 
    … …  
    113108    $tklist->setWeek($week); 
    114109    $tklist->setYear($year); 
    115     if (CORP_ID) 
    116         $tklist->addInvolvedCorp(new Corporation(CORP_ID)); 
    117     if (ALLIANCE_ID) 
    118         $tklist->addInvolvedAlliance(new Alliance(ALLIANCE_ID)); 
     110    involved::load($tklist,'kill'); 
    119111 
    120112    $tklist->generate(); 

  • dev/mods/forum_post/cc_detail.php

    r233 r240  
    223223$tklist = new TopContractKillsList(); 
    224224$tklist->setContract(new Contract($ctr_id)); 
    225 if (CORP_ID) 
    226     $tklist->addInvolvedCorp(new Corporation(CORP_ID)); 
    227 if (ALLIANCE_ID) 
    228     $tklist->addInvolvedAlliance(new Alliance(ALLIANCE_ID)); 
     225involved::load($tklist,'kill'); 
    229226 
    230227$tklist->generate(); 
    … …  
    241238    $tklist = new TopContractScoreList(); 
    242239    $tklist->setContract(new Contract($ctr_id)); 
    243     if (CORP_ID) 
    244         $tklist->addInvolvedCorp(new Corporation(CORP_ID)); 
    245     if (ALLIANCE_ID) 
    246         $tklist->addInvolvedAlliance(new Alliance(ALLIANCE_ID)); 
     240    involved::load($tklist,'kill'); 
    247241 
    248242    $tklist->generate(); 

  • dev/mods/forum_post/forum_post.php

    r233 r240  
    8989$kslist->setStartDate($firstts); 
    9090$kslist->setEndDate($lastts); 
    91 if (CORP_ID) 
    92     $kslist->addInvolvedCorp(new Corporation(CORP_ID)); 
    93 if (ALLIANCE_ID) 
    94     $kslist->addInvolvedAlliance(new Alliance(ALLIANCE_ID)); 
     91involved::load($kslist,'kill'); 
    9592 
    9693$lslist = new KillList(); 
    … …  
    9996$lslist->setStartDate($firstts); 
    10097$lslist->setEndDate($lastts); 
    101 if (CORP_ID) 
    102     $lslist->addVictimCorp(new Corporation(CORP_ID)); 
    103 if (ALLIANCE_ID) 
    104     $lslist->addVictimAlliance(new Alliance(ALLIANCE_ID)); 
     98involved::load($lslist,'loss'); 
    10599 
    106100$killsummary = new KillSummaryTable($kslist, $lslist); 

  • dev/mods/forum_post/kill_related.php

    r233 r240  
    7979$kslist->setStartDate($firstts); 
    8080$kslist->setEndDate($lastts); 
    81 if (CORP_ID) 
    82     $kslist->addInvolvedCorp(new Corporation(CORP_ID)); 
    83 if (ALLIANCE_ID) 
    84     $kslist->addInvolvedAlliance(new Alliance(ALLIANCE_ID)); 
     81involved::load($kslist,'kill'); 
    8582 
    8683$lslist = new KillList(); 
    … …  
    8986$lslist->setStartDate($firstts); 
    9087$lslist->setEndDate($lastts); 
    91 if (CORP_ID) 
    92     $lslist->addVictimCorp(new Corporation(CORP_ID)); 
    93 if (ALLIANCE_ID) 
    94     $lslist->addVictimAlliance(new Alliance(ALLIANCE_ID)); 
     88involved::load($lslist,'loss'); 
    9589 
    9690$summarytable = new KillSummaryTable($kslist, $lslist); 
    … …  
    10397$klist->setStartDate($firstts); 
    10498$klist->setEndDate($lastts); 
    105 if (CORP_ID) 
    106     $klist->addInvolvedCorp(new Corporation(CORP_ID)); 
    107 if (ALLIANCE_ID) 
    108     $klist->addInvolvedAlliance(new Alliance(ALLIANCE_ID)); 
     99involved::load($klist,'kill'); 
    109100 
    110101$llist = new KillList(); 
    … …  
    113104$llist->setStartDate($firstts); 
    114105$llist->setEndDate($lastts); 
    115 if (CORP_ID) 
    116     $llist->addVictimCorp(new Corporation(CORP_ID)); 
    117 if (ALLIANCE_ID) 
    118     $llist->addVictimAlliance(new Alliance(ALLIANCE_ID)); 
     106involved::load($llist,'loss'); 
    119107 
    120108if ($_GET['scl_id']) 

  • dev/mods/ingame_mod/igb.php

    r212 r240  
    4949                $klist = new KillList(); 
    5050                $klist->setOrdered(true); 
    51                 if ( CORP_ID ) 
    52                         $klist->addVictimCorp( new Corporation( CORP_ID ) ); 
    53                 if ( ALLIANCE_ID ) 
    54                         $klist->addVictimAlliance( new Alliance( ALLIANCE_ID ) ); 
    55                          
     51                involved::load($klist,'loss');           
    5652                $html .= mktable($klist,30); 
    5753                break; 
    … …  
    5955                $klist = new KillList(); 
    6056                $klist->setOrdered(true); 
    61                 if ( CORP_ID ) 
    62                         $klist->addInvolvedCorp( new Corporation( CORP_ID ) ); 
    63                 if ( ALLIANCE_ID ) 
    64                         $klist->addInvolvedAlliance( new Alliance( ALLIANCE_ID ) ); 
     57                involved::load($klist,'kill'); 
    6558                $html .= mktable($klist,30); 
    6659                break; 
    6760        default:  
    6861                $klist = new KillList(); 
    69                 if ( CORP_ID ) 
    70                         $klist->addInvolvedCorp( new Corporation( CORP_ID ) ); 
    71                 if ( ALLIANCE_ID ) 
    72                         $klist->addInvolvedAlliance( new Alliance( ALLIANCE_ID ) ); 
     62                involved::load($klist,'kill'); 
    7363                $klist->setOrdered(true); 
    7464                $html .= mktable($klist,10); 

  • dev/mods/rss_feed/rss.php

    r190 r240  
    2424$klist = new KillList(); 
    2525$klist->setOrdered(true); 
    26 if (CORP_ID) 
    27 { 
    28     $klist->addInvolvedCorp(new Corporation(CORP_ID)); 
    29 } 
    30 if (ALLIANCE_ID) 
    31 { 
    32     $klist->addInvolvedAlliance(new Alliance(ALLIANCE_ID)); 
    33 } 
     26involved::load($klist,'kill'); 
    3427 
    3528if ($_GET['scl_id'])