Changeset 459

Timestamp:

10/06/09 09:36:59 (13 years ago)

Author:

kovell

Message:

Fixes: headers for uncached page set correctly, summary additions evaluated with isset instead of intval, ctr_id and scl_id explicitly set as int. unused pages removed.

Location:

dev/common

Files:

• alliance_detail.php (modified) (7 diffs)
• campaigns.php (modified) (1 diff)
• cc_detail.php (modified) (9 diffs)
• corp_detail.php (modified) (12 diffs)
• includes/class.cache.php (modified) (1 diff)
• includes/class.session.php (modified) (1 diff)
• includes/class.summary.php (modified) (9 diffs)
• includes/globals.php (modified) (2 diffs)
• kill_related.php (modified) (1 diff)
• kills.php (modified) (1 diff)
• losses.php (modified) (1 diff)
• mixed.php (deleted)
• pilot_detail.php (modified) (5 diffs)
• portrait_grab.php (deleted)
• system_detail.php (modified) (2 diffs)

dev/common/alliance_detail.php

@@ -9 +9 @@
 $all_id = intval($_GET['all_id']);
 $all_external_id = intval($_GET['all_external_id']);
+$scl_id = intval($_GET['scl_id']);
+
 if (!$all_id && !$all_external_id)
 {
-    if (ALLIANCE_ID)
-    {
-        $all_id = ALLIANCE_ID;
-    }
-    else
-    {
-        echo 'no valid alliance id specified<br/>';
-        return;
-    }
+        if (ALLIANCE_ID)
+        {
+                $all_id = ALLIANCE_ID;
+        }
+        else
+        {
+                echo 'no valid alliance id specified<br/>';
+                return;
+        }
 }
 
@@ -33 +35 @@
 }
 
-$month = $_GET['m'];
-$year = $_GET['y'];
-
-if ($month == '')
-    $month = kbdate('m');
-
-if ($year == '')
-    $year = kbdate('Y');
+$month = intval($_GET['m']);
+$year = intval($_GET['y']);
+
+if (!$month)
+        $month = kbdate('m');
+
+if (!$year)
+        $year = kbdate('Y');
 
 if ($month == 12)
 {
-    $nmonth = 1;
-    $nyear = $year + 1;
+        $nmonth = 1;
+        $nyear = $year + 1;
 }
 else
 {
-    $nmonth = $month + 1;
-    $nyear = $year;
+        $nmonth = $month + 1;
+        $nyear = $year;
 }
 if ($month == 1)
 {
-    $pmonth = 12;
-    $pyear = $year - 1;
+        $pmonth = 12;
+        $pyear = $year - 1;
 }
 else
 {
-    $pmonth = $month - 1;
-    $pyear = $year;
+        $pmonth = $month - 1;
+        $pyear = $year;
 }
 $monthname = kbdate("F", strtotime("2000-".$month."-2"));
@@ -72 +74 @@
 if (file_exists("img/alliances/".$alliance->getUnique().".png"))
 {
-    $html .= "<img src=\"".IMG_URL."/alliances/".$alliance->getUnique().".png\" border=\"0\" alt=\"$alliance->getName()\"></td>";
+        $html .= "<img src=\"".IMG_URL."/alliances/".$alliance->getUnique().".png\" border=\"0\" alt=\"$alliance->getName()\"></td>";
 }
 else
 {
-    $html .= "<img src=\"".IMG_URL."/alliances/default.gif\" border=\"0\" alt=\"$alliance->getName()\"></td>";
+        $html .= "<img src=\"".IMG_URL."/alliances/default.gif\" border=\"0\" alt=\"$alliance->getName()\"></td>";
 }
 $kill_summary = new KillSummaryTable();
@@ -89 +91 @@
 if ($kill_summary->getTotalKillISK())
 {
-    $efficiency = round($kill_summary->getTotalKillISK() / ($kill_summary->getTotalKillISK() + $kill_summary->getTotalLossISK()) * 100, 2);
+        $efficiency = round($kill_summary->getTotalKillISK() / ($kill_summary->getTotalKillISK() + $kill_summary->getTotalLossISK()) * 100, 2);
 }
 else
 {
-    $efficiency = 0;
+        $efficiency = 0;
 }
 
