X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2FContact.php;h=10005d3e3caad6cd4c662601a8dc044f057980c3;hb=0deea97cf296481d792429ae9d4042c66887230d;hp=04d3fa9e5d013a0a426b7c8af155fbd90edebdf9;hpb=f1a0aeb480542255fd2aae261382a756779b3d98;p=friendica.git
diff --git a/include/Contact.php b/include/Contact.php
index 04d3fa9e5d..10005d3e3c 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -15,7 +15,7 @@ function user_remove($uid) {
call_hooks('remove_user',$r[0]);
- // save username (actually the nickname as it is guaranteed
+ // save username (actually the nickname as it is guaranteed
// unique), so it cannot be re-registered in the future.
q("insert into userd ( username ) values ( '%s' )",
@@ -46,6 +46,10 @@ function user_remove($uid) {
// 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);
+
+ // Send an update to the directory
+ proc_run('php', "include/directory.php", $r[0]['url']);
+
if($uid == local_user()) {
unset($_SESSION['authenticated']);
unset($_SESSION['uid']);
@@ -64,13 +68,13 @@ function contact_remove($id) {
$archive = get_pconfig($r[0]['uid'], 'system','archive_removed_contacts');
if($archive) {
- q("update contact set `archive` = 1, `network` = 'none', `writable` = 0 where id = %d limit 1",
+ q("update contact set `archive` = 1, `network` = 'none', `writable` = 0 where id = %d",
intval($id)
);
return;
}
- q("DELETE FROM `contact` WHERE `id` = %d LIMIT 1",
+ q("DELETE FROM `contact` WHERE `id` = %d",
intval($id)
);
q("DELETE FROM `item` WHERE `contact-id` = %d ",
@@ -109,7 +113,7 @@ function terminate_friendship($user,$self,$contact) {
'$photo' => $self['photo'],
'$thumb' => $self['thumb'],
'$published' => datetime_convert('UTC','UTC', 'now', ATOM_TIME),
- '$item_id' => 'urn:X-dfrn:' . $a->get_hostname() . ':unfollow:' . random_string(),
+ '$item_id' => 'urn:X-dfrn:' . $a->get_hostname() . ':unfollow:' . get_guid(32),
'$title' => '',
'$type' => 'text',
'$content' => t('stopped following'),
@@ -125,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);
}
}
@@ -140,7 +144,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) {
@@ -148,25 +152,26 @@ function mark_for_death($contact) {
return;
if($contact['term-date'] == '0000-00-00 00:00:00') {
- q("UPDATE `contact` SET `term-date` = '%s' WHERE `id` = %d LIMIT 1",
+ q("UPDATE `contact` SET `term-date` = '%s' WHERE `id` = %d",
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
+ /// @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
$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 limit 1",
+ 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']));
@@ -181,24 +186,148 @@ function mark_for_death($contact) {
if(! function_exists('unmark_for_death')) {
function unmark_for_death($contact) {
// It's a miracle. Our dead contact has inexplicably come back to life.
- q("UPDATE `contact` SET `term-date` = '%s' WHERE `id` = %d LIMIT 1",
+ q("UPDATE `contact` SET `term-date` = '%s' WHERE `id` = %d",
dbesc('0000-00-00 00:00:00'),
intval($contact['id'])
);
}}
+/**
+ * @brief Get contact data for a given profile link
+ *
+ * The function looks at several places (contact table and gcontact table) for the contact
+ *
+ * @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()) {
+ if ($uid == -1)
+ $uid = local_user();
+
+ // 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`,
+ `keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `bd` AS `birthday`, `self`
+ FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d",
+ dbesc(normalise_link($url)), intval($uid));
+
+ // 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`,
+ `keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `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`,
+ `keywords`, `gender`, `photo`, `photo` AS `thumb`, `photo` AS `micro`, `community` AS `forum`, 0 AS `prv`, `community`, `birthday`, 0 AS `self`
+ FROM `gcontact` WHERE `nurl` = '%s'",
+ dbesc(normalise_link($url)));
+
+ if ($r) {
+ // 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('php',"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);
+}
+
if(! function_exists('contact_photo_menu')){
-function contact_photo_menu($contact) {
+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="";
+ 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) {
$sparkle = true;
@@ -214,52 +343,56 @@ function contact_photo_menu($contact) {
$status_link = $profile_link . "?url=status";
$photos_link = $profile_link . "?url=photos";
$profile_link = $profile_link . "?url=profile";
- $pm_url = $a->get_baseurl() . '/message/new/' . $contact['id'];
}
- $poke_link = $a->get_baseurl() . '/poke/?f=&c=' . $contact['id'];
+ if (in_array($contact["network"], array(NETWORK_DFRN, NETWORK_DIASPORA)))
+ $pm_url = $a->get_baseurl() . '/message/new/' . $contact['id'];
+
+ 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'];
+ $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(
- 'poke' => array(t("Poke"), $poke_link),
- '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),
- 'pm' => array(t("Send PM"), $pm_url),
+ '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("Edit 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),
);
-
-
+
+
$args = array('contact' => $contact, 'menu' => &$menu);
-
+
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 .= "$k\n";
- else
- $o .= "$k\n";
- }
- }
- return $o;*/
- 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;
- }
- }
- return $menu;
+
+ $menucondensed = array();
+
+ foreach ($menu AS $menuname=>$menuitem)
+ if ($menuitem[1] != "")
+ $menucondensed[$menuname] = $menuitem;
+
+ return $menucondensed;
}}
function random_profile() {
- $r = q("select url from gcontact where url like '%%://%%/profile/%%' order by rand() limit 1");
+ $r = q("SELECT `url` FROM `gcontact` WHERE `network` = '%s'
+ AND `last_contact` >= `last_failure`
+ AND `updated` > UTC_TIMESTAMP - INTERVAL 1 MONTH
+ ORDER BY rand() LIMIT 1",
+ dbesc(NETWORK_DFRN));
+
if(count($r))
return dirname($r[0]['url']);
return '';
@@ -289,3 +422,265 @@ function contacts_not_grouped($uid,$start = 0,$count = 0) {
return $r;
}
+function get_contact($url, $uid = 0) {
+ require_once("include/Scrape.php");
+
+ $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"];
+ if ($url == "")
+ return 0;
+ }
+
+ $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 ORDER BY `id` LIMIT 1",
+ dbesc($url),
+ dbesc(normalise_link($url)),
+ intval($uid));
+
+ if ($contact) {
+ $contactid = $contact[0]["id"];
+
+ // Update the contact every 7 days
+ $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)
+ return($contactid);
+ } elseif ($uid != 0)
+ return 0;
+
+ if (!count($data))
+ $data = probe_url($url);
+
+ // Does this address belongs to a valid network?
+ if (!in_array($data["network"], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA))) {
+ if ($uid != 0)
+ return 0;
+
+ // 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`,
+ `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)",
+ intval($uid),
+ dbesc(datetime_convert()),
+ dbesc($data["url"]),
+ dbesc(normalise_link($data["url"])),
+ dbesc($data["addr"]),
+ dbesc($data["alias"]),
+ dbesc($data["notify"]),
+ dbesc($data["poll"]),
+ dbesc($data["name"]),
+ dbesc($data["nick"]),
+ dbesc($data["photo"]),
+ dbesc($data["network"]),
+ dbesc($data["pubkey"]),
+ intval(CONTACT_IS_SHARING),
+ intval($data["priority"]),
+ dbesc($data["batch"]),
+ dbesc($data["request"]),
+ dbesc($data["confirm"]),
+ dbesc($data["poco"])
+ );
+
+ $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");
+
+ update_contact_avatar($data["photo"],$uid,$contactid);
+
+ 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_created`)
+ 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`.`created` 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;
+}
+?>