chamilo / chamilo-lms

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

Indentation +202 added lines, -202 removed lines

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

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

Indentation +54 added lines, -54 removed lines

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

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

main/inc/lib/phpdocx/lib/log4php/appenders/LoggerAppenderRollingFile.php

Indentation +162 added lines, -162 removed lines

@@ -48,183 +48,183 @@
  */
 class LoggerAppenderRollingFile extends LoggerAppenderFile {
 
-	/**
-	 * Set the maximum size that the output file is allowed to reach
-	 * before being rolled over to backup files.
-	 *
-	 * <p>In configuration files, the <var>MaxFileSize</var> option takes a
-	 * long integer in the range 0 - 2^63. You can specify the value
-	 * with the suffixes "KB", "MB" or "GB" so that the integer is
-	 * interpreted being expressed respectively in kilobytes, megabytes
-	 * or gigabytes. For example, the value "10KB" will be interpreted
-	 * as 10240.</p>
-	 * <p>The default maximum file size is 10MB.</p>
-	 *
-	 * <p>Note that MaxFileSize cannot exceed <b>2 GB</b>.</p>
-	 *
-	 * @var integer
-	 */
-	private $maxFileSize = 10485760;
+    /**
+     * Set the maximum size that the output file is allowed to reach
+     * before being rolled over to backup files.
+     *
+     * <p>In configuration files, the <var>MaxFileSize</var> option takes a
+     * long integer in the range 0 - 2^63. You can specify the value
+     * with the suffixes "KB", "MB" or "GB" so that the integer is
+     * interpreted being expressed respectively in kilobytes, megabytes
+     * or gigabytes. For example, the value "10KB" will be interpreted
+     * as 10240.</p>
+     * <p>The default maximum file size is 10MB.</p>
+     *
+     * <p>Note that MaxFileSize cannot exceed <b>2 GB</b>.</p>
+     *
+     * @var integer
+     */
+    private $maxFileSize = 10485760;
 	
-	/**
-	 * Set the maximum number of backup files to keep around.
-	 * 
-	 * <p>The <var>MaxBackupIndex</var> option determines how many backup
-	 * files are kept before the oldest is erased. This option takes
-	 * a positive integer value. If set to zero, then there will be no
-	 * backup files and the log file will be truncated when it reaches
-	 * MaxFileSize.</p>
-	 * <p>There is one backup file by default.</p>
-	 *
-	 * @var integer 
-	 */
-	private $maxBackupIndex	 = 1;
+    /**
+     * Set the maximum number of backup files to keep around.
+     * 
+     * <p>The <var>MaxBackupIndex</var> option determines how many backup
+     * files are kept before the oldest is erased. This option takes
+     * a positive integer value. If set to zero, then there will be no
+     * backup files and the log file will be truncated when it reaches
+     * MaxFileSize.</p>
+     * <p>There is one backup file by default.</p>
+     *
+     * @var integer 
+     */
+    private $maxBackupIndex	 = 1;
 	
-	/**
-	 * @var string the filename expanded
-	 * @access private
-	 */
-	private $expandedFileName = null;
+    /**
+     * @var string the filename expanded
+     * @access private
+     */
+    private $expandedFileName = null;
 
-	public function __destruct() {
-       parent::__destruct();
-   	}
+    public function __destruct() {
+        parent::__destruct();
+        }
    	
-	/**
-	 * Returns the value of the MaxBackupIndex option.
-	 * @return integer 
-	 */
-	private function getExpandedFileName() {
-		return $this->expandedFileName;
-	}
+    /**
+     * Returns the value of the MaxBackupIndex option.
+     * @return integer 
+     */
+    private function getExpandedFileName() {
+        return $this->expandedFileName;
+    }
 
-	/**
-	 * Get the maximum size that the output file is allowed to reach
-	 * before being rolled over to backup files.
-	 * @return integer
-	 */
-	private function getMaximumFileSize() {
-		return $this->maxFileSize;
-	}
+    /**
+     * Get the maximum size that the output file is allowed to reach
+     * before being rolled over to backup files.
+     * @return integer
+     */
+    private function getMaximumFileSize() {
+        return $this->maxFileSize;
+    }
 
-	/**
-	 * Implements the usual roll over behaviour.
-	 *
-	 * <p>If MaxBackupIndex is positive, then files File.1, ..., File.MaxBackupIndex -1 are renamed to File.2, ..., File.MaxBackupIndex. 
-	 * Moreover, File is renamed File.1 and closed. A new File is created to receive further log output.
-	 * 
-	 * <p>If MaxBackupIndex is equal to zero, then the File is truncated with no backup files created.
-	 */
-	private function rollOver() {
-		// If maxBackups <= 0, then there is no file renaming to be done.
-		if($this->maxBackupIndex > 0) {
-			$fileName = $this->getExpandedFileName();
-			// Delete the oldest file, to keep Windows happy.
-			$file = $fileName . '.' . $this->maxBackupIndex;
-			if(is_writable($file))
-				unlink($file);
-			// Map {(maxBackupIndex - 1), ..., 2, 1} to {maxBackupIndex, ..., 3, 2}
-			for($i = $this->maxBackupIndex - 1; $i >= 1; $i--) {
-				$file = $fileName . "." . $i;
-				if(is_readable($file)) {
-					$target = $fileName . '.' . ($i + 1);
-					rename($file, $target);
-				}
-			}
+    /**
+     * Implements the usual roll over behaviour.
+     *
+     * <p>If MaxBackupIndex is positive, then files File.1, ..., File.MaxBackupIndex -1 are renamed to File.2, ..., File.MaxBackupIndex. 
+     * Moreover, File is renamed File.1 and closed. A new File is created to receive further log output.
+     * 
+     * <p>If MaxBackupIndex is equal to zero, then the File is truncated with no backup files created.
+     */
+    private function rollOver() {
+        // If maxBackups <= 0, then there is no file renaming to be done.
+        if($this->maxBackupIndex > 0) {
+            $fileName = $this->getExpandedFileName();
+            // Delete the oldest file, to keep Windows happy.
+            $file = $fileName . '.' . $this->maxBackupIndex;
+            if(is_writable($file))
+                unlink($file);
+            // Map {(maxBackupIndex - 1), ..., 2, 1} to {maxBackupIndex, ..., 3, 2}
+            for($i = $this->maxBackupIndex - 1; $i >= 1; $i--) {
+                $file = $fileName . "." . $i;
+                if(is_readable($file)) {
+                    $target = $fileName . '.' . ($i + 1);
+                    rename($file, $target);
+                }
+            }
 	
-			$this->close();
+            $this->close();
 	
-			// Rename fileName to fileName.1
-			$target = $fileName . ".1";
-			$file = $fileName;
-			rename($file, $target);
-		}
+            // Rename fileName to fileName.1
+            $target = $fileName . ".1";
+            $file = $fileName;
+            rename($file, $target);
+        }
 		
-		//unset($this->fp);
-		$this->activateOptions();
-		$this->setFile($fileName, false);
-	}
+        //unset($this->fp);
+        $this->activateOptions();
+        $this->setFile($fileName, false);
+    }
 	
-	public function setFileName($fileName) {
-		$this->fileName = $fileName;
-		// As LoggerAppenderFile does not create the directory, it has to exist.
-		// realpath() fails if the argument does not exist so the filename is separated.
-		$this->expandedFileName = realpath(dirname($fileName));
-		if ($this->expandedFileName === false) throw new Exception("Directory of $fileName does not exist!");
-		$this->expandedFileName .= '/'.basename($fileName);
-	}
+    public function setFileName($fileName) {
+        $this->fileName = $fileName;
+        // As LoggerAppenderFile does not create the directory, it has to exist.
+        // realpath() fails if the argument does not exist so the filename is separated.
+        $this->expandedFileName = realpath(dirname($fileName));
+        if ($this->expandedFileName === false) throw new Exception("Directory of $fileName does not exist!");
+        $this->expandedFileName .= '/'.basename($fileName);
+    }
 
 
-	/**
-	 * Set the maximum number of backup files to keep around.
-	 * 
-	 * <p>The <b>MaxBackupIndex</b> option determines how many backup
-	 * files are kept before the oldest is erased. This option takes
-	 * a positive integer value. If set to zero, then there will be no
-	 * backup files and the log file will be truncated when it reaches
-	 * MaxFileSize.
-	 *
-	 * @param mixed $maxBackups
-	 */
-	public function setMaxBackupIndex($maxBackups) {
-		if(is_numeric($maxBackups)) {
-			$this->maxBackupIndex = abs((int)$maxBackups);
-		}
-	}
+    /**
+     * Set the maximum number of backup files to keep around.
+     * 
+     * <p>The <b>MaxBackupIndex</b> option determines how many backup
+     * files are kept before the oldest is erased. This option takes
+     * a positive integer value. If set to zero, then there will be no
+     * backup files and the log file will be truncated when it reaches
+     * MaxFileSize.
+     *
+     * @param mixed $maxBackups
+     */
+    public function setMaxBackupIndex($maxBackups) {
+        if(is_numeric($maxBackups)) {
+            $this->maxBackupIndex = abs((int)$maxBackups);
+        }
+    }
 
-	/**
-	 * Set the maximum size that the output file is allowed to reach
-	 * before being rolled over to backup files.
-	 *
-	 * @param mixed $maxFileSize
-	 * @see setMaxFileSize()
-	 * @deprecated
-	 */
-	public function setMaximumFileSize($maxFileSize) {
-		return $this->setMaxFileSize($maxFileSize);
-	}
+    /**
+     * Set the maximum size that the output file is allowed to reach
+     * before being rolled over to backup files.
+     *
+     * @param mixed $maxFileSize
+     * @see setMaxFileSize()
+     * @deprecated
+     */
+    public function setMaximumFileSize($maxFileSize) {
+        return $this->setMaxFileSize($maxFileSize);
+    }
 
-	/**
-	 * Set the maximum size that the output file is allowed to reach
-	 * before being rolled over to backup files.
-	 * <p>In configuration files, the <b>MaxFileSize</b> option takes an
-	 * long integer in the range 0 - 2^63. You can specify the value
-	 * with the suffixes "KB", "MB" or "GB" so that the integer is
-	 * interpreted being expressed respectively in kilobytes, megabytes
-	 * or gigabytes. For example, the value "10KB" will be interpreted
-	 * as 10240.
-	 *
-	 * @param mixed $value
-	 * @return the actual file size set
-	 */
-	public function setMaxFileSize($value) {
-		$maxFileSize = null;
-		$numpart = substr($value,0, strlen($value) -2);
-		$suffix = strtoupper(substr($value, -2));
+    /**
+     * Set the maximum size that the output file is allowed to reach
+     * before being rolled over to backup files.
+     * <p>In configuration files, the <b>MaxFileSize</b> option takes an
+     * long integer in the range 0 - 2^63. You can specify the value
+     * with the suffixes "KB", "MB" or "GB" so that the integer is
+     * interpreted being expressed respectively in kilobytes, megabytes
+     * or gigabytes. For example, the value "10KB" will be interpreted
+     * as 10240.
+     *
+     * @param mixed $value
+     * @return the actual file size set
+     */
+    public function setMaxFileSize($value) {
+        $maxFileSize = null;
+        $numpart = substr($value,0, strlen($value) -2);
+        $suffix = strtoupper(substr($value, -2));
 
-		switch($suffix) {
-			case 'KB': $maxFileSize = (int)((int)$numpart * 1024); break;
-			case 'MB': $maxFileSize = (int)((int)$numpart * 1024 * 1024); break;
-			case 'GB': $maxFileSize = (int)((int)$numpart * 1024 * 1024 * 1024); break;
-			default:
-				if(is_numeric($value)) {
-					$maxFileSize = (int)$value;
-				}
-		}
+        switch($suffix) {
+            case 'KB': $maxFileSize = (int)((int)$numpart * 1024); break;
+            case 'MB': $maxFileSize = (int)((int)$numpart * 1024 * 1024); break;
+            case 'GB': $maxFileSize = (int)((int)$numpart * 1024 * 1024 * 1024); break;
+            default:
+                if(is_numeric($value)) {
+                    $maxFileSize = (int)$value;
+                }
+        }
 		
-		if($maxFileSize !== null) {
-			$this->maxFileSize = abs($maxFileSize);
-		}
-		return $this->maxFileSize;
-	}
+        if($maxFileSize !== null) {
+            $this->maxFileSize = abs($maxFileSize);
+        }
+        return $this->maxFileSize;
+    }
 
-	/**
-	 * @param LoggerLoggingEvent $event
-	 */
-	public function append(LoggerLoggingEvent $event) {
-		parent::append($event);
-		if(ftell($this->fp) > $this->getMaximumFileSize()) {
-			$this->rollOver();
-		}
-	}
+    /**
+     * @param LoggerLoggingEvent $event
+     */
+    public function append(LoggerLoggingEvent $event) {
+        parent::append($event);
+        if(ftell($this->fp) > $this->getMaximumFileSize()) {
+            $this->rollOver();
+        }
+    }
 }