@@ -103 +105 @@
 if ($_GET['view'] == "" || $_GET['view'] == "kills" || $_GET['view'] == "losses")
 {
-    $html .= $summary_html;
+        $html .= $summary_html;
 }
 
 switch ($_GET['view'])
 {
-    case "":
-        $html .= "<div class=kb-kills-header>10 Most recent kills in the last 30 days</div>";
-
-        $list = new KillList();
-        $list->setOrdered(true);
+        case "":
+                $html .= "<div class=kb-kills-header>10 Most recent kills in the last 30 days</div>";
+
+                $list = new KillList();
+                $list->setOrdered(true);
                 if (config::get('comments_count')) $list->setCountComments(true);
                 if (config::get('killlist_involved')) $list->setCountInvolved(true);
-        $list->setLimit(10);
-        $list->setPodsNoobships(true);
-        $list->addInvolvedAlliance($alliance);
-        if ($_GET['scl_id'])
-            $list->addVictimShipClass(new ShipClass($_GET['scl_id']));
+                $list->setLimit(10);
+                $list->setPodsNoobships(true);
+                $list->addInvolvedAlliance($alliance);
+                if ($scl_id)
+                        $list->addVictimShipClass($scl_id);
                 $list->setStartDate(date('Y-m-d H:i',strtotime('-30 days')));
-        $ktab = new KillListTable($list);
-        $ktab->setLimit(10);
-        $ktab->setDayBreak(false);
-        $html .= $ktab->generate();
-
-        $html .= "<div class=kb-losses-header>10 Most recent losses in the last 30 days</div>";
-
-        $list = new KillList();
-        $list->setOrdered(true);
+                $ktab = new KillListTable($list);
+                $ktab->setLimit(10);
+                $ktab->setDayBreak(false);
+                $html .= $ktab->generate();
+
+                $html .= "<div class=kb-losses-header>10 Most recent losses in the last 30 days</div>";
+
+                $list = new KillList();
+                $list->setOrdered(true);
                 if (config::get('comments_count')) $list->setCountComments(true);
                 if (config::get('killlist_involved')) $list->setCountInvolved(true);
-        $list->setLimit(10);
-        $list->setPodsNoobships(true);
-        $list->addVictimAlliance($alliance);
-        if ($_GET['scl_id'])
-            $list->addVictimShipClass(new ShipClass($_GET['scl_id']));
+                $list->setLimit(10);
+                $list->setPodsNoobships(true);
+                $list->addVictimAlliance($alliance);
+                if ($scl_id)
+                        $list->addVictimShipClass($scl_id);
                 $list->setStartDate(date('Y-m-d H:i',strtotime('-30 days')));
 
-        $ltab = new KillListTable($list);
-        $ltab->setLimit(10);
-        $ltab->setDayBreak(false);
-        $html .= $ltab->generate();
-
-        break;
-    case "kills":
-        $html .= "<div class=kb-kills-header>All kills</div>";
-
-        $list = new KillList();
-        $list->setOrdered(true);
-                $list->addInvolvedAlliance($alliance);
-        if ($_GET['scl_id'])
-            $list->addVictimShipClass(new ShipClass($_GET['scl_id']));
-        $pagesplitter = new PageSplitter($list->getCount(), 30);
-        $list->setPageSplitter($pagesplitter);
-        $table = new KillListTable($list);
-        $table->setDayBreak(false);
-        $html .= $table->generate();
-        $html .= $pagesplitter->generate();
-
-        break;
-    case "losses":
-        $html .= "<div class=kb-losses-header>All losses</div>";
-
-        $list = new KillList();
-        $list->setOrdered(true);
+                $ltab = new KillListTable($list);
+                $ltab->setLimit(10);
+                $ltab->setDayBreak(false);
+                $html .= $ltab->generate();
+
+                break;
+        case "kills":
+                $html .= "<div class=kb-kills-header>All kills</div>";
+
+                $list = new KillList();
+                $list->setOrdered(true);
+                $list->addInvolvedAlliance($alliance);
+                if ($scl_id)
+                        $list->addVictimShipClass($scl_id);
+                $pagesplitter = new PageSplitter($list->getCount(), 30);
+                $list->setPageSplitter($pagesplitter);
+                $table = new KillListTable($list);
+                $table->setDayBreak(false);
+                $html .= $table->generate();
+                $html .= $pagesplitter->generate();
+
+                break;
+        case "losses":
+                $html .= "<div class=kb-losses-header>All losses</div>";
+
+                $list = new KillList();
+                $list->setOrdered(true);
                 $list->setPodsNoobships(true);
-        $list->addVictimAlliance($alliance);
-        if ($_GET['scl_id'])
-            $list->addVictimShipClass(new ShipClass($_GET['scl_id']));
-        $pagesplitter = new PageSplitter($list->getCount(), 30);
-        $list->setPageSplitter($pagesplitter);
-
-        $table = new KillListTable($list);
-        $table->setDayBreak(false);
-        $html .= $table->generate();
-        $html .= $pagesplitter->generate();
-
-        break;
-    case "corp_kills":
-        $html .= "<div class=block-header2>Top killers</div>";
-
-        $html .= "<table class=kb-subtable><tr><td valign=top width=440>";
-        $html .= "<div class=block-header>$monthname $year</div>";
-
-        $list = new TopCorpKillsList();
-        $list->addInvolvedAlliance($alliance);
-        $list->setPodsNoobShips(false);
-        $list->setMonth($month);
-        $list->setYear($year);
-        $table = new TopCorpTable($list, "Kills");
-        $html .= $table->generate();
-        
+                $list->addVictimAlliance($alliance);
+                if ($scl_id)
+                        $list->addVictimShipClass($scl_id);
+                $pagesplitter = new PageSplitter($list->getCount(), 30);
+                $list->setPageSplitter($pagesplitter);
+
+                $table = new KillListTable($list);
+                $table->setDayBreak(false);
+                $html .= $table->generate();
+                $html .= $pagesplitter->generate();
+
+                break;
+        case "corp_kills":
+                $html .= "<div class=block-header2>Top killers</div>";
+
+                $html .= "<table class=kb-subtable><tr><td valign=top width=440>";
+                $html .= "<div class=block-header>$monthname $year</div>";
+
+                $list = new TopCorpKillsList();
+                $list->addInvolvedAlliance($alliance);
+                $list->setPodsNoobShips(false);
+                $list->setMonth($month);
+                $list->setYear($year);
+                $table = new TopCorpTable($list, "Kills");
+                $html .= $table->generate();
+
                 $html .= "<table width=300 cellspacing=1><tr><td><a href='?a=alliance_detail&amp;view=corp_kills&amp;m=$pmonth&amp;all_id=$all_id&amp;y=$pyear'>previous</a></td>";
-        $html .= "<td align='right'><a href='?a=alliance_detail&amp;view=corp_kills&amp;all_id=$all_id&amp;m=$nmonth&amp;y=$nyear'>next</a></p></td></tr></table>";
-        
-        $html .= "</td><td valign=top width=400>";
-        $html .= "<div class=block-header>All time</div>";
-
-        $list = new TopCorpKillsList();
-        $list->addInvolvedAlliance($alliance);
-        $list->setPodsNoobShips(false);
-        $table = new TopCorpTable($list, "Kills");
-        $html .= $table->generate();
-
-        $html .= "</td></tr></table>";
-
-        break;
-    case "corp_kills_class":
-        $html .= "<div class=block-header2>Destroyed ships</div>";
-
-        // Get all ShipClasses
-        $sql = "select scl_id, scl_class from kb3_ship_classes
+                $html .= "<td align='right'><a href='?a=alliance_detail&amp;view=corp_kills&amp;all_id=$all_id&amp;m=$nmonth&amp;y=$nyear'>next</a></p></td></tr></table>";
+
+                $html .= "</td><td valign=top width=400>";
+                $html .= "<div class=block-header>All time</div>";
+
+                $list = new TopCorpKillsList();
+                $list->addInvolvedAlliance($alliance);
+                $list->setPodsNoobShips(false);
+                $table = new TopCorpTable($list, "Kills");
+                $html .= $table->generate();
+
+                $html .= "</td></tr></table>";
+
+                break;
+        case "corp_kills_class":
+                $html .= "<div class=block-header2>Destroyed ships</div>";
+
+                // Get all ShipClasses
+                $sql = "select scl_id, scl_class from kb3_ship_classes
             where scl_class not in ('Drone','Unknown') order by scl_class";
 
-        $qry = new DBQuery();
-        $qry->execute($sql);
-        while ($row = $qry->getRow())
-        {
-            $shipclass[] = new Shipclass($row['scl_id']);
-        }
-        $html .= "<table class=kb-subtable>";
-        $html .= "<tr>";
-        $newrow = true;
-
-        foreach ($shipclass as $shp){
-            if ($newrow){
-            $html .= '</tr><tr>';
-            }
-            $list = new TopCorpKillsList();
-            $list->addInvolvedAlliance($alliance);
-            $list->addVictimShipClass($shp);
-            $table = new TopCorpTable($list, "Kills");
-            $content = $table->generate();
-            if ($content != '<table class=kb-table cellspacing=1><tr class=kb-table-header><td class=kb-table-cell align=center>#</td><td class=kb-table-cell align=center>Corporation</td><td class=kb-table-cell align=center width=60>Kills</td></tr></table>'){
-            $html .= "<td valign=top width=440>";
-            $html .= "<div class=block-header>".$shp->getName()."</div>";
-            $html .= $content;
-            $html .= "</td>";
-            $newrow = !$newrow;
-            }
-
-        }
-        $html .= "</tr></table>";        
-        break;
-    case "kills_class":
-        $html .= "<div class=block-header2>Destroyed ships</div>";
-
-        // Get all ShipClasses
-        $sql = "select scl_id, scl_class from kb3_ship_classes
+                $qry = new DBQuery();
+                $qry->execute($sql);
+                while ($row = $qry->getRow())
+                {
+                        $shipclass[] = new Shipclass($row['scl_id']);
+                }
+                $html .= "<table class=kb-subtable>";
+                $html .= "<tr>";
+                $newrow = true;
+
+                foreach ($shipclass as $shp)
+                {
+                        if ($newrow)
+                        {
+                                $html .= '</tr><tr>';
+                        }
+                        $list = new TopCorpKillsList();
+                        $list->addInvolvedAlliance($alliance);
+                        $list->addVictimShipClass($shp);
+                        $table = new TopCorpTable($list, "Kills");
+                        $content = $table->generate();
+                        if ($content != '<table class=kb-table cellspacing=1><tr class=kb-table-header><td class=kb-table-cell align=center>#</td><td class=kb-table-cell align=center>Corporation</td><td class=kb-table-cell align=center width=60>Kills</td></tr></table>')
+                        {
+                                $html .= "<td valign=top width=440>";
+                                $html .= "<div class=block-header>".$shp->getName()."</div>";
+                                $html .= $content;
+                                $html .= "</td>";
+                                $newrow = !$newrow;
+                        }
+
+                }
+                $html .= "</tr></table>";
+                break;
+        case "kills_class":
+                $html .= "<div class=block-header2>Destroyed ships</div>";
+
+                // Get all ShipClasses
+                $sql = "select scl_id, scl_class from kb3_ship_classes
             where scl_class not in ('Drone','Unknown') order by scl_class";
 
-        $qry = new DBQuery();
-        $qry->execute($sql);
-        while ($row = $qry->getRow())
-        {
-            $shipclass[] = new Shipclass($row['scl_id']);
-        }
-        $html .= "<table class=kb-subtable>";
-        $html .= "<tr>";
-        $newrow = true;
-
-        foreach ($shipclass as $shp){
-            if ($newrow){
-            $html .= '</tr><tr>';
-            }
-            $list = new TopKillsList();
-            $list->addInvolvedAlliance($alliance);
-            $list->addVictimShipClass($shp);
-            $table = new TopPilotTable($list, "Kills");
-            $content = $table->generate();
-            if ($content != '<table class=kb-table cellspacing=1><tr class=kb-table-header><td class=kb-table-cell align=center colspan=2>Pilot</td><td class=kb-table-cell align=center width=60>Kills</td></tr></table>'){
-            $html .= "<td valign=top width=440>";
-            $html .= "<div class=block-header>".$shp->getName()."</div>";
-            $html .= $content;
-            $html .= "</td>";
-            $newrow = !$newrow;
-            }
-
-        }
-        $html .= "</tr></table>";
-
-        break;
-    case "corp_losses_class":
-        $html .= "<div class=block-header2>Lost ships</div>";
-
-            // Get all ShipClasses
-        $sql = "select scl_id, scl_class from kb3_ship_classes
+                $qry = new DBQuery();
+                $qry->execute($sql);
+                while ($row = $qry->getRow())
+                {
+                        $shipclass[] = new Shipclass($row['scl_id']);
+                }
+                $html .= "<table class=kb-subtable>";
+                $html .= "<tr>";
+                $newrow = true;
+
+                foreach ($shipclass as $shp)
+                {
+                        if ($newrow)
+                        {
+                                $html .= '</tr><tr>';
+                        }
+                        $list = new TopKillsList();
+                        $list->addInvolvedAlliance($alliance);
+                        $list->addVictimShipClass($shp);
+                        $table = new TopPilotTable($list, "Kills");
+                        $content = $table->generate();
+                        if ($content != '<table class=kb-table cellspacing=1><tr class=kb-table-header><td class=kb-table-cell align=center colspan=2>Pilot</td><td class=kb-table-cell align=center width=60>Kills</td></tr></table>')
+                        {
+                                $html .= "<td valign=top width=440>";
+                                $html .= "<div class=block-header>".$shp->getName()."</div>";
+                                $html .= $content;
+                                $html .= "</td>";
+                                $newrow = !$newrow;
+                        }
+
+                }
+                $html .= "</tr></table>";
+
+                break;
+        case "corp_losses_class":
+                $html .= "<div class=block-header2>Lost ships</div>";
+
+                // Get all ShipClasses
+                $sql = "select scl_id, scl_class from kb3_ship_classes
             where scl_class not in ('Drone','Unknown') order by scl_class";
 
-        $qry = new DBQuery();
-        $qry->execute($sql);
-        while ($row = $qry->getRow())
-        {
-            $shipclass[] = new Shipclass($row['scl_id']);
-        }
-        $html .= "<table class=kb-subtable>";
-        $html .= "<tr>";
-        $newrow = true;
-
-        foreach ($shipclass as $shp){
-            if ($newrow){
-            $html .= '</tr><tr>';
-            }
-            $list = new TopCorpLossesList();
-                $list->addVictimAlliance($alliance);
-            $list->addVictimShipClass($shp);
-            $table = new TopCorpTable($list, "Losses");
-            $content = $table->generate();
-            if ($content != '<table class=kb-table cellspacing=1><tr class=kb-table-header><td class=kb-table-cell align=center>#</td><td class=kb-table-cell align=center>Corporation</td><td class=kb-table-cell align=center width=60>Losses</td></tr></table>'){
-            $html .= "<td valign=top width=440>";
-                $html .= "<div class=block-header>".$shp->getName()."</div>";
-                $html .= $content;
-            $html .= "</td>";
-            $newrow = !$newrow;
-            }
-        }
-        $html .= "</tr></table>";
-
-        break;
-    case "losses_class":
-        $html .= "<div class=block-header2>Lost ships</div>";
-
-            // Get all ShipClasses
-        $sql = "select scl_id, scl_class from kb3_ship_classes
+                $qry = new DBQuery();
+                $qry->execute($sql);
+                while ($row = $qry->getRow())
+                {
+                        $shipclass[] = new Shipclass($row['scl_id']);
+                }
+                $html .= "<table class=kb-subtable>";
+                $html .= "<tr>";
+                $newrow = true;
+
+                foreach ($shipclass as $shp)
+                {
+                        if ($newrow)
+                        {
+                                $html .= '</tr><tr>';
+                        }
+                        $list = new TopCorpLossesList();
+                        $list->addVictimAlliance($alliance);
+                        $list->addVictimShipClass($shp);
+                        $table = new TopCorpTable($list, "Losses");
+                        $content = $table->generate();
+                        if ($content != '<table class=kb-table cellspacing=1><tr class=kb-table-header><td class=kb-table-cell align=center>#</td><td class=kb-table-cell align=center>Corporation</td><td class=kb-table-cell align=center width=60>Losses</td></tr></table>')
+                        {
+                                $html .= "<td valign=top width=440>";
+                                $html .= "<div class=block-header>".$shp->getName()."</div>";
+                                $html .= $content;
+                                $html .= "</td>";
+                                $newrow = !$newrow;
+                        }
+                }
+                $html .= "</tr></table>";
+
+                break;
+        case "losses_class":
+                $html .= "<div class=block-header2>Lost ships</div>";
+
+                // Get all ShipClasses
+                $sql = "select scl_id, scl_class from kb3_ship_classes
             where scl_class not in ('Drone','Unknown') order by scl_class";
 
-        $qry = new DBQuery();
-        $qry->execute($sql);
-        while ($row = $qry->getRow())
-        {
-            $shipclass[] = new Shipclass($row['scl_id']);
-        }
-        $html .= "<table class=kb-subtable>";
-        $html .= "<tr>";
-        $newrow = true;
-
-        foreach ($shipclass as $shp){
-            if ($newrow){
-            $html .= '</tr><tr>';
-            }
-            $list = new TopLossesList();
-                $list->addVictimAlliance($alliance);
-            $list->addVictimShipClass($shp);
-            $table = new TopPilotTable($list, "Losses");
-            $content = $table->generate();
-            if ($content != '<table class=kb-table cellspacing=1><tr class=kb-table-header><td class=kb-table-cell align=center colspan=2>Pilot</td><td class=kb-table-cell align=center width=60>Losses</td></tr></table>'){
-            $html .= "<td valign=top width=440>";
-                $html .= "<div class=block-header>".$shp->getName()."</div>";
-                $html .= $content;
-            $html .= "</td>";
-            $newrow = !$newrow;
-            }
-        }
-        $html .= "</tr></table>";
-
-        break;
-    case "corp_losses":
-        $html .= "<div class=block-header2>Top losers</div>";
-
-        $html .= "<table class=kb-subtable><tr><td valign=top width=440>";
-        $html .= "<div class=block-header>$monthname $year</div>";
-
-        $list = new TopCorpLossesList();
-        $list->addVictimAlliance($alliance);
-        $list->setPodsNoobShips(false);
-        $list->setMonth($month);
-        $list->setYear($year);
-        $table = new TopCorpTable($list, "Losses");
-        $html .= $table->generate();
+                $qry = new DBQuery();
+                $qry->execute($sql);
+                while ($row = $qry->getRow())
+                {
+                        $shipclass[] = new Shipclass($row['scl_id']);
+                }
+                $html .= "<table class=kb-subtable>";
+                $html .= "<tr>";
+                $newrow = true;
+
+                foreach ($shipclass as $shp)
+                {
+                        if ($newrow)
+                        {
+                                $html .= '</tr><tr>';
+                        }
+                        $list = new TopLossesList();
+                        $list->addVictimAlliance($alliance);
+                        $list->addVictimShipClass($shp);
+                        $table = new TopPilotTable($list, "Losses");
+                        $content = $table->generate();
+                        if ($content != '<table class=kb-table cellspacing=1><tr class=kb-table-header><td class=kb-table-cell align=center colspan=2>Pilot</td><td class=kb-table-cell align=center width=60>Losses</td></tr></table>')
+                        {
+                                $html .= "<td valign=top width=440>";
+                                $html .= "<div class=block-header>".$shp->getName()."</div>";
+                                $html .= $content;
+                                $html .= "</td>";
+                                $newrow = !$newrow;
+                        }
+                }
+                $html .= "</tr></table>";
+
+                break;
+        case "corp_losses":
+                $html .= "<div class=block-header2>Top losers</div>";
+
+                $html .= "<table class=kb-subtable><tr><td valign=top width=440>";
+                $html .= "<div class=block-header>$monthname $year</div>";
+
+                $list = new TopCorpLossesList();
+                $list->addVictimAlliance($alliance);
+                $list->setPodsNoobShips(false);
+                $list->setMonth($month);
+                $list->setYear($year);
+                $table = new TopCorpTable($list, "Losses");
+                $html .= $table->generate();
 
                 $html .= "<table width=300 cellspacing=1><tr><td><a href='?a=alliance_detail&amp;view=corp_losses&amp;m=$pmonth&amp;all_id=$all_id&amp;y=$pyear'>previous</a></td>";
-        $html .= "<td align='right'><a href='?a=alliance_detail&amp;view=corp_losses&amp;all_id=$all_id&amp;m=$nmonth&amp;y=$nyear'>next</a></p></td></tr></table>";
-         
-        $html .= "</td><td valign=top width=400>";
-        $html .= "<div class=block-header>All time</div>";
-
-        $list = new TopCorpLossesList();
-        $list->addVictimAlliance($alliance);
-        $list->setPodsNoobShips(false);
-        $table = new TopCorpTable($list, "Losses");
-        $html .= $table->generate();
-
-        $html .= "</td></tr></table>";
-
-        break;
-    case "pilot_kills":
-        $html .= "<div class=block-header2>Top killers</div>";
-
-        $html .= "<table class=kb-subtable><tr><td valign=top width=440>";
-        $html .= "<div class=block-header>$monthname $year</div>";
-
-        $list = new TopKillsList();
-        $list->addInvolvedAlliance($alliance);
-        $list->setPodsNoobShips(false);
-        $list->setMonth($month);
-        $list->setYear($year);
-        $table = new TopPilotTable($list, "Kills");
-        $html .= $table->generate();
+                $html .= "<td align='right'><a href='?a=alliance_detail&amp;view=corp_losses&amp;all_id=$all_id&amp;m=$nmonth&amp;y=$nyear'>next</a></p></td></tr></table>";
+
+                $html .= "</td><td valign=top width=400>";
+                $html .= "<div class=block-header>All time</div>";
+
+                $list = new TopCorpLossesList();
+                $list->addVictimAlliance($alliance);
+                $list->setPodsNoobShips(false);
+                $table = new TopCorpTable($list, "Losses");
+                $html .= $table->generate();
+
+                $html .= "</td></tr></table>";
+
+                break;
+        case "pilot_kills":
+                $html .= "<div class=block-header2>Top killers</div>";
+
+                $html .= "<table class=kb-subtable><tr><td valign=top width=440>";
+                $html .= "<div class=block-header>$monthname $year</div>";
+
+                $list = new TopKillsList();
+                $list->addInvolvedAlliance($alliance);
+                $list->setPodsNoobShips(false);
+                $list->setMonth($month);
+                $list->setYear($year);
+                $table = new TopPilotTable($list, "Kills");
+                $html .= $table->generate();
 
                 $html .= "<table width=300 cellspacing=1><tr><td><a href='?a=alliance_detail&amp;view=pilot_kills&amp;m=$pmonth&amp;all_id=$all_id&amp;y=$pyear'>previous</a></td>";
-        $html .= "<td align='right'><a href='?a=alliance_detail&amp;view=pilot_kills&amp;all_id=$all_id&amp;m=$nmonth&amp;y=$nyear'>next</a></p></td></tr></table>";
-        
-        $html .= "</td><td valign=top width=400>";
-        $html .= "<div class=block-header>All time</div>";
-
-        $list = new TopKillsList();
-        $list->addInvolvedAlliance($alliance);
-        $list->setPodsNoobShips(false);
-        $table = new TopPilotTable($list, "Kills");
-        $html .= $table->generate();
-
-        $html .= "</td></tr></table>";
-
-        break;
-    case "pilot_scores":
-        $html .= "<div class=block-header2>Top scorers</div>";
-
-        $html .= "<table class=kb-subtable><tr><td valign=top width=440>";
-        $html .= "<div class=block-header>$monthname $year</div>";
-
-        $list = new TopScoreList();
-        $list->addInvolvedAlliance($alliance);
-        $list->setPodsNoobShips(true);
-        $list->setMonth($month);
-        $list->setYear($year);
-        $table = new TopPilotTable($list, "Points");
-        $html .= $table->generate();
+                $html .= "<td align='right'><a href='?a=alliance_detail&amp;view=pilot_kills&amp;all_id=$all_id&amp;m=$nmonth&amp;y=$nyear'>next</a></p></td></tr></table>";
+
+                $html .= "</td><td valign=top width=400>";
+                $html .= "<div class=block-header>All time</div>";
+
+                $list = new TopKillsList();
+                $list->addInvolvedAlliance($alliance);
+                $list->setPodsNoobShips(false);
+                $table = new TopPilotTable($list, "Kills");
+                $html .= $table->generate();
+
+                $html .= "</td></tr></table>";
+
+                break;
+        case "pilot_scores":
+                $html .= "<div class=block-header2>Top scorers</div>";
+
+                $html .= "<table class=kb-subtable><tr><td valign=top width=440>";
+                $html .= "<div class=block-header>$monthname $year</div>";
+
+                $list = new TopScoreList();
+                $list->addInvolvedAlliance($alliance);
+                $list->setPodsNoobShips(true);
+                $list->setMonth($month);
+                $list->setYear($year);
+                $table = new TopPilotTable($list, "Points");
+                $html .= $table->generate();
 
                 $html .= "<table width=300 cellspacing=1><tr><td><a href='?a=alliance_detail&amp;view=pilot_scores&amp;m=$pmonth&amp;all_id=$all_id&amp;y=$pyear'>previous</a></td>";
-        $html .= "<td align='right'><a href='?a=alliance_detail&amp;view=pilot_scores&amp;all_id=$all_id&amp;m=$nmonth&amp;y=$nyear'>next</a></p></td></tr></table>";
-          
-        $html .= "</td><td valign=top width=400>";
-        $html .= "<div class=block-header>All time</div>";
-
-        $list = new TopScoreList();
-        $list->addInvolvedAlliance($alliance);
-        $list->setPodsNoobShips(true);
-        $table = new TopPilotTable($list, "Points");
-        $html .= $table->generate();
-
-        $html .= "</td></tr></table>";
-
-        break;
-    case "pilot_losses":
-        $html .= "<div class=block-header2>Top losers</div>";
-
-        $html .= "<table class=kb-subtable><tr><td valign=top width=440>";
-        $html .= "<div class=block-header>$monthname $year</div>";
-
-        $list = new TopLossesList();
-        $list->addVictimAlliance($alliance);
-        $list->setPodsNoobShips(false);
-        $list->setMonth($month);
-        $list->setYear($year);
-        $table = new TopPilotTable($list, "Losses");
-        $html .= $table->generate();
+                $html .= "<td align='right'><a href='?a=alliance_detail&amp;view=pilot_scores&amp;all_id=$all_id&amp;m=$nmonth&amp;y=$nyear'>next</a></p></td></tr></table>";
+
+                $html .= "</td><td valign=top width=400>";
+                $html .= "<div class=block-header>All time</div>";
+
+                $list = new TopScoreList();
+                $list->addInvolvedAlliance($alliance);
+                $list->setPodsNoobShips(true);
+                $table = new TopPilotTable($list, "Points");
+                $html .= $table->generate();
+
+                $html .= "</td></tr></table>";
+
+                break;
+        case "pilot_losses":
+                $html .= "<div class=block-header2>Top losers</div>";
+
+                $html .= "<table class=kb-subtable><tr><td valign=top width=440>";
+                $html .= "<div class=block-header>$monthname $year</div>";
+
+                $list = new TopLossesList();
+                $list->addVictimAlliance($alliance);
+                $list->setPodsNoobShips(false);
+                $list->setMonth($month);
+                $list->setYear($year);
+                $table = new TopPilotTable($list, "Losses");
+                $html .= $table->generate();
 
                 $html .= "<table width=300 cellspacing=1><tr><td><a href='?a=alliance_detail&amp;view=pilot_losses&amp;m=$pmonth&amp;all_id=$all_id&amp;y=$pyear'>previous</a></td>";
-        $html .= "<td align='right'><a href='?a=alliance_detail&amp;view=pilot_losses&amp;all_id=$all_id&amp;m=$nmonth&amp;y=$nyear'>next</a></p></td></tr></table>";
-        
-        $html .= "</td><td valign=top width=400>";
-        $html .= "<div class=block-header>All time</div>";
-
-        $list = new TopLossesList();
-        $list->addVictimAlliance($alliance);
-        $list->setPodsNoobShips(false);
-        $table = new TopPilotTable($list, "Losses");
-        $html .= $table->generate();
-
-        $html .= "</td></tr></table>";
-
-        break;
-    case "ships_weapons":
-        $html .= "<div class=block-header2>Ships &amp; weapons used</div>";
-
-        $html .= "<table class=kb-subtable><tr><td valign=top width=400>";
-        $shiplist = new TopShipList();
-        $shiplist->addInvolvedAlliance($alliance);
-        $shiplisttable = new TopShipListTable($shiplist);
-        $html .= $shiplisttable->generate();
-        $html .= "</td><td valign=top align=right width=400>";
-
-        $weaponlist = new TopWeaponList();
-        $weaponlist->addInvolvedAlliance($alliance);
-        $weaponlisttable = new TopWeaponListTable($weaponlist);
-        $html .= $weaponlisttable->generate();
-        $html .= "</td></tr></table>";
-
-        break;
-    case 'violent_systems':
-        $html .= "<div class=block-header2>Most violent systems</div>";
-        $html .= "<table width=\"99%\"><tr><td align=center valign=top>";
-
-        $html .= "<div class=block-header>This month</div>";
-        $html .= "<table class=kb-table>";
-        $html .= "<tr class=kb-table-header><td>#</td><td width=180>System</td><td width=40 align=center >Kills</td></tr>";
-
-        $sql = "select sys.sys_name, sys.sys_sec, sys.sys_id, count(distinct kll.kll_id) as kills
+                $html .= "<td align='right'><a href='?a=alliance_detail&amp;view=pilot_losses&amp;all_id=$all_id&amp;m=$nmonth&amp;y=$nyear'>next</a></p></td></tr></table>";
+
+                $html .= "</td><td valign=top width=400>";
+                $html .= "<div class=block-header>All time</div>";
+
+                $list = new TopLossesList();
+                $list->addVictimAlliance($alliance);
+                $list->setPodsNoobShips(false);
+                $table = new TopPilotTable($list, "Losses");
+                $html .= $table->generate();
+
+                $html .= "</td></tr></table>";
+
+                break;
+        case "ships_weapons":
+                $html .= "<div class=block-header2>Ships &amp; weapons used</div>";
+
+                $html .= "<table class=kb-subtable><tr><td valign=top width=400>";
+                $shiplist = new TopShipList();
+                $shiplist->addInvolvedAlliance($alliance);
+                $shiplisttable = new TopShipListTable($shiplist);
+                $html .= $shiplisttable->generate();
+                $html .= "</td><td valign=top align=right width=400>";
+
+                $weaponlist = new TopWeaponList();
+                $weaponlist->addInvolvedAlliance($alliance);
+                $weaponlisttable = new TopWeaponListTable($weaponlist);
+                $html .= $weaponlisttable->generate();
+                $html .= "</td></tr></table>";
+
+                break;
+        case 'violent_systems':
+                $html .= "<div class=block-header2>Most violent systems</div>";
+                $html .= "<table width=\"99%\"><tr><td align=center valign=top>";
+
+                $html .= "<div class=block-header>This month</div>";
+                $html .= "<table class=kb-table>";
+                $html .= "<tr class=kb-table-header><td>#</td><td width=180>System</td><td width=40 align=center >Kills</td></tr>";
+
+                $sql = "select sys.sys_name, sys.sys_sec, sys.sys_id, count(distinct kll.kll_id) as kills
                     from kb3_systems sys, kb3_kills kll, kb3_inv_detail inv
                     where kll.kll_system_id = sys.sys_id
                     and inv.ind_kll_id = kll.kll_id";
 
-        if ($crp_id)
-            $sql .= " and inv.ind_crp_id in (".$crp_id.")";
-        if ($all_id)
-            $sql .= " and inv.ind_all_id = ".$all_id;
-
-        $sql .= "   and date_format( kll.kll_timestamp, \"%c\" ) = ".kbdate("m")."
+                if ($crp_id)
+                        $sql .= " and inv.ind_crp_id in (".$crp_id.")";
+                if ($all_id)
+                        $sql .= " and inv.ind_all_id = ".$all_id;
+
+                $sql .= "   and date_format( kll.kll_timestamp, \"%c\" ) = ".kbdate("m")."
                     and date_format( kll.kll_timestamp, \"%Y\" ) = ".kbdate("Y")."
                     group by sys.sys_name
@@ -514 +528 @@
                     limit 25";
 
-        $qry = new DBQuery();
-        $qry->execute($sql);
-        $odd = false;
-        $counter = 1;
-        while ($row = $qry->getRow())
-        {
-            if (!$odd)
-            {
-                $odd = true;
-                $rowclass = 'kb-table-row-odd';
-            }
-            else
-            {
-                $odd = false;
-                $rowclass = 'kb-table-row-even';
-            }
-
-            $html .= "<tr class=".$rowclass."><td><b>".$counter.".</b></td><td class=kb-table-cell width=180><b><a href=\"?a=system_detail&amp;sys_id=".$row['sys_id']."\">".$row['sys_name']."</a></b> (".roundsec($row['sys_sec']).")</td><td align=center>".$row['kills']."</td></tr>";
-            $counter++;
-        }
-
-        $html .= "</table>";
-
-        $html .= "</td><td align=center valign=top>";
-        $html .= "<div class=block-header>All-Time</div>";
-        $html .= "<table class=kb-table>";
-        $html .= "<tr class=kb-table-header><td>#</td><td width=180>System</td><td width=40 align=center>Kills</td></tr>";
-
-        $sql = "select sys.sys_name, sys.sys_id, sys.sys_sec, count(distinct kll.kll_id) as kills
+                $qry = new DBQuery();
+                $qry->execute($sql);
+                $odd = false;
+                $counter = 1;
+                while ($row = $qry->getRow())
+                {
+                        if (!$odd)
+                        {
+                                $odd = true;
+                                $rowclass = 'kb-table-row-odd';
+                        }
+                        else
+                        {
+                                $odd = false;
+                                $rowclass = 'kb-table-row-even';
+                        }
+
+                        $html .= "<tr class=".$rowclass."><td><b>".$counter.".</b></td><td class=kb-table-cell width=180><b><a href=\"?a=system_detail&amp;sys_id=".$row['sys_id']."\">".$row['sys_name']."</a></b> (".roundsec($row['sys_sec']).")</td><td align=center>".$row['kills']."</td></tr>";
+                        $counter++;
+                }
+
+                $html .= "</table>";
+
+                $html .= "</td><td align=center valign=top>";
+                $html .= "<div class=block-header>All-Time</div>";
+                $html .= "<table class=kb-table>";
+                $html .= "<tr class=kb-table-header><td>#</td><td width=180>System</td><td width=40 align=center>Kills</td></tr>";
+
+                $sql = "select sys.sys_name, sys.sys_id, sys.sys_sec, count(distinct kll.kll_id) as kills
                     from kb3_systems sys, kb3_kills kll, kb3_inv_detail inv
                     where kll.kll_system_id = sys.sys_id
                     and inv.ind_kll_id = kll.kll_id";
 
-        if ($crp_id)
-            $sql .= " and inv.ind_crp_id in (".$crp_id.")";
-        if ($all_id)
-            $sql .= " and inv.ind_all_id = ".$all_id;
-
-        $sql .= " group by sys.sys_name
+                if ($crp_id)
+                        $sql .= " and inv.ind_crp_id in (".$crp_id.")";
+                if ($all_id)
+                        $sql .= " and inv.ind_all_id = ".$all_id;
+
+                $sql .= " group by sys.sys_name
                     order by kills desc
                     limit 25";
 
-        $qry = new DBQuery();
-        $qry->execute($sql);
-        $odd = false;
-        $counter = 1;
-        while ($row = $qry->getRow())
-        {
-            if (!$odd)
-            {
-                $odd = true;
-                $rowclass = 'kb-table-row-odd';
-            }
-            else
-            {
-                $odd = false;
-                $rowclass = 'kb-table-row-even';
-            }
-
-            $html .= "<tr class=".$rowclass."><td><b>".$counter.".</b></td><td class=kb-table-cell><b><a href=\"?a=system_detail&amp;sys_id=".$row['sys_id']."\">".$row['sys_name']."</a></b> (".roundsec($row['sys_sec']).")</td><td align=center>".$row['kills']."</td></tr>";
-            $counter++;
-        }
-        $html .= "</table>";
-        $html .= "</td></tr></table>";
-    break;
+                $qry = new DBQuery();
+                $qry->execute($sql);
+                $odd = false;
+                $counter = 1;
+                while ($row = $qry->getRow())
+                {
+                        if (!$odd)
+                        {
+                                $odd = true;
+                                $rowclass = 'kb-table-row-odd';
+                        }
+                        else
+                        {
+                                $odd = false;
+                                $rowclass = 'kb-table-row-even';
+                        }
+
+                        $html .= "<tr class=".$rowclass."><td><b>".$counter.".</b></td><td class=kb-table-cell><b><a href=\"?a=system_detail&amp;sys_id=".$row['sys_id']."\">".$row['sys_name']."</a></b> (".roundsec($row['sys_sec']).")</td><td align=center>".$row['kills']."</td></tr>";
+                        $counter++;
+                }
+                $html .= "</table>";
+                $html .= "</td></tr></table>";
+                break;
 }
 
@@ -596 +610 @@
 if (config::get('kill_points'))
 {
-    $menubox->addOption('link', "Top scorers", "?a=alliance_detail&amp;all_id=" . $alliance->getID() . "&amp;view=pilot_scores");
+        $menubox->addOption('link', "Top scorers", "?a=alliance_detail&amp;all_id=" . $alliance->getID() . "&amp;view=pilot_scores");
 }
 $menubox->addOption("link","Top losers", "?a=alliance_detail&amp;all_id=" . $alliance->getID() . "&amp;view=pilot_losses");

dev/common/campaigns.php

@@ -6 +6 @@
 switch ($_GET['view'])
 {
-    case '':
-        $activelist = new ContractList();
-        $activelist->setCampaigns(true);
-        $activelist->setActive('yes');
-        $page->setTitle('Active campaigns');
-        $table = new ContractListTable($activelist);
-        $table->paginate(10, $_GET['page']);
-        $html .= $table->generate();
-        break;
-    case 'past':
-        $pastlist = new ContractList();
-        $pastlist->setCampaigns(true);
-        $pastlist->setActive('no');
-        $page->setTitle('Past campaigns');
-        $table = new ContractListTable($pastlist);
-        $table->paginate(10, $_GET['page']);
-        $html .= $table->generate();
-        break;
+        case '':
+                $activelist = new ContractList();
+                $activelist->setCampaigns(true);
+                $activelist->setActive('yes');
+                $page->setTitle('Active campaigns');
+                $table = new ContractListTable($activelist);
+                $table->paginate(10, intval($_GET['page']));
+                $html .= $table->generate();
+                break;
+        case 'past':
+                $pastlist = new ContractList();
+                $pastlist->setCampaigns(true);
+                $pastlist->setActive('no');
+                $page->setTitle('Past campaigns');
+                $table = new ContractListTable($pastlist);
+                $table->paginate(10, intval($_GET['page']));
+                $html .= $table->generate();
+                break;
 }
 

dev/common/cc_detail.php

@@ -6 +6 @@
 require_once('common/includes/class.toplist.php');
 
-$ctr_id = $_GET['ctr_id'];
+$ctr_id = intval($_GET['ctr_id']);
+$scl_id = intval($_GET['scl_id']);
 
 $contract = new Contract($ctr_id);
+if(!$contract->validate())
+{
+        echo 'No valid contract ID specified<br />';
+        return;
+}
 
 if ($contract->getCampaign())
-    $title = 'Campaign details';
-else
-    $title = 'Contract details';
+        $title = 'Campaign details';
+else
+        $title = 'Contract details';
 
 $page = new Page($title.' - '.$contract->getName());
@@ -20 +26 @@
 // table class=kb-subtable cellspacing=0><tr class=kb-table-row-even><td width=80 height=80 align=center>";
 if ($contract->getCampaign())
-    $html .= "<img src=\"".IMG_URL."/campaign-big.gif\" align=center>";
-else
-    $html .= "<img src=\"".IMG_URL."/contract-big.gif\" align=center>";
+        $html .= "<img src=\"".IMG_URL."/campaign-big.gif\" align=center>";
+else
+        $html .= "<img src=\"".IMG_URL."/contract-big.gif\" align=center>";
 
 $html .= "</td>";
@@ -28 +34 @@
 // $html .= "<table class=kb-subtable width=\"100%\" height=\"100%\" cellspacing=1 border=\"0\">";
 if ($contract->getEndDate() == "")
-    $ended = "Active";
-else
-    $ended = substr($contract->getEndDate(), 0, 10);
+        $ended = "Active";
+else
+        $ended = substr($contract->getEndDate(), 0, 10);
 $html .= "<td class=kb-table-cell><b>Start date:</b></td><td class=kb-table-cell width=120><b>".substr($contract->getStartDate(), 0, 10)."</b></td><td class=kb-table-cell><b>End date:</b></td><td class=kb-table-cell width=120><b>".$ended."</b></td></tr>";
 $html .= "<tr class=kb-table-row-even><td class=kb-table-cell><b>Kills:</b></td><td class=kl-kill>".$contract->getKills()."</td><td class=kb-table-cell><b>Losses:</b></td><td class=kl-loss>".$contract->getLosses()."</td></tr>";
@@ -42 +48 @@
 $killsummary->setBreak(config::get('summarytable_rowcount'));
 if ($_GET['view'] == "")
-    $killsummary->setFilter(false);
+        $killsummary->setFilter(false);
 
 $html .= "<br>";
@@ -49 +55 @@
 switch ($_GET['view'])
 {
-    case "":
-        while ($target = &$contract->getContractTarget())
-        {
-            $kl = &$target->getKillList();
-            $ll = &$target->getLossList();
-            $summary = new KillSummaryTable($kl, $ll);
-            $summary->setVerbose(true);
+        case "":
+                while ($target = &$contract->getContractTarget())
+                {
+                        $kl = &$target->getKillList();
+                        $ll = &$target->getLossList();
+                        $summary = new KillSummaryTable($kl, $ll);
+                        $summary->setVerbose(true);
                         $qrylength=new DBQuery();
                         // set break at half of the number of valid classes - excludes noob ships, drones and unknown
@@ -65 +71 @@
                         }
                         else $summary->setBreak(15);
-            $summary->setView('combined');
-
-            $html .= "<br><div class=kb-contract-target-header>Target ".$target->getType()." - ";
-            switch ($target->getType()) {
-                case "corp":
-                    $html .= "<a class=kb-contract href=\"?a=".$target->getType()."_detail&crp_id=".$target->getID()."\">".$target->getName()."</a>";
-                    break;
-                case "alliance":
-                    $html .= "<a class=kb-contract href=\"?a=".$target->getType()."_detail&all_id=".$target->getID()."\">".$target->getName()."</a>";
-                    break;
-                case "system":
-                    $html .= "<a class=kb-contract href=\"?a=" .$target->getType()."_detail&sys_id=".$target->getID()."\">".$target->getName()."</a>";
-                    break;
-                case "region":
-                    $html .= $target->getName();
-                    break;
-            }
-            $html .= "</div>";
-            $html .= $summary->generate();
-
-            $html .= "<br><table class=kb-subtable border=\"0\" cellspacing=0 width=\"100%\"><tr><td>";
-
-            if ($summary->getTotalKillISK())
-                $efficiency = round($summary->getTotalKillISK() / ($summary->getTotalKillISK() + $summary->getTotalLossISK()) * 100, 2);
-            else
-                $efficiency = 0;
-
-            $bar = new BarGraph($efficiency, 100, 120);
-            $html .= "<table class=kb-table cellspacing=1 border=\"0\" width=\"100%\"><tr class=kb-table-row-even>";
-            $html .= "<td class=kb-table-cell width=108><b>Totals:</b></td><td class=kl-kill-bg width=60 align=center>".$summary->getTotalKills()."</td><td class=kl-kill-bg width=60 align=center>".round($summary->getTotalKillISK()/1000000000, 2)."B</td>";
-            $html .= "<td class=kl-loss-bg width=64 align=center>".$summary->getTotalLosses()."</td><td class=kl-loss-bg width=60 align=center>".round($summary->getTotalLossISK()/1000000000, 2)."B</td></tr></table>";
-
-            $html .= "</td><td align=left>";
-
-            $html .= "<table class=kb-table cellspacing=1 border=\"0\"><tr class=kb-table-row-even>";
-            $html .= "<td class=kb-table-cell width=108><b>Efficiency:</b></td><td class=kb-table-cell align=center colspan=2 width=120><b>".$efficiency."%</b></td>";
-            $html .= "<td class=kb-table-cell colspan=2 width=120>".$bar->generate()."</td></tr>";
-            $html .= "</tr></table>";
-
-            $html .= "</td></tr></table>";
-        }
-
-        break;
-    case "recent_activity":
-        $html .= "<div class=kb-kills-header>10 Most recent kills</div>";
-
-        $contract = new Contract($ctr_id);
-        $klist = $contract->getKillList();
-        $klist->setOrdered(true);
-        if ($_GET['scl_id'])
-            $klist->addVictimShipClass(new ShipClass($_GET['scl_id']));
-        else
-            $klist->setPodsNoobShips(false);
-
-        $table = new KillListTable($klist);
-        $table->setLimit(10);
-        $table->setDayBreak(false);
-        $html .= $table->generate();
-
-        $html .= "<div class=kb-losses-header>10 Most recent losses</div>";
-        $llist = $contract->getLossList();
-        $llist->setOrdered(true);
-        if ($_GET['scl_id'])
-            $llist->addVictimShipClass(new ShipClass($_GET['scl_id']));
-        else
-            $llist->setPodsNoobShips(false);
-
-        $table = new KillListTable($llist);
-        $table->setLimit(10);
-        $table->setDayBreak(false);
-        $html .= $table->generate();
-        break;
-    case "kills":
-        $html .= "<div class=kb-kills-header>All kills</div>";
-
-        $contract = new Contract($ctr_id);
-        $list = $contract->getKillList();
-        $list->setOrdered(true);
-        if ($_GET['scl_id'])
-            $list->addVictimShipClass(new ShipClass($_GET['scl_id']));
-
-        $pagesplitter = new PageSplitter($list->getCount(), 30);
-        $list->setPageSplitter($pagesplitter);
-        $table = new KillListTable($list);
-        $table->setDayBreak(false);
-        $html .= $table->generate();
-        $html .= $pagesplitter->generate();
-        break;
-    case "losses":
-        $html .= "<div class=kb-losses-header>All losses</div>";
-
-        $contract = new Contract($ctr_id);
-        $llist = $contract->getLossList();
-        $llist->setOrdered(true);
-        if ($_GET['scl_id'])
-            $llist->addVictimShipClass(new ShipClass($_GET['scl_id']));
-
-        $pagesplitter = new PageSplitter($llist->getCount(), 30);
-        $llist->setPageSplitter($pagesplitter);
-        $table = new KillListTable($llist);
-        $table->setDayBreak(false);
-        $html .= $table->generate();
-        $html .= $pagesplitter->generate();
-        break;
-    case "combined":
-        $html .= "<div class=kb-kills-header>All kills</div>";
-
-        $contract = new Contract($ctr_id);
-        $list = $contract->getKillList();
-        $list->setOrdered(true);
-        if ($_GET['scl_id'])
-            $list->addVictimShipClass(new ShipClass($_GET['scl_id']));
-
-        $pagesplitter = new PageSplitter($list->getCount(), 20);
-        $list->setPageSplitter($pagesplitter);
-        $table = new KillListTable($list);
-        $table->setDayBreak(false);
-        $html .= $table->generate();
-        $html .= $pagesplitter->generate();
-
-        $html .= "<div class=kb-losses-header>All losses</div>";
-
-        $contract = new Contract($ctr_id);
-        $llist = $contract->getLossList();
-        $llist->setOrdered(true);
-        if ($_GET['scl_id'])
-            $llist->addVictimShipClass(new ShipClass($_GET['scl_id']));
-
-        $pagesplitter = new PageSplitter($llist->getCount(), 20);
-        $llist->setPageSplitter($pagesplitter);
-        $table = new KillListTable($llist);
-        $table->setDayBreak(false);
-        $html .= $table->generate();
-        $html .= $pagesplitter->generate();
-        break;
+                        $summary->setView('combined');
+
+                        $html .= "<br><div class=kb-contract-target-header>Target ".$target->getType()." - ";
+                        switch ($target->getType())
+                        {
+                                case "corp":
+                                        $html .= "<a class=kb-contract href=\"?a=".$target->getType()."_detail&crp_id=".$target->getID()."\">".$target->getName()."</a>";
+                                        break;
+                                case "alliance":
+                                        $html .= "<a class=kb-contract href=\"?a=".$target->getType()."_detail&all_id=".$target->getID()."\">".$target->getName()."</a>";
+                                        break;
+                                case "system":
+                                        $html .= "<a class=kb-contract href=\"?a=" .$target->getType()."_detail&sys_id=".$target->getID()."\">".$target->getName()."</a>";
+                                        break;
+                                case "region":
+                                        $html .= $target->getName();
+                                        break;
+                        }
+                        $html .= "</div>";
+                        $html .= $summary->generate();
+
+                        $html .= "<br><table class=kb-subtable border=\"0\" cellspacing=0 width=\"100%\"><tr><td>";
+
+                        if ($summary->getTotalKillISK())
+                                $efficiency = round($summary->getTotalKillISK() / ($summary->getTotalKillISK() + $summary->getTotalLossISK()) * 100, 2);
+                        else
+                                $efficiency = 0;
+
+                        $bar = new BarGraph($efficiency, 100, 120);
+                        $html .= "<table class=kb-table cellspacing=1 border=\"0\" width=\"100%\"><tr class=kb-table-row-even>";
+                        $html .= "<td class=kb-table-cell width=108><b>Totals:</b></td><td class=kl-kill-bg width=60 align=center>".$summary->getTotalKills()."</td><td class=kl-kill-bg width=60 align=center>".round($summary->getTotalKillISK()/1000000000, 2)."B</td>";
+                        $html .= "<td class=kl-loss-bg width=64 align=center>".$summary->getTotalLosses()."</td><td class=kl-loss-bg width=60 align=center>".round($summary->getTotalLossISK()/1000000000, 2)."B</td></tr></table>";
+
+                        $html .= "</td><td align=left>";
+
+                        $html .= "<table class=kb-table cellspacing=1 border=\"0\"><tr class=kb-table-row-even>";
+                        $html .= "<td class=kb-table-cell width=108><b>Efficiency:</b></td><td class=kb-table-cell align=center colspan=2 width=120><b>".$efficiency."%</b></td>";
+                        $html .= "<td class=kb-table-cell colspan=2 width=120>".$bar->generate()."</td></tr>";
+                        $html .= "</tr></table>";
+
+                        $html .= "</td></tr></table>";
+                }
+
+                break;
+        case "recent_activity":
+                $html .= "<div class=kb-kills-header>10 Most recent kills</div>";
+
+                $contract = new Contract($ctr_id);
+                $klist = $contract->getKillList();
+                $klist->setOrdered(true);
+                if ($scl_id)
+                        $klist->addVictimShipClass($scl_id);
+                else
+                        $klist->setPodsNoobShips(false);
+
+                $table = new KillListTable($klist);
+                $table->setLimit(10);
+                $table->setDayBreak(false);
+                $html .= $table->generate();
+
+                $html .= "<div class=kb-losses-header>10 Most recent losses</div>";
+                $llist = $contract->getLossList();
+                $llist->setOrdered(true);
+                if ($scl_id)
+                        $llist->addVictimShipClass($scl_id);
+                else
+                        $llist->setPodsNoobShips(false);
+
+                $table = new KillListTable($llist);
+                $table->setLimit(10);
+                $table->setDayBreak(false);
+                $html .= $table->generate();
+                break;
+        case "kills":
+                $html .= "<div class=kb-kills-header>All kills</div>";
+
+                $contract = new Contract($ctr_id);
+                $list = $contract->getKillList();
+                $list->setOrdered(true);
+                if ($scl_id)
+                        $list->addVictimShipClass($scl_id);
+
+                $pagesplitter = new PageSplitter($list->getCount(), 30);
+                $list->setPageSplitter($pagesplitter);
+                $table = new KillListTable($list);
+                $table->setDayBreak(false);
+                $html .= $table->generate();
+                $html .= $pagesplitter->generate();
+                break;
+        case "losses":
+                $html .= "<div class=kb-losses-header>All losses</div>";
+
+                $contract = new Contract($ctr_id);
+                $llist = $contract->getLossList();
+                $llist->setOrdered(true);
+                if ($scl_id)
+                        $llist->addVictimShipClass($scl_id);
+
+                $pagesplitter = new PageSplitter($llist->getCount(), 30);
+                $llist->setPageSplitter($pagesplitter);
+                $table = new KillListTable($llist);
+                $table->setDayBreak(false);
+                $html .= $table->generate();
+                $html .= $pagesplitter->generate();
+                break;
+        case "combined":
+                $html .= "<div class=kb-kills-header>All kills</div>";
+
+                $contract = new Contract($ctr_id);
+                $list = $contract->getKillList();
+                $list->setOrdered(true);
+                if ($scl_id)
+                        $list->addVictimShipClass($scl_id);
+
+                $pagesplitter = new PageSplitter($list->getCount(), 20);
+                $list->setPageSplitter($pagesplitter);
+                $table = new KillListTable($list);
+                $table->setDayBreak(false);
+                $html .= $table->generate();
+                $html .= $pagesplitter->generate();
+
+                $html .= "<div class=kb-losses-header>All losses</div>";
+
+                $contract = new Contract($ctr_id);
+                $llist = $contract->getLossList();
+                $llist->setOrdered(true);
+                if ($scl_id)
+                        $llist->addVictimShipClass($scl_id);
+
+                $pagesplitter = new PageSplitter($llist->getCount(), 20);
+                $llist->setPageSplitter($pagesplitter);
+                $table = new KillListTable($llist);
+                $table->setDayBreak(false);
+                $html .= $table->generate();
+                $html .= $pagesplitter->generate();
+                break;
 }
 
