YetiForceCompany / YetiForceCRM

libraries/log4php.debug/appenders/LoggerAppenderMailEvent.php

Indentation +110 added lines, -110 removed lines

@@ -46,125 +46,125 @@
  */
 class LoggerAppenderMailEvent extends LoggerAppenderSkeleton {
 
-    /**
-     * @var string 'from' field
-     */
-    public $from           = null;
-
-    /**
-     * @var integer 'from' field
-     */
-    public $port           = 25;
-
-    /**
-     * @var string hostname. 
-     */
-    public $smtpHost       = null;
-
-    /**
-     * @var string 'subject' field
-     */
-    public $subject        = '';
-
-    /**
-     * @var string 'to' field
-     */
-    public $to             = null;
+	/**
+	 * @var string 'from' field
+	 */
+	public $from           = null;
+
+	/**
+	 * @var integer 'from' field
+	 */
+	public $port           = 25;
+
+	/**
+	 * @var string hostname. 
+	 */
+	public $smtpHost       = null;
+
+	/**
+	 * @var string 'subject' field
+	 */
+	public $subject        = '';
+
+	/**
+	 * @var string 'to' field
+	 */
+	public $to             = null;
     
-    /**
-     * @access private
-     */
-    public $requiresLayout = true;
-
-    /**
-     * Constructor.
-     *
-     * @param string $name appender name
-     */
-    public function LoggerAppenderMailEvent($name)
-    {
-        $this->LoggerAppenderSkeleton($name);
-    }
-
-    public function activateOptions()
-    { 
-        $this->closed = false;
-    }
+	/**
+	 * @access private
+	 */
+	public $requiresLayout = true;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param string $name appender name
+	 */
+	public function LoggerAppenderMailEvent($name)
+	{
+		$this->LoggerAppenderSkeleton($name);
+	}
+
+	public function activateOptions()
+	{ 
+		$this->closed = false;
+	}
     
-    public function close()
-    {
-        $this->closed = true;
-    }
-
-    /**
-     * @return string
-     */
-    public function getFrom()      { return $this->from; }
+	public function close()
+	{
+		$this->closed = true;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getFrom()      { return $this->from; }
     
-    /**
-     * @return integer
-     */
-    public function getPort()      { return $this->port; }
+	/**
+	 * @return integer
+	 */
+	public function getPort()      { return $this->port; }
     
-    /**
-     * @return string
-     */
-    public function getSmtpHost()  { return $this->smtpHost; }
+	/**
+	 * @return string
+	 */
+	public function getSmtpHost()  { return $this->smtpHost; }
     
-    /**
-     * @return string
-     */
-    public function getSubject()   { return $this->subject; }
-
-    /**
-     * @return string
-     */
-    public function getTo()        { return $this->to; }
-
-    public function setFrom($from)             { $this->from = $from; }
-    public function setPort($port)             { $this->port = (int)$port; }
-    public function setSmtpHost($smtphost)     { $this->smtpHost = $smtpHost; }
-    public function setSubject($subject)       { $this->subject = $subject; }
-    public function setTo($to)                 { $this->to = $to; }
-
-    public function append($event)
-    {
-        $from = $this->getFrom();
-        $to   = $this->getTo();
-        if (empty($from) || empty($to))
-            return;
+	/**
+	 * @return string
+	 */
+	public function getSubject()   { return $this->subject; }
+
+	/**
+	 * @return string
+	 */
+	public function getTo()        { return $this->to; }
+
+	public function setFrom($from)             { $this->from = $from; }
+	public function setPort($port)             { $this->port = (int)$port; }
+	public function setSmtpHost($smtphost)     { $this->smtpHost = $smtpHost; }
+	public function setSubject($subject)       { $this->subject = $subject; }
+	public function setTo($to)                 { $this->to = $to; }
+
+	public function append($event)
+	{
+		$from = $this->getFrom();
+		$to   = $this->getTo();
+		if (empty($from) || empty($to))
+			return;
     
-        $smtpHost = $this->getSmtpHost();
-        $prevSmtpHost = ini_get('SMTP');
-        if (!empty($smtpHost)) {
-            ini_set('SMTP', $smtpHost);
-        } else {
-            $smtpHost = $prevSmtpHost;
-        } 
-
-        $smtpPort = $this->getPort();
-        $prevSmtpPort= ini_get('smtp_port');        
-        if ($smtpPort > 0 && $smtpPort < 65535) {
-            ini_set('smtp_port', $smtpPort);
-        } else {
-            $smtpPort = $prevSmtpPort;
-        } 
+		$smtpHost = $this->getSmtpHost();
+		$prevSmtpHost = ini_get('SMTP');
+		if (!empty($smtpHost)) {
+			ini_set('SMTP', $smtpHost);
+		} else {
+			$smtpHost = $prevSmtpHost;
+		} 
+
+		$smtpPort = $this->getPort();
+		$prevSmtpPort= ini_get('smtp_port');        
+		if ($smtpPort > 0 && $smtpPort < 65535) {
+			ini_set('smtp_port', $smtpPort);
+		} else {
+			$smtpPort = $prevSmtpPort;
+		} 
         
-        LoggerLog::debug(
-            "LoggerAppenderMailEvent::append()" . 
-            ":from=[{$from}]:to=[{$to}]:smtpHost=[{$smtpHost}]:smtpPort=[{$smtpPort}]"
-        ); 
+		LoggerLog::debug(
+			"LoggerAppenderMailEvent::append()" . 
+			":from=[{$from}]:to=[{$to}]:smtpHost=[{$smtpHost}]:smtpPort=[{$smtpPort}]"
+		); 
         
-        if (!@mail( $to, $this->getSubject(), 
-            $this->layout->getHeader() . $this->layout->format($event) . $this->layout->getFooter($event), 
-            "From: {$from}\r\n"
-        )) {
-            LoggerLog::debug("LoggerAppenderMailEvent::append() mail error");
-        }
+		if (!@mail( $to, $this->getSubject(), 
+			$this->layout->getHeader() . $this->layout->format($event) . $this->layout->getFooter($event), 
+			"From: {$from}\r\n"
+		)) {
+			LoggerLog::debug("LoggerAppenderMailEvent::append() mail error");
+		}
             
-        ini_set('SMTP',         $prevSmtpHost);
-        ini_set('smtp_port',    $prevSmtpPort);
-    }
+		ini_set('SMTP',         $prevSmtpHost);
+		ini_set('smtp_port',    $prevSmtpPort);
+	}
 }
 
 ?>
\ No newline at end of file

Spacing +19 added lines, -19 removed lines

@@ -49,27 +49,27 @@ 
     /**
      * @var string 'from' field
      */
-    public $from           = null;
+    public $from = null;
 
     /**
      * @var integer 'from' field
      */
-    public $port           = 25;
+    public $port = 25;
 
     /**
      * @var string hostname. 
      */
-    public $smtpHost       = null;
+    public $smtpHost = null;
 
     /**
      * @var string 'subject' field
      */
-    public $subject        = '';
+    public $subject = '';
 
     /**
      * @var string 'to' field
      */
-    public $to             = null;
+    public $to = null;
     
     /**
      * @access private
@@ -99,33 +99,33 @@ 
     /**
      * @return string
      */
-    public function getFrom()      { return $this->from; }
+    public function getFrom() { return $this->from; }
     
     /**
      * @return integer
      */
-    public function getPort()      { return $this->port; }
+    public function getPort() { return $this->port; }
     
     /**
      * @return string
      */
-    public function getSmtpHost()  { return $this->smtpHost; }
+    public function getSmtpHost() { return $this->smtpHost; }
     
     /**
      * @return string
      */
-    public function getSubject()   { return $this->subject; }
+    public function getSubject() { return $this->subject; }
 
     /**
      * @return string
      */
-    public function getTo()        { return $this->to; }
+    public function getTo() { return $this->to; }
 
-    public function setFrom($from)             { $this->from = $from; }
-    public function setPort($port)             { $this->port = (int)$port; }
-    public function setSmtpHost($smtphost)     { $this->smtpHost = $smtpHost; }
-    public function setSubject($subject)       { $this->subject = $subject; }
-    public function setTo($to)                 { $this->to = $to; }
+    public function setFrom($from) { $this->from = $from; }
+    public function setPort($port) { $this->port = (int) $port; }
+    public function setSmtpHost($smtphost) { $this->smtpHost = $smtpHost; }
+    public function setSubject($subject) { $this->subject = $subject; }
+    public function setTo($to) { $this->to = $to; }
 
     public function append($event)
     {
@@ -143,7 +143,7 @@ 
         } 
 
         $smtpPort = $this->getPort();
-        $prevSmtpPort= ini_get('smtp_port');        
+        $prevSmtpPort = ini_get('smtp_port');        
         if ($smtpPort > 0 && $smtpPort < 65535) {
             ini_set('smtp_port', $smtpPort);
         } else {
@@ -155,15 +155,15 @@ 
             ":from=[{$from}]:to=[{$to}]:smtpHost=[{$smtpHost}]:smtpPort=[{$smtpPort}]"
         ); 
         
-        if (!@mail( $to, $this->getSubject(), 
+        if (!@mail($to, $this->getSubject(), 
             $this->layout->getHeader() . $this->layout->format($event) . $this->layout->getFooter($event), 
             "From: {$from}\r\n"
         )) {
             LoggerLog::debug("LoggerAppenderMailEvent::append() mail error");
         }
             
-        ini_set('SMTP',         $prevSmtpHost);
-        ini_set('smtp_port',    $prevSmtpPort);
+        ini_set('SMTP', $prevSmtpHost);
+        ini_set('smtp_port', $prevSmtpPort);
     }
 }
 

libraries/log4php.debug/helpers/LoggerPatternConverter.php

Indentation +347 added lines, -347 removed lines

@@ -31,8 +31,8 @@ 
  * Used by {@link LoggerPatternConverter::spacePad()}.  
  */
 $GLOBALS['log4php.LoggerPatternConverter.spaces'] = array(" ", "  ", "    ", "        ", //1,2,4,8 spaces
-			    "                ", // 16 spaces
-			    "                                " ); // 32 spaces
+				"                ", // 16 spaces
+				"                                " ); // 32 spaces
 
 /**
  * LoggerPatternConverter is an abstract class that provides the formatting 
@@ -51,101 +51,101 @@ 
  */
 class LoggerPatternConverter {
 
-    /**
-     * @var LoggerPatternConverter next converter in converter chain
-     */
-    public $next = null;
+	/**
+	 * @var LoggerPatternConverter next converter in converter chain
+	 */
+	public $next = null;
     
-    public $min = -1;
-    public $max = 0x7FFFFFFF;
-    public $leftAlign = false;
-
-    /**
-     * Constructor 
-     *
-     * @param LoggerFormattingInfo $fi
-     */
-    public function LoggerPatternConverter($fi = null) 
-    {  
-        if ($fi !== null) {
-            $this->min = $fi->min;
-            $this->max = $fi->max;
-            $this->leftAlign = $fi->leftAlign;
-        }
-    }
+	public $min = -1;
+	public $max = 0x7FFFFFFF;
+	public $leftAlign = false;
+
+	/**
+	 * Constructor 
+	 *
+	 * @param LoggerFormattingInfo $fi
+	 */
+	public function LoggerPatternConverter($fi = null) 
+	{  
+		if ($fi !== null) {
+			$this->min = $fi->min;
+			$this->max = $fi->max;
+			$this->leftAlign = $fi->leftAlign;
+		}
+	}
   
-    /**
-     * Derived pattern converters must override this method in order to
-     * convert conversion specifiers in the correct way.
-     *
-     * @param LoggerLoggingEvent $event
-     */
-    public function convert($event) {}
-
-    /**
-     * A template method for formatting in a converter specific way.
-     *
-     * @param string &$sbuf string buffer
-     * @param LoggerLoggingEvent $e
-     */
-    public function format(&$sbuf, $e)
-    {
-        LoggerLog::debug("LoggerPatternConverter::format() sbuf='$sbuf'");    
+	/**
+	 * Derived pattern converters must override this method in order to
+	 * convert conversion specifiers in the correct way.
+	 *
+	 * @param LoggerLoggingEvent $event
+	 */
+	public function convert($event) {}
+
+	/**
+	 * A template method for formatting in a converter specific way.
+	 *
+	 * @param string &$sbuf string buffer
+	 * @param LoggerLoggingEvent $e
+	 */
+	public function format(&$sbuf, $e)
+	{
+		LoggerLog::debug("LoggerPatternConverter::format() sbuf='$sbuf'");    
     
-        $s = $this->convert($e);
+		$s = $this->convert($e);
         
-        LoggerLog::debug("LoggerPatternConverter::format() converted event is '$s'");    
+		LoggerLog::debug("LoggerPatternConverter::format() converted event is '$s'");    
         
     
-        if($s == null || empty($s)) {
-            if(0 < $this->min)
-                $this->spacePad($sbuf, $this->min);
-            return;
-        }
+		if($s == null || empty($s)) {
+			if(0 < $this->min)
+				$this->spacePad($sbuf, $this->min);
+			return;
+		}
         
-        $len = strlen($s);
+		$len = strlen($s);
     
-        if($len > $this->max) {
-            $sbuf .= substr($s , 0, ($len - $this->max));
-        } elseif($len < $this->min) {
-            if($this->leftAlign) {	
-                $sbuf .= $s;
-                $this->spacePad($sbuf, ($this->min - $len));
-            } else {
-                $this->spacePad($sbuf, ($this->min - $len));
-                $sbuf .= $s;
-            }
-        } else {
-            $sbuf .= $s;
-        }
-    }	
-
-
-    /**
-     * Fast space padding method.
-     *
-     * @param string    &$sbuf     string buffer
-     * @param integer   $length    pad length
-     *
-     * @todo reimplement using PHP string functions
-     */
-    public function spacePad(&$sbuf, $length)
-    {
-        LoggerLog::debug("LoggerPatternConverter::spacePad() sbuf='$sbuf' len='$length'");        
+		if($len > $this->max) {
+			$sbuf .= substr($s , 0, ($len - $this->max));
+		} elseif($len < $this->min) {
+			if($this->leftAlign) {	
+				$sbuf .= $s;
+				$this->spacePad($sbuf, ($this->min - $len));
+			} else {
+				$this->spacePad($sbuf, ($this->min - $len));
+				$sbuf .= $s;
+			}
+		} else {
+			$sbuf .= $s;
+		}
+	}	
+
+
+	/**
+	 * Fast space padding method.
+	 *
+	 * @param string    &$sbuf     string buffer
+	 * @param integer   $length    pad length
+	 *
+	 * @todo reimplement using PHP string functions
+	 */
+	public function spacePad(&$sbuf, $length)
+	{
+		LoggerLog::debug("LoggerPatternConverter::spacePad() sbuf='$sbuf' len='$length'");        
     
-        while($length >= 32) {
-          $sbuf .= $GLOBALS['log4php.LoggerPatternConverter.spaces'][5];
-          $length -= 32;
-        }
+		while($length >= 32) {
+		  $sbuf .= $GLOBALS['log4php.LoggerPatternConverter.spaces'][5];
+		  $length -= 32;
+		}
         
-        for($i = 4; $i >= 0; $i--) {	
-            if(($length & (1<<$i)) != 0) {
-    	        $sbuf .= $GLOBALS['log4php.LoggerPatternConverter.spaces'][$i];
-            }
-        }
-
-        // $sbuf = str_pad($sbuf, $length);
-    }
+		for($i = 4; $i >= 0; $i--) {	
+			if(($length & (1<<$i)) != 0) {
+				$sbuf .= $GLOBALS['log4php.LoggerPatternConverter.spaces'][$i];
+			}
+		}
+
+		// $sbuf = str_pad($sbuf, $length);
+	}
 }
 
 // ---------------------------------------------------------------------