main/inc/lib/phpdocx/lib/log4php/appenders/LoggerAppenderConsole.php

Indentation +74 added lines, -74 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
+     */
 
 /**
  * ConsoleAppender appends log events to STDOUT or STDERR. 
@@ -43,70 +43,70 @@ 
  */
 class LoggerAppenderConsole extends LoggerAppender {
 
-	const STDOUT = 'php://stdout';
-	const STDERR = 'php://stderr';
+    const STDOUT = 'php://stdout';
+    const STDERR = 'php://stderr';
 
-	/**
-	 * Can be 'php://stdout' or 'php://stderr'. But it's better to use keywords <b>STDOUT</b> and <b>STDERR</b> (case insensitive). 
-	 * Default is STDOUT
-	 * @var string	  
-	 */
-	private $target = self::STDOUT;
+    /**
+     * Can be 'php://stdout' or 'php://stderr'. But it's better to use keywords <b>STDOUT</b> and <b>STDERR</b> (case insensitive). 
+     * Default is STDOUT
+     * @var string	  
+     */
+    private $target = self::STDOUT;
 	
-	/**
-	 * @var boolean
-	 * @access private	   
-	 */
-	protected $requiresLayout = true;
+    /**
+     * @var boolean
+     * @access private	   
+     */
+    protected $requiresLayout = true;
 
-	/**
-	 * @var mixed the resource used to open stdout/stderr
-	 * @access private	   
-	 */
-	protected $fp = null;
+    /**
+     * @var mixed the resource used to open stdout/stderr
+     * @access private	   
+     */
+    protected $fp = null;
 
-	public function __destruct() {
-       $this->close();
-   	}
+    public function __destruct() {
+        $this->close();
+        }
    	
-	/**
-	 * Set console target.
-	 * @param mixed $value a constant or a string
-	 */
-	public function setTarget($value) {
-		$v = trim($value);
-		if ($v == self::STDOUT || strtoupper($v) == 'STDOUT') {
-			$this->target = self::STDOUT;
-		} elseif ($v == self::STDERR || strtoupper($v) == 'STDERR') {
-			$this->target = self::STDERR;
-		} 
-	}
+    /**
+     * Set console target.
+     * @param mixed $value a constant or a string
+     */
+    public function setTarget($value) {
+        $v = trim($value);
+        if ($v == self::STDOUT || strtoupper($v) == 'STDOUT') {
+            $this->target = self::STDOUT;
+        } elseif ($v == self::STDERR || strtoupper($v) == 'STDERR') {
+            $this->target = self::STDERR;
+        } 
+    }
 
-	public function activateOptions() {
-		$this->fp = fopen($this->target, 'w');
-		if(is_resource($this->fp) && $this->layout !== null) {
-			fwrite($this->fp, $this->layout->getHeader());
-		}
-		$this->closed = (bool)is_resource($this->fp) === false; 
-	}
+    public function activateOptions() {
+        $this->fp = fopen($this->target, 'w');
+        if(is_resource($this->fp) && $this->layout !== null) {
+            fwrite($this->fp, $this->layout->getHeader());
+        }
+        $this->closed = (bool)is_resource($this->fp) === false; 
+    }
 	
-	/**
-	 * @see LoggerAppender::close()
-	 */
-	public function close() {
-		if($this->closed != true) {
-			if (is_resource($this->fp) && $this->layout !== null) {
-				fwrite($this->fp, $this->layout->getFooter());
-				fclose($this->fp);
-			}
-			$this->closed = true;
-		}			 
-	}
+    /**
+     * @see LoggerAppender::close()
+     */
+    public function close() {
+        if($this->closed != true) {
+            if (is_resource($this->fp) && $this->layout !== null) {
+                fwrite($this->fp, $this->layout->getFooter());
+                fclose($this->fp);
+            }
+            $this->closed = true;
+        }			 
+    }
 
-	public function append(LoggerLoggingEvent $event) {
-		if (is_resource($this->fp) && $this->layout !== null) {
-			fwrite($this->fp, $this->layout->format($event));
-		} 
-	}
+    public function append(LoggerLoggingEvent $event) {
+        if (is_resource($this->fp) && $this->layout !== null) {
+            fwrite($this->fp, $this->layout->format($event));
+        } 
+    }
 }
 

