rlkollman/meekrodb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

DB::$ssl now works even if DB::$ssl['key'] is NULL

Browse Source 
DB::$connect_flags allows access to flags passed to $mysqli->real_connect()

Resolves #82
Resolves #83
This commit is contained in:
Sergey Tsalkov
2022-03-24 16:58:37 +00:00
parent f82f0cc208
commit ed0b6f040d
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
db.class.php
View File

@@ -31,13 +31,14 @@ class DB {
public static $param_char = '%';
public static $named_param_seperator = '_';
public static $nested_transactions = false;
public static $ssl = array('key' => '', 'cert' => '', 'ca_cert' => '', 'ca_path' => '', 'cipher' => '');
public static $ssl = null;
public static $connect_options = array(MYSQLI_OPT_CONNECT_TIMEOUT => 30);
public static $connect_flags = 0;
public static $logfile;
// internal
protected static $mdb = null;
public static $variables_to_sync = array('param_char', 'named_param_seperator', 'nested_transactions', 'ssl', 'connect_options', 'logfile');
public static $variables_to_sync = array('param_char', 'named_param_seperator', 'nested_transactions', 'ssl', 'connect_options', 'connect_flags', 'logfile');
public static function getMDB() {
$mdb = DB::$mdb;
@@ -83,8 +84,9 @@ class MeekroDB {
public $param_char = '%';
public $named_param_seperator = '_';
public $nested_transactions = false;
public $ssl = array('key' => '', 'cert' => '', 'ca_cert' => '', 'ca_path' => '', 'cipher' => '');
public $ssl = null;
public $connect_options = array(MYSQLI_OPT_CONNECT_TIMEOUT => 30);
public $connect_flags = 0;
public $logfile;
// internal
@@ -142,11 +144,15 @@ class MeekroDB {
$this->current_db = $this->dbName;
$mysql = new mysqli();
$connect_flags = 0;
if ($this->ssl['key']) {
$mysql->ssl_set($this->ssl['key'], $this->ssl['cert'], $this->ssl['ca_cert'], $this->ssl['ca_path'], $this->ssl['cipher']);
$connect_flags = $this->connect_flags;
if (is_array($this->ssl)) {
// PHP produces a warning when trying to access undefined array keys
$ssl_default = array('key' => NULL, 'cert' => NULL, 'ca_cert' => NULL, 'ca_path' => NULL, 'cipher' => NULL);
$ssl = array_merge($ssl_default, $this->ssl);
$mysql->ssl_set($ssl['key'], $ssl['cert'], $ssl['ca_cert'], $ssl['ca_path'], $ssl['cipher']);
$connect_flags |= MYSQLI_CLIENT_SSL;
}
foreach ($this->connect_options as $key => $value) {
$mysql->options($key, $value);
}