bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Merge pull request #1359 from annando/1502-more-detailled-location

Browse source 
More details in the location field for poco
This commit is contained in:
Tobias Diekershoff 2015-02-05 08:31:15 +01:00
parent f3b8950ab1 29f732e811
commit be40d9d265
2 changed files with 58 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
mod/poco.php
View file

@ -102,7 +102,8 @@ function poco_init(&$a) {
intval($itemsPerPage) intval($itemsPerPage)
); );
} elseif($system_mode) { } elseif($system_mode) {
$r = q("SELECT `contact`.*, `profile`.`about` AS `pabout`, `profile`.`locality` AS `plocation`, `profile`.`pub_keywords`, `profile`.`gender` AS `pgender` $r = q("SELECT `contact`.*, `profile`.`about` AS `pabout`, `profile`.`locality` AS `plocation`, `profile`.`pub_keywords`, `profile`.`gender` AS `pgender`,
`profile`.`address` AS `paddress`, `profile`.`region` AS `pregion`, `profile`.`postal-code` AS `ppostalcode`, `profile`.`country-name` AS `pcountry`
FROM `contact` INNER JOIN `profile` ON `profile`.`uid` = `contact`.`uid` FROM `contact` INNER JOIN `profile` ON `profile`.`uid` = `contact`.`uid`
WHERE `self` = 1 AND `network` IN ('%s', '%s', '%s', '%s', '') AND `profile`.`is-default` WHERE `self` = 1 AND `network` IN ('%s', '%s', '%s', '%s', '') AND `profile`.`is-default`
AND `contact`.`uid` IN (SELECT `uid` FROM `pconfig` WHERE `cat` = 'system' AND `k` = 'suggestme' AND `v` = 1) LIMIT %d, %d", AND `contact`.`uid` IN (SELECT `uid` FROM `pconfig` WHERE `cat` = 'system' AND `k` = 'suggestme' AND `v` = 1) LIMIT %d, %d",
@ -151,7 +152,8 @@ function poco_init(&$a) {
'currentLocation' => false, 'currentLocation' => false,
'network' => false, 'network' => false,
'gender' => false, 'gender' => false,
'tags' => false 'tags' => false,
'address' => false
); );
if((! x($_GET,'fields')) || ($_GET['fields'] === '@all')) if((! x($_GET,'fields')) || ($_GET['fields'] === '@all'))
@ -169,8 +171,24 @@ function poco_init(&$a) {
if (($rr['about'] == "") AND isset($rr['pabout'])) if (($rr['about'] == "") AND isset($rr['pabout']))
$rr['about'] = $rr['pabout']; $rr['about'] = $rr['pabout'];
if (($rr['location'] == "") AND isset($rr['plocation'])) if ($rr['location'] == "") {
$rr['location'] = $rr['plocation']; if (isset($rr['plocation']))
$rr['location'] = $rr['plocation'];
if (isset($rr['pregion']) AND ($rr['pregion'] != "")) {
if ($rr['location'] != "")
$rr['location'] .= ", ";
$rr['location'] .= $rr['pregion'];
}
if (isset($rr['pcountry']) AND ($rr['pcountry'] != "")) {
if ($rr['location'] != "")
$rr['location'] .= ", ";
$rr['location'] .= $rr['pcountry'];
}
}
if (($rr['gender'] == "") AND isset($rr['pgender'])) if (($rr['gender'] == "") AND isset($rr['pgender']))
$rr['gender'] = $rr['pgender']; $rr['gender'] = $rr['pgender'];
@ -235,6 +253,26 @@ function poco_init(&$a) {
$entry['tags'] = array($cleaned); $entry['tags'] = array($cleaned);
} }
if($fields_ret['address']) {
$entry['address'] = array();
// Deactivated. It just reveals too much data. (Although its from the default profile)
//if (isset($rr['paddress']))
// $entry['address']['streetAddress'] = $rr['paddress'];
if (isset($rr['plocation']))
$entry['address']['locality'] = $rr['plocation'];
if (isset($rr['pregion']))
$entry['address']['region'] = $rr['pregion'];
// See above
//if (isset($rr['ppostalcode']))
// $entry['address']['postalCode'] = $rr['ppostalcode'];
if (isset($rr['pcountry']))
$entry['address']['country'] = $rr['pcountry'];
}
$ret['entry'][] = $entry; $ret['entry'][] = $entry;
} }

17
mod/profiles.php
View file

@ -485,10 +485,25 @@ function profiles_post(&$a) {
} }
if($is_default) { if($is_default) {
$location = $locality;
if ($region != "") {
if ($location != "")
$location .= ", ";
$location .= $region;
}
if ($country_name != "") {
if ($location != "")
$location .= ", ";
$location .= $country_name;
}
$r = q("UPDATE `contact` SET `about` = '%s', `location` = '%s', `keywords` = '%s', `gender` = '%s' WHERE `self` = 1 AND `uid` = %d", $r = q("UPDATE `contact` SET `about` = '%s', `location` = '%s', `keywords` = '%s', `gender` = '%s' WHERE `self` = 1 AND `uid` = %d",
dbesc($about), dbesc($about),
dbesc($locality), dbesc($location),
dbesc($pub_keywords), dbesc($pub_keywords),
dbesc($gender), dbesc($gender),
intval(local_user()) intval(local_user())