Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-23 10:40:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

slight improvement in a couple of queries

Browse source
This commit is contained in:
friendica 2012-05-08 22:46:40 -07:00
parent 89d3ce7b5d
commit 70a07086ad
3 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
boot.php
View file

@ -29,6 +29,12 @@ define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );
define ( 'JPEG_QUALITY', 100 ); define ( 'JPEG_QUALITY', 100 );
/**
* Not yet used
*/
define ( 'DEFAULT_DB_ENGINE', 'MyISAM' );
/** /**
* SSL redirection policies * SSL redirection policies
*/ */

6
include/text.php
View file

@ -1524,3 +1524,9 @@ function fix_mce_lf($s) {
$s = str_replace("\n\n","\n",$s); $s = str_replace("\n\n","\n",$s);
return $s; return $s;
} }
function protect_sprintf($s) {
return(str_replace('%','%%',$s));
}

16
mod/network.php
View file

@ -340,7 +340,7 @@ function network_content(&$a, $update = 0) {
info( t('Group is empty')); info( t('Group is empty'));
} }
$sql_extra = " AND `item`.`parent` IN ( SELECT DISTINCT(`parent`) FROM `item` WHERE 1 $sql_options AND ( `contact-id` IN ( $contact_str ) OR `allow_gid` REGEXP '<" . intval($group) . ">' ) and deleted = 0 ) "; $sql_extra = " AND `item`.`parent` IN ( SELECT DISTINCT(`parent`) FROM `item` WHERE 1 $sql_options AND ( `contact-id` IN ( $contact_str ) OR `allow_gid` like '" . protect_sprintf('%<' . intval($group) . '>%') . "' ) and deleted = 0 ) ";
$o = '<h2>' . t('Group: ') . $r[0]['name'] . '</h2>' . $o; $o = '<h2>' . t('Group: ') . $r[0]['name'] . '</h2>' . $o;
} }
elseif($cid) { elseif($cid) {
@ -398,9 +398,9 @@ function network_content(&$a, $update = 0) {
if(x($_GET,'search')) { if(x($_GET,'search')) {
$search = escape_tags($_GET['search']); $search = escape_tags($_GET['search']);
$sql_extra .= sprintf(" AND ( `item`.`body` REGEXP '%s' OR `item`.`tag` REGEXP '%s' ) ", $sql_extra .= sprintf(" AND ( `item`.`body` like '%s' OR `item`.`tag` like '%s' ) ",
dbesc(preg_quote($search)), dbesc(protect_sprintf('%' . $search . '%')),
dbesc('\\]' . preg_quote($search) . '\\[') dbesc(protect_sprintf('%]' . $search . '[%'))
); );
} }
if(strlen($file)) { if(strlen($file)) {
@ -412,10 +412,10 @@ function network_content(&$a, $update = 0) {
$myurl = substr($myurl,strpos($myurl,'://')+3); $myurl = substr($myurl,strpos($myurl,'://')+3);
$myurl = str_replace(array('www.','.'),array('','\\.'),$myurl); $myurl = str_replace(array('www.','.'),array('','\\.'),$myurl);
$diasp_url = str_replace('/profile/','/u/',$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' )) ", $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($myurl . '$'), dbesc(protect_sprintf('%s' . $myurl)),
dbesc($myurl . '\\]'), dbesc(protect_sprintf('%' . $myurl . '\\]%')),
dbesc($diasp_url . '\\]') dbesc(protect_sprintf('%' . $diasp_url . '\\]%'))
); );
} }