@@ -159,54 +159,54 @@ 
  */
 class LoggerBasicPatternConverter extends LoggerPatternConverter {
 
-    /**
-     * @var integer
-     */
-    public $type;
-
-    /**
-     * Constructor
-     *
-     * @param string $formattingInfo
-     * @param integer $type
-     */
-    public function LoggerBasicPatternConverter($formattingInfo, $type)
-    {
-      LoggerLog::debug("LoggerBasicPatternConverter::LoggerBasicPatternConverter() type='$type'");    
+	/**
+	 * @var integer
+	 */
+	public $type;
+
+	/**
+	 * Constructor
+	 *
+	 * @param string $formattingInfo
+	 * @param integer $type
+	 */
+	public function LoggerBasicPatternConverter($formattingInfo, $type)
+	{
+	  LoggerLog::debug("LoggerBasicPatternConverter::LoggerBasicPatternConverter() type='$type'");    
     
-      $this->LoggerPatternConverter($formattingInfo);
-      $this->type = $type;
-    }
-
-    /**
-     * @param LoggerLoggingEvent $event
-     * @return string
-     */
-    public function convert($event)
-    {
-        switch($this->type) {
-            case LOG4PHP_LOGGER_PATTERN_PARSER_RELATIVE_TIME_CONVERTER:
-                $timeStamp = $event->getTimeStamp();
-                $startTime = LoggerLoggingEvent::getStartTime();
-	            return (string)(int)($timeStamp * 1000 - $startTime * 1000);
+	  $this->LoggerPatternConverter($formattingInfo);
+	  $this->type = $type;
+	}
+
+	/**
+	 * @param LoggerLoggingEvent $event
+	 * @return string
+	 */
+	public function convert($event)
+	{
+		switch($this->type) {
+			case LOG4PHP_LOGGER_PATTERN_PARSER_RELATIVE_TIME_CONVERTER:
+				$timeStamp = $event->getTimeStamp();
+				$startTime = LoggerLoggingEvent::getStartTime();
+				return (string)(int)($timeStamp * 1000 - $startTime * 1000);
                 
-            case LOG4PHP_LOGGER_PATTERN_PARSER_THREAD_CONVERTER:
-	            return $event->getThreadName();
+			case LOG4PHP_LOGGER_PATTERN_PARSER_THREAD_CONVERTER:
+				return $event->getThreadName();
 
-            case LOG4PHP_LOGGER_PATTERN_PARSER_LEVEL_CONVERTER:
-                $level = $event->getLevel();
-	            return $level->toString();
+			case LOG4PHP_LOGGER_PATTERN_PARSER_LEVEL_CONVERTER:
+				$level = $event->getLevel();
+				return $level->toString();
 
-            case LOG4PHP_LOGGER_PATTERN_PARSER_NDC_CONVERTER:
-	            return $event->getNDC();
+			case LOG4PHP_LOGGER_PATTERN_PARSER_NDC_CONVERTER:
+				return $event->getNDC();
 
-            case LOG4PHP_LOGGER_PATTERN_PARSER_MESSAGE_CONVERTER:
-	            return $event->getRenderedMessage();
+			case LOG4PHP_LOGGER_PATTERN_PARSER_MESSAGE_CONVERTER:
+				return $event->getRenderedMessage();
                 
-            default: 
-                return '';
-        }
-    }
+			default: 
+				return '';
+		}
+	}
 }
 
 /**
@@ -216,40 +216,40 @@ 
  */
 class LoggerLiteralPatternConverter extends LoggerPatternConverter {
     
-    /**
-     * @var string
-     */
-    public $literal;
-
-    /**
-     * Constructor
-     *
-     * @param string $value
-     */
-    public function LoggerLiteralPatternConverter($value)
-    {
-        LoggerLog::debug("LoggerLiteralPatternConverter::LoggerLiteralPatternConverter() value='$value'");    
+	/**
+	 * @var string
+	 */
+	public $literal;
+
+	/**
+	 * Constructor
+	 *
+	 * @param string $value
+	 */
+	public function LoggerLiteralPatternConverter($value)
+	{
+		LoggerLog::debug("LoggerLiteralPatternConverter::LoggerLiteralPatternConverter() value='$value'");    
     
-        $this->literal = $value;
-    }
-
-    /**
-     * @param string &$sbuf
-     * @param LoggerLoggingEvent $event
-     */
-    public function format(&$sbuf, $event)
-    {
-        $sbuf .= $this->literal;
-    }
-
-    /**
-     * @param LoggerLoggingEvent $event
-     * @return string
-     */
-    public function convert($event)
-    {
-      return $this->literal;
-    }
+		$this->literal = $value;
+	}
+
+	/**
+	 * @param string &$sbuf
+	 * @param LoggerLoggingEvent $event
+	 */
+	public function format(&$sbuf, $event)
+	{
+		$sbuf .= $this->literal;
+	}
+
+	/**
+	 * @param LoggerLoggingEvent $event
+	 * @return string
+	 */
+	public function convert($event)
+	{
+	  return $this->literal;
+	}
 }
 
 /**
@@ -259,38 +259,38 @@ 
  */
 class LoggerDatePatternConverter extends LoggerPatternConverter {
 
-    /**
-     * @var string
-     */
-    public $df;
+	/**
+	 * @var string
+	 */
+	public $df;
     
-    /**
-     * Constructor
-     *
-     * @param string $formattingInfo
-     * @param string $df
-     */
-    public function LoggerDatePatternConverter($formattingInfo, $df)
-    {
-        LoggerLog::debug("LoggerDatePatternConverter::LoggerDatePatternConverter() dateFormat='$df'");    
+	/**
+	 * Constructor
+	 *
+	 * @param string $formattingInfo
+	 * @param string $df
+	 */
+	public function LoggerDatePatternConverter($formattingInfo, $df)
+	{
+		LoggerLog::debug("LoggerDatePatternConverter::LoggerDatePatternConverter() dateFormat='$df'");    
     
-        $this->LoggerPatternConverter($formattingInfo);
-        $this->df = $df;
-    }
-
-    /**
-     * @param LoggerLoggingEvent $event
-     * @return string
-     */
-    public function convert($event)
-    {
-        $timeStamp = $event->getTimeStamp();
-        $usecs = round(($timeStamp - (int)$timeStamp) * 1000);
-        $this->df = str_replace("\u", "u", ereg_replace("[^\\]u", sprintf(',%03d', $usecs), $this->df));
+		$this->LoggerPatternConverter($formattingInfo);
+		$this->df = $df;
+	}
+
+	/**
+	 * @param LoggerLoggingEvent $event
+	 * @return string
+	 */
+	public function convert($event)
+	{
+		$timeStamp = $event->getTimeStamp();
+		$usecs = round(($timeStamp - (int)$timeStamp) * 1000);
+		$this->df = str_replace("\u", "u", ereg_replace("[^\\]u", sprintf(',%03d', $usecs), $this->df));
          
-        return date($this->df, $event->getTimeStamp());
+		return date($this->df, $event->getTimeStamp());
         
-    }
+	}
 }
 
 /**
@@ -300,33 +300,33 @@ 
  */
 class LoggerMDCPatternConverter extends LoggerPatternConverter {
 
-    /**
-     * @var string
-     */
-    public $key;
-
-    /**
-     * Constructor
-     *
-     * @param string $formattingInfo
-     * @param string $key
-     */
-    public function LoggerMDCPatternConverter($formattingInfo, $key)
-    {
-      LoggerLog::debug("LoggerMDCPatternConverter::LoggerMDCPatternConverter() key='$key'");    
-
-      $this->LoggerPatternConverter($formattingInfo);
-      $this->key = $key;
-    }
-
-    /**
-     * @param LoggerLoggingEvent $event
-     * @return string
-     */
-    public function convert($event)
-    {
-        return $event->getMDC($this->key);
-    }
+	/**
+	 * @var string
+	 */
+	public $key;
+
+	/**
+	 * Constructor
+	 *
+	 * @param string $formattingInfo
+	 * @param string $key
+	 */
+	public function LoggerMDCPatternConverter($formattingInfo, $key)
+	{
+	  LoggerLog::debug("LoggerMDCPatternConverter::LoggerMDCPatternConverter() key='$key'");    
+
+	  $this->LoggerPatternConverter($formattingInfo);
+	  $this->key = $key;
+	}
+
+	/**
+	 * @param LoggerLoggingEvent $event
+	 * @return string
+	 */
+	public function convert($event)
+	{
+		return $event->getMDC($this->key);
+	}
 }
 
 /**
@@ -336,45 +336,45 @@ 
  */
 class LoggerLocationPatternConverter extends LoggerPatternConverter {
     
-    /**
-     * @var integer
-     */
-    public $type;
-
-    /**
-     * Constructor
-     *
-     * @param string $formattingInfo
-     * @param integer $type
-     */
-    public function LoggerLocationPatternConverter($formattingInfo, $type)
-    {
-      LoggerLog::debug("LoggerLocationPatternConverter::LoggerLocationPatternConverter() type='$type'");    
+	/**
+	 * @var integer
+	 */
+	public $type;
+
+	/**
+	 * Constructor
+	 *
+	 * @param string $formattingInfo
+	 * @param integer $type
+	 */
+	public function LoggerLocationPatternConverter($formattingInfo, $type)
+	{
+	  LoggerLog::debug("LoggerLocationPatternConverter::LoggerLocationPatternConverter() type='$type'");    
     
-      $this->LoggerPatternConverter($formattingInfo);
-      $this->type = $type;
-    }
-
-    /**
-     * @param LoggerLoggingEvent $event
-     * @return string
-     */
-    public function convert($event)
-    {
-        $locationInfo = $event->getLocationInformation();
-        switch($this->type) {
-            case LOG4PHP_LOGGER_PATTERN_PARSER_FULL_LOCATION_CONVERTER:
-	            return $locationInfo->fullInfo;
-            case LOG4PHP_LOGGER_PATTERN_PARSER_METHOD_LOCATION_CONVERTER:
-	            return $locationInfo->getMethodName();
-            case LOG4PHP_LOGGER_PATTERN_PARSER_LINE_LOCATION_CONVERTER:
-	            return $locationInfo->getLineNumber();
-            case LOG4PHP_LOGGER_PATTERN_PARSER_FILE_LOCATION_CONVERTER:
-	            return $locationInfo->getFileName();
-            default: 
-                return '';
-        }
-    }
+	  $this->LoggerPatternConverter($formattingInfo);
+	  $this->type = $type;
+	}
+
+	/**
+	 * @param LoggerLoggingEvent $event
+	 * @return string
+	 */
+	public function convert($event)
+	{
+		$locationInfo = $event->getLocationInformation();
+		switch($this->type) {
+			case LOG4PHP_LOGGER_PATTERN_PARSER_FULL_LOCATION_CONVERTER:
+				return $locationInfo->fullInfo;
+			case LOG4PHP_LOGGER_PATTERN_PARSER_METHOD_LOCATION_CONVERTER:
+				return $locationInfo->getMethodName();
+			case LOG4PHP_LOGGER_PATTERN_PARSER_LINE_LOCATION_CONVERTER:
+				return $locationInfo->getLineNumber();
+			case LOG4PHP_LOGGER_PATTERN_PARSER_FILE_LOCATION_CONVERTER:
+				return $locationInfo->getFileName();
+			default: 
+				return '';
+		}
+	}
 }
 
 /**
@@ -385,60 +385,60 @@ 
  */
 class LoggerNamedPatternConverter extends LoggerPatternConverter {
 
-    /**
-     * @var integer
-     */
-    public $precision;
-
-    /**
-     * Constructor
-     *
-     * @param string $formattingInfo
-     * @param integer $precision
-     */
-    public function LoggerNamedPatternConverter($formattingInfo, $precision)
-    {
-      LoggerLog::debug("LoggerNamedPatternConverter::LoggerNamedPatternConverter() precision='$precision'");    
+	/**
+	 * @var integer
+	 */
+	public $precision;
+
+	/**
+	 * Constructor
+	 *
+	 * @param string $formattingInfo
+	 * @param integer $precision
+	 */
+	public function LoggerNamedPatternConverter($formattingInfo, $precision)
+	{
+	  LoggerLog::debug("LoggerNamedPatternConverter::LoggerNamedPatternConverter() precision='$precision'");    
     
-      $this->LoggerPatternConverter($formattingInfo);
-      $this->precision =  $precision;
-    }
-
-    /**
-     * @param LoggerLoggingEvent $event
-     * @return string
-     * @abstract
-     */
-    public function getFullyQualifiedName($event)
-    { 
-        // abstract
-        return;
-    }
-
-    /**
-     * @param LoggerLoggingEvent $event
-     * @return string
-     */
-    public function convert($event)
-    {
-        $n = $this->getFullyQualifiedName($event);
-        if ($this->precision <= 0) {
-	        return $n;
-        } else {
-	        $len = strlen($n);
+	  $this->LoggerPatternConverter($formattingInfo);
+	  $this->precision =  $precision;
+	}
+
+	/**
+	 * @param LoggerLoggingEvent $event
+	 * @return string
+	 * @abstract
+	 */
+	public function getFullyQualifiedName($event)
+	{ 
+		// abstract
+		return;
+	}
+
+	/**
+	 * @param LoggerLoggingEvent $event
+	 * @return string
+	 */
+	public function convert($event)
+	{
+		$n = $this->getFullyQualifiedName($event);
+		if ($this->precision <= 0) {
+			return $n;
+		} else {
+			$len = strlen($n);
             
-        	// We substract 1 from 'len' when assigning to 'end' to avoid out of
-        	// bounds exception in return r.substring(end+1, len). This can happen if
-        	// precision is 1 and the category name ends with a dot.
-        	$end = $len -1 ;
-        	for($i = $this->precision; $i > 0; $i--) {
-        	    $end = strrpos(substr($n, 0, ($end - 1)), '.');
-        	    if ($end === false)
-        	        return $n;
-        	}
-        	return substr($n, ($end + 1), $len);
-        }
-    }
+			// We substract 1 from 'len' when assigning to 'end' to avoid out of
+			// bounds exception in return r.substring(end+1, len). This can happen if
+			// precision is 1 and the category name ends with a dot.
+			$end = $len -1 ;
+			for($i = $this->precision; $i > 0; $i--) {
+				$end = strrpos(substr($n, 0, ($end - 1)), '.');
+				if ($end === false)
+					return $n;
+			}
+			return substr($n, ($end + 1), $len);
+		}
+	}
 }
 
 /**
@@ -448,27 +448,27 @@ 
  */
 class LoggerClassNamePatternConverter extends LoggerNamedPatternConverter {
 
-    /**
-     * Constructor
-     *
-     * @param string $formattingInfo
-     * @param integer $precision
-     */
-    public function LoggerClassNamePatternConverter($formattingInfo, $precision)
-    {
-        LoggerLog::debug("LoggerClassNamePatternConverter::LoggerClassNamePatternConverter() precision='$precision'");    
+	/**
+	 * Constructor
+	 *
+	 * @param string $formattingInfo
+	 * @param integer $precision
+	 */
+	public function LoggerClassNamePatternConverter($formattingInfo, $precision)
+	{
+		LoggerLog::debug("LoggerClassNamePatternConverter::LoggerClassNamePatternConverter() precision='$precision'");    
     
-        $this->LoggerNamedPatternConverter($formattingInfo, $precision);
-    }
-
-    /**
-     * @param LoggerLoggingEvent $event
-     * @return string
-     */
-    public function getFullyQualifiedName($event)
-    {
-        return $event->fqcn;
-    }
+		$this->LoggerNamedPatternConverter($formattingInfo, $precision);
+	}
+
+	/**
+	 * @param LoggerLoggingEvent $event
+	 * @return string
+	 */
+	public function getFullyQualifiedName($event)
+	{
+		return $event->fqcn;
+	}
 }
 
 /**
@@ -478,27 +478,27 @@ 
  */
 class LoggerCategoryPatternConverter extends LoggerNamedPatternConverter {
 
-    /**
-     * Constructor
-     *
-     * @param string $formattingInfo
-     * @param integer $precision
-     */
-    public function LoggerCategoryPatternConverter($formattingInfo, $precision)
-    {
-        LoggerLog::debug("LoggerCategoryPatternConverter::LoggerCategoryPatternConverter() precision='$precision'");    
+	/**
+	 * Constructor
+	 *
+	 * @param string $formattingInfo
+	 * @param integer $precision
+	 */
+	public function LoggerCategoryPatternConverter($formattingInfo, $precision)
+	{
+		LoggerLog::debug("LoggerCategoryPatternConverter::LoggerCategoryPatternConverter() precision='$precision'");    
     
-        $this->LoggerNamedPatternConverter($formattingInfo, $precision);
-    }
-
-    /**
-     * @param LoggerLoggingEvent $event
-     * @return string
-     */
-    public function getFullyQualifiedName($event)
-    {
-      return $event->getLoggerName();
-    }
+		$this->LoggerNamedPatternConverter($formattingInfo, $precision);
+	}
+
+	/**
+	 * @param LoggerLoggingEvent $event
+	 * @return string
+	 */
+	public function getFullyQualifiedName($event)
+	{
+	  return $event->getLoggerName();
+	}
 }
 
 ?>
\ No newline at end of file

libraries/log4php.debug/helpers/LoggerPatternParser.php

Indentation +321 added lines, -321 removed lines

