Changeset 314

Show
Ignore:
Timestamp:
01/21/08 11:19:44 (12 years ago)
Author:
ralle030583
Message:

DB Update003 : Warefare Links fixed from mid to highslot
Ticket #71 : Kill_detail.tpl Slot,Destroyed,Dropped items has own table-row styles in the style.css's
Ticket #70 : KB_VERSION not a number
Ticket #69 : Update Portrait Update
Ticket #68 : possibility to disabe out of game posting
Ticket #64 : Problem with IGB links when KB not in web root

Location:
dev
Files:
1 removed
18 modified

Legend:

Unmodified
Added
Removed
  • dev/common/about.php

    r297 r314  
    2222// Please leave the information on the next line as is so that other people can easily find the EVE-Dev website. 
    2323// Remember to share any modifications to the EVE-Dev Killboard. 
    24 $html .= "This is the EVE Development Network Killboard running version ".KB_VERSION." rev ".SVN_REV.", created for <a href=\"http://www.eve-online.com/\">EVE Online</a> corporations and alliances. Based on the EVE-Killboard created by rig0r, it is now developed and maintained by the <a href=\"http://www.eve-dev.net/\">EVE-Dev</a> group.<br/>" 
     24$html .= "This is the EVE Development Network Killboard running version ".KB_VERSION." ".KB_RELEASE." rev ".SVN_REV.", created for <a href=\"http://www.eve-online.com/\">EVE Online</a> corporations and alliances. Based on the EVE-Killboard created by rig0r, it is now developed and maintained by the <a href=\"http://www.eve-dev.net/\">EVE-Dev</a> group.<br/>" 
    2525        ."All EVE graphics and data used are property of <a href=\"http://www.ccpgames.com/\">CCP</a>.<br/><br/>"; 
    2626$html .= '<a href="http://www.eve-dev.net/" target="_blank"><img src="http://www.eve-dev.net/e107_images/evedev_button.png" border="0"/></a><br/><br/>'; 
  • dev/common/admin/admin.php

    r239 r314  
    2121    if ($_REQUEST['sub'] == 'Generic' && $_REQUEST['field'] == 'Appearance') 
    2222    { 
    23         $page->setTitle('Administration - Generic (Current version: '.KB_VERSION.' Build '.SVN_REV.')'); 
     23        $page->setTitle('Administration - Generic (Current version: '.KB_VERSION.' '.KB_RELEASE.' Build '.SVN_REV.')'); 
    2424    } 
    2525    $page->generate(); 
  • dev/common/admin/option_generic.php

    r289 r314  
    3030options::fadd('Disallow any killmails before', 'filter_date', 'custom', array('admin_generic', 'dateSelector'), array('admin_generic', 'postDateSelector')); 
    3131options::fadd('Forbid posting', 'post_forbid', 'checkbox'); 
     32options::fadd('Forbid out of game posting', 'post_oog_forbid', 'checkbox'); 
    3233options::fadd('Enable auto-addition of unknown Items', 'adapt_items', 'checkbox'); 
    3334options::fadd('ReAdd known killmails', 'readd_dupes', 'checkbox'); 
  • dev/common/includes/autoupgrade.php

    r312 r314  
    1212define(CURRENT_DB_UPDATE,config::get("DBUpdate")); 
    1313//Update version of this autoupgrade.php 
    14 define(LASTEST_DB_UPDATE,"002"); 
     14define(LASTEST_DB_UPDATE,"003"); 
    1515 
    1616function updateDB(){ 
     
    1919                update001(); 
    2020                update002(); 
     21                update003(); 
    2122        } 
    2223} 
     
    8081} 
    8182 
     83function update003(){ 
     84        // Warefare Links and Command Prozessor were midslot items in install file, should be high slot 
     85        if (CURRENT_DB_UPDATE < "003" ) 
     86        { 
     87                require_once("common/includes/class.item.php"); 
     88                $WarfareLinkGroup  =  item::get_group_id("Skirmish Warfare Link - Rapid Deployment"); 
     89                update_slot_of_group($WarfareLinkGroup,2,1); 
     90                config::set("DBUpdate","003");   
     91        } 
     92} 
     93 
    8294function update_slot_of_group($id,$oldSlot = 0 ,$newSlot){ 
    8395        $qry  = new DBQuery(); 
  • dev/common/includes/globals.php

    r313 r314  
    11<?php 
    22// current subversion revision 
    3 preg_match('/\$Re'.'vision: (.*?) \$/', '$Revision: 313 $', $match); 
     3preg_match('/\$Re'.'vision: (.*?) \$/', '$Revision: 314 $', $match); 
    44define('SVN_REV', $match[1]); 
    55 
    66// current version: major.minor.sub 
    77// unpair numbers for minor = development version 
    8 define('KB_VERSION', '1.4.0 (Trinity)'); 
     8define('KB_VERSION', '1.4.0'); 
     9define('KB_RELEASE', '(Trinity)'); 
    910 
    1011// set the running-server for id-syncs here 
  • dev/common/portrait_grab.php

    r230 r314  
    11<?php 
     2/* ex: set ts=4: set sw=4: set expandtab */ 
    23require_once('common/includes/class.pilot.php'); 
    34require_once('common/includes/class.corp.php'); 
    45require_once('common/includes/class.alliance.php'); 
     6define('IS_IMG_MAX', 256); 
    57 
    68$page = new Page('Capture portrait'); 
     
    2325    { 
    2426        $now = date('Y-m-d H:m:s'); 
    25  
    2627        $alliance = new Alliance(); 
    2728        $all_id = $alliance->add($_SERVER['HTTP_EVE_ALLIANCENAME']); 
     
    3233        $id = intval($_SERVER['HTTP_EVE_CHARID']); 
    3334        $pilot->setCharacterID($id); 
    34         @unlink("cache/portraits/".$id."_32.jpg"); 
    35         @unlink("cache/portraits/".$id."_64.jpg"); 
    36         @unlink("cache/portraits/".$id."_128.jpg"); 
    37         @unlink("cache/portraits/".$id."_256.jpg"); 
    38         @unlink("cache/portraits/".$id."_512.jpg"); 
    39         $html .= "<img src=\"".$pilot->getPortraitURL(64)."\" border=\"0\">"; 
    40         $html .= "Character portrait updated !<br>"; 
    41         $html .= "<a href=\"?a=igb\">Return</a><br>"; 
    42     } 
     35                if (file_exists("cache/portraits/".$id."_256.jpg") && 1 == $_REQUEST['force'])  
     36                { 
     37                        // Remove just in case. 
     38                        @unlink("cache/portraits/".$id."}_32.jpg"); 
     39                    @unlink("cache/portraits/".$id."_64.jpg"); 
     40                        @unlink("cache/portraits/".$id."_128.jpg"); 
     41                        @unlink("cache/portraits/".$id."_256.jpg"); 
     42                        if (0 == create_portraits($id)) 
     43                        { 
     44                                $message = "Character portrait uploaded."; 
     45                        } 
     46                        else 
     47                        { 
     48                                $message = "Character portrait update failed."; 
     49                        } 
     50                } 
     51                elseif (file_exists("cache/portraits/".$id."_256.jpg")) 
     52                { 
     53                        $message = "Character portrait not updated, as it already exists. <a href='".KB_HOST."?a=portrait_grab&force=1'>Click</a> to force an update."; 
     54                } 
     55                else 
     56                { 
     57                        if (0 == create_portraits($id)) 
     58                        { 
     59                                $message = "Character portrait uploaded."; 
     60                        } 
     61                        else 
     62                        { 
     63                                $message = "Character portrait update failed."; 
     64                        } 
     65                         
     66        } 
     67        $html .= "<img src='".$pilot->getPortraitURL(64)."' border='0' />"; 
     68        $html .= "<br />$message <br />$port_error_msg <br />"; 
     69        $html .= "<a href='".KB_HOST."?a=igb'>Return</a> to the killboard.<br />"; 
     70        } 
    4371} 
    4472 
     
    4775$page->setContent($html); 
    4876$page->generate(); 
     77 
     78function create_portraits($id) { 
     79        global $port_error_msg; 
     80        if (1 != ini_get('allow_url_fopen')) { 
     81                $port_error_msg = 'This web host does not allow PHP to create HTTP connections.  Check allow_url_fopen.'; 
     82                return -99; 
     83        } 
     84        if (! is_writable('cache/portraits/')) { 
     85                $port_error_msg = 'The portraits directory is not writable.  Please fix this.'; 
     86                return -99; 
     87        } 
     88 
     89        $img = @imagecreatefromjpeg("http://img.eve.is/serv.asp?s=".IS_IMG_MAX."&c=".$id); 
     90        if ($img) 
     91        { 
     92                $dims = array (32, 64, 128); 
     93                foreach ($dims as $dim) { 
     94                        $newimg = @imagecreatetruecolor($dim,$dim); 
     95                        @imagecopyresampled($newimg, $img, 0,0,0,0,$dim,$dim,IS_IMG_MAX,IS_IMG_MAX); 
     96                        @imagejpeg($newimg, "cache/portraits/".$id."_".$dim.".jpg"); 
     97                } 
     98                @imagejpeg($img, "cache/portraits/" . $id . "_256.jpg"); 
     99                $return = 0; 
     100        } 
     101        else 
     102        { 
     103                $port_error_msg = 'Attempting to create an image failed, and it was not because the directory was not writable.'; 
     104                $return = -99; 
     105        } 
     106        return $return; 
     107} 
    49108?> 
  • dev/common/post.php

    r213 r314  
    104104    } 
    105105} 
    106 elseif (!config::get('post_forbid')) 
     106elseif (!config::get('post_forbid') && !config::get('post_oog_forbid')) 
    107107{ 
    108108    $html .= "Paste the killmail from your EVEMail inbox into the box below. Make sure you post the <b>ENTIRE</b> mail.<br>Posting fake or otherwise edited mails is not allowed. All posts are logged."; 
     
    120120else 
    121121{ 
    122     $html .= 'Posting killmails is disabled<br/>'; 
     122        if (config::get('post_oog_forbid')) 
     123        { 
     124                $html .= 'Out of game posting is disabled, please use the ingame browser.<br/>'; 
     125        } 
     126        else 
     127        { 
     128                $html .= 'Posting killmails is disabled<br/>'; 
     129        } 
    123130} 
    124131 
  • dev/mods/fitting/kill_detail.tpl

    r311 r314  
    100100{* set to true to show empty slots *} 
    101101{if $destroyed.$slotindex or $dropped.$slotindex} 
    102                 <tr class="kb-table-row-even"> 
     102                <tr class="kb-table-row-slot"> 
    103103                    <td class="item-icon" width="32"><img width="32" height="32" src="{$img_url}/{$slot.img}" alt="{$slot.text}" border="0"></td> 
    104104                    <td colspan="2" class="kb-table-cell"><b>{$slot.text}</b> </td> 
     
    108108                </tr> 
    109109    {foreach from=$destroyed.$slotindex item=i} 
    110                 <tr class="kb-table-row-odd"> 
     110                <tr class="kb-table-row-destroyed"> 
    111111                    <td class="item-icon" width="32" height="34" valign="top"><a href="?a=invtype&id={$i.itemID}">{$i.Icon}</a></td> 
    112112                    <td class="kb-table-cell">{$i.Name}</td> 
     
    147147    {/foreach} 
    148148    {foreach from=$dropped.$slotindex item=i} 
    149                 <tr class="kb-table-row-odd" style="background-color: green;"> 
     149                <tr class="kb-table-row-dropped"> 
    150150                    <td style="border: 1px solid green;" width="32" height="34" valign="top"><a href="?a=invtype&id={$i.itemID}">{$i.Icon}</a></td> 
    151151                    <td class="kb-table-cell">{$i.Name}</td> 
  • dev/mods/history/about.php

    r296 r314  
    77$developer = array('exi (Lead Developer)', 
    88                   'knifee (Developer)', 
     9                   'Ralle030583 (Developer)' 
    910                   'Andrew Gunn (Siteadmin)', 
    1011                   'Ganja (Fluff girl)'); 
     
    1213$contributor = array('JaredC01', 
    1314                     'liquidism', 
    14                      'ralle030583', 
    1515                     'Mitchman', 
    1616                     'Coni', 
     
    2222// Please leave the information on the next line as is so that other people can easily find the EVE-Dev website. 
    2323// Remember to share any modifications to the EVE-Dev Killboard. 
    24 $html .= "This is the EVE Development Network Killboard running version ".KB_VERSION." rev ".SVN_REV.", created for <a href=\"http://www.eve-online.com/\">EVE Online</a> corporations and alliances. Based on the EVE-Killboard created by rig0r, it is now developed and maintained by the <a href=\"http://www.eve-dev.net/\">EVE-Dev</a> group.<br/>" 
     24$html .= "This is the EVE Development Network Killboard running version ".KB_VERSION." ".KB_RELEASE." rev ".SVN_REV.", created for <a href=\"http://www.eve-online.com/\">EVE Online</a> corporations and alliances. Based on the EVE-Killboard created by rig0r, it is now developed and maintained by the <a href=\"http://www.eve-dev.net/\">EVE-Dev</a> group.<br/>" 
    2525        ."All EVE graphics and data used are property of <a href=\"http://www.ccpgames.com/\">CCP</a>.<br/><br/>"; 
    2626$html .= '<a href="http://www.eve-dev.net/" target="_blank"><img src="http://www.eve-dev.net/e107_images/evedev_button.png" border="0"/></a><br/><br/>'; 
  • dev/mods/history/history.xml

    r313 r314  
    22<history> 
    33        <changeset> 
     4                <rev>314</rev> 
     5                <author>ralle030583</author> 
     6                <date>21.01.2008</date> 
     7                <comment> 
     8                        <type>FIX</type> 
     9                        <text> 
     10                                DB Update003: Warefare Links fixed from mid to highslot 
     11                        </text> 
     12                </comment> 
     13                <comment> 
     14                        <type>ADD</type> 
     15                        <text> 
     16                                Ticket #71 Kill_detail.tpl Slot,Destroyed,Dropped items has own table-row styles in the style.css's) 
     17                        </text> 
     18                </comment> 
     19                <comment> 
     20                        <type>FIX</type> 
     21                        <text> 
     22                                Ticket #70 (KB_VERSION not a number) 
     23                        </text> 
     24                </comment> 
     25                <comment> 
     26                        <type>FIX</type> 
     27                        <text> 
     28                                Ticket #69 (Update Portrait Update) 
     29                        </text> 
     30                </comment> 
     31                <comment> 
     32                        <type>ADD</type> 
     33                        <text> 
     34                                Ticket #68 (possibility to disabe out of game posting) 
     35                        </text> 
     36                </comment> 
     37                <comment> 
     38                        <type>FIX</type> 
     39                        <text> 
     40                                Ticket #64 (Problem with IGB links when KB not in web root) 
     41                        </text> 
     42                </comment> 
     43        </changeset> 
     44        <changeset> 
    445                <rev>313</rev> 
    546                <author>ralle030583</author> 
     
    3677                <comment> 
    3778                        <type>FIX</type> 
    38                         <text>for Ticket 62</text> 
     79                        <text>Ticket 62 (Update items value for dropped items)</text> 
    3980                </comment> 
    4081                <comment> 
  • dev/mods/ingame_mod/igb.php

    r286 r314  
    3434                $html .= $kill->getSolarSystemName() ."(".roundsec($kill->getSolarSystemSecurity()).")"; 
    3535                $html .= "</td><td>"; 
    36                 $html .= "<a href=index.php?a=igb_kill_mail&kll_id=".$kill->getID().">Mail</a>"; 
     36                $html .= "<a href=\"".KB_HOST."?a=igb_kill_mail&kll_id=".$kill->getID()."\">Mail</a>"; 
    3737                $html .= "</td></tr>"; 
    3838        } 
     
    4242 
    4343$html .= "<html><head><title>IGB Killboard</title></head><body>"; 
    44 $html .= "<a href=\"?a=post_igb\">Post killmail</a> | <a href=\"?a=portrait_grab\">Update portrait</a> | <a href=\"?a=igb&mode=kills\">Kills</a> | <a href=\"?a=igb&mode=losses\">Losses</a><br>"; 
     44$html .= "<a href=\"".KB_HOST."?a=post_igb\">Post killmail</a> | <a href=\"".KB_HOST."?a=portrait_grab\">Update portrait</a> | <a href=\"".KB_HOST."?a=igb&mode=kills\">Kills</a> | <a href=\"".KB_HOST."?a=igb&mode=losses\">Losses</a><br>"; 
    4545$html .= "<table width=\"100%\" border=1>"; 
    4646$html .= "<tr><td>Ship</td><td>Victim</td><td>Final Blow</td><td>Date/Time</td><td>System</td><td>Raw Mail</td></tr>"; 
  • dev/mods/ingame_mod/igb_kill_mail.php

    r286 r314  
    55 
    66$html .= "<html><head><title>IGB Killboard</title></head><body>"; 
    7 $html .= "<a href=\"?a=post_igb\">Post killmail</a> | <a href=\"?a=portrait_grab\">Update portrait</a> | <a href=\"?a=igb&mode=kills\">Kills</a> | <a href=\"?a=igb&mode=losses\">Losses</a><br><br>"; 
     7$html .= "<a href=\"".KB_HOST."?a=post_igb\">Post killmail</a> | <a href=\"".KB_HOST."?a=portrait_grab\">Update portrait</a> | <a href=\"".KB_HOST."?a=igb&mode=kills\">Kills</a> | <a href=\"".KB_HOST."?a=igb&mode=losses\">Losses</a><br><br>"; 
    88 
    99$kill = new Kill($kll_id); 
  • dev/style/blue/style.css

    r191 r314  
    213213{ 
    214214  background: #222222; 
     215} 
     216 
     217.kb-table-row-slot 
     218{ 
     219  background: #292929; 
     220} 
     221 
     222.kb-table-row-destroyed  
     223{  
     224  background: #222222;  
     225}  
     226  
     227.kb-table-row-dropped  
     228{  
     229  background: green;  
    215230} 
    216231 
  • dev/style/darkred/style.css

    r232 r314  
    223223{ 
    224224  background: #350000; 
     225} 
     226 
     227.kb-table-row-slot 
     228{ 
     229  background: #250000; 
     230} 
     231 
     232.kb-table-row-destroyed  
     233{  
     234  background: #350000;  
     235}  
     236  
     237.kb-table-row-dropped  
     238{  
     239  background: green;  
    225240} 
    226241 
  • dev/style/default/style.css

    r191 r314  
    213213{ 
    214214  background: #222222; 
     215} 
     216 
     217.kb-table-row-slot 
     218{ 
     219  background: #292929; 
     220} 
     221 
     222.kb-table-row-destroyed  
     223{  
     224  background: #222222;  
     225}  
     226  
     227.kb-table-row-dropped  
     228{  
     229  background: green;  
    215230} 
    216231 
  • dev/style/revelations/style.css

    r191 r314  
    218218{ 
    219219  background: #706670; 
     220} 
     221 
     222.kb-table-row-slot 
     223{ 
     224  background: #807680; 
     225} 
     226 
     227.kb-table-row-destroyed  
     228{  
     229  background: #706670;  
     230}  
     231  
     232.kb-table-row-dropped  
     233{  
     234  background: green;  
    220235} 
    221236 
  • dev/templates/igb.tpl

    r230 r314  
    1 <a href="/?a=igb_home">Home</a> | <a href="/?a=post_igb">Post killmail</a> | <a href="/?a=portrait_grab">Update portrait</a> 
     1<a href="{KB_HOST}/?a=igb_home">Home</a> | <a href="{KB_HOST}/?a=post_igb">Post killmail</a> | <a href="{KB_HOST}/?a=portrait_grab">Update portrait</a> 
  • dev/templates/kill_detail.tpl

    r311 r314  
    6666{* set to true to show empty slots *} 
    6767{if $destroyed.$slotindex or $dropped.$slotindex} 
    68                 <tr class="kb-table-row-even"> 
     68                <tr class="kb-table-row-slot"> 
    6969                    <td class="item-icon" width="32"><img width="32" height="32" src="{$img_url}/{$slot.img}" alt="{$slot.text}" border="0"></td> 
    7070                    <td colspan="2" class="kb-table-cell"><b>{$slot.text}</b> </td> 
     
    7474                </tr> 
    7575    {foreach from=$destroyed.$slotindex item=i} 
    76                 <tr class="kb-table-row-odd"> 
     76                <tr class="kb-table-row-destroyed"> 
    7777                    <td class="item-icon" width="32" height="34" valign="top"><a href="?a=invtype&id={$i.itemID}">{$i.Icon}</a></td> 
    7878                    <td class="kb-table-cell">{$i.Name}</td> 
     
    113113    {/foreach} 
    114114    {foreach from=$dropped.$slotindex item=i} 
    115                 <tr class="kb-table-row-odd" style="background-color: green;"> 
     115                <tr class="kb-table-row-dropped"> 
    116116                    <td style="border: 1px solid green;" width="32" height="34" valign="top"><a href="?a=invtype&id={$i.itemID}">{$i.Icon}</a></td> 
    117117                    <td class="kb-table-cell">{$i.Name}</td> 
     
    162162                    <td align="right">{$ItemValue}</td> 
    163163                </tr> 
    164                 <tr class={cycle name=ccl} style="background-color: green;"> 
     164                <tr class={cycle name=ccl} kb-table-row-dropped"> 
    165165                    <td style="border: 1px solid green;" colspan="3"><div align="right"><strong>Total Module Drop:</strong></div></td> 
    166166                    <td style="border: 1px solid green;" align="right">{$DropValue}</td>