keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

dba: leave unconnected if $server and $user are not defined

Browse source
This commit is contained in:
Fabio Comuni 2012-01-02 20:10:23 +01:00
parent f35109827b
commit 85fbdb00ac
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
include/dba.php
View file

@ -18,7 +18,7 @@ class dba {
private $db; private $db;
public $mysqli = true; public $mysqli = true;
public $connected = false; public $connected = false;
public $error = false;
function __construct($server,$user,$pass,$db,$install = false) { function __construct($server,$user,$pass,$db,$install = false) {
@ -27,10 +27,16 @@ class dba {
$pass = trim($pass); $pass = trim($pass);
$db = trim($db); $db = trim($db);
if (!(strlen($server) && strlen($user))){
$this->connected = false;
$this->db = null;
return;
}
if($install) { if($install) {
if(strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1')) { if(strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1')) {
if(! dns_get_record($server, DNS_A + DNS_CNAME + DNS_PTR)) { if(! dns_get_record($server, DNS_A + DNS_CNAME + DNS_PTR)) {
notice( sprintf( t('Cannot locate DNS info for database server \'%s\''), $server)); $this->error = sprintf( t('Cannot locate DNS info for database server \'%s\''), $server);
$this->connected = false; $this->connected = false;
$this->db = null; $this->db = null;
return; return;
@ -152,10 +158,11 @@ class dba {
} }
function __destruct() { function __destruct() {
if($this->mysqli) if ($this->db)
@$this->db->close(); if($this->mysqli)
else $this->db->close();
@mysql_close($this->db); else
mysql_close($this->db);
} }
}} }}
@ -186,6 +193,7 @@ function dbesc($str) {
}} }}
// Function: q($sql,$args); // Function: q($sql,$args);
// Description: execute SQL query with printf style args. // Description: execute SQL query with printf style args.
// Example: $r = q("SELECT * FROM `%s` WHERE `uid` = %d", // Example: $r = q("SELECT * FROM `%s` WHERE `uid` = %d",
@ -209,7 +217,6 @@ function q($sql) {
* session data after abnormal program termination * session data after abnormal program termination
* *
*/ */
logger('dba: no database: ' . print_r($args,true)); logger('dba: no database: ' . print_r($args,true));
return false; return false;