X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FGContact.php;h=5cf613388cbdfe32dadf5cc033bed1dce439f8dd;hb=d57449623b9376e234767bdcf60194d1ed403f3a;hp=7b14b2cdc4d19e42ce4cab9298f6a153aaa92343;hpb=d419d07f734442ad636720dc3c3d0b855c87082e;p=friendica.git

diff --git a/src/Model/GContact.php b/src/Model/GContact.php
index 7b14b2cdc4..5cf613388c 100644
--- a/src/Model/GContact.php
+++ b/src/Model/GContact.php
@@ -6,21 +6,17 @@
  */
 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';
-require_once 'include/html2bbcode.php';
 
 /**
  * @brief This class handles GlobalContact related functions
@@ -37,56 +33,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;
 	}
 
 	/**
@@ -112,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),
@@ -186,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"];
 			}
 
@@ -197,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"];
 				}
 			}
@@ -211,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"];
 			}
@@ -243,10 +236,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)]);
 				}
 			}
 		}
@@ -298,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;
@@ -320,7 +311,7 @@ class GContact
 			intval($uid)
 		);
 
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			return $r[0]['total'];
 		}
 
@@ -361,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;
 	}
 
@@ -393,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;
 	}
 
@@ -413,7 +404,7 @@ class GContact
 			intval($uid)
 		);
 
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			return $r[0]['total'];
 		}
 
@@ -444,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;
 	}
 
@@ -504,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.
@@ -570,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;
 						}
 					}
 				}
@@ -592,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)) {
@@ -668,6 +660,11 @@ class GContact
 		$last_failure_str = '';
 		$last_contact_str = '';
 
+		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;
@@ -690,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
@@ -731,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);
@@ -788,11 +785,11 @@ 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 ($public_contact[0]["keywords"] == "0") {
+		if (!empty($public_contact[0]["keywords"]) && ($public_contact[0]["keywords"] == "0")) {
 			$public_contact[0]["keywords"] = "";
 		}
 
@@ -817,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) {
@@ -860,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'],
@@ -873,13 +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.
-
-			$public_contact = dba::selectFirst('contact', ['id'], ['nurl' => normalise_link($contact["url"]), 'uid' => 0]);
-			if (DBM::is_result($public_contact)) {
+			/// @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::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'],
@@ -898,7 +896,13 @@ class GContact
 						'contact-type' => $contact['contact-type'], 'url' => $contact['url'],
 						'location' => $contact['location'], 'about' => $contact['about']];
 
-				dba::update('contact', $fields, ['id' => $public_contact["id"]], $old_contact);
+				// 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);
 			}
 		}
 
@@ -990,7 +994,7 @@ class GContact
 
 		$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 +1004,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,7 +1016,7 @@ 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;
 
@@ -1021,9 +1024,13 @@ class GContact
 						"name" => $user->fullname,
 						"addr" => $user->nickname."@".$hostname,
 						"nick" => $user->nickname,
-						"about" => $user->bio,
 						"network" => NETWORK_OSTATUS,
 						"photo" => System::baseUrl()."/images/person-175.jpg"];
+
+				if (isset($user->bio)) {
+					$contact["about"] = $user->bio;
+				}
+
 				self::getId($contact);
 			}
 		}
@@ -1045,7 +1052,7 @@ class GContact
 			dbesc($last_update)
 		);
 
-		if (!DBM::is_result($r)) {
+		if (!DBA::isResult($r)) {
 			return;
 		}
 
@@ -1068,7 +1075,7 @@ class GContact
 			dbesc(NETWORK_DFRN)
 		);
 
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			return dirname($r[0]['url']);
 		}