YetiForceCompany / YetiForceCRM

libraries/nusoap/class.wsdl.php

Indentation +493 added lines, -493 removed lines

@@ -14,35 +14,35 @@ 
 */
 class wsdl extends nusoap_base {
 	// URL or filename of the root of this WSDL
-    var $wsdl; 
-    // define internal arrays of bindings, ports, operations, messages, etc.
-    var $schemas = array();
-    var $currentSchema;
-    var $message = array();
-    var $complexTypes = array();
-    var $messages = array();
-    var $currentMessage;
-    var $currentOperation;
-    var $portTypes = array();
-    var $currentPortType;
-    var $bindings = array();
-    var $currentBinding;
-    var $ports = array();
-    var $currentPort;
-    var $opData = array();
-    var $status = '';
-    var $documentation = false;
-    var $endpoint = ''; 
-    // array of wsdl docs to import
-    var $import = array(); 
-    // parser vars
-    var $parser;
-    var $position = 0;
-    var $depth = 0;
-    var $depth_array = array();
+	var $wsdl; 
+	// define internal arrays of bindings, ports, operations, messages, etc.
+	var $schemas = array();
+	var $currentSchema;
+	var $message = array();
+	var $complexTypes = array();
+	var $messages = array();
+	var $currentMessage;
+	var $currentOperation;
+	var $portTypes = array();
+	var $currentPortType;
+	var $bindings = array();
+	var $currentBinding;
+	var $ports = array();
+	var $currentPort;
+	var $opData = array();
+	var $status = '';
+	var $documentation = false;
+	var $endpoint = ''; 
+	// array of wsdl docs to import
+	var $import = array(); 
+	// parser vars
+	var $parser;
+	var $position = 0;
+	var $depth = 0;
+	var $depth_array = array();
 	// for getting wsdl
 	var $proxyhost = '';
-    var $proxyport = '';
+	var $proxyport = '';
 	var $proxyusername = '';
 	var $proxypassword = '';
 	var $timeout = 0;
@@ -55,10 +55,10 @@ 
 	var $authtype = '';				// Type of HTTP authentication
 	var $certRequest = array();		// Certificate for HTTP SSL authentication
 
-    /**
-     * constructor
-     * 
-     * @param string $wsdl WSDL document URL
+	/**
+	 * constructor
+	 * 
+	 * @param string $wsdl WSDL document URL
 	 * @param string $proxyhost
 	 * @param string $proxyport
 	 * @param string $proxyusername
@@ -67,13 +67,13 @@ 
 	 * @param integer $response_timeout set the response timeout
 	 * @param array $curl_options user-specified cURL options
 	 * @param boolean $use_curl try to use cURL
-     * @access public 
-     */
-    public function wsdl($wsdl = '',$proxyhost=false,$proxyport=false,$proxyusername=false,$proxypassword=false,$timeout=0,$response_timeout=30,$curl_options=null,$use_curl=false){
+	 * @access public 
+	 */
+	public function wsdl($wsdl = '',$proxyhost=false,$proxyport=false,$proxyusername=false,$proxypassword=false,$timeout=0,$response_timeout=30,$curl_options=null,$use_curl=false){
 		parent::nusoap_base();
 		$this->debug("ctor wsdl=$wsdl timeout=$timeout response_timeout=$response_timeout");
-        $this->proxyhost = $proxyhost;
-        $this->proxyport = $proxyport;
+		$this->proxyhost = $proxyhost;
+		$this->proxyport = $proxyport;
 		$this->proxyusername = $proxyusername;
 		$this->proxypassword = $proxypassword;
 		$this->timeout = $timeout;
@@ -82,7 +82,7 @@ 
 			$this->curl_options = $curl_options;
 		$this->use_curl = $use_curl;
 		$this->fetchWSDL($wsdl);
-    }
+	}
 
 	/**
 	 * fetches the WSDL document and parses it
@@ -92,28 +92,28 @@ 
 	public function fetchWSDL($wsdl) {
 		$this->debug("parse and process WSDL path=$wsdl");
 		$this->wsdl = $wsdl;
-        // parse wsdl file
-        if ($this->wsdl != "") {
-            $this->parseWSDL($this->wsdl);
-        }
-    	$imported_urls = array();
-    	$imported = 1;
-    	while ($imported > 0) {
-    		$imported = 0;
-    		// Schema imports
-    		foreach ($this->schemas as $ns => $list) {
-    			foreach ($list as $xs) {
+		// parse wsdl file
+		if ($this->wsdl != "") {
+			$this->parseWSDL($this->wsdl);
+		}
+		$imported_urls = array();
+		$imported = 1;
+		while ($imported > 0) {
+			$imported = 0;
+			// Schema imports
+			foreach ($this->schemas as $ns => $list) {
+				foreach ($list as $xs) {
 					$wsdlparts = parse_url($this->wsdl);	// this is bogusly simple!
-		            foreach ($xs->imports as $ns2 => $list2) {
-		                for ($ii = 0; $ii < count($list2); $ii++) {
-		                	if (! $list2[$ii]['loaded']) {
-		                		/*
+					foreach ($xs->imports as $ns2 => $list2) {
+						for ($ii = 0; $ii < count($list2); $ii++) {
+							if (! $list2[$ii]['loaded']) {
+								/*
 		                		 * Substituted with line below
 		                		 * because of error "Warning: attempt to modify property of non-object"
 		                		 * GitHub issue #1
 		                		 */
-		                		$list2[$ii]['loaded'] = true;
-		                		$url = $list2[$ii]['location'];
+								$list2[$ii]['loaded'] = true;
+								$url = $list2[$ii]['location'];
 								if ($url != '') {
 									$urlparts = parse_url($url);
 									if (!isset($urlparts['host'])) {
@@ -121,25 +121,25 @@ 
 												substr($wsdlparts['path'],0,strrpos($wsdlparts['path'],'/') + 1) .$urlparts['path'];
 									}
 									if (! in_array($url, $imported_urls)) {
-					                	$this->parseWSDL($url);
-				                		$imported++;
-				                		$imported_urls[] = $url;
-				                	}
+										$this->parseWSDL($url);
+										$imported++;
+										$imported_urls[] = $url;
+									}
 								} else {
 									$this->debug("Unexpected scenario: empty URL for unloaded import");
 								}
 							}
 						}
-		            } 
-    			}
-    		}
-    		// WSDL imports
+					} 
+				}
+			}
+			// WSDL imports
 			$wsdlparts = parse_url($this->wsdl);	// this is bogusly simple!
-            foreach ($this->import as $ns => $list) {
-                for ($ii = 0; $ii < count($list); $ii++) {
-                	if (! $list[$ii]['loaded']) {
-                		$this->import[$ns][$ii]['loaded'] = true;
-                		$url = $list[$ii]['location'];
+			foreach ($this->import as $ns => $list) {
+				for ($ii = 0; $ii < count($list); $ii++) {
+					if (! $list[$ii]['loaded']) {
+						$this->import[$ns][$ii]['loaded'] = true;
+						$url = $list[$ii]['location'];
 						if ($url != '') {
 							$urlparts = parse_url($url);
 							if (!isset($urlparts['host'])) {
@@ -147,70 +147,70 @@ 
 										substr($wsdlparts['path'],0,strrpos($wsdlparts['path'],'/') + 1) .$urlparts['path'];
 							}
 							if (! in_array($url, $imported_urls)) {
-			                	$this->parseWSDL($url);
-		                		$imported++;
-		                		$imported_urls[] = $url;
-		                	}
+								$this->parseWSDL($url);
+								$imported++;
+								$imported_urls[] = $url;
+							}
 						} else {
 							$this->debug("Unexpected scenario: empty URL for unloaded import");
 						}
 					}
 				}
-            } 
+			} 
 		}
-        // add new data to operation data
-        foreach($this->bindings as $binding => $bindingData) {
-            if (isset($bindingData['operations']) && is_array($bindingData['operations'])) {
-                foreach($bindingData['operations'] as $operation => $data) {
-                    $this->debug('post-parse data gathering for ' . $operation);
-                    $this->bindings[$binding]['operations'][$operation]['input'] = 
+		// add new data to operation data
+		foreach($this->bindings as $binding => $bindingData) {
+			if (isset($bindingData['operations']) && is_array($bindingData['operations'])) {
+				foreach($bindingData['operations'] as $operation => $data) {
+					$this->debug('post-parse data gathering for ' . $operation);
+					$this->bindings[$binding]['operations'][$operation]['input'] = 
 						isset($this->bindings[$binding]['operations'][$operation]['input']) ? 
 						array_merge($this->bindings[$binding]['operations'][$operation]['input'], $this->portTypes[ $bindingData['portType'] ][$operation]['input']) :
 						$this->portTypes[ $bindingData['portType'] ][$operation]['input'];
-                    $this->bindings[$binding]['operations'][$operation]['output'] = 
+					$this->bindings[$binding]['operations'][$operation]['output'] = 
 						isset($this->bindings[$binding]['operations'][$operation]['output']) ?
 						array_merge($this->bindings[$binding]['operations'][$operation]['output'], $this->portTypes[ $bindingData['portType'] ][$operation]['output']) :
 						$this->portTypes[ $bindingData['portType'] ][$operation]['output'];
-                    if(isset($this->messages[ $this->bindings[$binding]['operations'][$operation]['input']['message'] ])){
+					if(isset($this->messages[ $this->bindings[$binding]['operations'][$operation]['input']['message'] ])){
 						$this->bindings[$binding]['operations'][$operation]['input']['parts'] = $this->messages[ $this->bindings[$binding]['operations'][$operation]['input']['message'] ];
 					}
 					if(isset($this->messages[ $this->bindings[$binding]['operations'][$operation]['output']['message'] ])){
-                   		$this->bindings[$binding]['operations'][$operation]['output']['parts'] = $this->messages[ $this->bindings[$binding]['operations'][$operation]['output']['message'] ];
-                    }
-                    // Set operation style if necessary, but do not override one already provided
+				   		$this->bindings[$binding]['operations'][$operation]['output']['parts'] = $this->messages[ $this->bindings[$binding]['operations'][$operation]['output']['message'] ];
+					}
+					// Set operation style if necessary, but do not override one already provided
 					if (isset($bindingData['style']) && !isset($this->bindings[$binding]['operations'][$operation]['style'])) {
-                        $this->bindings[$binding]['operations'][$operation]['style'] = $bindingData['style'];
-                    }
-                    $this->bindings[$binding]['operations'][$operation]['transport'] = isset($bindingData['transport']) ? $bindingData['transport'] : '';
-                    $this->bindings[$binding]['operations'][$operation]['documentation'] = isset($this->portTypes[ $bindingData['portType'] ][$operation]['documentation']) ? $this->portTypes[ $bindingData['portType'] ][$operation]['documentation'] : '';
-                    $this->bindings[$binding]['operations'][$operation]['endpoint'] = isset($bindingData['endpoint']) ? $bindingData['endpoint'] : '';
-                } 
-            } 
-        }
+						$this->bindings[$binding]['operations'][$operation]['style'] = $bindingData['style'];
+					}
+					$this->bindings[$binding]['operations'][$operation]['transport'] = isset($bindingData['transport']) ? $bindingData['transport'] : '';
+					$this->bindings[$binding]['operations'][$operation]['documentation'] = isset($this->portTypes[ $bindingData['portType'] ][$operation]['documentation']) ? $this->portTypes[ $bindingData['portType'] ][$operation]['documentation'] : '';
+					$this->bindings[$binding]['operations'][$operation]['endpoint'] = isset($bindingData['endpoint']) ? $bindingData['endpoint'] : '';
+				} 
+			} 
+		}
 	}
 
