Changeset 71

Timestamp:

11/10/06 20:50:51 (16 years ago)

Author:

exi

Message:

Rearranged some code in the parser.
Added autoupgrade code to adress the -10.0 security issue.
Changed KillSummaryTable? to support an additional mode for lightning fast speed (3.3s -> 0.12s page generation for me), now using that mode in corp+alliance_detail.php.

Location:

dev/common

Files:

• admin.php (modified) (2 diffs)
• alliance_detail.php (modified) (3 diffs)
• autoupgrade.php (modified) (1 diff)
• class.killsummarytable.php (modified) (3 diffs)
• class.parser.php (modified) (4 diffs)
• corp_detail.php (modified) (2 diffs)
• home.php (modified) (1 diff)

dev/common/admin.php

@@ -9 +9 @@
 $page = new Page("Administration - Generic");
 $page->setAdmin();
+require_once('autoupgrade.php');
+check_invdetail();
 
 if ($_POST['submit'])
@@ -22 +24 @@
     if ($config->checkCheckbox('comments'))
     {
-        require_once('autoupgrade.php');
         check_commenttable();
     }

dev/common/alliance_detail.php

@@ -11 +11 @@
 
 $alliance = new Alliance(intval($_GET['all_id']));
-$klist = new KillList();
-$klist->setOrdered(false);
-// $tklist = new KillList();
-// $tklist->setOrdered( false );
-$llist = new KillList();
-$llist->setOrdered(false);
-$klist->addInvolvedAlliance($alliance);
-// $tklist->addInvolvedAlliance( $alliance );
-// $tklist->setPodsNoobShips( false );
-$llist->addVictimAlliance($alliance);
-$klist->getAllKills();
-$llist->getAllKills();
-
 $page = new Page("Alliance details - " . $alliance->getName());
 
@@ -36 +23 @@
     $html .= "<img src=\"".IMG_URL."/alliances/default.gif\" border=\"0\"></td>";
 }
-
-$html .= "<td class=kb-table-cell width=180><b>Kills:</b></td><td class=kl-kill>" . $klist->getCount() . "</td></tr>";
-// $html .= "<tr class=kb-table-row-even><td class=kb-table-cell><b>Real kills:</b></td><td class=kl-kill>".$tklist->getCount()."</td></tr>";
-$html .= "<tr class=kb-table-row-even><td class=kb-table-cell><b>Losses:</b></td><td class=kl-loss>" . $llist->getCount() . "</td></tr>";
-$html .= "<tr class=kb-table-row-even><td class=kb-table-cell><b>Damage done (ISK):</b></td><td class=kl-kill>" . $klist->getISK() . "M</td></tr>";
-$html .= "<tr class=kb-table-row-even><td class=kb-table-cell><b>Damage received (ISK):</b></td><td class=kl-loss>" . $llist->getISK() . "M</td></tr>";
-if ($klist->getISK())
-    $efficiency = round($klist->getISK() / ($klist->getISK() + $llist->getISK()) * 100, 2);
+$kill_summary = new KillSummaryTable();
+$kill_summary->addInvolvedAlliance($alliance);
+$kill_summary->setBreak(6);
+$summary_html = $kill_summary->generate();
+
+$html .= "<td class=kb-table-cell width=180><b>Kills:</b></td><td class=kl-kill>".$kill_summary->getTotalKills()."</td></tr>";
+$html .= "<tr class=kb-table-row-even><td class=kb-table-cell><b>Losses:</b></td><td class=kl-loss>".$kill_summary->getTotalLosses()."</td></tr>";
+$html .= "<tr class=kb-table-row-even><td class=kb-table-cell><b>Damage done (ISK):</b></td><td class=kl-kill>".round($kill_summary->getTotalKillISK()/1000000, 2)."M</td></tr>";
+$html .= "<tr class=kb-table-row-even><td class=kb-table-cell><b>Damage received (ISK):</b></td><td class=kl-loss>".round($kill_summary->getTotalLossISK()/1000000, 2)."M</td></tr>";
+if ($kill_summary->getTotalKillISK())
+{
+    $efficiency = round($kill_summary->getTotalKillISK() / ($kill_summary->getTotalKillISK() + $kill_summary->getTotalLossISK()) * 100, 2);
+}
 else
