chamilo / chamilo-lms

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

Indentation +301 added lines, -301 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
+     */
 
 /**
  * Most of the work of the {@link LoggerPatternLayout} class 
@@ -33,309 +33,309 @@ 
  */
 class LoggerPatternParser {
 
-	const ESCAPE_CHAR = '%';
+    const ESCAPE_CHAR = '%';
 	
-	const LITERAL_STATE = 0;
-	const CONVERTER_STATE = 1;
-	const MINUS_STATE = 2;
-	const DOT_STATE = 3;
-	const MIN_STATE = 4;
-	const MAX_STATE = 5;
+    const LITERAL_STATE = 0;
+    const CONVERTER_STATE = 1;
+    const MINUS_STATE = 2;
+    const DOT_STATE = 3;
+    const MIN_STATE = 4;
+    const MAX_STATE = 5;
 	
-	const FULL_LOCATION_CONVERTER = 1000;
-	const METHOD_LOCATION_CONVERTER = 1001;
-	const CLASS_LOCATION_CONVERTER = 1002;
-	const FILE_LOCATION_CONVERTER = 1003;
-	const LINE_LOCATION_CONVERTER = 1004;
+    const FULL_LOCATION_CONVERTER = 1000;
+    const METHOD_LOCATION_CONVERTER = 1001;
+    const CLASS_LOCATION_CONVERTER = 1002;
+    const FILE_LOCATION_CONVERTER = 1003;
+    const LINE_LOCATION_CONVERTER = 1004;
 	
-	const RELATIVE_TIME_CONVERTER = 2000;
-	const THREAD_CONVERTER = 2001;
-	const LEVEL_CONVERTER = 2002;
-	const NDC_CONVERTER = 2003;
-	const MESSAGE_CONVERTER = 2004;
+    const RELATIVE_TIME_CONVERTER = 2000;
+    const THREAD_CONVERTER = 2001;
+    const LEVEL_CONVERTER = 2002;
+    const NDC_CONVERTER = 2003;
+    const MESSAGE_CONVERTER = 2004;
 	
-	const DATE_FORMAT_ISO8601 = 'Y-m-d H:i:s,u'; 
-	const DATE_FORMAT_ABSOLUTE = 'H:i:s';
-	const DATE_FORMAT_DATE = 'd M Y H:i:s,u';
+    const DATE_FORMAT_ISO8601 = 'Y-m-d H:i:s,u'; 
+    const DATE_FORMAT_ABSOLUTE = 'H:i:s';
+    const DATE_FORMAT_DATE = 'd M Y H:i:s,u';
 
-	private $state;
-	private $currentLiteral;
-	private $patternLength;
-	private $i;
+    private $state;
+    private $currentLiteral;
+    private $patternLength;
+    private $i;
 	
-	/**
-	 * @var LoggerPatternConverter
-	 */
-	private $head = null;
+    /**
+     * @var LoggerPatternConverter
+     */
+    private $head = null;
 	 
-	/**
-	 * @var LoggerPatternConverter
-	 */
-	private $tail = null;
+    /**
+     * @var LoggerPatternConverter
+     */
+    private $tail = null;
 	
-	/**
-	 * @var LoggerFormattingInfo
-	 */
-	private $formattingInfo;
+    /**
+     * @var LoggerFormattingInfo
+     */
+    private $formattingInfo;
 	
-	/**
-	 * @var string pattern to parse
-	 */
-	private $pattern;
+    /**
+     * @var string pattern to parse
+     */
+    private $pattern;
 
-	/**
-	 * Constructor 
-	 *
-	 * @param string $pattern
-	 */
-	public function __construct($pattern) {
-		$this->pattern = $pattern;
-		$this->patternLength =	strlen($pattern);
-		$this->formattingInfo = new LoggerFormattingInfo();
-		$this->state = self::LITERAL_STATE;
-	}
+    /**
+     * Constructor 
+     *
+     * @param string $pattern
+     */
+    public function __construct($pattern) {
+        $this->pattern = $pattern;
+        $this->patternLength =	strlen($pattern);
+        $this->formattingInfo = new LoggerFormattingInfo();
+        $this->state = self::LITERAL_STATE;
+    }
 
-	/**
-	 * @param LoggerPatternConverter $pc
-	 */
-	public function addToList($pc) {
-		if($this->head == null) {
-			$this->head = $pc;
-			$this->tail = $this->head;
-		} else {
-			$this->tail->next = $pc;
-			$this->tail = $this->tail->next;
-		}
-	}
+    /**
+     * @param LoggerPatternConverter $pc
+     */
+    public function addToList($pc) {
+        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) and ($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) and ($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) {
-					$r = 0;
-				}
-			}
-		}
-		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) {
+                    $r = 0;
+                }
+            }
+        }
+        return $r;
+    }
 
 	
-	/** Parser.
-	 * 
-	 * @return LoggerPatternConverter Returns $this->head.
-	 */
-	public function parse() {
-		$c = '';
-		$this->i = 0;
-		$this->currentLiteral = '';
-		while($this->i < $this->patternLength) {
-			$c = $this->pattern{$this->i++};
+    /** Parser.
+     * 
+     * @return LoggerPatternConverter Returns $this->head.
+     */
+    public function parse() {
+        $c = '';
+        $this->i = 0;
+        $this->currentLiteral = '';
+        while($this->i < $this->patternLength) {
+            $c = $this->pattern{$this->i++};
 
-			switch($this->state) {
-				case self::LITERAL_STATE:
-					// In literal state, the last char is always a literal.
-					if($this->i == $this->patternLength) {
-						$this->currentLiteral .= $c;
-						continue;
-					}
-					if($c == self::ESCAPE_CHAR) {
-						// peek at the next char.
-						switch($this->pattern{$this->i}) {
-							case self::ESCAPE_CHAR:
-								$this->currentLiteral .= $c;
-								$this->i++; // move pointer
-								break;
-							case 'n':
-								$this->currentLiteral .= PHP_EOL;
-								$this->i++; // move pointer
-								break;
-							default:
-								if(strlen($this->currentLiteral) != 0) {
-									$this->addToList(new LoggerLiteralPatternConverter($this->currentLiteral));
-								}
-								$this->currentLiteral = $c;
-								$this->state = self::CONVERTER_STATE;
-								$this->formattingInfo->reset();
-						}
-					} else {
-						$this->currentLiteral .= $c;
-					}
-					break;
-				case self::CONVERTER_STATE:
-						$this->currentLiteral .= $c;
-						switch($c) {
-						case '-':
-							$this->formattingInfo->leftAlign = true;
-							break;
-						case '.':
-							$this->state = self::DOT_STATE;
-								break;
-						default:
-							if(ord($c) >= ord('0') and ord($c) <= ord('9')) {
-								$this->formattingInfo->min = ord($c) - ord('0');
-								$this->state = self::MIN_STATE;
-							} else {
-								$this->finalizeConverter($c);
-							}
-						} // switch
-					break;
-				case self::MIN_STATE:
-					$this->currentLiteral .= $c;
-					if(ord($c) >= ord('0') and ord($c) <= ord('9')) {
-						$this->formattingInfo->min = ($this->formattingInfo->min * 10) + (ord($c) - ord('0'));
-					} else if ($c == '.') {
-						$this->state = self::DOT_STATE;
-					} else {
-						$this->finalizeConverter($c);
-					}
-					break;
-				case self::DOT_STATE:
-					$this->currentLiteral .= $c;
-					if(ord($c) >= ord('0') and ord($c) <= ord('9')) {
-						$this->formattingInfo->max = ord($c) - ord('0');
-						$this->state = self::MAX_STATE;
-					} else {
-						$this->state = self::LITERAL_STATE;
-					}
-					break;
-				case self::MAX_STATE:
-					$this->currentLiteral .= $c;
-					if(ord($c) >= ord('0') and ord($c) <= ord('9')) {
-						$this->formattingInfo->max = ($this->formattingInfo->max * 10) + (ord($c) - ord('0'));
-					} else {
-						$this->finalizeConverter($c);
-						$this->state = self::LITERAL_STATE;
-					}
-					break;
-			} // switch
-		} // while
-		if(strlen($this->currentLiteral) != 0) {
-			$this->addToList(new LoggerLiteralPatternConverter($this->currentLiteral));
-		}
-		return $this->head;
-	}
+            switch($this->state) {
+                case self::LITERAL_STATE:
+                    // In literal state, the last char is always a literal.
+                    if($this->i == $this->patternLength) {
+                        $this->currentLiteral .= $c;
+                        continue;
+                    }
+                    if($c == self::ESCAPE_CHAR) {
+                        // peek at the next char.
+                        switch($this->pattern{$this->i}) {
+                            case self::ESCAPE_CHAR:
+                                $this->currentLiteral .= $c;
+                                $this->i++; // move pointer
+                                break;
+                            case 'n':
+                                $this->currentLiteral .= PHP_EOL;
+                                $this->i++; // move pointer
+                                break;
+                            default:
+                                if(strlen($this->currentLiteral) != 0) {
+                                    $this->addToList(new LoggerLiteralPatternConverter($this->currentLiteral));
+                                }
+                                $this->currentLiteral = $c;
+                                $this->state = self::CONVERTER_STATE;
+                                $this->formattingInfo->reset();
+                        }
+                    } else {
+                        $this->currentLiteral .= $c;
+                    }
+                    break;
+                case self::CONVERTER_STATE:
+                        $this->currentLiteral .= $c;
+                        switch($c) {
+                        case '-':
+                            $this->formattingInfo->leftAlign = true;
+                            break;
+                        case '.':
+                            $this->state = self::DOT_STATE;
+                                break;
+                        default:
+                            if(ord($c) >= ord('0') and ord($c) <= ord('9')) {
+                                $this->formattingInfo->min = ord($c) - ord('0');
+                                $this->state = self::MIN_STATE;
+                            } else {
+                                $this->finalizeConverter($c);
+                            }
+                        } // switch
+                    break;
+                case self::MIN_STATE:
+                    $this->currentLiteral .= $c;
+                    if(ord($c) >= ord('0') and ord($c) <= ord('9')) {
+                        $this->formattingInfo->min = ($this->formattingInfo->min * 10) + (ord($c) - ord('0'));
+                    } else if ($c == '.') {
+                        $this->state = self::DOT_STATE;
+                    } else {
+                        $this->finalizeConverter($c);
+                    }
+                    break;
+                case self::DOT_STATE:
+                    $this->currentLiteral .= $c;
+                    if(ord($c) >= ord('0') and ord($c) <= ord('9')) {
+                        $this->formattingInfo->max = ord($c) - ord('0');
+                        $this->state = self::MAX_STATE;
+                    } else {
+                        $this->state = self::LITERAL_STATE;
+                    }
+                    break;
+                case self::MAX_STATE:
+                    $this->currentLiteral .= $c;
+                    if(ord($c) >= ord('0') and ord($c) <= ord('9')) {
+                        $this->formattingInfo->max = ($this->formattingInfo->max * 10) + (ord($c) - ord('0'));
+                    } else {
+                        $this->finalizeConverter($c);
+                        $this->state = self::LITERAL_STATE;
+                    }
+                    break;
+            } // switch
+        } // while
+        if(strlen($this->currentLiteral) != 0) {
+            $this->addToList(new LoggerLiteralPatternConverter($this->currentLiteral));
+        }
+        return $this->head;
+    }
 
