Changeset 112

Timestamp:

11/29/06 16:32:21 (14 years ago)

Author:

knifee

Message:

Added Item_value mod to the core, and a tick box on/off to the admin page.

Location:

dev/common

Files:

• admin.php (modified) (2 diffs)
• kill_detail.php (modified) (3 diffs)

dev/common/admin.php

@@ -39 +39 @@
     $config->checkCheckbox('comments_pw');
     $config->checkCheckbox('comments_count');
-
+        $config->checkCheckbox('item_values');
     $config->setPostPassword($_POST['post_password']);
     $config->setPostMailto($_POST['post_mailto']);
@@ -147 +147 @@
 $html .= "></td></tr>";
 
+$html .= "<tr><td width=120><b>Enable Lost Item Values</b></td><td><input type=checkbox name=item_values id=item_values";
+if ($config->getConfig('item_values'))
+{
+    $html .= " checked=\"checked\"";
+}
+$html .= "></td></tr>";
+$html .= "<tr><td width=120><b>Use custom shipvalues:</b></td><td><input type=checkbox name=ship_values id=ship_values";
+if ($config->getConfig('ship_values'))
+{
+    $html .= " checked=\"checked\"";
+}
+$html .= "></td></tr>";
 // $html .= "<tr><td width=120><b>Display least active:</b></td><td><input type=checkbox name=least_active id=least_active";
 // if ( $config->getLeastActive() )

dev/common/kill_detail.php

@@ -5 +5 @@
 require_once("class.corp.php");
 require_once("class.box.php");
+require_once("class.box.test.php");
 require_once("class.alliance.php");
 require_once("globals.php");
-
-$page = new Page("Kill details");
+ global $config, $smarty;
+
+
+$page = new Page("Kill details"); 
+if ($config->getConfig('item_values'))
+{
+        $smarty->assign('item_values',"true");
+        if($page->isAdmin()) {
+                $smarty->assign('admin',"true");
+                if (isset($_POST['submit'])) {
+                        // Send new value for item to the database
+                        $IID = $_POST['IID'];
+                        $Val = $_POST[$IID];
+                        //echo "UPDATE kb3_items SET itm_value ='" . $Val . "' WHERE itm_id='" . $IID . "'";
+                        $qry = new DBQuery();
+                        $qry->execute("UPDATE kb3_items SET itm_value ='" . $Val . "' WHERE itm_id='" . $IID . "'") or die($qry->getErrorMsg());
+                        
+                }
+        }
+}
+
+
 
 if (!$kll_id = intval($_GET['kll_id']))
@@ -26 +47 @@
 }
 
-$html .= "<table cellpadding=0 cellspacing=1 border=0><tr><td width=360 align=left valign=top>";
-
-// victim
-$html .= "<table class=kb-table width=360 cellpadding=0 cellspacing=1 border=0>";
-$html .= "<tr class=kb-table-row-odd><td rowspan=3 width=\"64\"><img src=\"".$kill->getVictimPortrait(64)."\" border=\"0\" width=\"64\" heigth=\"64\"></td>";
-$html .= "<td class=kb-table-cell width=64><b>Victim:</b></td><td class=kb-table-cell><a href=\"?a=pilot_detail&plt_id=".$kill->getVictimID()."\">".$kill->getVictimName()."</a></td>";
-$html .= "</tr>";
-$html .= "<tr class=kb-table-row-odd>";
-$html .= "<td class=kb-table-cell width=64><b>Corp:</b></td><td class=kb-table-cell><a href=\"?a=corp_detail&crp_id=".$kill->getVictimCorpID()."\">".$kill->getVictimCorpName()."</a></td>";
-$html .= "</tr>";
-$html .= "<tr class=kb-table-row-odd>";
-$html .= "<td class=kb-table-cell width=64><b>Alliance:</b></td><td class=kb-table-cell><a href=\"?a=alliance_detail&all_id=".$kill->getVictimAllianceID()."\">".$kill->getVictimAllianceName()."</a></b></td>";
-$html .= "</tr>";
-$html .= "</table>";
+// victim $smarty->assign('',);
+$smarty->assign('VictimPortrait',$kill->getVictimPortrait(64));
+$smarty->assign('VictimURL',"?a=pilot_detail&plt_id=".$kill->getVictimID());
+$smarty->assign('VictimName',$kill->getVictimName());
+$smarty->assign('VictimCorpURL',"?a=corp_detail&crp_id=".$kill->getVictimCorpID());
+$smarty->assign('VictimCorpName',$kill->getVictimCorpName());
+$smarty->assign('VictimAllianceURL',"?a=alliance_detail&all_id=".$kill->getVictimAllianceID());
+$smarty->assign('VictimAllianceName',$kill->getVictimAllianceName());
+
 
 // involved