+{
     $efficiency = 0;
+}
 
 $html .= "<tr class=kb-table-row-even><td class=kb-table-cell><b>Efficiency:</b></td><td class=kb-table-cell><b>" . $efficiency . "%</b></td></tr>";
@@ -54 +48 @@
 if ($_GET['view'] == "" || $_GET['view'] == "kills" || $_GET['view'] == "losses")
 {
-    $summarytable = new KillSummaryTable($klist, $llist);
-    $summarytable->setBreak(6);
-
-    $html .= $summarytable->generate();
+    $html .= $summary_html;
 }
 

dev/common/autoupgrade.php

@@ -61 +61 @@
 }
 
+function check_invdetail()
+{
+    $qry = new DBQuery();
+    $query = 'select ind_sec_status from kb3_inv_detail limit 1';
+    $qry->execute($query);
+    $len = mysql_field_len($qry->resid_,0);
+    if ($len == 4)
+    {
+        $query = 'ALTER TABLE `kb3_inv_detail` CHANGE `ind_sec_status` `ind_sec_status` VARCHAR( 5 )';
+        $qry->execute($query);
+    }
+}
 ?>

dev/common/class.killsummarytable.php

@@ -3 +3 @@
 require_once("class.page.php");
 require_once("class.ship.php");
-require_once("class.profiler.php");
 
 class KillSummaryTable
 {
-    function KillSummaryTable($klist, $llist)
+    function KillSummaryTable($klist = null, $llist = null)
     {
         $this->klist_ = $klist;
@@ -14 +13 @@
         $this->verbose_ = false;
         $this->filter_ = true;
+        $this->inv_crp_ = array();
+        $this->inv_all_ = array();
     }
 
@@ -66 +67 @@
     }
 
