Changeset 307

Timestamp:

12/31/07 14:30:49 (12 years ago)

Author:

ralle030583

Message:

- Fix:

merged the last few changes into kill_detail (slotfix) into fitting mod

Location:

dev

Files:

• common/includes/globals.php (modified) (1 diff)
• common/kill_detail.php (modified) (1 diff)
• mods/fitting/kill_detail.php (modified) (10 diffs)
• mods/fitting/kill_detail.tpl (modified) (6 diffs)
• templates/kill_detail.tpl (modified) (2 diffs)

dev/common/includes/globals.php

@@ -1 +1 @@
 <?php
 // current subversion revision
-preg_match('/\$Re'.'vision: (.*?) \$/', '$Revision: 305 $', $match);
+preg_match('/\$Re'.'vision: (.*?) \$/', '$Revision: 307 $', $match);
 define('SVN_REV', $match[1]);
 

dev/common/kill_detail.php

@@ -143 +143 @@
 {
         //Admin is able to see classified Systems
-        if ($page->isAdmin()){
+        if ($page->isAdmin())
+        {
             $smarty->assign('System', $system->getName().' (Classified)');
         $smarty->assign('SystemURL', "?a=system_detail&sys_id=".$system->getID());
             $smarty->assign('SystemSecurity', $system->getSecurity(true));
-        }else{
+        }
+        else
+        {
                 $smarty->assign('System', 'Classified');
         $smarty->assign('SystemURL', "");

dev/mods/fitting/kill_detail.php

@@ -5 +5 @@
 require_once('common/includes/class.alliance.php');
 
-$page = new Page('Kill details - MOD');
+$page = new Page('Kill details with Fitting MOD');
 
 if (config::get('item_values'))
@@ -13 +13 @@
     {
         $smarty->assign('admin', 'true');
-        if (isset($_POST['submit']))
+        if (isset($_POST['submit']) && $_POST['submit'] == 'UpdateValue')
         {
             // Send new value for item to the database
@@ -19 +19 @@
             $Val = $_POST[$IID];
             $qry = new DBQuery();
-            $qry->execute("UPDATE kb3_items SET itm_value ='".$Val."' WHERE itm_id='".$IID."'");
+            $qry->execute("INSERT INTO kb3_item_price (typeID, price) VALUES ('".$IID."', '".$Val."') ON DUPLICATE KEY UPDATE price = '".$Val."'");
         }
+    }
+}
+
+if ($page->isAdmin())
+{
+    if (isset($_GET['view']) && $_GET['view']== 'FixSlot')
+    {
+            $smarty->assign('fixSlot', 'true');
+    }
+
+    $smarty->assign('admin', 'true');
+    if (isset($_POST['submit']) && $_POST['submit'] == 'UpdateSlot')
+    {
+        $IID = $_POST['IID'];
+        $KID = $_POST['KID'];
+        $Val = $_POST[$IID];
+        $table = $_POST['TYPE'];
+        $old = $_POST['OLDSLOT'];
+        $qry = new DBQuery();
+        $qry->execute("UPDATE kb3_items_".$table." SET itd_itl_id ='".$Val."' WHERE itd_itm_id=".$IID." AND itd_kll_id = ".$KID." AND itd_itl_id = ".$old);
     }
 }
@@ -42 +62 @@
 
 // victim $smarty->assign('',);
+$smarty->assign('KillId', $kill->getID());
 $smarty->assign('VictimPortrait', $kill->getVictimPortrait(64));
 $smarty->assign('VictimURL', "?a=pilot_detail&plt_id=".$kill->getVictimID());
@@ -144 +165 @@
 $smarty->assign('VictimShipImg', $ship->getImage(64));
 
+// preparing slot layout
+
+    $slot_array = array();
+    $slot_array[1] = array('img' => 'icon08_11.png', 'text' => 'Fitted - High slot', 'items' => array());
+    $slot_array[2] = array('img' => 'icon08_10.png', 'text' => 'Fitted - Mid slot', 'items' => array());
+    $slot_array[3] = array('img' => 'icon08_09.png', 'text' => 'Fitted - Low slot', 'items' => array());
+    $slot_array[5] = array('img' => 'icon68_01.png', 'text' => 'Fitted - Rig slot', 'items' => array());
+    $slot_array[6] = array('img' => 'icon02_10.png', 'text' => 'Drone bay', 'items' => array());
+    $slot_array[4] = array('img' => 'icon03_14.png', 'text' => 'Cargo Bay', 'items' => array());
+
 // ship fitting
 if (count($kill->destroyeditems_) > 0)
 {
     $dest_array = array();
-    $dest_array[1] = array('img' => 'icon08_11.png', 'text' => 'Fitted - High slot', 'items' => array());
-    $dest_array[2] = array('img' => 'icon08_10.png', 'text' => 'Fitted - Mid slot', 'items' => array());
-    $dest_array[3] = array('img' => 'icon08_09.png', 'text' => 'Fitted - Low slot', 'items' => array());
-    $dest_array[5] = array('img' => 'icon68_01.png', 'text' => 'Fitted - Rig slot', 'items' => array());
-    $dest_array[6] = array('img' => 'icon02_10.png', 'text' => 'Drone bay', 'items' => array());
-    $dest_array[4] = array('img' => 'icon03_14.png', 'text' => 'Cargo Bay', 'items' => array());
-
     foreach($kill->destroyeditems_ as $destroyed)
     {
@@ -164 +188 @@
             $formatted = $destroyed->getFormatttedValue();
         }
-        $dest_array[$destroyed->getLocationID()]['items'][] = array('Icon' => $item->getIcon(32), 'Name' => $item->getName(), 'Quantity' => $destroyed->getQuantity(), 'Value' => $formatted, 'single_unit' => $value, 'itemID' => $item->getID());
+        $dest_array[$destroyed->getLocationID()][] = array('Icon' => $item->getIcon(32), 'Name' => $item->getName(), 'Quantity' => $destroyed->getQuantity(), 'Value' => $formatted, 'single_unit' => $value, 'itemID' => $item->getID(),'slotID' => $destroyed->getLocationID());
                 
                 //Fitting, KE - add destroyed items to an array of all fitted items.
@@ -181 +205 @@
 {
     $drop_array = array();
-    $drop_array[1] = array('img' => 'icon08_11.png', 'text' => 'Fitted - High slot', 'items' => array());
-    $drop_array[2] = array('img' => 'icon08_10.png', 'text' => 'Fitted - Mid slot', 'items' => array());
-    $drop_array[3] = array('img' => 'icon08_09.png', 'text' => 'Fitted - Low slot', 'items' => array());
-    $drop_array[5] = array('img' => 'icon68_01.png', 'text' => 'Fitted - Rig slot', 'items' => array());
-    $drop_array[6] = array('img' => 'icon02_10.png', 'text' => 'Drone bay', 'items' => array());
-    $drop_array[4] = array('img' => 'icon03_14.png', 'text' => 'Cargo Bay', 'items' => array());
-
     foreach($kill->droppeditems_ as $dropped)
     {
@@ -197 +214 @@
             $formatted = $dropped->getFormatttedValue();
         }
-        $drop_array[$dropped->getLocationID()]['items'][] = array('Icon' => $item->getIcon(32), 'Name' => $item->getName(), 'Quantity' => $dropped->getQuantity(), 'Value' => $formatted, 'single_unit' => $value, 'itemID' => $item->getID());
+        $drop_array[$dropped->getLocationID()][] = array('Icon' => $item->getIcon(32), 'Name' => $item->getName(), 'Quantity' => $dropped->getQuantity(), 'Value' => $formatted, 'single_unit' => $value, 'itemID' => $item->getID(),'slotID' => $dropped->getLocationID());
                 
                 //Fitting -KE, add dropped items to the list
@@ -269 +286 @@
 $dropvalue = number_format($dropvalue, 2);
 
-
 $smarty->assign_by_ref('destroyed', $dest_array);
 $smarty->assign_by_ref('dropped', $drop_array);
+$smarty->assign_by_ref('slots', $slot_array);
 $smarty->assign_by_ref('fitting_high', $fitting_array[1]);
 $smarty->assign_by_ref('fitting_med', $fitting_array[2]);
@@ -293 +310 @@
     $menubox->addOption("caption", "Admin");
     $menubox->addOption("link", "Delete", "javascript:openWindow('?a=admin_kill_delete&kll_id=".$kill->getID()."', null, 420, 300, '' );");
+    $menubox->addOption("link", "Fix Slots", "?a=kill_detail&kll_id=".$kill->getID()."&view=FixSlot");
+
 }
 $page->addContext($menubox->generate());

dev/mods/fitting/kill_detail.tpl

@@ -61 +61 @@
             </table>
 
-
           <br />
           <div id="fitting" style="position:relative; height:380px; width:360px; background-image:url(mods/fitting/fitting.gif)" name="fitting">
-<div id="high1" style="position:absolute; left:40px; top:255px; width:32px; height:32px; z-index:1;">{$fitting_high.0.Icon}</div>
-<div id="high2" style="position:absolute; left:8px; top:162px; width:32px; height:32px; z-index:1;">{$fitting_high.1.Icon}</div>
-<div id="high3" style="position:absolute; left:41px; top:71px; width:32px; height:32px; z-index:1;">{$fitting_high.2.Icon}</div>
-<div id="high4" style="position:absolute; left:117px; top:15px; width:32px; height:32px; z-index:1;">{$fitting_high.3.Icon}</div>
-<div id="high5" style="position:absolute; left:212px; top:13px; width:32px; height:32px; z-index:1;">{$fitting_high.4.Icon}</div>
-<div id="high6" style="position:absolute; left:295px; top:72px; width:32px; height:32px; z-index:1;">{$fitting_high.5.Icon}</div>
-<div id="high7" style="position:absolute; left:323px; top:165px; width:32px; height:32px; z-index:1;">{$fitting_high.6.Icon}</div>
-<div id="high8" style="position:absolute; left:295px; top:253px; width:32px; height:32px; z-index:1;">{$fitting_high.7.Icon}</div>
-
-<div id="mid1" style="position:absolute; left:73px; top:229px; width:32px; height:32px; z-index:1;">{$fitting_med.0.Icon}</div>
-<div id="mid2" style="position:absolute; left:51px; top:165px; width:32px; height:32px; z-index:1;">{$fitting_med.1.Icon}</div>
-<div id="mid3" style="position:absolute; left:72px; top:93px; width:32px; height:32px; z-index:1;">{$fitting_med.2.Icon}</div>
-<div id="mid4" style="position:absolute; left:132px; top:57px; width:32px; height:32px; z-index:1;">{$fitting_med.3.Icon}</div>
-<div id="mid5" style="position:absolute; left:198px; top:52px; width:32px; height:32px; z-index:1;">{$fitting_med.4.Icon}</div>
-<div id="mid6" style="position:absolute; left:256px; top:101px; width:32px; height:32px; z-index:1;">{$fitting_med.5.Icon}</div>
-<div id="mid7" style="position:absolute; left:275px; top:166px; width:32px; height:32px; z-index:1;">{$fitting_med.6.Icon}</div>
-<div id="mid8" style="position:absolute; left:261px; top:228px; width:32px; height:32px; z-index:1;">{$fitting_med.7.Icon}</div>
-
-<div id="low1" style="position:absolute; left:107px; top:205px; width:32px; height:32px; z-index:1;">{$fitting_low.0.Icon}</div>
-<div id="low2" style="position:absolute; left:94px; top:163px; width:32px; height:32px; z-index:1;">{$fitting_low.1.Icon}</div>
-<div id="low3" style="position:absolute; left:111px; top:123px; width:32px; height:32px; z-index:1;">{$fitting_low.2.Icon}</div>
-<div id="low4" style="position:absolute; left:143px; top:93px; width:32px; height:32px; z-index:1;">{$fitting_low.3.Icon}</div>
-<div id="low5" style="position:absolute; left:186px; top:94px; width:32px; height:32px; z-index:1;">{$fitting_low.4.Icon}</div>
-<div id="low6" style="position:absolute; left:228px; top:123px; width:32px; height:32px; z-index:1;">{$fitting_low.5.Icon}</div>
-<div id="low7" style="position:absolute; left:237px; top:164px; width:32px; height:32px; z-index:1;">{$fitting_low.6.Icon}</div>
-<div id="low8" style="position:absolute; left:225px; top:203px; width:32px; height:32px; z-index:1;">{$fitting_low.7.Icon}</div>
-
-<div id="rig1" style="position:absolute; left:54px; top:345px; width:32px; height:32px; z-index:1;">{$fitting_rig.0.Icon}</div>
-<div id="rig2" style="position:absolute; left:86px; top:345px; width:32px; height:32px; z-index:1;">{$fitting_rig.1.Icon}</div>
-<div id="rig3" style="position:absolute; left:118px; top:345px; width:32px; height:32px; z-index:1;">{$fitting_rig.2.Icon}</div>
-
-</div>
+                <div id="high1" style="position:absolute; left:40px; top:255px; width:32px; height:32px; z-index:1;">{$fitting_high.0.Icon}</div>
+                <div id="high2" style="position:absolute; left:8px; top:162px; width:32px; height:32px; z-index:1;">{$fitting_high.1.Icon}</div>
+                <div id="high3" style="position:absolute; left:41px; top:71px; width:32px; height:32px; z-index:1;">{$fitting_high.2.Icon}</div>
+                <div id="high4" style="position:absolute; left:117px; top:15px; width:32px; height:32px; z-index:1;">{$fitting_high.3.Icon}</div>
+                <div id="high5" style="position:absolute; left:212px; top:13px; width:32px; height:32px; z-index:1;">{$fitting_high.4.Icon}</div>
+                <div id="high6" style="position:absolute; left:295px; top:72px; width:32px; height:32px; z-index:1;">{$fitting_high.5.Icon}</div>
+                <div id="high7" style="position:absolute; left:323px; top:165px; width:32px; height:32px; z-index:1;">{$fitting_high.6.Icon}</div>
+                <div id="high8" style="position:absolute; left:295px; top:253px; width:32px; height:32px; z-index:1;">{$fitting_high.7.Icon}</div>
+
+                <div id="mid1" style="position:absolute; left:73px; top:229px; width:32px; height:32px; z-index:1;">{$fitting_med.0.Icon}</div>
+                <div id="mid2" style="position:absolute; left:51px; top:165px; width:32px; height:32px; z-index:1;">{$fitting_med.1.Icon}</div>
+                <div id="mid3" style="position:absolute; left:72px; top:93px; width:32px; height:32px; z-index:1;">{$fitting_med.2.Icon}</div>
+                <div id="mid4" style="position:absolute; left:132px; top:57px; width:32px; height:32px; z-index:1;">{$fitting_med.3.Icon}</div>
+                <div id="mid5" style="position:absolute; left:198px; top:52px; width:32px; height:32px; z-index:1;">{$fitting_med.4.Icon}</div>
+                <div id="mid6" style="position:absolute; left:256px; top:101px; width:32px; height:32px; z-index:1;">{$fitting_med.5.Icon}</div>
+                <div id="mid7" style="position:absolute; left:275px; top:166px; width:32px; height:32px; z-index:1;">{$fitting_med.6.Icon}</div>
+                <div id="mid8" style="position:absolute; left:261px; top:228px; width:32px; height:32px; z-index:1;">{$fitting_med.7.Icon}</div>
+
+                <div id="low1" style="position:absolute; left:107px; top:205px; width:32px; height:32px; z-index:1;">{$fitting_low.0.Icon}</div>
+                <div id="low2" style="position:absolute; left:94px; top:163px; width:32px; height:32px; z-index:1;">{$fitting_low.1.Icon}</div>
+                <div id="low3" style="position:absolute; left:111px; top:123px; width:32px; height:32px; z-index:1;">{$fitting_low.2.Icon}</div>
+                <div id="low4" style="position:absolute; left:143px; top:93px; width:32px; height:32px; z-index:1;">{$fitting_low.3.Icon}</div>
+                <div id="low5" style="position:absolute; left:186px; top:94px; width:32px; height:32px; z-index:1;">{$fitting_low.4.Icon}</div>
+                <div id="low6" style="position:absolute; left:228px; top:123px; width:32px; height:32px; z-index:1;">{$fitting_low.5.Icon}</div>
+                <div id="low7" style="position:absolute; left:237px; top:164px; width:32px; height:32px; z-index:1;">{$fitting_low.6.Icon}</div>
+                <div id="low8" style="position:absolute; left:225px; top:203px; width:32px; height:32px; z-index:1;">{$fitting_low.7.Icon}</div>
+
+                <div id="rig1" style="position:absolute; left:54px; top:345px; width:32px; height:32px; z-index:1;">{$fitting_rig.0.Icon}</div>
+                <div id="rig2" style="position:absolute; left:86px; top:345px; width:32px; height:32px; z-index:1;">{$fitting_rig.1.Icon}</div>
+                <div id="rig3" style="position:absolute; left:118px; top:345px; width:32px; height:32px; z-index:1;">{$fitting_rig.2.Icon}</div>
+          </div>
            
-           
-           
-           
-          <div class="block-header">Ship details</div>
+                <div class="block-header">Ship details</div>
             <table class="kb-table" width="360" border="0" cellspacing="1">
-{foreach from=$destroyed item=slot key=slotindex}
+{foreach from=$slots item=slot key=slotindex}
 {* set to true to show empty slots *}
-{if $slot.items or $dropped.$slotindex.items}
+{if $destroyed.$slotindex or $dropped.$slotindex}
                 <tr class="kb-table-row-even">
                     <td class="item-icon" width="32"><img width="32" height="32" src="{$img_url}/{$slot.img}" alt="{$slot.text}" border="0"></td>
@@ -112 +107 @@
     {/if}
                 </tr>
-    {foreach from=$slot.items item=i}
+    {foreach from=$destroyed.$slotindex item=i}
                 <tr class="kb-table-row-odd">
                     <td class="item-icon" width="32" height="34" valign="top"><a href="?a=invtype&id={$i.itemID}">{$i.Icon}</a></td>
@@ -121 +116 @@
         {/if}
                 </tr>
-        {if $admin and $config->get('item_values')}
+        {if $admin and $config->get('item_values') and !$fixSlot}
                     <tr class="kb-table-row-even">
                       <form method="post" action="">
@@ -130 +125 @@
                                 <input name="{$i.itemID}" type="text" class="comment-button" value="{$i.single_unit}" size="6">
                             </div>
-                        <td height="34" valign="top"><input type="submit" name="submit" value="Update" class="comment-button"></td>
-                      </form>
-                    </tr>
-        {/if}
-    {foreachelse}
-                <tr class="kb-table-row-odd">
-                    <td colspan="4" valign="top">No Items lost</td>
-                </tr>
+                        <td height="34" valign="top"><input type="submit" name="submit" value="UpdateValue" class="comment-button"></td>
+                      </form>
+                    </tr>
+        {/if}
+        {if $admin and $i.slotID < 4 and $fixSlot}
+                    <tr class="kb-table-row-even">
+                      <form method="post" action="">
+                        <td height="34" colspan="3" valign="top">
+                            <div align="right">
+                                Fix slot: 
+                                <input name="IID" value="{$i.itemID}" type="hidden">
+                                <input name="KID" value="{$KillId}" type="hidden">
+                                                                <input name="TYPE" value="destroyed" type="hidden">
+                                                                <input name="OLDSLOT" value="{$i.slotID}" type="hidden">                                
+                                <input name="{$i.itemID}" type="text" class="comment-button" value="{$i.slotID}" size="6">
+                            </div>
+                        <td height="34" valign="top"><input type="submit" name="submit" value="UpdateSlot" class="comment-button"></td>
+                      </form>
+                    </tr>
+        {/if}
     {/foreach}
-    {foreach from=$dropped.$slotindex.items item=i}
+    {foreach from=$dropped.$slotindex item=i}
                 <tr class="kb-table-row-odd" style="background-color: green;">
                     <td style="border: 1px solid green;" width="32" height="34" valign="top"><a href="?a=invtype&id={$i.itemID}">{$i.Icon}</a></td>
@@ -148 +155 @@
         {/if}
                 </tr>
-        {if $admin and $config->get('item_values')}
+        {if $admin and $config->get('item_values') and !$fixSlot}
                     <tr class="kb-table-row-even">
                       <form method="post" action="">
@@ -158 +165 @@
                             </div>
                         <td height="34" valign="top"><input type="submit" name="submit" value="Update" class="comment-button"></td>
+                      </form>
+                    </tr>
+        {/if}
+        {if $admin and $i.slotID < 4 and $fixSlot}
+                    <tr class="kb-table-row-even">
+                      <form method="post" action="">
+                        <td height="34" colspan="3" valign="top">
+                            <div align="right">
+                                Fix slot: 
+                                <input name="IID" value="{$i.itemID}" type="hidden">
+                                <input name="KID" value="{$KillId}" type="hidden">
+                                                                <input name="TYPE" value="dropped" type="hidden">
+                                                                <input name="OLDSLOT" value="{$i.slotID}" type="hidden">                                
+                                <input name="{$i.itemID}" type="text" class="comment-button" value="{$i.slotID}" size="6">
+                            </div>
+                        <td height="34" valign="top"><input type="submit" name="submit" value="UpdateSlot" class="comment-button"></td>
                       </form>
                     </tr>

dev/templates/kill_detail.tpl

@@ -103 +103 @@
                                 <input name="IID" value="{$i.itemID}" type="hidden">
                                 <input name="KID" value="{$KillId}" type="hidden">
-                                <input name="TYPE" value="destroyed" type="hidden">
-                                <input name="OLDSLOT" value="{$i.slotID}" type="hidden">                                
+                                                                <input name="TYPE" value="destroyed" type="hidden">
+                                                                <input name="OLDSLOT" value="{$i.slotID}" type="hidden">                                
                                 <input name="{$i.itemID}" type="text" class="comment-button" value="{$i.slotID}" size="6">
                             </div>
@@ -142 +142 @@
                                 <input name="IID" value="{$i.itemID}" type="hidden">
                                 <input name="KID" value="{$KillId}" type="hidden">
-                                <input name="TYPE" value="dropped" type="hidden">
-                                <input name="OLDSLOT" value="{$i.slotID}" type="hidden">                                
+                                                                <input name="TYPE" value="dropped" type="hidden">
+                                                                <input name="OLDSLOT" value="{$i.slotID}" type="hidden">                                
                                 <input name="{$i.itemID}" type="text" class="comment-button" value="{$i.slotID}" size="6">
                             </div>