YetiForceCompany / YetiForceCRM

libraries/log4php.debug/spi/LoggerLoggingEvent.php

Indentation +299 added lines, -299 removed lines

@@ -39,90 +39,90 @@ 
  */
 class LoggerLoggingEvent {
 
-    /** 
-    * @var string Fully Qualified Class Name of the calling category class.
-    */
-    public $fqcn;
+	/** 
+	 * @var string Fully Qualified Class Name of the calling category class.
+	 */
+	public $fqcn;
     
-    /**
-    * @var Logger reference
-    */
-    public $logger = null;
+	/**
+	 * @var Logger reference
+	 */
+	public $logger = null;
     
-    /** 
-    * The category (logger) name.
-    * This field will be marked as private in future
-    * releases. Please do not access it directly. 
-    * Use the {@link getLoggerName()} method instead.
-    * @deprecated 
-    */
-    public $categoryName;
+	/** 
+	 * The category (logger) name.
+	 * This field will be marked as private in future
+	 * releases. Please do not access it directly. 
+	 * Use the {@link getLoggerName()} method instead.
+	 * @deprecated 
+	 */
+	public $categoryName;
     
-    /** 
-    * Level of logging event.
-    * <p> This field should not be accessed directly. You shoud use the
-    * {@link getLevel()} method instead.
-    *
-    * @deprecated
-    * @var LoggerLevel
-    */
-    public $level;
+	/** 
+	 * Level of logging event.
+	 * <p> This field should not be accessed directly. You shoud use the
+	 * {@link getLevel()} method instead.
+	 *
+	 * @deprecated
+	 * @var LoggerLevel
+	 */
+	public $level;
     
-    /** 
-     * @var string The nested diagnostic context (NDC) of logging event. 
-     */
-    public $ndc;
+	/** 
+	 * @var string The nested diagnostic context (NDC) of logging event. 
+	 */
+	public $ndc;
     
-    /** 
-     * Have we tried to do an NDC lookup? If we did, there is no need
-     * to do it again.  Note that its value is always false when
-     * serialized. Thus, a receiving SocketNode will never use it's own
-     * (incorrect) NDC. See also writeObject method.
-     * @var boolean
-     */
-    public $ndcLookupRequired = true;
+	/** 
+	 * Have we tried to do an NDC lookup? If we did, there is no need
+	 * to do it again.  Note that its value is always false when
+	 * serialized. Thus, a receiving SocketNode will never use it's own
+	 * (incorrect) NDC. See also writeObject method.
+	 * @var boolean
+	 */
+	public $ndcLookupRequired = true;
     
-    /** 
-     * Have we tried to do an MDC lookup? If we did, there is no need
-     * to do it again.  Note that its value is always false when
-     * serialized. See also the getMDC and getMDCCopy methods.
-     * @var boolean  
-     */
-    public $mdcCopyLookupRequired = true;
+	/** 
+	 * Have we tried to do an MDC lookup? If we did, there is no need
+	 * to do it again.  Note that its value is always false when
+	 * serialized. See also the getMDC and getMDCCopy methods.
+	 * @var boolean  
+	 */
+	public $mdcCopyLookupRequired = true;
     
-    /** 
-     * @var mixed The application supplied message of logging event. 
-     */
-    public $message;
+	/** 
+	 * @var mixed The application supplied message of logging event. 
+	 */
+	public $message;
     
-    /** 
-     * The application supplied message rendered through the log4php
-     * objet rendering mechanism. At present renderedMessage == message.
-     * @var string
-     */
-    public $renderedMessage;
+	/** 
+	 * The application supplied message rendered through the log4php
+	 * objet rendering mechanism. At present renderedMessage == message.
+	 * @var string
+	 */
+	public $renderedMessage;
     
-    /** 
-     * The name of thread in which this logging event was generated.
-     * log4php saves here the process id via {@link PHP_MANUAL#getmypid getmypid()} 
-     * @var mixed
-     */
-    public $threadName = null;
+	/** 
+	 * The name of thread in which this logging event was generated.
+	 * log4php saves here the process id via {@link PHP_MANUAL#getmypid getmypid()} 
+	 * @var mixed
+	 */
+	public $threadName = null;
     
-    /** 
-    * The number of seconds elapsed from 1/1/1970 until logging event
-    * was created plus microseconds if available.
-    * @var float
-    */
-    public $timeStamp;
+	/** 
+	 * The number of seconds elapsed from 1/1/1970 until logging event
+	 * was created plus microseconds if available.
+	 * @var float
+	 */
+	public $timeStamp;
     
-    /** 
-    * @var LoggerLocationInfo Location information for the caller. 
-    */
-    public $locationInfo = null;
+	/** 
+	 * @var LoggerLocationInfo Location information for the caller. 
+	 */
+	public $locationInfo = null;
     
-    // Serialization
-    /*
+	// Serialization
+	/*
     public $serialVersionUID = -868428216207166145L;
     public $PARAM_ARRAY = array();
     public $TO_LEVEL = "toLevel";
@@ -130,252 +130,252 @@ 
     public $methodCache = array(); // use a tiny table
     */
 
-    /**
-    * Instantiate a LoggingEvent from the supplied parameters.
-    *
-    * <p>Except {@link $timeStamp} all the other fields of
-    * LoggerLoggingEvent are filled when actually needed.
-    *
-    * @param string $fqcn name of the caller class.
-    * @param mixed &$logger The {@link Logger} category of this event or the logger name.
-    * @param LoggerLevel $priority The level of this event.
-    * @param mixed $message The message of this event.
-    * @param integer $timeStamp the timestamp of this logging event.
-    */
-    public function LoggerLoggingEvent($fqcn, &$logger, $priority, $message, $timeStamp = null)
-    {
-        $this->fqcn = $fqcn;
-        if (is_a($logger, 'logger')) {
-            $this->logger =& $logger;
-            $this->categoryName = $logger->getName();
-        } else {
-            $this->categoryName = (string)$logger;
-        }
-        $this->level = $priority;
-        $this->message = $message;
-        if ($timeStamp !== null && is_float($timeStamp)) {
-            $this->timeStamp = $timeStamp;
-        } else {
-            if (function_exists('microtime')) {
-                list($usecs, $secs) = explode(' ', microtime());
-                $this->timeStamp = ((float)$usecs + (float)$secs);
-            } else {
-                $this->timeStamp = time();
-            }
-        }
-    }
+	/**
+	 * Instantiate a LoggingEvent from the supplied parameters.
+	 *
+	 * <p>Except {@link $timeStamp} all the other fields of
+	 * LoggerLoggingEvent are filled when actually needed.
+	 *
+	 * @param string $fqcn name of the caller class.
+	 * @param mixed &$logger The {@link Logger} category of this event or the logger name.
+	 * @param LoggerLevel $priority The level of this event.
+	 * @param mixed $message The message of this event.
+	 * @param integer $timeStamp the timestamp of this logging event.
+	 */
+	public function LoggerLoggingEvent($fqcn, &$logger, $priority, $message, $timeStamp = null)
+	{
+		$this->fqcn = $fqcn;
+		if (is_a($logger, 'logger')) {
+			$this->logger =& $logger;
+			$this->categoryName = $logger->getName();
+		} else {
+			$this->categoryName = (string)$logger;
+		}
+		$this->level = $priority;
+		$this->message = $message;
+		if ($timeStamp !== null && is_float($timeStamp)) {
+			$this->timeStamp = $timeStamp;
+		} else {
+			if (function_exists('microtime')) {
+				list($usecs, $secs) = explode(' ', microtime());
+				$this->timeStamp = ((float)$usecs + (float)$secs);
+			} else {
+				$this->timeStamp = time();
+			}
+		}
+	}
 
-    /**
-     * Set the location information for this logging event. The collected
-     * information is cached for future use.
-     *
-     * <p>This method uses {@link PHP_MANUAL#debug_backtrace debug_backtrace()} function (if exists)
-     * to collect informations about caller.</p>
-     * <p>It only recognize informations generated by {@link Logger} and its subclasses.</p>
-     * @return LoggerLocationInfo
-     */
-    public function getLocationInformation()
-    {
-        if($this->locationInfo === null) {
+	/**
+	 * Set the location information for this logging event. The collected
+	 * information is cached for future use.
+	 *
+	 * <p>This method uses {@link PHP_MANUAL#debug_backtrace debug_backtrace()} function (if exists)
+	 * to collect informations about caller.</p>
+	 * <p>It only recognize informations generated by {@link Logger} and its subclasses.</p>
+	 * @return LoggerLocationInfo
+	 */
+	public function getLocationInformation()
+	{
+		if($this->locationInfo === null) {
 
-            $locationInfo = array();
+			$locationInfo = array();
 
-            if (function_exists('debug_backtrace')) {
-                $trace = debug_backtrace();
-                $prevHop = null;
-                // make a downsearch to identify the caller
-                $hop = array_pop($trace);
-                while ($hop !== null) {
-                    $className = @$hop['class'];
-                    if ( !empty($className) && ($className == 'logger' || get_parent_class($className) == 'logger') ) {
-                        $locationInfo['line'] = $hop['line'];
-                        $locationInfo['file'] = $hop['file'];                         
-                        break;
-                    }
-                    $prevHop = $hop;
-                    $hop = array_pop($trace);
-                }
-                $locationInfo['class'] = isset($prevHop['class']) ? $prevHop['class'] : 'main';
-                if (isset($prevHop['function']) &&
-                    $prevHop['function'] !== 'include' &&
-                    $prevHop['function'] !== 'include_once' &&
-                    $prevHop['function'] !== 'require' &&
-                    $prevHop['function'] !== 'require_once') {                                        
+			if (function_exists('debug_backtrace')) {
+				$trace = debug_backtrace();
+				$prevHop = null;
+				// make a downsearch to identify the caller
+				$hop = array_pop($trace);
+				while ($hop !== null) {
+					$className = @$hop['class'];
+					if ( !empty($className) && ($className == 'logger' || get_parent_class($className) == 'logger') ) {
+						$locationInfo['line'] = $hop['line'];
+						$locationInfo['file'] = $hop['file'];                         
+						break;
+					}
+					$prevHop = $hop;
+					$hop = array_pop($trace);
+				}
+				$locationInfo['class'] = isset($prevHop['class']) ? $prevHop['class'] : 'main';
+				if (isset($prevHop['function']) &&
+					$prevHop['function'] !== 'include' &&
+					$prevHop['function'] !== 'include_once' &&
+					$prevHop['function'] !== 'require' &&
+					$prevHop['function'] !== 'require_once') {                                        
     
-                    $locationInfo['function'] = $prevHop['function'];
-                } else {
-                    $locationInfo['function'] = 'main';
-                }
-            }
+					$locationInfo['function'] = $prevHop['function'];
+				} else {
+					$locationInfo['function'] = 'main';
+				}
+			}
                      
-            $this->locationInfo = new LoggerLocationInfo($locationInfo, $this->fqcn);
-        }
-        return $this->locationInfo;
-    }
+			$this->locationInfo = new LoggerLocationInfo($locationInfo, $this->fqcn);
+		}
+		return $this->locationInfo;
+	}
 
-    /**
-     * Return the level of this event. Use this form instead of directly
-     * accessing the {@link $level} field.
-     * @return LoggerLevel  
-     */
-    public function getLevel()
-    {
-        return $this->level;
-    }
+	/**
+	 * Return the level of this event. Use this form instead of directly
+	 * accessing the {@link $level} field.
+	 * @return LoggerLevel  
+	 */
+	public function getLevel()
+	{
+		return $this->level;
+	}
 
-    /**
-     * Return the name of the logger. Use this form instead of directly
-     * accessing the {@link $categoryName} field.
-     * @return string  
-     */
-    public function getLoggerName()
-    {
-        return $this->categoryName;
-    }
+	/**
+	 * Return the name of the logger. Use this form instead of directly
+	 * accessing the {@link $categoryName} field.
+	 * @return string  
+	 */
+	public function getLoggerName()
+	{
+		return $this->categoryName;
+	}
 
-    /**
-     * Return the message for this logging event.
-     *
-     * <p>Before serialization, the returned object is the message
-     * passed by the user to generate the logging event. After
-     * serialization, the returned value equals the String form of the
-     * message possibly after object rendering.
-     * @return mixed
-     */
-    public function getMessage()
-    {
-        if($this->message !== null) {
-            return $this->message;
-        } else {
-            return $this->getRenderedMessage();
-        }
-    }
+	/**
+	 * Return the message for this logging event.
+	 *
+	 * <p>Before serialization, the returned object is the message
+	 * passed by the user to generate the logging event. After
+	 * serialization, the returned value equals the String form of the
+	 * message possibly after object rendering.
+	 * @return mixed
+	 */
+	public function getMessage()
+	{
+		if($this->message !== null) {
+			return $this->message;
+		} else {
+			return $this->getRenderedMessage();
+		}
+	}
 
-    /**
-     * This method returns the NDC for this event. It will return the
-     * correct content even if the event was generated in a different
-     * thread or even on a different machine. The {@link LoggerNDC::get()} method
-     * should <b>never</b> be called directly.
-     * @return string  
-     */
-    public function getNDC()
-    {
-        if ($this->ndcLookupRequired) {
-            $this->ndcLookupRequired = false;
-            $this->ndc = implode(' ',LoggerNDC::get());
-        }
-        return $this->ndc;
-    }
+	/**
+	 * This method returns the NDC for this event. It will return the
+	 * correct content even if the event was generated in a different
+	 * thread or even on a different machine. The {@link LoggerNDC::get()} method
+	 * should <b>never</b> be called directly.
+	 * @return string  
+	 */
+	public function getNDC()
+	{
+		if ($this->ndcLookupRequired) {
+			$this->ndcLookupRequired = false;
+			$this->ndc = implode(' ',LoggerNDC::get());
+		}
+		return $this->ndc;
+	}
 
 
-    /**
-     * Returns the the context corresponding to the <code>key</code>
-     * parameter.
-     * @return string
-     */
-    public function getMDC($key)
-    {
-        return LoggerMDC::get($key);
-    }
+	/**
+	 * Returns the the context corresponding to the <code>key</code>
+	 * parameter.
+	 * @return string
+	 */
+	public function getMDC($key)
+	{
+		return LoggerMDC::get($key);
+	}
 
-    /**
-     * Render message.
-     * @return string
-     */
-    public function getRenderedMessage()
-    {
-        if($this->renderedMessage === null && $this->message !== null) {
-            if (is_string($this->message)) {
-	            $this->renderedMessage = $this->message;
-            } else {
-                if ($this->logger !== null) {
-                    $repository =& $this->logger->getLoggerRepository();
-                } else {
-                    $repository =& LoggerManager::getLoggerRepository();
-                }
-                if (method_exists($repository, 'getrenderermap')) {
-                    $rendererMap =& $repository->getRendererMap();
-	                $this->renderedMessage= $rendererMap->findAndRender($this->message);
-	            } else {
-	                $this->renderedMessage = (string)$this->message;
-	            }
-            }
-        }
-        return $this->renderedMessage;
-    }
+	/**
+	 * Render message.
+	 * @return string
+	 */
+	public function getRenderedMessage()
+	{
+		if($this->renderedMessage === null && $this->message !== null) {
+			if (is_string($this->message)) {
+				$this->renderedMessage = $this->message;
+			} else {
+				if ($this->logger !== null) {
+					$repository =& $this->logger->getLoggerRepository();
+				} else {
+					$repository =& LoggerManager::getLoggerRepository();
+				}
+				if (method_exists($repository, 'getrenderermap')) {
+					$rendererMap =& $repository->getRendererMap();
+					$this->renderedMessage= $rendererMap->findAndRender($this->message);
+				} else {
+					$this->renderedMessage = (string)$this->message;
+				}
+			}
+		}
+		return $this->renderedMessage;
+	}
 
-    /**
-     * Returns the time when the application started, in seconds
-     * elapsed since 01.01.1970 plus microseconds if available.
-     *
-     * @return float
-     * @static
-     */
-    public function getStartTime()
-    {
-        static $startTime;
+	/**
+	 * Returns the time when the application started, in seconds
+	 * elapsed since 01.01.1970 plus microseconds if available.
+	 *
+	 * @return float
+	 * @static
+	 */
+	public function getStartTime()
+	{
+		static $startTime;
         
-        if (!isset($startTime)) {
-            if (function_exists('microtime')) {
-                list($usec, $sec) = explode(' ', microtime()); 
-                $startTime = ((float)$usec + (float)$sec);
-            } else {
-                $startTime = time();
-            }
-        }
-        return $startTime; 
-    }
+		if (!isset($startTime)) {
+			if (function_exists('microtime')) {
+				list($usec, $sec) = explode(' ', microtime()); 
+				$startTime = ((float)$usec + (float)$sec);
+			} else {
+				$startTime = time();
+			}
+		}
+		return $startTime; 
+	}
     
-    /**
-     * @return float
-     */
-    public function getTimeStamp()
-    {
-        return $this->timeStamp;
-    }
+	/**
+	 * @return float
+	 */
+	public function getTimeStamp()
+	{
+		return $this->timeStamp;
+	}
     
-    /**
-     * @return mixed
-     */
-    public function getThreadName()
-    {
-        if ($this->threadName === null)
-            $this->threadName = (string)getmypid();
-        return $this->threadName;
-    }
+	/**
+	 * @return mixed
+	 */
+	public function getThreadName()
+	{
+		if ($this->threadName === null)
+			$this->threadName = (string)getmypid();
+		return $this->threadName;
+	}
 
-    /**
-     * @return mixed null
-     */
-    public function getThrowableInformation()
-    {
-        return null;
-    }
+	/**
+	 * @return mixed null
+	 */
+	public function getThrowableInformation()
+	{
+		return null;
+	}
     
-    /**
-     * Serialize this object
-     * @return string
-     */
-    public function toString()
-    {
-        serialize($this);
-    }
+	/**
+	 * Serialize this object
+	 * @return string
+	 */
+	public function toString()
+	{
+		serialize($this);
+	}
     
-    /**
-     * Avoid serialization of the {@link $logger} object
-     */
-    public function __sleep()
-    {
-        return array(
-            'fqcn','categoryName',
-            'level',
-            'ndc','ndcLookupRequired',
-            'message','renderedMessage',
-            'threadName',
-            'timestamp',
-            'locationInfo'
-        );
-    }
+	/**
+	 * Avoid serialization of the {@link $logger} object
+	 */
+	public function __sleep()
+	{
+		return array(
+			'fqcn','categoryName',
+			'level',
+			'ndc','ndcLookupRequired',
+			'message','renderedMessage',
+			'threadName',
+			'timestamp',
+			'locationInfo'
+		);
+	}
 
 }
 

