From cb2e834dc17ddb49f7daf80959294f20d0b39022 Mon Sep 17 00:00:00 2001 From: dheeyi Date: Thu, 5 Mar 2015 12:20:19 -0400 Subject: [PATCH] =?UTF-8?q?PM-1485=200016744:=20In=20the=20BPMN=20Designer?= =?UTF-8?q?,=20can=20not=20connect=20to=20Oracle=20(and=20probably=20MS=20?= =?UTF-8?q?SQL)=20databases=20because=20no=20"Encode"=20options.=20Causa:?= =?UTF-8?q?=20Solo=20exisitia=20en=20el=20dise=C3=B1r=20anterior.=20Solici?= =?UTF-8?q?on:=20Se=20agrego=20esa=20funcionalidad=20al=20nuevo=20dise?= =?UTF-8?q?=C3=B1r.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- workflow/engine/classes/class.net.php | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/workflow/engine/classes/class.net.php b/workflow/engine/classes/class.net.php index 10dd46d50..78e3e2e0a 100755 --- a/workflow/engine/classes/class.net.php +++ b/workflow/engine/classes/class.net.php @@ -213,7 +213,15 @@ class NET } $stat = new Stat(); - $flagTns = (isset($arrayServerData["connectionType"]) && $arrayServerData["connectionType"] == "TNS")? 1 : 0; + if (array_key_exists("connectionType", $arrayServerData) || array_key_exists("DBS_TYPEORACLE", $arrayServerData)) { + if ($arrayServerData["connectionType"] == "TNS" || $arrayServerData["DBS_TYPEORACLE"] == "TNS") { + $flagTns=1; + }else{ + $flagTns=0; + } + }else{ + $flagTns=0; + } if (isset($this->db_user) && (isset($this->db_passwd) || $this->db_passwd == "") && (isset($this->db_sourcename) || $flagTns == 1)) { switch ($pDbDriver) { @@ -323,7 +331,15 @@ class NET set_time_limit( 0 ); $stat = new Stat(); - $flagTns = (isset($arrayServerData["connectionType"]) && $arrayServerData["connectionType"] == "TNS")? 1 : 0; + if (array_key_exists("connectionType", $arrayServerData) || array_key_exists("DBS_TYPEORACLE", $arrayServerData)) { + if ($arrayServerData["connectionType"] == "TNS" || $arrayServerData["DBS_TYPEORACLE"] == "TNS") { + $flagTns=1; + }else{ + $flagTns=0; + } + }else{ + $flagTns=0; + } if (isset($this->db_user) && (isset($this->db_passwd) || $this->db_passwd == "") && (isset($this->db_sourcename) || $flagTns == 1)) { switch ($pDbDriver) {