Changeset 135

Timestamp:

12/06/06 14:56:04 (16 years ago)

Author:

exi

Message:

Added an rss-icon to main page.
Cleaned up kill_detail template.
Added autoupgrade code for standings table.

Location:

dev

Files:

• common/admin.php (modified) (1 diff)
• common/autoupgrade.php (modified) (1 diff)
• common/home.php (modified) (1 diff)
• common/kill_detail.php (modified) (6 diffs)
• install/install_step4_tblchk.php (modified) (2 diffs)
• mods/rss_feed/rss_icon.png (added)
• templates/kill_detail.tpl (modified) (1 diff)

dev/common/admin.php

@@ -21 +21 @@
 check_tblstrct3();
 check_tblstrct4();
+check_tblstrct5();
 
 if ($_POST['submit'])

dev/common/autoupgrade.php

@@ -166 +166 @@
     $qry->execute('ALTER TABLE `kb3_items` CHANGE `itm_externalid` `itm_externalid` INT( 11 ) NOT NULL DEFAULT \'0\'');
 }
+
+function check_tblstrct5()
+{
+    $qry = new DBQuery();
+    $query = 'select count(*) from kb3_standings';
+    $result = mysql_query($query);
+    if ($result)
+    {
+        $query = 'select count(*) from kb3_standings where sta_from=1 and sta_to=1 and sta_from_type=\'a\' and
+                  sta_to_type=\'c\'';
+        $result = mysql_query($query);
+        if ($result)
+        {
+            return;
+        }
+        $qry->execute('drop table kb3_standings');
+    }
+$query = 'CREATE TABLE `kb3_standings` (
+  `sta_from` int(11) NOT NULL default \'0\',
+  `sta_to` int(11) NOT NULL default \'0\',
+  `sta_from_type` enum(\'a\',\'c\') NOT NULL default \'a\',
+  `sta_to_type` enum(\'a\',\'c\') NOT NULL default \'a\',
+  `sta_value` float NOT NULL default \'0\',
+  `sta_comment` varchar(200) NOT NULL,
+  KEY `sta_from` (`sta_from`)
+) TYPE=MyISAM;';
+    $qry->execute($query);
+}
 ?>

dev/common/home.php

@@ -69 +69 @@
 }
 
-$html .= "<div class=kb-kills-header>20 most recent kills</div>";
+// bad hax0ring, we really need mod callback stuff
+if (strpos($config->getConfig('mods_active'), 'rss_feed') !== false)
+{
+    $html .= "<div class=kb-kills-header><a href=\"?a=rss\"><img src=\"mods/rss_feed/rss_icon.png\" alt=\"RSS-Feed\" border=\"0\"></a>&nbsp;20 most recent kills</div>";
+}
+else
+{
+    $html .= "<div class=kb-kills-header>20 most recent kills</div>";
+}
 
 $klist = new KillList();

dev/common/kill_detail.php

@@ -12 +12 @@
 if ($config->getConfig('item_values'))
 {
-    $smarty->assign('item_values', "true");
+    $smarty->assign('item_values', 'true');
     if ($page->isAdmin())
     {
-        $smarty->assign('admin', "true");
+        $smarty->assign('admin', 'true');
         if (isset($_POST['submit']))
         {
@@ -21 +21 @@
             $IID = $_POST['IID'];
             $Val = $_POST[$IID];
-            // echo "UPDATE kb3_items SET itm_value ='" . $Val . "' WHERE itm_id='" . $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."'");
@@ -98 +98 @@
     ++$i;
 }
-
 $smarty->assign_by_ref('involved', $involved);
 
@@ -125 +124 @@
 if (count($kill->destroyeditems_) > 0)
 {
-    $cargo = array();
-    $drone = array();
-    $high_slot = array();
-    $mid_slot = array();
-    $low_slot = array();
+    $dest_array = array();
+    $dest_array[1] = array('img' => 'fitted_-_high_slot.jpg', 'text' => 'Fitted - High slot', 'items' => array());
+    $dest_array[2] = array('img' => 'fitted_-_medium_slot.jpg', 'text' => 'Fitted - Mid slot', 'items' => array());
+    $dest_array[3] = array('img' => 'fitted_-_low_slot.jpg', 'text' => 'Fitted - Low slot', 'items' => array());
+    $dest_array[6] = array('img' => 'drone_bay.jpg', 'text' => 'Drone bay', 'items' => array());
+    $dest_array[4] = array('img' => 'cargo.jpg', 'text' => 'Cargo Bay', 'items' => array());
 
     foreach($kill->destroyeditems_ as $destroyed)
@@ -170 +170 @@
             }
         }
-        $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']);*/
+        $dest_array[$destroyed->getLocationID()]['items'][] = array('Icon' => $item->getIcon(32), 'Name' => $item->getName(), 'Quantity' => $destroyed->getQuantity(), 'Value' => $Formatted, 'single_unit' => $value_single, 'itemID' => $item->getID());
+    }
+}
 
 if ($TotalValue > 0)
