X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2FContact.php;h=d76c8f826cd68846f59f30a6ffd9c2bfdfb51c70;hb=ffcc5f372f5626c592ada8de2b7eacfbc61f6622;hp=d9703d61e43b78ab8a0091910c2f61a7ab747783;hpb=62de6be495214e4b12a92a1877711768f4a1d992;p=friendica.git

diff --git a/include/Contact.php b/include/Contact.php
index d9703d61e4..d76c8f826c 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -129,7 +129,7 @@ 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/dfrn.php');
@@ -412,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));
@@ -441,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`,
@@ -472,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)
@@ -481,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)
 	);