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

db_create not create_db 

corrected version detection
corrected constant
This commit is contained in:
Matthew Vale 2015-12-01 10:23:24 +00:00
parent d305dd2f79
commit db1e53296e
4 changed files with 119 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/install/resources/classes/detect_switch.php
View File

@ -125,7 +125,7 @@ require_once "resources/classes/EventSocket.php";
throw new Exception('Failed to use event socket'); throw new Exception('Failed to use event socket');
} }
$FS_Version = $this->event_socket_request('api version'); $FS_Version = $this->event_socket_request('api version');
preg_match("/FreeSWITCH Version (\d+)\.(\d+)\.(\d(?:\.\d+)?)$/", $FS_Version, $matches); preg_match("/FreeSWITCH Version (\d+)\.(\d+)\.(\d+(?:\.\d+)?)/", $FS_Version, $matches);
$this->_major = $matches[1]; $this->_major = $matches[1];
$this->_minor = $matches[2]; $this->_minor = $matches[2];
$this->_build = $matches[3]; $this->_build = $matches[3];

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

@ -294,7 +294,6 @@ include "root.php";
} }
protected function create_database_pgsql() { protected function create_database_pgsql() {
if ($this->db_create_option == 'user') { if ($this->db_create_option == 'user') {
//Attempt to create new PG role and database //Attempt to create new PG role and database
try { try {

6
core/install/resources/page_parts/install_config_database.php
View File

@ -242,13 +242,13 @@
echo " Create Database Options\n"; echo " Create Database Options\n";
echo "</td>\n"; echo "</td>\n";
echo "<td class='vtable' align='left'>\n"; echo "<td class='vtable' align='left'>\n";
echo " <label class='radio'><input type='radio' name='create_db_option' value='none'"; echo " <label class='radio'><input type='radio' name='db_create_option' value='none'";
if($db_create_option=='none') { echo " checked='checked'"; } if($db_create_option=='none') { echo " checked='checked'"; }
echo "/>Do not create database</label>\n"; echo "/>Do not create database</label>\n";
echo " <label class='radio'><input type='radio' name='create_db_option' value='same'"; echo " <label class='radio'><input type='radio' name='db_create_option' value='same'";
if($db_create_option=='same') { echo " checked='checked'"; } if($db_create_option=='same') { echo " checked='checked'"; }
echo "/>Create database using above username/password</label>\n"; echo "/>Create database using above username/password</label>\n";
echo " <label class='radio'><input type='radio' name='create_db_option' value='user'"; echo " <label class='radio'><input type='radio' name='db_create_option' value='user'";
if($db_create_option=='user') { echo " checked='checked'"; } if($db_create_option=='user') { echo " checked='checked'"; }
echo "/>Create database using below username/password</label>\n"; echo "/>Create database using below username/password</label>\n";
echo "<br />\n"; echo "<br />\n";

2
resources/functions.php
View File

@ -602,7 +602,7 @@
if ( !function_exists('normalize_path')) { if ( !function_exists('normalize_path')) {
function normalize_path($path) { function normalize_path($path) {
return str_replace(DIRECTORY_SEPERATOR, '\\', $path); return str_replace(DIRECTORY_SEPARATOR, '\\', $path);
} }
} }