Changeset 399

Timestamp:

07/01/09 05:50:14 (13 years ago)

Author:

kovell

Message:

Fixes: autoupgrade smoother, Rare errors in db classes reduced, api login problems reduced, page cache notifications check if cache is active. admin mod list sorted. alliance and corp details pages load faster. all-time summary tables cached. killlist performance on large databases improved

Location:

dev

Files:

• common/admin/admin_mods.php (modified) (2 diffs)
• common/alliance_detail.php (modified) (6 diffs)
• common/corp_detail.php (modified) (4 diffs)
• common/includes/autoupgrade.php (modified) (9 diffs)
• common/includes/class.cache.php (modified) (1 diff)
• common/includes/class.db.mysqli.php (modified) (1 diff)
• common/includes/class.db.php (modified) (1 diff)
• common/includes/class.db_cache.php (modified) (1 diff)
• common/includes/class.db_memcache.php (modified) (1 diff)
• common/includes/class.kill.php (modified) (3 diffs)
• common/includes/class.killlist.php (modified) (3 diffs)
• common/includes/class.killsummarytable.php (modified) (2 diffs)
• common/includes/class.summary.php (added)
• common/includes/db.php (modified) (1 diff)
• common/includes/globals.php (modified) (2 diffs)
• common/index.php (modified) (2 diffs)
• common/pilot_detail.php (modified) (1 diff)
• mods/apiuser/login.php (modified) (1 diff)

dev/common/admin/admin_mods.php

@@ -32 +32 @@
 if ($handle = opendir('mods'))
 {
+        $modlist = array();
     while ($file = readdir($handle))
     {
         if (is_dir("mods/$file") && $file != ".." &$file != "." &$file != ".svn")
         {
-            $html .= "<tr class=kb-table-row-odd style=\"height: 34px;\">";
+            $modhtml = "<tr class=kb-table-row-odd style=\"height: 34px;\">";
             $id = $file;
 
@@ -51 +52 @@
                 $file .= " [<a href=\"?a=settings_$file\">settings</a>]";
             }
-            $html .= "<td>$file</td><td align=center><input name=\"mod_$id\" type=\"checkbox\"$checked/></td></tr>";
+            $modhtml .= "<td>$file</td><td align=center><input name=\"mod_$id\" type=\"checkbox\"$checked/></td></tr>";
+                        $modlist[] = $modhtml;
         }
     }
+        asort($modlist);
+        $html.=implode($modlist);
+
     closedir($handle);
 }

dev/common/alliance_detail.php

