Performance tests

diff --git a/include/config.php b/include/config.php
index 4cff38090c2e5bdd585de562d81fa1c5bb7a67f7..e416bec6e1a057398766337e016b8ca893633476 100644 (file)
--- a/include/config.php
+++ b/include/config.php
@@ -6,7 +6,7 @@
  * Note:
  * Please do not store booleans - convert to 0/1 integer values
  * The get_?config() functions return boolean false for keys that are unset,
- * and this could lead to subtle bugs.  
+ * and this could lead to subtle bugs.
  *
  * There are a few places in the code (such as the admin panel) where boolean
  * configurations need to be fixed as of 10/08/2011.

diff --git a/include/dba.php b/include/dba.php
index c9f880241ba9003d38cc2a356c90e62daeb7fc59..7ecce7270446308126303afd6949362d913973ce 100644 (file)
--- a/include/dba.php
+++ b/include/dba.php
@@ -32,9 +32,9 @@ class dba {
                if (!(strlen($server) && strlen($user))){
                        $this->connected = false;
                        $this->db = null;
-                       return;                 
+                       return;
                }
-               
+
                if($install) {
                        if(strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1')) {
                                if(! dns_get_record($server, DNS_A + DNS_CNAME + DNS_PTR)) {
@@ -71,23 +71,27 @@ class dba {
        }
 
        public function q($sql) {
-               
+
                if((! $this->db) || (! $this->connected))
                        return false;
-               
+
                $this->error = '';
 
+               //@file_put_contents("/tmp/friendica-db.log", datetime_convert().':'.session_id(). ' Start '.$sql."\n", FILE_APPEND);
+
                if($this->mysqli)
                        $result = @$this->db->query($sql);
                else
                        $result = @mysql_query($sql,$this->db);
 
+               //@file_put_contents("/tmp/friendica-db.log", datetime_convert().':'.session_id(). ' Stop '."\n", FILE_APPEND);
+
                if($this->mysqli) {
                        if($this->db->errno)
                                $this->error = $this->db->error;
                }
                elseif(mysql_errno($this->db))
-                               $this->error = mysql_error($this->db);  
+                               $this->error = mysql_error($this->db);
 
                if(strlen($this->error)) {
                        logger('dba: ' . $this->error);
@@ -107,8 +111,8 @@ class dba {
                        else
                                        $mesg = mysql_num_rows($result) . ' results' . EOL;
                        }
-    
-                       $str =  'SQL = ' . printable($sql) . EOL . 'SQL returned ' . $mesg 
+
+                       $str =  'SQL = ' . printable($sql) . EOL . 'SQL returned ' . $mesg
                                . (($this->error) ? ' error: ' . $this->error : '')
                                . EOL;
 
@@ -146,7 +150,7 @@ class dba {
                        }
                }
 
-    
+
                if($this->debug)
                        logger('dba: ' . printable(print_r($r, true)));
                return($r);

diff --git a/mod/network.php b/mod/network.php
index e59839ccc1ea615e2b1e11af66d8fd3e651191fd..c5347756ce55c0099d6f1ceec04efc263b0b1559 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -413,7 +413,7 @@ function network_content(&$a, $update = 0) {
                $myurl = str_replace(array('www.','.'),array('','\\.'),$myurl);
                $diasp_url = str_replace('/profile/','/u/',$myurl);
                $sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where ( `author-link` like '%s' or `tag` like '%s' or tag like '%s' )) ",
-                       dbesc(protect_sprintf('%s' . $myurl)),
+                       dbesc(protect_sprintf('%' . $myurl)),
                        dbesc(protect_sprintf('%' . $myurl . '\\]%')),
                        dbesc(protect_sprintf('%' . $diasp_url . '\\]%'))
                );

diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index de7e4184199f06c096b21211a34809369867f34b..83079782e87676a2aa4f5dec69d88e6a2d780128 100755 (executable)
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -18,6 +18,11 @@ $a->page['htmlhead'] .= sprintf('<META NAME=generator CONTENT="%s"/>', $diabook_
 
 //init css on network and profilepages
 $cssFile = null;
+
+// Preload config
+load_config("diabook");
+load_pconfig(local_user(), "diabook");
+
 //get statuses of boxes at right-hand-column
 $close_pages = false;
 $site_close_pages = get_config("diabook", "close_pages" );