fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/3.0.1.7' into 3.0.1.7-Gmail

Browse Source
This commit is contained in:
Dante
2015-12-09 09:38:40 -04:00
parent 1c15339798 8ac05c8f53
commit 7297f20dd9
41 changed files with 378 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
workflow/engine/controllers/installer.php
View File

@@ -780,12 +780,14 @@ class Installer extends Controller
$this->installLog( G::LoadTranslation('ID_CREATING', SYS_LANG, Array($db_file) ));
file_put_contents( $db_file, $dbText );
/*----------------------------------********---------------------------------*/
//Generate the env.ini file
$envIniFile = $path_site . 'env.ini';
$content = 'system_utc_time_zone = 1' . "\n";
$this->installLog(G::LoadTranslation('ID_CREATING', SYS_LANG, [$envIniFile]));
file_put_contents($envIniFile, $content);
/*----------------------------------********---------------------------------*/
//Generate the databases.php file
$databases_file = $path_site . 'databases.php';
@@ -1240,6 +1242,10 @@ class Installer extends Controller
$db_hostname = $filter->validateInput($_REQUEST['db_hostname']);
$db_username = $filter->validateInput($_REQUEST['db_username']);
$db_password = $filter->validateInput($_REQUEST['db_password']);
$db_port = $filter->validateInput($_REQUEST['db_port']);
if($db_port != "3306"){
$db_hostname = $db_hostname.":".$db_port;
}
$link = @mysql_connect( $db_hostname, $db_username, $db_password );
$wfDatabase = $filter->validateInput($_REQUEST['wfDatabase'], 'nosql');
$query = "show databases like '%s' ";