MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'develop' into patch-1

Browse source
This commit is contained in:
Marcus Müller 2018-04-13 09:41:24 +02:00 committed by GitHub
parent e382dfcfbd 966ebc7a5b
commit 3761797e5f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
boot.php
View file

@ -953,10 +953,12 @@ function public_contact()
*/ */
function remote_user() function remote_user()
{ {
// You cannot be both local and remote // You cannot be both local and remote.
if (local_user()) { // Unncommented by rabuzarus because remote authentication to local
return false; // profiles wasn't possible anymore (2018-04-12).
} // if (local_user()) {
// return false;
// }
if (x($_SESSION, 'authenticated') && x($_SESSION, 'visitor_id')) { if (x($_SESSION, 'authenticated') && x($_SESSION, 'visitor_id')) {
return intval($_SESSION['visitor_id']); return intval($_SESSION['visitor_id']);
} }

2
include/dba.php
View file

@ -54,7 +54,7 @@ class dba {
if ($install) { if ($install) {
// server has to be a non-empty string that is not 'localhost' and not an IP // server has to be a non-empty string that is not 'localhost' and not an IP
if (strlen($server) && ($server !== 'localhost') && filter_var($server, FILTER_VALIDATE_IP) === false) { if (strlen($server) && ($server !== 'localhost') && filter_var($server, FILTER_VALIDATE_IP) === false) {
if (! dns_get_record($server, DNS_A + DNS_CNAME + DNS_PTR)) { if (! dns_get_record($server, DNS_A + DNS_CNAME)) {
self::$error = L10n::t('Cannot locate DNS info for database server \'%s\'', $server); self::$error = L10n::t('Cannot locate DNS info for database server \'%s\'', $server);
return false; return false;
} }

4
src/Util/Network.php
View file

@ -446,7 +446,7 @@ class Network
/// @TODO Really suppress function outcomes? Why not find them + debug them? /// @TODO Really suppress function outcomes? Why not find them + debug them?
$h = @parse_url($url); $h = @parse_url($url);
if ((is_array($h)) && (@dns_get_record($h['host'], DNS_A + DNS_CNAME + DNS_PTR) || filter_var($h['host'], FILTER_VALIDATE_IP) )) { if ((is_array($h)) && (@dns_get_record($h['host'], DNS_A + DNS_CNAME) || filter_var($h['host'], FILTER_VALIDATE_IP) )) {
return $url; return $url;
} }
@ -471,7 +471,7 @@ class Network
$h = substr($addr, strpos($addr, '@') + 1); $h = substr($addr, strpos($addr, '@') + 1);
if (($h) && (dns_get_record($h, DNS_A + DNS_CNAME + DNS_PTR + DNS_MX) || filter_var($h, FILTER_VALIDATE_IP) )) { if (($h) && (dns_get_record($h, DNS_A + DNS_CNAME + DNS_MX) || filter_var($h, FILTER_VALIDATE_IP) )) {
return true; return true;
} }
return false; return false;