tobias/friendica
1
0
Fork 0
Code Pull requests Activity

add contact-id to auto-complete response to resolve duplicates

Browse source
This commit is contained in:
Friendika 2011-10-27 19:12:30 -07:00
commit e5a7b3e24b
5 changed files with 52 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
mod/item.php
View file

@ -407,7 +407,17 @@ function item_post(&$a) {
else {
$newname = $name;
$alias = '';
if(strstr($name,'_') || strstr($name,' ')) {
$tagcid = 0;
if(strrpos($newname,'+'))
$tagcid = intval(substr($newname,strrpos($newname,'+') + 1));
if($tagcid) {
$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($tagcid),
intval($profile_uid)
);
}
elseif(strstr($name,'_') || strstr($name,' ')) {
$newname = str_replace('_',' ',$name);
$r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
dbesc($newname),

13
mod/photos.php
View file

@ -408,7 +408,18 @@ function photos_post(&$a) {
}
else {
$newname = $name;
if(strstr($name,'_') || strstr($name,' ')) {
$alias = '';
$tagcid = 0;
if(strrpos($newname,'+'))
$tagcid = intval(substr($newname,strrpos($newname,'+') + 1));
if($tagcid) {
$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($tagcid),
intval($profile_uid)
);
}
elseif(strstr($name,'_') || strstr($name,' ')) {
$newname = str_replace('_',' ',$name);
$r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
dbesc($newname),

3
mod/search.php
View file

@ -96,10 +96,11 @@ function search_content(&$a) {
// Only public wall posts can be shown
// OR your own posts if you are a logged in member
$escaped_search = str_replace(array('[',']'),array('\\[','\\]'),$search);
// $s_bool = sprintf("AND MATCH (`item`.`body`) AGAINST ( '%s' IN BOOLEAN MODE )", dbesc($search));
$s_regx = sprintf("AND ( `item`.`body` REGEXP '%s' OR `item`.`tag` REGEXP '%s' )",
dbesc($search), dbesc('\\]' . $search . '\\['));
dbesc($escaped_search), dbesc('\\]' . $escaped_search . '\\['));
// if(mb_strlen($search) >= 3)
// $search_alg = $s_bool;