@@ -108 +108 @@
 {
     case "":
-        $html .= "<div class=kb-kills-header>10 Most recent kills</div>";
+        $html .= "<div class=kb-kills-header>10 Most recent kills in the last 30 days</div>";
 
         $list = new KillList();
         $list->setOrdered(true);
-    $list->setCountComments(true);
-    $list->setCountInvolved(true);
+                if (config::get('comments_count')) $list->setCountComments(true);
+                if (config::get('killlist_involved')) $list->setCountInvolved(true);
         $list->setLimit(10);
         $list->setPodsNoobships(true);
@@ -119 +119 @@
         if ($_GET['scl_id'])
             $list->addVictimShipClass(new ShipClass($_GET['scl_id']));
-
+                $list->setStartDate(date('Y-m-d H:i',strtotime('- 30 days')));
         $ktab = new KillListTable($list);
         $ktab->setLimit(10);
@@ -125 +125 @@
         $html .= $ktab->generate();
 
-        $html .= "<div class=kb-losses-header>10 Most recent losses</div>";
+        $html .= "<div class=kb-losses-header>10 Most recent losses in the last 30 days</div>";
 
         $list = new KillList();
         $list->setOrdered(true);
-    $list->setCountComments(true);
-    $list->setCountInvolved(true);
+                if (config::get('comments_count')) $list->setCountComments(true);
+                if (config::get('killlist_involved')) $list->setCountInvolved(true);
         $list->setLimit(10);
         $list->setPodsNoobships(true);
@@ -136 +136 @@
         if ($_GET['scl_id'])
             $list->addVictimShipClass(new ShipClass($_GET['scl_id']));
+                $list->setStartDate(date('Y-m-d H:i',strtotime('- 30 days')));
 
         $ltab = new KillListTable($list);
@@ -148 +149 @@
         $list = new KillList();
         $list->setOrdered(true);
-    $list->setCountComments(true);
-    $list->setCountInvolved(true);
-        $list->addInvolvedAlliance($alliance);
+                $list->addInvolvedAlliance($alliance);
         if ($_GET['scl_id'])
             $list->addVictimShipClass(new ShipClass($_GET['scl_id']));
@@ -166 +165 @@
         $list = new KillList();
         $list->setOrdered(true);
-    $list->setCountComments(true);
-    $list->setCountInvolved(true);
-        $list->setPodsNoobships(true);
+                $list->setPodsNoobships(true);
         $list->addVictimAlliance($alliance);
         if ($_GET['scl_id'])

dev/common/corp_detail.php

@@ -199 +199 @@
 {
     case "":
-        $html .= "<div class=kb-kills-header>10 Most recent kills</div>";
+        $html .= "<div class=kb-kills-header>10 Most recent kills in the last 30 days</div>";
 
         $list = new KillList();
@@ -208 +208 @@
         if ($_GET['scl_id'])
             $list->addVictimShipClass(new ShipClass($_GET['scl_id']));
+                $list->setStartDate(date('Y-m-d H:i',strtotime('- 30 days')));
 
         $ktab = new KillListTable($list);
@@ -214 +215 @@
         $html .= $ktab->generate();
 
-        $html .= "<div class=kb-losses-header>10 Most recent losses</div>";
+        $html .= "<div class=kb-losses-header>10 Most recent losses in the last 30 days</div>";
 
         $list = new KillList();
@@ -223 +224 @@
         if ($_GET['scl_id'])
             $list->addVictimShipClass(new ShipClass($_GET['scl_id']));
+                $list->setStartDate(date('Y-m-d H:i',strtotime('- 30 days')));
 
         $ltab = new KillListTable($list);

dev/common/includes/autoupgrade.php

@@ -27 +27 @@
                 update007();
                 update008();
+                update009();
         }
 }
