chamilo / chamilo-lms

main/inc/lib/phpdocx/lib/log4php/helpers/LoggerNamedPatternConverter.php

Indentation +46 added lines, -46 removed lines

@@ -25,53 +25,53 @@
  */
 class LoggerNamedPatternConverter extends LoggerPatternConverter {
 
-	/**
-	 * @var integer
-	 */
-	private $precision;
+    /**
+     * @var integer
+     */
+    private $precision;
 
-	/**
-	 * Constructor
-	 *
-	 * @param string $formattingInfo
-	 * @param integer $precision
-	 */
-	public function __construct($formattingInfo, $precision) {
-	  parent::__construct($formattingInfo);
-	  $this->precision =  $precision;
-	}
+    /**
+     * Constructor
+     *
+     * @param string $formattingInfo
+     * @param integer $precision
+     */
+    public function __construct($formattingInfo, $precision) {
+        parent::__construct($formattingInfo);
+        $this->precision =  $precision;
+    }
 
-	/**
-	 * @param LoggerLoggingEvent $event
-	 * @return string
-	 * @abstract
-	 */
-	public function getFullyQualifiedName($event) {
-		// abstract
-		return;
-	}
+    /**
+     * @param LoggerLoggingEvent $event
+     * @return string
+     * @abstract
+     */
+    public function getFullyQualifiedName($event) {
+        // abstract
+        return;
+    }
 
-	/**
-	 * @param LoggerLoggingEvent $event
-	 * @return string
-	 */
-	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);
-		}
-	}
+    /**
+     * @param LoggerLoggingEvent $event
+     * @return string
+     */
+    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);
+        }
+    }
 }

main/inc/lib/phpdocx/lib/log4php/LoggerLocationInfo.php

Indentation +86 added lines, -86 removed lines

@@ -1,22 +1,22 @@ 
 <?php
 /**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- *	   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * @package log4php
- */
+     * Licensed to the Apache Software Foundation (ASF) under one or more
+     * contributor license agreements. See the NOTICE file distributed with
+     * this work for additional information regarding copyright ownership.
+     * The ASF licenses this file to You under the Apache License, Version 2.0
+     * (the "License"); you may not use this file except in compliance with
+     * the License. You may obtain a copy of the License at
+     *
+     *	   http://www.apache.org/licenses/LICENSE-2.0
+     *
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     *
+     * @package log4php
+     */
 
 /**
  * The internal representation of caller location information.
@@ -26,85 +26,85 @@ 
  * @since 0.3
  */
 class LoggerLocationInfo {
-	/**
-	 * When location information is not available the constant
-	 * <i>NA</i> is returned. Current value of this string
-	 * constant is <b>?</b>.  
-	 */
-	const LOCATION_INFO_NA = 'NA';
+    /**
+     * When location information is not available the constant
+     * <i>NA</i> is returned. Current value of this string
+     * constant is <b>?</b>.  
+     */
+    const LOCATION_INFO_NA = 'NA';
 	
-	/**
-	* @var string Caller's line number.
-	*/
-	protected $lineNumber = null;
+    /**
+     * @var string Caller's line number.
+     */
+    protected $lineNumber = null;
 	
-	/**
-	* @var string Caller's file name.
-	*/
-	protected $fileName = null;
+    /**
+     * @var string Caller's file name.
+     */
+    protected $fileName = null;
 	
-	/**
-	* @var string Caller's fully qualified class name.
-	*/
-	protected $className = null;
+    /**
+     * @var string Caller's fully qualified class name.
+     */
+    protected $className = null;
 	
-	/**
-	* @var string Caller's method name.
-	*/
-	protected $methodName = null;
+    /**
+     * @var string Caller's method name.
+     */
+    protected $methodName = null;
 	
-	/**
-	* @var string 
-	*/
-	protected $fullInfo = null;
+    /**
+     * @var string 
+     */
+    protected $fullInfo = null;
 
-	/**
-	 * Instantiate location information based on a {@link PHP_MANUAL#debug_backtrace}.
-	 *
-	 * @param array $trace
-	 * @param mixed $caller
-	 */
-	public function __construct($trace, $fqcn = null) {
-		$this->lineNumber = isset($trace['line']) ? $trace['line'] : null;
-		$this->fileName = isset($trace['file']) ? $trace['file'] : null;
-		$this->className = isset($trace['class']) ? $trace['class'] : null;
-		$this->methodName = isset($trace['function']) ? $trace['function'] : null;
-		$this->fullInfo = $this->getClassName() . '.' . $this->getMethodName() . 
-			'(' . $this->getFileName() . ':' . $this->getLineNumber() . ')';
-	}
+    /**
+     * Instantiate location information based on a {@link PHP_MANUAL#debug_backtrace}.
+     *
+     * @param array $trace
+     * @param mixed $caller
+     */
+    public function __construct($trace, $fqcn = null) {
+        $this->lineNumber = isset($trace['line']) ? $trace['line'] : null;
+        $this->fileName = isset($trace['file']) ? $trace['file'] : null;
+        $this->className = isset($trace['class']) ? $trace['class'] : null;
+        $this->methodName = isset($trace['function']) ? $trace['function'] : null;
+        $this->fullInfo = $this->getClassName() . '.' . $this->getMethodName() . 
+            '(' . $this->getFileName() . ':' . $this->getLineNumber() . ')';
+    }
 
-	public function getClassName() {
-		return ($this->className === null) ? self::LOCATION_INFO_NA : $this->className; 
-	}
+    public function getClassName() {
+        return ($this->className === null) ? self::LOCATION_INFO_NA : $this->className; 
+    }
 
-	/**
-	 *	Return the file name of the caller.
-	 *	<p>This information is not always available.
-	 */
-	public function getFileName() {
-		return ($this->fileName === null) ? self::LOCATION_INFO_NA : $this->fileName; 
-	}
+    /**
+     *	Return the file name of the caller.
+     *	<p>This information is not always available.
+     */
+    public function getFileName() {
+        return ($this->fileName === null) ? self::LOCATION_INFO_NA : $this->fileName; 
+    }
 
-	/**
-	 *	Returns the line number of the caller.
-	 *	<p>This information is not always available.
-	 */
-	public function getLineNumber() {
-		return ($this->lineNumber === null) ? self::LOCATION_INFO_NA : $this->lineNumber; 
-	}
+    /**
+     *	Returns the line number of the caller.
+     *	<p>This information is not always available.
+     */
+    public function getLineNumber() {
+        return ($this->lineNumber === null) ? self::LOCATION_INFO_NA : $this->lineNumber; 
+    }
 
-	/**
-	 *	Returns the method name of the caller.
-	 */
-	public function getMethodName() {
-		return ($this->methodName === null) ? self::LOCATION_INFO_NA : $this->methodName; 
-	}
+    /**
+     *	Returns the method name of the caller.
+     */
+    public function getMethodName() {
+        return ($this->methodName === null) ? self::LOCATION_INFO_NA : $this->methodName; 
+    }
 
-	/**
-	 *	Returns the full information of the caller.
-	 */
-	public function getFullInfo() {
-		return ($this->fullInfo === null) ? self::LOCATION_INFO_NA : $this->fullInfo;
-	}
+    /**
+     *	Returns the full information of the caller.
+     */
+    public function getFullInfo() {
+        return ($this->fullInfo === null) ? self::LOCATION_INFO_NA : $this->fullInfo;
+    }
 
 }