-	public function finalizeConverter($c) {
-		$pc = null;
-		switch($c) {
-			case 'c':
-				$pc = new LoggerCategoryPatternConverter($this->formattingInfo, $this->extractPrecisionOption());
-				$this->currentLiteral = '';
-				break;
-			case 'C':
-				$pc = new LoggerClassNamePatternConverter($this->formattingInfo, $this->extractPrecisionOption());
-				$this->currentLiteral = '';
-				break;
-			case 'd':
-				$dateFormatStr = self::DATE_FORMAT_ISO8601; // ISO8601_DATE_FORMAT;
-				$dOpt = $this->extractOption();
+    public function finalizeConverter($c) {
+        $pc = null;
+        switch($c) {
+            case 'c':
+                $pc = new LoggerCategoryPatternConverter($this->formattingInfo, $this->extractPrecisionOption());
+                $this->currentLiteral = '';
+                break;
+            case 'C':
+                $pc = new LoggerClassNamePatternConverter($this->formattingInfo, $this->extractPrecisionOption());
+                $this->currentLiteral = '';
+                break;
+            case 'd':
+                $dateFormatStr = self::DATE_FORMAT_ISO8601; // ISO8601_DATE_FORMAT;
+                $dOpt = $this->extractOption();
 
-				if($dOpt !== null)
-					$dateFormatStr = $dOpt;
+                if($dOpt !== null)
+                    $dateFormatStr = $dOpt;
 					
-				if($dateFormatStr == 'ISO8601') {
-					$df = self::DATE_FORMAT_ISO8601;
-				} else if($dateFormatStr == 'ABSOLUTE') {
-					$df = self::DATE_FORMAT_ABSOLUTE;
-				} else if($dateFormatStr == 'DATE') {
-					$df = self::DATE_FORMAT_DATE;
-				} else {
-					$df = $dateFormatStr;
-					if($df == null) {
-						$df = self::DATE_FORMAT_ISO8601;
-					}
-				}
-				$pc = new LoggerDatePatternConverter($this->formattingInfo, $df);
-				$this->currentLiteral = '';
-				break;
-			case 'F':
-				$pc = new LoggerLocationPatternConverter($this->formattingInfo, self::FILE_LOCATION_CONVERTER);
-				$this->currentLiteral = '';
-				break;
-			case 'l':
-				$pc = new LoggerLocationPatternConverter($this->formattingInfo, self::FULL_LOCATION_CONVERTER);
-				$this->currentLiteral = '';
-				break;
-			case 'L':
-				$pc = new LoggerLocationPatternConverter($this->formattingInfo, self::LINE_LOCATION_CONVERTER);
-				$this->currentLiteral = '';
-				break;
-			case 'm':
-				$pc = new LoggerBasicPatternConverter($this->formattingInfo, self::MESSAGE_CONVERTER);
-				$this->currentLiteral = '';
-				break;
-			case 'M':
-				$pc = new LoggerLocationPatternConverter($this->formattingInfo, self::METHOD_LOCATION_CONVERTER);
-				$this->currentLiteral = '';
-				break;
-			case 'p':
-				$pc = new LoggerBasicPatternConverter($this->formattingInfo, self::LEVEL_CONVERTER);
-				$this->currentLiteral = '';
-				break;
-			case 'r':
-				$pc = new LoggerBasicPatternConverter($this->formattingInfo, self::RELATIVE_TIME_CONVERTER);
-				$this->currentLiteral = '';
-				break;
-			case 't':
-				$pc = new LoggerBasicPatternConverter($this->formattingInfo, self::THREAD_CONVERTER);
-				$this->currentLiteral = '';
-				break;
-			case 'u':
-				if($this->i < $this->patternLength) {
-					$cNext = $this->pattern{$this->i};
-					if(ord($cNext) >= ord('0') and ord($cNext) <= ord('9')) {
-						$pc = new LoggerUserFieldPatternConverter($this->formattingInfo, (string)(ord($cNext) - ord('0')));
-						$this->currentLiteral = '';
-						$this->i++;
-					}
-				}
-				break;
-			case 'x':
-				$pc = new LoggerBasicPatternConverter($this->formattingInfo, self::NDC_CONVERTER);
-				$this->currentLiteral = '';
-				break;
-			case 'X':
-				$xOpt = $this->extractOption();
-				$pc = new LoggerMDCPatternConverter($this->formattingInfo, $xOpt);
-				$this->currentLiteral = '';
-				break;
-			default:
-				$pc = new LoggerLiteralPatternConverter($this->currentLiteral);
-				$this->currentLiteral = '';
-		}
-		$this->addConverter($pc);
-	}
+                if($dateFormatStr == 'ISO8601') {
+                    $df = self::DATE_FORMAT_ISO8601;
+                } else if($dateFormatStr == 'ABSOLUTE') {
+                    $df = self::DATE_FORMAT_ABSOLUTE;
+                } else if($dateFormatStr == 'DATE') {
+                    $df = self::DATE_FORMAT_DATE;
+                } else {
+                    $df = $dateFormatStr;
+                    if($df == null) {
+                        $df = self::DATE_FORMAT_ISO8601;
+                    }
+                }
+                $pc = new LoggerDatePatternConverter($this->formattingInfo, $df);
+                $this->currentLiteral = '';
+                break;
+            case 'F':
+                $pc = new LoggerLocationPatternConverter($this->formattingInfo, self::FILE_LOCATION_CONVERTER);
+                $this->currentLiteral = '';
+                break;
+            case 'l':
+                $pc = new LoggerLocationPatternConverter($this->formattingInfo, self::FULL_LOCATION_CONVERTER);
+                $this->currentLiteral = '';
+                break;
+            case 'L':
+                $pc = new LoggerLocationPatternConverter($this->formattingInfo, self::LINE_LOCATION_CONVERTER);
+                $this->currentLiteral = '';
+                break;
+            case 'm':
+                $pc = new LoggerBasicPatternConverter($this->formattingInfo, self::MESSAGE_CONVERTER);
+                $this->currentLiteral = '';
+                break;
+            case 'M':
+                $pc = new LoggerLocationPatternConverter($this->formattingInfo, self::METHOD_LOCATION_CONVERTER);
+                $this->currentLiteral = '';
+                break;
+            case 'p':
+                $pc = new LoggerBasicPatternConverter($this->formattingInfo, self::LEVEL_CONVERTER);
+                $this->currentLiteral = '';
+                break;
+            case 'r':
+                $pc = new LoggerBasicPatternConverter($this->formattingInfo, self::RELATIVE_TIME_CONVERTER);
+                $this->currentLiteral = '';
+                break;
+            case 't':
+                $pc = new LoggerBasicPatternConverter($this->formattingInfo, self::THREAD_CONVERTER);
+                $this->currentLiteral = '';
+                break;
+            case 'u':
+                if($this->i < $this->patternLength) {
+                    $cNext = $this->pattern{$this->i};
+                    if(ord($cNext) >= ord('0') and ord($cNext) <= ord('9')) {
+                        $pc = new LoggerUserFieldPatternConverter($this->formattingInfo, (string)(ord($cNext) - ord('0')));
+                        $this->currentLiteral = '';
+                        $this->i++;
+                    }
+                }
+                break;
+            case 'x':
+                $pc = new LoggerBasicPatternConverter($this->formattingInfo, self::NDC_CONVERTER);
+                $this->currentLiteral = '';
+                break;
+            case 'X':
+                $xOpt = $this->extractOption();
+                $pc = new LoggerMDCPatternConverter($this->formattingInfo, $xOpt);
+                $this->currentLiteral = '';
+                break;
+            default:
+                $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 = self::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 = self::LITERAL_STATE;
+        // Reset formatting info
+        $this->formattingInfo->reset();
+    }
 }
 

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

