Merge branch 'master' of github.com:annando/friendica

Conflicts:
	mod/network.php

diff --git a/htconfig.php b/htconfig.php
index 872572654a705cec36d5f39d43353d4f7fd64209..2c5658be4dc5fdb9f5ad812fa0668b9a6bb453de 100644 (file)
--- a/htconfig.php
+++ b/htconfig.php
@@ -88,3 +88,6 @@ $a->config['system']['itemcache'] = "";
 
 // If enabled, the lockpath is used for a lockfile to check if the poller is running
 $a->config['system']['lockpath'] = "";
+
+// If enabled, the MyBB fulltext engine is used
+$a->config['system']['use_fulltext_engine'] = true;

diff --git a/include/api.php b/include/api.php
index f58a91a72f48224616e09ee047014a304d63de7c..5697fbdbcb881c35365cdacbb525a43fa120ec76 100644 (file)
--- a/include/api.php
+++ b/include/api.php
@@ -976,7 +976,7 @@
                $since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
                $max_id = (x($_REQUEST,'max_id')?$_REQUEST['max_id']:0);
                //$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
-               
+
                $start = $page*$count;
 
                //$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false);
@@ -985,11 +985,19 @@
                $myurl = substr($myurl,strpos($myurl,'://')+3);
                $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` regexp '%s' or `tag` regexp '%s' or tag regexp '%s' )) ",
-                       dbesc($myurl . '$'),
-                       dbesc($myurl . '\\]'),
-                       dbesc($diasp_url . '\\]')
-               );
+
+               if (get_config('system','use_fulltext_engine'))
+                        $sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where (MATCH(`author-link`) AGAINST ('".'"%s"'."' in boolean mode) or MATCH(`tag`) AGAINST ('".'"%s"'."' in boolean mode) or MATCH(tag) AGAINST ('".'"%s"'."' in boolean mode))) ",
+                                dbesc(protect_sprintf($myurl)),
+                                dbesc(protect_sprintf($myurl)),
+                                dbesc(protect_sprintf($diasp_url))
+                        );
+                else
+                        $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('%' . $myurl)),
+                                dbesc(protect_sprintf('%' . $myurl . '\\]%')),
+                                dbesc(protect_sprintf('%' . $diasp_url . '\\]%'))
+                        );
 
                if ($max_id > 0)
                        $sql_extra .= ' AND `item`.`id` <= '.intval($max_id);

diff --git a/include/config.php b/include/config.php
index 12fc9cafc99b61699fe172d635673277ff79b2fd..6edc3f286c66750d6fce1fdba98a51fb9e517385 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 fbfe2de4fd1775008adc2bc6506eef0db4b32b52..a94272a4290fac21307bb6a720ae402db89d3d4e 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -402,10 +402,22 @@ function network_content(&$a, $update = 0) {
 
        if(x($_GET,'search')) {
                $search = escape_tags($_GET['search']);
-               $sql_extra .= sprintf(" AND ( `item`.`body` like '%s' OR `item`.`tag` like '%s' ) ",
-                       dbesc(protect_sprintf('%' . $search . '%')),
-                       dbesc(protect_sprintf('%]' . $search . '[%'))
-               );
+               if (get_config('system','use_fulltext_engine')) {
+                       if(strpos($search,'#') === 0)
+                               $sql_extra .= sprintf(" AND (MATCH(tag) AGAINST ('".'"%s"'."' in boolean mode)) ",
+                                       dbesc(protect_sprintf($search))
+                               );
+                       else
+                               $sql_extra .= sprintf(" AND (MATCH(`item`.`body`) AGAINST ('".'"%s"'."' in boolean mode) or MATCH(tag) AGAINST ('".'"%s"'."' in boolean mode)) ",
+                                       dbesc(protect_sprintf($search)),
+                                       dbesc(protect_sprintf($search))
+                               );
+               } else {
+                       $sql_extra .= sprintf(" AND ( `item`.`body` like '%s' OR `item`.`tag` like '%s' ) ",
+                                       dbesc(protect_sprintf('%' . $search . '%')),
+                                       dbesc(protect_sprintf('%]' . $search . '[%'))
+                       );
+               }
        }
        if(strlen($file)) {
                $sql_extra .= file_tag_file_query('item',unxmlify($file));
@@ -416,11 +428,19 @@ function network_content(&$a, $update = 0) {
                $myurl = substr($myurl,strpos($myurl,'://')+3);
                $myurl = str_replace('www.','',$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('%' . $myurl)),
-                       dbesc(protect_sprintf('%' . $myurl . ']%')),
-                       dbesc(protect_sprintf('%' . $diasp_url . ']%'))
-               );
+               if (get_config('system','use_fulltext_engine'))
+                       $sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where (MATCH(`author-link`) AGAINST ('".'"%s"'."' in boolean mode) or MATCH(`tag`) AGAINST ('".'"%s"'."' in boolean mode) or MATCH(tag) AGAINST ('".'"%s"'."' in boolean mode))) ",
+                               dbesc(protect_sprintf($myurl)),
+                               dbesc(protect_sprintf($myurl)),
+                               dbesc(protect_sprintf($diasp_url))
+                       );
+               else
+                       $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('%' . $myurl)),
+                               dbesc(protect_sprintf('%' . $myurl . '\\]%')),
+                               dbesc(protect_sprintf('%' . $diasp_url . '\\]%'))
+                       );
+
        }
 
        if($update) {

diff --git a/mod/search.php b/mod/search.php
index 3e6bf68aa679c96c1aaaa3507e3c00cc261e3ae3..d4cd9d96763c7d0838fa2fc72b3e0e00b345df6a 100644 (file)
--- a/mod/search.php
+++ b/mod/search.php
@@ -71,7 +71,7 @@ function search_content(&$a) {
                notice( t('Public access denied.') . EOL);
                return;
        }
-       
+
        nav_set_selected('search');
 
        require_once("include/bbcode.php");
@@ -96,7 +96,6 @@ function search_content(&$a) {
 
        $o .= search($search,'search-box','/search',((local_user()) ? true : false));
 
-
        if(strpos($search,'#') === 0) {
                $tag = true;
                $search = substr($search,1);
@@ -109,11 +108,17 @@ function search_content(&$a) {
        if(! $search)
                return $o;
 
-       if($tag)
-               $sql_extra = sprintf(" AND `item`.`tag` REGEXP '%s' ",  dbesc('\\]' . preg_quote($search) . '\\['));
-       else
-               $sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(preg_quote($search)));
-
+       if (get_config('system','use_fulltext_engine')) {
+               if($tag)
+                       $sql_extra = sprintf(" AND MATCH (`item`.`tag`) AGAINST ('".'"%s"'."' in boolean mode) ", '#'.preg_quote($search));
+               else
+                       $sql_extra = sprintf(" AND MATCH (`item`.`body`) AGAINST ('".'"%s"'."' in boolean mode) ", dbesc(preg_quote($search)));
+       } else {
+               if($tag)
+                       $sql_extra = sprintf(" AND `item`.`tag` REGEXP '%s' ",  dbesc('\\]' . preg_quote($search) . '\\['));
+               else
+                       $sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(preg_quote($search)));
+       }
 
 
 

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" );