chamilo / chamilo-lms

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

Indentation +845 added lines, -845 removed lines

@@ -84,810 +84,810 @@ 
 */

 class nusoap_base

 {

-	/**

-	 * Identification for HTTP headers.

-	 *

-	 * @var string

-	 * @access private

-	 */

-	var $title = 'NuSOAP';

-	/**

-	 * Version for HTTP headers.

-	 *

-	 * @var string

-	 * @access private

-	 */

-	var $version = '0.9.5';

-	/**

-	 * CVS revision for HTTP headers.

-	 *

-	 * @var string

-	 * @access private

-	 */

-	var $revision = '$Revision: 1.56 $';

+    /**

+     * Identification for HTTP headers.

+     *

+     * @var string

+     * @access private

+     */

+    var $title = 'NuSOAP';

+    /**

+     * Version for HTTP headers.

+     *

+     * @var string

+     * @access private

+     */

+    var $version = '0.9.5';

+    /**

+     * CVS revision for HTTP headers.

+     *

+     * @var string

+     * @access private

+     */

+    var $revision = '$Revision: 1.56 $';

     /**

      * Current error string (manipulated by getError/setError)

-	 *

-	 * @var string

-	 * @access private

-	 */

-	var $error_str = '';

+     *

+     * @var string

+     * @access private

+     */

+    var $error_str = '';

     /**

      * Current debug string (manipulated by debug/appendDebug/clearDebug/getDebug/getDebugAsXMLComment)

-	 *

-	 * @var string

-	 * @access private

-	 */

+     *

+     * @var string

+     * @access private

+     */

     var $debug_str = '';

     /**

-	 * toggles automatic encoding of special characters as entities

-	 * (should always be true, I think)

-	 *

-	 * @var boolean

-	 * @access private

-	 */

-	var $charencoding = true;

-	/**

-	 * the debug level for this instance

-	 *

-	 * @var	integer

-	 * @access private

-	 */

-	var $debugLevel;

-

-    /**

-	* set schema version

-	*

-	* @var      string

-	* @access   public

-	*/

-	var $XMLSchemaVersion = 'http://www.w3.org/2001/XMLSchema';

-

-    /**

-	* charset encoding for outgoing messages

-	*

-	* @var      string

-	* @access   public

-	*/

+     * toggles automatic encoding of special characters as entities

+     * (should always be true, I think)

+     *

+     * @var boolean

+     * @access private

+     */

+    var $charencoding = true;

+    /**

+     * the debug level for this instance

+     *

+     * @var	integer

+     * @access private

+     */

+    var $debugLevel;

+

+    /**

+     * set schema version

+     *

+     * @var      string

+     * @access   public

+     */

+    var $XMLSchemaVersion = 'http://www.w3.org/2001/XMLSchema';

+

+    /**

+     * charset encoding for outgoing messages

+     *

+     * @var      string

+     * @access   public

+     */

     var $soap_defencoding = 'ISO-8859-1';

-	//var $soap_defencoding = 'UTF-8';

-

-	/**

-	* namespaces in an array of prefix => uri

-	*

-	* this is "seeded" by a set of constants, but it may be altered by code

-	*

-	* @var      array

-	* @access   public

-	*/

-	var $namespaces = array(

-		'SOAP-ENV' => 'http://schemas.xmlsoap.org/soap/envelope/',

-		'xsd' => 'http://www.w3.org/2001/XMLSchema',

-		'xsi' => 'http://www.w3.org/2001/XMLSchema-instance',

-		'SOAP-ENC' => 'http://schemas.xmlsoap.org/soap/encoding/'

-		);

-

-	/**

-	* namespaces used in the current context, e.g. during serialization

-	*

-	* @var      array

-	* @access   private

-	*/

-	var $usedNamespaces = array();

-

-	/**

-	* XML Schema types in an array of uri => (array of xml type => php type)

-	* is this legacy yet?

-	* no, this is used by the nusoap_xmlschema class to verify type => namespace mappings.

-	* @var      array

-	* @access   public

-	*/

-	var $typemap = array(

-	'http://www.w3.org/2001/XMLSchema' => array(

-		'string'=>'string','boolean'=>'boolean','float'=>'double','double'=>'double','decimal'=>'double',

-		'duration'=>'','dateTime'=>'string','time'=>'string','date'=>'string','gYearMonth'=>'',

-		'gYear'=>'','gMonthDay'=>'','gDay'=>'','gMonth'=>'','hexBinary'=>'string','base64Binary'=>'string',

-		// abstract "any" types

-		'anyType'=>'string','anySimpleType'=>'string',

-		// derived datatypes

-		'normalizedString'=>'string','token'=>'string','language'=>'','NMTOKEN'=>'','NMTOKENS'=>'','Name'=>'','NCName'=>'','ID'=>'',

-		'IDREF'=>'','IDREFS'=>'','ENTITY'=>'','ENTITIES'=>'','integer'=>'integer','nonPositiveInteger'=>'integer',

-		'negativeInteger'=>'integer','long'=>'integer','int'=>'integer','short'=>'integer','byte'=>'integer','nonNegativeInteger'=>'integer',

-		'unsignedLong'=>'','unsignedInt'=>'','unsignedShort'=>'','unsignedByte'=>'','positiveInteger'=>''),

-	'http://www.w3.org/2000/10/XMLSchema' => array(

-		'i4'=>'','int'=>'integer','boolean'=>'boolean','string'=>'string','double'=>'double',

-		'float'=>'double','dateTime'=>'string',

-		'timeInstant'=>'string','base64Binary'=>'string','base64'=>'string','ur-type'=>'array'),

-	'http://www.w3.org/1999/XMLSchema' => array(

-		'i4'=>'','int'=>'integer','boolean'=>'boolean','string'=>'string','double'=>'double',

-		'float'=>'double','dateTime'=>'string',

-		'timeInstant'=>'string','base64Binary'=>'string','base64'=>'string','ur-type'=>'array'),

-	'http://soapinterop.org/xsd' => array('SOAPStruct'=>'struct'),

-	'http://schemas.xmlsoap.org/soap/encoding/' => array('base64'=>'string','array'=>'array','Array'=>'array'),

+    //var $soap_defencoding = 'UTF-8';

+

+    /**

+     * namespaces in an array of prefix => uri

+     *

+     * this is "seeded" by a set of constants, but it may be altered by code

+     *

+     * @var      array

+     * @access   public

+     */

+    var $namespaces = array(

+        'SOAP-ENV' => 'http://schemas.xmlsoap.org/soap/envelope/',

+        'xsd' => 'http://www.w3.org/2001/XMLSchema',

+        'xsi' => 'http://www.w3.org/2001/XMLSchema-instance',

+        'SOAP-ENC' => 'http://schemas.xmlsoap.org/soap/encoding/'

+        );

+

+    /**

+     * namespaces used in the current context, e.g. during serialization

+     *

+     * @var      array

+     * @access   private

+     */

+    var $usedNamespaces = array();

+

+    /**

+     * XML Schema types in an array of uri => (array of xml type => php type)

+     * is this legacy yet?

+     * no, this is used by the nusoap_xmlschema class to verify type => namespace mappings.

+     * @var      array

+     * @access   public

+     */

+    var $typemap = array(

+    'http://www.w3.org/2001/XMLSchema' => array(

+        'string'=>'string','boolean'=>'boolean','float'=>'double','double'=>'double','decimal'=>'double',

+        'duration'=>'','dateTime'=>'string','time'=>'string','date'=>'string','gYearMonth'=>'',

+        'gYear'=>'','gMonthDay'=>'','gDay'=>'','gMonth'=>'','hexBinary'=>'string','base64Binary'=>'string',

+        // abstract "any" types

+        'anyType'=>'string','anySimpleType'=>'string',

+        // derived datatypes

+        'normalizedString'=>'string','token'=>'string','language'=>'','NMTOKEN'=>'','NMTOKENS'=>'','Name'=>'','NCName'=>'','ID'=>'',

+        'IDREF'=>'','IDREFS'=>'','ENTITY'=>'','ENTITIES'=>'','integer'=>'integer','nonPositiveInteger'=>'integer',

+        'negativeInteger'=>'integer','long'=>'integer','int'=>'integer','short'=>'integer','byte'=>'integer','nonNegativeInteger'=>'integer',

+        'unsignedLong'=>'','unsignedInt'=>'','unsignedShort'=>'','unsignedByte'=>'','positiveInteger'=>''),

+    'http://www.w3.org/2000/10/XMLSchema' => array(

+        'i4'=>'','int'=>'integer','boolean'=>'boolean','string'=>'string','double'=>'double',

+        'float'=>'double','dateTime'=>'string',

+        'timeInstant'=>'string','base64Binary'=>'string','base64'=>'string','ur-type'=>'array'),

+    'http://www.w3.org/1999/XMLSchema' => array(

+        'i4'=>'','int'=>'integer','boolean'=>'boolean','string'=>'string','double'=>'double',

+        'float'=>'double','dateTime'=>'string',

+        'timeInstant'=>'string','base64Binary'=>'string','base64'=>'string','ur-type'=>'array'),

+    'http://soapinterop.org/xsd' => array('SOAPStruct'=>'struct'),

+    'http://schemas.xmlsoap.org/soap/encoding/' => array('base64'=>'string','array'=>'array','Array'=>'array'),

     'http://xml.apache.org/xml-soap' => array('Map')

-	);

-

-	/**

-	* XML entities to convert

-	*

-	* @var      array

-	* @access   public

-	* @deprecated

-	* @see	expandEntities

-	*/

-	var $xmlEntities = array('quot' => '"','amp' => '&',

-		'lt' => '<','gt' => '>','apos' => "'");

-

-	/**

-	* constructor

-	*

-	* @access	public

-	*/

-	public function __construct()

+    );

+

+    /**

+     * XML entities to convert

+     *

+     * @var      array

+     * @access   public

+     * @deprecated

+     * @see	expandEntities

+     */

+    var $xmlEntities = array('quot' => '"','amp' => '&',

+        'lt' => '<','gt' => '>','apos' => "'");

+

+    /**

+     * constructor

+     *

+     * @access	public

+     */

+    public function __construct()

     {

-		$this->debugLevel = $GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel'];

-	}

-

-	/**

-	* gets the global debug level, which applies to future instances

-	*

-	* @return	integer	Debug level 0-9, where 0 turns off

-	* @access	public

-	*/

-	function getGlobalDebugLevel() {

-		return $GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel'];

-	}

-

-	/**

-	* sets the global debug level, which applies to future instances

-	*

-	* @param	int	$level	Debug level 0-9, where 0 turns off

-	* @access	public

-	*/

-	function setGlobalDebugLevel($level) {

-		$GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel'] = $level;

-	}

-

-	/**

-	* gets the debug level for this instance

-	*

-	* @return	int	Debug level 0-9, where 0 turns off

-	* @access	public

-	*/

-	function getDebugLevel() {

-		return $this->debugLevel;

-	}

-

-	/**

-	* sets the debug level for this instance

-	*

-	* @param	int	$level	Debug level 0-9, where 0 turns off

-	* @access	public

-	*/

-	function setDebugLevel($level) {

-		$this->debugLevel = $level;

-	}

-

-	/**

-	* adds debug data to the instance debug string with formatting

-	*

-	* @param    string $string debug data

-	* @access   private

-	*/

-	function debug($string){

-		if ($this->debugLevel > 0) {

-			$this->appendDebug($this->getmicrotime().' '.get_class($this).": $string\n");

-		}

-	}

-

-	/**

-	* adds debug data to the instance debug string without formatting

-	*

-	* @param    string $string debug data

-	* @access   public

-	*/

-	function appendDebug($string){

-		if ($this->debugLevel > 0) {

-			// it would be nice to use a memory stream here to use

-			// memory more efficiently

-			$this->debug_str .= $string;

-		}

-	}

-

-	/**

-	* clears the current debug data for this instance

-	*

-	* @access   public

-	*/

-	function clearDebug() {

-		// it would be nice to use a memory stream here to use

-		// memory more efficiently

-		$this->debug_str = '';

-	}

-

-	/**

-	* gets the current debug data for this instance

-	*

-	* @return   debug data

-	* @access   public

-	*/

-	function &getDebug() {

-		// it would be nice to use a memory stream here to use

-		// memory more efficiently

-		return $this->debug_str;

-	}

-

-	/**

-	* gets the current debug data for this instance as an XML comment

-	* this may change the contents of the debug data

-	*

-	* @return   debug data as an XML comment

-	* @access   public

-	*/

-	function &getDebugAsXMLComment() {

-		// it would be nice to use a memory stream here to use

-		// memory more efficiently

-		while (strpos($this->debug_str, '--')) {

-			$this->debug_str = str_replace('--', '- -', $this->debug_str);

-		}

-		$ret = "<!--\n" . $this->debug_str . "\n-->";

-    	return $ret;

-	}

-

-	/**

-	* expands entities, e.g. changes '<' to '&lt;'.

-	*

-	* @param	string	$val	The string in which to expand entities.

-	* @access	private

-	*/

-	function expandEntities($val) {

-		if ($this->charencoding) {

-	    	$val = str_replace('&', '&amp;', $val);

-	    	$val = str_replace("'", '&apos;', $val);

-	    	$val = str_replace('"', '&quot;', $val);

-	    	$val = str_replace('<', '&lt;', $val);

-	    	$val = str_replace('>', '&gt;', $val);

-	    }

-	    return $val;

-	}

-

-	/**

-	* returns error string if present

-	*

-	* @return   mixed error string or false

-	* @access   public

-	*/

-	function getError(){

-		if($this->error_str != ''){

-			return $this->error_str;

-		}

-		return false;

-	}

-

-	/**

-	* sets error string

-	*

-	* @return   boolean $string error string

-	* @access   private

-	*/

-	function setError($str){

-		$this->error_str = $str;

-	}

-

-	/**

-	* detect if array is a simple array or a struct (associative array)

-	*

-	* @param	mixed	$val	The PHP array

-	* @return	string	(arraySimple|arrayStruct)

-	* @access	private

-	*/

-	function isArraySimpleOrStruct($val) {

+        $this->debugLevel = $GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel'];

+    }

+

+    /**

+     * gets the global debug level, which applies to future instances

+     *

+     * @return	integer	Debug level 0-9, where 0 turns off

+     * @access	public

+     */

+    function getGlobalDebugLevel() {

+        return $GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel'];

+    }

+

+    /**

+     * sets the global debug level, which applies to future instances

+     *

+     * @param	int	$level	Debug level 0-9, where 0 turns off

+     * @access	public

+     */

+    function setGlobalDebugLevel($level) {

+        $GLOBALS['_transient']['static']['nusoap_base']['globalDebugLevel'] = $level;

+    }

+

+    /**

+     * gets the debug level for this instance

+     *

+     * @return	int	Debug level 0-9, where 0 turns off

+     * @access	public

+     */

+    function getDebugLevel() {

+        return $this->debugLevel;

+    }

+

+    /**

+     * sets the debug level for this instance

+     *

+     * @param	int	$level	Debug level 0-9, where 0 turns off

+     * @access	public

+     */

+    function setDebugLevel($level) {

+        $this->debugLevel = $level;

+    }

+

+    /**

+     * adds debug data to the instance debug string with formatting

+     *

+     * @param    string $string debug data

+     * @access   private

+     */

+    function debug($string){

+        if ($this->debugLevel > 0) {

+            $this->appendDebug($this->getmicrotime().' '.get_class($this).": $string\n");

+        }

+    }

+

+    /**

+     * adds debug data to the instance debug string without formatting

+     *

+     * @param    string $string debug data

+     * @access   public

+     */

+    function appendDebug($string){

+        if ($this->debugLevel > 0) {

+            // it would be nice to use a memory stream here to use

+            // memory more efficiently

+            $this->debug_str .= $string;

+        }

+    }

+

+    /**

+     * clears the current debug data for this instance

+     *

+     * @access   public

+     */

+    function clearDebug() {

+        // it would be nice to use a memory stream here to use

+        // memory more efficiently

+        $this->debug_str = '';

+    }

+

+    /**

+     * gets the current debug data for this instance

+     *

+     * @return   debug data

+     * @access   public

+     */

+    function &getDebug() {

+        // it would be nice to use a memory stream here to use

+        // memory more efficiently

+        return $this->debug_str;

+    }

+

+    /**

+     * gets the current debug data for this instance as an XML comment

+     * this may change the contents of the debug data

+     *

+     * @return   debug data as an XML comment

+     * @access   public

+     */

+    function &getDebugAsXMLComment() {

+        // it would be nice to use a memory stream here to use

+        // memory more efficiently

+        while (strpos($this->debug_str, '--')) {

+            $this->debug_str = str_replace('--', '- -', $this->debug_str);

+        }

+        $ret = "<!--\n" . $this->debug_str . "\n-->";

+        return $ret;

+    }

+

+    /**

+     * expands entities, e.g. changes '<' to '&lt;'.

+     *

+     * @param	string	$val	The string in which to expand entities.

+     * @access	private

+     */

+    function expandEntities($val) {

+        if ($this->charencoding) {

+            $val = str_replace('&', '&amp;', $val);

+            $val = str_replace("'", '&apos;', $val);

+            $val = str_replace('"', '&quot;', $val);

+            $val = str_replace('<', '&lt;', $val);

+            $val = str_replace('>', '&gt;', $val);

+        }

+        return $val;

+    }

+

+    /**

+     * returns error string if present

+     *

+     * @return   mixed error string or false

+     * @access   public

+     */

+    function getError(){

+        if($this->error_str != ''){

+            return $this->error_str;

+        }

+        return false;

+    }

+

+    /**

+     * sets error string

+     *

+     * @return   boolean $string error string

+     * @access   private

+     */

+    function setError($str){

+        $this->error_str = $str;

+    }

+

+    /**

+     * detect if array is a simple array or a struct (associative array)

+     *

+     * @param	mixed	$val	The PHP array

+     * @return	string	(arraySimple|arrayStruct)

+     * @access	private

+     */

+    function isArraySimpleOrStruct($val) {

         $keyList = array_keys($val);

-		foreach ($keyList as $keyListValue) {

-			if (!is_int($keyListValue)) {

-				return 'arrayStruct';

-			}

-		}

-		return 'arraySimple';

-	}

-

-	/**

-	* serializes PHP values in accordance w/ section 5. Type information is

-	* not serialized if $use == 'literal'.

-	*

-	* @param	mixed	$val	The value to serialize

-	* @param	string	$name	The name (local part) of the XML element

-	* @param	string	$type	The XML schema type (local part) for the element

-	* @param	string	$name_ns	The namespace for the name of the XML element

-	* @param	string	$type_ns	The namespace for the type of the element

-	* @param	array	$attributes	The attributes to serialize as name=>value pairs

-	* @param	string	$use	The WSDL "use" (encoded|literal)

-	* @param	boolean	$soapval	Whether this is called from soapval.

-	* @return	string	The serialized element, possibly with child elements

-    * @access	public

-	*/

-	function serialize_val($val,$name=false,$type=false,$name_ns=false,$type_ns=false,$attributes=false,$use='encoded',$soapval=false) {

-		$this->debug("in serialize_val: name=$name, type=$type, name_ns=$name_ns, type_ns=$type_ns, use=$use, soapval=$soapval");

-		$this->appendDebug('value=' . $this->varDump($val));

-		$this->appendDebug('attributes=' . $this->varDump($attributes));

-

-    	if (is_object($val) && get_class($val) == 'soapval' && (! $soapval)) {

-    		$this->debug("serialize_val: serialize soapval");

-        	$xml = $val->serialize($use);

-			$this->appendDebug($val->getDebug());

-			$val->clearDebug();

-			$this->debug("serialize_val of soapval returning $xml");

-			return $xml;

+        foreach ($keyList as $keyListValue) {

+            if (!is_int($keyListValue)) {

+                return 'arrayStruct';

+            }

+        }

+        return 'arraySimple';

+    }

+

+    /**

+     * serializes PHP values in accordance w/ section 5. Type information is

+     * not serialized if $use == 'literal'.

+     *

+     * @param	mixed	$val	The value to serialize

+     * @param	string	$name	The name (local part) of the XML element

+     * @param	string	$type	The XML schema type (local part) for the element

+     * @param	string	$name_ns	The namespace for the name of the XML element

+     * @param	string	$type_ns	The namespace for the type of the element

+     * @param	array	$attributes	The attributes to serialize as name=>value pairs

+     * @param	string	$use	The WSDL "use" (encoded|literal)

+     * @param	boolean	$soapval	Whether this is called from soapval.

+     * @return	string	The serialized element, possibly with child elements

+     * @access	public

+     */

+    function serialize_val($val,$name=false,$type=false,$name_ns=false,$type_ns=false,$attributes=false,$use='encoded',$soapval=false) {

+        $this->debug("in serialize_val: name=$name, type=$type, name_ns=$name_ns, type_ns=$type_ns, use=$use, soapval=$soapval");

+        $this->appendDebug('value=' . $this->varDump($val));

+        $this->appendDebug('attributes=' . $this->varDump($attributes));

+

+        if (is_object($val) && get_class($val) == 'soapval' && (! $soapval)) {

+            $this->debug("serialize_val: serialize soapval");

+            $xml = $val->serialize($use);

+            $this->appendDebug($val->getDebug());

+            $val->clearDebug();

+            $this->debug("serialize_val of soapval returning $xml");

+            return $xml;

         }

-		// force valid name if necessary

-		if (is_numeric($name)) {

-			$name = '__numeric_' . $name;

-		} elseif (! $name) {

-			$name = 'noname';

-		}

-		// if name has ns, add ns prefix to name

-		$xmlns = '';

+        // force valid name if necessary

+        if (is_numeric($name)) {

+            $name = '__numeric_' . $name;

+        } elseif (! $name) {

+            $name = 'noname';

+        }

+        // if name has ns, add ns prefix to name

+        $xmlns = '';

         if($name_ns){

-			$prefix = 'nu'.rand(1000,9999);

-			$name = $prefix.':'.$name;

-			$xmlns .= " xmlns:$prefix=\"$name_ns\"";

-		}

-		// if type is prefixed, create type prefix

-		if($type_ns != '' && $type_ns == $this->namespaces['xsd']){

-			// need to fix this. shouldn't default to xsd if no ns specified

-		    // w/o checking against typemap

-			$type_prefix = 'xsd';

-		} elseif($type_ns){

-			$type_prefix = 'ns'.rand(1000,9999);

-			$xmlns .= " xmlns:$type_prefix=\"$type_ns\"";

-		}

-		// serialize attributes if present

-		$atts = '';

-		if($attributes){

-			foreach($attributes as $k => $v){

-				$atts .= " $k=\"".$this->expandEntities($v).'"';

-			}

-		}

-		// serialize null value

-		if (is_null($val)) {

-    		$this->debug("serialize_val: serialize null");

-			if ($use == 'literal') {

-				// TODO: depends on minOccurs

-				$xml = "<$name$xmlns$atts/>";

-				$this->debug("serialize_val returning $xml");

-	        	return $xml;

-        	} else {

-				if (isset($type) && isset($type_prefix)) {

-					$type_str = " xsi:type=\"$type_prefix:$type\"";

-				} else {

-					$type_str = '';

-				}

-				$xml = "<$name$xmlns$type_str$atts xsi:nil=\"true\"/>";

-				$this->debug("serialize_val returning $xml");

-	        	return $xml;

-        	}

-		}

+            $prefix = 'nu'.rand(1000,9999);

+            $name = $prefix.':'.$name;

+            $xmlns .= " xmlns:$prefix=\"$name_ns\"";

+        }

+        // if type is prefixed, create type prefix

+        if($type_ns != '' && $type_ns == $this->namespaces['xsd']){

+            // need to fix this. shouldn't default to xsd if no ns specified

+            // w/o checking against typemap

+            $type_prefix = 'xsd';

+        } elseif($type_ns){

+            $type_prefix = 'ns'.rand(1000,9999);

+            $xmlns .= " xmlns:$type_prefix=\"$type_ns\"";

+        }

+        // serialize attributes if present

+        $atts = '';

+        if($attributes){

+            foreach($attributes as $k => $v){

+                $atts .= " $k=\"".$this->expandEntities($v).'"';

+            }

+        }

+        // serialize null value

+        if (is_null($val)) {

+            $this->debug("serialize_val: serialize null");

+            if ($use == 'literal') {

+                // TODO: depends on minOccurs

+                $xml = "<$name$xmlns$atts/>";

+                $this->debug("serialize_val returning $xml");

+                return $xml;

+            } else {

+                if (isset($type) && isset($type_prefix)) {

+                    $type_str = " xsi:type=\"$type_prefix:$type\"";

+                } else {

+                    $type_str = '';

+                }

+                $xml = "<$name$xmlns$type_str$atts xsi:nil=\"true\"/>";

+                $this->debug("serialize_val returning $xml");

+                return $xml;

+            }

+        }

         // serialize if an xsd built-in primitive type

         if($type != '' && isset($this->typemap[$this->XMLSchemaVersion][$type])){

-    		$this->debug("serialize_val: serialize xsd built-in primitive type");

-        	if (is_bool($val)) {

-        		if ($type == 'boolean') {

-	        		$val = $val ? 'true' : 'false';

-	        	} elseif (! $val) {

-	        		$val = 0;

-	        	}

-			} else if (is_string($val)) {

-				$val = $this->expandEntities($val);

-			}

-			if ($use == 'literal') {

-				$xml = "<$name$xmlns$atts>$val</$name>";

-				$this->debug("serialize_val returning $xml");

-	        	return $xml;

-        	} else {

-				$xml = "<$name$xmlns xsi:type=\"xsd:$type\"$atts>$val</$name>";

-				$this->debug("serialize_val returning $xml");

-	        	return $xml;

-        	}

+            $this->debug("serialize_val: serialize xsd built-in primitive type");

+            if (is_bool($val)) {

+                if ($type == 'boolean') {

+                    $val = $val ? 'true' : 'false';

+                } elseif (! $val) {

+                    $val = 0;

+                }

+            } else if (is_string($val)) {

+                $val = $this->expandEntities($val);

+            }

+            if ($use == 'literal') {

+                $xml = "<$name$xmlns$atts>$val</$name>";

+                $this->debug("serialize_val returning $xml");

+                return $xml;

+            } else {

+                $xml = "<$name$xmlns xsi:type=\"xsd:$type\"$atts>$val</$name>";

+                $this->debug("serialize_val returning $xml");

+                return $xml;

+            }

         }

-		// detect type and serialize

-		$xml = '';

-		switch(true) {

-			case (is_bool($val) || $type == 'boolean'):

-		   		$this->debug("serialize_val: serialize boolean");

-        		if ($type == 'boolean') {

-	        		$val = $val ? 'true' : 'false';

-	        	} elseif (! $val) {

-	        		$val = 0;

-	        	}

-				if ($use == 'literal') {

-					$xml .= "<$name$xmlns$atts>$val</$name>";

-				} else {

-					$xml .= "<$name$xmlns xsi:type=\"xsd:boolean\"$atts>$val</$name>";

-				}

-				break;

-			case (is_int($val) || is_long($val) || $type == 'int'):

-		   		$this->debug("serialize_val: serialize int");

-				if ($use == 'literal') {

-					$xml .= "<$name$xmlns$atts>$val</$name>";

-				} else {

-					$xml .= "<$name$xmlns xsi:type=\"xsd:int\"$atts>$val</$name>";

-				}

-				break;

-			case (is_float($val)|| is_double($val) || $type == 'float'):

-		   		$this->debug("serialize_val: serialize float");

-				if ($use == 'literal') {

-					$xml .= "<$name$xmlns$atts>$val</$name>";

-				} else {

-					$xml .= "<$name$xmlns xsi:type=\"xsd:float\"$atts>$val</$name>";

-				}

-				break;

-			case (is_string($val) || $type == 'string'):

-		   		$this->debug("serialize_val: serialize string");

-				$val = $this->expandEntities($val);

-				if ($use == 'literal') {

-					$xml .= "<$name$xmlns$atts>$val</$name>";

-				} else {

-					$xml .= "<$name$xmlns xsi:type=\"xsd:string\"$atts>$val</$name>";

-				}

-				break;

-			case is_object($val):

-		   		$this->debug("serialize_val: serialize object");

-		    	if (get_class($val) == 'soapval') {

-		    		$this->debug("serialize_val: serialize soapval object");

-		        	$pXml = $val->serialize($use);

-					$this->appendDebug($val->getDebug());

-					$val->clearDebug();

-		        } else {

-					if (! $name) {

-						$name = get_class($val);

-						$this->debug("In serialize_val, used class name $name as element name");

-					} else {

-						$this->debug("In serialize_val, do not override name $name for element name for class " . get_class($val));

-					}

-					foreach(get_object_vars($val) as $k => $v){

-						$pXml = isset($pXml) ? $pXml.$this->serialize_val($v,$k,false,false,false,false,$use) : $this->serialize_val($v,$k,false,false,false,false,$use);

-					}

-				}

-				if(isset($type) && isset($type_prefix)){

-					$type_str = " xsi:type=\"$type_prefix:$type\"";

-				} else {

-					$type_str = '';

-				}

-				if ($use == 'literal') {

-					$xml .= "<$name$xmlns$atts>$pXml</$name>";

-				} else {

-					$xml .= "<$name$xmlns$type_str$atts>$pXml</$name>";

-				}

-				break;

-			case (is_array($val) || $type):

-				// detect if struct or array

-				$valueType = $this->isArraySimpleOrStruct($val);

+        // detect type and serialize

+        $xml = '';

+        switch(true) {

+            case (is_bool($val) || $type == 'boolean'):

+                   $this->debug("serialize_val: serialize boolean");

+                if ($type == 'boolean') {

+                    $val = $val ? 'true' : 'false';

+                } elseif (! $val) {

+                    $val = 0;

+                }

+                if ($use == 'literal') {

+                    $xml .= "<$name$xmlns$atts>$val</$name>";

+                } else {

+                    $xml .= "<$name$xmlns xsi:type=\"xsd:boolean\"$atts>$val</$name>";

+                }

+                break;

+            case (is_int($val) || is_long($val) || $type == 'int'):

+                   $this->debug("serialize_val: serialize int");

+                if ($use == 'literal') {

+                    $xml .= "<$name$xmlns$atts>$val</$name>";

+                } else {

+                    $xml .= "<$name$xmlns xsi:type=\"xsd:int\"$atts>$val</$name>";

+                }

+                break;

+            case (is_float($val)|| is_double($val) || $type == 'float'):

+                   $this->debug("serialize_val: serialize float");

+                if ($use == 'literal') {

+                    $xml .= "<$name$xmlns$atts>$val</$name>";

+                } else {

+                    $xml .= "<$name$xmlns xsi:type=\"xsd:float\"$atts>$val</$name>";

+                }

+                break;

+            case (is_string($val) || $type == 'string'):

+                   $this->debug("serialize_val: serialize string");

+                $val = $this->expandEntities($val);

+                if ($use == 'literal') {

+                    $xml .= "<$name$xmlns$atts>$val</$name>";

+                } else {

+                    $xml .= "<$name$xmlns xsi:type=\"xsd:string\"$atts>$val</$name>";

+                }

+                break;

+            case is_object($val):

+                   $this->debug("serialize_val: serialize object");

+                if (get_class($val) == 'soapval') {

+                    $this->debug("serialize_val: serialize soapval object");

+                    $pXml = $val->serialize($use);

+                    $this->appendDebug($val->getDebug());

+                    $val->clearDebug();

+                } else {

+                    if (! $name) {

+                        $name = get_class($val);

+                        $this->debug("In serialize_val, used class name $name as element name");

+                    } else {

+                        $this->debug("In serialize_val, do not override name $name for element name for class " . get_class($val));

+                    }

+                    foreach(get_object_vars($val) as $k => $v){

+                        $pXml = isset($pXml) ? $pXml.$this->serialize_val($v,$k,false,false,false,false,$use) : $this->serialize_val($v,$k,false,false,false,false,$use);

+                    }

+                }

+                if(isset($type) && isset($type_prefix)){

+                    $type_str = " xsi:type=\"$type_prefix:$type\"";

+                } else {

+                    $type_str = '';

+                }

+                if ($use == 'literal') {

+                    $xml .= "<$name$xmlns$atts>$pXml</$name>";

+                } else {

+                    $xml .= "<$name$xmlns$type_str$atts>$pXml</$name>";

+                }

+                break;

+            case (is_array($val) || $type):

+                // detect if struct or array

+                $valueType = $this->isArraySimpleOrStruct($val);

                 if($valueType=='arraySimple' || preg_match('/^ArrayOf/',$type)){

-			   		$this->debug("serialize_val: serialize array");

-					$i = 0;

-					if(is_array($val) && count($val)> 0){

-						foreach($val as $v){

-	                    	if(is_object($v) && get_class($v) ==  'soapval'){

-								$tt_ns = $v->type_ns;

-								$tt = $v->type;

-							} elseif (is_array($v)) {

-								$tt = $this->isArraySimpleOrStruct($v);

-							} else {

-								$tt = gettype($v);

-	                        }

-							$array_types[$tt] = 1;

-							// TODO: for literal, the name should be $name

-							$xml .= $this->serialize_val($v,'item',false,false,false,false,$use);

-							++$i;

-						}

-						if(count($array_types) > 1){

-							$array_typename = 'xsd:anyType';

-						} elseif(isset($tt) && isset($this->typemap[$this->XMLSchemaVersion][$tt])) {

-							if ($tt == 'integer') {

-								$tt = 'int';

-							}

-							$array_typename = 'xsd:'.$tt;

-						} elseif(isset($tt) && $tt == 'arraySimple'){

-							$array_typename = 'SOAP-ENC:Array';

-						} elseif(isset($tt) && $tt == 'arrayStruct'){

-							$array_typename = 'unnamed_struct_use_soapval';

-						} else {

-							// if type is prefixed, create type prefix

-							if ($tt_ns != '' && $tt_ns == $this->namespaces['xsd']){

-								 $array_typename = 'xsd:' . $tt;

-							} elseif ($tt_ns) {

-								$tt_prefix = 'ns' . rand(1000, 9999);

-								$array_typename = "$tt_prefix:$tt";

-								$xmlns .= " xmlns:$tt_prefix=\"$tt_ns\"";

-							} else {

-								$array_typename = $tt;

-							}

-						}

-						$array_type = $i;

-						if ($use == 'literal') {

-							$type_str = '';

-						} else if (isset($type) && isset($type_prefix)) {

-							$type_str = " xsi:type=\"$type_prefix:$type\"";

-						} else {

-							$type_str = " xsi:type=\"SOAP-ENC:Array\" SOAP-ENC:arrayType=\"".$array_typename."[$array_type]\"";

-						}

-					// empty array

-					} else {

-						if ($use == 'literal') {

-							$type_str = '';

-						} else if (isset($type) && isset($type_prefix)) {

-							$type_str = " xsi:type=\"$type_prefix:$type\"";

-						} else {

-							$type_str = " xsi:type=\"SOAP-ENC:Array\" SOAP-ENC:arrayType=\"xsd:anyType[0]\"";

-						}

-					}

-					// TODO: for array in literal, there is no wrapper here

-					$xml = "<$name$xmlns$type_str$atts>".$xml."</$name>";

-				} else {

-					// got a struct

-			   		$this->debug("serialize_val: serialize struct");

-					if(isset($type) && isset($type_prefix)){

-						$type_str = " xsi:type=\"$type_prefix:$type\"";

-					} else {

-						$type_str = '';

-					}

-					if ($use == 'literal') {

-						$xml .= "<$name$xmlns$atts>";

-					} else {

-						$xml .= "<$name$xmlns$type_str$atts>";

-					}

-					foreach($val as $k => $v){

-						// Apache Map

-						if ($type == 'Map' && $type_ns == 'http://xml.apache.org/xml-soap') {

-							$xml .= '<item>';

-							$xml .= $this->serialize_val($k,'key',false,false,false,false,$use);

-							$xml .= $this->serialize_val($v,'value',false,false,false,false,$use);

-							$xml .= '</item>';

-						} else {

-							$xml .= $this->serialize_val($v,$k,false,false,false,false,$use);

-						}

-					}

-					$xml .= "</$name>";

-				}

-				break;

-			default:

-		   		$this->debug("serialize_val: serialize unknown");

-				$xml .= 'not detected, got '.gettype($val).' for '.$val;

-				break;

-		}

-		$this->debug("serialize_val returning $xml");

-		return $xml;

-	}

-

-    /**

-    * serializes a message

-    *

-    * @param string $body the XML of the SOAP body

-    * @param mixed $headers optional string of XML with SOAP header content, or array of soapval objects for SOAP headers, or associative array

-    * @param array $namespaces optional the namespaces used in generating the body and headers

-    * @param string $style optional (rpc|document)

-    * @param string $use optional (encoded|literal)

-    * @param string $encodingStyle optional (usually 'http://schemas.xmlsoap.org/soap/encoding/' for encoded)

-    * @return string the message

-    * @access public

-    */

+                        $this->debug("serialize_val: serialize array");

+                    $i = 0;

+                    if(is_array($val) && count($val)> 0){

+                        foreach($val as $v){

+                            if(is_object($v) && get_class($v) ==  'soapval'){

+                                $tt_ns = $v->type_ns;

+                                $tt = $v->type;

+                            } elseif (is_array($v)) {

+                                $tt = $this->isArraySimpleOrStruct($v);

+                            } else {

+                                $tt = gettype($v);

+                            }

+                            $array_types[$tt] = 1;

+                            // TODO: for literal, the name should be $name

+                            $xml .= $this->serialize_val($v,'item',false,false,false,false,$use);

+                            ++$i;

+                        }

+                        if(count($array_types) > 1){

+                            $array_typename = 'xsd:anyType';

+                        } elseif(isset($tt) && isset($this->typemap[$this->XMLSchemaVersion][$tt])) {

+                            if ($tt == 'integer') {

+                                $tt = 'int';

+                            }

+                            $array_typename = 'xsd:'.$tt;

+                        } elseif(isset($tt) && $tt == 'arraySimple'){

+                            $array_typename = 'SOAP-ENC:Array';

+                        } elseif(isset($tt) && $tt == 'arrayStruct'){

+                            $array_typename = 'unnamed_struct_use_soapval';

+                        } else {

+                            // if type is prefixed, create type prefix

+                            if ($tt_ns != '' && $tt_ns == $this->namespaces['xsd']){

+                                    $array_typename = 'xsd:' . $tt;

+                            } elseif ($tt_ns) {

+                                $tt_prefix = 'ns' . rand(1000, 9999);

+                                $array_typename = "$tt_prefix:$tt";

+                                $xmlns .= " xmlns:$tt_prefix=\"$tt_ns\"";

+                            } else {

+                                $array_typename = $tt;

+                            }

+                        }

+                        $array_type = $i;

+                        if ($use == 'literal') {

+                            $type_str = '';

+                        } else if (isset($type) && isset($type_prefix)) {

+                            $type_str = " xsi:type=\"$type_prefix:$type\"";

+                        } else {

+                            $type_str = " xsi:type=\"SOAP-ENC:Array\" SOAP-ENC:arrayType=\"".$array_typename."[$array_type]\"";

+                        }

+                    // empty array

+                    } else {

+                        if ($use == 'literal') {

+                            $type_str = '';

+                        } else if (isset($type) && isset($type_prefix)) {

+                            $type_str = " xsi:type=\"$type_prefix:$type\"";

+                        } else {

+                            $type_str = " xsi:type=\"SOAP-ENC:Array\" SOAP-ENC:arrayType=\"xsd:anyType[0]\"";

+                        }

+                    }

+                    // TODO: for array in literal, there is no wrapper here

+                    $xml = "<$name$xmlns$type_str$atts>".$xml."</$name>";

+                } else {

+                    // got a struct

+                        $this->debug("serialize_val: serialize struct");

+                    if(isset($type) && isset($type_prefix)){

+                        $type_str = " xsi:type=\"$type_prefix:$type\"";

+                    } else {

+                        $type_str = '';

+                    }

+                    if ($use == 'literal') {

+                        $xml .= "<$name$xmlns$atts>";

+                    } else {

+                        $xml .= "<$name$xmlns$type_str$atts>";

+                    }

+                    foreach($val as $k => $v){

+                        // Apache Map

+                        if ($type == 'Map' && $type_ns == 'http://xml.apache.org/xml-soap') {

+                            $xml .= '<item>';

+                            $xml .= $this->serialize_val($k,'key',false,false,false,false,$use);

+                            $xml .= $this->serialize_val($v,'value',false,false,false,false,$use);

+                            $xml .= '</item>';

+                        } else {

+                            $xml .= $this->serialize_val($v,$k,false,false,false,false,$use);

+                        }

+                    }

+                    $xml .= "</$name>";

+                }

+                break;

+            default:

+                   $this->debug("serialize_val: serialize unknown");

+                $xml .= 'not detected, got '.gettype($val).' for '.$val;

+                break;

+        }

+        $this->debug("serialize_val returning $xml");

+        return $xml;

+    }

+

+    /**

+     * serializes a message

+     *

+     * @param string $body the XML of the SOAP body

+     * @param mixed $headers optional string of XML with SOAP header content, or array of soapval objects for SOAP headers, or associative array

+     * @param array $namespaces optional the namespaces used in generating the body and headers

+     * @param string $style optional (rpc|document)

+     * @param string $use optional (encoded|literal)

+     * @param string $encodingStyle optional (usually 'http://schemas.xmlsoap.org/soap/encoding/' for encoded)

+     * @return string the message

+     * @access public

+     */

     function serializeEnvelope($body,$headers=false,$namespaces=array(),$style='rpc',$use='encoded',$encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'){

     // TODO: add an option to automatically run utf8_encode on $body and $headers

     // if $this->soap_defencoding is UTF-8.  Not doing this automatically allows

     // one to send arbitrary UTF-8 characters, not just characters that map to ISO-8859-1

 

-	$this->debug("In serializeEnvelope length=" . strlen($body) . " body (max 1000 characters)=" . substr($body, 0, 1000) . " style=$style use=$use encodingStyle=$encodingStyle");

-	$this->debug("headers:");

-	$this->appendDebug($this->varDump($headers));

-	$this->debug("namespaces:");

-	$this->appendDebug($this->varDump($namespaces));

+    $this->debug("In serializeEnvelope length=" . strlen($body) . " body (max 1000 characters)=" . substr($body, 0, 1000) . " style=$style use=$use encodingStyle=$encodingStyle");

+    $this->debug("headers:");

+    $this->appendDebug($this->varDump($headers));

+    $this->debug("namespaces:");

+    $this->appendDebug($this->varDump($namespaces));

 

-	// serialize namespaces

+    // serialize namespaces

     $ns_string = '';

-	foreach(array_merge($this->namespaces,$namespaces) as $k => $v){

-		$ns_string .= " xmlns:$k=\"$v\"";

-	}

-	if($encodingStyle) {

-		$ns_string = " SOAP-ENV:encodingStyle=\"$encodingStyle\"$ns_string";

-	}

-

-	// serialize headers

-	if($headers){

-		if (is_array($headers)) {

-			$xml = '';

-			foreach ($headers as $k => $v) {

-				if (is_object($v) && get_class($v) == 'soapval') {

-					$xml .= $this->serialize_val($v, false, false, false, false, false, $use);

-				} else {

-					$xml .= $this->serialize_val($v, $k, false, false, false, false, $use);

-				}

-			}

-			$headers = $xml;

-			$this->debug("In serializeEnvelope, serialized array of headers to $headers");

-		}

-		$headers = "<SOAP-ENV:Header>".$headers."</SOAP-ENV:Header>";

-	}

-	// serialize envelope

-	return

-	'<?xml version="1.0" encoding="'.$this->soap_defencoding .'"?'.">".

-	'<SOAP-ENV:Envelope'.$ns_string.">".

-	$headers.

-	"<SOAP-ENV:Body>".

-		$body.

-	"</SOAP-ENV:Body>".

-	"</SOAP-ENV:Envelope>";

-    }

-

-	/**

-	 * formats a string to be inserted into an HTML stream

-	 *

-	 * @param string $str The string to format

-	 * @return string The formatted string

-	 * @access public

-	 * @deprecated

-	 */

+    foreach(array_merge($this->namespaces,$namespaces) as $k => $v){

+        $ns_string .= " xmlns:$k=\"$v\"";

+    }

+    if($encodingStyle) {

+        $ns_string = " SOAP-ENV:encodingStyle=\"$encodingStyle\"$ns_string";

+    }

+

+    // serialize headers

+    if($headers){

+        if (is_array($headers)) {

+            $xml = '';

+            foreach ($headers as $k => $v) {

+                if (is_object($v) && get_class($v) == 'soapval') {

+                    $xml .= $this->serialize_val($v, false, false, false, false, false, $use);

+                } else {

+                    $xml .= $this->serialize_val($v, $k, false, false, false, false, $use);

+                }

+            }

+            $headers = $xml;

+            $this->debug("In serializeEnvelope, serialized array of headers to $headers");

+        }

+        $headers = "<SOAP-ENV:Header>".$headers."</SOAP-ENV:Header>";

+    }

+    // serialize envelope

+    return

+    '<?xml version="1.0" encoding="'.$this->soap_defencoding .'"?'.">".

+    '<SOAP-ENV:Envelope'.$ns_string.">".

+    $headers.

+    "<SOAP-ENV:Body>".

+        $body.

+    "</SOAP-ENV:Body>".

+    "</SOAP-ENV:Envelope>";

+    }

+

+    /**

+     * formats a string to be inserted into an HTML stream

+     *

+     * @param string $str The string to format

+     * @return string The formatted string

+     * @access public

+     * @deprecated

+     */

     function formatDump($str){

-		$str = htmlspecialchars($str);

-		return nl2br($str);

-    }

-

-	/**

-	* contracts (changes namespace to prefix) a qualified name

-	*

-	* @param    string $qname qname

-	* @return	string contracted qname

-	* @access   private

-	*/

-	function contractQname($qname){

-		// get element namespace

-		//$this->xdebug("Contract $qname");

-		if (strrpos($qname, ':')) {

-			// get unqualified name

-			$name = substr($qname, strrpos($qname, ':') + 1);

-			// get ns

-			$ns = substr($qname, 0, strrpos($qname, ':'));

-			$p = $this->getPrefixFromNamespace($ns);

-			if ($p) {

-				return $p . ':' . $name;

-			}

-			return $qname;

-		} else {

-			return $qname;

-		}

-	}

-

-	/**

-	* expands (changes prefix to namespace) a qualified name

-	*

-	* @param    string $qname qname

-	* @return	string expanded qname

-	* @access   private

-	*/

-	function expandQname($qname){

-		// get element prefix

-		if(strpos($qname,':') && !preg_match('/^http:\/\//',$qname)){

-			// get unqualified name

-			$name = substr(strstr($qname,':'),1);

-			// get ns prefix

-			$prefix = substr($qname,0,strpos($qname,':'));

-			if(isset($this->namespaces[$prefix])){

-				return $this->namespaces[$prefix].':'.$name;

-			} else {

-				return $qname;

-			}

-		} else {

-			return $qname;

-		}

-	}

-

-    /**

-    * returns the local part of a prefixed string

-    * returns the original string, if not prefixed

-    *

-    * @param string $str The prefixed string

-    * @return string The local part

-    * @access public

-    */

-	function getLocalPart($str){

-		if($sstr = strrchr($str,':')){

-			// get unqualified name

-			return substr( $sstr, 1 );

-		} else {

-			return $str;

-		}

-	}

-

-	/**

-    * returns the prefix part of a prefixed string

-    * returns false, if not prefixed

-    *

-    * @param string $str The prefixed string

-    * @return mixed The prefix or false if there is no prefix

-    * @access public

-    */

-	function getPrefix($str){

-		if($pos = strrpos($str,':')){

-			// get prefix

-			return substr($str,0,$pos);

-		}

-		return false;

-	}

-

-	/**

-    * pass it a prefix, it returns a namespace

-    *

-    * @param string $prefix The prefix

-    * @return mixed The namespace, false if no namespace has the specified prefix

-    * @access public

-    */

-	function getNamespaceFromPrefix($prefix){

-		if (isset($this->namespaces[$prefix])) {

-			return $this->namespaces[$prefix];

-		}

-		//$this->setError("No namespace registered for prefix '$prefix'");

-		return false;

-	}

-

-	/**

-    * returns the prefix for a given namespace (or prefix)

-    * or false if no prefixes registered for the given namespace

-    *

-    * @param string $ns The namespace

-    * @return mixed The prefix, false if the namespace has no prefixes

-    * @access public

-    */

-	function getPrefixFromNamespace($ns) {

-		foreach ($this->namespaces as $p => $n) {

-			if ($ns == $n || $ns == $p) {

-			    $this->usedNamespaces[$p] = $n;

-				return $p;

-			}

-		}

-		return false;

-	}

-

-	/**

-    * returns the time in ODBC canonical form with microseconds

-    *

-    * @return string The time in ODBC canonical form with microseconds

-    * @access public

-    */

-	function getmicrotime() {

-		if (function_exists('gettimeofday')) {

-			$tod = gettimeofday();

-			$sec = $tod['sec'];

-			$usec = $tod['usec'];

-		} else {

-			$sec = time();

-			$usec = 0;

-		}

-		return strftime('%Y-%m-%d %H:%M:%S', $sec) . '.' . sprintf('%06d', $usec);

-	}

-

-	/**

-	 * Returns a string with the output of var_dump

-	 *

-	 * @param mixed $data The variable to var_dump

-	 * @return string The output of var_dump

-	 * @access public

-	 */

+        $str = htmlspecialchars($str);

+        return nl2br($str);

+    }

+

+    /**

+     * contracts (changes namespace to prefix) a qualified name

+     *

+     * @param    string $qname qname

+     * @return	string contracted qname

+     * @access   private

+     */

+    function contractQname($qname){

+        // get element namespace

+        //$this->xdebug("Contract $qname");

+        if (strrpos($qname, ':')) {

+            // get unqualified name

+            $name = substr($qname, strrpos($qname, ':') + 1);

+            // get ns

+            $ns = substr($qname, 0, strrpos($qname, ':'));

+            $p = $this->getPrefixFromNamespace($ns);

+            if ($p) {

+                return $p . ':' . $name;

+            }

+            return $qname;

+        } else {

+            return $qname;

+        }

+    }

+

+    /**

+     * expands (changes prefix to namespace) a qualified name

+     *

+     * @param    string $qname qname

+     * @return	string expanded qname

+     * @access   private

+     */

+    function expandQname($qname){

+        // get element prefix

+        if(strpos($qname,':') && !preg_match('/^http:\/\//',$qname)){

+            // get unqualified name

+            $name = substr(strstr($qname,':'),1);

+            // get ns prefix

+            $prefix = substr($qname,0,strpos($qname,':'));

+            if(isset($this->namespaces[$prefix])){

+                return $this->namespaces[$prefix].':'.$name;

+            } else {

+                return $qname;

+            }

+        } else {

+            return $qname;

+        }

+    }

+

+    /**

+     * returns the local part of a prefixed string

+     * returns the original string, if not prefixed

+     *

+     * @param string $str The prefixed string

+     * @return string The local part

+     * @access public

+     */

+    function getLocalPart($str){

+        if($sstr = strrchr($str,':')){

+            // get unqualified name

+            return substr( $sstr, 1 );

+        } else {

+            return $str;

+        }

+    }

+

+    /**

+     * returns the prefix part of a prefixed string

+     * returns false, if not prefixed

+     *

+     * @param string $str The prefixed string

+     * @return mixed The prefix or false if there is no prefix

+     * @access public

+     */

+    function getPrefix($str){

+        if($pos = strrpos($str,':')){

+            // get prefix

+            return substr($str,0,$pos);

+        }

+        return false;

+    }

+

+    /**

+     * pass it a prefix, it returns a namespace

+     *

+     * @param string $prefix The prefix

+     * @return mixed The namespace, false if no namespace has the specified prefix

+     * @access public

+     */

+    function getNamespaceFromPrefix($prefix){

+        if (isset($this->namespaces[$prefix])) {

+            return $this->namespaces[$prefix];

+        }

+        //$this->setError("No namespace registered for prefix '$prefix'");

+        return false;

+    }

+

+    /**

+     * returns the prefix for a given namespace (or prefix)

+     * or false if no prefixes registered for the given namespace

+     *

+     * @param string $ns The namespace

+     * @return mixed The prefix, false if the namespace has no prefixes

+     * @access public

+     */

+    function getPrefixFromNamespace($ns) {

+        foreach ($this->namespaces as $p => $n) {

+            if ($ns == $n || $ns == $p) {

+                $this->usedNamespaces[$p] = $n;

+                return $p;

+            }

+        }

+        return false;

+    }

+

+    /**

+     * returns the time in ODBC canonical form with microseconds

+     *

+     * @return string The time in ODBC canonical form with microseconds

+     * @access public

+     */

+    function getmicrotime() {

+        if (function_exists('gettimeofday')) {

+            $tod = gettimeofday();

+            $sec = $tod['sec'];

+            $usec = $tod['usec'];

+        } else {

+            $sec = time();

+            $usec = 0;

+        }

+        return strftime('%Y-%m-%d %H:%M:%S', $sec) . '.' . sprintf('%06d', $usec);

+    }

+

+    /**

+     * Returns a string with the output of var_dump

+     *

+     * @param mixed $data The variable to var_dump

+     * @return string The output of var_dump

+     * @access public

+     */

     function varDump($data) {

-		ob_start();

-		var_dump($data);

-		$ret_val = ob_get_contents();

-		ob_end_clean();

-		return $ret_val;

-	}

-

-	/**

-	* represents the object as a string

-	*

-	* @return	string

-	* @access   public

-	*/

-	function __toString() {

-		return $this->varDump($this);

-	}

+        ob_start();

+        var_dump($data);

+        $ret_val = ob_get_contents();

+        ob_end_clean();

+        return $ret_val;

+    }

+

+    /**

+     * represents the object as a string

+     *

+     * @return	string

+     * @access   public

+     */

+    function __toString() {

+        return $this->varDump($this);

+    }

 }

 

 // XML Schema Datatype Helper Functions

@@ -903,35 +903,35 @@ 
 * @access   public

 */

 function timestamp_to_iso8601($timestamp,$utc=true){

-	$datestr = date('Y-m-d\TH:i:sO',$timestamp);

-	$pos = strrpos($datestr, "+");

-	if ($pos === FALSE) {

-		$pos = strrpos($datestr, "-");

-	}

-	if ($pos !== FALSE) {

-		if (strlen($datestr) == $pos + 5) {

-			$datestr = substr($datestr, 0, $pos + 3) . ':' . substr($datestr, -2);

-		}

-	}

-	if($utc){

-		$pattern = '/'.

-		'([0-9]{4})-'.	// centuries & years CCYY-

-		'([0-9]{2})-'.	// months MM-

-		'([0-9]{2})'.	// days DD

-		'T'.			// separator T

-		'([0-9]{2}):'.	// hours hh:

-		'([0-9]{2}):'.	// minutes mm:

-		'([0-9]{2})(\.[0-9]*)?'. // seconds ss.ss...

-		'(Z|[+\-][0-9]{2}:?[0-9]{2})?'. // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's

-		'/';

-

-		if(preg_match($pattern,$datestr,$regs)){

-			return sprintf('%04d-%02d-%02dT%02d:%02d:%02dZ',$regs[1],$regs[2],$regs[3],$regs[4],$regs[5],$regs[6]);

-		}

-		return false;

-	} else {

-		return $datestr;

-	}

+    $datestr = date('Y-m-d\TH:i:sO',$timestamp);

+    $pos = strrpos($datestr, "+");

+    if ($pos === FALSE) {

+        $pos = strrpos($datestr, "-");

+    }

+    if ($pos !== FALSE) {

+        if (strlen($datestr) == $pos + 5) {

+            $datestr = substr($datestr, 0, $pos + 3) . ':' . substr($datestr, -2);

+        }

+    }

+    if($utc){

+        $pattern = '/'.

+        '([0-9]{4})-'.	// centuries & years CCYY-

+        '([0-9]{2})-'.	// months MM-

+        '([0-9]{2})'.	// days DD

+        'T'.			// separator T

+        '([0-9]{2}):'.	// hours hh:

+        '([0-9]{2}):'.	// minutes mm:

+        '([0-9]{2})(\.[0-9]*)?'. // seconds ss.ss...

+        '(Z|[+\-][0-9]{2}:?[0-9]{2})?'. // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's

+        '/';

+

+        if(preg_match($pattern,$datestr,$regs)){

+            return sprintf('%04d-%02d-%02dT%02d:%02d:%02dZ',$regs[1],$regs[2],$regs[3],$regs[4],$regs[5],$regs[6]);

+        }

+        return false;

+    } else {

+        return $datestr;

+    }

 }

 

 /**

@@ -942,35 +942,35 @@ 
 * @access   public

 */

 function iso8601_to_timestamp($datestr){

-	$pattern = '/'.

-	'([0-9]{4})-'.	// centuries & years CCYY-

-	'([0-9]{2})-'.	// months MM-

-	'([0-9]{2})'.	// days DD

-	'T'.			// separator T

-	'([0-9]{2}):'.	// hours hh:

-	'([0-9]{2}):'.	// minutes mm:

-	'([0-9]{2})(\.[0-9]+)?'. // seconds ss.ss...

-	'(Z|[+\-][0-9]{2}:?[0-9]{2})?'. // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's

-	'/';

-	if(preg_match($pattern,$datestr,$regs)){

-		// not utc

-		if($regs[8] != 'Z'){

-			$op = substr($regs[8],0,1);

-			$h = substr($regs[8],1,2);

-			$m = substr($regs[8],strlen($regs[8])-2,2);

-			if($op == '-'){

-				$regs[4] = $regs[4] + $h;

-				$regs[5] = $regs[5] + $m;

-			} elseif($op == '+'){

-				$regs[4] = $regs[4] - $h;

-				$regs[5] = $regs[5] - $m;

-			}

-		}

-		return gmmktime($regs[4], $regs[5], $regs[6], $regs[2], $regs[3], $regs[1]);

+    $pattern = '/'.

+    '([0-9]{4})-'.	// centuries & years CCYY-

+    '([0-9]{2})-'.	// months MM-

+    '([0-9]{2})'.	// days DD

+    'T'.			// separator T

+    '([0-9]{2}):'.	// hours hh:

+    '([0-9]{2}):'.	// minutes mm:

+    '([0-9]{2})(\.[0-9]+)?'. // seconds ss.ss...

+    '(Z|[+\-][0-9]{2}:?[0-9]{2})?'. // Z to indicate UTC, -/+HH:MM:SS.SS... for local tz's

+    '/';

+    if(preg_match($pattern,$datestr,$regs)){

+        // not utc

+        if($regs[8] != 'Z'){

+            $op = substr($regs[8],0,1);

+            $h = substr($regs[8],1,2);

+            $m = substr($regs[8],strlen($regs[8])-2,2);

+            if($op == '-'){

+                $regs[4] = $regs[4] + $h;

+                $regs[5] = $regs[5] + $m;

+            } elseif($op == '+'){

+                $regs[4] = $regs[4] - $h;

+                $regs[5] = $regs[5] - $m;

+            }

+        }

+        return gmmktime($regs[4], $regs[5], $regs[6], $regs[2], $regs[3], $regs[1]);

 //		return strtotime("$regs[1]-$regs[2]-$regs[3] $regs[4]:$regs[5]:$regs[6]Z");

-	} else {

-		return false;

-	}

+    } else {

+        return false;

+    }

 }

 

 /**

@@ -982,13 +982,13 @@ 
 */

 function usleepWindows($usec)

 {

-	$start = gettimeofday();

-

-	do

-	{

-		$stop = gettimeofday();

-		$timePassed = 1000000 * ($stop['sec'] - $start['sec'])

-		+ $stop['usec'] - $start['usec'];

-	}

-	while ($timePassed < $usec);

+    $start = gettimeofday();

+

+    do

+    {

+        $stop = gettimeofday();

+        $timePassed = 1000000 * ($stop['sec'] - $start['sec'])

+        + $stop['usec'] - $start['usec'];

+    }

+    while ($timePassed < $usec);

 }

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

Indentation +175 added lines, -175 removed lines

@@ -17,189 +17,189 @@
 */

 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 = '';

+    /**

+     *	@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 __construct($cache_dir='.', $cache_lifetime=0) {

-		$this->fplock = array();

-		$this->cache_dir = $cache_dir != '' ? $cache_dir : '.';

-		$this->cache_lifetime = $cache_lifetime;

-	}

+    /**

+     * 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 __construct($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);

-	}

+    /**

+     * 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";

-	}

+    /**

+     * 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;

-	}

+    /**

+     * 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);

-		}

-	}

+    /**

+     * 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;

-	}

+    /**

+     * 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;

-	}

+    /**

+     * 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;

-	}

+    /**

+     * 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;

+    }

 }

 

 /**

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

Indentation +64 added lines, -64 removed lines

@@ -10,72 +10,72 @@
 */

 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;

+    /**

+     * 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

-	*/

-	public function __construct($faultcode,$faultactor='',$faultstring='',$faultdetail=''){

-		parent::__construct();

-		$this->faultcode = $faultcode;

-		$this->faultactor = $faultactor;

-		$this->faultstring = $faultstring;

-		$this->faultdetail = $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

+     */

+    public function __construct($faultcode,$faultactor='',$faultstring='',$faultdetail=''){

+        parent::__construct();

+        $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;

-	}

+    /**

+     * 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;

+    }

 }

 

 /**

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

Indentation +1262 added lines, -1262 removed lines

@@ -11,171 +11,171 @@ 
 */

 class soap_transport_http extends nusoap_base

 {

-	var $url = '';

-	var $uri = '';

-	var $digest_uri = '';

-	var $scheme = '';

-	var $host = '';

-	var $port = '';

-	var $path = '';

-	var $request_method = 'POST';

-	var $protocol_version = '1.0';

-	var $encoding = '';

-	var $outgoing_headers = array();

-	var $incoming_headers = array();

-	var $incoming_cookies = array();

-	var $outgoing_payload = '';

-	var $incoming_payload = '';

-	var $response_status_line;	// HTTP response status line

-	var $useSOAPAction = true;

-	var $persistentConnection = false;

-	var $ch = false;	// cURL handle

-	var $ch_options = array();	// cURL custom options

-	var $use_curl = false;		// force cURL use

-	var $proxy = null;			// proxy information (associative array)

-	var $username = '';

-	var $password = '';

-	var $authtype = '';

-	var $digestRequest = array();

-	var $certRequest = array();	// keys must be cainfofile (optional), sslcertfile, sslkeyfile, passphrase, certpassword (optional), verifypeer (optional), verifyhost (optional)

-								// cainfofile: certificate authority file, e.g. '$pathToPemFiles/rootca.pem'

-								// sslcertfile: SSL certificate file, e.g. '$pathToPemFiles/mycert.pem'

-								// sslkeyfile: SSL key file, e.g. '$pathToPemFiles/mykey.pem'

-								// passphrase: SSL key password/passphrase

-								// certpassword: SSL certificate password

-								// verifypeer: default is 1

-								// verifyhost: default is 1

-

-	/**

-	* constructor

-	*

-	* @param string $url The URL to which to connect

-	* @param array $curl_options User-specified cURL options

-	* @param boolean $use_curl Whether to try to force cURL use

-	* @access public

-	*/

-	function __construct($url, $curl_options = NULL, $use_curl = false){

-		parent::__construct();

-		$this->debug("ctor url=$url use_curl=$use_curl curl_options:");

-		$this->appendDebug($this->varDump($curl_options));

-		$this->setURL($url);

-		if (is_array($curl_options)) {

-			$this->ch_options = $curl_options;

-		}

-		$this->use_curl = $use_curl;

-		preg_match('/\$Revisio' . 'n: ([^ ]+)/', $this->revision, $rev);

-		$this->setHeader('User-Agent', $this->title.'/'.$this->version.' ('.$rev[1].')');

-	}

-

-	/**

-	* sets a cURL option

-	*

-	* @param	mixed $option The cURL option (always integer?)

-	* @param	mixed $value The cURL option value

-	* @access   private

-	*/

-	function setCurlOption($option, $value) {

-		$this->debug("setCurlOption option=$option, value=");

-		$this->appendDebug($this->varDump($value));

-		curl_setopt($this->ch, $option, $value);

-	}

-

-	/**

-	* sets an HTTP header

-	*

-	* @param string $name The name of the header

-	* @param string $value The value of the header

-	* @access private

-	*/

-	function setHeader($name, $value) {

-		$this->outgoing_headers[$name] = $value;

-		$this->debug("set header $name: $value");

-	}

-

-	/**

-	* unsets an HTTP header

-	*

-	* @param string $name The name of the header

-	* @access private

-	*/

-	function unsetHeader($name) {

-		if (isset($this->outgoing_headers[$name])) {

-			$this->debug("unset header $name");

-			unset($this->outgoing_headers[$name]);

-		}

-	}

-

-	/**

-	* sets the URL to which to connect

-	*

-	* @param string $url The URL to which to connect

-	* @access private

-	*/

-	function setURL($url) {

-		$this->url = $url;

-

-		$u = parse_url($url);

-		foreach($u as $k => $v){

-			$this->debug("parsed URL $k = $v");

-			$this->$k = $v;

-		}

-

-		// add any GET params to path

-		if(isset($u['query']) && $u['query'] != ''){

+    var $url = '';

+    var $uri = '';

+    var $digest_uri = '';

+    var $scheme = '';

+    var $host = '';

+    var $port = '';

+    var $path = '';

+    var $request_method = 'POST';

+    var $protocol_version = '1.0';

+    var $encoding = '';

+    var $outgoing_headers = array();

+    var $incoming_headers = array();

+    var $incoming_cookies = array();

+    var $outgoing_payload = '';

+    var $incoming_payload = '';

+    var $response_status_line;	// HTTP response status line

+    var $useSOAPAction = true;

+    var $persistentConnection = false;

+    var $ch = false;	// cURL handle

+    var $ch_options = array();	// cURL custom options

+    var $use_curl = false;		// force cURL use

+    var $proxy = null;			// proxy information (associative array)

+    var $username = '';

+    var $password = '';

+    var $authtype = '';

+    var $digestRequest = array();

+    var $certRequest = array();	// keys must be cainfofile (optional), sslcertfile, sslkeyfile, passphrase, certpassword (optional), verifypeer (optional), verifyhost (optional)

+                                // cainfofile: certificate authority file, e.g. '$pathToPemFiles/rootca.pem'

+                                // sslcertfile: SSL certificate file, e.g. '$pathToPemFiles/mycert.pem'

+                                // sslkeyfile: SSL key file, e.g. '$pathToPemFiles/mykey.pem'

+                                // passphrase: SSL key password/passphrase

+                                // certpassword: SSL certificate password

+                                // verifypeer: default is 1

+                                // verifyhost: default is 1

+

+    /**

+     * constructor

+     *

+     * @param string $url The URL to which to connect

+     * @param array $curl_options User-specified cURL options

+     * @param boolean $use_curl Whether to try to force cURL use

+     * @access public

+     */

+    function __construct($url, $curl_options = NULL, $use_curl = false){

+        parent::__construct();

+        $this->debug("ctor url=$url use_curl=$use_curl curl_options:");

+        $this->appendDebug($this->varDump($curl_options));

+        $this->setURL($url);

+        if (is_array($curl_options)) {

+            $this->ch_options = $curl_options;

+        }

+        $this->use_curl = $use_curl;

+        preg_match('/\$Revisio' . 'n: ([^ ]+)/', $this->revision, $rev);

+        $this->setHeader('User-Agent', $this->title.'/'.$this->version.' ('.$rev[1].')');

+    }

+

+    /**

+     * sets a cURL option

+     *

+     * @param	mixed $option The cURL option (always integer?)

+     * @param	mixed $value The cURL option value

+     * @access   private

+     */

+    function setCurlOption($option, $value) {

+        $this->debug("setCurlOption option=$option, value=");

+        $this->appendDebug($this->varDump($value));

+        curl_setopt($this->ch, $option, $value);

+    }

+

+    /**

+     * sets an HTTP header

+     *

+     * @param string $name The name of the header

+     * @param string $value The value of the header

+     * @access private

+     */

+    function setHeader($name, $value) {

+        $this->outgoing_headers[$name] = $value;

+        $this->debug("set header $name: $value");

+    }

+

+    /**

+     * unsets an HTTP header

+     *

+     * @param string $name The name of the header

+     * @access private

+     */

+    function unsetHeader($name) {

+        if (isset($this->outgoing_headers[$name])) {

+            $this->debug("unset header $name");

+            unset($this->outgoing_headers[$name]);

+        }

+    }

+

+    /**

+     * sets the URL to which to connect

+     *

+     * @param string $url The URL to which to connect

+     * @access private

+     */

+    function setURL($url) {

+        $this->url = $url;

+

+        $u = parse_url($url);

+        foreach($u as $k => $v){

+            $this->debug("parsed URL $k = $v");

+            $this->$k = $v;

+        }

+

+        // add any GET params to path

+        if(isset($u['query']) && $u['query'] != ''){

             $this->path .= '?' . $u['query'];

-		}

-

-		// set default port

-		if(!isset($u['port'])){

-			if($u['scheme'] == 'https'){

-				$this->port = 443;

-			} else {

-				$this->port = 80;

-			}

-		}

-

-		$this->uri = $this->path;

-		$this->digest_uri = $this->uri;

-

-		// build headers

-		if (!isset($u['port'])) {

-			$this->setHeader('Host', $this->host);

-		} else {

-			$this->setHeader('Host', $this->host.':'.$this->port);

-		}

-

-		if (isset($u['user']) && $u['user'] != '') {

-			$this->setCredentials(urldecode($u['user']), isset($u['pass']) ? urldecode($u['pass']) : '');

-		}

-	}

-

-	/**

-	* gets the I/O method to use

-	*

-	* @return	string	I/O method to use (socket|curl|unknown)

-	* @access	private

-	*/

-	function io_method() {

-		if ($this->use_curl || ($this->scheme == 'https') || ($this->scheme == 'http' && $this->authtype == 'ntlm') || ($this->scheme == 'http' && is_array($this->proxy) && $this->proxy['authtype'] == 'ntlm'))

-			return 'curl';

-		if (($this->scheme == 'http' || $this->scheme == 'ssl') && $this->authtype != 'ntlm' && (!is_array($this->proxy) || $this->proxy['authtype'] != 'ntlm'))

-			return 'socket';

-		return 'unknown';

-	}

-

-	/**

-	* establish an HTTP connection

-	*

-	* @param    integer $timeout set connection timeout in seconds

-	* @param	integer $response_timeout set response timeout in seconds

-	* @return	boolean true if connected, false if not

-	* @access   private

-	*/

-	function connect($connection_timeout=0,$response_timeout=30){

-	  	// For PHP 4.3 with OpenSSL, change https scheme to ssl, then treat like

-	  	// "regular" socket.

-	  	// TODO: disabled for now because OpenSSL must be *compiled* in (not just

-	  	//       loaded), and until PHP5 stream_get_wrappers is not available.

+        }

+

+        // set default port

+        if(!isset($u['port'])){

+            if($u['scheme'] == 'https'){

+                $this->port = 443;

+            } else {

+                $this->port = 80;

+            }

+        }

+

+        $this->uri = $this->path;

+        $this->digest_uri = $this->uri;

+

+        // build headers

+        if (!isset($u['port'])) {

+            $this->setHeader('Host', $this->host);

+        } else {

+            $this->setHeader('Host', $this->host.':'.$this->port);

+        }

+

+        if (isset($u['user']) && $u['user'] != '') {

+            $this->setCredentials(urldecode($u['user']), isset($u['pass']) ? urldecode($u['pass']) : '');

+        }

+    }

+

+    /**

+     * gets the I/O method to use

+     *

+     * @return	string	I/O method to use (socket|curl|unknown)

+     * @access	private

+     */

+    function io_method() {

+        if ($this->use_curl || ($this->scheme == 'https') || ($this->scheme == 'http' && $this->authtype == 'ntlm') || ($this->scheme == 'http' && is_array($this->proxy) && $this->proxy['authtype'] == 'ntlm'))

+            return 'curl';

+        if (($this->scheme == 'http' || $this->scheme == 'ssl') && $this->authtype != 'ntlm' && (!is_array($this->proxy) || $this->proxy['authtype'] != 'ntlm'))

+            return 'socket';

+        return 'unknown';

+    }

+

+    /**

+     * establish an HTTP connection

+     *

+     * @param    integer $timeout set connection timeout in seconds

+     * @param	integer $response_timeout set response timeout in seconds

+     * @return	boolean true if connected, false if not

+     * @access   private

+     */

+    function connect($connection_timeout=0,$response_timeout=30){

+            // For PHP 4.3 with OpenSSL, change https scheme to ssl, then treat like

+            // "regular" socket.

+            // TODO: disabled for now because OpenSSL must be *compiled* in (not just

+            //       loaded), and until PHP5 stream_get_wrappers is not available.

 //	  	if ($this->scheme == 'https') {

 //		  	if (version_compare(phpversion(), '4.3.0') >= 0) {

 //		  		if (extension_loaded('openssl')) {

@@ -184,1120 +184,1120 @@ 
 //		  		}

 //		  	}

 //		}

-		$this->debug("connect connection_timeout $connection_timeout, response_timeout $response_timeout, scheme $this->scheme, host $this->host, port $this->port");

-	  if ($this->io_method() == 'socket') {

-		if (!is_array($this->proxy)) {

-			$host = $this->host;

-			$port = $this->port;

-		} else {

-			$host = $this->proxy['host'];

-			$port = $this->proxy['port'];

-		}

-

-		// use persistent connection

-		if($this->persistentConnection && isset($this->fp) && is_resource($this->fp)){

-			if (!feof($this->fp)) {

-				$this->debug('Re-use persistent connection');

-				return true;

-			}

-			fclose($this->fp);

-			$this->debug('Closed persistent connection at EOF');

-		}

-

-		// munge host if using OpenSSL

-		if ($this->scheme == 'ssl') {

-			$host = 'ssl://' . $host;

-		}

-		$this->debug('calling fsockopen with host ' . $host . ' connection_timeout ' . $connection_timeout);

-

-		// open socket

-		if($connection_timeout > 0){

-			$this->fp = @fsockopen( $host, $this->port, $this->errno, $this->error_str, $connection_timeout);

-		} else {

-			$this->fp = @fsockopen( $host, $this->port, $this->errno, $this->error_str);

-		}

-

-		// test pointer

-		if(!$this->fp) {

-			$msg = 'Couldn\'t open socket connection to server ' . $this->url;

-			if ($this->errno) {

-				$msg .= ', Error ('.$this->errno.'): '.$this->error_str;

-			} else {

-				$msg .= ' prior to connect().  This is often a problem looking up the host name.';

-			}

-			$this->debug($msg);

-			$this->setError($msg);

-			return false;

-		}

-

-		// set response timeout

-		$this->debug('set response timeout to ' . $response_timeout);

-		socket_set_timeout( $this->fp, $response_timeout);

-

-		$this->debug('socket connected');

-		return true;

-	  } else if ($this->io_method() == 'curl') {

-		if (!extension_loaded('curl')) {

+        $this->debug("connect connection_timeout $connection_timeout, response_timeout $response_timeout, scheme $this->scheme, host $this->host, port $this->port");

+        if ($this->io_method() == 'socket') {

+        if (!is_array($this->proxy)) {

+            $host = $this->host;

+            $port = $this->port;

+        } else {

+            $host = $this->proxy['host'];

+            $port = $this->proxy['port'];

+        }

+

+        // use persistent connection

+        if($this->persistentConnection && isset($this->fp) && is_resource($this->fp)){

+            if (!feof($this->fp)) {

+                $this->debug('Re-use persistent connection');

+                return true;

+            }

+            fclose($this->fp);

+            $this->debug('Closed persistent connection at EOF');

+        }

+

+        // munge host if using OpenSSL

+        if ($this->scheme == 'ssl') {

+            $host = 'ssl://' . $host;

+        }

+        $this->debug('calling fsockopen with host ' . $host . ' connection_timeout ' . $connection_timeout);

+

+        // open socket

+        if($connection_timeout > 0){

+            $this->fp = @fsockopen( $host, $this->port, $this->errno, $this->error_str, $connection_timeout);

+        } else {

+            $this->fp = @fsockopen( $host, $this->port, $this->errno, $this->error_str);

+        }

+

+        // test pointer

+        if(!$this->fp) {

+            $msg = 'Couldn\'t open socket connection to server ' . $this->url;

+            if ($this->errno) {

+                $msg .= ', Error ('.$this->errno.'): '.$this->error_str;

+            } else {

+                $msg .= ' prior to connect().  This is often a problem looking up the host name.';

+            }

+            $this->debug($msg);

+            $this->setError($msg);

+            return false;

+        }

+

+        // set response timeout

+        $this->debug('set response timeout to ' . $response_timeout);

+        socket_set_timeout( $this->fp, $response_timeout);

+

+        $this->debug('socket connected');

+        return true;

+        } else if ($this->io_method() == 'curl') {

+        if (!extension_loaded('curl')) {

 //			$this->setError('cURL Extension, or OpenSSL extension w/ PHP version >= 4.3 is required for HTTPS');

-			$this->setError('The PHP cURL Extension is required for HTTPS or NLTM.  You will need to re-build or update your PHP to include cURL or change php.ini to load the PHP cURL extension.');

-			return false;

-		}

-		// Avoid warnings when PHP does not have these options

-		if (defined('CURLOPT_CONNECTIONTIMEOUT'))

-			$CURLOPT_CONNECTIONTIMEOUT = CURLOPT_CONNECTIONTIMEOUT;

-		else

-			$CURLOPT_CONNECTIONTIMEOUT = 78;

-		if (defined('CURLOPT_HTTPAUTH'))

-			$CURLOPT_HTTPAUTH = CURLOPT_HTTPAUTH;

-		else

-			$CURLOPT_HTTPAUTH = 107;

-		if (defined('CURLOPT_PROXYAUTH'))

-			$CURLOPT_PROXYAUTH = CURLOPT_PROXYAUTH;

-		else

-			$CURLOPT_PROXYAUTH = 111;

-		if (defined('CURLAUTH_BASIC'))

-			$CURLAUTH_BASIC = CURLAUTH_BASIC;

-		else

-			$CURLAUTH_BASIC = 1;

-		if (defined('CURLAUTH_DIGEST'))

-			$CURLAUTH_DIGEST = CURLAUTH_DIGEST;

-		else

-			$CURLAUTH_DIGEST = 2;

-		if (defined('CURLAUTH_NTLM'))

-			$CURLAUTH_NTLM = CURLAUTH_NTLM;

-		else

-			$CURLAUTH_NTLM = 8;

-

-		$this->debug('connect using cURL');

-		// init CURL

-		$this->ch = curl_init();

-		// set url

-		$hostURL = ($this->port != '') ? "$this->scheme://$this->host:$this->port" : "$this->scheme://$this->host";

-		// add path

-		$hostURL .= $this->path;

-		$this->setCurlOption(CURLOPT_URL, $hostURL);

-		// follow location headers (re-directs)

-		if (ini_get('safe_mode') || ini_get('open_basedir')) {

-			$this->debug('safe_mode or open_basedir set, so do not set CURLOPT_FOLLOWLOCATION');

-			$this->debug('safe_mode = ');

-			$this->appendDebug($this->varDump(ini_get('safe_mode')));

-			$this->debug('open_basedir = ');

-			$this->appendDebug($this->varDump(ini_get('open_basedir')));

-		} else {

-			$this->setCurlOption(CURLOPT_FOLLOWLOCATION, 1);

-		}

-		// ask for headers in the response output

-		$this->setCurlOption(CURLOPT_HEADER, 1);

-		// ask for the response output as the return value

-		$this->setCurlOption(CURLOPT_RETURNTRANSFER, 1);

-		// encode

-		// We manage this ourselves through headers and encoding

+            $this->setError('The PHP cURL Extension is required for HTTPS or NLTM.  You will need to re-build or update your PHP to include cURL or change php.ini to load the PHP cURL extension.');

+            return false;

+        }

+        // Avoid warnings when PHP does not have these options

+        if (defined('CURLOPT_CONNECTIONTIMEOUT'))

+            $CURLOPT_CONNECTIONTIMEOUT = CURLOPT_CONNECTIONTIMEOUT;

+        else

+            $CURLOPT_CONNECTIONTIMEOUT = 78;

+        if (defined('CURLOPT_HTTPAUTH'))

+            $CURLOPT_HTTPAUTH = CURLOPT_HTTPAUTH;

+        else

+            $CURLOPT_HTTPAUTH = 107;

+        if (defined('CURLOPT_PROXYAUTH'))

+            $CURLOPT_PROXYAUTH = CURLOPT_PROXYAUTH;

+        else

+            $CURLOPT_PROXYAUTH = 111;

+        if (defined('CURLAUTH_BASIC'))

+            $CURLAUTH_BASIC = CURLAUTH_BASIC;

+        else

+            $CURLAUTH_BASIC = 1;

+        if (defined('CURLAUTH_DIGEST'))

+            $CURLAUTH_DIGEST = CURLAUTH_DIGEST;

+        else

+            $CURLAUTH_DIGEST = 2;

+        if (defined('CURLAUTH_NTLM'))

+            $CURLAUTH_NTLM = CURLAUTH_NTLM;

+        else

+            $CURLAUTH_NTLM = 8;

+

+        $this->debug('connect using cURL');

+        // init CURL

+        $this->ch = curl_init();

+        // set url

+        $hostURL = ($this->port != '') ? "$this->scheme://$this->host:$this->port" : "$this->scheme://$this->host";

+        // add path

+        $hostURL .= $this->path;

+        $this->setCurlOption(CURLOPT_URL, $hostURL);

+        // follow location headers (re-directs)

+        if (ini_get('safe_mode') || ini_get('open_basedir')) {

+            $this->debug('safe_mode or open_basedir set, so do not set CURLOPT_FOLLOWLOCATION');

+            $this->debug('safe_mode = ');

+            $this->appendDebug($this->varDump(ini_get('safe_mode')));

+            $this->debug('open_basedir = ');

+            $this->appendDebug($this->varDump(ini_get('open_basedir')));

+        } else {

+            $this->setCurlOption(CURLOPT_FOLLOWLOCATION, 1);

+        }

+        // ask for headers in the response output

+        $this->setCurlOption(CURLOPT_HEADER, 1);

+        // ask for the response output as the return value

+        $this->setCurlOption(CURLOPT_RETURNTRANSFER, 1);

+        // encode

+        // We manage this ourselves through headers and encoding

 //		if(function_exists('gzuncompress')){

 //			$this->setCurlOption(CURLOPT_ENCODING, 'deflate');

 //		}

-		// persistent connection

-		if ($this->persistentConnection) {

-			// I believe the following comment is now bogus, having applied to

-			// the code when it used CURLOPT_CUSTOMREQUEST to send the request.

-			// The way we send data, we cannot use persistent connections, since

-			// there will be some "junk" at the end of our request.

-			//$this->setCurlOption(CURL_HTTP_VERSION_1_1, true);

-			$this->persistentConnection = false;

-			$this->setHeader('Connection', 'close');

-		}

-		// set timeouts

-		if ($connection_timeout != 0) {

-			$this->setCurlOption($CURLOPT_CONNECTIONTIMEOUT, $connection_timeout);

-		}

-		if ($response_timeout != 0) {

-			$this->setCurlOption(CURLOPT_TIMEOUT, $response_timeout);

-		}

-

-		if ($this->scheme == 'https') {

-			$this->debug('set cURL SSL verify options');

-			// recent versions of cURL turn on peer/host checking by default,

-			// while PHP binaries are not compiled with a default location for the

-			// CA cert bundle, so disable peer/host checking.

-			//$this->setCurlOption(CURLOPT_CAINFO, 'f:\php-4.3.2-win32\extensions\curl-ca-bundle.crt');

-			$this->setCurlOption(CURLOPT_SSL_VERIFYPEER, 0);

-			$this->setCurlOption(CURLOPT_SSL_VERIFYHOST, 0);

-

-			// support client certificates (thanks Tobias Boes, Doug Anarino, Eryan Ariobowo)

-			if ($this->authtype == 'certificate') {

-				$this->debug('set cURL certificate options');

-				if (isset($this->certRequest['cainfofile'])) {

-					$this->setCurlOption(CURLOPT_CAINFO, $this->certRequest['cainfofile']);

-				}

-				if (isset($this->certRequest['verifypeer'])) {

-					$this->setCurlOption(CURLOPT_SSL_VERIFYPEER, $this->certRequest['verifypeer']);

-				} else {

-					$this->setCurlOption(CURLOPT_SSL_VERIFYPEER, 1);

-				}

-				if (isset($this->certRequest['verifyhost'])) {

-					$this->setCurlOption(CURLOPT_SSL_VERIFYHOST, $this->certRequest['verifyhost']);

-				} else {

-					$this->setCurlOption(CURLOPT_SSL_VERIFYHOST, 1);

-				}

-				if (isset($this->certRequest['sslcertfile'])) {

-					$this->setCurlOption(CURLOPT_SSLCERT, $this->certRequest['sslcertfile']);

-				}

-				if (isset($this->certRequest['sslkeyfile'])) {

-					$this->setCurlOption(CURLOPT_SSLKEY, $this->certRequest['sslkeyfile']);

-				}

-				if (isset($this->certRequest['passphrase'])) {

-					$this->setCurlOption(CURLOPT_SSLKEYPASSWD, $this->certRequest['passphrase']);

-				}

-				if (isset($this->certRequest['certpassword'])) {

-					$this->setCurlOption(CURLOPT_SSLCERTPASSWD, $this->certRequest['certpassword']);

-				}

-			}

-		}

-		if ($this->authtype && ($this->authtype != 'certificate')) {

-			if ($this->username) {

-				$this->debug('set cURL username/password');

-				$this->setCurlOption(CURLOPT_USERPWD, "$this->username:$this->password");

-			}

-			if ($this->authtype == 'basic') {

-				$this->debug('set cURL for Basic authentication');

-				$this->setCurlOption($CURLOPT_HTTPAUTH, $CURLAUTH_BASIC);

-			}

-			if ($this->authtype == 'digest') {

-				$this->debug('set cURL for digest authentication');

-				$this->setCurlOption($CURLOPT_HTTPAUTH, $CURLAUTH_DIGEST);

-			}

-			if ($this->authtype == 'ntlm') {

-				$this->debug('set cURL for NTLM authentication');

-				$this->setCurlOption($CURLOPT_HTTPAUTH, $CURLAUTH_NTLM);

-			}

-		}

-		if (is_array($this->proxy)) {

-			$this->debug('set cURL proxy options');

-			if ($this->proxy['port'] != '') {

-				$this->setCurlOption(CURLOPT_PROXY, $this->proxy['host'].':'.$this->proxy['port']);

-			} else {

-				$this->setCurlOption(CURLOPT_PROXY, $this->proxy['host']);

-			}

-			if ($this->proxy['username'] || $this->proxy['password']) {

-				$this->debug('set cURL proxy authentication options');

-				$this->setCurlOption(CURLOPT_PROXYUSERPWD, $this->proxy['username'].':'.$this->proxy['password']);

-				if ($this->proxy['authtype'] == 'basic') {

-					$this->setCurlOption($CURLOPT_PROXYAUTH, $CURLAUTH_BASIC);

-				}

-				if ($this->proxy['authtype'] == 'ntlm') {

-					$this->setCurlOption($CURLOPT_PROXYAUTH, $CURLAUTH_NTLM);

-				}

-			}

-		}

-		$this->debug('cURL connection set up');

-		return true;

-	  } else {

-		$this->setError('Unknown scheme ' . $this->scheme);

-		$this->debug('Unknown scheme ' . $this->scheme);

-		return false;

-	  }

-	}

-

-	/**

-	* sends the SOAP request and gets the SOAP response via HTTP[S]

-	*

-	* @param    string $data message data

-	* @param    integer $timeout set connection timeout in seconds

-	* @param	integer $response_timeout set response timeout in seconds

-	* @param	array $cookies cookies to send

-	* @return	string data

-	* @access   public

-	*/

-	function send($data, $timeout=0, $response_timeout=30, $cookies=NULL) {

-

-		$this->debug('entered send() with data of length: '.strlen($data));

-

-		$this->tryagain = true;

-		$tries = 0;

-		while ($this->tryagain) {

-			$this->tryagain = false;

-			if ($tries++ < 2) {

-				// make connnection

-				if (!$this->connect($timeout, $response_timeout)){

-					return false;

-				}

-

-				// send request

-				if (!$this->sendRequest($data, $cookies)){

-					return false;

-				}

-

-				// get response

-				$respdata = $this->getResponse();

-			} else {

-				$this->setError("Too many tries to get an OK response ($this->response_status_line)");

-			}

-		}

-		$this->debug('end of send()');

-		return $respdata;

-	}

-

-

-	/**

-	* sends the SOAP request and gets the SOAP response via HTTPS using CURL

-	*

-	* @param    string $data message data

-	* @param    integer $timeout set connection timeout in seconds

-	* @param	integer $response_timeout set response timeout in seconds

-	* @param	array $cookies cookies to send

-	* @return	string data

-	* @access   public

-	* @deprecated

-	*/

-	function sendHTTPS($data, $timeout=0, $response_timeout=30, $cookies) {

-		return $this->send($data, $timeout, $response_timeout, $cookies);

-	}

-

-	/**

-	* if authenticating, set user credentials here

-	*

-	* @param    string $username

-	* @param    string $password

-	* @param	string $authtype (basic|digest|certificate|ntlm)

-	* @param	array $digestRequest (keys must be nonce, nc, realm, qop)

-	* @param	array $certRequest (keys must be cainfofile (optional), sslcertfile, sslkeyfile, passphrase, certpassword (optional), verifypeer (optional), verifyhost (optional): see corresponding options in cURL docs)

-	* @access   public

-	*/

-	function setCredentials($username, $password, $authtype = 'basic', $digestRequest = array(), $certRequest = array()) {

-		$this->debug("setCredentials username=$username authtype=$authtype digestRequest=");

-		$this->appendDebug($this->varDump($digestRequest));

-		$this->debug("certRequest=");

-		$this->appendDebug($this->varDump($certRequest));

-		// cf. RFC 2617

-		if ($authtype == 'basic') {

-			$this->setHeader('Authorization', 'Basic '.base64_encode(str_replace(':','',$username).':'.$password));

-		} elseif ($authtype == 'digest') {

-			if (isset($digestRequest['nonce'])) {

-				$digestRequest['nc'] = isset($digestRequest['nc']) ? $digestRequest['nc']++ : 1;

-

-				// calculate the Digest hashes (calculate code based on digest implementation found at: http://www.rassoc.com/gregr/weblog/stories/2002/07/09/webServicesSecurityHttpDigestAuthenticationWithoutActiveDirectory.html)

-

-				// A1 = unq(username-value) ":" unq(realm-value) ":" passwd

-				$A1 = $username. ':' . (isset($digestRequest['realm']) ? $digestRequest['realm'] : '') . ':' . $password;

-

-				// H(A1) = MD5(A1)

-				$HA1 = md5($A1);

-

-				// A2 = Method ":" digest-uri-value

-				$A2 = $this->request_method . ':' . $this->digest_uri;

-

-				// H(A2)

-				$HA2 =  md5($A2);

-

-				// KD(secret, data) = H(concat(secret, ":", data))

-				// if qop == auth:

-				// request-digest  = <"> < KD ( H(A1),     unq(nonce-value)

-				//                              ":" nc-value

-				//                              ":" unq(cnonce-value)

-				//                              ":" unq(qop-value)

-				//                              ":" H(A2)

-				//                            ) <">

-				// if qop is missing,

-				// request-digest  = <"> < KD ( H(A1), unq(nonce-value) ":" H(A2) ) > <">

-

-				$unhashedDigest = '';

-				$nonce = isset($digestRequest['nonce']) ? $digestRequest['nonce'] : '';

-				$cnonce = $nonce;

-				if ($digestRequest['qop'] != '') {

-					$unhashedDigest = $HA1 . ':' . $nonce . ':' . sprintf("%08d", $digestRequest['nc']) . ':' . $cnonce . ':' . $digestRequest['qop'] . ':' . $HA2;

-				} else {

-					$unhashedDigest = $HA1 . ':' . $nonce . ':' . $HA2;

-				}

-

-				$hashedDigest = md5($unhashedDigest);

-

-				$opaque = '';

-				if (isset($digestRequest['opaque'])) {

-					$opaque = ', opaque="' . $digestRequest['opaque'] . '"';

-				}

-

-				$this->setHeader('Authorization', 'Digest username="' . $username . '", realm="' . $digestRequest['realm'] . '", nonce="' . $nonce . '", uri="' . $this->digest_uri . $opaque . '", cnonce="' . $cnonce . '", nc=' . sprintf("%08x", $digestRequest['nc']) . ', qop="' . $digestRequest['qop'] . '", response="' . $hashedDigest . '"');

-			}

-		} elseif ($authtype == 'certificate') {

-			$this->certRequest = $certRequest;

-			$this->debug('Authorization header not set for certificate');

-		} elseif ($authtype == 'ntlm') {

-			// do nothing

-			$this->debug('Authorization header not set for ntlm');

-		}

-		$this->username = $username;

-		$this->password = $password;

-		$this->authtype = $authtype;

-		$this->digestRequest = $digestRequest;

-	}

-

-	/**

-	* set the soapaction value

-	*

-	* @param    string $soapaction

-	* @access   public

-	*/

-	function setSOAPAction($soapaction) {

-		$this->setHeader('SOAPAction', '"' . $soapaction . '"');

-	}

-

-	/**

-	* use http encoding

-	*

-	* @param    string $enc encoding style. supported values: gzip, deflate, or both

-	* @access   public

-	*/

-	function setEncoding($enc='gzip, deflate') {

-		if (function_exists('gzdeflate')) {

-			$this->protocol_version = '1.1';

-			$this->setHeader('Accept-Encoding', $enc);

-			if (!isset($this->outgoing_headers['Connection'])) {

-				$this->setHeader('Connection', 'close');

-				$this->persistentConnection = false;

-			}

-			// deprecated as of PHP 5.3.0

-			//set_magic_quotes_runtime(0);

-			$this->encoding = $enc;

-		}

-	}

-

-	/**

-	* set proxy info here

-	*

-	* @param    string $proxyhost use an empty string to remove proxy

-	* @param    string $proxyport

-	* @param	string $proxyusername

-	* @param	string $proxypassword

-	* @param	string $proxyauthtype (basic|ntlm)

-	* @access   public

-	*/

-	function setProxy($proxyhost, $proxyport, $proxyusername = '', $proxypassword = '', $proxyauthtype = 'basic') {

-		if ($proxyhost) {

-			$this->proxy = array(

-				'host' => $proxyhost,

-				'port' => $proxyport,

-				'username' => $proxyusername,

-				'password' => $proxypassword,

-				'authtype' => $proxyauthtype

-			);

-			if ($proxyusername != '' && $proxypassword != '' && $proxyauthtype = 'basic') {

-				$this->setHeader('Proxy-Authorization', ' Basic '.base64_encode($proxyusername.':'.$proxypassword));

-			}

-		} else {

-			$this->debug('remove proxy');

-			$proxy = null;

-			unsetHeader('Proxy-Authorization');

-		}

-	}

-

-

-	/**

-	 * Test if the given string starts with a header that is to be skipped.

-	 * Skippable headers result from chunked transfer and proxy requests.

-	 *

-	 * @param	string $data The string to check.

-	 * @returns	boolean	Whether a skippable header was found.

-	 * @access	private

-	 */

-	function isSkippableCurlHeader(&$data) {

-		$skipHeaders = array(	'HTTP/1.1 100',

-								'HTTP/1.0 301',

-								'HTTP/1.1 301',

-								'HTTP/1.0 302',

-								'HTTP/1.1 302',

-								'HTTP/1.0 401',

-								'HTTP/1.1 401',

-								'HTTP/1.0 200 Connection established');

-		foreach ($skipHeaders as $hd) {

-			$prefix = substr($data, 0, strlen($hd));

-			if ($prefix == $hd) return true;

-		}

-

-		return false;

-	}

-

-	/**

-	* decode a string that is encoded w/ "chunked' transfer encoding

- 	* as defined in RFC2068 19.4.6

-	*

-	* @param    string $buffer

-	* @param    string $lb

-	* @returns	string

-	* @access   public

-	* @deprecated

-	*/

-	function decodeChunked($buffer, $lb){

-		// length := 0

-		$length = 0;

-		$new = '';

-

-		// read chunk-size, chunk-extension (if any) and CRLF

-		// get the position of the linebreak

-		$chunkend = strpos($buffer, $lb);

-		if ($chunkend == FALSE) {

-			$this->debug('no linebreak found in decodeChunked');

-			return $new;

-		}

-		$temp = substr($buffer,0,$chunkend);

-		$chunk_size = hexdec( trim($temp) );

-		$chunkstart = $chunkend + strlen($lb);

-		// while (chunk-size > 0) {

-		while ($chunk_size > 0) {

-			$this->debug("chunkstart: $chunkstart chunk_size: $chunk_size");

-			$chunkend = strpos( $buffer, $lb, $chunkstart + $chunk_size);

-

-			// Just in case we got a broken connection

-		  	if ($chunkend == FALSE) {

-		  	    $chunk = substr($buffer,$chunkstart);

-				// append chunk-data to entity-body

-		    	$new .= $chunk;

-		  	    $length += strlen($chunk);

-		  	    break;

-			}

-

-		  	// read chunk-data and CRLF

-		  	$chunk = substr($buffer,$chunkstart,$chunkend-$chunkstart);

-		  	// append chunk-data to entity-body

-		  	$new .= $chunk;

-		  	// length := length + chunk-size

-		  	$length += strlen($chunk);

-		  	// read chunk-size and CRLF

-		  	$chunkstart = $chunkend + strlen($lb);

-

-		  	$chunkend = strpos($buffer, $lb, $chunkstart) + strlen($lb);

-			if ($chunkend == FALSE) {

-				break; //Just in case we got a broken connection

-			}

-			$temp = substr($buffer,$chunkstart,$chunkend-$chunkstart);

-			$chunk_size = hexdec( trim($temp) );

-			$chunkstart = $chunkend;

-		}

-		return $new;

-	}

-

-	/**

-	 * Writes the payload, including HTTP headers, to $this->outgoing_payload.

-	 *

-	 * @param	string $data HTTP body

-	 * @param	string $cookie_str data for HTTP Cookie header

-	 * @return	void

-	 * @access	private

-	 */

-	function buildPayload($data, $cookie_str = '') {

-		// Note: for cURL connections, $this->outgoing_payload is ignored,

-		// as is the Content-Length header, but these are still created as

-		// debugging guides.

-

-		// add content-length header

-		if ($this->request_method != 'GET') {

-			$this->setHeader('Content-Length', strlen($data));

-		}

-

-		// start building outgoing payload:

-		if ($this->proxy) {

-			$uri = $this->url;

-		} else {

-			$uri = $this->uri;

-		}

-		$req = "$this->request_method $uri HTTP/$this->protocol_version";

-		$this->debug("HTTP request: $req");

-		$this->outgoing_payload = "$req\r\n";

-

-		// loop thru headers, serializing

-		foreach($this->outgoing_headers as $k => $v){

-			$hdr = $k.': '.$v;

-			$this->debug("HTTP header: $hdr");

-			$this->outgoing_payload .= "$hdr\r\n";

-		}

-

-		// add any cookies

-		if ($cookie_str != '') {

-			$hdr = 'Cookie: '.$cookie_str;

-			$this->debug("HTTP header: $hdr");

-			$this->outgoing_payload .= "$hdr\r\n";

-		}

-

-		// header/body separator

-		$this->outgoing_payload .= "\r\n";

-

-		// add data

-		$this->outgoing_payload .= $data;

-	}

-

-	/**

-	* sends the SOAP request via HTTP[S]

-	*

-	* @param    string $data message data

-	* @param	array $cookies cookies to send

-	* @return	boolean	true if OK, false if problem

-	* @access   private

-	*/

-	function sendRequest($data, $cookies = NULL) {

-		// build cookie string

-		$cookie_str = $this->getCookiesForRequest($cookies, (($this->scheme == 'ssl') || ($this->scheme == 'https')));

-

-		// build payload

-		$this->buildPayload($data, $cookie_str);

-

-	  if ($this->io_method() == 'socket') {

-		// send payload

-		if(!fputs($this->fp, $this->outgoing_payload, strlen($this->outgoing_payload))) {

-			$this->setError('couldn\'t write message data to socket');

-			$this->debug('couldn\'t write message data to socket');

-			return false;

-		}

-		$this->debug('wrote data to socket, length = ' . strlen($this->outgoing_payload));

-		return true;

-	  } else if ($this->io_method() == 'curl') {

-		// set payload

-		// cURL does say this should only be the verb, and in fact it

-		// turns out that the URI and HTTP version are appended to this, which

-		// some servers refuse to work with (so we no longer use this method!)

-		//$this->setCurlOption(CURLOPT_CUSTOMREQUEST, $this->outgoing_payload);

-		$curl_headers = array();

-		foreach($this->outgoing_headers as $k => $v){

-			if ($k == 'Connection' || $k == 'Content-Length' || $k == 'Host' || $k == 'Authorization' || $k == 'Proxy-Authorization') {

-				$this->debug("Skip cURL header $k: $v");

-			} else {

-				$curl_headers[] = "$k: $v";

-			}

-		}

-		if ($cookie_str != '') {

-			$curl_headers[] = 'Cookie: ' . $cookie_str;

-		}

-		$this->setCurlOption(CURLOPT_HTTPHEADER, $curl_headers);

-		$this->debug('set cURL HTTP headers');

-		if ($this->request_method == "POST") {

-	  		$this->setCurlOption(CURLOPT_POST, 1);

-	  		$this->setCurlOption(CURLOPT_POSTFIELDS, $data);

-			$this->debug('set cURL POST data');

-	  	} else {

-	  	}

-		// insert custom user-set cURL options

-		foreach ($this->ch_options as $key => $val) {

-			$this->setCurlOption($key, $val);

-		}

-

-		$this->debug('set cURL payload');

-		return true;

-	  }

-	}

-

-	/**

-	* gets the SOAP response via HTTP[S]

-	*

-	* @return	string the response (also sets member variables like incoming_payload)

-	* @access   private

-	*/

-	function getResponse(){

-		$this->incoming_payload = '';

-

-	  if ($this->io_method() == 'socket') {

-	    // loop until headers have been retrieved

-	    $data = '';

-	    while (!isset($lb)){

-

-			// We might EOF during header read.

-			if(feof($this->fp)) {

-				$this->incoming_payload = $data;

-				$this->debug('found no headers before EOF after length ' . strlen($data));

-				$this->debug("received before EOF:\n" . $data);

-				$this->setError('server failed to send headers');

-				return false;

-			}

-

-			$tmp = fgets($this->fp, 256);

-			$tmplen = strlen($tmp);

-			$this->debug("read line of $tmplen bytes: " . trim($tmp));

-

-			if ($tmplen == 0) {

-				$this->incoming_payload = $data;

-				$this->debug('socket read of headers timed out after length ' . strlen($data));

-				$this->debug("read before timeout: " . $data);

-				$this->setError('socket read of headers timed out');

-				return false;

-			}

-

-			$data .= $tmp;

-			$pos = strpos($data,"\r\n\r\n");

-			if($pos > 1){

-				$lb = "\r\n";

-			} else {

-				$pos = strpos($data,"\n\n");

-				if($pos > 1){

-					$lb = "\n";

-				}

-			}

-			// remove 100 headers

-			if (isset($lb) && preg_match('/^HTTP\/1.1 100/',$data)) {

-				unset($lb);

-				$data = '';

-			}//

-		}

-		// store header data

-		$this->incoming_payload .= $data;

-		$this->debug('found end of headers after length ' . strlen($data));

-		// process headers

-		$header_data = trim(substr($data,0,$pos));

-		$header_array = explode($lb,$header_data);

-		$this->incoming_headers = array();

-		$this->incoming_cookies = array();

-		foreach($header_array as $header_line){

-			$arr = explode(':',$header_line, 2);

-			if(count($arr) > 1){

-				$header_name = strtolower(trim($arr[0]));

-				$this->incoming_headers[$header_name] = trim($arr[1]);

-				if ($header_name == 'set-cookie') {

-					// TODO: allow multiple cookies from parseCookie

-					$cookie = $this->parseCookie(trim($arr[1]));

-					if ($cookie) {

-						$this->incoming_cookies[] = $cookie;

-						$this->debug('found cookie: ' . $cookie['name'] . ' = ' . $cookie['value']);

-					} else {

-						$this->debug('did not find cookie in ' . trim($arr[1]));

-					}

-    			}

-			} else if (isset($header_name)) {

-				// append continuation line to previous header

-				$this->incoming_headers[$header_name] .= $lb . ' ' . $header_line;

-			}

-		}

-

-		// loop until msg has been received

-		if (isset($this->incoming_headers['transfer-encoding']) && strtolower($this->incoming_headers['transfer-encoding']) == 'chunked') {

-			$content_length =  2147483647;	// ignore any content-length header

-			$chunked = true;

-			$this->debug("want to read chunked content");

-		} elseif (isset($this->incoming_headers['content-length'])) {

-			$content_length = $this->incoming_headers['content-length'];

-			$chunked = false;

-			$this->debug("want to read content of length $content_length");

-		} else {

-			$content_length =  2147483647;

-			$chunked = false;

-			$this->debug("want to read content to EOF");

-		}

-		$data = '';

-		do {

-			if ($chunked) {

-				$tmp = fgets($this->fp, 256);

-				$tmplen = strlen($tmp);

-				$this->debug("read chunk line of $tmplen bytes");

-				if ($tmplen == 0) {

-					$this->incoming_payload = $data;

-					$this->debug('socket read of chunk length timed out after length ' . strlen($data));

-					$this->debug("read before timeout:\n" . $data);

-					$this->setError('socket read of chunk length timed out');

-					return false;

-				}

-				$content_length = hexdec(trim($tmp));

-				$this->debug("chunk length $content_length");

-			}

-			$strlen = 0;

-		    while (($strlen < $content_length) && (!feof($this->fp))) {

-		    	$readlen = min(8192, $content_length - $strlen);

-				$tmp = fread($this->fp, $readlen);

-				$tmplen = strlen($tmp);

-				$this->debug("read buffer of $tmplen bytes");

-				if (($tmplen == 0) && (!feof($this->fp))) {

-					$this->incoming_payload = $data;

-					$this->debug('socket read of body timed out after length ' . strlen($data));

-					$this->debug("read before timeout:\n" . $data);

-					$this->setError('socket read of body timed out');

-					return false;

-				}

-				$strlen += $tmplen;

-				$data .= $tmp;

-			}

-			if ($chunked && ($content_length > 0)) {

-				$tmp = fgets($this->fp, 256);

-				$tmplen = strlen($tmp);

-				$this->debug("read chunk terminator of $tmplen bytes");

-				if ($tmplen == 0) {

-					$this->incoming_payload = $data;

-					$this->debug('socket read of chunk terminator timed out after length ' . strlen($data));

-					$this->debug("read before timeout:\n" . $data);

-					$this->setError('socket read of chunk terminator timed out');

-					return false;

-				}

-			}

-		} while ($chunked && ($content_length > 0) && (!feof($this->fp)));

-		if (feof($this->fp)) {

-			$this->debug('read to EOF');

-		}

-		$this->debug('read body of length ' . strlen($data));

-		$this->incoming_payload .= $data;

-		$this->debug('received a total of '.strlen($this->incoming_payload).' bytes of data from server');

-

-		// close filepointer

-		if(

-			(isset($this->incoming_headers['connection']) && strtolower($this->incoming_headers['connection']) == 'close') ||

-			(! $this->persistentConnection) || feof($this->fp)){

-			fclose($this->fp);

-			$this->fp = false;

-			$this->debug('closed socket');

-		}

-

-		// connection was closed unexpectedly

-		if($this->incoming_payload == ''){

-			$this->setError('no response from server');

-			return false;

-		}

-

-		// decode transfer-encoding

+        // persistent connection

+        if ($this->persistentConnection) {

+            // I believe the following comment is now bogus, having applied to

+            // the code when it used CURLOPT_CUSTOMREQUEST to send the request.

+            // The way we send data, we cannot use persistent connections, since

+            // there will be some "junk" at the end of our request.

+            //$this->setCurlOption(CURL_HTTP_VERSION_1_1, true);

+            $this->persistentConnection = false;

+            $this->setHeader('Connection', 'close');

+        }

+        // set timeouts

+        if ($connection_timeout != 0) {

+            $this->setCurlOption($CURLOPT_CONNECTIONTIMEOUT, $connection_timeout);

+        }

+        if ($response_timeout != 0) {

+            $this->setCurlOption(CURLOPT_TIMEOUT, $response_timeout);

+        }

+

+        if ($this->scheme == 'https') {

+            $this->debug('set cURL SSL verify options');

+            // recent versions of cURL turn on peer/host checking by default,

+            // while PHP binaries are not compiled with a default location for the

+            // CA cert bundle, so disable peer/host checking.

+            //$this->setCurlOption(CURLOPT_CAINFO, 'f:\php-4.3.2-win32\extensions\curl-ca-bundle.crt');

+            $this->setCurlOption(CURLOPT_SSL_VERIFYPEER, 0);

+            $this->setCurlOption(CURLOPT_SSL_VERIFYHOST, 0);

+

+            // support client certificates (thanks Tobias Boes, Doug Anarino, Eryan Ariobowo)

+            if ($this->authtype == 'certificate') {

+                $this->debug('set cURL certificate options');

+                if (isset($this->certRequest['cainfofile'])) {

+                    $this->setCurlOption(CURLOPT_CAINFO, $this->certRequest['cainfofile']);

+                }

+                if (isset($this->certRequest['verifypeer'])) {

+                    $this->setCurlOption(CURLOPT_SSL_VERIFYPEER, $this->certRequest['verifypeer']);

+                } else {

+                    $this->setCurlOption(CURLOPT_SSL_VERIFYPEER, 1);

+                }

+                if (isset($this->certRequest['verifyhost'])) {

+                    $this->setCurlOption(CURLOPT_SSL_VERIFYHOST, $this->certRequest['verifyhost']);

+                } else {

+                    $this->setCurlOption(CURLOPT_SSL_VERIFYHOST, 1);

+                }

+                if (isset($this->certRequest['sslcertfile'])) {

+                    $this->setCurlOption(CURLOPT_SSLCERT, $this->certRequest['sslcertfile']);

+                }

+                if (isset($this->certRequest['sslkeyfile'])) {

+                    $this->setCurlOption(CURLOPT_SSLKEY, $this->certRequest['sslkeyfile']);

+                }

+                if (isset($this->certRequest['passphrase'])) {

+                    $this->setCurlOption(CURLOPT_SSLKEYPASSWD, $this->certRequest['passphrase']);

+                }

+                if (isset($this->certRequest['certpassword'])) {

+                    $this->setCurlOption(CURLOPT_SSLCERTPASSWD, $this->certRequest['certpassword']);

+                }

+            }

+        }

+        if ($this->authtype && ($this->authtype != 'certificate')) {

+            if ($this->username) {

+                $this->debug('set cURL username/password');

+                $this->setCurlOption(CURLOPT_USERPWD, "$this->username:$this->password");

+            }

+            if ($this->authtype == 'basic') {

+                $this->debug('set cURL for Basic authentication');

+                $this->setCurlOption($CURLOPT_HTTPAUTH, $CURLAUTH_BASIC);

+            }

+            if ($this->authtype == 'digest') {

+                $this->debug('set cURL for digest authentication');

+                $this->setCurlOption($CURLOPT_HTTPAUTH, $CURLAUTH_DIGEST);

+            }

+            if ($this->authtype == 'ntlm') {

+                $this->debug('set cURL for NTLM authentication');

+                $this->setCurlOption($CURLOPT_HTTPAUTH, $CURLAUTH_NTLM);

+            }

+        }

+        if (is_array($this->proxy)) {

+            $this->debug('set cURL proxy options');

+            if ($this->proxy['port'] != '') {

+                $this->setCurlOption(CURLOPT_PROXY, $this->proxy['host'].':'.$this->proxy['port']);

+            } else {

+                $this->setCurlOption(CURLOPT_PROXY, $this->proxy['host']);

+            }

+            if ($this->proxy['username'] || $this->proxy['password']) {

+                $this->debug('set cURL proxy authentication options');

+                $this->setCurlOption(CURLOPT_PROXYUSERPWD, $this->proxy['username'].':'.$this->proxy['password']);

+                if ($this->proxy['authtype'] == 'basic') {

+                    $this->setCurlOption($CURLOPT_PROXYAUTH, $CURLAUTH_BASIC);

+                }

+                if ($this->proxy['authtype'] == 'ntlm') {

+                    $this->setCurlOption($CURLOPT_PROXYAUTH, $CURLAUTH_NTLM);

+                }

+            }

+        }

+        $this->debug('cURL connection set up');

+        return true;

+        } else {

+        $this->setError('Unknown scheme ' . $this->scheme);

+        $this->debug('Unknown scheme ' . $this->scheme);

+        return false;

+        }

+    }

+

+    /**

+     * sends the SOAP request and gets the SOAP response via HTTP[S]

+     *

+     * @param    string $data message data

+     * @param    integer $timeout set connection timeout in seconds

+     * @param	integer $response_timeout set response timeout in seconds

+     * @param	array $cookies cookies to send

+     * @return	string data

+     * @access   public

+     */

+    function send($data, $timeout=0, $response_timeout=30, $cookies=NULL) {

+

+        $this->debug('entered send() with data of length: '.strlen($data));

+

+        $this->tryagain = true;

+        $tries = 0;

+        while ($this->tryagain) {

+            $this->tryagain = false;

+            if ($tries++ < 2) {

+                // make connnection

+                if (!$this->connect($timeout, $response_timeout)){

+                    return false;

+                }

+

+                // send request

+                if (!$this->sendRequest($data, $cookies)){

+                    return false;

+                }

+

+                // get response

+                $respdata = $this->getResponse();

+            } else {

+                $this->setError("Too many tries to get an OK response ($this->response_status_line)");

+            }

+        }

+        $this->debug('end of send()');

+        return $respdata;

+    }

+

+

+    /**

+     * sends the SOAP request and gets the SOAP response via HTTPS using CURL

+     *

+     * @param    string $data message data

+     * @param    integer $timeout set connection timeout in seconds

+     * @param	integer $response_timeout set response timeout in seconds

+     * @param	array $cookies cookies to send

+     * @return	string data

+     * @access   public

+     * @deprecated

+     */

+    function sendHTTPS($data, $timeout=0, $response_timeout=30, $cookies) {

+        return $this->send($data, $timeout, $response_timeout, $cookies);

+    }

+

+    /**

+     * if authenticating, set user credentials here

+     *

+     * @param    string $username

+     * @param    string $password

+     * @param	string $authtype (basic|digest|certificate|ntlm)

+     * @param	array $digestRequest (keys must be nonce, nc, realm, qop)

+     * @param	array $certRequest (keys must be cainfofile (optional), sslcertfile, sslkeyfile, passphrase, certpassword (optional), verifypeer (optional), verifyhost (optional): see corresponding options in cURL docs)

+     * @access   public

+     */

+    function setCredentials($username, $password, $authtype = 'basic', $digestRequest = array(), $certRequest = array()) {

+        $this->debug("setCredentials username=$username authtype=$authtype digestRequest=");

+        $this->appendDebug($this->varDump($digestRequest));

+        $this->debug("certRequest=");

+        $this->appendDebug($this->varDump($certRequest));

+        // cf. RFC 2617

+        if ($authtype == 'basic') {

+            $this->setHeader('Authorization', 'Basic '.base64_encode(str_replace(':','',$username).':'.$password));

+        } elseif ($authtype == 'digest') {

+            if (isset($digestRequest['nonce'])) {

+                $digestRequest['nc'] = isset($digestRequest['nc']) ? $digestRequest['nc']++ : 1;

+

+                // calculate the Digest hashes (calculate code based on digest implementation found at: http://www.rassoc.com/gregr/weblog/stories/2002/07/09/webServicesSecurityHttpDigestAuthenticationWithoutActiveDirectory.html)

+

+                // A1 = unq(username-value) ":" unq(realm-value) ":" passwd

+                $A1 = $username. ':' . (isset($digestRequest['realm']) ? $digestRequest['realm'] : '') . ':' . $password;

+

+                // H(A1) = MD5(A1)

+                $HA1 = md5($A1);

+

+                // A2 = Method ":" digest-uri-value

+                $A2 = $this->request_method . ':' . $this->digest_uri;

+

+                // H(A2)

+                $HA2 =  md5($A2);

+

+                // KD(secret, data) = H(concat(secret, ":", data))

+                // if qop == auth:

+                // request-digest  = <"> < KD ( H(A1),     unq(nonce-value)

+                //                              ":" nc-value

+                //                              ":" unq(cnonce-value)

+                //                              ":" unq(qop-value)

+                //                              ":" H(A2)

+                //                            ) <">

+                // if qop is missing,

+                // request-digest  = <"> < KD ( H(A1), unq(nonce-value) ":" H(A2) ) > <">

+

+                $unhashedDigest = '';

+                $nonce = isset($digestRequest['nonce']) ? $digestRequest['nonce'] : '';

+                $cnonce = $nonce;

+                if ($digestRequest['qop'] != '') {

+                    $unhashedDigest = $HA1 . ':' . $nonce . ':' . sprintf("%08d", $digestRequest['nc']) . ':' . $cnonce . ':' . $digestRequest['qop'] . ':' . $HA2;

+                } else {

+                    $unhashedDigest = $HA1 . ':' . $nonce . ':' . $HA2;

+                }

+

+                $hashedDigest = md5($unhashedDigest);

+

+                $opaque = '';

+                if (isset($digestRequest['opaque'])) {

+                    $opaque = ', opaque="' . $digestRequest['opaque'] . '"';

+                }

+

+                $this->setHeader('Authorization', 'Digest username="' . $username . '", realm="' . $digestRequest['realm'] . '", nonce="' . $nonce . '", uri="' . $this->digest_uri . $opaque . '", cnonce="' . $cnonce . '", nc=' . sprintf("%08x", $digestRequest['nc']) . ', qop="' . $digestRequest['qop'] . '", response="' . $hashedDigest . '"');

+            }

+        } elseif ($authtype == 'certificate') {

+            $this->certRequest = $certRequest;

+            $this->debug('Authorization header not set for certificate');

+        } elseif ($authtype == 'ntlm') {

+            // do nothing

+            $this->debug('Authorization header not set for ntlm');

+        }

+        $this->username = $username;

+        $this->password = $password;

+        $this->authtype = $authtype;

+        $this->digestRequest = $digestRequest;

+    }

+

+    /**

+     * set the soapaction value

+     *

+     * @param    string $soapaction

+     * @access   public

+     */

+    function setSOAPAction($soapaction) {

+        $this->setHeader('SOAPAction', '"' . $soapaction . '"');

+    }

+

+    /**

+     * use http encoding

+     *

+     * @param    string $enc encoding style. supported values: gzip, deflate, or both

+     * @access   public

+     */

+    function setEncoding($enc='gzip, deflate') {

+        if (function_exists('gzdeflate')) {

+            $this->protocol_version = '1.1';

+            $this->setHeader('Accept-Encoding', $enc);

+            if (!isset($this->outgoing_headers['Connection'])) {

+                $this->setHeader('Connection', 'close');

+                $this->persistentConnection = false;

+            }

+            // deprecated as of PHP 5.3.0

+            //set_magic_quotes_runtime(0);

+            $this->encoding = $enc;

+        }

+    }

+

+    /**

+     * set proxy info here

+     *

+     * @param    string $proxyhost use an empty string to remove proxy

+     * @param    string $proxyport

+     * @param	string $proxyusername

+     * @param	string $proxypassword

+     * @param	string $proxyauthtype (basic|ntlm)

+     * @access   public

+     */

+    function setProxy($proxyhost, $proxyport, $proxyusername = '', $proxypassword = '', $proxyauthtype = 'basic') {

+        if ($proxyhost) {

+            $this->proxy = array(

+                'host' => $proxyhost,

+                'port' => $proxyport,

+                'username' => $proxyusername,

+                'password' => $proxypassword,

+                'authtype' => $proxyauthtype

+            );

+            if ($proxyusername != '' && $proxypassword != '' && $proxyauthtype = 'basic') {

+                $this->setHeader('Proxy-Authorization', ' Basic '.base64_encode($proxyusername.':'.$proxypassword));

+            }

+        } else {

+            $this->debug('remove proxy');

+            $proxy = null;

+            unsetHeader('Proxy-Authorization');

+        }

+    }

+

+

+    /**

+     * Test if the given string starts with a header that is to be skipped.

+     * Skippable headers result from chunked transfer and proxy requests.

+     *

+     * @param	string $data The string to check.

+     * @returns	boolean	Whether a skippable header was found.

+     * @access	private

+     */

+    function isSkippableCurlHeader(&$data) {

+        $skipHeaders = array(	'HTTP/1.1 100',

+                                'HTTP/1.0 301',

+                                'HTTP/1.1 301',

+                                'HTTP/1.0 302',

+                                'HTTP/1.1 302',

+                                'HTTP/1.0 401',

+                                'HTTP/1.1 401',

+                                'HTTP/1.0 200 Connection established');

+        foreach ($skipHeaders as $hd) {

+            $prefix = substr($data, 0, strlen($hd));

+            if ($prefix == $hd) return true;

+        }

+

+        return false;

+    }

+

+    /**

+     * decode a string that is encoded w/ "chunked' transfer encoding

+     * as defined in RFC2068 19.4.6

+     *

+     * @param    string $buffer

+     * @param    string $lb

+     * @returns	string

+     * @access   public

+     * @deprecated

+     */

+    function decodeChunked($buffer, $lb){

+        // length := 0

+        $length = 0;

+        $new = '';

+

+        // read chunk-size, chunk-extension (if any) and CRLF

+        // get the position of the linebreak

+        $chunkend = strpos($buffer, $lb);

+        if ($chunkend == FALSE) {

+            $this->debug('no linebreak found in decodeChunked');

+            return $new;

+        }

+        $temp = substr($buffer,0,$chunkend);

+        $chunk_size = hexdec( trim($temp) );

+        $chunkstart = $chunkend + strlen($lb);

+        // while (chunk-size > 0) {

+        while ($chunk_size > 0) {

+            $this->debug("chunkstart: $chunkstart chunk_size: $chunk_size");

+            $chunkend = strpos( $buffer, $lb, $chunkstart + $chunk_size);

+

+            // Just in case we got a broken connection

+                if ($chunkend == FALSE) {

+                    $chunk = substr($buffer,$chunkstart);

+                // append chunk-data to entity-body

+                $new .= $chunk;

+                    $length += strlen($chunk);

+                    break;

+            }

+

+                // read chunk-data and CRLF

+                $chunk = substr($buffer,$chunkstart,$chunkend-$chunkstart);

+                // append chunk-data to entity-body

+                $new .= $chunk;

+                // length := length + chunk-size

+                $length += strlen($chunk);

+                // read chunk-size and CRLF

+                $chunkstart = $chunkend + strlen($lb);

+

+                $chunkend = strpos($buffer, $lb, $chunkstart) + strlen($lb);

+            if ($chunkend == FALSE) {

+                break; //Just in case we got a broken connection

+            }

+            $temp = substr($buffer,$chunkstart,$chunkend-$chunkstart);

+            $chunk_size = hexdec( trim($temp) );

+            $chunkstart = $chunkend;

+        }

+        return $new;

+    }

+

+    /**

+     * Writes the payload, including HTTP headers, to $this->outgoing_payload.

+     *

+     * @param	string $data HTTP body

+     * @param	string $cookie_str data for HTTP Cookie header

+     * @return	void

+     * @access	private

+     */

+    function buildPayload($data, $cookie_str = '') {

+        // Note: for cURL connections, $this->outgoing_payload is ignored,

+        // as is the Content-Length header, but these are still created as

+        // debugging guides.

+

+        // add content-length header

+        if ($this->request_method != 'GET') {

+            $this->setHeader('Content-Length', strlen($data));

+        }

+

+        // start building outgoing payload:

+        if ($this->proxy) {

+            $uri = $this->url;

+        } else {

+            $uri = $this->uri;

+        }

+        $req = "$this->request_method $uri HTTP/$this->protocol_version";

+        $this->debug("HTTP request: $req");

+        $this->outgoing_payload = "$req\r\n";

+

+        // loop thru headers, serializing

+        foreach($this->outgoing_headers as $k => $v){

+            $hdr = $k.': '.$v;

+            $this->debug("HTTP header: $hdr");

+            $this->outgoing_payload .= "$hdr\r\n";

+        }

+

+        // add any cookies

+        if ($cookie_str != '') {

+            $hdr = 'Cookie: '.$cookie_str;

+            $this->debug("HTTP header: $hdr");

+            $this->outgoing_payload .= "$hdr\r\n";

+        }

+

+        // header/body separator

+        $this->outgoing_payload .= "\r\n";

+

+        // add data

+        $this->outgoing_payload .= $data;

+    }

+

+    /**

+     * sends the SOAP request via HTTP[S]

+     *

+     * @param    string $data message data

+     * @param	array $cookies cookies to send

+     * @return	boolean	true if OK, false if problem

+     * @access   private

+     */

+    function sendRequest($data, $cookies = NULL) {

+        // build cookie string

+        $cookie_str = $this->getCookiesForRequest($cookies, (($this->scheme == 'ssl') || ($this->scheme == 'https')));

+

+        // build payload

+        $this->buildPayload($data, $cookie_str);

+

+        if ($this->io_method() == 'socket') {

+        // send payload

+        if(!fputs($this->fp, $this->outgoing_payload, strlen($this->outgoing_payload))) {

+            $this->setError('couldn\'t write message data to socket');

+            $this->debug('couldn\'t write message data to socket');

+            return false;

+        }

+        $this->debug('wrote data to socket, length = ' . strlen($this->outgoing_payload));

+        return true;

+        } else if ($this->io_method() == 'curl') {

+        // set payload

+        // cURL does say this should only be the verb, and in fact it

+        // turns out that the URI and HTTP version are appended to this, which

+        // some servers refuse to work with (so we no longer use this method!)

+        //$this->setCurlOption(CURLOPT_CUSTOMREQUEST, $this->outgoing_payload);

+        $curl_headers = array();

+        foreach($this->outgoing_headers as $k => $v){

+            if ($k == 'Connection' || $k == 'Content-Length' || $k == 'Host' || $k == 'Authorization' || $k == 'Proxy-Authorization') {

+                $this->debug("Skip cURL header $k: $v");

+            } else {

+                $curl_headers[] = "$k: $v";

+            }

+        }

+        if ($cookie_str != '') {

+            $curl_headers[] = 'Cookie: ' . $cookie_str;

+        }

+        $this->setCurlOption(CURLOPT_HTTPHEADER, $curl_headers);

+        $this->debug('set cURL HTTP headers');

+        if ($this->request_method == "POST") {

+                $this->setCurlOption(CURLOPT_POST, 1);

+                $this->setCurlOption(CURLOPT_POSTFIELDS, $data);

+            $this->debug('set cURL POST data');

+            } else {

+            }

+        // insert custom user-set cURL options

+        foreach ($this->ch_options as $key => $val) {

+            $this->setCurlOption($key, $val);

+        }

+

+        $this->debug('set cURL payload');

+        return true;

+        }

+    }

+

+    /**

+     * gets the SOAP response via HTTP[S]

+     *

+     * @return	string the response (also sets member variables like incoming_payload)

+     * @access   private

+     */

+    function getResponse(){

+        $this->incoming_payload = '';

+

+        if ($this->io_method() == 'socket') {

+        // loop until headers have been retrieved

+        $data = '';

+        while (!isset($lb)){

+

+            // We might EOF during header read.

+            if(feof($this->fp)) {

+                $this->incoming_payload = $data;

+                $this->debug('found no headers before EOF after length ' . strlen($data));

+                $this->debug("received before EOF:\n" . $data);

+                $this->setError('server failed to send headers');

+                return false;

+            }

+

+            $tmp = fgets($this->fp, 256);

+            $tmplen = strlen($tmp);

+            $this->debug("read line of $tmplen bytes: " . trim($tmp));

+

+            if ($tmplen == 0) {

+                $this->incoming_payload = $data;

+                $this->debug('socket read of headers timed out after length ' . strlen($data));

+                $this->debug("read before timeout: " . $data);

+                $this->setError('socket read of headers timed out');

+                return false;

+            }

+

+            $data .= $tmp;

+            $pos = strpos($data,"\r\n\r\n");

+            if($pos > 1){

+                $lb = "\r\n";

+            } else {

+                $pos = strpos($data,"\n\n");

+                if($pos > 1){

+                    $lb = "\n";

+                }

+            }

+            // remove 100 headers

+            if (isset($lb) && preg_match('/^HTTP\/1.1 100/',$data)) {

+                unset($lb);

+                $data = '';

+            }//

+        }

+        // store header data

+        $this->incoming_payload .= $data;

+        $this->debug('found end of headers after length ' . strlen($data));

+        // process headers

+        $header_data = trim(substr($data,0,$pos));

+        $header_array = explode($lb,$header_data);

+        $this->incoming_headers = array();

+        $this->incoming_cookies = array();

+        foreach($header_array as $header_line){

+            $arr = explode(':',$header_line, 2);

+            if(count($arr) > 1){

+                $header_name = strtolower(trim($arr[0]));

+                $this->incoming_headers[$header_name] = trim($arr[1]);

+                if ($header_name == 'set-cookie') {

+                    // TODO: allow multiple cookies from parseCookie

+                    $cookie = $this->parseCookie(trim($arr[1]));

+                    if ($cookie) {

+                        $this->incoming_cookies[] = $cookie;

+                        $this->debug('found cookie: ' . $cookie['name'] . ' = ' . $cookie['value']);

+                    } else {

+                        $this->debug('did not find cookie in ' . trim($arr[1]));

+                    }

+                }

+            } else if (isset($header_name)) {

+                // append continuation line to previous header

+                $this->incoming_headers[$header_name] .= $lb . ' ' . $header_line;

+            }

+        }

+

+        // loop until msg has been received

+        if (isset($this->incoming_headers['transfer-encoding']) && strtolower($this->incoming_headers['transfer-encoding']) == 'chunked') {

+            $content_length =  2147483647;	// ignore any content-length header

+            $chunked = true;

+            $this->debug("want to read chunked content");

+        } elseif (isset($this->incoming_headers['content-length'])) {

+            $content_length = $this->incoming_headers['content-length'];

+            $chunked = false;

+            $this->debug("want to read content of length $content_length");

+        } else {

+            $content_length =  2147483647;

+            $chunked = false;

+            $this->debug("want to read content to EOF");

+        }

+        $data = '';

+        do {

+            if ($chunked) {

+                $tmp = fgets($this->fp, 256);

+                $tmplen = strlen($tmp);

+                $this->debug("read chunk line of $tmplen bytes");

+                if ($tmplen == 0) {

+                    $this->incoming_payload = $data;

+                    $this->debug('socket read of chunk length timed out after length ' . strlen($data));

+                    $this->debug("read before timeout:\n" . $data);

+                    $this->setError('socket read of chunk length timed out');

+                    return false;

+                }

+                $content_length = hexdec(trim($tmp));

+                $this->debug("chunk length $content_length");

+            }

+            $strlen = 0;

+            while (($strlen < $content_length) && (!feof($this->fp))) {

+                $readlen = min(8192, $content_length - $strlen);

+                $tmp = fread($this->fp, $readlen);

+                $tmplen = strlen($tmp);

+                $this->debug("read buffer of $tmplen bytes");

+                if (($tmplen == 0) && (!feof($this->fp))) {

+                    $this->incoming_payload = $data;

+                    $this->debug('socket read of body timed out after length ' . strlen($data));

+                    $this->debug("read before timeout:\n" . $data);

+                    $this->setError('socket read of body timed out');

+                    return false;

+                }

+                $strlen += $tmplen;

+                $data .= $tmp;

+            }

+            if ($chunked && ($content_length > 0)) {

+                $tmp = fgets($this->fp, 256);

+                $tmplen = strlen($tmp);

+                $this->debug("read chunk terminator of $tmplen bytes");

+                if ($tmplen == 0) {

+                    $this->incoming_payload = $data;

+                    $this->debug('socket read of chunk terminator timed out after length ' . strlen($data));

+                    $this->debug("read before timeout:\n" . $data);

+                    $this->setError('socket read of chunk terminator timed out');

+                    return false;

+                }

+            }

+        } while ($chunked && ($content_length > 0) && (!feof($this->fp)));

+        if (feof($this->fp)) {

+            $this->debug('read to EOF');

+        }

+        $this->debug('read body of length ' . strlen($data));

+        $this->incoming_payload .= $data;

+        $this->debug('received a total of '.strlen($this->incoming_payload).' bytes of data from server');

+

+        // close filepointer

+        if(

+            (isset($this->incoming_headers['connection']) && strtolower($this->incoming_headers['connection']) == 'close') ||

+            (! $this->persistentConnection) || feof($this->fp)){

+            fclose($this->fp);

+            $this->fp = false;

+            $this->debug('closed socket');

+        }

+

+        // connection was closed unexpectedly

+        if($this->incoming_payload == ''){

+            $this->setError('no response from server');

+            return false;

+        }

+

+        // decode transfer-encoding

 //		if(isset($this->incoming_headers['transfer-encoding']) && strtolower($this->incoming_headers['transfer-encoding']) == 'chunked'){

 //			if(!$data = $this->decodeChunked($data, $lb)){

 //				$this->setError('Decoding of chunked data failed');

 //				return false;

 //			}

-			//print "<pre>\nde-chunked:\n---------------\n$data\n\n---------------\n</pre>";

-			// set decoded payload

+            //print "<pre>\nde-chunked:\n---------------\n$data\n\n---------------\n</pre>";

+            // set decoded payload

 //			$this->incoming_payload = $header_data.$lb.$lb.$data;

 //		}

 

-	  } else if ($this->io_method() == 'curl') {

-		// send and receive

-		$this->debug('send and receive with cURL');

-		$this->incoming_payload = curl_exec($this->ch);

-		$data = $this->incoming_payload;

+        } else if ($this->io_method() == 'curl') {

+        // send and receive

+        $this->debug('send and receive with cURL');

+        $this->incoming_payload = curl_exec($this->ch);

+        $data = $this->incoming_payload;

 

         $cErr = curl_error($this->ch);

-		if ($cErr != '') {

-        	$err = 'cURL ERROR: '.curl_errno($this->ch).': '.$cErr.'<br>';

-        	// TODO: there is a PHP bug that can cause this to SEGV for CURLINFO_CONTENT_TYPE

-			foreach(curl_getinfo($this->ch) as $k => $v){

-				$err .= "$k: $v<br>";

-			}

-			$this->debug($err);

-			$this->setError($err);

-			curl_close($this->ch);

-	    	return false;

-		} else {

-			//echo '<pre>';

-			//var_dump(curl_getinfo($this->ch));

-			//echo '</pre>';

-		}

-		// close curl

-		$this->debug('No cURL error, closing cURL');

-		curl_close($this->ch);

-

-		// try removing skippable headers

-		$savedata = $data;

-		while ($this->isSkippableCurlHeader($data)) {

-			$this->debug("Found HTTP header to skip");

-			if ($pos = strpos($data,"\r\n\r\n")) {

-				$data = ltrim(substr($data,$pos));

-			} elseif($pos = strpos($data,"\n\n") ) {

-				$data = ltrim(substr($data,$pos));

-			}

-		}

-

-		if ($data == '') {

-			// have nothing left; just remove 100 header(s)

-			$data = $savedata;

-			while (preg_match('/^HTTP\/1.1 100/',$data)) {

-				if ($pos = strpos($data,"\r\n\r\n")) {

-					$data = ltrim(substr($data,$pos));

-				} elseif($pos = strpos($data,"\n\n") ) {

-					$data = ltrim(substr($data,$pos));

-				}

-			}

-		}

-

-		// separate content from HTTP headers

-		if ($pos = strpos($data,"\r\n\r\n")) {

-			$lb = "\r\n";

-		} elseif( $pos = strpos($data,"\n\n")) {

-			$lb = "\n";

-		} else {

-			$this->debug('no proper separation of headers and document');

-			$this->setError('no proper separation of headers and document');

-			return false;

-		}

-		$header_data = trim(substr($data,0,$pos));

-		$header_array = explode($lb,$header_data);

-		$data = ltrim(substr($data,$pos));

-		$this->debug('found proper separation of headers and document');

-		$this->debug('cleaned data, stringlen: '.strlen($data));

-		// clean headers

-		foreach ($header_array as $header_line) {

-			$arr = explode(':',$header_line,2);

-			if(count($arr) > 1){

-				$header_name = strtolower(trim($arr[0]));

-				$this->incoming_headers[$header_name] = trim($arr[1]);

-				if ($header_name == 'set-cookie') {

-					// TODO: allow multiple cookies from parseCookie

-					$cookie = $this->parseCookie(trim($arr[1]));

-					if ($cookie) {

-						$this->incoming_cookies[] = $cookie;

-						$this->debug('found cookie: ' . $cookie['name'] . ' = ' . $cookie['value']);

-					} else {

-						$this->debug('did not find cookie in ' . trim($arr[1]));

-					}

-    			}

-			} else if (isset($header_name)) {

-				// append continuation line to previous header

-				$this->incoming_headers[$header_name] .= $lb . ' ' . $header_line;

-			}

-		}

-	  }

-

-		$this->response_status_line = $header_array[0];

-		$arr = explode(' ', $this->response_status_line, 3);

-		$http_version = $arr[0];

-		$http_status = intval($arr[1]);

-		$http_reason = count($arr) > 2 ? $arr[2] : '';

-

- 		// see if we need to resend the request with http digest authentication

- 		if (isset($this->incoming_headers['location']) && ($http_status == 301 || $http_status == 302)) {

- 			$this->debug("Got $http_status $http_reason with Location: " . $this->incoming_headers['location']);

- 			$this->setURL($this->incoming_headers['location']);

-			$this->tryagain = true;

-			return false;

-		}

-

- 		// see if we need to resend the request with http digest authentication

- 		if (isset($this->incoming_headers['www-authenticate']) && $http_status == 401) {

- 			$this->debug("Got 401 $http_reason with WWW-Authenticate: " . $this->incoming_headers['www-authenticate']);

- 			if (strstr($this->incoming_headers['www-authenticate'], "Digest ")) {

- 				$this->debug('Server wants digest authentication');

- 				// remove "Digest " from our elements

- 				$digestString = str_replace('Digest ', '', $this->incoming_headers['www-authenticate']);

-

- 				// parse elements into array

- 				$digestElements = explode(',', $digestString);

- 				foreach ($digestElements as $val) {

- 					$tempElement = explode('=', trim($val), 2);

- 					$digestRequest[$tempElement[0]] = str_replace("\"", '', $tempElement[1]);

- 				}

-

-				// should have (at least) qop, realm, nonce

- 				if (isset($digestRequest['nonce'])) {

- 					$this->setCredentials($this->username, $this->password, 'digest', $digestRequest);

- 					$this->tryagain = true;

- 					return false;

- 				}

- 			}

-			$this->debug('HTTP authentication failed');

-			$this->setError('HTTP authentication failed');

-			return false;

- 		}

-

-		if (

-			($http_status >= 300 && $http_status <= 307) ||

-			($http_status >= 400 && $http_status <= 417) ||

-			($http_status >= 501 && $http_status <= 505)

-		   ) {

-			$this->setError("Unsupported HTTP response status $http_status $http_reason (soapclient->response has contents of the response)");

-			return false;

-		}

-

-		// decode content-encoding

-		if(isset($this->incoming_headers['content-encoding']) && $this->incoming_headers['content-encoding'] != ''){

-			if(strtolower($this->incoming_headers['content-encoding']) == 'deflate' || strtolower($this->incoming_headers['content-encoding']) == 'gzip'){

-    			// if decoding works, use it. else assume data wasn't gzencoded

-    			if(function_exists('gzinflate')){

-					//$timer->setMarker('starting decoding of gzip/deflated content');

-					// IIS 5 requires gzinflate instead of gzuncompress (similar to IE 5 and gzdeflate v. gzcompress)

-					// this means there are no Zlib headers, although there should be

-					$this->debug('The gzinflate function exists');

-					$datalen = strlen($data);

-					if ($this->incoming_headers['content-encoding'] == 'deflate') {

-						if ($degzdata = @gzinflate($data)) {

-	    					$data = $degzdata;

-	    					$this->debug('The payload has been inflated to ' . strlen($data) . ' bytes');

-	    					if (strlen($data) < $datalen) {

-	    						// test for the case that the payload has been compressed twice

-		    					$this->debug('The inflated payload is smaller than the gzipped one; try again');

-								if ($degzdata = @gzinflate($data)) {

-			    					$data = $degzdata;

-			    					$this->debug('The payload has been inflated again to ' . strlen($data) . ' bytes');

-								}

-	    					}

-	    				} else {

-	    					$this->debug('Error using gzinflate to inflate the payload');

-	    					$this->setError('Error using gzinflate to inflate the payload');

-	    				}

-					} elseif ($this->incoming_headers['content-encoding'] == 'gzip') {

-						if ($degzdata = @gzinflate(substr($data, 10))) {	// do our best

-							$data = $degzdata;

-	    					$this->debug('The payload has been un-gzipped to ' . strlen($data) . ' bytes');

-	    					if (strlen($data) < $datalen) {

-	    						// test for the case that the payload has been compressed twice

-		    					$this->debug('The un-gzipped payload is smaller than the gzipped one; try again');

-								if ($degzdata = @gzinflate(substr($data, 10))) {

-			    					$data = $degzdata;

-			    					$this->debug('The payload has been un-gzipped again to ' . strlen($data) . ' bytes');

-								}

-	    					}

-	    				} else {

-	    					$this->debug('Error using gzinflate to un-gzip the payload');

-							$this->setError('Error using gzinflate to un-gzip the payload');

-	    				}

-					}

-					//$timer->setMarker('finished decoding of gzip/deflated content');

-					//print "<xmp>\nde-inflated:\n---------------\n$data\n-------------\n</xmp>";

-					// set decoded payload

-					$this->incoming_payload = $header_data.$lb.$lb.$data;

-    			} else {

-					$this->debug('The server sent compressed data. Your php install must have the Zlib extension compiled in to support this.');

-					$this->setError('The server sent compressed data. Your php install must have the Zlib extension compiled in to support this.');

-				}

-			} else {

-				$this->debug('Unsupported Content-Encoding ' . $this->incoming_headers['content-encoding']);

-				$this->setError('Unsupported Content-Encoding ' . $this->incoming_headers['content-encoding']);

-			}

-		} else {

-			$this->debug('No Content-Encoding header');

-		}

-

-		if(strlen($data) == 0){

-			$this->debug('no data after headers!');

-			$this->setError('no data present after HTTP headers');

-			return false;

-		}

-

-		return $data;

-	}

-

-	/**

-	 * sets the content-type for the SOAP message to be sent

-	 *

-	 * @param	string $type the content type, MIME style

-	 * @param	mixed $charset character set used for encoding (or false)

-	 * @access	public

-	 */

-	function setContentType($type, $charset = false) {

-		$this->setHeader('Content-Type', $type . ($charset ? '; charset=' . $charset : ''));

-	}

-

-	/**

-	 * specifies that an HTTP persistent connection should be used

-	 *

-	 * @return	boolean whether the request was honored by this method.

-	 * @access	public

-	 */

-	function usePersistentConnection(){

-		if (isset($this->outgoing_headers['Accept-Encoding'])) {

-			return false;

-		}

-		$this->protocol_version = '1.1';

-		$this->persistentConnection = true;

-		$this->setHeader('Connection', 'Keep-Alive');

-		return true;

-	}

-

-	/**

-	 * parse an incoming Cookie into it's parts

-	 *

-	 * @param	string $cookie_str content of cookie

-	 * @return	array with data of that cookie

-	 * @access	private

-	 */

-	/*

+        if ($cErr != '') {

+            $err = 'cURL ERROR: '.curl_errno($this->ch).': '.$cErr.'<br>';

+            // TODO: there is a PHP bug that can cause this to SEGV for CURLINFO_CONTENT_TYPE

+            foreach(curl_getinfo($this->ch) as $k => $v){

+                $err .= "$k: $v<br>";

+            }

+            $this->debug($err);

+            $this->setError($err);

+            curl_close($this->ch);

+            return false;

+        } else {

+            //echo '<pre>';

+            //var_dump(curl_getinfo($this->ch));

+            //echo '</pre>';

+        }

+        // close curl

+        $this->debug('No cURL error, closing cURL');

+        curl_close($this->ch);

+

+        // try removing skippable headers

+        $savedata = $data;

+        while ($this->isSkippableCurlHeader($data)) {

+            $this->debug("Found HTTP header to skip");

+            if ($pos = strpos($data,"\r\n\r\n")) {

+                $data = ltrim(substr($data,$pos));

+            } elseif($pos = strpos($data,"\n\n") ) {

+                $data = ltrim(substr($data,$pos));

+            }

+        }

+

+        if ($data == '') {

+            // have nothing left; just remove 100 header(s)

+            $data = $savedata;

+            while (preg_match('/^HTTP\/1.1 100/',$data)) {

+                if ($pos = strpos($data,"\r\n\r\n")) {

+                    $data = ltrim(substr($data,$pos));

+                } elseif($pos = strpos($data,"\n\n") ) {

+                    $data = ltrim(substr($data,$pos));

+                }

+            }

+        }

+

+        // separate content from HTTP headers

+        if ($pos = strpos($data,"\r\n\r\n")) {

+            $lb = "\r\n";

+        } elseif( $pos = strpos($data,"\n\n")) {

+            $lb = "\n";

+        } else {

+            $this->debug('no proper separation of headers and document');

+            $this->setError('no proper separation of headers and document');

+            return false;

+        }

+        $header_data = trim(substr($data,0,$pos));

+        $header_array = explode($lb,$header_data);

+        $data = ltrim(substr($data,$pos));

+        $this->debug('found proper separation of headers and document');

+        $this->debug('cleaned data, stringlen: '.strlen($data));

+        // clean headers

+        foreach ($header_array as $header_line) {

+            $arr = explode(':',$header_line,2);

+            if(count($arr) > 1){

+                $header_name = strtolower(trim($arr[0]));

+                $this->incoming_headers[$header_name] = trim($arr[1]);

+                if ($header_name == 'set-cookie') {

+                    // TODO: allow multiple cookies from parseCookie

+                    $cookie = $this->parseCookie(trim($arr[1]));

+                    if ($cookie) {

+                        $this->incoming_cookies[] = $cookie;

+                        $this->debug('found cookie: ' . $cookie['name'] . ' = ' . $cookie['value']);

+                    } else {

+                        $this->debug('did not find cookie in ' . trim($arr[1]));

+                    }

+                }

+            } else if (isset($header_name)) {

+                // append continuation line to previous header

+                $this->incoming_headers[$header_name] .= $lb . ' ' . $header_line;

+            }

+        }

+        }

+

+        $this->response_status_line = $header_array[0];

+        $arr = explode(' ', $this->response_status_line, 3);

+        $http_version = $arr[0];

+        $http_status = intval($arr[1]);

+        $http_reason = count($arr) > 2 ? $arr[2] : '';

+

+            // see if we need to resend the request with http digest authentication

+            if (isset($this->incoming_headers['location']) && ($http_status == 301 || $http_status == 302)) {

+                $this->debug("Got $http_status $http_reason with Location: " . $this->incoming_headers['location']);

+                $this->setURL($this->incoming_headers['location']);

+            $this->tryagain = true;

+            return false;

+        }

+

+            // see if we need to resend the request with http digest authentication

+            if (isset($this->incoming_headers['www-authenticate']) && $http_status == 401) {

+                $this->debug("Got 401 $http_reason with WWW-Authenticate: " . $this->incoming_headers['www-authenticate']);

+                if (strstr($this->incoming_headers['www-authenticate'], "Digest ")) {

+                    $this->debug('Server wants digest authentication');

+                    // remove "Digest " from our elements

+                    $digestString = str_replace('Digest ', '', $this->incoming_headers['www-authenticate']);

+

+                    // parse elements into array

+                    $digestElements = explode(',', $digestString);

+                    foreach ($digestElements as $val) {

+                        $tempElement = explode('=', trim($val), 2);

+                        $digestRequest[$tempElement[0]] = str_replace("\"", '', $tempElement[1]);

+                    }

+

+                // should have (at least) qop, realm, nonce

+                    if (isset($digestRequest['nonce'])) {

+                        $this->setCredentials($this->username, $this->password, 'digest', $digestRequest);

+                        $this->tryagain = true;

+                        return false;

+                    }

+                }

+            $this->debug('HTTP authentication failed');

+            $this->setError('HTTP authentication failed');

+            return false;

+            }

+

+        if (

+            ($http_status >= 300 && $http_status <= 307) ||

+            ($http_status >= 400 && $http_status <= 417) ||

+            ($http_status >= 501 && $http_status <= 505)

+            ) {

+            $this->setError("Unsupported HTTP response status $http_status $http_reason (soapclient->response has contents of the response)");

+            return false;

+        }

+

+        // decode content-encoding

+        if(isset($this->incoming_headers['content-encoding']) && $this->incoming_headers['content-encoding'] != ''){

+            if(strtolower($this->incoming_headers['content-encoding']) == 'deflate' || strtolower($this->incoming_headers['content-encoding']) == 'gzip'){

+                // if decoding works, use it. else assume data wasn't gzencoded

+                if(function_exists('gzinflate')){

+                    //$timer->setMarker('starting decoding of gzip/deflated content');

+                    // IIS 5 requires gzinflate instead of gzuncompress (similar to IE 5 and gzdeflate v. gzcompress)

+                    // this means there are no Zlib headers, although there should be

+                    $this->debug('The gzinflate function exists');

+                    $datalen = strlen($data);

+                    if ($this->incoming_headers['content-encoding'] == 'deflate') {

+                        if ($degzdata = @gzinflate($data)) {

+                            $data = $degzdata;

+                            $this->debug('The payload has been inflated to ' . strlen($data) . ' bytes');

+                            if (strlen($data) < $datalen) {

+                                // test for the case that the payload has been compressed twice

+                                $this->debug('The inflated payload is smaller than the gzipped one; try again');

+                                if ($degzdata = @gzinflate($data)) {

+                                    $data = $degzdata;

+                                    $this->debug('The payload has been inflated again to ' . strlen($data) . ' bytes');

+                                }

+                            }

+                        } else {

+                            $this->debug('Error using gzinflate to inflate the payload');

+                            $this->setError('Error using gzinflate to inflate the payload');

+                        }

+                    } elseif ($this->incoming_headers['content-encoding'] == 'gzip') {

+                        if ($degzdata = @gzinflate(substr($data, 10))) {	// do our best

+                            $data = $degzdata;

+                            $this->debug('The payload has been un-gzipped to ' . strlen($data) . ' bytes');

+                            if (strlen($data) < $datalen) {

+                                // test for the case that the payload has been compressed twice

+                                $this->debug('The un-gzipped payload is smaller than the gzipped one; try again');

+                                if ($degzdata = @gzinflate(substr($data, 10))) {

+                                    $data = $degzdata;

+                                    $this->debug('The payload has been un-gzipped again to ' . strlen($data) . ' bytes');

+                                }

+                            }

+                        } else {

+                            $this->debug('Error using gzinflate to un-gzip the payload');

+                            $this->setError('Error using gzinflate to un-gzip the payload');

+                        }

+                    }

+                    //$timer->setMarker('finished decoding of gzip/deflated content');

+                    //print "<xmp>\nde-inflated:\n---------------\n$data\n-------------\n</xmp>";

+                    // set decoded payload

+                    $this->incoming_payload = $header_data.$lb.$lb.$data;

+                } else {

+                    $this->debug('The server sent compressed data. Your php install must have the Zlib extension compiled in to support this.');

+                    $this->setError('The server sent compressed data. Your php install must have the Zlib extension compiled in to support this.');

+                }

+            } else {

+                $this->debug('Unsupported Content-Encoding ' . $this->incoming_headers['content-encoding']);

+                $this->setError('Unsupported Content-Encoding ' . $this->incoming_headers['content-encoding']);

+            }

+        } else {

+            $this->debug('No Content-Encoding header');

+        }

+

+        if(strlen($data) == 0){

+            $this->debug('no data after headers!');

+            $this->setError('no data present after HTTP headers');

+            return false;

+        }

+

+        return $data;

+    }

+

+    /**

+     * sets the content-type for the SOAP message to be sent

+     *

+     * @param	string $type the content type, MIME style

+     * @param	mixed $charset character set used for encoding (or false)

+     * @access	public

+     */

+    function setContentType($type, $charset = false) {

+        $this->setHeader('Content-Type', $type . ($charset ? '; charset=' . $charset : ''));

+    }

+

+    /**

+     * specifies that an HTTP persistent connection should be used

+     *

+     * @return	boolean whether the request was honored by this method.

+     * @access	public

+     */

+    function usePersistentConnection(){

+        if (isset($this->outgoing_headers['Accept-Encoding'])) {

+            return false;

+        }

+        $this->protocol_version = '1.1';

+        $this->persistentConnection = true;

+        $this->setHeader('Connection', 'Keep-Alive');

+        return true;

+    }

+

+    /**

+     * parse an incoming Cookie into it's parts

+     *

+     * @param	string $cookie_str content of cookie

+     * @return	array with data of that cookie

+     * @access	private

+     */

+    /*

 	 * TODO: allow a Set-Cookie string to be parsed into multiple cookies

 	 */

-	function parseCookie($cookie_str) {

-		$cookie_str = str_replace('; ', ';', $cookie_str) . ';';

-		$data = preg_split('/;/', $cookie_str);

-		$value_str = $data[0];

-

-		$cookie_param = 'domain=';

-		$start = strpos($cookie_str, $cookie_param);

-		if ($start > 0) {

-			$domain = substr($cookie_str, $start + strlen($cookie_param));

-			$domain = substr($domain, 0, strpos($domain, ';'));

-		} else {

-			$domain = '';

-		}

-

-		$cookie_param = 'expires=';

-		$start = strpos($cookie_str, $cookie_param);

-		if ($start > 0) {

-			$expires = substr($cookie_str, $start + strlen($cookie_param));

-			$expires = substr($expires, 0, strpos($expires, ';'));

-		} else {

-			$expires = '';

-		}

-

-		$cookie_param = 'path=';

-		$start = strpos($cookie_str, $cookie_param);

-		if ( $start > 0 ) {

-			$path = substr($cookie_str, $start + strlen($cookie_param));

-			$path = substr($path, 0, strpos($path, ';'));

-		} else {

-			$path = '/';

-		}

-

-		$cookie_param = ';secure;';

-		if (strpos($cookie_str, $cookie_param) !== FALSE) {

-			$secure = true;

-		} else {

-			$secure = false;

-		}

-

-		$sep_pos = strpos($value_str, '=');

-

-		if ($sep_pos) {

-			$name = substr($value_str, 0, $sep_pos);

-			$value = substr($value_str, $sep_pos + 1);

-			$cookie= array(	'name' => $name,

-			                'value' => $value,

-							'domain' => $domain,

-							'path' => $path,

-							'expires' => $expires,

-							'secure' => $secure

-							);

-			return $cookie;

-		}

-		return false;

-	}

-

-	/**

-	 * sort out cookies for the current request

-	 *

-	 * @param	array $cookies array with all cookies

-	 * @param	boolean $secure is the send-content secure or not?

-	 * @return	string for Cookie-HTTP-Header

-	 * @access	private

-	 */

-	function getCookiesForRequest($cookies, $secure=false) {

-		$cookie_str = '';

-		if ((! is_null($cookies)) && (is_array($cookies))) {

-			foreach ($cookies as $cookie) {

-				if (! is_array($cookie)) {

-					continue;

-				}

-	    		$this->debug("check cookie for validity: ".$cookie['name'].'='.$cookie['value']);

-				if ((isset($cookie['expires'])) && (! empty($cookie['expires']))) {

-					if (strtotime($cookie['expires']) <= time()) {

-						$this->debug('cookie has expired');

-						continue;

-					}

-				}

-				if ((isset($cookie['domain'])) && (! empty($cookie['domain']))) {

-					$domain = preg_quote($cookie['domain']);

-					if (! preg_match("'.*$domain$'i", $this->host)) {

-						$this->debug('cookie has different domain');

-						continue;

-					}

-				}

-				if ((isset($cookie['path'])) && (! empty($cookie['path']))) {

-					$path = preg_quote($cookie['path']);

-					if (! preg_match("'^$path.*'i", $this->path)) {

-						$this->debug('cookie is for a different path');

-						continue;

-					}

-				}

-				if ((! $secure) && (isset($cookie['secure'])) && ($cookie['secure'])) {

-					$this->debug('cookie is secure, transport is not');

-					continue;

-				}

-				$cookie_str .= $cookie['name'] . '=' . $cookie['value'] . '; ';

-	    		$this->debug('add cookie to Cookie-String: ' . $cookie['name'] . '=' . $cookie['value']);

-			}

-		}

-		return $cookie_str;

-  }

+    function parseCookie($cookie_str) {

+        $cookie_str = str_replace('; ', ';', $cookie_str) . ';';

+        $data = preg_split('/;/', $cookie_str);

+        $value_str = $data[0];

+

+        $cookie_param = 'domain=';

+        $start = strpos($cookie_str, $cookie_param);

+        if ($start > 0) {

+            $domain = substr($cookie_str, $start + strlen($cookie_param));

+            $domain = substr($domain, 0, strpos($domain, ';'));

+        } else {

+            $domain = '';

+        }

+

+        $cookie_param = 'expires=';

+        $start = strpos($cookie_str, $cookie_param);

+        if ($start > 0) {

+            $expires = substr($cookie_str, $start + strlen($cookie_param));

+            $expires = substr($expires, 0, strpos($expires, ';'));

+        } else {

+            $expires = '';

+        }

+

+        $cookie_param = 'path=';

+        $start = strpos($cookie_str, $cookie_param);

+        if ( $start > 0 ) {

+            $path = substr($cookie_str, $start + strlen($cookie_param));

+            $path = substr($path, 0, strpos($path, ';'));

+        } else {

+            $path = '/';

+        }

+

+        $cookie_param = ';secure;';

+        if (strpos($cookie_str, $cookie_param) !== FALSE) {

+            $secure = true;

+        } else {

+            $secure = false;

+        }

+

+        $sep_pos = strpos($value_str, '=');

+

+        if ($sep_pos) {

+            $name = substr($value_str, 0, $sep_pos);

+            $value = substr($value_str, $sep_pos + 1);

+            $cookie= array(	'name' => $name,

+                            'value' => $value,

+                            'domain' => $domain,

+                            'path' => $path,

+                            'expires' => $expires,

+                            'secure' => $secure

+                            );

+            return $cookie;

+        }

+        return false;

+    }

+

+    /**

+     * sort out cookies for the current request

+     *

+     * @param	array $cookies array with all cookies

+     * @param	boolean $secure is the send-content secure or not?

+     * @return	string for Cookie-HTTP-Header

+     * @access	private

+     */

+    function getCookiesForRequest($cookies, $secure=false) {

+        $cookie_str = '';

+        if ((! is_null($cookies)) && (is_array($cookies))) {

+            foreach ($cookies as $cookie) {

+                if (! is_array($cookie)) {

+                    continue;

+                }

+                $this->debug("check cookie for validity: ".$cookie['name'].'='.$cookie['value']);

+                if ((isset($cookie['expires'])) && (! empty($cookie['expires']))) {

+                    if (strtotime($cookie['expires']) <= time()) {

+                        $this->debug('cookie has expired');

+                        continue;

+                    }

+                }

+                if ((isset($cookie['domain'])) && (! empty($cookie['domain']))) {

+                    $domain = preg_quote($cookie['domain']);

+                    if (! preg_match("'.*$domain$'i", $this->host)) {

+                        $this->debug('cookie has different domain');

+                        continue;

+                    }

+                }

+                if ((isset($cookie['path'])) && (! empty($cookie['path']))) {

+                    $path = preg_quote($cookie['path']);

+                    if (! preg_match("'^$path.*'i", $this->path)) {

+                        $this->debug('cookie is for a different path');

+                        continue;

+                    }

+                }

+                if ((! $secure) && (isset($cookie['secure'])) && ($cookie['secure'])) {

+                    $this->debug('cookie is secure, transport is not');

+                    continue;

+                }

+                $cookie_str .= $cookie['name'] . '=' . $cookie['value'] . '; ';

+                $this->debug('add cookie to Cookie-String: ' . $cookie['name'] . '=' . $cookie['value']);

+            }

+        }

+        return $cookie_str;

+    }

 }

 

 

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

Indentation +910 added lines, -910 removed lines

@@ -11,275 +11,275 @@ 
 */

 class nusoap_xmlschema extends nusoap_base

 {

-	// files

-	var $schema = '';

-	var $xml = '';

-	// namespaces

-	var $enclosingNamespaces;

-	// schema info

-	var $schemaInfo = array();

-	var $schemaTargetNamespace = '';

-	// types, elements, attributes defined by the schema

-	var $attributes = array();

-	var $complexTypes = array();

-	var $complexTypeStack = array();

-	var $currentComplexType = null;

-	var $elements = array();

-	var $elementStack = array();

-	var $currentElement = null;

-	var $simpleTypes = array();

-	var $simpleTypeStack = array();

-	var $currentSimpleType = null;

-	// imports

-	var $imports = array();

-	// parser vars

-	var $parser;

-	var $position = 0;

-	var $depth = 0;

-	var $depth_array = array();

-	var $message = array();

-	var $defaultNamespace = array();

-

-	/**

-	* constructor

-	*

-	* @param    string $schema schema document URI

-	* @param    string $xml xml document URI

-	* @param	string $namespaces namespaces defined in enclosing XML

-	* @access   public

-	*/

-	function __construct($schema='',$xml='',$namespaces=array()){

-		parent::__construct();

-		$this->debug('nusoap_xmlschema class instantiated, inside constructor');

-		// files

-		$this->schema = $schema;

-		$this->xml = $xml;

-

-		// namespaces

-		$this->enclosingNamespaces = $namespaces;

-		$this->namespaces = array_merge($this->namespaces, $namespaces);

-

-		// parse schema file

-		if($schema != ''){

-			$this->debug('initial schema file: '.$schema);

-			$this->parseFile($schema, 'schema');

-		}

-

-		// parse xml file

-		if($xml != ''){

-			$this->debug('initial xml file: '.$xml);

-			$this->parseFile($xml, 'xml');

-		}

-

-	}

+    // files

+    var $schema = '';

+    var $xml = '';

+    // namespaces

+    var $enclosingNamespaces;

+    // schema info

+    var $schemaInfo = array();

+    var $schemaTargetNamespace = '';

+    // types, elements, attributes defined by the schema

+    var $attributes = array();

+    var $complexTypes = array();

+    var $complexTypeStack = array();

+    var $currentComplexType = null;

+    var $elements = array();

+    var $elementStack = array();

+    var $currentElement = null;

+    var $simpleTypes = array();

+    var $simpleTypeStack = array();

+    var $currentSimpleType = null;

+    // imports

+    var $imports = array();

+    // parser vars

+    var $parser;

+    var $position = 0;

+    var $depth = 0;

+    var $depth_array = array();

+    var $message = array();

+    var $defaultNamespace = array();

 

     /**

-    * parse an XML file

-    *

-    * @param string $xml path/URL to XML file

-    * @param string $type (schema | xml)

-	* @return boolean

-    * @access public

-    */

-	function parseFile($xml,$type){

-		// parse xml file

-		if($xml != ""){

-			$xmlStr = @join("",@file($xml));

-			if($xmlStr == ""){

-				$msg = 'Error reading XML from '.$xml;

-				$this->setError($msg);

-				$this->debug($msg);

-			return false;

-			} else {

-				$this->debug("parsing $xml");

-				$this->parseString($xmlStr,$type);

-				$this->debug("done parsing $xml");

-			return true;

-			}

-		}

-		return false;

-	}

-

-	/**

-	* parse an XML string

-	*

-	* @param    string $xml path or URL

-    * @param	string $type (schema|xml)

-	* @access   private

-	*/

-	function parseString($xml,$type){

-		// parse xml string

-		if($xml != ""){

-

-	    	// Create an XML parser.

-	    	$this->parser = xml_parser_create();

-	    	// Set the options for parsing the XML data.

-	    	xml_parser_set_option($this->parser, XML_OPTION_CASE_FOLDING, 0);

-

-	    	// Set the object for the parser.

-	    	xml_set_object($this->parser, $this);

-

-	    	// Set the element handlers for the parser.

-			if($type == "schema"){

-		    	xml_set_element_handler($this->parser, 'schemaStartElement','schemaEndElement');

-		    	xml_set_character_data_handler($this->parser,'schemaCharacterData');

-			} elseif($type == "xml"){

-				xml_set_element_handler($this->parser, 'xmlStartElement','xmlEndElement');

-		    	xml_set_character_data_handler($this->parser,'xmlCharacterData');

-			}

-

-		    // Parse the XML file.

-		    if(!xml_parse($this->parser,$xml,true)){

-			// Display an error message.

-				$errstr = sprintf('XML error parsing XML schema on line %d: %s',

-				xml_get_current_line_number($this->parser),

-				xml_error_string(xml_get_error_code($this->parser))

-				);

-				$this->debug($errstr);

-				$this->debug("XML payload:\n" . $xml);

-				$this->setError($errstr);

-	    	}

-

-			xml_parser_free($this->parser);

-		} else{

-			$this->debug('no xml passed to parseString()!!');

-			$this->setError('no xml passed to parseString()!!');

-		}

-	}

-

-	/**

-	 * gets a type name for an unnamed type

-	 *

-	 * @param	string	Element name

-	 * @return	string	A type name for an unnamed type

-	 * @access	private

-	 */

-	function CreateTypeName($ename) {

-		$scope = '';

-		for ($i = 0; $i < count($this->complexTypeStack); $i++) {

-			$scope .= $this->complexTypeStack[$i] . '_';

-		}

-		return $scope . $ename . '_ContainedType';

-	}

-

-	/**

-	* start-element handler

-	*

-	* @param    string $parser XML parser object

-	* @param    string $name element name

-	* @param    string $attrs associative array of attributes

-	* @access   private

-	*/

-	function schemaStartElement($parser, $name, $attrs) {

-

-		// position in the total number of elements, starting from 0

-		$pos = $this->position++;

-		$depth = $this->depth++;

-		// set self as current value for this depth

-		$this->depth_array[$depth] = $pos;

-		$this->message[$pos] = array('cdata' => '');

-		if ($depth > 0) {

-			$this->defaultNamespace[$pos] = $this->defaultNamespace[$this->depth_array[$depth - 1]];

-		} else {

-			$this->defaultNamespace[$pos] = false;

-		}

-

-		// get element prefix

-		if($prefix = $this->getPrefix($name)){

-			// get unqualified name

-			$name = $this->getLocalPart($name);

-		} else {

-        	$prefix = '';

+     * constructor

+     *

+     * @param    string $schema schema document URI

+     * @param    string $xml xml document URI

+     * @param	string $namespaces namespaces defined in enclosing XML

+     * @access   public

+     */

+    function __construct($schema='',$xml='',$namespaces=array()){

+        parent::__construct();

+        $this->debug('nusoap_xmlschema class instantiated, inside constructor');

+        // files

+        $this->schema = $schema;

+        $this->xml = $xml;

+

+        // namespaces

+        $this->enclosingNamespaces = $namespaces;

+        $this->namespaces = array_merge($this->namespaces, $namespaces);

+

+        // parse schema file

+        if($schema != ''){

+            $this->debug('initial schema file: '.$schema);

+            $this->parseFile($schema, 'schema');

+        }

+

+        // parse xml file

+        if($xml != ''){

+            $this->debug('initial xml file: '.$xml);

+            $this->parseFile($xml, 'xml');

+        }

+

+    }

+

+    /**

+     * parse an XML file

+     *

+     * @param string $xml path/URL to XML file

+     * @param string $type (schema | xml)

+     * @return boolean

+     * @access public

+     */

+    function parseFile($xml,$type){

+        // parse xml file

+        if($xml != ""){

+            $xmlStr = @join("",@file($xml));

+            if($xmlStr == ""){

+                $msg = 'Error reading XML from '.$xml;

+                $this->setError($msg);

+                $this->debug($msg);

+            return false;

+            } else {

+                $this->debug("parsing $xml");

+                $this->parseString($xmlStr,$type);

+                $this->debug("done parsing $xml");

+            return true;

+            }

+        }

+        return false;

+    }

+

+    /**

+     * parse an XML string

+     *

+     * @param    string $xml path or URL

+     * @param	string $type (schema|xml)

+     * @access   private

+     */

+    function parseString($xml,$type){

+        // parse xml string

+        if($xml != ""){

+

+            // Create an XML parser.

+            $this->parser = xml_parser_create();

+            // Set the options for parsing the XML data.

+            xml_parser_set_option($this->parser, XML_OPTION_CASE_FOLDING, 0);

+

+            // Set the object for the parser.

+            xml_set_object($this->parser, $this);

+

+            // Set the element handlers for the parser.

+            if($type == "schema"){

+                xml_set_element_handler($this->parser, 'schemaStartElement','schemaEndElement');

+                xml_set_character_data_handler($this->parser,'schemaCharacterData');

+            } elseif($type == "xml"){

+                xml_set_element_handler($this->parser, 'xmlStartElement','xmlEndElement');

+                xml_set_character_data_handler($this->parser,'xmlCharacterData');

+            }

+

+            // Parse the XML file.

+            if(!xml_parse($this->parser,$xml,true)){

+            // Display an error message.

+                $errstr = sprintf('XML error parsing XML schema on line %d: %s',

+                xml_get_current_line_number($this->parser),

+                xml_error_string(xml_get_error_code($this->parser))

+                );

+                $this->debug($errstr);

+                $this->debug("XML payload:\n" . $xml);

+                $this->setError($errstr);

+            }

+

+            xml_parser_free($this->parser);

+        } else{

+            $this->debug('no xml passed to parseString()!!');

+            $this->setError('no xml passed to parseString()!!');

+        }

+    }

+

+    /**

+     * gets a type name for an unnamed type

+     *

+     * @param	string	Element name

+     * @return	string	A type name for an unnamed type

+     * @access	private

+     */

+    function CreateTypeName($ename) {

+        $scope = '';

+        for ($i = 0; $i < count($this->complexTypeStack); $i++) {

+            $scope .= $this->complexTypeStack[$i] . '_';

+        }

+        return $scope . $ename . '_ContainedType';

+    }

+

+    /**

+     * start-element handler

+     *

+     * @param    string $parser XML parser object

+     * @param    string $name element name

+     * @param    string $attrs associative array of attributes

+     * @access   private

+     */

+    function schemaStartElement($parser, $name, $attrs) {

+

+        // position in the total number of elements, starting from 0

+        $pos = $this->position++;

+        $depth = $this->depth++;

+        // set self as current value for this depth

+        $this->depth_array[$depth] = $pos;

+        $this->message[$pos] = array('cdata' => '');

+        if ($depth > 0) {

+            $this->defaultNamespace[$pos] = $this->defaultNamespace[$this->depth_array[$depth - 1]];

+        } else {

+            $this->defaultNamespace[$pos] = false;

+        }

+

+        // get element prefix

+        if($prefix = $this->getPrefix($name)){

+            // get unqualified name

+            $name = $this->getLocalPart($name);

+        } else {

+            $prefix = '';

         }

 

         // loop thru attributes, expanding, and registering namespace declarations

         if(count($attrs) > 0){

-        	foreach($attrs as $k => $v){

+            foreach($attrs as $k => $v){

                 // if ns declarations, add to class level array of valid namespaces

-				if(preg_match('/^xmlns/',$k)){

-                	//$this->xdebug("$k: $v");

-                	//$this->xdebug('ns_prefix: '.$this->getPrefix($k));

-                	if($ns_prefix = substr(strrchr($k,':'),1)){

-                		//$this->xdebug("Add namespace[$ns_prefix] = $v");

-						$this->namespaces[$ns_prefix] = $v;

-					} else {

-						$this->defaultNamespace[$pos] = $v;

-						if (! $this->getPrefixFromNamespace($v)) {

-							$this->namespaces['ns'.(count($this->namespaces)+1)] = $v;

-						}

-					}

-					if($v == 'http://www.w3.org/2001/XMLSchema' || $v == 'http://www.w3.org/1999/XMLSchema' || $v == 'http://www.w3.org/2000/10/XMLSchema'){

-						$this->XMLSchemaVersion = $v;

-						$this->namespaces['xsi'] = $v.'-instance';

-					}

-				}

-        	}

-        	foreach($attrs as $k => $v){

+                if(preg_match('/^xmlns/',$k)){

+                    //$this->xdebug("$k: $v");

+                    //$this->xdebug('ns_prefix: '.$this->getPrefix($k));

+                    if($ns_prefix = substr(strrchr($k,':'),1)){

+                        //$this->xdebug("Add namespace[$ns_prefix] = $v");

+                        $this->namespaces[$ns_prefix] = $v;

+                    } else {

+                        $this->defaultNamespace[$pos] = $v;

+                        if (! $this->getPrefixFromNamespace($v)) {

+                            $this->namespaces['ns'.(count($this->namespaces)+1)] = $v;

+                        }

+                    }

+                    if($v == 'http://www.w3.org/2001/XMLSchema' || $v == 'http://www.w3.org/1999/XMLSchema' || $v == 'http://www.w3.org/2000/10/XMLSchema'){

+                        $this->XMLSchemaVersion = $v;

+                        $this->namespaces['xsi'] = $v.'-instance';

+                    }

+                }

+            }

+            foreach($attrs as $k => $v){

                 // expand each attribute

                 $k = strpos($k,':') ? $this->expandQname($k) : $k;

                 $v = strpos($v,':') ? $this->expandQname($v) : $v;

-        		$eAttrs[$k] = $v;

-        	}

-        	$attrs = $eAttrs;

+                $eAttrs[$k] = $v;

+            }

+            $attrs = $eAttrs;

         } else {

-        	$attrs = array();

+            $attrs = array();

         }

-		// find status, register data

-		switch($name){

-			case 'all':			// (optional) compositor content for a complexType

-			case 'choice':

-			case 'group':

-			case 'sequence':

-				//$this->xdebug("compositor $name for currentComplexType: $this->currentComplexType and currentElement: $this->currentElement");

-				$this->complexTypes[$this->currentComplexType]['compositor'] = $name;

-				//if($name == 'all' || $name == 'sequence'){

-				//	$this->complexTypes[$this->currentComplexType]['phpType'] = 'struct';

-				//}

-			break;

-			case 'attribute':	// complexType attribute

-            	//$this->xdebug("parsing attribute $attrs[name] $attrs[ref] of value: ".$attrs['http://schemas.xmlsoap.org/wsdl/:arrayType']);

-            	$this->xdebug("parsing attribute:");

-            	$this->appendDebug($this->varDump($attrs));

-				if (!isset($attrs['form'])) {

-					// TODO: handle globals

-					$attrs['form'] = $this->schemaInfo['attributeFormDefault'];

-				}

-            	if (isset($attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'])) {

-					$v = $attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'];

-					if (!strpos($v, ':')) {

-						// no namespace in arrayType attribute value...

-						if ($this->defaultNamespace[$pos]) {

-							// ...so use the default

-							$attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'] = $this->defaultNamespace[$pos] . ':' . $attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'];

-						}

-					}

-            	}

+        // find status, register data

+        switch($name){

+            case 'all':			// (optional) compositor content for a complexType

+            case 'choice':

+            case 'group':

+            case 'sequence':

+                //$this->xdebug("compositor $name for currentComplexType: $this->currentComplexType and currentElement: $this->currentElement");

+                $this->complexTypes[$this->currentComplexType]['compositor'] = $name;

+                //if($name == 'all' || $name == 'sequence'){

+                //	$this->complexTypes[$this->currentComplexType]['phpType'] = 'struct';

+                //}

+            break;

+            case 'attribute':	// complexType attribute

+                //$this->xdebug("parsing attribute $attrs[name] $attrs[ref] of value: ".$attrs['http://schemas.xmlsoap.org/wsdl/:arrayType']);

+                $this->xdebug("parsing attribute:");

+                $this->appendDebug($this->varDump($attrs));

+                if (!isset($attrs['form'])) {

+                    // TODO: handle globals

+                    $attrs['form'] = $this->schemaInfo['attributeFormDefault'];

+                }

+                if (isset($attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'])) {

+                    $v = $attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'];

+                    if (!strpos($v, ':')) {

+                        // no namespace in arrayType attribute value...

+                        if ($this->defaultNamespace[$pos]) {

+                            // ...so use the default

+                            $attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'] = $this->defaultNamespace[$pos] . ':' . $attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'];

+                        }

+                    }

+                }

                 if(isset($attrs['name'])){

-					$this->attributes[$attrs['name']] = $attrs;

-					$aname = $attrs['name'];

-				} elseif(isset($attrs['ref']) && $attrs['ref'] == 'http://schemas.xmlsoap.org/soap/encoding/:arrayType'){

-					if (isset($attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'])) {

-	                	$aname = $attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'];

-	                } else {

-	                	$aname = '';

-	                }

-				} elseif(isset($attrs['ref'])){

-					$aname = $attrs['ref'];

+                    $this->attributes[$attrs['name']] = $attrs;

+                    $aname = $attrs['name'];

+                } elseif(isset($attrs['ref']) && $attrs['ref'] == 'http://schemas.xmlsoap.org/soap/encoding/:arrayType'){

+                    if (isset($attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'])) {

+                        $aname = $attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'];

+                    } else {

+                        $aname = '';

+                    }

+                } elseif(isset($attrs['ref'])){

+                    $aname = $attrs['ref'];

                     $this->attributes[$attrs['ref']] = $attrs;

-				}

-

-				if($this->currentComplexType){	// This should *always* be

-					$this->complexTypes[$this->currentComplexType]['attrs'][$aname] = $attrs;

-				}

-				// arrayType attribute

-				if(isset($attrs['http://schemas.xmlsoap.org/wsdl/:arrayType']) || $this->getLocalPart($aname) == 'arrayType'){

-					$this->complexTypes[$this->currentComplexType]['phpType'] = 'array';

-                	$prefix = $this->getPrefix($aname);

-					if(isset($attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'])){

-						$v = $attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'];

-					} else {

-						$v = '';

-					}

+                }

+

+                if($this->currentComplexType){	// This should *always* be

+                    $this->complexTypes[$this->currentComplexType]['attrs'][$aname] = $attrs;

+                }

+                // arrayType attribute

+                if(isset($attrs['http://schemas.xmlsoap.org/wsdl/:arrayType']) || $this->getLocalPart($aname) == 'arrayType'){

+                    $this->complexTypes[$this->currentComplexType]['phpType'] = 'array';

+                    $prefix = $this->getPrefix($aname);

+                    if(isset($attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'])){

+                        $v = $attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'];

+                    } else {

+                        $v = '';

+                    }

                     if(strpos($v,'[,]')){

                         $this->complexTypes[$this->currentComplexType]['multidimensional'] = true;

                     }

@@ -288,676 +288,676 @@ 
                         $v = $this->XMLSchemaVersion.':'.$v;

                     }

                     $this->complexTypes[$this->currentComplexType]['arrayType'] = $v;

-				}

-			break;

-			case 'complexContent':	// (optional) content for a complexType

-				$this->xdebug("do nothing for element $name");

-			break;

-			case 'complexType':

-				array_push($this->complexTypeStack, $this->currentComplexType);

-				if(isset($attrs['name'])){

-					// TODO: what is the scope of named complexTypes that appear

-					//       nested within other c complexTypes?

-					$this->xdebug('processing named complexType '.$attrs['name']);

-					//$this->currentElement = false;

-					$this->currentComplexType = $attrs['name'];

-					$this->complexTypes[$this->currentComplexType] = $attrs;

-					$this->complexTypes[$this->currentComplexType]['typeClass'] = 'complexType';

-					// This is for constructs like

-					//           <complexType name="ListOfString" base="soap:Array">

-					//                <sequence>

-					//                    <element name="string" type="xsd:string"

-					//                        minOccurs="0" maxOccurs="unbounded" />

-					//                </sequence>

-					//            </complexType>

-					if(isset($attrs['base']) && preg_match('/:Array$/',$attrs['base'])){

-						$this->xdebug('complexType is unusual array');

-						$this->complexTypes[$this->currentComplexType]['phpType'] = 'array';

-					} else {

-						$this->complexTypes[$this->currentComplexType]['phpType'] = 'struct';

-					}

-				} else {

-					$name = $this->CreateTypeName($this->currentElement);

-					$this->xdebug('processing unnamed complexType for element ' . $this->currentElement . ' named ' . $name);

-					$this->currentComplexType = $name;

-					//$this->currentElement = false;

-					$this->complexTypes[$this->currentComplexType] = $attrs;

-					$this->complexTypes[$this->currentComplexType]['typeClass'] = 'complexType';

-					// This is for constructs like

-					//           <complexType name="ListOfString" base="soap:Array">

-					//                <sequence>

-					//                    <element name="string" type="xsd:string"

-					//                        minOccurs="0" maxOccurs="unbounded" />

-					//                </sequence>

-					//            </complexType>

-					if(isset($attrs['base']) && preg_match('/:Array$/',$attrs['base'])){

-						$this->xdebug('complexType is unusual array');

-						$this->complexTypes[$this->currentComplexType]['phpType'] = 'array';

-					} else {

-						$this->complexTypes[$this->currentComplexType]['phpType'] = 'struct';

-					}

-				}

-				$this->complexTypes[$this->currentComplexType]['simpleContent'] = 'false';

-			break;

-			case 'element':

-				array_push($this->elementStack, $this->currentElement);

-				if (!isset($attrs['form'])) {

-					if ($this->currentComplexType) {

-						$attrs['form'] = $this->schemaInfo['elementFormDefault'];

-					} else {

-						// global

-						$attrs['form'] = 'qualified';

-					}

-				}

-				if(isset($attrs['type'])){

-					$this->xdebug("processing typed element ".$attrs['name']." of type ".$attrs['type']);

-					if (! $this->getPrefix($attrs['type'])) {

-						if ($this->defaultNamespace[$pos]) {

-							$attrs['type'] = $this->defaultNamespace[$pos] . ':' . $attrs['type'];

-							$this->xdebug('used default namespace to make type ' . $attrs['type']);

-						}

-					}

-					// This is for constructs like

-					//           <complexType name="ListOfString" base="soap:Array">

-					//                <sequence>

-					//                    <element name="string" type="xsd:string"

-					//                        minOccurs="0" maxOccurs="unbounded" />

-					//                </sequence>

-					//            </complexType>

-					if ($this->currentComplexType && $this->complexTypes[$this->currentComplexType]['phpType'] == 'array') {

-						$this->xdebug('arrayType for unusual array is ' . $attrs['type']);

-						$this->complexTypes[$this->currentComplexType]['arrayType'] = $attrs['type'];

-					}

-					$this->currentElement = $attrs['name'];

-					$ename = $attrs['name'];

-				} elseif(isset($attrs['ref'])){

-					$this->xdebug("processing element as ref to ".$attrs['ref']);

-					$this->currentElement = "ref to ".$attrs['ref'];

-					$ename = $this->getLocalPart($attrs['ref']);

-				} else {

-					$type = $this->CreateTypeName($this->currentComplexType . '_' . $attrs['name']);

-					$this->xdebug("processing untyped element " . $attrs['name'] . ' type ' . $type);

-					$this->currentElement = $attrs['name'];

-					$attrs['type'] = $this->schemaTargetNamespace . ':' . $type;

-					$ename = $attrs['name'];

-				}

-				if (isset($ename) && $this->currentComplexType) {

-					$this->xdebug("add element $ename to complexType $this->currentComplexType");

-					$this->complexTypes[$this->currentComplexType]['elements'][$ename] = $attrs;

-				} elseif (!isset($attrs['ref'])) {

-					$this->xdebug("add element $ename to elements array");

-					$this->elements[ $attrs['name'] ] = $attrs;

-					$this->elements[ $attrs['name'] ]['typeClass'] = 'element';

-				}

-			break;

-			case 'enumeration':	//	restriction value list member

-				$this->xdebug('enumeration ' . $attrs['value']);

-				if ($this->currentSimpleType) {

-					$this->simpleTypes[$this->currentSimpleType]['enumeration'][] = $attrs['value'];

-				} elseif ($this->currentComplexType) {

-					$this->complexTypes[$this->currentComplexType]['enumeration'][] = $attrs['value'];

-				}

-			break;

-			case 'extension':	// simpleContent or complexContent type extension

-				$this->xdebug('extension ' . $attrs['base']);

-				if ($this->currentComplexType) {

-					$ns = $this->getPrefix($attrs['base']);

-					if ($ns == '') {

-						$this->complexTypes[$this->currentComplexType]['extensionBase'] = $this->schemaTargetNamespace . ':' . $attrs['base'];

-					} else {

-						$this->complexTypes[$this->currentComplexType]['extensionBase'] = $attrs['base'];

-					}

-				} else {

-					$this->xdebug('no current complexType to set extensionBase');

-				}

-			break;

-			case 'import':

-			    if (isset($attrs['schemaLocation'])) {

-					$this->xdebug('import namespace ' . $attrs['namespace'] . ' from ' . $attrs['schemaLocation']);

+                }

+            break;

+            case 'complexContent':	// (optional) content for a complexType

+                $this->xdebug("do nothing for element $name");

+            break;

+            case 'complexType':

+                array_push($this->complexTypeStack, $this->currentComplexType);

+                if(isset($attrs['name'])){

+                    // TODO: what is the scope of named complexTypes that appear

+                    //       nested within other c complexTypes?

+                    $this->xdebug('processing named complexType '.$attrs['name']);

+                    //$this->currentElement = false;

+                    $this->currentComplexType = $attrs['name'];

+                    $this->complexTypes[$this->currentComplexType] = $attrs;

+                    $this->complexTypes[$this->currentComplexType]['typeClass'] = 'complexType';

+                    // This is for constructs like

+                    //           <complexType name="ListOfString" base="soap:Array">

+                    //                <sequence>

+                    //                    <element name="string" type="xsd:string"

+                    //                        minOccurs="0" maxOccurs="unbounded" />

+                    //                </sequence>

+                    //            </complexType>

+                    if(isset($attrs['base']) && preg_match('/:Array$/',$attrs['base'])){

+                        $this->xdebug('complexType is unusual array');

+                        $this->complexTypes[$this->currentComplexType]['phpType'] = 'array';

+                    } else {

+                        $this->complexTypes[$this->currentComplexType]['phpType'] = 'struct';

+                    }

+                } else {

+                    $name = $this->CreateTypeName($this->currentElement);

+                    $this->xdebug('processing unnamed complexType for element ' . $this->currentElement . ' named ' . $name);

+                    $this->currentComplexType = $name;

+                    //$this->currentElement = false;

+                    $this->complexTypes[$this->currentComplexType] = $attrs;

+                    $this->complexTypes[$this->currentComplexType]['typeClass'] = 'complexType';

+                    // This is for constructs like

+                    //           <complexType name="ListOfString" base="soap:Array">

+                    //                <sequence>

+                    //                    <element name="string" type="xsd:string"

+                    //                        minOccurs="0" maxOccurs="unbounded" />

+                    //                </sequence>

+                    //            </complexType>

+                    if(isset($attrs['base']) && preg_match('/:Array$/',$attrs['base'])){

+                        $this->xdebug('complexType is unusual array');

+                        $this->complexTypes[$this->currentComplexType]['phpType'] = 'array';

+                    } else {

+                        $this->complexTypes[$this->currentComplexType]['phpType'] = 'struct';

+                    }

+                }

+                $this->complexTypes[$this->currentComplexType]['simpleContent'] = 'false';

+            break;

+            case 'element':

+                array_push($this->elementStack, $this->currentElement);

+                if (!isset($attrs['form'])) {

+                    if ($this->currentComplexType) {

+                        $attrs['form'] = $this->schemaInfo['elementFormDefault'];

+                    } else {

+                        // global

+                        $attrs['form'] = 'qualified';

+                    }

+                }

+                if(isset($attrs['type'])){

+                    $this->xdebug("processing typed element ".$attrs['name']." of type ".$attrs['type']);

+                    if (! $this->getPrefix($attrs['type'])) {

+                        if ($this->defaultNamespace[$pos]) {

+                            $attrs['type'] = $this->defaultNamespace[$pos] . ':' . $attrs['type'];

+                            $this->xdebug('used default namespace to make type ' . $attrs['type']);

+                        }

+                    }

+                    // This is for constructs like

+                    //           <complexType name="ListOfString" base="soap:Array">

+                    //                <sequence>

+                    //                    <element name="string" type="xsd:string"

+                    //                        minOccurs="0" maxOccurs="unbounded" />

+                    //                </sequence>

+                    //            </complexType>

+                    if ($this->currentComplexType && $this->complexTypes[$this->currentComplexType]['phpType'] == 'array') {

+                        $this->xdebug('arrayType for unusual array is ' . $attrs['type']);

+                        $this->complexTypes[$this->currentComplexType]['arrayType'] = $attrs['type'];

+                    }

+                    $this->currentElement = $attrs['name'];

+                    $ename = $attrs['name'];

+                } elseif(isset($attrs['ref'])){

+                    $this->xdebug("processing element as ref to ".$attrs['ref']);

+                    $this->currentElement = "ref to ".$attrs['ref'];

+                    $ename = $this->getLocalPart($attrs['ref']);

+                } else {

+                    $type = $this->CreateTypeName($this->currentComplexType . '_' . $attrs['name']);

+                    $this->xdebug("processing untyped element " . $attrs['name'] . ' type ' . $type);

+                    $this->currentElement = $attrs['name'];

+                    $attrs['type'] = $this->schemaTargetNamespace . ':' . $type;

+                    $ename = $attrs['name'];

+                }

+                if (isset($ename) && $this->currentComplexType) {

+                    $this->xdebug("add element $ename to complexType $this->currentComplexType");

+                    $this->complexTypes[$this->currentComplexType]['elements'][$ename] = $attrs;

+                } elseif (!isset($attrs['ref'])) {

+                    $this->xdebug("add element $ename to elements array");

+                    $this->elements[ $attrs['name'] ] = $attrs;

+                    $this->elements[ $attrs['name'] ]['typeClass'] = 'element';

+                }

+            break;

+            case 'enumeration':	//	restriction value list member

+                $this->xdebug('enumeration ' . $attrs['value']);

+                if ($this->currentSimpleType) {

+                    $this->simpleTypes[$this->currentSimpleType]['enumeration'][] = $attrs['value'];

+                } elseif ($this->currentComplexType) {

+                    $this->complexTypes[$this->currentComplexType]['enumeration'][] = $attrs['value'];

+                }

+            break;

+            case 'extension':	// simpleContent or complexContent type extension

+                $this->xdebug('extension ' . $attrs['base']);

+                if ($this->currentComplexType) {

+                    $ns = $this->getPrefix($attrs['base']);

+                    if ($ns == '') {

+                        $this->complexTypes[$this->currentComplexType]['extensionBase'] = $this->schemaTargetNamespace . ':' . $attrs['base'];

+                    } else {

+                        $this->complexTypes[$this->currentComplexType]['extensionBase'] = $attrs['base'];

+                    }

+                } else {

+                    $this->xdebug('no current complexType to set extensionBase');

+                }

+            break;

+            case 'import':

+                if (isset($attrs['schemaLocation'])) {

+                    $this->xdebug('import namespace ' . $attrs['namespace'] . ' from ' . $attrs['schemaLocation']);

                     $this->imports[$attrs['namespace']][] = array('location' => $attrs['schemaLocation'], 'loaded' => false);

-				} else {

-					$this->xdebug('import namespace ' . $attrs['namespace']);

+                } else {

+                    $this->xdebug('import namespace ' . $attrs['namespace']);

                     $this->imports[$attrs['namespace']][] = array('location' => '', 'loaded' => true);

-					if (! $this->getPrefixFromNamespace($attrs['namespace'])) {

-						$this->namespaces['ns'.(count($this->namespaces)+1)] = $attrs['namespace'];

-					}

-				}

-			break;

-			case 'include':

-			    if (isset($attrs['schemaLocation'])) {

-					$this->xdebug('include into namespace ' . $this->schemaTargetNamespace . ' from ' . $attrs['schemaLocation']);

+                    if (! $this->getPrefixFromNamespace($attrs['namespace'])) {

+                        $this->namespaces['ns'.(count($this->namespaces)+1)] = $attrs['namespace'];

+                    }

+                }

+            break;

+            case 'include':

+                if (isset($attrs['schemaLocation'])) {

+                    $this->xdebug('include into namespace ' . $this->schemaTargetNamespace . ' from ' . $attrs['schemaLocation']);

                     $this->imports[$this->schemaTargetNamespace][] = array('location' => $attrs['schemaLocation'], 'loaded' => false);

-				} else {

-					$this->xdebug('ignoring invalid XML Schema construct: include without schemaLocation attribute');

-				}

-			break;

-			case 'list':	// simpleType value list

-				$this->xdebug("do nothing for element $name");

-			break;

-			case 'restriction':	// simpleType, simpleContent or complexContent value restriction

-				$this->xdebug('restriction ' . $attrs['base']);

-				if($this->currentSimpleType){

-					$this->simpleTypes[$this->currentSimpleType]['type'] = $attrs['base'];

-				} elseif($this->currentComplexType){

-					$this->complexTypes[$this->currentComplexType]['restrictionBase'] = $attrs['base'];

-					if(strstr($attrs['base'],':') == ':Array'){

-						$this->complexTypes[$this->currentComplexType]['phpType'] = 'array';

-					}

-				}

-			break;

-			case 'schema':

-				$this->schemaInfo = $attrs;

-				$this->schemaInfo['schemaVersion'] = $this->getNamespaceFromPrefix($prefix);

-				if (isset($attrs['targetNamespace'])) {

-					$this->schemaTargetNamespace = $attrs['targetNamespace'];

-				}

-				if (!isset($attrs['elementFormDefault'])) {

-					$this->schemaInfo['elementFormDefault'] = 'unqualified';

-				}

-				if (!isset($attrs['attributeFormDefault'])) {

-					$this->schemaInfo['attributeFormDefault'] = 'unqualified';

-				}

-			break;

-			case 'simpleContent':	// (optional) content for a complexType

-				if ($this->currentComplexType) {	// This should *always* be

-					$this->complexTypes[$this->currentComplexType]['simpleContent'] = 'true';

-				} else {

-					$this->xdebug("do nothing for element $name because there is no current complexType");

-				}

-			break;

-			case 'simpleType':

-				array_push($this->simpleTypeStack, $this->currentSimpleType);

-				if(isset($attrs['name'])){

-					$this->xdebug("processing simpleType for name " . $attrs['name']);

-					$this->currentSimpleType = $attrs['name'];

-					$this->simpleTypes[ $attrs['name'] ] = $attrs;

-					$this->simpleTypes[ $attrs['name'] ]['typeClass'] = 'simpleType';

-					$this->simpleTypes[ $attrs['name'] ]['phpType'] = 'scalar';

-				} else {

-					$name = $this->CreateTypeName($this->currentComplexType . '_' . $this->currentElement);

-					$this->xdebug('processing unnamed simpleType for element ' . $this->currentElement . ' named ' . $name);

-					$this->currentSimpleType = $name;

-					//$this->currentElement = false;

-					$this->simpleTypes[$this->currentSimpleType] = $attrs;

-					$this->simpleTypes[$this->currentSimpleType]['phpType'] = 'scalar';

-				}

-			break;

-			case 'union':	// simpleType type list

-				$this->xdebug("do nothing for element $name");

-			break;

-			default:

-				$this->xdebug("do not have any logic to process element $name");

-		}

-	}

-

-	/**

-	* end-element handler

-	*

-	* @param    string $parser XML parser object

-	* @param    string $name element name

-	* @access   private

-	*/

-	function schemaEndElement($parser, $name) {

-		// bring depth down a notch

-		$this->depth--;

-		// position of current element is equal to the last value left in depth_array for my depth

-		if(isset($this->depth_array[$this->depth])){

-        	$pos = $this->depth_array[$this->depth];

+                } else {

+                    $this->xdebug('ignoring invalid XML Schema construct: include without schemaLocation attribute');

+                }

+            break;

+            case 'list':	// simpleType value list

+                $this->xdebug("do nothing for element $name");

+            break;

+            case 'restriction':	// simpleType, simpleContent or complexContent value restriction

+                $this->xdebug('restriction ' . $attrs['base']);

+                if($this->currentSimpleType){

+                    $this->simpleTypes[$this->currentSimpleType]['type'] = $attrs['base'];

+                } elseif($this->currentComplexType){

+                    $this->complexTypes[$this->currentComplexType]['restrictionBase'] = $attrs['base'];

+                    if(strstr($attrs['base'],':') == ':Array'){

+                        $this->complexTypes[$this->currentComplexType]['phpType'] = 'array';

+                    }

+                }

+            break;

+            case 'schema':

+                $this->schemaInfo = $attrs;

+                $this->schemaInfo['schemaVersion'] = $this->getNamespaceFromPrefix($prefix);

+                if (isset($attrs['targetNamespace'])) {

+                    $this->schemaTargetNamespace = $attrs['targetNamespace'];

+                }

+                if (!isset($attrs['elementFormDefault'])) {

+                    $this->schemaInfo['elementFormDefault'] = 'unqualified';

+                }

+                if (!isset($attrs['attributeFormDefault'])) {

+                    $this->schemaInfo['attributeFormDefault'] = 'unqualified';

+                }

+            break;

+            case 'simpleContent':	// (optional) content for a complexType

+                if ($this->currentComplexType) {	// This should *always* be

+                    $this->complexTypes[$this->currentComplexType]['simpleContent'] = 'true';

+                } else {

+                    $this->xdebug("do nothing for element $name because there is no current complexType");

+                }

+            break;

+            case 'simpleType':

+                array_push($this->simpleTypeStack, $this->currentSimpleType);

+                if(isset($attrs['name'])){

+                    $this->xdebug("processing simpleType for name " . $attrs['name']);

+                    $this->currentSimpleType = $attrs['name'];

+                    $this->simpleTypes[ $attrs['name'] ] = $attrs;

+                    $this->simpleTypes[ $attrs['name'] ]['typeClass'] = 'simpleType';

+                    $this->simpleTypes[ $attrs['name'] ]['phpType'] = 'scalar';

+                } else {

+                    $name = $this->CreateTypeName($this->currentComplexType . '_' . $this->currentElement);

+                    $this->xdebug('processing unnamed simpleType for element ' . $this->currentElement . ' named ' . $name);

+                    $this->currentSimpleType = $name;

+                    //$this->currentElement = false;

+                    $this->simpleTypes[$this->currentSimpleType] = $attrs;

+                    $this->simpleTypes[$this->currentSimpleType]['phpType'] = 'scalar';

+                }

+            break;

+            case 'union':	// simpleType type list

+                $this->xdebug("do nothing for element $name");

+            break;

+            default:

+                $this->xdebug("do not have any logic to process element $name");

+        }

+    }

+

+    /**

+     * end-element handler

+     *

+     * @param    string $parser XML parser object

+     * @param    string $name element name

+     * @access   private

+     */

+    function schemaEndElement($parser, $name) {

+        // bring depth down a notch

+        $this->depth--;

+        // position of current element is equal to the last value left in depth_array for my depth

+        if(isset($this->depth_array[$this->depth])){

+            $pos = $this->depth_array[$this->depth];

+        }

+        // get element prefix

+        if ($prefix = $this->getPrefix($name)){

+            // get unqualified name

+            $name = $this->getLocalPart($name);

+        } else {

+            $prefix = '';

+        }

+        // move on...

+        if($name == 'complexType'){

+            $this->xdebug('done processing complexType ' . ($this->currentComplexType ? $this->currentComplexType : '(unknown)'));

+            $this->xdebug($this->varDump($this->complexTypes[$this->currentComplexType]));

+            $this->currentComplexType = array_pop($this->complexTypeStack);

+            //$this->currentElement = false;

+        }

+        if($name == 'element'){

+            $this->xdebug('done processing element ' . ($this->currentElement ? $this->currentElement : '(unknown)'));

+            $this->currentElement = array_pop($this->elementStack);

         }

-		// get element prefix

-		if ($prefix = $this->getPrefix($name)){

-			// get unqualified name

-			$name = $this->getLocalPart($name);

-		} else {

-        	$prefix = '';

+        if($name == 'simpleType'){

+            $this->xdebug('done processing simpleType ' . ($this->currentSimpleType ? $this->currentSimpleType : '(unknown)'));

+            $this->xdebug($this->varDump($this->simpleTypes[$this->currentSimpleType]));

+            $this->currentSimpleType = array_pop($this->simpleTypeStack);

         }

-		// move on...

-		if($name == 'complexType'){

-			$this->xdebug('done processing complexType ' . ($this->currentComplexType ? $this->currentComplexType : '(unknown)'));

-			$this->xdebug($this->varDump($this->complexTypes[$this->currentComplexType]));

-			$this->currentComplexType = array_pop($this->complexTypeStack);

-			//$this->currentElement = false;

-		}

-		if($name == 'element'){

-			$this->xdebug('done processing element ' . ($this->currentElement ? $this->currentElement : '(unknown)'));

-			$this->currentElement = array_pop($this->elementStack);

-		}

-		if($name == 'simpleType'){

-			$this->xdebug('done processing simpleType ' . ($this->currentSimpleType ? $this->currentSimpleType : '(unknown)'));

-			$this->xdebug($this->varDump($this->simpleTypes[$this->currentSimpleType]));

-			$this->currentSimpleType = array_pop($this->simpleTypeStack);

-		}

-	}

-

-	/**

-	* element content handler

-	*

-	* @param    string $parser XML parser object

-	* @param    string $data element content

-	* @access   private

-	*/

-	function schemaCharacterData($parser, $data){

-		$pos = $this->depth_array[$this->depth - 1];

-		$this->message[$pos]['cdata'] .= $data;

-	}

-

-	/**

-	* serialize the schema

-	*

-	* @access   public

-	*/

-	function serializeSchema(){

-

-		$schemaPrefix = $this->getPrefixFromNamespace($this->XMLSchemaVersion);

-		$xml = '';

-		// imports

-		if (sizeof($this->imports) > 0) {

-			foreach($this->imports as $ns => $list) {

-				foreach ($list as $ii) {

-					if ($ii['location'] != '') {

-						$xml .= " <$schemaPrefix:import location=\"" . $ii['location'] . '" namespace="' . $ns . "\" />\n";

-					} else {

-						$xml .= " <$schemaPrefix:import namespace=\"" . $ns . "\" />\n";

-					}

-				}

-			}

-		}

-		// complex types

-		foreach($this->complexTypes as $typeName => $attrs){

-			$contentStr = '';

-			// serialize child elements

-			if(isset($attrs['elements']) && (count($attrs['elements']) > 0)){

-				foreach($attrs['elements'] as $element => $eParts){

-					if(isset($eParts['ref'])){

-						$contentStr .= "   <$schemaPrefix:element ref=\"$element\"/>\n";

-					} else {

-						$contentStr .= "   <$schemaPrefix:element name=\"$element\" type=\"" . $this->contractQName($eParts['type']) . "\"";

-						foreach ($eParts as $aName => $aValue) {

-							// handle, e.g., abstract, default, form, minOccurs, maxOccurs, nillable

-							if ($aName != 'name' && $aName != 'type') {

-								$contentStr .= " $aName=\"$aValue\"";

-							}

-						}

-						$contentStr .= "/>\n";

-					}

-				}

-				// compositor wraps elements

-				if (isset($attrs['compositor']) && ($attrs['compositor'] != '')) {

-					$contentStr = "  <$schemaPrefix:$attrs[compositor]>\n".$contentStr."  </$schemaPrefix:$attrs[compositor]>\n";

-				}

-			}

-			// attributes

-			if(isset($attrs['attrs']) && (count($attrs['attrs']) >= 1)){

-				foreach($attrs['attrs'] as $attr => $aParts){

-					$contentStr .= "    <$schemaPrefix:attribute";

-					foreach ($aParts as $a => $v) {

-						if ($a == 'ref' || $a == 'type') {

-							$contentStr .= " $a=\"".$this->contractQName($v).'"';

-						} elseif ($a == 'http://schemas.xmlsoap.org/wsdl/:arrayType') {

-							$this->usedNamespaces['wsdl'] = $this->namespaces['wsdl'];

-							$contentStr .= ' wsdl:arrayType="'.$this->contractQName($v).'"';

-						} else {

-							$contentStr .= " $a=\"$v\"";

-						}

-					}

-					$contentStr .= "/>\n";

-				}

-			}

-			// if restriction

-			if (isset($attrs['restrictionBase']) && $attrs['restrictionBase'] != ''){

-				$contentStr = "   <$schemaPrefix:restriction base=\"".$this->contractQName($attrs['restrictionBase'])."\">\n".$contentStr."   </$schemaPrefix:restriction>\n";

-				// complex or simple content

-				if ((isset($attrs['elements']) && count($attrs['elements']) > 0) || (isset($attrs['attrs']) && count($attrs['attrs']) > 0)){

-					$contentStr = "  <$schemaPrefix:complexContent>\n".$contentStr."  </$schemaPrefix:complexContent>\n";

-				}

-			}

-			// finalize complex type

-			if($contentStr != ''){

-				$contentStr = " <$schemaPrefix:complexType name=\"$typeName\">\n".$contentStr." </$schemaPrefix:complexType>\n";

-			} else {

-				$contentStr = " <$schemaPrefix:complexType name=\"$typeName\"/>\n";

-			}

-			$xml .= $contentStr;

-		}

-		// simple types

-		if(isset($this->simpleTypes) && count($this->simpleTypes) > 0){

-			foreach($this->simpleTypes as $typeName => $eParts){

-				$xml .= " <$schemaPrefix:simpleType name=\"$typeName\">\n  <$schemaPrefix:restriction base=\"".$this->contractQName($eParts['type'])."\">\n";

-				if (isset($eParts['enumeration'])) {

-					foreach ($eParts['enumeration'] as $e) {

-						$xml .= "  <$schemaPrefix:enumeration value=\"$e\"/>\n";

-					}

-				}

-				$xml .= "  </$schemaPrefix:restriction>\n </$schemaPrefix:simpleType>";

-			}

-		}

-		// elements

-		if(isset($this->elements) && count($this->elements) > 0){

-			foreach($this->elements as $element => $eParts){

-				$xml .= " <$schemaPrefix:element name=\"$element\" type=\"".$this->contractQName($eParts['type'])."\"/>\n";

-			}

-		}

-		// attributes

-		if(isset($this->attributes) && count($this->attributes) > 0){

-			foreach($this->attributes as $attr => $aParts){

-				$xml .= " <$schemaPrefix:attribute name=\"$attr\" type=\"".$this->contractQName($aParts['type'])."\"\n/>";

-			}

-		}

-		// finish 'er up

-		$attr = '';

-		foreach ($this->schemaInfo as $k => $v) {

-			if ($k == 'elementFormDefault' || $k == 'attributeFormDefault') {

-				$attr .= " $k=\"$v\"";

-			}

-		}

-		$el = "<$schemaPrefix:schema$attr targetNamespace=\"$this->schemaTargetNamespace\"\n";

-		foreach (array_diff($this->usedNamespaces, $this->enclosingNamespaces) as $nsp => $ns) {

-			$el .= " xmlns:$nsp=\"$ns\"";

-		}

-		$xml = $el . ">\n".$xml."</$schemaPrefix:schema>\n";

-		return $xml;

-	}

-

-	/**

-	* adds debug data to the clas level debug string

-	*

-	* @param    string $string debug data

-	* @access   private

-	*/

-	function xdebug($string){

-		$this->debug('<' . $this->schemaTargetNamespace . '> '.$string);

-	}

+    }

+

+    /**

+     * element content handler

+     *

+     * @param    string $parser XML parser object

+     * @param    string $data element content

+     * @access   private

+     */

+    function schemaCharacterData($parser, $data){

+        $pos = $this->depth_array[$this->depth - 1];

+        $this->message[$pos]['cdata'] .= $data;

+    }

 

     /**

-    * get the PHP type of a user defined type in the schema

-    * PHP type is kind of a misnomer since it actually returns 'struct' for assoc. arrays

-    * returns false if no type exists, or not w/ the given namespace

-    * else returns a string that is either a native php type, or 'struct'

-    *

-    * @param string $type name of defined type

-    * @param string $ns namespace of type

-    * @return mixed

-    * @access public

-    * @deprecated

-    */

-	function getPHPType($type,$ns){

-		if(isset($this->typemap[$ns][$type])){

-			//print "found type '$type' and ns $ns in typemap<br>";

-			return $this->typemap[$ns][$type];

-		} elseif(isset($this->complexTypes[$type])){

-			//print "getting type '$type' and ns $ns from complexTypes array<br>";

-			return $this->complexTypes[$type]['phpType'];

-		}

-		return false;

-	}

-

-	/**

-    * returns an associative array of information about a given type

-    * returns false if no type exists by the given name

-    *

-	*	For a complexType typeDef = array(

-	*	'restrictionBase' => '',

-	*	'phpType' => '',

-	*	'compositor' => '(sequence|all)',

-	*	'elements' => array(), // refs to elements array

-	*	'attrs' => array() // refs to attributes array

-	*	... and so on (see addComplexType)

-	*	)

-	*

-	*   For simpleType or element, the array has different keys.

-    *

-    * @param string $type

-    * @return mixed

-    * @access public

-    * @see addComplexType

-    * @see addSimpleType

-    * @see addElement

-    */

-	function getTypeDef($type){

-		//$this->debug("in getTypeDef for type $type");

-		if (substr($type, -1) == '^') {

-			$is_element = 1;

-			$type = substr($type, 0, -1);

-		} else {

-			$is_element = 0;

-		}

-

-		if((! $is_element) && isset($this->complexTypes[$type])){

-			$this->xdebug("in getTypeDef, found complexType $type");

-			return $this->complexTypes[$type];

-		} elseif((! $is_element) && isset($this->simpleTypes[$type])){

-			$this->xdebug("in getTypeDef, found simpleType $type");

-			if (!isset($this->simpleTypes[$type]['phpType'])) {

-				// get info for type to tack onto the simple type

-				// TODO: can this ever really apply (i.e. what is a simpleType really?)

-				$uqType = substr($this->simpleTypes[$type]['type'], strrpos($this->simpleTypes[$type]['type'], ':') + 1);

-				$ns = substr($this->simpleTypes[$type]['type'], 0, strrpos($this->simpleTypes[$type]['type'], ':'));

-				$etype = $this->getTypeDef($uqType);

-				if ($etype) {

-					$this->xdebug("in getTypeDef, found type for simpleType $type:");

-					$this->xdebug($this->varDump($etype));

-					if (isset($etype['phpType'])) {

-						$this->simpleTypes[$type]['phpType'] = $etype['phpType'];

-					}

-					if (isset($etype['elements'])) {

-						$this->simpleTypes[$type]['elements'] = $etype['elements'];

-					}

-				}

-			}

-			return $this->simpleTypes[$type];

-		} elseif(isset($this->elements[$type])){

-			$this->xdebug("in getTypeDef, found element $type");

-			if (!isset($this->elements[$type]['phpType'])) {

-				// get info for type to tack onto the element

-				$uqType = substr($this->elements[$type]['type'], strrpos($this->elements[$type]['type'], ':') + 1);

-				$ns = substr($this->elements[$type]['type'], 0, strrpos($this->elements[$type]['type'], ':'));

-				$etype = $this->getTypeDef($uqType);

-				if ($etype) {

-					$this->xdebug("in getTypeDef, found type for element $type:");

-					$this->xdebug($this->varDump($etype));

-					if (isset($etype['phpType'])) {

-						$this->elements[$type]['phpType'] = $etype['phpType'];

-					}

-					if (isset($etype['elements'])) {

-						$this->elements[$type]['elements'] = $etype['elements'];

-					}

-					if (isset($etype['extensionBase'])) {

-						$this->elements[$type]['extensionBase'] = $etype['extensionBase'];

-					}

-				} elseif ($ns == 'http://www.w3.org/2001/XMLSchema') {

-					$this->xdebug("in getTypeDef, element $type is an XSD type");

-					$this->elements[$type]['phpType'] = 'scalar';

-				}

-			}

-			return $this->elements[$type];

-		} elseif(isset($this->attributes[$type])){

-			$this->xdebug("in getTypeDef, found attribute $type");

-			return $this->attributes[$type];

-		} elseif (preg_match('/_ContainedType$/', $type)) {

-			$this->xdebug("in getTypeDef, have an untyped element $type");

-			$typeDef['typeClass'] = 'simpleType';

-			$typeDef['phpType'] = 'scalar';

-			$typeDef['type'] = 'http://www.w3.org/2001/XMLSchema:string';

-			return $typeDef;

-		}

-		$this->xdebug("in getTypeDef, did not find $type");

-		return false;

-	}

-

-	/**

-    * returns a sample serialization of a given type, or false if no type by the given name

-    *

-    * @param string $type name of type

-    * @return mixed

-    * @access public

-    * @deprecated

-    */

+     * serialize the schema

+     *

+     * @access   public

+     */

+    function serializeSchema(){

+

+        $schemaPrefix = $this->getPrefixFromNamespace($this->XMLSchemaVersion);

+        $xml = '';

+        // imports

+        if (sizeof($this->imports) > 0) {

+            foreach($this->imports as $ns => $list) {

+                foreach ($list as $ii) {

+                    if ($ii['location'] != '') {

+                        $xml .= " <$schemaPrefix:import location=\"" . $ii['location'] . '" namespace="' . $ns . "\" />\n";

+                    } else {

+                        $xml .= " <$schemaPrefix:import namespace=\"" . $ns . "\" />\n";

+                    }

+                }

+            }

+        }

+        // complex types

+        foreach($this->complexTypes as $typeName => $attrs){

+            $contentStr = '';

+            // serialize child elements

+            if(isset($attrs['elements']) && (count($attrs['elements']) > 0)){

+                foreach($attrs['elements'] as $element => $eParts){

+                    if(isset($eParts['ref'])){

+                        $contentStr .= "   <$schemaPrefix:element ref=\"$element\"/>\n";

+                    } else {

+                        $contentStr .= "   <$schemaPrefix:element name=\"$element\" type=\"" . $this->contractQName($eParts['type']) . "\"";

+                        foreach ($eParts as $aName => $aValue) {

+                            // handle, e.g., abstract, default, form, minOccurs, maxOccurs, nillable

+                            if ($aName != 'name' && $aName != 'type') {

+                                $contentStr .= " $aName=\"$aValue\"";

+                            }

+                        }

+                        $contentStr .= "/>\n";

+                    }

+                }

+                // compositor wraps elements

+                if (isset($attrs['compositor']) && ($attrs['compositor'] != '')) {

+                    $contentStr = "  <$schemaPrefix:$attrs[compositor]>\n".$contentStr."  </$schemaPrefix:$attrs[compositor]>\n";

+                }

+            }

+            // attributes

+            if(isset($attrs['attrs']) && (count($attrs['attrs']) >= 1)){

+                foreach($attrs['attrs'] as $attr => $aParts){

+                    $contentStr .= "    <$schemaPrefix:attribute";

+                    foreach ($aParts as $a => $v) {

+                        if ($a == 'ref' || $a == 'type') {

+                            $contentStr .= " $a=\"".$this->contractQName($v).'"';

+                        } elseif ($a == 'http://schemas.xmlsoap.org/wsdl/:arrayType') {

+                            $this->usedNamespaces['wsdl'] = $this->namespaces['wsdl'];

+                            $contentStr .= ' wsdl:arrayType="'.$this->contractQName($v).'"';

+                        } else {

+                            $contentStr .= " $a=\"$v\"";

+                        }

+                    }

+                    $contentStr .= "/>\n";

+                }

+            }

+            // if restriction

+            if (isset($attrs['restrictionBase']) && $attrs['restrictionBase'] != ''){

+                $contentStr = "   <$schemaPrefix:restriction base=\"".$this->contractQName($attrs['restrictionBase'])."\">\n".$contentStr."   </$schemaPrefix:restriction>\n";

+                // complex or simple content

+                if ((isset($attrs['elements']) && count($attrs['elements']) > 0) || (isset($attrs['attrs']) && count($attrs['attrs']) > 0)){

+                    $contentStr = "  <$schemaPrefix:complexContent>\n".$contentStr."  </$schemaPrefix:complexContent>\n";

+                }

+            }

+            // finalize complex type

+            if($contentStr != ''){

+                $contentStr = " <$schemaPrefix:complexType name=\"$typeName\">\n".$contentStr." </$schemaPrefix:complexType>\n";

+            } else {

+                $contentStr = " <$schemaPrefix:complexType name=\"$typeName\"/>\n";

+            }

+            $xml .= $contentStr;

+        }

+        // simple types

+        if(isset($this->simpleTypes) && count($this->simpleTypes) > 0){

+            foreach($this->simpleTypes as $typeName => $eParts){

+                $xml .= " <$schemaPrefix:simpleType name=\"$typeName\">\n  <$schemaPrefix:restriction base=\"".$this->contractQName($eParts['type'])."\">\n";

+                if (isset($eParts['enumeration'])) {

+                    foreach ($eParts['enumeration'] as $e) {

+                        $xml .= "  <$schemaPrefix:enumeration value=\"$e\"/>\n";

+                    }

+                }

+                $xml .= "  </$schemaPrefix:restriction>\n </$schemaPrefix:simpleType>";

+            }

+        }

+        // elements

+        if(isset($this->elements) && count($this->elements) > 0){

+            foreach($this->elements as $element => $eParts){

+                $xml .= " <$schemaPrefix:element name=\"$element\" type=\"".$this->contractQName($eParts['type'])."\"/>\n";

+            }

+        }

+        // attributes

+        if(isset($this->attributes) && count($this->attributes) > 0){

+            foreach($this->attributes as $attr => $aParts){

+                $xml .= " <$schemaPrefix:attribute name=\"$attr\" type=\"".$this->contractQName($aParts['type'])."\"\n/>";

+            }

+        }

+        // finish 'er up

+        $attr = '';

+        foreach ($this->schemaInfo as $k => $v) {

+            if ($k == 'elementFormDefault' || $k == 'attributeFormDefault') {

+                $attr .= " $k=\"$v\"";

+            }

+        }

+        $el = "<$schemaPrefix:schema$attr targetNamespace=\"$this->schemaTargetNamespace\"\n";

+        foreach (array_diff($this->usedNamespaces, $this->enclosingNamespaces) as $nsp => $ns) {

+            $el .= " xmlns:$nsp=\"$ns\"";

+        }

+        $xml = $el . ">\n".$xml."</$schemaPrefix:schema>\n";

+        return $xml;

+    }

+

+    /**

+     * adds debug data to the clas level debug string

+     *

+     * @param    string $string debug data

+     * @access   private

+     */

+    function xdebug($string){

+        $this->debug('<' . $this->schemaTargetNamespace . '> '.$string);

+    }

+

+    /**

+     * get the PHP type of a user defined type in the schema

+     * PHP type is kind of a misnomer since it actually returns 'struct' for assoc. arrays

+     * returns false if no type exists, or not w/ the given namespace

+     * else returns a string that is either a native php type, or 'struct'

+     *

+     * @param string $type name of defined type

+     * @param string $ns namespace of type

+     * @return mixed

+     * @access public

+     * @deprecated

+     */

+    function getPHPType($type,$ns){

+        if(isset($this->typemap[$ns][$type])){

+            //print "found type '$type' and ns $ns in typemap<br>";

+            return $this->typemap[$ns][$type];

+        } elseif(isset($this->complexTypes[$type])){

+            //print "getting type '$type' and ns $ns from complexTypes array<br>";

+            return $this->complexTypes[$type]['phpType'];

+        }

+        return false;

+    }

+

+    /**

+     * returns an associative array of information about a given type

+     * returns false if no type exists by the given name

+     *

+     *	For a complexType typeDef = array(

+     *	'restrictionBase' => '',

+     *	'phpType' => '',

+     *	'compositor' => '(sequence|all)',

+     *	'elements' => array(), // refs to elements array

+     *	'attrs' => array() // refs to attributes array

+     *	... and so on (see addComplexType)

+     *	)

+     *

+     *   For simpleType or element, the array has different keys.

+     *

+     * @param string $type

+     * @return mixed

+     * @access public

+     * @see addComplexType

+     * @see addSimpleType

+     * @see addElement

+     */

+    function getTypeDef($type){

+        //$this->debug("in getTypeDef for type $type");

+        if (substr($type, -1) == '^') {

+            $is_element = 1;

+            $type = substr($type, 0, -1);

+        } else {

+            $is_element = 0;

+        }

+

+        if((! $is_element) && isset($this->complexTypes[$type])){

+            $this->xdebug("in getTypeDef, found complexType $type");

+            return $this->complexTypes[$type];

+        } elseif((! $is_element) && isset($this->simpleTypes[$type])){

+            $this->xdebug("in getTypeDef, found simpleType $type");

+            if (!isset($this->simpleTypes[$type]['phpType'])) {

+                // get info for type to tack onto the simple type

+                // TODO: can this ever really apply (i.e. what is a simpleType really?)

+                $uqType = substr($this->simpleTypes[$type]['type'], strrpos($this->simpleTypes[$type]['type'], ':') + 1);

+                $ns = substr($this->simpleTypes[$type]['type'], 0, strrpos($this->simpleTypes[$type]['type'], ':'));

+                $etype = $this->getTypeDef($uqType);

+                if ($etype) {

+                    $this->xdebug("in getTypeDef, found type for simpleType $type:");

+                    $this->xdebug($this->varDump($etype));

+                    if (isset($etype['phpType'])) {

+                        $this->simpleTypes[$type]['phpType'] = $etype['phpType'];

+                    }

+                    if (isset($etype['elements'])) {

+                        $this->simpleTypes[$type]['elements'] = $etype['elements'];

+                    }

+                }

+            }

+            return $this->simpleTypes[$type];

+        } elseif(isset($this->elements[$type])){

+            $this->xdebug("in getTypeDef, found element $type");

+            if (!isset($this->elements[$type]['phpType'])) {

+                // get info for type to tack onto the element

+                $uqType = substr($this->elements[$type]['type'], strrpos($this->elements[$type]['type'], ':') + 1);

+                $ns = substr($this->elements[$type]['type'], 0, strrpos($this->elements[$type]['type'], ':'));

+                $etype = $this->getTypeDef($uqType);

+                if ($etype) {

+                    $this->xdebug("in getTypeDef, found type for element $type:");

+                    $this->xdebug($this->varDump($etype));

+                    if (isset($etype['phpType'])) {

+                        $this->elements[$type]['phpType'] = $etype['phpType'];

+                    }

+                    if (isset($etype['elements'])) {

+                        $this->elements[$type]['elements'] = $etype['elements'];

+                    }

+                    if (isset($etype['extensionBase'])) {

+                        $this->elements[$type]['extensionBase'] = $etype['extensionBase'];

+                    }

+                } elseif ($ns == 'http://www.w3.org/2001/XMLSchema') {

+                    $this->xdebug("in getTypeDef, element $type is an XSD type");

+                    $this->elements[$type]['phpType'] = 'scalar';

+                }

+            }

+            return $this->elements[$type];

+        } elseif(isset($this->attributes[$type])){

+            $this->xdebug("in getTypeDef, found attribute $type");

+            return $this->attributes[$type];

+        } elseif (preg_match('/_ContainedType$/', $type)) {

+            $this->xdebug("in getTypeDef, have an untyped element $type");

+            $typeDef['typeClass'] = 'simpleType';

+            $typeDef['phpType'] = 'scalar';

+            $typeDef['type'] = 'http://www.w3.org/2001/XMLSchema:string';

+            return $typeDef;

+        }

+        $this->xdebug("in getTypeDef, did not find $type");

+        return false;

+    }

+

+    /**

+     * returns a sample serialization of a given type, or false if no type by the given name

+     *

+     * @param string $type name of type

+     * @return mixed

+     * @access public

+     * @deprecated

+     */

     function serializeTypeDef($type){

-    	//print "in sTD() for type $type<br>";

-	if($typeDef = $this->getTypeDef($type)){

-		$str .= '<'.$type;

-	    if(is_array($typeDef['attrs'])){

-		foreach($typeDef['attrs'] as $attName => $data){

-		    $str .= " $attName=\"{type = ".$data['type']."}\"";

-		}

-	    }

-	    $str .= " xmlns=\"".$this->schema['targetNamespace']."\"";

-	    if(count($typeDef['elements']) > 0){

-		$str .= ">";

-		foreach($typeDef['elements'] as $element => $eData){

-		    $str .= $this->serializeTypeDef($element);

-		}

-		$str .= "</$type>";

-	    } elseif($typeDef['typeClass'] == 'element') {

-		$str .= "></$type>";

-	    } else {

-		$str .= "/>";

-	    }

-			return $str;

-	}

-    	return false;

+        //print "in sTD() for type $type<br>";

+    if($typeDef = $this->getTypeDef($type)){

+        $str .= '<'.$type;

+        if(is_array($typeDef['attrs'])){

+        foreach($typeDef['attrs'] as $attName => $data){

+            $str .= " $attName=\"{type = ".$data['type']."}\"";

+        }

+        }

+        $str .= " xmlns=\"".$this->schema['targetNamespace']."\"";

+        if(count($typeDef['elements']) > 0){

+        $str .= ">";

+        foreach($typeDef['elements'] as $element => $eData){

+            $str .= $this->serializeTypeDef($element);

+        }

+        $str .= "</$type>";

+        } elseif($typeDef['typeClass'] == 'element') {

+        $str .= "></$type>";

+        } else {

+        $str .= "/>";

+        }

+            return $str;

+    }

+        return false;

     }

 

     /**

-    * returns HTML form elements that allow a user

-    * to enter values for creating an instance of the given type.

-    *

-    * @param string $name name for type instance

-    * @param string $type name of type

-    * @return string

-    * @access public

-    * @deprecated

-	*/

-	function typeToForm($name,$type){

-		// get typedef

-		if($typeDef = $this->getTypeDef($type)){

-			// if struct

-			if($typeDef['phpType'] == 'struct'){

-				$buffer .= '<table>';

-				foreach($typeDef['elements'] as $child => $childDef){

-					$buffer .= "

+     * returns HTML form elements that allow a user

+     * to enter values for creating an instance of the given type.

+     *

+     * @param string $name name for type instance

+     * @param string $type name of type

+     * @return string

+     * @access public

+     * @deprecated

+     */

+    function typeToForm($name,$type){

+        // get typedef

+        if($typeDef = $this->getTypeDef($type)){

+            // if struct

+            if($typeDef['phpType'] == 'struct'){

+                $buffer .= '<table>';

+                foreach($typeDef['elements'] as $child => $childDef){

+                    $buffer .= "

 					<tr><td align='right'>$childDef[name] (type: ".$this->getLocalPart($childDef['type'])."):</td>

 					<td><input type='text' name='parameters[".$name."][$childDef[name]]'></td></tr>";

-				}

-				$buffer .= '</table>';

-			// if array

-			} elseif($typeDef['phpType'] == 'array'){

-				$buffer .= '<table>';

-				for($i=0;$i < 3; $i++){

-					$buffer .= "

+                }

+                $buffer .= '</table>';

+            // if array

+            } elseif($typeDef['phpType'] == 'array'){

+                $buffer .= '<table>';

+                for($i=0;$i < 3; $i++){

+                    $buffer .= "

 					<tr><td align='right'>array item (type: $typeDef[arrayType]):</td>

 					<td><input type='text' name='parameters[".$name."][]'></td></tr>";

-				}

-				$buffer .= '</table>';

-			// if scalar

-			} else {

-				$buffer .= "<input type='text' name='parameters[$name]'>";

-			}

-		} else {

-			$buffer .= "<input type='text' name='parameters[$name]'>";

-		}

-		return $buffer;

-	}

-

-	/**

-	* adds a complex type to the schema

-	*

-	* example: array

-	*

-	* addType(

-	* 	'ArrayOfstring',

-	* 	'complexType',

-	* 	'array',

-	* 	'',

-	* 	'SOAP-ENC:Array',

-	* 	array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType'=>'string[]'),

-	* 	'xsd:string'

-	* );

-	*

-	* example: PHP associative array ( SOAP Struct )

-	*

-	* addType(

-	* 	'SOAPStruct',

-	* 	'complexType',

-	* 	'struct',

-	* 	'all',

-	* 	array('myVar'=> array('name'=>'myVar','type'=>'string')

-	* );

-	*

-	* @param name

-	* @param typeClass (complexType|simpleType|attribute)

-	* @param phpType: currently supported are array and struct (php assoc array)

-	* @param compositor (all|sequence|choice)

-	* @param restrictionBase namespace:name (http://schemas.xmlsoap.org/soap/encoding/:Array)

-	* @param elements = array ( name = array(name=>'',type=>'') )

-	* @param attrs = array(

-	* 	array(

-	*		'ref' => "http://schemas.xmlsoap.org/soap/encoding/:arrayType",

-	*		"http://schemas.xmlsoap.org/wsdl/:arrayType" => "string[]"

-	* 	)

-	* )

-	* @param arrayType: namespace:name (http://www.w3.org/2001/XMLSchema:string)

-	* @access public

-	* @see getTypeDef

-	*/

-	function addComplexType($name,$typeClass='complexType',$phpType='array',$compositor='',$restrictionBase='',$elements=array(),$attrs=array(),$arrayType=''){

-		$this->complexTypes[$name] = array(

-	    'name'		=> $name,

-	    'typeClass'	=> $typeClass,

-	    'phpType'	=> $phpType,

-		'compositor'=> $compositor,

-	    'restrictionBase' => $restrictionBase,

-		'elements'	=> $elements,

-	    'attrs'		=> $attrs,

-	    'arrayType'	=> $arrayType

-		);

-

-		$this->xdebug("addComplexType $name:");

-		$this->appendDebug($this->varDump($this->complexTypes[$name]));

-	}

-

-	/**

-	* adds a simple type to the schema

-	*

-	* @param string $name

-	* @param string $restrictionBase namespace:name (http://schemas.xmlsoap.org/soap/encoding/:Array)

-	* @param string $typeClass (should always be simpleType)

-	* @param string $phpType (should always be scalar)

-	* @param array $enumeration array of values

-	* @access public

-	* @see nusoap_xmlschema

-	* @see getTypeDef

-	*/

-	function addSimpleType($name, $restrictionBase='', $typeClass='simpleType', $phpType='scalar', $enumeration=array()) {

-		$this->simpleTypes[$name] = array(

-	    'name'			=> $name,

-	    'typeClass'		=> $typeClass,

-	    'phpType'		=> $phpType,

-	    'type'			=> $restrictionBase,

-	    'enumeration'	=> $enumeration

-		);

-

-		$this->xdebug("addSimpleType $name:");

-		$this->appendDebug($this->varDump($this->simpleTypes[$name]));

-	}

-

-	/**

-	* adds an element to the schema

-	*

-	* @param array $attrs attributes that must include name and type

-	* @see nusoap_xmlschema

-	* @access public

-	*/

-	function addElement($attrs) {

-		if (! $this->getPrefix($attrs['type'])) {

-			$attrs['type'] = $this->schemaTargetNamespace . ':' . $attrs['type'];

-		}

-		$this->elements[ $attrs['name'] ] = $attrs;

-		$this->elements[ $attrs['name'] ]['typeClass'] = 'element';

-

-		$this->xdebug("addElement " . $attrs['name']);

-		$this->appendDebug($this->varDump($this->elements[ $attrs['name'] ]));

-	}

+                }

+                $buffer .= '</table>';

+            // if scalar

+            } else {

+                $buffer .= "<input type='text' name='parameters[$name]'>";

+            }

+        } else {

+            $buffer .= "<input type='text' name='parameters[$name]'>";

+        }

+        return $buffer;

+    }

+

+    /**

+     * adds a complex type to the schema

+     *

+     * example: array

+     *

+     * addType(

+     * 	'ArrayOfstring',

+     * 	'complexType',

+     * 	'array',

+     * 	'',

+     * 	'SOAP-ENC:Array',

+     * 	array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType'=>'string[]'),

+     * 	'xsd:string'

+     * );

+     *

+     * example: PHP associative array ( SOAP Struct )

+     *

+     * addType(

+     * 	'SOAPStruct',

+     * 	'complexType',

+     * 	'struct',

+     * 	'all',

+     * 	array('myVar'=> array('name'=>'myVar','type'=>'string')

+     * );

+     *

+     * @param name

+     * @param typeClass (complexType|simpleType|attribute)

+     * @param phpType: currently supported are array and struct (php assoc array)

+     * @param compositor (all|sequence|choice)

+     * @param restrictionBase namespace:name (http://schemas.xmlsoap.org/soap/encoding/:Array)

+     * @param elements = array ( name = array(name=>'',type=>'') )

+     * @param attrs = array(

+     * 	array(

+     *		'ref' => "http://schemas.xmlsoap.org/soap/encoding/:arrayType",

+     *		"http://schemas.xmlsoap.org/wsdl/:arrayType" => "string[]"

+     * 	)

+     * )

+     * @param arrayType: namespace:name (http://www.w3.org/2001/XMLSchema:string)

+     * @access public

+     * @see getTypeDef

+     */

+    function addComplexType($name,$typeClass='complexType',$phpType='array',$compositor='',$restrictionBase='',$elements=array(),$attrs=array(),$arrayType=''){

+        $this->complexTypes[$name] = array(

+        'name'		=> $name,

+        'typeClass'	=> $typeClass,

+        'phpType'	=> $phpType,

+        'compositor'=> $compositor,

+        'restrictionBase' => $restrictionBase,

+        'elements'	=> $elements,

+        'attrs'		=> $attrs,

+        'arrayType'	=> $arrayType

+        );

+

+        $this->xdebug("addComplexType $name:");

+        $this->appendDebug($this->varDump($this->complexTypes[$name]));

+    }

+

+    /**

+     * adds a simple type to the schema

+     *

+     * @param string $name

+     * @param string $restrictionBase namespace:name (http://schemas.xmlsoap.org/soap/encoding/:Array)

+     * @param string $typeClass (should always be simpleType)

+     * @param string $phpType (should always be scalar)

+     * @param array $enumeration array of values

+     * @access public

+     * @see nusoap_xmlschema

+     * @see getTypeDef

+     */

+    function addSimpleType($name, $restrictionBase='', $typeClass='simpleType', $phpType='scalar', $enumeration=array()) {

+        $this->simpleTypes[$name] = array(

+        'name'			=> $name,

+        'typeClass'		=> $typeClass,

+        'phpType'		=> $phpType,

+        'type'			=> $restrictionBase,

+        'enumeration'	=> $enumeration

+        );

+

+        $this->xdebug("addSimpleType $name:");

+        $this->appendDebug($this->varDump($this->simpleTypes[$name]));

+    }

+

+    /**

+     * adds an element to the schema

+     *

+     * @param array $attrs attributes that must include name and type

+     * @see nusoap_xmlschema

+     * @access public

+     */

+    function addElement($attrs) {

+        if (! $this->getPrefix($attrs['type'])) {

+            $attrs['type'] = $this->schemaTargetNamespace . ':' . $attrs['type'];

+        }

+        $this->elements[ $attrs['name'] ] = $attrs;

+        $this->elements[ $attrs['name'] ]['typeClass'] = 'element';

+

+        $this->xdebug("addElement " . $attrs['name']);

+        $this->appendDebug($this->varDump($this->elements[ $attrs['name'] ]));

+    }

 }

 

 /**

main/inc/lib/nusoap/nusoapmime.php

Indentation +418 added lines, -418 removed lines

@@ -52,224 +52,224 @@ 
 * @access   public

 */

 class nusoap_client_mime extends nusoap_client {

-	/**

-	 * @var array Each array element in the return is an associative array with keys

-	 * data, filename, contenttype, cid

-	 * @access private

-	 */

-	var $requestAttachments = array();

-	/**

-	 * @var array Each array element in the return is an associative array with keys

-	 * data, filename, contenttype, cid

-	 * @access private

-	 */

-	var $responseAttachments;

-	/**

-	 * @var string

-	 * @access private

-	 */

-	var $mimeContentType;

-

-	/**

-	* adds a MIME attachment to the current request.

-	*

-	* If the $data parameter contains an empty string, this method will read

-	* the contents of the file named by the $filename parameter.

-	*

-	* If the $cid parameter is false, this method will generate the cid.

-	*

-	* @param string $data The data of the attachment

-	* @param string $filename The filename of the attachment (default is empty string)

-	* @param string $contenttype The MIME Content-Type of the attachment (default is application/octet-stream)

-	* @param string $cid The content-id (cid) of the attachment (default is false)

-	* @return string The content-id (cid) of the attachment

-	* @access public

-	*/

-	function addAttachment($data, $filename = '', $contenttype = 'application/octet-stream', $cid = false) {

-		if (! $cid) {

-			$cid = md5(uniqid(time()));

-		}

-

-		$info['data'] = $data;

-		$info['filename'] = $filename;

-		$info['contenttype'] = $contenttype;

-		$info['cid'] = $cid;

-

-		$this->requestAttachments[] = $info;

-

-		return $cid;

-	}

-

-	/**

-	* clears the MIME attachments for the current request.

-	*

-	* @access public

-	*/

-	function clearAttachments() {

-		$this->requestAttachments = array();

-	}

-

-	/**

-	* gets the MIME attachments from the current response.

-	*

-	* Each array element in the return is an associative array with keys

-	* data, filename, contenttype, cid.  These keys correspond to the parameters

-	* for addAttachment.

-	*

-	* @return array The attachments.

-	* @access public

-	*/

-	function getAttachments() {

-		return $this->responseAttachments;

-	}

-

-	/**

-	* gets the HTTP body for the current request.

-	*

-	* @param string $soapmsg The SOAP payload

-	* @return string The HTTP body, which includes the SOAP payload

-	* @access private

-	*/

-	function getHTTPBody($soapmsg) {

-		if (count($this->requestAttachments) > 0) {

-			$params['content_type'] = 'multipart/related; type="text/xml"';

-			$mimeMessage = new Mail_mimePart('', $params);

-			unset($params);

-

-			$params['content_type'] = 'text/xml';

-			$params['encoding']     = '8bit';

-			$params['charset']      = $this->soap_defencoding;

-			$mimeMessage->addSubpart($soapmsg, $params);

-

-			foreach ($this->requestAttachments as $att) {

-				unset($params);

-

-				$params['content_type'] = $att['contenttype'];

-				$params['encoding']     = 'base64';

-				$params['disposition']  = 'attachment';

-				$params['dfilename']    = $att['filename'];

-				$params['cid']          = $att['cid'];

-

-				if ($att['data'] == '' && $att['filename'] <> '') {

-					if ($fd = fopen($att['filename'], 'rb')) {

-						$data = fread($fd, filesize($att['filename']));

-						fclose($fd);

-					} else {

-						$data = '';

-					}

-					$mimeMessage->addSubpart($data, $params);

-				} else {

-					$mimeMessage->addSubpart($att['data'], $params);

-				}

-			}

-

-			$output = $mimeMessage->encode();

-			$mimeHeaders = $output['headers'];

-

-			foreach ($mimeHeaders as $k => $v) {

-				$this->debug("MIME header $k: $v");

-				if (strtolower($k) == 'content-type') {

-					// PHP header() seems to strip leading whitespace starting

-					// the second line, so force everything to one line

-					$this->mimeContentType = str_replace("\r\n", " ", $v);

-				}

-			}

-

-			return $output['body'];

-		}

-

-		return parent::getHTTPBody($soapmsg);

-	}

-

-	/**

-	* gets the HTTP content type for the current request.

-	*

-	* Note: getHTTPBody must be called before this.

-	*

-	* @return string the HTTP content type for the current request.

-	* @access private

-	*/

-	function getHTTPContentType() {

-		if (count($this->requestAttachments) > 0) {

-			return $this->mimeContentType;

-		}

-		return parent::getHTTPContentType();

-	}

-

-	/**

-	* gets the HTTP content type charset for the current request.

-	* returns false for non-text content types.

-	*

-	* Note: getHTTPBody must be called before this.

-	*

-	* @return string the HTTP content type charset for the current request.

-	* @access private

-	*/

-	function getHTTPContentTypeCharset() {

-		if (count($this->requestAttachments) > 0) {

-			return false;

-		}

-		return parent::getHTTPContentTypeCharset();

-	}

-

-	/**

-	* processes SOAP message returned from server

-	*

-	* @param	array	$headers	The HTTP headers

-	* @param	string	$data		unprocessed response data from server

-	* @return	mixed	value of the message, decoded into a PHP type

-	* @access   private

-	*/

+    /**

+     * @var array Each array element in the return is an associative array with keys

+     * data, filename, contenttype, cid

+     * @access private

+     */

+    var $requestAttachments = array();

+    /**

+     * @var array Each array element in the return is an associative array with keys

+     * data, filename, contenttype, cid

+     * @access private

+     */

+    var $responseAttachments;

+    /**

+     * @var string

+     * @access private

+     */

+    var $mimeContentType;

+

+    /**

+     * adds a MIME attachment to the current request.

+     *

+     * If the $data parameter contains an empty string, this method will read

+     * the contents of the file named by the $filename parameter.

+     *

+     * If the $cid parameter is false, this method will generate the cid.

+     *

+     * @param string $data The data of the attachment

+     * @param string $filename The filename of the attachment (default is empty string)

+     * @param string $contenttype The MIME Content-Type of the attachment (default is application/octet-stream)

+     * @param string $cid The content-id (cid) of the attachment (default is false)

+     * @return string The content-id (cid) of the attachment

+     * @access public

+     */

+    function addAttachment($data, $filename = '', $contenttype = 'application/octet-stream', $cid = false) {

+        if (! $cid) {

+            $cid = md5(uniqid(time()));

+        }

+

+        $info['data'] = $data;

+        $info['filename'] = $filename;

+        $info['contenttype'] = $contenttype;

+        $info['cid'] = $cid;

+

+        $this->requestAttachments[] = $info;

+

+        return $cid;

+    }

+

+    /**

+     * clears the MIME attachments for the current request.

+     *

+     * @access public

+     */

+    function clearAttachments() {

+        $this->requestAttachments = array();

+    }

+

+    /**

+     * gets the MIME attachments from the current response.

+     *

+     * Each array element in the return is an associative array with keys

+     * data, filename, contenttype, cid.  These keys correspond to the parameters

+     * for addAttachment.

+     *

+     * @return array The attachments.

+     * @access public

+     */

+    function getAttachments() {

+        return $this->responseAttachments;

+    }

+

+    /**

+     * gets the HTTP body for the current request.

+     *

+     * @param string $soapmsg The SOAP payload

+     * @return string The HTTP body, which includes the SOAP payload

+     * @access private

+     */

+    function getHTTPBody($soapmsg) {

+        if (count($this->requestAttachments) > 0) {

+            $params['content_type'] = 'multipart/related; type="text/xml"';

+            $mimeMessage = new Mail_mimePart('', $params);

+            unset($params);

+

+            $params['content_type'] = 'text/xml';

+            $params['encoding']     = '8bit';

+            $params['charset']      = $this->soap_defencoding;

+            $mimeMessage->addSubpart($soapmsg, $params);

+

+            foreach ($this->requestAttachments as $att) {

+                unset($params);

+

+                $params['content_type'] = $att['contenttype'];

+                $params['encoding']     = 'base64';

+                $params['disposition']  = 'attachment';

+                $params['dfilename']    = $att['filename'];

+                $params['cid']          = $att['cid'];

+

+                if ($att['data'] == '' && $att['filename'] <> '') {

+                    if ($fd = fopen($att['filename'], 'rb')) {

+                        $data = fread($fd, filesize($att['filename']));

+                        fclose($fd);

+                    } else {

+                        $data = '';

+                    }

+                    $mimeMessage->addSubpart($data, $params);

+                } else {

+                    $mimeMessage->addSubpart($att['data'], $params);

+                }

+            }

+

+            $output = $mimeMessage->encode();

+            $mimeHeaders = $output['headers'];

+

+            foreach ($mimeHeaders as $k => $v) {

+                $this->debug("MIME header $k: $v");

+                if (strtolower($k) == 'content-type') {

+                    // PHP header() seems to strip leading whitespace starting

+                    // the second line, so force everything to one line

+                    $this->mimeContentType = str_replace("\r\n", " ", $v);

+                }

+            }

+

+            return $output['body'];

+        }

+

+        return parent::getHTTPBody($soapmsg);

+    }

+

+    /**

+     * gets the HTTP content type for the current request.

+     *

+     * Note: getHTTPBody must be called before this.

+     *

+     * @return string the HTTP content type for the current request.

+     * @access private

+     */

+    function getHTTPContentType() {

+        if (count($this->requestAttachments) > 0) {

+            return $this->mimeContentType;

+        }

+        return parent::getHTTPContentType();

+    }

+

+    /**

+     * gets the HTTP content type charset for the current request.

+     * returns false for non-text content types.

+     *

+     * Note: getHTTPBody must be called before this.

+     *

+     * @return string the HTTP content type charset for the current request.

+     * @access private

+     */

+    function getHTTPContentTypeCharset() {

+        if (count($this->requestAttachments) > 0) {

+            return false;

+        }

+        return parent::getHTTPContentTypeCharset();

+    }

+

+    /**

+     * processes SOAP message returned from server

+     *

+     * @param	array	$headers	The HTTP headers

+     * @param	string	$data		unprocessed response data from server

+     * @return	mixed	value of the message, decoded into a PHP type

+     * @access   private

+     */

     function parseResponse($headers, $data) {

-		$this->debug('Entering parseResponse() for payload of length ' . strlen($data) . ' and type of ' . $headers['content-type']);

-		$this->responseAttachments = array();

-		if (strstr($headers['content-type'], 'multipart/related')) {

-			$this->debug('Decode multipart/related');

-			$input = '';

-			foreach ($headers as $k => $v) {

-				$input .= "$k: $v\r\n";

-			}

-			$params['input'] = $input . "\r\n" . $data;

-			$params['include_bodies'] = true;

-			$params['decode_bodies'] = true;

-			$params['decode_headers'] = true;

-

-			$structure = Mail_mimeDecode::decode($params);

-

-			foreach ($structure->parts as $part) {

-				if (!isset($part->disposition) && (strstr($part->headers['content-type'], 'text/xml'))) {

-					$this->debug('Have root part of type ' . $part->headers['content-type']);

-					$root = $part->body;

-					$return = parent::parseResponse($part->headers, $part->body);

-				} else {

-					$this->debug('Have an attachment of type ' . $part->headers['content-type']);

-					$info['data'] = $part->body;

-					$info['filename'] = isset($part->d_parameters['filename']) ? $part->d_parameters['filename'] : '';

-					$info['contenttype'] = $part->headers['content-type'];

-					$info['cid'] = $part->headers['content-id'];

-					$this->responseAttachments[] = $info;

-				}

-			}

-

-			if (isset($return)) {

-				$this->responseData = $root;

-				return $return;

-			}

-

-			$this->setError('No root part found in multipart/related content');

-			return '';

-		}

-		$this->debug('Not multipart/related');

-		return parent::parseResponse($headers, $data);

-	}

+        $this->debug('Entering parseResponse() for payload of length ' . strlen($data) . ' and type of ' . $headers['content-type']);

+        $this->responseAttachments = array();

+        if (strstr($headers['content-type'], 'multipart/related')) {

+            $this->debug('Decode multipart/related');

+            $input = '';

+            foreach ($headers as $k => $v) {

+                $input .= "$k: $v\r\n";

+            }

+            $params['input'] = $input . "\r\n" . $data;

+            $params['include_bodies'] = true;

+            $params['decode_bodies'] = true;

+            $params['decode_headers'] = true;

+

+            $structure = Mail_mimeDecode::decode($params);

+

+            foreach ($structure->parts as $part) {

+                if (!isset($part->disposition) && (strstr($part->headers['content-type'], 'text/xml'))) {

+                    $this->debug('Have root part of type ' . $part->headers['content-type']);

+                    $root = $part->body;

+                    $return = parent::parseResponse($part->headers, $part->body);

+                } else {

+                    $this->debug('Have an attachment of type ' . $part->headers['content-type']);

+                    $info['data'] = $part->body;

+                    $info['filename'] = isset($part->d_parameters['filename']) ? $part->d_parameters['filename'] : '';

+                    $info['contenttype'] = $part->headers['content-type'];

+                    $info['cid'] = $part->headers['content-id'];

+                    $this->responseAttachments[] = $info;

+                }

+            }

+

+            if (isset($return)) {

+                $this->responseData = $root;

+                return $return;

+            }

+

+            $this->setError('No root part found in multipart/related content');

+            return '';

+        }

+        $this->debug('Not multipart/related');

+        return parent::parseResponse($headers, $data);

+    }

 }

 

 /*

  *	For backwards compatiblity, define soapclientmime unless the PHP SOAP extension is loaded.

  */

 if (!extension_loaded('soap')) {

-	class soapclientmime extends nusoap_client_mime {

-	}

+    class soapclientmime extends nusoap_client_mime {

+    }

 }

 

 /**

@@ -282,214 +282,214 @@ 
 * @access   public

 */

 class nusoap_server_mime extends nusoap_server {

-	/**

-	 * @var array Each array element in the return is an associative array with keys

-	 * data, filename, contenttype, cid

-	 * @access private

-	 */

-	var $requestAttachments = array();

-	/**

-	 * @var array Each array element in the return is an associative array with keys

-	 * data, filename, contenttype, cid

-	 * @access private

-	 */

-	var $responseAttachments;

-	/**

-	 * @var string

-	 * @access private

-	 */

-	var $mimeContentType;

-

-	/**

-	* adds a MIME attachment to the current response.

-	*

-	* If the $data parameter contains an empty string, this method will read

-	* the contents of the file named by the $filename parameter.

-	*

-	* If the $cid parameter is false, this method will generate the cid.

-	*

-	* @param string $data The data of the attachment

-	* @param string $filename The filename of the attachment (default is empty string)

-	* @param string $contenttype The MIME Content-Type of the attachment (default is application/octet-stream)

-	* @param string $cid The content-id (cid) of the attachment (default is false)

-	* @return string The content-id (cid) of the attachment

-	* @access public

-	*/

-	function addAttachment($data, $filename = '', $contenttype = 'application/octet-stream', $cid = false) {

-		if (! $cid) {

-			$cid = md5(uniqid(time()));

-		}

-

-		$info['data'] = $data;

-		$info['filename'] = $filename;

-		$info['contenttype'] = $contenttype;

-		$info['cid'] = $cid;

-

-		$this->responseAttachments[] = $info;

-

-		return $cid;

-	}

-

-	/**

-	* clears the MIME attachments for the current response.

-	*

-	* @access public

-	*/

-	function clearAttachments() {

-		$this->responseAttachments = array();

-	}

-

-	/**

-	* gets the MIME attachments from the current request.

-	*

-	* Each array element in the return is an associative array with keys

-	* data, filename, contenttype, cid.  These keys correspond to the parameters

-	* for addAttachment.

-	*

-	* @return array The attachments.

-	* @access public

-	*/

-	function getAttachments() {

-		return $this->requestAttachments;

-	}

-

-	/**

-	* gets the HTTP body for the current response.

-	*

-	* @param string $soapmsg The SOAP payload

-	* @return string The HTTP body, which includes the SOAP payload

-	* @access private

-	*/

-	function getHTTPBody($soapmsg) {

-		if (count($this->responseAttachments) > 0) {

-			$params['content_type'] = 'multipart/related; type="text/xml"';

-			$mimeMessage = new Mail_mimePart('', $params);

-			unset($params);

-

-			$params['content_type'] = 'text/xml';

-			$params['encoding']     = '8bit';

-			$params['charset']      = $this->soap_defencoding;

-			$mimeMessage->addSubpart($soapmsg, $params);

-

-			foreach ($this->responseAttachments as $att) {

-				unset($params);

-

-				$params['content_type'] = $att['contenttype'];

-				$params['encoding']     = 'base64';

-				$params['disposition']  = 'attachment';

-				$params['dfilename']    = $att['filename'];

-				$params['cid']          = $att['cid'];

-

-				if ($att['data'] == '' && $att['filename'] <> '') {

-					if ($fd = fopen($att['filename'], 'rb')) {

-						$data = fread($fd, filesize($att['filename']));

-						fclose($fd);

-					} else {

-						$data = '';

-					}

-					$mimeMessage->addSubpart($data, $params);

-				} else {

-					$mimeMessage->addSubpart($att['data'], $params);

-				}

-			}

-

-			$output = $mimeMessage->encode();

-			$mimeHeaders = $output['headers'];

-

-			foreach ($mimeHeaders as $k => $v) {

-				$this->debug("MIME header $k: $v");

-				if (strtolower($k) == 'content-type') {

-					// PHP header() seems to strip leading whitespace starting

-					// the second line, so force everything to one line

-					$this->mimeContentType = str_replace("\r\n", " ", $v);

-				}

-			}

-

-			return $output['body'];

-		}

-

-		return parent::getHTTPBody($soapmsg);

-	}

-

-	/**

-	* gets the HTTP content type for the current response.

-	*

-	* Note: getHTTPBody must be called before this.

-	*

-	* @return string the HTTP content type for the current response.

-	* @access private

-	*/

-	function getHTTPContentType() {

-		if (count($this->responseAttachments) > 0) {

-			return $this->mimeContentType;

-		}

-		return parent::getHTTPContentType();

-	}

-

-	/**

-	* gets the HTTP content type charset for the current response.

-	* returns false for non-text content types.

-	*

-	* Note: getHTTPBody must be called before this.

-	*

-	* @return string the HTTP content type charset for the current response.

-	* @access private

-	*/

-	function getHTTPContentTypeCharset() {

-		if (count($this->responseAttachments) > 0) {

-			return false;

-		}

-		return parent::getHTTPContentTypeCharset();

-	}

-

-	/**

-	* processes SOAP message received from client

-	*

-	* @param	array	$headers	The HTTP headers

-	* @param	string	$data		unprocessed request data from client

-	* @return	mixed	value of the message, decoded into a PHP type

-	* @access   private

-	*/

+    /**

+     * @var array Each array element in the return is an associative array with keys

+     * data, filename, contenttype, cid

+     * @access private

+     */

+    var $requestAttachments = array();

+    /**

+     * @var array Each array element in the return is an associative array with keys

+     * data, filename, contenttype, cid

+     * @access private

+     */

+    var $responseAttachments;

+    /**

+     * @var string

+     * @access private

+     */

+    var $mimeContentType;

+

+    /**

+     * adds a MIME attachment to the current response.

+     *

+     * If the $data parameter contains an empty string, this method will read

+     * the contents of the file named by the $filename parameter.

+     *

+     * If the $cid parameter is false, this method will generate the cid.

+     *

+     * @param string $data The data of the attachment

+     * @param string $filename The filename of the attachment (default is empty string)

+     * @param string $contenttype The MIME Content-Type of the attachment (default is application/octet-stream)

+     * @param string $cid The content-id (cid) of the attachment (default is false)

+     * @return string The content-id (cid) of the attachment

+     * @access public

+     */

+    function addAttachment($data, $filename = '', $contenttype = 'application/octet-stream', $cid = false) {

+        if (! $cid) {

+            $cid = md5(uniqid(time()));

+        }

+

+        $info['data'] = $data;

+        $info['filename'] = $filename;

+        $info['contenttype'] = $contenttype;

+        $info['cid'] = $cid;

+

+        $this->responseAttachments[] = $info;

+

+        return $cid;

+    }

+

+    /**

+     * clears the MIME attachments for the current response.

+     *

+     * @access public

+     */

+    function clearAttachments() {

+        $this->responseAttachments = array();

+    }

+

+    /**

+     * gets the MIME attachments from the current request.

+     *

+     * Each array element in the return is an associative array with keys

+     * data, filename, contenttype, cid.  These keys correspond to the parameters

+     * for addAttachment.

+     *

+     * @return array The attachments.

+     * @access public

+     */

+    function getAttachments() {

+        return $this->requestAttachments;

+    }

+

+    /**

+     * gets the HTTP body for the current response.

+     *

+     * @param string $soapmsg The SOAP payload

+     * @return string The HTTP body, which includes the SOAP payload

+     * @access private

+     */

+    function getHTTPBody($soapmsg) {

+        if (count($this->responseAttachments) > 0) {

+            $params['content_type'] = 'multipart/related; type="text/xml"';

+            $mimeMessage = new Mail_mimePart('', $params);

+            unset($params);

+

+            $params['content_type'] = 'text/xml';

+            $params['encoding']     = '8bit';

+            $params['charset']      = $this->soap_defencoding;

+            $mimeMessage->addSubpart($soapmsg, $params);

+

+            foreach ($this->responseAttachments as $att) {

+                unset($params);

+

+                $params['content_type'] = $att['contenttype'];

+                $params['encoding']     = 'base64';

+                $params['disposition']  = 'attachment';

+                $params['dfilename']    = $att['filename'];

+                $params['cid']          = $att['cid'];

+

+                if ($att['data'] == '' && $att['filename'] <> '') {

+                    if ($fd = fopen($att['filename'], 'rb')) {

+                        $data = fread($fd, filesize($att['filename']));

+                        fclose($fd);

+                    } else {

+                        $data = '';

+                    }

+                    $mimeMessage->addSubpart($data, $params);

+                } else {

+                    $mimeMessage->addSubpart($att['data'], $params);

+                }

+            }

+

+            $output = $mimeMessage->encode();

+            $mimeHeaders = $output['headers'];

+

+            foreach ($mimeHeaders as $k => $v) {

+                $this->debug("MIME header $k: $v");

+                if (strtolower($k) == 'content-type') {

+                    // PHP header() seems to strip leading whitespace starting

+                    // the second line, so force everything to one line

+                    $this->mimeContentType = str_replace("\r\n", " ", $v);

+                }

+            }

+

+            return $output['body'];

+        }

+

+        return parent::getHTTPBody($soapmsg);

+    }

+

+    /**

+     * gets the HTTP content type for the current response.

+     *

+     * Note: getHTTPBody must be called before this.

+     *

+     * @return string the HTTP content type for the current response.

+     * @access private

+     */

+    function getHTTPContentType() {

+        if (count($this->responseAttachments) > 0) {

+            return $this->mimeContentType;

+        }

+        return parent::getHTTPContentType();

+    }

+

+    /**

+     * gets the HTTP content type charset for the current response.

+     * returns false for non-text content types.

+     *

+     * Note: getHTTPBody must be called before this.

+     *

+     * @return string the HTTP content type charset for the current response.

+     * @access private

+     */

+    function getHTTPContentTypeCharset() {

+        if (count($this->responseAttachments) > 0) {

+            return false;

+        }

+        return parent::getHTTPContentTypeCharset();

+    }

+

+    /**

+     * processes SOAP message received from client

+     *

+     * @param	array	$headers	The HTTP headers

+     * @param	string	$data		unprocessed request data from client

+     * @return	mixed	value of the message, decoded into a PHP type

+     * @access   private

+     */

     function parseRequest($headers, $data) {

-		$this->debug('Entering parseRequest() for payload of length ' . strlen($data) . ' and type of ' . $headers['content-type']);

-		$this->requestAttachments = array();

-		if (strstr($headers['content-type'], 'multipart/related')) {

-			$this->debug('Decode multipart/related');

-			$input = '';

-			foreach ($headers as $k => $v) {

-				$input .= "$k: $v\r\n";

-			}

-			$params['input'] = $input . "\r\n" . $data;

-			$params['include_bodies'] = true;

-			$params['decode_bodies'] = true;

-			$params['decode_headers'] = true;

-

-			$structure = Mail_mimeDecode::decode($params);

-

-			foreach ($structure->parts as $part) {

-				if (!isset($part->disposition) && (strstr($part->headers['content-type'], 'text/xml'))) {

-					$this->debug('Have root part of type ' . $part->headers['content-type']);

-					$return = parent::parseRequest($part->headers, $part->body);

-				} else {

-					$this->debug('Have an attachment of type ' . $part->headers['content-type']);

-					$info['data'] = $part->body;

-					$info['filename'] = isset($part->d_parameters['filename']) ? $part->d_parameters['filename'] : '';

-					$info['contenttype'] = $part->headers['content-type'];

-					$info['cid'] = $part->headers['content-id'];

-					$this->requestAttachments[] = $info;

-				}

-			}

-

-			if (isset($return)) {

-				return $return;

-			}

-

-			$this->setError('No root part found in multipart/related content');

-			return;

-		}

-		$this->debug('Not multipart/related');

-		return parent::parseRequest($headers, $data);

-	}

+        $this->debug('Entering parseRequest() for payload of length ' . strlen($data) . ' and type of ' . $headers['content-type']);

+        $this->requestAttachments = array();

+        if (strstr($headers['content-type'], 'multipart/related')) {

+            $this->debug('Decode multipart/related');

+            $input = '';

+            foreach ($headers as $k => $v) {

+                $input .= "$k: $v\r\n";

+            }

+            $params['input'] = $input . "\r\n" . $data;

+            $params['include_bodies'] = true;

+            $params['decode_bodies'] = true;

+            $params['decode_headers'] = true;

+

+            $structure = Mail_mimeDecode::decode($params);

+

+            foreach ($structure->parts as $part) {

+                if (!isset($part->disposition) && (strstr($part->headers['content-type'], 'text/xml'))) {

+                    $this->debug('Have root part of type ' . $part->headers['content-type']);

+                    $return = parent::parseRequest($part->headers, $part->body);

+                } else {

+                    $this->debug('Have an attachment of type ' . $part->headers['content-type']);

+                    $info['data'] = $part->body;

+                    $info['filename'] = isset($part->d_parameters['filename']) ? $part->d_parameters['filename'] : '';

+                    $info['contenttype'] = $part->headers['content-type'];

+                    $info['cid'] = $part->headers['content-id'];

+                    $this->requestAttachments[] = $info;

+                }

+            }

+

+            if (isset($return)) {

+                return $return;

+            }

+

+            $this->setError('No root part found in multipart/related content');

+            return;

+        }

+        $this->debug('Not multipart/related');

+        return parent::parseRequest($headers, $data);

+    }

 }

 

 /*

main/session/index.php

Indentation +6 added lines, -6 removed lines

@@ -282,7 +282,7 @@ 
                             if ($exercise_info->start_time != '0000-00-00 00:00:00') {
                                 $allowed_time = api_strtotime($exercise_info->start_time, 'UTC');
                                 if ($now < $allowed_time) {
-                                      continue;
+                                        continue;
                                 }
                             }
                             $exercise_info->exercise = Display::url(
@@ -512,11 +512,11 @@ 
 		window.location.href=ui.tab;
     });
 <?php
-     //Displays js code to use a jqgrid
-     echo Display::grid_js('courses',       '',             $columns_courses, $column_model_courses, $extra_params_courses, $new_course_list);
-     echo Display::grid_js('list_default',  $url,           $columns,         $column_model,$extra_params,array(), '');
-     echo Display::grid_js('list_course',   $url_by_course, $columns,         $column_model,$extra_params_course,array(),'');
-     echo Display::grid_js('list_week',     $url_week,      $column_week,     $column_week_model, $extra_params_week,array(),'');
+        //Displays js code to use a jqgrid
+        echo Display::grid_js('courses',       '',             $columns_courses, $column_model_courses, $extra_params_courses, $new_course_list);
+        echo Display::grid_js('list_default',  $url,           $columns,         $column_model,$extra_params,array(), '');
+        echo Display::grid_js('list_course',   $url_by_course, $columns,         $column_model,$extra_params_course,array(),'');
+        echo Display::grid_js('list_week',     $url_week,      $column_week,     $column_week_model, $extra_params_week,array(),'');
 
     if (!api_is_anonymous()) {
         echo Display::grid_js('exercises', '', $column_exercise, $column_exercise_model, $extra_params_exercise, $my_real_array);

plugin/ims_lti/OAuthSimple.php

Indentation +186 added lines, -186 removed lines

@@ -18,24 +18,24 @@ 
     private $_nonce_chars;
 
     /**
-	 * Constructor
+     * Constructor
      *
-	 * @access public
+     * @access public
      * @param api_key (String) The API Key (sometimes referred to as the consumer key) This value is usually supplied by the site you wish to use.
      * @param shared_secret (String) The shared secret. This value is also usually provided by the site you wish to use.
-	 * @return OAuthSimple (Object)
+     * @return OAuthSimple (Object)
      */
     function __construct ($APIKey = "", $sharedSecret=""){
 
         if (!empty($APIKey))
-		{
-			$this->_secrets['consumer_key'] = $APIKey;
-		}
+        {
+            $this->_secrets['consumer_key'] = $APIKey;
+        }
 
         if (!empty($sharedSecret))
-		{
-			$this->_secrets['shared_secret'] = $sharedSecret;
-		}
+        {
+            $this->_secrets['shared_secret'] = $sharedSecret;
+        }
 
         $this->_default_signature_method = "HMAC-SHA1";
         $this->_action = "GET";
@@ -45,11 +45,11 @@ 
     }
 
     /**
-	 * Reset the parameters and URL
-	 *
-	 * @access public
-	 * @return OAuthSimple (Object)
-	 */
+     * Reset the parameters and URL
+     *
+     * @access public
+     * @return OAuthSimple (Object)
+     */
     public function reset() {
         $this->_parameters = Array();
         $this->path = NULL;
@@ -59,87 +59,87 @@ 
     }
 
     /**
-	 * Set the parameters either from a hash or a string
-	 *
-	 * @access public
-	 * @param(string, object) List of parameters for the call, this can either be a URI string (e.g. "foo=bar&gorp=banana" or an object/hash)
-	 * @return OAuthSimple (Object)
-	 */
+     * Set the parameters either from a hash or a string
+     *
+     * @access public
+     * @param(string, object) List of parameters for the call, this can either be a URI string (e.g. "foo=bar&gorp=banana" or an object/hash)
+     * @return OAuthSimple (Object)
+     */
     public function setParameters ($parameters=Array()) {
 
         if (is_string($parameters))
-		{
-			$parameters = $this->_parseParameterString($parameters);
-		}
+        {
+            $parameters = $this->_parseParameterString($parameters);
+        }
         if (empty($this->_parameters))
-		{
-			$this->_parameters = $parameters;
-		}
+        {
+            $this->_parameters = $parameters;
+        }
         else if (!empty($parameters))
-		{
-			$this->_parameters = array_merge($this->_parameters,$parameters);
-		}
+        {
+            $this->_parameters = array_merge($this->_parameters,$parameters);
+        }
         if (empty($this->_parameters['oauth_nonce']))
-		{
-			$this->_getNonce();
-		}
+        {
+            $this->_getNonce();
+        }
         if (empty($this->_parameters['oauth_timestamp']))
-		{
-			 $this->_getTimeStamp();
-		}
+        {
+                $this->_getTimeStamp();
+        }
         if (empty($this->_parameters['oauth_consumer_key']))
-		{
-			$this->_getApiKey();
-		}
+        {
+            $this->_getApiKey();
+        }
         if (empty($this->_parameters['oauth_token']))
-		{
-			  $this->_getAccessToken();
-		}
+        {
+                $this->_getAccessToken();
+        }
         if (empty($this->_parameters['oauth_signature_method']))
-		{
+        {
             $this->setSignatureMethod();
-		}
+        }
         if (empty($this->_parameters['oauth_version']))
-		{
+        {
             $this->_parameters['oauth_version']="1.0";
-		}
+        }
 
         return $this;
     }
 
     /**
-	 * Convenience method for setParameters
-	 *
-	 * @access public
-	 * @see setParameters
-	 */
+     * Convenience method for setParameters
+     *
+     * @access public
+     * @see setParameters
+     */
     public function setQueryString ($parameters)
     {
         return $this->setParameters($parameters);
     }
 
     /**
-	 * Set the target URL (does not include the parameters)
-	 *
+     * Set the target URL (does not include the parameters)
+     *
      * @param path (String) the fully qualified URI (excluding query arguments) (e.g "http://example.org/foo")
-	 * @return OAuthSimple (Object)
+     * @return OAuthSimple (Object)
      */
     public function setURL ($path)
-	{
+    {
         if (empty($path))
-		{
+        {
             throw new OAuthSimpleException('No path specified for OAuthSimple.setURL');
-		}
+        }
         $this->_path=$path;
 
         return $this;
     }
 
     /**
-	 * Convenience method for setURL
+     * Convenience method for setURL
      *
      * @param path (String)
-	 * @see setURL
+     * @see setURL
      */
     public function setPath ($path)
     {
@@ -147,39 +147,39 @@ 
     }
 
     /**
-	 * Set the "action" for the url, (e.g. GET,POST, DELETE, etc.)
+     * Set the "action" for the url, (e.g. GET,POST, DELETE, etc.)
      *
      * @param action (String) HTTP Action word.
-	 * @return OAuthSimple (Object)
+     * @return OAuthSimple (Object)
      */
     public function setAction ($action)
     {
         if (empty($action))
-		{
-			$action = 'GET';
-		}
+        {
+            $action = 'GET';
+        }
         $action = strtoupper($action);
         if (preg_match('/[^A-Z]/',$action))
-		{
+        {
             throw new OAuthSimpleException('Invalid action specified for OAuthSimple.setAction');
-		}
+        }
         $this->_action = $action;
 
         return $this;
     }
 
     /**
-	 * Set the signatures (as well as validate the ones you have)
+     * Set the signatures (as well as validate the ones you have)
      *
      * @param signatures (object) object/hash of the token/signature pairs {api_key:, shared_secret:, oauth_token: oauth_secret:}
-	 * @return OAuthSimple (Object)
+     * @return OAuthSimple (Object)
      */
     public function signatures ($signatures)
     {
         if (!empty($signatures) && !is_array($signatures))
-		{
+        {
             throw new OAuthSimpleException('Must pass dictionary array to OAuthSimple.signatures');
-		}
+        }
         if (!empty($signatures))
         {
             if (empty($this->_secrets))
@@ -189,33 +189,33 @@ 
             $this->_secrets=array_merge($this->_secrets,$signatures);
         }
         if (isset($this->_secrets['api_key']))
-		{
+        {
             $this->_secrets['consumer_key'] = $this->_secrets['api_key'];
-		}
+        }
         if (isset($this->_secrets['access_token']))
-		{
+        {
             $this->_secrets['oauth_token'] = $this->_secrets['access_token'];
-		}
+        }
         if (isset($this->_secrets['access_secret']))
-		{
+        {
             $this->_secrets['shared_secret'] = $this->_secrets['access_secret'];
         }
         if (isset($this->_secrets['oauth_token_secret']))
-		{
+        {
             $this->_secrets['oauth_secret'] = $this->_secrets['oauth_token_secret'];
-		}
+        }
         if (empty($this->_secrets['consumer_key']))
-		{
+        {
             throw new OAuthSimpleException('Missing required consumer_key in OAuthSimple.signatures');
         }
         if (empty($this->_secrets['shared_secret']))
-		{
+        {
             throw new OAuthSimpleException('Missing requires shared_secret in OAuthSimple.signatures');
-		}
+        }
         if (!empty($this->_secrets['oauth_token']) && empty($this->_secrets['oauth_secret']))
-		{
+        {
             throw new OAuthSimpleException('Missing oauth_secret for supplied oauth_token in OAuthSimple.signatures');
-		}
+        }
 
         return $this;
     }
@@ -226,30 +226,30 @@ 
     }
 
     /**
-	 * Set the signature method (currently only Plaintext or SHA-MAC1)
+     * Set the signature method (currently only Plaintext or SHA-MAC1)
      *
      * @param method (String) Method of signing the transaction (only PLAINTEXT and SHA-MAC1 allowed for now)
-	 * @return OAuthSimple (Object)
-    */
+     * @return OAuthSimple (Object)
+     */
     public function setSignatureMethod ($method="")
-	{
+    {
         if (empty($method))
-		{
+        {
             $method = $this->_default_signature_method;
-		}
+        }
         $method = strtoupper($method);
         switch($method)
         {
             case 'PLAINTEXT':
             case 'HMAC-SHA1':
                 $this->_parameters['oauth_signature_method']=$method;
-				break;
+                break;
             default:
                 throw new OAuthSimpleException ("Unknown signing method $method specified for OAuthSimple.setSignatureMethod");
-				break;
+                break;
         }
 
-		return $this;
+        return $this;
     }
 
     /** sign the request
@@ -258,30 +258,30 @@ 
      * other helper functions.
      *
      * @param args (Array) hash of arguments for the call {action, path, parameters (array), method, signatures (array)} all arguments are optional.
-	 * @return (Array) signed values
+     * @return (Array) signed values
      */
     public function sign($args=array())
     {
         if (!empty($args['action']))
-		{
+        {
             $this->setAction($args['action']);
-		}
+        }
         if (!empty($args['path']))
-		{
+        {
             $this->setPath($args['path']);
         }
         if (!empty($args['method']))
-		{
+        {
             $this->setSignatureMethod($args['method']);
-		}
+        }
         if (!empty($args['signatures']))
-		{
+        {
             $this->signatures($args['signatures']);
-		}
+        }
         if (empty($args['parameters']))
-		{
+        {
             $args['parameters']=array();
-		}
+        }
         $this->setParameters($args['parameters']);
         $normParams = $this->_normalizedParameters();
 
@@ -295,29 +295,29 @@ 
     }
 
     /**
-	 * Return a formatted "header" string
+     * Return a formatted "header" string
      *
      * NOTE: This doesn't set the "Authorization: " prefix, which is required.
      * It's not set because various set header functions prefer different
      * ways to do that.
      *
      * @param args (Array)
-	 * @return $result (String)
-    */
+     * @return $result (String)
+     */
     public function getHeaderString ($args=array())
     {
         if (empty($this->_parameters['oauth_signature']))
-		{
+        {
             $this->sign($args);
-		}
+        }
         $result = 'OAuth ';
 
         foreach ($this->_parameters as $pName => $pValue)
         {
             if (strpos($pName,'oauth_') !== 0)
-			{
+            {
                 continue;
-			}
+            }
             if (is_array($pValue))
             {
                 foreach ($pValue as $val)
@@ -342,19 +342,19 @@ 
         {
             list ($key,$token) = explode('=',$element);
             if ($token)
-			{
+            {
                 $token = urldecode($token);
-			}
+            }
             if (!empty($result[$key]))
             {
                 if (!is_array($result[$key]))
-				{
+                {
                     $result[$key] = array($result[$key],$token);
-				}
+                }
                 else
-				{
+                {
                     array_push($result[$key],$token);
-				}
+                }
             }
             else
                 $result[$key]=$token;
@@ -366,14 +366,14 @@ 
     private static function _oauthEscape($string)
     {
         if ($string === 0) { return 0; }
-		if ($string == '0') { return '0'; }
+        if ($string == '0') { return '0'; }
         if (strlen($string) == 0) { return ''; }
         if (is_array($string)) {
             throw new OAuthSimpleException('Array passed to _oauthEscape');
-		}
+        }
         $string = urlencode($string);
 
-	    //FIX: urlencode of ~ and '+'
+        //FIX: urlencode of ~ and '+'
         $string = str_replace(
             Array('%7E','+'  ), // Replace these
             Array('~',  '%20'), // with these
@@ -410,13 +410,13 @@ 
     private function _getAccessToken()
     {
         if (!isset($this->_secrets['oauth_secret']))
-		{
+        {
             return '';
-		}
+        }
         if (!isset($this->_secrets['oauth_token']))
-		{
+        {
             throw new OAuthSimpleException('No access token (oauth_token) set for OAuthSimple.');
-		}
+        }
         $this->_parameters['oauth_token'] = $this->_secrets['oauth_token'];
 
         return $this->_parameters['oauth_token'];
@@ -429,8 +429,8 @@ 
 
     private function _normalizedParameters()
     {
-		$normalized_keys = array();
-		$return_array = array();
+        $normalized_keys = array();
+        $return_array = array();
 
         foreach ( $this->_parameters as $paramName=>$paramValue) {
             if (preg_match('/w+_secret/', $paramName) OR
@@ -439,59 +439,59 @@ 
                 }
             // Read parameters from a file. Hope you're practicing safe PHP.
             //if (strpos($paramValue, '@') !== 0 && !file_exists(substr($paramValue, 1)))
-			//{
-				if (is_array($paramValue))
-				{
-					$normalized_keys[self::_oauthEscape($paramName)] = array();
-					foreach($paramValue as $item)
-					{
-						array_push($normalized_keys[self::_oauthEscape($paramName)],  self::_oauthEscape($item));
-					}
-				}
-				else
-				{
-					$normalized_keys[self::_oauthEscape($paramName)] = self::_oauthEscape($paramValue);
-				}
-			//}
-        }
-
-		ksort($normalized_keys);
-
-		foreach($normalized_keys as $key=>$val)
-		{
-			if (is_array($val))
-			{
-				sort($val);
-				foreach($val as $element)
-				{
-					array_push($return_array, $key . "=" . $element);
-				}
-			}
-			else
-			{
-				array_push($return_array, $key .'='. $val);
-			}
+            //{
+                if (is_array($paramValue))
+                {
+                    $normalized_keys[self::_oauthEscape($paramName)] = array();
+                    foreach($paramValue as $item)
+                    {
+                        array_push($normalized_keys[self::_oauthEscape($paramName)],  self::_oauthEscape($item));
+                    }
+                }
+                else
+                {
+                    $normalized_keys[self::_oauthEscape($paramName)] = self::_oauthEscape($paramValue);
+                }
+            //}
+        }
+
+        ksort($normalized_keys);
+
+        foreach($normalized_keys as $key=>$val)
+        {
+            if (is_array($val))
+            {
+                sort($val);
+                foreach($val as $element)
+                {
+                    array_push($return_array, $key . "=" . $element);
+                }
+            }
+            else
+            {
+                array_push($return_array, $key .'='. $val);
+            }
 
         }
         $presig = join("&", $return_array);
         $sig = $this->_generateSignature($presig);
         $this->_parameters['oauth_signature']=$sig;
         array_push($return_array, "oauth_signature=$sig");
-		return join("&", $return_array);
+        return join("&", $return_array);
     }
 
 
     private function _generateSignature ($parameters="")
     {
         $secretKey = '';
-		if(isset($this->_secrets['shared_secret']))
-		{
-			$secretKey = self::_oauthEscape($this->_secrets['shared_secret']);
-		}
-
-		$secretKey .= '&';
-		if(isset($this->_secrets['oauth_secret']))
-		{
+        if(isset($this->_secrets['shared_secret']))
+        {
+            $secretKey = self::_oauthEscape($this->_secrets['shared_secret']);
+        }
+
+        $secretKey .= '&';
+        if(isset($this->_secrets['oauth_secret']))
+        {
             $secretKey .= self::_oauthEscape($this->_secrets['oauth_secret']);
         }
         if(!empty($parameters)){
@@ -507,33 +507,33 @@ 
                 return base64_encode(hash_hmac('sha1',$this->sbs,$secretKey,TRUE));
             default:
                 throw new OAuthSimpleException('Unknown signature method for OAuthSimple');
-				break;
+                break;
         }
     }
 }
 
 class OAuthSimpleException extends Exception {
 
-	public function __construct($err, $isDebug = FALSE)
-	{
-		self::log_error($err);
-		if ($isDebug)
-		{
-			self::display_error($err, TRUE);
-		}
-	}
-
-	public static function log_error($err)
-	{
-		error_log($err, 0);
-	}
-
-	public static function display_error($err, $kill = FALSE)
-	{
-		print_r($err);
-		if ($kill === FALSE)
-		{
-			die();
-		}
-	}
+    public function __construct($err, $isDebug = FALSE)
+    {
+        self::log_error($err);
+        if ($isDebug)
+        {
+            self::display_error($err, TRUE);
+        }
+    }
+
+    public static function log_error($err)
+    {
+        error_log($err, 0);
+    }
+
+    public static function display_error($err, $kill = FALSE)
+    {
+        print_r($err);
+        if ($kill === FALSE)
+        {
+            die();
+        }
+    }
 }

main/dropbox/index.php

Indentation +424 added lines, -424 removed lines

@@ -7,12 +7,12 @@ 
 $last_access = '';
 // get the last time the user accessed the tool
 if (isset($_SESSION[$_course['id']]) && $_SESSION[$_course['id']]['last_access'][TOOL_DROPBOX] == '') {
-	$last_access = get_last_tool_access(TOOL_DROPBOX);
-	$_SESSION[$_course['id']]['last_access'][TOOL_DROPBOX] = $last_access;
+    $last_access = get_last_tool_access(TOOL_DROPBOX);
+    $_SESSION[$_course['id']]['last_access'][TOOL_DROPBOX] = $last_access;
 } else {
-	if (isset($_SESSION[$_course['id']])) {
-		$last_access = $_SESSION[$_course['id']]['last_access'][TOOL_DROPBOX];
-	}
+    if (isset($_SESSION[$_course['id']])) {
+        $last_access = $_SESSION[$_course['id']]['last_access'][TOOL_DROPBOX];
+    }
 }
 
 $postAction = isset($_POST['action']) ? $_POST['action'] : null;
@@ -50,9 +50,9 @@ 
 
 // Display the form for adding a new dropbox item.
 if ($action == 'add') {
-	if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
-		api_not_allowed();
-	}
+    if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
+        api_not_allowed();
+    }
     display_add_form(
         $dropbox_unid,
         $viewReceivedCategory,
@@ -62,56 +62,56 @@ 
 }
 
 if (isset($_POST['submitWork'])) {
-	$check = Security::check_token();
-	if ($check) {
+    $check = Security::check_token();
+    if ($check) {
         store_add_dropbox();
-	}
+    }
 }
 
 // Display the form for adding a category
 if ($action == 'addreceivedcategory' || $action == 'addsentcategory') {
-	if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
-		api_not_allowed();
-	}
-	$categoryName = isset($_POST['category_name']) ? $_POST['category_name'] : '';
-	display_addcategory_form($categoryName, '', $_GET['action']);
+    if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
+        api_not_allowed();
+    }
+    $categoryName = isset($_POST['category_name']) ? $_POST['category_name'] : '';
+    display_addcategory_form($categoryName, '', $_GET['action']);
 }
 
 // Editing a category: displaying the form
 if ($action == 'editcategory' && isset($_GET['id'])) {
-	if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
-		api_not_allowed();
-	}
-	if (!$_POST) {
-		if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
-			api_not_allowed();
-		}
-		display_addcategory_form('', $_GET['id'], 'editcategory');
-	}
+    if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
+        api_not_allowed();
+    }
+    if (!$_POST) {
+        if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
+            api_not_allowed();
+        }
+        display_addcategory_form('', $_GET['id'], 'editcategory');
+    }
 }
 
 // Storing a new or edited category
 if (isset($_POST['StoreCategory'])) {
-	if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
-		api_not_allowed();
-	}
-	$return_information = store_addcategory();
-	if ($return_information['type'] == 'confirmation') {
-		Display :: display_confirmation_message($return_information['message']);
-	}
-	if ($return_information['type'] == 'error') {
-		Display :: display_error_message(get_lang('FormHasErrorsPleaseComplete').'<br />'.$return_information['message']);
-		display_addcategory_form($_POST['category_name'], $_POST['edit_id'], $postAction);
-	}
+    if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
+        api_not_allowed();
+    }
+    $return_information = store_addcategory();
+    if ($return_information['type'] == 'confirmation') {
+        Display :: display_confirmation_message($return_information['message']);
+    }
+    if ($return_information['type'] == 'error') {
+        Display :: display_error_message(get_lang('FormHasErrorsPleaseComplete').'<br />'.$return_information['message']);
+        display_addcategory_form($_POST['category_name'], $_POST['edit_id'], $postAction);
+    }
 }
 
 
 // Move a File
 if (($action == 'movesent' || $action == 'movereceived') AND isset($_GET['move_id'])) {
-	if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
-		api_not_allowed();
-	}
-	display_move_form(
+    if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
+        api_not_allowed();
+    }
+    display_move_form(
         str_replace('move', '', $action),
         $_GET['move_id'],
         get_dropbox_categories(str_replace('move', '', $action)),
@@ -122,33 +122,33 @@ 
     );
 }
 if (isset($_POST['do_move'])) {
-	Display :: display_confirmation_message(store_move($_POST['id'], $_POST['move_target'], $_POST['part']));
+    Display :: display_confirmation_message(store_move($_POST['id'], $_POST['move_target'], $_POST['part']));
 }
 
 // Delete a file
 if (($action == 'deletereceivedfile' || $action == 'deletesentfile') AND isset($_GET['id']) AND is_numeric($_GET['id'])) {
-	if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
-		api_not_allowed();
-	}
-	$dropboxfile = new Dropbox_Person(api_get_user_id(), $is_courseAdmin, $is_courseTutor);
-	if ($action == 'deletereceivedfile') {
-		$dropboxfile->deleteReceivedWork($_GET['id']);
-		$message = get_lang('ReceivedFileDeleted');
-	}
-	if ($action == 'deletesentfile') {
-		$dropboxfile->deleteSentWork($_GET['id']);
-		$message = get_lang('SentFileDeleted');
-	}
-	Display :: display_confirmation_message($message);
+    if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
+        api_not_allowed();
+    }
+    $dropboxfile = new Dropbox_Person(api_get_user_id(), $is_courseAdmin, $is_courseTutor);
+    if ($action == 'deletereceivedfile') {
+        $dropboxfile->deleteReceivedWork($_GET['id']);
+        $message = get_lang('ReceivedFileDeleted');
+    }
+    if ($action == 'deletesentfile') {
+        $dropboxfile->deleteSentWork($_GET['id']);
+        $message = get_lang('SentFileDeleted');
+    }
+    Display :: display_confirmation_message($message);
 }
 
 // Delete a category
 if (($action == 'deletereceivedcategory' || $action == 'deletesentcategory') AND isset($_GET['id']) AND is_numeric($_GET['id'])) {
-	if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
-		api_not_allowed();
-	}
-	$message = delete_category($action, $_GET['id']);
-	Display :: display_confirmation_message($message);
+    if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
+        api_not_allowed();
+    }
+    $message = delete_category($action, $_GET['id']);
+    Display :: display_confirmation_message($message);
 }
 
 // Do an action on multiple files
@@ -163,27 +163,27 @@ 
     $postAction == 'delete_sent' ||
     $postAction == 'download_sent')
 ) {
-	$display_message = handle_multiple_actions();
-	Display :: display_normal_message($display_message);
+    $display_message = handle_multiple_actions();
+    Display :: display_normal_message($display_message);
 }
 
 // Store Feedback
 
 if (isset($_POST['feedback'])) {
-	if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
-		api_not_allowed();
-	}
-	$check = Security::check_token();
-	if ($check) {
-		$display_message = store_feedback();
-		Display :: display_normal_message($display_message);
-		Security::check_token();
-	}
+    if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
+        api_not_allowed();
+    }
+    $check = Security::check_token();
+    if ($check) {
+        $display_message = store_feedback();
+        Display :: display_normal_message($display_message);
+        Security::check_token();
+    }
 }
 
 // Error Message
 if (isset($_GET['error']) AND !empty($_GET['error'])) {
-	Display :: display_normal_message(get_lang($_GET['error']));
+    Display :: display_normal_message(get_lang($_GET['error']));
 }
 
 $dropbox_data_sent = array();
@@ -191,96 +191,96 @@ 
 $dropbox_data_recieved = array();
 
 if ($action != 'add') {
-	// Getting all the categories in the dropbox for the given user
-	$dropbox_categories = get_dropbox_categories();
-	// Greating the arrays with the categories for the received files and for the sent files
-	foreach ($dropbox_categories as $category) {
-		if ($category['received'] == '1') {
-			$dropbox_received_category[] = $category;
-		}
-		if ($category['sent'] == '1') {
-			$dropbox_sent_category[] = $category;
-		}
-	}
-
-	// ACTIONS
-	if ($view == 'received' || !$showSentReceivedTabs) {
-		//echo '<h3>'.get_lang('ReceivedFiles').'</h3>';
-
-		// This is for the categories
-		if (isset($viewReceivedCategory) AND $viewReceivedCategory != '') {
-			$view_dropbox_category_received = $viewReceivedCategory;
-		} else {
-			$view_dropbox_category_received = 0;
-		}
-
-		/* Menu Received */
-
-		if (api_get_session_id() == 0) {
-			echo '<div class="actions">';
-			if ($view_dropbox_category_received != 0  && api_is_allowed_to_session_edit(false, true)) {
-				echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category=0&view_sent_category='.$viewSentCategory.'&view='.$view.'">'.Display::return_icon('folder_up.png', get_lang('Up').' '.get_lang('Root'),'',ICON_SIZE_MEDIUM)."</a>";
-				echo get_lang('Category').': <strong>'.Security::remove_XSS($dropbox_categories[$view_dropbox_category_received]['cat_name']).'</strong> ';
-				$movelist[0] = 'Root'; // move_received selectbox content
-			} else {
-				echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=addreceivedcategory&view='.$view.'">'.Display::return_icon('new_folder.png', get_lang('AddNewCategory'),'',ICON_SIZE_MEDIUM).'</a>';
-			}
-			echo '</div>';
-		} else {
-			if (api_is_allowed_to_session_edit(false, true)) {
-				echo '<div class="actions">';
-				if ($view_dropbox_category_received != 0 && api_is_allowed_to_session_edit(false, true)) {
-					echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category=0&view_sent_category='.$viewSentCategory.'&view='.$view.'">'.Display::return_icon('folder_up.png', get_lang('Up').' '.get_lang('Root'),'',ICON_SIZE_MEDIUM)."</a>";
-					echo get_lang('Category').': <strong>'.Security::remove_XSS($dropbox_categories[$view_dropbox_category_received]['cat_name']).'</strong> ';
-					$movelist[0] = 'Root'; // move_received selectbox content
-				} else {
-					echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=addreceivedcategory&view='.$view.'">'.Display::return_icon('new_folder.png', get_lang('AddNewCategory'),'',ICON_SIZE_MEDIUM).'</a>';
-				}
-				echo '</div>';
-			}
-		}
-	}
-
-	if (!$view || $view == 'sent' || !$showSentReceivedTabs) {
-		// This is for the categories
-		if (isset($viewSentCategory) AND $viewSentCategory != '') {
-			$view_dropbox_category_sent = $viewSentCategory;
-		} else {
-			$view_dropbox_category_sent = 0;
-		}
-
-		/* Menu Sent */
-
-		if (api_get_session_id() == 0) {
-			echo '<div class="actions">';
-			if ($view_dropbox_category_sent != 0) {
-				echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category=0&view='.$view.'">'.Display::return_icon('folder_up.png', get_lang('Up').' '.get_lang('Root'),'',ICON_SIZE_MEDIUM)."</a>";
-				echo get_lang('Category').': <strong>'.Security::remove_XSS($dropbox_categories[$view_dropbox_category_sent]['cat_name']).'</strong> ';
-			} else {
-				echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&view=".$view."&action=addsentcategory\">".Display::return_icon('new_folder.png', get_lang('AddNewCategory'),'',ICON_SIZE_MEDIUM)."</a>\n";
-			}
-			if (empty($viewSentCategory)) {
-				echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&view=".$view."&action=add\">".Display::return_icon('upload_file.png', get_lang('UploadNewFile'),'',ICON_SIZE_MEDIUM)."</a>";
-			}
-			echo '</div>';
-		} else {
-			if (api_is_allowed_to_session_edit(false, true)) {
-				echo '<div class="actions">';
-				if ($view_dropbox_category_sent != 0) {
-					echo get_lang('CurrentlySeeing').': <strong>'.Security::remove_XSS($dropbox_categories[$view_dropbox_category_sent]['cat_name']).'</strong> ';
-					echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category=0&view='.$view.'">'.Display::return_icon('folder_up.png', get_lang('Up').' '.get_lang('Root'),'',ICON_SIZE_MEDIUM)."</a>";
-				} else {
-					echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&view=".$view."&action=addsentcategory\">".Display::return_icon('new_folder.png', get_lang('AddNewCategory'),'',ICON_SIZE_MEDIUM)."</a>\n";
-				}
-				if (empty($viewSentCategory)) {
-					echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&view=".$view."&action=add\">".Display::return_icon('upload_file.png', get_lang('UploadNewFile'),'',ICON_SIZE_MEDIUM)."</a>";
-				}
-				echo '</div>';
-			}
-		}
-	}
-	/*	THE MENU TABS */
-	if ($showSentReceivedTabs) {
+    // Getting all the categories in the dropbox for the given user
+    $dropbox_categories = get_dropbox_categories();
+    // Greating the arrays with the categories for the received files and for the sent files
+    foreach ($dropbox_categories as $category) {
+        if ($category['received'] == '1') {
+            $dropbox_received_category[] = $category;
+        }
+        if ($category['sent'] == '1') {
+            $dropbox_sent_category[] = $category;
+        }
+    }
+
+    // ACTIONS
+    if ($view == 'received' || !$showSentReceivedTabs) {
+        //echo '<h3>'.get_lang('ReceivedFiles').'</h3>';
+
+        // This is for the categories
+        if (isset($viewReceivedCategory) AND $viewReceivedCategory != '') {
+            $view_dropbox_category_received = $viewReceivedCategory;
+        } else {
+            $view_dropbox_category_received = 0;
+        }
+
+        /* Menu Received */
+
+        if (api_get_session_id() == 0) {
+            echo '<div class="actions">';
+            if ($view_dropbox_category_received != 0  && api_is_allowed_to_session_edit(false, true)) {
+                echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category=0&view_sent_category='.$viewSentCategory.'&view='.$view.'">'.Display::return_icon('folder_up.png', get_lang('Up').' '.get_lang('Root'),'',ICON_SIZE_MEDIUM)."</a>";
+                echo get_lang('Category').': <strong>'.Security::remove_XSS($dropbox_categories[$view_dropbox_category_received]['cat_name']).'</strong> ';
+                $movelist[0] = 'Root'; // move_received selectbox content
+            } else {
+                echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=addreceivedcategory&view='.$view.'">'.Display::return_icon('new_folder.png', get_lang('AddNewCategory'),'',ICON_SIZE_MEDIUM).'</a>';
+            }
+            echo '</div>';
+        } else {
+            if (api_is_allowed_to_session_edit(false, true)) {
+                echo '<div class="actions">';
+                if ($view_dropbox_category_received != 0 && api_is_allowed_to_session_edit(false, true)) {
+                    echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category=0&view_sent_category='.$viewSentCategory.'&view='.$view.'">'.Display::return_icon('folder_up.png', get_lang('Up').' '.get_lang('Root'),'',ICON_SIZE_MEDIUM)."</a>";
+                    echo get_lang('Category').': <strong>'.Security::remove_XSS($dropbox_categories[$view_dropbox_category_received]['cat_name']).'</strong> ';
+                    $movelist[0] = 'Root'; // move_received selectbox content
+                } else {
+                    echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=addreceivedcategory&view='.$view.'">'.Display::return_icon('new_folder.png', get_lang('AddNewCategory'),'',ICON_SIZE_MEDIUM).'</a>';
+                }
+                echo '</div>';
+            }
+        }
+    }
+
+    if (!$view || $view == 'sent' || !$showSentReceivedTabs) {
+        // This is for the categories
+        if (isset($viewSentCategory) AND $viewSentCategory != '') {
+            $view_dropbox_category_sent = $viewSentCategory;
+        } else {
+            $view_dropbox_category_sent = 0;
+        }
+
+        /* Menu Sent */
+
+        if (api_get_session_id() == 0) {
+            echo '<div class="actions">';
+            if ($view_dropbox_category_sent != 0) {
+                echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category=0&view='.$view.'">'.Display::return_icon('folder_up.png', get_lang('Up').' '.get_lang('Root'),'',ICON_SIZE_MEDIUM)."</a>";
+                echo get_lang('Category').': <strong>'.Security::remove_XSS($dropbox_categories[$view_dropbox_category_sent]['cat_name']).'</strong> ';
+            } else {
+                echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&view=".$view."&action=addsentcategory\">".Display::return_icon('new_folder.png', get_lang('AddNewCategory'),'',ICON_SIZE_MEDIUM)."</a>\n";
+            }
+            if (empty($viewSentCategory)) {
+                echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&view=".$view."&action=add\">".Display::return_icon('upload_file.png', get_lang('UploadNewFile'),'',ICON_SIZE_MEDIUM)."</a>";
+            }
+            echo '</div>';
+        } else {
+            if (api_is_allowed_to_session_edit(false, true)) {
+                echo '<div class="actions">';
+                if ($view_dropbox_category_sent != 0) {
+                    echo get_lang('CurrentlySeeing').': <strong>'.Security::remove_XSS($dropbox_categories[$view_dropbox_category_sent]['cat_name']).'</strong> ';
+                    echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category=0&view='.$view.'">'.Display::return_icon('folder_up.png', get_lang('Up').' '.get_lang('Root'),'',ICON_SIZE_MEDIUM)."</a>";
+                } else {
+                    echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&view=".$view."&action=addsentcategory\">".Display::return_icon('new_folder.png', get_lang('AddNewCategory'),'',ICON_SIZE_MEDIUM)."</a>\n";
+                }
+                if (empty($viewSentCategory)) {
+                    echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&view=".$view."&action=add\">".Display::return_icon('upload_file.png', get_lang('UploadNewFile'),'',ICON_SIZE_MEDIUM)."</a>";
+                }
+                echo '</div>';
+            }
+        }
+    }
+    /*	THE MENU TABS */
+    if ($showSentReceivedTabs) {
 ?>
 <ul class="nav nav-tabs">
     <li <?php if (!$view || $view == 'sent') { echo 'class="active"'; } ?> >
@@ -294,80 +294,80 @@ 
     </li>
 </ul>
 <?php
-	}
+    }
     /*	RECEIVED FILES */
-	if ($view == 'received' || !$showSentReceivedTabs) {
-		// This is for the categories
-		if (isset($viewReceivedCategory) AND $viewReceivedCategory != '') {
-			$view_dropbox_category_received = $viewReceivedCategory;
-		} else {
-			$view_dropbox_category_received = 0;
-		}
-
-		// Object initialisation
-		$dropbox_person = new Dropbox_Person(api_get_user_id(), $is_courseAdmin, $is_courseTutor);
-		 // note: are the $is_courseAdmin and $is_courseTutor parameters needed????
-
-		// Constructing the array that contains the total number of feedback messages per document.
-		$number_feedback = get_total_number_feedback();
-
-		// Sorting and paging options
-		$sorting_options = array();
-		$paging_options = array();
-
-		// The headers of the sortable tables
-		$column_header = array();
-		$column_header[] = array('', false, '');
-		$column_header[] = array(get_lang('Type'), true, 'style="width:40px"', 'style="text-align:center"');
-		$column_header[] = array(get_lang('ReceivedTitle'), true, '');
-		$column_header[] = array(get_lang('Size'), true, '');
-		$column_header[] = array(get_lang('Authors'), true, '');
-		$column_header[] = array(get_lang('LastResent'), true);
-
-		if (api_get_session_id() == 0) {
-			$column_header[] = array(get_lang('Modify'), false, '', 'nowrap style="text-align: right"');
-		} elseif (api_is_allowed_to_session_edit(false,true)) {
-			$column_header[] = array(get_lang('Modify'), false, '', 'nowrap style="text-align: right"');
-		}
-
-		$column_header[] = array('RealDate', true);
-		$column_header[] = array('RealSize', true);
-
-		// An array with the setting of the columns -> 1: columns that we will show, 0:columns that will be hide
-		$column_show[] = 1;
-		$column_show[] = 1;
-		$column_show[] = 1;
-		$column_show[] = 1;
-		$column_show[] = 1;
-		$column_show[] = 1;
-
-		if (api_get_session_id() == 0) {
-			$column_show[] = 1;
-		} elseif (api_is_allowed_to_session_edit(false, true)) {
-			$column_show[] = 1;
-		}
-		$column_show[] = 0;
-
-		// Here we change the way how the columns are going to be sort
-		// in this case the the column of LastResent ( 4th element in $column_header) we will be order like the column RealDate
-		// because in the column RealDate we have the days in a correct format "2008-03-12 10:35:48"
-
-		$column_order[3] = 8;
-		$column_order[5] = 7;
-
-		// The content of the sortable table = the received files
-		foreach ($dropbox_person -> receivedWork as $dropbox_file) {
-			$dropbox_file_data = array();
-			if ($view_dropbox_category_received == $dropbox_file->category) {
+    if ($view == 'received' || !$showSentReceivedTabs) {
+        // This is for the categories
+        if (isset($viewReceivedCategory) AND $viewReceivedCategory != '') {
+            $view_dropbox_category_received = $viewReceivedCategory;
+        } else {
+            $view_dropbox_category_received = 0;
+        }
+
+        // Object initialisation
+        $dropbox_person = new Dropbox_Person(api_get_user_id(), $is_courseAdmin, $is_courseTutor);
+            // note: are the $is_courseAdmin and $is_courseTutor parameters needed????
+
+        // Constructing the array that contains the total number of feedback messages per document.
+        $number_feedback = get_total_number_feedback();
+
+        // Sorting and paging options
+        $sorting_options = array();
+        $paging_options = array();
+
+        // The headers of the sortable tables
+        $column_header = array();
+        $column_header[] = array('', false, '');
+        $column_header[] = array(get_lang('Type'), true, 'style="width:40px"', 'style="text-align:center"');
+        $column_header[] = array(get_lang('ReceivedTitle'), true, '');
+        $column_header[] = array(get_lang('Size'), true, '');
+        $column_header[] = array(get_lang('Authors'), true, '');
+        $column_header[] = array(get_lang('LastResent'), true);
+
+        if (api_get_session_id() == 0) {
+            $column_header[] = array(get_lang('Modify'), false, '', 'nowrap style="text-align: right"');
+        } elseif (api_is_allowed_to_session_edit(false,true)) {
+            $column_header[] = array(get_lang('Modify'), false, '', 'nowrap style="text-align: right"');
+        }
+
+        $column_header[] = array('RealDate', true);
+        $column_header[] = array('RealSize', true);
+
+        // An array with the setting of the columns -> 1: columns that we will show, 0:columns that will be hide
+        $column_show[] = 1;
+        $column_show[] = 1;
+        $column_show[] = 1;
+        $column_show[] = 1;
+        $column_show[] = 1;
+        $column_show[] = 1;
+
+        if (api_get_session_id() == 0) {
+            $column_show[] = 1;
+        } elseif (api_is_allowed_to_session_edit(false, true)) {
+            $column_show[] = 1;
+        }
+        $column_show[] = 0;
+
+        // Here we change the way how the columns are going to be sort
+        // in this case the the column of LastResent ( 4th element in $column_header) we will be order like the column RealDate
+        // because in the column RealDate we have the days in a correct format "2008-03-12 10:35:48"
+
+        $column_order[3] = 8;
+        $column_order[5] = 7;
+
+        // The content of the sortable table = the received files
+        foreach ($dropbox_person -> receivedWork as $dropbox_file) {
+            $dropbox_file_data = array();
+            if ($view_dropbox_category_received == $dropbox_file->category) {
                 // we only display the files that are in the category that we are in.
-				$dropbox_file_data[] = $dropbox_file->id;
+                $dropbox_file_data[] = $dropbox_file->id;
 
-				if (isset($_SESSION['_seen']) && !is_array($_SESSION['_seen'][$_course['id']][TOOL_DROPBOX])) {
-					$_SESSION['_seen'][$_course['id']][TOOL_DROPBOX] = array();
-				}
+                if (isset($_SESSION['_seen']) && !is_array($_SESSION['_seen'][$_course['id']][TOOL_DROPBOX])) {
+                    $_SESSION['_seen'][$_course['id']][TOOL_DROPBOX] = array();
+                }
 
-				// New icon
-				$new_icon = '';
+                // New icon
+                $new_icon = '';
                 if (isset($_SESSION['_seen'])) {
                     if ($dropbox_file->last_upload_date > $last_access &&
                         !in_array(
@@ -384,12 +384,12 @@ 
                     }
                 }
 
-				$link_open = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&id='.$dropbox_file->id.'">';
-				$dropbox_file_data[] = $link_open.DocumentManager::build_document_icon_tag('file', $dropbox_file->title).'</a>';
-				$dropbox_file_data[] = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&id='.$dropbox_file->id.'&action=download">'.
+                $link_open = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&id='.$dropbox_file->id.'">';
+                $dropbox_file_data[] = $link_open.DocumentManager::build_document_icon_tag('file', $dropbox_file->title).'</a>';
+                $dropbox_file_data[] = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&id='.$dropbox_file->id.'&action=download">'.
                     Display::return_icon('save.png', get_lang('Download'), array('style' => 'float:right;'),ICON_SIZE_SMALL).'</a>'.$link_open.$dropbox_file->title.'</a>'.$new_icon.'<br />'.$dropbox_file->description;
-				$file_size = $dropbox_file->filesize;
-				$dropbox_file_data[] = format_file_size($file_size);
+                $file_size = $dropbox_file->filesize;
+                $dropbox_file_data[] = format_file_size($file_size);
 
                 $authorInfo = api_get_user_info($dropbox_file->uploader_id);
                 if ($authorInfo) {
@@ -398,62 +398,62 @@ 
                     $dropbox_file_data[] = '';
                 }
 
-				$last_upload_date = api_get_local_time($dropbox_file->last_upload_date);
-				$dropbox_file_data[] = date_to_str_ago($dropbox_file->last_upload_date).'<br /><span class="dropbox_date">'.
+                $last_upload_date = api_get_local_time($dropbox_file->last_upload_date);
+                $dropbox_file_data[] = date_to_str_ago($dropbox_file->last_upload_date).'<br /><span class="dropbox_date">'.
                     api_format_date($last_upload_date).'</span>';
 
-				$action_icons = check_number_feedback($dropbox_file->id, $number_feedback).' '.get_lang('Feedback').'
+                $action_icons = check_number_feedback($dropbox_file->id, $number_feedback).' '.get_lang('Feedback').'
                 <a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=viewfeedback&id='.$dropbox_file->id.'&'.$sort_params.'">'.Display::return_icon('discuss.png', get_lang('Comment'),'',ICON_SIZE_SMALL).'</a>
                 <a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=movereceived&move_id='.$dropbox_file->id.'&'.$sort_params.'">'.Display::return_icon('move.png', get_lang('Move'),'',ICON_SIZE_SMALL).'</a>
                 <a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=deletereceivedfile&id='.$dropbox_file->id.'&'.$sort_params.'" onclick="javascript: return confirmation(\''.$dropbox_file->title.'\');">'.
                 Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>';
 
-				// This is a hack to have an additional row in a sortable table
-
-				if ($action == 'viewfeedback' AND isset($_GET['id']) and is_numeric($_GET['id']) AND $dropbox_file->id == $_GET['id']) {
-					$action_icons .= "</td></tr>"; // Ending the normal row of the sortable table
-					$action_icons .= '<tr><td colspan="2"><a href="'.api_get_path(WEB_CODE_PATH).'dropbox/index.php?"'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory."&view_sent_category=".$viewSentCategory."&view=".$view.'&'.$sort_params."\">".get_lang('CloseFeedback')."</a></td><td colspan=\"7\">".feedback($dropbox_file->feedback2)."</td></tr>";
-				}
-				if (api_get_session_id() == 0) {
-					$dropbox_file_data[] = $action_icons;
-				} elseif (api_is_allowed_to_session_edit(false, true)) {
-					$dropbox_file_data[] = $action_icons;
-				}
-				$action_icons = '';
-				$dropbox_file_data[] = $last_upload_date;
-				$dropbox_file_data[] = $file_size;
-				$dropbox_data_recieved[] = $dropbox_file_data;
-			}
-		}
-
-		// The content of the sortable table = the categories (if we are not in the root)
-		if ($view_dropbox_category_received == 0) {
-			foreach ($dropbox_categories as $category) {
-			    /*  Note: This can probably be shortened since the categories
+                // This is a hack to have an additional row in a sortable table
+
+                if ($action == 'viewfeedback' AND isset($_GET['id']) and is_numeric($_GET['id']) AND $dropbox_file->id == $_GET['id']) {
+                    $action_icons .= "</td></tr>"; // Ending the normal row of the sortable table
+                    $action_icons .= '<tr><td colspan="2"><a href="'.api_get_path(WEB_CODE_PATH).'dropbox/index.php?"'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory."&view_sent_category=".$viewSentCategory."&view=".$view.'&'.$sort_params."\">".get_lang('CloseFeedback')."</a></td><td colspan=\"7\">".feedback($dropbox_file->feedback2)."</td></tr>";
+                }
+                if (api_get_session_id() == 0) {
+                    $dropbox_file_data[] = $action_icons;
+                } elseif (api_is_allowed_to_session_edit(false, true)) {
+                    $dropbox_file_data[] = $action_icons;
+                }
+                $action_icons = '';
+                $dropbox_file_data[] = $last_upload_date;
+                $dropbox_file_data[] = $file_size;
+                $dropbox_data_recieved[] = $dropbox_file_data;
+            }
+        }
+
+        // The content of the sortable table = the categories (if we are not in the root)
+        if ($view_dropbox_category_received == 0) {
+            foreach ($dropbox_categories as $category) {
+                /*  Note: This can probably be shortened since the categories
 			    for the received files are already in the
 			    $dropbox_received_category array;*/
-				$dropbox_category_data = array();
-				if ($category['received'] == '1') {
-					$movelist[$category['cat_id']] = $category['cat_name'];
+                $dropbox_category_data = array();
+                if ($category['received'] == '1') {
+                    $movelist[$category['cat_id']] = $category['cat_name'];
                     // This is where the checkbox icon for the files appear
-					$dropbox_category_data[] = $category['cat_id'];
-					// The icon of the category
-					$link_open = '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$category['cat_id'].'&view_sent_category='.$viewSentCategory.'&view='.$view.'">';
-					$dropbox_category_data[] = $link_open.DocumentManager::build_document_icon_tag('folder', $category['cat_name']).'</a>';
-					$dropbox_category_data[] = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&cat_id='.$category['cat_id'].'&action=downloadcategory&sent_received=received">'.Display::return_icon('save_pack.png', get_lang('Save'), array('style' => 'float:right;'),ICON_SIZE_SMALL).'</a>'.$link_open.$category['cat_name'].'</a>';
-					$dropbox_category_data[] = '';
-					$dropbox_category_data[] = '';
-					$dropbox_category_data[] = '';
-					$dropbox_category_data[] = '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=editcategory&id='.$category['cat_id'].'">'.Display::return_icon('edit.png',get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>
+                    $dropbox_category_data[] = $category['cat_id'];
+                    // The icon of the category
+                    $link_open = '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$category['cat_id'].'&view_sent_category='.$viewSentCategory.'&view='.$view.'">';
+                    $dropbox_category_data[] = $link_open.DocumentManager::build_document_icon_tag('folder', $category['cat_name']).'</a>';
+                    $dropbox_category_data[] = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&cat_id='.$category['cat_id'].'&action=downloadcategory&sent_received=received">'.Display::return_icon('save_pack.png', get_lang('Save'), array('style' => 'float:right;'),ICON_SIZE_SMALL).'</a>'.$link_open.$category['cat_name'].'</a>';
+                    $dropbox_category_data[] = '';
+                    $dropbox_category_data[] = '';
+                    $dropbox_category_data[] = '';
+                    $dropbox_category_data[] = '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=editcategory&id='.$category['cat_id'].'">'.Display::return_icon('edit.png',get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>
 										  <a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=deletereceivedcategory&id='.$category['cat_id'].'" onclick="javascript: return confirmation(\''.Security::remove_XSS($category['cat_name']).'\');">'.Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>';
-				}
-				if (is_array($dropbox_category_data) && count($dropbox_category_data) > 0) {
-					$dropbox_data_recieved[] = $dropbox_category_data;
-				}
-			}
-		}
-
-		// Displaying the table
+                }
+                if (is_array($dropbox_category_data) && count($dropbox_category_data) > 0) {
+                    $dropbox_data_recieved[] = $dropbox_category_data;
+                }
+            }
+        }
+
+        // Displaying the table
         $additional_get_parameters = array(
             'view' => $view,
             'view_received_category' => $viewReceivedCategory,
@@ -464,15 +464,15 @@ 
             'download_received' => get_lang('Download')
         );
 
-		if (is_array($movelist)) {
-			foreach ($movelist as $catid => $catname){
-				$selectlist['move_received_'.$catid] = get_lang('Move') . '->'. Security::remove_XSS($catname);
-			}
-		}
+        if (is_array($movelist)) {
+            foreach ($movelist as $catid => $catname){
+                $selectlist['move_received_'.$catid] = get_lang('Move') . '->'. Security::remove_XSS($catname);
+            }
+        }
 
-		if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
-			$selectlist = array();
-		}
+        if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
+            $selectlist = array();
+        }
         echo '<div class="files-table">';
         Display::display_sortable_config_table(
             'dropbox',
@@ -486,154 +486,154 @@ 
             $selectlist
         );
         echo '</div>';
-	}
-
-	/*	SENT FILES */
-
-	if (!$view || $view == 'sent' || !$showSentReceivedTabs) {
-		// This is for the categories
-		if (isset($viewSentCategory) AND $viewSentCategory != '') {
-			$view_dropbox_category_sent = $viewSentCategory;
-		} else {
-			$view_dropbox_category_sent = 0;
-		}
-
-		// Object initialisation
-		$dropbox_person = new Dropbox_Person(api_get_user_id(), $is_courseAdmin, $is_courseTutor);
-
-		// Constructing the array that contains the total number of feedback messages per document.
-		$number_feedback = get_total_number_feedback();
-
-		// Sorting and paging options
-		$sorting_options = array();
-		$paging_options = array();
-
-		// The headers of the sortable tables
-		$column_header = array();
-
-		$column_header[] = array('', false, '');
-		$column_header[] = array(get_lang('Type'), true, 'style="width:40px"', 'style="text-align:center"');
-		$column_header[] = array(get_lang('SentTitle'), true, '');
-		$column_header[] = array(get_lang('Size'), true, '');
-		$column_header[] = array(get_lang('SentTo'), true, '');
-		$column_header[] = array(get_lang('LastResent'), true, '');
-
-		if (api_get_session_id() == 0) {
-			$column_header[] = array(get_lang('Modify'), false, '', 'nowrap style="text-align: right"');
-		} elseif (api_is_allowed_to_session_edit(false, true)) {
-			$column_header[] = array(get_lang('Modify'), false, '', 'nowrap style="text-align: right"');
-		}
-
-		$column_header[] = array('RealDate', true);
-		$column_header[] = array('RealSize', true);
-
-		$column_show = array();
-		$column_order = array();
-
-		// An array with the setting of the columns -> 1: columns that we will show, 0:columns that will be hide
-		$column_show[] = 1;
-		$column_show[] = 1;
-		$column_show[] = 1;
-		$column_show[] = 1;
-		$column_show[] = 1;
-		$column_show[] = 1;
-		if (api_get_session_id() == 0) {
-			$column_show[] = 1;
-		} elseif (api_is_allowed_to_session_edit(false, true)) {
-			$column_show[] = 1;
-		}
-		$column_show[] = 0;
-
-		// Here we change the way how the colums are going to be sort
-		// in this case the the column of LastResent ( 4th element in $column_header) we will be order like the column RealDate
-		// because in the column RealDate we have the days in a correct format "2008-03-12 10:35:48"
-
-		$column_order[3] = 8;
-		$column_order[5] = 7;
-
-		// The content of the sortable table = the received files
-		foreach ($dropbox_person->sentWork as $dropbox_file) {
-			$dropbox_file_data = array();
-
-			if ($view_dropbox_category_sent == $dropbox_file->category) {
-				$dropbox_file_data[] = $dropbox_file->id;
-				$link_open = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&id='.$dropbox_file->id.'">';
-				$dropbox_file_data[] = $link_open.DocumentManager::build_document_icon_tag('file', $dropbox_file->title).'</a>';
-				$dropbox_file_data[] = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&id='.$dropbox_file->id.'&action=download">'.
+    }
+
+    /*	SENT FILES */
+
+    if (!$view || $view == 'sent' || !$showSentReceivedTabs) {
+        // This is for the categories
+        if (isset($viewSentCategory) AND $viewSentCategory != '') {
+            $view_dropbox_category_sent = $viewSentCategory;
+        } else {
+            $view_dropbox_category_sent = 0;
+        }
+
+        // Object initialisation
+        $dropbox_person = new Dropbox_Person(api_get_user_id(), $is_courseAdmin, $is_courseTutor);
+
+        // Constructing the array that contains the total number of feedback messages per document.
+        $number_feedback = get_total_number_feedback();
+
+        // Sorting and paging options
+        $sorting_options = array();
+        $paging_options = array();
+
+        // The headers of the sortable tables
+        $column_header = array();
+
+        $column_header[] = array('', false, '');
+        $column_header[] = array(get_lang('Type'), true, 'style="width:40px"', 'style="text-align:center"');
+        $column_header[] = array(get_lang('SentTitle'), true, '');
+        $column_header[] = array(get_lang('Size'), true, '');
+        $column_header[] = array(get_lang('SentTo'), true, '');
+        $column_header[] = array(get_lang('LastResent'), true, '');
+
+        if (api_get_session_id() == 0) {
+            $column_header[] = array(get_lang('Modify'), false, '', 'nowrap style="text-align: right"');
+        } elseif (api_is_allowed_to_session_edit(false, true)) {
+            $column_header[] = array(get_lang('Modify'), false, '', 'nowrap style="text-align: right"');
+        }
+
+        $column_header[] = array('RealDate', true);
+        $column_header[] = array('RealSize', true);
+
+        $column_show = array();
+        $column_order = array();
+
+        // An array with the setting of the columns -> 1: columns that we will show, 0:columns that will be hide
+        $column_show[] = 1;
+        $column_show[] = 1;
+        $column_show[] = 1;
+        $column_show[] = 1;
+        $column_show[] = 1;
+        $column_show[] = 1;
+        if (api_get_session_id() == 0) {
+            $column_show[] = 1;
+        } elseif (api_is_allowed_to_session_edit(false, true)) {
+            $column_show[] = 1;
+        }
+        $column_show[] = 0;
+
+        // Here we change the way how the colums are going to be sort
+        // in this case the the column of LastResent ( 4th element in $column_header) we will be order like the column RealDate
+        // because in the column RealDate we have the days in a correct format "2008-03-12 10:35:48"
+
+        $column_order[3] = 8;
+        $column_order[5] = 7;
+
+        // The content of the sortable table = the received files
+        foreach ($dropbox_person->sentWork as $dropbox_file) {
+            $dropbox_file_data = array();
+
+            if ($view_dropbox_category_sent == $dropbox_file->category) {
+                $dropbox_file_data[] = $dropbox_file->id;
+                $link_open = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&id='.$dropbox_file->id.'">';
+                $dropbox_file_data[] = $link_open.DocumentManager::build_document_icon_tag('file', $dropbox_file->title).'</a>';
+                $dropbox_file_data[] = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&id='.$dropbox_file->id.'&action=download">'.
                     Display::return_icon('save.png', get_lang('Save'), array('style' => 'float:right;'),ICON_SIZE_SMALL).'</a>'.$link_open.$dropbox_file->title.'</a><br />'.$dropbox_file->description;
-				$file_size = $dropbox_file->filesize;
-				$dropbox_file_data[] = format_file_size($file_size);
+                $file_size = $dropbox_file->filesize;
+                $dropbox_file_data[] = format_file_size($file_size);
                 $receivers_celldata = null;
-				foreach ($dropbox_file->recipients as $recipient) {
-					$userInfo = api_get_user_info($recipient['user_id']);
-					$receivers_celldata = UserManager::getUserProfileLink($userInfo).', '.$receivers_celldata;
-				}
-				$receivers_celldata = trim(trim($receivers_celldata), ','); // Removing the trailing comma.
-				$dropbox_file_data[] = $receivers_celldata;
-				$last_upload_date = api_get_local_time($dropbox_file->last_upload_date);
-				$dropbox_file_data[] = date_to_str_ago($dropbox_file->last_upload_date).'<br /><span class="dropbox_date">'.
-					api_format_date($last_upload_date).'</span>';
-
-				//$dropbox_file_data[] = $dropbox_file->author;
-				$receivers_celldata = '';
-
-				$action_icons = check_number_feedback($dropbox_file->id, $number_feedback).' '.get_lang('Feedback').'
+                foreach ($dropbox_file->recipients as $recipient) {
+                    $userInfo = api_get_user_info($recipient['user_id']);
+                    $receivers_celldata = UserManager::getUserProfileLink($userInfo).', '.$receivers_celldata;
+                }
+                $receivers_celldata = trim(trim($receivers_celldata), ','); // Removing the trailing comma.
+                $dropbox_file_data[] = $receivers_celldata;
+                $last_upload_date = api_get_local_time($dropbox_file->last_upload_date);
+                $dropbox_file_data[] = date_to_str_ago($dropbox_file->last_upload_date).'<br /><span class="dropbox_date">'.
+                    api_format_date($last_upload_date).'</span>';
+
+                //$dropbox_file_data[] = $dropbox_file->author;
+                $receivers_celldata = '';
+
+                $action_icons = check_number_feedback($dropbox_file->id, $number_feedback).' '.get_lang('Feedback').'
                     <a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=viewfeedback&id='.$dropbox_file->id.'&'.$sort_params.'">'.Display::return_icon('discuss.png', get_lang('Comment'),'',ICON_SIZE_SMALL).'</a>
                     <a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=movesent&move_id='.$dropbox_file->id.'&'.$sort_params.'">'.Display::return_icon('move.png', get_lang('Move'),'',ICON_SIZE_SMALL).'</a>
                     <a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=deletesentfile&id='.$dropbox_file->id.'&'.$sort_params.'" onclick="javascript: return confirmation(\''.$dropbox_file->title.'\');">'.Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>';
-				// This is a hack to have an additional row in a sortable table
-				if ($action == 'viewfeedback' && isset($_GET['id']) && is_numeric($_GET['id']) && $dropbox_file->id == $_GET['id']) {
-					$action_icons .= "</td></tr>\n"; // ending the normal row of the sortable table
-					$action_icons .= "<tr><td colspan=\"2\">";
-					$action_icons .= "<a href=\"".api_get_path(WEB_CODE_PATH)."dropbox/index.php?".api_get_cidreq()."&view_received_category=".$viewReceivedCategory."&view_sent_category=".$viewSentCategory."&view=".$view.'&'.$sort_params."\">".get_lang('CloseFeedback')."</a>";
-					$action_icons .= "</td><td colspan=\"7\">".feedback($dropbox_file->feedback2)."</td></tr>";
-				}
-				$dropbox_file_data[] = $action_icons;
-				$dropbox_file_data[] = $last_upload_date;
-				$dropbox_file_data[] = $file_size;
-				$action_icons = '';
-				$dropbox_data_sent[] = $dropbox_file_data;
-			}
-		}
+                // This is a hack to have an additional row in a sortable table
+                if ($action == 'viewfeedback' && isset($_GET['id']) && is_numeric($_GET['id']) && $dropbox_file->id == $_GET['id']) {
+                    $action_icons .= "</td></tr>\n"; // ending the normal row of the sortable table
+                    $action_icons .= "<tr><td colspan=\"2\">";
+                    $action_icons .= "<a href=\"".api_get_path(WEB_CODE_PATH)."dropbox/index.php?".api_get_cidreq()."&view_received_category=".$viewReceivedCategory."&view_sent_category=".$viewSentCategory."&view=".$view.'&'.$sort_params."\">".get_lang('CloseFeedback')."</a>";
+                    $action_icons .= "</td><td colspan=\"7\">".feedback($dropbox_file->feedback2)."</td></tr>";
+                }
+                $dropbox_file_data[] = $action_icons;
+                $dropbox_file_data[] = $last_upload_date;
+                $dropbox_file_data[] = $file_size;
+                $action_icons = '';
+                $dropbox_data_sent[] = $dropbox_file_data;
+            }
+        }
 
         $moveList = array();
-		// The content of the sortable table = the categories (if we are not in the root)
-		if ($view_dropbox_category_sent == 0) {
-			foreach ($dropbox_categories as $category) {
-				$dropbox_category_data = array();
+        // The content of the sortable table = the categories (if we are not in the root)
+        if ($view_dropbox_category_sent == 0) {
+            foreach ($dropbox_categories as $category) {
+                $dropbox_category_data = array();
 
-				if ($category['sent'] == '1') {
+                if ($category['sent'] == '1') {
 
                     $moveList[$category['cat_id']] = $category['cat_name'];
-					$dropbox_category_data[] = $category['cat_id'];
-					// This is where the checkbox icon for the files appear.
-					$link_open = '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$category['cat_id'].'&view='.$view.'">';
-					$dropbox_category_data[] = $link_open.DocumentManager::build_document_icon_tag('folder', Security::remove_XSS($category['cat_name'])).'</a>';
-					$dropbox_category_data[] = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&cat_id='.$category['cat_id'].'&action=downloadcategory&sent_received=sent">'.Display::return_icon('save_pack.png', get_lang('Save'), array('style' => 'float:right;'),ICON_SIZE_SMALL).'</a>'.$link_open.Security::remove_XSS($category['cat_name']).'</a>';
-					//$dropbox_category_data[] = '';
-					$dropbox_category_data[] = '';
-					//$dropbox_category_data[] = '';
-					$dropbox_category_data[] = '';
-					$dropbox_category_data[] = '';
-					$dropbox_category_data[] = '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=editcategory&id='.$category['cat_id'].'">'.
+                    $dropbox_category_data[] = $category['cat_id'];
+                    // This is where the checkbox icon for the files appear.
+                    $link_open = '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$category['cat_id'].'&view='.$view.'">';
+                    $dropbox_category_data[] = $link_open.DocumentManager::build_document_icon_tag('folder', Security::remove_XSS($category['cat_name'])).'</a>';
+                    $dropbox_category_data[] = '<a href="'.api_get_path(WEB_CODE_PATH).'dropbox/dropbox_download.php?'.api_get_cidreq().'&cat_id='.$category['cat_id'].'&action=downloadcategory&sent_received=sent">'.Display::return_icon('save_pack.png', get_lang('Save'), array('style' => 'float:right;'),ICON_SIZE_SMALL).'</a>'.$link_open.Security::remove_XSS($category['cat_name']).'</a>';
+                    //$dropbox_category_data[] = '';
+                    $dropbox_category_data[] = '';
+                    //$dropbox_category_data[] = '';
+                    $dropbox_category_data[] = '';
+                    $dropbox_category_data[] = '';
+                    $dropbox_category_data[] = '<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=editcategory&id='.$category['cat_id'].'">'.
                                     Display::return_icon('edit.png', get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>
 									<a href="'.api_get_self().'?'.api_get_cidreq().'&view_received_category='.$viewReceivedCategory.'&view_sent_category='.$viewSentCategory.'&view='.$view.'&action=deletesentcategory&id='.$category['cat_id'].'" onclick="javascript: return confirmation(\''.Security::remove_XSS($category['cat_name']).'\');">'.
                                     Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).'</a>';
-				}
-				if (is_array($dropbox_category_data) && count($dropbox_category_data) > 0) {
-					$dropbox_data_sent[] = $dropbox_category_data;
-				}
-			}
-		}
-
-		// Displaying the table
-		$additional_get_parameters = array(
+                }
+                if (is_array($dropbox_category_data) && count($dropbox_category_data) > 0) {
+                    $dropbox_data_sent[] = $dropbox_category_data;
+                }
+            }
+        }
+
+        // Displaying the table
+        $additional_get_parameters = array(
             'view' => $view,
             'view_received_category' => $viewReceivedCategory,
             'view_sent_category' => $viewSentCategory
         );
 
-		$selectlist = array(
+        $selectlist = array(
             'delete_received' => get_lang('Delete'),
             'download_received' => get_lang('Download')
         );
@@ -644,12 +644,12 @@ 
             }
         }
 
-		if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
-			$selectlist = array('download_received' => get_lang('Download'));
-		}
+        if (api_get_session_id() != 0 && !api_is_allowed_to_session_edit(false, true)) {
+            $selectlist = array('download_received' => get_lang('Download'));
+        }
 
         echo '<div class="files-table">';
-		Display::display_sortable_config_table(
+        Display::display_sortable_config_table(
             'dropbox',
             $column_header,
             $dropbox_data_sent,
@@ -661,7 +661,7 @@ 
             $selectlist
         );
         echo '</div>';
-	}
+    }
 }
 
 Display::display_footer();