dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use the new config class in the domains and schema classes.

This commit is contained in:
markjcrane 2015-11-27 19:59:50 -07:00
parent 82e602e93a
commit 1691c3e5f0
3 changed files with 43 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
resources/classes/config.php
View File

@ -67,17 +67,21 @@ class config {
* @var string $config_path - full path to the config.php file * @var string $config_path - full path to the config.php file
*/ */
public function find() { public function find() {
if (file_exists($_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/resources/config.php")) { //get the PROJECT PATH
$this->config_path = $_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/resources/config.php"; include "root.php";
} elseif (file_exists("/etc/fusionpbx/config.php")) { // find the file
$this->config_path = "/etc/fusionpbx/config.php"; if (file_exists($_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/resources/config.php")) {
} elseif (file_exists("/usr/local/etc/fusionpbx/config.php")) { $this->config_path = $_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/resources/config.php";
$this->config_path = "/usr/local/etc/fusionpbx/config.php"; } elseif (file_exists("/etc/fusionpbx/config.php")) {
} $this->config_path = "/etc/fusionpbx/config.php";
else { } elseif (file_exists("/usr/local/etc/fusionpbx/config.php")) {
$this->config_path = ''; $this->config_path = "/usr/local/etc/fusionpbx/config.php";
} }
return $this->config_path; else {
$this->config_path = '';
}
//return the path
return $this->config_path;
} }
/** /**

15
resources/classes/domains.php
View File

@ -215,7 +215,20 @@
public function upgrade() { public function upgrade() {
//set the global variable //set the global variable
global $db, $db_type, $db_name, $db_username, $db_password, $db_host, $db_path, $db_port; global $db;
//get the db variables
$config = new config;
$config_exists = $config->exists();
$config_path = $config->find();
$config->get();
$db_type = $config->db_type;
$db_name = $config->db_name;
$db_username = $config->db_username;
$db_password = $config->db_password;
$db_host = $config->db_host;
$db_path = $config->db_path;
$db_port = $config->db_port;
//get the PROJECT PATH //get the PROJECT PATH
include "root.php"; include "root.php";

16
resources/classes/schema.php
View File

@ -448,8 +448,20 @@ include "root.php";
public function schema ($format) { public function schema ($format) {
//set the global variable //set the global variable
global $db, $db_type, $db_name, $db_username, $db_password; global $db, $upgrade_data_types, $text;
global $db_host, $db_path, $db_port, $upgrade_data_types, $text;
//get the db variables
$config = new config;
$config_exists = $config->exists();
$config_path = $config->find();
$config->get();
$db_type = $config->db_type;
$db_name = $config->db_name;
$db_username = $config->db_username;
$db_password = $config->db_password;
$db_host = $config->db_host;
$db_path = $config->db_path;
$db_port = $config->db_port;
//get the PROJECT PATH //get the PROJECT PATH
include "root.php"; include "root.php";