Changeset 404

Timestamp:

07/07/09 02:52:45 (12 years ago)

Author:

kovell

Message:

Fixes: db debug code no longer errors on some setups. upgrade now gives updates on progress. apicache returned to index.php for better eve api compatibility. cache options now has clear summary cache option. siglist shows correct urls. summary cache correctly updates. feedfetcher excludes kills before exclude date. exclude date on kills works

Location:

dev

Files:

• common/admin/feed_fetcher.php (modified) (3 diffs)
• common/admin/option_acache.php (modified) (3 diffs)
• common/includes/autoupgrade.php (modified) (1 diff)
• common/includes/class.db.mysqli.php (modified) (1 diff)
• common/includes/class.db.php (modified) (3 diffs)
• common/includes/class.db_cache.php (modified) (1 diff)
• common/includes/class.db_memcache.php (modified) (1 diff)
• common/includes/class.eveapi.php (modified) (1 diff)
• common/includes/class.options.php (modified) (2 diffs)
• common/includes/class.summary.php (modified) (3 diffs)
• common/includes/globals.php (modified) (1 diff)
• common/index.php (modified) (2 diffs)
• mods/signature_generator/sig_list.tpl (modified) (1 diff)
• upgrade.php (added)

dev/common/admin/feed_fetcher.php

@@ -128 +128 @@
                         if ( isset( $description ) )
                         {
+                                //Check age of mail
+                                if(config::get('filter_apply'))
+                                {
+                                        $filterdate = config::get('filter_date');
+                                        $year = substr($description, 0, 4);
+                                        $month = substr($description, 5, 2);
+                                        $day = substr($description, 8, 2);
+                                        $killstamp = mktime(0, 0, 0, $month, $day, $year);
+                                        if ($killstamp < $filterdate) $killid = -4;
+                                }
+                                if(config::get('filter_apply') && $killid == -4);
                                 // If the kill has an external id then check if it is already
                                 // on this board.
-                                $apiID = intval($apiID);
-                                if( $apiID)
+                                elseif($apiID = intval($apiID))
                                 {
                                         $qry = new DBQuery();
@@ -140 +150 @@
                                                 $killid = $parser->parse( true );
                                         }
-                                        else
-                                        {
-                                                $killid = -3;
-                                                $html .= "Killmail already posted <a href=\"?a=kill_detail&amp;kll_external_id=".$apiID."\">here</a>.<br>";
-                                        }
+                                        else $killid = -3;
                                 }
                                 elseif(!$apikills)
@@ -158 +164 @@
                                                 config::set($this->trackkey_, $uurl . ':::' . intval($title) . ':::' . $this->trackfriend_ . ':::' );
                                 }
-                                if ( $killid == 0 || $killid == -1 || $killid == -2 || $killid == -3)
+                                if ( $killid <= 0 )
                                 {
                                         if ( $killid == 0 && config::get('fetch_verbose') )
                                                 $html .= "Killmail is malformed. ".$uurl." Kill ID = ".$title." <br>";
+                                        if ( $killid == -1 && config::get('fetch_verbose') )
+                                                $html .= "Killmail already posted <a href=\"?a=kill_detail&amp;kll_id=".$parser->dupeid_."\">here</a>.<br>";
                                         if ( $killid == -2 && config::get('fetch_verbose') )
                                                 $html .= "Killmail is not related to ".KB_TITLE.".<br>";
-                                        if ( $killid == -1 && config::get('fetch_verbose') )
-                                                $html .= "Killmail already posted <a href=\"?a=kill_detail&amp;kll_id=".$parser->dupeid_."\">here</a>.<br>";
+                                        if ( $killid == -3 && config::get('fetch_verbose') )
+                                                $html .= "Killmail already posted <a href=\"?a=kill_detail&amp;kll_external_id=".$apiID."\">here</a>.<br>";
+                                        if ( $killid == -4 && config::get('fetch_verbose') )
+                                                $html .= "Killmail too old to post with current settings.<br>";
                                 }
                                 else

dev/common/admin/option_acache.php

@@ -37 +37 @@
 //options::fadd('Mail Cache', 'none', 'custom', array('admin_acache', 'optionClearMail'), array('admin_acache', 'clearCaches'));
 options::fadd('SQL Query Cache', 'none', 'custom', array('admin_acache', 'optionClearSQL'), array('admin_acache', 'clearCaches'));
+options::fadd('Kill Summary Cache', 'none', 'custom', array('admin_acache', 'optionClearSum'), array('admin_acache', 'clearCaches'));
 options::fadd('All Caches', 'none', 'custom', array('admin_acache', 'optionClearAll'), array('admin_acache', 'clearCaches'));
 