-$html .= "<div class=block-header>Involved parties</div>";
-$html .= "<table class=kb-table width=360 border=0 cellspacing=\"1\">";
-$odd = true;
+$i=1;
+$involved = array();
 foreach ($kill->involvedparties_ as $inv)
 {
@@ -53 +68 @@
     $weapon = $inv->getWeapon();
 
-    if ($odd)
-    {
-        $odd = false;
-        $rowclass = "kb-table-row-even";
+$involved[$i]['shipImage'] = $ship->getImage(64);
+$involved[$i]['PilotURL'] = "?a=pilot_detail&plt_id=".$pilot->getID();
+$involved[$i]['PilotName'] = $pilot->getName();
+$involved[$i]['CorpURL'] = "?a=corp_detail&crp_id=".$corp->getID();
+$involved[$i]['CorpName'] = $corp->getName();
+$involved[$i]['AlliURL'] = "?a=alliance_detail&all_id=".$alliance->getID();
+$involved[$i]['AlliName'] = $alliance->getName();
+$involved[$i]['ShipName'] = $ship->getName();
+
+    if ($pilot->getID() == $kill->getFBPilotID())
+    {
+        $involved[$i]['FB'] = "true";
     }
     else
     {
-        $odd = true;
-        $rowclass = "kb-table-row-odd";
-    }
-
-    if ($pilot->getID() == $kill->getFBPilotID())
-    {
-        $imgclass = "class=finalblow ";
+        $involved[$i]['FB'] = "false";
+    }
+
+    if ($corp->isNPCCorp())
+    {
+        $involved[$i]['portrait'] = $corp->getPortraitURL(64);
     }
     else
     {
-        $imgclass = "";
-    }
-
-    $html .= "<tr class=kb-table-row-even>";
-    if ($corp->isNPCCorp())
-    {
-        $html .= "<td rowspan=5 width=\"64\"><img ".$imgclass."src=\"".$corp->getPortraitURL(64)."\" border=\"0\"></td>";
-    }
+        $involved[$i]['portrait'] = $pilot->getPortraitURL(64);
+    }
+
+    if ($weapon->getName() != "Unknown" && $weapon->getName() != $ship->getName())
+        $involved[$i]['weaponName'] = $weapon->getName();
     else
-    {
-        $html .= "<td rowspan=5 width=\"64\"><img ".$imgclass."src=\"".$pilot->getPortraitURL(64)."\" border=\"0\"></td>";
-    }
-    $html .= "<td rowspan=5 width=\"64\"><img ".$imgclass."src=\"".$ship->getImage(64)."\" border=\"0\"></td>";
-    $html .= "<td class=kb-table-cell style=\"padding-top: 1px; padding-bottom: 1px;\"><a href=\"?a=pilot_detail&plt_id=".$pilot->getID()."\">".$pilot->getName()."</a></td>";
-    $html .= "</tr>";
-
-    $html .= "<tr class=kb-table-row-odd><td class=kb-table-cell style=\"padding-top: 1px; padding-bottom: 1px;\"><a href=\"?a=corp_detail&crp_id=".$corp->getID()."\">".$corp->getName()."</a></td></tr>";
-    $html .= "<tr class=kb-table-row-even><td class=kb-table-cell style=\"padding-top: 1px; padding-bottom: 1px;\"><a href=\"?a=alliance_detail&all_id=".$alliance->getID()."\">".$alliance->getName()."</a></td></tr>";
-    $html .= "<tr class=kb-table-row-odd><td class=kb-table-cell style=\"padding-top: 1px; padding-bottom: 1px;\"><b>".$ship->getName()."</b></td></tr>";
-
-    if ($weapon->getName() != "Unknown" && $weapon->getName() != $ship->getName())
-        $html .= "<tr class=kb-table-row-even><td class=kb-table-cell style=\"padding-top: 1px; padding-bottom: 1px;\">".$weapon->getName()."</td></tr>";
-    else
-        $html .= "<tr class=kb-table-row-even><td class=kb-table-cell style=\"padding-top: 1px; padding-bottom: 1px;\">Unknown</td></tr>";
-}
-$html .= "</table>";
+        $involved[$i]['weaponName'] = "Unknown";
+                ++$i;
+}
+$smarty->assign('involved',$involved);
 
 if ($config->getConfig('comments'))
 {
-    include('comments.php');
-}
-
-$html .= "</td><td width=50>&nbsp;</td>";
+        include('comments.php');
+   $smarty->assign('comments',"true");
+}
+
+
 // ship, ship details
