X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FACL.php;h=030825e8138904e101f8c2d12f94ca9e3b211156;hb=33e096434af297743f2aed43aab8fd9f4e68c1e6;hp=20db2908772b2ec4be0cfa095033677d3f4bc954;hpb=ea17370211f400c0438e3d5b06268d63e7da743c;p=friendica.git

diff --git a/src/Core/ACL.php b/src/Core/ACL.php
index 20db290877..030825e813 100644
--- a/src/Core/ACL.php
+++ b/src/Core/ACL.php
@@ -9,6 +9,7 @@ namespace Friendica\Core;
 use Friendica\BaseObject;
 use Friendica\Content\Feature;
 use Friendica\Core\Protocol;
+use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
@@ -17,7 +18,7 @@ use Friendica\Util\Network;
 /**
  * Handle ACL management and display
  *
- * @author Hypolite Petovan <mrpetovan@gmail.com>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class ACL extends BaseObject
 {
@@ -51,14 +52,14 @@ class ACL extends BaseObject
 				break;
 
 			case 'PRIVATE':
-				$networks = [Protocol::DFRN, Protocol::MAIL, Protocol::DIASPORA];
+				$networks = [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::MAIL, Protocol::DIASPORA];
 				break;
 
 			case 'TWO_WAY':
 				if (!empty($a->user['prvnets'])) {
-					$networks = [Protocol::DFRN, Protocol::MAIL, Protocol::DIASPORA];
+					$networks = [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::MAIL, Protocol::DIASPORA];
 				} else {
-					$networks = [Protocol::DFRN, Protocol::MAIL, Protocol::DIASPORA, Protocol::OSTATUS];
+					$networks = [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::MAIL, Protocol::DIASPORA, Protocol::OSTATUS];
 				}
 				break;
 
@@ -100,7 +101,7 @@ class ACL extends BaseObject
 		}
 
 		$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` != ''
+			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())
 		);
@@ -165,7 +166,7 @@ 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`
-			WHERE `uid` = ? AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `notify` != ''
+			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())
 		);
@@ -291,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($default_permissions['allow_cid']),
-			'$allowgid' => json_encode($default_permissions['allow_gid']),
-			'$denycid' => json_encode($default_permissions['deny_cid']),
-			'$denygid' => json_encode($default_permissions['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'),
@@ -324,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 [];
 		}
 
@@ -341,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'];
 				}