keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Continued:

Browse source 
- added curly braces
- added TODO
- removed TODO (no change needed, is fine)

Signed-off-by: Roland Häder <roland@mxchange.org>
This commit is contained in:
Roland Häder 2017-02-07 09:36:16 +01:00 committed by Roland Haeder
parent 4fe5cdf3fd
commit aeaafb5d71
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
include/dfrn.php
View file

@ -1608,8 +1608,9 @@ 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?
if (dbm::is_result($r)) { if (dbm::is_result($r)) {
// Has already friend matching description
return false; return false;
} }
@ -1730,6 +1731,7 @@ class dfrn {
intval($importer["importer_uid"])); intval($importer["importer_uid"]));
if (!dbm::is_result($r)) { if (!dbm::is_result($r)) {
/// @todo Don't die quietly
killme(); killme();
} }
@ -1809,8 +1811,10 @@ class dfrn {
$n, dbesc($f[1]), $n, dbesc($f[1]),
$n, dbesc($f[0]), $n, dbesc($f[0]),
intval($importer["importer_uid"])); intval($importer["importer_uid"]));
if ($x === false)
return false; if ($x === false) {
return false;
}
} }
} }
@ -2692,12 +2696,14 @@ class dfrn {
// Update the contact table if the data has changed // Update the contact table if the data has changed
// The "atom:author" is only present in feeds // The "atom:author" is only present in feeds
if ($xpath->query("/atom:feed/atom:author")->length > 0) if ($xpath->query("/atom:feed/atom:author")->length > 0) {
self::fetchauthor($xpath, $doc->firstChild, $importer, "atom:author", false, $xml); self::fetchauthor($xpath, $doc->firstChild, $importer, "atom:author", false, $xml);
}
// Only the "dfrn:owner" in the head section contains all data // Only the "dfrn:owner" in the head section contains all data
if ($xpath->query("/atom:feed/dfrn:owner")->length > 0) if ($xpath->query("/atom:feed/dfrn:owner")->length > 0) {
self::fetchauthor($xpath, $doc->firstChild, $importer, "dfrn:owner", false, $xml); self::fetchauthor($xpath, $doc->firstChild, $importer, "dfrn:owner", false, $xml);
}
logger("Import DFRN message for user ".$importer["uid"]." from contact ".$importer["id"], LOGGER_DEBUG); logger("Import DFRN message for user ".$importer["uid"]." from contact ".$importer["id"], LOGGER_DEBUG);
@ -2705,22 +2711,24 @@ class dfrn {
if ($xpath->query("/atom:feed/dfrn:account_type")->length > 0) { if ($xpath->query("/atom:feed/dfrn:account_type")->length > 0) {
$accounttype = intval($xpath->evaluate("/atom:feed/dfrn:account_type/text()", $context)->item(0)->nodeValue); $accounttype = intval($xpath->evaluate("/atom:feed/dfrn:account_type/text()", $context)->item(0)->nodeValue);
if ($accounttype != $importer["contact-type"]) if ($accounttype != $importer["contact-type"]) {
q("UPDATE `contact` SET `contact-type` = %d WHERE `id` = %d", q("UPDATE `contact` SET `contact-type` = %d WHERE `id` = %d",
intval($accounttype), intval($accounttype),
intval($importer["id"]) intval($importer["id"])
); );
}
} }
// is it a public forum? Private forums aren't supported with this method // is it a public forum? Private forums aren't supported with this method
// This is deprecated since 3.5.1 // This is deprecated since 3.5.1
$forum = intval($xpath->evaluate("/atom:feed/dfrn:community/text()", $context)->item(0)->nodeValue); $forum = intval($xpath->evaluate("/atom:feed/dfrn:community/text()", $context)->item(0)->nodeValue);
if ($forum != $importer["forum"]) if ($forum != $importer["forum"]) {
q("UPDATE `contact` SET `forum` = %d WHERE `forum` != %d AND `id` = %d", q("UPDATE `contact` SET `forum` = %d WHERE `forum` != %d AND `id` = %d",
intval($forum), intval($forum), intval($forum), intval($forum),
intval($importer["id"]) intval($importer["id"])
); );
}
$mails = $xpath->query("/atom:feed/dfrn:mail"); $mails = $xpath->query("/atom:feed/dfrn:mail");
foreach ($mails AS $mail) { foreach ($mails AS $mail) {