Changeset 89 for dev

Timestamp:

11/25/06 16:25:57 (14 years ago)

Author:

exi

Message:

Moved img/banners to img/logo.
Added auto-addition for items as option.
Autoupgrade:
Changed comments to work on mysql < 4.1.
Changed pilot_name to be 64 chars long.
Added system-field for contract targets.
Added index on kb3_item_types.itt_id.
Dropped kb3_ships.shp_description.
Dropped kb3_items.itm_description.
Changed Value to itm_value on kb3_items in case you got that.
Added kb3_items.itm_value to store the market value of items.

Location:

dev

Files:

• common/admin.php (modified) (8 diffs)
• common/autoupgrade.php (modified) (6 diffs)
• common/class.item.php (modified) (1 diff)
• img/banners (deleted)
• img/logo (added)
• img/logo/amarr.jpg (added)
• img/logo/caldari.jpg (added)
• img/logo/default.jpg (added)
• img/logo/gallente.jpg (added)
• img/logo/killboard.jpg (added)
• img/logo/minmatar.jpg (added)
• img/logo/revelations.jpg (added)
• img/logo/revelations_gray.jpg (added)

dev/common/admin.php

@@ -1 +1 @@
 <?php
-require_once("db.php");
-require_once("class.killboard.php");
-require_once("class.page.php");
-require_once("class.tabbedform.php");
-require_once("admin_menu.php");
+require_once('db.php');
+require_once('class.killboard.php');
+require_once('class.page.php');
+require_once('class.tabbedform.php');
+require_once('admin_menu.php');
+require_once('autoupgrade.php');
 
 $killboard = new Killboard(KB_SITE);
-$page = new Page("Administration - Generic");
+$page = new Page('Administration - Generic (Current version: '.KB_VERSION.' Build '.SVN_REV.')');
 $page->setAdmin();
-require_once('autoupgrade.php');
+
+// check tables for validity and fields
+// todo: tidy this mess up!!!!!
+check_pilots();
 check_invdetail();
+check_contracts();
+check_index();
+check_tblstrct1();
+check_tblstrct2();
+check_tblstrct3();
+check_tblstrct4();
 
 if ($_POST['submit'])
@@ -21 +31 @@
     $config->checkCheckbox('ship_values');
     $config->checkCheckbox('least_active');
+    $config->checkCheckbox('adapt_items');
 
     if ($config->checkCheckbox('comments'))
@@ -52 +63 @@
 $html .= "<tr><td width=120><b>Banner:</b></td><td><select id=style_banner name=style_banner>";
 
-$dir = "img/banners/";
+$dir = "img/logo/";
 if (is_dir($dir))
 {
@@ -60 +71 @@
         {
             $file = substr($file, 0, strpos($file, "."));
-            if (!is_dir($dir . $file))
+            if (!is_dir($dir.$file))
             {
-                $html .= "<option value=\"" . $file . "\"";
-                if ($file == $config->getStyleBanner())
+                $html .= "<option value=\"".$file."\"";
+                if ($file == $config->getConfig('style_banner'))
                 {
                     $html .= " selected=\"selected\"";
                 }
-                $html .= ">" . $file . "</option>";
+                $html .= ">".$file."</option>";
             }
         }
@@ -73 +84 @@
     }
 }
-$html .= "<option value=\"custom\"";
-if ($config->getStyleBanner() == "custom")
-{
-    $html .= " selected=\"selected\"";
-}
-$html .= ">custom</option></select></td></tr>";
+$html .= "</td></tr>";
 $html .= "<tr><td width=120><b>Style:</b></td><td><select id=style_name name=style_name>";
 
@@ -88 +94 @@
         while (($file = readdir($dh)) !== false)
         {
-            if (is_dir($dir . $file))
+            if (is_dir($dir.$file))
             {
                 if ($file == "." || $file == ".." || $file == ".svn")
@@ -94 +100 @@
                     continue;
                 }
-                $html .= "<option value=\"" . $file . "\"";
-                if ($file == $config->getStyleName())
+                $html .= "<option value=\"".$file."\"";
+                if ($file == $config->getConfig('style_name'))
                 {
                     $html .= " selected=\"selected\"";
                 }
-                $html .= ">" . $file . "</option>";
+                $html .= ">".$file."</option>";
             }
         }
