Changeset 289

Timestamp:

12/16/07 14:55:47 (15 years ago)

Author:

exi

Message:

Added the change from ticket:54 - customizable rowcount on KillSummaryTable?.
Added the change from ticket:55 - ship classes shouldnt wrap anymore.
Added the fix from ticket:56 - proper png output by the signature generator.

Location:

dev

Files:

• common/admin/option_generic.php (modified) (2 diffs)
• common/alliance_detail.php (modified) (1 diff)
• common/cc_detail.php (modified) (1 diff)
• common/corp_detail.php (modified) (1 diff)
• common/home.php (modified) (1 diff)
• common/igb_home.php (modified) (1 diff)
• common/includes/class.config.php (modified) (1 diff)
• common/includes/class.kill.php (modified) (2 diffs)
• common/includes/class.killsummarytable.php (modified) (7 diffs)
• common/kill_related.php (modified) (1 diff)
• common/kills.php (modified) (1 diff)
• common/losses.php (modified) (1 diff)
• common/pilot_detail.php (modified) (1 diff)
• common/system_detail.php (modified) (1 diff)
• mods/signature_generator/sig.php (modified) (1 diff)

dev/common/admin/option_generic.php

@@ -22 +22 @@
 options::fadd('Use gmdate instead of date', 'date_gmtime', 'checkbox');
 options::fadd('Classify kills for hours:', 'kill_classified', 'edit:size:4', '', '', '0 to disable, 1-24hrs');
-options::fadd('Display a summary line below a killsummarytable', 'summarytable_summary', 'checkbox');
 
 options::cat('Appearance', 'Generic', 'Posting');
@@ -41 +40 @@
 options::fadd('Include dropped value into total loss', 'kd_droptototal', 'checkbox');
 
+options::cat('Appearance', 'Generic', 'Killsummarytables');
+options::fadd('Stats Row Count', 'summarytable_rowcount', 'edit:size:2');
+options::fadd('Display a summary line below a killsummarytable', 'summarytable_summary', 'checkbox');
+
 options::cat('Appearance', 'Generic', 'Public-Mode v0.2');
 options::fadd('Only Kills in SummaryTables', 'public_summarytable', 'checkbox','','','CORP_ID and ALLIANCE_ID in config has to be 0 to work "public"');

dev/common/alliance_detail.php

@@ -34 +34 @@
 $kill_summary = new KillSummaryTable();
 $kill_summary->addInvolvedAlliance($alliance);
-$kill_summary->setBreak(6);
+$kill_summary->setBreak(config::get('summarytable_rowcount'));
 $summary_html = $kill_summary->generate();
 

dev/common/cc_detail.php

@@ -40 +40 @@
 $llist = $contract->getLossList();
 $killsummary = new KillSummaryTable($klist, $llist);
-$killsummary->setBreak(6);
+$killsummary->setBreak(config::get('summarytable_rowcount'));
 if ($_GET['view'] == "")
     $killsummary->setFilter(false);

dev/common/corp_detail.php

@@ -25 +25 @@
 $kill_summary = new KillSummaryTable();
 $kill_summary->addInvolvedCorp($corp);
-$kill_summary->setBreak(6);
+$kill_summary->setBreak(config::get('summarytable_rowcount'));
 $summary_html = $kill_summary->generate();
 

dev/common/home.php

@@ -29 +29 @@
         $summarytable = new KillSummaryTable($kslist, $llist);
 }
-$summarytable->setBreak(6);
+$summarytable->setBreak(config::get('summarytable_rowcount'));
 $html .= $summarytable->generate();
 

dev/common/igb_home.php

@@ -24 +24 @@
 
 $summarytable = new KillSummaryTable($kslist, $llist);
-$summarytable->setBreak(6);
+$summarytable->setBreak(config::get('summarytable_rowcount'));
 
 if ($week == 1)

dev/common/includes/class.config.php

@@ -126 +126 @@
         if (!isset($cache[$key]))
         {
-            return null;
+            return config::defaultval($key);
         }
         return stripslashes($cache[$key]);
     }
+
+    function defaultval($key)
+    {
+        // add important upgrade configs here, they will return the default if not set
+        $defaults = array('summarytable_rowcount' => 6);
+
+        if (!isset($defaults[$key]))
+        {
+            return null;
+        }
+        return $defaults[$key];
+    }
 }
 ?>

dev/common/includes/class.kill.php

