Changeset 243

Timestamp:

10/10/07 14:31:28 (15 years ago)

Author:

exi

Message:

Moving config to runtime
Added reinforced management
New icon set with alpha, fixed missing/wrong icons
Changed version to 1.4.0
Added code for handling the new dogma codebase

Location:

branch/rev3

Files:

• common/admin/admin_kill_export.php (modified) (2 diffs)
• common/admin/option_acache.php (added)
• common/admin/option_config.php (added)
• common/admin/option_generic.php (modified) (4 diffs)
• common/includes/class.cache.php (added)
• common/includes/class.config.php (modified) (2 diffs)
• common/includes/class.dogma.php (added)
• common/includes/class.item.php (modified) (10 diffs)
• common/includes/class.kill.php (modified) (5 diffs)
• common/includes/class.killlisttable.php (modified) (2 diffs)
• common/includes/class.page.php (modified) (5 diffs)
• common/includes/class.session.php (modified) (1 diff)
• common/includes/class.toplist.php (modified) (2 diffs)
• common/includes/globals.php (modified) (1 diff)
• common/index.php (modified) (5 diffs)
• common/invtype.php (added)
• common/kill_detail.php (modified) (4 diffs)
• common/login.php (modified) (1 diff)
• img/ships/64_64/20543.png (added)
• img/ships/64_64/24688.png (modified) (previous)
• img/ships/64_64/24690.png (modified) (previous)
• img/ships/64_64/24692.png (modified) (previous)
• img/ships/64_64/24694.png (modified) (previous)
• img/ships/64_64/24696.png (modified) (previous)
• img/ships/64_64/24698.png (modified) (previous)
• img/ships/64_64/24700.png (modified) (previous)
• img/ships/64_64/24702.png (modified) (previous)
• img/ships/64_64/25426.png (added)
• img/ships/64_64/25453.png (added)
• img/ships/64_64/25469.png (added)
• img/ships/64_64/25489.png (added)
• img/ships/64_64/25491.png (added)
• img/ships/64_64/25560.png (added)
• img/ships/64_64/26273.png (added)
• img/ships/64_64/26808.png (added)
• img/ships/64_64/26829.png (added)
• img/ships/64_64/26835.png (added)
• img/ships/64_64/26840.png (added)
• img/ships/64_64/26842.png (added)
• img/ships/64_64/26872.png (added)
• img/ships/64_64/26874.png (added)
• img/ships/64_64/26876.png (added)
• img/ships/64_64/27299.png (added)
• img/ships/64_64/27301.png (added)
• img/ships/64_64/27303.png (added)
• img/ships/64_64/27305.png (added)
• img/ships/64_64/28068.png (added)
• templates/index.tpl (modified) (1 diff)
• templates/invtype_item.tpl (added)
• templates/invtype_ship.tpl (added)
• templates/kill_detail.tpl (modified) (4 diffs)
• templates/killlisttable.tpl (modified) (2 diffs)
• update (added)
• update/update.php (added)

branch/rev3/common/admin/admin_kill_export.php

@@ -11 +11 @@
 if (!$_POST['dir'])
 {
-    $dir = getcwd().'/cache/kill_export';
+    $dir = str_replace('\\','/',getcwd()).'/cache/kill_export';
 }
 if (!$_POST['ext'])
@@ -43 +43 @@
         $ext = $_SESSION['admin_kill_export']['ext'];
     }
-    if (!strstr(stripslashes($dir), stripslashes(getcwd())))
-    {
-        $dir = getcwd().$dir;
+    if (!strstr(stripslashes($dir), stripslashes(str_replace('\\','/',getcwd()))))
+    {
+        $dir = str_replace('\\','/',getcwd()).$dir;
     }
 

branch/rev3/common/admin/option_generic.php

@@ -15 +15 @@
 options::fadd('Enable Comments', 'comments', 'checkbox');
 options::fadd('Require password for Comments', 'comments_pw', 'checkbox');
-options::fadd('Display Comment Count on Killlists', 'comments_count', 'checkbox');
 options::fadd('Display Standings', 'show_standings', 'checkbox');
 options::fadd('Enable Lost Item Values', 'item_values', 'checkbox');
@@ -35 +34 @@
 options::fadd('ReAdd known killmails', 'readd_dupes', 'checkbox');
 
+options::cat('Appearance', 'Generic', 'Killlists');
+options::fadd('Display Comment Count on Killlists', 'comments_count', 'checkbox');
+options::fadd('Display Alliance Logos on killlists', 'killlist_alogo', 'checkbox');
+
 options::cat('Appearance', 'Generic', 'Public-Mode-Beta (Provided by eve-kill.net, the TRUE public KB... *jokeing*)');
 options::fadd('Only Kills in SummaryTables', 'public_summarytable', 'checkbox','','','CORP_ID and ALLIANCE_ID in config.php has to be 0 to work "public"');
@@ -118 +121 @@
         }
         $options[] = array('value' => 'do nothing', 'descr' => 'do nothing', 'state' => $state);