@@ -150 +156 @@
 $html .= "<table class=kb-subtable>";
 
-$html .= "<tr><td width=120><b>Post password:</b></td><td><input type=text name=post_password id=post_password size=20 maxlength=20 value=\"" . $config->getPostPassword() . "\"></td></tr>";
-$html .= "<tr><td width=120><b>Killmail CC:</b></td><td><input type=text name=post_mailto id=post_mailto size=20 maxlength=80 value=\"" . $config->getPostMailto() . "\"> (e-mail address)</td></tr>";
+$html .= "<tr><td width=120><b>Post password:</b></td><td><input type=text name=post_password id=post_password size=20 maxlength=20 value=\"".$config->getPostPassword()."\"></td></tr>";
+$html .= "<tr><td width=120><b>Killmail CC:</b></td><td><input type=text name=post_mailto id=post_mailto size=20 maxlength=80 value=\"".$config->getPostMailto()."\"> (e-mail address)</td></tr>";
 $html .= "<tr><td width=120><b>Mailhost:</b></td><td><input type=text name=post_mailhost id=post_mailhost size=20 maxlength=80 value=\"".$config->getConfig('mail_host')."\"></td></tr>";
-$html .= "<tr><td width=120><b>Disallow any killmails before:</b></td><td>" . dateSelector($config->getConfig('filter_apply'), $config->getConfig('filter_date')) . "</td></tr>";
+$html .= "<tr><td width=120><b>Disallow any killmails before:</b></td><td>".dateSelector($config->getConfig('filter_apply'), $config->getConfig('filter_date'))."</td></tr>";
+$html .= "<tr><td width=120><b>Enable auto-addition of unknown Items:</b></td><td><input type=checkbox name=adapt_items id=adapt_items";
+if ($config->getConfig('adapt_items'))
+{
+    $html .= " checked=\"checked\"";
+}
+$html .= "> (This is in case we can't supply a dump with the new items when Kali goes live)</td></tr>";
 $html .= "</table>";
 

dev/common/autoupgrade.php

@@ -16 +16 @@
 `comment` TEXT NOT NULL ,
 `name` TINYTEXT NOT NULL ,
-`posttime` TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,
+`posttime` TIMESTAMP DEFAULT \'0000-00-00 00:00:00\' NOT NULL,
 PRIMARY KEY ( `ID` )
 ) TYPE = MYISAM';
@@ -25 +25 @@
 {
     $qry = new DBQuery();
-    $query = 'select count(posttime) from kb3_comments';
+    $query = 'select posttime from kb3_comments limit 1';
     $result = mysql_query($query);
     if ($result)
@@ -33 +33 @@
         return;
     }
-    $query = 'ALTER TABLE `kb3_comments` ADD `posttime` TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL';
+    $query = 'ALTER TABLE `kb3_comments` ADD `posttime` TIMESTAMP DEFAULT \'0000-00-00 00:00:00\' NOT NULL';
     $qry->execute($query);
 }
@@ -52 +52 @@
 ) TYPE = MYISAM ;';
     $qry->execute($query);
+    $qry->execute('ALTER TABLE `kb3_ships_values` ADD PRIMARY KEY ( `shp_id` ) ');
     $qry->execute('UPDATE kb3_ships set shp_class = 8 WHERE shp_id=257 limit 1');
     $qry->execute('UPDATE kb3_ships set shp_class = 8 WHERE shp_id=252 limit 1');
@@ -59 +60 @@
     $qry->execute('UPDATE kb3_ships set shp_class = 4 WHERE shp_id=246 limit 1');
     $qry->execute('UPDATE kb3_ships set shp_class = 4 WHERE shp_id=249 limit 1');
+    $qry->execute('UPDATE kb3_ships set shp_techlevel = 2 where shp_class = 22');
 }
 
@@ -69 +71 @@
     if ($len == 4)
     {
-        $query = 'ALTER TABLE `kb3_inv_detail` CHANGE `ind_sec_status` `ind_sec_status` VARCHAR( 5 )';
+        $query = 'ALTER TABLE `kb3_inv_detail` CHANGE `ind_sec_status` `ind_sec_status` VARCHAR(5)';
         $qry->execute($query);
     }
 }