@@ -23,17 +23,17 @@ 
 if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..');
 
 if (!defined('LOG4PHP_LINE_SEP')) {
-    if (substr(php_uname(), 0, 7) == "Windows") {
-        /**
-         * @ignore
-         */
-        define('LOG4PHP_LINE_SEP', "\r\n");
-    } else {
-        /**
-         * @ignore
-         */
-        define('LOG4PHP_LINE_SEP', "\n");
-    }
+	if (substr(php_uname(), 0, 7) == "Windows") {
+		/**
+		 * @ignore
+		 */
+		define('LOG4PHP_LINE_SEP', "\r\n");
+	} else {
+		/**
+		 * @ignore
+		 */
+		define('LOG4PHP_LINE_SEP', "\n");
+	}
 }
  
 /**
@@ -83,335 +83,335 @@ 
  */
 class LoggerPatternParser {
 
-    public $state;
-    public $currentLiteral;
-    public $patternLength;
-    public $i;
+	public $state;
+	public $currentLiteral;
+	public $patternLength;
+	public $i;
     
-    /**
-     * @var LoggerPatternConverter
-     */
-    public $head = null;
+	/**
+	 * @var LoggerPatternConverter
+	 */
+	public $head = null;
      
-    /**
-     * @var LoggerPatternConverter
-     */
-    public $tail = null;
+	/**
+	 * @var LoggerPatternConverter
+	 */
+	public $tail = null;
     
-    /**
-     * @var LoggerFormattingInfo
-     */
-    public $formattingInfo;
+	/**
+	 * @var LoggerFormattingInfo
+	 */
+	public $formattingInfo;
     
-    /**
-     * @var string pattern to parse
-     */
-    public $pattern;
+	/**
+	 * @var string pattern to parse
+	 */
+	public $pattern;
 
-    /**
-     * Constructor 
-     *
-     * @param string $pattern
-     */
-    public function LoggerPatternParser($pattern)
-    {
-        LoggerLog::debug("LoggerPatternParser::LoggerPatternParser() pattern='$pattern'");
+	/**
+	 * Constructor 
+	 *
+	 * @param string $pattern
+	 */
+	public function LoggerPatternParser($pattern)
+	{
+		LoggerLog::debug("LoggerPatternParser::LoggerPatternParser() pattern='$pattern'");
     
-        $this->pattern = $pattern;
-        $this->patternLength =  strlen($pattern);
-        $this->formattingInfo = new LoggerFormattingInfo();
-        $this->state = LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE;
-    }
+		$this->pattern = $pattern;
+		$this->patternLength =  strlen($pattern);
+		$this->formattingInfo = new LoggerFormattingInfo();
+		$this->state = LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE;
+	}
 
-    /**
-     * @param LoggerPatternConverter $pc
-     */
-    public function addToList($pc)
-    {
-        // LoggerLog::debug("LoggerPatternParser::addToList()");
+	/**
+	 * @param LoggerPatternConverter $pc
+	 */
+	public function addToList($pc)
+	{
+		// LoggerLog::debug("LoggerPatternParser::addToList()");
     
-        if($this->head == null) {
-            $this->head = $pc;
-            $this->tail =& $this->head;
-        } else {
-            $this->tail->next = $pc;
-            $this->tail =& $this->tail->next;
-        }
-    }
+		if($this->head == null) {
+			$this->head = $pc;
+			$this->tail =& $this->head;
+		} else {
+			$this->tail->next = $pc;
+			$this->tail =& $this->tail->next;
+		}
+	}
 
-    /**
-     * @return string
-     */
-    public function extractOption()
-    {
-        if(($this->i < $this->patternLength) && ($this->pattern{$this->i} == '{')) {
-            $end = strpos($this->pattern, '}' , $this->i);
-            if ($end !== false) {
-                $r = substr($this->pattern, ($this->i + 1), ($end - $this->i - 1));
-	            $this->i= $end + 1;
-        	    return $r;
-            }
-        }
-        return null;
-    }
+	/**
+	 * @return string
+	 */
+	public function extractOption()
+	{
+		if(($this->i < $this->patternLength) && ($this->pattern{$this->i} == '{')) {
+			$end = strpos($this->pattern, '}' , $this->i);
+			if ($end !== false) {
+				$r = substr($this->pattern, ($this->i + 1), ($end - $this->i - 1));
+				$this->i= $end + 1;
+				return $r;
+			}
+		}
+		return null;
+	}
 
-    /**
-     * The option is expected to be in decimal and positive. In case of
-     * error, zero is returned.  
-     */
-    public function extractPrecisionOption()
-    {
-        $opt = $this->extractOption();
-        $r = 0;
-        if ($opt !== null) {
-            if (is_numeric($opt)) {
-    	        $r = (int)$opt;
-            	if($r <= 0) {
-            	    LoggerLog::warn("Precision option ({$opt}) isn't a positive integer.");
-            	    $r = 0;
-            	}
-            } else {
-                LoggerLog::warn("Category option \"{$opt}\" not a decimal integer.");
-            }
-        }
-        return $r;
-    }
+	/**
+	 * The option is expected to be in decimal and positive. In case of
+	 * error, zero is returned.  
+	 */
+	public function extractPrecisionOption()
+	{
+		$opt = $this->extractOption();
+		$r = 0;
+		if ($opt !== null) {
+			if (is_numeric($opt)) {
+				$r = (int)$opt;
+				if($r <= 0) {
+					LoggerLog::warn("Precision option ({$opt}) isn't a positive integer.");
+					$r = 0;
+				}
+			} else {
+				LoggerLog::warn("Category option \"{$opt}\" not a decimal integer.");
+			}
+		}
+		return $r;
+	}
 
-    public function parse()
-    {
-        LoggerLog::debug("LoggerPatternParser::parse()");
+	public function parse()
+	{
+		LoggerLog::debug("LoggerPatternParser::parse()");
     
-        $c = '';
-        $this->i = 0;
-        $this->currentLiteral = '';
-        while ($this->i < $this->patternLength) {
-            $c = $this->pattern{$this->i++};
+		$c = '';
+		$this->i = 0;
+		$this->currentLiteral = '';
+		while ($this->i < $this->patternLength) {
+			$c = $this->pattern{$this->i++};
 //            LoggerLog::debug("LoggerPatternParser::parse() char is now '$c' and currentLiteral is '{$this->currentLiteral}'");            
-            switch($this->state) {
-                case LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE:
-                    // LoggerLog::debug("LoggerPatternParser::parse() state is 'LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE'");
-                    // In literal state, the last char is always a literal.
-                    if($this->i == $this->patternLength) {
-                        $this->currentLiteral .= $c;
-                        continue;
-                    }
-                    if($c == LOG4PHP_LOGGER_PATTERN_PARSER_ESCAPE_CHAR) {
-                        // LoggerLog::debug("LoggerPatternParser::parse() char is an escape char");                    
-                        // peek at the next char.
-                        switch($this->pattern{$this->i}) {
-                            case LOG4PHP_LOGGER_PATTERN_PARSER_ESCAPE_CHAR:
-                                // LoggerLog::debug("LoggerPatternParser::parse() next char is an escape char");                    
-                                $this->currentLiteral .= $c;
-                                $this->i++; // move pointer
-                                break;
-                            case 'n':
-                                // LoggerLog::debug("LoggerPatternParser::parse() next char is 'n'");                            
-                                $this->currentLiteral .= LOG4PHP_LINE_SEP;
-                                $this->i++; // move pointer
-                                break;
-                            default:
-                                if(strlen($this->currentLiteral) != 0) {
-                                    $this->addToList(new LoggerLiteralPatternConverter($this->currentLiteral));
-                                    LoggerLog::debug("LoggerPatternParser::parse() Parsed LITERAL converter: \"{$this->currentLiteral}\".");
-                                }
-                                $this->currentLiteral = $c;
-                                $this->state = LOG4PHP_LOGGER_PATTERN_PARSER_CONVERTER_STATE;
-                                $this->formattingInfo->reset();
-                        }
-                    } else {
-                        $this->currentLiteral .= $c;
-                    }
-                    break;
-              case LOG4PHP_LOGGER_PATTERN_PARSER_CONVERTER_STATE:
-                    // LoggerLog::debug("LoggerPatternParser::parse() state is 'LOG4PHP_LOGGER_PATTERN_PARSER_CONVERTER_STATE'");              
-                	$this->currentLiteral .= $c;
-                	switch($c) {
-                    	case '-':
-                            $this->formattingInfo->leftAlign = true;
-                            break;
-                    	case '.':
-                            $this->state = LOG4PHP_LOGGER_PATTERN_PARSER_DOT_STATE;
-	                        break;
-                    	default:
-                            if(ord($c) >= ord('0') && ord($c) <= ord('9')) {
-                        	    $this->formattingInfo->min = ord($c) - ord('0');
-                        	    $this->state = LOG4PHP_LOGGER_PATTERN_PARSER_MIN_STATE;
-                            } else {
-                                $this->finalizeConverter($c);
-                            }
-                  	} // switch
-                    break;
-              case LOG4PHP_LOGGER_PATTERN_PARSER_MIN_STATE:
-                    // LoggerLog::debug("LoggerPatternParser::parse() state is 'LOG4PHP_LOGGER_PATTERN_PARSER_MIN_STATE'");              
-	                $this->currentLiteral .= $c;
-                    if(ord($c) >= ord('0') && ord($c) <= ord('9')) {
-                        $this->formattingInfo->min = ($this->formattingInfo->min * 10) + (ord(c) - ord('0'));
-                	} elseif ($c == '.') {
-                        $this->state = LOG4PHP_LOGGER_PATTERN_PARSER_DOT_STATE;
-                    } else {
-                    	$this->finalizeConverter($c);
-                	}
-                	break;
-              case LOG4PHP_LOGGER_PATTERN_PARSER_DOT_STATE:
-                    // LoggerLog::debug("LoggerPatternParser::parse() state is 'LOG4PHP_LOGGER_PATTERN_PARSER_DOT_STATE'");              
-                	$this->currentLiteral .= $c;
-                    if(ord($c) >= ord('0') && ord($c) <= ord('9')) {
-                        $this->formattingInfo->max = ord($c) - ord('0');
-	                    $this->state = LOG4PHP_LOGGER_PATTERN_PARSER_MAX_STATE;
-                    } else {
-                	  LoggerLog::warn("LoggerPatternParser::parse() Error occured in position {$this->i}. Was expecting digit, instead got char \"{$c}\".");
-	                  $this->state = LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE;
-                    }
-                	break;
-              case LOG4PHP_LOGGER_PATTERN_PARSER_MAX_STATE:
-                    // LoggerLog::debug("LoggerPatternParser::parse() state is 'LOG4PHP_LOGGER_PATTERN_PARSER_MAX_STATE'");              
-                	$this->currentLiteral .= $c;
-                    if(ord($c) >= ord('0') && ord($c) <= ord('9')) {
-                        $this->formattingInfo->max = ($this->formattingInfo->max * 10) + (ord($c) - ord('0'));
-	                } else {
-                	  $this->finalizeConverter($c);
-                      $this->state = LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE;
-	                }
-                	break;
-            } // switch
-        } // while
-        if(strlen($this->currentLiteral) != 0) {
-            $this->addToList(new LoggerLiteralPatternConverter($this->currentLiteral));
-            // LoggerLog::debug("LoggerPatternParser::parse() Parsed LITERAL converter: \"{$this->currentLiteral}\".");
-        }
-        return $this->head;
-    }
+			switch($this->state) {
+				case LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE:
+					// LoggerLog::debug("LoggerPatternParser::parse() state is 'LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE'");
+					// In literal state, the last char is always a literal.
+					if($this->i == $this->patternLength) {
+						$this->currentLiteral .= $c;
+						continue;
+					}
+					if($c == LOG4PHP_LOGGER_PATTERN_PARSER_ESCAPE_CHAR) {
+						// LoggerLog::debug("LoggerPatternParser::parse() char is an escape char");                    
+						// peek at the next char.
+						switch($this->pattern{$this->i}) {
+							case LOG4PHP_LOGGER_PATTERN_PARSER_ESCAPE_CHAR:
+								// LoggerLog::debug("LoggerPatternParser::parse() next char is an escape char");                    
+								$this->currentLiteral .= $c;
+								$this->i++; // move pointer
+								break;
+							case 'n':
+								// LoggerLog::debug("LoggerPatternParser::parse() next char is 'n'");                            
+								$this->currentLiteral .= LOG4PHP_LINE_SEP;
+								$this->i++; // move pointer
+								break;
+							default:
+								if(strlen($this->currentLiteral) != 0) {
+									$this->addToList(new LoggerLiteralPatternConverter($this->currentLiteral));
+									LoggerLog::debug("LoggerPatternParser::parse() Parsed LITERAL converter: \"{$this->currentLiteral}\".");
+								}
+								$this->currentLiteral = $c;
+								$this->state = LOG4PHP_LOGGER_PATTERN_PARSER_CONVERTER_STATE;
+								$this->formattingInfo->reset();
+						}
+					} else {
+						$this->currentLiteral .= $c;
+					}
+					break;
+			  case LOG4PHP_LOGGER_PATTERN_PARSER_CONVERTER_STATE:
+					// LoggerLog::debug("LoggerPatternParser::parse() state is 'LOG4PHP_LOGGER_PATTERN_PARSER_CONVERTER_STATE'");              
+					$this->currentLiteral .= $c;
+					switch($c) {
+						case '-':
+							$this->formattingInfo->leftAlign = true;
+							break;
+						case '.':
+							$this->state = LOG4PHP_LOGGER_PATTERN_PARSER_DOT_STATE;
+							break;
+						default:
+							if(ord($c) >= ord('0') && ord($c) <= ord('9')) {
+								$this->formattingInfo->min = ord($c) - ord('0');
+								$this->state = LOG4PHP_LOGGER_PATTERN_PARSER_MIN_STATE;
+							} else {
+								$this->finalizeConverter($c);
+							}
+				  	} // switch
+					break;
+			  case LOG4PHP_LOGGER_PATTERN_PARSER_MIN_STATE:
+					// LoggerLog::debug("LoggerPatternParser::parse() state is 'LOG4PHP_LOGGER_PATTERN_PARSER_MIN_STATE'");              
+					$this->currentLiteral .= $c;
+					if(ord($c) >= ord('0') && ord($c) <= ord('9')) {
+						$this->formattingInfo->min = ($this->formattingInfo->min * 10) + (ord(c) - ord('0'));
+					} elseif ($c == '.') {
+						$this->state = LOG4PHP_LOGGER_PATTERN_PARSER_DOT_STATE;
+					} else {
+						$this->finalizeConverter($c);
+					}
+					break;
+			  case LOG4PHP_LOGGER_PATTERN_PARSER_DOT_STATE:
+					// LoggerLog::debug("LoggerPatternParser::parse() state is 'LOG4PHP_LOGGER_PATTERN_PARSER_DOT_STATE'");              
+					$this->currentLiteral .= $c;
+					if(ord($c) >= ord('0') && ord($c) <= ord('9')) {
+						$this->formattingInfo->max = ord($c) - ord('0');
+						$this->state = LOG4PHP_LOGGER_PATTERN_PARSER_MAX_STATE;
+					} else {
+					  LoggerLog::warn("LoggerPatternParser::parse() Error occured in position {$this->i}. Was expecting digit, instead got char \"{$c}\".");
+					  $this->state = LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE;
+					}
+					break;
+			  case LOG4PHP_LOGGER_PATTERN_PARSER_MAX_STATE:
+					// LoggerLog::debug("LoggerPatternParser::parse() state is 'LOG4PHP_LOGGER_PATTERN_PARSER_MAX_STATE'");              
+					$this->currentLiteral .= $c;
+					if(ord($c) >= ord('0') && ord($c) <= ord('9')) {
+						$this->formattingInfo->max = ($this->formattingInfo->max * 10) + (ord($c) - ord('0'));
+					} else {
+					  $this->finalizeConverter($c);
+					  $this->state = LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE;
+					}
+					break;
+			} // switch
+		} // while
+		if(strlen($this->currentLiteral) != 0) {
+			$this->addToList(new LoggerLiteralPatternConverter($this->currentLiteral));
+			// LoggerLog::debug("LoggerPatternParser::parse() Parsed LITERAL converter: \"{$this->currentLiteral}\".");
+		}
+		return $this->head;
+	}
 
-    public function finalizeConverter($c)
-    {
-        LoggerLog::debug("LoggerPatternParser::finalizeConverter() with char '$c'");    
+	public function finalizeConverter($c)
+	{
+		LoggerLog::debug("LoggerPatternParser::finalizeConverter() with char '$c'");    
 
-        $pc = null;
-        switch($c) {
-            case 'c':
-                $pc = new LoggerCategoryPatternConverter($this->formattingInfo, $this->extractPrecisionOption());
-                LoggerLog::debug("LoggerPatternParser::finalizeConverter() CATEGORY converter.");
-                $this->currentLiteral = '';
-                break;
-            case 'C':
-                $pc = new LoggerClassNamePatternConverter($this->formattingInfo, $this->extractPrecisionOption());
-                LoggerLog::debug("LoggerPatternParser::finalizeConverter() CLASSNAME converter.");
-                $this->currentLiteral = '';
-                break;
-            case 'd':
-                $dateFormatStr = LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_ISO8601; // ISO8601_DATE_FORMAT;
-                $dOpt = $this->extractOption();
+		$pc = null;
+		switch($c) {
+			case 'c':
+				$pc = new LoggerCategoryPatternConverter($this->formattingInfo, $this->extractPrecisionOption());
+				LoggerLog::debug("LoggerPatternParser::finalizeConverter() CATEGORY converter.");
+				$this->currentLiteral = '';
+				break;
+			case 'C':
+				$pc = new LoggerClassNamePatternConverter($this->formattingInfo, $this->extractPrecisionOption());
+				LoggerLog::debug("LoggerPatternParser::finalizeConverter() CLASSNAME converter.");
+				$this->currentLiteral = '';
+				break;
+			case 'd':
+				$dateFormatStr = LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_ISO8601; // ISO8601_DATE_FORMAT;
+				$dOpt = $this->extractOption();
 
-                if($dOpt !== null)
-	                $dateFormatStr = $dOpt;
+				if($dOpt !== null)
+					$dateFormatStr = $dOpt;
                     
-                if ($dateFormatStr == 'ISO8601') {
-                    $df = LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_ISO8601;
-                } elseif($dateFormatStr == 'ABSOLUTE') {
-                    $df = LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_ABSOLUTE;
-                } elseif($dateFormatStr == 'DATE') {
-                    $df = LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_DATE;
-                } else {
-                    $df = $dateFormatStr;
-                    if ($df == null) {
-                        $df = LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_ISO8601;
-                    }
-	            }
-                $pc = new LoggerDatePatternConverter($this->formattingInfo, $df);
-                $this->currentLiteral = '';
-                break;
-            case 'F':
-                $pc = new LoggerLocationPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_FILE_LOCATION_CONVERTER);
-                LoggerLog::debug("LoggerPatternParser::finalizeConverter() File name converter.");
-                //formattingInfo.dump();
-                $this->currentLiteral = '';
-                break;
-            case 'l':
-                $pc = new LoggerLocationPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_FULL_LOCATION_CONVERTER);
-                LoggerLog::debug("LoggerPatternParser::finalizeConverter() Location converter.");
-                //formattingInfo.dump();
-                $this->currentLiteral = '';
-                break;
-            case 'L':
-                $pc = new LoggerLocationPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_LINE_LOCATION_CONVERTER);
-                LoggerLog::debug("LoggerPatternParser::finalizeConverter() LINE NUMBER converter.");
-                //formattingInfo.dump();
-                $this->currentLiteral = '';
-                break;
-            case 'm':
-                $pc = new LoggerBasicPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_MESSAGE_CONVERTER);
-                LoggerLog::debug("LoggerPatternParser::finalizeConverter() MESSAGE converter.");
-                //formattingInfo.dump();
-                $this->currentLiteral = '';
-                break;
-            case 'M':
-                $pc = new LoggerLocationPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_METHOD_LOCATION_CONVERTER);
-                //LogLog.debug("METHOD converter.");
-                //formattingInfo.dump();
-                $this->currentLiteral = '';
-                break;
-            case 'p':
-                $pc = new LoggerBasicPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_LEVEL_CONVERTER);
-                //LogLog.debug("LEVEL converter.");
-                //formattingInfo.dump();
-                $this->currentLiteral = '';
-                break;
-            case 'r':
-                $pc = new LoggerBasicPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_RELATIVE_TIME_CONVERTER);
-                LoggerLog::debug("LoggerPatternParser::finalizeConverter() RELATIVE TIME converter.");
-                //formattingInfo.dump();
-                $this->currentLiteral = '';
-                break;
-            case 't':
-                $pc = new LoggerBasicPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_THREAD_CONVERTER);
-                LoggerLog::debug("LoggerPatternParser::finalizeConverter() THREAD converter.");
-                //formattingInfo.dump();
-                $this->currentLiteral = '';
-                break;
-            case 'u':
-                if($this->i < $this->patternLength) {
-	                $cNext = $this->pattern{$this->i};
-                    if(ord($cNext) >= ord('0') && ord($cNext) <= ord('9')) {
-	                    $pc = new LoggerUserFieldPatternConverter($this->formattingInfo, (string)(ord($cNext) - ord('0')));
-                        LoggerLog::debug("LoggerPatternParser::finalizeConverter() USER converter [{$cNext}].");
-	                    // formattingInfo.dump();
-                        $this->currentLiteral = '';
-	                    $this->i++;
-	                } else {
-                        LoggerLog::warn("LoggerPatternParser::finalizeConverter() Unexpected char '{$cNext}' at position {$this->i}.");
-                    }
-                }
-                break;
-            case 'x':
-                $pc = new LoggerBasicPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_NDC_CONVERTER);
-                LoggerLog::debug("LoggerPatternParser::finalizeConverter() NDC converter.");
-                $this->currentLiteral = '';
-                break;
+				if ($dateFormatStr == 'ISO8601') {
+					$df = LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_ISO8601;
+				} elseif($dateFormatStr == 'ABSOLUTE') {
+					$df = LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_ABSOLUTE;
+				} elseif($dateFormatStr == 'DATE') {
+					$df = LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_DATE;
+				} else {
+					$df = $dateFormatStr;
+					if ($df == null) {
+						$df = LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_ISO8601;
+					}
+				}
+				$pc = new LoggerDatePatternConverter($this->formattingInfo, $df);
+				$this->currentLiteral = '';
+				break;
+			case 'F':
+				$pc = new LoggerLocationPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_FILE_LOCATION_CONVERTER);
+				LoggerLog::debug("LoggerPatternParser::finalizeConverter() File name converter.");
+				//formattingInfo.dump();
+				$this->currentLiteral = '';
+				break;
+			case 'l':
+				$pc = new LoggerLocationPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_FULL_LOCATION_CONVERTER);
+				LoggerLog::debug("LoggerPatternParser::finalizeConverter() Location converter.");
+				//formattingInfo.dump();
+				$this->currentLiteral = '';
+				break;
+			case 'L':
+				$pc = new LoggerLocationPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_LINE_LOCATION_CONVERTER);
+				LoggerLog::debug("LoggerPatternParser::finalizeConverter() LINE NUMBER converter.");
+				//formattingInfo.dump();
+				$this->currentLiteral = '';
+				break;
+			case 'm':
+				$pc = new LoggerBasicPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_MESSAGE_CONVERTER);
+				LoggerLog::debug("LoggerPatternParser::finalizeConverter() MESSAGE converter.");
+				//formattingInfo.dump();
+				$this->currentLiteral = '';
+				break;
+			case 'M':
+				$pc = new LoggerLocationPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_METHOD_LOCATION_CONVERTER);
+				//LogLog.debug("METHOD converter.");
+				//formattingInfo.dump();
+				$this->currentLiteral = '';
+				break;
+			case 'p':
+				$pc = new LoggerBasicPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_LEVEL_CONVERTER);
+				//LogLog.debug("LEVEL converter.");
+				//formattingInfo.dump();
+				$this->currentLiteral = '';
+				break;
+			case 'r':
+				$pc = new LoggerBasicPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_RELATIVE_TIME_CONVERTER);
+				LoggerLog::debug("LoggerPatternParser::finalizeConverter() RELATIVE TIME converter.");
+				//formattingInfo.dump();
+				$this->currentLiteral = '';
+				break;
+			case 't':
+				$pc = new LoggerBasicPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_THREAD_CONVERTER);
+				LoggerLog::debug("LoggerPatternParser::finalizeConverter() THREAD converter.");
+				//formattingInfo.dump();
+				$this->currentLiteral = '';
+				break;
+			case 'u':
+				if($this->i < $this->patternLength) {
+					$cNext = $this->pattern{$this->i};
+					if(ord($cNext) >= ord('0') && ord($cNext) <= ord('9')) {
+						$pc = new LoggerUserFieldPatternConverter($this->formattingInfo, (string)(ord($cNext) - ord('0')));
+						LoggerLog::debug("LoggerPatternParser::finalizeConverter() USER converter [{$cNext}].");
+						// formattingInfo.dump();
+						$this->currentLiteral = '';
+						$this->i++;
+					} else {
+						LoggerLog::warn("LoggerPatternParser::finalizeConverter() Unexpected char '{$cNext}' at position {$this->i}.");
+					}
+				}
+				break;
+			case 'x':
+				$pc = new LoggerBasicPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_NDC_CONVERTER);
+				LoggerLog::debug("LoggerPatternParser::finalizeConverter() NDC converter.");
+				$this->currentLiteral = '';
+				break;
 