-        
+
         if (config::get('public_stats') == 'remove')
             {
@@ -138 +141 @@
         }
         $options[] = array('value' => 'replace', 'descr' => 'replace (not rdy yet)', 'state' => $state);
-        
+
         return $options;
     }
-    
+
     function dateSelector()
     {

branch/rev3/common/includes/class.config.php

@@ -93 +93 @@
             }
         }
-        $cache[$key] = $value;
+
         if (is_array($value))
         {
+            $cache[$key] = $value;
             $value = serialize($value);
         }
+        else
+        {
+            $cache[$key] = stripslashes($value);
+        }
+        $value = addslashes($value);
 
         $qry = new DBQuery();
@@ -122 +128 @@
             return null;
         }
-        return $cache[$key];
+        return stripslashes($cache[$key]);
     }
 }

branch/rev3/common/includes/class.item.php

@@ -1 +1 @@
 <?php
-require_once("db.php");
+require_once('db.php');
+
+define('DGM_TECHLEVEL', 422);
 
 class Item
@@ -7 +9 @@
     {
         $this->id_ = $id;
-        $this->qry_ = new DBQuery();
     }
 
@@ -18 +19 @@
     {
         $this->execQuery();
+        if (DB_USE_CCP)
+        {
+            return $this->row_['typeName'];
+        }
         return $this->row_['itm_name'];
     }
@@ -26 +31 @@
         global $smarty;
 
-        // slot 6 is dronebay
-        if ($this->row_['itt_slot'] == 6)
+        // cat 18 are combat drones
+        if ($this->row_['itt_cat'] == 18)
         {
             $img = IMG_URL.'/drones/'.$size.'_'.$size.'/'.$this->row_['itm_externalid'].'.png';
+        }
+        // cat 6 are ships (destroyed in cargo)
+        elseif ($this->row_['itt_cat'] == 6)
+        {
+            $img = IMG_URL.'/ships/'.$size.'_'.$size.'/'.$this->row_['itm_externalid'].'.png';
         }
         else
@@ -47 +57 @@
         else
         {
-            $icon= IMG_URL.'/items/32_32/blank.gif';
+            $icon = IMG_URL.'/items/32_32/blank.gif';
         }
 
@@ -63 +73 @@
     function execQuery()
     {
+        if (!isset($this->qry_))
+        {
+            $this->qry_ = new DBQuery();
+        }
+
         if (!$this->qry_->executed_)
         {
@@ -73 +88 @@
                            left join kb3_item_types on itm_type = itt_id
                                where itm_id = '".$this->id_."'";
+
+            if (DB_USE_CCP)
+            {
+                    // new
+                $this->sql_ = "select inv.*, kb3_item_types.*, dga.value as techlevel, itp.price
+                               from kb3_invtypes inv
+                               left join kb3_dgmtypeattributes dga on dga.typeID=inv.typeID and dga.attributeID=".DGM_TECHLEVEL."
+                               left join kb3_item_price itp on itp.typeID=inv.typeID
+                               left join kb3_item_types on groupID=itt_id
+                                   where inv.typeID = '".$this->id_."'";
+            }
             $this->qry_->execute($this->sql_);
             $this->row_ = $this->qry_->getRow();
+            if (DB_USE_CCP)
+            {
+                $this->row_['itm_icon'] = $this->row_['icon'];
+                $this->row_['itm_techlevel'] = $this->row_['techlevel'];
+                $this->row_['itm_externalid'] = $this->row_['typeID'];
+                $this->row_['itm_value'] = $this->row_['price'];
+            }
         }
     }
@@ -82 +115 @@
         $name = trim($name);
         $qry = new DBQuery();
