Merge pull request #5519 from annando/test-2

[friendica.git] / src / Model / GContact.php

diff --git a/src/Model/GContact.php b/src/Model/GContact.php
index 6b585f5be2d1604f6af1b8f851c9d178510e8757..9941eb1ed711156ef04a94008283e467a9297236 100644 (file)
--- a/src/Model/GContact.php
+++ b/src/Model/GContact.php
@@ -105,19 +105,19 @@ class GContact
                        intval($zcid)
                );
 
-               if (!DBA::is_result($r)) {
+               if (!DBA::isResult($r)) {
                        q(
                                "INSERT INTO `glink` (`cid`, `uid`, `gcid`, `zcid`, `updated`) VALUES (%d, %d, %d, %d, '%s') ",
                                intval($cid),
                                intval($uid),
                                intval($gcid),
                                intval($zcid),
-                               dbesc(DateTimeFormat::utcNow())
+                               DBA::escape(DateTimeFormat::utcNow())
                        );
                } else {
                        q(
                                "UPDATE `glink` SET `updated` = '%s' WHERE `cid` = %d AND `uid` = %d AND `gcid` = %d AND `zcid` = %d",
-                               dbesc(DateTimeFormat::utcNow()),
+                               DBA::escape(DateTimeFormat::utcNow()),
                                intval($cid),
                                intval($uid),
                                intval($gcid),
@@ -176,21 +176,21 @@ class GContact
                if (!isset($gcontact['network'])) {
                        $r = q(
                                "SELECT `network` FROM `contact` WHERE `uid` = 0 AND `nurl` = '%s' AND `network` != '' AND `network` != '%s' LIMIT 1",
-                               dbesc(normalise_link($gcontact['url'])),
-                               dbesc(NETWORK_STATUSNET)
+                               DBA::escape(normalise_link($gcontact['url'])),
+                               DBA::escape(NETWORK_STATUSNET)
                        );
-                       if (DBA::is_result($r)) {
+                       if (DBA::isResult($r)) {
                                $gcontact['network'] = $r[0]["network"];
                        }
 
                        if (($gcontact['network'] == "") || ($gcontact['network'] == NETWORK_OSTATUS)) {
                                $r = q(
                                        "SELECT `network`, `url` FROM `contact` WHERE `uid` = 0 AND `alias` IN ('%s', '%s') AND `network` != '' AND `network` != '%s' LIMIT 1",
-                                       dbesc($gcontact['url']),
-                                       dbesc(normalise_link($gcontact['url'])),
-                                       dbesc(NETWORK_STATUSNET)
+                                       DBA::escape($gcontact['url']),
+                                       DBA::escape(normalise_link($gcontact['url'])),
+                                       DBA::escape(NETWORK_STATUSNET)
                                );
-                               if (DBA::is_result($r)) {
+                               if (DBA::isResult($r)) {
                                        $gcontact['network'] = $r[0]["network"];
                                }
                        }
@@ -201,10 +201,10 @@ class GContact
 
                $x = q(
                        "SELECT * FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
-                       dbesc(normalise_link($gcontact['url']))
+                       DBA::escape(normalise_link($gcontact['url']))
                );
 
-               if (DBA::is_result($x)) {
+               if (DBA::isResult($x)) {
                        if (!isset($gcontact['network']) && ($x[0]["network"] != NETWORK_STATUSNET)) {
                                $gcontact['network'] = $x[0]["network"];
                        }
@@ -289,7 +289,7 @@ class GContact
                );
 
                // logger("countCommonFriends: $uid $cid {$r[0]['total']}");
-               if (DBA::is_result($r)) {
+               if (DBA::isResult($r)) {
                        return $r[0]['total'];
                }
                return 0;
@@ -311,7 +311,7 @@ class GContact
                        intval($uid)
                );
 
-               if (DBA::is_result($r)) {
+               if (DBA::isResult($r)) {
                        return $r[0]['total'];
                }
 
@@ -352,7 +352,7 @@ class GContact
                        intval($limit)
                );
 
-               /// @TODO Check all calling-findings of this function if they properly use DBA::is_result()
+               /// @TODO Check all calling-findings of this function if they properly use DBA::isResult()
                return $r;
        }
 
@@ -384,7 +384,7 @@ class GContact
                        intval($limit)
                );
 
-               /// @TODO Check all calling-findings of this function if they properly use DBA::is_result()
+               /// @TODO Check all calling-findings of this function if they properly use DBA::isResult()
                return $r;
        }
 
@@ -404,7 +404,7 @@ class GContact
                        intval($uid)
                );
 
-               if (DBA::is_result($r)) {
+               if (DBA::isResult($r)) {
                        return $r[0]['total'];
                }
 
@@ -435,7 +435,7 @@ class GContact
                        intval($limit)
                );
 
-               /// @TODO Check all calling-findings of this function if they properly use DBA::is_result()
+               /// @TODO Check all calling-findings of this function if they properly use DBA::isResult()
                return $r;
        }
 
@@ -489,13 +489,13 @@ class GContact
                        intval($uid),
                        intval($uid),
                        intval($uid),
-                       dbesc(NULL_DATE),
+                       DBA::escape(NULL_DATE),
                        $sql_network,
                        intval($start),
                        intval($limit)
                );
 
-               if (DBA::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.
@@ -518,7 +518,7 @@ class GContact
                        intval($uid),
                        intval($uid),
                        intval($uid),
-                       dbesc(NULL_DATE),
+                       DBA::escape(NULL_DATE),
                        $sql_network,
                        intval($start),
                        intval($limit)
@@ -580,11 +580,11 @@ class GContact
                // Query your contacts from Friendica and Redmatrix/Hubzilla for their contacts
                $r = q(
                        "SELECT DISTINCT(`poco`) AS `poco` FROM `contact` WHERE `network` IN ('%s', '%s')",
-                       dbesc(NETWORK_DFRN),
-                       dbesc(NETWORK_DIASPORA)
+                       DBA::escape(NETWORK_DFRN),
+                       DBA::escape(NETWORK_DIASPORA)
                );
 
-               if (DBA::is_result($r)) {
+               if (DBA::isResult($r)) {
                        foreach ($r as $rr) {
                                $base = substr($rr['poco'], 0, strrpos($rr['poco'], '/'));
                                if (! in_array($base, $done)) {
@@ -690,10 +690,10 @@ class 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"]))
+                       DBA::escape(normalise_link($contact["url"]))
                );
 
-               if (DBA::is_result($r)) {
+               if (DBA::isResult($r)) {
                        $gcontact_id = $r[0]["id"];
 
                        // Update every 90 days
@@ -708,27 +708,27 @@ class GContact
                        q(
                                "INSERT INTO `gcontact` (`name`, `nick`, `addr` , `network`, `url`, `nurl`, `photo`, `created`, `updated`, `location`, `about`, `hide`, `generation`)
                                VALUES ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d)",
-                               dbesc($contact["name"]),
-                               dbesc($contact["nick"]),
-                               dbesc($contact["addr"]),
-                               dbesc($contact["network"]),
-                               dbesc($contact["url"]),
-                               dbesc(normalise_link($contact["url"])),
-                               dbesc($contact["photo"]),
-                               dbesc(DateTimeFormat::utcNow()),
-                               dbesc(DateTimeFormat::utcNow()),
-                               dbesc($contact["location"]),
-                               dbesc($contact["about"]),
+                               DBA::escape($contact["name"]),
+                               DBA::escape($contact["nick"]),
+                               DBA::escape($contact["addr"]),
+                               DBA::escape($contact["network"]),
+                               DBA::escape($contact["url"]),
+                               DBA::escape(normalise_link($contact["url"])),
+                               DBA::escape($contact["photo"]),
+                               DBA::escape(DateTimeFormat::utcNow()),
+                               DBA::escape(DateTimeFormat::utcNow()),
+                               DBA::escape($contact["location"]),
+                               DBA::escape($contact["about"]),
                                intval($contact["hide"]),
                                intval($contact["generation"])
                        );
 
                        $r = q(
                                "SELECT `id`, `network` FROM `gcontact` WHERE `nurl` = '%s' ORDER BY `id` LIMIT 2",
-                               dbesc(normalise_link($contact["url"]))
+                               DBA::escape(normalise_link($contact["url"]))
                        );
 
-                       if (DBA::is_result($r)) {
+                       if (DBA::isResult($r)) {
                                $gcontact_id = $r[0]["id"];
 
                                $doprobing = in_array($r[0]["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""]);
@@ -877,7 +877,7 @@ class GContact
                        /// @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 (DBA::is_result($public_contact)) {
+                       if (DBA::isResult($public_contact)) {
                                logger("Update public contact ".$public_contact["id"], LOGGER_DEBUG);
 
                                Contact::updateAvatar($contact["photo"], 0, $public_contact["id"]);
@@ -1048,17 +1048,17 @@ class GContact
 
                $r = q(
                        "SELECT `nurl`, `url` FROM `gserver` WHERE `last_contact` >= `last_failure` AND `network` = '%s' AND `last_poco_query` < '%s' ORDER BY RAND() LIMIT 5",
-                       dbesc(NETWORK_OSTATUS),
-                       dbesc($last_update)
+                       DBA::escape(NETWORK_OSTATUS),
+                       DBA::escape($last_update)
                );
 
-               if (!DBA::is_result($r)) {
+               if (!DBA::isResult($r)) {
                        return;
                }
 
                foreach ($r as $server) {
                        self::fetchGsUsers($server["url"]);
-                       q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", dbesc(DateTimeFormat::utcNow()), dbesc($server["nurl"]));
+                       q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", DBA::escape(DateTimeFormat::utcNow()), DBA::escape($server["nurl"]));
                }
        }
 
@@ -1072,10 +1072,10 @@ class GContact
                                        AND `last_contact` >= `last_failure`
                                        AND `updated` > UTC_TIMESTAMP - INTERVAL 1 MONTH
                                ORDER BY rand() LIMIT 1",
-                       dbesc(NETWORK_DFRN)
+                       DBA::escape(NETWORK_DFRN)
                );
 
-               if (DBA::is_result($r)) {
+               if (DBA::isResult($r)) {
                        return dirname($r[0]['url']);
                }