main/inc/lib/phpdocx/lib/log4php/appenders/LoggerAppenderMailEvent.php

Indentation +91 added lines, -91 removed lines

@@ -53,57 +53,57 @@ 
  */
 class LoggerAppenderMailEvent extends LoggerAppender {
 
-	/**  'from' field (defaults to 'sendmail_from' from php.ini on win32).
-	 * @var string
-	 */
-	private $from = null;
+    /**  'from' field (defaults to 'sendmail_from' from php.ini on win32).
+     * @var string
+     */
+    private $from = null;
 
-	/** Mailserver port (win32 only).
-	 * @var integer 
-	 */
-	private $port = 25;
+    /** Mailserver port (win32 only).
+     * @var integer 
+     */
+    private $port = 25;
 
-	/** Mailserver hostname (win32 only).
-	 * @var string   
-	 */
-	private $smtpHost = null;
+    /** Mailserver hostname (win32 only).
+     * @var string   
+     */
+    private $smtpHost = null;
 
-	/**
-	 * @var string 'subject' field
-	 */
-	private $subject = '';
+    /**
+     * @var string 'subject' field
+     */
+    private $subject = '';
 
-	/**
-	 * @var string 'to' field
-	 */
-	private $to = null;
+    /**
+     * @var string 'to' field
+     */
+    private $to = null;
 	
-	/**
-	 * @access private
-	 */
-	protected $requiresLayout = true;
+    /**
+     * @access private
+     */
+    protected $requiresLayout = true;
 
-	/** @var indiciates if this appender should run in dry mode */
-	private $dry = false;
+    /** @var indiciates if this appender should run in dry mode */
+    private $dry = false;
 	
-	/**
-	 * Constructor.
-	 *
-	 * @param string $name appender name
-	 */
-	public function __construct($name = '') {
-		parent::__construct($name);
-	}
+    /**
+     * Constructor.
+     *
+     * @param string $name appender name
+     */
+    public function __construct($name = '') {
+        parent::__construct($name);
+    }
 
-	public function __destruct() {
-       $this->close();
-   	}
+    public function __destruct() {
+        $this->close();
+        }
    	
-	public function activateOptions() {
-	    if (empty($this->layout)) {
-	        throw new LoggerException("LoggerAppenderMailEvent requires layout!");
-	    }
-	    if (empty($this->to)) {
+    public function activateOptions() {
+        if (empty($this->layout)) {
+            throw new LoggerException("LoggerAppenderMailEvent requires layout!");
+        }
+        if (empty($this->to)) {
             throw new LoggerException("LoggerAppenderMailEvent was initialized with empty 'from' ($this->from) or 'to' ($this->to) Adress!");
         }
         
@@ -113,67 +113,67 @@ 
         }
         
         $this->closed = false;
-	}
+    }
 	
-	public function close() {
-		$this->closed = true;
-	}
+    public function close() {
+        $this->closed = true;
+    }
 
-	public function setFrom($from) {
-		$this->from = $from;
-	}
+    public function setFrom($from) {
+        $this->from = $from;
+    }
 	
-	public function setPort($port) {
-		$this->port = (int)$port;
-	}
+    public function setPort($port) {
+        $this->port = (int)$port;
+    }
 	
-	public function setSmtpHost($smtpHost) {
-		$this->smtpHost = $smtpHost;
-	}
+    public function setSmtpHost($smtpHost) {
+        $this->smtpHost = $smtpHost;
+    }
 	
-	public function setSubject($subject) {
-		$this->subject = $subject;
-	}
+    public function setSubject($subject) {
+        $this->subject = $subject;
+    }
 	
-	public function setTo($to) {
-		$this->to = $to;
-	}
+    public function setTo($to) {
+        $this->to = $to;
+    }
 
-	public function setDry($dry) {
-		$this->dry = $dry;
-	}
+    public function setDry($dry) {
+        $this->dry = $dry;
+    }
 	
-	public function append(LoggerLoggingEvent $event) {
-		$smtpHost = $this->smtpHost;
-		$prevSmtpHost = ini_get('SMTP');
-		if(!empty($smtpHost)) {
-			ini_set('SMTP', $smtpHost);
-		} 
+    public function append(LoggerLoggingEvent $event) {
+        $smtpHost = $this->smtpHost;
+        $prevSmtpHost = ini_get('SMTP');
+        if(!empty($smtpHost)) {
+            ini_set('SMTP', $smtpHost);
+        } 
 
-		$smtpPort = $this->port;
-		$prevSmtpPort= ini_get('smtp_port');		
-		if($smtpPort > 0 and $smtpPort < 65535) {
-			ini_set('smtp_port', $smtpPort);
-		}
+        $smtpPort = $this->port;
+        $prevSmtpPort= ini_get('smtp_port');		
+        if($smtpPort > 0 and $smtpPort < 65535) {
+            ini_set('smtp_port', $smtpPort);
+        }
 
-		// On unix only sendmail_path, which is PHP_INI_SYSTEM i.e. not changeable here, is used.
+        // On unix only sendmail_path, which is PHP_INI_SYSTEM i.e. not changeable here, is used.
 
-		$addHeader = empty($this->from) ? '' : "From: {$this->from}\r\n";
+        $addHeader = empty($this->from) ? '' : "From: {$this->from}\r\n";
 		
-		if(!$this->dry) {
-			$result = mail($this->to, $this->subject, 
-				$this->layout->getHeader() . $this->layout->format($event) . $this->layout->getFooter($event), 
-				$addHeader);			
-		    if ($result === false) {
-		        // The error message is only printed to stderr as warning. Any idea how to get it?
-		        throw new LoggerException("Error sending mail to '".$this->to."'!");
-		    }
-		} else {
-		    echo "DRY MODE OF MAIL APP.: Send mail to: ".$this->to." with additional headers '".trim($addHeader)."' and content: ".$this->layout->format($event);
-		}
+        if(!$this->dry) {
+            $result = mail($this->to, $this->subject, 
+                $this->layout->getHeader() . $this->layout->format($event) . $this->layout->getFooter($event), 
+                $addHeader);			
+            if ($result === false) {
+                // The error message is only printed to stderr as warning. Any idea how to get it?
+                throw new LoggerException("Error sending mail to '".$this->to."'!");
+            }
+        } else {
+            echo "DRY MODE OF MAIL APP.: Send mail to: ".$this->to." with additional headers '".trim($addHeader)."' and content: ".$this->layout->format($event);
+        }
 			
-		ini_set('SMTP', $prevSmtpHost);
-		ini_set('smtp_port', $prevSmtpPort);
-	}
+        ini_set('SMTP', $prevSmtpHost);
+        ini_set('smtp_port', $prevSmtpPort);
+    }
 }
 

main/inc/lib/phpdocx/lib/log4php/appenders/LoggerAppenderAdodb.php

Indentation +4 added lines, -4 removed lines

@@ -121,10 +121,10 @@
     {        
         $this->db = &ADONewConnection($this->type);
         if (! $this->db->PConnect($this->host, $this->user, $this->password, $this->database)) {
-          $this->db = null;
-          $this->closed = true;
-          $this->canAppend = false;
-          return;
+            $this->db = null;
+            $this->closed = true;
+            $this->canAppend = false;
+            return;
         }
         
         $this->layout = LoggerReflectionUtils::createObject('LoggerLayoutPattern');