]> git.mxchange.org Git - friendica.git/blobdiff - include/Contact.php
Merge pull request #3003 from tobiasd/20161209-lang
[friendica.git] / include / Contact.php
index 3f74a19d5f44e66f22a9b9dfcdeaed6b6ebdf46f..d0f4023447f1448962d7f1ffd0bbabfcff3e97ab 100644 (file)
@@ -22,6 +22,7 @@ function user_remove($uid) {
                $r[0]['nickname']
        );
 
+       /// @todo Should be done in a background job since this likely will run into a time out
        // don't delete yet, will be done later when contacts have deleted my stuff
        // q("DELETE FROM `contact` WHERE `uid` = %d", intval($uid));
        q("DELETE FROM `gcign` WHERE `uid` = %d", intval($uid));
@@ -45,10 +46,10 @@ function user_remove($uid) {
        // don't delete yet, will be done later when contacts have deleted my stuff
        // q("DELETE FROM `user` WHERE `uid` = %d", intval($uid));
        q("UPDATE `user` SET `account_removed` = 1, `account_expires_on` = UTC_TIMESTAMP() WHERE `uid` = %d", intval($uid));
-       proc_run('php', "include/notifier.php", "removeme", $uid);
+       proc_run(PRIORITY_HIGH, "include/notifier.php", "removeme", $uid);
 
        // Send an update to the directory
-       proc_run('php', "include/directory.php", $r[0]['url']);
+       proc_run(PRIORITY_LOW, "include/directory.php", $r[0]['url']);
 
        if($uid == local_user()) {
                unset($_SESSION['authenticated']);
@@ -74,25 +75,10 @@ function contact_remove($id) {
                return;
        }
 
-       q("DELETE FROM `contact` WHERE `id` = %d",
-               intval($id)
-       );
-       q("DELETE FROM `item` WHERE `contact-id` = %d ",
-               intval($id)
-       );
-       q("DELETE FROM `photo` WHERE `contact-id` = %d ",
-               intval($id)
-       );
-       q("DELETE FROM `mail` WHERE `contact-id` = %d ",
-               intval($id)
-       );
-       q("DELETE FROM `event` WHERE `cid` = %d ",
-               intval($id)
-       );
-       q("DELETE FROM `queue` WHERE `cid` = %d ",
-               intval($id)
-       );
+       q("DELETE FROM `contact` WHERE `id` = %d", intval($id));
 
+       // Delete the rest in the background
+       proc_run(PRIORITY_LOW, 'include/remove_contact.php', $id);
 }
 
 
@@ -129,11 +115,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);
        }
 
 }
@@ -144,8 +130,7 @@ function terminate_friendship($user,$self,$contact) {
 // and we won't waste any more time trying to communicate with them.
 // This provides for the possibility that their database is temporarily messed
 // up or some other transient event and that there's a possibility we could recover from it.
-if(! function_exists('mark_for_death')) {
+
 function mark_for_death($contact) {
 
        if($contact['archive'])
@@ -156,177 +141,274 @@ function mark_for_death($contact) {
                                dbesc(datetime_convert()),
                                intval($contact['id'])
                );
-       }
-       else {
 
-               // TODO: We really should send a notification to the owner after 2-3 weeks
-               // so they won't be surprised when the contact vanishes and can take
-               // remedial action if this was a serious mistake or glitch
+               if ($contact['url'] != '') {
+                       q("UPDATE `contact` SET `term-date` = '%s'
+                               WHERE `nurl` = '%s' AND `term-date` <= '1000-00-00'",
+                                       dbesc(datetime_convert()),
+                                       dbesc(normalise_link($contact['url']))
+                       );
+               }
+       } else {
+
+               /// @todo
+               /// We really should send a notification to the owner after 2-3 weeks
+               /// so they won't be surprised when the contact vanishes and can take
+               /// remedial action if this was a serious mistake or glitch
+
+               /// @todo
+               /// Check for contact vitality via probing
 
                $expiry = $contact['term-date'] . ' + 32 days ';
                if(datetime_convert() > datetime_convert('UTC','UTC',$expiry)) {
 
-                       // relationship is really truly dead. 
+                       // relationship is really truly dead.
                        // archive them rather than delete
                        // though if the owner tries to unarchive them we'll start the whole process over again
 
-                       q("update contact set `archive` = 1 where id = %d",
+                       q("UPDATE `contact` SET `archive` = 1 WHERE `id` = %d",
                                intval($contact['id'])
                        );
-                       q("UPDATE `item` SET `private` = 2 WHERE `contact-id` = %d AND `uid` = %d", intval($contact['id']), intval($contact['uid']));
-
-                       //contact_remove($contact['id']);
 
+                       if ($contact['url'] != '') {
+                               q("UPDATE `contact` SET `archive` = 1 WHERE `nurl` = '%s'",
+                                       dbesc(normalise_link($contact['url']))
+                               );
+                       }
                }
        }
 
-}}
+}
 