@@ -438 +438 @@
                         itd_itl_id, itl_location
                     from kb3_items_destroyed itd
-                        left join kb3_items itm on itd.itd_itm_id = itm.itm_id
-                        left join kb3_item_locations itl on (itd.itd_itl_id = itl.itl_id or (itd.itd_itl_id = 0 and itl.itl_id = 1))
-                    where itd.itd_kll_id = ".$this->getID()."
-                    group by itd_itm_id, itd_itl_id
-                    order by itd.itd_itl_id, itm.itm_type";
-
-            if (DB_USE_CCP)
-            {
-                $sql = "select sum(itd.itd_quantity) as itd_quantity, itd_itm_id,
-                        itd_itl_id, itl_location
-                    from kb3_items_destroyed itd
                         left join kb3_item_locations itl on (itd.itd_itl_id = itl.itl_id or (itd.itd_itl_id = 0 and itl.itl_id = 1))
                     where itd.itd_kll_id = ".$this->getID()."
                     group by itd_itm_id, itd_itl_id
                     order by itd.itd_itl_id";
-            }
             $qry->execute($sql);
             while ($row = $qry->getRow())
@@ -463 +451 @@
             }
 
-            if (DB_USE_CCP)
-            {
-                $sql = "select sum(itd.itd_quantity) as itd_quantity, itd_itm_id,
-                        itd_itl_id, itl_location
-                    from kb3_items_dropped itd
-                        left join kb3_item_locations itl on (itd.itd_itl_id = itl.itl_id or (itd.itd_itl_id = 0 and itl.itl_id = 1))
-                    where itd.itd_kll_id = ".$this->getID()."
-                    group by itd_itm_id, itd_itl_id
-                    order by itd.itd_itl_id";
-                $qry->execute($sql);
-                while ($row = $qry->getRow())
-                {
-                    $destroyed = new DroppedItem(new Item($row['itd_itm_id']),
-                        $row['itd_quantity'],
-                        $row['itl_location']);
-                    array_push($this->droppeditems_, $destroyed);
-                }
+            // dropped items
+            $sql = "select sum(itd.itd_quantity) as itd_quantity, itd_itm_id,
+                    itd_itl_id, itl_location
+                from kb3_items_dropped itd
+                    left join kb3_item_locations itl on (itd.itd_itl_id = itl.itl_id or (itd.itd_itl_id = 0 and itl.itl_id = 1))
+                where itd.itd_kll_id = ".$this->getID()."
+                group by itd_itm_id, itd_itl_id
+                order by itd.itd_itl_id";
+            $qry->execute($sql);
+            while ($row = $qry->getRow())
+            {
+                $destroyed = new DroppedItem(new Item($row['itd_itm_id']),
+                    $row['itd_quantity'],
+                    $row['itl_location']);
+                array_push($this->droppeditems_, $destroyed);
             }
         }

dev/common/includes/class.killsummarytable.php

@@ -140 +140 @@
         }
 
-      
+
         $sql = 'SELECT count(*) AS lnb, scl_id, scl_class,';
         if (config::get('ship_values'))
@@ -231 +231 @@
         $odd = false;
         $prevdate = "";
+        $width = round($this->break_/count($entry)*100);
+        $width_abs = round($this->break_/count($entry)*600);
+
         $html .= "<table class=kb-subtable width=\"100%\" border=\"0\" cellspacing=0>";
         if ($this->break_)
-            $html .= "<tr><td valign=top><table class=kb-table cellspacing=\"1\" width=\"100%\">";
+            $html .= "<tr><td valign=top width=\"$width%\"><table class=kb-table cellspacing=\"1\" width=\"100%\">";
         $counter = 1;
 
-        if ($this->verbose_) 
-        {
-            $header = "<tr class=kb-table-header><td class=kb-table-cell width=110>Ship class</td><td class=kb-table-cell width=60 align=center>Kills</td><td class=kb-table-cell width=60 align=center>ISK (M)</td><td class=kb-table-cell width=60 align=center>Losses</td><td class=kb-table-cell width=60 align=center>ISK (M)</td></tr>";
+        if ($this->verbose_)
+        {
+            $header = "<tr class=kb-table-header><td class=kb-table-cell width=\"$width_abs\">Ship class</td><td class=kb-table-cell width=60 align=center>Kills</td><td class=kb-table-cell width=60 align=center>ISK (M)</td><td class=kb-table-cell width=60 align=center>Losses</td><td class=kb-table-cell width=60 align=center>ISK (M)</td></tr>";
         }
         else
         {
-            $header = "<tr class=kb-table-header><td class=kb-table-cell width=110>Ship class</td><td class=kb-table-cell width=30 align=center>K</td><td class=kb-table-cell width=30 align=center>L</td></tr>";
-        }
-        
+            $header = "<tr class=kb-table-header><td class=kb-table-cell width=\"$width_abs\">Ship class</td><td class=kb-table-cell width=30 align=center>K</td><td class=kb-table-cell width=30 align=center>L</td></tr>";
+        }
+
         $html .= $header;
 
