bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Replaced quotes

Browse source
This commit is contained in:
Michael 2019-10-16 17:13:56 +00:00
parent f1e7d97b8c
commit 4c5b97834b
1 changed files with 78 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

156
src/Model/GContact.php
View file

@ -31,7 +31,7 @@ class GContact
* @brief Search global contact table by nick or name * @brief Search global contact table by nick or name
* *
* @param string $search Name or nick * @param string $search Name or nick
* @param string $mode Search mode (e.g. "community") * @param string $mode Search mode (e.g. 'community')
* *
* @return array with search results * @return array with search results
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \Friendica\Network\HTTPException\InternalServerErrorException
@ -56,13 +56,13 @@ class GContact
} }
// check if we search only communities or every contact // check if we search only communities or every contact
if ($mode === "community") { if ($mode === 'community') {
$extra_sql = " AND `community`"; $extra_sql = ' AND `community`';
} else { } else {
$extra_sql = ""; $extra_sql = '';
} }
$search .= "%"; $search .= '%';
$results = DBA::p("SELECT `nurl` FROM `gcontact` $results = DBA::p("SELECT `nurl` FROM `gcontact`
WHERE NOT `hide` AND `network` IN (?, ?, ?, ?) AND WHERE NOT `hide` AND `network` IN (?, ?, ?, ?) AND
@ -74,7 +74,7 @@ class GContact
$gcontacts = []; $gcontacts = [];
while ($result = DBA::fetch($results)) { while ($result = DBA::fetch($results)) {
$urlparts = parse_url($result["nurl"]); $urlparts = parse_url($result['nurl']);
// Ignore results that look strange. // Ignore results that look strange.
// For historic reasons the gcontact table does contain some garbage. // For historic reasons the gcontact table does contain some garbage.
@ -82,7 +82,7 @@ class GContact
continue; continue;
} }
$gcontacts[] = Contact::getDetailsByURL($result["nurl"], local_user()); $gcontacts[] = Contact::getDetailsByURL($result['nurl'], local_user());
} }
return $gcontacts; return $gcontacts;
} }
@ -131,7 +131,7 @@ class GContact
$urlparts = parse_url($gcontact['url']); $urlparts = parse_url($gcontact['url']);
if (!isset($urlparts['scheme'])) { if (!isset($urlparts['scheme'])) {
throw new Exception("This (".$gcontact['url'].") doesn't seem to be an url."); throw new Exception('This ('.$gcontact['url'].") doesn't seem to be an url.");
} }
if (in_array($urlparts['host'], ['twitter.com', 'identi.ca'])) { if (in_array($urlparts['host'], ['twitter.com', 'identi.ca'])) {
@ -145,7 +145,7 @@ class GContact
} }
// Assure that there are no parameter fragments in the profile url // Assure that there are no parameter fragments in the profile url
if (empty($gcontact['*network']) || in_array($gcontact["network"], Protocol::FEDERATED)) { if (empty($gcontact['*network']) || in_array($gcontact['network'], Protocol::FEDERATED)) {
$gcontact['url'] = self::cleanContactUrl($gcontact['url']); $gcontact['url'] = self::cleanContactUrl($gcontact['url']);
} }
@ -436,7 +436,7 @@ class GContact
* Uncommented because the result of the queries are to big to store it in the cache. * 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. * We need to decide if we want to change the db column type or if we want to delete it.
*/ */
//$list = Cache::get("suggestion_query:".$uid.":".$start.":".$limit); //$list = Cache::get('suggestion_query:'.$uid.':'.$start.':'.$limit);
//if (!is_null($list)) { //if (!is_null($list)) {
// return $list; // return $list;
//} //}
@ -507,11 +507,11 @@ class GContact
$list = []; $list = [];
foreach ($r2 as $suggestion) { foreach ($r2 as $suggestion) {
$list[$suggestion["nurl"]] = $suggestion; $list[$suggestion['nurl']] = $suggestion;
} }
foreach ($r as $suggestion) { foreach ($r as $suggestion) {
$list[$suggestion["nurl"]] = $suggestion; $list[$suggestion['nurl']] = $suggestion;
} }
while (sizeof($list) > ($limit)) { while (sizeof($list) > ($limit)) {
@ -540,7 +540,7 @@ class GContact
$done[] = System::baseUrl() . '/poco'; $done[] = System::baseUrl() . '/poco';
if (strlen(Config::get('system', 'directory'))) { if (strlen(Config::get('system', 'directory'))) {
$x = Network::fetchUrl(get_server()."/pubsites"); $x = Network::fetchUrl(get_server().'/pubsites');
if (!empty($x)) { if (!empty($x)) {
$j = json_decode($x); $j = json_decode($x);
if (!empty($j->entries)) { if (!empty($j->entries)) {
@ -586,22 +586,22 @@ class GContact
{ {
$parts = parse_url($url); $parts = parse_url($url);
if (!isset($parts["scheme"]) || !isset($parts["host"])) { if (!isset($parts['scheme']) || !isset($parts['host'])) {
return $url; return $url;
} }
$new_url = $parts["scheme"]."://".$parts["host"]; $new_url = $parts['scheme'].'://'.$parts['host'];
if (isset($parts["port"])) { if (isset($parts['port'])) {
$new_url .= ":".$parts["port"]; $new_url .= ':'.$parts['port'];
} }
if (isset($parts["path"])) { if (isset($parts['path'])) {
$new_url .= $parts["path"]; $new_url .= $parts['path'];
} }
if ($new_url != $url) { if ($new_url != $url) {
Logger::log("Cleaned contact url ".$url." to ".$new_url." - Called by: ".System::callstack(), Logger::DEBUG); Logger::log('Cleaned contact url '.$url.' to '.$new_url.' - Called by: '.System::callstack(), Logger::DEBUG);
} }
return $new_url; return $new_url;
@ -617,14 +617,14 @@ class GContact
*/ */
public static function fixAlternateContactAddress(&$contact) public static function fixAlternateContactAddress(&$contact)
{ {
if (($contact["network"] == Protocol::OSTATUS) && PortableContact::alternateOStatusUrl($contact["url"])) { if (($contact['network'] == Protocol::OSTATUS) && PortableContact::alternateOStatusUrl($contact['url'])) {
$data = Probe::uri($contact["url"]); $data = Probe::uri($contact['url']);
if ($contact["network"] == Protocol::OSTATUS) { if ($contact['network'] == Protocol::OSTATUS) {
Logger::log("Fix primary url from ".$contact["url"]." to ".$data["url"]." - Called by: ".System::callstack(), Logger::DEBUG); Logger::log('Fix primary url from '.$contact['url'].' to '.$data['url'].' - Called by: '.System::callstack(), Logger::DEBUG);
$contact["url"] = $data["url"]; $contact['url'] = $data['url'];
$contact["addr"] = $data["addr"]; $contact['addr'] = $data['addr'];
$contact["alias"] = $data["alias"]; $contact['alias'] = $data['alias'];
$contact["server_url"] = $data["baseurl"]; $contact['server_url'] = $data['baseurl'];
} }
} }
} }
@ -645,45 +645,45 @@ class GContact
$last_failure_str = ''; $last_failure_str = '';
$last_contact_str = ''; $last_contact_str = '';
if (empty($contact["network"])) { if (empty($contact['network'])) {
Logger::log("Empty network for contact url ".$contact["url"]." - Called by: ".System::callstack(), Logger::DEBUG); Logger::log('Empty network for contact url '.$contact['url'].' - Called by: '.System::callstack(), Logger::DEBUG);
return false; return false;
} }
if (in_array($contact["network"], [Protocol::PHANTOM])) { if (in_array($contact['network'], [Protocol::PHANTOM])) {
Logger::log("Invalid network for contact url ".$contact["url"]." - Called by: ".System::callstack(), Logger::DEBUG); Logger::log('Invalid network for contact url '.$contact['url'].' - Called by: '.System::callstack(), Logger::DEBUG);
return false; return false;
} }
if ($contact["network"] == Protocol::STATUSNET) { if ($contact['network'] == Protocol::STATUSNET) {
$contact["network"] = Protocol::OSTATUS; $contact['network'] = Protocol::OSTATUS;
} }
// All new contacts are hidden by default // All new contacts are hidden by default
if (!isset($contact["hide"])) { if (!isset($contact['hide'])) {
$contact["hide"] = true; $contact['hide'] = true;
} }
// Replace alternate OStatus user format with the primary one // Replace alternate OStatus user format with the primary one
self::fixAlternateContactAddress($contact); self::fixAlternateContactAddress($contact);
// Remove unwanted parts from the contact url (e.g. "?zrl=...") // Remove unwanted parts from the contact url (e.g. '?zrl=...')
if (in_array($contact["network"], Protocol::FEDERATED)) { if (in_array($contact['network'], Protocol::FEDERATED)) {
$contact["url"] = self::cleanContactUrl($contact["url"]); $contact['url'] = self::cleanContactUrl($contact['url']);
} }
DBA::lock('gcontact'); DBA::lock('gcontact');
$fields = ['id', 'last_contact', 'last_failure', 'network']; $fields = ['id', 'last_contact', 'last_failure', 'network'];
$gcnt = DBA::selectFirst('gcontact', $fields, ['nurl' => Strings::normaliseLink($contact["url"])]); $gcnt = DBA::selectFirst('gcontact', $fields, ['nurl' => Strings::normaliseLink($contact['url'])]);
if (DBA::isResult($gcnt)) { if (DBA::isResult($gcnt)) {
$gcontact_id = $gcnt["id"]; $gcontact_id = $gcnt['id'];
// Update every 90 days // Update every 90 days
if (in_array($gcnt["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, ""])) { if (in_array($gcnt['network'], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, ''])) {
$last_failure_str = $gcnt["last_failure"]; $last_failure_str = $gcnt['last_failure'];
$last_failure = strtotime($gcnt["last_failure"]); $last_failure = strtotime($gcnt['last_failure']);
$last_contact_str = $gcnt["last_contact"]; $last_contact_str = $gcnt['last_contact'];
$last_contact = strtotime($gcnt["last_contact"]); $last_contact = strtotime($gcnt['last_contact']);
$doprobing = (((time() - $last_contact) > (90 * 86400)) && ((time() - $last_failure) > (90 * 86400))); $doprobing = (((time() - $last_contact) > (90 * 86400)) && ((time() - $last_failure) > (90 * 86400)));
} }
} else { } else {
@ -694,33 +694,33 @@ class GContact
q( q(
"INSERT INTO `gcontact` (`name`, `nick`, `addr` , `network`, `url`, `nurl`, `photo`, `created`, `updated`, `location`, `about`, `hide`, `generation`) "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)", VALUES ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d)",
DBA::escape($contact["name"]), DBA::escape($contact['name']),
DBA::escape($contact["nick"]), DBA::escape($contact['nick']),
DBA::escape($contact["addr"]), DBA::escape($contact['addr']),
DBA::escape($contact["network"]), DBA::escape($contact['network']),
DBA::escape($contact["url"]), DBA::escape($contact['url']),
DBA::escape(Strings::normaliseLink($contact["url"])), DBA::escape(Strings::normaliseLink($contact['url'])),
DBA::escape($contact["photo"]), DBA::escape($contact['photo']),
DBA::escape(DateTimeFormat::utcNow()), DBA::escape(DateTimeFormat::utcNow()),
DBA::escape(DateTimeFormat::utcNow()), DBA::escape(DateTimeFormat::utcNow()),
DBA::escape($contact["location"]), DBA::escape($contact['location']),
DBA::escape($contact["about"]), DBA::escape($contact['about']),
intval($contact["hide"]), intval($contact['hide']),
intval($contact["generation"]) intval($contact['generation'])
); );
$condition = ['nurl' => Strings::normaliseLink($contact["url"])]; $condition = ['nurl' => Strings::normaliseLink($contact['url'])];
$cnt = DBA::selectFirst('gcontact', ['id', 'network'], $condition, ['order' => ['id']]); $cnt = DBA::selectFirst('gcontact', ['id', 'network'], $condition, ['order' => ['id']]);
if (DBA::isResult($cnt)) { if (DBA::isResult($cnt)) {
$gcontact_id = $cnt["id"]; $gcontact_id = $cnt['id'];
$doprobing = in_array($cnt["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, ""]); $doprobing = in_array($cnt['network'], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, '']);
} }
} }
DBA::unlock(); DBA::unlock();
if ($doprobing) { if ($doprobing) {
Logger::log("Last Contact: ". $last_contact_str." - Last Failure: ".$last_failure_str." - Checking: ".$contact["url"], Logger::DEBUG); Logger::log("Last Contact: ". $last_contact_str." - Last Failure: ".$last_failure_str." - Checking: ".$contact['url'], Logger::DEBUG);
Worker::add(PRIORITY_LOW, 'GProbe', $contact["url"]); Worker::add(PRIORITY_LOW, 'GProbe', $contact['url']);
} }
return $gcontact_id; return $gcontact_id;
@ -828,13 +828,13 @@ class GContact
if ((($contact['generation'] > 0) && ($contact['generation'] <= $public_contact['generation'])) || ($public_contact['generation'] == 0)) { if ((($contact['generation'] > 0) && ($contact['generation'] <= $public_contact['generation'])) || ($public_contact['generation'] == 0)) {
foreach ($fields as $field => $data) { foreach ($fields as $field => $data) {
if ($contact[$field] != $public_contact[$field]) { if ($contact[$field] != $public_contact[$field]) {
Logger::debug('Difference found.', ['contact' => $contact["url"], 'field' => $field, 'new' => $contact[$field], 'old' => $public_contact[$field]]); Logger::debug('Difference found.', ['contact' => $contact['url'], 'field' => $field, 'new' => $contact[$field], 'old' => $public_contact[$field]]);
$update = true; $update = true;
} }
} }
if ($contact['generation'] < $public_contact['generation']) { if ($contact['generation'] < $public_contact['generation']) {
Logger::debug('Difference found.', ['contact' => $contact["url"], 'field' => 'generation', 'new' => $contact['generation'], 'old' => $public_contact['generation']]); Logger::debug('Difference found.', ['contact' => $contact['url'], 'field' => 'generation', 'new' => $contact['generation'], 'old' => $public_contact['generation']]);
$update = true; $update = true;
} }
} }
@ -842,7 +842,7 @@ class GContact
if ($update) { if ($update) {
Logger::debug('Update gcontact.', ['contact' => $contact['url']]); Logger::debug('Update gcontact.', ['contact' => $contact['url']]);
$condition = ['`nurl` = ? AND (`generation` = 0 OR `generation` >= ?)', $condition = ['`nurl` = ? AND (`generation` = 0 OR `generation` >= ?)',
Strings::normaliseLink($contact["url"]), $contact["generation"]]; Strings::normaliseLink($contact['url']), $contact["generation"]];
$contact["updated"] = DateTimeFormat::utc($contact["updated"]); $contact["updated"] = DateTimeFormat::utc($contact["updated"]);
$updated = [ $updated = [
@ -1154,7 +1154,7 @@ class GContact
{ {
$data = Probe::uri($url, $force); $data = Probe::uri($url, $force);
if (in_array($data["network"], [Protocol::PHANTOM])) { if (in_array($data['network'], [Protocol::PHANTOM])) {
$fields = ['last_failure' => DateTimeFormat::utcNow()]; $fields = ['last_failure' => DateTimeFormat::utcNow()];
DBA::update('gcontact', $fields, ['nurl' => Strings::normaliseLink($url)]); DBA::update('gcontact', $fields, ['nurl' => Strings::normaliseLink($url)]);
Logger::info('Invalid network for contact', ['url' => $data['url'], 'callstack' => System::callstack()]); Logger::info('Invalid network for contact', ['url' => $data['url'], 'callstack' => System::callstack()]);
@ -1203,19 +1203,19 @@ class GContact
["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 // The 'addr' field was added in 3.4.3 so it can be empty for older users
if ($r[0]["addr"] != "") { if ($r[0]['addr'] != '') {
$addr = $r[0]["nickname"].'@'.str_replace(["http://", "https://"], "", System::baseUrl()); $addr = $r[0]["nickname"].'@'.str_replace(["http://", "https://"], '', System::baseUrl());
} else { } else {
$addr = $r[0]["addr"]; $addr = $r[0]['addr'];
} }
$gcontact = ["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"], "gender" => $r[0]["gender"], 'keywords' => $r[0]["pub_keywords"],
"birthday" => $r[0]["dob"], "photo" => $r[0]["photo"], "birthday" => $r[0]["dob"], "photo" => $r[0]["photo"],
"notify" => $r[0]["notify"], "url" => $r[0]["url"], "notify" => $r[0]["notify"], "url" => $r[0]['url'],
"hide" => ($r[0]["hidewall"] || !$r[0]["net-publish"]), "hide" => ($r[0]["hidewall"] || !$r[0]["net-publish"]),
"nick" => $r[0]["nickname"], "addr" => $addr, "nick" => $r[0]["nickname"], 'addr' => $addr,
"connect" => $addr, "server_url" => System::baseUrl(), "connect" => $addr, "server_url" => System::baseUrl(),
"generation" => 1, "network" => Protocol::DFRN]; "generation" => 1, "network" => Protocol::DFRN];
@ -1272,14 +1272,14 @@ class GContact
$profile_url = $server."/".$user->nickname; $profile_url = $server."/".$user->nickname;
$contact = ["url" => $profile_url, $contact = ["url" => $profile_url,
"name" => $user->fullname, 'name' => $user->fullname,
"addr" => $user->nickname."@".$hostname, 'addr' => $user->nickname."@".$hostname,
"nick" => $user->nickname, "nick" => $user->nickname,
"network" => Protocol::OSTATUS, "network" => Protocol::OSTATUS,
"photo" => System::baseUrl()."/images/person-300.jpg"]; "photo" => System::baseUrl()."/images/person-300.jpg"];
if (isset($user->bio)) { if (isset($user->bio)) {
$contact["about"] = $user->bio; $contact['about'] = $user->bio;
} }
self::getId($contact); self::getId($contact);
@ -1315,7 +1315,7 @@ class GContact
} }
foreach ($r as $server) { foreach ($r as $server) {
self::fetchGsUsers($server["url"]); self::fetchGsUsers($server['url']);
q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", DBA::escape(DateTimeFormat::utcNow()), DBA::escape($server["nurl"])); q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", DBA::escape(DateTimeFormat::utcNow()), DBA::escape($server["nurl"]));
} }
} }