-if(! function_exists('unmark_for_death')) {
 function unmark_for_death($contact) {
+
+       $r = q("SELECT `term-date` FROM `contact` WHERE `id` = %d AND `term-date` > '%s'",
+               intval($contact['id']),
+               dbesc('1000-00-00 00:00:00')
+       );
+
+       // We don't need to update, we never marked this contact as dead
+       if (!dbm::is_result($r)) {
+               return;
+       }
+
        // It's a miracle. Our dead contact has inexplicably come back to life.
        q("UPDATE `contact` SET `term-date` = '%s' WHERE `id` = %d",
                dbesc('0000-00-00 00:00:00'),
                intval($contact['id'])
        );
-}}
 
-function get_contact_details_by_url($url, $uid = -1) {
-       require_once("mod/proxy.php");
-       require_once("include/bbcode.php");
+       if ($contact['url'] != '') {
+               q("UPDATE `contact` SET `term-date` = '%s' WHERE `nurl` = '%s'",
+                       dbesc('0000-00-00 00:00:00'),
+                       dbesc(normalise_link($contact['url']))
+               );
+       }
+}
 
-       if ($uid == -1)
+/**
+ * @brief Get contact data for a given profile link
+ *
+ * The function looks at several places (contact table and gcontact table) for the contact
+ * It caches its result for the same script execution to prevent duplicate calls
+ *
+ * @param string $url The profile link
+ * @param int $uid User id
+ * @param array $default If not data was found take this data as default value
+ *
+ * @return array Contact data
+ */
+function get_contact_details_by_url($url, $uid = -1, $default = array()) {
+       static $cache = array();
+
+       if ($uid == -1) {
                $uid = local_user();
-
-       $r = q("SELECT `url`, `name`, `nick`, `photo`, `location`, `about`, `keywords`, `gender`, `community`, `network` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
-               dbesc(normalise_link($url)));
-
-       if ($r)
-               $profile = $r[0];
-       else {
-               $r = q("SELECT `url`, `name`, `nick`, `avatar` AS `photo`, `location`, `about` FROM `unique_contacts` WHERE `url` = '%s'",
-                       dbesc(normalise_link($url)));
-
-               if (count($r)) {
-                       $profile = $r[0];
-                       $profile["keywords"] = "";
-                       $profile["gender"] = "";
-                       $profile["community"] = false;
-                       $profile["network"] = "";
-               }
        }
 
-       // Fetching further contact data from the contact table
-       $r = q("SELECT `id`, `uid`, `url`, `network`, `name`, `nick`, `location`, `about`, `keywords`, `gender`, `photo`, `addr`, `forum`, `prv`, `bd` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND `network` = '%s'",
-               dbesc(normalise_link($url)), intval($uid), dbesc($profile["network"]));
+       if (isset($cache[$url][$uid])) {
+               return $cache[$url][$uid];
+       }
 
-       if (!count($r))
-               $r = q("SELECT `id`, `uid`, `url`, `network`, `name`, `nick`, `location`, `about`, `keywords`, `gender`, `photo`, `addr`, `forum`, `prv`, `bd` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d",
+       // Fetch contact data from the contact table for the given user
+       $r = q("SELECT `id`, `id` AS `cid`, 0 AS `gid`, 0 AS `zid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
+                       `keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, `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`, `location`, `about`, `keywords`, `gender`, `photo`, `addr`, `forum`, `prv`, `bd` FROM `contact` WHERE `nurl` = '%s' AND `uid` = 0",
-                       dbesc(normalise_link($url)));
+       // Fetch the data from the contact table with "uid=0" (which is filled automatically)
+       if (!$r)
+               $r = q("SELECT `id`, 0 AS `cid`, `id` AS `zid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
+                       `keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, 0 AS `self`
+                       FROM `contact` WHERE `nurl` = '%s' AND `uid` = 0",
+                               dbesc(normalise_link($url)));
+
+       // Fetch the data from the gcontact table
+       if (!$r)
+               $r = q("SELECT 0 AS `id`, 0 AS `cid`, `id` AS `gid`, 0 AS `zid`, 0 AS `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, '' AS `xmpp`,
+                       `keywords`, `gender`, `photo`, `photo` AS `thumb`, `photo` AS `micro`, `community` AS `forum`, 0 AS `prv`, `community`, `contact-type`, `birthday`, 0 AS `self`
+                       FROM `gcontact` WHERE `nurl` = '%s'",
+                               dbesc(normalise_link($url)));
 
        if ($r) {
-               if (isset($r[0]["url"]) AND $r[0]["url"])
-                       $profile["url"] = $r[0]["url"];
-               if (isset($r[0]["name"]) AND $r[0]["name"])
-                       $profile["name"] = $r[0]["name"];
-               if (isset($r[0]["nick"]) AND $r[0]["nick"] AND ($profile["nick"] == ""))
-                       $profile["nick"] = $r[0]["nick"];
-               if (isset($r[0]["photo"]) AND $r[0]["photo"])
-                       $profile["photo"] = $r[0]["photo"];
-               if (isset($r[0]["location"]) AND $r[0]["location"])
-                       $profile["location"] = $r[0]["location"];
-               if (isset($r[0]["about"]) AND $r[0]["about"])
-                       $profile["about"] = $r[0]["about"];
-               if (isset($r[0]["keywords"]) AND $r[0]["keywords"])
-                       $profile["keywords"] = $r[0]["keywords"];
-               if (isset($r[0]["gender"]) AND $r[0]["gender"])
-                       $profile["gender"] = $r[0]["gender"];
-               if (isset($r[0]["forum"]) AND isset($r[0]["prv"]))
-                       $profile["community"] = ($r[0]["forum"] OR $r[0]["prv"]);
-               if (isset($r[0]["network"]) AND $r[0]["network"])
-                       $profile["network"] = $r[0]["network"];
-               if (isset($r[0]["addr"]) AND $r[0]["addr"])
-                       $profile["addr"] = $r[0]["addr"];
-               if (isset($r[0]["bd"]) AND $r[0]["bd"])
-                       $profile["bd"] = $r[0]["bd"];
-               if ($r[0]["uid"] == 0)
-                       $profile["cid"] = 0;
-               else
-                       $profile["cid"] = $r[0]["id"];
-       } else
-               $profile["cid"] = 0;
-
-       if (isset($profile["photo"]))
-               $profile["photo"] = proxy_url($profile["photo"], false, PROXY_SIZE_SMALL);
-
-       if (isset($profile["location"]))
-               $profile["location"] = bbcode($profile["location"]);
-
-       if (isset($profile["about"]))
-               $profile["about"] = bbcode($profile["about"]);
+               // If there is more than one entry we filter out the connector networks
+               if (count($r) > 1) {
+                       foreach ($r AS $id => $result) {
+                               if ($result["network"] == NETWORK_STATUSNET) {
+                                       unset($r[$id]);
+                               }
+                       }
+               }
+
+               $profile = array_shift($r);
 
+               // "bd" always contains the upcoming birthday of a contact.
+               // "birthday" might contain the birthday including the year of birth.
+               if ($profile["birthday"] != "0000-00-00") {
+                       $bd_timestamp = strtotime($profile["birthday"]);
+                       $month = date("m", $bd_timestamp);
+                       $day = date("d", $bd_timestamp);
+
+                       $current_timestamp = time();
+                       $current_year = date("Y", $current_timestamp);
+                       $current_month = date("m", $current_timestamp);
+                       $current_day = date("d", $current_timestamp);
+
+                       $profile["bd"] = $current_year."-".$month."-".$day;
+                       $current = $current_year."-".$current_month."-".$current_day;
+
+                       if ($profile["bd"] < $current) {
+                               $profile["bd"] = (++$current_year)."-".$month."-".$day;
+                       }
+               } else {
+                       $profile["bd"] = "0000-00-00";
+               }
+       } else {
+               $profile = $default;
+       }
+
+       if (($profile["photo"] == "") AND isset($default["photo"])) {
+               $profile["photo"] = $default["photo"];
+       }
+
+       if (($profile["name"] == "") AND isset($default["name"])) {
+               $profile["name"] = $default["name"];
+       }
+
+       if (($profile["network"] == "") AND isset($default["network"])) {
+               $profile["network"] = $default["network"];
+       }
+
+       if (($profile["thumb"] == "") AND isset($profile["photo"])) {
+               $profile["thumb"] = $profile["photo"];
+       }
+
+       if (($profile["micro"] == "") AND isset($profile["thumb"])) {
+               $profile["micro"] = $profile["thumb"];
+       }
+
+       if ((($profile["addr"] == "") OR ($profile["name"] == "")) AND ($profile["gid"] != 0) AND
+               in_array($profile["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) {
+               proc_run(PRIORITY_LOW, "include/update_gcontact.php", $profile["gid"]);
+       }
+
+       // Show contact details of Diaspora contacts only if connected
        if (($profile["cid"] == 0) AND ($profile["network"] == NETWORK_DIASPORA)) {
                $profile["location"] = "";
                $profile["about"] = "";
+               $profile["gender"] = "";
+               $profile["birthday"] = "0000-00-00";
        }
 
-       return($profile);
-}
+       $cache[$url][$uid] = $profile;
 
-if(! function_exists('contact_photo_menu')){
-function contact_photo_menu($contact) {
+       return $profile;
+}
 
+if (! function_exists('contact_photo_menu')) {
+function contact_photo_menu($contact, $uid = 0)
+{
        $a = get_app();
 
-       $contact_url="";
-       $pm_url="";
-       $status_link="";
-       $photos_link="";
-       $posts_link="";
-       $contact_drop_link = "";
-       $poke_link="";
+       $contact_url = '';
+       $pm_url = '';
+       $status_link = '';
+       $photos_link = '';
+       $posts_link = '';
+       $contact_drop_link = '';
+       $poke_link = '';
+
+       if ($uid == 0) {
+               $uid = local_user();
+       }
+
+       if ($contact['uid'] != $uid) {
+               if ($uid == 0) {
+                       $profile_link = zrl($contact['url']);
+                       $menu = Array('profile' => array(t('View Profile'), $profile_link, true));
+
+                       return $menu;
+               }
+
+               $r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `network` = '%s' AND `uid` = %d",
+                       dbesc($contact['nurl']), dbesc($contact['network']), intval($uid));
+               if ($r) {
+                       return contact_photo_menu($r[0], $uid);
+               } else {
+                       $profile_link = zrl($contact['url']);
+                       $connlnk = 'follow/?url='.$contact['url'];
+                       $menu = array(
+                               'profile' => array(t('View Profile'), $profile_link, true),
+                               'follow' => array(t('Connect/Follow'), $connlnk, true)
+                       );
+
+                       return $menu;
+               }
+       }
 
        $sparkle = false;
-       if($contact['network'] === NETWORK_DFRN) {
+       if ($contact['network'] === NETWORK_DFRN) {
                $sparkle = true;
                $profile_link = $a->get_baseurl() . '/redir/' . $contact['id'];
-       }
-       else
+       } else {
                $profile_link = $contact['url'];
+       }
 
-       if($profile_link === 'mailbox')
+       if ($profile_link === 'mailbox') {
                $profile_link = '';
+       }
 
-       if($sparkle) {
-               $status_link = $profile_link . "?url=status";
-               $photos_link = $profile_link . "?url=photos";
-               $profile_link = $profile_link . "?url=profile";
+       if ($sparkle) {
+               $status_link = $profile_link . '?url=status';
+               $photos_link = $profile_link . '?url=photos';
+               $profile_link = $profile_link . '?url=profile';
        }
 
-       if (in_array($contact["network"], array(NETWORK_DFRN, NETWORK_DIASPORA)))
+       if (in_array($contact['network'], array(NETWORK_DFRN, NETWORK_DIASPORA))) {
                $pm_url = $a->get_baseurl() . '/message/new/' . $contact['id'];
+       }
 
-       if ($contact["network"] == NETWORK_DFRN)
+       if ($contact['network'] == NETWORK_DFRN) {
                $poke_link = $a->get_baseurl() . '/poke/?f=&c=' . $contact['id'];
+       }
 
        $contact_url = $a->get_baseurl() . '/contacts/' . $contact['id'];
-       $posts_link = $a->get_baseurl() . '/network/0?nets=all&cid=' . $contact['id'];
-       $contact_drop_link = $a->get_baseurl() . "/contacts/" . $contact['id'] . '/drop?confirm=1';
-
-
-       $menu = Array(
-               'status' => array(t("View Status"), $status_link),
-               'profile' => array(t("View Profile"), $profile_link),
-               'photos' => array(t("View Photos"), $photos_link),
-               'network' => array(t("Network Posts"), $posts_link),
-               'edit' => array(t("Edit Contact"), $contact_url),
-               'drop' => array(t("Drop Contact"), $contact_drop_link),
-               'pm' => array(t("Send PM"), $pm_url),
-               'poke' => array(t("Poke"), $poke_link),
+
+       $posts_link = $a->get_baseurl() . '/contacts/' . $contact['id'] . '/posts';
+       $contact_drop_link = $a->get_baseurl() . '/contacts/' . $contact['id'] . '/drop?confirm=1';
+
+       /**
+        * menu array:
+        * "name" => [ "Label", "link", (bool)Should the link opened in a new tab? ]
+        */
+       $menu = array(
+               'status' => array(t("View Status"), $status_link, true),
+               'profile' => array(t("View Profile"), $profile_link, true),
+               'photos' => array(t("View Photos"), $photos_link, true),
+               'network' => array(t("Network Posts"), $posts_link, false),
+               'edit' => array(t("View Contact"), $contact_url, false),
+               'drop' => array(t("Drop Contact"), $contact_drop_link, false),
+               'pm' => array(t("Send PM"), $pm_url, false),
+               'poke' => array(t("Poke"), $poke_link, false),
        );
 
 
@@ -334,32 +416,14 @@ function contact_photo_menu($contact) {
 
        call_hooks('contact_photo_menu', $args);
 
-/*     $o = "";
-       foreach($menu as $k=>$v){
-               if ($v!="") {
-                       if(($k !== t("Network Posts")) && ($k !== t("Send PM")) && ($k !== t('Edit Contact')))
-                               $o .= "<li><a target=\"redir\" href=\"$v\">$k</a></li>\n";
-                       else
-                               $o .= "<li><a href=\"$v\">$k</a></li>\n";
-               }
-       }
-       return $o;*/
+       $menucondensed = array();
 
-       foreach($menu as $k=>$v){
-               if ($v[1]!="") {
-                       if(($v[0] !== t("Network Posts")) && ($v[0] !== t("Send PM")) && ($v[0] !== t('Edit Contact')))
-                               $menu[$k][2] = 1;
-                       else
-                               $menu[$k][2] = 0;
+       foreach ($menu AS $menuname => $menuitem) {
+               if ($menuitem[1] != '') {
+                       $menucondensed[$menuname] = $menuitem;
                }
        }
 
-       $menucondensed = array();
-
-       foreach ($menu AS $menuitem)
-               if ($menuitem[1] != "")
-                       $menucondensed[] = $menuitem;
-
        return $menucondensed;
 }}
 
@@ -400,13 +464,25 @@ function contacts_not_grouped($uid,$start = 0,$count = 0) {
        return $r;
 }
 
-function get_contact($url, $uid = 0) {
+/**
+ * @brief Fetch the contact id for a given url and user
+ *
+ * @param string $url Contact URL
+ * @param integer $uid The user id for the contact
+ * @param boolean $no_update Don't update the contact
+ *
+ * @return integer Contact ID
+ */
+function get_contact($url, $uid = 0, $no_update = false) {
        require_once("include/Scrape.php");
 
+       logger("Get contact data for url ".$url." and user ".$uid." - ".App::callstack(), LOGGER_DEBUG);;
+
        $data = array();
        $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"];
@@ -414,12 +490,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));
@@ -431,8 +507,9 @@ function get_contact($url, $uid = 0) {
                $update_photo = ($contact[0]['avatar-date'] < datetime_convert('','','now -7 days'));
                //$update_photo = ($contact[0]['avatar-date'] < datetime_convert('','','now -12 hours'));
 
-               if (!$update_photo)
+               if (!$update_photo OR $no_update) {
                        return($contactid);
+               }
        } elseif ($uid != 0)
                return 0;
 
@@ -440,19 +517,27 @@ function get_contact($url, $uid = 0) {
                $data = probe_url($url);
 
        // Does this address belongs to a valid network?
-       if (!in_array($data["network"], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA)))
-               return 0;
+       if (!in_array($data["network"], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA))) {
+               if ($uid != 0)
+                       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);
+               // Get data from the gcontact table
+               $r = q("SELECT `name`, `nick`, `url`, `photo`, `addr`, `alias`, `network` FROM `gcontact` WHERE `nurl` = '%s'",
+                        dbesc(normalise_link($url)));
+               if (!$r)
+                       return 0;
+
+               $data = $r[0];
+       }
+
+       $url = $data["url"];
 
        if ($contactid == 0) {
                q("INSERT INTO `contact` (`uid`, `created`, `url`, `nurl`, `addr`, `alias`, `notify`, `poll`,
                                        `name`, `nick`, `photo`, `network`, `pubkey`, `rel`, `priority`,
-                                       `batch`, `request`, `confirm`, `poco`,
+                                       `batch`, `request`, `confirm`, `poco`, `name-date`, `uri-date`,
                                        `writable`, `blocked`, `readonly`, `pending`)
-                                       VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', '%s', '%s', 1, 0, 0, 0)",
+                                       VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', 1, 0, 0, 0)",
                        intval($uid),
                        dbesc(datetime_convert()),
                        dbesc($data["url"]),
@@ -471,37 +556,244 @@ function get_contact($url, $uid = 0) {
                        dbesc($data["batch"]),
                        dbesc($data["request"]),
                        dbesc($data["confirm"]),
-                       dbesc($data["poco"])
+                       dbesc($data["poco"]),
+                       dbesc(datetime_convert()),
+                       dbesc(datetime_convert())
                );
 
-               $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)
                        return 0;
 
                $contactid = $contact[0]["id"];
+
+               // Update the newly created contact from data in the gcontact table
+               $r = q("SELECT `location`, `about`, `keywords`, `gender` FROM `gcontact` WHERE `nurl` = '%s'",
+                        dbesc(normalise_link($data["url"])));
+               if ($r) {
+                       logger("Update contact ".$data["url"]);
+                       q("UPDATE `contact` SET `location` = '%s', `about` = '%s', `keywords` = '%s', `gender` = '%s' WHERE `id` = %d",
+                               dbesc($r["location"]), dbesc($r["about"]), dbesc($r["keywords"]),
+                               dbesc($r["gender"]), intval($contactid));
+               }
        }
 
+       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);
-
-       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]),
-               dbesc($data["addr"]),
-               dbesc($data["alias"]),
-               dbesc($data["name"]),
-               dbesc($data["nick"]),
-               dbesc(datetime_convert()),
-               dbesc(datetime_convert()),
-               dbesc(datetime_convert()),
-               intval($contactid)
-       );
+       update_contact_avatar($data["photo"],$uid,$contactid);
+
+       $r = q("SELECT `addr`, `alias`, `name`, `nick` FROM `contact`  WHERE `id` = %d", intval($contactid));
+
+       // This condition should always be true
+       if (!dbm::is_result($r))
+               return $contactid;
+
+       // Only update if there had something been changed
+       if (($data["addr"] != $r[0]["addr"]) OR
+               ($data["alias"] != $r[0]["alias"]) OR
+               ($data["name"] != $r[0]["name"]) OR
+               ($data["nick"] != $r[0]["nick"]))
+               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()),
+                       intval($contactid)
+               );
 
        return $contactid;
 }
