X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FGContact.php;h=6a6f6cd349cc9ed86d7917e267f7a0bb76f7c8ee;hb=8ddb94ef0669948d11da6040e47eab386b91f3db;hp=830f80e921e209730e93cbf4bd9c19fedb906989;hpb=8d07a69bba06f8cb8e63d46edcbb53fea34aa6d1;p=friendica.git diff --git a/src/Model/GContact.php b/src/Model/GContact.php index 830f80e921..6a6f6cd349 100644 --- a/src/Model/GContact.php +++ b/src/Model/GContact.php @@ -1,25 +1,23 @@ 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"]); + + // Ignore results that look strange. + // For historic reasons the gcontact table does contain some garbage. + if (!empty($urlparts['query']) || !empty($urlparts['fragment'])) { + continue; + } - return $results; + $gcontacts[] = Contact::getDetailsByURL($result["nurl"], local_user()); } + return $gcontacts; } /** @@ -118,12 +113,12 @@ class GContact intval($uid), intval($gcid), intval($zcid), - dbesc(datetime_convert()) + dbesc(DateTimeFormat::utcNow()) ); } else { q( "UPDATE `glink` SET `updated` = '%s' WHERE `cid` = %d AND `uid` = %d AND `gcid` = %d AND `zcid` = %d", - dbesc(datetime_convert()), + dbesc(DateTimeFormat::utcNow()), intval($cid), intval($uid), intval($gcid), @@ -157,7 +152,7 @@ class GContact throw new Exception("This (".$gcontact['url'].") doesn't seem to be an url."); } - if (in_array($urlparts["host"], array("www.facebook.com", "facebook.com", "twitter.com", "identi.ca", "alpha.app.net"))) { + if (in_array($urlparts["host"], ["www.facebook.com", "facebook.com", "twitter.com", "identi.ca", "alpha.app.net"])) { throw new Exception('Contact from a non federated network ignored. ('.$gcontact['url'].')'); } @@ -168,7 +163,7 @@ class GContact } // Assure that there are no parameter fragments in the profile url - if (in_array($gcontact['network'], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""))) { + if (in_array($gcontact['network'], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""])) { $gcontact['url'] = self::cleanContactUrl($gcontact['url']); } @@ -242,10 +237,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)]); } } } @@ -254,7 +247,7 @@ class GContact throw new Exception('No name and photo for URL '.$gcontact['url']); } - if (!in_array($gcontact['network'], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA))) { + if (!in_array($gcontact['network'], [NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA])) { throw new Exception('No federated network ('.$gcontact['network'].') detected for URL '.$gcontact['url']); } @@ -456,7 +449,7 @@ class GContact public static function suggestionQuery($uid, $start = 0, $limit = 80) { if (!$uid) { - return array(); + return []; } /* @@ -468,7 +461,7 @@ class GContact // return $list; //} - $network = array(NETWORK_DFRN); + $network = [NETWORK_DFRN]; if (Config::get('system', 'diaspora_enabled')) { $network[] = NETWORK_DIASPORA; @@ -532,7 +525,7 @@ class GContact intval($limit) ); - $list = array(); + $list = []; foreach ($r2 as $suggestion) { $list[$suggestion["nurl"]] = $suggestion; } @@ -560,7 +553,7 @@ class GContact { $a = get_app(); - $done = array(); + $done = []; /// @TODO Check if it is really neccessary to poll the own server PortableContact::loadWorker(0, 0, 0, System::baseUrl() . '/poco'); @@ -568,16 +561,17 @@ class GContact $done[] = System::baseUrl() . '/poco'; if (strlen(Config::get('system', 'directory'))) { - $x = fetch_url(get_server()."/pubsites"); - if ($x) { + $x = Network::fetchUrl(get_server()."/pubsites"); + 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; } } } @@ -664,8 +658,15 @@ class GContact { $gcontact_id = 0; $doprobing = false; + $last_failure_str = ''; + $last_contact_str = ''; - if (in_array($contact["network"], array(NETWORK_PHANTOM))) { + if (empty($contact["network"])) { + logger("Empty network for contact url ".$contact["url"]." - Called by: ".System::callstack(), LOGGER_DEBUG); + return false; + } + + if (in_array($contact["network"], [NETWORK_PHANTOM])) { logger("Invalid network for contact url ".$contact["url"]." - Called by: ".System::callstack(), LOGGER_DEBUG); return false; } @@ -683,11 +684,11 @@ class GContact self::fixAlternateContactAddress($contact); // Remove unwanted parts from the contact url (e.g. "?zrl=...") - if (in_array($contact["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) { + if (in_array($contact["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS])) { $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"])) @@ -697,7 +698,7 @@ class GContact $gcontact_id = $r[0]["id"]; // Update every 90 days - if (in_array($r[0]["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""))) { + if (in_array($r[0]["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""])) { $last_failure_str = $r[0]["last_failure"]; $last_failure = strtotime($r[0]["last_failure"]); $last_contact_str = $r[0]["last_contact"]; @@ -715,8 +716,8 @@ class GContact dbesc($contact["url"]), dbesc(normalise_link($contact["url"])), dbesc($contact["photo"]), - dbesc(datetime_convert()), - dbesc(datetime_convert()), + dbesc(DateTimeFormat::utcNow()), + dbesc(DateTimeFormat::utcNow()), dbesc($contact["location"]), dbesc($contact["about"]), intval($contact["hide"]), @@ -731,10 +732,10 @@ class GContact if (DBM::is_result($r)) { $gcontact_id = $r[0]["id"]; - $doprobing = in_array($r[0]["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, "")); + $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); @@ -766,7 +767,7 @@ class GContact return false; } - $r = q( + $public_contact = q( "SELECT `name`, `nick`, `photo`, `location`, `about`, `addr`, `generation`, `birthday`, `gender`, `keywords`, `contact-type`, `hide`, `nsfw`, `network`, `alias`, `notify`, `server_url`, `connect`, `updated`, `url` FROM `gcontact` WHERE `id` = %d LIMIT 1", @@ -774,8 +775,8 @@ class GContact ); // Get all field names - $fields = array(); - foreach ($r[0] as $field => $data) { + $fields = []; + foreach ($public_contact[0] as $field => $data) { $fields[$field] = $data; } @@ -785,26 +786,26 @@ class GContact // Bugfix: We had an error in the storing of keywords which lead to the "0" // This value is still transmitted via poco. - if ($contact["keywords"] == "0") { + if (!empty($contact["keywords"]) && ($contact["keywords"] == "0")) { unset($contact["keywords"]); } - if ($r[0]["keywords"] == "0") { - $r[0]["keywords"] = ""; + if (!empty($public_contact[0]["keywords"]) && ($public_contact[0]["keywords"] == "0")) { + $public_contact[0]["keywords"] = ""; } // assign all unassigned fields from the database entry foreach ($fields as $field => $data) { if (!isset($contact[$field]) || ($contact[$field] == "")) { - $contact[$field] = $r[0][$field]; + $contact[$field] = $public_contact[0][$field]; } } if (!isset($contact["hide"])) { - $contact["hide"] = $r[0]["hide"]; + $contact["hide"] = $public_contact[0]["hide"]; } - $fields["hide"] = $r[0]["hide"]; + $fields["hide"] = $public_contact[0]["hide"]; if ($contact["network"] == NETWORK_STATUSNET) { $contact["network"] = NETWORK_OSTATUS; @@ -814,7 +815,7 @@ class GContact self::fixAlternateContactAddress($contact); if (!isset($contact["updated"])) { - $contact["updated"] = DBM::date(); + $contact["updated"] = DateTimeFormat::utcNow(); } if ($contact["network"] == NETWORK_TWITTER) { @@ -839,27 +840,27 @@ class GContact $update = false; unset($fields["generation"]); - if ((($contact["generation"] > 0) && ($contact["generation"] <= $r[0]["generation"])) || ($r[0]["generation"] == 0)) { + if ((($contact["generation"] > 0) && ($contact["generation"] <= $public_contact[0]["generation"])) || ($public_contact[0]["generation"] == 0)) { foreach ($fields as $field => $data) { - if ($contact[$field] != $r[0][$field]) { - logger("Difference for contact ".$contact["url"]." in field '".$field."'. New value: '".$contact[$field]."', old value '".$r[0][$field]."'", LOGGER_DEBUG); + if ($contact[$field] != $public_contact[0][$field]) { + logger("Difference for contact ".$contact["url"]." in field '".$field."'. New value: '".$contact[$field]."', old value '".$public_contact[0][$field]."'", LOGGER_DEBUG); $update = true; } } - if ($contact["generation"] < $r[0]["generation"]) { - logger("Difference for contact ".$contact["url"]." in field 'generation'. new value: '".$contact["generation"]."', old value '".$r[0]["generation"]."'", LOGGER_DEBUG); + if ($contact["generation"] < $public_contact[0]["generation"]) { + logger("Difference for contact ".$contact["url"]." in field 'generation'. new value: '".$contact["generation"]."', old value '".$public_contact[0]["generation"]."'", LOGGER_DEBUG); $update = true; } } if ($update) { logger("Update gcontact for ".$contact["url"], LOGGER_DEBUG); - $condition = array('`nurl` = ? AND (`generation` = 0 OR `generation` >= ?)', - normalise_link($contact["url"]), $contact["generation"]); - $contact["updated"] = DBM::date($contact["updated"]); + $condition = ['`nurl` = ? AND (`generation` = 0 OR `generation` >= ?)', + normalise_link($contact["url"]), $contact["generation"]]; + $contact["updated"] = DateTimeFormat::utc($contact["updated"]); - $updated = array('photo' => $contact['photo'], 'name' => $contact['name'], + $updated = ['photo' => $contact['photo'], 'name' => $contact['name'], 'nick' => $contact['nick'], 'addr' => $contact['addr'], 'network' => $contact['network'], 'birthday' => $contact['birthday'], 'gender' => $contact['gender'], 'keywords' => $contact['keywords'], @@ -868,37 +869,41 @@ class GContact 'notify' => $contact['notify'], 'url' => $contact['url'], 'location' => $contact['location'], 'about' => $contact['about'], 'generation' => $contact['generation'], 'updated' => $contact['updated'], - 'server_url' => $contact['server_url'], 'connect' => $contact['connect']); + '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. - $r = q( - "SELECT `id` FROM `contact` WHERE `nurl` = '%s' AND `uid` = 0 ORDER BY `id` LIMIT 1", - dbesc(normalise_link($contact["url"])) - ); - - if (DBM::is_result($r)) { - logger("Update public contact ".$r[0]["id"], LOGGER_DEBUG); + /// @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); - Contact::updateAvatar($contact["photo"], 0, $r[0]["id"]); + Contact::updateAvatar($contact["photo"], 0, $public_contact["id"]); - $fields = array('name', 'nick', 'addr', + $fields = ['name', 'nick', 'addr', 'network', 'bd', 'gender', 'keywords', 'alias', 'contact-type', - 'url', 'location', 'about'); - $old_contact = dba::select('contact', $fields, array('id' => $r[0]["id"]), array('limit' => 1)); + 'url', 'location', 'about']; + $old_contact = DBA::selectFirst('contact', $fields, ['id' => $public_contact["id"]]); // Update it with the current values - $fields = array('name' => $contact['name'], 'nick' => $contact['nick'], + $fields = ['name' => $contact['name'], 'nick' => $contact['nick'], 'addr' => $contact['addr'], 'network' => $contact['network'], 'bd' => $contact['birthday'], 'gender' => $contact['gender'], 'keywords' => $contact['keywords'], 'alias' => $contact['alias'], 'contact-type' => $contact['contact-type'], 'url' => $contact['url'], - 'location' => $contact['location'], 'about' => $contact['about']); + '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, array('id' => $r[0]["id"]), $old_contact); + + DBA::update('contact', $fields, ['id' => $public_contact["id"]], $old_contact); } } @@ -915,7 +920,7 @@ class GContact { $data = Probe::uri($url); - if (in_array($data["network"], array(NETWORK_PHANTOM))) { + if (in_array($data["network"], [NETWORK_PHANTOM])) { logger("Invalid network for contact url ".$data["url"]." - Called by: ".System::callstack(), LOGGER_DEBUG); return; } @@ -947,24 +952,24 @@ class GContact ); $location = Profile::formatLocation( - array("locality" => $r[0]["locality"], "region" => $r[0]["region"], "country-name" => $r[0]["country-name"]) + ["locality" => $r[0]["locality"], "region" => $r[0]["region"], "country-name" => $r[0]["country-name"]] ); // 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://"), "", System::baseUrl()); + $addr = $r[0]["nickname"].'@'.str_replace(["http://", "https://"], "", System::baseUrl()); } else { $addr = $r[0]["addr"]; } - $gcontact = array("name" => $r[0]["name"], "location" => $location, "about" => $r[0]["about"], + $gcontact = ["name" => $r[0]["name"], "location" => $location, "about" => $r[0]["about"], "gender" => $r[0]["gender"], "keywords" => $r[0]["pub_keywords"], "birthday" => $r[0]["dob"], "photo" => $r[0]["photo"], "notify" => $r[0]["notify"], "url" => $r[0]["url"], "hide" => ($r[0]["hidewall"] || !$r[0]["net-publish"]), "nick" => $r[0]["nickname"], "addr" => $addr, "connect" => $addr, "server_url" => System::baseUrl(), - "generation" => 1, "network" => NETWORK_DFRN); + "generation" => 1, "network" => NETWORK_DFRN]; self::update($gcontact); } @@ -972,7 +977,7 @@ class GContact /** * @brief Fetches users of given GNU Social server * - * If the "Statistics" plugin is enabled (See http://gstools.org/ for details) we query user data with this. + * If the "Statistics" addon is enabled (See http://gstools.org/ for details) we query user data with this. * * @param string $server Server address * @return void @@ -983,14 +988,14 @@ class GContact $url = $server."/main/statistics"; - $result = z_fetch_url($url); + $result = Network::curl($url); if (!$result["success"]) { return false; } $statistics = json_decode($result["body"]); - if (is_object($statistics->config)) { + if (!empty($statistics->config)) { if ($statistics->config->instance_with_ssl) { $server = "https://"; } else { @@ -1000,8 +1005,7 @@ class GContact $server .= $statistics->config->instance_address; $hostname = $statistics->config->instance_address; - } else { - /// @TODO is_object() above means here no object, still $statistics is being used as object + } elseif (!empty($statistics)) { if ($statistics->instance_with_ssl) { $server = "https://"; } else { @@ -1013,17 +1017,21 @@ class GContact $hostname = $statistics->instance_address; } - if (is_object($statistics->users)) { + if (!empty($statistics->users)) { foreach ($statistics->users as $nick => $user) { $profile_url = $server."/".$user->nickname; - $contact = array("url" => $profile_url, + $contact = ["url" => $profile_url, "name" => $user->fullname, "addr" => $user->nickname."@".$hostname, "nick" => $user->nickname, - "about" => $user->bio, "network" => NETWORK_OSTATUS, - "photo" => System::baseUrl()."/images/person-175.jpg"); + "photo" => System::baseUrl()."/images/person-175.jpg"]; + + if (isset($user->bio)) { + $contact["about"] = $user->bio; + } + self::getId($contact); } } @@ -1051,7 +1059,7 @@ class GContact foreach ($r as $server) { self::fetchGsUsers($server["url"]); - q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", dbesc(datetime_convert()), dbesc($server["nurl"])); + q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", dbesc(DateTimeFormat::utcNow()), dbesc($server["nurl"])); } }