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

BUG 12676 Workspace Restore action from ./processmaker is not working with strange characters IMPROVEMENT

Browse Source
This commit is contained in:
Julio Cesar Laura
2013-08-21 16:59:33 -04:00
parent 5dbf3f76fe
commit 6c92b92cd1
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1060,19 +1060,20 @@ class workspaceTools
private function executeSQLScript($database, $filename, $parameters) private function executeSQLScript($database, $filename, $parameters)
{ {
mysql_query("CREATE DATABASE IF NOT EXISTS " . mysql_real_escape_string($database)); mysql_query("CREATE DATABASE IF NOT EXISTS " . mysql_real_escape_string($database));
// Check for safe mode and if mysql exist on server // Check for safe mode and if mysql exist on server
$flagFunction = ''; $flagFunction = '';
if ( !ini_get('safe_mode') ) { if ( !ini_get('safe_mode') ) {
$flagFunction = shell_exec('mysql --version'); $flagFunction = shell_exec('mysql --version');
} }
if ( !ini_get('safe_mode') && !is_null($flagFunction) ) { if ( !ini_get('safe_mode') && !is_null($flagFunction) ) {
$command = 'mysql' $command = 'mysql'
. ' --host=' . $parameters['dbHost'] . ' --host=' . $parameters['dbHost']
. ' --user=' . $parameters['dbUser'] . ' --user=' . $parameters['dbUser']
. ' --password=' . $parameters['dbPass'] . ' --password=' . $parameters['dbPass']
. ' --database=' . mysql_real_escape_string($database) . ' --database=' . mysql_real_escape_string($database)
. ' --default_character_set utf8'
. ' --execute="SOURCE '.$filename.'"'; . ' --execute="SOURCE '.$filename.'"';
shell_exec($command); shell_exec($command);
@@ -1081,7 +1082,7 @@ class workspaceTools
try { try {
mysql_select_db($database); mysql_select_db($database);
$script = file_get_contents($filename); $script = file_get_contents($filename);
$lines = explode(";\n", $script); $lines = explode(";\n", $script);
$previous = null; $previous = null;
foreach ($lines as $j => $line) { foreach ($lines as $j => $line) {
@@ -1113,9 +1114,9 @@ class workspaceTools
} catch (Exception $e) { } catch (Exception $e) {
CLI::logging(CLI::error("Error:" . "There are problems running script '$filename': " . $e)); CLI::logging(CLI::error("Error:" . "There are problems running script '$filename': " . $e));
} }
} }
} }