[geeklog-cvs] Auth_Enterprise/Client AEXMLRPCClient.class.php,1.6,1.7
tony at iowaoutdoors.org
tony at iowaoutdoors.org
Thu Jul 1 14:42:45 EDT 2004
Update of /var/cvs/Auth_Enterprise/Client
In directory www:/tmp/cvs-serv20739
Modified Files:
AEXMLRPCClient.class.php
Log Message:
Fixed bad reference to the client provider and added more exceptions that can be successfully caught from the XMLRPC call
Index: AEXMLRPCClient.class.php
===================================================================
RCS file: /var/cvs/Auth_Enterprise/Client/AEXMLRPCClient.class.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** AEXMLRPCClient.class.php 24 Jun 2004 21:56:26 -0000 1.6
--- AEXMLRPCClient.class.php 1 Jul 2004 18:42:43 -0000 1.7
***************
*** 135,139 ****
$xmlRequest = new XML_RPC_Message('Auth_Enterprise.processRequest'
, array(new XML_RPC_Value('authenticate','string')
! , new XML_RPC_Value($this->appId, 'string')
, new XML_RPC_Value($userName, 'string')
, new XML_RPC_Value($password, 'string')));
--- 135,139 ----
$xmlRequest = new XML_RPC_Message('Auth_Enterprise.processRequest'
, array(new XML_RPC_Value('authenticate','string')
! , new XML_RPC_Value($this->getAppId(), 'string')
, new XML_RPC_Value($userName, 'string')
, new XML_RPC_Value($password, 'string')));
***************
*** 144,148 ****
if ($response->faultCode()) {
try {
! throw $this->faultToException($response->faultCode(), $response->faultString());
} catch (AEBaseException $e) {
throw $e;
--- 144,149 ----
if ($response->faultCode()) {
try {
! $e = $this->faultToException($response->faultCode(), $response->faultString());
! throw $e;
} catch (AEBaseException $e) {
throw $e;
***************
*** 195,199 ****
, new XML_RPC_Value($userName, 'string')
, new XML_RPC_Value($password, 'string')));
! $response = $this->_XMLRPCClient->send($xmlRequest, 0, $this->options['server_method']);
// If we got a fault, throw an exception back to the calling
// application
--- 196,200 ----
, new XML_RPC_Value($userName, 'string')
, new XML_RPC_Value($password, 'string')));
! $response = $this->XMLRPCClient->send($xmlRequest, 0, $this->options['server_method']);
// If we got a fault, throw an exception back to the calling
// application
***************
*** 219,223 ****
, new XML_RPC_Value($userName, 'string')
, new XML_RPC_Value($newPassword, 'string')));
! $response = $this->_XMLRPCClient->send($xmlRequest, 0, $this->options['server_method']);
// If we got a fault, throw an exception back to the calling
// application
--- 220,224 ----
, new XML_RPC_Value($userName, 'string')
, new XML_RPC_Value($newPassword, 'string')));
! $response = $this->XMLRPCClient->send($xmlRequest, 0, $this->options['server_method']);
// If we got a fault, throw an exception back to the calling
// application
***************
*** 244,248 ****
, new XML_RPC_Value($userName, 'string')
, new XML_RPC_Value($newPassword, 'string')));
! $response = $this->_XMLRPCClient->send($xmlRequest, 0, $this->options['server_method']);
// If we got a fault, throw an exception back to the calling
// application
--- 245,249 ----
, new XML_RPC_Value($userName, 'string')
, new XML_RPC_Value($newPassword, 'string')));
! $response = $this->XMLRPCClient->send($xmlRequest, 0, $this->options['server_method']);
// If we got a fault, throw an exception back to the calling
// application
***************
*** 265,269 ****
, new XML_RPC_Value($this->getAppId(), 'string')
, new XML_RPC_Value($userName, 'string')));
! $response = $this->_XMLRPCClient->send($xmlRequest, 0, $this->options['server_method']);
// If we got a fault, throw an exception back to the calling
// application
--- 266,270 ----
, new XML_RPC_Value($this->getAppId(), 'string')
, new XML_RPC_Value($userName, 'string')));
! $response = $this->XMLRPCClient->send($xmlRequest, 0, $this->options['server_method']);
// If we got a fault, throw an exception back to the calling
// application
***************
*** 290,294 ****
, new XML_RPC_Value($adminPassword, 'string')
, new XML_RPC_Value($userName, 'string')));
! $response = $this->_XMLRPCClient->send($xmlRequest, 0, $this->options['server_method']);
// If we got a fault, throw an exception back to the calling
// application
--- 291,295 ----
, new XML_RPC_Value($adminPassword, 'string')
, new XML_RPC_Value($userName, 'string')));
! $response = $this->XMLRPCClient->send($xmlRequest, 0, $this->options['server_method']);
// If we got a fault, throw an exception back to the calling
// application
***************
*** 316,320 ****
, new XML_RPC_Value($userName, 'string')
, new XML_RPC_Value($privArray, 'array')));
! $response = $this->_XMLRPCClient->send($xmlRequest, 0, $this->options['server_method']);
// If we got a fault, throw an exception back to the calling
// application
--- 317,321 ----
, new XML_RPC_Value($userName, 'string')
, new XML_RPC_Value($privArray, 'array')));
! $response = $this->XMLRPCClient->send($xmlRequest, 0, $this->options['server_method']);
// If we got a fault, throw an exception back to the calling
// application
***************
*** 338,342 ****
, new XML_RPC_Value($adminUserName, 'string')
, new XML_RPC_Value($adminPassword, 'string')));
! $response = $this->_XMLRPCClient->send($xmlRequest, 0, $this->options['server_method']);
// If we got a fault, throw an exception back to the calling
// application
--- 339,343 ----
, new XML_RPC_Value($adminUserName, 'string')
, new XML_RPC_Value($adminPassword, 'string')));
! $response = $this->XMLRPCClient->send($xmlRequest, 0, $this->options['server_method']);
// If we got a fault, throw an exception back to the calling
// application
***************
*** 363,367 ****
, new XML_RPC_Value($adminPassword, 'string')
, new XML_RPC_Value($userName, 'string')));
! $response = $this->_XMLRPCClient->send($xmlRequest, 0, $this->options['server_method']);
// If we got a fault, throw an exception back to the calling
// application
--- 364,368 ----
, new XML_RPC_Value($adminPassword, 'string')
, new XML_RPC_Value($userName, 'string')));
! $response = $this->XMLRPCClient->send($xmlRequest, 0, $this->options['server_method']);
// If we got a fault, throw an exception back to the calling
// application
***************
*** 389,393 ****
, new XML_RPC_Value($userName, 'string')
, new XML_RPC_Value($groupArray, 'array')));
! $response = $this->_XMLRPCClient->send($xmlRequest, 0, $this->options['server_method']);
// If we got a fault, throw an exception back to the calling
// application
--- 390,394 ----
, new XML_RPC_Value($userName, 'string')
, new XML_RPC_Value($groupArray, 'array')));
! $response = $this->XMLRPCClient->send($xmlRequest, 0, $this->options['server_method']);
// If we got a fault, throw an exception back to the calling
// application
***************
*** 464,468 ****
throw new AEInsufficientClientOptions($faultMessage);
break;
! case defaut:
throw new Exception($faultMessage);
--- 465,478 ----
throw new AEInsufficientClientOptions($faultMessage);
break;
! case AENoProviderResp:
! throw new AENoProvider($faultMessage);
! break;
! case AELDAPBindErrorResp:
! throw new AELDAPBindError($faultMessage);
! break;
! case AENoAppIdResp:
! throw new AENoAppId($faultMessage);
! break;
! default:
throw new Exception($faultMessage);
More information about the geeklog-cvs
mailing list