chamilo / chamilo-lms

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

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

Indentation +393 added lines, -393 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
+     */
 
 /**
  * Allows the configuration of log4php from an external file.
@@ -63,401 +63,401 @@ 
  * @since 0.5
  */
 class LoggerConfiguratorIni implements LoggerConfigurator {
- 	const CATEGORY_PREFIX = "log4php.category.";
- 	const LOGGER_PREFIX = "log4php.logger.";
-	const FACTORY_PREFIX = "log4php.factory";
-	const ADDITIVITY_PREFIX = "log4php.additivity.";
-	const ROOT_CATEGORY_PREFIX = "log4php.rootCategory";
-	const ROOT_LOGGER_PREFIX = "log4php.rootLogger";
-	const APPENDER_PREFIX = "log4php.appender.";
-	const RENDERER_PREFIX = "log4php.renderer.";
-	const THRESHOLD_PREFIX = "log4php.threshold";
+        const CATEGORY_PREFIX = "log4php.category.";
+        const LOGGER_PREFIX = "log4php.logger.";
+    const FACTORY_PREFIX = "log4php.factory";
+    const ADDITIVITY_PREFIX = "log4php.additivity.";
+    const ROOT_CATEGORY_PREFIX = "log4php.rootCategory";
+    const ROOT_LOGGER_PREFIX = "log4php.rootLogger";
+    const APPENDER_PREFIX = "log4php.appender.";
+    const RENDERER_PREFIX = "log4php.renderer.";
+    const THRESHOLD_PREFIX = "log4php.threshold";
 	
-	/** 
-	 * Key for specifying the {@link LoggerFactory}.  
-	 */
-	const LOGGER_FACTORY_KEY = "log4php.loggerFactory";
-	const LOGGER_DEBUG_KEY = "log4php.debug";
-	const INTERNAL_ROOT_NAME = "root";
+    /** 
+     * Key for specifying the {@link LoggerFactory}.  
+     */
+    const LOGGER_FACTORY_KEY = "log4php.loggerFactory";
+    const LOGGER_DEBUG_KEY = "log4php.debug";
+    const INTERNAL_ROOT_NAME = "root";
 	
-	/**
-	 * Constructor
-	 */
-	public function __construct() {
-	}
+    /**
+     * Constructor
+     */
+    public function __construct() {
+    }
 
-	/**
-	 * Read configuration from a file.
-	 *
-	 * <p>The function {@link PHP_MANUAL#parse_ini_file} is used to read the
-	 * file.</p>
-	 *
-	 * <b>The existing configuration is not cleared nor reset.</b> 
-	 * If you require a different behavior, then call 
-	 * {@link  Logger::resetConfiguration()} 
-	 * method before calling {@link doConfigure()}.
-	 * 
-	 * <p>The configuration file consists of statements in the format
-	 * <b>key=value</b>. The syntax of different configuration
-	 * elements are discussed below.
-	 * 
-	 * <p><b>Repository-wide threshold</b></p>
-	 * 
-	 * <p>The repository-wide threshold filters logging requests by level
-	 * regardless of logger. The syntax is:
-	 * 
-	 * <pre>
-	 * log4php.threshold=[level]
-	 * </pre>
-	 * 
-	 * <p>The level value can consist of the string values OFF, FATAL,
-	 * ERROR, WARN, INFO, DEBUG, ALL or a <i>custom level</i> value. A
-	 * custom level value can be specified in the form
-	 * <samp>level#classname</samp>. By default the repository-wide threshold is set
-	 * to the lowest possible value, namely the level <b>ALL</b>.
-	 * </p>
-	 * 
-	 * 
-	 * <p><b>Appender configuration</b></p>
-	 * 
-	 * <p>Appender configuration syntax is:</p>
-	 * <pre>
-	 * ; For appender named <i>appenderName</i>, set its class.
-	 * ; Note: The appender name can contain dots.
-	 * log4php.appender.appenderName=name_of_appender_class
-	 * 
-	 * ; Set appender specific options.
-	 * 
-	 * log4php.appender.appenderName.option1=value1
-	 * log4php.appender.appenderName.optionN=valueN
-	 * </pre>
-	 * 
-	 * For each named appender you can configure its {@link LoggerLayout}. The
-	 * syntax for configuring an appender's layout is:
-	 * <pre>
-	 * log4php.appender.appenderName.layout=name_of_layout_class
-	 * log4php.appender.appenderName.layout.option1=value1
-	 *	....
-	 * log4php.appender.appenderName.layout.optionN=valueN
-	 * </pre>
-	 * 
-	 * <p><b>Configuring loggers</b></p>
-	 * 
-	 * <p>The syntax for configuring the root logger is:
-	 * <pre>
-	 * log4php.rootLogger=[level], appenderName, appenderName, ...
-	 * </pre>
-	 * 
-	 * <p>This syntax means that an optional <i>level</i> can be
-	 * supplied followed by appender names separated by commas.
-	 * 
-	 * <p>The level value can consist of the string values OFF, FATAL,
-	 * ERROR, WARN, INFO, DEBUG, ALL or a <i>custom level</i> value. A
-	 * custom level value can be specified in the form</p>
-	 *
-	 * <pre>level#classname</pre>
-	 * 
-	 * <p>If a level value is specified, then the root level is set
-	 * to the corresponding level.	If no level value is specified,
-	 * then the root level remains untouched.
-	 * 
-	 * <p>The root logger can be assigned multiple appenders.
-	 * 
-	 * <p>Each <i>appenderName</i> (separated by commas) will be added to
-	 * the root logger. The named appender is defined using the
-	 * appender syntax defined above.
-	 * 
-	 * <p>For non-root categories the syntax is almost the same:
-	 * <pre>
-	 * log4php.logger.logger_name=[level|INHERITED|NULL], appenderName, appenderName, ...
-	 * </pre>
-	 * 
-	 * <p>The meaning of the optional level value is discussed above
-	 * in relation to the root logger. In addition however, the value
-	 * INHERITED can be specified meaning that the named logger should
-	 * inherit its level from the logger hierarchy.</p>
-	 * 
-	 * <p>If no level value is supplied, then the level of the
-	 * named logger remains untouched.</p>
-	 * 
-	 * <p>By default categories inherit their level from the
-	 * hierarchy. However, if you set the level of a logger and later
-	 * decide that that logger should inherit its level, then you should
-	 * specify INHERITED as the value for the level value. NULL is a
-	 * synonym for INHERITED.</p>
-	 * 
-	 * <p>Similar to the root logger syntax, each <i>appenderName</i>
-	 * (separated by commas) will be attached to the named logger.</p>
-	 * 
-	 * <p>See the <i>appender additivity rule</i> in the user manual for 
-	 * the meaning of the <b>additivity</b> flag.
-	 * 
-	 * <p><b>ObjectRenderers</b></p>
-	 * 
-	 * <p>You can customize the way message objects of a given type are
-	 * converted to String before being logged. This is done by
-	 * specifying a {@link LoggerRendererObject}
-	 * for the object type would like to customize.</p>
-	 * 
-	 * <p>The syntax is:
-	 * 
-	 * <pre>
-	 * log4php.renderer.name_of_rendered_class=name_of_rendering.class
-	 * </pre>
-	 * 
-	 * As in,
-	 * <pre>
-	 * log4php.renderer.myFruit=myFruitRenderer
-	 * </pre>
-	 * 
-	 * <p><b>Logger Factories</b></p>
-	 * 
-	 * The usage of custom logger factories is discouraged and no longer
-	 * documented.
-	 * 
-	 * <p><b>Example</b></p>
-	 * 
-	 * <p>An example configuration is given below. Other configuration
-	 * file examples are given in the <b>tests</b> folder.
-	 * 
-	 * <pre>
-	 * ; Set options for appender named "A1".
-	 * ; Appender "A1" will be a LoggerAppenderSyslog
-	 * log4php.appender.A1=LoggerAppenderSyslog
-	 * 
-	 * ; The syslog daemon resides on www.abc.net
-	 * log4php.appender.A1.ident=log4php-test
-	 * 
-	 * ; A1's layout is a LoggerPatternLayout, using the conversion pattern
-	 * ; <b>%r %-5p %c{2} %M.%L %x - %m%n</b>. Thus, the log output will
-	 * ; include the relative time since the start of the application in
-	 * ; milliseconds, followed by the level of the log request,
-	 * ; followed by the two rightmost components of the logger name,
-	 * ; followed by the callers method name, followed by the line number,
-	 * ; the nested disgnostic context and finally the message itself.
-	 * ; Refer to the documentation of LoggerPatternLayout} for further information
-	 * ; on the syntax of the ConversionPattern key.
-	 * log4php.appender.A1.layout=LoggerPatternLayout
-	 * log4php.appender.A1.layout.ConversionPattern="%-4r %-5p %c{2} %M.%L %x - %m%n"
-	 * 
-	 * ; Set options for appender named "A2"
-	 * ; A2 should be a LoggerAppenderRollingFile, with maximum file size of 10 MB
-	 * ; using at most one backup file. A2's layout is TTCC, using the
-	 * ; ISO8061 date format with context printing enabled.
-	 * log4php.appender.A2=LoggerAppenderRollingFile
-	 * log4php.appender.A2.MaxFileSize=10MB
-	 * log4php.appender.A2.MaxBackupIndex=1
-	 * log4php.appender.A2.layout=LoggerLayoutTTCC
-	 * log4php.appender.A2.layout.ContextPrinting="true"
-	 * log4php.appender.A2.layout.DateFormat="%c"
-	 * 
-	 * ; Root logger set to DEBUG using the A2 appender defined above.
-	 * log4php.rootLogger=DEBUG, A2
-	 * 
-	 * ; Logger definitions:
-	 * ; The SECURITY logger inherits is level from root. However, it's output
-	 * ; will go to A1 appender defined above. It's additivity is non-cumulative.
-	 * log4php.logger.SECURITY=INHERIT, A1
-	 * log4php.additivity.SECURITY=false
-	 * 
-	 * ; Only warnings or above will be logged for the logger "SECURITY.access".
-	 * ; Output will go to A1.
-	 * log4php.logger.SECURITY.access=WARN
-	 * 
-	 * 
-	 * ; The logger "class.of.the.day" inherits its level from the
-	 * ; logger hierarchy.	Output will go to the appender's of the root
-	 * ; logger, A2 in this case.
-	 * log4php.logger.class.of.the.day=INHERIT
-	 * </pre>
-	 * 
-	 * <p>Refer to the <b>setOption</b> method in each Appender and
-	 * Layout for class specific options.</p>
-	 * 
-	 * <p>Use the <b>&quot;;&quot;</b> character at the
-	 * beginning of a line for comments.</p>
-	 * 
-	 * @param string $url The name of the configuration file where the
-	 *					  configuration information is stored.
-	 * @param LoggerHierarchy $repository the repository to apply the configuration
-	 */
-	public function configure(LoggerHierarchy $hierarchy, $url = '') {
-		$properties = @parse_ini_file($url);
-		if ($properties === false || count($properties) == 0) {
-			$error = error_get_last();
-		    throw new LoggerException("LoggerConfiguratorIni: ".$error['message']);
-		}
-		return $this->doConfigureProperties($properties, $hierarchy);
-	}
+    /**
+     * Read configuration from a file.
+     *
+     * <p>The function {@link PHP_MANUAL#parse_ini_file} is used to read the
+     * file.</p>
+     *
+     * <b>The existing configuration is not cleared nor reset.</b> 
+     * If you require a different behavior, then call 
+     * {@link  Logger::resetConfiguration()} 
+     * method before calling {@link doConfigure()}.
+     * 
+     * <p>The configuration file consists of statements in the format
+     * <b>key=value</b>. The syntax of different configuration
+     * elements are discussed below.
+     * 
+     * <p><b>Repository-wide threshold</b></p>
+     * 
+     * <p>The repository-wide threshold filters logging requests by level
+     * regardless of logger. The syntax is:
+     * 
+     * <pre>
+     * log4php.threshold=[level]
+     * </pre>
+     * 
+     * <p>The level value can consist of the string values OFF, FATAL,
+     * ERROR, WARN, INFO, DEBUG, ALL or a <i>custom level</i> value. A
+     * custom level value can be specified in the form
+     * <samp>level#classname</samp>. By default the repository-wide threshold is set
+     * to the lowest possible value, namely the level <b>ALL</b>.
+     * </p>
+     * 
+     * 
+     * <p><b>Appender configuration</b></p>
+     * 
+     * <p>Appender configuration syntax is:</p>
+     * <pre>
+     * ; For appender named <i>appenderName</i>, set its class.
+     * ; Note: The appender name can contain dots.
+     * log4php.appender.appenderName=name_of_appender_class
+     * 
+     * ; Set appender specific options.
+     * 
+     * log4php.appender.appenderName.option1=value1
+     * log4php.appender.appenderName.optionN=valueN
+     * </pre>
+     * 
+     * For each named appender you can configure its {@link LoggerLayout}. The
+     * syntax for configuring an appender's layout is:
+     * <pre>
+     * log4php.appender.appenderName.layout=name_of_layout_class
+     * log4php.appender.appenderName.layout.option1=value1
+     *	....
+     * log4php.appender.appenderName.layout.optionN=valueN
+     * </pre>
+     * 
+     * <p><b>Configuring loggers</b></p>
+     * 
+     * <p>The syntax for configuring the root logger is:
+     * <pre>
+     * log4php.rootLogger=[level], appenderName, appenderName, ...
+     * </pre>
+     * 
+     * <p>This syntax means that an optional <i>level</i> can be
+     * supplied followed by appender names separated by commas.
+     * 
+     * <p>The level value can consist of the string values OFF, FATAL,
+     * ERROR, WARN, INFO, DEBUG, ALL or a <i>custom level</i> value. A
+     * custom level value can be specified in the form</p>
+     *
+     * <pre>level#classname</pre>
+     * 
+     * <p>If a level value is specified, then the root level is set
+     * to the corresponding level.	If no level value is specified,
+     * then the root level remains untouched.
+     * 
+     * <p>The root logger can be assigned multiple appenders.
+     * 
+     * <p>Each <i>appenderName</i> (separated by commas) will be added to
+     * the root logger. The named appender is defined using the
+     * appender syntax defined above.
+     * 
+     * <p>For non-root categories the syntax is almost the same:
+     * <pre>
+     * log4php.logger.logger_name=[level|INHERITED|NULL], appenderName, appenderName, ...
+     * </pre>
+     * 
+     * <p>The meaning of the optional level value is discussed above
+     * in relation to the root logger. In addition however, the value
+     * INHERITED can be specified meaning that the named logger should
+     * inherit its level from the logger hierarchy.</p>
+     * 
+     * <p>If no level value is supplied, then the level of the
+     * named logger remains untouched.</p>
+     * 
+     * <p>By default categories inherit their level from the
+     * hierarchy. However, if you set the level of a logger and later
+     * decide that that logger should inherit its level, then you should
+     * specify INHERITED as the value for the level value. NULL is a
+     * synonym for INHERITED.</p>
+     * 
+     * <p>Similar to the root logger syntax, each <i>appenderName</i>
+     * (separated by commas) will be attached to the named logger.</p>
+     * 
+     * <p>See the <i>appender additivity rule</i> in the user manual for 
+     * the meaning of the <b>additivity</b> flag.
+     * 
+     * <p><b>ObjectRenderers</b></p>
+     * 
+     * <p>You can customize the way message objects of a given type are
+     * converted to String before being logged. This is done by
+     * specifying a {@link LoggerRendererObject}
+     * for the object type would like to customize.</p>
+     * 
+     * <p>The syntax is:
+     * 
+     * <pre>
+     * log4php.renderer.name_of_rendered_class=name_of_rendering.class
+     * </pre>
+     * 
+     * As in,
+     * <pre>
+     * log4php.renderer.myFruit=myFruitRenderer
+     * </pre>
+     * 
+     * <p><b>Logger Factories</b></p>
+     * 
+     * The usage of custom logger factories is discouraged and no longer
+     * documented.
+     * 
+     * <p><b>Example</b></p>
+     * 
+     * <p>An example configuration is given below. Other configuration
+     * file examples are given in the <b>tests</b> folder.
+     * 
+     * <pre>
+     * ; Set options for appender named "A1".
+     * ; Appender "A1" will be a LoggerAppenderSyslog
+     * log4php.appender.A1=LoggerAppenderSyslog
+     * 
+     * ; The syslog daemon resides on www.abc.net
+     * log4php.appender.A1.ident=log4php-test
+     * 
+     * ; A1's layout is a LoggerPatternLayout, using the conversion pattern
+     * ; <b>%r %-5p %c{2} %M.%L %x - %m%n</b>. Thus, the log output will
+     * ; include the relative time since the start of the application in
+     * ; milliseconds, followed by the level of the log request,
+     * ; followed by the two rightmost components of the logger name,
+     * ; followed by the callers method name, followed by the line number,
+     * ; the nested disgnostic context and finally the message itself.
+     * ; Refer to the documentation of LoggerPatternLayout} for further information
+     * ; on the syntax of the ConversionPattern key.
+     * log4php.appender.A1.layout=LoggerPatternLayout
+     * log4php.appender.A1.layout.ConversionPattern="%-4r %-5p %c{2} %M.%L %x - %m%n"
+     * 
+     * ; Set options for appender named "A2"
+     * ; A2 should be a LoggerAppenderRollingFile, with maximum file size of 10 MB
+     * ; using at most one backup file. A2's layout is TTCC, using the
+     * ; ISO8061 date format with context printing enabled.
+     * log4php.appender.A2=LoggerAppenderRollingFile
+     * log4php.appender.A2.MaxFileSize=10MB
+     * log4php.appender.A2.MaxBackupIndex=1
+     * log4php.appender.A2.layout=LoggerLayoutTTCC
+     * log4php.appender.A2.layout.ContextPrinting="true"
+     * log4php.appender.A2.layout.DateFormat="%c"
+     * 
+     * ; Root logger set to DEBUG using the A2 appender defined above.
+     * log4php.rootLogger=DEBUG, A2
+     * 
+     * ; Logger definitions:
+     * ; The SECURITY logger inherits is level from root. However, it's output
+     * ; will go to A1 appender defined above. It's additivity is non-cumulative.
+     * log4php.logger.SECURITY=INHERIT, A1
+     * log4php.additivity.SECURITY=false
+     * 
+     * ; Only warnings or above will be logged for the logger "SECURITY.access".
+     * ; Output will go to A1.
+     * log4php.logger.SECURITY.access=WARN
+     * 
+     * 
+     * ; The logger "class.of.the.day" inherits its level from the
+     * ; logger hierarchy.	Output will go to the appender's of the root
+     * ; logger, A2 in this case.
+     * log4php.logger.class.of.the.day=INHERIT
+     * </pre>
+     * 
+     * <p>Refer to the <b>setOption</b> method in each Appender and
+     * Layout for class specific options.</p>
+     * 
+     * <p>Use the <b>&quot;;&quot;</b> character at the
+     * beginning of a line for comments.</p>
+     * 
+     * @param string $url The name of the configuration file where the
+     *					  configuration information is stored.
+     * @param LoggerHierarchy $repository the repository to apply the configuration
+     */
+    public function configure(LoggerHierarchy $hierarchy, $url = '') {
+        $properties = @parse_ini_file($url);
+        if ($properties === false || count($properties) == 0) {
+            $error = error_get_last();
+            throw new LoggerException("LoggerConfiguratorIni: ".$error['message']);
+        }
+        return $this->doConfigureProperties($properties, $hierarchy);
+    }
 
-	/**
-	 * Read configuration options from <b>properties</b>.
-	 *
-	 * @see doConfigure().
-	 * @param array $properties
-	 * @param LoggerHierarchy $hierarchy
-	 */
-	private function doConfigureProperties($properties, LoggerHierarchy $hierarchy) {
-		$thresholdStr = @$properties[self::THRESHOLD_PREFIX];
-		$hierarchy->setThreshold(LoggerOptionConverter::toLevel($thresholdStr, LoggerLevel::getLevelAll()));
-		$this->configureRootCategory($properties, $hierarchy);
-		$this->parseCatsAndRenderers($properties, $hierarchy);
-		return true;
-	}
+    /**
+     * Read configuration options from <b>properties</b>.
+     *
+     * @see doConfigure().
+     * @param array $properties
+     * @param LoggerHierarchy $hierarchy
+     */
+    private function doConfigureProperties($properties, LoggerHierarchy $hierarchy) {
+        $thresholdStr = @$properties[self::THRESHOLD_PREFIX];
+        $hierarchy->setThreshold(LoggerOptionConverter::toLevel($thresholdStr, LoggerLevel::getLevelAll()));
+        $this->configureRootCategory($properties, $hierarchy);
+        $this->parseCatsAndRenderers($properties, $hierarchy);
+        return true;
+    }
 
-	/**
-	 * @param array $props array of properties
-	 * @param LoggerHierarchy $hierarchy
-	 */
-	private function configureRootCategory($props, LoggerHierarchy $hierarchy) {
-		$effectivePrefix = self::ROOT_LOGGER_PREFIX;
-		$value = @$props[self::ROOT_LOGGER_PREFIX];
+    /**
+     * @param array $props array of properties
+     * @param LoggerHierarchy $hierarchy
+     */
+    private function configureRootCategory($props, LoggerHierarchy $hierarchy) {
+        $effectivePrefix = self::ROOT_LOGGER_PREFIX;
+        $value = @$props[self::ROOT_LOGGER_PREFIX];
 
-		if(empty($value)) {
-			$value = @$props[self::ROOT_CATEGORY_PREFIX];
-			$effectivePrefix = self::ROOT_CATEGORY_PREFIX;
-		}
+        if(empty($value)) {
+            $value = @$props[self::ROOT_CATEGORY_PREFIX];
+            $effectivePrefix = self::ROOT_CATEGORY_PREFIX;
+        }
 
-		if(empty($value)) {
-			// TODO "Could not find root logger information. Is this OK?"
-		} else {
-			$root = $hierarchy->getRootLogger();
-			$this->parseCategory($props, $root, $effectivePrefix, self::INTERNAL_ROOT_NAME,	$value);
-		}
-	}
+        if(empty($value)) {
+            // TODO "Could not find root logger information. Is this OK?"
+        } else {
+            $root = $hierarchy->getRootLogger();
+            $this->parseCategory($props, $root, $effectivePrefix, self::INTERNAL_ROOT_NAME,	$value);
+        }
+    }
 
-	/**
-	 * Parse non-root elements, such non-root categories and renderers.
-	 *
-	 * @param array $props array of properties
-	 * @param LoggerHierarchy $hierarchy
-	 */
-	private function parseCatsAndRenderers($props, LoggerHierarchy $hierarchy) {
-		while(list($key,$value) = each($props)) {
-			if(strpos($key, self::CATEGORY_PREFIX) === 0 or 
-				strpos($key, self::LOGGER_PREFIX) === 0) {
-				if(strpos($key, self::CATEGORY_PREFIX) === 0) {
-					$loggerName = substr($key, strlen(self::CATEGORY_PREFIX));
-				} else if(strpos($key, self::LOGGER_PREFIX) === 0) {
-					$loggerName = substr($key, strlen(self::LOGGER_PREFIX));
-				}
+    /**
+     * Parse non-root elements, such non-root categories and renderers.
+     *
+     * @param array $props array of properties
+     * @param LoggerHierarchy $hierarchy
+     */
+    private function parseCatsAndRenderers($props, LoggerHierarchy $hierarchy) {
+        while(list($key,$value) = each($props)) {
+            if(strpos($key, self::CATEGORY_PREFIX) === 0 or 
+                strpos($key, self::LOGGER_PREFIX) === 0) {
+                if(strpos($key, self::CATEGORY_PREFIX) === 0) {
+                    $loggerName = substr($key, strlen(self::CATEGORY_PREFIX));
+                } else if(strpos($key, self::LOGGER_PREFIX) === 0) {
+                    $loggerName = substr($key, strlen(self::LOGGER_PREFIX));
+                }
 				
-				$logger = $hierarchy->getLogger($loggerName);
-				$this->parseCategory($props, $logger, $key, $loggerName, $value);
-				$this->parseAdditivityForLogger($props, $logger, $loggerName);
-			} else if(strpos($key, self::RENDERER_PREFIX) === 0) {
-				$renderedClass = substr($key, strlen(self::RENDERER_PREFIX));
-				$renderingClass = $value;
-				$hierarchy->getRendererMap()->addRenderer($renderedClass, $renderingClass);
-			}
-		}
-	}
+                $logger = $hierarchy->getLogger($loggerName);
+                $this->parseCategory($props, $logger, $key, $loggerName, $value);
+                $this->parseAdditivityForLogger($props, $logger, $loggerName);
+            } else if(strpos($key, self::RENDERER_PREFIX) === 0) {
+                $renderedClass = substr($key, strlen(self::RENDERER_PREFIX));
+                $renderingClass = $value;
+                $hierarchy->getRendererMap()->addRenderer($renderedClass, $renderingClass);
+            }
+        }
+    }
 
-	/**
-	 * Parse the additivity option for a non-root category.
-	 *
-	 * @param array $props array of properties
-	 * @param Logger $cat
-	 * @param string $loggerName
-	 */
-	private function parseAdditivityForLogger($props, Logger $cat, $loggerName) {
-		$value = LoggerOptionConverter::findAndSubst(self::ADDITIVITY_PREFIX . $loggerName, $props);
+    /**
+     * Parse the additivity option for a non-root category.
+     *
+     * @param array $props array of properties
+     * @param Logger $cat
+     * @param string $loggerName
+     */
+    private function parseAdditivityForLogger($props, Logger $cat, $loggerName) {
+        $value = LoggerOptionConverter::findAndSubst(self::ADDITIVITY_PREFIX . $loggerName, $props);
 		
-		// touch additivity only if necessary
-		if(!empty($value)) {
-			$additivity = LoggerOptionConverter::toBoolean($value, true);
-			$cat->setAdditivity($additivity);
-		}
-	}
+        // touch additivity only if necessary
+        if(!empty($value)) {
+            $additivity = LoggerOptionConverter::toBoolean($value, true);
+            $cat->setAdditivity($additivity);
+        }
+    }
 
-	/**
-	 * This method must work for the root category as well.
-	 *
-	 * @param array $props array of properties
-	 * @param Logger $logger
-	 * @param string $optionKey
-	 * @param string $loggerName
-	 * @param string $value
-	 * @return Logger
-	 */
-	private function parseCategory($props, Logger $logger, $optionKey, $loggerName, $value) {
-		// We must skip over ',' but not white space
-		$st = explode(',', $value);
+    /**
+     * This method must work for the root category as well.
+     *
+     * @param array $props array of properties
+     * @param Logger $logger
+     * @param string $optionKey
+     * @param string $loggerName
+     * @param string $value
+     * @return Logger
+     */
+    private function parseCategory($props, Logger $logger, $optionKey, $loggerName, $value) {
+        // We must skip over ',' but not white space
+        $st = explode(',', $value);
 
-		// If value is not in the form ", appender.." or "", then we should set
-		// the level of the loggeregory.
+        // If value is not in the form ", appender.." or "", then we should set
+        // the level of the loggeregory.
 
-		if(!(empty($value) || @$value[0] == ',')) {
-			// just to be on the safe side...
-			if(count($st) == 0) {
-				return;
-			}
-			$levelStr = current($st);
+        if(!(empty($value) || @$value[0] == ',')) {
+            // just to be on the safe side...
+            if(count($st) == 0) {
+                return;
+            }
+            $levelStr = current($st);
 			
-			// If the level value is inherited, set category level value to
-			// null. We also check that the user has not specified inherited for the
-			// root category.
-			if('INHERITED' == strtoupper($levelStr) || 'NULL' == strtoupper($levelStr)) {
-				if($loggerName == self::INTERNAL_ROOT_NAME) {
-					// TODO: throw exception?	"The root logger cannot be set to null."
-				} else {
-					$logger->setLevel(null);
-				}
-			} else {
-				$logger->setLevel(LoggerOptionConverter::toLevel($levelStr, LoggerLevel::getLevelDebug()));
-			}
-		}
+            // If the level value is inherited, set category level value to
+            // null. We also check that the user has not specified inherited for the
+            // root category.
+            if('INHERITED' == strtoupper($levelStr) || 'NULL' == strtoupper($levelStr)) {
+                if($loggerName == self::INTERNAL_ROOT_NAME) {
+                    // TODO: throw exception?	"The root logger cannot be set to null."
+                } else {
+                    $logger->setLevel(null);
+                }
+            } else {
+                $logger->setLevel(LoggerOptionConverter::toLevel($levelStr, LoggerLevel::getLevelDebug()));
+            }
+        }
 
-		// TODO: removing should be done by the logger, if necessary and wanted 
-		// $logger->removeAllAppenders();
-		while($appenderName = next($st)) {
-			$appenderName = trim($appenderName);
-			if(empty($appenderName)) {
-				continue;
-			}
+        // TODO: removing should be done by the logger, if necessary and wanted 
+        // $logger->removeAllAppenders();
+        while($appenderName = next($st)) {
+            $appenderName = trim($appenderName);
+            if(empty($appenderName)) {
+                continue;
+            }
 			
-			$appender = $this->parseAppender($props, $appenderName);
-			if($appender !== null) {
-					$logger->addAppender($appender);
-			}
-		}
-	}
+            $appender = $this->parseAppender($props, $appenderName);
+            if($appender !== null) {
+                    $logger->addAppender($appender);
+            }
+        }
+    }
 
-	/**
-	 * @param array $props array of properties
-	 * @param string $appenderName
-	 * @return LoggerAppender
-	 */
-	private function parseAppender($props, $appenderName) {
-		$appender = LoggerAppenderPool::getAppenderFromPool($appenderName);
-		$prefix = self::APPENDER_PREFIX . $appenderName;
-		if($appender === null) {
-			// Appender was not previously initialized.
-			$appenderClass = @$props[$prefix];
-			$appender = LoggerAppenderPool::getAppenderFromPool($appenderName, $appenderClass);
-			if($appender === null) {
-				return null;
-			}
-		}
+    /**
+     * @param array $props array of properties
+     * @param string $appenderName
+     * @return LoggerAppender
+     */
+    private function parseAppender($props, $appenderName) {
+        $appender = LoggerAppenderPool::getAppenderFromPool($appenderName);
+        $prefix = self::APPENDER_PREFIX . $appenderName;
+        if($appender === null) {
+            // Appender was not previously initialized.
+            $appenderClass = @$props[$prefix];
+            $appender = LoggerAppenderPool::getAppenderFromPool($appenderName, $appenderClass);
+            if($appender === null) {
+                return null;
+            }
+        }
 		
-		if($appender->requiresLayout() ) {
-			$layoutPrefix = $prefix . ".layout";
-			$layoutClass = @$props[$layoutPrefix];
-			$layoutClass = LoggerOptionConverter::substVars($layoutClass, $props);
-			if(empty($layoutClass)) {
-				$layout = LoggerReflectionUtils::createObject('LoggerLayoutSimple');
-			} else {
-				$layout = LoggerReflectionUtils::createObject($layoutClass);
-				if($layout === null) {
-					$layout = LoggerReflectionUtils::createObject('LoggerLayoutSimple');
-				}
-			}
+        if($appender->requiresLayout() ) {
+            $layoutPrefix = $prefix . ".layout";
+            $layoutClass = @$props[$layoutPrefix];
+            $layoutClass = LoggerOptionConverter::substVars($layoutClass, $props);
+            if(empty($layoutClass)) {
+                $layout = LoggerReflectionUtils::createObject('LoggerLayoutSimple');
+            } else {
+                $layout = LoggerReflectionUtils::createObject($layoutClass);
+                if($layout === null) {
+                    $layout = LoggerReflectionUtils::createObject('LoggerLayoutSimple');
+                }
+            }
 			
-			LoggerReflectionUtils::setPropertiesByObject($layout, $props, $layoutPrefix . ".");				  
-			$appender->setLayout($layout);
+            LoggerReflectionUtils::setPropertiesByObject($layout, $props, $layoutPrefix . ".");				  
+            $appender->setLayout($layout);
 			
-		}
-		LoggerReflectionUtils::setPropertiesByObject($appender, $props, $prefix . ".");
-		return $appender;		 
-	}
+        }
+        LoggerReflectionUtils::setPropertiesByObject($appender, $props, $prefix . ".");
+        return $appender;		 
+    }
 }

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