-            case 'X':
-                $xOpt = $this->extractOption();
-                $pc = new LoggerMDCPatternConverter($this->formattingInfo, $xOpt);
-                LoggerLog::debug("LoggerPatternParser::finalizeConverter() MDC converter.");
-                $this->currentLiteral = '';
-                break;
-            default:
-                LoggerLog::warn("LoggerPatternParser::finalizeConverter() Unexpected char [$c] at position {$this->i} in conversion pattern.");
-                $pc = new LoggerLiteralPatternConverter($this->currentLiteral);
-                $this->currentLiteral = '';
-        }
-        $this->addConverter($pc);
-    }
+			case 'X':
+				$xOpt = $this->extractOption();
+				$pc = new LoggerMDCPatternConverter($this->formattingInfo, $xOpt);
+				LoggerLog::debug("LoggerPatternParser::finalizeConverter() MDC converter.");
+				$this->currentLiteral = '';
+				break;
+			default:
+				LoggerLog::warn("LoggerPatternParser::finalizeConverter() Unexpected char [$c] at position {$this->i} in conversion pattern.");
+				$pc = new LoggerLiteralPatternConverter($this->currentLiteral);
+				$this->currentLiteral = '';
+		}
+		$this->addConverter($pc);
+	}
 
-    public function addConverter($pc)
-    {
-        $this->currentLiteral = '';
-        // Add the pattern converter to the list.
-        $this->addToList($pc);
-        // Next pattern is assumed to be a literal.
-        $this->state = LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE;
-        // Reset formatting info
-        $this->formattingInfo->reset();
-    }
+	public function addConverter($pc)
+	{
+		$this->currentLiteral = '';
+		// Add the pattern converter to the list.
+		$this->addToList($pc);
+		// Next pattern is assumed to be a literal.
+		$this->state = LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE;
+		// Reset formatting info
+		$this->formattingInfo->reset();
+	}
 }
 
 ?>
\ No newline at end of file

libraries/log4php.debug/helpers/LoggerFormattingInfo.php

Indentation +17 added lines, -17 removed lines

@@ -37,25 +37,25 @@
  */
 class LoggerFormattingInfo {
 
-    public $min        = -1;
-    public $max        = 0x7FFFFFFF;
-    public $leftAlign  = false;
+	public $min        = -1;
+	public $max        = 0x7FFFFFFF;
+	public $leftAlign  = false;
 
-    /**
-     * Constructor
-     */
-    public function LoggerFormattingInfo() {}
+	/**
+	 * Constructor
+	 */
+	public function LoggerFormattingInfo() {}
     
-    public function reset()
-    {
-        $this->min          = -1;
-        $this->max          = 0x7FFFFFFF;
-        $this->leftAlign    = false;      
-    }
+	public function reset()
+	{
+		$this->min          = -1;
+		$this->max          = 0x7FFFFFFF;
+		$this->leftAlign    = false;      
+	}
 
-    public function dump()
-    {
-        LoggerLog::debug("LoggerFormattingInfo::dump() min={$this->min}, max={$this->max}, leftAlign={$this->leftAlign}");
-    }
+	public function dump()
+	{
+		LoggerLog::debug("LoggerFormattingInfo::dump() min={$this->min}, max={$this->max}, leftAlign={$this->leftAlign}");
+	}
 } 
 ?>
\ No newline at end of file

libraries/log4php.debug/varia/LoggerLevelMatchFilter.php

Indentation +61 added lines, -61 removed lines

@@ -47,73 +47,73 @@
  */
 class LoggerLevelMatchFilter extends LoggerFilter {
   
-    /**
-     * @var boolean
-     */
-    public $acceptOnMatch = true;
+	/**
+	 * @var boolean
+	 */
+	public $acceptOnMatch = true;
 
-    /**
-     * @var LoggerLevel
-     */
-    public $levelToMatch;
+	/**
+	 * @var LoggerLevel
+	 */
+	public $levelToMatch;
   
-    /**
-     * @return boolean
-     */
-    public function getAcceptOnMatch()
-    {
-        return $this->acceptOnMatch;
-    }
+	/**
+	 * @return boolean
+	 */
+	public function getAcceptOnMatch()
+	{
+		return $this->acceptOnMatch;
+	}
     
-    /**
-     * @param boolean $acceptOnMatch
-     */
-    public function setAcceptOnMatch($acceptOnMatch)
-    {
-        $this->acceptOnMatch = LoggerOptionConverter::toBoolean($acceptOnMatch, true); 
-    }
+	/**
+	 * @param boolean $acceptOnMatch
+	 */
+	public function setAcceptOnMatch($acceptOnMatch)
+	{
+		$this->acceptOnMatch = LoggerOptionConverter::toBoolean($acceptOnMatch, true); 
+	}
     
-    /**
-     * @return LoggerLevel
-     */
-    public function getLevelToMatch()
-    {
-        return $this->levelToMatch;
-    }
+	/**
+	 * @return LoggerLevel
+	 */
+	public function getLevelToMatch()
+	{
+		return $this->levelToMatch;
+	}
     
-    /**
-     * @param string $l the level to match
-     */
-    public function setLevelToMatch($l)
-    {
-        $this->levelToMatch = LoggerOptionConverter::toLevel($l, null);
-    }
+	/**
+	 * @param string $l the level to match
+	 */
+	public function setLevelToMatch($l)
+	{
+		$this->levelToMatch = LoggerOptionConverter::toLevel($l, null);
+	}
 
-    /**
-     * Return the decision of this filter.
-     * 
-     * Returns {@link LOG4PHP_LOGGER_FILTER_NEUTRAL} if the <b><var>LevelToMatch</var></b>
-     * option is not set or if there is not match.  Otherwise, if there is a
-     * match, then the returned decision is {@link LOG4PHP_LOGGER_FILTER_ACCEPT} if the
-     * <b><var>AcceptOnMatch</var></b> property is set to <i>true</i>. The
-     * returned decision is {@link LOG4PHP_LOGGER_FILTER_DENY} if the
-     * <b><var>AcceptOnMatch</var></b> property is set to <i>false</i>.
-     *
-     * @param LoggerLoggingEvent $event
-     * @return integer
-     */
-    public function decide($event)
-    {
-        if($this->levelToMatch === null)
-            return LOG4PHP_LOGGER_FILTER_NEUTRAL;
+	/**
+	 * Return the decision of this filter.
+	 * 
+	 * Returns {@link LOG4PHP_LOGGER_FILTER_NEUTRAL} if the <b><var>LevelToMatch</var></b>
+	 * option is not set or if there is not match.  Otherwise, if there is a
+	 * match, then the returned decision is {@link LOG4PHP_LOGGER_FILTER_ACCEPT} if the
+	 * <b><var>AcceptOnMatch</var></b> property is set to <i>true</i>. The
+	 * returned decision is {@link LOG4PHP_LOGGER_FILTER_DENY} if the
+	 * <b><var>AcceptOnMatch</var></b> property is set to <i>false</i>.
+	 *
+	 * @param LoggerLoggingEvent $event
+	 * @return integer
+	 */
+	public function decide($event)
+	{
+		if($this->levelToMatch === null)
+			return LOG4PHP_LOGGER_FILTER_NEUTRAL;
         
-        if ($this->levelToMatch->equals($event->getLevel())) {  
-            return $this->getAcceptOnMatch() ? 
-                LOG4PHP_LOGGER_FILTER_ACCEPT : 
-                LOG4PHP_LOGGER_FILTER_DENY;
-        } else {
-            return LOG4PHP_LOGGER_FILTER_NEUTRAL;
-        }
-    }
+		if ($this->levelToMatch->equals($event->getLevel())) {  
+			return $this->getAcceptOnMatch() ? 
+				LOG4PHP_LOGGER_FILTER_ACCEPT : 
+				LOG4PHP_LOGGER_FILTER_DENY;
+		} else {
+			return LOG4PHP_LOGGER_FILTER_NEUTRAL;
+		}
+	}
 }
 ?>
\ No newline at end of file

libraries/log4php.debug/varia/LoggerStringMatchFilter.php

Indentation +51 added lines, -51 removed lines

@@ -46,63 +46,63 @@
  */
 class LoggerStringMatchFilter extends LoggerFilter {
   
-    /**
-     * @var boolean
-     */
-    public $acceptOnMatch = true;
+	/**
+	 * @var boolean
+	 */
+	public $acceptOnMatch = true;
 
-    /**
-     * @var string
-     */
-    public $stringToMatch = null;
+	/**
+	 * @var string
+	 */
+	public $stringToMatch = null;
   
-    /**
-     * @return boolean
-     */
-    public function getAcceptOnMatch()
-    {
-        return $this->acceptOnMatch;
-    }
+	/**
+	 * @return boolean
+	 */
+	public function getAcceptOnMatch()
+	{
+		return $this->acceptOnMatch;
+	}
     
-    /**
-     * @param mixed $acceptOnMatch a boolean or a string ('true' or 'false')
-     */
-    public function setAcceptOnMatch($acceptOnMatch)
-    {
-        $this->acceptOnMatch = is_bool($acceptOnMatch) ? 
-            $acceptOnMatch : 
-            (bool)(strtolower($acceptOnMatch) == 'true');
-    }
+	/**
+	 * @param mixed $acceptOnMatch a boolean or a string ('true' or 'false')
+	 */
+	public function setAcceptOnMatch($acceptOnMatch)
+	{
+		$this->acceptOnMatch = is_bool($acceptOnMatch) ? 
+			$acceptOnMatch : 
+			(bool)(strtolower($acceptOnMatch) == 'true');
+	}
     
-    /**
-     * @return string
-     */
-    public function getStringToMatch()
-    {
-        return $this->stringToMatch;
-    }
+	/**
+	 * @return string
+	 */
+	public function getStringToMatch()
+	{
+		return $this->stringToMatch;
+	}
     
-    /**
-     * @param string $s the string to match
-     */
-    public function setStringToMatch($s)
-    {
-        $this->stringToMatch = $s;
-    }
+	/**
+	 * @param string $s the string to match
+	 */
+	public function setStringToMatch($s)
+	{
+		$this->stringToMatch = $s;
+	}
 
-    /**
-     * @return integer a {@link LOGGER_FILTER_NEUTRAL} is there is no string match.
-     */
-    public function decide($event)
-    {
-        $msg = $event->getRenderedMessage();
+	/**
+	 * @return integer a {@link LOGGER_FILTER_NEUTRAL} is there is no string match.
+	 */
+	public function decide($event)
+	{
+		$msg = $event->getRenderedMessage();
         
-        if($msg === null ||  $this->stringToMatch === null)
-            return LOG4PHP_LOGGER_FILTER_NEUTRAL;
-        if( strpos($msg, $this->stringToMatch) !== false ) {
-            return ($this->acceptOnMatch) ? LOG4PHP_LOGGER_FILTER_ACCEPT : LOG4PHP_LOGGER_FILTER_DENY ; 
-        }
-        return LOG4PHP_LOGGER_FILTER_NEUTRAL;        
-    }
+		if($msg === null ||  $this->stringToMatch === null)
+			return LOG4PHP_LOGGER_FILTER_NEUTRAL;
+		if( strpos($msg, $this->stringToMatch) !== false ) {
+			return ($this->acceptOnMatch) ? LOG4PHP_LOGGER_FILTER_ACCEPT : LOG4PHP_LOGGER_FILTER_DENY ; 
+		}
+		return LOG4PHP_LOGGER_FILTER_NEUTRAL;        
+	}
 }
 ?>
\ No newline at end of file

libraries/log4php.debug/varia/LoggerLevelRangeFilter.php

Indentation +87 added lines, -87 removed lines

@@ -65,104 +65,104 @@
  */
 class LoggerLevelRangeFilter extends LoggerFilter {
   
-    /**
-     * @var boolean
-     */
-    public $acceptOnMatch = true;
+	/**
+	 * @var boolean
+	 */
+	public $acceptOnMatch = true;
 
-    /**
-     * @var LoggerLevel
-     */
-    public $levelMin;
+	/**
+	 * @var LoggerLevel
+	 */
+	public $levelMin;
   
-    /**
-     * @var LoggerLevel
-     */
-    public $levelMax;
+	/**
+	 * @var LoggerLevel
+	 */
+	public $levelMax;
 
-    /**
-     * @return boolean
-     */
-    public function getAcceptOnMatch()
-    {
-        return $this->acceptOnMatch;
-    }
+	/**
+	 * @return boolean
+	 */
+	public function getAcceptOnMatch()
+	{
+		return $this->acceptOnMatch;
+	}
     
-    /**
-     * @param boolean $acceptOnMatch
-     */
-    public function setAcceptOnMatch($acceptOnMatch)
-    {
-        $this->acceptOnMatch = LoggerOptionConverter::toBoolean($acceptOnMatch, true); 
-    }
+	/**
+	 * @param boolean $acceptOnMatch
+	 */
+	public function setAcceptOnMatch($acceptOnMatch)
+	{
+		$this->acceptOnMatch = LoggerOptionConverter::toBoolean($acceptOnMatch, true); 
+	}
     
-    /**
-     * @return LoggerLevel
-     */
-    public function getLevelMin()
-    {
-        return $this->levelMin;
-    }
+	/**
+	 * @return LoggerLevel
+	 */
+	public function getLevelMin()
+	{
+		return $this->levelMin;
+	}
     
-    /**
-     * @param string $l the level min to match
-     */
-    public function setLevelMin($l)
-    {
-        $this->levelMin = LoggerOptionConverter::toLevel($l, null);
-    }
+	/**
+	 * @param string $l the level min to match
+	 */
+	public function setLevelMin($l)
+	{
+		$this->levelMin = LoggerOptionConverter::toLevel($l, null);
+	}
 
-    /**
-     * @return LoggerLevel
-     */
-    public function getLevelMax()
-    {
-        return $this->levelMax;
-    }
+	/**
+	 * @return LoggerLevel
+	 */
+	public function getLevelMax()
+	{
+		return $this->levelMax;
+	}
     
-    /**
-     * @param string $l the level max to match
-     */
-    public function setLevelMax($l)
-    {
-        $this->levelMax = LoggerOptionConverter::toLevel($l, null);
-    }
+	/**
+	 * @param string $l the level max to match
+	 */
+	public function setLevelMax($l)
+	{
+		$this->levelMax = LoggerOptionConverter::toLevel($l, null);
+	}
 
-    /**
-     * Return the decision of this filter.
-     *
-     * @param LoggerLoggingEvent $event
-     * @return integer
-     */
-    public function decide($event)
-    {
-        $level = $event->getLevel();
+	/**
+	 * Return the decision of this filter.
+	 *
+	 * @param LoggerLoggingEvent $event
+	 * @return integer
+	 */
+	public function decide($event)
+	{
+		$level = $event->getLevel();
         
-        if($this->levelMin !== null) {
-            if ($level->isGreaterOrEqual($this->levelMin) === false) {
-                // level of event is less than minimum
-                return LOG4PHP_LOGGER_FILTER_DENY;
-            }
-        }
+		if($this->levelMin !== null) {
+			if ($level->isGreaterOrEqual($this->levelMin) === false) {
+				// level of event is less than minimum
+				return LOG4PHP_LOGGER_FILTER_DENY;
+			}
+		}
 
-        if($this->levelMax !== null) {
-            if ($level->toInt() > $this->levelMax->toInt()) {
-                // level of event is greater than maximum
-                // Alas, there is no Level.isGreater method. and using
-                // a combo of isGreaterOrEqual && !Equal seems worse than
-                // checking the int values of the level objects..
-                return LOG4PHP_LOGGER_FILTER_DENY;
-            }
-        }
+		if($this->levelMax !== null) {
+			if ($level->toInt() > $this->levelMax->toInt()) {
+				// level of event is greater than maximum
+				// Alas, there is no Level.isGreater method. and using
+				// a combo of isGreaterOrEqual && !Equal seems worse than
+				// checking the int values of the level objects..
+				return LOG4PHP_LOGGER_FILTER_DENY;
+			}
+		}
 
-        if ($this->getAcceptOnMatch()) {
-            // this filter set up to bypass later filters and always return
-            // accept if level in range
-            return  LOG4PHP_LOGGER_FILTER_ACCEPT;
-        } else {
-            // event is ok for this filter; allow later filters to have a look..
-            return LOG4PHP_LOGGER_FILTER_NEUTRAL;
-        }
-    }
+		if ($this->getAcceptOnMatch()) {
+			// this filter set up to bypass later filters and always return
+			// accept if level in range
+			return  LOG4PHP_LOGGER_FILTER_ACCEPT;
+		} else {
+			// event is ok for this filter; allow later filters to have a look..
+			return LOG4PHP_LOGGER_FILTER_NEUTRAL;
+		}
+	}
 }
 ?>
