updated nusoap library to a version compatible with php5.3

main/inc/lib/nusoap/class.soap_fault.php

@@ -1,90 +1,90 @@
-<?php
-
-
-
-
-/**
-* Contains information for a SOAP fault.
-* Mainly used for returning faults from deployed functions
-* in a server instance.
-* @author   Dietrich Ayala <dietrich@ganx4.com>
-* @version  $Id: class.soap_fault.php,v 1.14 2007/04/11 15:49:47 snichol Exp $
-* @access public
-*/
-class nusoap_fault extends nusoap_base {
-	/**
-	 * The fault code (client|server)
-	 * @var string
-	 * @access private
-	 */
-	var $faultcode;
-	/**
-	 * The fault actor
-	 * @var string
-	 * @access private
-	 */
-	var $faultactor;
-	/**
-	 * The fault string, a description of the fault
-	 * @var string
-	 * @access private
-	 */
-	var $faultstring;
-	/**
-	 * The fault detail, typically a string or array of string
-	 * @var mixed
-	 * @access private
-	 */
-	var $faultdetail;
-
-	/**
-	* constructor
-    *
-    * @param string $faultcode (SOAP-ENV:Client | SOAP-ENV:Server)
-    * @param string $faultactor only used when msg routed between multiple actors
-    * @param string $faultstring human readable error message
-    * @param mixed $faultdetail detail, typically a string or array of string
-	*/
-	function nusoap_fault($faultcode,$faultactor='',$faultstring='',$faultdetail=''){
-		parent::nusoap_base();
-		$this->faultcode = $faultcode;
-		$this->faultactor = $faultactor;
-		$this->faultstring = $faultstring;
-		$this->faultdetail = $faultdetail;
-	}
-
-	/**
-	* serialize a fault
-	*
-	* @return	string	The serialization of the fault instance.
-	* @access   public
-	*/
-	function serialize(){
-		$ns_string = '';
-		foreach($this->namespaces as $k => $v){
-			$ns_string .= "\n  xmlns:$k=\"$v\"";
-		}
-		$return_msg =
-			'<?xml version="1.0" encoding="'.$this->soap_defencoding.'"?>'.
-			'<SOAP-ENV:Envelope SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"'.$ns_string.">\n".
-				'<SOAP-ENV:Body>'.
-				'<SOAP-ENV:Fault>'.
-					$this->serialize_val($this->faultcode, 'faultcode').
-					$this->serialize_val($this->faultactor, 'faultactor').
-					$this->serialize_val($this->faultstring, 'faultstring').
-					$this->serialize_val($this->faultdetail, 'detail').
-				'</SOAP-ENV:Fault>'.
-				'</SOAP-ENV:Body>'.
-			'</SOAP-ENV:Envelope>';
-		return $return_msg;
-	}
-}
-
-/**
- * Backward compatibility
- */
-class soap_fault extends nusoap_fault {
-}
-
-
+<?php
+
+
+
+
+/**
+* Contains information for a SOAP fault.
+* Mainly used for returning faults from deployed functions
+* in a server instance.
+* @author   Dietrich Ayala <dietrich@ganx4.com>
+* @version  $Id: class.soap_fault.php,v 1.14 2007/04/11 15:49:47 snichol Exp $
+* @access public
+*/
+class nusoap_fault extends nusoap_base {
+	/**
+	 * The fault code (client|server)
+	 * @var string
+	 * @access private
+	 */
+	var $faultcode;
+	/**
+	 * The fault actor
+	 * @var string
+	 * @access private
+	 */
+	var $faultactor;
+	/**
+	 * The fault string, a description of the fault
+	 * @var string
+	 * @access private
+	 */
+	var $faultstring;
+	/**
+	 * The fault detail, typically a string or array of string
+	 * @var mixed
+	 * @access private
+	 */
+	var $faultdetail;
+
+	/**
+	* constructor
+    *
+    * @param string $faultcode (SOAP-ENV:Client | SOAP-ENV:Server)
+    * @param string $faultactor only used when msg routed between multiple actors
+    * @param string $faultstring human readable error message
+    * @param mixed $faultdetail detail, typically a string or array of string
+	*/
+	function nusoap_fault($faultcode,$faultactor='',$faultstring='',$faultdetail=''){
+		parent::nusoap_base();
+		$this->faultcode = $faultcode;
+		$this->faultactor = $faultactor;
+		$this->faultstring = $faultstring;
+		$this->faultdetail = $faultdetail;
+	}
+
+	/**
+	* serialize a fault
+	*
+	* @return	string	The serialization of the fault instance.
+	* @access   public
+	*/
+	function serialize(){
+		$ns_string = '';
+		foreach($this->namespaces as $k => $v){
+			$ns_string .= "\n  xmlns:$k=\"$v\"";
+		}
+		$return_msg =
+			'<?xml version="1.0" encoding="'.$this->soap_defencoding.'"?>'.
+			'<SOAP-ENV:Envelope SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"'.$ns_string.">\n".
+				'<SOAP-ENV:Body>'.
+				'<SOAP-ENV:Fault>'.
+					$this->serialize_val($this->faultcode, 'faultcode').
+					$this->serialize_val($this->faultactor, 'faultactor').
+					$this->serialize_val($this->faultstring, 'faultstring').
+					$this->serialize_val($this->faultdetail, 'detail').
+				'</SOAP-ENV:Fault>'.
+				'</SOAP-ENV:Body>'.
+			'</SOAP-ENV:Envelope>';
+		return $return_msg;
+	}
+}
+
+/**
+ * Backward compatibility
+ */
+class soap_fault extends nusoap_fault {
+}
+
+
 ?>