-        $qry->execute("select * from kb3_items itm
-                        where itm_name = '".slashfix($name)."'");
+        $query = "select * from kb3_items itm
+                        where itm_name = '".slashfix($name)."'";
+        if (DB_USE_CCP)
+        {
+            $query = "select *,typeID as itm_id from kb3_invtypes itm
+                        where typeName = '".slashfix($name)."'";
+        }
+        $qry->execute($query);
         $row = $qry->getRow();
         if (!isset($row['itm_id']))
         {
-            if (config::get('adapt_items'))
+            if (config::get('adapt_items') && DB_USE_CCP !== true)
             {
                 // if the item is a tec2 we likely have the tec1
@@ -110 +149 @@
                 $row['itm_id'] = $qry->getInsertID();
             }
+            else
+            {
+                // that item doesnt exist or is mispelled
+                return false;
+            }
         }
         $this->id_ = $row['itm_id'];
@@ -117 +161 @@
     {
         $qry = new DBQuery();
-        $qry->execute("select *
+        $query = "select *
                         from kb3_items
-                        where itm_name = '".slashfix($name)."'");
+                        where itm_name = '".slashfix($name)."'";
+        if (DB_USE_CCP)
+        {
+            $query = "select *,typeID as itm_id
+                        from kb3_items
+                        where typeName = '".slashfix($name)."'";
+        }
+        $qry->execute($query);
 
         $row = $qry->getRow();

branch/rev3/common/includes/class.kill.php

@@ -386 +386 @@
             }
             // destroyed items
-            $sql = "select sum( itd.itd_quantity ) as itd_quantity, itd_itm_id,
-                    itd_itl_id, itl_location
-                    from kb3_items_destroyed itd, kb3_items itm,
-                    kb3_item_locations itl
+            $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_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()."
-                    and itd.itd_itm_id = itm.itm_id
-                    and ( itd.itd_itl_id = itl.itl_id or (itd.itd_itl_id = 0 and itl.itl_id = 1))
                     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())
@@ -730 +739 @@
             $item = $dest->getItem();
             $loc_id = $dest->getLocationID();
-            if (!is_numeric($item->getID()) || !is_numeric($item->getID()) || !is_numeric($dest->getQuantity()) || !is_numeric($loc_id))
+            if (!is_numeric($this->getID()) || !is_numeric($item->getID()) || !is_numeric($dest->getQuantity()) || !is_numeric($loc_id))
             {
                 trigger_error('error with destroyed item.', E_USER_WARNING);
@@ -744 +753 @@
 
         // call the event that we added this mail
-        event::call('killmail_added', &$this);
+        event::call('killmail_added', $this);
         return $this->id_;
     }
@@ -753 +762 @@
             return;
 
-        event::call('killmail_delete', &$this);
+        event::call('killmail_delete', $this);
 
         $qry = new DBQuery();
@@ -843 +852 @@
 
         function getValue()
-        //returns the value of an item
         {
+            if (DB_USE_CCP)
+            {
+            $qry = new DBQuery();
+            $qry->execute("select basePrice, price from kb3_invtypes left join kb3_item_price using (typeID) where typeID='".$this->item_->getID()."'");
+            if ($row = $qry->getRow())
+            {
+                if ($row['price'])
+                {
+                    return $row['price'];
+                }
+                return $row['basePrice'];
+            }
+            return 0;
+            }
+
+        //returns the value of an item
                 $value = 0;                             // Set 0 value incase nothing comes back
                 $id = $this->item_->getID(); // get Item ID

branch/rev3/common/includes/class.killlisttable.php

@@ -40 +40 @@
         }
 
-
         while ($kill = $this->kill_list_->getKill())
         {
@@ -76 +75 @@
             $kll['systemsecurity'] = $kill->getSolarSystemSecurity();
             $kll['timestamp'] = $kill->getTimeStamp();
+            if (config::get('killlist_alogo'))
+            {
+                $kll['victimallianceicon'] = preg_replace('/[^a-zA-Z0-9]/', '', $kll['victimalliancename']);
+                $kll['allianceexists'] = file_exists('img/alliances/'.$kll['victimallianceicon'].'.png');
+            }
+
             if (isset($kill->_tag))
             {

branch/rev3/common/includes/class.page.php

@@ -10 +10 @@
                         config::set('public_stats','do nothing');
                 }
-        
+
         $this->title_ = $title;
         $this->admin_ = false;
@@ -22 +22 @@
         $this->cachable_ = $cachable;
         $this->cachetime_ = 5;
-        
-        // if you have probs with missing tables uncomment this and 
+
+        // if you have probs with missing tables uncomment this and
                 // require_once('common/includes/autoupgrade.php');
         // check_navigationtable();
@@ -79 +79 @@
             }
             $smarty->assign('banner', $banner);
-                        
+
             $nav = new Navigation();
             $nav->setSite($_GET['a']);
             $menu = $nav->generateMenu();
             $w = floor(100 / count($menu->get()));
-            
+
             $smarty->assign('menu_w',$w.'%');
             $smarty->assign('menu', $menu->get());
@@ -107 +107 @@
         }
         $smarty->assign('context_html', $this->contexthtml_);