\ No newline at end of file

libraries/log4php.debug/LoggerPropertyConfigurator.php

Indentation +521 added lines, -521 removed lines

@@ -91,560 +91,560 @@
  */
 class LoggerPropertyConfigurator extends LoggerConfigurator {
 
-    /**
-     * @var LoggerFactory
-     */
-    public $loggerFactory = null;
+	/**
+	 * @var LoggerFactory
+	 */
+	public $loggerFactory = null;
     
-    /**
-     * Constructor
-     */
-    public function LoggerPropertyConfigurator()
-    {
-        $this->loggerFactory = new LoggerDefaultCategoryFactory();
-    }
+	/**
+	 * Constructor
+	 */
+	public function LoggerPropertyConfigurator()
+	{
+		$this->loggerFactory = new LoggerDefaultCategoryFactory();
+	}
     
-    /**
-     * 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
-     * @return boolean configuration result
-     * @static
-     */
-    public function configure($url = '')
-    {
-        $configurator = new LoggerPropertyConfigurator();
-        $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
+	 * @return boolean configuration result
+	 * @static
+	 */
+	public function configure($url = '')
+	{
+		$configurator = new LoggerPropertyConfigurator();
+		$repository =& LoggerManager::getLoggerRepository();
+		return $configurator->doConfigure($url, $repository);
+	}
 
-    /**
-     * Read configuration from a file.
-     *
-     * <p>The function {@link PHP_MANUAL#parse_ini_file} is used to read the
-     * file.</p>
-     *
-     * <b>The existing configuration is not cleared nor reset.</b> 
-     * If you require a different behavior, then call 
-     * {@link  LoggerManager::resetConfiguration()} 
-     * method before calling {@link doConfigure()}.
-     * 
-     * <p>The configuration file consists of statements in the format
-     * <b>key=value</b>. The syntax of different configuration
-     * elements are discussed below.
-     * 
-     * <p><b>Repository-wide threshold</b></p>
-     * 
-     * <p>The repository-wide threshold filters logging requests by level
-     * regardless of logger. The syntax is:
-     * 
-     * <pre>
-     * log4php.threshold=[level]
-     * </pre>
-     * 
-     * <p>The level value can consist of the string values OFF, FATAL,
-     * ERROR, WARN, INFO, DEBUG, ALL or a <i>custom level</i> value. A
-     * custom level value can be specified in the form
-     * <samp>level#classname</samp>. By default the repository-wide threshold is set
-     * to the lowest possible value, namely the level <b>ALL</b>.
-     * </p>
-     * 
-     * 
-     * <p><b>Appender configuration</b></p>
-     * 
-     * <p>Appender configuration syntax is:</p>
-     * <pre>
-     * ; For appender named <i>appenderName</i>, set its class.
-     * ; Note: The appender name can contain dots.
-     * log4php.appender.appenderName=name_of_appender_class
-     * 
-     * ; Set appender specific options.
-     * 
-     * log4php.appender.appenderName.option1=value1
-     * log4php.appender.appenderName.optionN=valueN
-     * </pre>
-     * 
-     * For each named appender you can configure its {@link LoggerLayout}. The
-     * syntax for configuring an appender's layout is:
-     * <pre>
-     * log4php.appender.appenderName.layout=name_of_layout_class
-     * log4php.appender.appenderName.layout.option1=value1
-     *  ....
-     * log4php.appender.appenderName.layout.optionN=valueN
-     * </pre>
-     * 
-     * <p><b>Configuring loggers</b></p>
-     * 
-     * <p>The syntax for configuring the root logger is:
-     * <pre>
-     * log4php.rootLogger=[level], appenderName, appenderName, ...
-     * </pre>
-     * 
-     * <p>This syntax means that an optional <i>level</i> can be
-     * supplied followed by appender names separated by commas.
-     * 
-     * <p>The level value can consist of the string values OFF, FATAL,
-     * ERROR, WARN, INFO, DEBUG, ALL or a <i>custom level</i> value. A
-     * custom level value can be specified in the form</p>
-     *
-     * <pre>level#classname</pre>
-     * 
-     * <p>If a level value is specified, then the root level is set
-     * to the corresponding level.  If no level value is specified,
-     * then the root level remains untouched.
-     * 
-     * <p>The root logger can be assigned multiple appenders.
-     * 
-     * <p>Each <i>appenderName</i> (separated by commas) will be added to
-     * the root logger. The named appender is defined using the
-     * appender syntax defined above.
-     * 
-     * <p>For non-root categories the syntax is almost the same:
-     * <pre>
-     * log4php.logger.logger_name=[level|INHERITED|NULL], appenderName, appenderName, ...
-     * </pre>
-     * 
-     * <p>The meaning of the optional level value is discussed above
-     * in relation to the root logger. In addition however, the value
-     * INHERITED can be specified meaning that the named logger should
-     * inherit its level from the logger hierarchy.</p>
-     * 
-     * <p>If no level value is supplied, then the level of the
-     * named logger remains untouched.</p>
-     * 
-     * <p>By default categories inherit their level from the
-     * hierarchy. However, if you set the level of a logger and later
-     * decide that that logger should inherit its level, then you should
-     * specify INHERITED as the value for the level value. NULL is a
-     * synonym for INHERITED.</p>
-     * 
-     * <p>Similar to the root logger syntax, each <i>appenderName</i>
-     * (separated by commas) will be attached to the named logger.</p>
-     * 
-     * <p>See the <i>appender additivity rule</i> in the user manual for 
-     * the meaning of the <b>additivity</b> flag.
-     * 
-     * <p><b>ObjectRenderers</b></p>
-     * 
-     * <p>You can customize the way message objects of a given type are
-     * converted to String before being logged. This is done by
-     * specifying a {@link LoggerObjectRenderer}
-     * for the object type would like to customize.</p>
-     * 
-     * <p>The syntax is:
-     * 
-     * <pre>
-     * log4php.renderer.name_of_rendered_class=name_of_rendering.class
-     * </pre>
-     * 
-     * As in,
-     * <pre>
-     * log4php.renderer.myFruit=myFruitRenderer
-     * </pre>
-     * 
-     * <p><b>Logger Factories</b></p>
-     * 
-     * The usage of custom logger factories is discouraged and no longer
-     * documented.
-     * 
-     * <p><b>Example</b></p>
-     * 
-     * <p>An example configuration is given below. Other configuration
-     * file examples are given in the <b>tests</b> folder.
-     * 
-     * <pre>
-     * ; Set options for appender named "A1".
-     * ; Appender "A1" will be a SyslogAppender
-     * log4php.appender.A1=SyslogAppender
-     * 
-     * ; The syslog daemon resides on www.abc.net
-     * log4php.appender.A1.SyslogHost=www.abc.net
-     * 
-     * ; A1's layout is a LoggerPatternLayout, using the conversion pattern
-     * ; <b>%r %-5p %c{2} %M.%L %x - %m%n</b>. Thus, the log output will
-     * ; include the relative time since the start of the application in
-     * ; milliseconds, followed by the level of the log request,
-     * ; followed by the two rightmost components of the logger name,
-     * ; followed by the callers method name, followed by the line number,
-     * ; the nested disgnostic context and finally the message itself.
-     * ; Refer to the documentation of LoggerPatternLayout} for further information
-     * ; on the syntax of the ConversionPattern key.
-     * log4php.appender.A1.layout=LoggerPatternLayout
-     * log4php.appender.A1.layout.ConversionPattern="%-4r %-5p %c{2} %M.%L %x - %m%n"
-     * 
-     * ; Set options for appender named "A2"
-     * ; A2 should be a LoggerAppenderRollingFile, with maximum file size of 10 MB
-     * ; using at most one backup file. A2's layout is TTCC, using the
-     * ; ISO8061 date format with context printing enabled.
-     * log4php.appender.A2=LoggerAppenderRollingFile
-     * log4php.appender.A2.MaxFileSize=10MB
-     * log4php.appender.A2.MaxBackupIndex=1
-     * log4php.appender.A2.layout=LoggerLayoutTTCC
-     * log4php.appender.A2.layout.ContextPrinting="true"
-     * log4php.appender.A2.layout.DateFormat="%c"
-     * 
-     * ; Root logger set to DEBUG using the A2 appender defined above.
-     * log4php.rootLogger=DEBUG, A2
-     * 
-     * ; Logger definitions:
-     * ; The SECURITY logger inherits is level from root. However, it's output
-     * ; will go to A1 appender defined above. It's additivity is non-cumulative.
-     * log4php.logger.SECURITY=INHERIT, A1
-     * log4php.additivity.SECURITY=false
-     * 
-     * ; Only warnings or above will be logged for the logger "SECURITY.access".
-     * ; Output will go to A1.
-     * log4php.logger.SECURITY.access=WARN
-     * 
-     * 
-     * ; The logger "class.of.the.day" inherits its level from the
-     * ; logger hierarchy.  Output will go to the appender's of the root
-     * ; logger, A2 in this case.
-     * log4php.logger.class.of.the.day=INHERIT
-     * </pre>
-     * 
-     * <p>Refer to the <b>setOption</b> method in each Appender and
-     * Layout for class specific options.</p>
-     * 
-     * <p>Use the <b>&quot;;&quot;</b> character at the
-     * beginning of a line for comments.</p>
-     * 
-     * @param string $url The name of the configuration file where the
-     *                    configuration information is stored.
-     * @param LoggerHierarchy &$repository the repository to apply the configuration
-     */
-    public function doConfigure($url, &$repository)
-    {
-        $properties = @parse_ini_file($url);
-        if ($properties === false) {
-            LoggerLog::warn("LoggerPropertyConfigurator::doConfigure() cannot load '$url' configuration.");
-            return false; 
-        }
-        return $this->doConfigureProperties($properties, $repository);
-    }
+	/**
+	 * Read configuration from a file.
+	 *
+	 * <p>The function {@link PHP_MANUAL#parse_ini_file} is used to read the
+	 * file.</p>
+	 *
+	 * <b>The existing configuration is not cleared nor reset.</b> 
+	 * If you require a different behavior, then call 
+	 * {@link  LoggerManager::resetConfiguration()} 
+	 * method before calling {@link doConfigure()}.
+	 * 
+	 * <p>The configuration file consists of statements in the format
+	 * <b>key=value</b>. The syntax of different configuration
+	 * elements are discussed below.
+	 * 
+	 * <p><b>Repository-wide threshold</b></p>
+	 * 
+	 * <p>The repository-wide threshold filters logging requests by level
+	 * regardless of logger. The syntax is:
+	 * 
+	 * <pre>
+	 * log4php.threshold=[level]
+	 * </pre>
+	 * 
+	 * <p>The level value can consist of the string values OFF, FATAL,
+	 * ERROR, WARN, INFO, DEBUG, ALL or a <i>custom level</i> value. A
+	 * custom level value can be specified in the form
+	 * <samp>level#classname</samp>. By default the repository-wide threshold is set
+	 * to the lowest possible value, namely the level <b>ALL</b>.
+	 * </p>
+	 * 
+	 * 
+	 * <p><b>Appender configuration</b></p>
+	 * 
+	 * <p>Appender configuration syntax is:</p>
+	 * <pre>
+	 * ; For appender named <i>appenderName</i>, set its class.
+	 * ; Note: The appender name can contain dots.
+	 * log4php.appender.appenderName=name_of_appender_class
+	 * 
+	 * ; Set appender specific options.
+	 * 
+	 * log4php.appender.appenderName.option1=value1
+	 * log4php.appender.appenderName.optionN=valueN
+	 * </pre>
+	 * 
+	 * For each named appender you can configure its {@link LoggerLayout}. The
+	 * syntax for configuring an appender's layout is:
+	 * <pre>
+	 * log4php.appender.appenderName.layout=name_of_layout_class
+	 * log4php.appender.appenderName.layout.option1=value1
+	 *  ....
+	 * log4php.appender.appenderName.layout.optionN=valueN
+	 * </pre>
+	 * 
+	 * <p><b>Configuring loggers</b></p>
+	 * 
+	 * <p>The syntax for configuring the root logger is:
+	 * <pre>
+	 * log4php.rootLogger=[level], appenderName, appenderName, ...
+	 * </pre>
+	 * 
+	 * <p>This syntax means that an optional <i>level</i> can be
+	 * supplied followed by appender names separated by commas.
+	 * 
+	 * <p>The level value can consist of the string values OFF, FATAL,
+	 * ERROR, WARN, INFO, DEBUG, ALL or a <i>custom level</i> value. A
+	 * custom level value can be specified in the form</p>
+	 *
+	 * <pre>level#classname</pre>
+	 * 
+	 * <p>If a level value is specified, then the root level is set
+	 * to the corresponding level.  If no level value is specified,
+	 * then the root level remains untouched.
+	 * 
+	 * <p>The root logger can be assigned multiple appenders.
+	 * 
+	 * <p>Each <i>appenderName</i> (separated by commas) will be added to
+	 * the root logger. The named appender is defined using the
+	 * appender syntax defined above.
+	 * 
+	 * <p>For non-root categories the syntax is almost the same:
+	 * <pre>
+	 * log4php.logger.logger_name=[level|INHERITED|NULL], appenderName, appenderName, ...
+	 * </pre>
+	 * 
+	 * <p>The meaning of the optional level value is discussed above
+	 * in relation to the root logger. In addition however, the value
+	 * INHERITED can be specified meaning that the named logger should
+	 * inherit its level from the logger hierarchy.</p>
+	 * 
+	 * <p>If no level value is supplied, then the level of the
+	 * named logger remains untouched.</p>
+	 * 
+	 * <p>By default categories inherit their level from the
+	 * hierarchy. However, if you set the level of a logger and later
+	 * decide that that logger should inherit its level, then you should
+	 * specify INHERITED as the value for the level value. NULL is a
+	 * synonym for INHERITED.</p>
+	 * 
+	 * <p>Similar to the root logger syntax, each <i>appenderName</i>
+	 * (separated by commas) will be attached to the named logger.</p>
+	 * 
+	 * <p>See the <i>appender additivity rule</i> in the user manual for 
+	 * the meaning of the <b>additivity</b> flag.
+	 * 
+	 * <p><b>ObjectRenderers</b></p>
+	 * 
+	 * <p>You can customize the way message objects of a given type are
+	 * converted to String before being logged. This is done by
+	 * specifying a {@link LoggerObjectRenderer}
+	 * for the object type would like to customize.</p>
+	 * 
+	 * <p>The syntax is:
+	 * 
+	 * <pre>
+	 * log4php.renderer.name_of_rendered_class=name_of_rendering.class
+	 * </pre>
+	 * 
+	 * As in,
+	 * <pre>
+	 * log4php.renderer.myFruit=myFruitRenderer
+	 * </pre>
+	 * 
+	 * <p><b>Logger Factories</b></p>
+	 * 
+	 * The usage of custom logger factories is discouraged and no longer
+	 * documented.
+	 * 
+	 * <p><b>Example</b></p>
+	 * 
+	 * <p>An example configuration is given below. Other configuration
+	 * file examples are given in the <b>tests</b> folder.
+	 * 
+	 * <pre>
+	 * ; Set options for appender named "A1".
+	 * ; Appender "A1" will be a SyslogAppender
+	 * log4php.appender.A1=SyslogAppender
+	 * 
+	 * ; The syslog daemon resides on www.abc.net
+	 * log4php.appender.A1.SyslogHost=www.abc.net
+	 * 
+	 * ; A1's layout is a LoggerPatternLayout, using the conversion pattern
+	 * ; <b>%r %-5p %c{2} %M.%L %x - %m%n</b>. Thus, the log output will
+	 * ; include the relative time since the start of the application in
+	 * ; milliseconds, followed by the level of the log request,
+	 * ; followed by the two rightmost components of the logger name,
+	 * ; followed by the callers method name, followed by the line number,
+	 * ; the nested disgnostic context and finally the message itself.
+	 * ; Refer to the documentation of LoggerPatternLayout} for further information
+	 * ; on the syntax of the ConversionPattern key.
+	 * log4php.appender.A1.layout=LoggerPatternLayout
+	 * log4php.appender.A1.layout.ConversionPattern="%-4r %-5p %c{2} %M.%L %x - %m%n"
+	 * 
+	 * ; Set options for appender named "A2"
+	 * ; A2 should be a LoggerAppenderRollingFile, with maximum file size of 10 MB
+	 * ; using at most one backup file. A2's layout is TTCC, using the
+	 * ; ISO8061 date format with context printing enabled.
+	 * log4php.appender.A2=LoggerAppenderRollingFile
+	 * log4php.appender.A2.MaxFileSize=10MB
+	 * log4php.appender.A2.MaxBackupIndex=1
+	 * log4php.appender.A2.layout=LoggerLayoutTTCC
+	 * log4php.appender.A2.layout.ContextPrinting="true"
+	 * log4php.appender.A2.layout.DateFormat="%c"
+	 * 
+	 * ; Root logger set to DEBUG using the A2 appender defined above.
+	 * log4php.rootLogger=DEBUG, A2
+	 * 
+	 * ; Logger definitions:
+	 * ; The SECURITY logger inherits is level from root. However, it's output
+	 * ; will go to A1 appender defined above. It's additivity is non-cumulative.
+	 * log4php.logger.SECURITY=INHERIT, A1
+	 * log4php.additivity.SECURITY=false
+	 * 
+	 * ; Only warnings or above will be logged for the logger "SECURITY.access".
+	 * ; Output will go to A1.
+	 * log4php.logger.SECURITY.access=WARN
+	 * 
+	 * 
+	 * ; The logger "class.of.the.day" inherits its level from the
+	 * ; logger hierarchy.  Output will go to the appender's of the root
+	 * ; logger, A2 in this case.
+	 * log4php.logger.class.of.the.day=INHERIT
+	 * </pre>
+	 * 
+	 * <p>Refer to the <b>setOption</b> method in each Appender and
+	 * Layout for class specific options.</p>
+	 * 
+	 * <p>Use the <b>&quot;;&quot;</b> character at the
+	 * beginning of a line for comments.</p>
+	 * 
+	 * @param string $url The name of the configuration file where the
+	 *                    configuration information is stored.
+	 * @param LoggerHierarchy &$repository the repository to apply the configuration
+	 */
+	public function doConfigure($url, &$repository)
+	{
+		$properties = @parse_ini_file($url);
+		if ($properties === false) {
+			LoggerLog::warn("LoggerPropertyConfigurator::doConfigure() cannot load '$url' configuration.");
+			return false; 
+		}
+		return $this->doConfigureProperties($properties, $repository);
+	}
 
 
-    /**
-     * Read configuration options from <b>properties</b>.
-     *
-     * @see doConfigure().
-     * @param array $properties
-     * @param LoggerHierarchy &$hierarchy
-     */
-    public function doConfigureProperties($properties, &$hierarchy)
-    {
-        $value = @$properties[LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_DEBUG_KEY];
+	/**
+	 * Read configuration options from <b>properties</b>.
+	 *
+	 * @see doConfigure().
+	 * @param array $properties
+	 * @param LoggerHierarchy &$hierarchy
+	 */
+	public function doConfigureProperties($properties, &$hierarchy)
+	{
+		$value = @$properties[LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_DEBUG_KEY];
         
-        if (!empty($value)) {
-            LoggerLog::internalDebugging(LoggerOptionConverter::toBoolean($value, LoggerLog::internalDebugging()));
-        }
+		if (!empty($value)) {
+			LoggerLog::internalDebugging(LoggerOptionConverter::toBoolean($value, LoggerLog::internalDebugging()));
+		}
 
-        $thresholdStr = @$properties[LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_THRESHOLD_PREFIX];
-        $hierarchy->setThreshold(LoggerOptionConverter::toLevel($thresholdStr, LoggerLevel::getLevelAll()));
+		$thresholdStr = @$properties[LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_THRESHOLD_PREFIX];
+		$hierarchy->setThreshold(LoggerOptionConverter::toLevel($thresholdStr, LoggerLevel::getLevelAll()));
         
-        $this->configureRootCategory($properties, $hierarchy);
-        $this->configureLoggerFactory($properties);
-        $this->parseCatsAndRenderers($properties, $hierarchy);
+		$this->configureRootCategory($properties, $hierarchy);
+		$this->configureLoggerFactory($properties);
+		$this->parseCatsAndRenderers($properties, $hierarchy);
 
-        LoggerLog::debug("LoggerPropertyConfigurator::doConfigureProperties() Finished configuring.");
+		LoggerLog::debug("LoggerPropertyConfigurator::doConfigureProperties() Finished configuring.");
         
-        return true;
-    }
+		return true;
+	}
 
-    // --------------------------------------------------------------------------
-    // Internal stuff
-    // --------------------------------------------------------------------------
+	// --------------------------------------------------------------------------
+	// Internal stuff
+	// --------------------------------------------------------------------------
 
-    /**
-     * Check the provided <b>Properties</b> object for a
-     * {@link LoggerFactory} entry specified by 
-     * {@link LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_FACTORY_KEY}.
-     *  
-     * If such an entry exists, an attempt is made to create an instance using 
-     * the default constructor.  
-     * This instance is used for subsequent Category creations
-     * within this configurator.
-     *
-     * @see parseCatsAndRenderers()
-     * @param array $props array of properties
-     */
-    public function configureLoggerFactory($props)
-    {
-        $factoryFqcn = @$props[LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_FACTORY_KEY];
-        if(!empty($factoryFqcn)) {
-            $factoryClassName = basename($factoryFqcn);
-            LoggerLog::debug(
-                "LoggerPropertyConfigurator::configureLoggerFactory() Trying to load factory [" .
-                $factoryClassName . 
-                "]."
-            );
+	/**
+	 * Check the provided <b>Properties</b> object for a
+	 * {@link LoggerFactory} entry specified by 
+	 * {@link LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_FACTORY_KEY}.
+	 *  
+	 * If such an entry exists, an attempt is made to create an instance using 
+	 * the default constructor.  
+	 * This instance is used for subsequent Category creations
+	 * within this configurator.
+	 *
+	 * @see parseCatsAndRenderers()
+	 * @param array $props array of properties
+	 */
+	public function configureLoggerFactory($props)
+	{
+		$factoryFqcn = @$props[LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_FACTORY_KEY];
+		if(!empty($factoryFqcn)) {
+			$factoryClassName = basename($factoryFqcn);
+			LoggerLog::debug(
+				"LoggerPropertyConfigurator::configureLoggerFactory() Trying to load factory [" .
+				$factoryClassName . 
+				"]."
+			);
             
-            if (!class_exists($factoryClassName))
-                @include_once("{$factoryFqcn}.php");
-            if (class_exists($factoryClassName)) {
-                $loggerFactory = new $factoryClassName();
-            } else {
-                LoggerLog::debug(
-                    "LoggerPropertyConfigurator::configureLoggerFactory() Unable to load factory [" .
-                    $factoryClassName . 
-                    "]. Using default."
-                );
-                $loggerFactory = $this->loggerFactory;
-            }
+			if (!class_exists($factoryClassName))
+				@include_once("{$factoryFqcn}.php");
+			if (class_exists($factoryClassName)) {
+				$loggerFactory = new $factoryClassName();
+			} else {
+				LoggerLog::debug(
+					"LoggerPropertyConfigurator::configureLoggerFactory() Unable to load factory [" .
+					$factoryClassName . 
+					"]. Using default."
+				);
+				$loggerFactory = $this->loggerFactory;
+			}
 
-            LoggerLog::debug(
-                "LoggerPropertyConfigurator::configureLoggerFactory() ".
-                "Setting properties for category factory [" . get_class($loggerFactory) . "]."
-            );
+			LoggerLog::debug(
+				"LoggerPropertyConfigurator::configureLoggerFactory() ".
+				"Setting properties for category factory [" . get_class($loggerFactory) . "]."
+			);
             
-            LoggerPropertySetter::setPropertiesByObject($loggerFactory, $props, LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_FACTORY_PREFIX . ".");
-        }
-    }
+			LoggerPropertySetter::setPropertiesByObject($loggerFactory, $props, LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_FACTORY_PREFIX . ".");
+		}
+	}
     
-    /**
-     * @param array $props array of properties
-     * @param LoggerHierarchy &$hierarchy
-     */
-    public function configureRootCategory($props, &$hierarchy)
-    {
-        $effectivePrefix = LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_ROOT_LOGGER_PREFIX;
-        $value = @$props[LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_ROOT_LOGGER_PREFIX];
+	/**
+	 * @param array $props array of properties
+	 * @param LoggerHierarchy &$hierarchy
+	 */
+	public function configureRootCategory($props, &$hierarchy)
+	{
+		$effectivePrefix = LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_ROOT_LOGGER_PREFIX;
+		$value = @$props[LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_ROOT_LOGGER_PREFIX];
 
-        if(empty($value)) {
-            $value = @$props[LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_ROOT_CATEGORY_PREFIX];
-            $effectivePrefix = LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_ROOT_CATEGORY_PREFIX;
-        }
+		if(empty($value)) {
+			$value = @$props[LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_ROOT_CATEGORY_PREFIX];
+			$effectivePrefix = LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_ROOT_CATEGORY_PREFIX;
+		}
 
-        if (empty($value)) {
-            LoggerLog::debug(
-                "LoggerPropertyConfigurator::configureRootCategory() ".
-                "Could not find root logger information. Is this OK?"
-            );
-        } else {
-            $root =& $hierarchy->getRootLogger();
-            // synchronized(root) {
-        	$this->parseCategory(
-                $props, 
-                $root, 
-                $effectivePrefix, 
-                LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_INTERNAL_ROOT_NAME, 
-                $value
-            );
-            // }
-        }
-    }
+		if (empty($value)) {
+			LoggerLog::debug(
+				"LoggerPropertyConfigurator::configureRootCategory() ".
+				"Could not find root logger information. Is this OK?"
+			);
+		} else {
+			$root =& $hierarchy->getRootLogger();
+			// synchronized(root) {
+			$this->parseCategory(
+				$props, 
+				$root, 
+				$effectivePrefix, 
+				LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_INTERNAL_ROOT_NAME, 
+				$value
+			);
+			// }
+		}
+	}
 
-    /**
-     * Parse non-root elements, such non-root categories and renderers.
-     *
-     * @param array $props array of properties
-     * @param LoggerHierarchy &$hierarchy
-     */
-    public function parseCatsAndRenderers($props, &$hierarchy)
-    {
-        while(list($key,$value) = each($props)) {
-            if( strpos($key, LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_CATEGORY_PREFIX) === 0 || 
-                strpos($key, LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_PREFIX) === 0) {
-	            if(strpos($key, LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_CATEGORY_PREFIX) === 0) {
-                    $loggerName = substr($key, strlen(LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_CATEGORY_PREFIX));
-	            } elseif (strpos($key, LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_PREFIX) === 0) {
-                    $loggerName = substr($key, strlen(LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_PREFIX));
-                }
-                $logger =& $hierarchy->getLogger($loggerName, $this->loggerFactory);
-	            // synchronized(logger) {
-	            $this->parseCategory($props, $logger, $key, $loggerName, $value);
-        	    $this->parseAdditivityForLogger($props, $logger, $loggerName);
-	            // }
-            } elseif (strpos($key, LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_RENDERER_PREFIX) === 0) {
-                $renderedClass = substr($key, strlen(LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_RENDERER_PREFIX));
-	            $renderingClass = $value;
-            	if (method_exists($hierarchy, 'addrenderer')) {
-	                LoggerRendererMap::addRenderer($hierarchy, $renderedClass, $renderingClass);
-                }
-	        }
-        }
-    }
+	/**
+	 * Parse non-root elements, such non-root categories and renderers.
+	 *
+	 * @param array $props array of properties
+	 * @param LoggerHierarchy &$hierarchy
+	 */
+	public function parseCatsAndRenderers($props, &$hierarchy)
+	{
+		while(list($key,$value) = each($props)) {
+			if( strpos($key, LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_CATEGORY_PREFIX) === 0 || 
+				strpos($key, LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_PREFIX) === 0) {
+				if(strpos($key, LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_CATEGORY_PREFIX) === 0) {
+					$loggerName = substr($key, strlen(LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_CATEGORY_PREFIX));
+				} elseif (strpos($key, LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_PREFIX) === 0) {
+					$loggerName = substr($key, strlen(LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_PREFIX));
+				}
+				$logger =& $hierarchy->getLogger($loggerName, $this->loggerFactory);
+				// synchronized(logger) {
+				$this->parseCategory($props, $logger, $key, $loggerName, $value);
+				$this->parseAdditivityForLogger($props, $logger, $loggerName);
+				// }
+			} elseif (strpos($key, LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_RENDERER_PREFIX) === 0) {
+				$renderedClass = substr($key, strlen(LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_RENDERER_PREFIX));
+				$renderingClass = $value;
+				if (method_exists($hierarchy, 'addrenderer')) {
+					LoggerRendererMap::addRenderer($hierarchy, $renderedClass, $renderingClass);
+				}
+			}
+		}
+	}
 
-    /**
-     * Parse the additivity option for a non-root category.
-     *
-     * @param array $props array of properties
-     * @param Logger &$cat
-     * @param string $loggerName
-     */
-    public function parseAdditivityForLogger($props, &$cat, $loggerName)
-    {
-        $value = LoggerOptionConverter::findAndSubst(
-                    LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_ADDITIVITY_PREFIX . $loggerName,
+	/**
+	 * Parse the additivity option for a non-root category.
+	 *
+	 * @param array $props array of properties
+	 * @param Logger &$cat
+	 * @param string $loggerName
+	 */
+	public function parseAdditivityForLogger($props, &$cat, $loggerName)
+	{
+		$value = LoggerOptionConverter::findAndSubst(
+					LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_ADDITIVITY_PREFIX . $loggerName,
 					$props
-                 );
-        LoggerLog::debug(
-            "LoggerPropertyConfigurator::parseAdditivityForLogger() ".
-            "Handling " . LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_ADDITIVITY_PREFIX . $loggerName . "=[{$value}]"
-        );
-        // touch additivity only if necessary
-        if(!empty($value)) {
-            $additivity = LoggerOptionConverter::toBoolean($value, true);
-            LoggerLog::debug(
-                "LoggerPropertyConfigurator::parseAdditivityForLogger() ".
-                "Setting additivity for [{$loggerName}] to [{$additivity}]"
-            );
-            $cat->setAdditivity($additivity);
-        }
-    }
+				 );
+		LoggerLog::debug(
+			"LoggerPropertyConfigurator::parseAdditivityForLogger() ".
+			"Handling " . LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_ADDITIVITY_PREFIX . $loggerName . "=[{$value}]"
+		);
+		// touch additivity only if necessary
+		if(!empty($value)) {
+			$additivity = LoggerOptionConverter::toBoolean($value, true);
+			LoggerLog::debug(
+				"LoggerPropertyConfigurator::parseAdditivityForLogger() ".
+				"Setting additivity for [{$loggerName}] to [{$additivity}]"
+			);
+			$cat->setAdditivity($additivity);
+		}
+	}
 
-    /**
-     * This method must work for the root category as well.
-     *
-     * @param array $props array of properties
-     * @param Logger &$logger
-     * @param string $optionKey
-     * @param string $loggerName
-     * @param string $value
-     * @return Logger
-     */
-    public function &parseCategory($props, &$logger, $optionKey, $loggerName, $value)
-    {
-        LoggerLog::debug(
-            "LoggerPropertyConfigurator::parseCategory() ".
-            "Parsing for [{$loggerName}] with value=[{$value}]."
-        );
+	/**
+	 * This method must work for the root category as well.
+	 *
+	 * @param array $props array of properties
+	 * @param Logger &$logger
+	 * @param string $optionKey
+	 * @param string $loggerName
+	 * @param string $value
+	 * @return Logger
+	 */
+	public function &parseCategory($props, &$logger, $optionKey, $loggerName, $value)
+	{
+		LoggerLog::debug(
+			"LoggerPropertyConfigurator::parseCategory() ".
+			"Parsing for [{$loggerName}] with value=[{$value}]."
+		);
         
-        // We must skip over ',' but not white space
-        $st = explode(',', $value);
+		// We must skip over ',' but not white space
+		$st = explode(',', $value);
 
-        // If value is not in the form ", appender.." or "", then we should set
-        // the level of the loggeregory.
+		// If value is not in the form ", appender.." or "", then we should set
+		// the level of the loggeregory.
 
-        if(!(@$value{0} == ',' || empty($value))) {
-            // just to be on the safe side...
-            if(sizeof($st) == 0)
-	            return;
+		if(!(@$value{0} == ',' || empty($value))) {
+			// just to be on the safe side...
+			if(sizeof($st) == 0)
+				return;
                 
-            $levelStr = current($st);
-            LoggerLog::debug(
-                "LoggerPropertyConfigurator::parseCategory() ".
-                "Level token is [$levelStr]."
-            );
+			$levelStr = current($st);
+			LoggerLog::debug(
+				"LoggerPropertyConfigurator::parseCategory() ".
+				"Level token is [$levelStr]."
+			);
 
-            // If the level value is inherited, set category level value to
-            // null. We also check that the user has not specified inherited for the
-            // root category.
-            if('INHERITED' == strtoupper($levelStr) || 'NULL' == strtoupper($levelStr)) {
-        	    if ($loggerName == LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_INTERNAL_ROOT_NAME) {
-                    LoggerLog::warn(
-                        "LoggerPropertyConfigurator::parseCategory() ".
-                        "The root logger cannot be set to null."
-                    );
-	            } else {
-	                $logger->setLevel(null);
-	            }
-            } else {
-	            $logger->setLevel(LoggerOptionConverter::toLevel($levelStr, LoggerLevel::getLevelDebug()));
-            }
-        }
+			// If the level value is inherited, set category level value to
+			// null. We also check that the user has not specified inherited for the
+			// root category.
+			if('INHERITED' == strtoupper($levelStr) || 'NULL' == strtoupper($levelStr)) {
+				if ($loggerName == LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_INTERNAL_ROOT_NAME) {
+					LoggerLog::warn(
+						"LoggerPropertyConfigurator::parseCategory() ".
+						"The root logger cannot be set to null."
+					);
+				} else {
+					$logger->setLevel(null);
+				}
+			} else {
+				$logger->setLevel(LoggerOptionConverter::toLevel($levelStr, LoggerLevel::getLevelDebug()));
+			}
+		}
 
-        // Begin by removing all existing appenders.
-        $logger->removeAllAppenders();
-        while($appenderName = next($st)) {
-            $appenderName = trim($appenderName);
-            if(empty($appenderName))
-                continue;
-            LoggerLog::debug(
-                "LoggerPropertyConfigurator::parseCategory() ".
-                "Parsing appender named [{$appenderName}]."
-            );
-            $appender =& $this->parseAppender($props, $appenderName);
-            if($appender !== null) {
-	            $logger->addAppender($appender);
-            }
-        }
-    }
+		// Begin by removing all existing appenders.
+		$logger->removeAllAppenders();
+		while($appenderName = next($st)) {
+			$appenderName = trim($appenderName);
+			if(empty($appenderName))
+				continue;
+			LoggerLog::debug(
+				"LoggerPropertyConfigurator::parseCategory() ".
+				"Parsing appender named [{$appenderName}]."
+			);
+			$appender =& $this->parseAppender($props, $appenderName);
+			if($appender !== null) {
+				$logger->addAppender($appender);
+			}
+		}
+	}
 
-    /**
-     * @param array $props array of properties
-     * @param string $appenderName
-     * @return LoggerAppender
-     */
-    public function &parseAppender($props, $appenderName)
-    {
-        $appender =& LoggerAppender::singleton($appenderName);
-        if($appender !== null) {
-            LoggerLog::debug(
-                "LoggerPropertyConfigurator::parseAppender() ".
-                "Appender [{$appenderName}] was already parsed."
-            );
-            return $appender;
-        }
-        // Appender was not previously initialized.
-        $prefix = LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_APPENDER_PREFIX . $appenderName;
-        $layoutPrefix = $prefix . ".layout";
-        $appenderClass = @$props[$prefix];
-        if (!empty($appenderClass)) {
-            $appender =& LoggerAppender::singleton($appenderName, $appenderClass);
-            if($appender === null) {
-                LoggerLog::warn(
-                    "LoggerPropertyConfigurator::parseAppender() ".
-                    "Could not instantiate appender named [$appenderName]."
-                );
-                return null;
-            }
-        } else {
-            LoggerLog::warn(
-                "LoggerPropertyConfigurator::parseAppender() ".
-                "Could not instantiate appender named [$appenderName] with null className."
-            );
-            return null;
-        }
+	/**
+	 * @param array $props array of properties
+	 * @param string $appenderName
+	 * @return LoggerAppender
+	 */
+	public function &parseAppender($props, $appenderName)
+	{
+		$appender =& LoggerAppender::singleton($appenderName);
+		if($appender !== null) {
+			LoggerLog::debug(
+				"LoggerPropertyConfigurator::parseAppender() ".
+				"Appender [{$appenderName}] was already parsed."
+			);
+			return $appender;
+		}
+		// Appender was not previously initialized.
+		$prefix = LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_APPENDER_PREFIX . $appenderName;
+		$layoutPrefix = $prefix . ".layout";
+		$appenderClass = @$props[$prefix];
+		if (!empty($appenderClass)) {
+			$appender =& LoggerAppender::singleton($appenderName, $appenderClass);
+			if($appender === null) {
+				LoggerLog::warn(
+					"LoggerPropertyConfigurator::parseAppender() ".
+					"Could not instantiate appender named [$appenderName]."
+				);
+				return null;
+			}
+		} else {
+			LoggerLog::warn(
+				"LoggerPropertyConfigurator::parseAppender() ".
+				"Could not instantiate appender named [$appenderName] with null className."
+			);
+			return null;
+		}
         
-        $appender->setName($appenderName);
-        if( $appender->requiresLayout() ) {
-            LoggerLog::debug(
-                "LoggerPropertyConfigurator::parseAppender() ".
-                "Parsing layout section for [$appenderName]."
-            );
-            $layoutClass = @$props[$layoutPrefix];
-            $layoutClass = LoggerOptionConverter::substVars($layoutClass, $props);
-            if (empty($layoutClass)) {
-                LoggerLog::warn(
-                    "LoggerPropertyConfigurator::parseAppender() ".
-                    "layout class is empty in '$layoutPrefix'. Using Simple layout"
-                );
-                $layout = LoggerLayout::factory('LoggerLayoutSimple');
-            } else {
-        	    $layout = LoggerLayout::factory($layoutClass);
+		$appender->setName($appenderName);
+		if( $appender->requiresLayout() ) {
+			LoggerLog::debug(
+				"LoggerPropertyConfigurator::parseAppender() ".
+				"Parsing layout section for [$appenderName]."
+			);
+			$layoutClass = @$props[$layoutPrefix];
+			$layoutClass = LoggerOptionConverter::substVars($layoutClass, $props);
+			if (empty($layoutClass)) {
+				LoggerLog::warn(
+					"LoggerPropertyConfigurator::parseAppender() ".
+					"layout class is empty in '$layoutPrefix'. Using Simple layout"
+				);
+				$layout = LoggerLayout::factory('LoggerLayoutSimple');
+			} else {
+				$layout = LoggerLayout::factory($layoutClass);
                 
-	            if($layout === null) {
-	                LoggerLog::warn(
-                        "LoggerPropertyConfigurator::parseAppender() ".
-                        "cannot create layout '$layoutClass'. Using Simple layout"
-                    );
-                    $layout = LoggerLayout::factory('LoggerLayoutSimple');
-                }
-            }
+				if($layout === null) {
+					LoggerLog::warn(
+						"LoggerPropertyConfigurator::parseAppender() ".
+						"cannot create layout '$layoutClass'. Using Simple layout"
+					);
+					$layout = LoggerLayout::factory('LoggerLayoutSimple');
+				}
+			}
             
-            LoggerLog::debug(
-                "LoggerPropertyConfigurator::parseAppender() ".
-                "Parsing layout options for [$appenderName]."
-            );
-            LoggerPropertySetter::setPropertiesByObject($layout, $props, $layoutPrefix . ".");                
-            LoggerLog::debug(
-                "LoggerPropertyConfigurator::parseAppender() ".
-                "End Parsing layout options for [$appenderName]."
-            );
-            $appender->setLayout($layout);
+			LoggerLog::debug(
+				"LoggerPropertyConfigurator::parseAppender() ".
+				"Parsing layout options for [$appenderName]."
+			);
+			LoggerPropertySetter::setPropertiesByObject($layout, $props, $layoutPrefix . ".");                
+			LoggerLog::debug(
+				"LoggerPropertyConfigurator::parseAppender() ".
+				"End Parsing layout options for [$appenderName]."
+			);
+			$appender->setLayout($layout);
             
-        }
-        LoggerPropertySetter::setPropertiesByObject($appender, $props, $prefix . ".");
-        LoggerLog::debug(
-            "LoggerPropertyConfigurator::parseAppender() ".        
-            "Parsed [{$appenderName}] options."
-        );
-        return $appender;        
-    }
+		}
+		LoggerPropertySetter::setPropertiesByObject($appender, $props, $prefix . ".");
+		LoggerLog::debug(
+			"LoggerPropertyConfigurator::parseAppender() ".        
+			"Parsed [{$appenderName}] options."
+		);
+		return $appender;        
+	}
 
 }
 ?>
\ No newline at end of file

libraries/log4php.debug/LoggerCategory.php

Indentation +478 added lines, -478 removed lines

@@ -36,537 +36,537 @@
  */
 class LoggerCategory {
 
-    /**
-     * Additivity is set to true by default, that is children inherit the 
-     * appenders of their ancestors by default.
-     * @var boolean
-     */
-    public $additive       = true;
+	/**
+	 * Additivity is set to true by default, that is children inherit the 
+	 * appenders of their ancestors by default.
+	 * @var boolean
+	 */
+	public $additive       = true;
     
-    /**
-     * @var string fully qualified class name
-     */  
-    public $fqcn           = 'LoggerCategory';
+	/**
+	 * @var string fully qualified class name
+	 */  
+	public $fqcn           = 'LoggerCategory';
 
-    /**
-     * @var LoggerLevel The assigned level of this category.
-     */
-    public $level          = null;
+	/**
+	 * @var LoggerLevel The assigned level of this category.
+	 */
+	public $level          = null;
     
-    /**
-     * @var string name of this category.
-     */
-    public $name           = '';
+	/**
+	 * @var string name of this category.
+	 */
+	public $name           = '';
     
-    /**
-     * @var Logger The parent of this category.
-     */
-    public $parent         = null;
+	/**
+	 * @var Logger The parent of this category.
+	 */
+	public $parent         = null;
 
-    /**
-     * @var LoggerHierarchy the object repository
-     */
-    public $repository     = null; 
+	/**
+	 * @var LoggerHierarchy the object repository
+	 */
+	public $repository     = null; 
 
-    /**
-     * @var array collection of appenders
-     * @see LoggerAppender
-     */
-    public $aai            = array();
+	/**
+	 * @var array collection of appenders
+	 * @see LoggerAppender
+	 */
+	public $aai            = array();
     
 /* --------------------------------------------------------------------------*/
 /* --------------------------------------------------------------------------*/
 /* --------------------------------------------------------------------------*/
 
-    /**
-     * Constructor.
-     *
-     * @param  string  $name  Category name   
-     */
-    public function LoggerCategory($name)
-    {
-        $this->name = $name;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param  string  $name  Category name   
+	 */
+	public function LoggerCategory($name)
+	{
+		$this->name = $name;
+	}
     
-    /**
-     * Add a new Appender to the list of appenders of this Category instance.
-     *
-     * @param LoggerAppender $newAppender
-     */
-    public function addAppender(&$newAppender)
-    {
-        $appenderName = $newAppender->getName();
-        $this->aai[$appenderName] =& $newAppender;
-    } 
+	/**
+	 * Add a new Appender to the list of appenders of this Category instance.
+	 *
+	 * @param LoggerAppender $newAppender
+	 */
+	public function addAppender(&$newAppender)
+	{
+		$appenderName = $newAppender->getName();
+		$this->aai[$appenderName] =& $newAppender;
+	} 
             
-    /**
-     * If assertion parameter is false, then logs msg as an error statement.
-     *
-     * @param bool $assertion
-     * @param string $msg message to log
-     */
-    public function assertLog($assertion = true, $msg = '')
-    {
-        if ($assertion === false) {
-            $this->error($msg);
-        }
-    } 
+	/**
+	 * If assertion parameter is false, then logs msg as an error statement.
+	 *
+	 * @param bool $assertion
+	 * @param string $msg message to log
+	 */
+	public function assertLog($assertion = true, $msg = '')
+	{
+		if ($assertion === false) {
+			$this->error($msg);
+		}
+	} 
 
-    /**
-     * Call the appenders in the hierarchy starting at this.
-     *
-     * @param LoggerLoggingEvent $event 
-     */
-    public function callAppenders($event) 
-    {
-        if (sizeof($this->aai) > 0) {
-            foreach (array_keys($this->aai) as $appenderName) {
-                $this->aai[$appenderName]->doAppend($event);
-            }
-        }
-        if ($this->parent != null && $this->getAdditivity()) {
-            $this->parent->callAppenders($event);
-        }
-    }
+	/**
+	 * Call the appenders in the hierarchy starting at this.
+	 *
+	 * @param LoggerLoggingEvent $event 
+	 */
+	public function callAppenders($event) 
+	{
+		if (sizeof($this->aai) > 0) {
+			foreach (array_keys($this->aai) as $appenderName) {
+				$this->aai[$appenderName]->doAppend($event);
+			}
+		}
+		if ($this->parent != null && $this->getAdditivity()) {
+			$this->parent->callAppenders($event);
+		}
+	}
     
-    /**
-     * Log a message object with the DEBUG level including the caller.
-     *
-     * @param mixed $message message
-     * @param mixed $caller caller object or caller string id
-     */
-    public function debug($message, $caller = null)
-    {
-        $debugLevel = LoggerLevel::getLevelDebug();
-        if ($this->repository->isDisabled($debugLevel)) {
-            return;
-        }
-        if ($debugLevel->isGreaterOrEqual($this->getEffectiveLevel())) {
-            $this->forcedLog($this->fqcn, $caller, $debugLevel, $message);
-        }
-    } 
+	/**
+	 * Log a message object with the DEBUG level including the caller.
+	 *
+	 * @param mixed $message message
+	 * @param mixed $caller caller object or caller string id
+	 */
+	public function debug($message, $caller = null)
+	{
+		$debugLevel = LoggerLevel::getLevelDebug();
+		if ($this->repository->isDisabled($debugLevel)) {
+			return;
+		}
+		if ($debugLevel->isGreaterOrEqual($this->getEffectiveLevel())) {
+			$this->forcedLog($this->fqcn, $caller, $debugLevel, $message);
+		}
+	} 
 
-    /**
-     * Log a message object with the ERROR level including the caller.
-     *
-     * @param mixed $message message
-     * @param mixed $caller caller object or caller string id
-     */
-    public function error($message, $caller = null)
-    {
-        $errorLevel = LoggerLevel::getLevelError();
-        if ($this->repository->isDisabled($errorLevel)) {
-            return;
-        }
-        if ($errorLevel->isGreaterOrEqual($this->getEffectiveLevel())) {
-            $this->forcedLog($this->fqcn, $caller, $errorLevel, $message);
+	/**
+	 * Log a message object with the ERROR level including the caller.
+	 *
+	 * @param mixed $message message
+	 * @param mixed $caller caller object or caller string id
+	 */
+	public function error($message, $caller = null)
+	{
+		$errorLevel = LoggerLevel::getLevelError();
+		if ($this->repository->isDisabled($errorLevel)) {
+			return;
+		}
+		if ($errorLevel->isGreaterOrEqual($this->getEffectiveLevel())) {
+			$this->forcedLog($this->fqcn, $caller, $errorLevel, $message);
 			$this->forcedLog($this->fqcn, $caller, $errorLevel, PHP_EOL.vtlib\Functions::getBacktrace(1));
-        }
-    }
+		}
+	}
   
-    /**
-     * Deprecated. Please use LoggerManager::exists() instead.
-     *
-     * @param string $name
-     * @see LoggerManager::exists()
-     * @deprecated
-     */
-    public function exists($name)
-    {
-        return LoggerManager::exists($name);
-    } 
+	/**
+	 * Deprecated. Please use LoggerManager::exists() instead.
+	 *
+	 * @param string $name
+	 * @see LoggerManager::exists()
+	 * @deprecated
+	 */
+	public function exists($name)
+	{
+		return LoggerManager::exists($name);
+	} 
  
-    /**
-     * Log a message object with the FATAL level including the caller.
-     *
-     * @param mixed $message message
-     * @param mixed $caller caller object or caller string id
-     */
-    public function fatal($message, $caller = null)
-    {
-        $fatalLevel = LoggerLevel::getLevelFatal();
-        if ($this->repository->isDisabled($fatalLevel)) {
-            return;
-        }
-        if ($fatalLevel->isGreaterOrEqual($this->getEffectiveLevel())) {
-            $this->forcedLog($this->fqcn, $caller, $fatalLevel, $message);
-        }
-    } 
+	/**
+	 * Log a message object with the FATAL level including the caller.
+	 *
+	 * @param mixed $message message
+	 * @param mixed $caller caller object or caller string id
+	 */
+	public function fatal($message, $caller = null)
+	{
+		$fatalLevel = LoggerLevel::getLevelFatal();
+		if ($this->repository->isDisabled($fatalLevel)) {
+			return;
+		}
+		if ($fatalLevel->isGreaterOrEqual($this->getEffectiveLevel())) {
+			$this->forcedLog($this->fqcn, $caller, $fatalLevel, $message);
+		}
+	} 
   
-    /**
-     * This method creates a new logging event and logs the event without further checks.
-     *
-     * It should not be called directly. Use {@link info()}, {@link debug()}, {@link warn()},
-     * {@link error()} and {@link fatal()} wrappers.
-     *
-     * @param string $fqcn Fully Qualified Class Name of the Logger
-     * @param mixed $caller caller object or caller string id
-     * @param LoggerLevel $level log level     
-     * @param mixed $message message
-     * @see LoggerLoggingEvent          
-     */
-    public function forcedLog($fqcn, $caller, $level, $message)
-    {
-        $this->callAppenders(new LoggerLoggingEvent($fqcn, $this, $level, $message));
-    } 
+	/**
+	 * This method creates a new logging event and logs the event without further checks.
+	 *
+	 * It should not be called directly. Use {@link info()}, {@link debug()}, {@link warn()},
+	 * {@link error()} and {@link fatal()} wrappers.
+	 *
+	 * @param string $fqcn Fully Qualified Class Name of the Logger
+	 * @param mixed $caller caller object or caller string id
+	 * @param LoggerLevel $level log level     
+	 * @param mixed $message message
+	 * @see LoggerLoggingEvent          
+	 */
+	public function forcedLog($fqcn, $caller, $level, $message)
+	{
+		$this->callAppenders(new LoggerLoggingEvent($fqcn, $this, $level, $message));
+	} 
 
-    /**
-     * Get the additivity flag for this Category instance.
-     * @return boolean
-     */
-    public function getAdditivity()
-    {
-        return $this->additive;
-    }
+	/**
+	 * Get the additivity flag for this Category instance.
+	 * @return boolean
+	 */
+	public function getAdditivity()
+	{
+		return $this->additive;
+	}
  
-    /**
-     * Get the appenders contained in this category as an array.
-     * @return array collection of appenders
-     */
-    public function &getAllAppenders() 
-    {
-        $appenders = array();
-        $appenderNames = array_keys($this->aai);
-        $enumAppenders = sizeof($appenderNames);
-        for ($i = 0; $i < $enumAppenders; $i++) {
-            $appenderName = $appenderNames[$i];
-            $appenders[] =& $this->aai[$appenderName];
-        }
-        return $appenders; 
-    }
+	/**
+	 * Get the appenders contained in this category as an array.
+	 * @return array collection of appenders
+	 */
+	public function &getAllAppenders() 
+	{
+		$appenders = array();
+		$appenderNames = array_keys($this->aai);
+		$enumAppenders = sizeof($appenderNames);
+		for ($i = 0; $i < $enumAppenders; $i++) {
+			$appenderName = $appenderNames[$i];
+			$appenders[] =& $this->aai[$appenderName];
+		}
+		return $appenders; 
+	}
     
-    /**
-     * Look for the appender named as name.
-     * @return LoggerAppender
-     */
-    public function &getAppender($name) 
-    {
-        return $this->aai[$name];
-    }
+	/**
+	 * Look for the appender named as name.
+	 * @return LoggerAppender
+	 */
+	public function &getAppender($name) 
+	{
+		return $this->aai[$name];
+	}
     
-    /**
-     * Please use the {@link getEffectiveLevel()} method instead.
-     * @deprecated
-     */
-    public function getChainedPriority()
-    {
-        return $this->getEffectiveLevel();
-    } 
+	/**
+	 * Please use the {@link getEffectiveLevel()} method instead.
+	 * @deprecated
+	 */
+	public function getChainedPriority()
+	{
+		return $this->getEffectiveLevel();
+	} 
  
-    /**
-     * Please use {@link LoggerManager::getCurrentLoggers()} instead.
-     * @deprecated
-     */
-    public function getCurrentCategories()
-    {
-        return LoggerManager::getCurrentLoggers();
-    } 
+	/**
+	 * Please use {@link LoggerManager::getCurrentLoggers()} instead.
+	 * @deprecated
+	 */
+	public function getCurrentCategories()
+	{
+		return LoggerManager::getCurrentLoggers();
+	} 
  
-    /**
-     * Please use {@link LoggerManager::getLoggerRepository()} instead.
-     * @deprecated 
-     */
-    public function &getDefaultHierarchy()
-    {
-        return LoggerManager::getLoggerRepository();
-    } 
+	/**
+	 * Please use {@link LoggerManager::getLoggerRepository()} instead.
+	 * @deprecated 
+	 */
+	public function &getDefaultHierarchy()
+	{
+		return LoggerManager::getLoggerRepository();
+	} 
  
-    /**
-     * @deprecated Use {@link getLoggerRepository()}
-     * @return LoggerHierarchy 
-     */
-    public function &getHierarchy()
-    {
-        return $this->getLoggerRepository();
-    } 
+	/**
+	 * @deprecated Use {@link getLoggerRepository()}
+	 * @return LoggerHierarchy 
+	 */
+	public function &getHierarchy()
+	{
+		return $this->getLoggerRepository();
+	} 
 
-    /**
-     * Starting from this category, search the category hierarchy for a non-null level and return it.
-     * @see LoggerLevel
-     * @return LoggerLevel or null
-     */
-    public function getEffectiveLevel()
-    {
-        for($c = $this; $c != null; $c = $c->parent) {
-            if($c->level !== null)
-            	return $c->level;
-        }
-        return null;
-    }
+	/**
+	 * Starting from this category, search the category hierarchy for a non-null level and return it.
+	 * @see LoggerLevel
+	 * @return LoggerLevel or null
+	 */
+	public function getEffectiveLevel()
+	{
+		for($c = $this; $c != null; $c = $c->parent) {
+			if($c->level !== null)
+				return $c->level;
+		}
+		return null;
+	}
   
-    /**
-     * Retrieve a category with named as the name parameter.
-     * @return Logger
-     */
-    public function &getInstance($name)
-    {
-        return LoggerManager::getLogger($name);
-    }
+	/**
+	 * Retrieve a category with named as the name parameter.
+	 * @return Logger
+	 */
+	public function &getInstance($name)
+	{
+		return LoggerManager::getLogger($name);
+	}
 
-    /**
-     * Returns the assigned Level, if any, for this Category.
-     * @return LoggerLevel or null 
-     */
-    public function getLevel()
-    {
-        return $this->level;
-    } 
+	/**
+	 * Returns the assigned Level, if any, for this Category.
+	 * @return LoggerLevel or null 
+	 */
+	public function getLevel()
+	{
+		return $this->level;
+	} 
 
-    /**
-     * Return the the repository where this Category is attached.
-     * @return LoggerHierarchy
-     */
-    public function &getLoggerRepository()
-    {
-        return $this->repository;
-    } 
+	/**
+	 * Return the the repository where this Category is attached.
+	 * @return LoggerHierarchy
+	 */
+	public function &getLoggerRepository()
+	{
+		return $this->repository;
+	} 
 
-    /**
-     * Return the category name.
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    } 
+	/**
+	 * Return the category name.
+	 * @return string
+	 */
+	public function getName()
+	{
+		return $this->name;
+	} 
 
-    /**
-     * Returns the parent of this category.
-     * @return Logger
-     */
-    public function &getParent() 
-    {
-        return $this->parent;
-    }      
+	/**
+	 * Returns the parent of this category.
+	 * @return Logger
+	 */
+	public function &getParent() 
+	{
+		return $this->parent;
+	}      
 
-    /**
-     * Please use getLevel() instead.
-     * @deprecated
-     */
-    public function getPriority()
-    {
-        return $this->getLevel();
-    }
+	/**
+	 * Please use getLevel() instead.
+	 * @deprecated
+	 */
+	public function getPriority()
+	{
+		return $this->getLevel();
+	}
           
-    /**
-     * Return the inherited ResourceBundle for this category.
-     */
-    public function getResourceBundle()
-    {
-        return;
-    } 
+	/**
+	 * Return the inherited ResourceBundle for this category.
+	 */
+	public function getResourceBundle()
+	{
+		return;
+	} 
 
-    /**
-     * Returns the string resource coresponding to key in this category's inherited resource bundle.
-     */
-    public function getResourceBundleString($key)
-    {
-        return;
-    } 
+	/**
+	 * Returns the string resource coresponding to key in this category's inherited resource bundle.
+	 */
+	public function getResourceBundleString($key)
+	{
+		return;
+	} 
 
-    /**
-     * Return the root of the default category hierrachy.
-     * @return LoggerRoot
-     */
-    public function &getRoot()
-    {
-        return LoggerManager::getRootLogger();
-    } 
+	/**
+	 * Return the root of the default category hierrachy.
+	 * @return LoggerRoot
+	 */
+	public function &getRoot()
+	{
+		return LoggerManager::getRootLogger();
+	} 
 
-    /**
-     * Log a message object with the INFO Level.
-     *
-     * @param mixed $message message
-     * @param mixed $caller caller object or caller string id
-     */
-    public function info($message, $caller = null)
-    {
-        $infoLevel = LoggerLevel::getLevelInfo();
-        if ($this->repository->isDisabled($infoLevel)) {
-            return;
-        }
-        if ($infoLevel->isGreaterOrEqual($this->getEffectiveLevel())) {
-            $this->forcedLog($this->fqcn, $caller, $infoLevel, $message);
-        }
-    }
+	/**
+	 * Log a message object with the INFO Level.
+	 *
+	 * @param mixed $message message
+	 * @param mixed $caller caller object or caller string id
+	 */
+	public function info($message, $caller = null)
+	{
+		$infoLevel = LoggerLevel::getLevelInfo();
+		if ($this->repository->isDisabled($infoLevel)) {
+			return;
+		}
+		if ($infoLevel->isGreaterOrEqual($this->getEffectiveLevel())) {
+			$this->forcedLog($this->fqcn, $caller, $infoLevel, $message);
+		}
+	}
      
-    /**
-     * Is the appender passed as parameter attached to this category?
-     *
-     * @param LoggerAppender $appender
-     */
-    public function isAttached($appender)
-    {
-        return in_array($appender->getName(), array_keys($this->aai));
-    } 
+	/**
+	 * Is the appender passed as parameter attached to this category?
+	 *
+	 * @param LoggerAppender $appender
+	 */
+	public function isAttached($appender)
+	{
+		return in_array($appender->getName(), array_keys($this->aai));
+	} 
            
-    /**
-     * Check whether this category is enabled for the DEBUG Level.
-     * @return boolean
-     */
-    public function isDebugEnabled()
-    {
-        $debugLevel = LoggerLevel::getLevelDebug(); 
-        if ($this->repository->isDisabled($debugLevel)) {
-            return false;
-        }
-        return ($debugLevel->isGreaterOrEqual($this->getEffectiveLevel()));
-    }       
+	/**
+	 * Check whether this category is enabled for the DEBUG Level.
+	 * @return boolean
+	 */
+	public function isDebugEnabled()
+	{
+		$debugLevel = LoggerLevel::getLevelDebug(); 
+		if ($this->repository->isDisabled($debugLevel)) {
+			return false;
+		}
+		return ($debugLevel->isGreaterOrEqual($this->getEffectiveLevel()));
+	}       
 
-    /**
-     * Check whether this category is enabled for a given Level passed as parameter.
-     *
-     * @param LoggerLevel level
-     * @return boolean
-     */
-    public function isEnabledFor($level)
-    {
-        if ($this->repository->isDisabled($level)) {
-            return false;
-        }
-        return (bool)($level->isGreaterOrEqual($this->getEffectiveLevel()));
-    } 
+	/**
+	 * Check whether this category is enabled for a given Level passed as parameter.
+	 *
+	 * @param LoggerLevel level
+	 * @return boolean
+	 */
+	public function isEnabledFor($level)
+	{
+		if ($this->repository->isDisabled($level)) {
+			return false;
+		}
+		return (bool)($level->isGreaterOrEqual($this->getEffectiveLevel()));
+	} 
 
-    /**
-     * Check whether this category is enabled for the info Level.
-     * @return boolean
-     * @see LoggerLevel
-     */
-    public function isInfoEnabled()
-    {
-        $infoLevel = LoggerLevel::getLevelInfo();
-        if ($this->repository->isDisabled($infoLevel)) {
-            return false;
-        }
-        return ($infoLevel->isGreaterOrEqual($this->getEffectiveLevel()));
-    } 
+	/**
+	 * Check whether this category is enabled for the info Level.
+	 * @return boolean
+	 * @see LoggerLevel
+	 */
+	public function isInfoEnabled()
+	{
+		$infoLevel = LoggerLevel::getLevelInfo();
+		if ($this->repository->isDisabled($infoLevel)) {
+			return false;
+		}
+		return ($infoLevel->isGreaterOrEqual($this->getEffectiveLevel()));
+	} 
 
-    /**
-     * Log a localized and parameterized message.
-     */
-    public function l7dlog($priority, $key, $params, $t)
-    {
-        return;
-    } 
+	/**
+	 * Log a localized and parameterized message.
+	 */
+	public function l7dlog($priority, $key, $params, $t)
+	{
+		return;
+	} 
 
-    /**
-     * This generic form is intended to be used by wrappers.
-     *
-     * @param LoggerLevel $priority a valid level
-     * @param mixed $message message
-     * @param mixed $caller caller object or caller string id
-     */
-    public function log($priority, $message, $caller = null)
-    {
-        if ($this->repository->isDisabled($priority)) {
-            return;
-        }
-        if ($priority->isGreaterOrEqual($this->getEffectiveLevel())) {
-            $this->forcedLog($this->fqcn, $caller, $priority, $message);
-        }
-    }
+	/**
+	 * This generic form is intended to be used by wrappers.
+	 *
+	 * @param LoggerLevel $priority a valid level
+	 * @param mixed $message message
+	 * @param mixed $caller caller object or caller string id
+	 */
+	public function log($priority, $message, $caller = null)
+	{
+		if ($this->repository->isDisabled($priority)) {
+			return;
+		}
+		if ($priority->isGreaterOrEqual($this->getEffectiveLevel())) {
+			$this->forcedLog($this->fqcn, $caller, $priority, $message);
+		}
+	}
 
-    /**
-     * Remove all previously added appenders from this Category instance.
-     */
-    public function removeAllAppenders()
-    {
-        $appenderNames = array_keys($this->aai);
-        $enumAppenders = sizeof($appenderNames);
-        for ($i = 0; $i < $enumAppenders; $i++) {
-            $this->removeAppender($appenderNames[$i]); 
-        }
-    } 
+	/**
+	 * Remove all previously added appenders from this Category instance.
+	 */
+	public function removeAllAppenders()
+	{
+		$appenderNames = array_keys($this->aai);
+		$enumAppenders = sizeof($appenderNames);
+		for ($i = 0; $i < $enumAppenders; $i++) {
+			$this->removeAppender($appenderNames[$i]); 
+		}
+	} 
             
-    /**
-     * Remove the appender passed as parameter form the list of appenders.
-     *
-     * @param mixed $appender can be an appender name or a {@link LoggerAppender} object
-     */
-    public function removeAppender($appender)
-    {
-        if (is_a($appender, 'loggerappender')) {
-            $appender->close();
-            unset($this->aai[$appender->getName()]);
-        } elseif (is_string($appender) && isset($this->aai[$appender])) {
-            $this->aai[$appender]->close();
-            unset($this->aai[$appender]);
-        }
-    } 
+	/**
+	 * Remove the appender passed as parameter form the list of appenders.
+	 *
+	 * @param mixed $appender can be an appender name or a {@link LoggerAppender} object
+	 */
+	public function removeAppender($appender)
+	{
+		if (is_a($appender, 'loggerappender')) {
+			$appender->close();
+			unset($this->aai[$appender->getName()]);
+		} elseif (is_string($appender) && isset($this->aai[$appender])) {
+			$this->aai[$appender]->close();
+			unset($this->aai[$appender]);
+		}
+	} 
 
-    /**
-     * Set the additivity flag for this Category instance.
-     *
-     * @param boolean $additive
-     */
-    public function setAdditivity($additive) 
-    {
-        $this->additive = (bool)$additive;
-    }
+	/**
+	 * Set the additivity flag for this Category instance.
+	 *
+	 * @param boolean $additive
+	 */
+	public function setAdditivity($additive) 
+	{
+		$this->additive = (bool)$additive;
+	}
     
-    /**
-     * @deprecated Please use {@link setLevel()} instead.
-     * @see setLevel()
-     */
-    public function setPriority($priority)
-    {
-        $this->setLevel($priority);
-    } 
+	/**
+	 * @deprecated Please use {@link setLevel()} instead.
+	 * @see setLevel()
+	 */
+	public function setPriority($priority)
+	{
+		$this->setLevel($priority);
+	} 
 
-    /**
-     * Only the Hiearchy class can set the hiearchy of a
-     * category.
-     *
-     * @param LoggerHierarchy &$repository
-     */
-    public function setHierarchy(&$repository)
-    {
-        $this->repository =& $repository;
-    }
+	/**
+	 * Only the Hiearchy class can set the hiearchy of a
+	 * category.
+	 *
+	 * @param LoggerHierarchy &$repository
+	 */
+	public function setHierarchy(&$repository)
+	{
+		$this->repository =& $repository;
+	}
 
-    /**
-     * Set the level of this Category.
-     *
-     * @param LoggerLevel $level a level string or a level costant 
-     */
-    public function setLevel($level)
-    {
-        $this->level = $level;
-    } 
+	/**
+	 * Set the level of this Category.
+	 *
+	 * @param LoggerLevel $level a level string or a level costant 
+	 */
+	public function setLevel($level)
+	{
+		$this->level = $level;
+	} 
 
-    /**
-     * Set the resource bundle to be used with localized logging methods 
-     */
-    public function setResourceBundle($bundle)
-    {
-        return;
-    } 
+	/**
+	 * Set the resource bundle to be used with localized logging methods 
+	 */
+	public function setResourceBundle($bundle)
+	{
+		return;
+	} 
            
-    /**
-     * @deprecated use {@link LoggerManager::shutdown()} instead.
-     * @see LoggerManager::shutdown()
-     */
-    public function shutdown()
-    {
-        LoggerManager::shutdown();
-    } 
+	/**
+	 * @deprecated use {@link LoggerManager::shutdown()} instead.
+	 * @see LoggerManager::shutdown()
+	 */
+	public function shutdown()
+	{
+		LoggerManager::shutdown();
+	} 
  
-    /**
-     * Log a message with the WARN level.
-     *
-     * @param mixed $message message
-     * @param mixed $caller caller object or caller string id
-     */
-    public function warn($message, $caller = null)
-    {
-        $warnLevel = LoggerLevel::getLevelWarn();
-        if ($this->repository->isDisabled($warnLevel)) {
-            return;
-        }
-        if ($warnLevel->isGreaterOrEqual($this->getEffectiveLevel())) {
-            $this->forcedLog($this->fqcn, $caller, $warnLevel, $message);
-        }
-    }
+	/**
+	 * Log a message with the WARN level.
+	 *
+	 * @param mixed $message message
+	 * @param mixed $caller caller object or caller string id
+	 */
+	public function warn($message, $caller = null)
+	{
+		$warnLevel = LoggerLevel::getLevelWarn();
+		if ($this->repository->isDisabled($warnLevel)) {
+			return;
+		}
+		if ($warnLevel->isGreaterOrEqual($this->getEffectiveLevel())) {
+			$this->forcedLog($this->fqcn, $caller, $warnLevel, $message);
+		}
+	}
 
 }  
 ?>

Spacing +15 added lines, -15 removed lines

@@ -41,38 +41,38 @@ 
      * appenders of their ancestors by default.
      * @var boolean
      */
-    public $additive       = true;
+    public $additive = true;
     
     /**
      * @var string fully qualified class name
      */  
-    public $fqcn           = 'LoggerCategory';
+    public $fqcn = 'LoggerCategory';
 
     /**
      * @var LoggerLevel The assigned level of this category.
      */
-    public $level          = null;
+    public $level = null;
     
     /**
      * @var string name of this category.
      */
-    public $name           = '';
+    public $name = '';
     
     /**
      * @var Logger The parent of this category.
      */
-    public $parent         = null;
+    public $parent = null;
 
     /**
      * @var LoggerHierarchy the object repository
      */
-    public $repository     = null; 
+    public $repository = null; 
 
     /**
      * @var array collection of appenders
      * @see LoggerAppender
      */
-    public $aai            = array();
+    public $aai = array();
     
 /* --------------------------------------------------------------------------*/
 /* --------------------------------------------------------------------------*/
@@ -96,7 +96,7 @@ 
     public function addAppender(&$newAppender)
     {
         $appenderName = $newAppender->getName();
-        $this->aai[$appenderName] =& $newAppender;
+        $this->aai[$appenderName] = & $newAppender;
     } 
             
     /**
@@ -160,7 +160,7 @@ 
         }
         if ($errorLevel->isGreaterOrEqual($this->getEffectiveLevel())) {
             $this->forcedLog($this->fqcn, $caller, $errorLevel, $message);
-			$this->forcedLog($this->fqcn, $caller, $errorLevel, PHP_EOL.vtlib\Functions::getBacktrace(1));
+			$this->forcedLog($this->fqcn, $caller, $errorLevel, PHP_EOL . vtlib\Functions::getBacktrace(1));
         }
     }
   
@@ -230,7 +230,7 @@ 
         $enumAppenders = sizeof($appenderNames);
         for ($i = 0; $i < $enumAppenders; $i++) {
             $appenderName = $appenderNames[$i];
-            $appenders[] =& $this->aai[$appenderName];
+            $appenders[] = & $this->aai[$appenderName];
         }
         return $appenders; 
     }
@@ -287,8 +287,8 @@ 
      */
     public function getEffectiveLevel()
     {
-        for($c = $this; $c != null; $c = $c->parent) {
-            if($c->level !== null)
+        for ($c = $this; $c != null; $c = $c->parent) {
+            if ($c->level !== null)
             	return $c->level;
         }
         return null;
@@ -424,7 +424,7 @@ 
         if ($this->repository->isDisabled($level)) {
             return false;
         }
-        return (bool)($level->isGreaterOrEqual($this->getEffectiveLevel()));
+        return (bool) ($level->isGreaterOrEqual($this->getEffectiveLevel()));
     } 
 
     /**
@@ -501,7 +501,7 @@ 
      */
     public function setAdditivity($additive) 
     {
-        $this->additive = (bool)$additive;
+        $this->additive = (bool) $additive;
     }
     
     /**
@@ -521,7 +521,7 @@ 
      */
     public function setHierarchy(&$repository)
     {
-        $this->repository =& $repository;
+        $this->repository = & $repository;
     }
 
     /**