strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #3425 from annando/1705-db-port

Browse source 
It is now possible to connect to a db server with host:port
This commit is contained in:
Hypolite Petovan 2017-05-03 19:17:43 -04:00 committed by GitHub
parent 8510b4d4dd 353074850e
commit 42b4c7601c
1 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
include/dba.php
View file

@ -25,11 +25,20 @@ class dba {
private static $dbo; private static $dbo;
private static $relation = array(); private static $relation = array();
function __construct($server, $user, $pass, $db, $install = false) { function __construct($serveraddr, $user, $pass, $db, $install = false) {
$a = get_app(); $a = get_app();
$stamp1 = microtime(true); $stamp1 = microtime(true);
$serveraddr = trim($serveraddr);
$serverdata = explode(':', $serveraddr);
$server = $serverdata[0];
if (count($serverdata) > 1) {
$port = trim($serverdata[1]);
}
$server = trim($server); $server = trim($server);
$user = trim($user); $user = trim($user);
$pass = trim($pass); $pass = trim($pass);
@ -55,6 +64,11 @@ class dba {
if (class_exists('\PDO') && in_array('mysql', PDO::getAvailableDrivers())) { if (class_exists('\PDO') && in_array('mysql', PDO::getAvailableDrivers())) {
$this->driver = 'pdo'; $this->driver = 'pdo';
$connect = "mysql:host=".$server.";dbname=".$db; $connect = "mysql:host=".$server.";dbname=".$db;
if (isset($port)) {
$connect .= ";port=".$port;
}
if (isset($a->config["system"]["db_charset"])) { if (isset($a->config["system"]["db_charset"])) {
$connect .= ";charset=".$a->config["system"]["db_charset"]; $connect .= ";charset=".$a->config["system"]["db_charset"];
} }
@ -64,7 +78,7 @@ class dba {
} }
} elseif (class_exists('mysqli')) { } elseif (class_exists('mysqli')) {
$this->driver = 'mysqli'; $this->driver = 'mysqli';
$this->db = @new mysqli($server,$user,$pass,$db); $this->db = @new mysqli($server, $user, $pass, $db, $port);
if (!mysqli_connect_errno()) { if (!mysqli_connect_errno()) {
$this->connected = true; $this->connected = true;
@ -74,8 +88,8 @@ class dba {
} }
} elseif (function_exists('mysql_connect')) { } elseif (function_exists('mysql_connect')) {
$this->driver = 'mysql'; $this->driver = 'mysql';
$this->db = mysql_connect($server,$user,$pass); $this->db = mysql_connect($serveraddr, $user, $pass);
if ($this->db && mysql_select_db($db,$this->db)) { if ($this->db && mysql_select_db($db, $this->db)) {
$this->connected = true; $this->connected = true;
if (isset($a->config["system"]["db_charset"])) { if (isset($a->config["system"]["db_charset"])) {
@ -553,9 +567,10 @@ class dba {
$values[] = &$args[$param]; $values[] = &$args[$param];
} }
array_unshift($values, $params); if (count($values) > 0) {
array_unshift($values, $params);
call_user_func_array(array($stmt, 'bind_param'), $values); call_user_func_array(array($stmt, 'bind_param'), $values);
}
if (!$stmt->execute()) { if (!$stmt->execute()) {
self::$dbo->error = self::$dbo->db->error; self::$dbo->error = self::$dbo->db->error;