@@ -254 +257 @@
             {
                 $html .= "</table></td>";
-                $html .= "<td valign=top><table class=kb-table cellspacing=\"1\">";
+                $html .= "<td valign=top width=\"$width%\"><table class=kb-table cellspacing=\"1\">";
                 $html .= $header;
                 $counter = 1;
@@ -293 +296 @@
                 $qrystring .= '&view='.$this->view_;
             }
-            $html .= "<td class=kb-table-cell><b>";
+            $html .= "<td nowrap class=kb-table-cell><b>";
 
             if ($this->filter_) $html .= "<a class=kb-shipclass".$highlight." href=\"?".$qrystring."&scl_id=".$v['id']."\">";
@@ -306 +309 @@
             if ($this->verbose_)
                 $html .= "<td class=".$kclass." align=center>".round($v['kills_isk']/1000000, 2)."</td>";
-            
+
             $html .= "<td class=".$lclass." align=center>".$v['losses']."</td>";
                 if ($this->verbose_)
@@ -314 +317 @@
 
             $counter++;
-            
+
             $this->tkcount_ += $kcount;
             $this->tkisk_ += $kisk;
-            $this->tkpoints_ += $kpoints;     
+            $this->tkpoints_ += $kpoints;
             $this->tlcount_ += $lcount;
             $this->tlisk_ += $lisk;
@@ -333 +336 @@
                      .$this->tkcount_.' Ships killed ('.round($this->tkisk_/1000000, 2).'M ISK)</span></td><td width=49%><span class="losscount">'.$this->tlcount_.' Ships lost ('.round($this->tlisk_/1000000, 2).'M ISK)</span></td></tr></table>';
         }
-        
+
         if ($_GET['scl_id'] != "")
         {

dev/common/kill_related.php

@@ -89 +89 @@
 
 $summarytable = new KillSummaryTable($kslist, $lslist);
-$summarytable->setBreak(6);
+$summarytable->setBreak(config::get('summarytable_rowcount'));
 $html .= $summarytable->generate();
 

dev/common/kills.php

@@ -57 +57 @@
         $summarytable = new KillSummaryTable($kslist, $llist);
 }
-$summarytable->setBreak(6);
+$summarytable->setBreak(config::get('summarytable_rowcount'));
 $html .= $summarytable->generate();
 

dev/common/losses.php

@@ -54 +54 @@
 
 $summarytable = new KillSummaryTable($klist, $lslist);
-$summarytable->setBreak(6);
+$summarytable->setBreak(config::get('summarytable_rowcount'));
 $html .= $summarytable->generate();
 // $html .= "<table width=\"99%\" align=center><tr><td class=weeknav align=left>";

dev/common/pilot_detail.php

@@ -56 +56 @@
 $lpoints = $llist->getPoints();
 $summary = new KillSummaryTable($klist, $llist);
-$summary->setBreak(6);
+$summary->setBreak(config::get('summarytable_rowcount'));
 if ($_GET['view'] == "ships_weapons")
 {

dev/common/system_detail.php

@@ -31 +31 @@
 
 $summarytable = new KillSummaryTable($kslist, $lslist);
-$summarytable->setBreak(6);
+$summarytable->setBreak(config::get('summarytable_rowcount'));
 $html .= $summarytable->generate();
 

dev/mods/signature_generator/sig.php

@@ -80 +80 @@
 {
     header('Content-Type: image/png');
+    imagepng($im, 'cache/data/sig_'.$id.'_'.$plt_id);
 }
 else
 {
     header('Content-Type: image/jpeg');
+    imagejpeg($im, 'cache/data/sig_'.$id.'_'.$plt_id, 90);
 }
-imagejpeg($im, 'cache/data/sig_'.$id.'_'.$plt_id, 95);
 readfile('cache/data/sig_'.$id.'_'.$plt_id);
 ?>