@@ -96 +97 @@
         function optionClearPage()
         {
-                return '<input type="checkbox" name="option[clean_page]">Clear cache ?';
+                return '<input type="checkbox" name="option[clear_page]">Clear cache ?';
         }
         function optionClearMail()
         {
-                return '<input type="checkbox" name="option[clean_mail]">Clear cache ?';
+                return '<input type="checkbox" name="option[clear_mail]">Clear cache ?';
+        }
+        function optionClearSum()
+        {
+                return '<input type="checkbox" name="option[clear_sum]">Clear cache ?';
         }
         function optionClearSQL()
         {
-                return '<input type="checkbox" name="option[clean_sql]">Clear cache ?';
+                return '<input type="checkbox" name="option[clear_sql]">Clear cache ?';
         }
         function optionClearTemplate()
         {
-                return '<input type="checkbox" name="option[clean_template]">Clear cache ?';
+                return '<input type="checkbox" name="option[clear_template]">Clear cache ?';
         }
         function optionClearAll()
         {
-                return '<input type="checkbox" name="option[clean_all]">Clear cache ?';
+                return '<input type="checkbox" name="option[clear_all]">Clear cache ?';
         }
         function clearCaches()
         {
-        if ($_POST['option']['clean_page'] == 'on')
+        if ($_POST['option']['clear_page'] == 'on')
         {
                         admin_acache::removeOld(0, KB_CACHEDIR.'/'.KB_SITE, false);
-                        $_POST['option']['clean_page'] = 'off';
+                        $_POST['option']['clear_page'] = 'off';
         }
-        if ($_POST['option']['clean_template'] == 'on')
+        if ($_POST['option']['clear_template'] == 'on')
         {//hardcoded in index.php
                         admin_acache::removeOld(0, 'cache/templates_c', false);
-                        $_POST['option']['clean_template'] == 'off';
+                        $_POST['option']['clear_template'] == 'off';
         }
-        if ($_POST['option']['clean_mail'] == 'on')
+        if ($_POST['option']['clear_mail'] == 'on')
         {
                         admin_acache::removeOld(0, config::get('km_cache_dir'), false);
-                        $_POST['option']['clean_mail'] == 'off';
+                        $_POST['option']['clear_mail'] == 'off';
         }
-        if ($_POST['option']['clean_sql'] == 'on')
+        if ($_POST['option']['clear_sum'] == 'on')
+        {
+                        $qry = new DBQuery();
+                        $qry->execute("DELETE FROM kb3_sum_alliance");
+                        $qry->execute("DELETE FROM kb3_sum_corp");
+                        $qry->execute("DELETE FROM kb3_sum_pilot");
+                        $_POST['option']['clear_sum'] == 'off';
+        }
+        if ($_POST['option']['clear_sql'] == 'on')
         {
                         admin_acache::clearQCache();
-                        $_POST['option']['clean_sql'] == 'off';
+                        $_POST['option']['clear_sql'] == 'off';
         }
-        if ($_POST['option']['clean_all'] == 'on')
+        if ($_POST['option']['clear_all'] == 'on')
         {
                         admin_acache::removeOld(0, KB_CACHEDIR.'/'.KB_SITE, false);
@@ -147 +160 @@
                         admin_acache::removeOld(0, 'cache/api', false);
                         admin_acache::removeOld(0, 'cache/corp', false);
-                        $_POST['option']['clean_all'] == 'off';
+                        $qry = new DBQuery();
+                        $qry->execute("DELETE FROM kb3_sum_alliance");
+                        $qry->execute("DELETE FROM kb3_sum_corp");
+                        $qry->execute("DELETE FROM kb3_sum_pilot");
+                        $_POST['option']['clear_all'] == 'off';
         }
                 return;

dev/common/includes/autoupgrade.php

@@ -18 +18 @@
         // if update nesseary run updates
         if (CURRENT_DB_UPDATE < LASTEST_DB_UPDATE ){
-
+        header('Location: '.KB_HOST."/upgrade.php");
+        die;
+
+        // Functional but very rough
+
+        // Plan for the future:
+        // Check here to see if an update is needed. If so redirect to
+        // KB_HOST/upgrade.php
                 update001();
                 update002();

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

@@ -94 +94 @@
                         {
                                 DBDebug::recordError("Database error: ".$this->dbconn_->id()->error);
-                                DBDebug::recordError("SQL: ".$this->_sql);
+                                DBDebug::recordError("SQL: ".$sql);
                         }
             if (defined('DB_HALTONERROR') && DB_HALTONERROR)

dev/common/includes/class.db.php

@@ -3 +3 @@
 class DBConnection
 {
-    function DBConnection()
-    {
-        static $conn_id;
-
-        if (is_resource($conn_id))
-        {
-            $this->id_ = $conn_id;
-            return;
-        }
-        if(defined('DB_PORT'))
-        {
-                if (!$this->id_ = mysql_connect(DB_HOST.':'.DB_PORT, DB_USER, DB_PASS))
-                    die("Unable to connect to mysql database.");
-        }
-        else
-        {
-                if (!$this->id_ = mysql_connect(DB_HOST, DB_USER, DB_PASS))
-                    die("Unable to connect to mysql database.");
-        }
-        mysql_select_db(DB_NAME);
-        $conn_id = $this->id_;
-    }
-
-    function id()
-    {
-        return $this->id_;
-    }
-
-    function affectedRows()
-    {
-        return mysql_affected_rows($this->id_);
-    }
+        function DBConnection()
+        {
+                static $conn_id;
+
+                if (is_resource($conn_id))
+                {
+                        $this->id_ = $conn_id;
+                        return;
+                }
+                if(defined('DB_PORT'))
+                {
+                        if (!$this->id_ = mysql_connect(DB_HOST.':'.DB_PORT, DB_USER, DB_PASS))
+                                die("Unable to connect to mysql database.");
+                }
+                else
+                {
+                        if (!$this->id_ = mysql_connect(DB_HOST, DB_USER, DB_PASS))
+                                die("Unable to connect to mysql database.");
+                }
+                mysql_select_db(DB_NAME);
+                $conn_id = $this->id_;
+        }
+
+        function id()
+        {
+                return $this->id_;
+        }
+
+        function affectedRows()
+        {
+                return mysql_affected_rows($this->id_);
+        }
 }
 
 class DBQuery
 {
-    var $object;
-
-    // php5 style object overloading
-    // we internally load up the wanted object and reroute all
-    // object actions to it
-    function __construct($forceNormal = false)
-    {
-        if (DB_TYPE_USED === 'mysqli' )
-        {
-            if (DB_USE_MEMCACHE === true && !$forceNormal)
-            {
-                $object = new DBMemCachedQuery_mysqli();
-            }
-            elseif (DB_USE_QCACHE === true && !$forceNormal)
-            {
-                $object = new DBCachedQuery_mysqli();
-            }
-            else
-            {
-                $object = new DBNormalQuery_mysqli();
-            }
-        }
-        elseif (DB_USE_MEMCACHE === true && !$forceNormal)
-        {
-            $object = new DBMemCachedQuery();
-        }
-        elseif (DB_USE_QCACHE === true && !$forceNormal)
-        {
-            $object = new DBCachedQuery();
-        }
-        else
-        {
-            $object = new DBNormalQuery();
-        }
-        $this->object = $object;
-    }
-
-    function __call($name, $args)
-    {
-        return call_user_func_array(array($this->object, $name), $args);
-    }
-
-    function __set($name, $value)
-    {
-        $this->object->$name = $value;
-    }
-
-    function __unset($name)
-    {
-        unset($this->object->$name);
-    }
-
-    function __isset($name)
-    {
-        return isset($this->object->$name);
-    }
-
-    function __get($name)
-    {
-        return $this->object->$name;
-    }
-
-    // php4 style object overloading
-    // we just hijack $this but we need to use a helper
-    // function for this because php5 fatals if it sees
-    // $this = ... in the src
-    function DBQuery($forceNormal = false)
-    {
-        $object = &$this->getRef($this);
-        if (DB_TYPE_USED === 'mysqli' )
-        {
-            if (DB_USE_MEMCACHE === true && !$forceNormal)
-            {
-                $object = new DBMemCachedQuery_mysqli();
-            }
-            elseif (DB_USE_QCACHE === true && !$forceNormal)
-            {
-                $object = new DBCachedQuery_mysqli();
-            }
-            else
-            {
-                $object = new DBNormalQuery_mysqli();
-            }
-        }
-        elseif (DB_USE_MEMCACHE === true && !$forceNormal)
-        {
-            $object = new DBMemCachedQuery();
-        }
-        elseif (DB_USE_QCACHE === true && !$forceNormal)
-        {
-            $object = new DBCachedQuery();
-        }
-        else
-        {
-            $object = new DBNormalQuery();
-        }
-    }
-
-    function &getRef(&$var)
-    {
-        return $var;
-    }
+        var $object;
+
+        // php5 style object overloading
+        // we internally load up the wanted object and reroute all
+        // object actions to it
+        function __construct($forceNormal = false)
+        {
+                if (DB_TYPE_USED === 'mysqli' )
+                {
+                        if (DB_USE_MEMCACHE === true && !$forceNormal)
+                        {
+                                $object = new DBMemCachedQuery_mysqli();
+                        }
+                        elseif (DB_USE_QCACHE === true && !$forceNormal)
+                        {
+                                $object = new DBCachedQuery_mysqli();
+                        }
+                        else
+                        {
+                                $object = new DBNormalQuery_mysqli();
+                        }
+                }
+                elseif (DB_USE_MEMCACHE === true && !$forceNormal)
+                {
+                        $object = new DBMemCachedQuery();
+                }
+                elseif (DB_USE_QCACHE === true && !$forceNormal)
+                {
+                        $object = new DBCachedQuery();
+                }
+                else
+                {
+                        $object = new DBNormalQuery();
+                }
+                $this->object = $object;
+        }
+
+        function __call($name, $args)
+        {
+                return call_user_func_array(array($this->object, $name), $args);
+        }
+
+        function __set($name, $value)
+        {
+                $this->object->$name = $value;
+        }
+
+        function __unset($name)
+        {
+                unset($this->object->$name);
+        }
+
+        function __isset($name)
+        {
+                return isset($this->object->$name);
+        }
+
+        function __get($name)
+        {
+                return $this->object->$name;
+        }
+
+        // php4 style object overloading
+        // we just hijack $this but we need to use a helper
+        // function for this because php5 fatals if it sees
+        // $this = ... in the src
+        function DBQuery($forceNormal = false)
+        {
+                $object = &$this->getRef($this);
+                if (DB_TYPE_USED === 'mysqli' )
+                {
+                        if (DB_USE_MEMCACHE === true && !$forceNormal)
+                        {
+                                $object = new DBMemCachedQuery_mysqli();
+                        }
+                        elseif (DB_USE_QCACHE === true && !$forceNormal)
+                        {
+                                $object = new DBCachedQuery_mysqli();
+                        }
+                        else
+                        {
+                                $object = new DBNormalQuery_mysqli();
+                        }
+                }
+                elseif (DB_USE_MEMCACHE === true && !$forceNormal)
+                {
+                        $object = new DBMemCachedQuery();
+                }
+                elseif (DB_USE_QCACHE === true && !$forceNormal)
+                {
+                        $object = new DBCachedQuery();
+                }
+                else
+                {
+                        $object = new DBNormalQuery();
+                }
+        }
+
+        function &getRef(&$var)
+        {
+                return $var;
+        }
 }
 
@@ -146 +146 @@
 class DBNormalQuery
 {
-    //! Prepare a connection for a new mysql query.
-    function DBNormalQuery()
-    {
-        static $totalexectime = 0;
+//! Prepare a connection for a new mysql query.
+        function DBNormalQuery()
+        {
+                static $totalexectime = 0;
                 $this->totalexectime_ = &$totalexectime;
-        $this->executed_ = false;
-        $this->dbconn_ = new DBConnection;
-    }
-
-    //! Return the count of queries performed.
+                $this->executed_ = false;
+                $this->dbconn_ = new DBConnection;
+        }
+
+        //! Return the count of queries performed.
 
     /*!
@@ -161 +161 @@
      * \return the count of queries so far.
      */
-    function queryCount($increase = false)
-    {
-        static $count;
-
-        if ($increase)
-        {
-            $count++;
-        }
-
-        return $count;
-    }
-
-    //! Return the count of cached queries performed - 0 for uncaches queries.
-    function queryCachedCount($increase = false)
-    {
-        return 0;
-    }
-
-    //! Execute an SQL string.
-
-    /* 
+        function queryCount($increase = false)
+        {
+                static $count;
+
+                if ($increase)
+                {
+                        $count++;
+                }
+
+                return $count;
+        }
+
+        //! Return the count of cached queries performed - 0 for uncaches queries.
+        function queryCachedCount($increase = false)
+        {
+                return 0;
+        }
+
+        //! Execute an SQL string.
+
+    /*
      * If DB_HALTONERROR is set then this will exit on an error.
      * \return false on error or true if successful.
      */
-    function execute($sql)
-    {
-        $t1 = strtok(microtime(), ' ') + strtok('');
-
-        $this->resid_ = mysql_query($sql, $this->dbconn_->id());
-
-        if (!$this->resid_ || mysql_errno($this->dbconn_->id()))
-        {
-            if(defined('KB_PROFILE'))
-                        {
-                                DBDebug::recordError("Database error: ".$this->dbconn_->id()->error);
-                                DBDebug::recordError("SQL: ".$this->_sql);
-                        }
-            if (defined('DB_HALTONERROR') && DB_HALTONERROR)
-            {
-                echo "Database error: " . mysql_error($this->dbconn_->id()) . "<br>";
-                echo "SQL: " . $sql . "<br>";
-                exit;
-            }
-            else
-            {
-                return false;
-            }
-        }
-
-        $this->exectime_ = strtok(microtime(), ' ') + strtok('') - $t1;
-        $this->totalexectime_ += $this->exectime_;
-        $this->executed_ = true;
-
-        if(defined('KB_PROFILE')) DBDebug::profile($sql, $this);
-
-        $this->queryCount(true);
-
-        return true;
-    }
-
-    //! Return the number of rows returned by the last query.
-    function recordCount()
-    {
-        return mysql_num_rows($this->resid_);
-    }
-
-    //! Return the next row of results from the last query.
-    function getRow()
-    {
-        if ($this->resid_)
-        {
-            return mysql_fetch_assoc($this->resid_);
-        }
-        return false;
-    }
-
-    //! Reset list of results to return the first row from the last query.
-    function rewind()
-    {
-        @mysql_data_seek($this->resid_, 0);
-    }
-
-    //! Return the auto-increment ID from the last insert operation.
-    function getInsertID()
-    {
-        return mysql_insert_id();
-    }
-
-    //! Return the execution time of the last query.
-    function execTime()
-    {
-        return $this->exectime_;
-    }
-
-    //! Return true if a query has been executed or false if none has been.
-    function executed()
-    {
-        return $this->executed_;
-    }
-
-    //! Return the most recent error message for the DB connection.
-    function getErrorMsg()
-    {
-        $msg = $this->sql_ . "<br>";
-        $msg .= "Query failed. " . mysql_error($this->dbconn_->id());
-
-        return $msg;
-    }
-    //! Set the autocommit status.
-    
-    //! Not implemented with mysql library
-    function autocommit($commit = true)
-    {
-        return false;
-    }
-    
-    //! Rollback all queries in the current transaction.
-    
-    //! Not implemented with mysql library
-    function rollback()
-    {
-        return false;
-    }
+        function execute($sql)
+        {
+                $t1 = strtok(microtime(), ' ') + strtok('');
+
+                $this->resid_ = mysql_query($sql, $this->dbconn_->id());
+
+                if (!$this->resid_ || mysql_errno($this->dbconn_->id()))
+                {
+                        if(defined('KB_PROFILE'))
+                        {
+                                DBDebug::recordError("Database error: ".mysql_error($this->dbconn_->id()));
+                                DBDebug::recordError("SQL: ".$sql);
+                        }
+                        if (defined('DB_HALTONERROR') && DB_HALTONERROR)
+                        {
+                                echo "Database error: " . mysql_error($this->dbconn_->id()) . "<br>";
+                                echo "SQL: " . $sql . "<br>";
+                                exit;
+                        }
+                        else
+                        {
+                                return false;
+                        }
+                }
+
+                $this->exectime_ = strtok(microtime(), ' ') + strtok('') - $t1;
+                $this->totalexectime_ += $this->exectime_;
+                $this->executed_ = true;
+
+                if(defined('KB_PROFILE')) DBDebug::profile($sql);
+
+                $this->queryCount(true);
+
+                return true;
+        }
+
+        //! Return the number of rows returned by the last query.
+        function recordCount()
+        {
+                return mysql_num_rows($this->resid_);
+        }
+
+        //! Return the next row of results from the last query.
+        function getRow()
+        {
+                if ($this->resid_)
+                {
+                        return mysql_fetch_assoc($this->resid_);
+                }
+                return false;
+        }
+
+        //! Reset list of results to return the first row from the last query.
+        function rewind()
+        {
+                @mysql_data_seek($this->resid_, 0);
+        }
+
+        //! Return the auto-increment ID from the last insert operation.
+        function getInsertID()
+        {
+                return mysql_insert_id();
+        }
+
+        //! Return the execution time of the last query.
+        function execTime()
+        {
+                return $this->exectime_;
+        }
+
+        //! Return true if a query has been executed or false if none has been.
+        function executed()
+        {
+                return $this->executed_;
+        }
+
+        //! Return the most recent error message for the DB connection.
+        function getErrorMsg()
+        {
+                $msg = $this->sql_ . "<br>";
+                $msg .= "Query failed. " . mysql_error($this->dbconn_->id());
+
+                return $msg;
+        }
+        //! Set the autocommit status.
+
+        //! Not implemented with mysql library
+        function autocommit($commit = true)
+        {
+                return false;
+        }
+
+        //! Rollback all queries in the current transaction.
+
+        //! Not implemented with mysql library
+        function rollback()
+        {
+                return false;
+        }
 }
 
-    class DBDebug
-    {
-        function recordError($text)
-        {
-            $qerrfile = "/tmp/EDKprofile.lst";
-            if($text) file_put_contents($qerrfile, $text."\n", FILE_APPEND);
-        }
-        function profile($sql, $text='')
-        {
-            $qerrfile = "/tmp/EDKprofile.lst";
-            if($text) file_put_contents($qerrfile, $text."\n", FILE_APPEND);
-            if (KB_PROFILE == 2)
-            {
-                    file_put_contents($qerrfile, $sql . "\nExecution time: " . $this->exectime_ . "\n", FILE_APPEND);
-            }
-                        if(DB_TYPE != 'mysqli') return;
-            if (KB_PROFILE == 3)
-            {
-                    if(strtolower(substr($sql,0,6))=='select')
-                    {
-                            $prof_qry= mysqli_query($this->dbconn_->id(),'EXPLAIN extended '.$sql.";");
-                            while($prof_row = mysqli_fetch_assoc($prof_qry))
-                            $prof_out_exp .= implode(' | ', $prof_row)."\n";
-                            $prof_qry= mysqli_query($this->dbconn_->id(),'show warnings');
-
-                            while($prof_row = mysqli_fetch_assoc($prof_qry))
-                            $prof_out_ext .= implode(' | ', $prof_row)."\n";
-                            file_put_contents($qerrfile, $sql . "\n".
-                                    $prof_out_ext. $prof_out_exp.
-                    "\n-- Execution time: " . $this->exectime_ . " --\n", FILE_APPEND);
-                    }
-                    else file_put_contents($qerrfile, $sql."\nExecution time: ".$this->exectime_."\n", FILE_APPEND);
-            }
-
-            if (KB_PROFILE == 4)
-            {
-                    if($this->exectime_ > 0.1 && strtolower(substr($sql,0,6))=='select')
-                    {
-                            $prof_qry= mysqli_query($this->dbconn_->id(),'EXPLAIN extended '.$sql);
-                            while($prof_row = mysqli_fetch_assoc($prof_qry))
-                            $prof_out_exp .= implode(' | ', $prof_row)."\n";
-                            $prof_qry= mysqli_query($this->dbconn_->id(),'show warnings');
-
-                            while($prof_row = mysqli_fetch_assoc($prof_qry))
-                            $prof_out_ext .= implode(' | ', $prof_row)."\n";
-                            file_put_contents($qerrfile, $sql . "\n".
-                                    $prof_out_ext. $prof_out_exp.
-                    "\n-- Execution time: " . $this->exectime_ . " --\n", FILE_APPEND);
-                    }
-            }
-
-        }
-    }
+class DBDebug
+{
+        function recordError($text)
+        {
+                $qerrfile = "/tmp/EDKprofile.lst";
+                if($text) file_put_contents($qerrfile, $text."\n", FILE_APPEND);
+        }
+        function profile($sql, $text='')
+        {
+                $qerrfile = "/tmp/EDKprofile.lst";
+                if($text) file_put_contents($qerrfile, $text."\n", FILE_APPEND);
+                if (KB_PROFILE == 2)
+                {
+                        file_put_contents($qerrfile, $sql . "\nExecution time: " . $this->exectime_ . "\n", FILE_APPEND);
+                }
+                if (KB_PROFILE == 3)
+                {
+                        if(DB_TYPE == 'mysqli' && strtolower(substr($sql,0,6))=='select')
+                        {
+                                $prof_qry= mysqli_query($this->dbconn_->id(),'EXPLAIN extended '.$sql.";");
+                                while($prof_row = mysqli_fetch_assoc($prof_qry))
+                                        $prof_out_exp .= implode(' | ', $prof_row)."\n";
+                                $prof_qry= mysqli_query($this->dbconn_->id(),'show warnings');
+
+                                while($prof_row = mysqli_fetch_assoc($prof_qry))
+                                        $prof_out_ext .= implode(' | ', $prof_row)."\n";
+                                file_put_contents($qerrfile, $sql . "\n".
+                                        $prof_out_ext. $prof_out_exp.
+                                        "\n-- Execution time: " . $this->exectime_ . " --\n", FILE_APPEND);
+                        }
+                        else file_put_contents($qerrfile, $sql."\nExecution time: ".$this->exectime_."\n", FILE_APPEND);
+                }
+
+                if (KB_PROFILE == 4)
+                {
+                        if($this->exectime_ > 0.1 && strtolower(substr($sql,0,6))=='select')
+                        {
+                                $prof_qry= mysqli_query($this->dbconn_->id(),'EXPLAIN extended '.$sql);
+                                while($prof_row = mysqli_fetch_assoc($prof_qry))
+                                        $prof_out_exp .= implode(' | ', $prof_row)."\n";
+                                $prof_qry= mysqli_query($this->dbconn_->id(),'show warnings');
+
+                                while($prof_row = mysqli_fetch_assoc($prof_qry))
+                                        $prof_out_ext .= implode(' | ', $prof_row)."\n";
+                                file_put_contents($qerrfile, $sql . "\n".
+                                        $prof_out_ext. $prof_out_exp.
+                                        "\n-- Execution time: " . $this->exectime_ . " --\n", FILE_APPEND);
+                        }
+                }
+
+        }
+}
 
 ?>

dev/common/includes/class.db_cache.php

@@ -268 +268 @@
             if(defined('KB_PROFILE'))
                         {
-                                DBDebug::recordError("Database error: ".$this->dbconn_->id()->error);
+                                DBDebug::recordError("Database error: ".mysql_error($this->dbconn_->id()));
                                 DBDebug::recordError("SQL: ".$this->_sql);
                         }

dev/common/includes/class.db_memcache.php

@@ -141 +141 @@
             if(defined('KB_PROFILE'))
                         {
-                                DBDebug::recordError("Database error: ".$this->dbconn_->id()->error);
+                                DBDebug::recordError("Database error: ".mysql_error($this->dbconn_->id()));
                                 DBDebug::recordError("SQL: ".$this->_sql);
                         }

dev/common/includes/class.eveapi.php

@@ -15 +15 @@
 require_once( "common/includes/db.php" );
 require_once('common/includes/class.apicache.php');
-
-$ApiCache = new ApiCache(KB_SITE);
 
 // Checks for configuration of files and folders

dev/common/includes/class.options.php

@@ -63 +63 @@
             foreach ($elements as $element)
             {
-                // for callbacks we check their callback function on postdata to deal with it
-                if ($element['onchange'])
-                {
-                    if (!is_callable($element['onchange']))
-                    {
-                        trigger_error('Unable to callback to '.$element['onchange'][0].'::'.$element['onchange'][1], E_USER_ERROR);
-                        return false;
-                    }
-                    call_user_func($element['onchange'], $element['name']);
-                    //continue;
-                }
-
                 // for checkboxes we need to set the value to zero if the option is not there
                 if ($element['type'] == 'checkbox')
@@ -92 +80 @@
                     config::set($element['name'], $_POST['option'][$element['name']]);
                 }
+                // for callbacks we check their callback function on postdata to deal with it
+                if ($element['onchange'])
+                {
+                    if (!is_callable($element['onchange']))
+                    {
+                        trigger_error('Unable to callback to '.$element['onchange'][0].'::'.$element['onchange'][1], E_USER_ERROR);
+                        return false;
+                    }
+                    call_user_func($element['onchange'], $element['name']);
+                    //continue;
+                }
+
             }
         }