Indentation +32 added lines, -32 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
+     */
 
 /**
  * Use this class to initialize the log4php environment using XML files.
@@ -44,19 +44,19 @@ 
  * @since 0.4 
  */
 class LoggerConfiguratorXml implements LoggerConfigurator {
-	const APPENDER_STATE = 1000;
-	const LAYOUT_STATE = 1010;
-	const ROOT_STATE = 1020;
-	const LOGGER_STATE = 1030;
-	const FILTER_STATE = 1040;
+    const APPENDER_STATE = 1000;
+    const LAYOUT_STATE = 1010;
+    const ROOT_STATE = 1020;
+    const LOGGER_STATE = 1030;
+    const FILTER_STATE = 1040;
 	
-	const DEFAULT_FILENAME = './log4php.xml';
+    const DEFAULT_FILENAME = './log4php.xml';
 	
-	/**
-	 * @var string the default configuration document
-	 */
-	const DEFAULT_CONFIGURATION = 
-	'<?xml version="1.0" ?>
+    /**
+     * @var string the default configuration document
+     */
+    const DEFAULT_CONFIGURATION = 
+    '<?xml version="1.0" ?>
 	<log4php:configuration threshold="all">
 	    <appender name="A1" class="LoggerAppenderEcho">
 	        <layout class="LoggerLayoutSimple" />
@@ -67,10 +67,10 @@ 
 	    </root>
 	</log4php:configuration>';
 	
-	/**
-	 * @var string the elements namespace
-	 */
-	const XMLNS = 'HTTP://LOGGING.APACHE.ORG/LOG4PHP/'; 
+    /**
+     * @var string the elements namespace
+     */
+    const XMLNS = 'HTTP://LOGGING.APACHE.ORG/LOG4PHP/'; 
 
     /**
      * @var LoggerHierarchy

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

Indentation +54 added lines, -54 removed lines

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

main/inc/lib/phpdocx/lib/log4php/renderers/LoggerRendererMap.php

Indentation +117 added lines, -117 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
+     */
 
 /**
  * Log objects using customized renderers that implement {@link LoggerRendererObject}.
@@ -36,114 +36,114 @@ 
  */
 class LoggerRendererMap {
 
-	/**
-	 * @var array
-	 */
-	private $map;
+    /**
+     * @var array
+     */
+    private $map;
 
-	/**
-	 * @var LoggerDefaultRenderer
-	 */
-	private $defaultRenderer;
+    /**
+     * @var LoggerDefaultRenderer
+     */
+    private $defaultRenderer;
 
-	/**
-	 * Constructor
-	 */
-	public function __construct() {
-		$this->map = array();
-		$this->defaultRenderer = new LoggerRendererDefault();
-	}
+    /**
+     * Constructor
+     */
+    public function __construct() {
+        $this->map = array();
+        $this->defaultRenderer = new LoggerRendererDefault();
+    }
 
-	/**
-	 * Add a renderer to a hierarchy passed as parameter.
-	 * Note that hierarchy must implement getRendererMap() and setRenderer() methods.
-	 *
-	 * @param LoggerHierarchy $repository a logger repository.
-	 * @param string $renderedClassName
-	 * @param string $renderingClassName
-	 * @static
-	 */
-	public function addRenderer($renderedClassName, $renderingClassName) {
-		$renderer = LoggerReflectionUtils::createObject($renderingClassName);
-		if($renderer == null) {
-			return;
-		} else {
-			$this->put($renderedClassName, $renderer);
-		}
-	}
+    /**
+     * Add a renderer to a hierarchy passed as parameter.
+     * Note that hierarchy must implement getRendererMap() and setRenderer() methods.
+     *
+     * @param LoggerHierarchy $repository a logger repository.
+     * @param string $renderedClassName
+     * @param string $renderingClassName
+     * @static
+     */
+    public function addRenderer($renderedClassName, $renderingClassName) {
+        $renderer = LoggerReflectionUtils::createObject($renderingClassName);
+        if($renderer == null) {
+            return;
+        } else {
+            $this->put($renderedClassName, $renderer);
+        }
+    }
 
 
-	/**
-	 * Find the appropriate renderer for the class type of the
-	 * <var>o</var> parameter. 
-	 *
-	 * This is accomplished by calling the {@link getByObject()} 
-	 * method if <var>o</var> is object or using {@link LoggerRendererDefault}. 
-	 * Once a renderer is found, it is applied on the object <var>o</var> and 
-	 * the result is returned as a string.
-	 *
-	 * @param mixed $o
-	 * @return string 
-	 */
-	public function findAndRender($o) {
-		if($o == null) {
-			return null;
-		} else {
-			if(is_object($o)) {
-				$renderer = $this->getByObject($o);
-				if($renderer !== null) {
-					return $renderer->render($o);
-				} else {
-					return null;
-				}
-			} else {
-				$renderer = $this->defaultRenderer;
-				return $renderer->render($o);
-			}
-		}
-	}
+    /**
+     * Find the appropriate renderer for the class type of the
+     * <var>o</var> parameter. 
+     *
+     * This is accomplished by calling the {@link getByObject()} 
+     * method if <var>o</var> is object or using {@link LoggerRendererDefault}. 
+     * Once a renderer is found, it is applied on the object <var>o</var> and 
+     * the result is returned as a string.
+     *
+     * @param mixed $o
+     * @return string 
+     */
+    public function findAndRender($o) {
+        if($o == null) {
+            return null;
+        } else {
+            if(is_object($o)) {
+                $renderer = $this->getByObject($o);
+                if($renderer !== null) {
+                    return $renderer->render($o);
+                } else {
+                    return null;
+                }
+            } else {
+                $renderer = $this->defaultRenderer;
+                return $renderer->render($o);
+            }
+        }
+    }
 
-	/**
-	 * Syntactic sugar method that calls {@link PHP_MANUAL#get_class} with the
-	 * class of the object parameter.
-	 * 
-	 * @param mixed $o
-	 * @return string
-	 */
-	public function getByObject($o) {
-		return ($o == null) ? null : $this->getByClassName(get_class($o));
-	}
+    /**
+     * Syntactic sugar method that calls {@link PHP_MANUAL#get_class} with the
+     * class of the object parameter.
+     * 
+     * @param mixed $o
+     * @return string
+     */
+    public function getByObject($o) {
+        return ($o == null) ? null : $this->getByClassName(get_class($o));
+    }
 
 
-	/**
-	 * Search the parents of <var>clazz</var> for a renderer. 
-	 *
-	 * The renderer closest in the hierarchy will be returned. If no
-	 * renderers could be found, then the default renderer is returned.
-	 *
-	 * @param string $class
-	 * @return LoggerRendererObject
-	 */
-	public function getByClassName($class) {
-		$r = null;
-		for($c = strtolower($class); !empty($c); $c = get_parent_class($c)) {
-			if(isset($this->map[$c])) {
-				return $this->map[$c];
-			}
-		}
-		return $this->defaultRenderer;
-	}
+    /**
+     * Search the parents of <var>clazz</var> for a renderer. 
+     *
+     * The renderer closest in the hierarchy will be returned. If no
+     * renderers could be found, then the default renderer is returned.
+     *
+     * @param string $class
+     * @return LoggerRendererObject
+     */
+    public function getByClassName($class) {
+        $r = null;
+        for($c = strtolower($class); !empty($c); $c = get_parent_class($c)) {
+            if(isset($this->map[$c])) {
+                return $this->map[$c];
+            }
+        }
+        return $this->defaultRenderer;
+    }
 
-	public function clear() {
-		$this->map = array();
-	}
+    public function clear() {
+        $this->map = array();
+    }
 
-	/**
-	 * Register a {@link LoggerRendererObject} for <var>clazz</var>.
-	 * @param string $class
-	 * @param LoggerRendererObject $or
-	 */
-	private function put($class, $or) {
-		$this->map[strtolower($class)] = $or;
-	}
+    /**
+     * Register a {@link LoggerRendererObject} for <var>clazz</var>.
+     * @param string $class
+     * @param LoggerRendererObject $or
+     */
+    private function put($class, $or) {
+        $this->map[strtolower($class)] = $or;
+    }
 }

main/inc/lib/phpdocx/lib/log4php/renderers/LoggerRendererDefault.php

Indentation +26 added lines, -26 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 default Renderer renders objects by type casting.
@@ -39,13 +39,13 @@ 
  */
 class LoggerRendererDefault implements LoggerRendererObject {
 
-	/**
-	 * Render objects by type casting
-	 *
-	 * @param mixed $o the object to render
-	 * @return string
-	 */
-	public function render($o) {
-		return var_export($o, true);
-	}
+    /**
+     * Render objects by type casting
+     *
+     * @param mixed $o the object to render
+     * @return string
+     */
+    public function render($o) {
+        return var_export($o, true);
+    }
 }

main/inc/lib/phpdocx/lib/log4php/renderers/LoggerRendererObject.php

Indentation +23 added lines, -23 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
+     */
 
 /**
  * Implement this interface in order to render objects as strings using {@link LoggerRendererMap}.
@@ -37,10 +37,10 @@ 
  * @since 0.3
  */
 interface LoggerRendererObject {
-	/**
-	 * Render the entity passed as parameter as a String.
-	 * @param mixed $o entity to render
-	 * @return string
-	 */
-	public function render($o);
+    /**
+     * Render the entity passed as parameter as a String.
+     * @param mixed $o entity to render
+     * @return string
+     */
+    public function render($o);
 }