Changeset 357 for dev/common/includes/class.item.php

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

Files:

• dev/common/includes/class.item.php (modified) (5 diffs)

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();