chamilo / chamilo-lms

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

Indentation +37 added lines, -37 removed lines

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

main/inc/lib/phpdocx/lib/log4php/helpers/LoggerFormattingInfo.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
+     */
 
 /**
  * This class encapsulates the information obtained when parsing
@@ -28,23 +28,23 @@ 
  */
 class LoggerFormattingInfo {
 
-	public $min = -1;
-	public $max = 0x7FFFFFFF;
-	public $leftAlign = false;
+    public $min = -1;
+    public $max = 0x7FFFFFFF;
+    public $leftAlign = false;
 
-	/**
-	 * Constructor
-	 */
-	public function __construct() {}
+    /**
+     * Constructor
+     */
+    public function __construct() {}
 	
-	public function reset() {
-		$this->min = -1;
-		$this->max = 0x7FFFFFFF;
-		$this->leftAlign = false;	  
-	}
+    public function reset() {
+        $this->min = -1;
+        $this->max = 0x7FFFFFFF;
+        $this->leftAlign = false;	  
+    }
 
-	public function dump() {
-		// TODO: other option to dump?
-		// LoggerLog::debug("LoggerFormattingInfo::dump() min={$this->min}, max={$this->max}, leftAlign={$this->leftAlign}");
-	}
+    public function dump() {
+        // TODO: other option to dump?
+        // LoggerLog::debug("LoggerFormattingInfo::dump() min={$this->min}, max={$this->max}, leftAlign={$this->leftAlign}");
+    }
 }

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

Indentation +269 added lines, -269 removed lines

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

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

Indentation +33 added lines, -33 removed lines

@@ -24,40 +24,40 @@
  */
 class LoggerLocationPatternConverter extends LoggerPatternConverter {
 	
-	/**
-	 * @var integer
-	 */
-	private $type;
+    /**
+     * @var integer
+     */
+    private $type;
 
-	/**
-	 * Constructor
-	 *
-	 * @param string $formattingInfo
-	 * @param integer $type
-	 */
-	public function __construct($formattingInfo, $type) {
-	  parent::__construct($formattingInfo);
-	  $this->type = $type;
-	}
+    /**
+     * Constructor
+     *
+     * @param string $formattingInfo
+     * @param integer $type
+     */
+    public function __construct($formattingInfo, $type) {
+        parent::__construct($formattingInfo);
+        $this->type = $type;
+    }
 
-	/**
-	 * @param LoggerLoggingEvent $event
-	 * @return string
-	 */
-	public function convert($event) {
-		$locationInfo = $event->getLocationInformation();
-		switch($this->type) {
-			case LoggerPatternParser::FULL_LOCATION_CONVERTER:
-				return $locationInfo->getFullInfo();
-			case LoggerPatternParser::METHOD_LOCATION_CONVERTER:
-				return $locationInfo->getMethodName();
-			case LoggerPatternParser::LINE_LOCATION_CONVERTER:
-				return $locationInfo->getLineNumber();
-			case LoggerPatternParser::FILE_LOCATION_CONVERTER:
-				return $locationInfo->getFileName();
-			default: 
-				return '';
-		}
-	}
+    /**
+     * @param LoggerLoggingEvent $event
+     * @return string
+     */
+    public function convert($event) {
+        $locationInfo = $event->getLocationInformation();
+        switch($this->type) {
+            case LoggerPatternParser::FULL_LOCATION_CONVERTER:
+                return $locationInfo->getFullInfo();
+            case LoggerPatternParser::METHOD_LOCATION_CONVERTER:
+                return $locationInfo->getMethodName();
+            case LoggerPatternParser::LINE_LOCATION_CONVERTER:
+                return $locationInfo->getLineNumber();
+            case LoggerPatternParser::FILE_LOCATION_CONVERTER:
+                return $locationInfo->getFileName();
+            default: 
+                return '';
+        }
+    }
 }
 

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

Indentation +26 added lines, -26 removed lines

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

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

Indentation +86 added lines, -86 removed lines

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

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

Indentation +87 added lines, -87 removed lines

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

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

Indentation +66 added lines, -66 removed lines

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

main/inc/lib/phpdocx/lib/log4php/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;
+    }
 	
 }