From 8a5e823b0eabdec35ae6099554853b4169aee824 Mon Sep 17 00:00:00 2001
From: "Paula V. Quispe" <paula.quispe@colosa.com>
Date: Tue, 26 May 2015 09:17:10 -0400
Subject: [PATCH] PM-2812: I use port only when exist

---
 workflow/engine/classes/class.wsTools.php | 29 ++++++++++++++---------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php
index 36bb6a449..098598a99 100755
--- a/workflow/engine/classes/class.wsTools.php
+++ b/workflow/engine/classes/class.wsTools.php
@@ -1359,18 +1359,25 @@ class workspaceTools
         if ( !$flag && !is_null($flagFunction) ) {
             $aHost = explode(':',$parameters['dbHost']);
             $dbHost = $aHost[0];
-            $dbPort = '3306';
             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);
         } else {
             //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));
             if($port != ''){
-               $dbHost = $dbHost.$port;
+               $dbHost = $dbHost.$port; //127.0.0.1:3306
             }
             $aParameters = array('dbHost'=>$dbHost,'dbUser'=>$dbUser,'dbPass'=>$dbPass);
             CLI::logging("> Connecting to system database in '$dbHost'\n");