[geeklog-cvs] Auth_Enterprise/Client AEXMLRPCClient.class.php,1.5,1.6

tony at iowaoutdoors.org tony at iowaoutdoors.org
Thu Jun 24 17:56:28 EDT 2004


Update of /var/cvs/Auth_Enterprise/Client
In directory www:/tmp/cvs-serv4055

Modified Files:
	AEXMLRPCClient.class.php 
Log Message:
Added SSL support (untested but doesn't flag errors)

Index: AEXMLRPCClient.class.php
===================================================================
RCS file: /var/cvs/Auth_Enterprise/Client/AEXMLRPCClient.class.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** AEXMLRPCClient.class.php	21 Jun 2004 04:58:22 -0000	1.5
--- AEXMLRPCClient.class.php	24 Jun 2004 21:56:26 -0000	1.6
***************
*** 71,77 ****
      *   - proxyPort int port on proxy to talk over, OPTIONAL
      *   - proxyUser string username to authentication to proxy with, OPTIONAL
!     *   - proxyPassword password password to authenticate to proxy with, OPTIONAL
      *   - xmlrpc_interface string Can be PEAR or PHP.  PHP requires PHP to be compiled
      *   --with-xmlrpc OPTIONAL
      *
      * @author Tony Bibbs <tony at geeklog.net>
--- 71,79 ----
      *   - proxyPort int port on proxy to talk over, OPTIONAL
      *   - proxyUser string username to authentication to proxy with, OPTIONAL
!     *   - proxyPassword string password to authenticate to proxy with, OPTIONAL
!     *   - server_method string Can be http or https, http is default, OPTIONAL
      *   - xmlrpc_interface string Can be PEAR or PHP.  PHP requires PHP to be compiled
      *   --with-xmlrpc OPTIONAL
+     *   
      *
      * @author Tony Bibbs <tony at geeklog.net>
***************
*** 90,93 ****
--- 92,106 ----
          }
          
+         // Cache options for later use
+         $this->options = $options;
+         
+         // Default server method to use http
+         if (strtolower($options['server_method']) <> 'http' AND strtolower($options['server_method'] <> 'https')) {
+             $this->options['server_method'] = 'http';
+         } else {
+             // Just in case it matters (which it probably doesn't) set method to lower case.
+             $this->options['server_method'] = strtolower($this->options['server_method']);
+         }
+         
          // Call constructor of parent
          try {
***************
*** 125,129 ****
                  , new XML_RPC_Value($userName, 'string')
                  , new XML_RPC_Value($password, 'string')));
!         $response = $this->XMLRPCClient->send($xmlRequest);
          
          // If we got a fault, throw an exception back to the calling
--- 138,142 ----
                  , 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
***************
*** 182,186 ****
                  , new XML_RPC_Value($userName, 'string')
                  , new XML_RPC_Value($password, 'string')));
!         $response = $this->_XMLRPCClient->send($xmlRequest);
          // If we got a fault, throw an exception back to the calling
          // application
--- 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
***************
*** 206,210 ****
                  , new XML_RPC_Value($userName, 'string')
                  , new XML_RPC_Value($newPassword, 'string')));
!         $response = $this->_XMLRPCClient->send($xmlRequest);
          // 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
***************
*** 231,235 ****
                  , new XML_RPC_Value($userName, 'string')
                  , new XML_RPC_Value($newPassword, 'string')));
!         $response = $this->_XMLRPCClient->send($xmlRequest);
          // 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
***************
*** 252,256 ****
                  , new XML_RPC_Value($this->getAppId(), 'string')
                  , new XML_RPC_Value($userName, 'string')));
!         $response = $this->_XMLRPCClient->send($xmlRequest);
          // 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
***************
*** 277,281 ****
                  , new XML_RPC_Value($adminPassword, 'string')
                  , new XML_RPC_Value($userName, 'string')));
!         $response = $this->_XMLRPCClient->send($xmlRequest);
          // 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
***************
*** 303,307 ****
                  , new XML_RPC_Value($userName, 'string')
                  , new XML_RPC_Value($privArray, 'array')));
!         $response = $this->_XMLRPCClient->send($xmlRequest);
          // 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
***************
*** 325,329 ****
                  , new XML_RPC_Value($adminUserName, 'string')
                  , new XML_RPC_Value($adminPassword, 'string')));
!         $response = $this->_XMLRPCClient->send($xmlRequest);
          // 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
***************
*** 350,354 ****
                  , new XML_RPC_Value($adminPassword, 'string')
                  , new XML_RPC_Value($userName, 'string')));
!         $response = $this->_XMLRPCClient->send($xmlRequest);
          // 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
***************
*** 376,380 ****
                  , new XML_RPC_Value($userName, 'string')
                  , new XML_RPC_Value($groupArray, 'array')));
!         $response = $this->_XMLRPCClient->send($xmlRequest);
          // 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




More information about the geeklog-cvs mailing list