]> git.mxchange.org Git - friendica.git/blobdiff - src/Model/GContact.php
Added true to json_decode (#5471)
[friendica.git] / src / Model / GContact.php
index 99660ba60283ff80a78cd138c0ba0d63e315e659..5cf613388cbdfe32dadf5cc033bed1dce439f8dd 100644 (file)
@@ -6,18 +6,15 @@
  */
 namespace Friendica\Model;
 
+use Exception;
 use Friendica\Core\Config;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
-use Friendica\Database\DBM;
-use Friendica\Model\Contact;
-use Friendica\Model\Profile;
+use Friendica\Database\DBA;
 use Friendica\Network\Probe;
 use Friendica\Protocol\PortableContact;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
-use dba;
-use Exception;
 
 require_once 'include/dba.php';
 
@@ -62,7 +59,7 @@ class GContact
 
                $search .= "%";
 
-               $results = dba::p("SELECT `nurl` FROM `gcontact`
+               $results = DBA::p("SELECT `nurl` FROM `gcontact`
                        WHERE NOT `hide` AND `network` IN (?, ?, ?) AND
                                ((`last_contact` >= `last_failure`) OR (`updated` >= `last_failure`)) AND
                                (`addr` LIKE ? OR `name` LIKE ? OR `nick` LIKE ?) $extra_sql
@@ -71,7 +68,7 @@ class GContact
                );
 
                $gcontacts = [];
-               while ($result = dba::fetch($results)) {
+               while ($result = DBA::fetch($results)) {
                        $urlparts = parse_url($result["nurl"]);
 
                        // Ignore results that look strange.
@@ -108,7 +105,7 @@ class GContact
                        intval($zcid)
                );
 
-               if (!DBM::is_result($r)) {
+               if (!DBA::isResult($r)) {
                        q(
                                "INSERT INTO `glink` (`cid`, `uid`, `gcid`, `zcid`, `updated`) VALUES (%d, %d, %d, %d, '%s') ",
                                intval($cid),
@@ -182,7 +179,7 @@ class GContact
                                dbesc(normalise_link($gcontact['url'])),
                                dbesc(NETWORK_STATUSNET)
                        );
-                       if (DBM::is_result($r)) {
+                       if (DBA::isResult($r)) {
                                $gcontact['network'] = $r[0]["network"];
                        }
 
@@ -193,7 +190,7 @@ class GContact
                                        dbesc(normalise_link($gcontact['url'])),
                                        dbesc(NETWORK_STATUSNET)
                                );
-                               if (DBM::is_result($r)) {
+                               if (DBA::isResult($r)) {
                                        $gcontact['network'] = $r[0]["network"];
                                }
                        }
@@ -207,7 +204,7 @@ class GContact
                        dbesc(normalise_link($gcontact['url']))
                );
 
-               if (DBM::is_result($x)) {
+               if (DBA::isResult($x)) {
                        if (!isset($gcontact['network']) && ($x[0]["network"] != NETWORK_STATUSNET)) {
                                $gcontact['network'] = $x[0]["network"];
                        }
@@ -239,8 +236,8 @@ class GContact
 
                        if ($alternate && ($gcontact['network'] == NETWORK_OSTATUS)) {
                                // Delete the old entry - if it exists
-                               if (dba::exists('gcontact', ['nurl' => normalise_link($orig_profile)])) {
-                                       dba::delete('gcontact', ['nurl' => normalise_link($orig_profile)]);
+                               if (DBA::exists('gcontact', ['nurl' => normalise_link($orig_profile)])) {
+                                       DBA::delete('gcontact', ['nurl' => normalise_link($orig_profile)]);
                                }
                        }
                }
@@ -292,7 +289,7 @@ class GContact
                );
 
                // logger("countCommonFriends: $uid $cid {$r[0]['total']}");
-               if (DBM::is_result($r)) {
+               if (DBA::isResult($r)) {
                        return $r[0]['total'];
                }
                return 0;
@@ -314,7 +311,7 @@ class GContact
                        intval($uid)
                );
 
-               if (DBM::is_result($r)) {
+               if (DBA::isResult($r)) {
                        return $r[0]['total'];
                }
 
@@ -355,7 +352,7 @@ class GContact
                        intval($limit)
                );
 
-               /// @TODO Check all calling-findings of this function if they properly use DBM::is_result()
+               /// @TODO Check all calling-findings of this function if they properly use DBA::isResult()
                return $r;
        }
 
@@ -387,7 +384,7 @@ class GContact
                        intval($limit)
                );
 
-               /// @TODO Check all calling-findings of this function if they properly use DBM::is_result()
+               /// @TODO Check all calling-findings of this function if they properly use DBA::isResult()
                return $r;
        }
 
@@ -407,7 +404,7 @@ class GContact
                        intval($uid)
                );
 
-               if (DBM::is_result($r)) {
+               if (DBA::isResult($r)) {
                        return $r[0]['total'];
                }
 
@@ -438,7 +435,7 @@ class GContact
                        intval($limit)
                );
 
-               /// @TODO Check all calling-findings of this function if they properly use DBM::is_result()
+               /// @TODO Check all calling-findings of this function if they properly use DBA::isResult()
                return $r;
        }
 
@@ -498,7 +495,7 @@ class GContact
                        intval($limit)
                );
 