@@ -181 +182 @@
 function update007()
 {
+        if(!config::get('007updatestatus')) config::set('007updatestatus',0);
         //Checking if this Update already done
         if (CURRENT_DB_UPDATE < "007" )
@@ -231 +233 @@
 */
                 $qry->execute("SHOW COLUMNS FROM kb3_kills LIKE 'kll_external_id'");
-                $testresult = $qry->recordCount();
-                if(!$testresult)
+                if(!$qry->recordCount())
                 {
                         $sql = "ALTER TABLE `kb3_kills` ".
@@ -240 +241 @@
                 }
                 // Add isk loss column to kb3_kills
-                $qry->execute("SHOW COLUMNS FROM kb3_kills LIKE 'kll_isk_loss'");
-                $sql = "ALTER TABLE `kb3_kills` ADD `kll_isk_loss` FLOAT NOT NULL DEFAULT '0'";
-                if(!$qry->recordCount()) $qry->execute($sql);
-                // Update price with items destroyed and ship value, excluding
-                // blueprints since default cost is for BPO and BPC looks identical
-                $sql = "CREATE TABLE IF NOT EXISTS `tmp_pricing` (
-                  `kll_id` int(11) NOT NULL DEFAULT '0',
-                  `ship` float NOT NULL DEFAULT '0',
-                  `destroyed` float NOT NULL DEFAULT '0',
-                  `dropped` float NOT NULL DEFAULT '0',
-                  PRIMARY KEY (`kll_id`),
-                  KEY `ship` (`ship`),
-                  KEY `destroyed` (`destroyed`),
-                  KEY `dropped` (`dropped`)
-                ) ENGINE=MyISAM";
-                $qry->execute($sql);
-                $qry->execute('SELECT * FROM tmp_pricing limit 1');
-                if(!$qry->recordCount()) $qry->execute("INSERT INTO tmp_pricing select kll_id,0,0,0 FROM kb3_kills");
-                $sql = "update tmp_pricing inner join kb3_kills on kb3_kills.kll_id = tmp_pricing.kll_id
-                        INNER JOIN kb3_ships ON kb3_ships.shp_id = kll_ship_id
-                        LEFT JOIN kb3_ships_values ON kb3_ships_values.shp_id = kll_ship_id
-                                set ship = if(isnull(shp_value),shp_baseprice,shp_value)
-                        where ship = 0";
-                $qry->execute($sql);
-                $sql = "UPDATE tmp_pricing
-                        INNER JOIN (SELECT itd_kll_id,
-                        sum(if(typeName LIKE '%Blueprint%',0,if(isnull(itd_quantity),
-                        0,itd_quantity * if(price = 0 OR isnull(price),basePrice,price))))
-                        AS killcost
-                        FROM kb3_items_destroyed
-                        LEFT JOIN kb3_item_price ON kb3_item_price.typeID = itd_itm_id
-                        LEFT JOIN kb3_invtypes ON itd_itm_id = kb3_invtypes.typeID
-                        GROUP BY itd_kll_id) cost on kll_id = itd_kll_id
-                        SET destroyed =  killcost
-                        WHERE destroyed = 0";
-                $qry->execute($sql);
-                if(config::get(kd_droptototal))
-                        $sql = "UPDATE tmp_pricing
-                        INNER JOIN (SELECT itd_kll_id,
-                        sum(if(typeName LIKE '%Blueprint%',0,if(isnull(itd_quantity),
-                        0,itd_quantity * if(price = 0 OR isnull(price),basePrice,price))))
-                        AS killcost
-                        FROM kb3_items_dropped
-                        LEFT JOIN kb3_item_price ON kb3_item_price.typeID = itd_itm_id
-                        LEFT JOIN kb3_invtypes ON itd_itm_id = kb3_invtypes.typeID
-                        GROUP BY itd_kll_id) cost on kll_id = itd_kll_id
-                        SET dropped =  killcost
-                        WHERE dropped = 0";
-                $qry->execute($sql);
-                $qry->execute('UPDATE kb3_kills inner join tmp_pricing
-                        ON kb3_kills.kll_id = tmp_pricing.kll_id SET kll_isk_loss = ship + destroyed + dropped');
-                $qry->execute('DROP TABLE tmp_pricing');
+                if(config::get('007updatestatus') <8)
+                {
+                        // Update price with items destroyed and ship value, excluding
+                        // blueprints since default cost is for BPO and BPC looks identical
+                        $sql = "CREATE TABLE IF NOT EXISTS `tmp_price_ship` (
+                          `kll_id` int(11) NOT NULL DEFAULT '0',
+                          `value` float NOT NULL DEFAULT '0',
+                          PRIMARY KEY (`kll_id`)
+                        ) ENGINE=MyISAM";
+                        $qry->execute($sql);
+                        $sql = "CREATE TABLE IF NOT EXISTS `tmp_price_destroyed` (
+                          `kll_id` int(11) NOT NULL DEFAULT '0',
+                          `value` float NOT NULL DEFAULT '0',
+                          PRIMARY KEY (`kll_id`)
+                        ) ENGINE=MyISAM";
+                        $qry->execute($sql);
+                        $sql = "CREATE TABLE IF NOT EXISTS `tmp_price_dropped` (
+                          `kll_id` int(11) NOT NULL DEFAULT '0',
+                          `value` float NOT NULL DEFAULT '0',
+                          PRIMARY KEY (`kll_id`)
+                        ) ENGINE=MyISAM";
+                        $qry->execute($sql);
+                        $qry->execute("LOCK TABLES tmp_price_ship WRITE, tmp_price_destroyed WRITE, 
+                                tmp_price_dropped WRITE, kb3_kills WRITE, kb3_ships WRITE,
+                                kb3_ships_values WRITE, kb3_items_destroyed WRITE, kb3_items_dropped WRITE,
+                                kb3_invtypes WRITE, kb3_item_price WRITE, kb3_config WRITE");
+                        if(config::get('007updatestatus') <1)
+                        {
+                                if(!$qry->recordCount()) $qry->execute("INSERT IGNORE INTO tmp_price_ship select
+                                        kll_id,if(isnull(shp_value),shp_baseprice,shp_value) FROM kb3_kills 
+                                        INNER JOIN kb3_ships ON kb3_ships.shp_id = kll_ship_id
+                                        LEFT JOIN kb3_ships_values ON kb3_ships_values.shp_id = kll_ship_id");
+                                $qry->execute($sql);
+                                config::set('007updatestatus',1);
+                        }
+                        if(config::get('007updatestatus') <2)
+                        {
+                                $sql = "INSERT IGNORE INTO tmp_price_destroyed
+                                        SELECT itd_kll_id,
+                                        sum(if(typeName LIKE '%Blueprint%',0,if(isnull(itd_quantity),
+                                        0,itd_quantity * if(price = 0 OR isnull(price),basePrice,price))))
+                                        FROM kb3_items_destroyed
+                                        LEFT JOIN kb3_item_price ON kb3_item_price.typeID = itd_itm_id
+                                        LEFT JOIN kb3_invtypes ON itd_itm_id = kb3_invtypes.typeID
+                                        GROUP BY itd_kll_id";
+                                $qry->execute($sql);
+                                config::set('007updatestatus',2);
+                        }
+                        if(0 && config::get('007updatestatus') <3)
+                        {
+                                $sql = "UPDATE tmp_pricing
+                                        INNER JOIN tmp_price on tmp_pricing.kll_id = tmp_price.kll_id
+                                        SET tmp_pricing.destroyed =  tmp_price.value
+                                        WHERE destroyed = 0";
+                                $qry->execute($sql);
+                                config::set('007updatestatus',3);
+                        }
+                        if(0 && config::get('007updatestatus') <4)
+                        {
+                                $qry->execute('DELETE FROM tmp_price');
+                                config::set('007updatestatus',4);
+                        }
+                        if(config::get('007updatestatus') <5)
+                        {
+                                if(config::get(kd_droptototal))
+                                {
+                                        $sql = "INSERT INTO tmp_price_dropped
+                                                SELECT itd_kll_id,
+                                                sum(if(typeName LIKE '%Blueprint%',0,if(isnull(itd_quantity),
+                                                0,itd_quantity * if(price = 0 OR isnull(price),basePrice,price))))
+                                                FROM kb3_items_dropped
+                                                LEFT JOIN kb3_item_price ON kb3_item_price.typeID = itd_itm_id
+                                                LEFT JOIN kb3_invtypes ON itd_itm_id = kb3_invtypes.typeID
+                                                GROUP BY itd_kll_id";
+                                        $qry->execute($sql);
+                                }
+                                config::set('007updatestatus',5);
+                        }
+                        if(0 && config::get('007updatestatus') <6)
+                        {
+                                $sql = "UPDATE tmp_pricing
+                                        INNER JOIN tmp_price on tmp_pricing.kll_id = tmp_price.kll_id
+                                        SET tmp_pricing.dropped = tmp_price.value";
+                                $qry->execute($sql);
+                                config::set('007updatestatus',6);
+                        }
+                        if(config::get('007updatestatus') <7)
+                        {
+                                $qry->execute("SHOW COLUMNS FROM kb3_kills LIKE 'kll_isk_loss'");
+                                if(!$qry->recordCount()) $qry->execute("ALTER TABLE `kb3_kills` ADD `kll_isk_loss` FLOAT NOT NULL DEFAULT '0'");
+                                config::set('007updatestatus',7);
+                        }
+                        if(config::get('007updatestatus') <8)
+                        {$sql = 'UPDATE kb3_kills 
+                                        natural join tmp_price_ship 
+                                        natural left join tmp_price_destroyed ';
+                                if(config::get(kd_droptototal)) $sql .= ' natural left join tmp_price_dropped ';
+                                $sql .= 'SET kb3_kills.kll_isk_loss = tmp_price_ship.value + ifnull(tmp_price_destroyed.value,0) ';
+                                if(config::get(kd_droptototal)) $sql .= ' + ifnull(tmp_price_dropped.value,0) ';
+                                $qry->execute ($sql);
+                                config::set('007updatestatus',8);
+                        }
+                        $qry->execute("UNLOCK TABLES");
+                        $qry->execute('DROP TABLE tmp_price_ship');
+                        $qry->execute('DROP TABLE tmp_price_destroyed');
+                        $qry->execute('DROP TABLE tmp_price_dropped');
+                }
                 $qry->execute("SHOW COLUMNS FROM kb3_kills LIKE 'kll_fb_crp_id'");
                 if($qry->recordCount()) $qry->execute("ALTER TABLE `kb3_kills` DROP `kll_fb_crp_id`");
@@ -339 +395 @@
                         ) ENGINE = MYISAM ");
 
