nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2025-12-30 00:53:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

contacts app_defaults breaks PDO db (#6585)

Browse Source
This commit is contained in:
frytimo
2023-03-24 12:18:23 -03:00
committed by GitHub
parent 051cb01fdc
commit 5e23824940
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/contacts/app_defaults.php
View File

@@ -4,7 +4,6 @@ if ($domains_processed == 1) {
//populate new phone_label values, phone_type_* values
$obj = new schema;
$obj->db = $db;
$obj->db_type = $db_type;
$obj->schema();
$field_exists = $obj->column_exists($db_name, 'v_contact_phones', 'phone_type'); //check if field exists
@@ -62,7 +61,6 @@ if ($domains_processed == 1) {
//populate primary email from deprecated field in v_contact table
$obj = new schema;
$obj->db = $db;
$obj->db_type = $db_type;
$obj->schema();
$field_exists = $obj->column_exists($db_name, 'v_contacts', 'contact_email'); //check if field exists
@@ -123,7 +121,6 @@ if ($domains_processed == 1) {
//populate primary url from deprecated field in v_contact table
$obj = new schema;
$obj->db = $db;
$obj->db_type = $db_type;
$obj->schema();
$field_exists = $obj->column_exists($db_name, 'v_contacts', 'contact_url'); //check if field exists

14
resources/classes/schema.php
View File

@@ -29,7 +29,7 @@ if (!class_exists('schema')) {
class schema {
//define variables
public $db;
private $db;
public $apps;
public $db_type;
public $result;
@@ -37,13 +37,11 @@ if (!class_exists('schema')) {
//class constructor
public function __construct() {
//connect to the database if not connected
if (!$this->db) {
require_once "resources/classes/database.php";
$database = new database;
$database->connect();
$this->db = $database->db;
}
//connect to the database
require_once "resources/classes/database.php";
$database = new database;
$database->connect();
$this->db = $database->db;
//set the include path
$conf = glob("{/usr/local/etc,/etc}/fusionpbx/config.conf", GLOB_BRACE);