Changeset 133

Timestamp:

12/02/06 05:17:10 (14 years ago)

Author:

exi

Message:

Reduced one potential sql-bug.
Added ability to identify items as t2 via their techlevel rather than just 'II'.
Fixed item location 0 to not cause skipping that item.
Added anzahl/quantity-replace for the german killpreparser.
Fixed final blow award to show correct numbers.
Removed unnecessary code from db.php.
Added a table data check to the sql importer and made the importer more verbose, this should minimize support requests caused by empty table data.
Fixed a small misalignment of the comment block.

Location:

dev

Files:

• common/class.item.php (modified) (6 diffs)
• common/class.kill.php (modified) (4 diffs)
• common/class.parser.php (modified) (1 diff)
• common/class.toplist.php (modified) (2 diffs)
• common/db.php (modified) (1 diff)
• install/install_step4.php (modified) (6 diffs)
• install/install_step4_tblchk.php (added)
• install/sql/sql_tbldata_ships.sql (modified) (1 diff)
• install/sql/tbl_check.txt (added)
• templates/block_comments.tpl (modified) (1 diff)

dev/common/class.item.php

@@ -24 +24 @@
         return $this->row_['itm_name'];
     }
-    
 
 
-  function getIcon($size = 32)
+
+    function getIcon($size = 32)
     {
         $this->execQuery();
@@ -47 +47 @@
         }
 
-        if (substr($this->getName(), strlen($this->getName()) - 2, 2) == "II")
+        if (substr($this->getName(), strlen($this->getName()) - 2, 2) == "II" || $this->row_['techlevel'])
         {
             $icon .= IMG_URL.'/items/32_32/t2.gif';
@@ -59 +59 @@
         $smarty->assign('icon', $icon);
         return $smarty->fetch('icon.tpl');
-    } 
+    }
 
     function getSlot()
@@ -73 +73 @@
             $this->sql_ = "select *
                            from kb3_items, kb3_item_types
-                               where itm_id = ".$this->id_."
+                               where itm_id = '".$this->id_."'
                                and itm_type = itt_id";
-            $this->qry_->execute($this->sql_) or die($this->qry_->getErrorMsg());
+            $this->qry_->execute($this->sql_);
             $this->row_ = $this->qry_->getRow();
         }
@@ -97 +97 @@
                                     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)
+                    $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
@@ -106 +105 @@
                     $qry->execute("INSERT INTO kb3_items (itm_name,itm_type)
                                     VALUES ('".slashfix($name)."','721')");
-                    $this->id_ = $qry->getInsertID();
                 }
+                $row['itm_id'] = $qry->getInsertID();
             }
         }

dev/common/class.kill.php

@@ -367 +367 @@
                     order by itd.itd_itl_id, itm.itm_type";
 