-                // set update complete
+                // set API update complete
                 config::set('API_DBUpdate', '1');
 
@@ -353 +409 @@
                         $qry->execute("UPDATE `kb3_item_types` SET `itt_slot` = '7' WHERE `kb3_item_types`.`itt_id` = 958 LIMIT 1");
                 }
-                $qry->execute("TRUNCATE kb3_inv_all");
-                $qry->execute("TRUNCATE kb3_inv_crp");
-                $qry->execute("TRUNCATE kb3_inv_plt");
-                
+                $qry->execute('SHOW TABLES');
+                $qry2 = new DBQuery(true);
+                while($row = $qry->getRow())
+                {
+                        $tablename = implode($row);
+                        if($tablename == 'kb3_inv_all') $qry2->execute("TRUNCATE kb3_inv_all");
+                        if($tablename == 'kb3_inv_crp') $qry2->execute("TRUNCATE kb3_inv_crp");
+                        if($tablename == 'kb3_inv_plt') $qry2->execute("TRUNCATE kb3_inv_plt");
+                }
+                killCache();
+                config::del('007updatestatus');
                 config::set("DBUpdate","007");
         }
@@ -451 +514 @@
                                 if(!$indexcexists) $qry->execute("ALTER TABLE `kb3_corps` DROP INDEX `".$indexcname."`");
                                 $qry->execute("ALTER TABLE `kb3_corps` ADD UNIQUE INDEX ( `crp_name` ) ");
