Update false evaluations

[friendica.git] / src / Worker / Notifier.php

diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php
index ac8cf123c5a8d4e6a02109877b80a12b7bcf682e..a3a03055ec9f13040bc289652f5eb4e99cd3a923 100644 (file)
--- a/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@@ -11,15 +11,14 @@ use Friendica\Network\Probe;
 use Friendica\Object\Contact;
 use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\OStatus;
+use Friendica\Protocol\Salmon;
 use dba;
 
 require_once 'include/queue_fn.php';
 require_once 'include/html2plain.php';
-require_once 'include/salmon.php';
 require_once 'include/datetime.php';
 require_once 'include/items.php';
 require_once 'include/bbcode.php';
-require_once 'include/email.php';
 
 /*
  * This file was at one time responsible for doing all deliveries, but this caused
@@ -108,7 +107,7 @@ class Notifier {
                        $recipients[] = $suggest[0]['cid'];
                        $item = $suggest[0];
                } elseif ($cmd === 'removeme') {
-                       $r = q("SELECT `contact`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey`,
+                       $r = q("SELECT `contact`.*, `user`.`prvkey` AS `uprvkey`,
                                        `user`.`timezone`, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`,
                                        `user`.`page-flags`, `user`.`prvnets`, `user`.`account-type`, `user`.`guid`
                                FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
@@ -173,7 +172,7 @@ class Notifier {
 
                }
 
-               $r = q("SELECT `contact`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey`,
+               $r = q("SELECT `contact`.*, `user`.`prvkey` AS `uprvkey`,
                        `user`.`timezone`, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`,
                        `user`.`page-flags`, `user`.`prvnets`, `user`.`account-type`
                        FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
@@ -448,7 +447,7 @@ class Notifier {
                                // It only makes sense to distribute answers to OStatus messages to Friendica and OStatus - but not Diaspora
                                $sql_extra = " AND `network` IN ('".NETWORK_OSTATUS."', '".NETWORK_DFRN."')";
                        } else {
-                               $sql_extra = " AND `network` IN ('".NETWORK_OSTATUS."', '".NETWORK_DFRN."', '".NETWORK_DIASPORA."', '".NETWORK_MAIL."', '".NETWORK_MAIL2."')";
+                               $sql_extra = " AND `network` IN ('".NETWORK_OSTATUS."', '".NETWORK_DFRN."', '".NETWORK_DIASPORA."', '".NETWORK_MAIL."')";
                        }
                } else {
                        $public_message = false;
@@ -506,11 +505,11 @@ class Notifier {
                // They are especially used for notifications to OStatus users that don't follow us.
 
                if ($slap && count($url_recipients) && ($public_message || $push_notify) && $normal_mode) {
-                       if (!Config::get('system','dfrn_only')) {
+                       if (!Config::get('system', 'dfrn_only')) {
                                foreach ($url_recipients as $url) {
                                        if ($url) {
                                                logger('notifier: urldelivery: ' . $url);
-                                               $deliver_status = slapper($owner,$url,$slap);
+                                               $deliver_status = Salmon::slapper($owner, $url, $slap);
                                                /// @TODO Redeliver/queue these items on failure, though there is no contact record
                                        }
                                }
@@ -538,9 +537,8 @@ class Notifier {
                        }
 
                        $r2 = q("SELECT `id`, `name`,`network` FROM `contact`
-                               WHERE `network` in ('%s', '%s') AND `uid` = %d AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `rel` != %d",
+                               WHERE `network` in ('%s') AND `uid` = %d AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `rel` != %d",
                                dbesc(NETWORK_DFRN),
-                               dbesc(NETWORK_MAIL2),
                                intval($owner['uid']),
                                intval(CONTACT_IS_SHARING)
                        );