X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2FContact.php;h=79a14ab581c84dd3de3ab61d9e3efe8174bf27c1;hb=7c68e14b3d58c954c02330b46b741b79d177929d;hp=5aaaa11bffa601183ad33bef33ed80c913b1ebf0;hpb=885dc1df81c9ab752f9f5d66894786944184a9c9;p=friendica.git

diff --git a/include/Contact.php b/include/Contact.php
index 5aaaa11bff..79a14ab581 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -129,11 +129,11 @@ function terminate_friendship($user,$self,$contact) {
 	}
 	elseif($contact['network'] === NETWORK_DIASPORA) {
 		require_once('include/diaspora.php');
-		diaspora_unshare($user,$contact);
+		diaspora::send_unshare($user,$contact);
 	}
 	elseif($contact['network'] === NETWORK_DFRN) {
-		require_once('include/items.php');
-		dfrn_deliver($user,$contact,'placeholder', 1);
+		require_once('include/dfrn.php');
+		dfrn::deliver($user,$contact,'placeholder', 1);
 	}
 
 }
@@ -208,44 +208,46 @@ function get_contact_details_by_url($url, $uid = -1) {
 	}
 
 	// Fetching further contact data from the contact table
-	$r = q("SELECT `id`, `uid`, `url`, `network`, `name`, `nick`, `addr`, `location`, `about`, `keywords`, `gender`, `photo`, `addr`, `forum`, `prv`, `bd` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND `network` = '%s'",
+	$r = q("SELECT `id`, `uid`, `url`, `network`, `name`, `nick`, `addr`, `location`, `about`, `keywords`, `gender`, `photo`, `thumb`, `addr`, `forum`, `prv`, `bd`, `self` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND `network` IN ('%s', '')",
 		dbesc(normalise_link($url)), intval($uid), dbesc($profile["network"]));
 
-	if (!count($r))
-		$r = q("SELECT `id`, `uid`, `url`, `network`, `name`, `nick`, `addr`, `location`, `about`, `keywords`, `gender`, `photo`, `addr`, `forum`, `prv`, `bd` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d",
+	if (!count($r) AND !isset($profile))
+		$r = q("SELECT `id`, `uid`, `url`, `network`, `name`, `nick`, `addr`, `location`, `about`, `keywords`, `gender`, `photo`, `thumb`, `addr`, `forum`, `prv`, `bd`, `self` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d",
 			dbesc(normalise_link($url)), intval($uid));
 
-	if (!count($r))
-		$r = q("SELECT `id`, `uid`, `url`, `network`, `name`, `nick`, `addr`, `location`, `about`, `keywords`, `gender`, `photo`, `addr`, `forum`, `prv`, `bd` FROM `contact` WHERE `nurl` = '%s' AND `uid` = 0",
+	if (!count($r) AND !isset($profile))
+		$r = q("SELECT `id`, `uid`, `url`, `network`, `name`, `nick`, `addr`, `location`, `about`, `keywords`, `gender`, `photo`, `thumb`, `addr`, `forum`, `prv`, `bd` FROM `contact` WHERE `nurl` = '%s' AND `uid` = 0",
 			dbesc(normalise_link($url)));
 
 	if ($r) {
-		if (isset($r[0]["url"]) AND $r[0]["url"])
+		if (!isset($profile["url"]) AND $r[0]["url"])
 			$profile["url"] = $r[0]["url"];
-		if (isset($r[0]["name"]) AND $r[0]["name"])
+		if (!isset($profile["name"]) AND $r[0]["name"])
 			$profile["name"] = $r[0]["name"];
-		if (isset($r[0]["nick"]) AND $r[0]["nick"] AND ($profile["nick"] == ""))
+		if (!isset($profile["nick"]) AND $r[0]["nick"])
 			$profile["nick"] = $r[0]["nick"];
-		if (isset($r[0]["addr"]) AND $r[0]["addr"] AND ($profile["addr"] == ""))
+		if (!isset($profile["addr"]) AND $r[0]["addr"])
 			$profile["addr"] = $r[0]["addr"];
-		if (isset($r[0]["photo"]) AND $r[0]["photo"])
+		if ((!isset($profile["photo"]) OR $r[0]["self"]) AND $r[0]["photo"])
 			$profile["photo"] = $r[0]["photo"];
-		if (isset($r[0]["location"]) AND $r[0]["location"])
+		if (!isset($profile["location"]) AND $r[0]["location"])
 			$profile["location"] = $r[0]["location"];
-		if (isset($r[0]["about"]) AND $r[0]["about"])
+		if (!isset($profile["about"]) AND $r[0]["about"])
 			$profile["about"] = $r[0]["about"];
-		if (isset($r[0]["keywords"]) AND $r[0]["keywords"])
+		if (!isset($profile["keywords"]) AND $r[0]["keywords"])
 			$profile["keywords"] = $r[0]["keywords"];
-		if (isset($r[0]["gender"]) AND $r[0]["gender"])
+		if (!isset($profile["gender"]) AND $r[0]["gender"])
 			$profile["gender"] = $r[0]["gender"];
 		if (isset($r[0]["forum"]) OR isset($r[0]["prv"]))
 			$profile["community"] = ($r[0]["forum"] OR $r[0]["prv"]);
-		if (isset($r[0]["network"]) AND $r[0]["network"])
+		if (!isset($profile["network"]) AND $r[0]["network"])
 			$profile["network"] = $r[0]["network"];
-		if (isset($r[0]["addr"]) AND $r[0]["addr"])
+		if (!isset($profile["addr"]) AND $r[0]["addr"])
 			$profile["addr"] = $r[0]["addr"];
-		if (isset($r[0]["bd"]) AND $r[0]["bd"])
+		if (!isset($profile["bd"]) AND $r[0]["bd"])
 			$profile["bd"] = $r[0]["bd"];
+		if (isset($r[0]["thumb"]))
+			$profile["thumb"] = $r[0]["thumb"];
 		if ($r[0]["uid"] == 0)
 			$profile["cid"] = 0;
 		else
@@ -402,6 +404,7 @@ function get_contact($url, $uid = 0) {
 	$contactid = 0;
 
 	// is it an address in the format user@server.tld?
+	/// @todo use gcontact and/or the addr field for a lookup
 	if (!strstr($url, "http") OR strstr($url, "@")) {
 		$data = probe_url($url);
 		$url = $data["url"];
@@ -409,12 +412,12 @@ function get_contact($url, $uid = 0) {
 			return 0;
 	}
 
-	$contact = q("SELECT `id`, `avatar-date` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d",
+	$contact = q("SELECT `id`, `avatar-date` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d ORDER BY `id` LIMIT 2",
 			dbesc(normalise_link($url)),
 			intval($uid));
 
 	if (!$contact)
-		$contact = q("SELECT `id`, `avatar-date` FROM `contact` WHERE `alias` IN ('%s', '%s') AND `uid` = %d",
+		$contact = q("SELECT `id`, `avatar-date` FROM `contact` WHERE `alias` IN ('%s', '%s') AND `uid` = %d ORDER BY `id` LIMIT 1",
 				dbesc($url),
 				dbesc(normalise_link($url)),
 				intval($uid));
@@ -438,9 +441,7 @@ function get_contact($url, $uid = 0) {
 	if (!in_array($data["network"], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA)))
 		return 0;
 
-	// tempory programming. Can be deleted after 2015-02-07
-	if (($data["alias"] == "") AND (normalise_link($data["url"]) != normalise_link($url)))
-		$data["alias"] = normalise_link($url);
+	$url = $data["url"];
 
 	if ($contactid == 0) {
 		q("INSERT INTO `contact` (`uid`, `created`, `url`, `nurl`, `addr`, `alias`, `notify`, `poll`,
@@ -469,7 +470,7 @@ function get_contact($url, $uid = 0) {
 			dbesc($data["poco"])
 		);
 
-		$contact = q("SELECT `id` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d",
+		$contact = q("SELECT `id` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d ORDER BY `id` LIMIT 2",
 				dbesc(normalise_link($data["url"])),
 				intval($uid));
 		if (!$contact)
@@ -478,23 +479,23 @@ function get_contact($url, $uid = 0) {
 		$contactid = $contact[0]["id"];
 	}
 
+	if ((count($contact) > 1) AND ($uid == 0) AND ($contactid != 0) AND ($url != ""))
+		q("DELETE FROM `contact` WHERE `nurl` = '%s' AND `id` != %d",
+			dbesc(normalise_link($url)),
+			intval($contactid));
+
 	require_once("Photo.php");
 
-	$photos = import_profile_photo($data["photo"],$uid,$contactid);
+	update_contact_avatar($data["photo"],$uid,$contactid);
 
-	q("UPDATE `contact` SET `photo` = '%s', `thumb` = '%s', `micro` = '%s',
-		`addr` = '%s', `alias` = '%s', `name` = '%s', `nick` = '%s',
-		`name-date` = '%s', `uri-date` = '%s', `avatar-date` = '%s' WHERE `id` = %d",
-		dbesc($photos[0]),
-		dbesc($photos[1]),
-		dbesc($photos[2]),
+	q("UPDATE `contact` SET `addr` = '%s', `alias` = '%s', `name` = '%s', `nick` = '%s',
+		`name-date` = '%s', `uri-date` = '%s' WHERE `id` = %d",
 		dbesc($data["addr"]),
 		dbesc($data["alias"]),
 		dbesc($data["name"]),
 		dbesc($data["nick"]),
 		dbesc(datetime_convert()),
 		dbesc(datetime_convert()),
-		dbesc(datetime_convert()),
 		intval($contactid)
 	);
 
@@ -533,7 +534,7 @@ function posts_from_gcontact($a, $gcontact_id) {
 	$r = q("SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`,
 			`author-name` AS `name`, `owner-avatar` AS `photo`,
 			`owner-link` AS `url`, `owner-avatar` AS `thumb`
-		FROM `item`
+		FROM `item` FORCE INDEX (`gcontactid_uid_created`)
 		WHERE `gcontact-id` = %d AND $sql AND
 			NOT `deleted` AND NOT `moderated` AND `visible`
 		ORDER BY `item`.`created` DESC LIMIT %d, %d",
@@ -554,60 +555,6 @@ function posts_from_gcontact($a, $gcontact_id) {
 	return $o;
 }
 
-/**
- * @brief set the gcontact-id in all item entries
- *
- * This job has to be started multiple times until all entries are set.
- * It isn't started in the update function since it would consume too much time and can be done in the background.
- */
-function item_set_gcontact() {
-	define ('POST_UPDATE_VERSION', 1192);
-
-	// Was the script completed?
-	if (get_config("system", "post_update_version") >= POST_UPDATE_VERSION)
-		return;
-
-	// Check if the first step is done (Setting "gcontact-id" in the item table)
-	$r = q("SELECT `author-link`, `author-name`, `author-avatar`, `uid`, `network` FROM `item` WHERE `gcontact-id` = 0 LIMIT 1000");
-	if (!$r) {
-		// Are there unfinished entries in the thread table?
-		$r = q("SELECT COUNT(*) AS `total` FROM `thread`
-			INNER JOIN `item` ON `item`.`id` =`thread`.`iid`
-			WHERE `thread`.`gcontact-id` = 0 AND
-				(`thread`.`uid` IN (SELECT `uid` from `user`) OR `thread`.`uid` = 0)");
-
-		if ($r AND ($r[0]["total"] == 0)) {
-			set_config("system", "post_update_version", POST_UPDATE_VERSION);
-			return false;
-		}
-
-		// Update the thread table from the item table
-		q("UPDATE `thread` INNER JOIN `item` ON `item`.`id`=`thread`.`iid`
-				SET `thread`.`gcontact-id` = `item`.`gcontact-id`
-			WHERE `thread`.`gcontact-id` = 0 AND
-				(`thread`.`uid` IN (SELECT `uid` from `user`) OR `thread`.`uid` = 0)");
-
-		return false;
-	}
-
-	$item_arr = array();
-	foreach ($r AS $item) {
-		$index = $item["author-link"]."-".$item["uid"];
-		$item_arr[$index] = array("author-link" => $item["author-link"],
-						"uid" => $item["uid"],
-						"network" => $item["network"]);
-	}
-
-	// Set the "gcontact-id" in the item table and add a new gcontact entry if needed
-	foreach($item_arr AS $item) {
-		$gcontact_id = get_gcontact_id(array("url" => $item['author-link'], "network" => $item['network'],
-						"photo" => $item['author-avatar'], "name" => $item['author-name']));
-		q("UPDATE `item` SET `gcontact-id` = %d WHERE `uid` = %d AND `author-link` = '%s' AND `gcontact-id` = 0",
-			intval($gcontact_id), intval($item["uid"]), dbesc($item["author-link"]));
-	}
-	return true;
-}
-
 /**
  * @brief Returns posts from a given contact
  *
@@ -639,7 +586,7 @@ function posts_from_contact($a, $contact_id) {
 	$r = q("SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`,
 			`author-name` AS `name`, `owner-avatar` AS `photo`,
 			`owner-link` AS `url`, `owner-avatar` AS `thumb`
-		FROM `item` FORCE INDEX (uid_contactid_created)
+		FROM `item` FORCE INDEX (`uid_contactid_created`)
 		WHERE `item`.`uid` = %d AND `contact-id` = %d
 			AND `author-link` IN ('%s', '%s')
 			AND NOT `deleted` AND NOT `moderated` AND `visible`
@@ -661,4 +608,34 @@ function posts_from_contact($a, $contact_id) {
 
 	return $o;
 }
+
+/**
+ * @brief Returns a formatted location string from the given profile array
+ *
+ * @param array $profile Profile array (Generated from the "profile" table)
+ *
+ * @return string Location string
+ */
+function formatted_location($profile) {
+	$location = '';
+
+	if($profile['locality'])
+		$location .= $profile['locality'];
+
+	if($profile['region'] AND ($profile['locality'] != $profile['region'])) {
+		if($location)
+			$location .= ', ';
+
+		$location .= $profile['region'];
+	}
+
+	if($profile['country-name']) {
+		if($location)
+			$location .= ', ';
+
+		$location .= $profile['country-name'];
+	}
+
+	return $location;
+}
 ?>