dev/common/includes/class.summary.php

@@ -138 +138 @@
 // Causes big slowdowns for feeds so just return and leave summary creation until the page is viewed.
 //              if(!$qry->recordCount()) allianceSummary::buildSummary($kill->getVictimAllianceID());
-                if(!$qry->recordCount()) return;
-                $sql = "INSERT INTO kb3_sum_alliance (asm_all_id, asm_shp_id, asm_loss_count, asm_loss_isk) ".
-                        "VALUES ( ".$kill->getVictimAllianceID().", ".$kill->getVictimShip()->getClass()->getID().", 1, ".
-                        $kill->getISKLoss().") ON DUPLICATE KEY UPDATE ".
-                        "asm_loss_count = asm_loss_count + 1, ".
-                        "asm_loss_isk = asm_loss_isk + ".$kill->getISKLoss();
-                $qry->execute($sql);
+                if($qry->recordCount())
+                {
+                        $sql = "INSERT INTO kb3_sum_alliance (asm_all_id, asm_shp_id, asm_loss_count, asm_loss_isk) ".
+                                "VALUES ( ".$kill->getVictimAllianceID().", ".$kill->getVictimShip()->getClass()->getID().", 1, ".
+                                $kill->getISKLoss().") ON DUPLICATE KEY UPDATE ".
+                                "asm_loss_count = asm_loss_count + 1, ".
+                                "asm_loss_isk = asm_loss_isk + ".$kill->getISKLoss();
+                        $qry->execute($sql);
+                }
                 foreach($kill->involvedparties_ as $inv)
                 {
@@ -275 +277 @@
                 $qry = new DBQuery();
                 $qry->execute("SELECT 1 FROM kb3_sum_corp WHERE csm_crp_id = ".$kill->getVictimcorpID());
-//              if(!$qry->recordCount()) corpSummary::buildSummary($kill->getVictimcorpID());
-                if(!$qry->recordCount()) return;
-                $sql = "INSERT INTO kb3_sum_corp (csm_crp_id, csm_shp_id, csm_loss_count, csm_loss_isk) ".
-                        "VALUES ( ".$kill->getVictimcorpID().", ".$kill->getVictimShip()->getClass()->getID().", 1, ".
-                        $kill->getISKLoss().") ON DUPLICATE KEY UPDATE ".
-                        "csm_loss_count = csm_loss_count + 1, ".
-                        "csm_loss_isk = csm_loss_isk + ".$kill->getISKLoss();
-                $qry->execute($sql);
+                if(!$qry->recordCount())
+                {
+                        $sql = "INSERT INTO kb3_sum_corp (csm_crp_id, csm_shp_id, csm_loss_count, csm_loss_isk) ".
+                                "VALUES ( ".$kill->getVictimcorpID().", ".$kill->getVictimShip()->getClass()->getID().", 1, ".
+                                $kill->getISKLoss().") ON DUPLICATE KEY UPDATE ".
+                                "csm_loss_count = csm_loss_count + 1, ".
+                                "csm_loss_isk = csm_loss_isk + ".$kill->getISKLoss();
+                        $qry->execute($sql);
+                }
                 foreach($kill->involvedparties_ as $inv)
                 {
@@ -414 +417 @@
                 $qry->execute("SELECT 1 FROM kb3_sum_pilot WHERE psm_plt_id = ".$kill->getVictimID());
 //              if(!$qry->recordCount()) pilotSummary::buildSummary($kill->getVictimpilotID());
-                if(!$qry->recordCount()) return;
-                $sql = "INSERT INTO kb3_sum_pilot (psm_plt_id, psm_shp_id, psm_loss_count, psm_loss_isk) ".
-                        "VALUES ( ".$kill->getVictimID().", ".$kill->getVictimShip()->getClass()->getID().", 1, ".
-                        $kill->getISKLoss().") ON DUPLICATE KEY UPDATE ".
-                        "psm_loss_count = psm_loss_count + 1, ".
-                        "psm_loss_isk = psm_loss_isk + ".$kill->getISKLoss();
-                $qry->execute($sql);
+                if(!$qry->recordCount())
+                {
+                        $sql = "INSERT INTO kb3_sum_pilot (psm_plt_id, psm_shp_id, psm_loss_count, psm_loss_isk) ".
+                                "VALUES ( ".$kill->getVictimID().", ".$kill->getVictimShip()->getClass()->getID().", 1, ".
+                                $kill->getISKLoss().") ON DUPLICATE KEY UPDATE ".
+                                "psm_loss_count = psm_loss_count + 1, ".
+                                "psm_loss_isk = psm_loss_isk + ".$kill->getISKLoss();
+                        $qry->execute($sql);
+                }
                 foreach($kill->involvedparties_ as $inv)
                 {

dev/common/includes/globals.php

@@ -7 +7 @@
 else
 {
-        $svn_rev = '403';
+        $svn_rev = '404';
 }
 define('SVN_REV', $svn_rev);

dev/common/index.php

@@ -27 +27 @@
 require_once('common/includes/db.php');
 require_once('common/includes/class.config.php');
-//require_once('common/includes/class.apicache.php');
+require_once('common/includes/class.apicache.php');
 require_once('common/includes/class.killboard.php');
 require_once('common/includes/class.page.php');
@@ -66 +66 @@
 // load the config from the database
 $config = new Config(KB_SITE);
-//$ApiCache = new ApiCache(KB_SITE);
+$ApiCache = new ApiCache(KB_SITE);
 define('KB_HOST', config::get('cfg_kbhost'));
 define('MAIN_SITE', config::get('cfg_mainsite'));

dev/mods/signature_generator/sig_list.tpl

@@ -13 +13 @@
 <td align="center">This is the code you can try for phpBB<br/>
 <textarea cols="80" rows="2">[url={$kb_host}?a=pilot_detail&plt_id={$pilot}]
-[img]{$kb_host}sig.php/{$pilot}/{$signatures[tpl]}/signature.jpg[/img][/url]</textarea>
+[img]{$kb_host}/sig.php/{$pilot}/{$signatures[tpl]}/signature.jpg[/img][/url]</textarea>
 <br/>&nbsp;</td>
 </tr>