Indentation +37 added lines, -37 removed lines

@@ -24,48 +24,48 @@
  */
 class LoggerBasicPatternConverter extends LoggerPatternConverter {
 
-	/**
-	 * @var integer
-	 */
-	private $type;
+    /**
+     * @var integer
+     */
+    private $type;
 
-	/**
-	 * Constructor
-	 *
-	 * @param string $formattingInfo
-	 * @param integer $type
-	 */
-	public function __construct($formattingInfo, $type) {
-	  parent::__construct($formattingInfo);
-	  $this->type = $type;
-	}
+    /**
+     * Constructor
+     *
+     * @param string $formattingInfo
+     * @param integer $type
+     */
+    public function __construct($formattingInfo, $type) {
+        parent::__construct($formattingInfo);
+        $this->type = $type;
+    }
 
-	/**
-	 * @param LoggerLoggingEvent $event
-	 * @return string
-	 */
-	public function convert($event) {
-		switch($this->type) {
-			case LoggerPatternParser::RELATIVE_TIME_CONVERTER:
-				$timeStamp = $event->getTimeStamp();
-				$startTime = LoggerLoggingEvent::getStartTime();
-				return (string)(int)($timeStamp * 1000 - $startTime * 1000);
+    /**
+     * @param LoggerLoggingEvent $event
+     * @return string
+     */
+    public function convert($event) {
+        switch($this->type) {
+            case LoggerPatternParser::RELATIVE_TIME_CONVERTER:
+                $timeStamp = $event->getTimeStamp();
+                $startTime = LoggerLoggingEvent::getStartTime();
+                return (string)(int)($timeStamp * 1000 - $startTime * 1000);
 				
-			case LoggerPatternParser::THREAD_CONVERTER:
-				return $event->getThreadName();
+            case LoggerPatternParser::THREAD_CONVERTER:
+                return $event->getThreadName();
 
-			case LoggerPatternParser::LEVEL_CONVERTER:
-				$level = $event->getLevel();
-				return $level->toString();
+            case LoggerPatternParser::LEVEL_CONVERTER:
+                $level = $event->getLevel();
+                return $level->toString();
 
-			case LoggerPatternParser::NDC_CONVERTER:
-				return $event->getNDC();
+            case LoggerPatternParser::NDC_CONVERTER:
+                return $event->getNDC();
 
-			case LoggerPatternParser::MESSAGE_CONVERTER:
-				return $event->getRenderedMessage();
+            case LoggerPatternParser::MESSAGE_CONVERTER:
+                return $event->getRenderedMessage();
 				
-			default: 
-				return '';
-		}
-	}
+            default: 
+                return '';
+        }
+    }
 }

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

