Merge pull request #5109 from rabuzarus/20180522_-_frio_nav_about_instance

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

diff --git a/src/Model/GContact.php b/src/Model/GContact.php
index e543e4baebf92b895e48aac4dc0718a170f9f8ac..c413bef4fa9ebde5d1a5cf95aab08c663a6f1dd2 100644 (file)
--- a/src/Model/GContact.php
+++ b/src/Model/GContact.php
@@ -20,7 +20,6 @@ use dba;
 use Exception;
 
 require_once 'include/dba.php';
-require_once 'include/html2bbcode.php';
 
 /**
  * @brief This class handles GlobalContact related functions
@@ -37,56 +36,53 @@ class GContact
         */
        public static function searchByName($search, $mode = '')
        {
-               if ($search) {
-                       // check supported networks
-                       if (Config::get('system', 'diaspora_enabled')) {
-                               $diaspora = NETWORK_DIASPORA;
-                       } else {
-                               $diaspora = NETWORK_DFRN;
-                       }
+               if (empty($search)) {
+                       return [];
+               }
 
-                       if (!Config::get('system', 'ostatus_disabled')) {
-                               $ostatus = NETWORK_OSTATUS;
-                       } else {
-                               $ostatus = NETWORK_DFRN;
-                       }
+               // check supported networks
+               if (Config::get('system', 'diaspora_enabled')) {
+                       $diaspora = NETWORK_DIASPORA;
+               } else {
+                       $diaspora = NETWORK_DFRN;
+               }
 
-                       // check if we search only communities or every contact
-                       if ($mode === "community") {
-                               $extra_sql = " AND `community`";
-                       } else {
-                               $extra_sql = "";
-                       }
+               if (!Config::get('system', 'ostatus_disabled')) {
+                       $ostatus = NETWORK_OSTATUS;
+               } else {
+                       $ostatus = NETWORK_DFRN;
+               }
 
-                       $search .= "%";
-
-                       $results = q(
-                               "SELECT `contact`.`id` AS `cid`, `gcontact`.`url`, `gcontact`.`name`, `gcontact`.`nick`, `gcontact`.`photo`,
-                                               `gcontact`.`network`, `gcontact`.`keywords`, `gcontact`.`addr`, `gcontact`.`community`
-                               FROM `gcontact`
-                               LEFT JOIN `contact` ON `contact`.`nurl` = `gcontact`.`nurl`
-                                       AND `contact`.`uid` = %d AND NOT `contact`.`blocked`
-                                       AND NOT `contact`.`pending` AND `contact`.`rel` IN ('%s', '%s')
-                               WHERE (`contact`.`id` > 0 OR (NOT `gcontact`.`hide` AND `gcontact`.`network` IN ('%s', '%s', '%s') AND
-                               ((`gcontact`.`last_contact` >= `gcontact`.`last_failure`) OR
-                               (`gcontact`.`updated` >= `gcontact`.`last_failure`)))) AND
-                               (`gcontact`.`addr` LIKE '%s' OR `gcontact`.`name` LIKE '%s' OR `gcontact`.`nick` LIKE '%s') $extra_sql
-                                       GROUP BY `gcontact`.`nurl`
-                                       ORDER BY `gcontact`.`nurl` DESC
-                                       LIMIT 1000",
-                               intval(local_user()),
-                               dbesc(CONTACT_IS_SHARING),
-                               dbesc(CONTACT_IS_FRIEND),
-                               dbesc(NETWORK_DFRN),
-                               dbesc($ostatus),
-                               dbesc($diaspora),
-                               dbesc(escape_tags($search)),
-                               dbesc(escape_tags($search)),
-                               dbesc(escape_tags($search))
-                       );
+               // check if we search only communities or every contact
+               if ($mode === "community") {
+                       $extra_sql = " AND `community`";
+               } else {
+                       $extra_sql = "";
+               }
+
+               $search .= "%";
+
+               $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
+                               GROUP BY `nurl` ORDER BY `nurl` DESC LIMIT 1000",
+                       NETWORK_DFRN, $ostatus, $diaspora, $search, $search, $search
+               );
+
+               $gcontacts = [];
+               while ($result = dba::fetch($results)) {
+                       $urlparts = parse_url($result["nurl"]);
 
-                       return $results;
+                       // Ignore results that look strange.
+                       // For historic reasons the gcontact table does contain some garbage.
+                       if (!empty($urlparts['query']) || !empty($urlparts['fragment'])) {
+                               continue;
+                       }
+
+                       $gcontacts[] = Contact::getDetailsByURL($result["nurl"], local_user());
                }
+               return $gcontacts;
        }
 
        /**
@@ -243,10 +239,8 @@ class GContact
 
                        if ($alternate && ($gcontact['network'] == NETWORK_OSTATUS)) {
                                // Delete the old entry - if it exists
-                               $r = q("SELECT `id` FROM `gcontact` WHERE `nurl` = '%s'", dbesc(normalise_link($orig_profile)));
-                               if (DBM::is_result($r)) {
-                                       q("DELETE FROM `gcontact` WHERE `nurl` = '%s'", dbesc(normalise_link($orig_profile)));
-                                       q("DELETE FROM `glink` WHERE `gcid` = %d", intval($r[0]["id"]));
+                               if (dba::exists('gcontact', ['nurl' => normalise_link($orig_profile)])) {
+                                       dba::delete('gcontact', ['nurl' => normalise_link($orig_profile)]);
                                }
                        }
                }
@@ -665,6 +659,8 @@ class GContact
        {
                $gcontact_id = 0;
                $doprobing = false;
+               $last_failure_str = '';
+               $last_contact_str = '';
 
                if (in_array($contact["network"], [NETWORK_PHANTOM])) {
                        logger("Invalid network for contact url ".$contact["url"]." - Called by: ".System::callstack(), LOGGER_DEBUG);
@@ -875,7 +871,8 @@ class GContact
 
                        // 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)) {
                                logger("Update public contact ".$public_contact["id"], LOGGER_DEBUG);
@@ -896,6 +893,12 @@ class GContact
                                                'contact-type' => $contact['contact-type'], 'url' => $contact['url'],
                                                'location' => $contact['location'], 'about' => $contact['about']];
 
+                               // Don't update the birthday field if not set or invalid
+                               if (empty($contact['birthday']) || ($contact['birthday'] < '0001-01-01')) {
+                                       unset($fields['bd']);
+                               }
+
+
                                dba::update('contact', $fields, ['id' => $public_contact["id"]], $old_contact);
                        }
                }