friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

better comment added by @Hypolite 

Signed-off-by: Roland Haeder <roland@mxchange.org>
This commit is contained in:
Roland Häder 2017-03-23 22:26:07 +01:00
parent 16c405b387
commit 09ab141404
No known key found for this signature in database
GPG Key ID: B72F8185C6C7BD78
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
include/dfrn.php
View File

@ -1608,7 +1608,14 @@ class dfrn {
dbesc(normalise_link($suggest["url"])), dbesc(normalise_link($suggest["url"])),
intval($suggest["uid"]) intval($suggest["uid"])
); );
/// @TODO Really abort on valid result??? Maybe missed ! here?
/*
* The valid result means the friend we're about to send a friend
* suggestion already has them in their contact, which means no further
* action is required.
*
* @see https://github.com/friendica/friendica/pull/3254#discussion_r107315246
*/
if (dbm::is_result($r)) { if (dbm::is_result($r)) {
return false; return false;
} }
@ -1629,30 +1636,33 @@ class dfrn {
intval($suggest["uid"]), intval($suggest["uid"]),
intval($fid) intval($fid)
); );
/// @TODO Really abort on valid result??? Maybe missed ! here? /// @TODO Really abort on valid result??? Maybe missed ! here?
if (dbm::is_result($r)) { if (dbm::is_result($r)) {
return false; return false;
} }
} }
if (!$fid) if (!$fid) {
$r = q("INSERT INTO `fcontact` (`name`,`url`,`photo`,`request`) VALUES ('%s', '%s', '%s', '%s')", $r = q("INSERT INTO `fcontact` (`name`,`url`,`photo`,`request`) VALUES ('%s', '%s', '%s', '%s')",
dbesc($suggest["name"]), dbesc($suggest["name"]),
dbesc($suggest["url"]), dbesc($suggest["url"]),
dbesc($suggest["photo"]), dbesc($suggest["photo"]),
dbesc($suggest["request"]) dbesc($suggest["request"])
); );
}
$r = q("SELECT `id` FROM `fcontact` WHERE `url` = '%s' AND `name` = '%s' AND `request` = '%s' LIMIT 1", $r = q("SELECT `id` FROM `fcontact` WHERE `url` = '%s' AND `name` = '%s' AND `request` = '%s' LIMIT 1",
dbesc($suggest["url"]), dbesc($suggest["url"]),
dbesc($suggest["name"]), dbesc($suggest["name"]),
dbesc($suggest["request"]) dbesc($suggest["request"])
); );
if (dbm::is_result($r)) {
$fid = $r[0]["id"]; // This way a useless else-block is being spared, resulting in easier code.
} else { if (!dbm::is_result($r)) {
// database record did not get created. Quietly give up. // database record did not get created. Quietly give up.
killme(); killme();
} }
$fid = $r[0]["id"];
$hash = random_string(); $hash = random_string();