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

PM-2812: I use port only when exist

Browse Source
This commit is contained in:
Paula V. Quispe
2015-05-26 09:17:10 -04:00
parent 2f082f096c
commit 8a5e823b0e
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
workflow/engine/classes/class.wsTools.php
View File

@@ -1359,18 +1359,25 @@ class workspaceTools
if ( !$flag && !is_null($flagFunction) ) { if ( !$flag && !is_null($flagFunction) ) {
$aHost = explode(':',$parameters['dbHost']); $aHost = explode(':',$parameters['dbHost']);
$dbHost = $aHost[0]; $dbHost = $aHost[0];
$dbPort = '3306';
if(isset($aHost[1])){ if(isset($aHost[1])){
$dbPort = $aHost[1]; $dbPort = $aHost[1];
$command = 'mysql'
. ' --host=' . $dbHost
. ' --port=' . $dbPort
. ' --user=' . $parameters['dbUser']
. ' --password=' . str_replace('"', '\"', str_replace("'", "\'", quotemeta($parameters['dbPass'])))//no change! supports the type passwords: .\+*?[^]($)'"\"'
. ' --database=' . mysql_real_escape_string($database)
. ' --default_character_set utf8'
. ' --execute="SOURCE '.$filename.'"';
}else{
$command = 'mysql'
. ' --host=' . $dbHost
. ' --user=' . $parameters['dbUser']
. ' --password=' . str_replace('"', '\"', str_replace("'", "\'", quotemeta($parameters['dbPass'])))//no change! supports the type passwords: .\+*?[^]($)'"\"'
. ' --database=' . mysql_real_escape_string($database)
. ' --default_character_set utf8'
. ' --execute="SOURCE '.$filename.'"';
} }
$command = 'mysql'
. ' --host=' . $dbHost
. ' --port=' . $dbPort
. ' --user=' . $parameters['dbUser']
. ' --password=' . str_replace('"', '\"', str_replace("'", "\'", quotemeta($parameters['dbPass'])))//no change! supports the type passwords: .\+*?[^]($)'"\"'
. ' --database=' . mysql_real_escape_string($database)
. ' --default_character_set utf8'
. ' --execute="SOURCE '.$filename.'"';
shell_exec($command); shell_exec($command);
} else { } else {
//If the safe mode of the server is actived //If the safe mode of the server is actived
@@ -1631,7 +1638,7 @@ class workspaceTools
} }
list ($dbHost, $dbUser, $dbPass) = @explode(SYSTEM_HASH, G::decrypt(HASH_INSTALLATION, SYSTEM_HASH)); list ($dbHost, $dbUser, $dbPass) = @explode(SYSTEM_HASH, G::decrypt(HASH_INSTALLATION, SYSTEM_HASH));
if($port != ''){ if($port != ''){
$dbHost = $dbHost.$port; $dbHost = $dbHost.$port; //127.0.0.1:3306
} }
$aParameters = array('dbHost'=>$dbHost,'dbUser'=>$dbUser,'dbPass'=>$dbPass); $aParameters = array('dbHost'=>$dbHost,'dbUser'=>$dbUser,'dbPass'=>$dbPass);
CLI::logging("> Connecting to system database in '$dbHost'\n"); CLI::logging("> Connecting to system database in '$dbHost'\n");