libraries/log4php.debug/spi/LoggerFilter.php

Indentation +27 added lines, -27 removed lines

@@ -79,35 +79,35 @@
  */
 class LoggerFilter {
 
-    /**
-     * @var LoggerFilter Points to the next {@link LoggerFilter} in the filter chain.
-     */
-    public $next;
+	/**
+	 * @var LoggerFilter Points to the next {@link LoggerFilter} in the filter chain.
+	 */
+	public $next;
 
-    /**
-     * Usually filters options become active when set. We provide a
-     * default do-nothing implementation for convenience.
-    */
-    public function activateOptions()
-    {
-        return;
-    }
+	/**
+	 * Usually filters options become active when set. We provide a
+	 * default do-nothing implementation for convenience.
+	 */
+	public function activateOptions()
+	{
+		return;
+	}
 
-    /**   
-     * Decide what to do.  
-     * <p>If the decision is {@link LOG4PHP_LOGGER_FILTER_DENY}, then the event will be
-     * dropped. If the decision is {@link LOG4PHP_LOGGER_FILTER_NEUTRAL}, then the next
-     * filter, if any, will be invoked. If the decision is {@link LOG4PHP_LOGGER_FILTER_ACCEPT} then
-     * the event will be logged without consulting with other filters in
-     * the chain.
-     *
-     * @param LoggerLoggingEvent $event The {@link LoggerLoggingEvent} to decide upon.
-     * @return integer {@link LOG4PHP_LOGGER_FILTER_NEUTRAL} or {@link LOG4PHP_LOGGER_FILTER_DENY}|{@link LOG4PHP_LOGGER_FILTER_ACCEPT}
-     */
-    public function decide($event)
-    {
-        return LOG4PHP_LOGGER_FILTER_NEUTRAL;
-    }
+	/**   
+	 * Decide what to do.  
+	 * <p>If the decision is {@link LOG4PHP_LOGGER_FILTER_DENY}, then the event will be
+	 * dropped. If the decision is {@link LOG4PHP_LOGGER_FILTER_NEUTRAL}, then the next
+	 * filter, if any, will be invoked. If the decision is {@link LOG4PHP_LOGGER_FILTER_ACCEPT} then
+	 * the event will be logged without consulting with other filters in
+	 * the chain.
+	 *
+	 * @param LoggerLoggingEvent $event The {@link LoggerLoggingEvent} to decide upon.
+	 * @return integer {@link LOG4PHP_LOGGER_FILTER_NEUTRAL} or {@link LOG4PHP_LOGGER_FILTER_DENY}|{@link LOG4PHP_LOGGER_FILTER_ACCEPT}
+	 */
+	public function decide($event)
+	{
+		return LOG4PHP_LOGGER_FILTER_NEUTRAL;
+	}
 
 }
 ?>
\ No newline at end of file

libraries/log4php.debug/config/LoggerPropertySetter.php

Indentation +93 added lines, -93 removed lines

@@ -53,109 +53,109 @@
  */
 class LoggerPropertySetter {
 
-    /**
-     * @var object the target object
-     * @access private
-     */
-    public $obj;
+	/**
+	 * @var object the target object
+	 * @access private
+	 */
+	public $obj;
   
-    /**
-     * Create a new LoggerPropertySetter for the specified Object. 
-     * This is done in prepartion for invoking {@link setProperty()} 
-     * one or more times.
-     * @param object &$obj the object for which to set properties
-     */
-    public function LoggerPropertySetter(&$obj)
-    {
-        $this->obj =& $obj;
-    }
+	/**
+	 * Create a new LoggerPropertySetter for the specified Object. 
+	 * This is done in prepartion for invoking {@link setProperty()} 
+	 * one or more times.
+	 * @param object &$obj the object for which to set properties
+	 */
+	public function LoggerPropertySetter(&$obj)
+	{
+		$this->obj =& $obj;
+	}
   
-    /**
-     * Set the properties of an object passed as a parameter in one
-     * go. The <code>properties</code> are parsed relative to a
-     * <code>prefix</code>.
-     *
-     * @param object &$obj The object to configure.
-     * @param array $properties An array containing keys and values.
-     * @param string $prefix Only keys having the specified prefix will be set.
-     * @static
-     */
-    public function setPropertiesByObject(&$obj, $properties, $prefix)
-    {
-        $pSetter = new LoggerPropertySetter($obj);
-        return $pSetter->setProperties($properties, $prefix);
-    }
+	/**
+	 * Set the properties of an object passed as a parameter in one
+	 * go. The <code>properties</code> are parsed relative to a
+	 * <code>prefix</code>.
+	 *
+	 * @param object &$obj The object to configure.
+	 * @param array $properties An array containing keys and values.
+	 * @param string $prefix Only keys having the specified prefix will be set.
+	 * @static
+	 */
+	public function setPropertiesByObject(&$obj, $properties, $prefix)
+	{
+		$pSetter = new LoggerPropertySetter($obj);
+		return $pSetter->setProperties($properties, $prefix);
+	}
   
 
-    /**
-     * Set the properites for the object that match the
-     * <code>prefix</code> passed as parameter.
-     *
-     * @param array $properties An array containing keys and values.
-     * @param string $prefix Only keys having the specified prefix will be set.
-     */
-    public function setProperties($properties, $prefix)
-    {
-        LoggerLog::debug("LoggerOptionConverter::setProperties():prefix=[{$prefix}]");
+	/**
+	 * Set the properites for the object that match the
+	 * <code>prefix</code> passed as parameter.
+	 *
+	 * @param array $properties An array containing keys and values.
+	 * @param string $prefix Only keys having the specified prefix will be set.
+	 */
+	public function setProperties($properties, $prefix)
+	{
+		LoggerLog::debug("LoggerOptionConverter::setProperties():prefix=[{$prefix}]");
 
-        $len = strlen($prefix);
-        while (list($key,) = each($properties)) {
-            if (strpos($key, $prefix) === 0) {
-                if (strpos($key, '.', ($len + 1)) > 0)
-                    continue;
-                $value = LoggerOptionConverter::findAndSubst($key, $properties);
-                $key = substr($key, $len);
-                if ($key == 'layout' && is_a($this->obj, 'loggerappender')) {
-                    continue;
-                }
-                $this->setProperty($key, $value);
-            }
-        }
-        $this->activate();
-    }
+		$len = strlen($prefix);
+		while (list($key,) = each($properties)) {
+			if (strpos($key, $prefix) === 0) {
+				if (strpos($key, '.', ($len + 1)) > 0)
+					continue;
+				$value = LoggerOptionConverter::findAndSubst($key, $properties);
+				$key = substr($key, $len);
+				if ($key == 'layout' && is_a($this->obj, 'loggerappender')) {
+					continue;
+				}
+				$this->setProperty($key, $value);
+			}
+		}
+		$this->activate();
+	}
     
-    /**
-     * Set a property on this PropertySetter's Object. If successful, this
-     * method will invoke a setter method on the underlying Object. The
-     * setter is the one for the specified property name and the value is
-     * determined partly from the setter argument type and partly from the
-     * value specified in the call to this method.
-     *
-     * <p>If the setter expects a String no conversion is necessary.
-     * If it expects an int, then an attempt is made to convert 'value'
-     * to an int using new Integer(value). If the setter expects a boolean,
-     * the conversion is by new Boolean(value).
-     *
-     * @param string $name    name of the property
-     * @param string $value   String value of the property
-     */
-    public function setProperty($name, $value)
-    {
-        LoggerLog::debug("LoggerOptionConverter::setProperty():name=[{$name}]:value=[{$value}]");
+	/**
+	 * Set a property on this PropertySetter's Object. If successful, this
+	 * method will invoke a setter method on the underlying Object. The
+	 * setter is the one for the specified property name and the value is
+	 * determined partly from the setter argument type and partly from the
+	 * value specified in the call to this method.
+	 *
+	 * <p>If the setter expects a String no conversion is necessary.
+	 * If it expects an int, then an attempt is made to convert 'value'
+	 * to an int using new Integer(value). If the setter expects a boolean,
+	 * the conversion is by new Boolean(value).
+	 *
+	 * @param string $name    name of the property
+	 * @param string $value   String value of the property
+	 */
+	public function setProperty($name, $value)
+	{
+		LoggerLog::debug("LoggerOptionConverter::setProperty():name=[{$name}]:value=[{$value}]");
 
-        if ($value === null) return;
+		if ($value === null) return;
         
-        $method = "set" . ucfirst($name);
+		$method = "set" . ucfirst($name);
         
-        if (!method_exists($this->obj, $method)) {
-            LoggerLog::warn(
-                "LoggerOptionConverter::setProperty() No such setter method for [{$name}] property in " .
-		        get_class($this->obj) . "." 
-            );
-        } else {
-            return call_user_func(array(&$this->obj, $method), $value);
-        } 
-    }
+		if (!method_exists($this->obj, $method)) {
+			LoggerLog::warn(
+				"LoggerOptionConverter::setProperty() No such setter method for [{$name}] property in " .
+				get_class($this->obj) . "." 
+			);
+		} else {
+			return call_user_func(array(&$this->obj, $method), $value);
+		} 
+	}
   
-    public function activate()
-    {
-        LoggerLog::debug("LoggerOptionConverter::activate()");
+	public function activate()
+	{
+		LoggerLog::debug("LoggerOptionConverter::activate()");
     
-        if (method_exists($this->obj, 'activateoptions')) {
-            return call_user_func(array(&$this->obj, 'activateoptions'));
-        } else {
-            LoggerLog::debug("LoggerOptionConverter::activate() Nothing to activate.");
-        }
-    }
+		if (method_exists($this->obj, 'activateoptions')) {
+			return call_user_func(array(&$this->obj, 'activateoptions'));
+		} else {
+			LoggerLog::debug("LoggerOptionConverter::activate() Nothing to activate.");
+		}
+	}
 }
 ?>
\ No newline at end of file

libraries/log4php.debug/LoggerHierarchy.php

Indentation +289 added lines, -289 removed lines