-            $qry->execute($sql) or die($qry->getErrorMsg());
+            $qry->execute($sql);
             while ($row = $qry->getRow())
             {
@@ -670 +670 @@
         {
             $item = $dest->getItem();
-            if (!$item->getID() || !$dest->getQuantity() || !$dest->getLocationID())
+            if (!$item->getID() || !$dest->getQuantity() || $dest->getLocationID() === false)
+            {
                 continue;
+            }
 
             $sql = "insert into kb3_items_destroyed
@@ -792 +794 @@
     function getLocationID()
     {
-        $id = 0;
+        $id = false;
         if (strlen($this->location_) < 2)
         {
@@ -800 +802 @@
         {
             $qry = new DBQuery();
-            $qry->execute("select itl_id from kb3_item_locations where itl_location = '".$this->location_."'") or die($qry->getErrorMsg());
+            $qry->execute("select itl_id from kb3_item_locations where itl_location = '".$this->location_."'");
             $row = $qry->getRow();
             $id = $row['itl_id'];

dev/common/class.parser.php

@@ -463 +463 @@
         if ($set == 'german')
         {
-            $search = array('Ziel:','Allianz: nichts','Allianz:','Zerstört','Sicherheit:','Beteiligte Parteien:');
-            $replace = array('Victim:','Alliance: None','Alliance:','Destroyed','Security:','Involved parties:');
+            $search = array('Ziel:','Allianz: nichts','Allianz:','Zerstört','Sicherheit:','Beteiligte Parteien:','Anz:');
+            $replace = array('Victim:','Alliance: None','Alliance:','Destroyed','Security:','Involved parties:', 'Qty:');
             $this->killmail_ = str_replace($search, $replace, $this->killmail_);
             return;

dev/common/class.toplist.php

@@ -228 +228 @@
 
         $this->sql_ .= " ".$this->sqlbottom_;
-        // echo $this->sql_."<br>";
+        // echo $this->sql_."<br/><br/>";
         $this->qry_->execute($this->sql_);
     }
@@ -389 +389 @@
         $sql = "select count(kll.kll_id) as cnt, kll.kll_fb_plt_id as plt_id
                 from kb3_kills kll
-              inner join kb3_inv_detail ind
-                      on ( ind.ind_kll_id = kll.kll_id)
               inner join kb3_pilots plt
-                      on ( plt.plt_id = ind.ind_plt_id ";
+                      on ( plt.plt_id = kll.kll_fb_plt_id ";
         if ($this->inv_crp_)
             $sql .= " and plt.plt_crp_id in ( ".substr($this->inv_crp_, 0, strlen($this->inv_crp_) - 2)." )";

dev/common/db.php

@@ -105 +105 @@
     }
 }
-/*
- * this looks like REALLY old code and isnt used anywhere
- * commented out for now
- *
-class DBAction
-{
-    function DBAction()
-    {
-        $this->dbconn_ = new DBConnection();
-    }
-
-    function setDateTime($timestamp)
-    {
-        $this->timestamp_ = $timestamp;
-    }
-
-    function addPilot($pilot, $corpid, $timestamp)
-    {
-        $sql = "select * from kb3_pilots where plt_name = '" . addslashes(stripslashes($pilot)) . "'";
-        $qry = new DBQuery($this->dbconn_, $sql);
-        $qry->execute() or die($qry->getErrorMsg());
-
-        if ($qry->recordCount() == 0)
-        {
-            $sql = "insert into kb3_pilots values ( null, '" . addslashes(stripslashes($pilot)) . "', " . $corpid . ", 0, 0, 0, date_format('" . $timestamp . "', '%Y.%m.%d %H:%i:%s') )";
-            $qry = new DBQuery($this->dbconn_, $sql) or die ($qry->getErrorMsg());
-            $qry->execute() or die($qry->getErrorMsg());
-            $pilotid = $qry->getInsertID();
-        }
-        else
-        {
-            $row = $qry->getRow();
-            $pilotid = $row['plt_id'];
-            $dbaction = new DBAction();
-
-            if ($dbaction->isPilotUpdatable($pilotid, $timestamp) && $$row['plt_crp_id'] != $corpid)
-            {
-                $qry = new DBQuery($this->dbconn_, "update kb3_pilots set plt_crp_id = " . $corpid . ", plt_updated = date_format('" . $timestamp . "', '%Y.%m.%d %H:%i:%s') where plt_id = " . $pilotid);
-                $qry->execute() or die($qry->getErrorMsg());
-            }
-        }
-
-        return $pilotid;
-    }
-
-    function setCharacterId($pilotid, $charid)
-    {
-        $sql = "update kb3_pilots set plt_externalid = " . $charid . " where plt_id = " . $pilotid;
-
-        $qry = new DBQuery($this->dbconn_, $sql);
-        $qry->execute();
-    }
-
-    function addAlliance($alliance)
-    {
-        $sql = "select * from kb3_alliances where all_name = '" . addslashes(stripslashes($alliance)) . "'";
-        $qry = new DBQuery($this->dbconn_, $sql);
-        $qry->execute() or die($qry->getErrorMsg());
-
-        if ($qry->recordCount() == 0)
-        {
-            $sql = "insert into kb3_alliances values ( null, '" . addslashes(stripslashes($alliance)) . "', 'default' )";
-            $qry = new DBQuery($this->dbconn_, $sql);
-            $qry->execute() or die($qry->getErrorMsg());
-            $allianceid = $qry->getInsertID();
-        }
-        else
-        {
-            $row = $qry->getRow();
-            $allianceid = $row['all_id'];
-        }
-
-        return $allianceid;
-    }
-
-    function addCorp($corp, $allianceid, $timestamp)
-    {
-        $sql = "select * from kb3_corps where crp_name = '" . addslashes(stripslashes($corp)) . "'";
-        $qry = new DBQuery($this->dbconn_, $sql);
-        $qry->execute() or die($qry->getErrorMsg());
-
-        if ($qry->recordCount() == 0)
-        {
-            $sql = "insert into kb3_corps values ( null, '" . addslashes(stripslashes($corp)) . "', " . $allianceid . ", 0, date_format('" . $timestamp . "', '%Y.%m.%d %H:%i:%s') )";
-            $qry = new DBQuery($this->dbconn_, $sql);
-            $qry->execute() or die($qry->getErrorMsg());
-            $corpid = $qry->getInsertID();
-        }
-        else
-        {
-            $row = $qry->getRow();
-            $corpid = $row['crp_id'];
-
-            $dbaction = new DBAction();
-
-            if ($dbaction->isCorpUpdatable($corpid, $timestamp) && $row['crp_all_id'] != $allianceid && $row['crp_trial'] != 1)
-            {
-                $sql = "update kb3_corps set crp_all_id = " . $allianceid . ", crp_updated = date_format('" . $timestamp . "', '%Y.%m.%d %H:%i:%s')
-                   where crp_id = " . $corpid;
-                $qry = new DBQuery($this->dbconn_, $sql);
-                $qry->execute() or die($qry->getErrorMsg());
-            }
-        }
-
-        return $corpid;
-    }
-
-    function addShip($ship, $description, $baseprice)
-    {
-        $sql = "select * from kb3_ships where shp_name = '" . addslashes(stripslashes($ship)) . "'";
-        $qry = new DBQuery($this->dbconn_, $sql);
-        $qry->execute();
-
-        if ($qry->recordCount() == 0)
-        {
-            $sql = "insert into kb3_ships values ( null, '" . addslashes(stripslashes($ship)) . "', 0, 0, 0, null, 0 )";
-            $qry = new DBQuery($this->dbconn_, $sql);
-            $qry->execute();
-            $shipid = $qry->getInsertID();
-        }
-        else
-        {
-            $row = $qry->getRow();
-            $shipid = $row['shp_id'];
-            if ($description != "")
-            {
-                $sql = "update kb3_ships set shp_description = '" . addslashes(stripslashes($description)) . "', shp_baseprice = " . $baseprice . " where shp_id = " . $shipid;
-                $qry = new DBQuery($this->dbconn_, $sql) or die($qry->getErrorMsg());
-                $qry->execute();
-            }
-        }
-
-        return $shipid;
-    }
-
-    function addItem($item, $description, $volume, $type, $icon)
-    {
-        $sql = "select * from kb3_items where itm_name = '" . addslashes(stripslashes($item)) . "'";
-        $qry = new DBQuery($this->dbconn_, $sql) or die ($qry->getErrorMsg());
-        $qry->execute();
-
-        if ($qry->recordCount() == 0)
-        {
-            $sql = "insert into kb3_items values ( null, '" . addslashes(stripslashes($item)) . "', '" . addslashes(stripslashes($description)) . "', " . $volume . ", " . $type . ", null, 1, '" . $icon . "' )";
-            $qry = new DBQuery($this->dbconn_, $sql);
-            $qry->execute() or die ($qry->getErrorMsg());
-            $itemid = $qry->getInsertID();
-            return -1;
-        }
-        else
-        {
-            $row = $qry->getRow();
-            $itemid = $row['itm_id'];
-            if ($description != "")
-            {
-                $sql = "update kb3_items set itm_description = '" . addslashes(stripslashes($description)) . "', itm_volume = " . $volume . ", itm_type = " . $type . ", itm_icon = '" . $icon . "' where itm_id = " . $itemid;
-                $qry = new DBQuery($this->dbconn_, $sql);
-                $qry->execute() or die ($qry->getErrorMsg());
-            }
-        }
-
-        return $itemid;
-    }
-
-    function setIcon($itemid, $icon)
-    {
-        $sql = "update kb3_items set itm_icon = '" . $icon . "' where itm_id = " . $itemid;
-        $qry = new DBQuery($this->dbconn_, $sql);
-        $qry->execute();
-    }
-
-    function addSystem($system, $systemsec)
-    {
-        $sql = "select * from kb3_systems where sys_name = '" . addslashes(stripslashes($system)) . "'";
-        $qry = new DBQuery($this->dbconn_, $sql);
-        $qry->execute() or die ($qry->getErrorMsg());
-
-        if ($qry->recordCount() == 0)
-        {
-            $sql = "insert into kb3_systems values ( null, '" . addslashes(stripslashes($system)) . "', '" . $systemsec . "', 0 )";
-            $qry = new DBQuery($this->dbconn_, $sql);
-            $qry->execute() or die ($qry->getErrorMsg());
-            $systemid = $qry->getInsertID();
-        }
-        else
-        {
-            $row = $qry->getRow();
-            $systemid = $row['sys_id'];
-        }
-
-        return $systemid;
-    }
-
-    function addInvolved($killid, $pilotid, $secstatus, $allianceid, $corpid, $shipid, $weaponid, $finalblow, $order)
-    {
-        $sql = "insert into _" . KB_SITE . "_involved values ( " . $killid . ", " . $pilotid . ", '" . $secstatus . "', " . $allianceid . ", " . $corpid . ", " . $shipid . ", " . $weaponid . ", " . $finalblow . ", " . $order . " )";
-        $qry = new DBQuery($this->dbconn_, $sql);
-        $qry->execute() or die ($qry->getErrorMsg());
-    }
-
-    function addDestroyedItem($killid, $itemid, $quantity, $location)
-    {
-        $qry = new DBQuery($this->dbconn_, "select itl_id from kb3_item_locations where itl_location = '" . $location . "'");
-        $qry->execute() or die($qry->getErrorMsg());
-        $row = $qry->getRow();
-        if ($row['itl_id'] != "")
-            $locationid = $row['itl_id'];
-        else
-            $locationid = 0;
-
-        $sql = "insert into _" . KB_SITE . "_items_destroyed values ( " . $killid . ", " . $itemid . ", " . $quantity . ", " . $locationid . " )";
-        $qry = new DBQuery($this->dbconn_, $sql);
-        $qry->execute() or die ($qry->getErrorMsg());
-    }
-
-    function addKill($timestamp, $victimid, $allianceid, $corpid, $shipid, $systemid)
-    {
-        $killid = 0;
-        // check if the killmail already exists
-        $sql = "select * from _" . KB_SITE . "_kills where kll_timestamp = date_format('" . $timestamp . "', '%Y.%m.%d %H:%i:%s') and kll_victim_id = " . $victimid . " and kll_ship_id = " . $shipid;
-        $qry = new DBQuery($this->dbconn_, $sql);
-        $qry->execute();
-
-        if ($qry->recordCount() == 0)
-        {
-            $sql = "insert into _" . KB_SITE . "_kills values ( null, date_format('" . $timestamp . "', '%Y.%m.%d %H:%i:%s'), " . $victimid . ", " . $allianceid . ", " . $corpid . ", " . $shipid . ", " . $systemid . " )";
-            $qry = new DBQuery($this->dbconn_, $sql);
-            $qry->execute() or die ($qry->getErrorMsg());
-            $killid = $qry->getInsertID();
-            // log entry
-            // $sql = "insert into kb3_log values ( ".$killid.", '".$_SERVER['REMOTE_ADDR']."', now() )";
-            // $qry = new DBQuery( $this->dbconn_, $sql );
-            // $qry->execute() or die ( $qry->getErrorMsg() );
-        }
-
-        return $killid;
-    }
-
-    function rollback($killid)
-    {
-        $qry = new DBQuery($this->dbconn_, "delete from _" . KB_SITE . "_kills where kll_id = " . $killid);
-        $qry->execute();
-
-        $qry = new DBQuery($this->dbconn_, "delete from _" . KB_SITE . "_involved where inv_kll_id = " . $killid);
-        $qry->execute();
-
-        $qry = new DBQuery($this->dbconn_, "delete from _" . KB_SITE . "_items_destroyed where itd_kll_id = " . $killid);
-        $qry->execute();
-    }
-
-    function getRawMail($killid, $site = "")
-    {
-        if ($site == "")
-            $site = KB_SITE;
-        $sql = "select kll.kll_timestamp, plt.plt_id, plt.plt_name, plt.plt_externalid, crp.crp_id, crp.crp_name, ali.all_id, ali.all_name, shp.shp_name, shp.shp_externalid, scl.scl_class, sys.sys_name, sys.sys_sec, kll.kll_system_id
-                from _" . $site . "_kills kll, kb3_pilots plt, kb3_corps crp,
-                     kb3_alliances ali, kb3_ships shp, kb3_ship_classes scl,
-                     kb3_systems sys
-       where kll.kll_id = " . $killid . "
-         and plt.plt_id = kll.kll_victim_id
-         and crp.crp_id = kll.kll_crp_id
-         and ali.all_id = kll.kll_all_id
-         and shp.shp_id = kll.kll_ship_id
-         and sys.sys_id = kll.kll_system_id
-         and scl.scl_id = shp.shp_class";
-
-        $qry = new DBQuery();
-        if (!$qry->execute($sql)) die($qry->getErrorMsg());
-        $row = $qry->getRow();
-
-        $mail .= substr(str_replace('-', '.' , $row['kll_timestamp']), 0, 16) . "\r\n\r\n";
-        $mail .= "Victim: " . $row['plt_name'] . "\r\n";
-        $mail .= "Alliance: " . $row['all_name'] . "\r\n";
-        $mail .= "Corp: " . $row['crp_name'] . "\r\n";
-        $mail .= "Destroyed: " . $row['shp_name'] . "\r\n";
-        $mail .= "System: " . $row['sys_name'] . "\r\n";
-        $mail .= "Security: " . roundsec($row['sys_sec']) . "\r\n\r\n";
-        $mail .= "Involved parties:\r\n\r\n";
-
-        $sql = "select plt.plt_id, plt.plt_name, plt.plt_externalid, crp.crp_name, ali.all_name, shp.shp_name, shp.shp_externalid, scl.scl_class,
-                 inv.inv_final_blow, itm.itm_name, inv.inv_sec_status
-            from _" . $site . "_involved inv, kb3_pilots plt, kb3_corps crp, kb3_alliances ali,
-             kb3_ships shp, kb3_ship_classes scl, kb3_items itm
-       where inv.inv_kll_id = " . $killid . "
-         and plt.plt_id = inv.inv_plt_id
-         and crp.crp_id = inv.inv_crp_id
-         and ali.all_id = inv.inv_all_id
-         and shp.shp_id = inv.inv_shp_id
-         and scl.scl_id = shp.shp_class
-         and itm.itm_id = inv.inv_wep_id
-      order by inv.inv_order";
-
-        $qry = new DBQuery();
-        $qry->execute($sql);
-
-        while ($row = $qry->getRow())
-        {
-            $mail .= "Name: " . $row['plt_name'];
-            if ($row['inv_final_blow'] == 1)
-                $mail .= " (laid the final blow)";
-            $mail .= "\r\n";
-
-            $mail .= "Security: " . $row['inv_sec_status'] . "\r\n";
-            $mail .= "Alliance: " . $row['all_name'] . "\r\n";
-            $mail .= "Corp: " . $row['crp_name'] . "\r\n";
-            $mail .= "Ship: " . $row['shp_name'] . "\r\n";
-            $mail .= "Weapon: " . $row['itm_name'] . "\r\n\r\n";
-        }
-
-        $sql = "select itd_quantity, itm.itm_name, itd.itd_itl_id
-            from _" . $site . "_items_destroyed itd, kb3_items itm
-           where itd.itd_kll_id = " . $killid . "
-             and itm.itm_id = itd.itd_itm_id
-           order by itd.itd_itl_id";
-
-        $qry = new DBQuery();
-        $qry->execute($sql) or die($qry->getErrorMsg());
-
-        if ($qry->recordCount())
-        {
-            $mail .= "\r\nDestroyed items:\r\n\r\n";
-
-            while ($row = $qry->getRow())
-            {
-                $mail .= $row['itm_name'];
-                if ($row['itd_quantity'] > 1)
-                    $mail .= ", Qty: " . $row['itd_quantity'];
-                if ($row['itd_itl_id'] == 4) // cargo
-                    $mail .= " (Cargo)";
-                if ($row['itd_itl_id'] == 6) // drone
-                    $mail .= " (Drone Bay)";
-                $mail .= "\r\n";
-            }
-        }
-
-        return $mail;
-    }
-
-    function getPostPassword()
-    {
-        $qry = new DBQuery($this->dbconn_, "select cfg_value from kb3_config where cfg_site = '" . KB_SITE . "' and cfg_key = 'post_password'");
-        $qry->execute();
-        $row = $qry->getRow();
-
-        return $row['cfg_value'];
-    }
-
-    function getPostMailto()
-    {
-        $qry = new DBQuery($this->dbconn_, "select cfg_value from kb3_config where cfg_site = '" . KB_SITE . "' and cfg_key = 'post_mailto'");
-        $qry->execute();
-        $row = $qry->getRow();
-
-        return $row['cfg_value'];
-    }
-
-    function setPostPassword($password)
-    {
-        $qry = new DBQuery($this->dbconn_, "update kb3_config set cfg_value = '" . $password . "' where cfg_site = '" . KB_SITE . "' and cfg_key = 'post_password'");
-        $qry->execute();
-    }
-
-    function setPostMailto($mailto)
-    {
-        $qry = new DBQuery($this->dbconn_, "update kb3_config set cfg_value = '" . $mailto . "' where cfg_site = '" . KB_SITE . "' and cfg_key = 'post_mailto'");
-        $qry->execute();
-    }
-
-    function isCorpUpdatable($crp_id, $timestamp)
-    {
-        $qry = new DBQuery($this->dbconn_,
-            "select crp_id from kb3_corps
-                            where crp_id = " . $crp_id . "
-                              and ( crp_updated < date_format('" . $timestamp . "', '%Y.%m.%d %H:%i') or crp_updated is null )");
-        $qry->execute() or die($qry->getErrorMsg());
-        return $qry->recordCount();
-    }
-
-    function isPilotUpdatable($plt_id, $timestamp)
-    {
-        $qry = new DBQuery($this->dbconn_,
-            "select plt_id from kb3_pilots
-                            where plt_id = " . $plt_id . "
-                              and ( plt_updated < date_format('" . $timestamp . "', '%Y.%m.%d %H:%i') or plt_updated is null )");
-        $qry->execute() or die($qry->getErrorMsg());
-
-        return $qry->recordCount();
-    }
-}
-*/
 ?>

dev/install/install_step4.php

@@ -20 +20 @@
             $optcnt++;
             $opt[$table][] = $file;
+            asort($opt[$table]);
         }
         else
@@ -26 +27 @@
             $datacnt++;
             $data[$table][] = $file;
-        }
-    }
-}
+            asort($data[$table]);
+        }
+    }
+}
+
 $db = mysql_pconnect($_SESSION['sql']['host'], $_SESSION['sql']['user'], $_SESSION['sql']['pass']);
 mysql_select_db($_SESSION['sql']['db']);
