--- nusoap.php 2010-04-29 00:43:23.000000000 -0500
+++ nusoap.php.drupal 2007-11-06 10:00:36.000000000 -0600
@@ -51,13 +51,24 @@ http://www.nusphere.com
* RFC 2068 Hypertext Transfer Protocol -- HTTP/1.1
* RFC 2617 HTTP Authentication: Basic and Digest Access Authentication
*/
-
-/*
- *
- * This is a modified version of nusoap for usage of Axis2
- * for some reason it does not marshall the SOAP Body correct for Axis2 on Linux Platforms
- *
- */
+
+/* load classes
+
+// necessary classes
+require_once('class.soapclient.php');
+require_once('class.soap_val.php');
+require_once('class.soap_parser.php');
+require_once('class.soap_fault.php');
+
+// transport classes
+require_once('class.soap_transport_http.php');
+
+// optional add-on classes
+require_once('class.xmlschema.php');
+require_once('class.wsdl.php');
+
+// server class
+require_once('class.soap_server.php');*/
// class variable emulation
// cf. http://www.webkreator.com/php/techniques/php-static-class-variables.html
@@ -72,7 +83,7 @@ $GLOBALS['_transient']['static']['nusoap
* @version $Id: nusoap.php,v 1.114 2007/11/06 15:17:46 snichol Exp $
* @access public
*/
-class nusoap_base_om {
+class nusoap_base {
/**
* Identification for HTTP headers.
*
@@ -212,7 +223,7 @@ class nusoap_base_om {
*
* @access public
*/
- function nusoap_base_om() {
+ function nusoap_base() {
$this->debugLevel = $GLOBALS['_transient']['static']['nusoap_base']->globalDebugLevel;
}
@@ -275,7 +286,6 @@ class nusoap_base_om {
* @access public
*/
function appendDebug($string){
- //echo "## appendDebug: ".$string."
";
if ($this->debugLevel > 0) {
// it would be nice to use a memory stream here to use
// memory more efficiently
@@ -697,9 +707,6 @@ class nusoap_base_om {
}
$headers = "".$headers."";
}
- //echo "####
";
- //echo $body;
- //echo "
####
";
// serialize envelope
return
'soap_defencoding .'"?'.">".
@@ -894,7 +901,6 @@ class nusoap_base_om {
* @param boolean $utc Whether the time stamp is UTC or local
* @access public
*/
-/*
function timestamp_to_iso8601($timestamp,$utc=true){
$datestr = date('Y-m-d\TH:i:sO',$timestamp);
if($utc){
@@ -915,7 +921,7 @@ function timestamp_to_iso8601($timestamp
} else {
return $datestr;
}
-}*/
+}
/**
* convert ISO 8601 compliant date string to unix timestamp
@@ -923,7 +929,6 @@ function timestamp_to_iso8601($timestamp
* @param string $datestr ISO 8601 compliant date string
* @access public
*/
-/*
function iso8601_to_timestamp($datestr){
$eregStr =
'([0-9]{4})-'. // centuries & years CCYY-
@@ -953,7 +958,7 @@ function iso8601_to_timestamp($datestr){
} else {
return false;
}
-}*/
+}
/**
* sleeps some number of microseconds
@@ -962,7 +967,6 @@ function iso8601_to_timestamp($datestr){
* @access public
* @deprecated
*/
-/*
function usleepWindows($usec)
{
$start = gettimeofday();
@@ -975,7 +979,7 @@ function usleepWindows($usec)
}
while ($timePassed < $usec);
}
-*/
+
?>faultcode = $faultcode;
$this->faultactor = $faultactor;
$this->faultstring = $faultstring;
@@ -1060,7 +1064,7 @@ class nusoap_fault_om extends nusoap_bas
/**
* Backward compatibility
*/
-class soap_fault_om extends nusoap_fault_om {
+class soap_fault extends nusoap_fault {
}
?>debug('nusoap_xmlschema class instantiated, inside constructor');
// files
$this->schema = $schema;
@@ -1995,7 +1999,7 @@ class nusoap_xmlschema_om extends nusoap
/**
* Backward compatibility
*/
-class XMLSchema_om extends nusoap_xmlschema_om {
+class XMLSchema extends nusoap_xmlschema {
}
?>name = $name;
$this->type = $type;
$this->value = $value;
@@ -2115,7 +2119,7 @@ class soapval_om extends nusoap_base_om
* @version $Id: nusoap.php,v 1.114 2007/11/06 15:17:46 snichol Exp $
* @access public
*/
-class soap_transport_http_om extends nusoap_base_om {
+class soap_transport_http extends nusoap_base {
var $url = '';
var $uri = '';
@@ -2160,8 +2164,8 @@ class soap_transport_http_om extends nus
* @param boolean $use_curl Whether to try to force cURL use
* @access public
*/
- function soap_transport_http_om($url, $curl_options = NULL, $use_curl = false){
- parent::nusoap_base_om();
+ function soap_transport_http($url, $curl_options = NULL, $use_curl = false){
+ parent::nusoap_base();
$this->debug("ctor url=$url use_curl=$use_curl curl_options:");
$this->appendDebug($this->varDump($curl_options));
$this->setURL($url);
@@ -3076,9 +3080,9 @@ class soap_transport_http_om extends nus
curl_close($this->ch);
return false;
} else {
- ////echo '';
+ //echo '';
//var_dump(curl_getinfo($this->ch));
- ////echo '
';
+ //echo '
';
}
// close curl
$this->debug('No cURL error, closing cURL');
@@ -3418,7 +3422,7 @@ class soap_transport_http_om extends nus
* @version $Id: nusoap.php,v 1.114 2007/11/06 15:17:46 snichol Exp $
* @access public
*/
-class nusoap_server_om extends nusoap_base_om {
+class nusoap_server extends nusoap_base {
/**
* HTTP headers of request
* @var array
@@ -3575,8 +3579,8 @@ class nusoap_server_om extends nusoap_ba
* @param mixed $wsdl file path or URL (string), or wsdl instance (object)
* @access public
*/
- function nusoap_server_om($wsdl=false){
- parent::nusoap_base_om();
+ function nusoap_server($wsdl=false){
+ parent::nusoap_base();
// turn on debugging?
global $debug;
global $HTTP_SERVER_VARS;
@@ -4014,7 +4018,7 @@ class nusoap_server_om extends nusoap_ba
function serialize_return() {
$this->debug('Entering serialize_return methodname: ' . $this->methodname . ' methodURI: ' . $this->methodURI);
// if fault
- if (isset($this->methodreturn) && ((get_class($this->methodreturn) == 'soap_fault_om') || (get_class($this->methodreturn) == 'nusoap_fault_om'))) {
+ if (isset($this->methodreturn) && ((get_class($this->methodreturn) == 'soap_fault') || (get_class($this->methodreturn) == 'nusoap_fault'))) {
$this->debug('got a fault object from method');
$this->fault = $this->methodreturn;
return;
@@ -4381,7 +4385,7 @@ class nusoap_server_om extends nusoap_ba
if ($faultdetail == '' && $this->debug_flag) {
$faultdetail = $this->getDebug();
}
- $this->fault = new nusoap_fault_om($faultcode,$faultactor,$faultstring,$faultdetail);
+ $this->fault = new nusoap_fault($faultcode,$faultactor,$faultstring,$faultdetail);
$this->fault->soap_defencoding = $this->soap_defencoding;
}
@@ -4440,7 +4444,7 @@ class nusoap_server_om extends nusoap_ba
$schemaTargetNamespace = $namespace;
}
- $this->wsdl = new wsdl_om;
+ $this->wsdl = new wsdl;
$this->wsdl->serviceName = $serviceName;
$this->wsdl->endpoint = $endpoint;
$this->wsdl->namespaces['tns'] = $namespace;
@@ -4449,7 +4453,7 @@ class nusoap_server_om extends nusoap_ba
if ($schemaTargetNamespace != $namespace) {
$this->wsdl->namespaces['types'] = $schemaTargetNamespace;
}
- $this->wsdl->schemas[$schemaTargetNamespace][0] = new nusoap_xmlschema_om('', '', $this->wsdl->namespaces);
+ $this->wsdl->schemas[$schemaTargetNamespace][0] = new nusoap_xmlschema('', '', $this->wsdl->namespaces);
if ($style == 'document') {
$this->wsdl->schemas[$schemaTargetNamespace][0]->schemaInfo['elementFormDefault'] = 'qualified';
}
@@ -4471,7 +4475,7 @@ class nusoap_server_om extends nusoap_ba
/**
* Backward compatibility
*/
-class soap_server_om extends nusoap_server_om {
+class soap_server extends nusoap_server {
}
?>debug("ctor wsdl=$wsdl timeout=$timeout response_timeout=$response_timeout");
$this->proxyhost = $proxyhost;
$this->proxyport = $proxyport;
@@ -4682,7 +4686,7 @@ class wsdl_om extends nusoap_base_om {
if (isset($wsdl_props['scheme']) && ($wsdl_props['scheme'] == 'http' || $wsdl_props['scheme'] == 'https')) {
$this->debug('getting WSDL http(s) URL ' . $wsdl);
// get wsdl
- $tr = new soap_transport_http_om($wsdl, $this->curl_options, $this->use_curl);
+ $tr = new soap_transport_http($wsdl, $this->curl_options, $this->use_curl);
$tr->request_method = 'GET';
$tr->useSOAPAction = false;
if($this->proxyhost && $this->proxyport){
@@ -4781,7 +4785,7 @@ class wsdl_om extends nusoap_base_om {
$this->debug('Parsing WSDL schema');
// $this->debug("startElement for $name ($attrs[name]). status = $this->status (".$this->getLocalPart($name).")");
$this->status = 'schema';
- $this->currentSchema = new nusoap_xmlschema_om('', '', $this->namespaces);
+ $this->currentSchema = new nusoap_xmlschema('', '', $this->namespaces);
$this->currentSchema->schemaStartElement($parser, $name, $attrs);
$this->appendDebug($this->currentSchema->getDebug());
$this->currentSchema->clearDebug();
@@ -5581,11 +5585,6 @@ class wsdl_om extends nusoap_base_om {
*/
function serializeRPCParameters($operation, $direction, $parameters, $bindingType = 'soap') {
$this->debug("in serializeRPCParameters: operation=$operation, direction=$direction, XMLSchemaVersion=$this->XMLSchemaVersion, bindingType=$bindingType");
-
- //echo "in serializeRPCParameters: operation=$operation, direction=$direction, XMLSchemaVersion=$this->XMLSchemaVersion, bindingType=$bindingType"."
";
- //print_r($parameters);
- //echo "
";
-
$this->appendDebug('parameters=' . $this->varDump($parameters));
if ($direction != 'input' && $direction != 'output') {
@@ -5633,7 +5632,6 @@ class wsdl_om extends nusoap_base_om {
}
}
foreach ($parts as $name => $type) {
- //echo "serializing part $name of type $type"."
";
$this->debug("serializing part $name of type $type");
// Track encoding style
if (isset($opData[$direction]['encodingStyle']) && $encodingStyle != $opData[$direction]['encodingStyle']) {
@@ -5645,38 +5643,23 @@ class wsdl_om extends nusoap_base_om {
// NOTE: add error handling here
// if serializeType returns false, then catch global error and fault
if ($parametersArrayType == 'arraySimple') {
- //echo "arraySimple
";
$p = array_shift($parameters);
$this->debug('calling serializeType w/indexed param');
$xml .= $this->serializeType($name, $type, $p, $use, $enc_style);
} elseif (isset($parameters[$name])) {
- //echo "array SECOND
";
$this->debug('calling serializeType w/named param');
- //echo "PARAMS: ";
- //print_r ($parameters[$name]);
- //echo "
";
$xml .= $this->serializeType($name, $type, $parameters[$name], $use, $enc_style);
} else {
- //echo "array THIRD
";
// TODO: only send nillable
$this->debug('calling serializeType w/null param');
- //echo "PARAMS: ";
- //print_r ($parameters);
- //echo "
";
- //For some reason this does not work!! I am heavily (!) thinking about WHY the params here
- //are passed as NULL?! What should be the resulting XML if you pass NULL as paramlist?!?!?
- //seba.wagner at gmail dot com 2008/05/12
- //$xml .= $this->serializeType($name, $type, null, $use, $enc_style);
- $xml .= $this->serializeLinuxAxis2Type($name, $type, $parameters, $use, $enc_style);
+ $xml .= $this->serializeType($name, $type, null, $use, $enc_style);
}
- //echo "PART XML: ".htmlentities($xml)."
";
}
} else {
$this->debug('no parameters passed.');
}
}
$this->debug("serializeRPCParameters returning: $xml");
- //echo "
"."serializeRPCParameters returning: ".htmlentities($xml)."
";
return $xml;
}
@@ -5761,50 +5744,6 @@ class wsdl_om extends nusoap_base_om {
return $xml;
}
- function serializeLinuxAxis2Type($name, $type, $params, $use='encoded', $encodingStyle=false, $unqualified=false)
- {
- $xml = '';
- if (strpos($type, ':')) {
- $uqType = substr($type, strrpos($type, ':') + 1);
- $ns = substr($type, 0, strrpos($type, ':'));
- $this->debug("in serializeType: got a prefixed type: $uqType, $ns");
- if ($this->getNamespaceFromPrefix($ns)) {
- $ns = $this->getNamespaceFromPrefix($ns);
- $this->debug("in serializeType: expanded prefixed type: $uqType, $ns");
- }
-
- //echo "NameSpace: ".$ns."
";
- //echo "Method: ".$uqType."
";
- $methodName = substr($uqType,0,strlen($uqType)-1);
-
- //echo "Method: ".$methodName."
";
-
- $xml .= '<'.$methodName.' xmlns="'.$ns.'">';
-
- foreach ($params as $key => $val){
- //echo "Key".$key." Value".$val."
";
-
- $insertVal = $val;
-
- //If Boolean rewrite the Value
- if (is_bool($val)){
- if ($val) {
- $insertVal = "true";
- } else {
- $insertVal = "false";
- }
- }
- $xml .= '<'.$key.'>'.$insertVal.'';
- }
-
- $xml .= '';
-
- //echo htmlentities($xml)."
";
- return $xml;
- //
- }
-
- }
/**
* serializes a PHP value according a given type definition
*
@@ -5820,10 +5759,6 @@ class wsdl_om extends nusoap_base_om {
function serializeType($name, $type, $value, $use='encoded', $encodingStyle=false, $unqualified=false)
{
$this->debug("in serializeType: name=$name, type=$type, use=$use, encodingStyle=$encodingStyle, unqualified=" . ($unqualified ? "unqualified" : "qualified"));
- //echo "in serializeType: name=$name, type=$type, use=$use, encodingStyle=$encodingStyle, unqualified=" . ($unqualified ? "unqualified" : "qualified")."
";
-
- //echo "SerialieType: ".$type."
";
-
$this->appendDebug("value=" . $this->varDump($value));
if($use == 'encoded' && $encodingStyle) {
$encodingStyle = ' SOAP-ENV:encodingStyle="' . $encodingStyle . '"';
@@ -5831,7 +5766,6 @@ class wsdl_om extends nusoap_base_om {
// if a soapval has been supplied, let its type override the WSDL
if (is_object($value) && get_class($value) == 'soapval') {
- ////echo "IS OBJECT "."
";
if ($value->type_ns) {
$type = $value->type_ns . ':' . $value->type;
$forceType = true;
@@ -5863,9 +5797,6 @@ class wsdl_om extends nusoap_base_om {
$xml = '';
if (strpos($type, ':')) {
$uqType = substr($type, strrpos($type, ':') + 1);
-
- //echo "FIRST ### uqType: ".$uqType."
";
-
$ns = substr($type, 0, strrpos($type, ':'));
$this->debug("in serializeType: got a prefixed type: $uqType, $ns");
if ($this->getNamespaceFromPrefix($ns)) {
@@ -5873,7 +5804,6 @@ class wsdl_om extends nusoap_base_om {
$this->debug("in serializeType: expanded prefixed type: $uqType, $ns");
}
- //echo "NameSpace: ".$ns."
";
if($ns == $this->XMLSchemaVersion || $ns == 'http://schemas.xmlsoap.org/soap/encoding/'){
$this->debug('in serializeType: type namespace indicates XML Schema or SOAP Encoding type');
if ($unqualified && $use == 'literal') {
@@ -5892,7 +5822,6 @@ class wsdl_om extends nusoap_base_om {
$this->debug("in serializeType: returning: $xml");
return $xml;
}
- //echo "uqType: ".$uqType."
";
if ($uqType == 'Array') {
// JBoss/Axis does this sometimes
return $this->serialize_val($value, $name, false, false, false, false, $use);
@@ -6067,17 +5996,12 @@ class wsdl_om extends nusoap_base_om {
$cols = '';
}
if (is_array($value) && sizeof($value) >= 1) {
- ////echo "IS ARRAY !! ".sizeof($value)."
";
$rows = sizeof($value);
$contents = '';
foreach($value as $k => $v) {
-
- ////echo $k." => ".$v."
";
-
$this->debug("serializing array element: $k, $v of type: $typeDef[arrayType]");
//if (strpos($typeDef['arrayType'], ':') ) {
if (!in_array($typeDef['arrayType'],$this->typemap['http://www.w3.org/2001/XMLSchema'])) {
- //echo "CALL AGAIN HEHRERERERER ###########
";
$contents .= $this->serializeType('item', $typeDef['arrayType'], $v, $use);
} else {
$contents .= $this->serialize_val($v, 'item', $typeDef['arrayType'], null, $this->XMLSchemaVersion, false, $use);
@@ -6468,7 +6392,7 @@ class wsdl_om extends nusoap_base_om {
* @version $Id: nusoap.php,v 1.114 2007/11/06 15:17:46 snichol Exp $
* @access public
*/
-class nusoap_parser extends nusoap_base_om {
+class nusoap_parser extends nusoap_base {
var $xml = '';
var $xml_encoding = '';
@@ -6514,7 +6438,7 @@ class nusoap_parser extends nusoap_base_
* @access public
*/
function nusoap_parser($xml,$encoding='UTF-8',$method='',$decode_utf8=true){
- parent::nusoap_base_om();
+ parent::nusoap_base();
$this->xml = $xml;
$this->xml_encoding = $encoding;
$this->method = $method;
@@ -7088,7 +7012,7 @@ class nusoap_parser extends nusoap_base_
/**
* Backward compatibility
*/
-class soap_parser_om extends nusoap_parser {
+class soap_parser extends nusoap_parser {
}
?>call( string methodname [ ,array parameters] );
+* echo $soapclient->call( string methodname [ ,array parameters] );
*
* // bye bye client
* unset($soapclient);
@@ -7115,7 +7039,7 @@ class soap_parser_om extends nusoap_pars
* @version $Id: nusoap.php,v 1.114 2007/11/06 15:17:46 snichol Exp $
* @access public
*/
-class nusoap_client_om extends nusoap_base_om {
+class nusoap_client extends nusoap_base {
var $username = ''; // Username for HTTP authentication
var $password = ''; // Password for HTTP authentication
@@ -7186,8 +7110,8 @@ class nusoap_client_om extends nusoap_ba
* @param integer $response_timeout set the response timeout
* @access public
*/
- function nusoap_client_om($endpoint,$wsdl = false,$proxyhost = false,$proxyport = false,$proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30){
- parent::nusoap_base_om();
+ function nusoap_client($endpoint,$wsdl = false,$proxyhost = false,$proxyport = false,$proxyusername = false, $proxypassword = false, $timeout = 0, $response_timeout = 30){
+ parent::nusoap_base();
$this->endpoint = $endpoint;
$this->proxyhost = $proxyhost;
$this->proxyport = $proxyport;
@@ -7269,7 +7193,6 @@ class nusoap_client_om extends nusoap_ba
// serialize parameters
if($this->endpointType == 'wsdl' && $opData = $this->getOperationData($operation)){
// use WSDL for operation
- //echo "use WSDL for operation
";
$this->opData = $opData;
$this->debug("found operation");
$this->appendDebug('opData=' . $this->varDump($opData));
@@ -7297,9 +7220,6 @@ class nusoap_client_om extends nusoap_ba
} elseif (is_array($params)) {
$this->debug("serializing param array for WSDL operation $operation");
$payload = $this->wsdl->serializeRPCParameters($operation,'input',$params,$this->bindingType);
- //echo "#####PAYLOAD 2 ####
";
- //echo htmlentities($payload)."
";
- //echo "#####PAYLOAD 2 ####
";
} else {
$this->debug('params must be array or string');
$this->setError('params must be array or string');
@@ -7351,9 +7271,6 @@ class nusoap_client_om extends nusoap_ba
$encodingStyle = '';
}
}
- //echo "#####PAYLOAD 1 ####
";
- //echo htmlentities($payload)."
";
- //echo "#####PAYLOAD 1 ####
";
// wrap RPC calls with method element
if ($style == 'rpc') {
if ($use == 'literal') {
@@ -7379,9 +7296,6 @@ class nusoap_client_om extends nusoap_ba
}
}
}
- //echo "#####PAYLOAD####
";
- //echo htmlentities($payload)."
";
- //echo "#####PAYLOAD####
";
// serialize envelope
$soapmsg = $this->serializeEnvelope($payload,$this->requestHeaders,$usedNamespaces,$style,$use,$encodingStyle);
$this->debug("endpoint=$this->endpoint, soapAction=$soapAction, namespace=$namespace, style=$style, use=$use, encodingStyle=$encodingStyle");
@@ -7464,7 +7378,7 @@ class nusoap_client_om extends nusoap_ba
*/
function loadWSDL() {
$this->debug('instantiating wsdl class with doc: '.$this->wsdlFile);
- $this->wsdl =& new wsdl_om('',$this->proxyhost,$this->proxyport,$this->proxyusername,$this->proxypassword,$this->timeout,$this->response_timeout,$this->curl_options,$this->use_curl);
+ $this->wsdl =& new wsdl('',$this->proxyhost,$this->proxyport,$this->proxyusername,$this->proxypassword,$this->timeout,$this->response_timeout,$this->curl_options,$this->use_curl);
$this->wsdl->setCredentials($this->username, $this->password, $this->authtype, $this->certRequest);
$this->wsdl->fetchWSDL($this->wsdlFile);
$this->checkWSDL();
@@ -7513,7 +7427,7 @@ class nusoap_client_om extends nusoap_ba
if($this->persistentConnection == true && is_object($this->persistentConnection)){
$http =& $this->persistentConnection;
} else {
- $http = new soap_transport_http_om($this->endpoint, $this->curl_options, $this->use_curl);
+ $http = new soap_transport_http($this->endpoint, $this->curl_options, $this->use_curl);
if ($this->persistentConnection) {
$http->usePersistentConnection();
}
@@ -7881,7 +7795,7 @@ class nusoap_client_om extends nusoap_ba
unset($paramCommentStr);
}
}
- $evalStr = 'class nusoap_proxy_'.$r.' extends nusoap_client_om {
+ $evalStr = 'class nusoap_proxy_'.$r.' extends nusoap_client {
'.$evalStr.'
}';
return $evalStr;
@@ -8073,7 +7987,7 @@ if (!extension_loaded('soap')) {
/**
* For backwards compatiblity, define soapclient unless the PHP SOAP extension is loaded.
*/
- class soapclient_om extends nusoap_client_om {
+ class soapclient extends nusoap_client {
}
}
?>