@@ -52,196 +52,196 @@ 
  */
 class LoggerHierarchy {
 
-    /**
-     * @var object currently unused
-     */
-    public $defaultFactory;
+	/**
+	 * @var object currently unused
+	 */
+	public $defaultFactory;
     
-    /**
-     * @var boolean activate internal logging
-     * @see LoggerLog
-     */
-    public $debug = false;
+	/**
+	 * @var boolean activate internal logging
+	 * @see LoggerLog
+	 */
+	public $debug = false;
 
-    /**
-     * @var array hierarchy tree. saves here all loggers
-     */
-    public $ht = array();
+	/**
+	 * @var array hierarchy tree. saves here all loggers
+	 */
+	public $ht = array();
     
-    /**
-     * @var LoggerRoot
-     */
-    public $root = null;
+	/**
+	 * @var LoggerRoot
+	 */
+	public $root = null;
     
-    /**
-     * @var LoggerRendererMap
-     */
-    public $rendererMap;
+	/**
+	 * @var LoggerRendererMap
+	 */
+	public $rendererMap;
 
-    /**
-     * @var LoggerLevel main level threshold
-     */
-    public $threshold;
+	/**
+	 * @var LoggerLevel main level threshold
+	 */
+	public $threshold;
     
-    /**
-     * @var boolean currently unused
-     */
-    public $emittedNoAppenderWarning       = false;
+	/**
+	 * @var boolean currently unused
+	 */
+	public $emittedNoAppenderWarning       = false;
 
-    /**
-     * @var boolean currently unused
-     */
-    public $emittedNoResourceBundleWarning = false;
+	/**
+	 * @var boolean currently unused
+	 */
+	public $emittedNoResourceBundleWarning = false;
     
     
 /* --------------------------------------------------------------------------*/
 /* --------------------------------------------------------------------------*/
 /* --------------------------------------------------------------------------*/
 
-    public function &singleton()
-    {
-        static $instance;
+	public function &singleton()
+	{
+		static $instance;
         
-        if (!isset($instance))
-            $instance = new LoggerHierarchy(new LoggerRoot());
-        return $instance;
-    }
+		if (!isset($instance))
+			$instance = new LoggerHierarchy(new LoggerRoot());
+		return $instance;
+	}
     
-    /**
-     * Create a new logger hierarchy.
-     * @param object $root the root logger
-     */
-    public function LoggerHierarchy($root)
-    {
-        $this->root    =& $root;
-        // Enable all level levels by default.
-        $this->setThreshold(LoggerLevel::getLevelAll());
-        $this->root->setHierarchy($this);
-        $this->rendererMap = new LoggerRendererMap();
-        $this->defaultFactory = new LoggerDefaultCategoryFactory();        
-    }
+	/**
+	 * Create a new logger hierarchy.
+	 * @param object $root the root logger
+	 */
+	public function LoggerHierarchy($root)
+	{
+		$this->root    =& $root;
+		// Enable all level levels by default.
+		$this->setThreshold(LoggerLevel::getLevelAll());
+		$this->root->setHierarchy($this);
+		$this->rendererMap = new LoggerRendererMap();
+		$this->defaultFactory = new LoggerDefaultCategoryFactory();        
+	}
      
-    /**
-     * Add a HierarchyEventListener event to the repository. 
-     * Not Yet Impl.
-     */
-    public function addHierarchyEventListener($listener)
-    {
-        return;
-    }
+	/**
+	 * Add a HierarchyEventListener event to the repository. 
+	 * Not Yet Impl.
+	 */
+	public function addHierarchyEventListener($listener)
+	{
+		return;
+	}
      
-    /**
-     * Add an object renderer for a specific class.
-     * Not Yet Impl.
-     */
-    public function addRenderer($classToRender, $or)
-    {
-        $this->rendererMap->put($classToRender, $or);
-    } 
+	/**
+	 * Add an object renderer for a specific class.
+	 * Not Yet Impl.
+	 */
+	public function addRenderer($classToRender, $or)
+	{
+		$this->rendererMap->put($classToRender, $or);
+	} 
     
-    /**
-     * This call will clear all logger definitions from the internal hashtable.
-     */
-    public function clear()
-    {
-        $this->ht = array();
-    }
+	/**
+	 * This call will clear all logger definitions from the internal hashtable.
+	 */
+	public function clear()
+	{
+		$this->ht = array();
+	}
       
-    public function emitNoAppenderWarning($cat)
-    {
-        return;
-    }
+	public function emitNoAppenderWarning($cat)
+	{
+		return;
+	}
     
-    /**
-     * Check if the named logger exists in the hierarchy.
-     * @param string $name
-     * @return boolean
-     */
-    public function exists($name)
-    {
-        return in_array($name, array_keys($this->ht));
-    }
+	/**
+	 * Check if the named logger exists in the hierarchy.
+	 * @param string $name
+	 * @return boolean
+	 */
+	public function exists($name)
+	{
+		return in_array($name, array_keys($this->ht));
+	}
 
-    public function fireAddAppenderEvent($logger, $appender)
-    {
-        return;
-    }
+	public function fireAddAppenderEvent($logger, $appender)
+	{
+		return;
+	}
     
-    /**
-     * @deprecated Please use {@link getCurrentLoggers()} instead.
-     */
-    public function &getCurrentCategories()
-    {
-        return $this->getCurrentLoggers();
-    }
+	/**
+	 * @deprecated Please use {@link getCurrentLoggers()} instead.
+	 */
+	public function &getCurrentCategories()
+	{
+		return $this->getCurrentLoggers();
+	}
     
-    /**
-     * Returns all the currently defined categories in this hierarchy as an array.
-     * @return array
-     */  
-    public function &getCurrentLoggers()
-    {
-        $loggers = array();
-        $loggerNames = array_keys($this->ht);
-        $enumLoggers = sizeof($loggerNames);
-        for ($i = 0; $i < $enumLoggers; $i++) {
-            $loggerName = $loggerNames[$i];
-            $loggers[] =& $this->ht[$loggerName];
-        }
-        return $loggers; 
-    }
+	/**
+	 * Returns all the currently defined categories in this hierarchy as an array.
+	 * @return array
+	 */  
+	public function &getCurrentLoggers()
+	{
+		$loggers = array();
+		$loggerNames = array_keys($this->ht);
+		$enumLoggers = sizeof($loggerNames);
+		for ($i = 0; $i < $enumLoggers; $i++) {
+			$loggerName = $loggerNames[$i];
+			$loggers[] =& $this->ht[$loggerName];
+		}
+		return $loggers; 
+	}
     
-    /**
-     * Return a new logger instance named as the first parameter using the default factory.
-     * 
-     * @param string $name logger name
-     * @param LoggerFactory $factory a {@link LoggerFactory} instance or null     
-     * @return Logger
-     */
-    public function &getLogger($name, $factory = null)
-    {
-        if ($factory === null) {
-            return $this->getLoggerByFactory($name, $this->defaultFactory);
-        } else {
-            return $this->getLoggerByFactory($name, $factory);
-        }
-    } 
+	/**
+	 * Return a new logger instance named as the first parameter using the default factory.
+	 * 
+	 * @param string $name logger name
+	 * @param LoggerFactory $factory a {@link LoggerFactory} instance or null     
+	 * @return Logger
+	 */
+	public function &getLogger($name, $factory = null)
+	{
+		if ($factory === null) {
+			return $this->getLoggerByFactory($name, $this->defaultFactory);
+		} else {
+			return $this->getLoggerByFactory($name, $factory);
+		}
+	} 
     
-    /**
-     * Return a new logger instance named as the first parameter using the default factory.
-     * 
-     * @param string $name logger name
-     * @return Logger
-     * @todo merge with {@link getLogger()}
-     */
-    public function &getLoggerByFactory($name, $factory)
-    {
-        if (!isset($this->ht[$name])) {
-            LoggerLog::debug("LoggerHierarchy::getLoggerByFactory():name=[$name]:factory=[".get_class($factory)."] creating a new logger...");
-            $this->ht[$name] = $factory->makeNewLoggerInstance($name);
-            $this->ht[$name]->setHierarchy($this);
-            $nodes = explode('.', $name);
-            $firstNode = array_shift($nodes);
-            if ( $firstNode != $name && isset($this->ht[$firstNode])) {
-                LoggerLog::debug("LoggerHierarchy::getLogger($name) parent is now [$firstNode]");            
-                $this->ht[$name]->parent =& $this->ht[$firstNode];
-            } else {
-                LoggerLog::debug("LoggerHierarchy::getLogger($name) parent is now [root]");            
-                $this->ht[$name]->parent =& $this->root;
-            } 
-            if (sizeof($nodes) > 0) {
-                // find parent node
-                foreach ($nodes as $node) {
-                    $parentNode = "$firstNode.$node";
-                    if (isset($this->ht[$parentNode]) && $parentNode != $name) {
-                        LoggerLog::debug("LoggerHierarchy::getLogger($name) parent is now [$parentNode]");                    
-                        $this->ht[$name]->parent =& $this->ht[$parentNode];
-                    }
-                    $firstNode .= ".$node";
-                }
-            }
-            // update children
-            /*
+	/**
+	 * Return a new logger instance named as the first parameter using the default factory.
+	 * 
+	 * @param string $name logger name
+	 * @return Logger
+	 * @todo merge with {@link getLogger()}
+	 */
+	public function &getLoggerByFactory($name, $factory)
+	{
+		if (!isset($this->ht[$name])) {
+			LoggerLog::debug("LoggerHierarchy::getLoggerByFactory():name=[$name]:factory=[".get_class($factory)."] creating a new logger...");
+			$this->ht[$name] = $factory->makeNewLoggerInstance($name);
+			$this->ht[$name]->setHierarchy($this);
+			$nodes = explode('.', $name);
+			$firstNode = array_shift($nodes);
+			if ( $firstNode != $name && isset($this->ht[$firstNode])) {
+				LoggerLog::debug("LoggerHierarchy::getLogger($name) parent is now [$firstNode]");            
+				$this->ht[$name]->parent =& $this->ht[$firstNode];
+			} else {
+				LoggerLog::debug("LoggerHierarchy::getLogger($name) parent is now [root]");            
+				$this->ht[$name]->parent =& $this->root;
+			} 
+			if (sizeof($nodes) > 0) {
+				// find parent node
+				foreach ($nodes as $node) {
+					$parentNode = "$firstNode.$node";
+					if (isset($this->ht[$parentNode]) && $parentNode != $name) {
+						LoggerLog::debug("LoggerHierarchy::getLogger($name) parent is now [$parentNode]");                    
+						$this->ht[$name]->parent =& $this->ht[$parentNode];
+					}
+					$firstNode .= ".$node";
+				}
+			}
+			// update children
+			/*
             $children = array();
             foreach (array_keys($this->ht) as $nodeName) {
                 if ($nodeName != $name && substr($nodeName, 0, strlen($name)) == $name) {
@@ -249,140 +249,140 @@ 
                 }
             }
             */
-        }            
-        return $this->ht[$name];
-    }
+		}            
+		return $this->ht[$name];
+	}
     
-    /**
-     * @return LoggerRendererMap Get the renderer map for this hierarchy.
-     */
-    public function &getRendererMap()
-    {
-        return $this->rendererMap;
-    }
+	/**
+	 * @return LoggerRendererMap Get the renderer map for this hierarchy.
+	 */
+	public function &getRendererMap()
+	{
+		return $this->rendererMap;
+	}
     
-    /**
-     * @return LoggerRoot Get the root of this hierarchy.
-     */ 
-    public function &getRootLogger()
-    {
-        if (!isset($this->root) || $this->root == null)
-            $this->root = new LoggerRoot();
-        return $this->root;
-    }
+	/**
+	 * @return LoggerRoot Get the root of this hierarchy.
+	 */ 
+	public function &getRootLogger()
+	{
+		if (!isset($this->root) || $this->root == null)
+			$this->root = new LoggerRoot();
+		return $this->root;
+	}
      
-    /**
-     * @return LoggerLevel Returns the threshold Level.
-     */
-    public function getThreshold()
-    {
-        return $this->threshold;
-    } 
+	/**
+	 * @return LoggerLevel Returns the threshold Level.
+	 */
+	public function getThreshold()
+	{
+		return $this->threshold;
+	} 
 
-    /**
-     * This method will return true if this repository is disabled 
-     * for level object passed as parameter and false otherwise.
-     * @return boolean
-     */
-    public function isDisabled($level)
-    {
-        return ($this->threshold->level > $level->level);
-    }
+	/**
+	 * This method will return true if this repository is disabled 
+	 * for level object passed as parameter and false otherwise.
+	 * @return boolean
+	 */
+	public function isDisabled($level)
+	{
+		return ($this->threshold->level > $level->level);
+	}
     
-    /**
-     * @deprecated Deprecated with no replacement.
-     */
-    public function overrideAsNeeded($override)
-    {
-        return;
-    } 
+	/**
+	 * @deprecated Deprecated with no replacement.
+	 */
+	public function overrideAsNeeded($override)
+	{
+		return;
+	} 
     
-    /**
-     * Reset all values contained in this hierarchy instance to their
-     * default. 
-     *
-     * This removes all appenders from all categories, sets
-     * the level of all non-root categories to <i>null</i>,
-     * sets their additivity flag to <i>true</i> and sets the level
-     * of the root logger to {@link LOGGER_LEVEL_DEBUG}.  Moreover,
-     * message disabling is set its default "off" value.
-     * 
-     * <p>Existing categories are not removed. They are just reset.
-     *
-     * <p>This method should be used sparingly and with care as it will
-     * block all logging until it is completed.</p>
-     */
-    public function resetConfiguration()
-    {
-        $root =& $this->getRootLogger();
+	/**
+	 * Reset all values contained in this hierarchy instance to their
+	 * default. 
+	 *
+	 * This removes all appenders from all categories, sets
+	 * the level of all non-root categories to <i>null</i>,
+	 * sets their additivity flag to <i>true</i> and sets the level
+	 * of the root logger to {@link LOGGER_LEVEL_DEBUG}.  Moreover,
+	 * message disabling is set its default "off" value.
+	 * 
+	 * <p>Existing categories are not removed. They are just reset.
+	 *
+	 * <p>This method should be used sparingly and with care as it will
+	 * block all logging until it is completed.</p>
+	 */
+	public function resetConfiguration()
+	{
+		$root =& $this->getRootLogger();
         
-        $root->setLevel(LoggerLevel::getLevelDebug());
-        $this->setThreshold(LoggerLevel::getLevelAll());
-        $this->shutDown();
-        $loggers =& $this->getCurrentLoggers();
-        $enumLoggers = sizeof($loggers);
-        for ($i = 0; $i < $enumLoggers; $i++) {
-            $loggers[$i]->setLevel(null);
-        	$loggers[$i]->setAdditivity(true);
-        	$loggers[$i]->setResourceBundle(null);
-        }
-        $this->rendererMap->clear();
-    }
+		$root->setLevel(LoggerLevel::getLevelDebug());
+		$this->setThreshold(LoggerLevel::getLevelAll());
+		$this->shutDown();
+		$loggers =& $this->getCurrentLoggers();
+		$enumLoggers = sizeof($loggers);
+		for ($i = 0; $i < $enumLoggers; $i++) {
+			$loggers[$i]->setLevel(null);
+			$loggers[$i]->setAdditivity(true);
+			$loggers[$i]->setResourceBundle(null);
+		}
+		$this->rendererMap->clear();
+	}
       
-    /**
-     * @deprecated Deprecated with no replacement.
-     */
-    public function setDisableOverride($override)
-    {
-        return;
-    }
+	/**
+	 * @deprecated Deprecated with no replacement.
+	 */
+	public function setDisableOverride($override)
+	{
+		return;
+	}
     
-    /**
-     * Used by subclasses to add a renderer to the hierarchy passed as parameter.
-     * @param string $renderedClass a LoggerRenderer class name
-     * @param LoggerRenderer $renderer
-     *
-     */
-    public function setRenderer($renderedClass, $renderer)
-    {
-        $this->rendererMap->put($renderedClass, $renderer);
-    }
+	/**
+	 * Used by subclasses to add a renderer to the hierarchy passed as parameter.
+	 * @param string $renderedClass a LoggerRenderer class name
+	 * @param LoggerRenderer $renderer
+	 *
+	 */
+	public function setRenderer($renderedClass, $renderer)
+	{
+		$this->rendererMap->put($renderedClass, $renderer);
+	}
     
-    /**
-     * set a new threshold level
-     *
-     * @param LoggerLevel $l
-     */
-    public function setThreshold($l)
-    {
-        if ($l !== null)
-            $this->threshold = $l;
-    }
+	/**
+	 * set a new threshold level
+	 *
+	 * @param LoggerLevel $l
+	 */
+	public function setThreshold($l)
+	{
+		if ($l !== null)
+			$this->threshold = $l;
+	}
     
-    /**
-     * Shutting down a hierarchy will <i>safely</i> close and remove
-     * all appenders in all categories including the root logger.
-     * 
-     * <p>Some appenders such as {@link LoggerSocketAppender}
-     * need to be closed before the
-     * application exists. Otherwise, pending logging events might be
-     * lost.
-     * 
-     * <p>The shutdown method is careful to close nested
-     * appenders before closing regular appenders. This is allows
-     * configurations where a regular appender is attached to a logger
-     * and again to a nested appender.
-     */
-    public function shutdown()
-    {
-        $this->root->removeAllAppenders();
-        $cats =& $this->getCurrentLoggers();
-        $enumCats = sizeof($cats);        
-        if ($enumCats > 0) {
-            for ($i = 0; $i < $enumCats; $i++) {
-                $cats[$i]->removeAllAppenders();
-            }
-        }
-    }  
+	/**
+	 * Shutting down a hierarchy will <i>safely</i> close and remove
+	 * all appenders in all categories including the root logger.
+	 * 
+	 * <p>Some appenders such as {@link LoggerSocketAppender}
+	 * need to be closed before the
+	 * application exists. Otherwise, pending logging events might be
+	 * lost.
+	 * 
+	 * <p>The shutdown method is careful to close nested
+	 * appenders before closing regular appenders. This is allows
+	 * configurations where a regular appender is attached to a logger
+	 * and again to a nested appender.
+	 */
+	public function shutdown()
+	{
+		$this->root->removeAllAppenders();
+		$cats =& $this->getCurrentLoggers();
+		$enumCats = sizeof($cats);        
+		if ($enumCats > 0) {
+			for ($i = 0; $i < $enumCats; $i++) {
+				$cats[$i]->removeAllAppenders();
+			}
+		}
+	}  
 } 
 ?>
\ No newline at end of file

Spacing +11 added lines, -11 removed lines

@@ -86,7 +86,7 @@ 
     /**
      * @var boolean currently unused
      */
-    public $emittedNoAppenderWarning       = false;
+    public $emittedNoAppenderWarning = false;
 
     /**
      * @var boolean currently unused
@@ -113,7 +113,7 @@ 
      */
     public function LoggerHierarchy($root)
     {
-        $this->root    =& $root;
+        $this->root = & $root;
         // Enable all level levels by default.
         $this->setThreshold(LoggerLevel::getLevelAll());
         $this->root->setHierarchy($this);
@@ -186,7 +186,7 @@ 
         $enumLoggers = sizeof($loggerNames);
         for ($i = 0; $i < $enumLoggers; $i++) {
             $loggerName = $loggerNames[$i];
-            $loggers[] =& $this->ht[$loggerName];
+            $loggers[] = & $this->ht[$loggerName];
         }
         return $loggers; 
     }
