More usage of dbm::is_result($r) instead of count($r):

[friendica.git] / include / socgraph.php

diff --git a/include/socgraph.php b/include/socgraph.php
index f1388435380b0bbc48a6f8eaa139303c03be36ac..d4a7f5c94bdc457554930624f1c6668393f2fb2f 100644 (file)
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -40,7 +40,7 @@ function poco_load($cid,$uid = 0,$zcid = 0,$url = null) {
                        $r = q("select `poco`, `uid` from `contact` where `id` = %d limit 1",
                                intval($cid)
                        );
-                       if(count($r)) {
+                       if(dbm::is_result($r)) {
                                $url = $r[0]['poco'];
                                $uid = $r[0]['uid'];
                        }
@@ -213,14 +213,14 @@ function poco_check($profile_url, $name, $network, $profile_photo, $about, $loca
        $r = q("SELECT `network` FROM `contact` WHERE `nurl` = '%s' AND `network` != '' AND `network` != '%s' LIMIT 1",
                dbesc(normalise_link($profile_url)), dbesc(NETWORK_STATUSNET)
        );
-       if(count($r))
+       if(dbm::is_result($r))
                $network = $r[0]["network"];
 
        if (($network == "") OR ($network == NETWORK_OSTATUS)) {
                $r = q("SELECT `network`, `url` FROM `contact` WHERE `alias` IN ('%s', '%s') AND `network` != '' AND `network` != '%s' LIMIT 1",
                        dbesc($profile_url), dbesc(normalise_link($profile_url)), dbesc(NETWORK_STATUSNET)
                );
-               if(count($r)) {
+               if(dbm::is_result($r)) {
                        $network = $r[0]["network"];
                        //$profile_url = $r[0]["url"];
                }
@@ -330,7 +330,7 @@ function poco_check($profile_url, $name, $network, $profile_photo, $about, $loca
                intval($gcid),
                intval($zcid)
        );
-       if(! count($r)) {
+       if(! dbm::is_result($r)) {
                q("INSERT INTO `glink` (`cid`,`uid`,`gcid`,`zcid`, `updated`) VALUES (%d,%d,%d,%d, '%s') ",
                        intval($cid),
                        intval($uid),
@@ -732,6 +732,7 @@ function poco_check_server($server_url, $network = "", $force = false) {
        if (!$serverret["success"] OR ($serverret["body"] == "") OR (@sizeof($xmlobj) == 0) OR !is_object($xmlobj)) {
                $server_url = str_replace("https://", "http://", $server_url);
                $serverret = z_fetch_url($server_url."/.well-known/host-meta");
+
                $xmlobj = @simplexml_load_string($serverret["body"],'SimpleXMLElement',0, "http://docs.oasis-open.org/ns/xri/xrd-1.0");
        }
 
@@ -975,7 +976,7 @@ function count_common_friends($uid,$cid) {
        );
 
 //     logger("count_common_friends: $uid $cid {$r[0]['total']}");
-       if(count($r))
+       if(dbm::is_result($r))
                return $r[0]['total'];
        return 0;
 
@@ -1021,7 +1022,7 @@ function count_common_friends_zcid($uid,$zcid) {
                intval($uid)
        );
 
-       if(count($r))
+       if(dbm::is_result($r))
                return $r[0]['total'];
        return 0;
 
@@ -1060,7 +1061,7 @@ function count_all_friends($uid,$cid) {
                intval($uid)
        );
 
-       if(count($r))
+       if(dbm::is_result($r))
                return $r[0]['total'];
        return 0;
 
@@ -1132,7 +1133,7 @@ function suggestion_query($uid, $start = 0, $limit = 80) {
                intval($limit)
        );
 
-       if (count($r) && count($r) >= ($limit -1)) {
+       if (dbm::is_result($r) && count($r) >= ($limit -1)) {
 // Uncommented because the result of the queries are to big to store it in the cache.
 // We need to decide if we want to change the db column type or if we want to delete it.
 //             Cache::set("suggestion_query:".$uid.":".$start.":".$limit, $r, CACHE_FIVE_MINUTES);
@@ -1206,7 +1207,7 @@ function update_suggestions() {
                dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA)
        );
 
-       if(count($r)) {
+       if(dbm::is_result($r)) {
                foreach($r as $rr) {
                        $base = substr($rr['poco'],0,strrpos($rr['poco'],'/'));
                        if(! in_array($base,$done))
@@ -1727,6 +1728,8 @@ function update_gcontact_from_probe($url) {
  * @param int $uid User ID
  */
 function update_gcontact_for_user($uid) {
+       $a = get_app();
+
        $r = q("SELECT `profile`.`locality`, `profile`.`region`, `profile`.`country-name`,
                        `profile`.`name`, `profile`.`about`, `profile`.`gender`,
                        `profile`.`pub_keywords`, `profile`.`dob`, `profile`.`photo`,
@@ -1743,7 +1746,7 @@ function update_gcontact_for_user($uid) {
 
        // The "addr" field was added in 3.4.3 so it can be empty for older users
        if ($r[0]["addr"] != "")
-               $addr = $r[0]["nickname"].'@'.str_replace(array("http://", "https://"), "", App::get_baseurl());
+               $addr = $r[0]["nickname"].'@'.str_replace(array("http://", "https://"), "", $a->get_baseurl());
        else
                $addr = $r[0]["addr"];
 
@@ -1753,7 +1756,7 @@ function update_gcontact_for_user($uid) {
                        "notify" => $r[0]["notify"], "url" => $r[0]["url"],
                        "hide" => ($r[0]["hidewall"] OR !$r[0]["net-publish"]),
                        "nick" => $r[0]["nickname"], "addr" => $addr,
-                       "connect" => $addr, "server_url" => App::get_baseurl(),
+                       "connect" => $addr, "server_url" => $a->get_baseurl(),
                        "generation" => 1, "network" => NETWORK_DFRN);
 
        update_gcontact($gcontact);