X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FACL.php;h=11af99af660a2c69b110b7a488aa2c5e22bc3811;hb=8789aedf6b9c68ba6d71d3dd2e285aed3e052ac4;hp=95948af293c18870c69395313e22291df9727820;hpb=daa1177e3a1e42b4c95e0a8759f1610942b952c7;p=friendica.git

diff --git a/src/Core/ACL.php b/src/Core/ACL.php
index 95948af293..11af99af66 100644
--- a/src/Core/ACL.php
+++ b/src/Core/ACL.php
@@ -8,8 +8,7 @@ namespace Friendica\Core;
 
 use Friendica\BaseObject;
 use Friendica\Content\Feature;
-use Friendica\Database\dba;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
 use Friendica\Util\Network;
@@ -50,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?
@@ -76,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'])) {
@@ -86,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 ) ";
@@ -100,20 +95,20 @@ class ACL extends BaseObject
 			$o .= "<select name=\"{$selname}[]\" id=\"$selclass\" class=\"$selclass\" multiple=\"multiple\" size=\"" . $x['size'] . "$\" $tabindex >\r\n";
 		}
 
-		$stmt = dba::p("SELECT `id`, `name`, `url`, `network` FROM `contact`
+		$stmt = DBA::p("SELECT `id`, `name`, `url`, `network` FROM `contact`
 			WHERE `uid` = ? AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `notify` != ''
 			$sql_extra
 			ORDER BY `name` ASC ", intval(local_user())
 		);
 
-		$contacts = dba::inArray($stmt);
+		$contacts = DBA::toArray($stmt);
 
 		$arr = ['contact' => $contacts, 'entry' => $o];
 
 		// e.g. 'network_pre_contact_deny', 'profile_pre_contact_allow'
 		Addon::callHooks($a->module . '_pre_' . $selname, $arr);
 
-		if (DBM::is_result($contacts)) {
+		if (DBA::isResult($contacts)) {
 			foreach ($contacts as $contact) {
 				if (in_array($contact['id'], $preselected)) {
 					$selected = ' selected="selected" ';
@@ -152,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) . '"' : '';
@@ -165,13 +160,13 @@ class ACL extends BaseObject
 
 		$o .= "<select name=\"$selname\" id=\"$selclass\" class=\"$selclass\" size=\"$size\"$tabindex_attr$hidepreselected>\r\n";
 
-		$stmt = dba::p("SELECT `id`, `name`, `url`, `network` FROM `contact`
+		$stmt = DBA::p("SELECT `id`, `name`, `url`, `network` FROM `contact`
 			WHERE `uid` = ? AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `notify` != ''
 			$sql_extra
 			ORDER BY `name` ASC ", intval(local_user())
 		);
 
-		$contacts = dba::inArray($stmt);
+		$contacts = DBA::toArray($stmt);
 
 		$arr = ['contact' => $contacts, 'entry' => $o];
 
@@ -180,7 +175,7 @@ class ACL extends BaseObject
 
 		$receiverlist = [];
 
-		if (DBM::is_result($contacts)) {
+		if (DBA::isResult($contacts)) {
 			foreach ($contacts as $contact) {
 				if (in_array($contact['id'], $preselected)) {
 					$selected = ' selected="selected"';
@@ -258,6 +253,11 @@ class ACL extends BaseObject
 	 */
 	public static function getFullSelectorHTML(array $user = null, $show_jotnets = false)
 	{
+
+		if (empty($user['uid'])) {
+			return '';
+		}
+
 		$perms = self::getDefaultUserPermissions($user);
 
 		$jotnets = '';
@@ -268,8 +268,8 @@ class ACL extends BaseObject
 			$pubmail_enabled = false;
 
 			if (!$imap_disabled) {
-				$mailacct = dba::selectFirst('mailacct', ['pubmail'], ['`uid` = ? AND `server` != ""', local_user()]);
-				if (DBM::is_result($mailacct)) {
+				$mailacct = DBA::selectFirst('mailacct', ['pubmail'], ['`uid` = ? AND `server` != ""', local_user()]);
+				if (DBA::isResult($mailacct)) {
 					$mail_enabled = true;
 					$pubmail_enabled = !empty($mailacct['pubmail']);
 				}