-$html .= "<td align=left valign=top width=360>";
-
-$html .= "<table class=kb-table width=360 cellspacing=\"1\">";
 $ship = $kill->getVictimShip();
 $shipclass = $ship->getClass();
-$html .= "<tr class=kb-table-row-odd><td width=\"64\" heigth=\"64\" rowspan=3><img src=\"".$ship->getImage(64)."\" width=\"64\" heigth=\"64\"></td>";
-$html .= "<td class=kb-table-cell><b>Ship:</b></td><td class=kb-table-cell><b>".$ship->getName()."</b> (".$shipclass->getName().")</td>";
-$html .= "</tr>";
-// $html .= "<tr class=kb-table-row-odd><td><b>Location:</b></td><td><b>".$sys_name."</b> (".$sys_sec.")</td>";
 $system = $kill->getSystem();
-$html .= "<tr class=kb-table-row-odd><td class=kb-table-cell><b>Location:</b></td><td class=kb-table-cell><b><a href=\"javascript:openWindow( '?a=system_detail&sys_id=".$system->getID()."', '', 620, 260, '' );\">".$system->getName()."</a></b> (".$system->getSecurity(true).")</td>";
-
-$html .= "</tr>";
-$html .= "<tr class=kb-table-row-odd><td class=kb-table-cell><b>Date:</b></td><td class=kb-table-cell>".$kill->getTimeStamp()."</td>";
-$html .= "</tr>";
-$html .= "</table>";
+
+$smarty->assign('VictimShip',$kill->getVictimShip());
+$smarty->assign('ShipClass',$ship->getClass());
+$smarty->assign('ShipImage',$ship->getImage(64));
+$smarty->assign('ShipName',$ship->getName());
+$smarty->assign('ClassName',$shipclass->getName());
+$smarty->assign('System',$system->getName());
+$smarty->assign('SystemURL',"?a=system_detail&sys_id=".$system->getID());
+$smarty->assign('SystemSecurity',$system->getSecurity(true));
+$smarty->assign('TimeStamp',$kill->getTimeStamp());
+$smarty->assign('VictimShipImg',$ship->getImage(64));
+
 
 // ship fitting
 if (count($kill->destroyeditems_) > 0)
 {
-    $html .= "<div class=block-header>Ship details</div>";
-    $html .= "<table class=kb-table width=360 border=\"0\" cellspacing=\"1\">";
-    $imgid = 0;
-    foreach($kill->destroyeditems_ as $destroyed)
+$cargo = array();
+$drone = array();
+$high_slot = array();
+$mid_slot = array();
+$low_slot = array();
+    
+        foreach($kill->destroyeditems_ as $destroyed)
     {
         $item = $destroyed->getItem();
-        switch ($destroyed->getLocationID())
-        {
-            case 4:
-                $location = "Cargo";
-                break;
-            case 6: // drone
-                $location = "Drone Bay";
-                break;
-            default:
-                switch ($item->getSlot())
-                {
-                    case 1: // high
-                        $location = "Fitted - High slot";
-                        break;
-                    case 2: // high
-                        $location = "Fitted - Medium slot";
-                        break;
-                    case 3: // high
-                        $location = "Fitted - Low slot";
-                        break;
-                    case 6: // drone
-                        $location = "Drone Bay";
-                        break;
-                }
-                break;
-        }
-
-        if ($location != $lastlocation)
-        {
-            $lastlocation = $location;
-            $html .= "<tr class=kb-table-row-odd>";
-            $html .= "<td width=\"32\"><img src=\"".IMG_URL."/".strtolower(str_replace(' ', '_', $location)).".jpg\" alt=\"".$location."\" border=\"0\"></a></td>";
-            $html .= "<td class=kb-table-cell colspan=2><b>".$location."</b></td>";
-            $html .= "</tr>";
-        }
-        // item detail
-        // $html .= "<tr class=kb-table-row-even onclick=\"openWindow( '?a=item_detail&itm_id=".$row['itm_id']."', null, 225, 250, '' );\" onmouseover=\"document.getElementById('item_img".$imgid."').className='icon-hover'; this.style.cursor='pointer';\" onmouseout=\"document.getElementById('item_img".$imgid."').className='icon';\">";
-        $html .= "<tr class=kb-table-row-even>";
-        // $html .= "<td width=\"32\"><img id=item_img".$imgid." class=icon src=\"".IMG_URL."/items/32_32/".$row['itm_icon'].".png\"></td>";
-        // $html .= "<td class=icon width=\"32\" height=\"32\"></td>";
-        // $html .= "<td class=item-icon width=\"30\" height=\"34\" background=\"".$destroyed->getItem()->getIcon( 32 )."\" valign=top>";
-        // if ( substr( $destroyed->getItem()->getName(), strlen( $destroyed->getItem()->getName() ) - 2, 2 ) == "II" )
-        // $html .= "<img src=\"".IMG_URL."/items/32_32/t2.gif\" border=\"0\">";
-        // else
-        // $html .= "<img src=\"".IMG_URL."/items/32_32/blank.gif\" border=\"0\">";
-        // $hmtl .= "</td>";
-        $html .= $item->getIcon(32);
-
-        $html .= "<td class=kb-table-cell>".$item->getName()."</td>";
-        $html .= "<td width=\"30\" align=\"center\">".$destroyed->getQuantity()."</td>";
-        $html .= "</tr>";
-        $imgid++;
-    }
-    $html .= "</table>";
-}
-else
-    $html .= "<div class=block-header>No ship details</div>";
-
-$html .= "</td></tr></table>";
-
-$menubox = new box("Menu");
-$menubox->setIcon("menu-item.gif");
-$menubox->addOption("Caption","View");
-$menubox->addOption("link","Killmail", "javascript:openWindow( '?a=kill_mail&kll_id=".$kill->getID()."', null, 355, 430, '' );");
-if ($kill->relatedKillCount() > 1 || $kill->relatedLossCount() > 1)
-{
-    $menubox->addOption("link","Related kills (".$kill->relatedKillCount()."/".$kill->relatedLossCount().")", "?a=kill_related&kll_id=".$kill->getID());
-}
-if ($page->isAdmin())
-{
-    $menubox->addOption("caption","Admin");
-    $menubox->addOption("link","Delete", "javascript:openWindow('?a=kill_delete&kll_id=".$kill->getID()."', null, 420, 300, '' );");
-}
-$page->addContext($menubox->generate());
-
-if ($config->getKillPoints())
-{
-    $scorebox = new Box("Points awarded");
-    $scorebox->addOption("points",$kill->getKillPoints());
-    $page->addContext($scorebox->generate());
-}
-
-$mapbox = new Box("Map");
-$mapbox->addOption("img","?a=mapview&sys_id=".$system->getID()."&mode=map&size=145");
-$mapbox->addOption("img","?a=mapview&sys_id=".$system->getID()."&mode=region&size=145");
-$mapbox->addOption("img","?a=mapview&sys_id=".$system->getID()."&mode=cons&size=145");
-
-$page->addContext($mapbox->generate());
-
+                if ($config->getConfig('item_values'))
+                {
+                        
+                        $value = $destroyed->getValue();
+                        $value_single = $value;
+                        if ($value > 0)
+                        {
+                                $value = $destroyed->getValue() * $destroyed->getQuantity();
+                                $TotalValue = $TotalValue + $value;
+        
+                                // Value Manipulation for prettyness.
+        
+                                if (strlen($value) >1) {        // 1000's ?
+                                        $Formatted = number_format($value,2);
+                                        $Formatted = $Formatted . " isk";
+                                }
+        
+                                if (strlen($value) >3) {        // 1000's ?
+                                        $Formatted = round($value / 1000,2);
+        
+                                        $Formatted = number_format($Formatted,2);
+                                        $Formatted = $Formatted . " K";
+                                }
+        
+                                if (strlen($value) >6) {        // Is this value in the millions?
+                                        $Formatted = round($value / 1000000,2);
+                                        $Formatted = number_format($Formatted,2);
+                                        $Formatted = $Formatted . " M";
+                                }
+                        }
+                        else
+                        {
+                        $value = 0;
+                        $Formatted = "0 isk";
+                        }
+                }
+                $dest_array[$destroyed->getLocationID()][] = array('Icon' => $item->getIcon(32), 'Name' => $item->getName(), 'Quantity' => $destroyed->getQuantity(), 'Value'=>$Formatted,'single_unit'=>$value_single,'itemID'=>$item->getID() );
+
+    }
+
+} 
+
+/*
+ echo count($mid_slot);
+print_r($low_slot); 
+print_r($dest_array['1']);*/
+
+
+    if ($TotalValue > 0)
+    {
+                $Formatted = number_format($TotalValue,2);
+        }
+        //Get Ship Value
+        $ShipValue = $ship->getPrice();
+
+        $TotalLoss = number_format($TotalValue + $ShipValue,2);
+        $ShipValue = number_format($ShipValue,2);
+        
+        $smarty->assign('high_slot',$dest_array['1']);
+        $smarty->assign('mid_slot',$dest_array['2']); 
+        $smarty->assign('low_slot',$dest_array['3']);
+        $smarty->assign('cargo',$dest_array['4']);
+        $smarty->assign('drone',$dest_array['5']);
+        $smarty->assign('ItemValue',$Formatted);
+        $smarty->assign('ShipValue',$ShipValue);
+        $smarty->assign('TotalLoss',$TotalLoss);
+        
+        
+        $menubox = new box("Menu");
+        $menubox->setIcon("menu-item.gif");
+        $menubox->addOption("caption","View");
+        $menubox->addOption("link","Killmail", "javascript:openWindow( '?a=kill_mail&kll_id=".$kill->getID()."', null, 355, 430, '' );");
+                if ($kill->relatedKillCount() > 1 || $kill->relatedLossCount() > 1)
+                {
+                        $menubox->addOption("link","Related kills (".$kill->relatedKillCount()."/".$kill->relatedLossCount().")", "?a=kill_related&kll_id=".$kill->getID());
+                }
+                if ($page->isAdmin())
+                {
+                        $menubox->addOption("caption","Admin");
+                        $menubox->addOption("link","Delete", "javascript:openWindow('?a=kill_delete&kll_id=".$kill->getID()."', null, 420, 300, '' );");
+                } 
+                $page->addContext($menubox->generate());
+                
+                
+                if ($config->getKillPoints())
+                {
+                        $scorebox = new Box("Points");
+                        $scorebox->addOption("points",$kill->getKillPoints());
+                        $page->addContext($scorebox->generate());
+                }
+        
+        
+        $mapbox = new Box("Map");
+        $mapbox->addOption("img","?a=mapview&sys_id=".$system->getID()."&mode=map&size=145");
+        $mapbox->addOption("img","?a=mapview&sys_id=".$system->getID()."&mode=region&size=145");
+        $mapbox->addOption("img","?a=mapview&sys_id=".$system->getID()."&mode=cons&size=145");
+        $page->addContext($mapbox->generate());
+
+
+$html = $smarty->fetch('kill_detail.tpl');
 $page->setContent($html);
 $page->generate();