DBA: Possibility to log the database speed

diff --git a/include/dba.php b/include/dba.php
index 881097f30c399598e3d6fc4f95739c8ec9b4c2bf..d37b756aeee7840e8e1edb650cfb13dd4fab7dc4 100644 (file)
--- a/include/dba.php
+++ b/include/dba.php
@@ -71,22 +71,32 @@ class dba {
        }
 
        public function q($sql) {
+               global $a;
 
                if((! $this->db) || (! $this->connected))
                        return false;
 
                $this->error = '';
 
-               //if (get_config("system", "db_log") != "")
-               //      @file_put_contents(get_config("system", "db_log"), datetime_convert().':'.session_id(). ' Start '.$sql."\n", FILE_APPEND);
+               if ($a->config["system"]["db_log"] != "")
+                       $stamp1 = microtime(true);
 
                if($this->mysqli)
                        $result = @$this->db->query($sql);
                else
                        $result = @mysql_query($sql,$this->db);
 
-               //if (get_config("system", "db_log") != "")
-               //      @file_put_contents(get_config("system", "db_log"), datetime_convert().':'.session_id(). ' Stop '."\n", FILE_APPEND);
+               if ($a->config["system"]["db_log"] != "") {
+                       $stamp2 = microtime(true);
+                       $duration = round($stamp2-$stamp1, 3);
+                       if ($duration > $a->config["system"]["db_loglimit"]) {
+                               $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+                               @file_put_contents($a->config["system"]["db_log"], $duration."\t".
+                                               basename($backtrace[1]["file"])."\t".
+                                               $backtrace[1]["line"]."\t".$backtrace[2]["function"]."\t".
+                                               substr($sql, 0, 2000)."\n", FILE_APPEND);
+                       }
+               }
 
                if($this->mysqli) {
                        if($this->db->errno)

diff --git a/include/network.php b/include/network.php
index 500dff08be476409554f03cf3ee8b9d24e07cc0b..d69454899a7438673d301c552644fc273aae54e3 100644 (file)
--- a/include/network.php
+++ b/include/network.php
@@ -795,6 +795,9 @@ function scale_external_images($s, $include_link = true, $scale_replace = false)
 
        $a = get_app();
 
+       // Picture addresses can contain special characters
+       $s = htmlspecialchars_decode($s);
+
        $matches = null;
        $c = preg_match_all('/\[img\](.*?)\[\/img\]/ism',$s,$matches,PREG_SET_ORDER);
        if($c) {