+
+
                                 config::set('008updatestatus', 7);
                         }
@@ -561 +626 @@
                 config::set('cache_update', '*');
                 config::set('cache_time', '10');
+
+                killCache();
                 config::set("DBUpdate", "008");
+        }
+}
+
+// Add alliance and corp summary tables.
+function update009()
+{
+        //Checking if this Update already done
+        if (CURRENT_DB_UPDATE < "009" )
+        {
+                $qry = new DBQuery();
+                $sql = "CREATE TABLE IF NOT EXISTS `kb3_sum_alliance` (
+                  `asm_all_id` int(11) NOT NULL DEFAULT '0',
+                  `asm_shp_id` int(3) NOT NULL DEFAULT '0',
+                  `asm_kill_count` int(11) NOT NULL DEFAULT '0',
+                  `asm_kill_isk` float NOT NULL DEFAULT '0',
+                  `asm_loss_count` int(11) NOT NULL DEFAULT '0',
+                  `asm_loss_isk` float NOT NULL DEFAULT '0',
+                  PRIMARY KEY (`asm_all_id`,`asm_shp_id`)
+                ) ENGINE=InnoDB";
+                $qry->execute($sql);
+                $sql = "CREATE TABLE IF NOT EXISTS `kb3_sum_corp` (
+                  `csm_crp_id` int(11) NOT NULL DEFAULT '0',
+                  `csm_shp_id` int(3) NOT NULL DEFAULT '0',
+                  `csm_kill_count` int(11) NOT NULL DEFAULT '0',
+                  `csm_kill_isk` float NOT NULL DEFAULT '0',
+                  `csm_loss_count` int(11) NOT NULL DEFAULT '0',
+                  `csm_loss_isk` float NOT NULL DEFAULT '0',
+                  PRIMARY KEY (`csm_crp_id`,`csm_shp_id`)
+                ) ENGINE=InnoDB";
+                $qry->execute($sql);
+                config::set("DBUpdate", "009");
         }
 }