@@ -205 +212 @@
 $menubox->setIcon("menu-item.gif");
 $menubox->addOption("caption","Overview");
-$menubox->addOption("link","Target overview", "?a=cc_detail&ctr_id=".$_GET['ctr_id']);
+$menubox->addOption("link","Target overview", "?a=cc_detail&ctr_id=".$ctr_id);
 $menubox->addOption("caption","Kills & losses");
-$menubox->addOption("link","Recent activity", "?a=cc_detail&ctr_id=".$_GET['ctr_id']."&view=recent_activity");
-$menubox->addOption("link","All kills", "?a=cc_detail&ctr_id=".$_GET['ctr_id']."&view=kills");
-$menubox->addOption("link","All losses", "?a=cc_detail&ctr_id=".$_GET['ctr_id']."&view=losses");
+$menubox->addOption("link","Recent activity", "?a=cc_detail&ctr_id=".$ctr_id."&view=recent_activity");
+$menubox->addOption("link","All kills", "?a=cc_detail&ctr_id=".$ctr_id."&view=kills");
+$menubox->addOption("link","All losses", "?a=cc_detail&ctr_id=".$ctr_id."&view=losses");
 
 $page->addContext($menubox->generate());
@@ -219 +226 @@
 $tklist->generate();
 if ($contract->getCampaign())
