Frio - Bring back some padding space (#5585)

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

diff --git a/src/Core/ACL.php b/src/Core/ACL.php
index f05cf1f7915880c0a1bf9b5305bf2fcc651625a6..11af99af660a2c69b110b7a488aa2c5e22bc3811 100644 (file)
--- a/src/Core/ACL.php
+++ b/src/Core/ACL.php
@@ -9,7 +9,6 @@ namespace Friendica\Core;
 use Friendica\BaseObject;
 use Friendica\Content\Feature;
 use Friendica\Database\DBA;
-use Friendica\Database\DBM;
 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 ) ";
@@ -106,14 +101,14 @@ class ACL extends BaseObject
                        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) . '"' : '';
@@ -171,7 +166,7 @@ class ACL extends BaseObject
                        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 = '';
@@ -269,7 +269,7 @@ class ACL extends BaseObject
 
                        if (!$imap_disabled) {
                                $mailacct = DBA::selectFirst('mailacct', ['pubmail'], ['`uid` = ? AND `server` != ""', local_user()]);
-                               if (DBM::is_result($mailacct)) {
+                               if (DBA::isResult($mailacct)) {
                                        $mail_enabled = true;
                                        $pubmail_enabled = !empty($mailacct['pubmail']);
                                }