@@ -183 +178 @@
     $Formatted = number_format($TotalValue, 2);
 }
+
 // Get Ship Value
 $ShipValue = $ship->getPrice();
-
 $TotalLoss = number_format($TotalValue + $ShipValue, 2);
 $ShipValue = number_format($ShipValue, 2);
 
-$smarty->assign_by_ref('high_slot', $dest_array['1']);
-$smarty->assign_by_ref('mid_slot', $dest_array['2']);
-$smarty->assign_by_ref('low_slot', $dest_array['3']);
-$smarty->assign_by_ref('cargo', $dest_array['4']);
-$smarty->assign_by_ref('drone', $dest_array['6']);
+$smarty->assign_by_ref('destroyed', $dest_array);
 $smarty->assign('ItemValue', $Formatted);
 $smarty->assign('ShipValue', $ShipValue);
 $smarty->assign('TotalLoss', $TotalLoss);
 
-$menubox = new box("Menu");
+$menubox = new Box("Menu");
 $menubox->setIcon("menu-item.gif");
 $menubox->addOption("caption", "View");
-        $menubox->addOption("link","Killmail", "javascript:sndReq('index.php?a=kill_mail&kll_id=".$kill->getID()."');ReverseContentDisplay('popup')");
+$menubox->addOption("link", "Killmail", "javascript:sndReq('index.php?a=kill_mail&kll_id=".$kill->getID()."');ReverseContentDisplay('popup')");
 if ($kill->relatedKillCount() > 1 || $kill->relatedLossCount() > 1)
 {

dev/install/install_step4_tblchk.php

@@ -155 +155 @@
 }
 
