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

Improvement in the proxy settings

Browse Source
This commit is contained in:
Julio Cesar Laura
2012-10-08 18:01:45 -04:00
parent 3887fd35a4
commit 35dedce572
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
workflow/engine/classes/class.processes.php
View File

@@ -3353,10 +3353,10 @@ class Processes {
$params = array('userid'=>$user, 'password'=>$pass ); $params = array('userid'=>$user, 'password'=>$pass );
$result = $client->__SoapCall('login', array($params)); $result = $client->__SoapCall('login', array($params));
if ( $result->status_code == 0 ) { if ( $result->status_code == 0 ) {
$sessionId = $result->message; $sessionId = $result->getMessage();
return 1; return 1;
} }
throw ( new Exception ( $result->message ) ); throw ( new Exception ( $result->getMessage() ) );
return 1; return 1;
} }
@@ -3390,7 +3390,7 @@ class Processes {
} }
$client = @new SoapClient($endpoint, $proxy); $client = @new SoapClient($endpoint, $proxy);
} catch (Exception $e) { } catch (Exception $e) {
throw ( new Exception ( $e->message ) ); throw ( new Exception ( $e->getMessage() ) );
} }
@@ -3428,7 +3428,7 @@ class Processes {
if ( $result->status_code == 0 ) { if ( $result->status_code == 0 ) {
return $result; return $result;
} }
throw ( new Exception ( $result->message ) ); throw ( new Exception ( $result->getMessage() ) );
} }
/** /**
@@ -3497,7 +3497,7 @@ class Processes {
if ( $result->status_code == 0 ) { if ( $result->status_code == 0 ) {
return $result; return $result;
} }
throw ( new Exception ( $result->message ) ); throw ( new Exception ( $result->getMessage() ) );
} }
/** /**

4
workflow/engine/classes/class.system.php
View File

@@ -1010,10 +1010,6 @@ class System {
if ($_SESSION['PROCESSMAKER_ENV_HASH'] === $hash) { if ($_SESSION['PROCESSMAKER_ENV_HASH'] === $hash) {
$_SESSION['PROCESSMAKER_ENV']['from_cache'] = 1; $_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']; return $_SESSION['PROCESSMAKER_ENV'];
} }
} }