+
+function check_pilots()
+{
+    $qry = new DBQuery();
+    $query = 'select plt_name from kb3_pilots limit 1';
+    $qry->execute($query);
+    $len = mysql_field_len($qry->resid_,0);
+    if ($len == 32)
+    {
+        $query = 'ALTER TABLE `kb3_pilots` CHANGE `plt_name` `plt_name` VARCHAR(64) NOT NULL';
+        $qry->execute($query);
+    }
+}
+
+function check_contracts()
+{
+    $qry = new DBQuery();
+    $query = 'select ctd_sys_id from kb3_contract_details limit 1';
+    $result = mysql_query($query);
+    if ($result)
+    {
+        return;
+    }
+    $qry->execute('ALTER TABLE `kb3_contract_details` ADD `ctd_sys_id` INT(11) NOT NULL DEFAULT \'0\'');
+    $qry->execute('ALTER TABLE `kb3_contract_details` ADD INDEX (`ctd_ctr_id`) ');
+}
+function check_index()
+{
+    $qry = new DBQuery();
+    $qry->execute('SHOW columns from kb3_item_types like \'itt_id\'');
+    $arr = $qry->getRow();
+    if ($arr['Key'] == 'PRI')
+    {
+        return;
+    }
+    $qry->execute('ALTER TABLE `kb3_item_types` ADD PRIMARY KEY ( `itt_id` ) ');
+}
+function check_tblstrct1()
+{
+    $qry = new DBQuery();
+    $query = 'select shp_description from kb3_ships limit 1';
+    $result = mysql_query($query);
+    if (!$result)
+    {
+        return;
+    }
+    $query = 'ALTER TABLE `kb3_ships` DROP `shp_description`';
+    $qry->execute($query);
+}
+function check_tblstrct2()
+{
+    $qry = new DBQuery();
+    $query = 'select itm_description from kb3_items limit 1';
+    $result = mysql_query($query);
+    if (!$result)
+    {
+        return;
+    }
+    $query = 'ALTER TABLE `kb3_items` DROP `itm_description`';
+    $qry->execute($query);
+}
+function check_tblstrct3()
+{
+    $qry = new DBQuery();
+    $query = 'select Value from kb3_items limit 1';
+    $result = mysql_query($query);
+    if ($result)
+    {
+        $query = 'ALTER TABLE `kb3_items` CHANGE `Value` `itm_value` INT( 11 ) NOT NULL DEFAULT \'0\'';
+        $qry->execute($query);
+    }
+}
+function check_tblstrct4()
+{
+    $qry = new DBQuery();
+    $query = 'select itm_value from kb3_items limit 1';
+    $result = mysql_query($query);
+    if ($result)
+    {
+        return;
+    }
+    $query = 'ALTER TABLE `kb3_items` ADD `itm_value` INT( 11 ) NOT NULL DEFAULT \'0\'';
+    $qry->execute($query);
+    $qry->execute('ALTER TABLE `kb3_items` CHANGE `itm_externalid` `itm_externalid` INT( 11 ) NOT NULL DEFAULT \'0\'');
+}
 ?>

dev/common/class.item.php

@@ -1 @@
-<?
-  require_once( "db.php" );
+<?php
+require_once("db.php");
 
