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

New function "isAuthenticated"

Browse Source
This commit is contained in:
Michael
2019-09-28 18:09:11 +00:00
parent 89f02a1125
commit 83b00ef308
26 changed files with 64 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Model/Contact.php
+3 -2
View File
@@ -13,6 +13,7 @@ use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\System;
use Friendica\Core\Session;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
use Friendica\Network\Probe;
@@ -2679,7 +2680,7 @@ class Contact extends BaseObject
*/
public static function magicLink($contact_url, $url = '')
{
if (!local_user() && !remote_user()) {
if (!Session::isAuthenticated()) {
return $url ?: $contact_url; // Equivalent to: ($url != '') ? $url : $contact_url;
}
@@ -2725,7 +2726,7 @@ class Contact extends BaseObject
{
$destination = $url ?: $contact['url']; // Equivalent to ($url != '') ? $url : $contact['url'];
if ((!local_user() && !remote_user()) || ($contact['network'] != Protocol::DFRN)) {
if (!Session::isAuthenticated() || ($contact['network'] != Protocol::DFRN)) {
return $destination;
}