+    function addInvolvedCorp($corp)
+    {
+        $this->inv_crp_[] = $corp->getID();
+        if ($this->inv_plt_ || $this->inv_all_)
+        {
+            $this->mixedinvolved_ = true;
+        }
+    }
+
+    function addInvolvedAlliance($alliance)
+    {
+        $this->inv_all_[] = $alliance->getID();
+        if ($this->inv_plt_ || $this->inv_crp_)
+        {
+            $this->mixedinvolved_ = true;
+        }
+    }
+
+
+    // do it faster, baby!
+    function getkills()
+    {
+        global $config;
+        if ($this->mixedinvolved_)
+        {
+            echo 'mode not supported<br>';
+            exit;
+        }
+
+        // as there is no way to do this elegant in sql
+        // i'll keep it in php
+        $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())
+        {
+            $this->entry_[$row['scl_class']] = array('id' => $row['scl_id'],
+                                                     'kills' => 0, 'kills_isk' => 0,
+                                                     'losses' => 0, 'losses_isk' => 0);
+        }
+
+        $sql = 'SELECT count(*) AS knb, scl_id, scl_class,';
+        if ($config->getConfig('ship_values'))
+        {
+            $sql .= ' sum(ifnull(ksv.shp_value,scl.scl_value)) AS kisk FROM kb3_kills kll
+                    INNER JOIN kb3_ships shp ON ( shp.shp_id = kll.kll_ship_id )
+                    left join kb3_ships_values ksv on (shp.shp_id = ksv.shp_id)';
+        }
+        else
+        {
+            $sql .= ' sum(scl.scl_value) AS kisk FROM kb3_kills kll
+                    INNER JOIN kb3_ships shp ON ( shp.shp_id = kll.kll_ship_id )';
+        }
+        $sql .= ' INNER JOIN kb3_ship_classes scl ON ( scl.scl_id = shp.shp_class )';
+
+        if ($this->inv_crp_)
+        {
+            $sql .= ' inner join kb3_inv_crp inc on ( inc.inc_crp_id in ( '.join(',', $this->inv_crp_).' ) and kll.kll_id = inc.inc_kll_id ) ';
+        }
+        elseif ($this->inv_all_)
+        {
+            $sql .= ' inner join kb3_inv_all ina on ( ina.ina_all_id in ( '.join(',', $this->inv_all_).' ) and kll.kll_id = ina.ina_kll_id ) ';
+        }
+        $sql .= 'GROUP BY scl_class order by scl_class';
+
+        $qry = new DBQuery();
+        $qry->execute($sql);
+        while ($row = $qry->getRow())
+        {
+            $this->entry_[$row['scl_class']]['kills'] = $row['knb'];
+            $this->entry_[$row['scl_class']]['kills_isk'] = $row['kisk'];
+            $this->tkcount_ += $row['knb'];
+            $this->tkisk_ += $row['kisk'];
+        }
+
+        $sql = 'SELECT count(*) AS lnb, scl_id, scl_class,';
+        if ($config->getConfig('ship_values'))
+        {
+            $sql .= ' sum(ifnull(ksv.shp_value,scl.scl_value)) AS lisk FROM kb3_kills kll
+                    INNER JOIN kb3_ships shp ON ( shp.shp_id = kll.kll_ship_id )
+                    left join kb3_ships_values ksv on (shp.shp_id = ksv.shp_id)';
+        }
+        else
+        {
+            $sql .= ' sum(scl.scl_value) AS lisk FROM kb3_kills kll
+                    INNER JOIN kb3_ships shp ON ( shp.shp_id = kll.kll_ship_id )';
+        }
+        $sql .= ' INNER JOIN kb3_ship_classes scl ON ( scl.scl_id = shp.shp_class )';
+
+        if ($this->inv_crp_)
+        {
+            $sql .= ' where kll.kll_crp_id in ( '.join(',', $this->inv_crp_).' ) ';
+        }
+        elseif ($this->inv_all_)
+        {
+            $sql .= ' where kll.kll_all_id in ( '.join(',', $this->inv_all_).' ) ';
+        }
+        $sql .= 'GROUP BY scl_class order by scl_class';
+
+        $qry = new DBQuery();
+        $qry->execute($sql);
+        while ($row = $qry->getRow())
+        {
+            $this->entry_[$row['scl_class']]['losses'] = $row['lnb'];
+            $this->entry_[$row['scl_class']]['losses_isk'] =  $row['lisk'];
+
+            $this->tlcount_ += $row['lnb'];
+            $this->tlisk_ += $row['lisk'];
+        }
+    }
+
     function generate()
     {
-        // build array
-        $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) or die($qry->getErrorMsg());
-        while ($row = $qry->getRow())
-        {
-            if (!$row['scl_id'])
-                continue;
-
-            $shipclass = new ShipClass($row['scl_id']);
-            $shipclass->setName($row['scl_class']);
-
-            $entry[$shipclass->getName()]['id'] = $row['scl_id'];
-            $entry[$shipclass->getName()]['kills'] = 0;
-            $entry[$shipclass->getName()]['kills_isk'] = 0;
-            $entry[$shipclass->getName()]['losses'] = 0;
-            $entry[$shipclass->getName()]['losses_isk'] = 0;
-        }
-        // kills
-        while ($kill = $this->klist_->getKill())
-        {
-            $classname = $kill->getVictimShipClassName();
-            $entry[$classname]['kills']++;
-            $entry[$classname]['kills_isk'] += $kill->getVictimShipValue();
-            $this->tkcount_++;
-            $this->tkisk_ += $kill->getVictimShipValue();
-        }
-        // losses
-        while ($kill = $this->llist_->getKill())
-        {
-            $classname = $kill->getVictimShipClassName();
-            $entry[$classname]['losses']++;
-            $entry[$classname]['losses_isk'] += $kill->getVictimShipValue();
-            $this->tlcount_++;
-            $this->tlisk_ += $kill->getVictimShipValue();
+        if ($this->klist_)
+        {
+            // build array
+            $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) or die($qry->getErrorMsg());
+            while ($row = $qry->getRow())
+            {
+                if (!$row['scl_id'])
+                    continue;
+
+                $shipclass = new ShipClass($row['scl_id']);
+                $shipclass->setName($row['scl_class']);
+
+                $entry[$shipclass->getName()]['id'] = $row['scl_id'];
+                $entry[$shipclass->getName()]['kills'] = 0;
+                $entry[$shipclass->getName()]['kills_isk'] = 0;
+                $entry[$shipclass->getName()]['losses'] = 0;
+                $entry[$shipclass->getName()]['losses_isk'] = 0;
+            }
+            // kills
+            while ($kill = $this->klist_->getKill())
+            {
+                $classname = $kill->getVictimShipClassName();
+                $entry[$classname]['kills']++;
+                $entry[$classname]['kills_isk'] += $kill->getVictimShipValue();
+                $this->tkcount_++;
+                $this->tkisk_ += $kill->getVictimShipValue();
+            }
+            // losses
+            while ($kill = $this->llist_->getKill())
+            {
+                $classname = $kill->getVictimShipClassName();
+                $entry[$classname]['losses']++;
+                $entry[$classname]['losses_isk'] += $kill->getVictimShipValue();
+                $this->tlcount_++;
+                $this->tlisk_ += $kill->getVictimShipValue();
+            }
+        }
+        else
+        {
+            $this->getkills();
+            $entry = &$this->entry_;
         }
 

