nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2026-01-06 11:43:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

simplified the create database options

Browse Source
This commit is contained in:
Matthew Vale
2015-12-01 10:33:51 +00:00
parent db1e53296e
commit 4ea9c8abc3
2 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/install/resources/classes/install_fusionpbx.php
View File

@@ -54,7 +54,8 @@ include "root.php";
public $db_name;
public $db_username;
public $db_password;
public $db_create_option = 'none';
public $db_create;
public $db_create_reuse_auth;
public $db_create_username;
public $db_create_password;
@@ -203,11 +204,10 @@ include "root.php";
protected function create_database() {
require $this->config_php;
$this->write_progress("Creating database as " . $this->db_type);
if($this->create_db_option == 'same')
if($this->db_create_reuse_auth)
{
$this->create_db_option = 'user';
$this->create_db_username = $this->db_username;
$this->create_db_password = $this->db_username_password;
$this->db_create_username = $this->db_username;
$this->db_create_password = $this->db_username_password;
}
$function = "create_database_" . $this->db_type;
$this->$function();
@@ -294,7 +294,7 @@ include "root.php";
}
protected function create_database_pgsql() {
if ($this->db_create_option == 'user') {
if ($this->db_create) {
//Attempt to create new PG role and database
try {
if (strlen($this->db_port) == 0) { $this->db_port = "5432"; }
@@ -371,7 +371,7 @@ include "root.php";
$connect_string = '';
$connect_username = $this->db_username;
$connect_password = $this->db_password;
if ($this->db_create_option == 'user') {
if ($this->db_create) {
$connect_username = $this->db_create_username;
$connect_password = $this->db_create_password;
}
@@ -395,7 +395,7 @@ include "root.php";
}
//create the table, user and set the permissions only if the db_create_username was provided
if ($this->db_create_option == 'user') {
if ($this->db_create) {
//select the mysql database
try {
$this->dbh->query("USE mysql;");