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

Merge remote-tracking branch 'origin/develop' into install_config

Browse Source
This commit is contained in:
Philipp Holzer
2018-04-21 14:23:49 +02:00
parent 346697d771 ebe203336f
commit 334d392154
90 changed files with 59497 additions and 56448 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/dba.php
View File

@@ -52,8 +52,9 @@ class dba {
}
if ($install) {
if (strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1')) {
if (! dns_get_record($server, DNS_A + DNS_CNAME + DNS_PTR)) {
// 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 (! dns_get_record($server, DNS_A + DNS_CNAME)) {
self::$error = L10n::t('Cannot locate DNS info for database server \'%s\'', $server);
return false;
}