-    $campaign = "campaign";
-else
-    $campaign = "contract";
+        $campaign = "campaign";
+else
+        $campaign = "contract";
 $tkbox = new AwardBox($tklist, "Top killers", "kills in this ".$campaign, "kills", "eagle");
 
@@ -228 +235 @@
 if (config::get('kill_points'))
 {
-    $tklist = new TopContractScoreList();
-    $tklist->setContract(new Contract($ctr_id));
-    involved::load($tklist,'kill');
-
-    $tklist->generate();
-    $tkbox = new AwardBox($tklist, "Top scorers", "points in this ".$campaign, "points", "redcross");
-    $page->addContext($tkbox->generate());
+        $tklist = new TopContractScoreList();
+        $tklist->setContract(new Contract($ctr_id));
+        involved::load($tklist,'kill');
+
+        $tklist->generate();
+        $tkbox = new AwardBox($tklist, "Top scorers", "points in this ".$campaign, "points", "redcross");
+        $page->addContext($tkbox->generate());
 }
 

dev/common/corp_detail.php

@@ -11 +11 @@
 $crp_id = intval($_GET['crp_id']);
 $crp_external_id = intval($_GET['crp_external_id']);
+
 if (!$crp_id && !$crp_external_id)
 {
-    if (CORP_ID)
-    {
-        $crp_id = CORP_ID;
-    }
-    else
-    {
-        echo 'no valid corp id specified<br/>';
-        return;
-    }
+        if (CORP_ID)
+        {
+                $crp_id = CORP_ID;
+        }
+        else
+        {
+                echo 'no valid corp id specified<br/>';
+                return;
+        }
 }
 
