Merge pull request #5599 from annando/postupdate

[friendica.git] / src / Core / ACL.php

diff --git a/src/Core/ACL.php b/src/Core/ACL.php
index ce1cd6589d65e2d801aa9df62cbd8656485f87bf..11af99af660a2c69b110b7a488aa2c5e22bc3811 100644 (file)
--- a/src/Core/ACL.php
+++ b/src/Core/ACL.php
@@ -49,17 +49,13 @@ class ACL extends BaseObject
                                $networks = [NETWORK_DFRN];
                                break;
                        case 'PRIVATE':
-                               if (!empty($a->user['prvnets'])) {
-                                       $networks = [NETWORK_DFRN, NETWORK_MAIL, NETWORK_DIASPORA];
-                               } else {
-                                       $networks = [NETWORK_DFRN, NETWORK_FACEBOOK, NETWORK_MAIL, NETWORK_DIASPORA];
-                               }
+                               $networks = [NETWORK_DFRN, NETWORK_MAIL, NETWORK_DIASPORA];
                                break;
                        case 'TWO_WAY':
                                if (!empty($a->user['prvnets'])) {
                                        $networks = [NETWORK_DFRN, NETWORK_MAIL, NETWORK_DIASPORA];
                                } else {
-                                       $networks = [NETWORK_DFRN, NETWORK_FACEBOOK, NETWORK_MAIL, NETWORK_DIASPORA, NETWORK_OSTATUS];
+                                       $networks = [NETWORK_DFRN, NETWORK_MAIL, NETWORK_DIASPORA, NETWORK_OSTATUS];
                                }
                                break;
                        default: /// @TODO Maybe log this call?
@@ -75,7 +71,7 @@ class ACL extends BaseObject
                $sql_extra = '';
 
                if (!empty($x['mutual'])) {
-                       $sql_extra .= sprintf(" AND `rel` = %d ", intval(CONTACT_IS_FRIEND));
+                       $sql_extra .= sprintf(" AND `rel` = %d ", intval(Contact::FRIEND));
                }
 
                if (!empty($x['exclude'])) {
@@ -85,7 +81,7 @@ class ACL extends BaseObject
                if (!empty($x['networks'])) {
                        /// @TODO rewrite to foreach()
                        array_walk($x['networks'], function (&$value) {
-                               $value = "'" . dbesc($value) . "'";
+                               $value = "'" . DBA::escape($value) . "'";
                        });
                        $str_nets = implode(',', $x['networks']);
                        $sql_extra .= " AND `network` IN ( $str_nets ) ";
@@ -112,7 +108,7 @@ class ACL extends BaseObject
                // e.g. 'network_pre_contact_deny', 'profile_pre_contact_allow'
                Addon::callHooks($a->module . '_pre_' . $selname, $arr);
 
-               if (DBA::is_result($contacts)) {
+               if (DBA::isResult($contacts)) {
                        foreach ($contacts as $contact) {
                                if (in_array($contact['id'], $preselected)) {
                                        $selected = ' selected="selected" ';
@@ -151,7 +147,7 @@ class ACL extends BaseObject
 
                // When used for private messages, we limit correspondence to mutual DFRN/Friendica friends and the selector
                // to one recipient. By default our selector allows multiple selects amongst all contacts.
-               $sql_extra = sprintf(" AND `rel` = %d ", intval(CONTACT_IS_FRIEND));
+               $sql_extra = sprintf(" AND `rel` = %d ", intval(Contact::FRIEND));
                $sql_extra .= sprintf(" AND `network` IN ('%s' , '%s') ", NETWORK_DFRN, NETWORK_DIASPORA);
 
                $tabindex_attr = !empty($tabindex) ? ' tabindex="' . intval($tabindex) . '"' : '';
@@ -179,7 +175,7 @@ class ACL extends BaseObject
 
                $receiverlist = [];
 
-               if (DBA::is_result($contacts)) {
+               if (DBA::isResult($contacts)) {
                        foreach ($contacts as $contact) {
                                if (in_array($contact['id'], $preselected)) {
                                        $selected = ' selected="selected"';
@@ -273,7 +269,7 @@ class ACL extends BaseObject
 
                        if (!$imap_disabled) {
                                $mailacct = DBA::selectFirst('mailacct', ['pubmail'], ['`uid` = ? AND `server` != ""', local_user()]);
-                               if (DBA::is_result($mailacct)) {
+                               if (DBA::isResult($mailacct)) {
                                        $mail_enabled = true;
                                        $pubmail_enabled = !empty($mailacct['pubmail']);
                                }