@@ -591 +689 @@
 }
 
+function killCache()
+{
+        if(!is_dir(KB_CACHEDIR)) return;
+        $dir = opendir(KB_CACHEDIR);
+        while ($line = readdir($dir))
+        {
+                if (strstr($line, 'qcache_qry') !== false)
+                {
+                        @unlink(KB_CACHEDIR.'/'.$line);
+                }
+                elseif (strstr($line, 'qcache_tbl') !== false)
+                {
+                        @unlink(KB_CACHEDIR.'/'.$line);
+                }
+        }
+}
 ?>

dev/common/includes/class.cache.php

@@ -171 +171 @@
         function touchCache()
         {
-                touch(genCacheName());
+                if(! KB_CACHE ) return;
+                if (!file_exists(KB_CACHEDIR.'/'.KB_SITE))
+                        mkdir(KB_CACHEDIR.'/'.KB_SITE);
+                touch(cache::genCacheName());
         }
         //! Notify the cache that a kill has been added.
         function notifyKillAdded()
         {
+                if(! KB_CACHE ) return;
+                if (!file_exists(KB_CACHEDIR.'/'.KB_SITE))
+                        mkdir(KB_CACHEDIR.'/'.KB_SITE);
                 touch(KB_CACHEDIR.'/'.KB_SITE.'/killadded.mk');
         }

dev/common/includes/class.db.mysqli.php

@@ -2 +2 @@
 // mssql: select SCOPE_IDENTITY() AS id
 // postgresql: INSERT INTO mytable (lastname) VALUES ('Cher') RETURNING id;
-
-require_once('db.php');
 
 //! mysqli connection class.

dev/common/includes/class.db.php

@@ -301 +301 @@
                     file_put_contents($qerrfile, $sql . "\nExecution time: " . $this->exectime_ . "\n", FILE_APPEND);
             }
+                        if(DB_TYPE != 'mysqli') return;
             if (KB_PROFILE == 3)
             {

dev/common/includes/class.db_cache.php

@@ -1 +1 @@
 <?php
-
-require_once('db.php');
 
 //! mysqli file-cached query class. Manages SQL queries to a MySQL DB using mysqli.

dev/common/includes/class.db_memcache.php

@@ -1 +1 @@
 <?php
-
-require_once('db.php');
 
 class DBMemcachedQuery

dev/common/includes/class.kill.php

@@ -9 +9 @@
 require_once('common/includes/class.itemlist.php');
 require_once('common/includes/class.cache.php');
+require_once('common/includes/class.summary.php');
 
 class Kill
@@ -1099 +1100 @@
                         return false;
                 }
+                allianceSummary::addKill($this);
+                corpSummary::addKill($this);
                 $qry->autocommit(true);
                 // call the event that we added this mail