@@ -35 +36 @@
 }
 
-$month = $_GET['m'];
-$year = $_GET['y'];
+$month = intval($_GET['m']);
+$year = intval($_GET['y']);
 
 if ($month == '')
-    $month = kbdate('m');
+        $month = kbdate('m');
 
 if ($year == '')
-    $year = kbdate('Y');
+        $year = kbdate('Y');
 
 if ($month == 12)
 {
-    $nmonth = 1;
-    $nyear = $year + 1;
+        $nmonth = 1;
+        $nyear = $year + 1;
 }
 else
 {
-    $nmonth = $month + 1;
-    $nyear = $year;
+        $nmonth = $month + 1;
+        $nyear = $year;
 }
 if ($month == 1)
 {
-    $pmonth = 12;
-    $pyear = $year - 1;
+        $pmonth = 12;
+        $pyear = $year - 1;
 }
 else
 {
-    $pmonth = $month - 1;
-    $pyear = $year;
+        $pmonth = $month - 1;
+        $pyear = $year;
 }
 $monthname = kbdate("F", strtotime("2000-".$month."-2"));
 
-$all_id = $_GET['all_id'];
+$all_id = intval($_GET['all_id']);
 $corp = new Corporation($crp_id);
 $alliance = $corp->getAlliance();
@@ -80 +81 @@
 $html .= $myID->fetchXML();
 $myNames = $myID->getNameData();
-                
+
 $myAPI = new API_CorporationSheet();
 $myAPI->setCorpID($myNames[0]['characterID']);
@@ -89 +90 @@
 {
         $page = new Page('Corporation details - '.$corp->getName());
-} else {
+} else
+{
         $page = new Page('Corporation details - '.$corp->getName() . " [" . $myAPI->getTicker() . "]");
 }       