main/inc/lib/nusoap/class.soap_val.php

@@ -1,107 +1,107 @@
-<?php
-
-
-
-
-/**
-* For creating serializable abstractions of native PHP types.  This class
-* allows element name/namespace, XSD type, and XML attributes to be
-* associated with a value.  This is extremely useful when WSDL is not
-* used, but is also useful when WSDL is used with polymorphic types, including
-* xsd:anyType and user-defined types.
-*
-* @author   Dietrich Ayala <dietrich@ganx4.com>
-* @version  $Id: class.soap_val.php,v 1.11 2007/04/06 13:56:32 snichol Exp $
-* @access   public
-*/
-class soapval extends nusoap_base {
-	/**
-	 * The XML element name
-	 *
-	 * @var string
-	 * @access private
-	 */
-	var $name;
-	/**
-	 * The XML type name (string or false)
-	 *
-	 * @var mixed
-	 * @access private
-	 */
-	var $type;
-	/**
-	 * The PHP value
-	 *
-	 * @var mixed
-	 * @access private
-	 */
-	var $value;
-	/**
-	 * The XML element namespace (string or false)
-	 *
-	 * @var mixed
-	 * @access private
-	 */
-	var $element_ns;
-	/**
-	 * The XML type namespace (string or false)
-	 *
-	 * @var mixed
-	 * @access private
-	 */
-	var $type_ns;
-	/**
-	 * The XML element attributes (array or false)
-	 *
-	 * @var mixed
-	 * @access private
-	 */
-	var $attributes;
-
-	/**
-	* constructor
-	*
-	* @param    string $name optional name
-	* @param    mixed $type optional type name
-	* @param	mixed $value optional value
-	* @param	mixed $element_ns optional namespace of value
-	* @param	mixed $type_ns optional namespace of type
-	* @param	mixed $attributes associative array of attributes to add to element serialization
-	* @access   public
-	*/
-  	function soapval($name='soapval',$type=false,$value=-1,$element_ns=false,$type_ns=false,$attributes=false) {
-		parent::nusoap_base();
-		$this->name = $name;
-		$this->type = $type;
-		$this->value = $value;
-		$this->element_ns = $element_ns;
-		$this->type_ns = $type_ns;
-		$this->attributes = $attributes;
-    }
-
-	/**
-	* return serialized value
-	*
-	* @param	string $use The WSDL use value (encoded|literal)
-	* @return	string XML data
-	* @access   public
-	*/
-	function serialize($use='encoded') {
-		return $this->serialize_val($this->value, $this->name, $this->type, $this->element_ns, $this->type_ns, $this->attributes, $use, true);
-    }
-
-	/**
-	* decodes a soapval object into a PHP native type
-	*
-	* @return	mixed
-	* @access   public
-	*/
-	function decode(){
-		return $this->value;
-	}
-}
-
-
-
-
+<?php
+
+
+
+
+/**
+* For creating serializable abstractions of native PHP types.  This class
+* allows element name/namespace, XSD type, and XML attributes to be
+* associated with a value.  This is extremely useful when WSDL is not
+* used, but is also useful when WSDL is used with polymorphic types, including
+* xsd:anyType and user-defined types.
+*
+* @author   Dietrich Ayala <dietrich@ganx4.com>
+* @version  $Id: class.soap_val.php,v 1.11 2007/04/06 13:56:32 snichol Exp $
+* @access   public
+*/
+class soapval extends nusoap_base {
+	/**
+	 * The XML element name
+	 *
+	 * @var string
+	 * @access private
+	 */
+	var $name;
+	/**
+	 * The XML type name (string or false)
+	 *
+	 * @var mixed
+	 * @access private
+	 */
+	var $type;
+	/**
+	 * The PHP value
+	 *
+	 * @var mixed
+	 * @access private
+	 */
+	var $value;
+	/**
+	 * The XML element namespace (string or false)
+	 *
+	 * @var mixed
+	 * @access private
+	 */
+	var $element_ns;
+	/**
+	 * The XML type namespace (string or false)
+	 *
+	 * @var mixed
+	 * @access private
+	 */
+	var $type_ns;
+	/**
+	 * The XML element attributes (array or false)
+	 *
+	 * @var mixed
+	 * @access private
+	 */
+	var $attributes;
+
+	/**
+	* constructor
+	*
+	* @param    string $name optional name
+	* @param    mixed $type optional type name
+	* @param	mixed $value optional value
+	* @param	mixed $element_ns optional namespace of value
+	* @param	mixed $type_ns optional namespace of type
+	* @param	mixed $attributes associative array of attributes to add to element serialization
+	* @access   public
+	*/
+  	function soapval($name='soapval',$type=false,$value=-1,$element_ns=false,$type_ns=false,$attributes=false) {
+		parent::nusoap_base();
+		$this->name = $name;
+		$this->type = $type;
+		$this->value = $value;
+		$this->element_ns = $element_ns;
+		$this->type_ns = $type_ns;
+		$this->attributes = $attributes;
+    }
+
+	/**
+	* return serialized value
+	*
+	* @param	string $use The WSDL use value (encoded|literal)
+	* @return	string XML data
+	* @access   public
+	*/
+	function serialize($use='encoded') {
+		return $this->serialize_val($this->value, $this->name, $this->type, $this->element_ns, $this->type_ns, $this->attributes, $use, true);
+    }
+
+	/**
+	* decodes a soapval object into a PHP native type
+	*
+	* @return	mixed
+	* @access   public
+	*/
+	function decode(){
+		return $this->value;
+	}
+}
+
+
+
+
 ?>

