X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fdfrn.php;h=689c5c28324b0a934739ef2fe79c33dd01af1588;hb=8b7d5d0efc3e28b2f7a5407f6583c8232739aa71;hp=272105128fe07a2ea4c9711a54cdf4d52deb6c67;hpb=0f2c27e041720ef25e353e7b38de1e85f7a73db3;p=friendica.git diff --git a/include/dfrn.php b/include/dfrn.php index 272105128f..689c5c2832 100644 --- a/include/dfrn.php +++ b/include/dfrn.php @@ -105,8 +105,9 @@ class dfrn { dbesc($owner_nick) ); - if(! count($r)) + if (! dbm::is_result($r)) { killme(); + } $owner = $r[0]; $owner_id = $owner['uid']; @@ -139,8 +140,9 @@ class dfrn { intval($owner_id) ); - if(! count($r)) + if (! dbm::is_result($r)) { killme(); + } $contact = $r[0]; require_once('include/security.php'); @@ -1443,6 +1445,7 @@ class dfrn { * @param array $importer Record of the importer user mixed with contact of the content */ private function process_suggestion($xpath, $suggestion, $importer) { + $a = get_app(); logger("Processing suggestions"); @@ -1462,7 +1465,7 @@ class dfrn { dbesc(normalise_link($suggest["url"])), intval($suggest["uid"]) ); - if(count($r)) + if (dbm::is_result($r)) return false; // Do we already have an fcontact record for this person? @@ -1473,7 +1476,7 @@ class dfrn { dbesc($suggest["name"]), dbesc($suggest["request"]) ); - if(count($r)) { + if (dbm::is_result($r)) { $fid = $r[0]["id"]; // OK, we do. Do we already have an introduction for this person ? @@ -1481,7 +1484,7 @@ class dfrn { intval($suggest["uid"]), intval($fid) ); - if(count($r)) + if (dbm::is_result($r)) return false; } if(!$fid) @@ -1496,7 +1499,7 @@ class dfrn { dbesc($suggest["name"]), dbesc($suggest["request"]) ); - if(count($r)) + if (dbm::is_result($r)) $fid = $r[0]["id"]; else // database record did not get created. Quietly give up. @@ -1745,7 +1748,7 @@ class dfrn { LIMIT 1", dbesc($item["parent-uri"]) ); - if($r && count($r)) { + if (dbm::is_result($r)) { $r = q("SELECT `item`.`forum_mode`, `item`.`wall` FROM `item` INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` WHERE `item`.`uri` = '%s' AND (`item`.`parent-uri` = '%s' OR `item`.`thr-parent` = '%s') @@ -1757,7 +1760,7 @@ class dfrn { dbesc($r[0]["parent-uri"]), intval($importer["importer_uid"]) ); - if($r && count($r)) + if (dbm::is_result($r)) $is_a_remote_action = true; } @@ -1895,7 +1898,7 @@ class dfrn { dbesc($item["verb"]), dbesc($item["parent-uri"]) ); - if($r && count($r)) + if (dbm::is_result($r)) return false; $r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `author-link` = '%s' AND `verb` = '%s' AND `thr-parent` = '%s' AND NOT `deleted` LIMIT 1", @@ -1904,7 +1907,7 @@ class dfrn { dbesc($item["verb"]), dbesc($item["parent-uri"]) ); - if($r && count($r)) + if (dbm::is_result($r)) return false; } else $is_like = false; @@ -1920,7 +1923,7 @@ class dfrn { intval($importer["importer_uid"]) ); - if(!count($r)) + if (!dbm::is_result($r)) return false; // extract tag, if not duplicate, add to parent item @@ -2192,7 +2195,7 @@ class dfrn { dbesc($item["uri"]), intval($importer["uid"]) ); - if(count($r)) + if (dbm::is_result($r)) $ev["id"] = $r[0]["id"]; $event_id = event_store($ev); @@ -2213,7 +2216,7 @@ class dfrn { } // Update content if 'updated' changes - if(count($r)) { + if (dbm::is_result($r)) { if (self::update_content($r[0], $item, $importer, $entrytype)) logger("Item ".$item["uri"]." was updated.", LOGGER_DEBUG); else @@ -2235,7 +2238,7 @@ class dfrn { intval($posted_id), intval($importer["importer_uid"]) ); - if(count($r)) { + if (dbm::is_result($r)) { $parent = $r[0]["parent"]; $parent_uri = $r[0]["parent-uri"]; } @@ -2323,7 +2326,7 @@ class dfrn { intval($importer["uid"]), intval($importer["id"]) ); - if(!count($r)) { + if (!dbm::is_result($r)) { logger("Item with uri ".$uri." from contact ".$importer["id"]." for user ".$importer["uid"]." wasn't found.", LOGGER_DEBUG); return; } else { @@ -2417,7 +2420,7 @@ class dfrn { dbesc($item["parent-uri"]), intval($importer["uid"]) ); - if(count($r)) { + if (dbm::is_result($r)) { q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d", intval($r[0]["id"]) );