Scrape: Changed detection for the profile link

[friendica.git] / include / Contact.php

diff --git a/include/Contact.php b/include/Contact.php
index f80cb80e2f29e40f2b2c360d267f2678624a0af9..d76c8f826cd68846f59f30a6ffd9c2bfdfb51c70 100644 (file)
--- 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);
        }
 
 }
@@ -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)
        );
 
@@ -664,4 +662,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;
+}
 ?>