+        event::call('smarty_displayindex', $smarty);
         $smarty->display(get_tpl('index'));
     }
@@ -160 +161 @@
         $this->cachetime_ = $cachetime;
     }
-     
+
 }
 

branch/rev3/common/includes/class.session.php

@@ -1 +1 @@
 <?php
 
-class Session
+class session
 {
     function init()

branch/rev3/common/includes/class.toplist.php

@@ -885 +885 @@
     {
         $sql = "select count(*) as cnt, ind.ind_wep_id as itm_id
-              from kb3_inv_detail ind
-              inner join kb3_items itm on ( itm_id = ind.ind_wep_id )";
+                from kb3_inv_detail ind
+                    inner join kb3_items itm on (itm_id = ind.ind_wep_id)";
+        if (DB_USE_CCP)
+        {
+            $sql = "select count(*) as cnt, ind.ind_wep_id as itm_id
+                      from kb3_inv_detail ind
+                      inner join kb3_invtypes itm on (typeID = ind.ind_wep_id)";
+        }
 
         if ($this->invplt_)
@@ -907 +913 @@
 
         $this->setSQLTop($sql);
+        if (DB_USE_CCP)
+        {
+            // since ccps database doesnt have icons for ships this will also fix the ship as weapon bug
+            $this->setSQLBottom(" and itm.icon != ''
+                                  and itm.typeName != 'Unknown'
+                                  group by ind.ind_wep_id order by 1 desc limit 20");
+        }
+        else
         $this->setSQLBottom(" and itm.itm_icon not in ( '1', 'icon_null' )
                              and itm.itm_name != 'Unknown'
-                             group by ind.ind_wep_id order by 1 desc
-                             limit 20");
+                             group by ind.ind_wep_id order by 1 desc limit 20");
     }
 }

branch/rev3/common/includes/globals.php

@@ -6 +6 @@
 // current version: major.minor.sub
 // unpair numbers for minor = development version
-define('KB_VERSION', '1.3.0 (Tigerduck Memorial Edition)');
+define('KB_VERSION', '1.4.0 (Revelations 3)');
 
 // set the running-server for id-syncs here

branch/rev3/common/index.php

@@ -31 +31 @@
 require_once('common/includes/class.user.php');
 require_once('common/includes/class.session.php');
+require_once('common/includes/class.cache.php');
 require_once('common/includes/class.involvedloader.php');
 require_once('common/smarty/Smarty.class.php');
@@ -59 +60 @@
 }
 
-// killboard is instantiated by class::Page
-//$killboard = new Killboard(KB_SITE);
-
 // load the config from the database
 $config = new Config(KB_SITE);
+define('KB_HOST', config::get('cfg_kbhost'));
+define('MAIN_SITE', config::get('cfg_mainsite'));
+define('STYLE_URL', config::get('cfg_style'));
+define('COMMON_URL', config::get('cfg_common'));
+define('IMG_URL', config::get('cfg_img'));
+define('DB_HALTONERROR', (bool)config::get('cfg_sqlhalt'));
+define('DB_USE_QCACHE', (bool)config::get('cfg_qcache'));
+define('KB_TITLE', config::get('cfg_kbtitle'));
+
+// corporation OR alliance id
+if (config::get('cfg_corpid'))
+{
+    define('CORP_ID', config::get('cfg_corpid'));
+    define('ALLIANCE_ID', 0);
+}
+else
+{
+    define('CORP_ID', 0);
+    define('ALLIANCE_ID', config::get('cfg_allianceid'));
+}
+if (!$dir = config::get('cache_dir'))
+{
+    $dir = 'cache/data';
+}
+define('KB_CACHEDIR', $dir);
 
 // setting up smarty and feed it with some config
@@ -79 +102 @@
 
 // start session management
-Session::init();
+session::init();
+
+// reinforced management
+if (config::get('auto_reinforced'))
+{
+    // first check if we are in reinforced
+    if (config::get('is_reinforced'))
+    {
+        // every 1/x request we check for disabling RF
+        if (rand(1, config::get('reinforced_rf_prob')) == 1)
+        {
+            cache::checkLoad();
+        }
+    }
+    else
+    {
+        // reinforced not active
+        // check for load and activate reinforced if needed
+        if (rand(1, config::get('reinforced_prob')) == 1)
+        {
+            cache::checkLoad();
+        }
+    }
+}
 
 // this is to make sure that smarty is able to create output
@@ -134 +180 @@
 }
 