dev/common/class.parser.php

@@ -127 +127 @@
 
             if ($secstatus == "") // NPC or POS
-                {
-                    $secstatus = "0.0";
+            {
+                $secstatus = "0.0";
                 preg_match("/(.*) \/ (.*)/", $ipname, $pmatches);
                 $icname = $pmatches[2];
                 $isname = "Unknown";
                 $iwname = $pmatches[1];
+
                 $tmpcorp = new Corporation();
                 $tmpcorp->lookup($icname);
+
+                if (!$tmpcorp->getID())
+                {
+                    // not a known corp, add it
+                    $ialliance = new Alliance();
+                    $ialliance->add('None');
+                    $icorp = new Corporation();
+                    $icorp->add($icname, $ialliance, $kill->getTimeStamp());
+                    $tmpcorp = $icorp;
+                }
                                 $iweapon = new Item();
                                 $iweapon->lookup($pmatches[1]);
                                 $ipname = '#'.$tmpcorp->getID().'#'.$iweapon->getID();
                 $tmpall = $tmpcorp->getAlliance();
-                if ($tmpcorp->getID())
-                    $ianame = $tmpall->getName();
-                else
-                    $ianame = "None";
+                // name will be None if no alliance is set
+                $ianame = $tmpall->getName();
+
+                $ialliance = &$tmpall;
+                $icorp = &$tmpcorp;
 
                 $i++;
@@ -160 +172 @@
                 $iwname = $matches[1];
                 $i += 6;
-            }
-
-            $ialliance = new Alliance();
-            $ialliance->add($ianame);
-            $icorp = new Corporation();
-            $icorp->add($icname, $ialliance, $kill->getTimeStamp());
+
+                $ialliance = new Alliance();
+                $ialliance->add($ianame);
+                $icorp = new Corporation();
+                $icorp->add($icname, $ialliance, $kill->getTimeStamp());
+            }
 
             if (ALLIANCE_ID != 0 && $ialliance->getID() == ALLIANCE_ID)
+            {
                 $authorized = true;
+            }
             elseif (CORP_ID != 0)
             {
@@ -177 +191 @@
                         $authorized = true;
                 }
+            }
+            else
+            {
+                $authorized = true;
             }
 
@@ -283 +301 @@
 
         if (!$authorized)
+        {
             return -2;
+        }
 
         $id = $kill->add();

dev/common/corp_detail.php

@@ -13 +13 @@
 $alliance = $corp->getAlliance();
 
