clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #11515 from annando/issue-11492 

Issue 11492: Improvements for contact import
This commit is contained in:
Tobias Diekershoff 2022-05-15 21:56:36 +02:00 committed by GitHub
parent 6f70d21e07 972f91436c
commit 204e52ea30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Module/Settings/Account.php
View File

@ -349,7 +349,7 @@ class Account extends BaseSettings
// "http" or "@" to be present in the string. // "http" or "@" to be present in the string.
// All other fields from the row will be ignored // All other fields from the row will be ignored
if ((strpos($csvRow[0], '@') !== false) || in_array(parse_url($csvRow[0], PHP_URL_SCHEME), ['http', 'https'])) { if ((strpos($csvRow[0], '@') !== false) || in_array(parse_url($csvRow[0], PHP_URL_SCHEME), ['http', 'https'])) {
Worker::add(PRIORITY_LOW, 'AddContact', $_SESSION['uid'], $csvRow[0]); Worker::add(PRIORITY_MEDIUM, 'AddContact', local_user(), $csvRow[0]);
} else { } else {
Logger::notice('Invalid account', ['url' => $csvRow[0]]); Logger::notice('Invalid account', ['url' => $csvRow[0]]);
} }

2
src/Worker/AddContact.php
View File

@ -41,6 +41,6 @@ class AddContact
} }
$result = Contact::createFromProbeForUser($uid, $url); $result = Contact::createFromProbeForUser($uid, $url);
Logger::info('Added contact', ['uid' => $uid, 'url' => $url, 'result' => $result]); Logger::info('Added contact for user', ['uid' => $uid, 'url' => $url, 'result' => $result]);
} }
} }