X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FACL.php;h=11af99af660a2c69b110b7a488aa2c5e22bc3811;hb=08fc86802a4ad2a265ed45d4e3a6603c65f6c70f;hp=b822d1f31d74b0eb72536a5c65a07ebfb85d84ac;hpb=ecea7425f8ad11ace4af39d476919e3203bff44f;p=friendica.git

diff --git a/src/Core/ACL.php b/src/Core/ACL.php
index b822d1f31d..11af99af66 100644
--- 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 ) ";
@@ -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) . '"' : '';