require_once('include/datetime.php');
require_once('include/diaspora.php');
require_once('include/queue_fn.php');
+require_once('include/Contact.php');
function profile_change() {
$a = get_app();
-
+
if(! local_user())
return;
// $url = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
-// if($url && strlen(get_config('system','directory_submit_url')))
+// if($url && strlen(get_config('system','directory')))
// proc_run('php',"include/directory.php","$url");
- $recips = q("SELECT DISTINCT(`batch`), `id`, `name`,`network` FROM `contact` WHERE `network` = '%s'
- AND `uid` = %d AND `rel` != %d group by `batch` ORDER BY rand() ",
+ $recips = q("SELECT `id`,`name`,`network`,`pubkey`,`notify` FROM `contact` WHERE `network` = '%s'
+ AND `uid` = %d AND `rel` != %d ",
dbesc(NETWORK_DIASPORA),
intval(local_user()),
intval(CONTACT_IS_SHARING)
return;
$r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `user`.* FROM `profile`
- LEFT JOIN `user` ON `profile`.`uid` = `user`.`uid`
+ INNER JOIN `user` ON `profile`.`uid` = `user`.`uid`
WHERE `user`.`uid` = %d AND `profile`.`is-default` = 1 LIMIT 1",
intval(local_user())
);
-
+
if(! count($r))
return;
$profile = $r[0];
$about = xmlify($profile['about']);
require_once('include/bbcode.php');
$about = xmlify(strip_tags(bbcode($about)));
- $location = '';
- if($profile['locality'])
- $location .= $profile['locality'];
- if($profile['region']) {
- if($location)
- $location .= ', ';
- $location .= $profile['region'];
- }
- if($profile['country-name']) {
- if($location)
- $location .= ', ';
- $location .= $profile['country-name'];
- }
+ $location = formatted_location($profile);
$location = xmlify($location);
$tags = '';
if($profile['pub_keywords']) {
logger('profile_change: ' . $msg, LOGGER_ALL);
foreach($recips as $recip) {
- $msgtosend = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$a->user,$recip,$a->user['prvkey'],null,true)));
- add_to_queue($recip['id'],NETWORK_DIASPORA,$msgtosend,true);
+ $msgtosend = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$a->user,$recip,$a->user['prvkey'],$recip['pubkey'],false)));
+ add_to_queue($recip['id'],NETWORK_DIASPORA,$msgtosend,false);
}
}