From 35dedce5728e2c57fb73ca695fa76c87ae68c85d Mon Sep 17 00:00:00 2001 From: Julio Cesar Laura Date: Mon, 8 Oct 2012 18:01:45 -0400 Subject: [PATCH 1/2] Improvement in the proxy settings --- workflow/engine/classes/class.processes.php | 10 +++++----- workflow/engine/classes/class.system.php | 4 ---- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/workflow/engine/classes/class.processes.php b/workflow/engine/classes/class.processes.php index 0736c23c9..ca04b4ea0 100755 --- a/workflow/engine/classes/class.processes.php +++ b/workflow/engine/classes/class.processes.php @@ -3353,10 +3353,10 @@ class Processes { $params = array('userid'=>$user, 'password'=>$pass ); $result = $client->__SoapCall('login', array($params)); if ( $result->status_code == 0 ) { - $sessionId = $result->message; + $sessionId = $result->getMessage(); return 1; } - throw ( new Exception ( $result->message ) ); + throw ( new Exception ( $result->getMessage() ) ); return 1; } @@ -3390,7 +3390,7 @@ class Processes { } $client = @new SoapClient($endpoint, $proxy); } catch (Exception $e) { - throw ( new Exception ( $e->message ) ); + throw ( new Exception ( $e->getMessage() ) ); } @@ -3428,7 +3428,7 @@ class Processes { if ( $result->status_code == 0 ) { return $result; } - throw ( new Exception ( $result->message ) ); + throw ( new Exception ( $result->getMessage() ) ); } /** @@ -3497,7 +3497,7 @@ class Processes { if ( $result->status_code == 0 ) { return $result; } - throw ( new Exception ( $result->message ) ); + throw ( new Exception ( $result->getMessage() ) ); } /** diff --git a/workflow/engine/classes/class.system.php b/workflow/engine/classes/class.system.php index bd69f2628..2b157b717 100755 --- a/workflow/engine/classes/class.system.php +++ b/workflow/engine/classes/class.system.php @@ -1010,10 +1010,6 @@ class System { if ($_SESSION['PROCESSMAKER_ENV_HASH'] === $hash) { $_SESSION['PROCESSMAKER_ENV']['from_cache'] = 1; - if (!isset($_SESSION['PROCESSMAKER_ENV']['proxy_pass'])) { - $_SESSION['PROCESSMAKER_ENV']['proxy_pass'] = ''; - } - $_SESSION['PROCESSMAKER_ENV']['proxy_pass'] = G::decrypt($_SESSION['PROCESSMAKER_ENV']['proxy_pass'], 'proxy_pass'); return $_SESSION['PROCESSMAKER_ENV']; } } From 0f169d391b0024d672ddac7b6979caae9a265820 Mon Sep 17 00:00:00 2001 From: Julio Cesar Laura Date: Mon, 8 Oct 2012 18:20:37 -0400 Subject: [PATCH 2/2] Improvement in the proxy settings --- workflow/engine/classes/class.processes.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/workflow/engine/classes/class.processes.php b/workflow/engine/classes/class.processes.php index ca04b4ea0..9acd9ea59 100755 --- a/workflow/engine/classes/class.processes.php +++ b/workflow/engine/classes/class.processes.php @@ -3353,10 +3353,10 @@ class Processes { $params = array('userid'=>$user, 'password'=>$pass ); $result = $client->__SoapCall('login', array($params)); if ( $result->status_code == 0 ) { - $sessionId = $result->getMessage(); + $sessionId = $result->message; return 1; } - throw ( new Exception ( $result->getMessage() ) ); + throw ( new Exception ( $result->message ) ); return 1; } @@ -3428,7 +3428,7 @@ class Processes { if ( $result->status_code == 0 ) { return $result; } - throw ( new Exception ( $result->getMessage() ) ); + throw ( new Exception ( $result->message ) ); } /** @@ -3497,7 +3497,7 @@ class Processes { if ( $result->status_code == 0 ) { return $result; } - throw ( new Exception ( $result->getMessage() ) ); + throw ( new Exception ( $result->message ) ); } /**