@@ -94 +97 @@
                     continue;
                 }
-                echo 'Inserting data ('.$i.'/'.$datacnt.') into '.$table.' from file '.$file.'...';
+                echo 'Inserting data ('.$i.'/'.$datacnt.') into '.$table.' from file '.$file.'...<br/>';
+
+                $error = '';
                 $querys = file('./sql/'.$file);
+                $lines = count($querys);
+                $errors = 0;
                 foreach ($querys as $query)
                 {
                     if (trim($query))
                     {
+                        $query_count++;
                         $id = mysql_query($query);
+                        if (!$id)
+                        {
+                            $error .= 'error: '.mysql_error().'<br/>';
+                            $errors++;
+                        }
                     }
                 }
-                if ($id)
+                echo 'File '.$file.' had '.$lines.' lines with '.$query_count.' querys. '.$errors.' Querys failed.<br/>';
+                if (!$error)
                 {
                     echo 'done<br/>';
@@ -111 +125 @@
                 else
                 {
-                    echo 'error: '.mysql_error().'<br/>';
+                    echo $error;
                     echo '<meta http-equiv="refresh" content="20; URL=?step=4&sub=data" />';
                     echo 'Automatic reload in 20s for next chunk because of the error occured. <a href="?step=4&sub=data">Manual Link</a><br/>';
@@ -179 +193 @@
     if (!$did)
     {
-        echo 'All tables imported. You can now create or search your corporation/alliance: <a href="?step=5">Continue</a><br/>';
         $stoppage = false;
-    }
-    echo '<a href="?step=4&sub=datasel&do=reset">Reset</a><br/>';
+        echo 'All tables imported. Checking tables for correct data...<br/>';
+        $check = file('./sql/tbl_check.txt');
+        foreach ($check as $line)
+        {
+            $tmp = explode(chr(9), $line);
+            $table = trim($tmp[0]);
+            $count = trim($tmp[1]);
+            echo 'Checking table '.$table.': ';
+            $result = mysql_query('SELECT count(*) as cnt FROM '.$table);
+            $test = mysql_fetch_array($result);
+            if ($test['cnt'] != $count)
+            {
+                echo $test['cnt'].'/'.$count.' - FAILED';
+                $stoppage = true;
+            }
+            else
+            {
+                echo $test['cnt'].'/'.$count.' - PASSED';
+            }
+            echo '<br/>';
+        }
+        if ($stoppage)
+        {
+            echo 'There has been an error with one of the tables, please <a href="?step=4&do=reset">Reset</a> and try again.<br/>';
+        }
+        else
+        {
+            echo '<br/>All tables passed.<br/>';
+            echo 'You can now create or search your corporation/alliance: <a href="?step=5">Next Step</a><br/>';
+        }
+    }
+    echo '<br/>Use <a href="?step=4&sub=datasel&do=reset">Reset</a> to step back to the sql-opt select.<br/>';
 }
 ?>