@@ -217,17 +217,17 @@ 
     public function &getLoggerByFactory($name, $factory)
     {
         if (!isset($this->ht[$name])) {
-            LoggerLog::debug("LoggerHierarchy::getLoggerByFactory():name=[$name]:factory=[".get_class($factory)."] creating a new logger...");
+            LoggerLog::debug("LoggerHierarchy::getLoggerByFactory():name=[$name]:factory=[" . get_class($factory) . "] creating a new logger...");
             $this->ht[$name] = $factory->makeNewLoggerInstance($name);
             $this->ht[$name]->setHierarchy($this);
             $nodes = explode('.', $name);
             $firstNode = array_shift($nodes);
-            if ( $firstNode != $name && isset($this->ht[$firstNode])) {
+            if ($firstNode != $name && isset($this->ht[$firstNode])) {
                 LoggerLog::debug("LoggerHierarchy::getLogger($name) parent is now [$firstNode]");            
-                $this->ht[$name]->parent =& $this->ht[$firstNode];
+                $this->ht[$name]->parent = & $this->ht[$firstNode];
             } else {
                 LoggerLog::debug("LoggerHierarchy::getLogger($name) parent is now [root]");            
-                $this->ht[$name]->parent =& $this->root;
+                $this->ht[$name]->parent = & $this->root;
             } 
             if (sizeof($nodes) > 0) {
                 // find parent node
@@ -235,7 +235,7 @@ 
                     $parentNode = "$firstNode.$node";
                     if (isset($this->ht[$parentNode]) && $parentNode != $name) {
                         LoggerLog::debug("LoggerHierarchy::getLogger($name) parent is now [$parentNode]");                    
-                        $this->ht[$name]->parent =& $this->ht[$parentNode];
+                        $this->ht[$name]->parent = & $this->ht[$parentNode];
                     }
                     $firstNode .= ".$node";
                 }
@@ -314,12 +314,12 @@ 
      */
     public function resetConfiguration()
     {
-        $root =& $this->getRootLogger();
+        $root = & $this->getRootLogger();
         
         $root->setLevel(LoggerLevel::getLevelDebug());
         $this->setThreshold(LoggerLevel::getLevelAll());
         $this->shutDown();
-        $loggers =& $this->getCurrentLoggers();
+        $loggers = & $this->getCurrentLoggers();
         $enumLoggers = sizeof($loggers);
         for ($i = 0; $i < $enumLoggers; $i++) {
             $loggers[$i]->setLevel(null);
@@ -376,7 +376,7 @@ 
     public function shutdown()
     {
         $this->root->removeAllAppenders();
-        $cats =& $this->getCurrentLoggers();
+        $cats = & $this->getCurrentLoggers();
         $enumCats = sizeof($cats);        
         if ($enumCats > 0) {
             for ($i = 0; $i < $enumCats; $i++) {

libraries/log4php.debug/or/LoggerRendererMap.php

Indentation +128 added lines, -128 removed lines

@@ -39,146 +39,146 @@
  */
 class LoggerRendererMap {
 
-    /**
-     * @var array
-     */
-    public $map;
+	/**
+	 * @var array
+	 */
+	public $map;
 
-    /**
-     * @var LoggerDefaultRenderer
-     */
-    public $defaultRenderer;
+	/**
+	 * @var LoggerDefaultRenderer
+	 */
+	public $defaultRenderer;
 
-    /**
-     * Constructor
-     */
-    public function LoggerRendererMap()
-    {
-        $this->map = array();
-        $this->defaultRenderer = new LoggerDefaultRenderer();
-    }
+	/**
+	 * Constructor
+	 */
+	public function LoggerRendererMap()
+	{
+		$this->map = array();
+		$this->defaultRenderer = new LoggerDefaultRenderer();
+	}
 
-    /**
-     * Add a renderer to a hierarchy passed as parameter.
-     * Note that hierarchy must implement getRendererMap() and setRenderer() methods.
-     *
-     * @param LoggerHierarchy &$repository a logger repository.
-     * @param string &$renderedClassName
-     * @param string &$renderingClassName
-     * @static
-     */
-    public function addRenderer(&$repository, $renderedClassName, $renderingClassName)
-    {
-        LoggerLog::debug("LoggerRendererMap::addRenderer() Rendering class: [{$renderingClassName}], Rendered class: [{$renderedClassName}].");
-        $renderer = LoggerObjectRenderer::factory($renderingClassName);
-        if($renderer == null) {
-            LoggerLog::warn("LoggerRendererMap::addRenderer() Could not instantiate renderer [{$renderingClassName}].");
-            return;
-        } else {
-            $repository->setRenderer($renderedClassName, $renderer);
-        }
-    }
+	/**
+	 * Add a renderer to a hierarchy passed as parameter.
+	 * Note that hierarchy must implement getRendererMap() and setRenderer() methods.
+	 *
+	 * @param LoggerHierarchy &$repository a logger repository.
+	 * @param string &$renderedClassName
+	 * @param string &$renderingClassName
+	 * @static
+	 */
+	public function addRenderer(&$repository, $renderedClassName, $renderingClassName)
+	{
+		LoggerLog::debug("LoggerRendererMap::addRenderer() Rendering class: [{$renderingClassName}], Rendered class: [{$renderedClassName}].");
+		$renderer = LoggerObjectRenderer::factory($renderingClassName);
+		if($renderer == null) {
+			LoggerLog::warn("LoggerRendererMap::addRenderer() Could not instantiate renderer [{$renderingClassName}].");
+			return;
+		} else {
+			$repository->setRenderer($renderedClassName, $renderer);
+		}
+	}
 
 
-    /**
-     * Find the appropriate renderer for the class type of the
-     * <var>o</var> parameter. 
-     *
-     * This is accomplished by calling the {@link getByObject()} 
-     * method if <var>o</var> is object or using {@link LoggerDefaultRenderer}. 
-     * Once a renderer is found, it is applied on the object <var>o</var> and 
-     * the result is returned as a string.
-     *
-     * @param mixed $o
-     * @return string 
-     */
-    public function findAndRender($o)
-    {
-        if($o == null) {
-            return null;
-        } else {
-            if (is_object($o)) {
-                $renderer = $this->getByObject($o);
-                if ($renderer !== null) {
-                    return $renderer->doRender($o);
-                } else {
-                    return null;
-                }
-            } else {
-                $renderer = $this->defaultRenderer;
-                return $renderer->doRender($o);
-            }
-        }
-    }
+	/**
+	 * Find the appropriate renderer for the class type of the
+	 * <var>o</var> parameter. 
+	 *
+	 * This is accomplished by calling the {@link getByObject()} 
+	 * method if <var>o</var> is object or using {@link LoggerDefaultRenderer}. 
+	 * Once a renderer is found, it is applied on the object <var>o</var> and 
+	 * the result is returned as a string.
+	 *
+	 * @param mixed $o
+	 * @return string 
+	 */
+	public function findAndRender($o)
+	{
+		if($o == null) {
+			return null;
+		} else {
+			if (is_object($o)) {
+				$renderer = $this->getByObject($o);
+				if ($renderer !== null) {
+					return $renderer->doRender($o);
+				} else {
+					return null;
+				}
+			} else {
+				$renderer = $this->defaultRenderer;
+				return $renderer->doRender($o);
+			}
+		}
+	}
 
-    /**
-     * Syntactic sugar method that calls {@link PHP_MANUAL#get_class} with the
-     * class of the object parameter.
-     * 
-     * @param mixed $o
-     * @return string
-     */
-    public function &getByObject($o)
-    {
-        return ($o == null) ? null : $this->getByClassName(get_class($o));
-    }
+	/**
+	 * Syntactic sugar method that calls {@link PHP_MANUAL#get_class} with the
+	 * class of the object parameter.
+	 * 
+	 * @param mixed $o
+	 * @return string
+	 */
+	public function &getByObject($o)
+	{
+		return ($o == null) ? null : $this->getByClassName(get_class($o));
+	}
 
 
-    /**
-     * Search the parents of <var>clazz</var> for a renderer. 
-     *
-     * The renderer closest in the hierarchy will be returned. If no
-     * renderers could be found, then the default renderer is returned.
-     *
-     * @param string $class
-     * @return LoggerObjectRenderer
-     */
-    public function &getByClassName($class)
-    {
-        $r = null;
-        for($c = strtolower($class); !empty($c); $c = get_parent_class($c)) {
-            if (isset($this->map[$c])) {
-                return  $this->map[$c];
-            }
-        }
-        return $this->defaultRenderer;
-    }
+	/**
+	 * Search the parents of <var>clazz</var> for a renderer. 
+	 *
+	 * The renderer closest in the hierarchy will be returned. If no
+	 * renderers could be found, then the default renderer is returned.
+	 *
+	 * @param string $class
+	 * @return LoggerObjectRenderer
+	 */
+	public function &getByClassName($class)
+	{
+		$r = null;
+		for($c = strtolower($class); !empty($c); $c = get_parent_class($c)) {
+			if (isset($this->map[$c])) {
+				return  $this->map[$c];
+			}
+		}
+		return $this->defaultRenderer;
+	}
 
-    /**
-     * @return LoggerDefaultRenderer
-     */
-    public function &getDefaultRenderer()
-    {
-        return $this->defaultRenderer;
-    }
+	/**
+	 * @return LoggerDefaultRenderer
+	 */
+	public function &getDefaultRenderer()
+	{
+		return $this->defaultRenderer;
+	}
 
 
-    public function clear()
-    {
-        $this->map = array();
-    }
+	public function clear()
+	{
+		$this->map = array();
+	}
 
-    /**
-     * Register a {@link LoggerObjectRenderer} for <var>clazz</var>.
-     * @param string $class
-     * @param LoggerObjectRenderer $or
-     */
-    public function put($class, $or)
-    {
-        $this->map[strtolower($class)] = $or;
-    }
+	/**
+	 * Register a {@link LoggerObjectRenderer} for <var>clazz</var>.
+	 * @param string $class
+	 * @param LoggerObjectRenderer $or
+	 */
+	public function put($class, $or)
+	{
+		$this->map[strtolower($class)] = $or;
+	}
     
-    /**
-     * @param string $class
-     * @return boolean
-     */
-    public function rendererExists($class)
-    {
-        $class = basename($class);
-        if (!class_exists($class)) {
-            @include_once(LOG4PHP_DIR ."/or/{$class}.php");
-        }
-        return class_exists($class);
-    }
+	/**
+	 * @param string $class
+	 * @return boolean
+	 */
+	public function rendererExists($class)
+	{
+		$class = basename($class);
+		if (!class_exists($class)) {
+			@include_once(LOG4PHP_DIR ."/or/{$class}.php");
+		}
+		return class_exists($class);
+	}
 }
 ?>
\ No newline at end of file

libraries/log4php.debug/xml/LoggerDOMConfigurator.php

Indentation +436 added lines, -436 removed lines

@@ -84,526 +84,526 @@
  */
 class LoggerDOMConfigurator extends LoggerConfigurator {
 
-    /**
-     * @var LoggerHierarchy
-     */
-    public $repository;
+	/**
+	 * @var LoggerHierarchy
+	 */
+	public $repository;
     
-    /**
-     * @var array state stack 
-     */
-    public $state;
+	/**
+	 * @var array state stack 
+	 */
+	public $state;
 
-    /**
-     * @var Logger parsed Logger  
-     */
-    public $logger;
+	/**
+	 * @var Logger parsed Logger  
+	 */
+	public $logger;
     
-    /**
-     * @var LoggerAppender parsed LoggerAppender 
-     */
-    public $appender;
+	/**
+	 * @var LoggerAppender parsed LoggerAppender 
+	 */
+	public $appender;
     
-    /**
-     * @var LoggerFilter parsed LoggerFilter 
-     */
-    public $filter;
+	/**
+	 * @var LoggerFilter parsed LoggerFilter 
+	 */
+	public $filter;
     
-    /**
-     * @var LoggerLayout parsed LoggerLayout 
-     */
-    public $layout;
+	/**
+	 * @var LoggerLayout parsed LoggerLayout 
+	 */
+	public $layout;
     
-    /**
-     * Constructor
-     */
-    public function LoggerDOMConfigurator()
-    {
-        $this->state    = array();
-        $this->logger   = null;
-        $this->appender = null;
-        $this->filter   = null;
-        $this->layout   = null;
-    }
+	/**
+	 * Constructor
+	 */
+	public function LoggerDOMConfigurator()
+	{
+		$this->state    = array();
+		$this->logger   = null;
+		$this->appender = null;
+		$this->filter   = null;
+		$this->layout   = null;
+	}
     
-    /**
-     * Configure the default repository using the resource pointed by <b>url</b>.
-     * <b>Url</b> is any valid resurce as defined in {@link PHP_MANUAL#file} function.
-     * Note that the resource will be search with <i>use_include_path</i> parameter 
-     * set to "1".
-     *
-     * @param string $url
-     * @static
-     */
-    public function configure($url = '')
-    {
-        $configurator = new LoggerDOMConfigurator();
-        $repository =& LoggerManager::getLoggerRepository();
-        return $configurator->doConfigure($url, $repository);
-    }
+	/**
+	 * Configure the default repository using the resource pointed by <b>url</b>.
+	 * <b>Url</b> is any valid resurce as defined in {@link PHP_MANUAL#file} function.
+	 * Note that the resource will be search with <i>use_include_path</i> parameter 
+	 * set to "1".
+	 *
+	 * @param string $url
+	 * @static
+	 */
+	public function configure($url = '')
+	{
+		$configurator = new LoggerDOMConfigurator();
+		$repository =& LoggerManager::getLoggerRepository();
+		return $configurator->doConfigure($url, $repository);
+	}
     
-    /**
-     * Configure the given <b>repository</b> using the resource pointed by <b>url</b>.
-     * <b>Url</b> is any valid resurce as defined in {@link PHP_MANUAL#file} function.
-     * Note that the resource will be search with <i>use_include_path</i> parameter 
-     * set to "1".
-     *
-     * @param string $url
-     * @param LoggerHierarchy &$repository
-     */
-    public function doConfigure($url = '', &$repository)
-    {
-        $xmlData = '';
-        if (!empty($url))
-            $xmlData = implode('', file($url, 1));
-        return $this->doConfigureByString($xmlData, $repository);
-    }
+	/**
+	 * Configure the given <b>repository</b> using the resource pointed by <b>url</b>.
+	 * <b>Url</b> is any valid resurce as defined in {@link PHP_MANUAL#file} function.
+	 * Note that the resource will be search with <i>use_include_path</i> parameter 
+	 * set to "1".
+	 *
+	 * @param string $url
+	 * @param LoggerHierarchy &$repository
+	 */
+	public function doConfigure($url = '', &$repository)
+	{
+		$xmlData = '';
+		if (!empty($url))
+			$xmlData = implode('', file($url, 1));
+		return $this->doConfigureByString($xmlData, $repository);
+	}
     
-    /**
-     * Configure the given <b>repository</b> using the configuration written in <b>xmlData</b>.
-     * Do not call this method directly. Use {@link doConfigure()} instead.
-     * @param string $xmlData
-     * @param LoggerHierarchy &$repository
-     */
-    public function doConfigureByString($xmlData, &$repository)
-    {
-        return $this->parse($xmlData, $repository);
-    }
+	/**
+	 * Configure the given <b>repository</b> using the configuration written in <b>xmlData</b>.
+	 * Do not call this method directly. Use {@link doConfigure()} instead.
+	 * @param string $xmlData
+	 * @param LoggerHierarchy &$repository
+	 */
+	public function doConfigureByString($xmlData, &$repository)
+	{
+		return $this->parse($xmlData, $repository);
+	}
     
-    /**
-     * @param LoggerHierarchy &$repository
-     */
-    public function doConfigureDefault(&$repository)
-    {
-        return $this->doConfigureByString(LOG4PHP_LOGGER_DOM_CONFIGURATOR_DEFAULT_CONFIGURATION, $repository);
-    }
+	/**
+	 * @param LoggerHierarchy &$repository
+	 */
+	public function doConfigureDefault(&$repository)
+	{
+		return $this->doConfigureByString(LOG4PHP_LOGGER_DOM_CONFIGURATOR_DEFAULT_CONFIGURATION, $repository);
+	}
     
-    /**
-     * @param string $xmlData
-     */
-    public function parse($xmlData, &$repository)
-    {
-        // LoggerManager::resetConfiguration();
-        $this->repository =& $repository;
+	/**
+	 * @param string $xmlData
+	 */
+	public function parse($xmlData, &$repository)
+	{
+		// LoggerManager::resetConfiguration();
+		$this->repository =& $repository;
 
-        $parser = xml_parser_create_ns();
+		$parser = xml_parser_create_ns();
     
-        xml_set_object($parser, &$this);
-        xml_set_element_handler($parser, "tagOpen", "tagClose");
+		xml_set_object($parser, &$this);
+		xml_set_element_handler($parser, "tagOpen", "tagClose");
         
-        $result = xml_parse($parser, $xmlData, true);
-        if (!$result) {
-            $errorCode = xml_get_error_code($parser);
-            $errorStr = xml_error_string($errorCode);
-            $errorLine = xml_get_current_line_number($parser);
-            LoggerLog::warn(
-                "LoggerDOMConfigurator::parse() ".
-                "Parsing error [{$errorCode}] {$errorStr}, line {$errorLine}"
-            );
-            $this->repository->resetConfiguration();
-        } else {
-            xml_parser_free($parser);
-        }
-        return $result;
-    }
+		$result = xml_parse($parser, $xmlData, true);
+		if (!$result) {
+			$errorCode = xml_get_error_code($parser);
+			$errorStr = xml_error_string($errorCode);
+			$errorLine = xml_get_current_line_number($parser);
+			LoggerLog::warn(
+				"LoggerDOMConfigurator::parse() ".
+				"Parsing error [{$errorCode}] {$errorStr}, line {$errorLine}"
+			);
+			$this->repository->resetConfiguration();
+		} else {
+			xml_parser_free($parser);
+		}
+		return $result;
+	}
     
-    /**
-     * @param mixed $parser
-     * @param string $tag
-     * @param array $attribs
-     *
-     * @todo In 'LOGGER' case find a better way to detect 'getLogger()' method
-     */
-    public function tagOpen($parser, $tag, $attribs)
-    {
-        switch ($tag) {
+	/**
+	 * @param mixed $parser
+	 * @param string $tag
+	 * @param array $attribs
+	 *
+	 * @todo In 'LOGGER' case find a better way to detect 'getLogger()' method
+	 */
+	public function tagOpen($parser, $tag, $attribs)
+	{
+		switch ($tag) {
         
-            case 'CONFIGURATION' :
-            case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':CONFIGURATION':
+			case 'CONFIGURATION' :
+			case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':CONFIGURATION':
             
-                LoggerLog::debug("LoggerDOMConfigurator::tagOpen() CONFIGURATION");
+				LoggerLog::debug("LoggerDOMConfigurator::tagOpen() CONFIGURATION");
 
-                if (isset($attribs['THRESHOLD'])) {
+				if (isset($attribs['THRESHOLD'])) {
                 
-                    $this->repository->setThreshold(
-                        LoggerOptionConverter::toLevel(
-                            $this->subst($attribs['THRESHOLD']), 
-                            $this->repository->getThreshold()
-                        )
-                    );
-                }
-                if (isset($attribs['DEBUG'])) {
-                    $debug = LoggerOptionConverter::toBoolean($this->subst($attribs['DEBUG']), LoggerLog::internalDebugging());
-                    $this->repository->debug = $debug;
-                    LoggerLog::internalDebugging($debug);
-                    LoggerLog::debug("LoggerDOMConfigurator::tagOpen() LOG4PHP:CONFIGURATION. Internal Debug turned ".($debug ? 'on':'off'));
+					$this->repository->setThreshold(
+						LoggerOptionConverter::toLevel(
+							$this->subst($attribs['THRESHOLD']), 
+							$this->repository->getThreshold()
+						)
+					);
+				}
+				if (isset($attribs['DEBUG'])) {
+					$debug = LoggerOptionConverter::toBoolean($this->subst($attribs['DEBUG']), LoggerLog::internalDebugging());
+					$this->repository->debug = $debug;
+					LoggerLog::internalDebugging($debug);
+					LoggerLog::debug("LoggerDOMConfigurator::tagOpen() LOG4PHP:CONFIGURATION. Internal Debug turned ".($debug ? 'on':'off'));
                     
-                }
-                break;
+				}
+				break;
                 
-            case 'APPENDER' :
-            case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':APPENDER':
+			case 'APPENDER' :
+			case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':APPENDER':
             
-                unset($this->appender);
-                $this->appender = null;
+				unset($this->appender);
+				$this->appender = null;
                 
-                $name  = $this->subst(@$attribs['NAME']);
-                $class = $this->subst(@$attribs['CLASS']);
+				$name  = $this->subst(@$attribs['NAME']);
+				$class = $this->subst(@$attribs['CLASS']);
                 
-                LoggerLog::debug("LoggerDOMConfigurator::tagOpen():tag=[$tag]:name=[$name]:class=[$class]");
+				LoggerLog::debug("LoggerDOMConfigurator::tagOpen():tag=[$tag]:name=[$name]:class=[$class]");
                 
-                $this->appender =& LoggerAppender::singleton($name, $class);
-                if ($this->appender === null) {
-                    LoggerLog::warn("LoggerDOMConfigurator::tagOpen() APPENDER cannot instantiate appender '$name'");
-                }
-                $this->state[] = LOG4PHP_LOGGER_DOM_CONFIGURATOR_APPENDER_STATE;
-                break;
+				$this->appender =& LoggerAppender::singleton($name, $class);
+				if ($this->appender === null) {
+					LoggerLog::warn("LoggerDOMConfigurator::tagOpen() APPENDER cannot instantiate appender '$name'");
+				}
+				$this->state[] = LOG4PHP_LOGGER_DOM_CONFIGURATOR_APPENDER_STATE;
+				break;
                 
-            case 'APPENDER_REF' :
-            case 'APPENDER-REF' :
-            case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':APPENDER_REF':
-            case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':APPENDER-REF':
+			case 'APPENDER_REF' :
+			case 'APPENDER-REF' :
+			case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':APPENDER_REF':
+			case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':APPENDER-REF':
             
             
-                if (isset($attribs['REF']) && !empty($attribs['REF'])) {
-                    $appenderName = $this->subst($attribs['REF']);
+				if (isset($attribs['REF']) && !empty($attribs['REF'])) {
+					$appenderName = $this->subst($attribs['REF']);
                     
-                    LoggerLog::debug("LoggerDOMConfigurator::tagOpen() APPENDER-REF ref='$appenderName'");        
+					LoggerLog::debug("LoggerDOMConfigurator::tagOpen() APPENDER-REF ref='$appenderName'");        
                     
-                    $appender =& LoggerAppender::singleton($appenderName);
-                    if ($appender !== null) {
-                        switch (end($this->state)) {
-                            case LOG4PHP_LOGGER_DOM_CONFIGURATOR_LOGGER_STATE:
-                            case LOG4PHP_LOGGER_DOM_CONFIGURATOR_ROOT_STATE:                
-                                $this->logger->addAppender($appender);
-                                break;
-                        }
-                    } else {
-                        LoggerLog::warn("LoggerDOMConfigurator::tagOpen() APPENDER-REF ref '$appenderName' points to a null appender");
-                    }
-                } else {
-                    LoggerLog::warn("LoggerDOMConfigurator::tagOpen() APPENDER-REF ref not set or empty");            
-                }
-                break;
+					$appender =& LoggerAppender::singleton($appenderName);
+					if ($appender !== null) {
+						switch (end($this->state)) {
+							case LOG4PHP_LOGGER_DOM_CONFIGURATOR_LOGGER_STATE:
+							case LOG4PHP_LOGGER_DOM_CONFIGURATOR_ROOT_STATE:                
+								$this->logger->addAppender($appender);
+								break;
+						}
+					} else {
+						LoggerLog::warn("LoggerDOMConfigurator::tagOpen() APPENDER-REF ref '$appenderName' points to a null appender");
+					}
+				} else {
+					LoggerLog::warn("LoggerDOMConfigurator::tagOpen() APPENDER-REF ref not set or empty");            
+				}
+				break;
                 
-            case 'FILTER' :
-            case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':FILTER':
+			case 'FILTER' :
+			case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':FILTER':
             
-                LoggerLog::debug("LoggerDOMConfigurator::tagOpen() FILTER");
+				LoggerLog::debug("LoggerDOMConfigurator::tagOpen() FILTER");
                             
-                unset($this->filter);
-                $this->filter = null;
+				unset($this->filter);
+				$this->filter = null;
 
-                $filterName = basename($this->subst(@$attribs['CLASS']));
-                if (!empty($filterName)) {
-                    if (!class_exists($filterName)) {
-                        @include_once(LOG4PHP_DIR . "/varia/{$filterName}.php");
-                    }
-                    if (class_exists($filterName)) {
-                        $this->filter = new $filterName();
-                    } else {
-                        LoggerLog::warn("LoggerDOMConfigurator::tagOpen() FILTER. class '$filterName' doesnt exist");
-                    }
-                    $this->state[] = LOG4PHP_LOGGER_DOM_CONFIGURATOR_FILTER_STATE;
-                } else {
-                    LoggerLog::warn("LoggerDOMConfigurator::tagOpen() FILTER filter name cannot be empty");
-                }
-                break;
+				$filterName = basename($this->subst(@$attribs['CLASS']));
+				if (!empty($filterName)) {
+					if (!class_exists($filterName)) {
+						@include_once(LOG4PHP_DIR . "/varia/{$filterName}.php");
+					}
+					if (class_exists($filterName)) {
+						$this->filter = new $filterName();
+					} else {
+						LoggerLog::warn("LoggerDOMConfigurator::tagOpen() FILTER. class '$filterName' doesnt exist");
+					}
+					$this->state[] = LOG4PHP_LOGGER_DOM_CONFIGURATOR_FILTER_STATE;
+				} else {
+					LoggerLog::warn("LoggerDOMConfigurator::tagOpen() FILTER filter name cannot be empty");
+				}
+				break;
                 
-            case 'LAYOUT':
-            case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':LAYOUT':
+			case 'LAYOUT':
+			case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':LAYOUT':
             
-                $class = @$attribs['CLASS'];
+				$class = @$attribs['CLASS'];
 
-                LoggerLog::debug("LoggerDOMConfigurator::tagOpen() LAYOUT class='{$class}'");
+				LoggerLog::debug("LoggerDOMConfigurator::tagOpen() LAYOUT class='{$class}'");
 
-                $this->layout = LoggerLayout::factory($this->subst($class));
-                if ($this->layout === null)
-                    LoggerLog::warn("LoggerDOMConfigurator::tagOpen() LAYOUT unable to instanciate class='{$class}'");
+				$this->layout = LoggerLayout::factory($this->subst($class));
+				if ($this->layout === null)
+					LoggerLog::warn("LoggerDOMConfigurator::tagOpen() LAYOUT unable to instanciate class='{$class}'");
                 
-                $this->state[] = LOG4PHP_LOGGER_DOM_CONFIGURATOR_LAYOUT_STATE;
-                break;
+				$this->state[] = LOG4PHP_LOGGER_DOM_CONFIGURATOR_LAYOUT_STATE;
+				break;
             
-            case 'LOGGER':
-            case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':LOGGER':
+			case 'LOGGER':
+			case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':LOGGER':
             
-                // $this->logger is assigned by reference.
-                // Only '$this->logger=null;' destroys referenced object
-                unset($this->logger);
-                $this->logger = null;
+				// $this->logger is assigned by reference.
+				// Only '$this->logger=null;' destroys referenced object
+				unset($this->logger);
+				$this->logger = null;
                 
-                $loggerName = $this->subst(@$attribs['NAME']);
-                if (!empty($loggerName)) {
-                    LoggerLog::debug("LoggerDOMConfigurator::tagOpen() LOGGER. name='$loggerName'");        
+				$loggerName = $this->subst(@$attribs['NAME']);
+				if (!empty($loggerName)) {
+					LoggerLog::debug("LoggerDOMConfigurator::tagOpen() LOGGER. name='$loggerName'");        
                     
-                    $class = $this->subst(@$attribs['CLASS']);
-                    if (empty($class)) {
-                        $this->logger =& $this->repository->getLogger($loggerName);
-                    } else {
-                        $className = basename($class);
-                        if (!class_exists($className))  
-                            @include_once("{$class}.php");
-                        if (!class_exists($className)) {
-                            LoggerLog::warn(
-                                "LoggerDOMConfigurator::tagOpen() LOGGER. ".
-                                "cannot find '$className'."
-                            );                        
-                        } else {
+					$class = $this->subst(@$attribs['CLASS']);
+					if (empty($class)) {
+						$this->logger =& $this->repository->getLogger($loggerName);
+					} else {
+						$className = basename($class);
+						if (!class_exists($className))  
+							@include_once("{$class}.php");
+						if (!class_exists($className)) {
+							LoggerLog::warn(
+								"LoggerDOMConfigurator::tagOpen() LOGGER. ".
+								"cannot find '$className'."
+							);                        
+						} else {
                         
-                            if (in_array('getlogger', get_class_methods($className))) {
-                                $this->logger =& call_user_func(array($className, 'getlogger'), $loggerName);
-                            } else {
-                                LoggerLog::warn(
-                                    "LoggerDOMConfigurator::tagOpen() LOGGER. ".
-                                    "class '$className' doesnt implement 'getLogger()' method."
-                                );                        
-                            }
-                        }
-                    }    
-                    if ($this->logger !== null && isset($attribs['ADDITIVITY'])) {
-                        $additivity = LoggerOptionConverter::toBoolean($this->subst($attribs['ADDITIVITY']), true);     
-                        $this->logger->setAdditivity($additivity);
-                    }
-                } else {
-                    LoggerLog::warn("LoggerDOMConfigurator::tagOpen() LOGGER. Attribute 'name' is not set or is empty.");
-                }
-                $this->state[] = LOG4PHP_LOGGER_DOM_CONFIGURATOR_LOGGER_STATE;;
-                break;
+							if (in_array('getlogger', get_class_methods($className))) {
+								$this->logger =& call_user_func(array($className, 'getlogger'), $loggerName);
+							} else {
+								LoggerLog::warn(
+									"LoggerDOMConfigurator::tagOpen() LOGGER. ".
+									"class '$className' doesnt implement 'getLogger()' method."
+								);                        
+							}
+						}
+					}    
+					if ($this->logger !== null && isset($attribs['ADDITIVITY'])) {
+						$additivity = LoggerOptionConverter::toBoolean($this->subst($attribs['ADDITIVITY']), true);     
+						$this->logger->setAdditivity($additivity);
+					}
+				} else {
+					LoggerLog::warn("LoggerDOMConfigurator::tagOpen() LOGGER. Attribute 'name' is not set or is empty.");
+				}
+				$this->state[] = LOG4PHP_LOGGER_DOM_CONFIGURATOR_LOGGER_STATE;;
+				break;
             
-            case 'LEVEL':
-            case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':LEVEL':
-            case 'PRIORITY':
-            case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':PRIORITY':
+			case 'LEVEL':
+			case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':LEVEL':
+			case 'PRIORITY':
+			case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':PRIORITY':
             
-                if (!isset($attribs['VALUE'])) {
-                    LoggerLog::debug("LoggerDOMConfigurator::tagOpen() LEVEL value not set");
-                    break;
-                }
+				if (!isset($attribs['VALUE'])) {
+					LoggerLog::debug("LoggerDOMConfigurator::tagOpen() LEVEL value not set");
+					break;
+				}
                     
-                LoggerLog::debug("LoggerDOMConfigurator::tagOpen() LEVEL value={$attribs['VALUE']}");
+				LoggerLog::debug("LoggerDOMConfigurator::tagOpen() LEVEL value={$attribs['VALUE']}");
                 
-                if ($this->logger === null) { 
-                    LoggerLog::warn("LoggerDOMConfigurator::tagOpen() LEVEL. parent logger is null");
-                    break;
-                }
+				if ($this->logger === null) { 
+					LoggerLog::warn("LoggerDOMConfigurator::tagOpen() LEVEL. parent logger is null");
+					break;
+				}
         
-                switch (end($this->state)) {
-                    case LOG4PHP_LOGGER_DOM_CONFIGURATOR_ROOT_STATE:
-                        $this->logger->setLevel(
-                            LoggerOptionConverter::toLevel(
-                                $this->subst($attribs['VALUE']), 
-                                $this->logger->getLevel()
-                            )
-                        );
-                        LoggerLog::debug("LoggerDOMConfigurator::tagOpen() LEVEL root level is now '{$attribs['VALUE']}' ");                
-                        break;
-                    case LOG4PHP_LOGGER_DOM_CONFIGURATOR_LOGGER_STATE:
-                        $this->logger->setLevel(
-                            LoggerOptionConverter::toLevel(
-                                $this->subst($attribs['VALUE']), 
-                                $this->logger->getLevel()
-                            )
-                        );
-                        break;
-                    default:
-                        LoggerLog::warn("LoggerDOMConfigurator::tagOpen() LEVEL state '{$this->state}' not allowed here");
-                }
-                break;
+				switch (end($this->state)) {
+					case LOG4PHP_LOGGER_DOM_CONFIGURATOR_ROOT_STATE:
+						$this->logger->setLevel(
+							LoggerOptionConverter::toLevel(
+								$this->subst($attribs['VALUE']), 
+								$this->logger->getLevel()
+							)
+						);
+						LoggerLog::debug("LoggerDOMConfigurator::tagOpen() LEVEL root level is now '{$attribs['VALUE']}' ");                
+						break;
+					case LOG4PHP_LOGGER_DOM_CONFIGURATOR_LOGGER_STATE:
+						$this->logger->setLevel(
+							LoggerOptionConverter::toLevel(
+								$this->subst($attribs['VALUE']), 
+								$this->logger->getLevel()
+							)
+						);
+						break;
+					default:
+						LoggerLog::warn("LoggerDOMConfigurator::tagOpen() LEVEL state '{$this->state}' not allowed here");
+				}
+				break;
             
-            case 'PARAM':
-            case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':PARAM':
+			case 'PARAM':
+			case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':PARAM':
 
-                LoggerLog::debug("LoggerDOMConfigurator::tagOpen() PARAM");
+				LoggerLog::debug("LoggerDOMConfigurator::tagOpen() PARAM");
                 
-                if (!isset($attribs['NAME'])) {
-                    LoggerLog::warn(
-                        "LoggerDOMConfigurator::tagOpen() PARAM. ".
-                        "attribute 'name' not defined."
-                    );
-                    break;
-                }
-                if (!isset($attribs['VALUE'])) {
-                    LoggerLog::warn(
-                        "LoggerDOMConfigurator::tagOpen() PARAM. ".
-                        "attribute 'value' not defined."
-                    );
-                    break;
-                }
+				if (!isset($attribs['NAME'])) {
+					LoggerLog::warn(
+						"LoggerDOMConfigurator::tagOpen() PARAM. ".
+						"attribute 'name' not defined."
+					);
+					break;
+				}
+				if (!isset($attribs['VALUE'])) {
+					LoggerLog::warn(
+						"LoggerDOMConfigurator::tagOpen() PARAM. ".
+						"attribute 'value' not defined."
+					);
+					break;
+				}
                     
-                switch (end($this->state)) {
-                    case LOG4PHP_LOGGER_DOM_CONFIGURATOR_APPENDER_STATE:
-                        if ($this->appender !== null) {
-                            $this->setter($this->appender, $this->subst($attribs['NAME']), $this->subst($attribs['VALUE']));
-                        } else {
-                            LoggerLog::warn(
-                                "LoggerDOMConfigurator::tagOpen() PARAM. ".
-                                " trying to set property to a null appender."
-                            );
-                        }
-                        break;
-                    case LOG4PHP_LOGGER_DOM_CONFIGURATOR_LAYOUT_STATE:
-                        if ($this->layout !== null) {
-                            $this->setter($this->layout, $this->subst($attribs['NAME']), $this->subst($attribs['VALUE']));                
-                        } else {
-                            LoggerLog::warn(
-                                "LoggerDOMConfigurator::tagOpen() PARAM. ".
-                                " trying to set property to a null layout."
-                            );
-                        }
-                        break;
-                    case LOG4PHP_LOGGER_DOM_CONFIGURATOR_FILTER_STATE:
-                        if ($this->filter !== null) {
-                            $this->setter($this->filter, $this->subst($attribs['NAME']), $this->subst($attribs['VALUE']));
-                        } else {
-                            LoggerLog::warn(
-                                "LoggerDOMConfigurator::tagOpen() PARAM. ".
-                                " trying to set property to a null filter."
-                            );
-                        }
-                        break;
-                    default:
-                        LoggerLog::warn("LoggerDOMConfigurator::tagOpen() PARAM state '{$this->state}' not allowed here");
-                }
-                break;
+				switch (end($this->state)) {
+					case LOG4PHP_LOGGER_DOM_CONFIGURATOR_APPENDER_STATE:
+						if ($this->appender !== null) {
+							$this->setter($this->appender, $this->subst($attribs['NAME']), $this->subst($attribs['VALUE']));
+						} else {
+							LoggerLog::warn(
+								"LoggerDOMConfigurator::tagOpen() PARAM. ".
+								" trying to set property to a null appender."
+							);
+						}
+						break;
+					case LOG4PHP_LOGGER_DOM_CONFIGURATOR_LAYOUT_STATE:
+						if ($this->layout !== null) {
+							$this->setter($this->layout, $this->subst($attribs['NAME']), $this->subst($attribs['VALUE']));                
+						} else {
+							LoggerLog::warn(
+								"LoggerDOMConfigurator::tagOpen() PARAM. ".
+								" trying to set property to a null layout."
+							);
+						}
+						break;
+					case LOG4PHP_LOGGER_DOM_CONFIGURATOR_FILTER_STATE:
+						if ($this->filter !== null) {
+							$this->setter($this->filter, $this->subst($attribs['NAME']), $this->subst($attribs['VALUE']));
+						} else {
+							LoggerLog::warn(
+								"LoggerDOMConfigurator::tagOpen() PARAM. ".
+								" trying to set property to a null filter."
+							);
+						}
+						break;
+					default:
+						LoggerLog::warn("LoggerDOMConfigurator::tagOpen() PARAM state '{$this->state}' not allowed here");
+				}
+				break;
             
-            case 'RENDERER':
-            case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':RENDERER':
+			case 'RENDERER':
+			case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':RENDERER':
 
-                $renderedClass   = $this->subst(@$attribs['RENDEREDCLASS']);
-                $renderingClass  = $this->subst(@$attribs['RENDERINGCLASS']);
+				$renderedClass   = $this->subst(@$attribs['RENDEREDCLASS']);
+				$renderingClass  = $this->subst(@$attribs['RENDERINGCLASS']);
         
-                LoggerLog::debug("LoggerDOMConfigurator::tagOpen() RENDERER renderedClass='$renderedClass' renderingClass='$renderingClass'");
+				LoggerLog::debug("LoggerDOMConfigurator::tagOpen() RENDERER renderedClass='$renderedClass' renderingClass='$renderingClass'");
         
-                if (!empty($renderedClass) && !empty($renderingClass)) {
-                    $renderer = LoggerObjectRenderer::factory($renderingClass);
-                    if ($renderer === null) {
-                        LoggerLog::warn("LoggerDOMConfigurator::tagOpen() RENDERER cannot instantiate '$renderingClass'");
-                    } else { 
-                        $this->repository->setRenderer($renderedClass, $renderer);
-                    }
-                } else {
-                    LoggerLog::warn("LoggerDOMConfigurator::tagOpen() RENDERER renderedClass or renderingClass is empty");        
-                }
-                break;
+				if (!empty($renderedClass) && !empty($renderingClass)) {
+					$renderer = LoggerObjectRenderer::factory($renderingClass);
+					if ($renderer === null) {
+						LoggerLog::warn("LoggerDOMConfigurator::tagOpen() RENDERER cannot instantiate '$renderingClass'");
+					} else { 
+						$this->repository->setRenderer($renderedClass, $renderer);
+					}
+				} else {
+					LoggerLog::warn("LoggerDOMConfigurator::tagOpen() RENDERER renderedClass or renderingClass is empty");        
+				}
+				break;
             
-            case 'ROOT':
-            case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':ROOT':
+			case 'ROOT':
+			case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':ROOT':
             
-                LoggerLog::debug("LoggerDOMConfigurator::tagOpen() ROOT");
+				LoggerLog::debug("LoggerDOMConfigurator::tagOpen() ROOT");
                 
-                $this->logger =& LoggerManager::getRootLogger();
+				$this->logger =& LoggerManager::getRootLogger();
                 
-                $this->state[] = LOG4PHP_LOGGER_DOM_CONFIGURATOR_ROOT_STATE;
-                break;
+				$this->state[] = LOG4PHP_LOGGER_DOM_CONFIGURATOR_ROOT_STATE;
+				break;
                 
-        }
+		}
          
-    }
+	}
 
 
-    /**
-     * @param mixed $parser
-     * @param string $tag
-     */
-    public function tagClose($parser, $tag)
-    {
-        switch ($tag) {
+	/**
+	 * @param mixed $parser
+	 * @param string $tag
+	 */
+	public function tagClose($parser, $tag)
+	{
+		switch ($tag) {
         
-            case 'CONFIGURATION' : 
-            case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':CONFIGURATION':
+			case 'CONFIGURATION' : 
+			case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':CONFIGURATION':
           
-                LoggerLog::debug("LoggerDOMConfigurator::tagClose() CONFIGURATION");
-                break;
+				LoggerLog::debug("LoggerDOMConfigurator::tagClose() CONFIGURATION");
+				break;
                 
-            case 'APPENDER' :
-            case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':APPENDER':
+			case 'APPENDER' :
+			case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':APPENDER':
             
-                LoggerLog::debug("LoggerDOMConfigurator::tagClose() APPENDER");
+				LoggerLog::debug("LoggerDOMConfigurator::tagClose() APPENDER");
                 
-                if ($this->appender !== null) {
-                    if ($this->appender->requiresLayout() && $this->appender->layout === null) {
-                        $appenderName = $this->appender->getName();
-                        LoggerLog::warn(
-                            "LoggerDOMConfigurator::tagClose() APPENDER. ".
-                            "'$appenderName' requires a layout that is not defined. ".
-                            "Using a simple layout"
-                        );
-                        $this->appender->setLayout(LoggerLayout::factory('LoggerLayoutSimple'));
-                    }                    
-                    $this->appender->activateOptions();
-                }        
-                array_pop($this->state);        
-                break;
+				if ($this->appender !== null) {
+					if ($this->appender->requiresLayout() && $this->appender->layout === null) {
+						$appenderName = $this->appender->getName();
+						LoggerLog::warn(
+							"LoggerDOMConfigurator::tagClose() APPENDER. ".
+							"'$appenderName' requires a layout that is not defined. ".
+							"Using a simple layout"
+						);
+						$this->appender->setLayout(LoggerLayout::factory('LoggerLayoutSimple'));
+					}                    
+					$this->appender->activateOptions();
+				}        
+				array_pop($this->state);        
+				break;
                 
-            case 'FILTER' :
-            case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':FILTER':
+			case 'FILTER' :
+			case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':FILTER':
             
-                LoggerLog::debug("LoggerDOMConfigurator::tagClose() FILTER");
+				LoggerLog::debug("LoggerDOMConfigurator::tagClose() FILTER");
                             
-                if ($this->filter !== null) {
-                    $this->filter->activateOptions();
-                    $this->appender->addFilter($this->filter);
-                    $this->filter = null;
-                }
-                array_pop($this->state);        
-                break;
+				if ($this->filter !== null) {
+					$this->filter->activateOptions();
+					$this->appender->addFilter($this->filter);
+					$this->filter = null;
+				}
+				array_pop($this->state);        
+				break;
                 
-            case 'LAYOUT':
-            case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':LAYOUT':
+			case 'LAYOUT':
+			case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':LAYOUT':
 
-                LoggerLog::debug("LoggerDOMConfigurator::tagClose() LAYOUT");
+				LoggerLog::debug("LoggerDOMConfigurator::tagClose() LAYOUT");
 
-                if ($this->appender !== null && $this->layout !== null && $this->appender->requiresLayout()) {
-                    $this->layout->activateOptions();
-                    $this->appender->setLayout($this->layout);
-                    $this->layout = null;
-                }
-                array_pop($this->state);
-                break;
+				if ($this->appender !== null && $this->layout !== null && $this->appender->requiresLayout()) {
+					$this->layout->activateOptions();
+					$this->appender->setLayout($this->layout);
+					$this->layout = null;
+				}
+				array_pop($this->state);
+				break;
             
-            case 'LOGGER':
-            case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':LOGGER':
+			case 'LOGGER':
+			case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':LOGGER':
             
-                LoggerLog::debug("LoggerDOMConfigurator::tagClose() LOGGER");        
+				LoggerLog::debug("LoggerDOMConfigurator::tagClose() LOGGER");        
 
-                array_pop($this->state);
-                break;
+				array_pop($this->state);
+				break;
             
-            case 'ROOT':
-            case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':ROOT':
+			case 'ROOT':
+			case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':ROOT':
             
-                LoggerLog::debug("LoggerDOMConfigurator::tagClose() ROOT");
+				LoggerLog::debug("LoggerDOMConfigurator::tagClose() ROOT");
 
-                array_pop($this->state);
-                break;
-        }
-    }
+				array_pop($this->state);
+				break;
+		}
+	}
     
-    /**
-     * @param object $object
-     * @param string $name
-     * @param mixed $value
-     */
-    public function setter(&$object, $name, $value)
-    {
-        if (empty($name)) {
-            LoggerLog::debug("LoggerDOMConfigurator::setter() 'name' param cannot be empty");        
-            return false;
-        }
-        $methodName = 'set'.ucfirst($name);
-        if (method_exists($object, $methodName)) {
-            LoggerLog::debug("LoggerDOMConfigurator::setter() Calling ".get_class($object)."::{$methodName}({$value})");
-            return call_user_func(array(&$object, $methodName), $value);
-        } else {
-            LoggerLog::warn("LoggerDOMConfigurator::setter() ".get_class($object)."::{$methodName}() does not exists");
-            return false;
-        }
-    }
+	/**
+	 * @param object $object
+	 * @param string $name
+	 * @param mixed $value
+	 */
+	public function setter(&$object, $name, $value)
+	{
+		if (empty($name)) {
+			LoggerLog::debug("LoggerDOMConfigurator::setter() 'name' param cannot be empty");        
+			return false;
+		}
+		$methodName = 'set'.ucfirst($name);
+		if (method_exists($object, $methodName)) {
+			LoggerLog::debug("LoggerDOMConfigurator::setter() Calling ".get_class($object)."::{$methodName}({$value})");
+			return call_user_func(array(&$object, $methodName), $value);
+		} else {
+			LoggerLog::warn("LoggerDOMConfigurator::setter() ".get_class($object)."::{$methodName}() does not exists");
+			return false;
+		}
+	}
     
-    public function subst($value)
-    {
-        return LoggerOptionConverter::substVars($value);
-    }
+	public function subst($value)
+	{
+		return LoggerOptionConverter::substVars($value);
+	}
 
 }
 ?>
\ No newline at end of file

libraries/log4php.debug/LoggerLevel.php

Indentation +195 added lines, -195 removed lines

@@ -49,216 +49,216 @@
  */
 class LoggerLevel {
 
-    /**
-     * @var integer
-     */
-    public $level;
+	/**
+	 * @var integer
+	 */
+	public $level;
   
-    /**
-     * @var string
-     */
-    public $levelStr;
+	/**
+	 * @var string
+	 */
+	public $levelStr;
   
-    /**
-     * @var integer
-     */
-    public $syslogEquivalent;
+	/**
+	 * @var integer
+	 */
+	public $syslogEquivalent;
 
-    /**
-     * Constructor
-     *
-     * @param integer $level
-     * @param string $levelStr
-     * @param integer $syslogEquivalent
-     */
-    public function LoggerLevel($level, $levelStr, $syslogEquivalent)
-    {
-        $this->level = $level;
-        $this->levelStr = $levelStr;
-        $this->syslogEquivalent = $syslogEquivalent;
-    }
+	/**
+	 * Constructor
+	 *
+	 * @param integer $level
+	 * @param string $levelStr
+	 * @param integer $syslogEquivalent
+	 */
+	public function LoggerLevel($level, $levelStr, $syslogEquivalent)
+	{
+		$this->level = $level;
+		$this->levelStr = $levelStr;
+		$this->syslogEquivalent = $syslogEquivalent;
+	}
 
-    /**
-     * Two priorities are equal if their level fields are equal.
-     *
-     * @param object $o
-     * @return boolean 
-     */
-    public function equals($o)
-    {
-        if (is_a($o, 'loggerlevel')) {
-            return ($this->level == $o->level);
-        } else {
-            return false;
-        }
-    }
+	/**
+	 * Two priorities are equal if their level fields are equal.
+	 *
+	 * @param object $o
+	 * @return boolean 
+	 */
+	public function equals($o)
+	{
+		if (is_a($o, 'loggerlevel')) {
+			return ($this->level == $o->level);
+		} else {
+			return false;
+		}
+	}
     
-    /**
-     * Returns an Off Level
-     * @static
-     * @return LoggerLevel
-     */
-    public function &getLevelOff()
-    {
-        static $level;
-        if (!isset($level)) $level = new LoggerLevel(LOG4PHP_LEVEL_OFF_INT, 'OFF', 0);
-        return $level;
-    }
+	/**
+	 * Returns an Off Level
+	 * @static
+	 * @return LoggerLevel
+	 */
+	public function &getLevelOff()
+	{
+		static $level;
+		if (!isset($level)) $level = new LoggerLevel(LOG4PHP_LEVEL_OFF_INT, 'OFF', 0);
+		return $level;
+	}
 
-    /**
-     * Returns a Fatal Level
-     * @static
-     * @return LoggerLevel
-     */
-    public function &getLevelFatal()
-    {
-        static $level;
-        if (!isset($level)) $level = new LoggerLevel(LOG4PHP_LEVEL_FATAL_INT, 'FATAL', 0);
-        return $level;
-    }
+	/**
+	 * Returns a Fatal Level
+	 * @static
+	 * @return LoggerLevel
+	 */
+	public function &getLevelFatal()
+	{
+		static $level;
+		if (!isset($level)) $level = new LoggerLevel(LOG4PHP_LEVEL_FATAL_INT, 'FATAL', 0);
+		return $level;
+	}
     
-    /**
-     * Returns an Error Level
-     * @static
-     * @return LoggerLevel
-     */
-    public function &getLevelError()
-    {
-        static $level;
-        if (!isset($level)) $level = new LoggerLevel(LOG4PHP_LEVEL_ERROR_INT, 'ERROR', 3);
-        return $level;
-    }
+	/**
+	 * Returns an Error Level
+	 * @static
+	 * @return LoggerLevel
+	 */
+	public function &getLevelError()
+	{
+		static $level;
+		if (!isset($level)) $level = new LoggerLevel(LOG4PHP_LEVEL_ERROR_INT, 'ERROR', 3);
+		return $level;
+	}
     
-    /**
-     * Returns a Warn Level
-     * @static
-     * @return LoggerLevel
-     */
-    public function &getLevelWarn()
-    {
-        static $level;
-        if (!isset($level)) $level = new LoggerLevel(LOG4PHP_LEVEL_WARN_INT, 'WARN', 4);
-        return $level;
-    }
+	/**
+	 * Returns a Warn Level
+	 * @static
+	 * @return LoggerLevel
+	 */
+	public function &getLevelWarn()
+	{
+		static $level;
+		if (!isset($level)) $level = new LoggerLevel(LOG4PHP_LEVEL_WARN_INT, 'WARN', 4);
+		return $level;
+	}
 
-    /**
-     * Returns an Info Level
-     * @static
-     * @return LoggerLevel
-     */
-    public function &getLevelInfo()
-    {
-        static $level;
-        if (!isset($level)) $level = new LoggerLevel(LOG4PHP_LEVEL_INFO_INT, 'INFO', 6);
-        return $level;
-    }
+	/**
+	 * Returns an Info Level
+	 * @static
+	 * @return LoggerLevel
+	 */
+	public function &getLevelInfo()
+	{
+		static $level;
+		if (!isset($level)) $level = new LoggerLevel(LOG4PHP_LEVEL_INFO_INT, 'INFO', 6);
+		return $level;
+	}
 
-    /**
-     * Returns a Debug Level
-     * @static
-     * @return LoggerLevel
-     */
-    public function &getLevelDebug()
-    {
-        static $level;
-        if (!isset($level)) $level = new LoggerLevel(LOG4PHP_LEVEL_DEBUG_INT, 'DEBUG', 7);
-        return $level;
-    }
+	/**
+	 * Returns a Debug Level
+	 * @static
+	 * @return LoggerLevel
+	 */
+	public function &getLevelDebug()
+	{
+		static $level;
+		if (!isset($level)) $level = new LoggerLevel(LOG4PHP_LEVEL_DEBUG_INT, 'DEBUG', 7);
+		return $level;
+	}
 
-    /**
-     * Returns an All Level
-     * @static
-     * @return LoggerLevel
-     */
-    public function &getLevelAll()
-    {
-        static $level;
-        if (!isset($level)) $level = new LoggerLevel(LOG4PHP_LEVEL_ALL_INT, 'ALL', 7);
-        return $level;
-    }
+	/**
+	 * Returns an All Level
+	 * @static
+	 * @return LoggerLevel
+	 */
+	public function &getLevelAll()
+	{
+		static $level;
+		if (!isset($level)) $level = new LoggerLevel(LOG4PHP_LEVEL_ALL_INT, 'ALL', 7);
+		return $level;
+	}
     
-    /**
-     * Return the syslog equivalent of this priority as an integer.
-     * @final
-     * @return integer
-     */
-    public function getSyslogEquivalent()
-    {
-        return $this->syslogEquivalent;
-    }
+	/**
+	 * Return the syslog equivalent of this priority as an integer.
+	 * @final
+	 * @return integer
+	 */
+	public function getSyslogEquivalent()
+	{
+		return $this->syslogEquivalent;
+	}
 
-    /**
-     * Returns <i>true</i> if this level has a higher or equal
-     * level than the level passed as argument, <i>false</i>
-     * otherwise.  
-     * 
-     * <p>You should think twice before overriding the default
-     * implementation of <i>isGreaterOrEqual</i> method.
-     *
-     * @param LoggerLevel $r
-     * @return boolean
-     */
-    public function isGreaterOrEqual($r)
-    {
-        return $this->level >= $r->level;
-    }
+	/**
+	 * Returns <i>true</i> if this level has a higher or equal
+	 * level than the level passed as argument, <i>false</i>
+	 * otherwise.  
+	 * 
+	 * <p>You should think twice before overriding the default
+	 * implementation of <i>isGreaterOrEqual</i> method.
+	 *
+	 * @param LoggerLevel $r
+	 * @return boolean
+	 */
+	public function isGreaterOrEqual($r)
+	{
+		return $this->level >= $r->level;
+	}
 
-    /**
-     * Returns the string representation of this priority.
-     * @return string
-     * @final
-     */
-    public function toString()
-    {
-        return $this->levelStr;
-    }
+	/**
+	 * Returns the string representation of this priority.
+	 * @return string
+	 * @final
+	 */
+	public function toString()
+	{
+		return $this->levelStr;
+	}
 
-    /**
-     * Returns the integer representation of this level.
-     * @return integer
-     */
-    public function toInt()
-    {
-        return $this->level;
-    }
+	/**
+	 * Returns the integer representation of this level.
+	 * @return integer
+	 */
+	public function toInt()
+	{
+		return $this->level;
+	}
 
-    /**
-     * Convert the string passed as argument to a level. If the
-     * conversion fails, then this method returns a DEBUG Level.
-     *
-     * @param mixed $arg
-     * @param LoggerLevel $default
-     * @static 
-     */
-    public function &toLevel($arg, $defaultLevel = null)
-    {
-        if ($defaultLevel === null) {
-            return LoggerLevel::toLevel($arg, LoggerLevel::getLevelDebug());
-        } else {
-            if (is_int($arg)) {
-                switch($arg) {
-                    case LOG4PHP_LEVEL_ALL_INT:     return LoggerLevel::getLevelAll();
-                    case LOG4PHP_LEVEL_DEBUG_INT:   return LoggerLevel::getLevelDebug();
-                    case LOG4PHP_LEVEL_INFO_INT:    return LoggerLevel::getLevelInfo();
-                    case LOG4PHP_LEVEL_WARN_INT:    return LoggerLevel::getLevelWarn();
-                    case LOG4PHP_LEVEL_ERROR_INT:   return LoggerLevel::getLevelError();
-                    case LOG4PHP_LEVEL_FATAL_INT:   return LoggerLevel::getLevelFatal();
-                    case LOG4PHP_LEVEL_OFF_INT:     return LoggerLevel::getLevelOff();
-                    default:                        return $defaultLevel;
-                }
-            } else {
-                switch(strtoupper($arg)) {
-                    case 'ALL':     return LoggerLevel::getLevelAll();
-                    case 'DEBUG':   return LoggerLevel::getLevelDebug();
-                    case 'INFO':    return LoggerLevel::getLevelInfo();
-                    case 'WARN':    return LoggerLevel::getLevelWarn();
-                    case 'ERROR':   return LoggerLevel::getLevelError();
-                    case 'FATAL':   return LoggerLevel::getLevelFatal();
-                    case 'OFF':     return LoggerLevel::getLevelOff();
-                    default:        return $defaultLevel;
-                }
-            }
-        }
-    }
+	/**
+	 * Convert the string passed as argument to a level. If the
+	 * conversion fails, then this method returns a DEBUG Level.
+	 *
+	 * @param mixed $arg
+	 * @param LoggerLevel $default
+	 * @static 
+	 */
+	public function &toLevel($arg, $defaultLevel = null)
+	{
+		if ($defaultLevel === null) {
+			return LoggerLevel::toLevel($arg, LoggerLevel::getLevelDebug());
+		} else {
+			if (is_int($arg)) {
+				switch($arg) {
+					case LOG4PHP_LEVEL_ALL_INT:     return LoggerLevel::getLevelAll();
+					case LOG4PHP_LEVEL_DEBUG_INT:   return LoggerLevel::getLevelDebug();
+					case LOG4PHP_LEVEL_INFO_INT:    return LoggerLevel::getLevelInfo();
+					case LOG4PHP_LEVEL_WARN_INT:    return LoggerLevel::getLevelWarn();
+					case LOG4PHP_LEVEL_ERROR_INT:   return LoggerLevel::getLevelError();
+					case LOG4PHP_LEVEL_FATAL_INT:   return LoggerLevel::getLevelFatal();
+					case LOG4PHP_LEVEL_OFF_INT:     return LoggerLevel::getLevelOff();
+					default:                        return $defaultLevel;
+				}
+			} else {
+				switch(strtoupper($arg)) {
+					case 'ALL':     return LoggerLevel::getLevelAll();
+					case 'DEBUG':   return LoggerLevel::getLevelDebug();
+					case 'INFO':    return LoggerLevel::getLevelInfo();
+					case 'WARN':    return LoggerLevel::getLevelWarn();
+					case 'ERROR':   return LoggerLevel::getLevelError();
+					case 'FATAL':   return LoggerLevel::getLevelFatal();
+					case 'OFF':     return LoggerLevel::getLevelOff();
+					default:        return $defaultLevel;
+				}
+			}
+		}
+	}
 }
 ?>
\ No newline at end of file

libraries/log4php.debug/LoggerRoot.php

Indentation +54 added lines, -54 removed lines

@@ -36,66 +36,66 @@
  */
 class LoggerRoot extends Logger {
 
-    /**
-     * @var string name of logger 
-     */
-    public $name   = 'root';
+	/**
+	 * @var string name of logger 
+	 */
+	public $name   = 'root';
 
-    /**
-     * @var object must be null for LoggerRoot
-     */
-    public $parent = null;
+	/**
+	 * @var object must be null for LoggerRoot
+	 */
+	public $parent = null;
     
 
-    /**
-     * Constructor
-     *
-     * @param integer $level initial log level
-     */
-    public function LoggerRoot($level = null)
-    {
-        $this->Logger($this->name);
-        if ($level == null)
-            $level = LoggerLevel::getLevelAll();
-        $this->setLevel($level);
-    } 
+	/**
+	 * Constructor
+	 *
+	 * @param integer $level initial log level
+	 */
+	public function LoggerRoot($level = null)
+	{
+		$this->Logger($this->name);
+		if ($level == null)
+			$level = LoggerLevel::getLevelAll();
+		$this->setLevel($level);
+	} 
     
-    /**
-     * @return integer the level
-     */
-    public function getChainedLevel()
-    {
-        return $this->level;
-    } 
+	/**
+	 * @return integer the level
+	 */
+	public function getChainedLevel()
+	{
+		return $this->level;
+	} 
     
-    /**
-     * Setting a null value to the level of the root category may have catastrophic results.
-     * @param LoggerLevel $level
-     */
-    public function setLevel($level)
-    {
-        $this->level = $level;
-    }    
+	/**
+	 * Setting a null value to the level of the root category may have catastrophic results.
+	 * @param LoggerLevel $level
+	 */
+	public function setLevel($level)
+	{
+		$this->level = $level;
+	}    
  
-    /**
-     * Please use setLevel() instead.
-     * @param LoggerLevel $level
-     * @deprecated
-     */
-    public function setPriority($level)
-    {
-        $this->setLevel($level); 
-    }
+	/**
+	 * Please use setLevel() instead.
+	 * @param LoggerLevel $level
+	 * @deprecated
+	 */
+	public function setPriority($level)
+	{
+		$this->setLevel($level); 
+	}
     
-    /**
-     * Always returns false.
-     * Because LoggerRoot has no parents, it returns false.
-     * @param Logger $parent
-     * @return boolean
-     */
-    public function setParent($parent)
-    {
-        return false;
-    }  
+	/**
+	 * Always returns false.
+	 * Because LoggerRoot has no parents, it returns false.
+	 * @param Logger $parent
+	 * @return boolean
+	 */
+	public function setParent($parent)
+	{
+		return false;
+	}  
 }
 ?>
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
     /**
      * @var string name of logger 
      */
-    public $name   = 'root';
+    public $name = 'root';
 
     /**
      * @var object must be null for LoggerRoot

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
-    public $wsdl; 
-    // define internal arrays of bindings, ports, operations, messages, etc.
-    public $schemas = array();
-    public $currentSchema;
-    public $message = array();
-    public $complexTypes = array();
-    public $messages = array();
-    public $currentMessage;
-    public $currentOperation;
-    public $portTypes = array();
-    public $currentPortType;
-    public $bindings = array();
-    public $currentBinding;
-    public $ports = array();
-    public $currentPort;
-    public $opData = array();
-    public $status = '';
-    public $documentation = false;
-    public $endpoint = ''; 
-    // array of wsdl docs to import
-    public $import = array(); 
-    // parser vars
-    public $parser;
-    public $position = 0;
-    public $depth = 0;
-    public $depth_array = array();
+	public $wsdl; 
+	// define internal arrays of bindings, ports, operations, messages, etc.
+	public $schemas = array();
+	public $currentSchema;
+	public $message = array();
+	public $complexTypes = array();
+	public $messages = array();
+	public $currentMessage;
+	public $currentOperation;
+	public $portTypes = array();
+	public $currentPortType;
+	public $bindings = array();
+	public $currentBinding;
+	public $ports = array();
+	public $currentPort;
+	public $opData = array();
+	public $status = '';
+	public $documentation = false;
+	public $endpoint = ''; 
+	// array of wsdl docs to import
+	public $import = array(); 
+	// parser vars
+	public $parser;
+	public $position = 0;
+	public $depth = 0;
+	public $depth_array = array();
 	// for getting wsdl
 	public $proxyhost = '';
-    public $proxyport = '';
+	public $proxyport = '';
 	public $proxyusername = '';
 	public $proxypassword = '';
 	public $timeout = 0;
@@ -55,10 +55,10 @@ 
 	public $authtype = '';				// Type of HTTP authentication
 	public $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;
 	} 
 }

Spacing +125 added lines, -127 removed lines

@@ -47,13 +47,13 @@ 
 	public $proxypassword = '';
 	public $timeout = 0;
 	public $response_timeout = 30;
-	public $curl_options = array();	// User-specified cURL options
-	public $use_curl = false;			// whether to always try to use cURL
+	public $curl_options = array(); // User-specified cURL options
+	public $use_curl = false; // whether to always try to use cURL
 	// for HTTP authentication
-	public $username = '';				// Username for HTTP authentication
-	public $password = '';				// Password for HTTP authentication
-	public $authtype = '';				// Type of HTTP authentication
-	public $certRequest = array();		// Certificate for HTTP SSL authentication
+	public $username = ''; // Username for HTTP authentication
+	public $password = ''; // Password for HTTP authentication
+	public $authtype = ''; // Type of HTTP authentication
+	public $certRequest = array(); // Certificate for HTTP SSL authentication
 
     /**
      * constructor
@@ -69,7 +69,7 @@ 
 	 * @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){
+    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;
@@ -103,10 +103,10 @@ 
     		// Schema imports
     		foreach ($this->schemas as $ns => $list) {
     			foreach ($list as $xs) {
-					$wsdlparts = parse_url($this->wsdl);	// this is bogusly simple!
+					$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']) {
+		                	if (!$list2[$ii]['loaded']) {
 		                		/*
 		                		 * Substituted with line below
 		                		 * because of error "Warning: attempt to modify property of non-object"
@@ -117,10 +117,10 @@ 
 								if ($url != '') {
 									$urlparts = parse_url($url);
 									if (!isset($urlparts['host'])) {
-										$url = $wsdlparts['scheme'] . '://' . $wsdlparts['host'] . (isset($wsdlparts['port']) ? ':' .$wsdlparts['port'] : '') .
-												substr($wsdlparts['path'],0,strrpos($wsdlparts['path'],'/') + 1) .$urlparts['path'];
+										$url = $wsdlparts['scheme'] . '://' . $wsdlparts['host'] . (isset($wsdlparts['port']) ? ':' . $wsdlparts['port'] : '') .
+												substr($wsdlparts['path'], 0, strrpos($wsdlparts['path'], '/') + 1) . $urlparts['path'];
 									}
-									if (! in_array($url, $imported_urls)) {
+									if (!in_array($url, $imported_urls)) {
 					                	$this->parseWSDL($url);
 				                		$imported++;
 				                		$imported_urls[] = $url;
@@ -134,19 +134,19 @@ 
     			}
     		}
     		// WSDL imports
-			$wsdlparts = parse_url($this->wsdl);	// this is bogusly simple!
+			$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']) {
+                	if (!$list[$ii]['loaded']) {
                 		$this->import[$ns][$ii]['loaded'] = true;
                 		$url = $list[$ii]['location'];
 						if ($url != '') {
 							$urlparts = parse_url($url);
 							if (!isset($urlparts['host'])) {
 								$url = $wsdlparts['scheme'] . '://' . $wsdlparts['host'] . (isset($wsdlparts['port']) ? ':' . $wsdlparts['port'] : '') .
-										substr($wsdlparts['path'],0,strrpos($wsdlparts['path'],'/') + 1) .$urlparts['path'];
+										substr($wsdlparts['path'], 0, strrpos($wsdlparts['path'], '/') + 1) . $urlparts['path'];
 							}
-							if (! in_array($url, $imported_urls)) {
+							if (!in_array($url, $imported_urls)) {
 			                	$this->parseWSDL($url);
 		                		$imported++;
 		                		$imported_urls[] = $url;
@@ -159,30 +159,28 @@ 
             } 
 		}
         // add new data to operation data
-        foreach($this->bindings as $binding => $bindingData) {
+        foreach ($this->bindings as $binding => $bindingData) {
             if (isset($bindingData['operations']) && is_array($bindingData['operations'])) {
-                foreach($bindingData['operations'] as $operation => $data) {
+                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'];
+						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'] = 
 						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'] ])){
-						$this->bindings[$binding]['operations'][$operation]['input']['parts'] = $this->messages[ $this->bindings[$binding]['operations'][$operation]['input']['message'] ];
+						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']])) {
+						$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'] ];
+					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
 					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]['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'] : '';
                 } 
             } 
@@ -213,8 +211,8 @@ 
 	        $tr = new soap_transport_http($wsdl, $this->curl_options, $this->use_curl);
 			$tr->request_method = 'GET';
 			$tr->useSOAPAction = false;
-			if($this->proxyhost && $this->proxyport){
-				$tr->setProxy($this->proxyhost,$this->proxyport,$this->proxyusername,$this->proxypassword);
+			if ($this->proxyhost && $this->proxyport) {
+				$tr->setProxy($this->proxyhost, $this->proxyport, $this->proxyusername, $this->proxypassword);
 			}
 			if ($this->authtype != '') {
 				$tr->setCredentials($this->username, $this->password, $this->authtype, array(), $this->certRequest);
@@ -223,8 +221,8 @@ 
 			$wsdl_string = $tr->send('', $this->timeout, $this->response_timeout);
 			$this->appendDebug($tr->getDebug());
 			// catch errors
-			if($err = $tr->getError() ){
-				$errstr = 'Getting ' . $wsdl . ' - HTTP ERROR: '.$err;
+			if ($err = $tr->getError()) {
+				$errstr = 'Getting ' . $wsdl . ' - HTTP ERROR: ' . $err;
 				$this->debug($errstr);
 	            $this->setError($errstr);
 				unset($tr);
@@ -283,7 +281,7 @@ 
         xml_parser_free($this->parser);
         $this->debug('Parsing WSDL done');
 		// catch wsdl parse errors
-		if($this->getError()){
+		if ($this->getError()) {
 			return false;
 		}
         return true;
@@ -320,8 +318,8 @@ 
             // process attributes
             if (count($attrs) > 0) {
 				// register namespace declarations
-                foreach($attrs as $k => $v) {
-                    if (preg_match('/^xmlns/',$k)) {
+                foreach ($attrs as $k => $v) {
+                    if (preg_match('/^xmlns/', $k)) {
                         if ($ns_prefix = substr(strrchr($k, ':'), 1)) {
                             $this->namespaces[$ns_prefix] = $v;
                         } else {
@@ -334,7 +332,7 @@ 
                     }
                 }
                 // expand each attribute prefix to its namespace
-                foreach($attrs as $k => $v) {
+                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;
@@ -441,8 +439,8 @@ 
 					    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'];
+					        $this->bindings[$this->ports[$this->currentPort]['binding']]['bindingType'] = $namespace;
+					        $this->bindings[$this->ports[$this->currentPort]['binding']]['endpoint'] = $attrs['location'];
 					        break;
 					} 
 					break;
@@ -452,13 +450,13 @@ 
 			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']]).')');
+                    $this->debug('parsing import ' . $attrs['namespace'] . ' - ' . $attrs['location'] . ' (' . count($this->import[$attrs['namespace']]) . ')');
 				} else {
                     $this->import[$attrs['namespace']][] = array('location' => '', 'loaded' => true);
-					if (! $this->getPrefixFromNamespace($attrs['namespace'])) {
-						$this->namespaces['ns'.(count($this->namespaces)+1)] = $attrs['namespace'];
+					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
@@ -509,7 +507,7 @@ 
 	* @param string $name element name
 	* @access private 
 	*/
-	public function end_element($parser, $name){ 
+	public function end_element($parser, $name) { 
 		// unset schema status
 		if (/*preg_match('/types$/', $name) ||*/ preg_match('/schema$/', $name)) {
 			$this->status = "";
@@ -592,15 +590,15 @@ 
 		}
 		$this->debug("getOperations for port '$portName' bindingType $bindingType");
 		// loop thru ports
-		foreach($this->ports as $port => $portData) {
+		foreach ($this->ports as $port => $portData) {
 			$this->debug("getOperations checking port $port bindingType " . $portData['bindingType']);
 			if ($portName == '' || $port == $portName) {
 				// binding type of port matches parameter
 				if ($portData['bindingType'] == $bindingType) {
 					$this->debug("getOperations found port $port bindingType $bindingType");
 					// merge bindings
-					if (isset($this->bindings[ $portData['binding'] ]['operations'])) {
-						$ops = array_merge ($ops, $this->bindings[ $portData['binding'] ]['operations']);
+					if (isset($this->bindings[$portData['binding']]['operations'])) {
+						$ops = array_merge($ops, $this->bindings[$portData['binding']]['operations']);
 					}
 				}
 			}
@@ -627,15 +625,15 @@ 
 			$bindingType = 'http://schemas.xmlsoap.org/wsdl/soap12/';
 		}
 		// loop thru ports
-		foreach($this->ports as $port => $portData) {
+		foreach ($this->ports as $port => $portData) {
 			// binding type of port matches parameter
 			if ($portData['bindingType'] == $bindingType) {
 				// get binding
 				//foreach($this->bindings[ $portData['binding'] ]['operations'] as $bOperation => $opData) {
-				foreach(array_keys($this->bindings[ $portData['binding'] ]['operations']) as $bOperation) {
+				foreach (array_keys($this->bindings[$portData['binding']]['operations']) as $bOperation) {
 					// note that we could/should also check the namespace here
 					if ($operation == $bOperation) {
-						$opData = $this->bindings[ $portData['binding'] ]['operations'][$operation];
+						$opData = $this->bindings[$portData['binding']]['operations'][$operation];
 					    return $opData;
 					} 
 				} 
@@ -658,11 +656,11 @@ 
 			$bindingType = 'http://schemas.xmlsoap.org/wsdl/soap12/';
 		}
 		// loop thru ports
-		foreach($this->ports as $port => $portData) {
+		foreach ($this->ports as $port => $portData) {
 			// binding type of port matches parameter
 			if ($portData['bindingType'] == $bindingType) {
 				// loop through operations for the binding
-				foreach ($this->bindings[ $portData['binding'] ]['operations'] as $bOperation => $opData) {
+				foreach ($this->bindings[$portData['binding']]['operations'] as $bOperation => $opData) {
 					if ($opData['soapAction'] == $soapAction) {
 					    return $opData;
 					} 
@@ -691,7 +689,7 @@ 
     */
 	public function getTypeDef($type, $ns) {
 		$this->debug("in getTypeDef: type=$type, ns=$ns");
-		if ((! $ns) && isset($this->namespaces['tns'])) {
+		if ((!$ns) && isset($this->namespaces['tns'])) {
 			$ns = $this->namespaces['tns'];
 			$this->debug("in getTypeDef: type namespace forced to $ns");
 		}
@@ -749,7 +747,7 @@ 
     *
     * @access private
     */
-    public function webDescription(){
+    public function webDescription() {
     	global $HTTP_SERVER_VARS;
 
 		if (isset($_SERVER)) {
@@ -761,7 +759,7 @@ 
 		}
 
 		$b = '
-		<html><head><title>NuSOAP: '.$this->serviceName.'</title>
+		<html><head><title>NuSOAP: '.$this->serviceName . '</title>
 		<style type="text/css">
 		    body    { font-family: arial; color: #000000; background-color: #ffffff; margin: 0px 0px 0px 0px; }
 		    p       { font-family: arial; color: #000000; margin-top: 0px; margin-bottom: 12px; }
@@ -838,24 +836,24 @@ 
 		<body>
 		<div class=content>
 			<br><br>
-			<div class=title>'.$this->serviceName.'</div>
+			<div class=title>'.$this->serviceName . '</div>
 			<div class=nav>
-				<p>View the <a href="'.$PHP_SELF.'?wsdl">WSDL</a> for the service.
+				<p>View the <a href="'.$PHP_SELF . '?wsdl">WSDL</a> for the service.
 				Click on an operation name to view it&apos;s details.</p>
 				<ul>';
-				foreach($this->getOperations() as $op => $data){
+				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'>
 				    <a href='#' onclick='popout()'><font color='#ffffff'>Close</font></a><br><br>";
-				    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
-								if($captain == 'parts'){ // loop thru parts
+				    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
+								if ($captain == 'parts') { // loop thru parts
 								    $b .= "&nbsp;&nbsp;$captain:<br>";
 					                //if(is_array($tenille)){
-								    	foreach($tenille as $joanie => $chachi){
+								    	foreach ($tenille as $joanie => $chachi) {
 											$b .= "&nbsp;&nbsp;&nbsp;&nbsp;$joanie: $chachi<br>";
 								    	}
 					        		//}
@@ -864,7 +862,7 @@ 
 								}
 						    }
 						} else {
-						    $b .= "<font color='white'>".ucfirst($donnie).":</font> $marie<br>";
+						    $b .= "<font color='white'>" . ucfirst($donnie) . ":</font> $marie<br>";
 						}
 				    }
 					$b .= '</div>';
@@ -887,7 +885,7 @@ 
 	{
 		$xml = '<?xml version="1.0" encoding="ISO-8859-1"?>';
 		$xml .= "\n<definitions";
-		foreach($this->namespaces as $k => $v) {
+		foreach ($this->namespaces as $k => $v) {
 			$xml .= " xmlns:$k=\"$v\"";
 		} 
 		// 10.9.02 - add poulter fix for wsdl and tns declarations
@@ -900,7 +898,7 @@ 
 		$xml .= '>'; 
 		// imports
 		if (sizeof($this->import) > 0) {
-			foreach($this->import as $ns => $list) {
+			foreach ($this->import as $ns => $list) {
 				foreach ($list as $ii) {
 					if ($ii['location'] != '') {
 						$xml .= '<import location="' . $ii['location'] . '" namespace="' . $ns . '" />';
@@ -911,7 +909,7 @@ 
 			} 
 		} 
 		// types
-		if (count($this->schemas)>=1) {
+		if (count($this->schemas) >= 1) {
 			$xml .= "\n<types>\n";
 			foreach ($this->schemas as $ns => $list) {
 				foreach ($list as $xs) {
@@ -922,10 +920,10 @@ 
 		} 
 		// messages
 		if (count($this->messages) >= 1) {
-			foreach($this->messages as $msgName => $msgParts) {
+			foreach ($this->messages as $msgName => $msgParts) {
 				$xml .= "\n<message name=\"" . $msgName . '">';
-				if(is_array($msgParts)){
-					foreach($msgParts as $partName => $partType) {
+				if (is_array($msgParts)) {
+					foreach ($msgParts as $partName => $partType) {
 						// print 'serializing '.$partType.', sv: '.$this->XMLSchemaVersion.'<br>';
 						if (strpos($partType, ':')) {
 						    $typePrefix = $this->getPrefixFromNamespace($this->getPrefix($partType));
@@ -933,7 +931,7 @@ 
 						    // print 'checking typemap: '.$this->XMLSchemaVersion.'<br>';
 						    $typePrefix = 'xsd';
 						} else {
-						    foreach($this->typemap as $ns => $types) {
+						    foreach ($this->typemap as $ns => $types) {
 						        if (isset($types[$partType])) {
 						            $typePrefix = $this->getPrefixFromNamespace($ns);
 						        } 
@@ -963,13 +961,13 @@ 
 		if (count($this->bindings) >= 1) {
 			$binding_xml = '';
 			$portType_xml = '';
-			foreach($this->bindings as $bindingName => $attrs) {
+			foreach ($this->bindings as $bindingName => $attrs) {
 				$binding_xml .= "\n<binding name=\"" . $bindingName . '" type="tns:' . $attrs['portType'] . '">';
 				$binding_xml .= "\n" . '  <soap:binding style="' . $attrs['style'] . '" transport="' . $attrs['transport'] . '"/>';
 				$portType_xml .= "\n<portType name=\"" . $attrs['portType'] . '">';
-				foreach($attrs['operations'] as $opName => $opParts) {
+				foreach ($attrs['operations'] as $opName => $opParts) {
 					$binding_xml .= "\n" . '  <operation name="' . $opName . '">';
-					$binding_xml .= "\n" . '    <soap:operation soapAction="' . $opParts['soapAction'] . '" style="'. $opParts['style'] . '"/>';
+					$binding_xml .= "\n" . '    <soap:operation soapAction="' . $opParts['soapAction'] . '" style="' . $opParts['style'] . '"/>';
 					if (isset($opParts['input']['encodingStyle']) && $opParts['input']['encodingStyle'] != '') {
 						$enc_style = ' encodingStyle="' . $opParts['input']['encodingStyle'] . '"';
 					} else {
@@ -988,7 +986,7 @@ 
 					    $portType_xml .= ' parameterOrder="' . $opParts['parameterOrder'] . '"';
 					} 
 					$portType_xml .= '>';
-					if(isset($opParts['documentation']) && $opParts['documentation'] != '') {
+					if (isset($opParts['documentation']) && $opParts['documentation'] != '') {
 						$portType_xml .= "\n" . '    <documentation>' . htmlspecialchars($opParts['documentation']) . '</documentation>';
 					}
 					$portType_xml .= "\n" . '    <input message="tns:' . $opParts['input']['message'] . '"/>';
@@ -1003,7 +1001,7 @@ 
 		// services
 		$xml .= "\n<service name=\"" . $this->serviceName . '">';
 		if (count($this->ports) >= 1) {
-			foreach($this->ports as $pName => $attrs) {
+			foreach ($this->ports as $pName => $attrs) {
 				$xml .= "\n" . '  <port name="' . $pName . '" binding="tns:' . $attrs['binding'] . '">';
 				$xml .= "\n" . '    <soap:address location="' . $attrs['location'] . ($debug ? '?debug=1' : '') . '"/>';
 				$xml .= "\n" . '  </port>';
@@ -1118,7 +1116,7 @@ 
 
 		// Get encoding style for output and set to current
 		$encodingStyle = 'http://schemas.xmlsoap.org/soap/encoding/';
-		if(($direction == 'input') && isset($opData['output']['encodingStyle']) && ($opData['output']['encodingStyle'] != $encodingStyle)) {
+		if (($direction == 'input') && isset($opData['output']['encodingStyle']) && ($opData['output']['encodingStyle'] != $encodingStyle)) {
 			$encodingStyle = $opData['output']['encodingStyle'];
 			$enc_style = $encodingStyle;
 		}
@@ -1213,7 +1211,7 @@ 
 		
 		// Get encoding style for output and set to current
 		$encodingStyle = 'http://schemas.xmlsoap.org/soap/encoding/';
-		if(($direction == 'input') && isset($opData['output']['encodingStyle']) && ($opData['output']['encodingStyle'] != $encodingStyle)) {
+		if (($direction == 'input') && isset($opData['output']['encodingStyle']) && ($opData['output']['encodingStyle'] != $encodingStyle)) {
 			$encodingStyle = $opData['output']['encodingStyle'];
 			$enc_style = $encodingStyle;
 		}
@@ -1228,10 +1226,10 @@ 
 			if (is_array($parameters)) {
 				$parametersArrayType = $this->isArraySimpleOrStruct($parameters);
 				$this->debug('have ' . $parametersArrayType . ' parameters');
-				foreach($opData[$direction]['parts'] as $name => $type) {
-					$this->debug('serializing part "'.$name.'" of type "'.$type.'"');
+				foreach ($opData[$direction]['parts'] as $name => $type) {
+					$this->debug('serializing part "' . $name . '" of type "' . $type . '"');
 					// Track encoding style
-					if(isset($opData[$direction]['encodingStyle']) && $encodingStyle != $opData[$direction]['encodingStyle']) {
+					if (isset($opData[$direction]['encodingStyle']) && $encodingStyle != $opData[$direction]['encodingStyle']) {
 						$encodingStyle = $opData[$direction]['encodingStyle'];			
 						$enc_style = $encodingStyle;
 					} else {
@@ -1271,11 +1269,11 @@ 
 	 * @return string value serialized as an XML string
 	 * @access private
 	 */
-	public function serializeType($name, $type, $value, $use='encoded', $encodingStyle=false, $unqualified=false)
+	public function serializeType($name, $type, $value, $use = 'encoded', $encodingStyle = false, $unqualified = false)
 	{
 		$this->debug("in serializeType: name=$name, type=$type, use=$use, encodingStyle=$encodingStyle, unqualified=" . ($unqualified ? "unqualified" : "qualified"));
 		$this->appendDebug("value=" . $this->varDump($value));
-		if($use == 'encoded' && $encodingStyle) {
+		if ($use == 'encoded' && $encodingStyle) {
 			$encodingStyle = ' SOAP-ENV:encodingStyle="' . $encodingStyle . '"';
 		}
 
@@ -1319,7 +1317,7 @@ 
 				$this->debug("in serializeType: expanded prefixed type: $uqType, $ns");
 			}
 
-			if($ns == $this->XMLSchemaVersion || $ns == 'http://schemas.xmlsoap.org/soap/encoding/'){
+			if ($ns == $this->XMLSchemaVersion || $ns == 'http://schemas.xmlsoap.org/soap/encoding/') {
 				$this->debug('in serializeType: type namespace indicates XML Schema or SOAP Encoding type');
 				if ($unqualified && $use == 'literal') {
 					$elementNS = " xmlns=\"\"";
@@ -1340,7 +1338,7 @@ 
 					return $this->serialize_val($value, $name, false, false, false, false, $use);
 				}
 		    	if ($uqType == 'boolean') {
-		    		if ((is_string($value) && $value == 'false') || (! $value)) {
+		    		if ((is_string($value) && $value == 'false') || (!$value)) {
 						$value = 'false';
 					} else {
 						$value = 'true';
@@ -1370,7 +1368,7 @@ 
 				$this->debug('in serializeType: appears to be Apache SOAP type');
 				if ($uqType == 'Map') {
 					$tt_prefix = $this->getPrefixFromNamespace('http://xml.apache.org/xml-soap');
-					if (! $tt_prefix) {
+					if (!$tt_prefix) {
 						$this->debug('in serializeType: Add namespace for Apache SOAP type');
 						$tt_prefix = 'ns' . rand(1000, 9999);
 						$this->namespaces[$tt_prefix] = 'http://xml.apache.org/xml-soap';
@@ -1378,11 +1376,11 @@ 
 						$tt_prefix = $this->getPrefixFromNamespace('http://xml.apache.org/xml-soap');
 					}
 					$contents = '';
-					foreach($value as $k => $v) {
+					foreach ($value as $k => $v) {
 						$this->debug("serializing map element: key $k, value $v");
 						$contents .= '<item>';
-						$contents .= $this->serialize_val($k,'key',false,false,false,false,$use);
-						$contents .= $this->serialize_val($v,'value',false,false,false,false,$use);
+						$contents .= $this->serialize_val($k, 'key', false, false, false, false, $use);
+						$contents .= $this->serialize_val($v, 'value', false, false, false, false, $use);
 						$contents .= '</item>';
 					}
 					if ($use == 'literal') {
@@ -1404,7 +1402,7 @@ 
 			$ns = '';
 			$uqType = $type;
 		}
-		if(!$typeDef = $this->getTypeDef($uqType, $ns)){
+		if (!$typeDef = $this->getTypeDef($uqType, $ns)) {
 			$this->setError("$type ($uqType) is not a supported type.");
 			$this->debug("in serializeType: $type ($uqType) is not a supported type.");
 			return false;
@@ -1421,7 +1419,7 @@ 
 			return false;
 		}
 		$phpType = $typeDef['phpType'];
-		$this->debug("in serializeType: uqType: $uqType, ns: $ns, phptype: $phpType, arrayType: " . (isset($typeDef['arrayType']) ? $typeDef['arrayType'] : '') ); 
+		$this->debug("in serializeType: uqType: $uqType, ns: $ns, phptype: $phpType, arrayType: " . (isset($typeDef['arrayType']) ? $typeDef['arrayType'] : '')); 
 		// if php type == struct, map value to the <all> element names
 		if ($phpType == 'struct') {
 			if (isset($typeDef['typeClass']) && $typeDef['typeClass'] == 'element') {
@@ -1501,14 +1499,14 @@ 
 						':arrayType="' .
 						$this->getPrefixFromNamespace($this->getPrefix($typeDef['arrayType'])) .
 						':' .
-						$this->getLocalPart($typeDef['arrayType'])."[0]\"/>";
+						$this->getLocalPart($typeDef['arrayType']) . "[0]\"/>";
 				}
 				$this->debug("in serializeType: returning: $xml");
 				return $xml;
 			}
 			if (isset($typeDef['multidimensional'])) {
 				$nv = array();
-				foreach($value as $v) {
+				foreach ($value as $v) {
 					$cols = ',' . sizeof($v);
 					$nv = array_merge($nv, $v);
 				} 
@@ -1519,10 +1517,10 @@ 
 			if (is_array($value) && sizeof($value) >= 1) {
 				$rows = sizeof($value);
 				$contents = '';
-				foreach($value as $k => $v) {
+				foreach ($value as $k => $v) {
 					$this->debug("serializing array element: $k, $v of type: $typeDef[arrayType]");
 					//if (strpos($typeDef['arrayType'], ':') ) {
-					if (!in_array($typeDef['arrayType'],$this->typemap['http://www.w3.org/2001/XMLSchema'])) {
+					if (!in_array($typeDef['arrayType'], $this->typemap['http://www.w3.org/2001/XMLSchema'])) {
 					    $contents .= $this->serializeType('item', $typeDef['arrayType'], $v, $use);
 					} else {
 					    $contents .= $this->serialize_val($v, 'item', $typeDef['arrayType'], null, $this->XMLSchemaVersion, false, $use);
@@ -1537,11 +1535,11 @@ 
 					.$contents
 					."</$name>";
 			} else {
-				$xml = "<$name$elementNS xsi:type=\"".$this->getPrefixFromNamespace('http://schemas.xmlsoap.org/soap/encoding/').':Array" '.
+				$xml = "<$name$elementNS xsi:type=\"" . $this->getPrefixFromNamespace('http://schemas.xmlsoap.org/soap/encoding/') . ':Array" ' .
 					$this->getPrefixFromNamespace('http://schemas.xmlsoap.org/soap/encoding/')
 					.':arrayType="'
 					.$this->getPrefixFromNamespace($this->getPrefix($typeDef['arrayType']))
-					.":".$this->getLocalPart($typeDef['arrayType'])."[$rows$cols]\">"
+					.":" . $this->getLocalPart($typeDef['arrayType']) . "[$rows$cols]\">"
 					.$contents
 					."</$name>";
 			}
@@ -1621,7 +1619,7 @@ 
 					$this->debug("no value provided for attribute $aName");
 				}
 				if ($xname) {
-					$xml .=  " $aName=\"" . $this->expandEntities($xvalue[$xname]) . "\"";
+					$xml .= " $aName=\"" . $this->expandEntities($xvalue[$xname]) . "\"";
 				}
 			} 
 		} else {
@@ -1642,7 +1640,7 @@ 
 	 * @return string value serialized as an XML string
 	 * @access private
 	 */
-	public function serializeComplexTypeElements($typeDef, $value, $ns, $uqType, $use='encoded', $encodingStyle=false) {
+	public function serializeComplexTypeElements($typeDef, $value, $ns, $uqType, $use = 'encoded', $encodingStyle = false) {
 		$this->debug("in serializeComplexTypeElements for XML Schema type $ns:$uqType");
 		$xml = '';
 		if (isset($typeDef['extensionBase'])) {
@@ -1669,7 +1667,7 @@ 
 				$xvalue = array();
 			}
 			// toggle whether all elements are present - ideally should validate against schema
-			if (count($typeDef['elements']) != count($xvalue)){
+			if (count($typeDef['elements']) != count($xvalue)) {
 				$optionals = true;
 			}
 			foreach ($typeDef['elements'] as $eName => $attrs) {
@@ -1682,8 +1680,8 @@ 
 				// if user took advantage of a minOccurs=0, then only serialize named parameters
 				if (isset($optionals)
 				    && (!isset($xvalue[$eName])) 
-					&& ( (!isset($attrs['nillable'])) || $attrs['nillable'] != 'true')
-					){
+					&& ((!isset($attrs['nillable'])) || $attrs['nillable'] != 'true')
+					) {
 					if (isset($attrs['minOccurs']) && $attrs['minOccurs'] <> '0') {
 						$this->debug("apparent error: no value provided for element $eName with minOccurs=" . $attrs['minOccurs']);
 					}
@@ -1748,15 +1746,15 @@ 
 	* @see nusoap_xmlschema
 	* @access public
 	*/
-	public function addComplexType($name,$typeClass='complexType',$phpType='array',$compositor='',$restrictionBase='',$elements=array(),$attrs=array(),$arrayType='') {
+	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){
+	    	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;
+		            $k = strpos($k, ':') ? $this->expandQname($k) : $k;
+		            $v = strpos($v, ':') ? $this->expandQname($v) : $v;
 		            $ee[$k] = $v;
 		    	}
 	    		$eElements[$n] = $ee;
@@ -1765,11 +1763,11 @@ 
 		}
 		
 		if (count($attrs) > 0) {
-	    	foreach($attrs as $n => $a){
+	    	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;
+		            $k = strpos($k, ':') ? $this->expandQname($k) : $k;
+		            $v = strpos($v, ':') ? $this->expandQname($v) : $v;
 		            $aa[$k] = $v;
 		    	}
 	    		$eAttrs[$n] = $aa;
@@ -1777,11 +1775,11 @@ 
 	    	$attrs = $eAttrs;
 		}
 
-		$restrictionBase = strpos($restrictionBase,':') ? $this->expandQname($restrictionBase) : $restrictionBase;
-		$arrayType = strpos($arrayType,':') ? $this->expandQname($arrayType) : $arrayType;
+		$restrictionBase = strpos($restrictionBase, ':') ? $this->expandQname($restrictionBase) : $restrictionBase;
+		$arrayType = strpos($arrayType, ':') ? $this->expandQname($arrayType) : $arrayType;
 
 		$typens = isset($this->namespaces['types']) ? $this->namespaces['types'] : $this->namespaces['tns'];
-		$this->schemas[$typens][0]->addComplexType($name,$typeClass,$phpType,$compositor,$restrictionBase,$elements,$attrs,$arrayType);
+		$this->schemas[$typens][0]->addComplexType($name, $typeClass, $phpType, $compositor, $restrictionBase, $elements, $attrs, $arrayType);
 	}
 
 	/**
@@ -1795,8 +1793,8 @@ 
 	* @see nusoap_xmlschema
 	* @access public
 	*/
-	public function addSimpleType($name, $restrictionBase='', $typeClass='simpleType', $phpType='scalar', $enumeration=array()) {
-		$restrictionBase = strpos($restrictionBase,':') ? $this->expandQname($restrictionBase) : $restrictionBase;
+	public function addSimpleType($name, $restrictionBase = '', $typeClass = 'simpleType', $phpType = 'scalar', $enumeration = array()) {
+		$restrictionBase = strpos($restrictionBase, ':') ? $this->expandQname($restrictionBase) : $restrictionBase;
 
 		$typens = isset($this->namespaces['types']) ? $this->namespaces['types'] : $this->namespaces['tns'];
 		$this->schemas[$typens][0]->addSimpleType($name, $restrictionBase, $typeClass, $phpType, $enumeration);
@@ -1828,7 +1826,7 @@ 
 	* @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 = ''){
+	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/';
 		}
@@ -1852,7 +1850,7 @@ 
 		}
 
 		// get binding
-		$this->bindings[ $this->serviceName . 'Binding' ]['operations'][$name] =
+		$this->bindings[$this->serviceName . 'Binding']['operations'][$name] =
 		array(
 		'name' => $name,
 		'binding' => $this->serviceName . 'Binding',
@@ -1876,29 +1874,29 @@ 
 		'documentation' => $documentation); 
 		// add portTypes
 		// add messages
-		if($in)
+		if ($in)
 		{
-			foreach($in as $pName => $pType)
+			foreach ($in as $pName => $pType)
 			{
-				if(strpos($pType,':')) {
-					$pType = $this->getNamespaceFromPrefix($this->getPrefix($pType)).":".$this->getLocalPart($pType);
+				if (strpos($pType, ':')) {
+					$pType = $this->getNamespaceFromPrefix($this->getPrefix($pType)) . ":" . $this->getLocalPart($pType);
 				}
-				$this->messages[$name.'Request'][$pName] = $pType;
+				$this->messages[$name . 'Request'][$pName] = $pType;
 			}
 		} else {
-            $this->messages[$name.'Request']= '0';
+            $this->messages[$name . 'Request'] = '0';
         }
-		if($out)
+		if ($out)
 		{
-			foreach($out as $pName => $pType)
+			foreach ($out as $pName => $pType)
 			{
-				if(strpos($pType,':')) {
-					$pType = $this->getNamespaceFromPrefix($this->getPrefix($pType)).":".$this->getLocalPart($pType);
+				if (strpos($pType, ':')) {
+					$pType = $this->getNamespaceFromPrefix($this->getPrefix($pType)) . ":" . $this->getLocalPart($pType);
 				}
-				$this->messages[$name.'Response'][$pName] = $pType;
+				$this->messages[$name . 'Response'][$pName] = $pType;
 			}
 		} else {
-            $this->messages[$name.'Response']= '0';
+            $this->messages[$name . 'Response'] = '0';
         }
 		return true;
 	}