@@ -96 +98 @@
 if (file_exists("img/corps/".$corp->getID().".jpg") || file_exists("img/corps/".$corp->getUnique().".jpg"))
 {
-    $html .= "<img src=\"".$corp->getPortraitURL(128)."\" border=\"0\" alt=\"\"></td>";
+        $html .= "<img src=\"".$corp->getPortraitURL(128)."\" border=\"0\" alt=\"\"></td>";
 }
 else
 {
         if ($alliance != 0)
-        {       
+        {
                 $mylogo = $myAPI->getLogo();
-                
+
                 if ($result == "Corporation is not part of alliance.")
                 {
                         $html .= "<img src=\"".IMG_URL."/campaign-big.gif\" border=\"0\" alt=\"\"></td>";
-                } elseif ($result == "") {
-                        // create two sized logo's in 2 places - this allows checks already in place not to keep requesting corp logos each time page is viewed
-                        // class.thumb.php cannot work with png (although saved as jpg these are actually pngs) therefore we have to create the 128 size for it
-                        // doing this prevents the images being rendered each time the function is called and allows it to use one in the cache instead.
+                } elseif ($result == "")
+                {
+                // create two sized logo's in 2 places - this allows checks already in place not to keep requesting corp logos each time page is viewed
+                // class.thumb.php cannot work with png (although saved as jpg these are actually pngs) therefore we have to create the 128 size for it
+                // doing this prevents the images being rendered each time the function is called and allows it to use one in the cache instead.
                         CorporationLogo( $mylogo, 64, $corp->getID() );
                         CorporationLogo( $mylogo, 128, $corp->getID() );
-                        
+
                         $html .= "<img src=\"".$corp->getPortraitURL(128)."\" border=\"0\" alt=\"\"></td>";
-                } else {
-                        // some kind of error getting details from CCP so abort writing file(s) allowing us to try again later - in the meantime, lets print trusty default
-                        // error text will also appear where the picture is, which is nice
+                } else
+                {
+                // some kind of error getting details from CCP so abort writing file(s) allowing us to try again later - in the meantime, lets print trusty default
+                // error text will also appear where the picture is, which is nice
                         $html .= "<img src=\"".IMG_URL."/campaign-big.gif\" border=\"0\" alt=\"\"></td>";
-                }       
-        } else {
+                }
+        } else
+        {
                 $html .= "<img src=\"".IMG_URL."/campaign-big.gif\" border=\"0\" alt=\"\"></td>";
         }
@@ -130 +135 @@
         if ($alliance->getName() == "Unknown" || $alliance->getName() == "None")
         {
-                $html .= "<b>".$alliance->getName()."</b>";
+                $html .= "<b>".$alliance->getName()."</b>";
         }
         else
         {
-        $html .= "<a href=\"?a=alliance_detail&amp;all_id=".$alliance->getID()."\">".$alliance->getName()."</a>";
+                $html .= "<a href=\"?a=alliance_detail&amp;all_id=".$alliance->getID()."\">".$alliance->getName()."</a>";
         }
         $html .= "</td></tr>";
@@ -143 +148 @@
         if ($kill_summary->getTotalKillISK())
         {
-        $efficiency = round($kill_summary->getTotalKillISK() / ($kill_summary->getTotalKillISK() + $kill_summary->getTotalLossISK()) * 100, 2);
+                $efficiency = round($kill_summary->getTotalKillISK() / ($kill_summary->getTotalKillISK() + $kill_summary->getTotalLossISK()) * 100, 2);
         }
         else
         {
-                $efficiency = 0;
+                $efficiency = 0;
         }
 
@@ -153 +158 @@
         $html .= "</table>";
         $html .= "<br/>";
-} else {
+} else
+{
         $html .= "<td class=kb-table-cell width=150><b>Alliance:</b></td><td class=kb-table-cell>";
         if ($alliance->getName() == "Unknown" || $alliance->getName() == "None")
         {
-                $html .= "<b>".$alliance->getName()."</b>";
+                $html .= "<b>".$alliance->getName()."</b>";
         }
         else
         {
-        $html .= "<a href=\"?a=alliance_detail&amp;all_id=".$alliance->getID()."\">".$alliance->getName()."</a>";
+                $html .= "<a href=\"?a=alliance_detail&amp;all_id=".$alliance->getID()."\">".$alliance->getName()."</a>";
         }
         $html .= "</td><td class=kb-table-cell width=65><b>CEO:</b></td><td class=kb-table-cell><a href=\"?a=search&amp;searchtype=pilot&amp;searchphrase=" . urlencode($myAPI->getCeoName()) . "\">" . $myAPI->getCeoName() . "</a></td></tr>";
@@ -174 +180 @@
         if ($kill_summary->getTotalKillISK())
         {
-        $efficiency = round($kill_summary->getTotalKillISK() / ($kill_summary->getTotalKillISK() + $kill_summary->getTotalLossISK()) * 100, 2);
+                $efficiency = round($kill_summary->getTotalKillISK() / ($kill_summary->getTotalKillISK() + $kill_summary->getTotalLossISK()) * 100, 2);
         }
         else
         {
-                $efficiency = 0;
+                $efficiency = 0;
         }
 
@@ -193 +199 @@
 if ($_GET['view'] == "" || $_GET['view'] == "kills" || $_GET['view'] == "losses")
 {
-    $html .= $summary_html;
+        $html .= $summary_html;
 }
 
 switch ($_GET['view'])
 {
-    case "":
-        $html .= "<div class=kb-kills-header>10 Most recent kills in the last 30 days</div>";
-
-        $list = new KillList();
-        $list->setOrdered(true);
-        $list->setLimit(10);
-        $list->setPodsNoobships(true);
-        $list->addInvolvedCorp($corp);
-        if ($_GET['scl_id'])
-            $list->addVictimShipClass(new ShipClass($_GET['scl_id']));
+        case "":
+                $html .= "<div class=kb-kills-header>10 Most recent kills in the last 30 days</div>";
+
+                $list = new KillList();
+                $list->setOrdered(true);
+                $list->setLimit(10);
+                $list->setPodsNoobships(true);
+                $list->addInvolvedCorp($corp);
+                if ($_GET['scl_id'])
+                        $list->addVictimShipClass(new ShipClass($_GET['scl_id']));
                 $list->setStartDate(date('Y-m-d H:i',strtotime('-30 days')));
 
-        $ktab = new KillListTable($list);
-        $ktab->setLimit(10);
-        $ktab->setDayBreak(false);
-        $html .= $ktab->generate();
-
-        $html .= "<div class=kb-losses-header>10 Most recent losses in the last 30 days</div>";
-
-        $list = new KillList();
-        $list->setOrdered(true);
-        $list->setLimit(10);
-        $list->setPodsNoobships(true);
-        $list->addVictimCorp($corp);
-        if ($_GET['scl_id'])
-            $list->addVictimShipClass(new ShipClass($_GET['scl_id']));
+                $ktab = new KillListTable($list);
+                $ktab->setLimit(10);
+                $ktab->setDayBreak(false);
+                $html .= $ktab->generate();
+
+                $html .= "<div class=kb-losses-header>10 Most recent losses in the last 30 days</div>";
+
+                $list = new KillList();
+                $list->setOrdered(true);
+                $list->setLimit(10);
+                $list->setPodsNoobships(true);
+                $list->addVictimCorp($corp);
+                if ($_GET['scl_id'])
+                        $list->addVictimShipClass(new ShipClass($_GET['scl_id']));
                 $list->setStartDate(date('Y-m-d H:i',strtotime('-30 days')));
 
-        $ltab = new KillListTable($list);
-        $ltab->setLimit(10);
-        $ltab->setDayBreak(false);
-        $html .= $ltab->generate();
-
-        break;
-    case "kills":
-        $html .= "<div class=kb-kills-header>All kills</div>";
-
-        $list = new KillList();
-        $list->setOrdered(true);
-        $list->addInvolvedCorp($corp);
-        if ($_GET['scl_id'])
-            $list->addVictimShipClass(new ShipClass($_GET['scl_id']));
-        $pagesplitter = new PageSplitter($list->getCount(), 30);
-        $list->setPageSplitter($pagesplitter);
-        $table = new KillListTable($list);
-        $table->setDayBreak(false);
-        $html .= $table->generate();
-        $html .= $pagesplitter->generate();
-
-        break;
-    case "losses":
-        $html .= "<div class=kb-losses-header>All losses</div>";
-
-        $list = new KillList();
-        $list->setOrdered(true);
-        $list->setPodsNoobships(true);
-        $list->addVictimCorp($corp);
-        if ($_GET['scl_id'])
-            $list->addVictimShipClass(new ShipClass($_GET['scl_id']));
-        $pagesplitter = new PageSplitter($list->getCount(), 30);
-        $list->setPageSplitter($pagesplitter);
-
-        $table = new KillListTable($list);
-        $table->setDayBreak(false);
-        $html .= $table->generate();
-        $html .= $pagesplitter->generate();
-
-        break;
-    case "pilot_kills":
-        $html .= "<div class=block-header2>Top killers</div>";
-
-        $html .= "<table class=kb-subtable><tr><td valign=top width=440>";
-        $html .= "<div class=block-header>$monthname $year</div>";
-
-        $list = new TopKillsList();
-        $list->addInvolvedCorp($corp);
-        $list->setPodsNoobShips(false);
-        $list->setMonth($month);
-        $list->setYear($year);
-        $table = new TopPilotTable($list, "Kills");
-        $html .= $table->generate();
-
-        $html .= "<table width=300 cellspacing=1><tr><td><a href='?a=corp_detail&amp;view=pilot_kills&amp;m=$pmonth&amp;crp_id=$crp_id&amp;y=$pyear'>previous</a></td>";
-        $html .= "<td align='right'><a href='?a=corp_detail&amp;view=pilot_kills&amp;crp_id=$crp_id&amp;m=$nmonth&amp;y=$nyear'>next</a></p></td></tr></table>";
-        
-        $html .= "</td><td valign=top width=400>";
-        $html .= "<div class=block-header>All time</div>";
-
-        $list = new TopKillsList();
-        $list->addInvolvedCorp($corp);
-        $list->setPodsNoobShips(false);
-        $table = new TopPilotTable($list, "Kills");
-        $html .= $table->generate();
-
-        $html .= "</td></tr></table>";
-
-        break;
-    case "pilot_scores":
-        $html .= "<div class=block-header2>Top scorers</div>";
-
-        $html .= "<table class=kb-subtable><tr><td valign=top width=440>";
-        $html .= "<div class=block-header>$monthname $year</div>";
-
-        $list = new TopScoreList();
-        $list->addInvolvedCorp($corp);
-        $list->setPodsNoobShips(true);
-        $list->setMonth($month);
-        $list->setYear($year);
-        $table = new TopPilotTable($list, "Points");
-        $html .= $table->generate();
-
-        $html .= "<table width=300 cellspacing=1><tr><td><a href='?a=corp_detail&amp;view=pilot_scores&amp;m=$pmonth&amp;crp_id=$crp_id&amp;y=$pyear'>previous</a></td>";
-        $html .= "<td align='right'><a href='?a=corp_detail&amp;view=pilot_scores&amp;crp_id=$crp_id&amp;m=$nmonth&amp;y=$nyear'>next</a></p></td></tr></table>";
-        
-        $html .= "</td><td valign=top width=400>";
-        $html .= "<div class=block-header>All time</div>";
-
-        $list = new TopScoreList();
-        $list->addInvolvedCorp($corp);
-        $list->setPodsNoobShips(true);
-        $table = new TopPilotTable($list, "Points");
-        $html .= $table->generate();
-
-        $html .= "</td></tr></table>";
-
-        break;
-    case "pilot_solo":
-        $html .= "<div class=block-header2>Top solokillers</div>";
-
-        $html .= "<table class=kb-subtable><tr><td valign=top width=440>";
-        $html .= "<div class=block-header>$monthname $year</div>";
-
-        $list = new TopSoloKillerList();
-        $list->addInvolvedCorp($corp);
-        $list->setPodsNoobShips(false);
-        $list->setMonth($month);
-        $list->setYear($year);
-        $table = new TopPilotTable($list, "Solokills");
-        $html .= $table->generate();
-
-        $html .= "<table width=300 cellspacing=1><tr><td><a href='?a=corp_detail&amp;view=pilot_solo&amp;m=$pmonth&amp;crp_id=$crp_id&amp;y=$pyear'>previous</a></td>";
-        $html .= "<td align='right'><a href='?a=corp_detail&amp;view=pilot_solo&amp;crp_id=$crp_id&amp;m=$nmonth&amp;y=$nyear'>next</a></p></td></tr></table>";
-        
-        $html .= "</td><td valign=top width=400>";
-        $html .= "<div class=block-header>All time</div>";
-
-        $list = new TopSoloKillerList();
-        $list->addInvolvedCorp($corp);
-        $list->setPodsNoobShips(false);
-        $table = new TopPilotTable($list, "Solokills");
-        $html .= $table->generate();
-
-        $html .= "</td></tr></table>";
-
-        break;
-
-    case "pilot_damage":
-        $html .= "<div class=block-header2>Top damagedealers</div>";
-
-        $html .= "<table class=kb-subtable><tr><td valign=top width=440>";
-        $html .= "<div class=block-header>$monthname $year</div>";
-
-        $list = new TopDamageDealerList();
-        $list->addInvolvedCorp($corp);
-        $list->setPodsNoobShips(false);
-        $list->setMonth($month);
-        $list->setYear($year);
-        $table = new TopPilotTable($list, "Kills");
-        $html .= $table->generate();
-
-        $html .= "<table width=300 cellspacing=1><tr><td><a href='?a=corp_detail&amp;view=pilot_damage&amp;m=$pmonth&amp;crp_id=$crp_id&amp;y=$pyear'>previous</a></td>";
-        $html .= "<td align='right'><a href='?a=corp_detail&amp;view=pilot_damage&amp;crp_id=$crp_id&amp;m=$nmonth&amp;y=$nyear'>next</a></p></td></tr></table>";
-        
-        $html .= "</td><td valign=top width=400>";
-        $html .= "<div class=block-header>All time</div>";
-
-        $list = new TopDamageDealerList();
-        $list->addInvolvedCorp($corp);
-        $list->setPodsNoobShips(false);
-        $table = new TopPilotTable($list, "Kills");
-        $html .= $table->generate();
-
-        $html .= "</td></tr></table>";
-
-        break;
-
-    case "pilot_griefer":
-        $html .= "<div class=block-header2>Top griefers</div>";
-
-        $html .= "<table class=kb-subtable><tr><td valign=top width=440>";
-        $html .= "<div class=block-header>$monthname $year</div>";
-
-        $list = new TopGrieferList();
-        $list->addInvolvedCorp($corp);
-        $list->setMonth($month);
-        $list->setYear($year);
-        $table = new TopPilotTable($list, "Kills");
-        $html .= $table->generate();
-
-        $html .= "<table width=300 cellspacing=1><tr><td><a href='?a=corp_detail&amp;view=pilot_griefer&amp;m=$pmonth&amp;crp_id=$crp_id&amp;y=$pyear'>previous</a></td>";
-        $html .= "<td align='right'><a href='?a=corp_detail&amp;view=pilot_griefer&amp;crp_id=$crp_id&amp;m=$nmonth&amp;y=$nyear'>next</a></p></td></tr></table>";
-        
-        $html .= "</td><td valign=top width=400>";
-        $html .= "<div class=block-header>All time</div>";
-
-        $list = new TopGrieferList();
-        $list->addInvolvedCorp($corp);
-        $table = new TopPilotTable($list, "Kills");
-        $html .= $table->generate();
-
-        $html .= "</td></tr></table>";
-
-        break;
-
-    case "pilot_losses":
-        $html .= "<div class=block-header2>Top losers</div>";
-
-        $html .= "<table class=kb-subtable><tr><td valign=top width=440>";
-        $html .= "<div class=block-header>$monthname $year</div>";
-
-        $list = new TopLossesList();
-        $list->addVictimCorp($corp);
-        $list->setPodsNoobShips(false);
-        $list->setMonth($month);
-        $list->setYear($year);
-        $table = new TopPilotTable($list, "Losses");
-        $html .= $table->generate();
-
-        $html .= "<table width=300 cellspacing=1><tr><td><a href='?a=corp_detail&amp;view=pilot_losses&amp;m=$pmonth&amp;crp_id=$crp_id&amp;y=$pyear'>previous</a></td>";
-        $html .= "<td align='right'><a href='?a=corp_detail&amp;view=pilot_losses&amp;crp_id=$crp_id&amp;m=$nmonth&amp;y=$nyear'>next</a></p></td></tr></table>";
-        
-        $html .= "</td><td valign=top width=400>";
-        $html .= "<div class=block-header>All time</div>";
-
-        $list = new TopLossesList();
-        $list->addVictimCorp($corp);
-        $list->setPodsNoobShips(false);
-        $table = new TopPilotTable($list, "Losses");
-        $html .= $table->generate();
-
-        $html .= "</td></tr></table>";
-
-        break;
-    case "ships_weapons":
-        $html .= "<div class=block-header2>Ships &amp; weapons used</div>";
-
-        $html .= "<table class=kb-subtable><tr><td valign=top width=400>";
-        $shiplist = new TopShipList();
-        $shiplist->addInvolvedCorp($corp);
-        $shiplisttable = new TopShipListTable($shiplist);
-        $html .= $shiplisttable->generate();
-        $html .= "</td><td valign=top align=right width=400>";
-
-        $weaponlist = new TopWeaponList();
-        $weaponlist->addInvolvedCorp($corp);
-        $weaponlisttable = new TopWeaponListTable($weaponlist);
-        $html .= $weaponlisttable->generate();
-        $html .= "</td></tr></table>";
-
-        break;
-    case 'violent_systems':
-        $html .= "<div class=block-header2>Most violent systems</div>";
-        $html .= "<table width=\"99%\"><tr><td align=center valign=top>";
-
-        $html .= "<div class=block-header>This month</div>";
-        $html .= "<table class=kb-table>";
-        $html .= "<tr class=kb-table-header><td>#</td><td width=180>System</td><td width=40 align=center >Kills</td></tr>";
-
-        $sql = "select sys.sys_name, sys.sys_sec, sys.sys_id, count(distinct kll.kll_id) as kills
+                $ltab = new KillListTable($list);
+                $ltab->setLimit(10);
+                $ltab->setDayBreak(false);
+                $html .= $ltab->generate();
+
+                break;
+        case "kills":
+                $html .= "<div class=kb-kills-header>All kills</div>";
+
+                $list = new KillList();
+                $list->setOrdered(true);
+                $list->addInvolvedCorp($corp);
+                if ($_GET['scl_id'])
+                        $list->addVictimShipClass(new ShipClass($_GET['scl_id']));
+                $pagesplitter = new PageSplitter($list->getCount(), 30);
+                $list->setPageSplitter($pagesplitter);
+                $table = new KillListTable($list);
+                $table->setDayBreak(false);
+                $html .= $table->generate();
+                $html .= $pagesplitter->generate();
+
+                break;
+        case "losses":
+                $html .= "<div class=kb-losses-header>All losses</div>";
+
+                $list = new KillList();
+                $list->setOrdered(true);
+                $list->setPodsNoobships(true);
+                $list->addVictimCorp($corp);
+                if ($_GET['scl_id'])
+                        $list->addVictimShipClass(new ShipClass($_GET['scl_id']));
+                $pagesplitter = new PageSplitter($list->getCount(), 30);
+                $list->setPageSplitter($pagesplitter);
+
+                $table = new KillListTable($list);
+                $table->setDayBreak(false);
+                $html .= $table->generate();
+                $html .= $pagesplitter->generate();
+
+                break;
+        case "pilot_kills":
+                $html .= "<div class=block-header2>Top killers</div>";
+
+                $html .= "<table class=kb-subtable><tr><td valign=top width=440>";
+                $html .= "<div class=block-header>$monthname $year</div>";
+
+                $list = new TopKillsList();
+                $list->addInvolvedCorp($corp);
+                $list->setPodsNoobShips(false);
+                $list->setMonth($month);
+                $list->setYear($year);
+                $table = new TopPilotTable($list, "Kills");
+                $html .= $table->generate();
+
+                $html .= "<table width=300 cellspacing=1><tr><td><a href='?a=corp_detail&amp;view=pilot_kills&amp;m=$pmonth&amp;crp_id=$crp_id&amp;y=$pyear'>previous</a></td>";
+                $html .= "<td align='right'><a href='?a=corp_detail&amp;view=pilot_kills&amp;crp_id=$crp_id&amp;m=$nmonth&amp;y=$nyear'>next</a></p></td></tr></table>";
+
+                $html .= "</td><td valign=top width=400>";
+                $html .= "<div class=block-header>All time</div>";
+
+                $list = new TopKillsList();
+                $list->addInvolvedCorp($corp);
+                $list->setPodsNoobShips(false);
+                $table = new TopPilotTable($list, "Kills");
+                $html .= $table->generate();
+
+                $html .= "</td></tr></table>";
+
+                break;
+        case "pilot_scores":
+                $html .= "<div class=block-header2>Top scorers</div>";
+
+                $html .= "<table class=kb-subtable><tr><td valign=top width=440>";
+                $html .= "<div class=block-header>$monthname $year</div>";
+
+                $list = new TopScoreList();
+                $list->addInvolvedCorp($corp);
+                $list->setPodsNoobShips(true);
+                $list->setMonth($month);
+                $list->setYear($year);
+                $table = new TopPilotTable($list, "Points");
+                $html .= $table->generate();
+
+                $html .= "<table width=300 cellspacing=1><tr><td><a href='?a=corp_detail&amp;view=pilot_scores&amp;m=$pmonth&amp;crp_id=$crp_id&amp;y=$pyear'>previous</a></td>";
+                $html .= "<td align='right'><a href='?a=corp_detail&amp;view=pilot_scores&amp;crp_id=$crp_id&amp;m=$nmonth&amp;y=$nyear'>next</a></p></td></tr></table>";
+
+                $html .= "</td><td valign=top width=400>";
+                $html .= "<div class=block-header>All time</div>";
+
+                $list = new TopScoreList();
+                $list->addInvolvedCorp($corp);
+                $list->setPodsNoobShips(true);
+                $table = new TopPilotTable($list, "Points");
+                $html .= $table->generate();
+
+                $html .= "</td></tr></table>";
+
+                break;
+        case "pilot_solo":
+                $html .= "<div class=block-header2>Top solokillers</div>";
+
+                $html .= "<table class=kb-subtable><tr><td valign=top width=440>";
+                $html .= "<div class=block-header>$monthname $year</div>";
+
+                $list = new TopSoloKillerList();
+                $list->addInvolvedCorp($corp);
+                $list->setPodsNoobShips(false);
+                $list->setMonth($month);
+                $list->setYear($year);
+                $table = new TopPilotTable($list, "Solokills");
+                $html .= $table->generate();
+
+                $html .= "<table width=300 cellspacing=1><tr><td><a href='?a=corp_detail&amp;view=pilot_solo&amp;m=$pmonth&amp;crp_id=$crp_id&amp;y=$pyear'>previous</a></td>";
+                $html .= "<td align='right'><a href='?a=corp_detail&amp;view=pilot_solo&amp;crp_id=$crp_id&amp;m=$nmonth&amp;y=$nyear'>next</a></p></td></tr></table>";
+
+                $html .= "</td><td valign=top width=400>";
+                $html .= "<div class=block-header>All time</div>";
+
+                $list = new TopSoloKillerList();
+                $list->addInvolvedCorp($corp);
+                $list->setPodsNoobShips(false);
+                $table = new TopPilotTable($list, "Solokills");
+                $html .= $table->generate();
+
+                $html .= "</td></tr></table>";
+
+                break;
+
+        case "pilot_damage":
+                $html .= "<div class=block-header2>Top damagedealers</div>";
+
+                $html .= "<table class=kb-subtable><tr><td valign=top width=440>";
+                $html .= "<div class=block-header>$monthname $year</div>";
+
+                $list = new TopDamageDealerList();
+                $list->addInvolvedCorp($corp);
+                $list->setPodsNoobShips(false);
+                $list->setMonth($month);
+                $list->setYear($year);
+                $table = new TopPilotTable($list, "Kills");
+                $html .= $table->generate();
+
+                $html .= "<table width=300 cellspacing=1><tr><td><a href='?a=corp_detail&amp;view=pilot_damage&amp;m=$pmonth&amp;crp_id=$crp_id&amp;y=$pyear'>previous</a></td>";
+                $html .= "<td align='right'><a href='?a=corp_detail&amp;view=pilot_damage&amp;crp_id=$crp_id&amp;m=$nmonth&amp;y=$nyear'>next</a></p></td></tr></table>";
+
+                $html .= "</td><td valign=top width=400>";
+                $html .= "<div class=block-header>All time</div>";
+
+                $list = new TopDamageDealerList();
+                $list->addInvolvedCorp($corp);
+                $list->setPodsNoobShips(false);
+                $table = new TopPilotTable($list, "Kills");
+                $html .= $table->generate();
+
+                $html .= "</td></tr></table>";
+
+                break;
+
+        case "pilot_griefer":
+                $html .= "<div class=block-header2>Top griefers</div>";
+
+                $html .= "<table class=kb-subtable><tr><td valign=top width=440>";
+                $html .= "<div class=block-header>$monthname $year</div>";
+
+                $list = new TopGrieferList();
+                $list->addInvolvedCorp($corp);
+                $list->setMonth($month);
+                $list->setYear($year);
+                $table = new TopPilotTable($list, "Kills");
+                $html .= $table->generate();
+
+                $html .= "<table width=300 cellspacing=1><tr><td><a href='?a=corp_detail&amp;view=pilot_griefer&amp;m=$pmonth&amp;crp_id=$crp_id&amp;y=$pyear'>previous</a></td>";
+                $html .= "<td align='right'><a href='?a=corp_detail&amp;view=pilot_griefer&amp;crp_id=$crp_id&amp;m=$nmonth&amp;y=$nyear'>next</a></p></td></tr></table>";
+
+                $html .= "</td><td valign=top width=400>";
+                $html .= "<div class=block-header>All time</div>";
+
+                $list = new TopGrieferList();
+                $list->addInvolvedCorp($corp);
+                $table = new TopPilotTable($list, "Kills");
+                $html .= $table->generate();
+
+                $html .= "</td></tr></table>";
+
+                break;
+
+        case "pilot_losses":
+                $html .= "<div class=block-header2>Top losers</div>";
+
+                $html .= "<table class=kb-subtable><tr><td valign=top width=440>";
+                $html .= "<div class=block-header>$monthname $year</div>";
+
+                $list = new TopLossesList();
+                $list->addVictimCorp($corp);
+                $list->setPodsNoobShips(false);
+                $list->setMonth($month);
+                $list->setYear($year);
+                $table = new TopPilotTable($list, "Losses");
+                $html .= $table->generate();
+
+                $html .= "<table width=300 cellspacing=1><tr><td><a href='?a=corp_detail&amp;view=pilot_losses&amp;m=$pmonth&amp;crp_id=$crp_id&amp;y=$pyear'>previous</a></td>";
+                $html .= "<td align='right'><a href='?a=corp_detail&amp;view=pilot_losses&amp;crp_id=$crp_id&amp;m=$nmonth&amp;y=$nyear'>next</a></p></td></tr></table>";
+
+                $html .= "</td><td valign=top width=400>";
+                $html .= "<div class=block-header>All time</div>";
+
+                $list = new TopLossesList();
+                $list->addVictimCorp($corp);
+                $list->setPodsNoobShips(false);
+                $table = new TopPilotTable($list, "Losses");
+                $html .= $table->generate();
+
+                $html .= "</td></tr></table>";
+
+                break;
+        case "ships_weapons":
+                $html .= "<div class=block-header2>Ships &amp; weapons used</div>";
+
+                $html .= "<table class=kb-subtable><tr><td valign=top width=400>";
+                $shiplist = new TopShipList();
+                $shiplist->addInvolvedCorp($corp);
+                $shiplisttable = new TopShipListTable($shiplist);
+                $html .= $shiplisttable->generate();
+                $html .= "</td><td valign=top align=right width=400>";
+
+                $weaponlist = new TopWeaponList();
+                $weaponlist->addInvolvedCorp($corp);
+                $weaponlisttable = new TopWeaponListTable($weaponlist);
+                $html .= $weaponlisttable->generate();
+                $html .= "</td></tr></table>";
+
+                break;
+        case 'violent_systems':
+                $html .= "<div class=block-header2>Most violent systems</div>";
+                $html .= "<table width=\"99%\"><tr><td align=center valign=top>";
+
+                $html .= "<div class=block-header>This month</div>";
+                $html .= "<table class=kb-table>";
+                $html .= "<tr class=kb-table-header><td>#</td><td width=180>System</td><td width=40 align=center >Kills</td></tr>";
+
+                $sql = "select sys.sys_name, sys.sys_sec, sys.sys_id, count(distinct kll.kll_id) as kills
                     from kb3_systems sys, kb3_kills kll, kb3_inv_detail inv
                     where kll.kll_system_id = sys.sys_id
                     and inv.ind_kll_id = kll.kll_id";
 
-        if ($crp_id)
-            $sql .= " and inv.ind_crp_id in (".$crp_id.")";
-        if ($all_id)
-            $sql .= " and inv.ind_all_id = ".$all_id;
-
-        $sql .= "   and date_format( kll.kll_timestamp, \"%c\" ) = ".kbdate("m")."
+                if ($crp_id)
+                        $sql .= " and inv.ind_crp_id in (".$crp_id.")";
+                if ($all_id)
+                        $sql .= " and inv.ind_all_id = ".$all_id;
+
+                $sql .= "   and date_format( kll.kll_timestamp, \"%c\" ) = ".kbdate("m")."
                     and date_format( kll.kll_timestamp, \"%Y\" ) = ".kbdate("Y")."
                     group by sys.sys_name
@@ -482 +488 @@
                     limit 25";
 
-        $qry = new DBQuery();
-        $qry->execute($sql);
-        $odd = false;
-        $counter = 1;
-        while ($row = $qry->getRow())
-        {
-            if (!$odd)
-            {
-                $odd = true;
-                $rowclass = 'kb-table-row-odd';
-            }
-            else
-            {
-                $odd = false;
-                $rowclass = 'kb-table-row-even';
-            }
-
-            $html .= "<tr class=".$rowclass."><td><b>".$counter.".</b></td><td class=kb-table-cell width=180><b><a href=\"?a=system_detail&amp;sys_id=".$row['sys_id']."\">".$row['sys_name']."</a></b> (".roundsec($row['sys_sec']).")</td><td align=center>".$row['kills']."</td></tr>";
-            $counter++;
-        }
-
-        $html .= "</table>";
-
-        $html .= "</td><td align=center valign=top>";
-        $html .= "<div class=block-header>All-Time</div>";
-        $html .= "<table class=kb-table>";
-        $html .= "<tr class=kb-table-header><td>#</td><td width=180>System</td><td width=40 align=center>Kills</td></tr>";
-
-        $sql = "select sys.sys_name, sys.sys_id, sys.sys_sec, count(distinct kll.kll_id) as kills
+                $qry = new DBQuery();
+                $qry->execute($sql);
+                $odd = false;
+                $counter = 1;
+                while ($row = $qry->getRow())
+                {
+                        if (!$odd)
+                        {
+                                $odd = true;
+                                $rowclass = 'kb-table-row-odd';
+                        }
+                        else
+                        {
+                                $odd = false;
+                                $rowclass = 'kb-table-row-even';
+                        }
+
+                        $html .= "<tr class=".$rowclass."><td><b>".$counter.".</b></td><td class=kb-table-cell width=180><b><a href=\"?a=system_detail&amp;sys_id=".$row['sys_id']."\">".$row['sys_name']."</a></b> (".roundsec($row['sys_sec']).")</td><td align=center>".$row['kills']."</td></tr>";
+                        $counter++;
+                }
+
+                $html .= "</table>";
+
+                $html .= "</td><td align=center valign=top>";
+                $html .= "<div class=block-header>All-Time</div>";
+                $html .= "<table class=kb-table>";
+                $html .= "<tr class=kb-table-header><td>#</td><td width=180>System</td><td width=40 align=center>Kills</td></tr>";
+
+                $sql = "select sys.sys_name, sys.sys_id, sys.sys_sec, count(distinct kll.kll_id) as kills
                     from kb3_systems sys, kb3_kills kll, kb3_inv_detail inv
                     where kll.kll_system_id = sys.sys_id
                     and inv.ind_kll_id = kll.kll_id";
 
-        if ($crp_id)
-            $sql .= " and inv.ind_crp_id in (".$crp_id.")";
-        if ($all_id)
-            $sql .= " and inv.ind_all_id = ".$all_id;
-
-        $sql .= " group by sys.sys_name
+                if ($crp_id)
+                        $sql .= " and inv.ind_crp_id in (".$crp_id.")";
+                if ($all_id)
+                        $sql .= " and inv.ind_all_id = ".$all_id;
+
+                $sql .= " group by sys.sys_name
                     order by kills desc
                     limit 25";
 
-        $qry = new DBQuery();
-        $qry->execute($sql);
-        $odd = false;
-        $counter = 1;
-        while ($row = $qry->getRow())
-        {
-            if (!$odd)
-            {
-                $odd = true;
-                $rowclass = 'kb-table-row-odd';
-            }
-            else
-            {
-                $odd = false;
-                $rowclass = 'kb-table-row-even';
-            }
-
-            $html .= "<tr class=".$rowclass."><td><b>".$counter.".</b></td><td class=kb-table-cell><b><a href=\"?a=system_detail&amp;sys_id=".$row['sys_id']."\">".$row['sys_name']."</a></b> (".roundsec($row['sys_sec']).")</td><td align=center>".$row['kills']."</td></tr>";
-            $counter++;
-        }
-        $html .= "</table>";
-        $html .= "</td></tr></table>";
-        break;
+                $qry = new DBQuery();
+                $qry->execute($sql);
+                $odd = false;
+                $counter = 1;
+                while ($row = $qry->getRow())
+                {
+                        if (!$odd)
+                        {
+                                $odd = true;
+                                $rowclass = 'kb-table-row-odd';
+                        }
+                        else
+                        {
+                                $odd = false;
+                                $rowclass = 'kb-table-row-even';
+                        }
+
+                        $html .= "<tr class=".$rowclass."><td><b>".$counter.".</b></td><td class=kb-table-cell><b><a href=\"?a=system_detail&amp;sys_id=".$row['sys_id']."\">".$row['sys_name']."</a></b> (".roundsec($row['sys_sec']).")</td><td align=center>".$row['kills']."</td></tr>";
+                        $counter++;
+                }
+                $html .= "</table>";
+                $html .= "</td></tr></table>";
+                break;
 }
 
@@ -561 +567 @@
 
 if (config::get('kill_points'))
-    $menubox->addOption("link","Top scorers", "?a=corp_detail&amp;crp_id=" . $corp->getID() . "&amp;view=pilot_scores");
+        $menubox->addOption("link","Top scorers", "?a=corp_detail&amp;crp_id=" . $corp->getID() . "&amp;view=pilot_scores");
 $menubox->addOption("link","Top solokillers", "?a=corp_detail&amp;crp_id=" . $corp->getID() . "&amp;view=pilot_solo");
 $menubox->addOption("link","Top damagedealers", "?a=corp_detail&amp;crp_id=" . $corp->getID() . "&amp;view=pilot_damage");

dev/common/includes/class.cache.php

@@ -60 +60 @@
     function check($page)
     {
+                $cachefile = cache::genCacheName();
+                
                 // If the cache doesn't exist then we don't need to check times.
         if (cache::shouldCache($page) && file_exists(cache::genCacheName()))
         {
-                        $cachefile = cache::genCacheName();
-                        
+                                                
             $times = explode(',', config::get('cache_times'));
             foreach ($times as $string)

dev/common/includes/class.session.php

@@ -3 +3 @@
 class session
 {
-    function init()
-    {
-        if (isset($_REQUEST[session_name()]))
-        {
-            session_start();
-            if (isset($_SESSION['user']))
-            {
-                user::loggedin(true);
-            }
-        }
-    }
+        function init()
+        {
+                if (isset($_REQUEST[session_name()]))
+                {
+                        session_start();
+                        if (isset($_SESSION['user']))
+                        {
+                                user::loggedin(true);
+                        }
+                }
+        }
 
-    function isAdmin()
-    {
-        return (bool)(isset($_SESSION['admin']) && $_SESSION['rsite'] == $_SERVER["HTTP_HOST"] && md5(KB_SITE) == $_SESSION['site']);
-    }
+        function isAdmin()
+        {
+                return (bool)($_SESSION['admin'] && $_SESSION['rsite'] == $_SERVER["HTTP_HOST"] && md5(KB_SITE) == $_SESSION['site']);
+        }
 
-    function isSuperAdmin()
-    {
-        return (bool)(isset($_SESSION['admin_super']) && $_SESSION['rsite'] == $_SERVER["HTTP_HOST"] && md5(KB_SITE) == $_SESSION['site']);
-    }
+        function isSuperAdmin()
+        {
+                return (bool)($_SESSION['admin_super'] && $_SESSION['rsite'] == $_SERVER["HTTP_HOST"] && md5(KB_SITE) == $_SESSION['site']);
+        }
 
-    function create($admin = false)
-    {
-        session_start();
+        function create($admin = false)
+        {
+                session_start();
                 session_regenerate_id();
-        $_SESSION['admin'] = $admin;
+                $_SESSION['admin'] = $admin;
                 $_SESSION['rsite'] = $_SERVER["HTTP_HOST"];
                 $_SESSION['site'] = md5(KB_SITE);
-    }
+        }
 
-    function destroy()
-    {
-        session_destroy();
-    }
+        function destroy()
+        {
+                session_destroy();
+        }
 }
 ?>

dev/common/includes/class.summary.php

@@ -150 +150 @@
                 foreach($kill->involvedparties_ as $inv)
                 {
-                        if(intval($alls[$inv->getAllianceID()])) continue;
+                        if(isset($alls[$inv->getAllianceID()])) continue;
                         $alls[$inv->getAllianceID()] = 1;
                         $qry->execute("SELECT 1 FROM kb3_sum_alliance WHERE asm_all_id = ".$inv->getAllianceID());
@@ -186 +186 @@
                 foreach($kill->involvedparties_ as $inv)
                 {
-                        if(intval($alls[$inv->getAllianceID()])) continue;
+                        if(isset($alls[$inv->getAllianceID()])) continue;
                         $alls[$inv->getAllianceID()] = 1;
                         $qry->execute("SELECT 1 FROM kb3_sum_alliance WHERE asm_all_id = ".$inv->getAllianceID());
@@ -219 +219 @@
                 foreach($kill->involvedparties_ as $inv)
                 {
-                        if(intval($alls[$inv->getAllianceID()])) continue;
+                        if(isset($alls[$inv->getAllianceID()])) continue;
                         $alls[$inv->getAllianceID()] = 1;
                         $qry->execute("SELECT 1 FROM kb3_sum_alliance WHERE asm_all_id = ".$inv->getAllianceID());
@@ -333 +333 @@
                 foreach($kill->involvedparties_ as $inv)
                 {
-                        if(intval($alls[$inv->getcorpID()])) continue;
+                        if(isset($alls[$inv->getcorpID()])) continue;
                         $alls[$inv->getcorpID()] = 1;
                         $qry->execute("SELECT 1 FROM kb3_sum_corp WHERE csm_crp_id = ".$inv->getcorpID());
@@ -369 +369 @@
                 foreach($kill->involvedparties_ as $inv)
                 {
-                        if(intval($alls[$inv->getCorpID()])) continue;
+                        if(isset($alls[$inv->getCorpID()])) continue;
                         $alls[$inv->getCorpID()] = 1;
                         $qry->execute("SELECT 1 FROM kb3_sum_corp WHERE csm_crp_id = ".$inv->getCorpID());
@@ -402 +402 @@
                 foreach($kill->involvedparties_ as $inv)
                 {
-                        if(intval($alls[$inv->getCorpID()])) continue;
+                        if(isset($alls[$inv->getCorpID()])) continue;
                         $alls[$inv->getCorpID()] = 1;
                         $qry->execute("SELECT 1 FROM kb3_sum_corp WHERE csm_crp_id = ".$inv->getCorpID());
@@ -516 +516 @@
                 foreach($kill->involvedparties_ as $inv)
                 {
-                        if(intval($alls[$inv->getPilotID()])) continue;
+                        if(isset($alls[$inv->getPilotID()])) continue;
                         $alls[$inv->getPilotID()] = 1;
                         $qry->execute("SELECT 1 FROM kb3_sum_pilot WHERE psm_plt_id = ".$inv->getPilotID());
@@ -552 +552 @@
                 foreach($kill->involvedparties_ as $inv)
                 {
-                        if(intval($alls[$inv->getPilotID()])) continue;
+                        if(isset($alls[$inv->getPilotID()])) continue;
                         $alls[$inv->getPilotID()] = 1;
                         $qry->execute("SELECT 1 FROM kb3_sum_pilot WHERE psm_plt_id = ".$inv->getPilotID());
@@ -585 +585 @@
                 foreach($kill->involvedparties_ as $inv)
                 {
-                        if(intval($alls[$inv->getPilotID()])) continue;
+                        if(isset($alls[$inv->getPilotID()])) continue;
                         $alls[$inv->getPilotID()] = 1;
                         $qry->execute("SELECT 1 FROM kb3_sum_pilot WHERE psm_plt_id = ".$inv->getPilotID());

dev/common/includes/globals.php

@@ -7 +7 @@
 else
 {
-        $svn_rev = '458';
+        $svn_rev = '459';
 }
 define('SVN_REV', $svn_rev);
@@ -15 +15 @@
 // current version: major.minor.sub
 // unpair numbers for minor = development version
-define('KB_VERSION', '2.0.5');
+define('KB_VERSION', '2.0.6');
 define('KB_RELEASE', '(Apocrypha)');
 

dev/common/kill_related.php

@@ -475 +475 @@
 $menubox->setIcon("menu-item.gif");
 $menubox->addOption("caption", "View");
-$menubox->addOption("link", "Back to Killmail", "?a=kill_detail&kll_id=".$_GET['kll_id']);
-$menubox->addOption("link", "Kills & losses", "?a=kill_related&kll_id=".$_GET['kll_id']);
+$menubox->addOption("link", "Back to Killmail", "?a=kill_detail&kll_id=".$kll_id);
+$menubox->addOption("link", "Kills & losses", "?a=kill_related&kll_id=".$kll_id);
 $page->addContext($menubox->generate());
 

dev/common/kills.php

@@ -10 +10 @@
 require_once('common/includes/class.toplist.php');
 
-$week = $_GET['w'];
-$year = $_GET['y'];
+$week = intval($_GET['w']);
+$year = intval($_GET['y']);
 
 if ($week == '')

dev/common/losses.php

@@ -13 +13 @@
 }
 
-$week = $_GET['w'];
-$year = $_GET['y'];
+$week = intval($_GET['w']);
+$year = intval($_GET['y']);
 
 if ($week == '')

dev/common/pilot_detail.php

@@ -11 +11 @@
 $plt_id = intval($_GET['plt_id']);
 $plt_external_id = intval($_GET['plt_external_id']);
+$scl_id = intval($_GET['scl_did']);
+
 if(!$plt_id)
 {
@@ -127 +129 @@
                 $list->setOrdered(true);
                 $list->addInvolvedPilot($pilot);
-                if ($_GET['scl_id'])
-                        $list->addVictimShipClass(new ShipClass($_GET['scl_id']));
+                if ($scl_id)
+                        $list->addVictimShipClass($scl_id);
                 $pagesplitter = new PageSplitter($list->getCount(), 30);
                 $list->setPageSplitter($pagesplitter);
@@ -144 +146 @@
                 $list->setPodsNoobships(true);
                 $list->addVictimPilot($pilot);
-                if ($_GET['scl_id'])
-                        $list->addVictimShipClass(new ShipClass($_GET['scl_id']));
+                if ($scl_id)
+                        $list->addVictimShipClass($scl_id);
                 $pagesplitter = new PageSplitter($list->getCount(), 30);
                 $list->setPageSplitter($pagesplitter);
@@ -180 +182 @@
                 $list->setPodsNoobships(true);
                 $list->addInvolvedPilot($pilot);
-                if ($_GET['scl_id'])
-                        $list->addVictimShipClass(new ShipClass($_GET['scl_id']));
+                if ($scl_id)
+                        $list->addVictimShipClass($scl_id);
 
                 $table = new KillListTable($list);
@@ -195 +197 @@
                 $list->setPodsNoobships(true);
                 $list->addVictimPilot($pilot);
-                if ($_GET['scl_id'])
-                        $list->addVictimShipClass(new ShipClass($_GET['scl_id']));
+                if ($scl_id)
+                        $list->addVictimShipClass($scl_id);
 
                 $table = new KillListTable($list);

dev/common/system_detail.php

@@ -6 +6 @@
 
 $sys_id = intval($_GET['sys_id']);
+$scl_id = intval($_GET['scl_did']);
 
 if (!$sys_id)
@@ -47 +48 @@
 }
 $klist->addSystem($system);
-if ($_GET['scl_id'])
-    $klist->addVictimShipClass(new ShipClass($_GET['scl_id']));
+if ($scl_id)
+    $klist->addVictimShipClass($scl_id);
 else
     $klist->setPodsNoobShips(false);