Changeset 357

Timestamp:

10/27/08 12:26:01 (14 years ago)

Author:

ralle

Message:

-fix of swf banner parth <br/>-upd of history mod and fix of trac linking -del of old DB_USE_CCP stuff -CHG of inserts to name adressed ones

Location:

dev

Files:

• common/includes/class.corp.php (modified) (1 diff)
• common/includes/class.item.php (modified) (5 diffs)
• common/includes/class.kill.php (modified) (5 diffs)
• common/includes/globals.php (modified) (1 diff)
• mods/history/about.php (modified) (1 diff)
• mods/history/history.xml (modified) (1 diff)
• templates/index.tpl (modified) (1 diff)

dev/common/includes/class.corp.php

@@ -78 +78 @@
         if ($qry->recordCount() == 0)
         {
-            $qry->execute("insert into kb3_corps values ( null,'".slashfix($name)."',"
+            $qry->execute("insert into kb3_corps (crp_id, crp_name, crp_all_id, crp_trial, crp_updated) values ( null,'".slashfix($name)."',"
                            .$alliance->getID().",0,date_format('".$timestamp."','%Y.%m.%d %H:%i:%s'))");
             $this->id_ = $qry->getInsertID();

dev/common/includes/class.item.php

@@ -17 +17 @@
     {
         $this->execQuery();
-        if (DB_USE_CCP)
-        {
-            return $this->row_['typeName'];
-        }
-        return $this->row_['itm_name'];
+        return $this->row_['typeName'];  
     }
 
@@ -43 +39 @@
         {
                 $img = IMG_URL.'/blueprints/'.$size.'_'.$size.'/'.$this->row_['itm_externalid'].'.png';
-        } 
-        else
-        {
-            // fix for new db structure, just make sure old clients dont break
-            if (!strstr($this->row_['itm_icon'], 'icon'))
-            {
-                $this->row_['itm_icon'] = 'icon'.$this->row_['itm_icon'];
-            }
-            $img = IMG_URL.'/items/'.$size.'_'.$size.'/'.$this->row_['itm_icon'].'.png';
-        }
+        }
+        
         if ($size == 24)
         {
@@ -166 +154 @@
                 return false;
             }
-            $this->sql_ = "select *
-                           from kb3_items
-                           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
+            
+            $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=633
@@ -180 +161 @@
                                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'];
-            }
-        }
-    }
-
+            $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'];
+        }
+    }
+
+    // loads $this->id_  by name 
     function lookup($name)
     {
         $name = trim($name);
         $qry = new DBQuery();
-        $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)."'";
-        }
+        $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') && DB_USE_CCP !== true)
-            {
-                // if the item is a tec2 we likely have the tec1
-                if (substr($name, -2, 2) == 'II')
-                {
-                    $qry->execute("select * from kb3_items itm
-                                    where itm_name = '".slashfix(substr($name,0,-1))."'");
-                    $row = $qry->getRow();
-                    if (!$row['itm_type'])
-                    {
-                        return false;
-                    }
-                    $qry->execute("INSERT INTO kb3_items (itm_name,itm_volume,itm_type,itm_externalid,itm_techlevel,itm_icon)
-                                    VALUES ('".slashfix($name)."','".$row['itm_volume']."','".$row['itm_type']."','".$row['itm_externalid']."','2','".$row['itm_icon']."')");
-                }
-                else
-                {
-                    // no idea what this is, insert as 'Temp'
-                    $qry->execute("INSERT INTO kb3_items (itm_name,itm_type)
-                                    VALUES ('".slashfix($name)."','721')");
-                }
-                $row['itm_id'] = $qry->getInsertID();
-            }
-            else
-            {
-                // that item doesnt exist or is misspelled
-                return false;
-            }
+                return false;  
         }
         $this->id_ = $row['itm_id'];
     }
  
-    
+    // return typeID by name, dont change $this->id_
     function get_item_id($name)
     {
         $qry = new DBQuery();
-        $query = "select *
-                        from kb3_items
-                        where itm_name = '".slashfix($name)."'";
-        if (DB_USE_CCP)
-        {
-            $query = "select *,typeID as itm_id
-                        from kb3_items
-                        where typeName = '".slashfix($name)."'";
-        }
+        $query = "select *,typeID as itm_id
+                  from kb3_items
+                  where typeName = '".slashfix($name)."'";
         $qry->execute($query);
 
@@ -316 +256 @@
     }    
     
-        function get_group_id($name)
+    function get_group_id($name)
     {
         $qry = new DBQuery();

dev/common/includes/class.kill.php

@@ -770 +770 @@
 
         $qry = new DBQuery();
-        $sql = "insert into kb3_kills values (".$qid.",
+        $sql = "INSERT INTO kb3_kills 
+                (kll_id , kll_timestamp , kll_victim_id , kll_all_id , kll_crp_id , kll_ship_id , kll_system_id , kll_fb_all_id , kll_fb_crp_id , kll_fb_plt_id , kll_points , kll_dmgtaken)
+                VALUES (".$qid.",
                     date_format('".$this->timestamp_."', '%Y.%m.%d %H:%i:%s'),
-                ".$this->victimid_.", ".$this->victimallianceid_.",
-                ".$this->victimcorpid_.", ".$this->victimship_->getID().",
-                ".$this->solarsystem_->getID().", ".$this->getFBAllianceID().",
-                ".$this->getFBCorpID().", ".$this->getFBPilotID().", ".$this->calculateKillPoints().", ".$this->dmgtaken." )";
+                ".$this->victimid_.", 
+                ".$this->victimallianceid_.",
+                ".$this->victimcorpid_.", 
+                ".$this->victimship_->getID().",
+                ".$this->solarsystem_->getID().", 
+                ".$this->getFBAllianceID().",
+                ".$this->getFBCorpID().", 
+                ".$this->getFBPilotID().", 
+                ".$this->calculateKillPoints().", 
+                ".$this->dmgtaken." )";
         $qry->execute($sql);
 
@@ -808 +816 @@
 
             $sql = "insert into kb3_inv_detail
-                    values ( ".$this->getID().", ".$inv->getPilotID().", '".$inv->getSecStatus()."', "
+                    (ind_kll_id, ind_plt_id, ind_sec_status, ind_all_id, ind_crp_id, ind_shp_id, ind_wep_id, ind_order, ind_dmgdone )
+                    values ( ".$this->getID().", ".$inv->getPilotID().", '".$inv->getSecStatus()."', "
                     .$inv->getAllianceID().", ".$inv->getCorpID().", ".$ship->getID().", "
                     .$weapon->getID().", ".$order++.", ".$inv->dmgdone_.")";
@@ -816 +825 @@
             {
                 array_push($invall, $inv->getAllianceID());
-                $qry->execute("insert into kb3_inv_all values ( ".$this->getID().", ".$inv->getAllianceID()." )") or die($qry->getErrorMsg());
+                $qry->execute("insert into kb3_inv_all (ina_kll_id, ina_all_id) values ( ".$this->getID().", ".$inv->getAllianceID()." )") or die($qry->getErrorMsg());
             }
             if (!in_array($inv->getCorpID(), $invcrp))
             {
                 array_push($invcrp, $inv->getCorpID());
-                $qry->execute("insert into kb3_inv_crp values ( ".$this->getID().", ".$inv->getCorpID()." )") or die($qry->getErrorMsg());
+                $qry->execute("insert into kb3_inv_crp (inc_kll_id, inc_crp_id) values ( ".$this->getID().", ".$inv->getCorpID()." )") or die($qry->getErrorMsg());
             }
             if (!in_array($inv->getPilotID(), $invplt))
             {
                 array_push($invplt, $inv->getPilotID());
-                $qry->execute("insert into kb3_inv_plt values ( ".$this->getID().", ".$inv->getPilotID()." )") or die($qry->getErrorMsg());
+                $qry->execute("insert into kb3_inv_plt (inp_kll_id, inp_plt_id) values ( ".$this->getID().", ".$inv->getPilotID()." )") or die($qry->getErrorMsg());
             }
         }
@@ -842 +851 @@
             }
 
-            $sql = "insert into kb3_items_destroyed
+            $sql = "insert into kb3_items_destroyed (itd_kll_id, itd_itm_id, itd_quantity, itd_itl_id)
                         values ( ".$this->getID().", ".$item->getID().", ".$dest->getQuantity().", "
                     .$loc_id." )";
@@ -860 +869 @@
             }
 
-            $sql = "insert into kb3_items_dropped
+            $sql = "insert into kb3_items_dropped (itd_kll_id, itd_itm_id, itd_quantity, itd_itl_id)
                         values ( ".$this->getID().", ".$item->getID().", ".$dest->getQuantity().", "
                     .$loc_id." )";

dev/common/includes/globals.php

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

dev/mods/history/about.php

@@ -69 +69 @@
 if ($count > 5 && !isset($_GET['showAll']))
     break;
-$html .= "<tr class=kb-table-row-odd><td width = 50><a href='http://trac.eve-dev.net/changeset/".$set->rev."' target='_blank'>REV".$set->rev."</a><td>".$set->author."</td><td width=100 align='right'>".$set->date."</tr>";
+$html .= "<tr class=kb-table-row-odd><td width = 50><a href='https://svn.nsbit.dk/trac/edk/changeset/".$set->rev."' target='_blank'>REV".$set->rev."</a><td>".$set->author."</td><td width=100 align='right'>".$set->date."</tr>";
 foreach ($set->comment as $comment)
 {

dev/mods/history/history.xml

@@ -2 +2 @@
 <history>
         <changeset>
-                <rev>355</rev>
+                <rev>357</rev>
+                <author>Ralle030583</author>
+                <date>27.10.2008</date>
+                <comment>
+                        <type>FIX</type>
+                        <text>
+                                linking in history-mod about page rev numbers to beansmans trac,
+                                cause trac.eve-dev.net is currenty down
+                        </text>
+                </comment>
+                <comment>
+                        <type>FIX</type>
+                        <text>
+                                removing some old queris from preior CCP dump use 
+                                (DB_USE_CCP stuff)
+                        </text>
+                </comment>
+                <comment>
+                        <type>FIX</type>
+                        <text>
+                                path for swf-banner corrected to banner/{banner}
+                        </text>
+                </comment>
+                <comment>
+                        <type>UPD</type>
+                        <text>
+                                Changed inserts into name adressed ones
+                        </text>
+                </comment>
+        </changeset>
+        <changeset>
+                <rev>355/356</rev>
                 <author>beans</author>
                 <date>24.10.2008</date>

dev/templates/index.tpl

@@ -27 +27 @@
 {if $bannerswf=='true'}
 <OBJECT classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,0,0" WIDTH="1000" HEIGHT="200" id="{$banner}" ALIGN="">
-<PARAM NAME=movie VALUE="{$img_url}/logo/{$banner}"> <PARAM NAME=quality VALUE=high> <PARAM NAME=bgcolor VALUE=black> <EMBED src="{$banner}" quality=high bgcolor=black WIDTH="1000" HEIGHT="200" NAME="{$banner}" ALIGN="" TYPE="application/x-shockwave-flash" PLUGINSPAGE="http://www.macromedia.com/go/getflashplayer"></EMBED> </OBJECT>
+<PARAM NAME=movie VALUE="banner/{$banner}"> <PARAM NAME=quality VALUE=high> <PARAM NAME=bgcolor VALUE=black> <EMBED src="banner/{$banner}" quality=high bgcolor=black WIDTH="1000" HEIGHT="200" NAME="{$banner}" ALIGN="" TYPE="application/x-shockwave-flash" PLUGINSPAGE="http://www.macromedia.com/go/getflashplayer"></EMBED> </OBJECT>
 {else}
 {if $banner_link}