MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Simplified query

Browse source
This commit is contained in:
Michael 2018-03-17 07:12:28 +00:00
parent 69918f4ae9
commit c7dc3f94c9
1 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
mod/dirfind.php
View file

@ -114,28 +114,22 @@ function dirfind_content(App $a, $prefix = "") {
/// @TODO These 2 SELECTs are not checked on validity with DBM::is_result() /// @TODO These 2 SELECTs are not checked on validity with DBM::is_result()
$count = q("SELECT count(*) AS `total` FROM `gcontact` $count = q("SELECT count(*) AS `total` FROM `gcontact`
LEFT JOIN `contact` ON `contact`.`nurl` = `gcontact`.`nurl` AND `contact`.`uid` = 0 WHERE NOT `hide` AND `network` IN ('%s', '%s', '%s') AND
WHERE NOT `gcontact`.`hide` AND `gcontact`.`network` IN ('%s', '%s', '%s') AND ((`last_contact` >= `last_failure`) OR (`updated` >= `last_failure`)) AND
((`gcontact`.`last_contact` >= `gcontact`.`last_failure`) OR (`url` LIKE '%s' OR `name` LIKE '%s' OR `location` LIKE '%s' OR
(`gcontact`.`updated` >= `gcontact`.`last_failure`)) AND `addr` LIKE '%s' OR `about` LIKE '%s' OR `keywords` LIKE '%s') $extra_sql",
(`gcontact`.`url` LIKE '%s' OR `gcontact`.`name` LIKE '%s' OR
`gcontact`.`location` LIKE '%s' OR `gcontact`.`addr` LIKE '%s' OR
`gcontact`.`about` LIKE '%s' OR `gcontact`.`keywords` LIKE '%s') $extra_sql",
dbesc(NETWORK_DFRN), dbesc($ostatus), dbesc($diaspora), dbesc(NETWORK_DFRN), dbesc($ostatus), dbesc($diaspora),
dbesc(escape_tags($search2)), dbesc(escape_tags($search2)), dbesc(escape_tags($search2)), dbesc(escape_tags($search2)), dbesc(escape_tags($search2)), dbesc(escape_tags($search2)),
dbesc(escape_tags($search2)), dbesc(escape_tags($search2)), dbesc(escape_tags($search2))); dbesc(escape_tags($search2)), dbesc(escape_tags($search2)), dbesc(escape_tags($search2)));
$results = q("SELECT `gcontact`.`nurl` $results = q("SELECT `nurl`
FROM `gcontact` FROM `gcontact`
LEFT JOIN `contact` ON `contact`.`nurl` = `gcontact`.`nurl` AND `contact`.`uid` = 0 WHERE NOT `hide` AND `network` IN ('%s', '%s', '%s') AND
WHERE NOT `gcontact`.`hide` AND `gcontact`.`network` IN ('%s', '%s', '%s') AND ((`last_contact` >= `last_failure`) OR (`updated` >= `last_failure`)) AND
((`gcontact`.`last_contact` >= `gcontact`.`last_failure`) OR (`url` LIKE '%s' OR `name` LIKE '%s' OR `location` LIKE '%s' OR
(`gcontact`.`updated` >= `gcontact`.`last_failure`)) AND `addr` LIKE '%s' OR `about` LIKE '%s' OR `keywords` LIKE '%s') $extra_sql
(`gcontact`.`url` LIKE '%s' OR `gcontact`.`name` LIKE '%s' OR GROUP BY `nurl`
`gcontact`.`location` LIKE '%s' OR `gcontact`.`addr` LIKE '%s' OR ORDER BY `updated` DESC LIMIT %d, %d",
`gcontact`.`about` LIKE '%s' OR `gcontact`.`keywords` LIKE '%s') $extra_sql
GROUP BY `gcontact`.`nurl`
ORDER BY `gcontact`.`updated` DESC LIMIT %d, %d",
dbesc(NETWORK_DFRN), dbesc($ostatus), dbesc($diaspora), dbesc(NETWORK_DFRN), dbesc($ostatus), dbesc($diaspora),
dbesc(escape_tags($search2)), dbesc(escape_tags($search2)), dbesc(escape_tags($search2)), dbesc(escape_tags($search2)), dbesc(escape_tags($search2)), dbesc(escape_tags($search2)),
dbesc(escape_tags($search2)), dbesc(escape_tags($search2)), dbesc(escape_tags($search2)), dbesc(escape_tags($search2)), dbesc(escape_tags($search2)), dbesc(escape_tags($search2)),