X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FACL.php;h=030825e8138904e101f8c2d12f94ca9e3b211156;hb=33e096434af297743f2aed43aab8fd9f4e68c1e6;hp=95948af293c18870c69395313e22291df9727820;hpb=4e44b07dfe07dde78fe8a095fbb43d9ec1ffcb53;p=friendica.git diff --git a/src/Core/ACL.php b/src/Core/ACL.php index 95948af293..030825e813 100644 --- a/src/Core/ACL.php +++ b/src/Core/ACL.php @@ -8,8 +8,9 @@ namespace Friendica\Core; use Friendica\BaseObject; use Friendica\Content\Feature; -use Friendica\Database\dba; -use Friendica\Database\DBM; +use Friendica\Core\Protocol; +use Friendica\Core\Renderer; +use Friendica\Database\DBA; use Friendica\Model\Contact; use Friendica\Model\GContact; use Friendica\Util\Network; @@ -17,7 +18,7 @@ use Friendica\Util\Network; /** * Handle ACL management and display * - * @author Hypolite Petovan + * @author Hypolite Petovan */ class ACL extends BaseObject { @@ -47,22 +48,21 @@ class ACL extends BaseObject switch (defaults($options, 'networks', Protocol::PHANTOM)) { case 'DFRN_ONLY': - $networks = [NETWORK_DFRN]; + $networks = [Protocol::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 = [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::MAIL, Protocol::DIASPORA]; break; + case 'TWO_WAY': if (!empty($a->user['prvnets'])) { - $networks = [NETWORK_DFRN, NETWORK_MAIL, NETWORK_DIASPORA]; + $networks = [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::MAIL, Protocol::DIASPORA]; } else { - $networks = [NETWORK_DFRN, NETWORK_FACEBOOK, NETWORK_MAIL, NETWORK_DIASPORA, NETWORK_OSTATUS]; + $networks = [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::MAIL, Protocol::DIASPORA, Protocol::OSTATUS]; } break; + default: /// @TODO Maybe log this call? break; } @@ -76,7 +76,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 +86,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 +100,20 @@ class ACL extends BaseObject $o .= "\r\n"; - $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` != '' + $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 NOT `deleted` 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 +180,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"'; @@ -252,13 +252,17 @@ class ACL extends BaseObject /** * Return the full jot ACL selector HTML * - * @param array $user + * @param array $user User array + * @param array $default_permissions Static defaults permission array: ['allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => ''] * @param bool $show_jotnets * @return string */ - public static function getFullSelectorHTML(array $user = null, $show_jotnets = false) + public static function getFullSelectorHTML(array $user, $show_jotnets = false, array $default_permissions = []) { - $perms = self::getDefaultUserPermissions($user); + // Defaults user permissions + if (empty($default_permissions)) { + $default_permissions = self::getDefaultUserPermissions($user); + } $jotnets = ''; if ($show_jotnets) { @@ -268,14 +272,14 @@ 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']); } } - if (empty($user['hidewall'])) { + if (empty($default_permissions['hidewall'])) { if ($mail_enabled) { $selected = $pubmail_enabled ? ' checked="checked"' : ''; $jotnets .= '
' . L10n::t("Post to Email") . '
'; @@ -288,15 +292,15 @@ class ACL extends BaseObject } } - $tpl = get_markup_template('acl_selector.tpl'); - $o = replace_macros($tpl, [ + $tpl = Renderer::getMarkupTemplate('acl_selector.tpl'); + $o = Renderer::replaceMacros($tpl, [ '$showall' => L10n::t('Visible to everybody'), '$show' => L10n::t('show'), '$hide' => L10n::t('don\'t show'), - '$allowcid' => json_encode($perms['allow_cid']), - '$allowgid' => json_encode($perms['allow_gid']), - '$denycid' => json_encode($perms['deny_cid']), - '$denygid' => json_encode($perms['deny_gid']), + '$allowcid' => json_encode(defaults($default_permissions, 'allow_cid', '')), + '$allowgid' => json_encode(defaults($default_permissions, 'allow_gid', '')), + '$denycid' => json_encode(defaults($default_permissions, 'deny_cid', '')), + '$denygid' => json_encode(defaults($default_permissions, 'deny_gid', '')), '$networks' => $show_jotnets, '$emailcc' => L10n::t('CC: email addresses'), '$emtitle' => L10n::t('Example: bob@example.com, mary@example.com'), @@ -321,7 +325,7 @@ class ACL extends BaseObject */ public static function contactAutocomplete($search, $mode) { - if ((Config::get('system', 'block_public')) && (!local_user()) && (!remote_user())) { + if (Config::get('system', 'block_public') && !local_user() && !remote_user()) { return []; } @@ -338,12 +342,11 @@ class ACL extends BaseObject if (Config::get('system', 'poco_local_search')) { $return = GContact::searchByName($search, $mode); } else { - $a = self::getApp(); - $p = $a->pager['page'] != 1 ? '&p=' . $a->pager['page'] : ''; + $p = defaults($_GET, 'page', 1) != 1 ? '&p=' . defaults($_GET, 'page', 1) : ''; - $response = Network::curl(get_server() . '/lsearch?f=' . $p . '&search=' . urlencode($search)); - if ($response['success']) { - $lsearch = json_decode($response['body'], true); + $curlResult = Network::curl(get_server() . '/lsearch?f=' . $p . '&search=' . urlencode($search)); + if ($curlResult->isSuccess()) { + $lsearch = json_decode($curlResult->getBody(), true); if (!empty($lsearch['results'])) { $return = $lsearch['results']; }