+function check_tblstrct5()
+{
+    $query = 'select count(*) from kb3_standings';
+    $result = mysql_query($query);
+    if ($result)
+    {
+        $query = 'select count(*) from kb3_standings where sta_from=1 and sta_to=1 and sta_from_type=\'a\' and
+                  sta_to_type=\'c\'';
+        $result = mysql_query($query);
+        if ($result)
+        {
+            return;
+        }
+        mysql_query('drop table kb3_standings');
+    }
+$query = 'CREATE TABLE `kb3_standings` (
+  `sta_from` int(11) NOT NULL default \'0\',
+  `sta_to` int(11) NOT NULL default \'0\',
+  `sta_from_type` enum(\'a\',\'c\') NOT NULL default \'a\',
+  `sta_to_type` enum(\'a\',\'c\') NOT NULL default \'a\',
+  `sta_value` float NOT NULL default \'0\',
+  `sta_comment` varchar(200) NOT NULL,
+  KEY `sta_from` (`sta_from`)
+) TYPE=MyISAM;';
+    mysql_query($query);
+}
 
 check_commenttable();
@@ -167 +193 @@
 check_tblstrct3();
 check_tblstrct4();
+check_tblstrct5();
 ?>

dev/templates/kill_detail.tpl

@@ -57 +57 @@
                 </tr>
             </table>
-            <div class=block-header>Ship details</div>
 
-{if $item_values}
-            <table class=kb-table width=360 border="0" cellspacing="1">
-
-                <tr class=kb-table-row-even>
-                    <td width="32"><img src="img/fitted_-_high_slot.jpg" alt="Fitted - High slot" border="0"></td>
-                    <td colspan="2" class=kb-table-cell><b>Fitted - High slot</b> </td>
-                    <td align="center" class=kb-table-cell><b>Value</b></td>
+            <div class="block-header">Ship details</div>
+            <table class="kb-table" width="360" border="0" cellspacing="1">
+{foreach from=$destroyed item=slot}
+{* set to true to show empty slots *}
+{if $slot.items}
+                <tr class="kb-table-row-even">
+                    <td width="32"><img src="img/{$slot.img}" alt="{$slot.text}" border="0"></td>
+                    <td colspan="2" class="kb-table-cell"><b>{$slot.text}</b> </td>
+    {if $config->getConfig('item_values')}
+                    <td align="center" class="kb-table-cell"><b>Value</b></td>
+    {/if}
                 </tr>
-    {foreach from=$high_slot key=k item=i}
-                <tr class=kb-table-row-odd>
-                    <td class=item-icon width="32" height="34"  valign=top>{$i.Icon}</td>
-                    <td class=kb-table-cell>{$i.Name}</td>
+    {foreach from=$slot.items item=i}
+                <tr class="kb-table-row-odd">
+                    <td class="item-icon" width="32" height="34" valign="top">{$i.Icon}</td>
+                    <td class="kb-table-cell">{$i.Name}</td>
                     <td width="30" align="center">{$i.Quantity}</td>
+        {if $config->getConfig('item_values')}
                     <td align="center">{$i.Value}</td>
+        {/if}
                 </tr>
-        {if $admin}
-                    <tr class=kb-table-row-odd>
-                    <form method=post id="{$value}" name="{$value}" action= >
-                        <td height="34" colspan="3" valign=top >
+        {if $admin and $config->getConfig('item_values')}
+                    <tr class="kb-table-row-even">
+                      <form method="post" action="">
+                        <td height="34" colspan="3" valign="top">
                             <div align="right">
                                 Current single Item Value:
-                                <input checked='checked' name='IID' value="{$i.itemID}" type='hidden'>
-                                <input name= '{$i.itemID}' type='text' class='comment-button' value='{$i.single_unit}' size='6'>
+                                <input name="IID" value="{$i.itemID}" type="hidden">
+                                <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>
+                        <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 height="34" colspan="4" valign=top >No Information Stored</tr>
+                <tr class="kb-table-row-odd">
+                    <td colspan="4" valign="top">No Items lost</td>
+                </tr>
     {/foreach}
-                <tr class=kb-table-row-even>
-                    <td width="32"><img src="img/fitted_-_medium_slot.jpg" alt="Fitted - Mid slot" border="0"></td>
-                    <td colspan=2 class=kb-table-cell>
-                        <b>Fitted - Mid slot</b></td>
-                    <td align="center" class=kb-table-cell><b>Value</b></td>
-                </tr>
-    {foreach from=$mid_slot key=k item=i}
-                <tr class=kb-table-row-odd>
-                    <td class=item-icon width="32" height="34"  valign=top>{$i.Icon}</td>
-                    <td class=kb-table-cell>{$i.Name}</td>
-                    <td width="30" align="center">{$i.Quantity}</td>
-                    <td align="center">{$i.Value}</td>
-                </tr>
-        {if $admin=="true"}
-                    <tr class={cycle values="kb-table-row-odd,kb-table-row-odd"}>
-                    <form method=post id="{$value}" name="{$value}" action= >
-                        <td height="34" colspan="3" valign=top >
-                            <div align="right">
-                                Current single Item Value:
-                                <input checked='checked' name='IID' value="{$i.itemID}" type='hidden'>
-                                <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={cycle values="kb-table-row-odd,kb-table-row-odd"}>
-                    <td height="34" colspan="4" valign=top >No Information Stored</tr>
-    {/foreach}
-                <tr class=kb-table-row-even>
-                    <td width="32"><img src="img/fitted_-_low_slot.jpg" alt="Fitted - Low slot" border="0"></td>
-                    <td colspan=2 class=kb-table-cell><b>Fitted - Low slot</b></td>
-
-                    <td align="center" class=kb-table-cell><b>Value</b></td>
-                </tr>
-    {foreach from=$low_slot key=k item=i}
-                <tr class=kb-table-row-odd>
-                    <td class=item-icon width="32" height="34"  valign=top>{$i.Icon}</td>
-                    <td class=kb-table-cell>{$i.Name}</td>
-                    <td width="30" align="center">{$i.Quantity}</td>
-                    <td align="center">{$i.Value}</td>
-                </tr>
-        {if $admin=="true"}
-                    <tr class={cycle values="kb-table-row-odd,kb-table-row-odd"}>
-                    <form method=post id="{$value}" name="{$value}" action= >
-                        <td height="34" colspan="3" valign=top >
-                            <div align="right">
-                                Current single Item Value:
-                                <input checked='checked' name='IID' value="{$i.itemID}" type='hidden'>
-                                <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={cycle values="kb-table-row-odd,kb-table-row-odd"}>
-                    <td height="34" colspan="4" valign=top >No Information Stored</tr>
-    {/foreach}
-                <tr class=kb-table-row-even>
-                    <td width="32"><img src="img/drone_bay.jpg" alt="Drone Bay" border="0"></td>
-                    <td colspan=2 class=kb-table-cell><b>Drone Bay</b></td>
-                    <td align="center" class=kb-table-cell><b>Value</b></td>
-                </tr>
-
-    {foreach from=$drones key=k item=i}
-                <tr class=kb-table-row-odd>
-                    <td class=item-icon width="32" height="34"  valign=top>{$i.Icon}</td>
-                    <td class=kb-table-cell>{$i.Name}</td>
-                    <td width="30" align="center">{$i.Quantity}</td>
-                    <td align="center">{$i.Value}</td>
-                </tr>
-        {if $admin=="true"}
-                    <tr class={cycle values="kb-table-row-odd,kb-table-row-odd"}>
-                    <form method=post id="{$value}" name="{$value}" action= >
-                        <td height="34" colspan="3" valign=top >
-                            <div align="right">
-                                Current single Item Value:
-                                <input checked='checked' name='IID' value="{$i.itemID}" type='hidden'>
-                                <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={cycle values="kb-table-row-odd,kb-table-row-odd"}>
-                    <td height="34" colspan="4" valign=top >No Information Stored</tr>
-    {/foreach}
-                <tr class=kb-table-row-even>
-                    <td width="32"><img src="img/cargo.jpg" alt="Drone Bay" border="0"></td>
-                    <td colspan=2 class=kb-table-cell><b>Cargo Bay</b></td>
-                    <td align="center" class=kb-table-cell><b>Value</b></td>
-                </tr>
-    {foreach from=$cargo key=k item=i}
-                <tr class=kb-table-row-odd>
-                    <td class=item-icon width="32" height="34"  valign=top>{$i.Icon}</td>
-                    <td class=kb-table-cell>{$i.Name}</td>
-                    <td width="30" align="center">{$i.Quantity}</td>
-                    <td width="30" align="center">{$i.Value}</td>
-                </tr>
-        {if $admin=="true"}
-                    <tr class=kb-table-row-odd>
-                    <form method=post id="{$value}" name="{$value}" action= >
-                        <td height="34" colspan="3" valign=top >
-                            <div align="right">
-                                Current single Item Value:
-                                <input checked='checked' name='IID' value="{$i.itemID}" type='hidden'>
-                                <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 height="34" colspan="4" valign=top >No Information Stored</tr>
-    {/foreach}
-        {if $item_values=="true"}
+{/if}
+{/foreach}
+{if $item_values}
                 <tr class={cycle name=ccl}>
-                    <td colspan="3" ><div align="right"><strong>Total Module Loss:</strong></div></td>
-                    <td>{$ItemValue}</td>
+                    <td colspan="3"><div align="right"><strong>Total Module Loss:</strong></div></td>
+                    <td align="right">{$ItemValue}</td>
                 </tr>
                 <tr class={cycle name=ccl}>
-                    <td colspan="3" ><div align="right"><strong>Ship Loss:</strong></div></td>
-                    <td>{$ShipValue}</td>
+                    <td colspan="3"><div align="right"><strong>Ship Loss:</strong></div></td>
+                    <td align="right">{$ShipValue}</td>
                 </tr>
                 <tr class={cycle name=ccl}>
-                    <td colspan="3" ><div align="right"><strong>Total Loss:</strong></div></td>
-                    <td>{$TotalLoss}</td>
+                    <td colspan="3"><div align="right"><strong>Total Loss:</strong></div></td>
+                    <td align="right">{$TotalLoss}</td>
                 </tr>
-                {/if}
+{/if}
             </table>
-        {else}
-            <table class=kb-table width=360 border="0" cellspacing="1">
-
-                <tr class=kb-table-row-odd>
-                    <td width="32"><img src="img/fitted_-_high_slot.jpg" alt="Fitted - High slot" border="0"></td>
-                    <td class=kb-table-cell colspan=2><b>Fitted - High slot</b></td>
-                </tr>
-            {foreach from=$high_slot key=k item=i}
-                <tr class=kb-table-row-even>
-                    <td class=item-icon width="32" height="34"  valign=top>{$i.Icon}</td>
-                    <td class=kb-table-cell>{$i.Name}</td>
-                    <td width="30" align="center">{$i.Quantity}</td>
-                </tr>
-            {foreachelse}
-                <tr class=kb-table-row-even>
-                    <td height="34" colspan="3" valign=top >No Information Stored</tr>
-            {/foreach}
-                <tr class=kb-table-row-odd>
-                    <td width="32"><img src="img/fitted_-_medium_slot.jpg" alt="Fitted - Mid slot" border="0"></td>
-                    <td class=kb-table-cell colspan=2><b>Fitted - Mid slot</b></td>
-                </tr>
-            {foreach from=$mid_slot key=k item=i}
-                <tr class=kb-table-row-even>
-                    <td class=item-icon width="32" height="34"  valign=top>{$i.Icon}</td>
-                    <td class=kb-table-cell>{$i.Name}</td>
-                    <td width="30" align="center">{$i.Quantity}</td>
-                </tr>
-            {foreachelse}
-                <tr class=kb-table-row-even>
-                    <td height="34" colspan="3" valign=top >No Information Stored</tr>
-            {/foreach}
-                <tr class=kb-table-row-odd>
-                    <td width="32"><img src="img/fitted_-_low_slot.jpg" alt="Fitted - low slot" border="0"></td>
-                    <td class=kb-table-cell colspan=2><b>Fitted - Low slot</b></td>
-                </tr>
-            {foreach from=$low_slot key=k item=i}
-                <tr class=kb-table-row-even>
-                    <td class=item-icon width="32" height="34"  valign=top>{$i.Icon}</td>
-                    <td class=kb-table-cell>{$i.Name}</td>
-                    <td width="30" align="center">{$i.Quantity}</td>
-                </tr>
-            {foreachelse}
-                <tr class=kb-table-row-even>
-                    <td height="34" colspan="3" valign=top >No Information Stored</tr>
-            {/foreach}
-                <tr class=kb-table-row-odd>
-                    <td width="32"><img src="img/drone_bay.jpg" alt="Drone Bay" border="0"></td>
-                    <td class=kb-table-cell colspan=2><b>Drone Bay</b></td>
-                </tr>
-            {foreach from=$drone key=k item=i}
-                <tr class=kb-table-row-even>
-                    <td class=item-icon width="32" height="34"  valign=top>{$i.Icon}</td>
-                    <td class=kb-table-cell>{$i.Name}</td>
-                    <td width="30" align="center">{$i.Quantity}</td>
-                </tr>
-            {foreachelse}
-                <tr class=kb-table-row-even>
-                    <td height="34" colspan="3" valign=top >No Information Stored</tr>
-            {/foreach}
-                <tr class=kb-table-row-odd>
-                    <td width="32"><img src="img/cargo.jpg" alt="Drone Bay" border="0"></td>
-                    <td class=kb-table-cell colspan=2><b>Cargo Bay</b></td>
-                </tr>
-            {foreach from=$cargo key=k item=i}
-                <tr class=kb-table-row-even>
-                    <td class=item-icon width="32" height="34"  valign=top>{$i.Icon}</td>
-                    <td class=kb-table-cell>{$i.Name}</td>
-                    <td width="30" align="center">{$i.Quantity}</td>
-                </tr>
-            {foreachelse}
-                <tr class=kb-table-row-even>
-                    <td height="34" colspan="3" valign=top >No Information Stored</tr>
-            {/foreach}
-            </table>
-        {/if}
         </td>
     </tr>