Indentation +269 added lines, -269 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
+     */
 
 /**
  * A convenience class to convert property values to specific types.
@@ -29,193 +29,193 @@ 
  */
 class LoggerOptionConverter {
 
-	const DELIM_START = '${';
-	const DELIM_STOP = '}';
-	const DELIM_START_LEN = 2;
-	const DELIM_STOP_LEN = 1;
+    const DELIM_START = '${';
+    const DELIM_STOP = '}';
+    const DELIM_START_LEN = 2;
+    const DELIM_STOP_LEN = 1;
 
-   /**
-	* Read a predefined var.
-	*
-	* It returns a value referenced by <var>$key</var> using this search criteria:
-	* - if <var>$key</var> is a constant then return it. Else
-	* - if <var>$key</var> is set in <var>$_ENV</var> then return it. Else
-	* - return <var>$def</var>. 
-	*
-	* @param string $key The key to search for.
-	* @param string $def The default value to return.
-	* @return string	the string value of the system property, or the default
-	*					value if there is no property with that key.
-	*
-	* @static
-	*/
-	public static function getSystemProperty($key, $def) {
-		if(defined($key)) {
-			return (string)constant($key);
-		} else if(isset($_SERVER[$key])) {
-			return (string)$_SERVER[$key];
-		} else if(isset($_ENV[$key])) {
-			return (string)$_ENV[$key];
-		} else {
-			return $def;
-		}
-	}
+    /**
+     * Read a predefined var.
+     *
+     * It returns a value referenced by <var>$key</var> using this search criteria:
+     * - if <var>$key</var> is a constant then return it. Else
+     * - if <var>$key</var> is set in <var>$_ENV</var> then return it. Else
+     * - return <var>$def</var>. 
+     *
+     * @param string $key The key to search for.
+     * @param string $def The default value to return.
+     * @return string	the string value of the system property, or the default
+     *					value if there is no property with that key.
+     *
+     * @static
+     */
+    public static function getSystemProperty($key, $def) {
+        if(defined($key)) {
+            return (string)constant($key);
+        } else if(isset($_SERVER[$key])) {
+            return (string)$_SERVER[$key];
+        } else if(isset($_ENV[$key])) {
+            return (string)$_ENV[$key];
+        } else {
+            return $def;
+        }
+    }
 
-	/**
-	 * If <var>$value</var> is <i>true</i>, then <i>true</i> is
-	 * returned. If <var>$value</var> is <i>false</i>, then
-	 * <i>true</i> is returned. Otherwise, <var>$default</var> is
-	 * returned.
-	 *
-	 * <p>Case of value is unimportant.</p>
-	 *
-	 * @param string $value
-	 * @param boolean $default
-	 * @return boolean
-	 *
-	 * @static
-	 */
-	public static function toBoolean($value, $default=true) {
-	    if (is_null($value)) {
-			return $default;
-	    } elseif (is_string($value)) {
-		$trimmedVal = strtolower(trim($value));
+    /**
+     * If <var>$value</var> is <i>true</i>, then <i>true</i> is
+     * returned. If <var>$value</var> is <i>false</i>, then
+     * <i>true</i> is returned. Otherwise, <var>$default</var> is
+     * returned.
+     *
+     * <p>Case of value is unimportant.</p>
+     *
+     * @param string $value
+     * @param boolean $default
+     * @return boolean
+     *
+     * @static
+     */
+    public static function toBoolean($value, $default=true) {
+        if (is_null($value)) {
+            return $default;
+        } elseif (is_string($value)) {
+        $trimmedVal = strtolower(trim($value));
 	
             if("1" == $trimmedVal or "true" == $trimmedVal or "yes" == $trimmedVal or "on" == $trimmedVal) {
-			return true;
+            return true;
             } else if ("" == $trimmedVal or "0" == $trimmedVal or "false" == $trimmedVal or "no" == $trimmedVal or "off" == $trimmedVal) {
-			return false;
-		}
-		} elseif (is_bool($value)) {
-		    return $value;
-		} elseif (is_int($value)) {
-		    return !($value == 0); // true is everything but 0 like in C 
-		}
+            return false;
+        }
+        } elseif (is_bool($value)) {
+            return $value;
+        } elseif (is_int($value)) {
+            return !($value == 0); // true is everything but 0 like in C 
+        }
 		
-		trigger_error("Could not convert ".var_export($value,1)." to boolean!", E_USER_WARNING);
-		return $default;
-	}
+        trigger_error("Could not convert ".var_export($value,1)." to boolean!", E_USER_WARNING);
+        return $default;
+    }
 