main/inc/lib/phpdocx/lib/log4php/filters/LoggerFilterLevelRange.php

Indentation +87 added lines, -87 removed lines

@@ -1,22 +1,22 @@ 
 <?php
 /**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- *	   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * @package log4php
- */
+     * Licensed to the Apache Software Foundation (ASF) under one or more
+     * contributor license agreements. See the NOTICE file distributed with
+     * this work for additional information regarding copyright ownership.
+     * The ASF licenses this file to You under the Apache License, Version 2.0
+     * (the "License"); you may not use this file except in compliance with
+     * the License. You may obtain a copy of the License at
+     *
+     *	   http://www.apache.org/licenses/LICENSE-2.0
+     *
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     *
+     * @package log4php
+     */
 
 /**
  * This is a very simple filter based on level matching, which can be
@@ -64,83 +64,83 @@ 
  */
 class LoggerFilterLevelRange extends LoggerFilter {
 
-	/**
-	 * @var boolean
-	 */
-	private $acceptOnMatch = true;
+    /**
+     * @var boolean
+     */
+    private $acceptOnMatch = true;
 
-	/**
-	 * @var LoggerLevel
-	 */
-	private $levelMin;
+    /**
+     * @var LoggerLevel
+     */
+    private $levelMin;
   
-	/**
-	 * @var LoggerLevel
-	 */
-	private $levelMax;
+    /**
+     * @var LoggerLevel
+     */
+    private $levelMax;
 
-	/**
-	 * @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); 
+    }
 	
-	/**
-	 * @param string $l the level min to match
-	 */
-	public function setLevelMin($l) {
-		if($l instanceof LoggerLevel) {
-		    $this->levelMin = $l;
-		} else {
-			$this->levelMin = LoggerOptionConverter::toLevel($l, null);
-		}
-	}
+    /**
+     * @param string $l the level min to match
+     */
+    public function setLevelMin($l) {
+        if($l instanceof LoggerLevel) {
+            $this->levelMin = $l;
+        } else {
+            $this->levelMin = LoggerOptionConverter::toLevel($l, null);
+        }
+    }
 
-	/**
-	 * @param string $l the level max to match
-	 */
-	public function setLevelMax($l) {
-		if($l instanceof LoggerLevel) {
-		    $this->levelMax = $l;
-		} else {
-			$this->levelMax = LoggerOptionConverter::toLevel($l, null);
-		}
-	}
+    /**
+     * @param string $l the level max to match
+     */
+    public function setLevelMax($l) {
+        if($l instanceof LoggerLevel) {
+            $this->levelMax = $l;
+        } else {
+            $this->levelMax = LoggerOptionConverter::toLevel($l, null);
+        }
+    }
 
-	/**
-	 * Return the decision of this filter.
-	 *
-	 * @param LoggerLoggingEvent $event
-	 * @return integer
-	 */
-	public function decide(LoggerLoggingEvent $event) {
-		$level = $event->getLevel();
+    /**
+     * Return the decision of this filter.
+     *
+     * @param LoggerLoggingEvent $event
+     * @return integer
+     */
+    public function decide(LoggerLoggingEvent $event) {
+        $level = $event->getLevel();
 		
-		if($this->levelMin !== null) {
-			if($level->isGreaterOrEqual($this->levelMin) == false) {
-				// level of event is less than minimum
-				return LoggerFilter::DENY;
-			}
-		}
+        if($this->levelMin !== null) {
+            if($level->isGreaterOrEqual($this->levelMin) == false) {
+                // level of event is less than minimum
+                return LoggerFilter::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 LoggerFilter::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 LoggerFilter::DENY;
+            }
+        }
 
-		if($this->acceptOnMatch) {
-			// this filter set up to bypass later filters and always return
-			// accept if level in range
-			return LoggerFilter::ACCEPT;
-		} else {
-			// event is ok for this filter; allow later filters to have a look..
-			return LoggerFilter::NEUTRAL;
-		}
-	}
+        if($this->acceptOnMatch) {
+            // this filter set up to bypass later filters and always return
+            // accept if level in range
+            return LoggerFilter::ACCEPT;
+        } else {
+            // event is ok for this filter; allow later filters to have a look..
+            return LoggerFilter::NEUTRAL;
+        }
+    }
 }

main/inc/lib/phpdocx/lib/log4php/filters/LoggerFilterStringMatch.php

Indentation +50 added lines, -50 removed lines

@@ -1,22 +1,22 @@ 
 <?php
 /**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- *	   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * @package log4php
- */
+     * Licensed to the Apache Software Foundation (ASF) under one or more
+     * contributor license agreements. See the NOTICE file distributed with
+     * this work for additional information regarding copyright ownership.
+     * The ASF licenses this file to You under the Apache License, Version 2.0
+     * (the "License"); you may not use this file except in compliance with
+     * the License. You may obtain a copy of the License at
+     *
+     *	   http://www.apache.org/licenses/LICENSE-2.0
+     *
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     *
+     * @package log4php
+     */
 
 /**
  * This is a very simple filter based on string matching.
@@ -47,43 +47,43 @@ 
  */
 class LoggerFilterStringMatch extends LoggerFilter {
 
-	/**
-	 * @var boolean
-	 */
-	private $acceptOnMatch = true;
+    /**
+     * @var boolean
+     */
+    private $acceptOnMatch = true;
 
-	/**
-	 * @var string
-	 */
-	private $stringToMatch = null;
+    /**
+     * @var string
+     */
+    private $stringToMatch = null;
 
-	/**
-	 * @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');
+    }
 	
-	/**
-	 * @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(LoggerLoggingEvent $event) {
-		$msg = $event->getRenderedMessage();
+    /**
+     * @return integer a {@link LOGGER_FILTER_NEUTRAL} is there is no string match.
+     */
+    public function decide(LoggerLoggingEvent $event) {
+        $msg = $event->getRenderedMessage();
 		
-		if($msg === null or $this->stringToMatch === null) {
-			return LoggerFilter::NEUTRAL;
-		}
+        if($msg === null or $this->stringToMatch === null) {
+            return LoggerFilter::NEUTRAL;
+        }
 		
-		if(strpos($msg, $this->stringToMatch) !== false ) {
-			return ($this->acceptOnMatch) ? LoggerFilter::ACCEPT : LoggerFilter::DENY;
-		}
-		return LoggerFilter::NEUTRAL;
-	}
+        if(strpos($msg, $this->stringToMatch) !== false ) {
+            return ($this->acceptOnMatch) ? LoggerFilter::ACCEPT : LoggerFilter::DENY;
+        }
+        return LoggerFilter::NEUTRAL;
+    }
 }

