Changeset 382 for dev

Timestamp:

06/21/09 12:16:24 (13 years ago)

Author:

kovell

Message:

Admin setting clarifications, autoupgrade uses existing kill settings.

Location:

dev/common

Files:

• admin/option_acache.php (modified) (1 diff)
• admin/option_appearance.php (modified) (1 diff)
• includes/autoupgrade.php (modified) (1 diff)
• includes/class.apicache.php (modified) (1 diff)
• includes/db.php (modified) (1 diff)

dev/common/admin/option_acache.php

@@ -28 +28 @@
 options::fadd('Reinforcement threshold', 'reinforced_threshold', 'edit:size:4');
 options::fadd('Disabling threshold', 'reinforced_disable_threshold', 'edit:size:4');
-options::fadd('Reinforcement chance', 'reinforced_prob', 'edit:size:4');
-options::fadd('Reinforcement end chance', 'reinforced_rf_prob', 'edit:size:4');
+options::fadd('Reinforcement chance (1/x)', 'reinforced_prob', 'edit:size:4');
+options::fadd('Reinforcement end chance (1/x)', 'reinforced_rf_prob', 'edit:size:4');
 
 class admin_acache

dev/common/admin/option_appearance.php

@@ -23 +23 @@
 options::fadd('Display combined kills and losses on Front Page', 'show_comb_home', 'checkbox');
 options::fadd('Display comment count on Front Page', 'comments_count', 'checkbox');
+options::fadd('Display involved count on Front Page', 'killlist_involved', 'checkbox');
 options::fadd('Display alliance logos on Front Page', 'killlist_alogo', 'checkbox');
-options::fadd('Display involved count on Front Page', 'killlist_involved', 'checkbox');
 options::fadd('Show Corp: / Alliance: on Front Page', 'corpalliance-name', 'checkbox');
 options::fadd('Display clock on Front Page', 'show_clock', 'checkbox');
 
 options::cat('Appearance', 'Front Page', 'Kill Summary Tables');
-options::fadd('Amount in each Row', 'summarytable_rowcount', 'edit:size:2');
+options::fadd('Amount in each Column', 'summarytable_rowcount', 'edit:size:2');
 options::fadd('Display a summary line below a Summary Table', 'summarytable_summary', 'checkbox');
 options::fadd('Display efficiency in the summary line', 'summarytable_efficiency', 'checkbox');

dev/common/includes/autoupgrade.php

@@ -242 +242 @@
                 // Update price with items destroyed and ship value, excluding
                 // blueprints since default cost is for BPO and BPC looks identical
-                $sql = "UPDATE kb3_kills NATURAL JOIN (SELECT kll_id, ".
-                        "sum(if(typeName LIKE '%Blueprint%',0,if(isnull(itd_quantity), ".
-                        "0,itd_quantity * if(price = 0 OR isnull(price),basePrice,price)))) ".
-                        "+ if(isnull(shp_value),shp_baseprice,shp_value) AS killcost ".
-                        "FROM kb3_kills ".
-                        "LEFT JOIN kb3_items_destroyed ON kll_id = itd_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 ".
-                        "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 kll_id) cost ".
-                        "SET kll_isk_loss = killcost";
+                $sql = "UPDATE 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
+                                set kll_isk_loss = if(isnull(shp_value),shp_baseprice,shp_value)";
+                $qry->execute($sql);
+                $sql = "UPDATE kb3_kills 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 kll_isk_loss = kll_isk_loss + killcost";
+                $qry->execute($sql);
+                if(config::get(kd_droptototal))
+                        $sql = "UPDATE kb3_kills 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 kll_isk_loss = kll_isk_loss + killcost";
                 $qry->execute($sql);
 

dev/common/includes/class.apicache.php

@@ -28 +28 @@
 
         $db = new DBQuery(true);
-                $db->execute("CREATE TABLE IF NOT EXISTS `kb3_apicache` (
-                 `cfg_site` varchar(16) NOT NULL default '',
-                         `cfg_key` varchar(32) NOT NULL default '',
-                         `cfg_value` text NOT NULL,
-                         PRIMARY KEY  (`cfg_site`,`cfg_key`)
-                         )");
         $db->execute('select * from kb3_apicache where cfg_site=\''.KB_SITE."'");
         $ApiCache = &ApiCache::_getCache();

dev/common/includes/db.php

@@ -9 +9 @@
 
 // get mysql server info and store it in a define so we know if its
-// safe to use subquerys or not
-$conn = new DBConnection;
-$value = (float)mysql_get_server_info($conn->id_);
-if ($value > 4.1)
-{
-    define('KB_MYSQL41', true);
-}
+// safe to use subquerys or not. (mysqli only works on 4.1+)
+if(DB_TYPE == 'mysqli') define('KB_MYSQL41', true);
 else
 {
-    define('KB_MYSQL41', false);
+        $conn = new DBConnection;
+        $value = (float) mysql_get_server_info($conn->id_);
+        if ($value > 4.1)
+        {
+                define('KB_MYSQL41', true);
+        }
+        else
+        {
+                define('KB_MYSQL41', false);
+        }
 }