main/inc/lib/nusoap/class.wsdlcache.php

@@ -1,209 +1,209 @@
-<?php
-/*
-The NuSOAP project home is:
-http://sourceforge.net/projects/nusoap/
-
-The primary support for NuSOAP is the mailing list:
-nusoap-general@lists.sourceforge.net
-*/
-
-/**
-* caches instances of the wsdl class
-*
-* @author   Scott Nichol <snichol@users.sourceforge.net>
-* @author	Ingo Fischer <ingo@apollon.de>
-* @version  $Id: class.wsdlcache.php,v 1.7 2007/04/17 16:34:03 snichol Exp $
-* @access public
-*/
-class nusoap_wsdlcache {
-	/**
-	 *	@var resource
-	 *	@access private
-	 */
-	var $fplock;
-	/**
-	 *	@var integer
-	 *	@access private
-	 */
-	var $cache_lifetime;
-	/**
-	 *	@var string
-	 *	@access private
-	 */
-	var $cache_dir;
-	/**
-	 *	@var string
-	 *	@access public
-	 */
-	var $debug_str = '';
-
-	/**
-	* constructor
-	*
-	* @param string $cache_dir directory for cache-files
-	* @param integer $cache_lifetime lifetime for caching-files in seconds or 0 for unlimited
-	* @access public
-	*/
-	function nusoap_wsdlcache($cache_dir='.', $cache_lifetime=0) {
-		$this->fplock = array();
-		$this->cache_dir = $cache_dir != '' ? $cache_dir : '.';
-		$this->cache_lifetime = $cache_lifetime;
-	}
-
-	/**
-	* creates the filename used to cache a wsdl instance
-	*
-	* @param string $wsdl The URL of the wsdl instance
-	* @return string The filename used to cache the instance
-	* @access private
-	*/
-	function createFilename($wsdl) {
-		return $this->cache_dir.'/wsdlcache-' . md5($wsdl);
-	}
-
-	/**
-	* adds debug data to the class level debug string
-	*
-	* @param    string $string debug data
-	* @access   private
-	*/
-	function debug($string){
-		$this->debug_str .= get_class($this).": $string\n";
-	}
-
-	/**
-	* gets a wsdl instance from the cache
-	*
-	* @param string $wsdl The URL of the wsdl instance
-	* @return object wsdl The cached wsdl instance, null if the instance is not in the cache
-	* @access public
-	*/
-	function get($wsdl) {
-		$filename = $this->createFilename($wsdl);
-		if ($this->obtainMutex($filename, "r")) {
-			// check for expired WSDL that must be removed from the cache
- 			if ($this->cache_lifetime > 0) {
-				if (file_exists($filename) && (time() - filemtime($filename) > $this->cache_lifetime)) {
-					unlink($filename);
-					$this->debug("Expired $wsdl ($filename) from cache");
-					$this->releaseMutex($filename);
-					return null;
-  				}
-			}
-			// see what there is to return
-			if (!file_exists($filename)) {
-				$this->debug("$wsdl ($filename) not in cache (1)");
-				$this->releaseMutex($filename);
-				return null;
-			}
-			$fp = @fopen($filename, "r");
-			if ($fp) {
-				$s = implode("", @file($filename));
-				fclose($fp);
-				$this->debug("Got $wsdl ($filename) from cache");
-			} else {
-				$s = null;
-				$this->debug("$wsdl ($filename) not in cache (2)");
-			}
-			$this->releaseMutex($filename);
-			return (!is_null($s)) ? unserialize($s) : null;
-		} else {
-			$this->debug("Unable to obtain mutex for $filename in get");
-		}
-		return null;
-	}
-
-	/**
-	* obtains the local mutex
-	*
-	* @param string $filename The Filename of the Cache to lock
-	* @param string $mode The open-mode ("r" or "w") or the file - affects lock-mode
-	* @return boolean Lock successfully obtained ?!
-	* @access private
-	*/
-	function obtainMutex($filename, $mode) {
-		if (isset($this->fplock[md5($filename)])) {
-			$this->debug("Lock for $filename already exists");
-			return false;
-		}
-		$this->fplock[md5($filename)] = fopen($filename.".lock", "w");
-		if ($mode == "r") {
-			return flock($this->fplock[md5($filename)], LOCK_SH);
-		} else {
-			return flock($this->fplock[md5($filename)], LOCK_EX);
-		}
-	}
-
-	/**
-	* adds a wsdl instance to the cache
-	*
-	* @param object wsdl $wsdl_instance The wsdl instance to add
-	* @return boolean WSDL successfully cached
-	* @access public
-	*/
-	function put($wsdl_instance) {
-		$filename = $this->createFilename($wsdl_instance->wsdl);
-		$s = serialize($wsdl_instance);
-		if ($this->obtainMutex($filename, "w")) {
-			$fp = fopen($filename, "w");
-			if (! $fp) {
-				$this->debug("Cannot write $wsdl_instance->wsdl ($filename) in cache");
-				$this->releaseMutex($filename);
-				return false;
-			}
-			fputs($fp, $s);
-			fclose($fp);
-			$this->debug("Put $wsdl_instance->wsdl ($filename) in cache");
-			$this->releaseMutex($filename);
-			return true;
-		} else {
-			$this->debug("Unable to obtain mutex for $filename in put");
-		}
-		return false;
-	}
-
-	/**
-	* releases the local mutex
-	*
-	* @param string $filename The Filename of the Cache to lock
-	* @return boolean Lock successfully released
-	* @access private
-	*/
-	function releaseMutex($filename) {
-		$ret = flock($this->fplock[md5($filename)], LOCK_UN);
-		fclose($this->fplock[md5($filename)]);
-		unset($this->fplock[md5($filename)]);
-		if (! $ret) {
-			$this->debug("Not able to release lock for $filename");
-		}
-		return $ret;
-	}
-
-	/**
-	* removes a wsdl instance from the cache
-	*
-	* @param string $wsdl The URL of the wsdl instance
-	* @return boolean Whether there was an instance to remove
-	* @access public
-	*/
-	function remove($wsdl) {
-		$filename = $this->createFilename($wsdl);
-		if (!file_exists($filename)) {
-			$this->debug("$wsdl ($filename) not in cache to be removed");
-			return false;
-		}
-		// ignore errors obtaining mutex
-		$this->obtainMutex($filename, "w");
-		$ret = unlink($filename);
-		$this->debug("Removed ($ret) $wsdl ($filename) from cache");
-		$this->releaseMutex($filename);
-		return $ret;
-	}
-}
-
-/**
- * For backward compatibility
- */
-class wsdlcache extends nusoap_wsdlcache {
-}
-?>
+<?php
+/*
+The NuSOAP project home is:
+http://sourceforge.net/projects/nusoap/
+
+The primary support for NuSOAP is the mailing list:
+nusoap-general@lists.sourceforge.net
+*/
+
+/**
+* caches instances of the wsdl class
+* 
+* @author   Scott Nichol <snichol@users.sourceforge.net>
+* @author	Ingo Fischer <ingo@apollon.de>
+* @version  $Id: class.wsdlcache.php,v 1.7 2007/04/17 16:34:03 snichol Exp $
+* @access public 
+*/
+class nusoap_wsdlcache {
+	/**
+	 *	@var resource
+	 *	@access private
+	 */
+	var $fplock;
+	/**
+	 *	@var integer
+	 *	@access private
+	 */
+	var $cache_lifetime;
+	/**
+	 *	@var string
+	 *	@access private
+	 */
+	var $cache_dir;
+	/**
+	 *	@var string
+	 *	@access public
+	 */
+	var $debug_str = '';
+
+	/**
+	* constructor
+	*
+	* @param string $cache_dir directory for cache-files
+	* @param integer $cache_lifetime lifetime for caching-files in seconds or 0 for unlimited
+	* @access public
+	*/
+	function nusoap_wsdlcache($cache_dir='.', $cache_lifetime=0) {
+		$this->fplock = array();
+		$this->cache_dir = $cache_dir != '' ? $cache_dir : '.';
+		$this->cache_lifetime = $cache_lifetime;
+	}
+
+	/**
+	* creates the filename used to cache a wsdl instance
+	*
+	* @param string $wsdl The URL of the wsdl instance
+	* @return string The filename used to cache the instance
+	* @access private
+	*/
+	function createFilename($wsdl) {
+		return $this->cache_dir.'/wsdlcache-' . md5($wsdl);
+	}
+
+	/**
+	* adds debug data to the class level debug string
+	*
+	* @param    string $string debug data
+	* @access   private
+	*/
+	function debug($string){
+		$this->debug_str .= get_class($this).": $string\n";
+	}
+
+	/**
+	* gets a wsdl instance from the cache
+	*
+	* @param string $wsdl The URL of the wsdl instance
+	* @return object wsdl The cached wsdl instance, null if the instance is not in the cache
+	* @access public
+	*/
+	function get($wsdl) {
+		$filename = $this->createFilename($wsdl);
+		if ($this->obtainMutex($filename, "r")) {
+			// check for expired WSDL that must be removed from the cache
+ 			if ($this->cache_lifetime > 0) {
+				if (file_exists($filename) && (time() - filemtime($filename) > $this->cache_lifetime)) {
+					unlink($filename);
+					$this->debug("Expired $wsdl ($filename) from cache");
+					$this->releaseMutex($filename);
+					return null;
+  				}
+			}
+			// see what there is to return
+			if (!file_exists($filename)) {
+				$this->debug("$wsdl ($filename) not in cache (1)");
+				$this->releaseMutex($filename);
+				return null;
+			}
+			$fp = @fopen($filename, "r");
+			if ($fp) {
+				$s = implode("", @file($filename));
+				fclose($fp);
+				$this->debug("Got $wsdl ($filename) from cache");
+			} else {
+				$s = null;
+				$this->debug("$wsdl ($filename) not in cache (2)");
+			}
+			$this->releaseMutex($filename);
+			return (!is_null($s)) ? unserialize($s) : null;
+		} else {
+			$this->debug("Unable to obtain mutex for $filename in get");
+		}
+		return null;
+	}
+
+	/**
+	* obtains the local mutex
+	*
+	* @param string $filename The Filename of the Cache to lock
+	* @param string $mode The open-mode ("r" or "w") or the file - affects lock-mode
+	* @return boolean Lock successfully obtained ?!
+	* @access private
+	*/
+	function obtainMutex($filename, $mode) {
+		if (isset($this->fplock[md5($filename)])) {
+			$this->debug("Lock for $filename already exists");
+			return false;
+		}
+		$this->fplock[md5($filename)] = fopen($filename.".lock", "w");
+		if ($mode == "r") {
+			return flock($this->fplock[md5($filename)], LOCK_SH);
+		} else {
+			return flock($this->fplock[md5($filename)], LOCK_EX);
+		}
+	}
+
+	/**
+	* adds a wsdl instance to the cache
+	*
+	* @param object wsdl $wsdl_instance The wsdl instance to add
+	* @return boolean WSDL successfully cached
+	* @access public
+	*/
+	function put($wsdl_instance) {
+		$filename = $this->createFilename($wsdl_instance->wsdl);
+		$s = serialize($wsdl_instance);
+		if ($this->obtainMutex($filename, "w")) {
+			$fp = fopen($filename, "w");
+			if (! $fp) {
+				$this->debug("Cannot write $wsdl_instance->wsdl ($filename) in cache");
+				$this->releaseMutex($filename);
+				return false;
+			}
+			fputs($fp, $s);
+			fclose($fp);
+			$this->debug("Put $wsdl_instance->wsdl ($filename) in cache");
+			$this->releaseMutex($filename);
+			return true;
+		} else {
+			$this->debug("Unable to obtain mutex for $filename in put");
+		}
+		return false;
+	}
+
+	/**
+	* releases the local mutex
+	*
+	* @param string $filename The Filename of the Cache to lock
+	* @return boolean Lock successfully released
+	* @access private
+	*/
+	function releaseMutex($filename) {
+		$ret = flock($this->fplock[md5($filename)], LOCK_UN);
+		fclose($this->fplock[md5($filename)]);
+		unset($this->fplock[md5($filename)]);
+		if (! $ret) {
+			$this->debug("Not able to release lock for $filename");
+		}
+		return $ret;
+	}
+
+	/**
+	* removes a wsdl instance from the cache
+	*
+	* @param string $wsdl The URL of the wsdl instance
+	* @return boolean Whether there was an instance to remove
+	* @access public
+	*/
+	function remove($wsdl) {
+		$filename = $this->createFilename($wsdl);
+		if (!file_exists($filename)) {
+			$this->debug("$wsdl ($filename) not in cache to be removed");
+			return false;
+		}
+		// ignore errors obtaining mutex
+		$this->obtainMutex($filename, "w");
+		$ret = unlink($filename);
+		$this->debug("Removed ($ret) $wsdl ($filename) from cache");
+		$this->releaseMutex($filename);
+		return $ret;
+	}
+}
+
+/**
+ * For backward compatibility
+ */
+class wsdlcache extends nusoap_wsdlcache {
+}
+?>