main/inc/lib/phpdocx/lib/log4php/filters/LoggerFilterLevelMatch.php

Indentation +66 added lines, -66 removed lines

@@ -1,22 +1,22 @@ 
 <?php
 /**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- *	   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * @package log4php
- */
+     * Licensed to the Apache Software Foundation (ASF) under one or more
+     * contributor license agreements. See the NOTICE file distributed with
+     * this work for additional information regarding copyright ownership.
+     * The ASF licenses this file to You under the Apache License, Version 2.0
+     * (the "License"); you may not use this file except in compliance with
+     * the License. You may obtain a copy of the License at
+     *
+     *	   http://www.apache.org/licenses/LICENSE-2.0
+     *
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     *
+     * @package log4php
+     */
 
 /**
  * This is a very simple filter based on level matching.
@@ -47,58 +47,58 @@ 
  */
 class LoggerFilterLevelMatch extends LoggerFilter {
   
-	/** 
-	 * Indicates if this event should be accepted or denied on match
-	 * @var boolean
-	 */
-	private $acceptOnMatch = true;
+    /** 
+     * Indicates if this event should be accepted or denied on match
+     * @var boolean
+     */
+    private $acceptOnMatch = true;
 
-	/**
-	 * The level, when to match
-	 * @var LoggerLevel
-	 */
-	private $levelToMatch;
+    /**
+     * The level, when to match
+     * @var LoggerLevel
+     */
+    private $levelToMatch;
   
-	/**
-	 * @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); 
+    }
 	
-	/**
-	 * @param string $l the level to match
-	 */
-	public function setLevelToMatch($l) {
-		if($l instanceof LoggerLevel) {
-		    $this->levelToMatch = $l;
-		} else {
-			$this->levelToMatch = LoggerOptionConverter::toLevel($l, null);
-		}
-	}
+    /**
+     * @param string $l the level to match
+     */
+    public function setLevelToMatch($l) {
+        if($l instanceof LoggerLevel) {
+            $this->levelToMatch = $l;
+        } else {
+            $this->levelToMatch = LoggerOptionConverter::toLevel($l, null);
+        }
+    }
 
-	/**
-	 * Return the decision of this filter.
-	 * 
-	 * Returns {@link LoggerFilter::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 LoggerFilter::ACCEPT} if the
-	 * <b><var>AcceptOnMatch</var></b> property is set to <i>true</i>. The
-	 * returned decision is {@link LoggerFilter::DENY} if the
-	 * <b><var>AcceptOnMatch</var></b> property is set to <i>false</i>.
-	 *
-	 * @param LoggerLoggingEvent $event
-	 * @return integer
-	 */
-	public function decide(LoggerLoggingEvent $event) {
-		if($this->levelToMatch === null) {
-			return LoggerFilter::NEUTRAL;
-		}
+    /**
+     * Return the decision of this filter.
+     * 
+     * Returns {@link LoggerFilter::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 LoggerFilter::ACCEPT} if the
+     * <b><var>AcceptOnMatch</var></b> property is set to <i>true</i>. The
+     * returned decision is {@link LoggerFilter::DENY} if the
+     * <b><var>AcceptOnMatch</var></b> property is set to <i>false</i>.
+     *
+     * @param LoggerLoggingEvent $event
+     * @return integer
+     */
+    public function decide(LoggerLoggingEvent $event) {
+        if($this->levelToMatch === null) {
+            return LoggerFilter::NEUTRAL;
+        }
 		
-		if($this->levelToMatch->equals($event->getLevel())) {	
-			return $this->acceptOnMatch ? LoggerFilter::ACCEPT : LoggerFilter::DENY;
-		} else {
-			return LoggerFilter::NEUTRAL;
-		}
-	}
+        if($this->levelToMatch->equals($event->getLevel())) {	
+            return $this->acceptOnMatch ? LoggerFilter::ACCEPT : LoggerFilter::DENY;
+        } else {
+            return LoggerFilter::NEUTRAL;
+        }
+    }
 }

main/inc/lib/phpdocx/lib/log4php/LoggerHierarchy.php

Indentation +185 added lines, -185 removed lines

@@ -1,22 +1,22 @@ 
 <?php
 /**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- *	   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * @package log4php
- */
+     * Licensed to the Apache Software Foundation (ASF) under one or more
+     * contributor license agreements. See the NOTICE file distributed with
+     * this work for additional information regarding copyright ownership.
+     * The ASF licenses this file to You under the Apache License, Version 2.0
+     * (the "License"); you may not use this file except in compliance with
+     * the License. You may obtain a copy of the License at
+     *
+     *	   http://www.apache.org/licenses/LICENSE-2.0
+     *
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     *
+     * @package log4php
+     */
 
 /**
  * This class is specialized in retrieving loggers by name and also maintaining 
@@ -47,199 +47,199 @@ 
  * @version $Revision: 822448 $
  * @package log4php
  */