-$klist = new KillList();
-$tklist = new KillList();
-$llist = new KillList();
-$klist->addInvolvedCorp($corp);
-$tklist->addInvolvedCorp($corp);
-$tklist->setPodsNoobShips(false);
-$llist->addVictimCorp($corp);
-$klist->getAllKills();
-$llist->getAllKills();
+$kill_summary = new KillSummaryTable();
+$kill_summary->addInvolvedCorp($corp);
+$kill_summary->setBreak(6);
+$summary_html = $kill_summary->generate();
 
 $page = new Page("Corporation details - " . $corp->getName());
@@ -35 +30 @@
 }
 
-// $html .= "</tr>";
 $html .= "<td class=kb-table-cell width=180><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&all_id=" . $alliance->getID() . "\">" . $alliance->getName() . "</a>";
+{
+    $html .= "<a href=\"?a=alliance_detail&all_id=".$alliance->getID()."\">".$alliance->getName()."</a>";
+}
 $html .= "</td></tr>";
-$html .= "<tr class=kb-table-row-even><td class=kb-table-cell><b>Kills:</b></td><td class=kl-kill>" . $klist->getCount() . "</td></tr>";
-$html .= "<tr class=kb-table-row-even><td class=kb-table-cell><b>Real kills:</b></td><td class=kl-kill>" . $tklist->getCount() . "</td></tr>";
-$html .= "<tr class=kb-table-row-even><td class=kb-table-cell><b>Losses:</b></td><td class=kl-loss>" . $llist->getCount() . "</td></tr>";
-$html .= "<tr class=kb-table-row-even><td class=kb-table-cell><b>Damage done (ISK):</b></td><td class=kl-kill>" . $klist->getISK() . "M</td></tr>";
-$html .= "<tr class=kb-table-row-even><td class=kb-table-cell><b>Damage received (ISK):</b></td><td class=kl-loss>" . $llist->getISK() . "M</td></tr>";
-if ($klist->getISK())
-    $efficiency = round($klist->getISK() / ($klist->getISK() + $llist->getISK()) * 100, 2);
+$html .= "<tr class=kb-table-row-even><td class=kb-table-cell><b>Kills:</b></td><td class=kl-kill>".$kill_summary->getTotalKills()."</td></tr>";
+$html .= "<tr class=kb-table-row-even><td class=kb-table-cell><b>Losses:</b></td><td class=kl-loss>".$kill_summary->getTotalLosses()."</td></tr>";
+$html .= "<tr class=kb-table-row-even><td class=kb-table-cell><b>Damage done (ISK):</b></td><td class=kl-kill>".round($kill_summary->getTotalKillISK()/1000000, 2)."M</td></tr>";
+$html .= "<tr class=kb-table-row-even><td class=kb-table-cell><b>Damage received (ISK):</b></td><td class=kl-loss>".round($kill_summary->getTotalLossISK()/1000000, 2)."M</td></tr>";
+if ($kill_summary->getTotalKillISK())
+{
+    $efficiency = round($kill_summary->getTotalKillISK() / ($kill_summary->getTotalKillISK() + $kill_summary->getTotalLossISK()) * 100, 2);
+}
 else
+{
     $efficiency = 0;
+}
 
 $html .= "<tr class=kb-table-row-even><td class=kb-table-cell><b>Efficiency:</b></td><td class=kb-table-cell><b>" . $efficiency . "%</b></td></tr>";
-
 $html .= "</table>";
-
 $html .= "<br/>";
 
 if ($_GET['view'] == "" || $_GET['view'] == "kills" || $_GET['view'] == "losses")
 {
-    $summarytable = new KillSummaryTable($klist, $llist);
-    $summarytable->setBreak(6);
-
-    $html .= $summarytable->generate();
+    $html .= $summary_html;
 }
 

dev/common/home.php

@@ -109 +109 @@
 $page->addContext($tkbox->generate());
 
-$config = $page->killboard_->getConfig();
 if ($config->getKillPoints())
 {