-	/**
-	 * @param string $value
-	 * @param integer $default
-	 * @return integer
-	 * @static
-	 */
-	public static function toInt($value, $default) {
-		$value = trim($value);
-		if(is_numeric($value)) {
-			return (int)$value;
-		} else {
-			return $default;
-		}
-	}
+    /**
+     * @param string $value
+     * @param integer $default
+     * @return integer
+     * @static
+     */
+    public static function toInt($value, $default) {
+        $value = trim($value);
+        if(is_numeric($value)) {
+            return (int)$value;
+        } else {
+            return $default;
+        }
+    }
 
-	/**
-	 * Converts a standard or custom priority level to a Level
-	 * object.
-	 *
-	 * <p> If <var>$value</var> is of form "<b>level#full_file_classname</b>",
-	 * where <i>full_file_classname</i> means the class filename with path
-	 * but without php extension, then the specified class' <i>toLevel()</i> method
-	 * is called to process the specified level string; if no '#'
-	 * character is present, then the default {@link LoggerLevel}
-	 * class is used to process the level value.</p>
-	 *
-	 * <p>As a special case, if the <var>$value</var> parameter is
-	 * equal to the string "NULL", then the value <i>null</i> will
-	 * be returned.</p>
-	 *
-	 * <p>If any error occurs while converting the value to a level,
-	 * the <var>$defaultValue</var> parameter, which may be
-	 * <i>null</i>, is returned.</p>
-	 *
-	 * <p>Case of <var>$value</var> is insignificant for the level level, but is
-	 * significant for the class name part, if present.</p>
-	 *
-	 * @param string $value
-	 * @param LoggerLevel $defaultValue
-	 * @return LoggerLevel a {@link LoggerLevel} or null
-	 * @static
-	 */
-	public static function toLevel($value, $defaultValue) {
-		if($value === null) {
-			return $defaultValue;
-		}
-		$hashIndex = strpos($value, '#');
-		if($hashIndex === false) {
-			if("NULL" == strtoupper($value)) {
-				return null;
-			} else {
-				// no class name specified : use standard Level class
-				return LoggerLevel::toLevel($value, $defaultValue);
-			}
-		}
+    /**
+     * Converts a standard or custom priority level to a Level
+     * object.
+     *
+     * <p> If <var>$value</var> is of form "<b>level#full_file_classname</b>",
+     * where <i>full_file_classname</i> means the class filename with path
+     * but without php extension, then the specified class' <i>toLevel()</i> method
+     * is called to process the specified level string; if no '#'
+     * character is present, then the default {@link LoggerLevel}
+     * class is used to process the level value.</p>
+     *
+     * <p>As a special case, if the <var>$value</var> parameter is
+     * equal to the string "NULL", then the value <i>null</i> will
+     * be returned.</p>
+     *
+     * <p>If any error occurs while converting the value to a level,
+     * the <var>$defaultValue</var> parameter, which may be
+     * <i>null</i>, is returned.</p>
+     *
+     * <p>Case of <var>$value</var> is insignificant for the level level, but is
+     * significant for the class name part, if present.</p>
+     *
+     * @param string $value
+     * @param LoggerLevel $defaultValue
+     * @return LoggerLevel a {@link LoggerLevel} or null
+     * @static
+     */
+    public static function toLevel($value, $defaultValue) {
+        if($value === null) {
+            return $defaultValue;
+        }
+        $hashIndex = strpos($value, '#');
+        if($hashIndex === false) {
+            if("NULL" == strtoupper($value)) {
+                return null;
+            } else {
+                // no class name specified : use standard Level class
+                return LoggerLevel::toLevel($value, $defaultValue);
+            }
+        }
 
-		$result = $defaultValue;
+        $result = $defaultValue;
 
-		$clazz = substr($value, ($hashIndex + 1));
-		$levelName = substr($value, 0, $hashIndex);
+        $clazz = substr($value, ($hashIndex + 1));
+        $levelName = substr($value, 0, $hashIndex);
 
-		// This is degenerate case but you never know.
-		if("NULL" == strtoupper($levelName)) {
-			return null;
-		}
+        // This is degenerate case but you never know.
+        if("NULL" == strtoupper($levelName)) {
+            return null;
+        }
 
-		$clazz = basename($clazz);
+        $clazz = basename($clazz);
 
-		if(class_exists($clazz)) {
-			$result = @call_user_func(array($clazz, 'toLevel'), $levelName, $defaultValue);
-			if(!$result instanceof LoggerLevel) {
-				$result = $defaultValue;
-			}
-		} 
-		return $result;
-	}
+        if(class_exists($clazz)) {
+            $result = @call_user_func(array($clazz, 'toLevel'), $levelName, $defaultValue);
+            if(!$result instanceof LoggerLevel) {
+                $result = $defaultValue;
+            }
+        } 
+        return $result;
+    }
 
