Misc changes to url_from_contact_guid

[friendica.git] / include / socgraph.php

diff --git a/include/socgraph.php b/include/socgraph.php
index d4a7f5c94bdc457554930624f1c6668393f2fb2f..349fd0b2caebcecd5dfff17e050a2129c5161ec1 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(dbm::is_result($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(dbm::is_result($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(dbm::is_result($r)) {
+               if (dbm::is_result($r)) {
                        $network = $r[0]["network"];
                        //$profile_url = $r[0]["url"];
                }
@@ -976,7 +976,7 @@ function count_common_friends($uid,$cid) {
        );
 
 //     logger("count_common_friends: $uid $cid {$r[0]['total']}");
-       if(dbm::is_result($r))
+       if (dbm::is_result($r))
                return $r[0]['total'];
        return 0;
 
@@ -1022,7 +1022,7 @@ function count_common_friends_zcid($uid,$zcid) {
                intval($uid)
        );
 
-       if(dbm::is_result($r))
+       if (dbm::is_result($r))
                return $r[0]['total'];
        return 0;
 
@@ -1061,7 +1061,7 @@ function count_all_friends($uid,$cid) {
                intval($uid)
        );
 
-       if(dbm::is_result($r))
+       if (dbm::is_result($r))
                return $r[0]['total'];
        return 0;
 
@@ -1207,7 +1207,7 @@ function update_suggestions() {
                dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA)
        );
 
-       if(dbm::is_result($r)) {
+       if (dbm::is_result($r)) {
                foreach($r as $rr) {
                        $base = substr($rr['poco'],0,strrpos($rr['poco'],'/'));
                        if(! in_array($base,$done))
@@ -1728,8 +1728,6 @@ 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`,
@@ -1746,7 +1744,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://"), "", $a->get_baseurl());
+               $addr = $r[0]["nickname"].'@'.str_replace(array("http://", "https://"), "", App::get_baseurl());
        else
                $addr = $r[0]["addr"];
 
@@ -1756,7 +1754,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" => $a->get_baseurl(),
+                       "connect" => $addr, "server_url" => App::get_baseurl(),
                        "generation" => 1, "network" => NETWORK_DFRN);
 
        update_gcontact($gcontact);