-    /**
-     * parses the wsdl document
-     * 
-     * @param string $wsdl path or URL
-     * @access private 
-     */
-    public function parseWSDL($wsdl = '') {
+	/**
+	 * parses the wsdl document
+	 * 
+	 * @param string $wsdl path or URL
+	 * @access private 
+	 */
+	public function parseWSDL($wsdl = '') {
 		$this->debug("parse WSDL at path=$wsdl");
 
-        if ($wsdl == '') {
-            $this->debug('no wsdl passed to parseWSDL()!!');
-            $this->setError('no wsdl passed to parseWSDL()!!');
-            return false;
-        }
+		if ($wsdl == '') {
+			$this->debug('no wsdl passed to parseWSDL()!!');
+			$this->setError('no wsdl passed to parseWSDL()!!');
+			return false;
+		}
         
-        // parse $wsdl for url format
-        $wsdl_props = parse_url($wsdl);
+		// parse $wsdl for url format
+		$wsdl_props = parse_url($wsdl);
 
-        if (isset($wsdl_props['scheme']) && ($wsdl_props['scheme'] == 'http' || $wsdl_props['scheme'] == 'https')) {
-            $this->debug('getting WSDL http(s) URL ' . $wsdl);
-        	// get wsdl
-	        $tr = new soap_transport_http($wsdl, $this->curl_options, $this->use_curl);
+		if (isset($wsdl_props['scheme']) && ($wsdl_props['scheme'] == 'http' || $wsdl_props['scheme'] == 'https')) {
+			$this->debug('getting WSDL http(s) URL ' . $wsdl);
+			// get wsdl
+			$tr = new soap_transport_http($wsdl, $this->curl_options, $this->use_curl);
 			$tr->request_method = 'GET';
 			$tr->useSOAPAction = false;
 			if($this->proxyhost && $this->proxyport){
@@ -226,239 +226,239 @@ 
 			if($err = $tr->getError() ){
 				$errstr = 'Getting ' . $wsdl . ' - HTTP ERROR: '.$err;
 				$this->debug($errstr);
-	            $this->setError($errstr);
+				$this->setError($errstr);
 				unset($tr);
-	            return false;
+				return false;
 			}
 			unset($tr);
 			$this->debug("got WSDL URL");
-        } else {
-            // $wsdl is not http(s), so treat it as a file URL or plain file path
-        	if (isset($wsdl_props['scheme']) && ($wsdl_props['scheme'] == 'file') && isset($wsdl_props['path'])) {
-        		$path = isset($wsdl_props['host']) ? ($wsdl_props['host'] . ':' . $wsdl_props['path']) : $wsdl_props['path'];
-        	} else {
-        		$path = $wsdl;
-        	}
-            $this->debug('getting WSDL file ' . $path);
-            if ($fp = @fopen($path, 'r')) {
-                $wsdl_string = '';
-                while ($data = fread($fp, 32768)) {
-                    $wsdl_string .= $data;
-                } 
-                fclose($fp);
-            } else {
-            	$errstr = "Bad path to WSDL file $path";
-            	$this->debug($errstr);
-                $this->setError($errstr);
-                return false;
-            } 
-        }
-        $this->debug('Parse WSDL');
-        // end new code added
-        // Create an XML parser.
-        $this->parser = xml_parser_create(); 
-        // Set the options for parsing the XML data.
-        // xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1);
-        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.
-        xml_set_element_handler($this->parser, 'start_element', 'end_element');
-        xml_set_character_data_handler($this->parser, 'character_data');
-        // Parse the XML file.
-        if (!xml_parse($this->parser, $wsdl_string, true)) {
-            // Display an error message.
-            $errstr = sprintf(
+		} else {
+			// $wsdl is not http(s), so treat it as a file URL or plain file path
+			if (isset($wsdl_props['scheme']) && ($wsdl_props['scheme'] == 'file') && isset($wsdl_props['path'])) {
+				$path = isset($wsdl_props['host']) ? ($wsdl_props['host'] . ':' . $wsdl_props['path']) : $wsdl_props['path'];
+			} else {
+				$path = $wsdl;
+			}
+			$this->debug('getting WSDL file ' . $path);
+			if ($fp = @fopen($path, 'r')) {
+				$wsdl_string = '';
+				while ($data = fread($fp, 32768)) {
+					$wsdl_string .= $data;
+				} 
+				fclose($fp);
+			} else {
+				$errstr = "Bad path to WSDL file $path";
+				$this->debug($errstr);
+				$this->setError($errstr);
+				return false;
+			} 
+		}
+		$this->debug('Parse WSDL');
+		// end new code added
+		// Create an XML parser.
+		$this->parser = xml_parser_create(); 
+		// Set the options for parsing the XML data.
+		// xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1);
+		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.
+		xml_set_element_handler($this->parser, 'start_element', 'end_element');
+		xml_set_character_data_handler($this->parser, 'character_data');
+		// Parse the XML file.
+		if (!xml_parse($this->parser, $wsdl_string, true)) {
+			// Display an error message.
+			$errstr = sprintf(
 				'XML error parsing WSDL from %s on line %d: %s',
 				$wsdl,
-                xml_get_current_line_number($this->parser),
-                xml_error_string(xml_get_error_code($this->parser))
-                );
-            $this->debug($errstr);
+				xml_get_current_line_number($this->parser),
+				xml_error_string(xml_get_error_code($this->parser))
+				);
+			$this->debug($errstr);
 			$this->debug("XML payload:\n" . $wsdl_string);
-            $this->setError($errstr);
-            return false;
-        } 
+			$this->setError($errstr);
+			return false;
+		} 
 		// free the parser
-        xml_parser_free($this->parser);
-        $this->debug('Parsing WSDL done');
+		xml_parser_free($this->parser);
+		$this->debug('Parsing WSDL done');
 		// catch wsdl parse errors
 		if($this->getError()){
 			return false;
 		}
-        return true;
-    } 
+		return true;
+	} 
 
-    /**
-     * start-element handler
-     * 
-     * @param string $parser XML parser object
-     * @param string $name element name
-     * @param string $attrs associative array of attributes
-     * @access private 
-     */
-    public function start_element($parser, $name, $attrs)
-    {
-        if ($this->status == 'schema') {
-            $this->currentSchema->schemaStartElement($parser, $name, $attrs);
-            $this->appendDebug($this->currentSchema->getDebug());
-            $this->currentSchema->clearDebug();
-        } elseif (preg_match('/schema$/', $name)) {
-        	$this->debug('Parsing WSDL schema');
-            $this->status = 'schema';
-            $this->currentSchema = new nusoap_xmlschema('', '', $this->namespaces);
-            $this->currentSchema->schemaStartElement($parser, $name, $attrs);
-            $this->appendDebug($this->currentSchema->getDebug());
-            $this->currentSchema->clearDebug();
-        } else {
-            // 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' => ''); 
-            // process attributes
-            if (count($attrs) > 0) {
+	/**
+	 * start-element handler
+	 * 
+	 * @param string $parser XML parser object
+	 * @param string $name element name
+	 * @param string $attrs associative array of attributes
+	 * @access private 
+	 */
+	public function start_element($parser, $name, $attrs)
+	{
+		if ($this->status == 'schema') {
+			$this->currentSchema->schemaStartElement($parser, $name, $attrs);
+			$this->appendDebug($this->currentSchema->getDebug());
+			$this->currentSchema->clearDebug();
+		} elseif (preg_match('/schema$/', $name)) {
+			$this->debug('Parsing WSDL schema');
+			$this->status = 'schema';
+			$this->currentSchema = new nusoap_xmlschema('', '', $this->namespaces);
+			$this->currentSchema->schemaStartElement($parser, $name, $attrs);
+			$this->appendDebug($this->currentSchema->getDebug());
+			$this->currentSchema->clearDebug();
+		} else {
+			// 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' => ''); 
+			// process attributes
+			if (count($attrs) > 0) {
 				// register namespace declarations
-                foreach($attrs as $k => $v) {
-                    if (preg_match('/^xmlns/',$k)) {
-                        if ($ns_prefix = substr(strrchr($k, ':'), 1)) {
-                            $this->namespaces[$ns_prefix] = $v;
-                        } else {
-                            $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';
-                        } 
-                    }
-                }
-                // expand each attribute prefix to its namespace
-                foreach($attrs as $k => $v) {
-                    $k = strpos($k, ':') ? $this->expandQname($k) : $k;
-                    if ($k != 'location' && $k != 'soapAction' && $k != 'namespace') {
-                        $v = strpos($v, ':') ? $this->expandQname($v) : $v;
-                    } 
-                    $eAttrs[$k] = $v;
-                } 
-                $attrs = $eAttrs;
-            } else {
-                $attrs = array();
-            } 
-            // get element prefix, namespace and name
-            if (preg_match('/:/', $name)) {
-                // get ns prefix
-                $prefix = substr($name, 0, strpos($name, ':')); 
-                // get ns
-                $namespace = isset($this->namespaces[$prefix]) ? $this->namespaces[$prefix] : ''; 
-                // get unqualified name
-                $name = substr(strstr($name, ':'), 1);
-            } 
+				foreach($attrs as $k => $v) {
+					if (preg_match('/^xmlns/',$k)) {
+						if ($ns_prefix = substr(strrchr($k, ':'), 1)) {
+							$this->namespaces[$ns_prefix] = $v;
+						} else {
+							$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';
+						} 
+					}
+				}
+				// expand each attribute prefix to its namespace
+				foreach($attrs as $k => $v) {
+					$k = strpos($k, ':') ? $this->expandQname($k) : $k;
+					if ($k != 'location' && $k != 'soapAction' && $k != 'namespace') {
+						$v = strpos($v, ':') ? $this->expandQname($v) : $v;
+					} 
+					$eAttrs[$k] = $v;
+				} 
+				$attrs = $eAttrs;
+			} else {
+				$attrs = array();
+			} 
+			// get element prefix, namespace and name
+			if (preg_match('/:/', $name)) {
+				// get ns prefix
+				$prefix = substr($name, 0, strpos($name, ':')); 
+				// get ns
+				$namespace = isset($this->namespaces[$prefix]) ? $this->namespaces[$prefix] : ''; 
+				// get unqualified name
+				$name = substr(strstr($name, ':'), 1);
+			} 
 			// process attributes, expanding any prefixes to namespaces
-            // find status, register data
-            switch ($this->status) {
-                case 'message':
-                    if ($name == 'part') {
-			            if (isset($attrs['type'])) {
-		                    $this->debug("msg " . $this->currentMessage . ": found part (with type) $attrs[name]: " . implode(',', $attrs));
-		                    $this->messages[$this->currentMessage][$attrs['name']] = $attrs['type'];
-            			} 
-			            if (isset($attrs['element'])) {
-		                    $this->debug("msg " . $this->currentMessage . ": found part (with element) $attrs[name]: " . implode(',', $attrs));
-			                $this->messages[$this->currentMessage][$attrs['name']] = $attrs['element'] . '^';
-			            } 
-        			} 
-        			break;
-			    case 'portType':
-			        switch ($name) {
-			            case 'operation':
-			                $this->currentPortOperation = $attrs['name'];
-			                $this->debug("portType $this->currentPortType operation: $this->currentPortOperation");
-			                if (isset($attrs['parameterOrder'])) {
-			                	$this->portTypes[$this->currentPortType][$attrs['name']]['parameterOrder'] = $attrs['parameterOrder'];
-			        		} 
-			        		break;
-					    case 'documentation':
-					        $this->documentation = true;
-					        break; 
-					    // merge input/output data
-					    default:
-					        $m = isset($attrs['message']) ? $this->getLocalPart($attrs['message']) : '';
-					        $this->portTypes[$this->currentPortType][$this->currentPortOperation][$name]['message'] = $m;
-					        break;
+			// find status, register data
+			switch ($this->status) {
+				case 'message':
+					if ($name == 'part') {
+						if (isset($attrs['type'])) {
+							$this->debug("msg " . $this->currentMessage . ": found part (with type) $attrs[name]: " . implode(',', $attrs));
+							$this->messages[$this->currentMessage][$attrs['name']] = $attrs['type'];
+						} 
+						if (isset($attrs['element'])) {
+							$this->debug("msg " . $this->currentMessage . ": found part (with element) $attrs[name]: " . implode(',', $attrs));
+							$this->messages[$this->currentMessage][$attrs['name']] = $attrs['element'] . '^';
+						} 
 					} 
-			    	break;
+					break;
+				case 'portType':
+					switch ($name) {
+						case 'operation':
+							$this->currentPortOperation = $attrs['name'];
+							$this->debug("portType $this->currentPortType operation: $this->currentPortOperation");
+							if (isset($attrs['parameterOrder'])) {
+								$this->portTypes[$this->currentPortType][$attrs['name']]['parameterOrder'] = $attrs['parameterOrder'];
+							} 
+							break;
+						case 'documentation':
+							$this->documentation = true;
+							break; 
+						// merge input/output data
+						default:
+							$m = isset($attrs['message']) ? $this->getLocalPart($attrs['message']) : '';
+							$this->portTypes[$this->currentPortType][$this->currentPortOperation][$name]['message'] = $m;
+							break;
+					} 
+					break;
 				case 'binding':
-				    switch ($name) {
-				        case 'binding': 
-				            // get ns prefix
-				            if (isset($attrs['style'])) {
-				            $this->bindings[$this->currentBinding]['prefix'] = $prefix;
-					    	} 
-					    	$this->bindings[$this->currentBinding] = array_merge($this->bindings[$this->currentBinding], $attrs);
-					    	break;
+					switch ($name) {
+						case 'binding': 
+							// get ns prefix
+							if (isset($attrs['style'])) {
+							$this->bindings[$this->currentBinding]['prefix'] = $prefix;
+							} 
+							$this->bindings[$this->currentBinding] = array_merge($this->bindings[$this->currentBinding], $attrs);
+							break;
 						case 'header':
-						    $this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus]['headers'][] = $attrs;
-						    break;
+							$this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus]['headers'][] = $attrs;
+							break;
 						case 'operation':
-						    if (isset($attrs['soapAction'])) {
-						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['soapAction'] = $attrs['soapAction'];
-						    } 
-						    if (isset($attrs['style'])) {
-						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['style'] = $attrs['style'];
-						    } 
-						    if (isset($attrs['name'])) {
-						        $this->currentOperation = $attrs['name'];
-						        $this->debug("current binding operation: $this->currentOperation");
-						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['name'] = $attrs['name'];
-						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['binding'] = $this->currentBinding;
-						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['endpoint'] = isset($this->bindings[$this->currentBinding]['endpoint']) ? $this->bindings[$this->currentBinding]['endpoint'] : '';
-						    } 
-						    break;
+							if (isset($attrs['soapAction'])) {
+								$this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['soapAction'] = $attrs['soapAction'];
+							} 
+							if (isset($attrs['style'])) {
+								$this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['style'] = $attrs['style'];
+							} 
+							if (isset($attrs['name'])) {
+								$this->currentOperation = $attrs['name'];
+								$this->debug("current binding operation: $this->currentOperation");
+								$this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['name'] = $attrs['name'];
+								$this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['binding'] = $this->currentBinding;
+								$this->bindings[$this->currentBinding]['operations'][$this->currentOperation]['endpoint'] = isset($this->bindings[$this->currentBinding]['endpoint']) ? $this->bindings[$this->currentBinding]['endpoint'] : '';
+							} 
+							break;
 						case 'input':
-						    $this->opStatus = 'input';
-						    break;
+							$this->opStatus = 'input';
+							break;
 						case 'output':
-						    $this->opStatus = 'output';
-						    break;
+							$this->opStatus = 'output';
+							break;
 						case 'body':
-						    if (isset($this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus])) {
-						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus] = array_merge($this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus], $attrs);
-						    } else {
-						        $this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus] = $attrs;
-						    } 
-						    break;
+							if (isset($this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus])) {
+								$this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus] = array_merge($this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus], $attrs);
+							} else {
+								$this->bindings[$this->currentBinding]['operations'][$this->currentOperation][$this->opStatus] = $attrs;
+							} 
+							break;
 					} 
 					break;
 				case 'service':
 					switch ($name) {
-					    case 'port':
-					        $this->currentPort = $attrs['name'];
-					        $this->debug('current port: ' . $this->currentPort);
-					        $this->ports[$this->currentPort]['binding'] = $this->getLocalPart($attrs['binding']);
+						case 'port':
+							$this->currentPort = $attrs['name'];
+							$this->debug('current port: ' . $this->currentPort);
+							$this->ports[$this->currentPort]['binding'] = $this->getLocalPart($attrs['binding']);
 					
-					        break;
-					    case 'address':
-					        $this->ports[$this->currentPort]['location'] = $attrs['location'];
-					        $this->ports[$this->currentPort]['bindingType'] = $namespace;
-					        $this->bindings[ $this->ports[$this->currentPort]['binding'] ]['bindingType'] = $namespace;
-					        $this->bindings[ $this->ports[$this->currentPort]['binding'] ]['endpoint'] = $attrs['location'];
-					        break;
+							break;
+						case 'address':
+							$this->ports[$this->currentPort]['location'] = $attrs['location'];
+							$this->ports[$this->currentPort]['bindingType'] = $namespace;
+							$this->bindings[ $this->ports[$this->currentPort]['binding'] ]['bindingType'] = $namespace;
+							$this->bindings[ $this->ports[$this->currentPort]['binding'] ]['endpoint'] = $attrs['location'];
+							break;
 					} 
 					break;
 			} 
 		// set status
 		switch ($name) {
 			case 'import':
-			    if (isset($attrs['location'])) {
-                    $this->import[$attrs['namespace']][] = array('location' => $attrs['location'], 'loaded' => false);
-                    $this->debug('parsing import ' . $attrs['namespace']. ' - ' . $attrs['location'] . ' (' . count($this->import[$attrs['namespace']]).')');
+				if (isset($attrs['location'])) {
+					$this->import[$attrs['namespace']][] = array('location' => $attrs['location'], 'loaded' => false);
+					$this->debug('parsing import ' . $attrs['namespace']. ' - ' . $attrs['location'] . ' (' . count($this->import[$attrs['namespace']]).')');
 				} else {
-                    $this->import[$attrs['namespace']][] = array('location' => '', 'loaded' => true);
+					$this->import[$attrs['namespace']][] = array('location' => '', 'loaded' => true);
 					if (! $this->getPrefixFromNamespace($attrs['namespace'])) {
 						$this->namespaces['ns'.(count($this->namespaces)+1)] = $attrs['namespace'];
 					}
-                    $this->debug('parsing import ' . $attrs['namespace']. ' - [no location] (' . count($this->import[$attrs['namespace']]).')');
+					$this->debug('parsing import ' . $attrs['namespace']. ' - [no location] (' . count($this->import[$attrs['namespace']]).')');
 				}
 				break;
 			//wait for schema
@@ -479,9 +479,9 @@ 
 				if (isset($attrs['name'])) {
 				// get binding name
 					if (strpos($attrs['name'], ':')) {
-			    		$this->currentBinding = $this->getLocalPart($attrs['name']);
+						$this->currentBinding = $this->getLocalPart($attrs['name']);
 					} else {
-			    		$this->currentBinding = $attrs['name'];
+						$this->currentBinding = $attrs['name'];
 					} 
 					$this->status = 'binding';
 					$this->bindings[$this->currentBinding]['portType'] = $this->getLocalPart($attrs['type']);
@@ -503,20 +503,20 @@ 
 	} 
 
 	/**
-	* end-element handler
-	* 
-	* @param string $parser XML parser object
-	* @param string $name element name
-	* @access private 
-	*/
+	 * end-element handler
+	 * 
+	 * @param string $parser XML parser object
+	 * @param string $name element name
+	 * @access private 
+	 */
 	public function end_element($parser, $name){ 
 		// unset schema status
 		if (/*preg_match('/types$/', $name) ||*/ preg_match('/schema$/', $name)) {
 			$this->status = "";
-            $this->appendDebug($this->currentSchema->getDebug());
-            $this->currentSchema->clearDebug();
+			$this->appendDebug($this->currentSchema->getDebug());
+			$this->currentSchema->clearDebug();
 			$this->schemas[$this->currentSchema->schemaTargetNamespace][] = $this->currentSchema;
-        	$this->debug('Parsing WSDL schema done');
+			$this->debug('Parsing WSDL schema done');
 		} 
 		if ($this->status == 'schema') {
 			$this->currentSchema->schemaEndElement($parser, $name);
@@ -549,14 +549,14 @@ 
 	} 
 
 	/**
-	* if authenticating, set user credentials here
-	*
-	* @param    string $username
-	* @param    string $password
-	* @param	string $authtype (basic|digest|certificate|ntlm)
-	* @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
-	*/
+	 * if authenticating, set user credentials here
+	 *
+	 * @param    string $username
+	 * @param    string $password
+	 * @param	string $authtype (basic|digest|certificate|ntlm)
+	 * @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
+	 */
 	public function setCredentials($username, $password, $authtype = 'basic', $certRequest = array()) {
 		$this->debug("setCredentials username=$username authtype=$authtype certRequest=");
 		$this->appendDebug($this->varDump($certRequest));
@@ -636,7 +636,7 @@ 
 					// note that we could/should also check the namespace here
 					if ($operation == $bOperation) {
 						$opData = $this->bindings[ $portData['binding'] ]['operations'][$operation];
-					    return $opData;
+						return $opData;
 					} 
 				} 
 			}
@@ -664,7 +664,7 @@ 
 				// loop through operations for the binding
 				foreach ($this->bindings[ $portData['binding'] ]['operations'] as $bOperation => $opData) {
 					if ($opData['soapAction'] == $soapAction) {
-					    return $opData;
+						return $opData;
 					} 
 				} 
 			}
@@ -672,23 +672,23 @@ 
 	}
 	
 	/**
-    * returns an array of information about a given type
-    * returns false if no type exists by the given name
-    *
-	*	 typeDef = array(
-	*	 'elements' => array(), // refs to elements array
-	*	'restrictionBase' => '',
-	*	'phpType' => '',
-	*	'order' => '(sequence|all)',
-	*	'attrs' => array() // refs to attributes array
-	*	)
-    *
-    * @param string $type the type
-    * @param string $ns namespace (not prefix) of the type
-    * @return mixed
-    * @access public
-    * @see nusoap_xmlschema
-    */
+	 * returns an array of information about a given type
+	 * returns false if no type exists by the given name
+	 *
+	 *	 typeDef = array(
+	 *	 'elements' => array(), // refs to elements array
+	 *	'restrictionBase' => '',
+	 *	'phpType' => '',
+	 *	'order' => '(sequence|all)',
+	 *	'attrs' => array() // refs to attributes array
+	 *	)
+	 *
+	 * @param string $type the type
+	 * @param string $ns namespace (not prefix) of the type
+	 * @return mixed
+	 * @access public
+	 * @see nusoap_xmlschema
+	 */
 	public function getTypeDef($type, $ns) {
 		$this->debug("in getTypeDef: type=$type, ns=$ns");
 		if ((! $ns) && isset($this->namespaces['tns'])) {
@@ -744,13 +744,13 @@ 
 		return false;
 	}
 
-    /**
-    * prints html description of services
-    *
-    * @access private
-    */
-    public function webDescription(){
-    	global $HTTP_SERVER_VARS;
+	/**
+	 * prints html description of services
+	 *
+	 * @access private
+	 */
+	public function webDescription(){
+		global $HTTP_SERVER_VARS;
 
 		if (isset($_SERVER)) {
 			$PHP_SELF = $_SERVER['PHP_SELF'];
@@ -844,29 +844,29 @@ 
 				Click on an operation name to view it&apos;s details.</p>
 				<ul>';
 				foreach($this->getOperations() as $op => $data){
-				    $b .= "<li><a href='#' onclick=\"popout();popup('$op')\">$op</a></li>";
-				    // create hidden div
-				    $b .= "<div id='$op' class='hidden'>
+					$b .= "<li><a href='#' onclick=\"popout();popup('$op')\">$op</a></li>";
+					// create hidden div
+					$b .= "<div id='$op' class='hidden'>
 				    <a href='#' onclick='popout()'><font color='#ffffff'>Close</font></a><br><br>";
-				    foreach($data as $donnie => $marie){ // loop through opdata
+					foreach($data as $donnie => $marie){ // loop through opdata
 						if($donnie == 'input' || $donnie == 'output'){ // show input/output data
-						    $b .= "<font color='white'>".ucfirst($donnie).':</font><br>';
-						    foreach($marie as $captain => $tenille){ // loop through data
+							$b .= "<font color='white'>".ucfirst($donnie).':</font><br>';
+							foreach($marie as $captain => $tenille){ // loop through data
 								if($captain == 'parts'){ // loop thru parts
-								    $b .= "&nbsp;&nbsp;$captain:<br>";
-					                //if(is_array($tenille)){
-								    	foreach($tenille as $joanie => $chachi){
+									$b .= "&nbsp;&nbsp;$captain:<br>";
+									//if(is_array($tenille)){
+										foreach($tenille as $joanie => $chachi){
 											$b .= "&nbsp;&nbsp;&nbsp;&nbsp;$joanie: $chachi<br>";
-								    	}
-					        		//}
+										}
+									//}
 								} else {
-								    $b .= "&nbsp;&nbsp;$captain: $tenille<br>";
+									$b .= "&nbsp;&nbsp;$captain: $tenille<br>";
 								}
-						    }
+							}
 						} else {
-						    $b .= "<font color='white'>".ucfirst($donnie).":</font> $marie<br>";
+							$b .= "<font color='white'>".ucfirst($donnie).":</font> $marie<br>";
 						}
-				    }
+					}
 					$b .= '</div>';
 				}
 				$b .= '
@@ -874,15 +874,15 @@ 
 			</div>
 		</div></body></html>';
 		return $b;
-    }
+	}
 
 	/**
-	* serialize the parsed wsdl
-	*
-	* @param mixed $debug whether to put debug=1 in endpoint URL
-	* @return string serialization of WSDL
-	* @access public 
-	*/
+	 * serialize the parsed wsdl
+	 *
+	 * @param mixed $debug whether to put debug=1 in endpoint URL
+	 * @return string serialization of WSDL
+	 * @access public 
+	 */
 	public function serialize($debug = 0)
 	{
 		$xml = '<?xml version="1.0" encoding="ISO-8859-1"?>';
@@ -928,19 +928,19 @@ 
 					foreach($msgParts as $partName => $partType) {
 						// print 'serializing '.$partType.', sv: '.$this->XMLSchemaVersion.'<br>';
 						if (strpos($partType, ':')) {
-						    $typePrefix = $this->getPrefixFromNamespace($this->getPrefix($partType));
+							$typePrefix = $this->getPrefixFromNamespace($this->getPrefix($partType));
 						} elseif (isset($this->typemap[$this->namespaces['xsd']][$partType])) {
-						    // print 'checking typemap: '.$this->XMLSchemaVersion.'<br>';
-						    $typePrefix = 'xsd';
+							// print 'checking typemap: '.$this->XMLSchemaVersion.'<br>';
+							$typePrefix = 'xsd';
 						} else {
-						    foreach($this->typemap as $ns => $types) {
-						        if (isset($types[$partType])) {
-						            $typePrefix = $this->getPrefixFromNamespace($ns);
-						        } 
-						    } 
-						    if (!isset($typePrefix)) {
-						        die("$partType has no namespace!");
-						    } 
+							foreach($this->typemap as $ns => $types) {
+								if (isset($types[$partType])) {
+									$typePrefix = $this->getPrefixFromNamespace($ns);
+								} 
+							} 
+							if (!isset($typePrefix)) {
+								die("$partType has no namespace!");
+							} 
 						}
 						$ns = $this->getNamespaceFromPrefix($typePrefix);
 						$localPart = $this->getLocalPart($partType);
@@ -985,7 +985,7 @@ 
 					$binding_xml .= "\n" . '  </operation>';
 					$portType_xml .= "\n" . '  <operation name="' . $opParts['name'] . '"';
 					if (isset($opParts['parameterOrder'])) {
-					    $portType_xml .= ' parameterOrder="' . $opParts['parameterOrder'] . '"';
+						$portType_xml .= ' parameterOrder="' . $opParts['parameterOrder'] . '"';
 					} 
 					$portType_xml .= '>';
 					if(isset($opParts['documentation']) && $opParts['documentation'] != '') {
@@ -1280,34 +1280,34 @@ 
 		}
 
 		// if a soapval has been supplied, let its type override the WSDL
-    	if (is_object($value) && get_class($value) == 'soapval') {
-    		if ($value->type_ns) {
-    			$type = $value->type_ns . ':' . $value->type;
-		    	$forceType = true;
-		    	$this->debug("in serializeType: soapval overrides type to $type");
-    		} elseif ($value->type) {
-	    		$type = $value->type;
-		    	$forceType = true;
-		    	$this->debug("in serializeType: soapval overrides type to $type");
-	    	} else {
-	    		$forceType = false;
-		    	$this->debug("in serializeType: soapval does not override type");
-	    	}
-	    	$attrs = $value->attributes;
-	    	$value = $value->value;
-	    	$this->debug("in serializeType: soapval overrides value to $value");
-	    	if ($attrs) {
-	    		if (!is_array($value)) {
-	    			$value['!'] = $value;
-	    		}
-	    		foreach ($attrs as $n => $v) {
-	    			$value['!' . $n] = $v;
-	    		}
-		    	$this->debug("in serializeType: soapval provides attributes");
-		    }
-        } else {
-        	$forceType = false;
-        }
+		if (is_object($value) && get_class($value) == 'soapval') {
+			if ($value->type_ns) {
+				$type = $value->type_ns . ':' . $value->type;
+				$forceType = true;
+				$this->debug("in serializeType: soapval overrides type to $type");
+			} elseif ($value->type) {
+				$type = $value->type;
+				$forceType = true;
+				$this->debug("in serializeType: soapval overrides type to $type");
+			} else {
+				$forceType = false;
+				$this->debug("in serializeType: soapval does not override type");
+			}
+			$attrs = $value->attributes;
+			$value = $value->value;
+			$this->debug("in serializeType: soapval overrides value to $value");
+			if ($attrs) {
+				if (!is_array($value)) {
+					$value['!'] = $value;
+				}
+				foreach ($attrs as $n => $v) {
+					$value['!' . $n] = $v;
+				}
+				$this->debug("in serializeType: soapval provides attributes");
+			}
+		} else {
+			$forceType = false;
+		}
 
 		$xml = '';
 		if (strpos($type, ':')) {
@@ -1339,8 +1339,8 @@ 
 					// JBoss/Axis does this sometimes
 					return $this->serialize_val($value, $name, false, false, false, false, $use);
 				}
-		    	if ($uqType == 'boolean') {
-		    		if ((is_string($value) && $value == 'false') || (! $value)) {
+				if ($uqType == 'boolean') {
+					if ((is_string($value) && $value == 'false') || (! $value)) {
 						$value = 'false';
 					} else {
 						$value = 'true';
@@ -1523,9 +1523,9 @@ 
 					$this->debug("serializing array element: $k, $v of type: $typeDef[arrayType]");
 					//if (strpos($typeDef['arrayType'], ':') ) {
 					if (!in_array($typeDef['arrayType'],$this->typemap['http://www.w3.org/2001/XMLSchema'])) {
-					    $contents .= $this->serializeType('item', $typeDef['arrayType'], $v, $use);
+						$contents .= $this->serializeType('item', $typeDef['arrayType'], $v, $use);
 					} else {
-					    $contents .= $this->serialize_val($v, 'item', $typeDef['arrayType'], null, $this->XMLSchemaVersion, false, $use);
+						$contents .= $this->serialize_val($v, 'item', $typeDef['arrayType'], null, $this->XMLSchemaVersion, false, $use);
 					} 
 				}
 			} else {
@@ -1681,7 +1681,7 @@ 
 				}
 				// if user took advantage of a minOccurs=0, then only serialize named parameters
 				if (isset($optionals)
-				    && (!isset($xvalue[$eName])) 
+					&& (!isset($xvalue[$eName])) 
 					&& ( (!isset($attrs['nillable'])) || $attrs['nillable'] != 'true')
 					){
 					if (isset($attrs['minOccurs']) && $attrs['minOccurs'] <> '0') {
@@ -1692,9 +1692,9 @@ 
 				} else {
 					// get value
 					if (isset($xvalue[$eName])) {
-					    $v = $xvalue[$eName];
+						$v = $xvalue[$eName];
 					} else {
-					    $v = null;
+						$v = null;
 					}
 					if (isset($attrs['form'])) {
 						$unqualified = ($attrs['form'] == 'unqualified');
@@ -1706,24 +1706,24 @@ 
 						foreach ($vv as $k => $v) {
 							if (isset($attrs['type']) || isset($attrs['ref'])) {
 								// serialize schema-defined type
-							    $xml .= $this->serializeType($eName, isset($attrs['type']) ? $attrs['type'] : $attrs['ref'], $v, $use, $encodingStyle, $unqualified);
+								$xml .= $this->serializeType($eName, isset($attrs['type']) ? $attrs['type'] : $attrs['ref'], $v, $use, $encodingStyle, $unqualified);
 							} else {
 								// serialize generic type (can this ever really happen?)
-							    $this->debug("calling serialize_val() for $v, $eName, false, false, false, false, $use");
-							    $xml .= $this->serialize_val($v, $eName, false, false, false, false, $use);
+								$this->debug("calling serialize_val() for $v, $eName, false, false, false, false, $use");
+								$xml .= $this->serialize_val($v, $eName, false, false, false, false, $use);
 							}
 						}
 					} else {
 						if (is_null($v) && isset($attrs['minOccurs']) && $attrs['minOccurs'] == '0') {
 						} elseif (is_null($v) && isset($attrs['nillable']) && $attrs['nillable'] == 'true') {
-						    $xml .= $this->serializeType($eName, isset($attrs['type']) ? $attrs['type'] : $attrs['ref'], $v, $use, $encodingStyle, $unqualified);
+							$xml .= $this->serializeType($eName, isset($attrs['type']) ? $attrs['type'] : $attrs['ref'], $v, $use, $encodingStyle, $unqualified);
 						} elseif (isset($attrs['type']) || isset($attrs['ref'])) {
 							// serialize schema-defined type
-						    $xml .= $this->serializeType($eName, isset($attrs['type']) ? $attrs['type'] : $attrs['ref'], $v, $use, $encodingStyle, $unqualified);
+							$xml .= $this->serializeType($eName, isset($attrs['type']) ? $attrs['type'] : $attrs['ref'], $v, $use, $encodingStyle, $unqualified);
 						} else {
 							// serialize generic type (can this ever really happen?)
-						    $this->debug("calling serialize_val() for $v, $eName, false, false, false, false, $use");
-						    $xml .= $this->serialize_val($v, $eName, false, false, false, false, $use);
+							$this->debug("calling serialize_val() for $v, $eName, false, false, false, false, $use");
+							$xml .= $this->serialize_val($v, $eName, false, false, false, false, $use);
 						}
 					}
 				}
@@ -1735,46 +1735,46 @@ 
 	}
 
 	/**
-	* adds an XML Schema complex type to the WSDL types
-	*
-	* @param string	$name
-	* @param string $typeClass (complexType|simpleType|attribute)
-	* @param string $phpType currently supported are array and struct (php assoc array)
-	* @param string $compositor (all|sequence|choice)
-	* @param string $restrictionBase namespace:name (http://schemas.xmlsoap.org/soap/encoding/:Array)
-	* @param array $elements e.g. array ( name => array(name=>'',type=>'') )
-	* @param array $attrs e.g. array(array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType'=>'xsd:string[]'))
-	* @param string $arrayType as namespace:name (xsd:string)
-	* @see nusoap_xmlschema
-	* @access public
-	*/
+	 * adds an XML Schema complex type to the WSDL types
+	 *
+	 * @param string	$name
+	 * @param string $typeClass (complexType|simpleType|attribute)
+	 * @param string $phpType currently supported are array and struct (php assoc array)
+	 * @param string $compositor (all|sequence|choice)
+	 * @param string $restrictionBase namespace:name (http://schemas.xmlsoap.org/soap/encoding/:Array)
+	 * @param array $elements e.g. array ( name => array(name=>'',type=>'') )
+	 * @param array $attrs e.g. array(array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType'=>'xsd:string[]'))
+	 * @param string $arrayType as namespace:name (xsd:string)
+	 * @see nusoap_xmlschema
+	 * @access public
+	 */
 	public function addComplexType($name,$typeClass='complexType',$phpType='array',$compositor='',$restrictionBase='',$elements=array(),$attrs=array(),$arrayType='') {
 		if (count($elements) > 0) {
 			$eElements = array();
-	    	foreach($elements as $n => $e){
-	            // expand each element
-	            $ee = array();
-	            foreach ($e as $k => $v) {
-		            $k = strpos($k,':') ? $this->expandQname($k) : $k;
-		            $v = strpos($v,':') ? $this->expandQname($v) : $v;
-		            $ee[$k] = $v;
-		    	}
-	    		$eElements[$n] = $ee;
-	    	}
-	    	$elements = $eElements;
+			foreach($elements as $n => $e){
+				// expand each element
+				$ee = array();
+				foreach ($e as $k => $v) {
+					$k = strpos($k,':') ? $this->expandQname($k) : $k;
+					$v = strpos($v,':') ? $this->expandQname($v) : $v;
+					$ee[$k] = $v;
+				}
+				$eElements[$n] = $ee;
+			}
+			$elements = $eElements;
 		}
 		
 		if (count($attrs) > 0) {
-	    	foreach($attrs as $n => $a){
-	            // expand each attribute
-	            foreach ($a as $k => $v) {
-		            $k = strpos($k,':') ? $this->expandQname($k) : $k;
-		            $v = strpos($v,':') ? $this->expandQname($v) : $v;
-		            $aa[$k] = $v;
-		    	}
-	    		$eAttrs[$n] = $aa;
-	    	}
-	    	$attrs = $eAttrs;
+			foreach($attrs as $n => $a){
+				// expand each attribute
+				foreach ($a as $k => $v) {
+					$k = strpos($k,':') ? $this->expandQname($k) : $k;
+					$v = strpos($v,':') ? $this->expandQname($v) : $v;
+					$aa[$k] = $v;
+				}
+				$eAttrs[$n] = $aa;
+			}
+			$attrs = $eAttrs;
 		}
 
 		$restrictionBase = strpos($restrictionBase,':') ? $this->expandQname($restrictionBase) : $restrictionBase;
@@ -1785,16 +1785,16 @@ 
 	}
 
 	/**
-	* adds an XML Schema simple type to the WSDL types
-	*
-	* @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
-	* @see nusoap_xmlschema
-	* @access public
-	*/
+	 * adds an XML Schema simple type to the WSDL types
+	 *
+	 * @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
+	 * @see nusoap_xmlschema
+	 * @access public
+	 */
 	public function addSimpleType($name, $restrictionBase='', $typeClass='simpleType', $phpType='scalar', $enumeration=array()) {
 		$restrictionBase = strpos($restrictionBase,':') ? $this->expandQname($restrictionBase) : $restrictionBase;
 
@@ -1803,31 +1803,31 @@ 
 	}
 
 	/**
-	* adds an element to the WSDL types
-	*
-	* @param array $attrs attributes that must include name and type
-	* @see nusoap_xmlschema
-	* @access public
-	*/
+	 * adds an element to the WSDL types
+	 *
+	 * @param array $attrs attributes that must include name and type
+	 * @see nusoap_xmlschema
+	 * @access public
+	 */
 	public function addElement($attrs) {
 		$typens = isset($this->namespaces['types']) ? $this->namespaces['types'] : $this->namespaces['tns'];
 		$this->schemas[$typens][0]->addElement($attrs);
 	}
 
 	/**
-	* register an operation with the server
-	* 
-	* @param string $name operation (method) name
-	* @param array $in assoc array of input values: key = param name, value = param type
-	* @param array $out assoc array of output values: key = param name, value = param type
-	* @param string $namespace optional The namespace for the operation
-	* @param string $soapaction optional The soapaction for the operation
-	* @param string $style (rpc|document) optional The style for the operation Note: when 'document' is specified, parameter and return wrappers are created for you automatically
-	* @param string $use (encoded|literal) optional The use for the parameters (cannot mix right now)
-	* @param string $documentation optional The description to include in the WSDL
-	* @param string $encodingStyle optional (usually 'http://schemas.xmlsoap.org/soap/encoding/' for encoded)
-	* @access public 
-	*/
+	 * register an operation with the server
+	 * 
+	 * @param string $name operation (method) name
+	 * @param array $in assoc array of input values: key = param name, value = param type
+	 * @param array $out assoc array of output values: key = param name, value = param type
+	 * @param string $namespace optional The namespace for the operation
+	 * @param string $soapaction optional The soapaction for the operation
+	 * @param string $style (rpc|document) optional The style for the operation Note: when 'document' is specified, parameter and return wrappers are created for you automatically
+	 * @param string $use (encoded|literal) optional The use for the parameters (cannot mix right now)
+	 * @param string $documentation optional The description to include in the WSDL
+	 * @param string $encodingStyle optional (usually 'http://schemas.xmlsoap.org/soap/encoding/' for encoded)
+	 * @access public 
+	 */
 	public function addOperation($name, $in = false, $out = false, $namespace = false, $soapaction = false, $style = 'rpc', $use = 'encoded', $documentation = '', $encodingStyle = ''){
 		if ($use == 'encoded' && $encodingStyle == '') {
 			$encodingStyle = 'http://schemas.xmlsoap.org/soap/encoding/';
@@ -1886,8 +1886,8 @@ 
 				$this->messages[$name.'Request'][$pName] = $pType;
 			}
 		} else {
-            $this->messages[$name.'Request']= '0';
-        }
+			$this->messages[$name.'Request']= '0';
+		}
 		if($out)
 		{
 			foreach($out as $pName => $pType)
@@ -1898,8 +1898,8 @@ 
 				$this->messages[$name.'Response'][$pName] = $pType;
 			}
 		} else {
-            $this->messages[$name.'Response']= '0';
-        }
+			$this->messages[$name.'Response']= '0';
+		}
 		return true;
 	} 
 }

libraries/nusoap/class.nusoap_base.php

Indentation +244 added lines, -244 removed lines

@@ -104,21 +104,21 @@ 
 	 * @access private
 	 */
 	var $revision = '$Revision: 1.57 $';
-    /**
-     * Current error string (manipulated by getError/setError)
+	/**
+	 * Current error string (manipulated by getError/setError)
 	 *
 	 * @var string
 	 * @access private
 	 */
 	var $error_str = '';
-    /**
-     * Current debug string (manipulated by debug/appendDebug/clearDebug/getDebug/getDebugAsXMLComment)
+	/**
+	 * Current debug string (manipulated by debug/appendDebug/clearDebug/getDebug/getDebugAsXMLComment)
 	 *
 	 * @var string
 	 * @access private
 	 */
-    var $debug_str = '';
-    /**
+	var $debug_str = '';
+	/**
 	 * toggles automatic encoding of special characters as entities
 	 * (should always be true, I think)
 	 *
@@ -134,31 +134,31 @@ 
 	 */
 	var $debugLevel;
 
-    /**
-	* set schema version
-	*
-	* @var      string
-	* @access   public
-	*/
+	/**
+	 * 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 = 'UTF-8';
+	/**
+	 * charset encoding for outgoing messages
+	 *
+	 * @var      string
+	 * @access   public
+	 */
+	var $soap_defencoding = 'UTF-8';
 	//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
-	*/
+	 * 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',
@@ -167,20 +167,20 @@ 
 		);
 
 	/**
-	* namespaces used in the current context, e.g. during serialization
-	*
-	* @var      array
-	* @access   private
-	*/
+	 * 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
-	*/
+	 * 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',
@@ -203,75 +203,75 @@ 
 		'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')
+	'http://xml.apache.org/xml-soap' => array('Map')
 	);
 
 	/**
-	* XML entities to convert
-	*
-	* @var      array
-	* @access   public
-	* @deprecated
-	* @see	expandEntities
-	*/
+	 * XML entities to convert
+	 *
+	 * @var      array
+	 * @access   public
+	 * @deprecated
+	 * @see	expandEntities
+	 */
 	var $xmlEntities = array('quot' => '"','amp' => '&',
 		'lt' => '<','gt' => '>','apos' => "'");
 
 	/**
-	* constructor
-	*
-	* @access	public
-	*/
+	 * constructor
+	 *
+	 * @access	public
+	 */
 	public function nusoap_base() {
 		$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
-	*/
+	 * gets the global debug level, which applies to future instances
+	 *
+	 * @return	integer	Debug level 0-9, where 0 turns off
+	 * @access	public
+	 */
 	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
-	*/
+	 * sets the global debug level, which applies to future instances
+	 *
+	 * @param	int	$level	Debug level 0-9, where 0 turns off
+	 * @access	public
+	 */
 	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
-	*/
+	 * gets the debug level for this instance
+	 *
+	 * @return	int	Debug level 0-9, where 0 turns off
+	 * @access	public
+	 */
 	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
-	*/
+	 * sets the debug level for this instance
+	 *
+	 * @param	int	$level	Debug level 0-9, where 0 turns off
+	 * @access	public
+	 */
 	public function setDebugLevel($level) {
 		$this->debugLevel = $level;
 	}
 
 	/**
-	* adds debug data to the instance debug string with formatting
-	*
-	* @param    string $string debug data
-	* @access   private
-	*/
+	 * adds debug data to the instance debug string with formatting
+	 *
+	 * @param    string $string debug data
+	 * @access   private
+	 */
 	public function debug($string){
 		if ($this->debugLevel > 0) {
 			$this->appendDebug($this->getmicrotime().' '.get_class($this).": $string\n");
@@ -279,11 +279,11 @@ 
 	}
 
 	/**
-	* adds debug data to the instance debug string without formatting
-	*
-	* @param    string $string debug data
-	* @access   public
-	*/
+	 * adds debug data to the instance debug string without formatting
+	 *
+	 * @param    string $string debug data
+	 * @access   public
+	 */
 	public function appendDebug($string){
 		if ($this->debugLevel > 0) {
 			// it would be nice to use a memory stream here to use
@@ -293,10 +293,10 @@ 
 	}
 
 	/**
-	* clears the current debug data for this instance
-	*
-	* @access   public
-	*/
+	 * clears the current debug data for this instance
+	 *
+	 * @access   public
+	 */
 	public function clearDebug() {
 		// it would be nice to use a memory stream here to use
 		// memory more efficiently
@@ -304,11 +304,11 @@ 
 	}
 
 	/**
-	* gets the current debug data for this instance
-	*
-	* @return   debug data
-	* @access   public
-	*/
+	 * gets the current debug data for this instance
+	 *
+	 * @return   debug data
+	 * @access   public
+	 */
 	public function &getDebug() {
 		// it would be nice to use a memory stream here to use
 		// memory more efficiently
@@ -316,12 +316,12 @@ 
 	}
 
 	/**
-	* 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
-	*/
+	 * 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
+	 */
 	public function &getDebugAsXMLComment() {
 		// it would be nice to use a memory stream here to use
 		// memory more efficiently
@@ -329,32 +329,32 @@ 
 			$this->debug_str = str_replace('--', '- -', $this->debug_str);
 		}
 		$ret = "<!--\n" . $this->debug_str . "\n-->";
-    	return $ret;
+		return $ret;
 	}
 
 	/**
-	* expands entities, e.g. changes '<' to '&lt;'.
-	*
-	* @param	string	$val	The string in which to expand entities.
-	* @access	private
-	*/
+	 * expands entities, e.g. changes '<' to '&lt;'.
+	 *
+	 * @param	string	$val	The string in which to expand entities.
+	 * @access	private
+	 */
 	public 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;
+			$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
-	*/
+	 * returns error string if present
+	 *
+	 * @return   mixed error string or false
+	 * @access   public
+	 */
 	public function getError(){
 		if($this->error_str != ''){
 			return $this->error_str;
@@ -363,24 +363,24 @@ 
 	}
 
 	/**
-	* sets error string
-	*
-	* @return   boolean $string error string
-	* @access   private
-	*/
+	 * sets error string
+	 *
+	 * @return   boolean $string error string
+	 * @access   private
+	 */
 	public 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
-	*/
+	 * detect if array is a simple array or a struct (associative array)
+	 *
+	 * @param	mixed	$val	The PHP array
+	 * @return	string	(arraySimple|arrayStruct)
+	 * @access	private
+	 */
 	public function isArraySimpleOrStruct($val) {
-        $keyList = array_keys($val);
+		$keyList = array_keys($val);
 		foreach ($keyList as $keyListValue) {
 			if (!is_int($keyListValue)) {
 				return 'arrayStruct';
@@ -390,33 +390,33 @@ 
 	}
 
 	/**
-	* 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
-	*/
+	 * 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
+	 */
 	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);
+		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;
@@ -425,7 +425,7 @@ 
 		}
 		// if name has ns, add ns prefix to name
 		$xmlns = '';
-        if($name_ns){
+		if($name_ns){
 			$prefix = 'nu'.rand(1000,9999);
 			$name = $prefix.':'.$name;
 			$xmlns .= " xmlns:$prefix=\"$name_ns\"";
@@ -433,7 +433,7 @@ 
 		// 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
+			// w/o checking against typemap
 			$type_prefix = 'xsd';
 		} elseif($type_ns){
 			$type_prefix = 'ns'.rand(1000,9999);
@@ -448,12 +448,12 @@ 
 		}
 		// serialize null value
 		if (is_null($val)) {
-    		$this->debug("serialize_val: serialize null");
+			$this->debug("serialize_val: serialize null");
 			if ($use == 'literal') {
 				$xml = "<$name$xmlns$atts/>";
 				$this->debug("serialize_val returning $xml");
-	        	return $xml;
-        	} else {
+				return $xml;
+			} else {
 				if (isset($type) && isset($type_prefix)) {
 					$type_str = " xsi:type=\"$type_prefix:$type\"";
 				} else {
@@ -461,41 +461,41 @@ 
 				}
 				$xml = "<$name$xmlns$type_str$atts xsi:nil=\"true\"/>";
 				$this->debug("serialize_val returning $xml");
-	        	return $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;
-	        	}
+		// 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 {
+				return $xml;
+			} else {
 				$xml = "<$name$xmlns xsi:type=\"xsd:$type\"$atts>$val</$name>";
 				$this->debug("serialize_val returning $xml");
-	        	return $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 ($type == 'boolean') {
+					$val = $val ? 'true' : 'false';
+				} elseif (! $val) {
+					$val = 0;
+				}
 				if ($use == 'literal') {
 					$xml .= "<$name$xmlns$atts>$val</$name>";
 				} else {
@@ -529,12 +529,12 @@ 
 				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);
+				if (get_class($val) == 'soapval') {
+					$this->debug("serialize_val: serialize soapval object");
+					$pXml = $val->serialize($use);
 					$this->appendDebug($val->getDebug());
 					$val->clearDebug();
-		        } else {
+				} else {
 					if (! $name) {
 						$name = get_class($val);
 						$this->debug("In serialize_val, used class name $name as element name");
@@ -560,19 +560,19 @@ 
 			case (is_array($val) || $type):
 				// detect if struct or array
 				$valueType = $this->isArraySimpleOrStruct($val);
-                if($valueType=='arraySimple' || preg_match('/^ArrayOf/',$type)){
+				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'){
+							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;
 							$xml .= $this->serialize_val($v,'item',false,false,false,false,$use);
 							++$i;
@@ -655,19 +655,19 @@ 
 		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
-    */
-    public function serializeEnvelope($body,$headers=false,$namespaces=array(),$style='rpc',$use='encoded',$encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'){
+	/**
+	 * 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
+	 */
+	public function serializeEnvelope($body,$headers=false,$namespaces=array(),$style='rpc',$use='encoded',$encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'){
 
 	$this->debug("In serializeEnvelope length=" . strlen($body) . " body (max 1000 characters)=" . substr($body, 0, 1000) . " style=$style use=$use encodingStyle=$encodingStyle");
 	$this->debug("headers:");
@@ -676,7 +676,7 @@ 
 	$this->appendDebug($this->varDump($namespaces));
 
 	// serialize namespaces
-    $ns_string = '';
+	$ns_string = '';
 	foreach(array_merge($this->namespaces,$namespaces) as $k => $v){
 		$ns_string .= " xmlns:$k=\"$v\"";
 	}
@@ -709,7 +709,7 @@ 
 		$body.
 	"</SOAP-ENV:Body>".
 	"</SOAP-ENV:Envelope>";
-    }
+	}
 
 	/**
 	 * formats a string to be inserted into an HTML stream
@@ -719,18 +719,18 @@ 
 	 * @access public
 	 * @deprecated
 	 */
-    public function formatDump($str){
+	public 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
-	*/
+	 * contracts (changes namespace to prefix) a qualified name
+	 *
+	 * @param    string $qname qname
+	 * @return	string contracted qname
+	 * @access   private
+	 */
 	public function contractQname($qname){
 		// get element namespace
 		if (strrpos($qname, ':')) {
@@ -749,12 +749,12 @@ 
 	}
 
 	/**
-	* expands (changes prefix to namespace) a qualified name
-	*
-	* @param    string $qname qname
-	* @return	string expanded qname
-	* @access   private
-	*/
+	 * expands (changes prefix to namespace) a qualified name
+	 *
+	 * @param    string $qname qname
+	 * @return	string expanded qname
+	 * @access   private
+	 */
 	public function expandQname($qname){
 		// get element prefix
 		if(strpos($qname,':') && !preg_match('/^http:\/\//',$qname)){
@@ -772,14 +772,14 @@ 
 		}
 	}
 
-    /**
-    * 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
-    */
+	/**
+	 * 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
+	 */
 	public function getLocalPart($str){
 		if($sstr = strrchr($str,':')){
 			// get unqualified name
@@ -790,13 +790,13 @@ 
 	}
 
 	/**
-    * 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
-    */
+	 * 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
+	 */
 	public function getPrefix($str){
 		if($pos = strrpos($str,':')){
 			// get prefix
@@ -806,12 +806,12 @@ 
 	}
 
 	/**
-    * 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
-    */
+	 * 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
+	 */
 	public function getNamespaceFromPrefix($prefix){
 		if (isset($this->namespaces[$prefix])) {
 			return $this->namespaces[$prefix];
@@ -820,17 +820,17 @@ 
 	}
 
 	/**
-    * 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
-    */
+	 * 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
+	 */
 	public function getPrefixFromNamespace($ns) {
 		foreach ($this->namespaces as $p => $n) {
 			if ($ns == $n || $ns == $p) {
-			    $this->usedNamespaces[$p] = $n;
+				$this->usedNamespaces[$p] = $n;
 				return $p;
 			}
 		}
@@ -838,11 +838,11 @@ 
 	}
 
 	/**
-    * returns the time in ODBC canonical form with microseconds
-    *
-    * @return string The time in ODBC canonical form with microseconds
-    * @access public
-    */
+	 * returns the time in ODBC canonical form with microseconds
+	 *
+	 * @return string The time in ODBC canonical form with microseconds
+	 * @access public
+	 */
 	public function getmicrotime() {
 		if (function_exists('gettimeofday')) {
 			$tod = gettimeofday();
@@ -862,7 +862,7 @@ 
 	 * @return string The output of var_dump
 	 * @access public
 	 */
-    public function varDump($data) {
+	public function varDump($data) {
 		// <--------   YetiForce Sp. z o.o.   -------->
 		// original code:  	ob_start(); var_dump($data); $ret_val = ob_get_contents(); ob_end_clean();
 		$ret_val = var_export($data, true); 
@@ -871,11 +871,11 @@ 
 	}
 
 	/**
-	* represents the object as a string
-	*
-	* @return	string
-	* @access   public
-	*/
+	 * represents the object as a string
+	 *
+	 * @return	string
+	 * @access   public
+	 */
 	public function __toString() {
 		return $this->varDump($this);
 	}

libraries/nusoap/class.xmlschema.php

Indentation +239 added lines, -239 removed lines

@@ -44,13 +44,13 @@ 
 	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
-	*/
+	 * constructor
+	 *
+	 * @param    string $schema schema document URI
+	 * @param    string $xml xml document URI
+	 * @param	string $namespaces namespaces defined in enclosing XML
+	 * @access   public
+	 */
 	public function nusoap_xmlschema($schema='',$xml='',$namespaces=array()){
 		parent::nusoap_base();
 		$this->debug('nusoap_xmlschema class instantiated, inside constructor');
@@ -76,14 +76,14 @@ 
 
 	}
 
-    /**
-    * parse an XML file
-    *
-    * @param string $xml path/URL to XML file
-    * @param string $type (schema | xml)
-	* @return boolean
-    * @access public
-    */
+	/**
+	 * parse an XML file
+	 *
+	 * @param string $xml path/URL to XML file
+	 * @param string $type (schema | xml)
+	 * @return boolean
+	 * @access public
+	 */
 	public function parseFile($xml,$type){
 		// parse xml file
 		if($xml != ""){
@@ -104,35 +104,35 @@ 
 	}
 
 	/**
-	* parse an XML string
-	*
-	* @param    string $xml path or URL
-    * @param	string $type (schema|xml)
-	* @access   private
-	*/
+	 * parse an XML string
+	 *
+	 * @param    string $xml path or URL
+	 * @param	string $type (schema|xml)
+	 * @access   private
+	 */
 	public 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);
+			// 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 object for the parser.
+			xml_set_object($this->parser, $this);
 
-	    	// Set the element handlers for the parser.
+			// 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');
+				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');
+				xml_set_character_data_handler($this->parser,'xmlCharacterData');
 			}
 
-		    // Parse the XML file.
-		    if(!xml_parse($this->parser,$xml,true)){
+			// 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),
@@ -141,7 +141,7 @@ 
 				$this->debug($errstr);
 				$this->debug("XML payload:\n" . $xml);
 				$this->setError($errstr);
-	    	}
+			}
             
 			xml_parser_free($this->parser);
 		} else{
@@ -166,13 +166,13 @@ 
 	}
 	
 	/**
-	* start-element handler
-	*
-	* @param    string $parser XML parser object
-	* @param    string $name element name
-	* @param    string $attrs associative array of attributes
-	* @access   private
-	*/
+	 * start-element handler
+	 *
+	 * @param    string $parser XML parser object
+	 * @param    string $name element name
+	 * @param    string $attrs associative array of attributes
+	 * @access   private
+	 */
 	public function schemaStartElement($parser, $name, $attrs) {
 		
 		// position in the total number of elements, starting from 0
@@ -192,15 +192,15 @@ 
 			// get unqualified name
 			$name = $this->getLocalPart($name);
 		} else {
-        	$prefix = '';
-        }
+			$prefix = '';
+		}
 		
-        // loop thru attributes, expanding, and registering namespace declarations
-        if(count($attrs) > 0){
-        	foreach($attrs as $k => $v){
-                // if ns declarations, add to class level array of valid namespaces
+		// loop thru attributes, expanding, and registering namespace declarations
+		if(count($attrs) > 0){
+			foreach($attrs as $k => $v){
+				// if ns declarations, add to class level array of valid namespaces
 				if(preg_match('/^xmlns/',$k)){
-                	if($ns_prefix = substr(strrchr($k,':'),1)){
+					if($ns_prefix = substr(strrchr($k,':'),1)){
 						$this->namespaces[$ns_prefix] = $v;
 					} else {
 						$this->defaultNamespace[$pos] = $v;
@@ -213,17 +213,17 @@ 
 						$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;
-        } else {
-        	$attrs = array();
-        }
+			}
+			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;
+		} else {
+			$attrs = array();
+		}
 		// find status, register data
 		switch($name){
 			case 'all':			// (optional) compositor content for a complexType
@@ -234,12 +234,12 @@ 
 
 			break;
 			case 'attribute':	// complexType attribute
-            	$this->xdebug("parsing attribute:");
-            	$this->appendDebug($this->varDump($attrs));
+				$this->xdebug("parsing attribute:");
+				$this->appendDebug($this->varDump($attrs));
 				if (!isset($attrs['form'])) {
 					$attrs['form'] = $this->schemaInfo['attributeFormDefault'];
 				}
-            	if (isset($attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'])) {
+				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...
@@ -248,19 +248,19 @@ 
 							$attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'] = $this->defaultNamespace[$pos] . ':' . $attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'];
 						}
 					}
-            	}
-                if(isset($attrs['name'])){
+				}
+				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 = '';
-	                }
+						$aname = $attrs['http://schemas.xmlsoap.org/wsdl/:arrayType'];
+					} else {
+						$aname = '';
+					}
 				} elseif(isset($attrs['ref'])){
 					$aname = $attrs['ref'];
-                    $this->attributes[$attrs['ref']] = $attrs;
+					$this->attributes[$attrs['ref']] = $attrs;
 				}
                 
 				if($this->currentComplexType){	// This should *always* be
@@ -269,20 +269,20 @@ 
 				// 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);
+					$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;
-                    }
-                    $v = substr($v,0,strpos($v,'[')); // clip the []
-                    if(!strpos($v,':') && isset($this->typemap[$this->XMLSchemaVersion][$v])){
-                        $v = $this->XMLSchemaVersion.':'.$v;
-                    }
-                    $this->complexTypes[$this->currentComplexType]['arrayType'] = $v;
+					if(strpos($v,'[,]')){
+						$this->complexTypes[$this->currentComplexType]['multidimensional'] = true;
+					}
+					$v = substr($v,0,strpos($v,'[')); // clip the []
+					if(!strpos($v,':') && isset($this->typemap[$this->XMLSchemaVersion][$v])){
+						$v = $this->XMLSchemaVersion.':'.$v;
+					}
+					$this->complexTypes[$this->currentComplexType]['arrayType'] = $v;
 				}
 			break;
 			case 'complexContent':	// (optional) content for a complexType
@@ -396,21 +396,21 @@ 
 				}
 			break;
 			case 'import':
-			    if (isset($attrs['schemaLocation'])) {
+				if (isset($attrs['schemaLocation'])) {
 					$this->xdebug('import namespace ' . $attrs['namespace'] . ' from ' . $attrs['schemaLocation']);
-                    $this->imports[$attrs['namespace']][] = array('location' => $attrs['schemaLocation'], 'loaded' => false);
+					$this->imports[$attrs['namespace']][] = array('location' => $attrs['schemaLocation'], 'loaded' => false);
 				} else {
 					$this->xdebug('import namespace ' . $attrs['namespace']);
-                    $this->imports[$attrs['namespace']][] = array('location' => '', 'loaded' => true);
+					$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'])) {
+				if (isset($attrs['schemaLocation'])) {
 					$this->xdebug('include into namespace ' . $this->schemaTargetNamespace . ' from ' . $attrs['schemaLocation']);
-                    $this->imports[$this->schemaTargetNamespace][] = array('location' => $attrs['schemaLocation'], 'loaded' => false);
+					$this->imports[$this->schemaTargetNamespace][] = array('location' => $attrs['schemaLocation'], 'loaded' => false);
 				} else {
 					$this->xdebug('ignoring invalid XML Schema construct: include without schemaLocation attribute');
 				}
@@ -474,26 +474,26 @@ 
 	}
 
 	/**
-	* end-element handler
-	*
-	* @param    string $parser XML parser object
-	* @param    string $name element name
-	* @access   private
-	*/
+	 * end-element handler
+	 *
+	 * @param    string $parser XML parser object
+	 * @param    string $name element name
+	 * @access   private
+	 */
 	public 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];
-        }
+			$pos = $this->depth_array[$this->depth];
+		}
 		// get element prefix
 		if ($prefix = $this->getPrefix($name)){
 			// get unqualified name
 			$name = $this->getLocalPart($name);
 		} else {
-        	$prefix = '';
-        }
+			$prefix = '';
+		}
 		// move on...
 		if($name == 'complexType'){
 			$this->xdebug('done processing complexType ' . ($this->currentComplexType ? $this->currentComplexType : '(unknown)'));
@@ -512,22 +512,22 @@ 
 	}
 
 	/**
-	* element content handler
-	*
-	* @param    string $parser XML parser object
-	* @param    string $data element content
-	* @access   private
-	*/
+	 * element content handler
+	 *
+	 * @param    string $parser XML parser object
+	 * @param    string $data element content
+	 * @access   private
+	 */
 	public function schemaCharacterData($parser, $data){
 		$pos = $this->depth_array[$this->depth - 1];
 		$this->message[$pos]['cdata'] .= $data;
 	}
 
 	/**
-	* serialize the schema
-	*
-	* @access   public
-	*/
+	 * serialize the schema
+	 *
+	 * @access   public
+	 */
 	public function serializeSchema(){
 
 		$schemaPrefix = $this->getPrefixFromNamespace($this->XMLSchemaVersion);
@@ -641,27 +641,27 @@ 
 	}
 
 	/**
-	* adds debug data to the clas level debug string
-	*
-	* @param    string $string debug data
-	* @access   private
-	*/
+	 * adds debug data to the clas level debug string
+	 *
+	 * @param    string $string debug data
+	 * @access   private
+	 */
 	public 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
-    */
+	/**
+	 * 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
+	 */
 	public function getPHPType($type,$ns){
 		if(isset($this->typemap[$ns][$type])){
 			//print "found type '$type' and ns $ns in typemap<br>";
@@ -674,27 +674,27 @@ 
 	}
 
 	/**
-    * 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
-    */
+	 * 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
+	 */
 	public function getTypeDef($type){
 		if (substr($type, -1) == '^') {
 			$is_element = 1;
@@ -764,49 +764,49 @@ 
 	}
 
 	/**
-    * 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
-    */
-    public function serializeTypeDef($type){
-    	//print "in sTD() for type $type<br>";
+	 * 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
+	 */
+	public function serializeTypeDef($type){
+		//print "in sTD() for type $type<br>";
 	if($typeDef = $this->getTypeDef($type)){
 		$str .= '<'.$type;
-	    if(is_array($typeDef['attrs'])){
+		if(is_array($typeDef['attrs'])){
 		foreach($typeDef['attrs'] as $attName => $data){
-		    $str .= " $attName=\"{type = ".$data['type']."}\"";
+			$str .= " $attName=\"{type = ".$data['type']."}\"";
 		}
-	    }
-	    $str .= " xmlns=\"".$this->schema['targetNamespace']."\"";
-	    if(count($typeDef['elements']) > 0){
+		}
+		$str .= " xmlns=\"".$this->schema['targetNamespace']."\"";
+		if(count($typeDef['elements']) > 0){
 		$str .= ">";
 		foreach($typeDef['elements'] as $element => $eData){
-		    $str .= $this->serializeTypeDef($element);
+			$str .= $this->serializeTypeDef($element);
 		}
 		$str .= "</$type>";
-	    } elseif($typeDef['typeClass'] == 'element') {
+		} elseif($typeDef['typeClass'] == 'element') {
 		$str .= "></$type>";
-	    } else {
+		} else {
 		$str .= "/>";
-	    }
+		}
 			return $str;
 	}
-    	return false;
-    }
+		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
-	*/
+	/**
+	 * 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
+	 */
 	public function typeToForm($name,$type){
 		// get typedef
 		if($typeDef = $this->getTypeDef($type)){
@@ -839,56 +839,56 @@ 
 	}
 	
 	/**
-	* 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
-	*/
+	 * 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
+	 */
 	public function addComplexType($name,$typeClass='complexType',$phpType='array',$compositor='',$restrictionBase='',$elements=array(),$attrs=array(),$arrayType=''){
 		$this->complexTypes[$name] = array(
-	    'name'		=> $name,
-	    'typeClass'	=> $typeClass,
-	    'phpType'	=> $phpType,
+		'name'		=> $name,
+		'typeClass'	=> $typeClass,
+		'phpType'	=> $phpType,
 		'compositor'=> $compositor,
-	    'restrictionBase' => $restrictionBase,
+		'restrictionBase' => $restrictionBase,
 		'elements'	=> $elements,
-	    'attrs'		=> $attrs,
-	    'arrayType'	=> $arrayType
+		'attrs'		=> $attrs,
+		'arrayType'	=> $arrayType
 		);
 		
 		$this->xdebug("addComplexType $name:");
@@ -896,24 +896,24 @@ 
 	}
 	
 	/**
-	* 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
-	*/
+	 * 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
+	 */
 	public function addSimpleType($name, $restrictionBase='', $typeClass='simpleType', $phpType='scalar', $enumeration=array()) {
 		$this->simpleTypes[$name] = array(
-	    'name'			=> $name,
-	    'typeClass'		=> $typeClass,
-	    'phpType'		=> $phpType,
-	    'type'			=> $restrictionBase,
-	    'enumeration'	=> $enumeration
+		'name'			=> $name,
+		'typeClass'		=> $typeClass,
+		'phpType'		=> $phpType,
+		'type'			=> $restrictionBase,
+		'enumeration'	=> $enumeration
 		);
 		
 		$this->xdebug("addSimpleType $name:");
@@ -921,12 +921,12 @@ 
 	}
 
 	/**
-	* adds an element to the schema
-	*
-	* @param array $attrs attributes that must include name and type
-	* @see nusoap_xmlschema
-	* @access public
-	*/
+	 * adds an element to the schema
+	 *
+	 * @param array $attrs attributes that must include name and type
+	 * @see nusoap_xmlschema
+	 * @access public
+	 */
 	public function addElement($attrs) {
 		if (! $this->getPrefix($attrs['type'])) {
 			$attrs['type'] = $this->schemaTargetNamespace . ':' . $attrs['type'];

libraries/nusoap/nusoapmime.php

Indentation +112 added lines, -112 removed lines

@@ -71,20 +71,20 @@ 
 	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
-	*/
+	 * 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
+	 */
 	public function addAttachment($data, $filename = '', $contenttype = 'application/octet-stream', $cid = false) {
 		if (! $cid) {
 			$cid = md5(uniqid(time()));
@@ -101,35 +101,35 @@ 
 	}
 
 	/**
-	* clears the MIME attachments for the current request.
-	*
-	* @access public
-	*/
+	 * clears the MIME attachments for the current request.
+	 *
+	 * @access public
+	 */
 	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
-	*/
+	 * 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
+	 */
 	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
-	*/
+	 * 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
+	 */
 	public function getHTTPBody($soapmsg) {
 		if (count($this->requestAttachments) > 0) {
 			$params['content_type'] = 'multipart/related; type="text/xml"';
@@ -182,13 +182,13 @@ 
 	}
 	
 	/**
-	* 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
-	*/
+	 * 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
+	 */
 	public function getHTTPContentType() {
 		if (count($this->requestAttachments) > 0) {
 			return $this->mimeContentType;
@@ -197,14 +197,14 @@ 
 	}
 	
 	/**
-	* 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
-	*/
+	 * 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
+	 */
 	public function getHTTPContentTypeCharset() {
 		if (count($this->requestAttachments) > 0) {
 			return false;
@@ -213,14 +213,14 @@ 
 	}
 
 	/**
-	* 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
-	*/
-    public function parseResponse($headers, $data) {
+	 * 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
+	 */
+	public 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')) {
@@ -301,20 +301,20 @@ 
 	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
-	*/
+	 * 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
+	 */
 	public function addAttachment($data, $filename = '', $contenttype = 'application/octet-stream', $cid = false) {
 		if (! $cid) {
 			$cid = md5(uniqid(time()));
@@ -331,35 +331,35 @@ 
 	}
 
 	/**
-	* clears the MIME attachments for the current response.
-	*
-	* @access public
-	*/
+	 * clears the MIME attachments for the current response.
+	 *
+	 * @access public
+	 */
 	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
-	*/
+	 * 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
+	 */
 	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
-	*/
+	 * 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
+	 */
 	public function getHTTPBody($soapmsg) {
 		if (count($this->responseAttachments) > 0) {
 			$params['content_type'] = 'multipart/related; type="text/xml"';
@@ -412,13 +412,13 @@ 
 	}
 	
 	/**
-	* 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
-	*/
+	 * 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
+	 */
 	public function getHTTPContentType() {
 		if (count($this->responseAttachments) > 0) {
 			return $this->mimeContentType;
@@ -427,14 +427,14 @@ 
 	}
 	
 	/**
-	* 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
-	*/
+	 * 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
+	 */
 	public function getHTTPContentTypeCharset() {
 		if (count($this->responseAttachments) > 0) {
 			return false;
@@ -443,14 +443,14 @@ 
 	}
 
 	/**
-	* 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
-	*/
-    public function parseRequest($headers, $data) {
+	 * 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
+	 */
+	public 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')) {

libraries/HTTP_Session/Session/Container/MDB2.php

Indentation +279 added lines, -279 removed lines

@@ -59,306 +59,306 @@
  */
 class HTTP_Session_Container_MDB2 extends HTTP_Session_Container
 {
-    /**
-     * MDB2 connection object
-     *
-     * @var object MDB2
-     * @access private
-     */
-    var $db = null;
+	/**
+	 * MDB2 connection object
+	 *
+	 * @var object MDB2
+	 * @access private
+	 */
+	var $db = null;
 
-    /**
-     * Session data cache id
-     *
-     * @var mixed
-     * @access private
-     */
-    var $crc = false;
+	/**
+	 * Session data cache id
+	 *
+	 * @var mixed
+	 * @access private
+	 */
+	var $crc = false;
 
-    /**
-     * Constructor method
-     *
-     * $options is an array with the options.<br>
-     * The options are:
-     * <ul>
-     * <li>'dsn' - The DSN string</li>
-     * <li>'table' - Table with session data, default is 'sessiondata'</li>
-     * <li>'autooptimize' - Boolean, 'true' to optimize
-     * the table on garbage collection, default is 'false'.</li>
-     * </ul>
-     *
-     * @param array $options Options
-     *
-     * @access public
-     * @return void
-     */
-    public function HTTP_Session_Container_MDB2($options)
-    {
-        $this->_setDefaults();
-        if (is_array($options)) {
-            $this->_parseOptions($options);
-        } else {
-            $this->options['dsn'] = $options;
-        }
-    }
+	/**
+	 * Constructor method
+	 *
+	 * $options is an array with the options.<br>
+	 * The options are:
+	 * <ul>
+	 * <li>'dsn' - The DSN string</li>
+	 * <li>'table' - Table with session data, default is 'sessiondata'</li>
+	 * <li>'autooptimize' - Boolean, 'true' to optimize
+	 * the table on garbage collection, default is 'false'.</li>
+	 * </ul>
+	 *
+	 * @param array $options Options
+	 *
+	 * @access public
+	 * @return void
+	 */
+	public function HTTP_Session_Container_MDB2($options)
+	{
+		$this->_setDefaults();
+		if (is_array($options)) {
+			$this->_parseOptions($options);
+		} else {
+			$this->options['dsn'] = $options;
+		}
+	}
 
-    /**
-     * Connect to database by using the given DSN string
-     *
-     * @param string $dsn DSN string
-     *
-     * @access private
-     * @return mixed   Object on error, otherwise bool
-     */
-    public function _connect($dsn)
-    {
-        if (is_string($dsn) || is_array($dsn)) {
-            $this->db = MDB2::connect($dsn);
-        } else if (is_object($dsn) && is_a($dsn, 'MDB2_Driver_Common')) {
-            $this->db = $dsn;
-        } else if (is_object($dsn) && MDB2::isError($dsn)) {
-            return $dsn;
-        } else {
-            return new PEAR_Error("The given dsn was not valid in file " . __FILE__
-                                  . " at line " . __LINE__,
-                                  41,
-                                  PEAR_ERROR_RETURN,
-                                  null,
-                                  null
-                                  );
+	/**
+	 * Connect to database by using the given DSN string
+	 *
+	 * @param string $dsn DSN string
+	 *
+	 * @access private
+	 * @return mixed   Object on error, otherwise bool
+	 */
+	public function _connect($dsn)
+	{
+		if (is_string($dsn) || is_array($dsn)) {
+			$this->db = MDB2::connect($dsn);
+		} else if (is_object($dsn) && is_a($dsn, 'MDB2_Driver_Common')) {
+			$this->db = $dsn;
+		} else if (is_object($dsn) && MDB2::isError($dsn)) {
+			return $dsn;
+		} else {
+			return new PEAR_Error("The given dsn was not valid in file " . __FILE__
+								  . " at line " . __LINE__,
+								  41,
+								  PEAR_ERROR_RETURN,
+								  null,
+								  null
+								  );
 
-        }
+		}
 
-        if (MDB2::isError($this->db)) {
-            return new MDB2_Error($this->db->code, PEAR_ERROR_DIE);
-        }
+		if (MDB2::isError($this->db)) {
+			return new MDB2_Error($this->db->code, PEAR_ERROR_DIE);
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * Set some default options
-     *
-     * @access private
-     * @return void
-     */
-    public function _setDefaults()
-    {
-        $this->options['dsn']          = null;
-        $this->options['table']        = 'sessiondata';
-        $this->options['autooptimize'] = false;
-    }
+	/**
+	 * Set some default options
+	 *
+	 * @access private
+	 * @return void
+	 */
+	public function _setDefaults()
+	{
+		$this->options['dsn']          = null;
+		$this->options['table']        = 'sessiondata';
+		$this->options['autooptimize'] = false;
+	}
 
-    /**
-     * Establish connection to a database
-     *
-     * @param string $save_path    Save path
-     * @param string $session_name Session name
-     *
-     * @return bool
-     */
-    public function open($save_path, $session_name)
-    {
-        if (MDB2::isError($this->_connect($this->options['dsn']))) {
-            return false;
-        } else {
-            return true;
-        }
-    }
+	/**
+	 * Establish connection to a database
+	 *
+	 * @param string $save_path    Save path
+	 * @param string $session_name Session name
+	 *
+	 * @return bool
+	 */
+	public function open($save_path, $session_name)
+	{
+		if (MDB2::isError($this->_connect($this->options['dsn']))) {
+			return false;
+		} else {
+			return true;
+		}
+	}
 
-    /**
-     * Free resources
-     *
-     * @return bool
-     */
-    public function close()
-    {
-        return true;
-    }
+	/**
+	 * Free resources
+	 *
+	 * @return bool
+	 */
+	public function close()
+	{
+		return true;
+	}
 
-    /**
-     * Read session data
-     *
-     * @param string $id Session id
-     *
-     * @return mixed
-     */
-    public function read($id)
-    {
-        $query = sprintf("SELECT data FROM %s WHERE id = %s && expiry >= %d",
-                         $this->options['table'],
-                         $this->db->quote(md5($id), 'text'),
-                         time());
-        $result = $this->db->queryOne($query);
-        if (MDB2::isError($result)) {
-            $this->db->raiseError($result->code, PEAR_ERROR_DIE);
-            return false;
-        }
-        $this->crc = strlen($result) . crc32($result);
-        return $result;
-    }
+	/**
+	 * Read session data
+	 *
+	 * @param string $id Session id
+	 *
+	 * @return mixed
+	 */
+	public function read($id)
+	{
+		$query = sprintf("SELECT data FROM %s WHERE id = %s && expiry >= %d",
+						 $this->options['table'],
+						 $this->db->quote(md5($id), 'text'),
+						 time());
+		$result = $this->db->queryOne($query);
+		if (MDB2::isError($result)) {
+			$this->db->raiseError($result->code, PEAR_ERROR_DIE);
+			return false;
+		}
+		$this->crc = strlen($result) . crc32($result);
+		return $result;
+	}
 
-    /**
-     * Write session data
-     *
-     * @param string $id   Session id
-     * @param mixed  $data Data
-     *
-     * @return bool
-     */
-    public function write($id, $data)
-    {
-        if ((false !== $this->crc) &&
-            ($this->crc === strlen($data) . crc32($data))) {
-            // $_SESSION hasn't been touched, no need to update the blob column
-            $query = sprintf("UPDATE %s SET expiry = %d WHERE id = %s",
-                             $this->options['table'],
-                             time() + ini_get('session.gc_maxlifetime'),
-                             $this->db->quote(md5($id), 'text'));
-        } else {
-            // Check if table row already exists
-            $query = sprintf("SELECT COUNT(id) FROM %s WHERE id = %s",
-                             $this->options['table'],
-                             $this->db->quote(md5($id), 'text'));
-            $result = $this->db->queryOne($query);
-            if (MDB2::isError($result)) {
-                $this->db->raiseError($result->code, PEAR_ERROR_DIE);
-                return false;
-            }
-            if (0 == intval($result)) {
-                // Insert new row into table
-                $query = sprintf("INSERT INTO %s (id, expiry, data) VALUES (%s, %d, %s)",
-                                 $this->options['table'],
-                                 $this->db->quote(md5($id), 'text'),
-                                 time() + ini_get('session.gc_maxlifetime'),
-                                 $this->db->quote($data, 'text'));
-            } else {
-                // Update existing row
-                $query = sprintf("UPDATE %s SET expiry = %d, data = %s WHERE id = %s",
-                                 $this->options['table'],
-                                 time() + ini_get('session.gc_maxlifetime'),
-                                 $this->db->quote($data, 'text'),
-                                 $this->db->quote(md5($id), 'text'));
-            }
-        }
-        $result = $this->db->query($query);
-        if (MDB2::isError($result)) {
-            $this->db->raiseError($result->code, PEAR_ERROR_DIE);
-            return false;
-        }
+	/**
+	 * Write session data
+	 *
+	 * @param string $id   Session id
+	 * @param mixed  $data Data
+	 *
+	 * @return bool
+	 */
+	public function write($id, $data)
+	{
+		if ((false !== $this->crc) &&
+			($this->crc === strlen($data) . crc32($data))) {
+			// $_SESSION hasn't been touched, no need to update the blob column
+			$query = sprintf("UPDATE %s SET expiry = %d WHERE id = %s",
+							 $this->options['table'],
+							 time() + ini_get('session.gc_maxlifetime'),
+							 $this->db->quote(md5($id), 'text'));
+		} else {
+			// Check if table row already exists
+			$query = sprintf("SELECT COUNT(id) FROM %s WHERE id = %s",
+							 $this->options['table'],
+							 $this->db->quote(md5($id), 'text'));
+			$result = $this->db->queryOne($query);
+			if (MDB2::isError($result)) {
+				$this->db->raiseError($result->code, PEAR_ERROR_DIE);
+				return false;
+			}
+			if (0 == intval($result)) {
+				// Insert new row into table
+				$query = sprintf("INSERT INTO %s (id, expiry, data) VALUES (%s, %d, %s)",
+								 $this->options['table'],
+								 $this->db->quote(md5($id), 'text'),
+								 time() + ini_get('session.gc_maxlifetime'),
+								 $this->db->quote($data, 'text'));
+			} else {
+				// Update existing row
+				$query = sprintf("UPDATE %s SET expiry = %d, data = %s WHERE id = %s",
+								 $this->options['table'],
+								 time() + ini_get('session.gc_maxlifetime'),
+								 $this->db->quote($data, 'text'),
+								 $this->db->quote(md5($id), 'text'));
+			}
+		}
+		$result = $this->db->query($query);
+		if (MDB2::isError($result)) {
+			$this->db->raiseError($result->code, PEAR_ERROR_DIE);
+			return false;
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * Destroy session data
-     *
-     * @param string $id Session id
-     *
-     * @return bool
-     */
-    public function destroy($id)
-    {
-        $query = sprintf("DELETE FROM %s WHERE id = %s",
-                         $this->options['table'],
-                         $this->db->quote(md5($id), 'text'));
-        $result = $this->db->query($query);
-        if (MDB2::isError($result)) {
-            $this->db->raiseError($result->code, PEAR_ERROR_DIE);
-            return false;
-        }
+	/**
+	 * Destroy session data
+	 *
+	 * @param string $id Session id
+	 *
+	 * @return bool
+	 */
+	public function destroy($id)
+	{
+		$query = sprintf("DELETE FROM %s WHERE id = %s",
+						 $this->options['table'],
+						 $this->db->quote(md5($id), 'text'));
+		$result = $this->db->query($query);
+		if (MDB2::isError($result)) {
+			$this->db->raiseError($result->code, PEAR_ERROR_DIE);
+			return false;
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * Replicate session data to table specified in option 'replicateBeforeDestroy'
-     *
-     * @param string $targetTable Table to replicate to
-     * @param string $id          Id of record to replicate
-     *
-     * @access private
-     * @return bool
-     */
-    public function replicate($targetTable, $id = null)
-    {
-        if (is_null($id)) {
-            $id = HTTP_Session::id();
-        }
+	/**
+	 * Replicate session data to table specified in option 'replicateBeforeDestroy'
+	 *
+	 * @param string $targetTable Table to replicate to
+	 * @param string $id          Id of record to replicate
+	 *
+	 * @access private
+	 * @return bool
+	 */
+	public function replicate($targetTable, $id = null)
+	{
+		if (is_null($id)) {
+			$id = HTTP_Session::id();
+		}
 
-        // Check if table row already exists
-        $query = sprintf("SELECT COUNT(id) FROM %s WHERE id = %s",
-                         $targetTable,
-                         $this->db->quote(md5($id), 'text'));
-        $result = $this->db->queryOne($query);
-        if (MDB2::isError($result)) {
-            $this->db->raiseError($result->code, PEAR_ERROR_DIE);
-            return false;
-        }
+		// Check if table row already exists
+		$query = sprintf("SELECT COUNT(id) FROM %s WHERE id = %s",
+						 $targetTable,
+						 $this->db->quote(md5($id), 'text'));
+		$result = $this->db->queryOne($query);
+		if (MDB2::isError($result)) {
+			$this->db->raiseError($result->code, PEAR_ERROR_DIE);
+			return false;
+		}
 
-        // Insert new row into dest table
-        if (0 == intval($result)) {
-            $query = sprintf("INSERT INTO %s SELECT * FROM %s WHERE id = %s",
-                             $targetTable,
-                             $this->options['table'],
-                             $this->db->quote(md5($id), 'text'));
+		// Insert new row into dest table
+		if (0 == intval($result)) {
+			$query = sprintf("INSERT INTO %s SELECT * FROM %s WHERE id = %s",
+							 $targetTable,
+							 $this->options['table'],
+							 $this->db->quote(md5($id), 'text'));
 
-        } else {
-            // Update existing row
-            $query = sprintf("UPDATE %s dst, %s src SET dst.expiry = src.expiry, dst.data = src.data WHERE dst.id = src.id && src.id = %s",
-                             $targetTable,
-                             $this->options['table'],
-                             $this->db->quote(md5($id), 'text'));
-        }
+		} else {
+			// Update existing row
+			$query = sprintf("UPDATE %s dst, %s src SET dst.expiry = src.expiry, dst.data = src.data WHERE dst.id = src.id && src.id = %s",
+							 $targetTable,
+							 $this->options['table'],
+							 $this->db->quote(md5($id), 'text'));
+		}
 
-        $result = $this->db->query($query);
-        if (MDB2::isError($result)) {
-            $this->db->raiseError($result->code, PEAR_ERROR_DIE);
-            return false;
-        }
+		$result = $this->db->query($query);
+		if (MDB2::isError($result)) {
+			$this->db->raiseError($result->code, PEAR_ERROR_DIE);
+			return false;
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * Garbage collection
-     *
-     * @param int $maxlifetime Maximum lifetime
-     *
-     * @return bool
-     */
-    public function gc($maxlifetime)
-    {
-        $query = sprintf("DELETE FROM %s WHERE expiry < %d",
-                         $this->options['table'],
-                         time());
-        $result = $this->db->query($query);
-        if (MDB2::isError($result)) {
-            $this->db->raiseError($result->code, PEAR_ERROR_DIE);
-            return false;
-        }
-        if ($this->options['autooptimize']) {
-            switch($this->db->phptype) {
-            case 'mysql':
-                $query = sprintf("OPTIMIZE TABLE %s", $this->options['table']);
-                break;
-            case 'pgsql':
-                $query = sprintf("VACUUM %s", $this->options['table']);
-                break;
-            default:
-                $query = null;
-                break;
-            }
-            if (isset($query)) {
-                $result = $this->db->query($query);
-                if (MDB2::isError($result)) {
-                    $this->db->raiseError($result->code, PEAR_ERROR_DIE);
-                    return false;
-                }
-            }
-        }
+	/**
+	 * Garbage collection
+	 *
+	 * @param int $maxlifetime Maximum lifetime
+	 *
+	 * @return bool
+	 */
+	public function gc($maxlifetime)
+	{
+		$query = sprintf("DELETE FROM %s WHERE expiry < %d",
+						 $this->options['table'],
+						 time());
+		$result = $this->db->query($query);
+		if (MDB2::isError($result)) {
+			$this->db->raiseError($result->code, PEAR_ERROR_DIE);
+			return false;
+		}
+		if ($this->options['autooptimize']) {
+			switch($this->db->phptype) {
+			case 'mysql':
+				$query = sprintf("OPTIMIZE TABLE %s", $this->options['table']);
+				break;
+			case 'pgsql':
+				$query = sprintf("VACUUM %s", $this->options['table']);
+				break;
+			default:
+				$query = null;
+				break;
+			}
+			if (isset($query)) {
+				$result = $this->db->query($query);
+				if (MDB2::isError($result)) {
+					$this->db->raiseError($result->code, PEAR_ERROR_DIE);
+					return false;
+				}
+			}
+		}
 
-        return true;
-    }
+		return true;
+	}
 }
 ?>
\ No newline at end of file

libraries/HTTP_Session/Session/Container/MDB.php

Indentation +279 added lines, -279 removed lines

@@ -60,305 +60,305 @@
 class HTTP_Session_Container_MDB extends HTTP_Session_Container
 {
 
-    /**
-     * MDB connection object
-     *
-     * @var object MDB
-     * @access private
-     */
-    var $db = null;
+	/**
+	 * MDB connection object
+	 *
+	 * @var object MDB
+	 * @access private
+	 */
+	var $db = null;
 
-    /**
-     * Session data cache id
-     *
-     * @var mixed
-     * @access private
-     */
-    var $crc = false;
+	/**
+	 * Session data cache id
+	 *
+	 * @var mixed
+	 * @access private
+	 */
+	var $crc = false;
 
-    /**
-     * Constructor method
-     *
-     * $options is an array with the options.<br>
-     * The options are:
-     * <ul>
-     * <li>'dsn' - The DSN string</li>
-     * <li>'table' - Table with session data, default is 'sessiondata'</li>
-     * <li>'autooptimize' - Boolean, 'true' to optimize
-     * the table on garbage collection, default is 'false'.</li>
-     * </ul>
-     *
-     * @param array $options Options
-     *
-     * @access public
-     * @return object
-     */
-    public function HTTP_Session_Container_MDB($options)
-    {
-        $this->_setDefaults();
-        if (is_array($options)) {
-            $this->_parseOptions($options);
-        } else {
-            $this->options['dsn'] = $options;
-        }
-    }
+	/**
+	 * Constructor method
+	 *
+	 * $options is an array with the options.<br>
+	 * The options are:
+	 * <ul>
+	 * <li>'dsn' - The DSN string</li>
+	 * <li>'table' - Table with session data, default is 'sessiondata'</li>
+	 * <li>'autooptimize' - Boolean, 'true' to optimize
+	 * the table on garbage collection, default is 'false'.</li>
+	 * </ul>
+	 *
+	 * @param array $options Options
+	 *
+	 * @access public
+	 * @return object
+	 */
+	public function HTTP_Session_Container_MDB($options)
+	{
+		$this->_setDefaults();
+		if (is_array($options)) {
+			$this->_parseOptions($options);
+		} else {
+			$this->options['dsn'] = $options;
+		}
+	}
 
-    /**
-     * Connect to database by using the given DSN string
-     *
-     * @param string $dsn DSN string
-     *
-     * @access private
-     * @return mixed  Object on error, otherwise bool
-     */
-    public function _connect($dsn)
-    {
-        if (is_string($dsn) || is_array($dsn)) {
-            $this->db = MDB::connect($dsn);
-        } else if (is_object($dsn) && is_a($dsn, 'mdb_common')) {
-            $this->db = $dsn;
-        } else if (is_object($dsn) && MDB::isError($dsn)) {
-            return new MDB_Error($dsn->code, PEAR_ERROR_DIE);
-        } else {
-            return new PEAR_Error("The given dsn was not valid in file " . __FILE__ 
-                                  . " at line " . __LINE__,
-                                  41,
-                                  PEAR_ERROR_RETURN,
-                                  null,
-                                  null
-                                  );
+	/**
+	 * Connect to database by using the given DSN string
+	 *
+	 * @param string $dsn DSN string
+	 *
+	 * @access private
+	 * @return mixed  Object on error, otherwise bool
+	 */
+	public function _connect($dsn)
+	{
+		if (is_string($dsn) || is_array($dsn)) {
+			$this->db = MDB::connect($dsn);
+		} else if (is_object($dsn) && is_a($dsn, 'mdb_common')) {
+			$this->db = $dsn;
+		} else if (is_object($dsn) && MDB::isError($dsn)) {
+			return new MDB_Error($dsn->code, PEAR_ERROR_DIE);
+		} else {
+			return new PEAR_Error("The given dsn was not valid in file " . __FILE__ 
+								  . " at line " . __LINE__,
+								  41,
+								  PEAR_ERROR_RETURN,
+								  null,
+								  null
+								  );
 
-        }
+		}
 
-        if (MDB::isError($this->db)) {
-            return new MDB_Error($this->db->code, PEAR_ERROR_DIE);
-        }
+		if (MDB::isError($this->db)) {
+			return new MDB_Error($this->db->code, PEAR_ERROR_DIE);
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * Set some default options
-     *
-     * @access private
-     * @return void
-     */
-    public function _setDefaults()
-    {
-        $this->options['dsn']          = null;
-        $this->options['table']        = 'sessiondata';
-        $this->options['autooptimize'] = false;
-    }
+	/**
+	 * Set some default options
+	 *
+	 * @access private
+	 * @return void
+	 */
+	public function _setDefaults()
+	{
+		$this->options['dsn']          = null;
+		$this->options['table']        = 'sessiondata';
+		$this->options['autooptimize'] = false;
+	}
 
-    /**
-     * Establish connection to a database
-     *
-     * @param string $save_path    Save path
-     * @param string $session_name Session name
-     *
-     * @return bool
-     */
-    public function open($save_path, $session_name)
-    {
-        if (MDB::isError($this->_connect($this->options['dsn']))) {
-            return false;
-        } else {
-            return true;
-        }
-    }
+	/**
+	 * Establish connection to a database
+	 *
+	 * @param string $save_path    Save path
+	 * @param string $session_name Session name
+	 *
+	 * @return bool
+	 */
+	public function open($save_path, $session_name)
+	{
+		if (MDB::isError($this->_connect($this->options['dsn']))) {
+			return false;
+		} else {
+			return true;
+		}
+	}
 
-    /**
-     * Free resources
-     *
-     * @return bool
-     */
-    public function close()
-    {
-        return true;
-    }
+	/**
+	 * Free resources
+	 *
+	 * @return bool
+	 */
+	public function close()
+	{
+		return true;
+	}
 
-    /**
-     * Read session data
-     *
-     * @param string $id Session id
-     *
-     * @return mixed
-     */
-    public function read($id)
-    {
-        $query = sprintf("SELECT data FROM %s WHERE id = %s && expiry >= %d",
-                         $this->options['table'],
-                         $this->db->getTextValue(md5($id)),
-                         time());
-        $result = $this->db->getOne($query);
-        if (MDB::isError($result)) {
-            new MDB_Error($result->code, PEAR_ERROR_DIE);
-            return false;
-        }
-        $this->crc = strlen($result) . crc32($result);
-        return $result;
-    }
+	/**
+	 * Read session data
+	 *
+	 * @param string $id Session id
+	 *
+	 * @return mixed
+	 */
+	public function read($id)
+	{
+		$query = sprintf("SELECT data FROM %s WHERE id = %s && expiry >= %d",
+						 $this->options['table'],
+						 $this->db->getTextValue(md5($id)),
+						 time());
+		$result = $this->db->getOne($query);
+		if (MDB::isError($result)) {
+			new MDB_Error($result->code, PEAR_ERROR_DIE);
+			return false;
+		}
+		$this->crc = strlen($result) . crc32($result);
+		return $result;
+	}
 
-    /**
-     * Write session data
-     *
-     * @param string $id   Session id
-     * @param mixed  $data Data
-     *
-     * @return bool
-     */
-    public function write($id, $data)
-    {
-        if ((false !== $this->crc) && 
-            ($this->crc === strlen($data) . crc32($data))) {
-            // $_SESSION hasn't been touched, no need to update the blob column
-            $query = sprintf("UPDATE %s SET expiry = %d WHERE id = %s",
-                             $this->options['table'],
-                             time() + ini_get('session.gc_maxlifetime'),
-                             $this->db->getTextValue(md5($id)));
-        } else {
-            // Check if table row already exists
-            $query = sprintf("SELECT COUNT(id) FROM %s WHERE id = %s",
-                             $this->options['table'],
-                             $this->db->getTextValue(md5($id)));
-            $result = $this->db->getOne($query);
-            if (MDB::isError($result)) {
-                new MDB_Error($result->code, PEAR_ERROR_DIE);
-                return false;
-            }
-            if (0 == intval($result)) {
-                // Insert new row into table
-                $query = sprintf("INSERT INTO %s (id, expiry, data) VALUES (%s, %d, %s)",
-                                 $this->options['table'],
-                                 $this->db->getTextValue(md5($id)),
-                                 time() + ini_get('session.gc_maxlifetime'),
-                                 $this->db->getTextValue($data));
-            } else {
-                // Update existing row
-                $query = sprintf("UPDATE %s SET expiry = %d, data = %s WHERE id = %s",
-                                 $this->options['table'],
-                                 time() + ini_get('session.gc_maxlifetime'),
-                                 $this->db->getTextValue($data),
-                                 $this->db->getTextValue(md5($id)));
-            }
-        }
-        $result = $this->db->query($query);
-        if (MDB::isError($result)) {
-            new MDB_Error($result->code, PEAR_ERROR_DIE);
-            return false;
-        }
+	/**
+	 * Write session data
+	 *
+	 * @param string $id   Session id
+	 * @param mixed  $data Data
+	 *
+	 * @return bool
+	 */
+	public function write($id, $data)
+	{
+		if ((false !== $this->crc) && 
+			($this->crc === strlen($data) . crc32($data))) {
+			// $_SESSION hasn't been touched, no need to update the blob column
+			$query = sprintf("UPDATE %s SET expiry = %d WHERE id = %s",
+							 $this->options['table'],
+							 time() + ini_get('session.gc_maxlifetime'),
+							 $this->db->getTextValue(md5($id)));
+		} else {
+			// Check if table row already exists
+			$query = sprintf("SELECT COUNT(id) FROM %s WHERE id = %s",
+							 $this->options['table'],
+							 $this->db->getTextValue(md5($id)));
+			$result = $this->db->getOne($query);
+			if (MDB::isError($result)) {
+				new MDB_Error($result->code, PEAR_ERROR_DIE);
+				return false;
+			}
+			if (0 == intval($result)) {
+				// Insert new row into table
+				$query = sprintf("INSERT INTO %s (id, expiry, data) VALUES (%s, %d, %s)",
+								 $this->options['table'],
+								 $this->db->getTextValue(md5($id)),
+								 time() + ini_get('session.gc_maxlifetime'),
+								 $this->db->getTextValue($data));
+			} else {
+				// Update existing row
+				$query = sprintf("UPDATE %s SET expiry = %d, data = %s WHERE id = %s",
+								 $this->options['table'],
+								 time() + ini_get('session.gc_maxlifetime'),
+								 $this->db->getTextValue($data),
+								 $this->db->getTextValue(md5($id)));
+			}
+		}
+		$result = $this->db->query($query);
+		if (MDB::isError($result)) {
+			new MDB_Error($result->code, PEAR_ERROR_DIE);
+			return false;
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * Destroy session data
-     *
-     * @param string $id Session id
-     *
-     * @return bool
-     */
-    public function destroy($id)
-    {
-        $query = sprintf("DELETE FROM %s WHERE id = %s",
-                         $this->options['table'],
-                         $this->db->getTextValue(md5($id)));
-        $result = $this->db->query($query);
-        if (MDB::isError($result)) {
-            new MDB_Error($result->code, PEAR_ERROR_DIE);
-            return false;
-        }
+	/**
+	 * Destroy session data
+	 *
+	 * @param string $id Session id
+	 *
+	 * @return bool
+	 */
+	public function destroy($id)
+	{
+		$query = sprintf("DELETE FROM %s WHERE id = %s",
+						 $this->options['table'],
+						 $this->db->getTextValue(md5($id)));
+		$result = $this->db->query($query);
+		if (MDB::isError($result)) {
+			new MDB_Error($result->code, PEAR_ERROR_DIE);
+			return false;
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * Replicate session data to table specified in option 'replicateBeforeDestroy'
-     *
-     * @param string $targetTable Table to replicate to
-     * @param string $id          Id of record to replicate
-     *
-     * @access private
-     * @return bool
-     */
-    public function replicate($targetTable, $id = null)
-    {
-        if (is_null($id)) {
-            $id = HTTP_Session::id();
-        }
+	/**
+	 * Replicate session data to table specified in option 'replicateBeforeDestroy'
+	 *
+	 * @param string $targetTable Table to replicate to
+	 * @param string $id          Id of record to replicate
+	 *
+	 * @access private
+	 * @return bool
+	 */
+	public function replicate($targetTable, $id = null)
+	{
+		if (is_null($id)) {
+			$id = HTTP_Session::id();
+		}
 
-        // Check if table row already exists
-        $query = sprintf("SELECT COUNT(id) FROM %s WHERE id = %s",
-                         $targetTable,
-                         $this->db->getTextValue(md5($id)));
-        $result = $this->db->getOne($query);
-        if (MDB::isError($result)) {
-            new MDB_Error($result->code, PEAR_ERROR_DIE);
-            return false;
-        }
+		// Check if table row already exists
+		$query = sprintf("SELECT COUNT(id) FROM %s WHERE id = %s",
+						 $targetTable,
+						 $this->db->getTextValue(md5($id)));
+		$result = $this->db->getOne($query);
+		if (MDB::isError($result)) {
+			new MDB_Error($result->code, PEAR_ERROR_DIE);
+			return false;
+		}
 
-        // Insert new row into dest table
-        if (0 == intval($result)) {
-            $query = sprintf("INSERT INTO %s SELECT * FROM %s WHERE id = %s",
-                             $targetTable,
-                             $this->options['table'],
-                             $this->db->getTextValue(md5($id)));
-        } else {
-            // Update existing row
-            $query = sprintf("UPDATE %s dst, %s src SET dst.expiry = src.expiry, dst.data = src.data WHERE dst.id = src.id && src.id = %s",
-                             $targetTable,
-                             $this->options['table'],
-                             $this->db->getTextValue(md5($id)));
-        }
+		// Insert new row into dest table
+		if (0 == intval($result)) {
+			$query = sprintf("INSERT INTO %s SELECT * FROM %s WHERE id = %s",
+							 $targetTable,
+							 $this->options['table'],
+							 $this->db->getTextValue(md5($id)));
+		} else {
+			// Update existing row
+			$query = sprintf("UPDATE %s dst, %s src SET dst.expiry = src.expiry, dst.data = src.data WHERE dst.id = src.id && src.id = %s",
+							 $targetTable,
+							 $this->options['table'],
+							 $this->db->getTextValue(md5($id)));
+		}
 
-        $result = $this->db->query($query);
-        if (MDB::isError($result)) {
-            new MDB_Error($result->code, PEAR_ERROR_DIE);
-            return false;
-        }
+		$result = $this->db->query($query);
+		if (MDB::isError($result)) {
+			new MDB_Error($result->code, PEAR_ERROR_DIE);
+			return false;
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * Garbage collection
-     *
-     * @param int $maxlifetime Maximum lifetime
-     *
-     * @return bool
-     */
-    public function gc($maxlifetime)
-    {
-        $query = sprintf("DELETE FROM %s WHERE expiry < %d",
-                         $this->options['table'],
-                         time());
-        $result = $this->db->query($query);
-        if (MDB::isError($result)) {
-            new MDB_Error($result->code, PEAR_ERROR_DIE);
-            return false;
-        }
-        if ($this->options['autooptimize']) {
-            switch($this->db->phptype) {
-            case 'mysql':
-                $query = sprintf("OPTIMIZE TABLE %s", $this->options['table']);
-                break;
-            case 'pgsql':
-                $query = sprintf("VACUUM %s", $this->options['table']);
-                break;
-            default:
-                $query = null;
-                break;
-            }
-            if (isset($query)) {
-                $result = $this->db->query($query);
-                if (MDB::isError($result)) {
-                    new MDB_Error($result->code, PEAR_ERROR_DIE);
-                    return false;
-                }
-            }
-        }
+	/**
+	 * Garbage collection
+	 *
+	 * @param int $maxlifetime Maximum lifetime
+	 *
+	 * @return bool
+	 */
+	public function gc($maxlifetime)
+	{
+		$query = sprintf("DELETE FROM %s WHERE expiry < %d",
+						 $this->options['table'],
+						 time());
+		$result = $this->db->query($query);
+		if (MDB::isError($result)) {
+			new MDB_Error($result->code, PEAR_ERROR_DIE);
+			return false;
+		}
+		if ($this->options['autooptimize']) {
+			switch($this->db->phptype) {
+			case 'mysql':
+				$query = sprintf("OPTIMIZE TABLE %s", $this->options['table']);
+				break;
+			case 'pgsql':
+				$query = sprintf("VACUUM %s", $this->options['table']);
+				break;
+			default:
+				$query = null;
+				break;
+			}
+			if (isset($query)) {
+				$result = $this->db->query($query);
+				if (MDB::isError($result)) {
+					new MDB_Error($result->code, PEAR_ERROR_DIE);
+					return false;
+				}
+			}
+		}
 
-        return true;
-    }
+		return true;
+	}
 }
 ?>
\ No newline at end of file

libraries/HTTP_Session/Session/Container/Memcache.php

Indentation +155 added lines, -155 removed lines

@@ -43,160 +43,160 @@
  */
 class HTTP_Session_Container_Memcache extends HTTP_Session_Container
 {
-    /**
-     * Memcache connection object
-     *
-     * @var     object  Memcache
-     * @access  private
-     */
-    var $mc;
-
-    /**
-     * Constructor method
-     *
-     * $options is an array with the options.<br>
-     * The options are:
-     * <ul>
-     * <li>'memcache' - Memcache object
-     * <li>'prefix' - Key prefix, default is 'sessiondata:'</li>
-     * </ul>
-     *
-     * @param array $options Options
-     *
-     * @access public
-     * @return object
-     */
-    public function HTTP_Session_Container_Memcache($options)
-    {
-        $this->_setDefaults();
-
-        if (is_array($options)) {
-            $this->_parseOptions($options);
-        }
-    }
-
-    /**
-     * Connect to database by using the given DSN string
-     *
-     * @param string $mc Memcache object
-     *
-     * @access private
-     * @return mixed   Object on error, otherwise bool
-     */
-    public function _connect($mc)
-    {
-        if (is_object($mc) && is_a($mc, 'Memcache')) {
-            $this->mc = $mc;
-
-        } else {
-
-            return new PEAR_Error('The given memcache object was not valid in file '
-                                  . __FILE__ . ' at line ' . __LINE__,
-                                  41,
-                                  PEAR_ERROR_RETURN,
-                                  null,
-                                  null
-                                 );
-        }
-
-        return true;
-    }
-
-    /**
-     * Set some default options
-     *
-     * @access private
-     * @return void
-     */
-    public function _setDefaults()
-    {
-        $this->options['prefix']   = 'sessiondata:';
-        $this->options['memcache'] = null;
-    }
-
-    /**
-     * Establish connection to a database
-     *
-     * @param string $save_path    Save path
-     * @param string $session_name Session name
-     *
-     * @access public
-     * @return mixed  Object on error, otherwise bool
-     */
-    public function open($save_path, $session_name)
-    {
-        return $this->_connect($this->options['memcache']);
-    }
-
-    /**
-     * Free resources
-     *
-     * @access public
-     * @return bool
-     */
-    public function close()
-    {
-        return true;
-    }
-
-    /**
-     * Read session data
-     *
-     * @param string $id Session id
-     *
-     * @access public
-     * @return mixed
-     */
-    public function read($id)
-    {
-        $result = $this->mc->get($this->options['prefix'] . $id);
-        return $result;
-    }
-
-    /**
-     * Write session data
-     *
-     * @param string $id   Session id
-     * @param mixed  $data Session data
-     *
-     * @access public
-     * @return bool
-     */
-    public function write($id, $data)
-    {
-        $this->mc->set($this->options['prefix'] . $id,
-                       $data,
-                       MEMCACHE_COMPRESSED,
-                       time() + ini_get('session.gc_maxlifetime'));
-
-        return true;
-    }
-
-    /**
-     * Destroy session data
-     *
-     * @param string $id Session id
-     *
-     * @access public
-     * @return bool
-     */
-    public function destroy($id)
-    {
-        $this->mc->delete($this->options['prefix'] . $id);
-        return true;
-    }
-
-    /**
-     * Garbage collection
-     *
-     * @param int $maxlifetime Maximum lifetime
-     *
-     * @access public
-     * @return bool
-     */
-    public function gc($maxlifetime)
-    {
-        return true;
-    }
+	/**
+	 * Memcache connection object
+	 *
+	 * @var     object  Memcache
+	 * @access  private
+	 */
+	var $mc;
+
+	/**
+	 * Constructor method
+	 *
+	 * $options is an array with the options.<br>
+	 * The options are:
+	 * <ul>
+	 * <li>'memcache' - Memcache object
+	 * <li>'prefix' - Key prefix, default is 'sessiondata:'</li>
+	 * </ul>
+	 *
+	 * @param array $options Options
+	 *
+	 * @access public
+	 * @return object
+	 */
+	public function HTTP_Session_Container_Memcache($options)
+	{
+		$this->_setDefaults();
+
+		if (is_array($options)) {
+			$this->_parseOptions($options);
+		}
+	}
+
+	/**
+	 * Connect to database by using the given DSN string
+	 *
+	 * @param string $mc Memcache object
+	 *
+	 * @access private
+	 * @return mixed   Object on error, otherwise bool
+	 */
+	public function _connect($mc)
+	{
+		if (is_object($mc) && is_a($mc, 'Memcache')) {
+			$this->mc = $mc;
+
+		} else {
+
+			return new PEAR_Error('The given memcache object was not valid in file '
+								  . __FILE__ . ' at line ' . __LINE__,
+								  41,
+								  PEAR_ERROR_RETURN,
+								  null,
+								  null
+								 );
+		}
+
+		return true;
+	}
+
+	/**
+	 * Set some default options
+	 *
+	 * @access private
+	 * @return void
+	 */
+	public function _setDefaults()
+	{
+		$this->options['prefix']   = 'sessiondata:';
+		$this->options['memcache'] = null;
+	}
+
+	/**
+	 * Establish connection to a database
+	 *
+	 * @param string $save_path    Save path
+	 * @param string $session_name Session name
+	 *
+	 * @access public
+	 * @return mixed  Object on error, otherwise bool
+	 */
+	public function open($save_path, $session_name)
+	{
+		return $this->_connect($this->options['memcache']);
+	}
+
+	/**
+	 * Free resources
+	 *
+	 * @access public
+	 * @return bool
+	 */
+	public function close()
+	{
+		return true;
+	}
+
+	/**
+	 * Read session data
+	 *
+	 * @param string $id Session id
+	 *
+	 * @access public
+	 * @return mixed
+	 */
+	public function read($id)
+	{
+		$result = $this->mc->get($this->options['prefix'] . $id);
+		return $result;
+	}
+
+	/**
+	 * Write session data
+	 *
+	 * @param string $id   Session id
+	 * @param mixed  $data Session data
+	 *
+	 * @access public
+	 * @return bool
+	 */
+	public function write($id, $data)
+	{
+		$this->mc->set($this->options['prefix'] . $id,
+					   $data,
+					   MEMCACHE_COMPRESSED,
+					   time() + ini_get('session.gc_maxlifetime'));
+
+		return true;
+	}
+
+	/**
+	 * Destroy session data
+	 *
+	 * @param string $id Session id
+	 *
+	 * @access public
+	 * @return bool
+	 */
+	public function destroy($id)
+	{
+		$this->mc->delete($this->options['prefix'] . $id);
+		return true;
+	}
+
+	/**
+	 * Garbage collection
+	 *
+	 * @param int $maxlifetime Maximum lifetime
+	 *
+	 * @access public
+	 * @return bool
+	 */
+	public function gc($maxlifetime)
+	{
+		return true;
+	}
 }
 ?>
\ No newline at end of file

libraries/HTTP_Session/Session/Container/DB.php

Indentation +279 added lines, -279 removed lines

@@ -59,306 +59,306 @@
  */
 class HTTP_Session_Container_DB extends HTTP_Session_Container
 {
-    /**
-     * DB connection object
-     *
-     * @var object DB
-     * @access private
-     */
-    var $db = null;
+	/**
+	 * DB connection object
+	 *
+	 * @var object DB
+	 * @access private
+	 */
+	var $db = null;
 
-    /**
-     * Session data cache id
-     *
-     * @var mixed
-     * @access private
-     */
-    var $crc = false;
+	/**
+	 * Session data cache id
+	 *
+	 * @var mixed
+	 * @access private
+	 */
+	var $crc = false;
 
-    /**
-     * Constrtuctor method
-     *
-     * $options is an array with the options.<br>
-     * The options are:
-     * <ul>
-     * <li>'dsn' - The DSN string</li>
-     * <li>'table' - Table with session data, default is 'sessiondata'</li>
-     * <li>'autooptimize' - Boolean, 'true' to optimize
-     * the table on garbage collection, default is 'false'.</li>
-     * </ul>
-     *
-     * @param array $options Options
-     *
-     * @access public
-     * @return object
-     */
-    public function HTTP_Session_Container_DB($options)
-    {
-        $this->_setDefaults();
-        if (is_array($options)) {
-            $this->_parseOptions($options);
-        } else {
-            $this->options['dsn'] = $options;
-        }
-    }
+	/**
+	 * Constrtuctor method
+	 *
+	 * $options is an array with the options.<br>
+	 * The options are:
+	 * <ul>
+	 * <li>'dsn' - The DSN string</li>
+	 * <li>'table' - Table with session data, default is 'sessiondata'</li>
+	 * <li>'autooptimize' - Boolean, 'true' to optimize
+	 * the table on garbage collection, default is 'false'.</li>
+	 * </ul>
+	 *
+	 * @param array $options Options
+	 *
+	 * @access public
+	 * @return object
+	 */
+	public function HTTP_Session_Container_DB($options)
+	{
+		$this->_setDefaults();
+		if (is_array($options)) {
+			$this->_parseOptions($options);
+		} else {
+			$this->options['dsn'] = $options;
+		}
+	}
 
-    /**
-     * Connect to database by using the given DSN string
-     *
-     * @param string $dsn DSN string
-     *
-     * @access private
-     * @return mixed   Object on error, otherwise bool
-     */
-    public function _connect($dsn)
-    {
-        if (is_string($dsn) || is_array($dsn)) {
-            $this->db = DB::connect($dsn);
-        } else if (is_object($dsn) && is_a($dsn, "db_common")) {
-            $this->db = $dsn;
-        } else if (is_object($dsn) && DB::isError($dsn)) {
-            return new DB_Error($dsn->code, PEAR_ERROR_DIE);
-        } else {
-            return new PEAR_Error("The given dsn was not valid in file " . __FILE__
-                                  . " at line " . __LINE__,
-                                  41,
-                                  PEAR_ERROR_RETURN,
-                                  null,
-                                  null
-                                  );
+	/**
+	 * Connect to database by using the given DSN string
+	 *
+	 * @param string $dsn DSN string
+	 *
+	 * @access private
+	 * @return mixed   Object on error, otherwise bool
+	 */
+	public function _connect($dsn)
+	{
+		if (is_string($dsn) || is_array($dsn)) {
+			$this->db = DB::connect($dsn);
+		} else if (is_object($dsn) && is_a($dsn, "db_common")) {
+			$this->db = $dsn;
+		} else if (is_object($dsn) && DB::isError($dsn)) {
+			return new DB_Error($dsn->code, PEAR_ERROR_DIE);
+		} else {
+			return new PEAR_Error("The given dsn was not valid in file " . __FILE__
+								  . " at line " . __LINE__,
+								  41,
+								  PEAR_ERROR_RETURN,
+								  null,
+								  null
+								  );
 
-        }
+		}
 
-        if (DB::isError($this->db)) {
-            return new DB_Error($this->db->code, PEAR_ERROR_DIE);
-        }
+		if (DB::isError($this->db)) {
+			return new DB_Error($this->db->code, PEAR_ERROR_DIE);
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * Set some default options
-     *
-     * @access private
-     * @return void
-     */
-    public function _setDefaults()
-    {
-        $this->options['dsn']          = null;
-        $this->options['table']        = 'sessiondata';
-        $this->options['autooptimize'] = false;
-    }
+	/**
+	 * Set some default options
+	 *
+	 * @access private
+	 * @return void
+	 */
+	public function _setDefaults()
+	{
+		$this->options['dsn']          = null;
+		$this->options['table']        = 'sessiondata';
+		$this->options['autooptimize'] = false;
+	}
 
-    /**
-     * Establish connection to a database
-     *
-     * @param string $save_path    Save path
-     * @param string $session_name Session name
-     *
-     * @return bool
-     */
-    public function open($save_path, $session_name)
-    {
-        if (DB::isError($this->_connect($this->options['dsn']))) {
-            return false;
-        } else {
-            return true;
-        }
-    }
+	/**
+	 * Establish connection to a database
+	 *
+	 * @param string $save_path    Save path
+	 * @param string $session_name Session name
+	 *
+	 * @return bool
+	 */
+	public function open($save_path, $session_name)
+	{
+		if (DB::isError($this->_connect($this->options['dsn']))) {
+			return false;
+		} else {
+			return true;
+		}
+	}
 
-    /**
-     * Free resources
-     *
-     * @return void
-     */
-    public function close()
-    {
-        return true;
-    }
+	/**
+	 * Free resources
+	 *
+	 * @return void
+	 */
+	public function close()
+	{
+		return true;
+	}
 
-    /**
-     * Read session data
-     *
-     * @param string $id Session id
-     *
-     * @return void
-     */
-    public function read($id)
-    {
-        $query = sprintf("SELECT data FROM %s WHERE id = %s && expiry >= %d",
-                         $this->options['table'],
-                         $this->db->quoteSmart(md5($id)),
-                         time());
-        $result = $this->db->getOne($query);
-        if (DB::isError($result)) {
-            new DB_Error($result->code, PEAR_ERROR_DIE);
-            return false;
-        }
-        $this->crc = strlen($result) . crc32($result);
-        return $result;
-    }
+	/**
+	 * Read session data
+	 *
+	 * @param string $id Session id
+	 *
+	 * @return void
+	 */
+	public function read($id)
+	{
+		$query = sprintf("SELECT data FROM %s WHERE id = %s && expiry >= %d",
+						 $this->options['table'],
+						 $this->db->quoteSmart(md5($id)),
+						 time());
+		$result = $this->db->getOne($query);
+		if (DB::isError($result)) {
+			new DB_Error($result->code, PEAR_ERROR_DIE);
+			return false;
+		}
+		$this->crc = strlen($result) . crc32($result);
+		return $result;
+	}
 
-    /**
-     * Write session data
-     *
-     * @param string $id   Session id
-     * @param mixed  $data Data
-     *
-     * @return bool
-     */
-    public function write($id, $data)
-    {
-        if ((false !== $this->crc) &&
-            ($this->crc === strlen($data) . crc32($data))) {
-            // $_SESSION hasn't been touched, no need to update the blob column
-            $query = sprintf("UPDATE %s SET expiry = %d WHERE id = %s",
-                             $this->options['table'],
-                             time() + ini_get('session.gc_maxlifetime'),
-                             $this->db->quoteSmart(md5($id)));
-        } else {
-            // Check if table row already exists
-            $query = sprintf("SELECT COUNT(id) FROM %s WHERE id = %s",
-                             $this->options['table'],
-                             $this->db->quoteSmart(md5($id)));
-            $result = $this->db->getOne($query);
-            if (DB::isError($result)) {
-                new DB_Error($result->code, PEAR_ERROR_DIE);
-                return false;
-            }
-            if (0 == intval($result)) {
-                // Insert new row into table
-                $query = sprintf("INSERT INTO %s (id, expiry, data) VALUES (%s, %d, %s)",
-                                 $this->options['table'],
-                                 $this->db->quoteSmart(md5($id)),
-                                 time() + ini_get('session.gc_maxlifetime'),
-                                 $this->db->quoteSmart($data));
-            } else {
-                // Update existing row
-                $query = sprintf("UPDATE %s SET expiry = %d, data = %s WHERE id = %s",
-                                 $this->options['table'],
-                                 time() + ini_get('session.gc_maxlifetime'),
-                                 $this->db->quoteSmart($data),
-                                 $this->db->quoteSmart(md5($id)));
-            }
-        }
-        $result = $this->db->query($query);
-        if (DB::isError($result)) {
-            new DB_Error($result->code, PEAR_ERROR_DIE);
-            return false;
-        }
+	/**
+	 * Write session data
+	 *
+	 * @param string $id   Session id
+	 * @param mixed  $data Data
+	 *
+	 * @return bool
+	 */
+	public function write($id, $data)
+	{
+		if ((false !== $this->crc) &&
+			($this->crc === strlen($data) . crc32($data))) {
+			// $_SESSION hasn't been touched, no need to update the blob column
+			$query = sprintf("UPDATE %s SET expiry = %d WHERE id = %s",
+							 $this->options['table'],
+							 time() + ini_get('session.gc_maxlifetime'),
+							 $this->db->quoteSmart(md5($id)));
+		} else {
+			// Check if table row already exists
+			$query = sprintf("SELECT COUNT(id) FROM %s WHERE id = %s",
+							 $this->options['table'],
+							 $this->db->quoteSmart(md5($id)));
+			$result = $this->db->getOne($query);
+			if (DB::isError($result)) {
+				new DB_Error($result->code, PEAR_ERROR_DIE);
+				return false;
+			}
+			if (0 == intval($result)) {
+				// Insert new row into table
+				$query = sprintf("INSERT INTO %s (id, expiry, data) VALUES (%s, %d, %s)",
+								 $this->options['table'],
+								 $this->db->quoteSmart(md5($id)),
+								 time() + ini_get('session.gc_maxlifetime'),
+								 $this->db->quoteSmart($data));
+			} else {
+				// Update existing row
+				$query = sprintf("UPDATE %s SET expiry = %d, data = %s WHERE id = %s",
+								 $this->options['table'],
+								 time() + ini_get('session.gc_maxlifetime'),
+								 $this->db->quoteSmart($data),
+								 $this->db->quoteSmart(md5($id)));
+			}
+		}
+		$result = $this->db->query($query);
+		if (DB::isError($result)) {
+			new DB_Error($result->code, PEAR_ERROR_DIE);
+			return false;
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * Destroy session data
-     *
-     * @param string $id Session id
-     *
-     * @return void
-     */
-    public function destroy($id)
-    {
-        $query = sprintf("DELETE FROM %s WHERE id = %s",
-                         $this->options['table'],
-                         $this->db->quoteSmart(md5($id)));
-        $result = $this->db->query($query);
-        if (DB::isError($result)) {
-            new DB_Error($result->code, PEAR_ERROR_DIE);
-            return false;
-        }
+	/**
+	 * Destroy session data
+	 *
+	 * @param string $id Session id
+	 *
+	 * @return void
+	 */
+	public function destroy($id)
+	{
+		$query = sprintf("DELETE FROM %s WHERE id = %s",
+						 $this->options['table'],
+						 $this->db->quoteSmart(md5($id)));
+		$result = $this->db->query($query);
+		if (DB::isError($result)) {
+			new DB_Error($result->code, PEAR_ERROR_DIE);
+			return false;
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * Replicate session data to table specified in option 'replicateBeforeDestroy'
-     *
-     * @param string $targetTable Table to replicate to
-     * @param string $id          Id of record to replicate
-     *
-     * @access private
-     * @return bool
-     */
-    public function replicate($targetTable, $id = null)
-    {
-        if (is_null($id)) {
-            $id = HTTP_Session::id();
-        }
+	/**
+	 * Replicate session data to table specified in option 'replicateBeforeDestroy'
+	 *
+	 * @param string $targetTable Table to replicate to
+	 * @param string $id          Id of record to replicate
+	 *
+	 * @access private
+	 * @return bool
+	 */
+	public function replicate($targetTable, $id = null)
+	{
+		if (is_null($id)) {
+			$id = HTTP_Session::id();
+		}
 
-        // Check if table row already exists
-        $query = sprintf("SELECT COUNT(id) FROM %s WHERE id = %s",
-                         $targetTable,
-                         $this->db->quoteSmart(md5($id)));
-        $result = $this->db->getOne($query);
-        if (DB::isError($result)) {
-            new DB_Error($result->code, PEAR_ERROR_DIE);
-            return false;
-        }
+		// Check if table row already exists
+		$query = sprintf("SELECT COUNT(id) FROM %s WHERE id = %s",
+						 $targetTable,
+						 $this->db->quoteSmart(md5($id)));
+		$result = $this->db->getOne($query);
+		if (DB::isError($result)) {
+			new DB_Error($result->code, PEAR_ERROR_DIE);
+			return false;
+		}
 
-        // Insert new row into dest table
-        if (0 == intval($result)) {
-            $query = sprintf("INSERT INTO %s SELECT * FROM %s WHERE id = %s",
-                             $targetTable,
-                             $this->options['table'],
-                             $this->db->quoteSmart(md5($id)));
+		// Insert new row into dest table
+		if (0 == intval($result)) {
+			$query = sprintf("INSERT INTO %s SELECT * FROM %s WHERE id = %s",
+							 $targetTable,
+							 $this->options['table'],
+							 $this->db->quoteSmart(md5($id)));
 
-        } else {
-            // Update existing row
-            $query = sprintf("UPDATE %s dst, %s src SET dst.expiry = src.expiry, dst.data = src.data WHERE dst.id = src.id && src.id = %s",
-                             $targetTable,
-                             $this->options['table'],
-                             $this->db->quoteSmart(md5($id)));
-        }
+		} else {
+			// Update existing row
+			$query = sprintf("UPDATE %s dst, %s src SET dst.expiry = src.expiry, dst.data = src.data WHERE dst.id = src.id && src.id = %s",
+							 $targetTable,
+							 $this->options['table'],
+							 $this->db->quoteSmart(md5($id)));
+		}
 
-        $result = $this->db->query($query);
-        if (DB::isError($result)) {
-            new DB_Error($result->code, PEAR_ERROR_DIE);
-            return false;
-        }
+		$result = $this->db->query($query);
+		if (DB::isError($result)) {
+			new DB_Error($result->code, PEAR_ERROR_DIE);
+			return false;
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * Garbage collection
-     *
-     * @param int $maxlifetime Maximum lifetime
-     *
-     * @return bool
-     */
-    public function gc($maxlifetime)
-    {
-        $query = sprintf("DELETE FROM %s WHERE expiry < %d",
-                         $this->options['table'],
-                         time());
-        $result = $this->db->query($query);
-        if (DB::isError($result)) {
-            new DB_Error($result->code, PEAR_ERROR_DIE);
-            return false;
-        }
-        if ($this->options['autooptimize']) {
-            switch($this->db->phptype) {
-            case 'mysql':
-                $query = sprintf("OPTIMIZE TABLE %s", $this->options['table']);
-                break;
-            case 'pgsql':
-                $query = sprintf("VACUUM %s", $this->options['table']);
-                break;
-            default:
-                $query = null;
-                break;
-            }
-            if (isset($query)) {
-                $result = $this->db->query($query);
-                if (DB::isError($result)) {
-                    new DB_Error($result->code, PEAR_ERROR_DIE);
-                    return false;
-                }
-            }
-        }
+	/**
+	 * Garbage collection
+	 *
+	 * @param int $maxlifetime Maximum lifetime
+	 *
+	 * @return bool
+	 */
+	public function gc($maxlifetime)
+	{
+		$query = sprintf("DELETE FROM %s WHERE expiry < %d",
+						 $this->options['table'],
+						 time());
+		$result = $this->db->query($query);
+		if (DB::isError($result)) {
+			new DB_Error($result->code, PEAR_ERROR_DIE);
+			return false;
+		}
+		if ($this->options['autooptimize']) {
+			switch($this->db->phptype) {
+			case 'mysql':
+				$query = sprintf("OPTIMIZE TABLE %s", $this->options['table']);
+				break;
+			case 'pgsql':
+				$query = sprintf("VACUUM %s", $this->options['table']);
+				break;
+			default:
+				$query = null;
+				break;
+			}
+			if (isset($query)) {
+				$result = $this->db->query($query);
+				if (DB::isError($result)) {
+					new DB_Error($result->code, PEAR_ERROR_DIE);
+					return false;
+				}
+			}
+		}
 
-        return true;
-    }
+		return true;
+	}
 }
 ?>
\ No newline at end of file

libraries/HTTP_Session/Session/Container.php

Indentation +194 added lines, -194 removed lines

@@ -44,237 +44,237 @@
  */
 class HTTP_Session_Container
 {
-    /**
-     * Additional options for the container object
-     *
-     * @var array
-     * @access private
-     */
-    var $options = array();
+	/**
+	 * Additional options for the container object
+	 *
+	 * @var array
+	 * @access private
+	 */
+	var $options = array();
 
-    /**
-     * Constrtuctor method
-     *
-     * @param array $options Additional options for the container object
-     *
-     * @access public
-     * @return object
-     */
-    public function HTTP_Session_Container($options = null)
-    {
-        $this->_setDefaults();
-        if (is_array($options)) {
-            $this->_parseOptions();
-        }
-    }
+	/**
+	 * Constrtuctor method
+	 *
+	 * @param array $options Additional options for the container object
+	 *
+	 * @access public
+	 * @return object
+	 */
+	public function HTTP_Session_Container($options = null)
+	{
+		$this->_setDefaults();
+		if (is_array($options)) {
+			$this->_parseOptions();
+		}
+	}
 
-    /**
-     * Set some default options
-     *
-     * @access private
-     * @return void
-     */
-    public function _setDefaults()
-    {
-    }
+	/**
+	 * Set some default options
+	 *
+	 * @access private
+	 * @return void
+	 */
+	public function _setDefaults()
+	{
+	}
 
-    /**
-     * Parse options passed to the container class
-     *
-     * @param array $options Options
-     *
-     * @access private
-     * @return void
-     */
-    public function _parseOptions($options)
-    {
-        foreach ($options as $option => $value) {
-            if (in_array($option, array_keys($this->options))) {
-                $this->options[$option] = $value;
-            }
-        }
-    }
+	/**
+	 * Parse options passed to the container class
+	 *
+	 * @param array $options Options
+	 *
+	 * @access private
+	 * @return void
+	 */
+	public function _parseOptions($options)
+	{
+		foreach ($options as $option => $value) {
+			if (in_array($option, array_keys($this->options))) {
+				$this->options[$option] = $value;
+			}
+		}
+	}
 
-    /**
-     * This function is called by the session handler to initialize things
-     *
-     * @param string $save_path    Save path
-     * @param string $session_name Session name
-     *
-     * @access public
-     * @return bool
-     */
-    public function open($save_path, $session_name)
-    {
-        return true;
-    }
+	/**
+	 * This function is called by the session handler to initialize things
+	 *
+	 * @param string $save_path    Save path
+	 * @param string $session_name Session name
+	 *
+	 * @access public
+	 * @return bool
+	 */
+	public function open($save_path, $session_name)
+	{
+		return true;
+	}
 
-    /**
-     * This function is called when the page is finished
-     * executing and the session handler needs to close things off
-     *
-     * Has to be overwritten by each container class
-     *
-     * @access public
-     * @return bool
-     */
-    public function close()
-    {
-        return true;
-    }
+	/**
+	 * This function is called when the page is finished
+	 * executing and the session handler needs to close things off
+	 *
+	 * Has to be overwritten by each container class
+	 *
+	 * @access public
+	 * @return bool
+	 */
+	public function close()
+	{
+		return true;
+	}
 
-    /**
-     * This function is called by the session handler
-     * to read the data associated with a given session ID.
-     * This function must retrieve and return the session data
-     * for the session identified by $id.
-     *
-     * Has to be overwritten by each container class
-     *
-     * @param string $id ID of the session
-     *
-     * @access public
-     * @return string
-     */
-    public function read($id)
-    {
-        return '';
-    }
+	/**
+	 * This function is called by the session handler
+	 * to read the data associated with a given session ID.
+	 * This function must retrieve and return the session data
+	 * for the session identified by $id.
+	 *
+	 * Has to be overwritten by each container class
+	 *
+	 * @param string $id ID of the session
+	 *
+	 * @access public
+	 * @return string
+	 */
+	public function read($id)
+	{
+		return '';
+	}
 
-    /**
-     * This function is called when the session handler
-     * has session data to save, which usually happens
-     * at the end of your script
-     *
-     * Has to be overwritten by each container class
-     *
-     * @param string $id   ID of the session
-     * @param mixed  $data The data associated with a given session ID
-     *
-     * @access public
-     * @return bool
-     */
-    public function write($id, $data)
-    {
-        return true;
-    }
+	/**
+	 * This function is called when the session handler
+	 * has session data to save, which usually happens
+	 * at the end of your script
+	 *
+	 * Has to be overwritten by each container class
+	 *
+	 * @param string $id   ID of the session
+	 * @param mixed  $data The data associated with a given session ID
+	 *
+	 * @access public
+	 * @return bool
+	 */
+	public function write($id, $data)
+	{
+		return true;
+	}
 
-    /**
-     * This function is called when a session is destroyed.
-     * It is responsible for deleting the session and cleaning things up.
-     *
-     * Has to be overwritten by each container class
-     *
-     * @param string $id ID of the session
-     *
-     * @access public
-     * @return bool
-     */
-    public function destroy($id)
-    {
-        return true;
-    }
+	/**
+	 * This function is called when a session is destroyed.
+	 * It is responsible for deleting the session and cleaning things up.
+	 *
+	 * Has to be overwritten by each container class
+	 *
+	 * @param string $id ID of the session
+	 *
+	 * @access public
+	 * @return bool
+	 */
+	public function destroy($id)
+	{
+		return true;
+	}
 
-    /**
-     * This function copies session data of specified id to specified table
-     *
-     * Has to be overwritten by each container class
-     *
-     * @param string $targetTable Table to replicate data to
-     * @param string $id          ID of the session
-     *
-     * @access public
-     * @return bool
-     */
-    public function replicate($targetTable, $id = null)
-    {
-        return true;
-    }
+	/**
+	 * This function copies session data of specified id to specified table
+	 *
+	 * Has to be overwritten by each container class
+	 *
+	 * @param string $targetTable Table to replicate data to
+	 * @param string $id          ID of the session
+	 *
+	 * @access public
+	 * @return bool
+	 */
+	public function replicate($targetTable, $id = null)
+	{
+		return true;
+	}
 
-    /**
-     * This function is responsible for garbage collection.
-     * In the case of session handling, it is responsible
-     * for deleting old, stale sessions that are hanging around.
-     * The session handler will call this every now and then.
-     *
-     * Has to be overwritten by each container class
-     *
-     * @param integer $maxlifetime Maximum lifetime
-     *
-     * @access public
-     * @return bool
-     */
-    public function gc($maxlifetime)
-    {
-        return true;
-    }
+	/**
+	 * This function is responsible for garbage collection.
+	 * In the case of session handling, it is responsible
+	 * for deleting old, stale sessions that are hanging around.
+	 * The session handler will call this every now and then.
+	 *
+	 * Has to be overwritten by each container class
+	 *
+	 * @param integer $maxlifetime Maximum lifetime
+	 *
+	 * @access public
+	 * @return bool
+	 */
+	public function gc($maxlifetime)
+	{
+		return true;
+	}
 
-    /**
-     * Set session save handler
-     *
-     * @access public
-     * @return void
-     */
-    public function set()
-    {
-        $GLOBALS['HTTP_Session_Container'] =& $this;
-        session_module_name('user');
-        session_set_save_handler('HTTP_Session_Open',
-                                 'HTTP_Session_Close',
-                                 'HTTP_Session_Read',
-                                 'HTTP_Session_Write',
-                                 'HTTP_Session_Destroy',
-                                 'HTTP_Session_GC');
-    }
+	/**
+	 * Set session save handler
+	 *
+	 * @access public
+	 * @return void
+	 */
+	public function set()
+	{
+		$GLOBALS['HTTP_Session_Container'] =& $this;
+		session_module_name('user');
+		session_set_save_handler('HTTP_Session_Open',
+								 'HTTP_Session_Close',
+								 'HTTP_Session_Read',
+								 'HTTP_Session_Write',
+								 'HTTP_Session_Destroy',
+								 'HTTP_Session_GC');
+	}
 
-    /**
-     * Destructor for compatibility with PHP >= 5.0.5
-     *
-     * @access private
-     * @return void
-     */
-    public function __destruct()
-    {
-        $GLOBALS['HTTP_Session_Container'] =& $this;
-        session_write_close();
-    }
+	/**
+	 * Destructor for compatibility with PHP >= 5.0.5
+	 *
+	 * @access private
+	 * @return void
+	 */
+	public function __destruct()
+	{
+		$GLOBALS['HTTP_Session_Container'] =& $this;
+		session_write_close();
+	}
 }
 
 // Delegate function calls to the object's methods
 /** @ignore */
 function HTTP_Session_Open($save_path, $session_name)
 {
-    return (isset($GLOBALS['HTTP_Session_Container'])) ? $GLOBALS['HTTP_Session_Container']->open($save_path, $session_name)
-                                                       : false;
+	return (isset($GLOBALS['HTTP_Session_Container'])) ? $GLOBALS['HTTP_Session_Container']->open($save_path, $session_name)
+													   : false;
 }
 /** @ignore */
 function HTTP_Session_Close()
 {
-    return (isset($GLOBALS['HTTP_Session_Container'])) ? $GLOBALS['HTTP_Session_Container']->close()
-                                                       : false;
+	return (isset($GLOBALS['HTTP_Session_Container'])) ? $GLOBALS['HTTP_Session_Container']->close()
+													   : false;
 }
 /** @ignore */
 function HTTP_Session_Read($id)
 {
-    return (isset($GLOBALS['HTTP_Session_Container'])) ? $GLOBALS['HTTP_Session_Container']->read($id)
-                                                       : false;
+	return (isset($GLOBALS['HTTP_Session_Container'])) ? $GLOBALS['HTTP_Session_Container']->read($id)
+													   : false;
 }
 /** @ignore */
 function HTTP_Session_Write($id, $data)
 {
-    return (isset($GLOBALS['HTTP_Session_Container'])) ? $GLOBALS['HTTP_Session_Container']->write($id, $data)
-                                                       : false;
+	return (isset($GLOBALS['HTTP_Session_Container'])) ? $GLOBALS['HTTP_Session_Container']->write($id, $data)
+													   : false;
 }
 /** @ignore */
 function HTTP_Session_Destroy($id)
 {
-    return (isset($GLOBALS['HTTP_Session_Container'])) ? $GLOBALS['HTTP_Session_Container']->destroy($id)
-                                                       : false;
+	return (isset($GLOBALS['HTTP_Session_Container'])) ? $GLOBALS['HTTP_Session_Container']->destroy($id)
+													   : false;
 }
 /** @ignore */
 function HTTP_Session_GC($maxlifetime)
 {
-    return (isset($GLOBALS['HTTP_Session_Container'])) ? $GLOBALS['HTTP_Session_Container']->gc($maxlifetime)
-                                                       : false;
+	return (isset($GLOBALS['HTTP_Session_Container'])) ? $GLOBALS['HTTP_Session_Container']->gc($maxlifetime)
+													   : false;
 }
 ?>
\ No newline at end of file