-	/**
-	 * @param string $value
-	 * @param float $default
-	 * @return float
-	 *
-	 * @static
-	 */
-	public static function toFileSize($value, $default) {
-		if($value === null) {
-			return $default;
-		}
+    /**
+     * @param string $value
+     * @param float $default
+     * @return float
+     *
+     * @static
+     */
+    public static function toFileSize($value, $default) {
+        if($value === null) {
+            return $default;
+        }
 
-		$s = strtoupper(trim($value));
-		$multiplier = (float)1;
-		if(($index = strpos($s, 'KB')) !== false) {
-			$multiplier = 1024;
-			$s = substr($s, 0, $index);
-		} else if(($index = strpos($s, 'MB')) !== false) {
-			$multiplier = 1024 * 1024;
-			$s = substr($s, 0, $index);
-		} else if(($index = strpos($s, 'GB')) !== false) {
-			$multiplier = 1024 * 1024 * 1024;
-			$s = substr($s, 0, $index);
-		}
-		if(is_numeric($s)) {
-			return (float)$s * $multiplier;
-		} 
-		return $default;
-	}
+        $s = strtoupper(trim($value));
+        $multiplier = (float)1;
+        if(($index = strpos($s, 'KB')) !== false) {
+            $multiplier = 1024;
+            $s = substr($s, 0, $index);
+        } else if(($index = strpos($s, 'MB')) !== false) {
+            $multiplier = 1024 * 1024;
+            $s = substr($s, 0, $index);
+        } else if(($index = strpos($s, 'GB')) !== false) {
+            $multiplier = 1024 * 1024 * 1024;
+            $s = substr($s, 0, $index);
+        }
+        if(is_numeric($s)) {
+            return (float)$s * $multiplier;
+        } 
+        return $default;
+    }
 
