From: Michael <heluecht@pirati.ca>
Date: Mon, 28 Oct 2019 13:50:06 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/develop' into issue-3229
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=bfbce16d0bd795cb7d48a98c05fd930058445f10;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into issue-3229
---

bfbce16d0bd795cb7d48a98c05fd930058445f10
diff --cc mod/settings.php
index 74dc8936dd,8c3ce66842..be121f6a78
--- a/mod/settings.php
+++ b/mod/settings.php
@@@ -534,11 -535,29 +536,14 @@@ function settings_post(App $a
  		date_default_timezone_set($timezone);
  	}
  
- 	$str_group_allow   = !empty($_POST['group_allow'])   ? perms2str($_POST['group_allow'])   : '';
- 	$str_contact_allow = !empty($_POST['contact_allow']) ? perms2str($_POST['contact_allow']) : '';
- 	$str_group_deny    = !empty($_POST['group_deny'])    ? perms2str($_POST['group_deny'])    : '';
- 	$str_contact_deny  = !empty($_POST['contact_deny'])  ? perms2str($_POST['contact_deny'])  : '';
+ 	/** @var ACLFormatter $aclFormatter */
+ 	$aclFormatter = BaseObject::getClass(ACLFormatter::class);
+ 
+ 	$str_group_allow   = !empty($_POST['group_allow'])   ? $aclFormatter->toString($_POST['group_allow'])   : '';
+ 	$str_contact_allow = !empty($_POST['contact_allow']) ? $aclFormatter->toString($_POST['contact_allow']) : '';
+ 	$str_group_deny    = !empty($_POST['group_deny'])    ? $aclFormatter->toString($_POST['group_deny'])    : '';
+ 	$str_contact_deny  = !empty($_POST['contact_deny'])  ? $aclFormatter->toString($_POST['contact_deny'])  : '';
  
 -	$openidserver = $a->user['openidserver'];
 -	//$openid = Strings::normaliseOpenID($openid);
 -
 -	// If openid has changed or if there's an openid but no openidserver, try and discover it.
 -	if ($openid != $a->user['openid'] || (strlen($openid) && (!strlen($openidserver)))) {
 -		if (Network::isUrlValid($openid)) {
 -			Logger::log('updating openidserver');
 -			$open_id_obj = new LightOpenID($a->getHostName());
 -			$open_id_obj->identity = $openid;
 -			$openidserver = $open_id_obj->discover($open_id_obj->identity);
 -		} else {
 -			$openidserver = '';
 -		}
 -	}
 -
  	PConfig::set(local_user(), 'expire', 'items', $expire_items);
  	PConfig::set(local_user(), 'expire', 'notes', $expire_notes);
  	PConfig::set(local_user(), 'expire', 'starred', $expire_starred);