strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

don't try to auto redir if I'm a blocked or pending contact

Browse source
This commit is contained in:
Zach Prezkuta 2012-11-01 10:32:33 -06:00
parent c177a5e5b2
commit 43de9cf904
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/redir.php
View file

@ -12,6 +12,8 @@ function auto_redir(&$a, $contact_nick) {
// same nickname as me on other hubs or other networks. Exclude these by requiring // same nickname as me on other hubs or other networks. Exclude these by requiring
// that the contact have a local URL. I will be the only person with my nickname at // that the contact have a local URL. I will be the only person with my nickname at
// this URL, so if a result is found, then I am a contact of the $contact_nick user. // this URL, so if a result is found, then I am a contact of the $contact_nick user.
//
// We also have to make sure that I'm a legitimate contact--I'm not blocked or pending.
$baseurl = $a->get_baseurl(); $baseurl = $a->get_baseurl();
$domain_st = strpos($baseurl, "://"); $domain_st = strpos($baseurl, "://");
@ -20,7 +22,7 @@ function auto_redir(&$a, $contact_nick) {
$baseurl = substr($baseurl, $domain_st + 3); $baseurl = substr($baseurl, $domain_st + 3);
$r = q("SELECT id FROM contact WHERE uid = ( SELECT uid FROM user WHERE nickname = '%s' LIMIT 1 ) $r = q("SELECT id FROM contact WHERE uid = ( SELECT uid FROM user WHERE nickname = '%s' LIMIT 1 )
AND nick = '%s' AND self = 0 AND url LIKE '%%%s%%' LIMIT 1", AND nick = '%s' AND self = 0 AND url LIKE '%%%s%%' AND blocked = 0 AND pending = 0 LIMIT 1",
dbesc($contact_nick), dbesc($contact_nick),
dbesc($a->user['nickname']), dbesc($a->user['nickname']),
dbesc($baseurl) dbesc($baseurl)
@ -30,10 +32,12 @@ function auto_redir(&$a, $contact_nick) {
return; return;
$r = q("SELECT * FROM contact WHERE nick = '%s' AND network = '%s' AND uid = %d LIMIT 1", $r = q("SELECT * FROM contact WHERE nick = '%s'
AND network = '%s' AND uid = %d AND url LIKE '%%%s%%' LIMIT 1",
dbesc($contact_nick), dbesc($contact_nick),
dbesc(NETWORK_DFRN), dbesc(NETWORK_DFRN),
intval(local_user()) intval(local_user()),
dbesc($baseurl)
); );
if(! ($r && count($r))) if(! ($r && count($r)))