-	/**
-	 * Find the value corresponding to <var>$key</var> in
-	 * <var>$props</var>. Then perform variable substitution on the
-	 * found value.
-	 *
-	 * @param string $key
-	 * @param array $props
-	 * @return string
-	 *
-	 * @static
-	 */
-	public static function findAndSubst($key, $props) {
-		$value = @$props[$key];
+    /**
+     * Find the value corresponding to <var>$key</var> in
+     * <var>$props</var>. Then perform variable substitution on the
+     * found value.
+     *
+     * @param string $key
+     * @param array $props
+     * @return string
+     *
+     * @static
+     */
+    public static function findAndSubst($key, $props) {
+        $value = @$props[$key];
 
         // If coming from the LoggerConfiguratorIni, some options were
         // already mangled by parse_ini_file:
@@ -233,90 +233,90 @@ 
         // explicitly set by the user and is different from an option which
         // has not been specified and therefore keeps its default value.
         //
-		// if(!empty($value)) {
-			return LoggerOptionConverter::substVars($value, $props);
-		// }
+        // if(!empty($value)) {
+            return LoggerOptionConverter::substVars($value, $props);
+        // }
     }
 
-	/**
-	 * Perform variable substitution in string <var>$val</var> from the
-	 * values of keys found with the {@link getSystemProperty()} method.
-	 * 
-	 * <p>The variable substitution delimeters are <b>${</b> and <b>}</b>.
-	 * 
-	 * <p>For example, if the "MY_CONSTANT" contains "value", then
-	 * the call
-	 * <code>
-	 * $s = LoggerOptionConverter::substituteVars("Value of key is ${MY_CONSTANT}.");
-	 * </code>
-	 * will set the variable <i>$s</i> to "Value of key is value.".</p>
-	 * 
-	 * <p>If no value could be found for the specified key, then the
-	 * <var>$props</var> parameter is searched, if the value could not
-	 * be found there, then substitution defaults to the empty string.</p>
-	 * 
-	 * <p>For example, if {@link getSystemProperty()} cannot find any value for the key
-	 * "inexistentKey", then the call
-	 * <code>
-	 * $s = LoggerOptionConverter::substVars("Value of inexistentKey is [${inexistentKey}]");
-	 * </code>
-	 * will set <var>$s</var> to "Value of inexistentKey is []".</p>
-	 * 
-	 * <p>A warn is thrown if <var>$val</var> contains a start delimeter "${" 
-	 * which is not balanced by a stop delimeter "}" and an empty string is returned.</p>
-	 * 
-	 * @author Avy Sharell
-	 * 
-	 * @param string $val The string on which variable substitution is performed.
-	 * @param array $props
-	 * @return string
-	 *
-	 * @static
-	 */
-	 // TODO: this method doesn't work correctly with key = true, it needs key = "true" which is odd
-	public static function substVars($val, $props = null) {
-		$sbuf = '';
-		$i = 0;
-		while(true) {
-			$j = strpos($val, self::DELIM_START, $i);
-			if($j === false) {
-				// no more variables
-				if($i == 0) { // this is a simple string
-					return $val;
-				} else { // add the tail string which contails no variables and return the result.
-					$sbuf .= substr($val, $i);
-					return $sbuf;
-				}
-			} else {
+    /**
+     * Perform variable substitution in string <var>$val</var> from the
+     * values of keys found with the {@link getSystemProperty()} method.
+     * 
+     * <p>The variable substitution delimeters are <b>${</b> and <b>}</b>.
+     * 
+     * <p>For example, if the "MY_CONSTANT" contains "value", then
+     * the call
+     * <code>
+     * $s = LoggerOptionConverter::substituteVars("Value of key is ${MY_CONSTANT}.");
+     * </code>
+     * will set the variable <i>$s</i> to "Value of key is value.".</p>
+     * 
+     * <p>If no value could be found for the specified key, then the
+     * <var>$props</var> parameter is searched, if the value could not
+     * be found there, then substitution defaults to the empty string.</p>
+     * 
+     * <p>For example, if {@link getSystemProperty()} cannot find any value for the key
+     * "inexistentKey", then the call
+     * <code>
+     * $s = LoggerOptionConverter::substVars("Value of inexistentKey is [${inexistentKey}]");
+     * </code>
+     * will set <var>$s</var> to "Value of inexistentKey is []".</p>
+     * 
+     * <p>A warn is thrown if <var>$val</var> contains a start delimeter "${" 
+     * which is not balanced by a stop delimeter "}" and an empty string is returned.</p>
+     * 
+     * @author Avy Sharell
+     * 
+     * @param string $val The string on which variable substitution is performed.
+     * @param array $props
+     * @return string
+     *
+     * @static
+     */
+        // TODO: this method doesn't work correctly with key = true, it needs key = "true" which is odd
+    public static function substVars($val, $props = null) {
+        $sbuf = '';
+        $i = 0;
+        while(true) {
+            $j = strpos($val, self::DELIM_START, $i);
+            if($j === false) {
+                // no more variables
+                if($i == 0) { // this is a simple string
+                    return $val;
+                } else { // add the tail string which contails no variables and return the result.
+                    $sbuf .= substr($val, $i);
+                    return $sbuf;
+                }
+            } else {
 			
-				$sbuf .= substr($val, $i, $j-$i);
-				$k = strpos($val, self::DELIM_STOP, $j);
-				if($k === false) {
-					// LoggerOptionConverter::substVars() has no closing brace. Opening brace
-					return '';
-				} else {
-					$j += self::START_LEN;
-					$key = substr($val, $j, $k - $j);
-					// first try in System properties
-					$replacement = LoggerOptionConverter::getSystemProperty($key, null);
-					// then try props parameter
-					if($replacement == null and $props !== null) {
-						$replacement = @$props[$key];
-					}
+                $sbuf .= substr($val, $i, $j-$i);
+                $k = strpos($val, self::DELIM_STOP, $j);
+                if($k === false) {
+                    // LoggerOptionConverter::substVars() has no closing brace. Opening brace
+                    return '';
+                } else {
+                    $j += self::START_LEN;
+                    $key = substr($val, $j, $k - $j);
+                    // first try in System properties
+                    $replacement = LoggerOptionConverter::getSystemProperty($key, null);
+                    // then try props parameter
+                    if($replacement == null and $props !== null) {
+                        $replacement = @$props[$key];
+                    }
 
-					if(!empty($replacement)) {
-						// Do variable substitution on the replacement string
-						// such that we can solve "Hello ${x2}" as "Hello p1" 
-						// the where the properties are
-						// x1=p1
-						// x2=${x1}
-						$recursiveReplacement = LoggerOptionConverter::substVars($replacement, $props);
-						$sbuf .= $recursiveReplacement;
-					}
-					$i = $k + self::DELIM_STOP_LEN;
-				}
-			}
-		}
-	}
+                    if(!empty($replacement)) {
+                        // Do variable substitution on the replacement string
+                        // such that we can solve "Hello ${x2}" as "Hello p1" 
+                        // the where the properties are
+                        // x1=p1
+                        // x2=${x1}
+                        $recursiveReplacement = LoggerOptionConverter::substVars($replacement, $props);
+                        $sbuf .= $recursiveReplacement;
+                    }
+                    $i = $k + self::DELIM_STOP_LEN;
+                }
+            }
+        }
+    }
 
 }

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