- /*
+    /*
   * TODO:
   * - addHierarchyEventListener($listener) not supported
   * - emitNoAppenderWarning($cat) not supported
   * - fireAddAppenderEvent not supported
   */
 class LoggerHierarchy {
-	/** Default Factory  */
-	protected $defaultFactory;
+    /** Default Factory  */
+    protected $defaultFactory;
 	
-	/** array hierarchy tree. saves here all loggers */
-	protected $ht = array();
+    /** array hierarchy tree. saves here all loggers */
+    protected $ht = array();
 	
-	/** The root Logger */
-	protected $root = null;
+    /** The root Logger */
+    protected $root = null;
 	
-	/** LoggerRendererMap */
-	protected $rendererMap;
+    /** LoggerRendererMap */
+    protected $rendererMap;
 
-	/** LoggerLevel main level threshold */
-	protected $threshold;
+    /** LoggerLevel main level threshold */
+    protected $threshold;
 	
-	/**
-	 * Create a new logger hierarchy.
-	 * @param object $root the root logger
-	 */
-	public function __construct(LoggerRoot $root) {
-		$this->root = $root;
-		$this->setThreshold(LoggerLevel::getLevelAll());
-		$this->rendererMap = new LoggerRendererMap();
-	}
+    /**
+     * Create a new logger hierarchy.
+     * @param object $root the root logger
+     */
+    public function __construct(LoggerRoot $root) {
+        $this->root = $root;
+        $this->setThreshold(LoggerLevel::getLevelAll());
+        $this->rendererMap = new LoggerRendererMap();
+    }
 	 
-	/**
-	 * This call will clear all logger definitions from the internal hashtable.
-	 */
-	public function clear() {
-		$this->ht = array();
-	}
+    /**
+     * This call will clear all logger definitions from the internal hashtable.
+     */
+    public function clear() {
+        $this->ht = array();
+    }
 	  
-	/**
-	 * Check if the named logger exists in the hierarchy.
-	 * @param string $name
-	 * @return boolean
-	 */
-	public function exists($name) {
-		return isset($this->ht[$name]);
-	}
+    /**
+     * Check if the named logger exists in the hierarchy.
+     * @param string $name
+     * @return boolean
+     */
+    public function exists($name) {
+        return isset($this->ht[$name]);
+    }
 
-	/**
-	 * Returns all the currently defined categories in this hierarchy as an array.
-	 * @return array
-	 */	 
-	public function getCurrentLoggers() {
-		return array_values($this->ht);
-	}
+    /**
+     * Returns all the currently defined categories in this hierarchy as an array.
+     * @return array
+     */	 
+    public function getCurrentLoggers() {
+        return array_values($this->ht);
+    }
 	
-	/**
-	 * Return a new logger instance named as the first parameter using the default factory.
-	 * 
-	 * @param string $name logger name
-	 * @param LoggerFactory $factory a {@link LoggerFactory} instance or null	  
-	 * @return Logger
-	 */
-	public function getLogger($name) {
-		if(!isset($this->ht[$name])) {
-			$this->ht[$name] = new Logger($name);;
-			// TODO: isn't necessary, access via singleton?
-			// $this->ht[$name]->setHierarchy($this);
-			$nodes = explode('.', $name);
-			$firstNode = array_shift($nodes);
+    /**
+     * Return a new logger instance named as the first parameter using the default factory.
+     * 
+     * @param string $name logger name
+     * @param LoggerFactory $factory a {@link LoggerFactory} instance or null	  
+     * @return Logger
+     */
+    public function getLogger($name) {
+        if(!isset($this->ht[$name])) {
+            $this->ht[$name] = new Logger($name);;
+            // TODO: isn't necessary, access via singleton?
+            // $this->ht[$name]->setHierarchy($this);
+            $nodes = explode('.', $name);
+            $firstNode = array_shift($nodes);
 			
-			// if name is not a first node but another first node is their
-			if($firstNode != $name and isset($this->ht[$firstNode])) {
-				$this->ht[$name]->setParent($this->ht[$firstNode]);
-			} else {
-				// if there is no father, set root logger as father
-				$this->ht[$name]->setParent($this->root);
-			} 
+            // if name is not a first node but another first node is their
+            if($firstNode != $name and isset($this->ht[$firstNode])) {
+                $this->ht[$name]->setParent($this->ht[$firstNode]);
+            } else {
+                // if there is no father, set root logger as father
+                $this->ht[$name]->setParent($this->root);
+            } 
 		
-			// if there are more nodes than one
-			if(count($nodes) > 0) {
-				// find parent node
-				foreach($nodes as $node) {
-					$parentNode = "$firstNode.$node";
-					if(isset($this->ht[$parentNode]) and $parentNode != $name) {
+            // if there are more nodes than one
+            if(count($nodes) > 0) {
+                // find parent node
+                foreach($nodes as $node) {
+                    $parentNode = "$firstNode.$node";
+                    if(isset($this->ht[$parentNode]) and $parentNode != $name) {
 		
-						$this->ht[$name]->setParent($this->ht[$parentNode]);
-					}
-					$firstNode .= ".$node";
-				}
-			}
-		}		
+                        $this->ht[$name]->setParent($this->ht[$parentNode]);
+                    }
+                    $firstNode .= ".$node";
+                }
+            }
+        }		
 		
-		return $this->ht[$name];
-	} 
+        return $this->ht[$name];
+    } 
 	
-	/**
-	 * @return LoggerRendererMap Get the renderer map for this hierarchy.
-	 */
-	public function getRendererMap() {
-		return $this->rendererMap;
-	}
+    /**
+     * @return LoggerRendererMap Get the renderer map for this hierarchy.
+     */
+    public function getRendererMap() {
+        return $this->rendererMap;
+    }
 	
-	/**
-	 * @return LoggerRoot Get the root of this hierarchy.
-	 */ 
-	public function getRootLogger() {
-		if(!isset($this->root) or $this->root == null) {
-			$this->root = new LoggerRoot();
-		}
-		return $this->root;
-	}
+    /**
+     * @return LoggerRoot Get the root of this hierarchy.
+     */ 
+    public function getRootLogger() {
+        if(!isset($this->root) or $this->root == null) {
+            $this->root = new LoggerRoot();
+        }
+        return $this->root;
+    }
 	 
-	/**
-	 * @return LoggerLevel Returns the threshold Level.
-	 */
-	public function getThreshold() {
-		return $this->threshold;
-	} 
+    /**
+     * @return LoggerLevel Returns the threshold Level.
+     */
+    public function getThreshold() {
+        return $this->threshold;
+    } 
 
-	/**
-	 * This method will return true if this repository is disabled 
-	 * for level object passed as parameter and false otherwise.
-	 * @return boolean
-	 */
-	public function isDisabled(LoggerLevel $level) {
-		return ($this->threshold->toInt() > $level->toInt());
-	}
+    /**
+     * This method will return true if this repository is disabled 
+     * for level object passed as parameter and false otherwise.
+     * @return boolean
+     */
+    public function isDisabled(LoggerLevel $level) {
+        return ($this->threshold->toInt() > $level->toInt());
+    }
 	
-	/**
-	 * Reset all values contained in this hierarchy instance to their
-	 * default. 
-	 *
-	 * This removes all appenders from all categories, sets
-	 * the level of all non-root categories to <i>null</i>,
-	 * sets their additivity flag to <i>true</i> and sets the level
-	 * of the root logger to {@link LOGGER_LEVEL_DEBUG}.  Moreover,
-	 * message disabling is set its default "off" value.
-	 * 
-	 * <p>Existing categories are not removed. They are just reset.
-	 *
-	 * <p>This method should be used sparingly and with care as it will
-	 * block all logging until it is completed.</p>
-	 */
-	public function resetConfiguration() {
-		$root = $this->getRootLogger();
+    /**
+     * Reset all values contained in this hierarchy instance to their
+     * default. 
+     *
+     * This removes all appenders from all categories, sets
+     * the level of all non-root categories to <i>null</i>,
+     * sets their additivity flag to <i>true</i> and sets the level
+     * of the root logger to {@link LOGGER_LEVEL_DEBUG}.  Moreover,
+     * message disabling is set its default "off" value.
+     * 
+     * <p>Existing categories are not removed. They are just reset.
+     *
+     * <p>This method should be used sparingly and with care as it will
+     * block all logging until it is completed.</p>
+     */
+    public function resetConfiguration() {
+        $root = $this->getRootLogger();
 		
-		$root->setLevel(LoggerLevel::getLevelDebug());
-		$this->setThreshold(LoggerLevel::getLevelAll());
-		$this->shutDown();
-		$loggers = $this->getCurrentLoggers();
-		$enumLoggers = count($loggers);
-		for($i = 0; $i < $enumLoggers; $i++) {
-			$loggers[$i]->setLevel(null);
-			$loggers[$i]->setAdditivity(true);
-			$loggers[$i]->removeAllAppenders();
-		}
-		$this->rendererMap->clear();
-	}
+        $root->setLevel(LoggerLevel::getLevelDebug());
+        $this->setThreshold(LoggerLevel::getLevelAll());
+        $this->shutDown();
+        $loggers = $this->getCurrentLoggers();
+        $enumLoggers = count($loggers);
+        for($i = 0; $i < $enumLoggers; $i++) {
+            $loggers[$i]->setLevel(null);
+            $loggers[$i]->setAdditivity(true);
+            $loggers[$i]->removeAllAppenders();
+        }
+        $this->rendererMap->clear();
+    }
 	
-	/**
-	 * set a new threshold level
-	 *
-	 * @param LoggerLevel $l
-	 */
-	public function setThreshold(LoggerLevel $l) {
-		if($l !== null) {
-			$this->threshold = $l;
-		}
-	}
+    /**
+     * set a new threshold level
+     *
+     * @param LoggerLevel $l
+     */
+    public function setThreshold(LoggerLevel $l) {
+        if($l !== null) {
+            $this->threshold = $l;
+        }
+    }
 	
-	/**
-	 * Shutting down a hierarchy will <i>safely</i> close and remove
-	 * all appenders in all categories including the root logger.
-	 * 
-	 * <p>Some appenders such as {@link LoggerSocketAppender}
-	 * need to be closed before the
-	 * application exists. Otherwise, pending logging events might be
-	 * lost.
-	 * 
-	 * <p>The shutdown method is careful to close nested
-	 * appenders before closing regular appenders. This is allows
-	 * configurations where a regular appender is attached to a logger
-	 * and again to a nested appender.
-	 */
-	public function shutdown() {
-		$this->root->removeAllAppenders();
-		$cats = $this->getCurrentLoggers();
-		$enumCats = count($cats);		  
-		if($enumCats > 0) {
-			for($i = 0; $i < $enumCats; $i++) {
-				$cats[$i]->removeAllAppenders();
-			}
-		}
-	}
+    /**
+     * Shutting down a hierarchy will <i>safely</i> close and remove
+     * all appenders in all categories including the root logger.
+     * 
+     * <p>Some appenders such as {@link LoggerSocketAppender}
+     * need to be closed before the
+     * application exists. Otherwise, pending logging events might be
+     * lost.
+     * 
+     * <p>The shutdown method is careful to close nested
+     * appenders before closing regular appenders. This is allows
+     * configurations where a regular appender is attached to a logger
+     * and again to a nested appender.
+     */
+    public function shutdown() {
+        $this->root->removeAllAppenders();
+        $cats = $this->getCurrentLoggers();
+        $enumCats = count($cats);		  
+        if($enumCats > 0) {
+            for($i = 0; $i < $enumCats; $i++) {
+                $cats[$i]->removeAllAppenders();
+            }
+        }
+    }
 } 