@@ -197 +240 @@
 if (!$structadd && $_REQUEST['sub'] != 'datasel' && $_REQUEST['sub'] != 'data')
 {
-    echo 'All table structures seem to be in the database, please continue with <a href="?step=4&sub=datasel">Importing Data</a><br/>';
+    echo 'All table structures seem to be in the database.<br/>';
+    echo 'I will now check some table structures in case you are upgrading from a previous version... ';
+    include('install_step4_tblchk.php');
+    echo 'done<br/>Please continue with <a href="?step=4&sub=datasel">Importing Data</a><br/>';
+
     echo '<br/><br/>In case you aborted the install and you got already data in those table you can bypass the import now by with <a href="?step=5">this link</a><br/>';
+    echo 'To be sure i will check some table data for you now:<br/>';
+    $check = file('./sql/tbl_check.txt');
+    foreach ($check as $line)
+    {
+        $tmp = explode(chr(9), $line);
+        $table = trim($tmp[0]);
+        $count = trim($tmp[1]);
+        echo 'Checking table '.$table.': ';
+        $result = mysql_query('SELECT count(*) as cnt FROM '.$table);
+        $test = mysql_fetch_array($result);
+        $failed = 0;
+        if ($test['cnt'] != $count)
+        {
+            echo $test['cnt'].'/'.$count.' - FAILED';
+            $failed++;
+        }
+        else
+        {
+            echo $test['cnt'].'/'.$count.' - PASSED';
+        }
+        echo '<br/>';
+    }
+    echo 'Checking table kb3_items: ';
+    $result = mysql_query('SELECT count(*) as cnt FROM kb3_items');
+    $test = mysql_fetch_array($result);
+    $failed = 0;
+    if ($test['cnt'] <= 5000)
+    {
+        echo $test['cnt'].'<5000 - FAILED';
+        $failed++;
+    }
+    else
+    {
+        echo $test['cnt'].'>5000 - PASSED';
+    }
+    echo '<br/>';
+    if (!$failed)
+    {
+        echo 'All important table data seems to be there, you are safe to bypass the import.<br/>';
+    }
+    else
+    {
+        echo 'There was an error in one of the important tables, please run the import.<br/>';
+    }
 }
 elseif ($structadd)

