harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dba driver cleanup

Browse Source
This commit is contained in:
friendica 2013-04-23 04:52:03 -07:00
parent 9bff33f112
commit 9d564913f6
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
include/dba/dba_driver.php
View File

@ -11,7 +11,6 @@ function dba_factory($server,$user,$pass,$db,$install = false) {
require_once('include/dba/dba_mysql.php'); require_once('include/dba/dba_mysql.php');
$dba = new dba_mysql($server,$user,$pass,$db,$install); $dba = new dba_mysql($server,$user,$pass,$db,$install);
} }
$dba->connect($server,$user,$pass,$db);
return $dba; return $dba;
} }
@ -20,7 +19,6 @@ function dba_factory($server,$user,$pass,$db,$install = false) {
abstract class dba_driver { abstract class dba_driver {
protected $debug = 0; protected $debug = 0;
protected $driver;
protected $db; protected $db;
public $connected = false; public $connected = false;
public $error = false; public $error = false;
@ -31,22 +29,18 @@ abstract class dba_driver {
abstract function close(); abstract function close();
function __construct($server,$user,$pass,$db,$install = false) { function __construct($server,$user,$pass,$db,$install = false) {
if($install) if(($install) && (! $this->install($server,$user,$pass,$db))) {
$this->install($server,$user,$pass,$db); return;
}
$this->connect($server,$user,$pass,$db); $this->connect($server,$user,$pass,$db);
} }
function install($server,$user,$pass,$db) { function install($server,$user,$pass,$db) {
$server = trim($server);
$user = trim($user);
$pass = trim($pass);
$db = trim($db);
if (!(strlen($server) && strlen($user))){ if (!(strlen($server) && strlen($user))){
$this->connected = false; $this->connected = false;
$this->db = null; $this->db = null;
return; return false;
} }
if(strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1')) { if(strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1')) {
@ -54,15 +48,15 @@ abstract class dba_driver {
$this->error = 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 false;
} }
} }
} }
function dbg($dbg) { function dbg($dbg) {
$this->debug = $dbg; $this->debug = $dbg;
} }
function __destruct() { function __destruct() {
if($this->db && $this->connected) { if($this->db && $this->connected) {

2
version.inc
View File

@ -1 +1 @@
2013-04-22.291 2013-04-23.292