Indentation +26 added lines, -26 removed lines

@@ -24,34 +24,34 @@
  */
 class LoggerLiteralPatternConverter extends LoggerPatternConverter {
 	
-	/**
-	 * @var string
-	 */
-	private $literal;
+    /**
+     * @var string
+     */
+    private $literal;
 
-	/**
-	 * Constructor
-	 *
-	 * @param string $value
-	 */
-	public function __construct($value) {
-		$this->literal = $value;
-	}
+    /**
+     * Constructor
+     *
+     * @param string $value
+     */
+    public function __construct($value) {
+        $this->literal = $value;
+    }
 
-	/**
-	 * @param string &$sbuf
-	 * @param LoggerLoggingEvent $event
-	 */
-	public function format(&$sbuf, $event) {
-		$sbuf .= $this->literal;
-	}
+    /**
+     * @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;
-	}
+    /**
+     * @param LoggerLoggingEvent $event
+     * @return string
+     */
+    public function convert($event) {
+        return $this->literal;
+    }
 }
 

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/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/configurators/LoggerConfiguratorBasic.php

Indentation +13 added lines, -13 removed lines

@@ -31,17 +31,17 @@
  */
 class LoggerConfiguratorBasic implements LoggerConfigurator {
 
-	/**
-	 * Add a {@link LoggerAppenderConsole} that uses 
-	 * the {@link LoggerLayoutTTCC} to the root category.
-	 * 
-	 * @param string $url not used here
-	 */
-	public function configure(LoggerHierarchy $hierarchy, $url = null) {
-		$root = $hierarchy->getRootLogger();
-		$appender = new LoggerAppenderConsole('A1');
-		$appender->setLayout( new LoggerLayoutTTCC() );
-		$appender->activateOptions();
-		$root->addAppender($appender);
-	}
+    /**
+     * Add a {@link LoggerAppenderConsole} that uses 
+     * the {@link LoggerLayoutTTCC} to the root category.
+     * 
+     * @param string $url not used here
+     */
+    public function configure(LoggerHierarchy $hierarchy, $url = null) {
+        $root = $hierarchy->getRootLogger();
+        $appender = new LoggerAppenderConsole('A1');
+        $appender->setLayout( new LoggerLayoutTTCC() );
+        $appender->activateOptions();
+        $root->addAppender($appender);
+    }
 }