dev/install/sql/sql_tbldata_ships.sql

@@ -360 +360 @@
 INSERT IGNORE INTO `kb3_ships` VALUES ('425','Hurricane','10','3','4','0','1');
 INSERT IGNORE INTO `kb3_ships` VALUES ('426','Myrmidon','10','4','1','0','1');
-INSERT IGNORE INTO `kb3_ships` VALUES ('427','Abbadon','1','5','3','0','1');
+INSERT IGNORE INTO `kb3_ships` VALUES ('427','Abaddon','1','5','3','0','1');
 INSERT IGNORE INTO `kb3_ships` VALUES ('428','Hyperion','1','6','1','0','1');
 INSERT IGNORE INTO `kb3_ships` VALUES ('429','Maelstrom','1','7','4','0','1');

dev/templates/block_comments.tpl

@@ -2 +2 @@
 <table class="kb-table" width="360" border="0" cellspacing="1" border="0">
   <tr>
-    <td width="360" align="left" valign="top">
-      <table width="360" border="0" cellspacing="0" border="0">
+    <td width="100%" align="left" valign="top">
+      <table width="100%" border="0" cellspacing="0" border="0">
 {cycle reset=true print=false name=ccl values="kb-table-row-even,kb-table-row-odd"}{section name=i loop=$comments}
         <tr class="{cycle name=ccl}">