Missing $a to $this conversion in App

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

diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php
index 0cf6420f153fa5e97168f0d9f290e8da0f3c8c1b..401178ec26664090aa6478314d8812d9470113ae 100644 (file)
--- a/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@@ -7,6 +7,7 @@ namespace Friendica\Worker;
 use Friendica\BaseObject;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
+use Friendica\Core\Protocol;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
@@ -103,7 +104,7 @@ class Notifier
                        $uid = $item_id;
 
                        $recipients_relocate = q("SELECT * FROM `contact` WHERE `uid` = %d AND NOT `self` AND `network` IN ('%s', '%s')",
-                                               intval($uid), NETWORK_DFRN, NETWORK_DIASPORA);
+                                               intval($uid), Protocol::DFRN, Protocol::DIASPORA);
                } else {
                        // find ancestors
                        $condition = ['id' => $item_id, 'visible' => true, 'moderated' => false];
@@ -238,7 +239,7 @@ class Notifier
                                // local followup to remote post
                                $followup = true;
                                $public_message = false; // not public
-                               $conversant_str = dbesc($parent['contact-id']);
+                               $conversant_str = DBA::escape($parent['contact-id']);
                                $recipients = [$parent['contact-id']];
                                $recipients_followup  = [$parent['contact-id']];
 
@@ -250,15 +251,15 @@ class Notifier
                                                $target_item['deny_cid'].$target_item['deny_gid']) == 0))
                                        $push_notify = true;
 
-                               if (($thr_parent && ($thr_parent['network'] == NETWORK_OSTATUS)) || ($parent['network'] == NETWORK_OSTATUS)) {
+                               if (($thr_parent && ($thr_parent['network'] == Protocol::OSTATUS)) || ($parent['network'] == Protocol::OSTATUS)) {
                                        $push_notify = true;
 
-                                       if ($parent["network"] == NETWORK_OSTATUS) {
+                                       if ($parent["network"] == Protocol::OSTATUS) {
                                                // Distribute the message to the DFRN contacts as if this wasn't a followup since OStatus can't relay comments
                                                // Currently it is work at progress
                                                $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `network` = '%s' AND NOT `blocked` AND NOT `pending` AND NOT `archive`",
                                                        intval($uid),
-                                                       dbesc(NETWORK_DFRN)
+                                                       DBA::escape(Protocol::DFRN)
                                                );
                                                if (DBA::isResult($r)) {
                                                        foreach ($r as $rr) {
@@ -331,12 +332,12 @@ class Notifier
                                $deny = array_unique(array_merge($deny_people,$deny_groups));
                                $recipients = array_diff($recipients,$deny);
 
-                               $conversant_str = dbesc(implode(', ',$conversants));
+                               $conversant_str = DBA::escape(implode(', ',$conversants));
                        }
 
                        // If the thread parent is OStatus then do some magic to distribute the messages.
                        // We have not only to look at the parent, since it could be a Friendica thread.
-                       if (($thr_parent && ($thr_parent['network'] == NETWORK_OSTATUS)) || ($parent['network'] == NETWORK_OSTATUS)) {
+                       if (($thr_parent && ($thr_parent['network'] == Protocol::OSTATUS)) || ($parent['network'] == Protocol::OSTATUS)) {
                                $diaspora_delivery = false;
 
                                logger('Some parent is OStatus for '.$target_item["guid"]." - Author: ".$thr_parent['author-id']." - Owner: ".$thr_parent['owner-id'], LOGGER_DEBUG);
@@ -370,9 +371,9 @@ class Notifier
                                }
 
                                // It only makes sense to distribute answers to OStatus messages to Friendica and OStatus - but not Diaspora
-                               $networks = [NETWORK_OSTATUS, NETWORK_DFRN];
+                               $networks = [Protocol::OSTATUS, Protocol::DFRN];
                        } else {
-                               $networks = [NETWORK_OSTATUS, NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_MAIL];
+                               $networks = [Protocol::OSTATUS, Protocol::DFRN, Protocol::DIASPORA, Protocol::MAIL];
                        }
                } else {
                        $public_message = false;
@@ -385,7 +386,7 @@ class Notifier
                                && intval($target_item['pubmail'])) {
                                $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `network` = '%s'",
                                        intval($uid),
-                                       dbesc(NETWORK_MAIL)
+                                       DBA::escape(Protocol::MAIL)
                                );
                                if (DBA::isResult($r)) {
                                        foreach ($r as $rr) {
@@ -440,9 +441,9 @@ class Notifier
                                $r1 = q("SELECT `batch`, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`name`) AS `name`, ANY_VALUE(`network`) AS `network`
                                        FROM `contact` WHERE `network` = '%s' AND `batch` != ''
                                        AND `uid` = %d AND `rel` != %d AND NOT `blocked` AND NOT `pending` AND NOT `archive` GROUP BY `batch`",
-                                       dbesc(NETWORK_DIASPORA),
+                                       DBA::escape(Protocol::DIASPORA),
                                        intval($owner['uid']),
-                                       intval(CONTACT_IS_SHARING)
+                                       intval(Contact::SHARING)
                                );
 
                                // Fetch the participation list
@@ -455,8 +456,9 @@ class Notifier
                                }
                        }
 
-                       $condition = ['network' => NETWORK_DFRN, 'uid' => $owner['uid'], 'blocked' => false,
-                               'pending' => false, 'archive' => false, 'rel' => [CONTACT_IS_FOLLOWER, CONTACT_IS_FRIEND]];
+                       $condition = ['network' => Protocol::DFRN, 'uid' => $owner['uid'], 'blocked' => false,
+                               'pending' => false, 'archive' => false, 'rel' => [Contact::FOLLOWER, Contact::FRIEND]];
+
                        $r2 = DBA::toArray(DBA::select('contact', ['id', 'name', 'network'], $condition));
 
                        $r = array_merge($r2, $r1);
@@ -468,7 +470,7 @@ class Notifier
                                        // except for Diaspora batch jobs
                                        // Don't deliver to folks who have already been delivered to
 
-                                       if (($rr['network'] !== NETWORK_DIASPORA) && (in_array($rr['id'], $conversants))) {
+                                       if (($rr['network'] !== Protocol::DIASPORA) && (in_array($rr['id'], $conversants))) {
                                                logger('notifier: already delivered id=' . $rr['id']);
                                                continue;
                                        }