-if (KB_CACHE == 1 && count($_POST) == 0 && !in_array($page, $cacheignore))
-{
-    $docache = true;
-}
-else
-{
-    $docache = false;
-}
-
-if ($docache)
-{
-    if (!file_exists(KB_CACHEDIR.'/'.KB_SITE))
-    {
-        @mkdir(KB_CACHEDIR.'/'.KB_SITE);
-    }
-
-    if ($cachetimes[$page])
-    {
-        $cachetime = $cachetimes[$page];
-    }
-    else
-    {
-        $cachetime = 5;
-    }
-
-    $cachetime = $cachetime * 60;
-
-    $cachefile = KB_CACHEDIR.'/'.KB_SITE.'/'.md5($_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']).'.cache';
-    $timestamp = ((@file_exists($cachefile))) ? @filemtime($cachefile) : 0;
-
-    if (time() - $cachetime < $timestamp)
-    {
-        ob_start('ob_gzhandler');
-        @readfile($cachefile);
-        ob_end_flush();
-        exit();
-    }
-
-    ob_start();
-}
-
+cache::check($page);
 if ($settingsPage)
 {
-    if (!Session::isAdmin())
+    if (!session::isAdmin())
     {
         header('Location: ?a=login');
@@ -195 +201 @@
 }
 
-if ($docache)
-{
-    $fp = @fopen($cachefile, 'w');
-    @fwrite($fp, ob_get_contents());
-    @fwrite($fp, '<!-- Generated from cache -->');
-    @fclose($fp);
-    ob_end_flush();
-}
+cache::generate();
 ?>

branch/rev3/common/kill_detail.php

@@ -69 +69 @@
     $involved[$i]['AlliName'] = $alliance->getName();
     $involved[$i]['ShipName'] = $ship->getName();
+    $involved[$i]['ShipID'] = $ship->externalid_;
 
     if ($pilot->getID() == $kill->getFBPilotID())
@@ -89 +90 @@
 
     if ($weapon->getName() != "Unknown" && $weapon->getName() != $ship->getName())
+    {
         $involved[$i]['weaponName'] = $weapon->getName();
+        $involved[$i]['weaponID'] = $weapon->row_['itm_externalid'];
+    }
     else
         $involved[$i]['weaponName'] = "Unknown";
@@ -110 +114 @@
 $smarty->assign('ShipImage', $ship->getImage(64));
 $smarty->assign('ShipName', $ship->getName());
+$smarty->assign('ShipID', $ship->externalid_);
 $smarty->assign('ClassName', $shipclass->getName());
 
@@ -224 +229 @@
 }
 
-//Admin is able to see classsiefied systems 
+//Admin is able to see classsiefied systems
 if ((!$kill->isClassified()) || ($page->isAdmin()))
 {

branch/rev3/common/login.php

@@ -6 +6 @@
     if ($_POST['usrlogin'] == '' && $_POST['usrpass'] == ADMIN_PASSWORD)
     {
-        Session::create(true);
+        session::create(true);
 
         header('Location: ?a=admin');

branch/rev3/templates/index.tpl

@@ -33 +33 @@
 </div>
 {include file="menu.tpl"}
+{if $message}
+<table class="navigation" width="100%" height="25" border="0" cellspacing="1">
+<tr class="kb-table-row-odd">
+<td align="center"><b>{$message}</b></td>
+</tr>
+</table>
+{/if}
 <div id="page-title">{$page_title}</div>
 <table cellpadding="0" cellspacing="0" width="100%" border="0">

branch/rev3/templates/kill_detail.tpl

@@ -22 +22 @@
                 <tr class={cycle name=ccl}>
                     <td rowspan=5 width="64"><img {if $i.FB == "true"}class=finalblow{/if} src="{$i.portrait}" border="0"></td>
-                    <td rowspan=5 width="64"><img  {if $i.FB == "true"}class=finalblow{/if} src="{$i.shipImage}" border="0"></td>
+                    <td rowspan=5 width="64"><img {if $i.FB == "true"}class=finalblow{/if} src="{$i.shipImage}" border="0"></td>
                     <td class=kb-table-cell style="padding-top: 1px; padding-bottom: 1px;"><a href="{$i.PilotURL}">{$i.PilotName}</a></td>
                 </tr>
@@ -32 +32 @@
                 </tr>
                 <tr class={cycle name=ccl}>
-                    <td class=kb-table-cell style="padding-top: 1px; padding-bottom: 1px;"><b>{$i.ShipName}</b></td>
+                    <td class=kb-table-cell style="padding-top: 1px; padding-bottom: 1px;"><b><a href="?a=invtype&id={$i.ShipID}">{$i.ShipName}</a></b></td>
                 </tr>
                 <tr class={cycle name=ccl}>
-                    <td class=kb-table-cell style="padding-top: 1px; padding-bottom: 1px;">{$i.weaponName}</td>
+                    <td class=kb-table-cell style="padding-top: 1px; padding-bottom: 1px;">{if $i.weaponID}<a href="?a=invtype&id={$i.weaponID}">{$i.weaponName}</a>{else}{$i.weaponName}{/if}</td>
                 </tr>
 {/foreach}
@@ -46 +46 @@
                     <td width="64" heigth="64" rowspan=3><img src="{$VictimShipImg}" width="64" heigth="64"></td>
                     <td class=kb-table-cell><b>Ship:</b></td>
-                    <td class=kb-table-cell><b>{$ShipName}</b> ({$ClassName})</td>
+                    <td class=kb-table-cell><b><a href="?a=invtype&id={$ShipID}">{$ShipName}</a></b> ({$ClassName})</td>
                 </tr>
                 <tr class={cycle name=ccl}>
@@ -73 +73 @@
                 <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 class="kb-table-cell"><a href="?a=invtype&id={$i.itemID}">{$i.Name}</a></td>
                     <td width="30" align="center">{$i.Quantity}</td>
         {if $config->get('item_values')}

branch/rev3/templates/killlisttable.tpl

@@ -6 +6 @@
     <tr class="kb-table-header">
         <td class="kb-table-header" colspan="2" align="center">Ship type</td>
-        <td class="kb-table-header">Victim</td>
+        <td class="kb-table-header"{if $config->get('killlist_alogo')} colspan="2"{/if}>Victim</td>
         <td class="kb-table-header">Final blow</td>
         <td class="kb-table-header" align="center">System</td>
@@ -21 +21 @@
         <td width="32" align="center"><img src="{$k.victimshipimage}" border="0" width="32" heigth="32"></td>
         <td height="34" width=150 valign="middle"><div class="kb-shiptype"><b>{$k.victimshipname}</b><br>{$k.victimshipclass}</div><div class="kb-shipicon"><img src="{$k.victimshipindicator}" border="0"></div></td>
+        {if $config->get('killlist_alogo')}
+            {if $k.allianceexists}
+            <td width="32" align="center"><img src="{$img_url}/alliances/{$k.victimallianceicon}.png" border="0" width="32" height="32"></td>
+            {elseif $k.victimalliancename != "None"}
+            <td width="32" align="center"><img src="{$img_url}/alliances/default.gif" border="0" width="32" height="32"></td>
+            {else}
+            <td width="32" align="center">&nbsp;</td>
+            {/if}
+        {/if}
         <td width="200" class="kb-table-cell"><b>{$k.victim}</b><br/>{$k.victimcorp|truncate:30}</td>
         <td width="200" class="kb-table-cell"><b>{$k.fb}</b><br>{$k.fbcorp|truncate:30}</td>