X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_confirm.php;h=51cd59c62fe100b203e6caf8683571725491318c;hb=0c9cc29a51941eb572bf16fd5489d0947d47d033;hp=68950ec285a5f29a6be7fb037fdeb43c6f00ee99;hpb=27905cc21a523d052a0148c9802a64d6dfd9d0d2;p=friendica.git diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php index 68950ec285..51cd59c62f 100644 --- a/mod/dfrn_confirm.php +++ b/mod/dfrn_confirm.php @@ -15,6 +15,8 @@ */ require_once('include/enotify.php'); +require_once('include/group.php'); +require_once('include/Probe.php'); function dfrn_confirm_post(&$a,$handsfree = null) { @@ -355,7 +357,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { $poll = (($contact['poll']) ? $contact['poll'] : ''); if((! $contact['notify']) || (! $contact['poll'])) { - $arr = lrdd($contact['url']); + $arr = Probe::lrdd($contact['url']); if(count($arr)) { foreach($arr as $link) { if($link['@attributes']['rel'] === 'salmon') @@ -427,8 +429,8 @@ function dfrn_confirm_post(&$a,$handsfree = null) { if(($contact) && ($contact['network'] === NETWORK_DIASPORA)) { require_once('include/diaspora.php'); - $ret = diaspora_share($user[0],$r[0]); - logger('mod_follow: diaspora_share returns: ' . $ret); + $ret = diaspora::send_share($user[0],$r[0]); + logger('share returns: ' . $ret); } // Send a new friend post if we are allowed to... @@ -448,6 +450,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { if(count($self)) { $arr = array(); + $arr['guid'] = get_guid(32); $arr['uri'] = $arr['parent-uri'] = item_new_uri($a->get_hostname(), $uid); $arr['uid'] = $uid; $arr['contact-id'] = $self[0]['id']; @@ -466,7 +469,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { $BPhoto = '[url=' . $contact['url'] . ']' . '[img]' . $contact['thumb'] . '[/img][/url]'; $arr['verb'] = ACTIVITY_FRIEND; - $arr['object-type'] = ACTIVITY_OBJ_PERSON; + $arr['object-type'] = ACTIVITY_OBJ_PERSON; $arr['body'] = sprintf( t('%1$s is now friends with %2$s'), $A, $B)."\n\n\n".$BPhoto; $arr['object'] = '' . ACTIVITY_OBJ_PERSON . '' . $contact['name'] . '' @@ -484,16 +487,14 @@ function dfrn_confirm_post(&$a,$handsfree = null) { $i = item_store($arr); if($i) - proc_run('php',"include/notifier.php","activity","$i"); + proc_run(PRIORITY_HIGH, "include/notifier.php", "activity", $i); } } } $def_gid = get_default_group($uid, $contact["network"]); - if($contact && intval($def_gid)) { - require_once('include/group.php'); + if($contact && intval($def_gid)) group_add_member($uid, '', $contact['id'], $def_gid); - } // Let's send our user to the contact editor in case they want to // do anything special with this new friend. @@ -783,7 +784,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { $i = item_store($arr); if($i) - proc_run('php',"include/notifier.php","activity","$i"); + proc_run(PRIORITY_HIGH, "include/notifier.php", "activity", $i); } }