friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Left trim at sign from nicks in ACL

This commit is contained in:
Hypolite Petovan 2017-04-10 22:09:49 -04:00
parent b9c0c114fb
commit 05a5e1792d
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/acl_selectors.php
View File

@ -627,14 +627,14 @@ function acl_lookup(App $a, $out_type = 'json') {
dbesc($search), dbesc($search),
implode("','", $known_contacts) implode("','", $known_contacts)
); );
if (dbm::is_result($r)){ if (dbm::is_result($r)) {
foreach ($r as $row) { foreach ($r as $row) {
// nickname..
$up = parse_url($row['author-link']); $up = parse_url($row['author-link']);
$nick = explode("/",$up['path']); $nick = explode('/', $up['path']);
$nick = $nick[count($nick)-1]; // Fix for Mastodon URLs with format https://domain.tld/@nick
$nick .= "@".$up['host']; $nick = ltrim($nick[count($nick) - 1], '@');
// /nickname $nick .= '@' . $up['host'];
$unknow_contacts[] = array( $unknow_contacts[] = array(
'type' => 'c', 'type' => 'c',
'photo' => proxy_url($row['author-avatar'], false, PROXY_SIZE_MICRO), 'photo' => proxy_url($row['author-avatar'], false, PROXY_SIZE_MICRO),

2
mod/acl.php
View File

@ -1,7 +1,7 @@
<?php <?php
/* ACL selector json backend */ /* ACL selector json backend */
require_once("include/acl_selectors.php"); require_once 'include/acl_selectors.php';
function acl_init(App $a) { function acl_init(App $a) {
acl_lookup($a); acl_lookup($a);