-  class Item {
-
-    function Item( $id = 0 )
+class Item
+{
+    function Item($id = 0)
     {
-      $this->id_ = $id;
-      $this->qry_ = new DBQuery();
-
+        $this->id_ = $id;
+        $this->qry_ = new DBQuery();
     }
 
     function getID()
     {
-      return $this->id_;
+        return $this->id_;
     }
 
     function getName()
     {
-      $this->execQuery();
-      return $this->row_['itm_name'];
+        $this->execQuery();
+        return $this->row_['itm_name'];
     }
 
-    function getIcon( $size = 32 )
+    function getIcon($size = 32)
     {
-      $this->execQuery();
-//      return IMG_URL."/items/".$size."_".$size."/".$this->row_['itm_icon'].".png";
-      $html .= "<td class=item-icon width=\"30\" height=\"34\" background=\"".IMG_URL."/items/".$size."_".$size."/".$this->row_['itm_icon'].".png\" valign=top>";
-      if ( substr( $this->getName(), strlen( $this->getName() ) - 2, 2 ) == "II" )
-        $html .= "<img src=\"".IMG_URL."/items/32_32/t2.gif\" border=\"0\">";
-      else
-        $html .= "<img src=\"".IMG_URL."/items/32_32/blank.gif\" border=\"0\">";
+        $this->execQuery();
+//        if (strstr($this->row_['itt_name'], 'Drone'))
+//        {
+//            $html .= "<td class=item-icon width=\"30\" height=\"34\" background=\"".IMG_URL."/drones/".$size."_".$size."/".$this->row_['itm_externalid'].".png\" valign=top>";
+//        }
+//        else
+//        {
+            $html .= "<td class=item-icon width=\"30\" height=\"34\" background=\"".IMG_URL."/items/".$size."_".$size."/".$this->row_['itm_icon'].".png\" valign=top>";
+//        }
+        // return IMG_URL."/items/".$size."_".$size."/".$this->row_['itm_icon'].".png";
 
-      $hmtl .= "</td>";
+        if (substr($this->getName(), strlen($this->getName()) - 2, 2) == "II")
+            $html .= "<img src=\"".IMG_URL."/items/32_32/t2.gif\" border=\"0\">";
+        else
+            $html .= "<img src=\"".IMG_URL."/items/32_32/blank.gif\" border=\"0\">";
 
-      return $html;
+        $hmtl .= "</td>";
+
+        return $html;
     }
-    
+
     function getSlot()
     {
-      $this->execQuery();
-      return $this->row_['itt_slot'];
+        $this->execQuery();
+        return $this->row_['itt_slot'];
     }
 
     function execQuery()
     {
-      if ( !$this->qry_->executed_ ) {
-        $this->sql_ = "select *
-                         from kb3_items, kb3_item_types
-                        where itm_id = ".$this->id_."
-                          and itm_type = itt_id";      
-        $this->qry_->execute( $this->sql_ ) or die( $this->qry_->getErrorMsg() );
-        $this->row_ = $this->qry_->getRow();
-      }
+        if (!$this->qry_->executed_)
+        {
+            $this->sql_ = "select *
+                           from kb3_items, kb3_item_types
+                               where itm_id = ".$this->id_."
+                               and itm_type = itt_id";
+            $this->qry_->execute($this->sql_) or die($this->qry_->getErrorMsg());
+            $this->row_ = $this->qry_->getRow();
+        }
     }
 
-    function lookup( $name )
+    function lookup($name)
     {
-      $qry = new DBQuery();
-      $qry->execute( "select *
-                        from kb3_items itm
-                       where itm_name = '".slashfix( $name )."'" );
-                                                                                
-      $row = $qry->getRow();
-      $this->id_ = $row['itm_id'];
+        $qry = new DBQuery();
+        $qry->execute("select * from kb3_items itm
+                        where itm_name = '".slashfix($name)."'");
+        $row = $qry->getRow();
+        if (!isset($row['itm_id']))
+        {
+            global $config;
+            if ($config->getConfig('adapt_items'))
+            {
+                // 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();
+                    $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']."')");
+                    $this->id_ = $qry->getInsertID();
+                }
+                else
+                {
+                    // no idea what this is, insert as 'Temp'
+                    $qry->execute("INSERT INTO kb3_items (itm_name,itm_type)
+                                    VALUES ('".slashfix($name)."','721')");
+                    $this->id_ = $qry->getInsertID();
+                }
+            }
+        }
+        $this->id_ = $row['itm_id'];
     }
-        
-        function get_item_id($name)
+
+    function get_item_id($name)
     {
         $qry = new DBQuery();
         $qry->execute("select *
                         from kb3_items
-                       where itm_name = '" . slashfix($name) . "'");
+                        where itm_name = '".slashfix($name)."'");
 
         $row = $qry->getRow();
         if ($row['itm_id']) return $row['itm_id'];
     }
-  }
+}
 ?>