@@ -1218 +1221 @@
         function getFormatttedValue()
         {
-                return getFormattedValue();
-        }
-
+                return $this->getFormattedValue();
+        }
+        //! Return value formatted into millions or thousands.
         function getFormattedValue()
         {

dev/common/includes/class.killlist.php

@@ -70 +70 @@
                 else
                                 {
-                                        $this->sql_ .= 'select kll.kll_id, kll.kll_timestamp, kll.kll_external_id,
+                                        $this->sql_ .= 'select distinct kll.kll_id, kll.kll_timestamp, kll.kll_external_id,
                                                                 plt.plt_name, crp.crp_name, crp.crp_id,
                                                                 ali.all_name, ali.all_id,
@@ -139 +139 @@
             if( $datefilter == "" && ( $this->inv_plt_ || $this->inv_crp_ || $this->inv_all_))
             {
+                                $this->sql_ .= " INNER JOIN kb3_inv_detail ind ON (kll.kll_id = ind.ind_kll_id AND (";
+                                $invop = "";
+                                if($this->inv_plt_ )
+                                {
+                                        $this->sql_ .= " ind.ind_plt_id IN (".
+                                                implode(',', $this->inv_plt_)." ) ";
+                                        $invop = "OR";
+                                }
+                                if($this->inv_crp_ )
+                                {
+                                        $this->sql_ .= $invop." ind.ind_crp_id IN (".
+                                                implode(',', $this->inv_crp_)." ) ";
+                                }
+                                if($this->inv_all_ )
+                                {
+                                        $this->sql_ .= $invop." ind.ind_all_id IN (".
+                                                implode(',', $this->inv_all_)." ) ";
+                                }
+                                $this->sql_ .= ") ) ";
+/* Faster on <50k mails, much slower on >500k
                                 $this->sql_ .= " INNER JOIN ";
                                 if($this->inv_plt_ && !($this->inv_crp_ || $this->inv_all_))
@@ -167 +187 @@
                                         $this->sql_ .= ") ind ON (kll.kll_id = ind.ind_kll_id) ";
                                 }
+*/
             }
             // The first argument after WHERE affects sql optimisation so check

dev/common/includes/class.killsummarytable.php

@@ -1 +1 @@
 <?php
 require_once("class.ship.php");
+require_once("class.summary.php");
 
 class KillSummaryTable
@@ -156 +157 @@
                         echo 'mode not supported<br>';
                         exit;
+                }
+                if( count($this->inv_all_) == 1 && !$this->inv_crp_ && !$this->inv_plt_ && $this->setDateFilter() == "")
+                {
+                        $allsum = new allianceSummary($this->inv_all_[0]);
+                        $summary = $allsum->getSummary();
+                        foreach($summary as $key => $row)
+                        {
+                                $this->entry_[$row['class_name']] = array('id' => $key,
+                                        'kills' => $row['killcount'], 'kills_isk' => $row['killisk'],
+                                        'losses' => $row['losscount'], 'losses_isk' => $row['lossisk']);
+
+                                $this->tkcount_ += $row['killcount'];
+                                $this->tkisk_ += $row['killisk'];
+                                $this->tlcount_ += $row['losscount'];
+                                $this->tlisk_ += $row['lossisk'];
+                        }
+                        return;
+                }
+
+                if( count($this->inv_crp_) == 1 && !$this->inv_all_ && !$this->inv_plt_ && $this->setDateFilter() == "")
+                {
+                        $crpsum = new corpSummary($this->inv_crp_[0]);
+                        $summary = $crpsum->getSummary();
+                        foreach($summary as $key => $row)
+                        {
+                                $this->entry_[$row['class_name']] = array('id' => $key,
+                                        'kills' => $row['killcount'], 'kills_isk' => $row['killisk'],
+                                        'losses' => $row['losscount'], 'losses_isk' => $row['lossisk']);
+
+                                $this->tkcount_ += $row['killcount'];
+                                $this->tkisk_ += $row['killisk'];
+                                $this->tlcount_ += $row['losscount'];
+                                $this->tlisk_ += $row['lossisk'];
+                        }
+                        return;
                 }
 

dev/common/includes/db.php

@@ -5 +5 @@
 require_once('common/includes/class.config.php');
 
+if(!defined('DB_TYPE')) define('DB_TYPE', 'mysql');
 if(DB_TYPE == 'mysqli' and function_exists('mysqli_connect')) define('DB_TYPE_USED', 'mysqli');
 if(DB_TYPE_USED == 'mysqli') require_once('common/includes/class.db.mysqli.php');

dev/common/includes/globals.php

@@ -7 +7 @@
 else
 {
-        $svn_rev = '398';
+        $svn_rev = '399';
 }
 define('SVN_REV', $svn_rev);
@@ -13 +13 @@
 // current version: major.minor.sub
 // unpair numbers for minor = development version
-define('KB_VERSION', '2.0.0 RC1');
+define('KB_VERSION', '2.0.0 RC2');
 define('KB_RELEASE', '(Apocrypha)');
 

dev/common/index.php

@@ -74 +74 @@
 define('KB_TITLE', config::get('cfg_kbtitle'));
 
-// corporation OR alliance id
-if (config::get('cfg_pilotid'))
-{
-define('PILOT_ID', config::get('cfg_corpid') );
-define('CORP_ID', 0);
-define('ALLIANCE_ID', 0);
-}
-if (config::get('cfg_corpid'))
-{
-define('PILOT_ID', 0);
-define('CORP_ID', config::get('cfg_corpid'));
-define('ALLIANCE_ID', 0);
-}
-else
-{
-define('PILOT_ID', 0);
-define('CORP_ID', 0);
-define('ALLIANCE_ID', config::get('cfg_allianceid'));
+// pilot id not fully implemented yet.
+if (0 && config::get('cfg_pilotid'))
+{
+        define('PILOT_ID', config::get('cfg_pilotid') );
+        define('CORP_ID', 0);
+        define('ALLIANCE_ID', 0);
+}
+elseif (config::get('cfg_corpid'))
+{
+        define('PILOT_ID', 0);
+        define('CORP_ID', config::get('cfg_corpid'));
+        define('ALLIANCE_ID', 0);
+}
+else
+{
+        define('PILOT_ID', 0);
+        define('CORP_ID', 0);
+        define('ALLIANCE_ID', config::get('cfg_allianceid'));
 }
 
@@ -138 +138 @@
 
 // Hardcode the DBUpdate
-define(LASTEST_DB_UPDATE,"008");
+define(LASTEST_DB_UPDATE,"009");
 
 if(config::get('DBUpdate') < LASTEST_DB_UPDATE) $page = 'admin';

dev/common/pilot_detail.php

@@ -82 +82 @@
 else
 {
-        $pilot_survival = round($llist->getCount() / ($tklist->getCount() + $llist->getCount()) * 100,2);
-        $pilot_efficiency = round(($klist->getISK() / ($klist->getISK() + $llist->getISK())) * 100,2);
+        if($tklist->getCount() + $llist->getCount()) $pilot_survival = round($llist->getCount() / ($tklist->getCount() + $llist->getCount()) * 100,2);
+        else $pilot_survival = 0;
+        if($klist->getISK() + $llist->getISK()) $pilot_efficiency = round(($klist->getISK() / ($klist->getISK() + $llist->getISK())) * 100,2);
+        else $pilot_efficiency = 0;
 }
 

dev/mods/apiuser/login.php

@@ -6 +6 @@
 {
  $result = user::login($_POST['usrlogin'], $_POST['usrpass']);
-    if ( $_POST['usrlogin'] == '' && $_POST['usrpass'] == ADMIN_PASSWORD || user::role('admin')     )
+    if ( $_POST['usrlogin'] == '' &&
+                (crypt($_POST['usrpass'],ADMIN_PASSWORD) == ADMIN_PASSWORD || $_POST['usrpass'] == ADMIN_PASSWORD)
+                || user::role('admin')     )
     {
         session::create(true);