aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-12-27 21:08:28 -0800
committerredmatrix <redmatrix@redmatrix.me>2015-12-27 21:08:28 -0800
commitcf5df259e50e708f336f85d01d4ae3cb62ade64f (patch)
treefcf999e770a1cc4f07d3c047a70c3fc4c73c731c /include
parent5a229234e79597202954cb4604bb27ec83966d56 (diff)
downloadvolse-hubzilla-cf5df259e50e708f336f85d01d4ae3cb62ade64f.tar.gz
volse-hubzilla-cf5df259e50e708f336f85d01d4ae3cb62ade64f.tar.bz2
volse-hubzilla-cf5df259e50e708f336f85d01d4ae3cb62ade64f.zip
refresh issue
Diffstat (limited to 'include')
-rw-r--r--include/follow.php7
-rw-r--r--include/notifier.php4
2 files changed, 9 insertions, 2 deletions
diff --git a/include/follow.php b/include/follow.php
index 97be82da7..5e1146657 100644
--- a/include/follow.php
+++ b/include/follow.php
@@ -122,6 +122,7 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
else
$permissions = $j['permissions'];
+
foreach($permissions as $k => $v) {
if($v) {
$their_perms = $their_perms | intval($global_perms[$k][1]);
@@ -167,6 +168,7 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
}
}
+
if(! $xchan_hash) {
$result['message'] = t('Channel discovery failed.');
logger('follow: ' . $result['message']);
@@ -202,6 +204,7 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
$default_group = $r[0]['channel_default_group'];
}
+
if($is_http) {
@@ -226,6 +229,8 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
dbesc($xchan_hash),
intval($uid)
);
+
+
if($r) {
$abook_instance = $r[0]['abook_instance'];
@@ -242,7 +247,6 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
);
}
else {
-
$closeness = get_pconfig($uid,'system','new_abook_closeness');
if($closeness === false)
$closeness = 80;
@@ -270,6 +274,7 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
dbesc($xchan_hash),
intval($uid)
);
+
if($r) {
$result['abook'] = $r[0];
proc_run('php', 'include/notifier.php', 'permission_create', $result['abook']['abook_id']);
diff --git a/include/notifier.php b/include/notifier.php
index 50981df9d..036fcbfc8 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -188,6 +188,8 @@ function notifier_run($argv, $argc){
$recipients[] = $r[0]['abook_xchan'];
$private = false;
$packet_type = 'refresh';
+ $packet_recips = array(array('guid' => $r[0]['xchan_guid'],'guid_sig' => $r[0]['xchan_guid_sig'],'hash' => $r[0]['xchan_hash']));
+
}
}
}
@@ -547,7 +549,7 @@ function notifier_run($argv, $argc){
$packet = null;
if($packet_type === 'refresh' || $packet_type === 'purge') {
- $packet = zot_build_packet($channel,$packet_type);
+ $packet = zot_build_packet($channel,$packet_type,(($packet_recips) ? $packet_recips : null));
}
elseif($packet_type === 'request') {
$packet = zot_build_packet($channel,$packet_type,$env_recips,$hub['hubloc_sitekey'],$hash,