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

Fix. Load Message class (#2585)

Browse Source 
Fix. Use correct way to get text message.
Fix. Use `Database Username` to create database if no `Create Database Username` specified.
This commit is contained in:
Alexey Melnichuk
2017-05-18 08:43:43 -06:00
committed by FusionPBX
parent dbf3d7ab08
commit a75d89ef73
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/install/install.php
+2 -1
View File
@@ -28,6 +28,7 @@
require_once "root.php"; require_once "root.php";
require_once "resources/functions.php"; require_once "resources/functions.php";
require_once "resources/classes/text.php"; require_once "resources/classes/text.php";
require_once "resources/classes/messages.php";
//start a php session //start a php session
if (!isset($_SESSION)) { session_start(); } if (!isset($_SESSION)) { session_start(); }
@@ -257,7 +258,7 @@
include "resources/page_parts/install_config_database.php"; include "resources/page_parts/install_config_database.php";
} }
elseif($install_step == 'execute'){ elseif($install_step == 'execute'){
echo "<p><b>".$text['header-installing'][$install_language]."</b></p>\n"; echo "<p><b>".$text['header-installing']."</b></p>\n";
//$protocol = 'http'; //$protocol = 'http';
//if($_SERVER['HTTPS']) { $protocol = 'https'; } //if($_SERVER['HTTPS']) { $protocol = 'https'; }
//echo "<iframe src='$protocol://$domain_name/core/install/install_first_time.php' style='border:solid 1px #000;width:100%;height:auto'></iframe>"; //echo "<iframe src='$protocol://$domain_name/core/install/install_first_time.php' style='border:solid 1px #000;width:100%;height:auto'></iframe>";
core/install/resources/classes/global_settings.php
-4
View File
@@ -194,10 +194,6 @@ require_once "root.php";
$this->$o_key = $value; $this->$o_key = $value;
} }
} }
if($this->_db_create== 1) {
if (strlen($this->_db_create_username)==0) $this->_db_create_username='root';
if (strlen($this->_db_create_password)==0) $this->_db_password;
}
if (strlen($this->_db_port) == 0) { $this->_db_port = "5432"; } if (strlen($this->_db_port) == 0) { $this->_db_port = "5432"; }
// domain info // domain info