X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fnotifier.php;h=9e1450ba2b5004a676f62375aab0f686290f3c23;hb=c0cc65304b06b027219a9f162deaab90fe2a0487;hp=33eeee62fd5b9eaa6eea7f0091358f5d0ba56410;hpb=a905522eb58612dfc9e4479998de2bd6477b3868;p=friendica.git diff --git a/include/notifier.php b/include/notifier.php index 33eeee62fd..9e1450ba2b 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -210,8 +210,9 @@ function notifier_run(&$argv, &$argc){ intval($uid) ); - if(! dbm::is_result($r)) + if (! dbm::is_result($r)) { return; + } $owner = $r[0]; @@ -424,20 +425,6 @@ function notifier_run(&$argv, &$argc){ $url_recipients[$probed_contact["notify"]] = $probed_contact["notify"]; } - // Send a salmon to the parent author - $probed_contact = probe_url($thr_parent[0]['author-link']); - if ($probed_contact["notify"] != "") { - logger('Notify parent author '.$probed_contact["url"].': '.$probed_contact["notify"]); - $url_recipients[$probed_contact["notify"]] = $probed_contact["notify"]; - } - - // Send a salmon to the parent owner - $probed_contact = probe_url($thr_parent[0]['owner-link']); - if ($probed_contact["notify"] != "") { - logger('Notify parent owner '.$probed_contact["url"].': '.$probed_contact["notify"]); - $url_recipients[$probed_contact["notify"]] = $probed_contact["notify"]; - } - // Send a salmon notification to every person we mentioned in the post $arr = explode(',',$target_item['tag']); foreach($arr as $x) { @@ -571,7 +558,7 @@ function notifier_run(&$argv, &$argc){ if($slap && count($url_recipients) && ($public_message || $push_notify) && $normal_mode) { if(!get_config('system','dfrn_only')) { foreach($url_recipients as $url) { - if($url) { + if ($url) { logger('notifier: urldelivery: ' . $url); $deliver_status = slapper($owner,$url,$slap); /// @TODO Redeliver/queue these items on failure, though there is no contact record @@ -663,7 +650,7 @@ function notifier_run(&$argv, &$argc){ } else { - $params = 'hub.mode=publish&hub.url=' . urlencode( $a->get_baseurl() . '/dfrn_poll/' . $owner['nickname'] ); + $params = 'hub.mode=publish&hub.url=' . urlencode( App::get_baseurl() . '/dfrn_poll/' . $owner['nickname'] ); post_url($h,$params); logger('publish for item '.$item_id.' ' . $h . ' ' . $params . ' returned ' . $a->get_curl_code()); }