main/inc/lib/phpdocx/lib/log4php/configurators/LoggerConfiguratorPhp.php

Indentation +89 added lines, -89 removed lines

@@ -1,22 +1,22 @@ 
 <?php
 /**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- *	   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * @package log4php
- */
+     * Licensed to the Apache Software Foundation (ASF) under one or more
+     * contributor license agreements. See the NOTICE file distributed with
+     * this work for additional information regarding copyright ownership.
+     * The ASF licenses this file to You under the Apache License, Version 2.0
+     * (the "License"); you may not use this file except in compliance with
+     * the License. You may obtain a copy of the License at
+     *
+     *	   http://www.apache.org/licenses/LICENSE-2.0
+     *
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     *
+     * @package log4php
+     */
 
 /**
  * LoggerConfiguratorPhp class
@@ -38,97 +38,97 @@ 
  */
 class LoggerConfiguratorPhp implements LoggerConfigurator {
 	
-	public function configure(LoggerHierarchy $hierarchy, $url = '') {
-		return $this->doConfigure($url, $hierarchy);
-	}
+    public function configure(LoggerHierarchy $hierarchy, $url = '') {
+        return $this->doConfigure($url, $hierarchy);
+    }
 	
-	private function doConfigure($url, LoggerHierarchy $hierarchy) {
+    private function doConfigure($url, LoggerHierarchy $hierarchy) {
 		
-		$config = require $url;
+        $config = require $url;
 		
-		// set threshold
-		if(isset($config['threshold'])) {
-			$hierarchy->setThreshold(LoggerOptionConverter::toLevel($config['threshold'], LoggerLevel::getLevelAll()));
-		}
+        // set threshold
+        if(isset($config['threshold'])) {
+            $hierarchy->setThreshold(LoggerOptionConverter::toLevel($config['threshold'], LoggerLevel::getLevelAll()));
+        }
 		
-		// parse and create appenders
-		if(isset($config['appenders'])) {
+        // parse and create appenders
+        if(isset($config['appenders'])) {
 			
-			foreach($config['appenders'] as $appenderName => $appenderProperties) {
+            foreach($config['appenders'] as $appenderName => $appenderProperties) {
 				
-				$appender = LoggerAppenderPool::getAppenderFromPool($appenderName, $appenderProperties['class']);
+                $appender = LoggerAppenderPool::getAppenderFromPool($appenderName, $appenderProperties['class']);
 				
-				if($appender->requiresLayout()) {
+                if($appender->requiresLayout()) {
 					
-					if(isset($appenderProperties['layout'])) {
+                    if(isset($appenderProperties['layout'])) {
 						
-						if(isset($appenderProperties['layout']['class']) and !empty($appenderProperties['layout']['class'])) {
-							$layoutClass = $appenderProperties['layout']['class'];							
-						} else {
-							$layoutClass = 'LoggerLayoutSimple';
-						}
+                        if(isset($appenderProperties['layout']['class']) and !empty($appenderProperties['layout']['class'])) {
+                            $layoutClass = $appenderProperties['layout']['class'];							
+                        } else {
+                            $layoutClass = 'LoggerLayoutSimple';
+                        }
 						
-						$layout = LoggerReflectionUtils::createObject($layoutClass);
-						if($layout === null) {
-							$layout = LoggerReflectionUtils::createObject('LoggerLayoutSimple');
-						}
+                        $layout = LoggerReflectionUtils::createObject($layoutClass);
+                        if($layout === null) {
+                            $layout = LoggerReflectionUtils::createObject('LoggerLayoutSimple');
+                        }
 						
-						if($layout instanceof LoggerLayoutPattern) {
-							$layout->setConversionPattern($appenderProperties['layout']['conversionPattern']);
-						}
+                        if($layout instanceof LoggerLayoutPattern) {
+                            $layout->setConversionPattern($appenderProperties['layout']['conversionPattern']);
+                        }
 						
-						$appender->setLayout($layout);
+                        $appender->setLayout($layout);
 						
-					} else {
-						// TODO: throw exception?
-					}
+                    } else {
+                        // TODO: throw exception?
+                    }
 					
-				}
+                }
 				
-			}
+            }
 			
-		}
+        }
 		
-		// parse and create root logger
-		if(isset($config['rootLogger'])) {
-			$rootLogger = $hierarchy->getRootLogger();
-			if(isset($config['rootLogger']['level'])) {
-				$rootLogger->setLevel(LoggerOptionConverter::toLevel($config['rootLogger']['level'], LoggerLevel::getLevelDebug()));
-				if(isset($config['rootLogger']['appenders'])) {
-					foreach($config['rootLogger']['appenders'] as $appenderName) {
-						$appender = LoggerAppenderPool::getAppenderFromPool($appenderName);
-						if($appender !== null) {
-							$rootLogger->addAppender($appender);
-						}
-					}
-				}	
-			}
-		}
+        // parse and create root logger
+        if(isset($config['rootLogger'])) {
+            $rootLogger = $hierarchy->getRootLogger();
+            if(isset($config['rootLogger']['level'])) {
+                $rootLogger->setLevel(LoggerOptionConverter::toLevel($config['rootLogger']['level'], LoggerLevel::getLevelDebug()));
+                if(isset($config['rootLogger']['appenders'])) {
+                    foreach($config['rootLogger']['appenders'] as $appenderName) {
+                        $appender = LoggerAppenderPool::getAppenderFromPool($appenderName);
+                        if($appender !== null) {
+                            $rootLogger->addAppender($appender);
+                        }
+                    }
+                }	
+            }
+        }
 		
-		// parse and create loggers
-		if(isset($config['loggers'])) {
-			foreach($config['loggers'] as $loggerName => $loggerProperties) {
-				if(is_string($loggerName)) {
-					$logger = $hierarchy->getLogger($loggerName);
+        // parse and create loggers
+        if(isset($config['loggers'])) {
+            foreach($config['loggers'] as $loggerName => $loggerProperties) {
+                if(is_string($loggerName)) {
+                    $logger = $hierarchy->getLogger($loggerName);
 					
-					if(isset($loggerProperties['level'])) {
-						$logger->setLevel(LoggerOptionConverter::toLevel($loggerProperties['level'], LoggerLevel::getLevelDebug()));
-						if(isset($loggerProperties['appenders'])) {
-							foreach($loggerProperties['appenders'] as $appenderName) {
-								$appender = LoggerAppenderPool::getAppenderFromPool($appenderName);
-								if($appender !== null) {
-									$logger->addAppender($appender);
-								}
-							}
-						}	
-					}
-				} else {
-					// TODO: throw exception
-				}
-			}
-		}
+                    if(isset($loggerProperties['level'])) {
+                        $logger->setLevel(LoggerOptionConverter::toLevel($loggerProperties['level'], LoggerLevel::getLevelDebug()));
+                        if(isset($loggerProperties['appenders'])) {
+                            foreach($loggerProperties['appenders'] as $appenderName) {
+                                $appender = LoggerAppenderPool::getAppenderFromPool($appenderName);
+                                if($appender !== null) {
+                                    $logger->addAppender($appender);
+                                }
+                            }
+                        }	
+                    }
+                } else {
+                    // TODO: throw exception
+                }
+            }
+        }
 		
-		return true;
-	}
+        return true;
+    }
 	
 }