+
+/**
+ * @brief Returns posts from a given gcontact
+ *
+ * @param App $a argv application class
+ * @param int $gcontact_id Global contact
+ *
+ * @return string posts in HTML
+ */
+function posts_from_gcontact($a, $gcontact_id) {
+
+       require_once('include/conversation.php');
+
+       // There are no posts with "uid = 0" with connector networks
+       // This speeds up the query a lot
+       $r = q("SELECT `network` FROM `gcontact` WHERE `id` = %d", dbesc($gcontact_id));
+       if (in_array($r[0]["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, "")))
+               $sql = "(`item`.`uid` = 0 OR  (`item`.`uid` = %d AND `item`.`private`))";
+       else
+               $sql = "`item`.`uid` = %d";
+
+       if(get_config('system', 'old_pager')) {
+               $r = q("SELECT COUNT(*) AS `total` FROM `item`
+                       WHERE `gcontact-id` = %d and $sql",
+                       intval($gcontact_id),
+                       intval(local_user()));
+
+               $a->set_pager_total($r[0]['total']);
+       }
+
+       $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 (`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",
+               intval($gcontact_id),
+               intval(local_user()),
+               intval($a->pager['start']),
+               intval($a->pager['itemspage'])
+       );
+
+       $o = conversation($a,$r,'community',false);
+
+       if(!get_config('system', 'old_pager')) {
+               $o .= alt_pager($a,count($r));
+       } else {
+               $o .= paginate($a);
+       }
+
+       return $o;
+}
+
+/**
+ * @brief Returns posts from a given contact
+ *
+ * @param App $a argv application class
+ * @param int $contact_id contact
+ *
+ * @return string posts in HTML
+ */
+function posts_from_contact($a, $contact_id) {
+
+       require_once('include/conversation.php');
+
+       $r = q("SELECT `url` FROM `contact` WHERE `id` = %d", intval($contact_id));
+       if (!$r)
+               return false;
+
+       $contact = $r[0];
+
+       if(get_config('system', 'old_pager')) {
+               $r = q("SELECT COUNT(*) AS `total` FROM `item`
+                       WHERE `item`.`uid` = %d AND `author-link` IN ('%s', '%s')",
+                       intval(local_user()),
+                       dbesc(str_replace("https://", "http://", $contact["url"])),
+                       dbesc(str_replace("http://", "https://", $contact["url"])));
+
+               $a->set_pager_total($r[0]['total']);
+       }
+
+       $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_id`)
+               WHERE `item`.`uid` = %d AND `contact-id` = %d
+                       AND `author-link` IN ('%s', '%s')
+                       AND NOT `deleted` AND NOT `moderated` AND `visible`
+               ORDER BY `item`.`id` DESC LIMIT %d, %d",
+               intval(local_user()),
+               intval($contact_id),
+               dbesc(str_replace("https://", "http://", $contact["url"])),
+               dbesc(str_replace("http://", "https://", $contact["url"])),
+               intval($a->pager['start']),
+               intval($a->pager['itemspage'])
+       );
+
+       $o .= conversation($a,$r,'community',false);
+
+       if(!get_config('system', 'old_pager'))
+               $o .= alt_pager($a,count($r));
+       else
+               $o .= paginate($a);
+
+       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;
+}
+
+/**
+ * @brief Returns the account type name
+ *
+ * The function can be called with either the user or the contact array
+ *
+ * @param array $contact contact or user array
+ */
+function account_type($contact) {
+
+       // There are several fields that indicate that the contact or user is a forum
+       // "page-flags" is a field in the user table,
+       // "forum" and "prv" are used in the contact table. They stand for PAGE_COMMUNITY and PAGE_PRVGROUP.
+       // "community" is used in the gcontact table and is true if the contact is PAGE_COMMUNITY or PAGE_PRVGROUP.
+       if((isset($contact['page-flags']) && (intval($contact['page-flags']) == PAGE_COMMUNITY))
+               || (isset($contact['page-flags']) && (intval($contact['page-flags']) == PAGE_PRVGROUP))
+               || (isset($contact['forum']) && intval($contact['forum']))
+               || (isset($contact['prv']) && intval($contact['prv']))
+               || (isset($contact['community']) && intval($contact['community'])))
+               $type = ACCOUNT_TYPE_COMMUNITY;
+       else
+               $type = ACCOUNT_TYPE_PERSON;
+
+       // The "contact-type" (contact table) and "account-type" (user table) are more general then the chaos from above.
+       if (isset($contact["contact-type"]))
+               $type = $contact["contact-type"];
+       if (isset($contact["account-type"]))
+               $type = $contact["account-type"];
+
+       switch($type) {
+               case ACCOUNT_TYPE_ORGANISATION:
+                       $account_type = t("Organisation");
+                       break;
+               case ACCOUNT_TYPE_NEWS:
+                       $account_type = t('News');
+                       break;
+               case ACCOUNT_TYPE_COMMUNITY:
+                       $account_type = t("Forum");
+                       break;
+               default:
+                       $account_type = "";
+                       break;
+       }
+
+       return $account_type;
+}
+?>