chamilo / chamilo-lms

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

Indentation +16 added lines, -16 removed lines

@@ -24,21 +24,21 @@
  */
 class LoggerCategoryPatternConverter extends LoggerNamedPatternConverter {
 
-	/**
-	 * Constructor
-	 *
-	 * @param string $formattingInfo
-	 * @param integer $precision
-	 */
-	public function __construct($formattingInfo, $precision) {
-		parent::__construct($formattingInfo, $precision);
-	}
+    /**
+     * Constructor
+     *
+     * @param string $formattingInfo
+     * @param integer $precision
+     */
+    public function __construct($formattingInfo, $precision) {
+        parent::__construct($formattingInfo, $precision);
+    }
 
-	/**
-	 * @param LoggerLoggingEvent $event
-	 * @return string
-	 */
-	public function getFullyQualifiedName($event) {
-		return $event->getLoggerName();
-	}
+    /**
+     * @param LoggerLoggingEvent $event
+     * @return string
+     */
+    public function getFullyQualifiedName($event) {
+        return $event->getLoggerName();
+    }
 }

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

Indentation +38 added lines, -38 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
+     */
 
 /**
  * @package log4php
@@ -24,27 +24,27 @@ 
  */
 class LoggerMDCPatternConverter extends LoggerPatternConverter {
 
-	/**
-	 * @var string
-	 */
-	private $key;
+    /**
+     * @var string
+     */
+    private $key;
 
-	/**
-	 * Constructor
-	 *
-	 * @param string $formattingInfo
-	 * @param string $key
-	 */
-	public function __construct($formattingInfo, $key) {
-		parent::__construct($formattingInfo);
-		$this->key = $key;
-	}
+    /**
+     * Constructor
+     *
+     * @param string $formattingInfo
+     * @param string $key
+     */
+    public function __construct($formattingInfo, $key) {
+        parent::__construct($formattingInfo);
+        $this->key = $key;
+    }
 
-	/**
-	 * @param LoggerLoggingEvent $event
-	 * @return string
-	 */
-	public function convert($event) {
-		return $event->getMDC($this->key);
-	}
+    /**
+     * @param LoggerLoggingEvent $event
+     * @return string
+     */
+    public function convert($event) {
+        return $event->getMDC($this->key);
+    }
 }

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

Indentation +33 added lines, -33 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
+     */
 
 /**
  * @package log4php
@@ -24,22 +24,22 @@ 
  */
 class LoggerClassNamePatternConverter extends LoggerNamedPatternConverter {
 
-	/**
-	 * Constructor
-	 *
-	 * @param string $formattingInfo
-	 * @param integer $precision
-	 */
-	public function __construct($formattingInfo, $precision) {
-		parent::__construct($formattingInfo, $precision);
-	}
+    /**
+     * Constructor
+     *
+     * @param string $formattingInfo
+     * @param integer $precision
+     */
+    public function __construct($formattingInfo, $precision) {
+        parent::__construct($formattingInfo, $precision);
+    }
 
-	/**
-	 * @param LoggerLoggingEvent $event
-	 * @return string
-	 */
-	public function getFullyQualifiedName($event) {
-		return $event->fqcn;
-	}
+    /**
+     * @param LoggerLoggingEvent $event
+     * @return string
+     */
+    public function getFullyQualifiedName($event) {
+        return $event->fqcn;
+    }
 }
 

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

Indentation +24 added lines, -24 removed lines

@@ -24,30 +24,30 @@
  */
 class LoggerDatePatternConverter extends LoggerPatternConverter {
 
-	/**
-	 * @var string
-	 */
-	private $df;
+    /**
+     * @var string
+     */
+    private $df;
 	
-	/**
-	 * Constructor
-	 *
-	 * @param string $formattingInfo
-	 * @param string $df
-	 */
-	public function __construct($formattingInfo, $df) {
-		parent::__construct($formattingInfo);
-		$this->df = $df;
-	}
+    /**
+     * Constructor
+     *
+     * @param string $formattingInfo
+     * @param string $df
+     */
+    public function __construct($formattingInfo, $df) {
+        parent::__construct($formattingInfo);
+        $this->df = $df;
+    }
 
-	/**
-	 * @param LoggerLoggingEvent $event
-	 * @return string
-	 */
-	public function convert($event) {
-		$timeStamp = $event->getTimeStamp();
-		$usecs = round(($timeStamp - (int)$timeStamp) * 1000);
-		$this->df = preg_replace('/((?<!\\\\)(?:\\\\{2})*)u/', '${1}' . sprintf('%03d', $usecs), $this->df);
-		return date($this->df, $event->getTimeStamp());
-	}
+    /**
+     * @param LoggerLoggingEvent $event
+     * @return string
+     */
+    public function convert($event) {
+        $timeStamp = $event->getTimeStamp();
+        $usecs = round(($timeStamp - (int)$timeStamp) * 1000);
+        $this->df = preg_replace('/((?<!\\\\)(?:\\\\{2})*)u/', '${1}' . sprintf('%03d', $usecs), $this->df);
+        return date($this->df, $event->getTimeStamp());
+    }
 }

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/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/LoggerFilterDenyAll.php

Indentation +10 added lines, -10 removed lines

@@ -43,14 +43,14 @@
  */
 class LoggerFilterDenyAll extends LoggerFilter {
 
-	/**
-	 * Always returns the integer constant {@link LoggerFilter::DENY}
-	 * regardless of the {@link LoggerLoggingEvent} parameter.
-	 * 
-	 * @param LoggerLoggingEvent $event The {@link LoggerLoggingEvent} to filter.
-	 * @return LoggerFilter::DENY Always returns {@link LoggerFilter::DENY}
-	 */
-	public function decide(LoggerLoggingEvent $event) {
-		return LoggerFilter::DENY;
-	}
+    /**
+     * Always returns the integer constant {@link LoggerFilter::DENY}
+     * regardless of the {@link LoggerLoggingEvent} parameter.
+     * 
+     * @param LoggerLoggingEvent $event The {@link LoggerLoggingEvent} to filter.
+     * @return LoggerFilter::DENY Always returns {@link LoggerFilter::DENY}
+     */
+    public function decide(LoggerLoggingEvent $event) {
+        return LoggerFilter::DENY;
+    }
 }

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;
+        }
+    }
 }