main/inc/lib/phpdocx/lib/log4php/LoggerLevel.php

Indentation +202 added lines, -202 removed lines

@@ -33,224 +33,224 @@
  */
 class LoggerLevel {
 	
-	const OFF = 2147483647;
-	const FATAL = 50000;
-	const ERROR = 40000;
-	const WARN = 30000;
-	const INFO = 20000;
-	const DEBUG = 10000;
-	const ALL = -2147483647;
+    const OFF = 2147483647;
+    const FATAL = 50000;
+    const ERROR = 40000;
+    const WARN = 30000;
+    const INFO = 20000;
+    const DEBUG = 10000;
+    const ALL = -2147483647;
 
-	/**
-	 * TODO: check if still necessary or to be refactored 
-	 * @var integer
-	 */
-	private $level;
+    /**
+     * TODO: check if still necessary or to be refactored 
+     * @var integer
+     */
+    private $level;
   
-  	/**
-   	 * Contains a list of instantiated levels 
-   	 */
-  	private static $levelMap;
+        /**
+         * Contains a list of instantiated levels 
+         */
+        private static $levelMap;
   	
-	/**
-	 * @var string
-	 */
-	private $levelStr;
+    /**
+     * @var string
+     */
+    private $levelStr;
   
-	/**
-	 * @var integer
-	 */
-	private $syslogEquivalent;
+    /**
+     * @var integer
+     */
+    private $syslogEquivalent;
 
-	/**
-	 * Constructor
-	 *
-	 * @param integer $level
-	 * @param string $levelStr
-	 * @param integer $syslogEquivalent
-	 */
-	private function __construct($level, $levelStr, $syslogEquivalent) {
-		$this->level = $level;
-		$this->levelStr = $levelStr;
-		$this->syslogEquivalent = $syslogEquivalent;
-	}
+    /**
+     * Constructor
+     *
+     * @param integer $level
+     * @param string $levelStr
+     * @param integer $syslogEquivalent
+     */
+    private function __construct($level, $levelStr, $syslogEquivalent) {
+        $this->level = $level;
+        $this->levelStr = $levelStr;
+        $this->syslogEquivalent = $syslogEquivalent;
+    }
 
-	/**
-	 * Two priorities are equal if their level fields are equal.
-	 *
-	 * @param object $o
-	 * @return boolean 
-	 */
-	public function equals($o) {
-		if($o instanceof LoggerLevel) {
-			if($this->level == $o->level) {
-			    return true;
-			}
-		} else {
-			return false;
-		}
-	}
+    /**
+     * Two priorities are equal if their level fields are equal.
+     *
+     * @param object $o
+     * @return boolean 
+     */
+    public function equals($o) {
+        if($o instanceof LoggerLevel) {
+            if($this->level == $o->level) {
+                return true;
+            }
+        } else {
+            return false;
+        }
+    }
 	
-	/**
-	 * Returns an Off Level
-	 * @static
-	 * @return LoggerLevel
-	 */
-	public static function getLevelOff() {
-		if(!isset(self::$levelMap[LoggerLevel::OFF])) {
-			self::$levelMap[LoggerLevel::OFF] = new LoggerLevel(LoggerLevel::OFF, 'OFF', 0);
-		}
-		return self::$levelMap[LoggerLevel::OFF];
-	}
+    /**
+     * Returns an Off Level
+     * @static
+     * @return LoggerLevel
+     */
+    public static function getLevelOff() {
+        if(!isset(self::$levelMap[LoggerLevel::OFF])) {
+            self::$levelMap[LoggerLevel::OFF] = new LoggerLevel(LoggerLevel::OFF, 'OFF', 0);
+        }
+        return self::$levelMap[LoggerLevel::OFF];
+    }
 
-	/**
-	 * Returns a Fatal Level
-	 * @static
-	 * @return LoggerLevel
-	 */
-	public static function getLevelFatal() {
-		if(!isset(self::$levelMap[LoggerLevel::FATAL])) {
-			self::$levelMap[LoggerLevel::FATAL] = new LoggerLevel(LoggerLevel::FATAL, 'FATAL', 0);
-		}
-		return self::$levelMap[LoggerLevel::FATAL];
-	}
+    /**
+     * Returns a Fatal Level
+     * @static
+     * @return LoggerLevel
+     */
+    public static function getLevelFatal() {
+        if(!isset(self::$levelMap[LoggerLevel::FATAL])) {
+            self::$levelMap[LoggerLevel::FATAL] = new LoggerLevel(LoggerLevel::FATAL, 'FATAL', 0);
+        }
+        return self::$levelMap[LoggerLevel::FATAL];
+    }
 	
-	/**
-	 * Returns an Error Level
-	 * @static
-	 * @return LoggerLevel
-	 */
-	public static function getLevelError() {
-		if(!isset(self::$levelMap[LoggerLevel::ERROR])) {
-			self::$levelMap[LoggerLevel::ERROR] = new LoggerLevel(LoggerLevel::ERROR, 'ERROR', 3);
-		}
-		return self::$levelMap[LoggerLevel::ERROR];
-	}
+    /**
+     * Returns an Error Level
+     * @static
+     * @return LoggerLevel
+     */
+    public static function getLevelError() {
+        if(!isset(self::$levelMap[LoggerLevel::ERROR])) {
+            self::$levelMap[LoggerLevel::ERROR] = new LoggerLevel(LoggerLevel::ERROR, 'ERROR', 3);
+        }
+        return self::$levelMap[LoggerLevel::ERROR];
+    }
 	
-	/**
-	 * Returns a Warn Level
-	 * @static
-	 * @return LoggerLevel
-	 */
-	public static function getLevelWarn() {
-		if(!isset(self::$levelMap[LoggerLevel::WARN])) {
-			self::$levelMap[LoggerLevel::WARN] = new LoggerLevel(LoggerLevel::WARN, 'WARN', 4);
-		}
-		return self::$levelMap[LoggerLevel::WARN];
-	}
+    /**
+     * Returns a Warn Level
+     * @static
+     * @return LoggerLevel
+     */
+    public static function getLevelWarn() {
+        if(!isset(self::$levelMap[LoggerLevel::WARN])) {
+            self::$levelMap[LoggerLevel::WARN] = new LoggerLevel(LoggerLevel::WARN, 'WARN', 4);
+        }
+        return self::$levelMap[LoggerLevel::WARN];
+    }
 
-	/**
-	 * Returns an Info Level
-	 * @static
-	 * @return LoggerLevel
-	 */
-	public static function getLevelInfo() {
-		if(!isset(self::$levelMap[LoggerLevel::INFO])) {
-			self::$levelMap[LoggerLevel::INFO] = new LoggerLevel(LoggerLevel::INFO, 'INFO', 6);
-		}
-		return self::$levelMap[LoggerLevel::INFO];
-	}
+    /**
+     * Returns an Info Level
+     * @static
+     * @return LoggerLevel
+     */
+    public static function getLevelInfo() {
+        if(!isset(self::$levelMap[LoggerLevel::INFO])) {
+            self::$levelMap[LoggerLevel::INFO] = new LoggerLevel(LoggerLevel::INFO, 'INFO', 6);
+        }
+        return self::$levelMap[LoggerLevel::INFO];
+    }
 
-	/**
-	 * Returns a Debug Level
-	 * @static
-	 * @return LoggerLevel
-	 */
-	public static function getLevelDebug() {
-		if(!isset(self::$levelMap[LoggerLevel::DEBUG])) {
-			self::$levelMap[LoggerLevel::DEBUG] = new LoggerLevel(LoggerLevel::DEBUG, 'DEBUG', 7);
-		}
-		return self::$levelMap[LoggerLevel::DEBUG];
-	}
+    /**
+     * Returns a Debug Level
+     * @static
+     * @return LoggerLevel
+     */
+    public static function getLevelDebug() {
+        if(!isset(self::$levelMap[LoggerLevel::DEBUG])) {
+            self::$levelMap[LoggerLevel::DEBUG] = new LoggerLevel(LoggerLevel::DEBUG, 'DEBUG', 7);
+        }
+        return self::$levelMap[LoggerLevel::DEBUG];
+    }
 
-	/**
-	 * Returns an All Level
-	 * @static
-	 * @return LoggerLevel
-	 */
-	public static function getLevelAll() {
-		if(!isset(self::$levelMap[LoggerLevel::ALL])) {
-			self::$levelMap[LoggerLevel::ALL] = new LoggerLevel(LoggerLevel::ALL, 'ALL', 7);
-		}
-		return self::$levelMap[LoggerLevel::ALL];
-	}
+    /**
+     * Returns an All Level
+     * @static
+     * @return LoggerLevel
+     */
+    public static function getLevelAll() {
+        if(!isset(self::$levelMap[LoggerLevel::ALL])) {
+            self::$levelMap[LoggerLevel::ALL] = new LoggerLevel(LoggerLevel::ALL, 'ALL', 7);
+        }
+        return self::$levelMap[LoggerLevel::ALL];
+    }
 	
-	/**
-	 * Return the syslog equivalent of this priority as an integer.
-	 * @final
-	 * @return integer
-	 */
-	public function getSyslogEquivalent() {
-		return $this->syslogEquivalent;
-	}
+    /**
+     * Return the syslog equivalent of this priority as an integer.
+     * @final
+     * @return integer
+     */
+    public function getSyslogEquivalent() {
+        return $this->syslogEquivalent;
+    }
 
-	/**
-	 * Returns <i>true</i> if this level has a higher or equal
-	 * level than the level passed as argument, <i>false</i>
-	 * otherwise.  
-	 * 
-	 * <p>You should think twice before overriding the default
-	 * implementation of <i>isGreaterOrEqual</i> method.
-	 *
-	 * @param LoggerLevel $r
-	 * @return boolean
-	 */
-	public function isGreaterOrEqual($r) {
-		return $this->level >= $r->level;
-	}
+    /**
+     * Returns <i>true</i> if this level has a higher or equal
+     * level than the level passed as argument, <i>false</i>
+     * otherwise.  
+     * 
+     * <p>You should think twice before overriding the default
+     * implementation of <i>isGreaterOrEqual</i> method.
+     *
+     * @param LoggerLevel $r
+     * @return boolean
+     */
+    public function isGreaterOrEqual($r) {
+        return $this->level >= $r->level;
+    }
 
-	/**
-	 * Returns the string representation of this priority.
-	 * @return string
-	 * @final
-	 */
-	public function toString() {
-		return $this->levelStr;
-	}
+    /**
+     * Returns the string representation of this priority.
+     * @return string
+     * @final
+     */
+    public function toString() {
+        return $this->levelStr;
+    }
 
-	/**
-	 * Returns the integer representation of this level.
-	 * @return integer
-	 */
-	public function toInt() {
-		return $this->level;
-	}
+    /**
+     * Returns the integer representation of this level.
+     * @return integer
+     */
+    public function toInt() {
+        return $this->level;
+    }
 
-	/**
-	 * Convert the string passed as argument to a level. If the
-	 * conversion fails, then this method returns a DEBUG Level.
-	 *
-	 * @param mixed $arg
-	 * @param LoggerLevel $default
-	 * @static 
-	 */
-	public static function toLevel($arg, $defaultLevel = null) {
-		if($defaultLevel === null) {
-			return self::toLevel($arg, self::getLevelDebug());
-		} else {
-			if(is_int($arg)) {
-				switch($arg) {
-					case self::ALL:	return self::getLevelAll();
-					case self::DEBUG: return self::getLevelDebug();
-					case self::INFO: return self::getLevelInfo();
-					case self::WARN: return self::getLevelWarn();
-					case self::ERROR: return self::getLevelError();
-					case self::FATAL: return self::getLevelFatal();
-					case self::OFF:	return self::getLevelOff();
-					default: return $defaultLevel;
-				}
-			} else {
-				switch(strtoupper($arg)) {
-					case 'ALL':	return self::getLevelAll();
-					case 'DEBUG': return self::getLevelDebug();
-					case 'INFO': return self::getLevelInfo();
-					case 'WARN': return self::getLevelWarn();
-					case 'ERROR': return self::getLevelError();
-					case 'FATAL': return self::getLevelFatal();
-					case 'OFF':	return self::getLevelOff();
-					default: return $defaultLevel;
-				}
-			}
-		}
-	}
+    /**
+     * Convert the string passed as argument to a level. If the
+     * conversion fails, then this method returns a DEBUG Level.
+     *
+     * @param mixed $arg
+     * @param LoggerLevel $default
+     * @static 
+     */
+    public static function toLevel($arg, $defaultLevel = null) {
+        if($defaultLevel === null) {
+            return self::toLevel($arg, self::getLevelDebug());
+        } else {
+            if(is_int($arg)) {
+                switch($arg) {
+                    case self::ALL:	return self::getLevelAll();
+                    case self::DEBUG: return self::getLevelDebug();
+                    case self::INFO: return self::getLevelInfo();
+                    case self::WARN: return self::getLevelWarn();
+                    case self::ERROR: return self::getLevelError();
+                    case self::FATAL: return self::getLevelFatal();
+                    case self::OFF:	return self::getLevelOff();
+                    default: return $defaultLevel;
+                }
+            } else {
+                switch(strtoupper($arg)) {
+                    case 'ALL':	return self::getLevelAll();
+                    case 'DEBUG': return self::getLevelDebug();
+                    case 'INFO': return self::getLevelInfo();
+                    case 'WARN': return self::getLevelWarn();
+                    case 'ERROR': return self::getLevelError();
+                    case 'FATAL': return self::getLevelFatal();
+                    case 'OFF':	return self::getLevelOff();
+                    default: return $defaultLevel;
+                }
+            }
+        }
+    }
 }