-               if (DBM::is_result($r) && count($r) >= ($limit -1)) {
+               if (DBA::isResult($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.
@@ -564,15 +561,16 @@ class GContact
 
                if (strlen(Config::get('system', 'directory'))) {
                        $x = Network::fetchUrl(get_server()."/pubsites");
-                       if ($x) {
+                       if (!empty($x)) {
                                $j = json_decode($x);
-                               if ($j->entries) {
+                               if (!empty($j->entries)) {
                                        foreach ($j->entries as $entry) {
                                                PortableContact::checkServer($entry->url);
 
                                                $url = $entry->url . '/poco';
-                                               if (! in_array($url, $done)) {
-                                                       PortableContact::loadWorker(0, 0, 0, $entry->url . '/poco');
+                                               if (!in_array($url, $done)) {
+                                                       PortableContact::loadWorker(0, 0, 0, $url);
+                                                       $done[] = $url;
                                                }
                                        }
                                }
@@ -586,7 +584,7 @@ class GContact
                        dbesc(NETWORK_DIASPORA)
                );
 
-               if (DBM::is_result($r)) {
+               if (DBA::isResult($r)) {
                        foreach ($r as $rr) {
                                $base = substr($rr['poco'], 0, strrpos($rr['poco'], '/'));
                                if (! in_array($base, $done)) {
@@ -689,13 +687,13 @@ class GContact
                        $contact["url"] = self::cleanContactUrl($contact["url"]);
                }
 
-               dba::lock('gcontact');
+               DBA::lock('gcontact');
                $r = q(
                        "SELECT `id`, `last_contact`, `last_failure`, `network` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
                        dbesc(normalise_link($contact["url"]))
                );
 
-               if (DBM::is_result($r)) {
+               if (DBA::isResult($r)) {
                        $gcontact_id = $r[0]["id"];
 
                        // Update every 90 days
@@ -730,13 +728,13 @@ class GContact
                                dbesc(normalise_link($contact["url"]))
                        );
 
-                       if (DBM::is_result($r)) {
+                       if (DBA::isResult($r)) {
                                $gcontact_id = $r[0]["id"];
 
                                $doprobing = in_array($r[0]["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""]);
                        }
                }
-               dba::unlock();
+               DBA::unlock();
 
                if ($doprobing) {
                        logger("Last Contact: ". $last_contact_str." - Last Failure: ".$last_failure_str." - Checking: ".$contact["url"], LOGGER_DEBUG);
@@ -816,7 +814,7 @@ class GContact
                self::fixAlternateContactAddress($contact);
 
                if (!isset($contact["updated"])) {
-                       $contact["updated"] = DBM::date();
+                       $contact["updated"] = DateTimeFormat::utcNow();
                }
 
                if ($contact["network"] == NETWORK_TWITTER) {
@@ -859,7 +857,7 @@ class GContact
                        logger("Update gcontact for ".$contact["url"], LOGGER_DEBUG);
                        $condition = ['`nurl` = ? AND (`generation` = 0 OR `generation` >= ?)',
                                        normalise_link($contact["url"]), $contact["generation"]];
-                       $contact["updated"] = DBM::date($contact["updated"]);
+                       $contact["updated"] = DateTimeFormat::utc($contact["updated"]);
 
                        $updated = ['photo' => $contact['photo'], 'name' => $contact['name'],
                                        'nick' => $contact['nick'], 'addr' => $contact['addr'],
@@ -872,14 +870,14 @@ class GContact
                                        'generation' => $contact['generation'], 'updated' => $contact['updated'],
                                        'server_url' => $contact['server_url'], 'connect' => $contact['connect']];
 
-                       dba::update('gcontact', $updated, $condition, $fields);
+                       DBA::update('gcontact', $updated, $condition, $fields);
 
                        // Now update the contact entry with the user id "0" as well.
                        // This is used for the shadow copies of public items.
                        /// @todo Check if we really should do this.
                        // The quality of the gcontact table is mostly lower than the public contact
-                       $public_contact = dba::selectFirst('contact', ['id'], ['nurl' => normalise_link($contact["url"]), 'uid' => 0]);
-                       if (DBM::is_result($public_contact)) {
+                       $public_contact = DBA::selectFirst('contact', ['id'], ['nurl' => normalise_link($contact["url"]), 'uid' => 0]);
+                       if (DBA::isResult($public_contact)) {
                                logger("Update public contact ".$public_contact["id"], LOGGER_DEBUG);
 
                                Contact::updateAvatar($contact["photo"], 0, $public_contact["id"]);
@@ -888,7 +886,7 @@ class GContact
                                                'network', 'bd', 'gender',
                                                'keywords', 'alias', 'contact-type',
                                                'url', 'location', 'about'];
-                               $old_contact = dba::selectFirst('contact', $fields, ['id' => $public_contact["id"]]);
+                               $old_contact = DBA::selectFirst('contact', $fields, ['id' => $public_contact["id"]]);
 
                                // Update it with the current values
                                $fields = ['name' => $contact['name'], 'nick' => $contact['nick'],
@@ -904,7 +902,7 @@ class GContact
                                }
 
 
-                               dba::update('contact', $fields, ['id' => $public_contact["id"]], $old_contact);
+                               DBA::update('contact', $fields, ['id' => $public_contact["id"]], $old_contact);
                        }
                }
 
@@ -1054,7 +1052,7 @@ class GContact
                        dbesc($last_update)
                );
 
-               if (!DBM::is_result($r)) {
+               if (!DBA::isResult($r)) {
                        return;
                }
 
@@ -1077,7 +1075,7 @@ class GContact
                        dbesc(NETWORK_DFRN)
                );
 
-               if (DBM::is_result($r)) {
+               if (DBA::isResult($r)) {
                        return dirname($r[0]['url']);
                }