diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-03-16 06:52:33 +0100 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-03-16 06:52:33 +0100 |
| commit | c43f647049c78b594c90e95d06d12f29f300d5d3 (patch) | |
| tree | a6b02ad763a5d539158721edbe8ca73e158d8ca4 /include/dba.php | |
| parent | a2ee5ebe427522228dc03dc81da11f348a399c4d (diff) | |
| parent | e2ea341094c53e78ae7473a83d2b6c85b1cde4eb (diff) | |
| download | volse-hubzilla-c43f647049c78b594c90e95d06d12f29f300d5d3.tar.gz volse-hubzilla-c43f647049c78b594c90e95d06d12f29f300d5d3.tar.bz2 volse-hubzilla-c43f647049c78b594c90e95d06d12f29f300d5d3.zip | |
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'include/dba.php')
| -rw-r--r-- | include/dba.php | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/include/dba.php b/include/dba.php index d75ed560a..e2f369f19 100644 --- a/include/dba.php +++ b/include/dba.php @@ -19,6 +19,23 @@ class dba { public $connected = false; function __construct($server,$user,$pass,$db,$install = false) { + + $server = trim($server); + $user = trim($user); + $pass = trim($pass); + $db = trim($db); + + if($install) { + if(strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1')) { + if(! dns_get_record($server, DNS_A + DNS_CNAME + DNS_PTR)) { + notice( sprintf( t('Cannot locate DNS info for database server \'%s\'',$server))); + $this->connected = false; + $this->db = null; + return; + } + } + } + $this->db = @new mysqli($server,$user,$pass,$db); if(! mysqli_connect_errno()) { $this->connected = true; @@ -61,7 +78,7 @@ class dba { } else { - /* + /** * If dbfail.out exists, we will write any failed calls directly to it, * regardless of any logging that may or may nor be in effect. * These usually indicate SQL syntax errors that need to be resolved. |