main/inc/lib/phpdocx/lib/log4php/LoggerLayout.php

Indentation +54 added lines, -54 removed lines

@@ -1,22 +1,22 @@ 
 <?php
 /**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- *	   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * @package log4php
- */
+     * Licensed to the Apache Software Foundation (ASF) under one or more
+     * contributor license agreements. See the NOTICE file distributed with
+     * this work for additional information regarding copyright ownership.
+     * The ASF licenses this file to You under the Apache License, Version 2.0
+     * (the "License"); you may not use this file except in compliance with
+     * the License. You may obtain a copy of the License at
+     *
+     *	   http://www.apache.org/licenses/LICENSE-2.0
+     *
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     *
+     * @package log4php
+     */
 
 /**
  * Extend this abstract class to create your own log layout format.
@@ -26,45 +26,45 @@ 
  * @abstract
  */
 abstract class LoggerLayout {
-	/**
-	 * Activates options for this layout.
-	 * Override this method if you have options to be activated.
-	 */
-	public function activateOptions() {
-		return true;
-	}
+    /**
+     * Activates options for this layout.
+     * Override this method if you have options to be activated.
+     */
+    public function activateOptions() {
+        return true;
+    }
 
-	/**
-	 * Override this method to create your own layout format.
-	 *
-	 * @param LoggerLoggingEvent
-	 * @return string
-	 */
-	public function format(LoggerLoggingEvent $event) {
-		return $event->getRenderedMessage();
-	} 
+    /**
+     * Override this method to create your own layout format.
+     *
+     * @param LoggerLoggingEvent
+     * @return string
+     */
+    public function format(LoggerLoggingEvent $event) {
+        return $event->getRenderedMessage();
+    } 
 	
-	/**
-	 * Returns the content type output by this layout.
-	 * @return string
-	 */
-	public function getContentType() {
-		return "text/plain";
-	} 
+    /**
+     * Returns the content type output by this layout.
+     * @return string
+     */
+    public function getContentType() {
+        return "text/plain";
+    } 
 			
-	/**
-	 * Returns the footer for the layout format.
-	 * @return string
-	 */
-	public function getFooter() {
-		return null;
-	} 
+    /**
+     * Returns the footer for the layout format.
+     * @return string
+     */
+    public function getFooter() {
+        return null;
+    } 
 
-	/**
-	 * Returns the header for the layout format.
-	 * @return string
-	 */
-	public function getHeader() {
-		return null;
-	}
+    /**
+     * Returns the header for the layout format.
+     * @return string
+     */
+    public function getHeader() {
+        return null;
+    }
 }