Ops, one more left ...

[friendica.git] / mod / salmon.php

diff --git a/mod/salmon.php b/mod/salmon.php
index 3cdd607ad178d44494ef81907cad8a6990528d34..8bdfdefeee1663ba2d9c72bd3644f7848787dda0 100644 (file)
--- a/mod/salmon.php
+++ b/mod/salmon.php
@@ -4,6 +4,7 @@
  */
 use Friendica\App;
 use Friendica\Core\PConfig;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
@@ -25,7 +26,7 @@ function salmon_post(App $a, $xml = '') {
        $mentions   = (($a->argc > 2 && $a->argv[2] === 'mention') ? true : false);
 
        $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
-               dbesc($nick)
+               DBA::escape($nick)
        );
        if (! DBA::isResult($r)) {
                System::httpExit(500);
@@ -145,11 +146,11 @@ function salmon_post(App $a, $xml = '') {
        $r = q("SELECT * FROM `contact` WHERE `network` IN ('%s', '%s')
                                                AND (`nurl` = '%s' OR `alias` = '%s' OR `alias` = '%s')
                                                AND `uid` = %d LIMIT 1",
-               dbesc(NETWORK_OSTATUS),
-               dbesc(NETWORK_DFRN),
-               dbesc(normalise_link($author_link)),
-               dbesc($author_link),
-               dbesc(normalise_link($author_link)),
+               DBA::escape(Protocol::OSTATUS),
+               DBA::escape(Protocol::DFRN),
+               DBA::escape(normalise_link($author_link)),
+               DBA::escape($author_link),
+               DBA::escape(normalise_link($author_link)),
                intval($importer['uid'])
        );
        if (! DBA::isResult($r)) {
@@ -159,9 +160,9 @@ function salmon_post(App $a, $xml = '') {
                        if($result['success']) {
                                $r = q("SELECT * FROM `contact` WHERE `network` = '%s' AND ( `url` = '%s' OR `alias` = '%s')
                                        AND `uid` = %d LIMIT 1",
-                                       dbesc(NETWORK_OSTATUS),
-                                       dbesc($author_link),
-                                       dbesc($author_link),
+                                       DBA::escape(Protocol::OSTATUS),
+                                       DBA::escape($author_link),
+                                       DBA::escape($author_link),
                                        intval($importer['uid'])
                                );
                        }
@@ -171,7 +172,7 @@ function salmon_post(App $a, $xml = '') {
        // Have we ignored the person?
        // If so we can not accept this post.
 
-       //if((DBA::isResult($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == CONTACT_IS_FOLLOWER) || ($r[0]['blocked']))) {
+       //if((DBA::isResult($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == Contact::FOLLOWER) || ($r[0]['blocked']))) {
        if (DBA::isResult($r) && $r[0]['blocked']) {
                logger('Ignoring this author.');
                System::httpExit(202);